Packman Build Service PMBS

Changes of Revision 4

omxplayer.changes Changed

omxplayer.spec Changed

Makefile.ffmpeg.diff Changed

@@ -1,5 +1,5 @@
---- Makefile.ffmpeg.orig	2013-09-06 18:42:09.000000000 +0200
-+++ Makefile.ffmpeg	2013-09-11 07:52:19.416455832 +0200
+--- Makefile.ffmpeg.orig	2014-04-01 10:10:54.625335141 +0200
++++ Makefile.ffmpeg	2014-04-01 10:59:01.525418476 +0200
 @@ -8,7 +8,7 @@ all: checkout configure compile
  
  copy:
@@ -8,8 +8,8 @@
 +	strip *.so*
  
  compile: 
- 	cd ffmpeg; \
-@@ -20,7 +20,6 @@ configure:
+ 	+$(MAKE) -C ffmpeg
+@@ -19,7 +19,6 @@ configure:
  	LDFLAGS="" \
    ./configure \
  			--extra-cflags="-mfpu=vfp -mfloat-abi=$(FLOAT) -mno-apcs-stack-check -mstructure-size-boundary=32 -mno-sched-prolog" \
@@ -17,7 +17,7 @@
  			--enable-shared \
  			--disable-static \
  			--arch=arm \
-@@ -238,7 +237,6 @@ configure:
+@@ -239,7 +238,6 @@ configure:
  			--disable-decoder=bintext \
  			--disable-decoder=xbin \
  			--disable-decoder=idf \
@@ -25,7 +25,7 @@
  
  clean:
  	@rm -rf ffmpeg
-@@ -249,5 +247,5 @@ checkout:
+@@ -250,5 +248,5 @@ checkout:
  
  install:
  	cd ffmpeg; make -j9 DESTDIR="$(WORK)/ffmpeg_compiled" install

omxplayer.cpp.diff Changed

@@ -1,5 +1,5 @@
---- omxplayer.cpp.orig	2013-09-20 11:01:13.603205969 +0200
-+++ omxplayer.cpp	2013-09-20 11:01:42.844307046 +0200
+--- omxplayer.cpp.orig	2014-04-01 10:10:54.633334942 +0200
++++ omxplayer.cpp	2014-04-01 11:00:49.156288571 +0200
 @@ -88,8 +88,8 @@ int               m_use_hw_audio
  bool              m_osd                 = true;
  std::string       m_external_subtitles_path;
@@ -8,10 +8,10 @@
 -std::string       m_italic_font_path    = "/usr/share/fonts/truetype/freefont/FreeSansOblique.ttf";
 +std::string       m_font_path           = "/usr/share/fonts/truetype/FreeSans.ttf";
 +std::string       m_italic_font_path    = "/usr/share/fonts/truetype/FreeSansOblique.ttf";
+ std::string       m_dbus_name           = "org.mpris.MediaPlayer2.omxplayer";
  bool              m_asked_for_font      = false;
  bool              m_asked_for_italic_font = false;
- float             m_font_size           = 0.055f;
-@@ -169,8 +169,8 @@ void print_usage()
+@@ -173,8 +173,8 @@ void print_usage()
    printf("              --no-osd                  do not display status information on screen\n");
    printf("              --subtitles path          external subtitles in UTF-8 srt format\n");
    printf("              --font path               subtitle font\n");

omxplayer-2014.02.11.tar.gz/Makefile.orig Deleted

@@ -1,75 +0,0 @@
-include Makefile.include
-
-CFLAGS+=-std=c++0x -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -DTARGET_POSIX -DTARGET_LINUX -fPIC -DPIC -D_REENTRANT -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DHAVE_CMAKE_CONFIG -D__VIDEOCORE4__ -U_FORTIFY_SOURCE -Wall -DHAVE_OMXLIB -DUSE_EXTERNAL_FFMPEG  -DHAVE_LIBAVCODEC_AVCODEC_H -DHAVE_LIBAVUTIL_OPT_H -DHAVE_LIBAVUTIL_MEM_H -DHAVE_LIBAVUTIL_AVUTIL_H -DHAVE_LIBAVFORMAT_AVFORMAT_H -DHAVE_LIBAVFILTER_AVFILTER_H -DHAVE_LIBSWRESAMPLE_SWRESAMPLE_H -DOMX -DOMX_SKIP64BIT -ftree-vectorize -DUSE_EXTERNAL_OMX -DTARGET_RASPBERRY_PI -DUSE_EXTERNAL_LIBBCM_HOST
-
-LDFLAGS+=-L./ -Lffmpeg_compiled/usr/local/lib/ -lc -lWFC -lGLESv2 -lEGL -lbcm_host -lopenmaxil -lfreetype -lz
-
-INCLUDES+=-I./ -Ilinux -Iffmpeg_compiled/usr/local/include/
-
-DIST ?= omxplayer-dist
-
-SRC=linux/XMemUtils.cpp \
-		utils/log.cpp \
-		DynamicDll.cpp \
-		utils/PCMRemap.cpp \
-		utils/RegExp.cpp \
-		OMXSubtitleTagSami.cpp \
-		OMXOverlayCodecText.cpp \
-		BitstreamConverter.cpp \
-		linux/RBP.cpp \
-		OMXThread.cpp \
-		OMXReader.cpp \
-		OMXStreamInfo.cpp \
-		OMXAudioCodecOMX.cpp \
-		OMXCore.cpp \
-		OMXVideo.cpp \
-		OMXAudio.cpp \
-		OMXClock.cpp \
-		File.cpp \
-		OMXPlayerVideo.cpp \
-		OMXPlayerAudio.cpp \
-		OMXPlayerSubtitles.cpp \
-		SubtitleRenderer.cpp \
-		Unicode.cpp \
-		Srt.cpp \
-		KeyConfig.cpp \
-		OMXControl.cpp \
-		Keyboard.cpp \
-		omxplayer.cpp \
-
-OBJS+=$(filter %.o,$(SRC:.cpp=.o))
-
-all: omxplayer.bin
-
-%.o: %.cpp
-	@rm -f $@ 
-	$(CXX) $(CFLAGS) $(INCLUDES) -c $< -o $@ -Wno-deprecated-declarations
-
-version:
-	bash gen_version.sh > version.h 
-
-omxplayer.bin: version $(OBJS)
-	$(CXX) $(LDFLAGS) -o omxplayer.bin $(OBJS) -lvchiq_arm -lvcos -ldbus-1 -lrt -lpthread -lavutil -lavcodec -lavformat -lswscale -lswresample -lpcre
-	$(STRIP) omxplayer.bin
-
-clean:
-	for i in $(OBJS); do (if test -e "$$i"; then ( rm $$i ); fi ); done
-	@rm -f omxplayer.old.log omxplayer.log
-	@rm -f omxplayer.bin
-	@rm -rf $(DIST)
-	@rm -f omxplayer-dist.tar.gz
-
-ffmpeg:
-	@rm -rf ffmpeg
-	make -f Makefile.ffmpeg
-	make -f Makefile.ffmpeg install
-
-dist: omxplayer.bin
-	mkdir -p $(DIST)/usr/lib/omxplayer
-	mkdir -p $(DIST)/usr/bin
-	mkdir -p $(DIST)/usr/share/doc
-	cp omxplayer omxplayer.bin $(DIST)/usr/bin
-	cp COPYING $(DIST)/usr/share/doc/
-	cp README.md $(DIST)/usr/share/doc/README
-	cp -a ffmpeg_compiled/usr/local/lib/*.so* $(DIST)/usr/lib/omxplayer/
-	cd $(DIST); tar -czf ../$(DIST).tgz *

omxplayer-2014.02.11.tar.gz/ffmpeg/.git/objects/pack/pack-6e3970575dba3814c048088638b859c0a670fbc5.idx Deleted

omxplayer-2014.02.11.tar.gz/ffmpeg/.git/objects/pack/pack-6e3970575dba3814c048088638b859c0a670fbc5.pack Deleted

omxplayer-2014.02.11.tar.gz/ffmpeg/doc/avutil.txt Deleted

@@ -1,36 +0,0 @@
-AVUtil
-======
-libavutil is a small lightweight library of generally useful functions.
-It is not a library for code needed by both libavcodec and libavformat.
-
-
-Overview:
-=========
-adler32.c               adler32 checksum
-aes.c                   AES encryption and decryption
-fifo.c                  resizeable first in first out buffer
-intfloat_readwrite.c    portable reading and writing of floating point values
-log.c                   "printf" with context and level
-md5.c                   MD5 Message-Digest Algorithm
-rational.c              code to perform exact calculations with rational numbers
-tree.c                  generic AVL tree
-crc.c                   generic CRC checksumming code
-integer.c               128bit integer math
-lls.c
-mathematics.c           greatest common divisor, integer sqrt, integer log2, ...
-mem.c                   memory allocation routines with guaranteed alignment
-
-Headers:
-bswap.h                 big/little/native-endian conversion code
-x86_cpu.h               a few useful macros for unifying x86-64 and x86-32 code
-avutil.h
-common.h
-intreadwrite.h          reading and writing of unaligned big/little/native-endian integers
-
-
-Goals:
-======
-* Modular (few interdependencies and the possibility of disabling individual parts during ./configure)
-* Small (source and object)
-* Efficient (low CPU and memory usage)
-* Useful (avoid useless features almost no one needs)

omxplayer-2014.02.11.tar.gz/ffmpeg/doc/doxy Deleted

omxplayer-2014.02.11.tar.gz/ffmpeg/doc/doxy/doxy_stylesheet.css Deleted

@@ -1,2019 +0,0 @@
-/*!
- * Bootstrap v2.1.1
- *
- * Copyright 2012 Twitter, Inc
- * Licensed under the Apache License v2.0
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Designed and built with all the love in the world @twitter by @mdo and @fat.
- */
-
-html {
-  font-size: 100%;
-  -webkit-text-size-adjust: 100%;
-  -ms-text-size-adjust: 100%;
-}
-a:focus {
-  outline: thin dotted #333;
-  outline: 5px auto -webkit-focus-ring-color;
-  outline-offset: -2px;
-}
-a:hover,
-a:current {
-  outline: 0;
-}
-img {
-  /* Responsive images (ensure images don't scale beyond their parents) */
-
-  max-width: 100%;
-  /* Part 1: Set a maxium relative to the parent */
-
-  width: auto\9;
-  /* IE7-8 need help adjusting responsive images */
-
-  height: auto;
-  /* Part 2: Scale the height according to the width, otherwise you get stretching */
-
-  vertical-align: middle;
-  border: 0;
-  -ms-interpolation-mode: bicubic;
-}
-body {
-  margin: 0;
-  font-family: sans-serif;
-  font-size: 14px;
-  line-height: 20px;
-  color: #333333;
-  background-color: #ffffff;
-}
-a {
-  color: #0088cc;
-  text-decoration: none;
-}
-a:hover {
-  color: #005580;
-  text-decoration: underline;
-}
-.container {
-  width: 940px;
-}
-
-.container {
-  margin-right: auto;
-  margin-left: auto;
-  *zoom: 1;
-}
-
-.container:before,
-.container:after {
-  display: table;
-  content: "";
-  line-height: 0;
-}
-.container:after {
-  clear: both;
-}
-.container-fluid {
-  padding-right: 20px;
-  padding-left: 20px;
-  *zoom: 1;
-}
-small {
-  font-size: 85%;
-}
-strong {
-  font-weight: bold;
-}
-em {
-  font-style: italic;
-}
-cite {
-  font-style: normal;
-}
-.text-warning {
-  color: #c09853;
-}
-.text-error {
-  color: #b94a48;
-}
-.text-info {
-  color: #3a87ad;
-}
-.text-success {
-  color: #468847;
-}
-h1,
-h2,
-h3,
-h4,
-h5,
-h6 {
-  margin: 10px 0;
-  font-family: inherit;
-  font-weight: bold;
-  line-height: 1;
-  color: inherit;
-  text-rendering: optimizelegibility;
-}
-h1 small,
-h2 small,
-h3 small,
-h4 small,
-h5 small,
-h6 small {
-  font-weight: normal;
-  line-height: 1;
-  color: #999999;
-}
-h1 {
-  font-size: 30px;
-  line-height: 40px;
-}
-h2 {
-  font-size: 20px;
-  line-height: 40px;
-}
-h3 {
-  font-size: 18px;
-  line-height: 40px;
-}
-h4 {
-  font-size: 18px;
-  line-height: 20px;
-}
-h5 {
-  font-size: 14px;
-  line-height: 20px;
-}
-h6 {
-  font-size: 12px;
-  line-height: 20px;
-}
-ul,
-ol {
-  padding: 0;
-  margin: 0 0 10px 25px;
-}
-ul ul,
-ul ol,
-ol ol,
-ol ul {
-  margin-bottom: 0;
-}
-li {
-  line-height: 20px;
-}
-ul.unstyled,
-ol.unstyled {
-  margin-left: 0;
-  list-style: none;
-}
-dl {
-  margin-bottom: 20px;
-}
-dt,
-dd {
-  line-height: 20px;
-}
-dt {
-  font-weight: bold;
-}
-dd {
-  margin-left: 10px;
-}
-blockquote {
-  padding: 0 0 0 15px;
-  margin: 0 0 20px;
-  border-left: 5px solid #eeeeee;
-}
-blockquote p {
-  margin-bottom: 0;
-  font-size: 16px;
-  font-weight: 300;
-  line-height: 25px;
-}
-blockquote:before,
-blockquote:after {
-  content: "";
-}
-.fragment,
-code,
-pre {
-  padding: 0 3px 2px;
-  font-family: monospace;
-  font-size: 12px;
-  color: #333333;
-  -webkit-border-radius: 3px;
-  -moz-border-radius: 3px;
-  border-radius: 3px;
-}
-.fragment,
-code {
-  padding: 2px 4px;
-  color: #d14;
-  background-color: #f7f7f9;
-  border: 1px solid #e1e1e8;
-}
-pre {
-  display: block;
-  padding: 9.5px;
-  margin: 0 0 10px;
-  font-size: 13px;
-  line-height: 20px;
-  word-break: break-all;
-  word-wrap: break-word;
-  white-space: pre;
-  white-space: pre-wrap;
-  background-color: #f5f5f5;
-  border: 1px solid #ccc;
-  border: 1px solid rgba(0, 0, 0, 0.15);
-  -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
-  border-radius: 4px;
-}
-pre code {
-  padding: 0;
-  color: inherit;
-  background-color: transparent;
-  border: 0;
-}
-.label,
-.badge {
-  font-size: 11.844px;
-  font-weight: bold;
-  line-height: 14px;
-  color: #ffffff;
-  vertical-align: baseline;
-  white-space: nowrap;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-  background-color: #999999;
-}
-.label {
-  padding: 1px 4px 2px;
-  -webkit-border-radius: 3px;
-  -moz-border-radius: 3px;
-  border-radius: 3px;
-}
-.badge {
-  padding: 1px 9px 2px;
-  -webkit-border-radius: 9px;
-  -moz-border-radius: 9px;
-  border-radius: 9px;
-}
-a.label:hover,
-a.badge:hover {
-  color: #ffffff;
-  text-decoration: none;
-  cursor: pointer;
-}
-.label-important,
-.badge-important {
-  background-color: #b94a48;
-}
-.label-important[href],
-.badge-important[href] {
-  background-color: #953b39;
-}
-.label-warning,
-.badge-warning {
-  background-color: #f89406;
-}
-.label-warning[href],
-.badge-warning[href] {
-  background-color: #c67605;
-}
-.label-success,
-.badge-success {
-  background-color: #468847;
-}
-.label-success[href],
-.badge-success[href] {
-  background-color: #356635;
-}
-.label-info,
-.badge-info {
-  background-color: #3a87ad;
-}
-.label-info[href],
-.badge-info[href] {
-  background-color: #2d6987;
-}
-.label-inverse,
-.badge-inverse {
-  background-color: #333333;
-}
-.label-inverse[href],
-.badge-inverse[href] {
-  background-color: #1a1a1a;
-}
-table {
-  max-width: 100%;
-  background-color: transparent;
-  border-collapse: collapse;
-  border-spacing: 0;
-}
-
-table [class*=span],
-.row-fluid table [class*=span] {
-  display: table-cell;
-  float: none;
-  margin-left: 0;
-}
-fieldset {
-  padding: 0;
-  margin: 0;
-  border: 0;
-}
-legend {
-  display: block;
-  width: 100%;
-  padding: 0;
-  margin-bottom: 20px;
-  font-size: 21px;
-  line-height: 40px;
-  color: #333333;
-  border: 0;
-  border-bottom: 1px solid #e5e5e5;
-}
-legend small {
-  font-size: 15px;
-  color: #999999;
-}
-label,
-input,
-button,
-select,
-textarea {
-  font-size: 14px;
-  font-weight: normal;
-  line-height: 20px;
-}
-input,
-button,
-select,
-textarea {
-  font-family: sans-serif;
-}
-label {
-  display: block;
-  margin-bottom: 5px;
-}
-
-.tablist {
-  margin-left: 0;
-  margin-bottom: 20px;
-  list-style: none;
-}
-.tablist > li > a {
-  display: block;
-}
-.tablist > li > a:hover {
-  text-decoration: none;
-  background-color: #eeeeee;
-}
-.tablist > .pull-right {
-  float: right;
-}
-.tablist-header {
-  display: block;
-  padding: 3px 15px;
-  font-size: 11px;
-  font-weight: bold;
-  line-height: 20px;
-  color: #999999;
-  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
-  text-transform: uppercase;
-}
-.tablist li + .tablist-header {
-  margin-top: 9px;
-}
-.tablist-list {
-  padding-left: 15px;
-  padding-right: 15px;
-  margin-bottom: 0;
-}
-.tablist-list > li > a,
-.tablist-list .tablist-header {
-  margin-left: -15px;
-  margin-right: -15px;
-  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
-}
-.tablist-list > li > a {
-  padding: 3px 15px;
-}
-.tablist-list > .current > a,
-.tablist-list > .current > a:hover {
-  color: #ffffff;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2);
-  background-color: #0088cc;
-}
-.tablist-list [class^="icon-"] {
-  margin-right: 2px;
-}
-.tablist-list .divider {
-  *width: 100%;
-  height: 1px;
-  margin: 9px 1px;
-  *margin: -5px 0 5px;
-  overflow: hidden;
-  background-color: #e5e5e5;
-  border-bottom: 1px solid #ffffff;
-}
-.tablist-tabs,
-.tablist {
-  *zoom: 1;
-}
-.tablist-tabs:before,
-.tablist:before,
-.tablist-tabs:after,
-.tablist:after {
-  display: table;
-  content: "";
-  line-height: 0;
-}
-.tablist-tabs:after,
-.tablist:after {
-  clear: both;
-}
-.tablist-tabs > li,
-.tablist > li {
-  float: left;
-}
-.tablist-tabs > li > a,
-.tablist > li > a {
-  padding-right: 12px;
-  padding-left: 12px;
-  margin-right: 2px;
-  line-height: 14px;
-}
-.tablist-tabs {
-  border-bottom: 1px solid #ddd;
-}
-.tablist-tabs > li {
-  margin-bottom: -1px;
-}
-.tablist-tabs > li > a {
-  padding-top: 8px;
-  padding-bottom: 8px;
-  line-height: 20px;
-  border: 1px solid transparent;
-  -webkit-border-radius: 4px 4px 0 0;
-  -moz-border-radius: 4px 4px 0 0;
-  border-radius: 4px 4px 0 0;
-}
-.tablist-tabs > li > a:hover {
-  border-color: #eeeeee #eeeeee #dddddd;
-}
-.tablist-tabs > .current > a,
-.tablist-tabs > .current > a:hover {
-  color: #555555;
-  background-color: #ffffff;
-  border: 1px solid #ddd;
-  border-bottom-color: transparent;
-  cursor: default;
-}
-.tablist > li > a {
-  padding-top: 8px;
-  padding-bottom: 8px;
-  margin-top: 2px;
-  margin-bottom: 2px;
-  -webkit-border-radius: 5px;
-  -moz-border-radius: 5px;
-  border-radius: 5px;
-}
-.tablist > .current > a,
-.tablist > .current > a:hover {
-  color: #ffffff;
-  background-color: #0088cc;
-}
-.tablist-stacked > li {
-  float: none;
-}
-.tablist-stacked > li > a {
-  margin-right: 0;
-}
-.tablist-tabs.tablist-stacked {
-  border-bottom: 0;
-}
-.tablist-tabs.tablist-stacked > li > a {
-  border: 1px solid #ddd;
-  -webkit-border-radius: 0;
-  -moz-border-radius: 0;
-  border-radius: 0;
-}
-.tablist-tabs.tablist-stacked > li:first-child > a {
-  -webkit-border-top-right-radius: 4px;
-  -moz-border-radius-topright: 4px;
-  border-top-right-radius: 4px;
-  -webkit-border-top-left-radius: 4px;
-  -moz-border-radius-topleft: 4px;
-  border-top-left-radius: 4px;
-}
-.tablist-tabs.tablist-stacked > li:last-child > a {
-  -webkit-border-bottom-right-radius: 4px;
-  -moz-border-radius-bottomright: 4px;
-  border-bottom-right-radius: 4px;
-  -webkit-border-bottom-left-radius: 4px;
-  -moz-border-radius-bottomleft: 4px;
-  border-bottom-left-radius: 4px;
-}
-.tablist-tabs.tablist-stacked > li > a:hover {
-  border-color: #ddd;
-  z-index: 2;
-}
-.tablist.tablist-stacked > li > a {
-  margin-bottom: 3px;
-}
-.tablist.tablist-stacked > li:last-child > a {
-  margin-bottom: 1px;
-}
-.tablist-tabs .dropdown-menu {
-  -webkit-border-radius: 0 0 6px 6px;
-  -moz-border-radius: 0 0 6px 6px;
-  border-radius: 0 0 6px 6px;
-}
-.tablist .dropdown-menu {
-  -webkit-border-radius: 6px;
-  -moz-border-radius: 6px;
-  border-radius: 6px;
-}
-.tablist .dropdown-toggle .caret {
-  border-top-color: #0088cc;
-  border-bottom-color: #0088cc;
-  margin-top: 6px;
-}
-.tablist .dropdown-toggle:hover .caret {
-  border-top-color: #005580;
-  border-bottom-color: #005580;
-}
-/* move down carets for tabs */
-.tablist-tabs .dropdown-toggle .caret {
-  margin-top: 8px;
-}
-.tablist .current .dropdown-toggle .caret {
-  border-top-color: #fff;
-  border-bottom-color: #fff;
-}
-.tablist-tabs .current .dropdown-toggle .caret {
-  border-top-color: #555555;
-  border-bottom-color: #555555;
-}
-.tablist > .dropdown.current > a:hover {
-  cursor: pointer;
-}
-.tablist-tabs .open .dropdown-toggle,
-.tablist .open .dropdown-toggle,
-.tablist > li.dropdown.open.current > a:hover {
-  color: #ffffff;
-  background-color: #999999;
-  border-color: #999999;
-}
-.tablist li.dropdown.open .caret,
-.tablist li.dropdown.open.current .caret,
-.tablist li.dropdown.open a:hover .caret {
-  border-top-color: #ffffff;
-  border-bottom-color: #ffffff;
-  opacity: 1;
-  filter: alpha(opacity=100);
-}
-.tabs-stacked .open > a:hover {
-  border-color: #999999;
-}
-.tab-content > .tab-pane,
-.pill-content > .pill-pane {
-  display: none;
-}
-.tab-content > .current,
-.pill-content > .current {
-  display: block;
-}
-.tabs-below > .tablist-tabs {
-  border-top: 1px solid #ddd;
-}
-.tabs-below > .tablist-tabs > li {
-  margin-top: -1px;
-  margin-bottom: 0;
-}
-.tabs-below > .tablist-tabs > li > a {
-  -webkit-border-radius: 0 0 4px 4px;
-  -moz-border-radius: 0 0 4px 4px;
-  border-radius: 0 0 4px 4px;
-}
-.tabs-below > .tablist-tabs > li > a:hover {
-  border-bottom-color: transparent;
-  border-top-color: #ddd;
-}
-.tabs-below > .tablist-tabs > .current > a,
-.tabs-below > .tablist-tabs > .current > a:hover {
-  border-color: transparent #ddd #ddd #ddd;
-}
-.tabs-left > .tablist-tabs > li,
-.tabs-right > .tablist-tabs > li {
-  float: none;
-}
-.tabs-left > .tablist-tabs > li > a,
-.tabs-right > .tablist-tabs > li > a {
-  min-width: 74px;
-  margin-right: 0;
-  margin-bottom: 3px;
-}
-.tabs-left > .tablist-tabs {
-  float: left;
-  margin-right: 19px;
-  border-right: 1px solid #ddd;
-}
-.tabs-left > .tablist-tabs > li > a {
-  margin-right: -1px;
-  -webkit-border-radius: 4px 0 0 4px;
-  -moz-border-radius: 4px 0 0 4px;
-  border-radius: 4px 0 0 4px;
-}
-.tabs-left > .tablist-tabs > li > a:hover {
-  border-color: #eeeeee #dddddd #eeeeee #eeeeee;
-}
-.tabs-left > .tablist-tabs .current > a,
-.tabs-left > .tablist-tabs .current > a:hover {
-  border-color: #ddd transparent #ddd #ddd;
-  *border-right-color: #ffffff;
-}
-.tabs-right > .tablist-tabs {
-  float: right;
-  margin-left: 19px;
-  border-left: 1px solid #ddd;
-}
-.tabs-right > .tablist-tabs > li > a {
-  margin-left: -1px;
-  -webkit-border-radius: 0 4px 4px 0;
-  -moz-border-radius: 0 4px 4px 0;
-  border-radius: 0 4px 4px 0;
-}
-.tabs-right > .tablist-tabs > li > a:hover {
-  border-color: #eeeeee #eeeeee #eeeeee #dddddd;
-}
-.tabs-right > .tablist-tabs .current > a,
-.tabs-right > .tablist-tabs .current > a:hover {
-  border-color: #ddd #ddd #ddd transparent;
-  *border-left-color: #ffffff;
-}
-.tablist > .disabled > a {
-  color: #999999;
-}
-.tablist > .disabled > a:hover {
-  text-decoration: none;
-  background-color: transparent;
-  cursor: default;
-}
-.tablistbar {
-  overflow: visible;
-  margin-bottom: 20px;
-  color: #ffffff;
-  *position: relative;
-  *z-index: 2;
-}
-.tablistbar-inner {
-  min-height: 40px;
-  padding-left: 20px;
-  padding-right: 20px;
-  background-color: #034c03;
-  background-image: -moz-linear-gradient(top, #024002, #045f04);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#024002), to(#045f04));
-  background-image: -webkit-linear-gradient(top, #024002, #045f04);
-  background-image: -o-linear-gradient(top, #024002, #045f04);
-  background-image: linear-gradient(to bottom, #024002, #045f04);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff024002', endColorstr='#ff045f04', GradientType=0);
-  border: 1px solid #022402;
-  -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
-  border-radius: 4px;
-  -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065);
-  -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065);
-  box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065);
-  *zoom: 1;
-}
-.tablistbar-inner:before,
-.tablistbar-inner:after {
-  display: table;
-  content: "";
-  line-height: 0;
-}
-.tablistbar-inner:after {
-  clear: both;
-}
-.tablistbar .container {
-  width: auto;
-}
-.tablist-collapse.collapse {
-  height: auto;
-}
-.tablistbar .brand {
-  float: left;
-  display: block;
-  padding: 10px 20px 10px;
-  margin-left: -20px;
-  font-size: 20px;
-  font-weight: 200;
-  color: #ffffff;
-  text-shadow: 0 1px 0 #024002;
-}
-.tablistbar .brand:hover {
-  text-decoration: none;
-}
-.tablistbar-text {
-  margin-bottom: 0;
-  line-height: 40px;
-}
-.tablistbar-link {
-  color: #ffffff;
-}
-.tablistbar-link:hover {
-  color: #333333;
-}
-.tablistbar .tablist {
-  position: relative;
-  left: 0;
-  display: block;
-  float: left;
-  margin: 0 10px 0 0;
-}
-.tablistbar .tablist.pull-right {
-  float: right;
-  margin-right: 0;
-}
-.tablistbar .tablist > li {
-  float: left;
-}
-.tablistbar .tablist > li > a {
-  float: none;
-  padding: 10px 15px 10px;
-  color: #ffffff;
-  text-decoration: none;
-  text-shadow: 0 1px 0 #024002;
-}
-.tablistbar .tablist .dropdown-toggle .caret {
-  margin-top: 8px;
-}
-.tablistbar .tablist > li > a:focus,
-.tablistbar .tablist > li > a:hover {
-  background-color: transparent;
-  color: white;
-  text-decoration: none;
-}
-.tablistbar .tablist > .current > a,
-.tablistbar .tablist > .current > a:hover,
-.tablistbar .tablist > .current > a:focus {
-  color: #555555;
-  text-decoration: none;
-  background-color: #034703;
-  -webkit-box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125);
-  -moz-box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125);
-  box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125);
-}
-.tablistbar .btn-navbar {
-  display: none;
-  float: right;
-  padding: 7px 10px;
-  margin-left: 5px;
-  margin-right: 5px;
-  color: #ffffff;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-  background-color: #023402;
-  background-image: -moz-linear-gradient(top, #012701, #034703);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#012701), to(#034703));
-  background-image: -webkit-linear-gradient(top, #012701, #034703);
-  background-image: -o-linear-gradient(top, #012701, #034703);
-  background-image: linear-gradient(to bottom, #012701, #034703);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff012701', endColorstr='#ff034703', GradientType=0);
-  border-color: #034703 #034703 #000000;
-  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-  *background-color: #034703;
-  /* Darken IE7 buttons by default so they stand out more given they won't have borders */
-
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
-  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075);
-  -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075);
-  box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075);
-}
-.tablistbar .tablist > li > .dropdown-menu:before {
-  content: '';
-  display: inline-block;
-  border-left: 7px solid transparent;
-  border-right: 7px solid transparent;
-  border-bottom: 7px solid #ccc;
-  border-bottom-color: rgba(0, 0, 0, 0.2);
-  position: absolute;
-  top: -7px;
-  left: 9px;
-}
-.tablistbar .tablist > li > .dropdown-menu:after {
-  content: '';
-  display: inline-block;
-  border-left: 6px solid transparent;
-  border-right: 6px solid transparent;
-  border-bottom: 6px solid #ffffff;
-  position: absolute;
-  top: -6px;
-  left: 10px;
-}
-.tablistbar .tablist li.dropdown.open > .dropdown-toggle,
-.tablistbar .tablist li.dropdown.current > .dropdown-toggle,
-.tablistbar .tablist li.dropdown.open.current > .dropdown-toggle {
-  background-color: #034703;
-  color: #555555;
-}
-.tablistbar .tablist li.dropdown > .dropdown-toggle .caret {
-  border-top-color: #ffffff;
-  border-bottom-color: #ffffff;
-}
-.tablistbar .tablist li.dropdown.open > .dropdown-toggle .caret,
-.tablistbar .tablist li.dropdown.current > .dropdown-toggle .caret,
-.tablistbar .tablist li.dropdown.open.current > .dropdown-toggle .caret {
-  border-top-color: #555555;
-  border-bottom-color: #555555;
-}
-.tablistbar .pull-right > li > .dropdown-menu,
-.tablistbar .tablist > li > .dropdown-menu.pull-right {
-  left: auto;
-  right: 0;
-}
-.tablistbar .pull-right > li > .dropdown-menu:before,
-.tablistbar .tablist > li > .dropdown-menu.pull-right:before {
-  left: auto;
-  right: 12px;
-}
-.tablistbar .pull-right > li > .dropdown-menu:after,
-.tablistbar .tablist > li > .dropdown-menu.pull-right:after {
-  left: auto;
-  right: 13px;
-}
-.tablistbar .pull-right > li > .dropdown-menu .dropdown-menu,
-.tablistbar .tablist > li > .dropdown-menu.pull-right .dropdown-menu {
-  left: auto;
-  right: 100%;
-  margin-left: 0;
-  margin-right: -1px;
-  -webkit-border-radius: 6px 0 6px 6px;
-  -moz-border-radius: 6px 0 6px 6px;
-  border-radius: 6px 0 6px 6px;
-}
-.breadcrumb {
-  padding: 8px 15px;
-  margin: 0 0 20px;
-  list-style: none;
-  background-color: #f5f5f5;
-  -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
-  border-radius: 4px;
-}
-.breadcrumb li {
-  display: inline-block;
-  *display: inline;
-  /* IE7 inline-block hack */
-
-  *zoom: 1;
-  text-shadow: 0 1px 0 #ffffff;
-}
-.breadcrumb .divider {
-  padding: 0 5px;
-  color: #ccc;
-}
-.breadcrumb .current {
-  color: #999999;
-}
-.pagination-right {
-  text-align: right;
-}
-.fade {
-  opacity: 0;
-  -webkit-transition: opacity 0.15s linear;
-  -moz-transition: opacity 0.15s linear;
-  -o-transition: opacity 0.15s linear;
-  transition: opacity 0.15s linear;
-}
-.fade.in {
-  opacity: 1;
-}
-.collapse {
-  position: relative;
-  height: 0;
-  overflow: hidden;
-  -webkit-transition: height 0.35s ease;
-  -moz-transition: height 0.35s ease;
-  -o-transition: height 0.35s ease;
-  transition: height 0.35s ease;
-}
-.collapse.in {
-  height: auto;
-}
-.hidden {
-  display: none;
-  visibility: hidden;
-}
-.visible-phone {
-  display: none !important;
-}
-.visible-tablet {
-  display: none !important;
-}
-.hidden-desktop {
-  display: none !important;
-}
-.visible-desktop {
-  display: inherit !important;
-}
-@media (min-width: 768px) and (max-width: 979px) {
-  .hidden-desktop {
-    display: inherit !important;
-  }
-  .visible-desktop {
-    display: none !important ;
-  }
-  .visible-tablet {
-    display: inherit !important;
-  }
-  .hidden-tablet {
-    display: none !important;
-  }
-}
-@media (max-width: 767px) {
-  .hidden-desktop {
-    display: inherit !important;
-  }
-  .visible-desktop {
-    display: none !important;
-  }
-  .visible-phone {
-    display: inherit !important;
-  }
-  .hidden-phone {
-    display: none !important;
-  }
-}
-@media (max-width: 767px) {
-  body {
-    padding-left: 20px;
-    padding-right: 20px;
-  }
-  .container {
-    width: auto;
-  }
-  .row,
-  .thumbnails {
-    margin-left: 0;
-  }
-}
-@media (max-width: 480px) {
-  .tablist-collapse {
-    -webkit-transform: translate3d(0, 0, 0);
-  }
-  .page-header h1 small {
-    display: block;
-    line-height: 20px;
-  }
-}
-@media (min-width: 768px) and (max-width: 979px) {
-  .row {
-    margin-left: -20px;
-    *zoom: 1;
-  }
-  .row:before,
-  .row:after {
-    display: table;
-    content: "";
-    line-height: 0;
-  }
-  .row:after {
-    clear: both;
-  }
-  [class*="span"] {
-    float: left;
-    min-height: 1px;
-    margin-left: 20px;
-  }
-  .container {
-    width: 724px;
-  }
-}
-@media (min-width: 1200px) {
-  .row {
-    margin-left: -30px;
-    *zoom: 1;
-  }
-  .row:before,
-  .row:after {
-    display: table;
-    content: "";
-    line-height: 0;
-  }
-  .row:after {
-    clear: both;
-  }
-  [class*="span"] {
-    float: left;
-    min-height: 1px;
-    margin-left: 30px;
-  }
-  .container {
-    width: 1070px;
-  }
-}
-@media (max-width: 979px) {
-  body {
-    padding-top: 0;
-  }
-}
-@media (min-width: 980px) {
-  .tablist-collapse.collapse {
-    height: auto !important;
-    overflow: visible !important;
-  }
-}
-.tablistbar .brand {
-  padding: 5px;
-  margin-left: 0;
-}
-.tablistbar .brand img {
-  width: 30px;
-  vertical-align: middle;
-}
-
-h1 small {
-  font-size: 18px;
-}
-
-h1 small,
-h2 small,
-h3 small,
-h4 small,
-h5 small,
-h6 small,
-.page-header small {
-  line-height: 0.8;
-  font-weight: normal;
-  color: #999999;
-  display:block;
-  vertical-align: middle;
-}
-
-.page-header h1, h1:first-child {
-  font-size: 40px;
-  padding-bottom: 5px;
-}
-
-.page-header h1 {
-  border-bottom: 1px solid #999999;
-  padding-bottom: 9px;
-}
-
-.page-header img {
-  height: 80px;
-  padding-bottom: 5px;
-}
-
-.page-header small {
-  line-height: 1.1;
-  font-size: 18px;
-}
-
-h2,
-h3,
-h4,
-div.ah,
-.title {
-  border-color: #D6E9C6;
-  color: #468847;
-  border-style: solid;
-  border-width: 0 0 1px;
-  padding-left: 0.5em;
-}
-
-
-.google {
-  color: white;
-}
-
-.breadcrumb {
-  font-size: 11px;
-  padding-top: 2px;
-  padding-bottom: 2px;
-}
-
-h1 a,
-h2 a,
-h3 a,
-h4 a {
-  color: inherit;
-}
-
-.tablistbar-inner a {
-  font-weight: bold;
-}
-
-.list-2panes:before,
-.list-2panes:after {
-  display: table;
-  content: "";
-  line-height: 0;
-}
-
-.list-2panes:after {
-  clear:both;
-}
-
-.list-2panes li {
-  width: 470px;
-  width: 470px;
-  float: left;
-  margin-left: 30px;
-  min-height: 1px;
-}
-/* The standard CSS for doxygen */
-
-/* @group Heading Levels */
-
-
-dt {
-    font-weight: bold;
-}
-
-div.multicol {
-    -moz-column-gap: 1em;
-    -webkit-column-gap: 1em;
-    -moz-column-count: 3;
-    -webkit-column-count: 3;
-}
-
-p.startli, p.startdd, p.starttd {
-    margin-top: 2px;
-}
-
-p.endli {
-    margin-bottom: 0px;
-}
-
-p.enddd {
-    margin-bottom: 4px;
-}
-
-p.endtd {
-    margin-bottom: 2px;
-}
-
-/* @end */
-
-caption {
-    font-weight: bold;
-}
-
-span.legend {
-        font-size: 70%;
-        text-align: center;
-}
-
-h3.version {
-        font-size: 90%;
-        text-align: center;
-}
-
-div.qindex, div.tablisttab{
-    background-color: #EBF6EB;
-    border: 1px solid #A3D7A3;
-    text-align: center;
-}
-
-div.qindex, div.tablistpath {
-    width: 100%;
-    line-height: 140%;
-}
-
-div.tablisttab {
-    margin-right: 15px;
-}
-
-/* @group Link Styling */
-
-a {
-    color: #3D8C3D;
-    font-weight: normal;
-    text-decoration: none;
-}
-
-.contents a:visited {
-    color: #46A246;
-}
-
-a:hover {
-    text-decoration: underline;
-}
-
-a.qindex {
-    font-weight: bold;
-}
-
-a.qindexHL {
-    font-weight: bold;
-    background-color: #9CD49C;
-    color: #ffffff;
-    border: 1px double #86CA86;
-}
-
-.contents a.qindexHL:visited {
-        color: #ffffff;
-}
-
-a.el {
-    font-weight: bold;
-}
-
-a.elRef {
-}
-
-a.code {
-    color: #4665A2;
-}
-
-a.codeRef {
-    color: #4665A2;
-}
-
-/* @end */
-
-dl.el {
-    margin-left: -1cm;
-}
-
-.fragment {
-    font-family: monospace, fixed;
-    font-size: 105%;
-}
-
-pre.fragment {
-    border: 1px solid #C4E5C4;
-    background-color: #FBFDFB;
-    padding: 4px 6px;
-    margin: 4px 8px 4px 2px;
-    overflow: auto;
-    word-wrap: break-word;
-    font-size:  9pt;
-    line-height: 125%;
-}
-
-div.groupHeader {
-    margin-left: 16px;
-    margin-top: 12px;
-    font-weight: bold;
-}
-
-div.groupText {
-    margin-left: 16px;
-    font-style: italic;
-}
-
-div.contents {
-    margin-top: 10px;
-    margin-left: 8px;
-    margin-right: 8px;
-}
-
-td.indexkey {
-    white-space: nowrap;
-    vertical-align: top;
-}
-
-
-tr.memlist {
-    background-color: #EEF7EE;
-}
-
-p.formulaDsp {
-    text-align: center;
-}
-
-img.formulaDsp {
-
-}
-
-img.formulaInl {
-    vertical-align: middle;
-}
-
-div.center {
-    text-align: center;
-        margin-top: 0px;
-        margin-bottom: 0px;
-        padding: 0px;
-}
-
-div.center img {
-    border: 0px;
-}
-
-#footer {
-    margin: -10px 1em 0;
-    padding-top: 20px;
-    text-align: center;
-    font-size: small;
-}
-
-address.footer {
-    background-color: #ffffff;
-    text-align: center;
-}
-
-img.footer {
-    border: 0px;
-    vertical-align: middle;
-}
-
-/* @group Code Colorization */
-
-span.keyword {
-    color: #008000
-}
-
-span.keywordtype {
-    color: #604020
-}
-
-span.keywordflow {
-    color: #e08000
-}
-
-span.comment {
-    color: #800000
-}
-
-span.preprocessor {
-    color: #806020
-}
-
-span.stringliteral {
-    color: #002080
-}
-
-span.charliteral {
-    color: #008080
-}
-
-span.vhdldigit {
-    color: #ff00ff
-}
-
-span.vhdlchar {
-    color: #000000
-}
-
-span.vhdlkeyword {
-    color: #700070
-}
-
-span.vhdllogic {
-    color: #ff0000
-}
-
-/* @end */
-
-/*
-.search {
-    color: #003399;
-    font-weight: bold;
-}
-
-form.search {
-    margin-bottom: 0px;
-    margin-top: 0px;
-}
-
-input.search {
-    font-size: 75%;
-    color: #000080;
-    font-weight: normal;
-    background-color: #e8eef2;
-}
-*/
-
-td.tiny {
-    font-size: 75%;
-}
-
-.dirtab {
-    padding: 4px;
-    border-collapse: collapse;
-    border: 1px solid #A3D7A3;
-}
-
-th.dirtab {
-    background: #EBF6EB;
-    font-weight: bold;
-}
-
-hr {
-    height: 0px;
-    border: none;
-    border-top: 1px solid #4AAA4A;
-}
-
-hr.footer {
-    height: 1px;
-}
-
-/* @group Member Descriptions */
-
-table.memberdecls {
-    border-spacing: 0px;
-    padding: 0px;
-}
-
-.mdescLeft, .mdescRight,
-.memItemLeft, .memItemRight,
-.memTemplItemLeft, .memTemplItemRight, .memTemplParams {
-    background-color: #F9FCF9;
-    border: none;
-    margin: 4px;
-    padding: 1px 0 0 8px;
-}
-
-.mdescLeft, .mdescRight {
-    padding: 0px 8px 4px 8px;
-    color: #555;
-}
-
-.memItemLeft, .memItemRight, .memTemplParams {
-    border-top: 1px solid #C4E5C4;
-}
-
-.memItemLeft, .memTemplItemLeft {
-        white-space: nowrap;
-}
-
-.memItemRight {
-    width: 100%;
-}
-
-.memTemplParams {
-    color: #46A246;
-        white-space: nowrap;
-}
-
-/* @end */
-
-/* @group Member Details */
-
-/* Styles for detailed member documentation */
-
-.memtemplate {
-    font-size: 80%;
-    color: #46A246;
-    font-weight: normal;
-    margin-left: 9px;
-}
-
-.memnav {
-    background-color: #EBF6EB;
-    border: 1px solid #A3D7A3;
-    text-align: center;
-    margin: 2px;
-    margin-right: 15px;
-    padding: 2px;
-}
-
-.mempage {
-    width: 100%;
-}
-
-.memitem {
-    padding: 0;
-    margin-bottom: 10px;
-    margin-right: 5px;
-}
-
-.memname {
-        white-space: nowrap;
-        font-weight: bold;
-        margin-left: 6px;
-}
-
-.memproto, dl.reflist dt {
-        border-top: 1px solid #A8D9A8;
-        border-left: 1px solid #A8D9A8;
-        border-right: 1px solid #A8D9A8;
-        padding: 6px 0px 6px 0px;
-        color: #255525;
-        font-weight: bold;
-        text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.9);
-        /* opera specific markup */
-        box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15);
-        border-top-right-radius: 8px;
-        border-top-left-radius: 8px;
-        /* firefox specific markup */
-        -moz-box-shadow: rgba(0, 0, 0, 0.15) 5px 5px 5px;
-        -moz-border-radius-topright: 8px;
-        -moz-border-radius-topleft: 8px;
-        /* webkit specific markup */
-        -webkit-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15);
-        -webkit-border-top-right-radius: 8px;
-        -webkit-border-top-left-radius: 8px;
-        background-image:url('nav_f.png');
-        background-repeat:repeat-x;
-        background-color: #E2F2E2;
-
-}
-
-.memdoc, dl.reflist dd {
-        border-bottom: 1px solid #A8D9A8;
-        border-left: 1px solid #A8D9A8;
-        border-right: 1px solid #A8D9A8;
-        padding: 2px 5px;
-        background-color: #FBFDFB;
-        border-top-width: 0;
-        /* opera specific markup */
-        border-bottom-left-radius: 8px;
-        border-bottom-right-radius: 8px;
-        box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15);
-        /* firefox specific markup */
-        -moz-border-radius-bottomleft: 8px;
-        -moz-border-radius-bottomright: 8px;
-        -moz-box-shadow: rgba(0, 0, 0, 0.15) 5px 5px 5px;
-        background-image: -moz-linear-gradient(center top, #FFFFFF 0%, #FFFFFF 60%, #F7FBF7 95%, #EEF7EE);
-        /* webkit specific markup */
-        -webkit-border-bottom-left-radius: 8px;
-        -webkit-border-bottom-right-radius: 8px;
-        -webkit-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15);
-        background-image: -webkit-gradient(linear,center top,center bottom,from(#FFFFFF), color-stop(0.6,#FFFFFF), color-stop(0.60,#FFFFFF), color-stop(0.95,#F7FBF7), to(#EEF7EE));
-}
-
-dl.reflist dt {
-        padding: 5px;
-}
-
-dl.reflist dd {
-        margin: 0px 0px 10px 0px;
-        padding: 5px;
-}
-
-.paramkey {
-    text-align: right;
-}
-
-.paramtype {
-    white-space: nowrap;
-}
-
-.paramname {
-    color: #602020;
-    white-space: nowrap;
-}
-.paramname em {
-    font-style: normal;
-}
-
-.params, .retval, .exception, .tparams {
-        border-spacing: 6px 2px;
-}
-
-.params .paramname, .retval .paramname {
-        font-weight: bold;
-        vertical-align: top;
-}
-
-.params .paramtype {
-        font-style: italic;
-        vertical-align: top;
-}
-
-.params .paramdir {
-        font-family: "courier new",courier,monospace;
-        vertical-align: top;
-}
-
-
-
-
-/* @end */
-
-/* @group Directory (tree) */
-
-/* for the tree view */
-
-.ftvtree {
-    font-family: sans-serif;
-    margin: 0px;
-}
-
-/* these are for tree view when used as main index */
-
-.directory {
-    font-size: 9pt;
-    font-weight: bold;
-    margin: 5px;
-}
-
-.directory h3 {
-    margin: 0px;
-    margin-top: 1em;
-    font-size: 11pt;
-}
-
-/*
-The following two styles can be used to replace the root node title
-with an image of your choice.  Simply uncomment the next two styles,
-specify the name of your image and be sure to set 'height' to the
-proper pixel height of your image.
-*/
-
-/*
-.directory h3.swap {
-    height: 61px;
-    background-repeat: no-repeat;
-    background-image: url("yourimage.gif");
-}
-.directory h3.swap span {
-    display: none;
-}
-*/
-
-.directory > h3 {
-    margin-top: 0;
-}
-
-.directory p {
-    margin: 0px;
-    white-space: nowrap;
-}
-
-.directory div {
-    display: none;
-    margin: 0px;
-}
-
-.directory img {
-    vertical-align: -30%;
-}
-
-/* these are for tree view when not used as main index */
-
-.directory-alt {
-    font-size: 100%;
-    font-weight: bold;
-}
-
-.directory-alt h3 {
-    margin: 0px;
-    margin-top: 1em;
-    font-size: 11pt;
-}
-
-.directory-alt > h3 {
-    margin-top: 0;
-}
-
-.directory-alt p {
-    margin: 0px;
-    white-space: nowrap;
-}
-
-.directory-alt div {
-    display: none;
-    margin: 0px;
-}
-
-.directory-alt img {
-    vertical-align: -30%;
-}
-
-/* @end */
-
-div.dynheader {
-        margin-top: 8px;
-}
-
-address {
-    font-style: normal;
-    color: #2A612A;
-}
-
-table.doxtable {
-    border-collapse:collapse;
-}
-
-table.doxtable td, table.doxtable th {
-    border: 1px solid #2D682D;
-    padding: 3px 7px 2px;
-}
-
-table.doxtable th {
-    background-color: #377F37;
-    color: #FFFFFF;
-    font-size: 110%;
-    padding-bottom: 4px;
-    padding-top: 5px;
-    text-align:left;
-}
-
-table.fieldtable {
-        width: 100%;
-        margin-bottom: 10px;
-        border: 1px solid #A8D9A8;
-        border-spacing: 0px;
-        -moz-border-radius: 4px;
-        -webkit-border-radius: 4px;
-        border-radius: 4px;
-        -moz-box-shadow: rgba(0, 0, 0, 0.15) 2px 2px 2px;
-        -webkit-box-shadow: 2px 2px 2px rgba(0, 0, 0, 0.15);
-        box-shadow: 2px 2px 2px rgba(0, 0, 0, 0.15);
-}
-
-.fieldtable td, .fieldtable th {
-        padding: 3px 7px 2px;
-}
-
-.fieldtable td.fieldtype, .fieldtable td.fieldname {
-        white-space: nowrap;
-        border-right: 1px solid #A8D9A8;
-        border-bottom: 1px solid #A8D9A8;
-        vertical-align: top;
-}
-
-.fieldtable td.fielddoc {
-        border-bottom: 1px solid #A8D9A8;
-        width: 100%;
-}
-
-.fieldtable tr:last-child td {
-        border-bottom: none;
-}
-
-.fieldtable th {
-        background-image:url('nav_f.png');
-        background-repeat:repeat-x;
-        background-color: #E2F2E2;
-        font-size: 90%;
-        color: #255525;
-        padding-bottom: 4px;
-        padding-top: 5px;
-        text-align:left;
-        -moz-border-radius-topleft: 4px;
-        -moz-border-radius-topright: 4px;
-        -webkit-border-top-left-radius: 4px;
-        -webkit-border-top-right-radius: 4px;
-        border-top-left-radius: 4px;
-        border-top-right-radius: 4px;
-        border-bottom: 1px solid #A8D9A8;
-}
-
-
-.tabsearch {
-    top: 0px;
-    left: 10px;
-    height: 36px;
-    background-image: url('tab_b.png');
-    z-index: 101;
-    overflow: hidden;
-    font-size: 13px;
-}
-
-.tablistpath ul
-{
-    font-size: 11px;
-    background-image:url('tab_b.png');
-    background-repeat:repeat-x;
-    height:30px;
-    line-height:30px;
-    color:#8ACC8A;
-    border:solid 1px #C2E4C2;
-    overflow:hidden;
-    margin:0px;
-    padding:0px;
-}
-
-.tablistpath li
-{
-    list-style-type:none;
-    float:left;
-    padding-left:10px;
-    padding-right:15px;
-    background-image:url('bc_s.png');
-    background-repeat:no-repeat;
-    background-position:right;
-    color:#367C36;
-}
-
-.tablistpath li.tablistelem a
-{
-    height:32px;
-    display:block;
-    text-decoration: none;
-    outline: none;
-}
-
-.tablistpath li.tablistelem a:hover
-{
-    color:#68BD68;
-}
-
-.tablistpath li.footer
-{
-        list-style-type:none;
-        float:right;
-        padding-left:10px;
-        padding-right:15px;
-        background-image:none;
-        background-repeat:no-repeat;
-        background-position:right;
-        color:#367C36;
-        font-size: 8pt;
-}
-
-
-div.summary
-{
-    margin-top: 12px;
-    text-align: center;
-}
-
-div.summary a
-{
-    white-space: nowrap;
-}
-
-div.ingroups
-{
-    margin-left: 5px;
-    font-size: 8pt;
-    padding-left: 5px;
-    width: 50%;
-    text-align: left;
-}
-
-div.ingroups a
-{
-    white-space: nowrap;
-}
-
-div.headertitle
-{
-    padding: 5px 5px 5px 7px;
-}
-
-dl
-{
-        padding: 0 0 0 10px;
-}
-
-dl.note, dl.warning, dl.attention, dl.pre, dl.post, dl.invariant, dl.deprecated, dl.todo, dl.test, dl.bug
-{
-        border-left:4px solid;
-        padding: 0 0 0 6px;
-}
-
-dl.note
-{
-        border-color: #D0C000;
-}
-
-dl.warning, dl.attention
-{
-        border-color: #FF0000;
-}
-
-dl.pre, dl.post, dl.invariant
-{
-        border-color: #00D000;
-}
-
-dl.deprecated
-{
-        border-color: #505050;
-}
-
-dl.todo
-{
-        border-color: #00C0E0;
-}
-
-dl.test
-{
-        border-color: #3030E0;
-}
-
-dl.bug
-{
-        border-color: #C08050;
-}
-
-#projectlogo
-{
-    text-align: center;
-    vertical-align: bottom;
-    border-collapse: separate;
-}
-
-#projectlogo img
-{
-    border: 0px none;
-}
-
-#projectname
-{
-    font: 300% Tahoma, Arial,sans-serif;
-    margin: 0px;
-    padding: 2px 0px;
-}
-
-#projectbrief
-{
-    font: 120% Tahoma, Arial,sans-serif;
-    margin: 0px;
-    padding: 0px;
-}
-
-#projectnumber
-{
-    font: 50% Tahoma, Arial,sans-serif;
-    margin: 0px;
-    padding: 0px;
-}
-
-#titlearea
-{
-    padding: 0px;
-    margin: 0px;
-    width: 100%;
-    border-bottom: 1px solid #53B453;
-}
-
-.image
-{
-        text-align: center;
-}
-
-.dotgraph
-{
-        text-align: center;
-}
-
-.mscgraph
-{
-        text-align: center;
-}
-
-.caption
-{
-    font-weight: bold;
-}
-
-div.zoom
-{
-    border: 1px solid #90CE90;
-}
-
-dl.citelist {
-        margin-bottom:50px;
-}
-
-dl.citelist dt {
-        color:#337533;
-        float:left;
-        font-weight:bold;
-        margin-right:10px;
-        padding:5px;
-}
-
-dl.citelist dd {
-        margin:2px 0;
-        padding:5px 0;
-}
-
-@media print
-{
-  #top { display: none; }
-  #side-nav { display: none; }
-  #nav-path { display: none; }
-  body { overflow:visible; }
-  h1, h2, h3, h4, h5, h6 { page-break-after: avoid; }
-  .summary { display: none; }
-  .memitem { page-break-inside: avoid; }
-  #doc-content
-  {
-    margin-left:0 !important;
-    height:auto !important;
-    width:auto !important;
-    overflow:inherit;
-    display:inline;
-  }
-  pre.fragment
-  {
-    overflow: visible;
-    text-wrap: unrestricted;
-    white-space: -moz-pre-wrap; /* Moz */
-    white-space: -pre-wrap; /* Opera 4-6 */
-    white-space: -o-pre-wrap; /* Opera 7 */
-    white-space: pre-wrap; /* CSS3  */
-    word-wrap: break-word; /* IE 5.5+ */
-  }
-}
-
-#proj_desc {
-    font-size: 1.2em;
-}

omxplayer-2014.02.11.tar.gz/ffmpeg/doc/doxy/footer.html Deleted

omxplayer-2014.02.11.tar.gz/ffmpeg/doc/doxy/header.html Deleted

omxplayer-2014.02.11.tar.gz/ffmpeg/doc/examples/decoding_encoding.c Deleted

@@ -1,650 +0,0 @@
-/*
- * Copyright (c) 2001 Fabrice Bellard
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-/**
- * @file
- * libavcodec API use example.
- *
- * Note that libavcodec only handles codecs (mpeg, mpeg4, etc...),
- * not file formats (avi, vob, mp4, mov, mkv, mxf, flv, mpegts, mpegps, etc...). See library 'libavformat' for the
- * format handling
- * @example doc/examples/decoding_encoding.c
- */
-
-#include <math.h>
-
-#include <libavutil/opt.h>
-#include <libavcodec/avcodec.h>
-#include <libavutil/channel_layout.h>
-#include <libavutil/common.h>
-#include <libavutil/imgutils.h>
-#include <libavutil/mathematics.h>
-#include <libavutil/samplefmt.h>
-
-#define INBUF_SIZE 4096
-#define AUDIO_INBUF_SIZE 20480
-#define AUDIO_REFILL_THRESH 4096
-
-/* check that a given sample format is supported by the encoder */
-static int check_sample_fmt(AVCodec *codec, enum AVSampleFormat sample_fmt)
-{
-    const enum AVSampleFormat *p = codec->sample_fmts;
-
-    while (*p != AV_SAMPLE_FMT_NONE) {
-        if (*p == sample_fmt)
-            return 1;
-        p++;
-    }
-    return 0;
-}
-
-/* just pick the highest supported samplerate */
-static int select_sample_rate(AVCodec *codec)
-{
-    const int *p;
-    int best_samplerate = 0;
-
-    if (!codec->supported_samplerates)
-        return 44100;
-
-    p = codec->supported_samplerates;
-    while (*p) {
-        best_samplerate = FFMAX(*p, best_samplerate);
-        p++;
-    }
-    return best_samplerate;
-}
-
-/* select layout with the highest channel count */
-static int select_channel_layout(AVCodec *codec)
-{
-    const uint64_t *p;
-    uint64_t best_ch_layout = 0;
-    int best_nb_channels   = 0;
-
-    if (!codec->channel_layouts)
-        return AV_CH_LAYOUT_STEREO;
-
-    p = codec->channel_layouts;
-    while (*p) {
-        int nb_channels = av_get_channel_layout_nb_channels(*p);
-
-        if (nb_channels > best_nb_channels) {
-            best_ch_layout    = *p;
-            best_nb_channels = nb_channels;
-        }
-        p++;
-    }
-    return best_ch_layout;
-}
-
-/*
- * Audio encoding example
- */
-static void audio_encode_example(const char *filename)
-{
-    AVCodec *codec;
-    AVCodecContext *c= NULL;
-    AVFrame *frame;
-    AVPacket pkt;
-    int i, j, k, ret, got_output;
-    int buffer_size;
-    FILE *f;
-    uint16_t *samples;
-    float t, tincr;
-
-    printf("Encode audio file %s\n", filename);
-
-    /* find the MP2 encoder */
-    codec = avcodec_find_encoder(AV_CODEC_ID_MP2);
-    if (!codec) {
-        fprintf(stderr, "Codec not found\n");
-        exit(1);
-    }
-
-    c = avcodec_alloc_context3(codec);
-    if (!c) {
-        fprintf(stderr, "Could not allocate audio codec context\n");
-        exit(1);
-    }
-
-    /* put sample parameters */
-    c->bit_rate = 64000;
-
-    /* check that the encoder supports s16 pcm input */
-    c->sample_fmt = AV_SAMPLE_FMT_S16;
-    if (!check_sample_fmt(codec, c->sample_fmt)) {
-        fprintf(stderr, "Encoder does not support sample format %s",
-                av_get_sample_fmt_name(c->sample_fmt));
-        exit(1);
-    }
-
-    /* select other audio parameters supported by the encoder */
-    c->sample_rate    = select_sample_rate(codec);
-    c->channel_layout = select_channel_layout(codec);
-    c->channels       = av_get_channel_layout_nb_channels(c->channel_layout);
-
-    /* open it */
-    if (avcodec_open2(c, codec, NULL) < 0) {
-        fprintf(stderr, "Could not open codec\n");
-        exit(1);
-    }
-
-    f = fopen(filename, "wb");
-    if (!f) {
-        fprintf(stderr, "Could not open %s\n", filename);
-        exit(1);
-    }
-
-    /* frame containing input raw audio */
-    frame = avcodec_alloc_frame();
-    if (!frame) {
-        fprintf(stderr, "Could not allocate audio frame\n");
-        exit(1);
-    }
-
-    frame->nb_samples     = c->frame_size;
-    frame->format         = c->sample_fmt;
-    frame->channel_layout = c->channel_layout;
-
-    /* the codec gives us the frame size, in samples,
-     * we calculate the size of the samples buffer in bytes */
-    buffer_size = av_samples_get_buffer_size(NULL, c->channels, c->frame_size,
-                                             c->sample_fmt, 0);
-    samples = av_malloc(buffer_size);
-    if (!samples) {
-        fprintf(stderr, "Could not allocate %d bytes for samples buffer\n",
-                buffer_size);
-        exit(1);
-    }
-    /* setup the data pointers in the AVFrame */
-    ret = avcodec_fill_audio_frame(frame, c->channels, c->sample_fmt,
-                                   (const uint8_t*)samples, buffer_size, 0);
-    if (ret < 0) {
-        fprintf(stderr, "Could not setup audio frame\n");
-        exit(1);
-    }
-
-    /* encode a single tone sound */
-    t = 0;
-    tincr = 2 * M_PI * 440.0 / c->sample_rate;
-    for(i=0;i<200;i++) {
-        av_init_packet(&pkt);
-        pkt.data = NULL; // packet data will be allocated by the encoder
-        pkt.size = 0;
-
-        for (j = 0; j < c->frame_size; j++) {
-            samples[2*j] = (int)(sin(t) * 10000);
-
-            for (k = 1; k < c->channels; k++)
-                samples[2*j + k] = samples[2*j];
-            t += tincr;
-        }
-        /* encode the samples */
-        ret = avcodec_encode_audio2(c, &pkt, frame, &got_output);
-        if (ret < 0) {
-            fprintf(stderr, "Error encoding audio frame\n");
-            exit(1);
-        }
-        if (got_output) {
-            fwrite(pkt.data, 1, pkt.size, f);
-            av_free_packet(&pkt);
-        }
-    }
-
-    /* get the delayed frames */
-    for (got_output = 1; got_output; i++) {
-        ret = avcodec_encode_audio2(c, &pkt, NULL, &got_output);
-        if (ret < 0) {
-            fprintf(stderr, "Error encoding frame\n");
-            exit(1);
-        }
-
-        if (got_output) {
-            fwrite(pkt.data, 1, pkt.size, f);
-            av_free_packet(&pkt);
-        }
-    }
-    fclose(f);
-
-    av_freep(&samples);
-    avcodec_free_frame(&frame);
-    avcodec_close(c);
-    av_free(c);
-}
-
-/*
- * Audio decoding.
- */
-static void audio_decode_example(const char *outfilename, const char *filename)
-{
-    AVCodec *codec;
-    AVCodecContext *c= NULL;
-    int len;
-    FILE *f, *outfile;
-    uint8_t inbuf[AUDIO_INBUF_SIZE + FF_INPUT_BUFFER_PADDING_SIZE];
-    AVPacket avpkt;
-    AVFrame *decoded_frame = NULL;
-
-    av_init_packet(&avpkt);
-
-    printf("Decode audio file %s to %s\n", filename, outfilename);
-
-    /* find the mpeg audio decoder */
-    codec = avcodec_find_decoder(AV_CODEC_ID_MP2);
-    if (!codec) {
-        fprintf(stderr, "Codec not found\n");
-        exit(1);
-    }
-
-    c = avcodec_alloc_context3(codec);
-    if (!c) {
-        fprintf(stderr, "Could not allocate audio codec context\n");
-        exit(1);
-    }
-
-    /* open it */
-    if (avcodec_open2(c, codec, NULL) < 0) {
-        fprintf(stderr, "Could not open codec\n");
-        exit(1);
-    }
-
-    f = fopen(filename, "rb");
-    if (!f) {
-        fprintf(stderr, "Could not open %s\n", filename);
-        exit(1);
-    }
-    outfile = fopen(outfilename, "wb");
-    if (!outfile) {
-        av_free(c);
-        exit(1);
-    }
-
-    /* decode until eof */
-    avpkt.data = inbuf;
-    avpkt.size = fread(inbuf, 1, AUDIO_INBUF_SIZE, f);
-
-    while (avpkt.size > 0) {
-        int got_frame = 0;
-
-        if (!decoded_frame) {
-            if (!(decoded_frame = avcodec_alloc_frame())) {
-                fprintf(stderr, "Could not allocate audio frame\n");
-                exit(1);
-            }
-        } else
-            avcodec_get_frame_defaults(decoded_frame);
-
-        len = avcodec_decode_audio4(c, decoded_frame, &got_frame, &avpkt);
-        if (len < 0) {
-            fprintf(stderr, "Error while decoding\n");
-            exit(1);
-        }
-        if (got_frame) {
-            /* if a frame has been decoded, output it */
-            int data_size = av_samples_get_buffer_size(NULL, c->channels,
-                                                       decoded_frame->nb_samples,
-                                                       c->sample_fmt, 1);
-            fwrite(decoded_frame->data[0], 1, data_size, outfile);
-        }
-        avpkt.size -= len;
-        avpkt.data += len;
-        avpkt.dts =
-        avpkt.pts = AV_NOPTS_VALUE;
-        if (avpkt.size < AUDIO_REFILL_THRESH) {
-            /* Refill the input buffer, to avoid trying to decode
-             * incomplete frames. Instead of this, one could also use
-             * a parser, or use a proper container format through
-             * libavformat. */
-            memmove(inbuf, avpkt.data, avpkt.size);
-            avpkt.data = inbuf;
-            len = fread(avpkt.data + avpkt.size, 1,
-                        AUDIO_INBUF_SIZE - avpkt.size, f);
-            if (len > 0)
-                avpkt.size += len;
-        }
-    }
-
-    fclose(outfile);
-    fclose(f);
-
-    avcodec_close(c);
-    av_free(c);
-    avcodec_free_frame(&decoded_frame);
-}
-
-/*
- * Video encoding example
- */
-static void video_encode_example(const char *filename, int codec_id)
-{
-    AVCodec *codec;
-    AVCodecContext *c= NULL;
-    int i, ret, x, y, got_output;
-    FILE *f;
-    AVFrame *frame;
-    AVPacket pkt;
-    uint8_t endcode[] = { 0, 0, 1, 0xb7 };
-
-    printf("Encode video file %s\n", filename);
-
-    /* find the mpeg1 video encoder */
-    codec = avcodec_find_encoder(codec_id);
-    if (!codec) {
-        fprintf(stderr, "Codec not found\n");
-        exit(1);
-    }
-
-    c = avcodec_alloc_context3(codec);
-    if (!c) {
-        fprintf(stderr, "Could not allocate video codec context\n");
-        exit(1);
-    }
-
-    /* put sample parameters */
-    c->bit_rate = 400000;
-    /* resolution must be a multiple of two */
-    c->width = 352;
-    c->height = 288;
-    /* frames per second */
-    c->time_base= (AVRational){1,25};
-    c->gop_size = 10; /* emit one intra frame every ten frames */
-    c->max_b_frames=1;
-    c->pix_fmt = AV_PIX_FMT_YUV420P;
-
-    if(codec_id == AV_CODEC_ID_H264)
-        av_opt_set(c->priv_data, "preset", "slow", 0);
-
-    /* open it */
-    if (avcodec_open2(c, codec, NULL) < 0) {
-        fprintf(stderr, "Could not open codec\n");
-        exit(1);
-    }
-
-    f = fopen(filename, "wb");
-    if (!f) {
-        fprintf(stderr, "Could not open %s\n", filename);
-        exit(1);
-    }
-
-    frame = avcodec_alloc_frame();
-    if (!frame) {
-        fprintf(stderr, "Could not allocate video frame\n");
-        exit(1);
-    }
-    frame->format = c->pix_fmt;
-    frame->width  = c->width;
-    frame->height = c->height;
-
-    /* the image can be allocated by any means and av_image_alloc() is
-     * just the most convenient way if av_malloc() is to be used */
-    ret = av_image_alloc(frame->data, frame->linesize, c->width, c->height,
-                         c->pix_fmt, 32);
-    if (ret < 0) {
-        fprintf(stderr, "Could not allocate raw picture buffer\n");
-        exit(1);
-    }
-
-    /* encode 1 second of video */
-    for(i=0;i<25;i++) {
-        av_init_packet(&pkt);
-        pkt.data = NULL;    // packet data will be allocated by the encoder
-        pkt.size = 0;
-
-        fflush(stdout);
-        /* prepare a dummy image */
-        /* Y */
-        for(y=0;y<c->height;y++) {
-            for(x=0;x<c->width;x++) {
-                frame->data[0][y * frame->linesize[0] + x] = x + y + i * 3;
-            }
-        }
-
-        /* Cb and Cr */
-        for(y=0;y<c->height/2;y++) {
-            for(x=0;x<c->width/2;x++) {
-                frame->data[1][y * frame->linesize[1] + x] = 128 + y + i * 2;
-                frame->data[2][y * frame->linesize[2] + x] = 64 + x + i * 5;
-            }
-        }
-
-        frame->pts = i;
-
-        /* encode the image */
-        ret = avcodec_encode_video2(c, &pkt, frame, &got_output);
-        if (ret < 0) {
-            fprintf(stderr, "Error encoding frame\n");
-            exit(1);
-        }
-
-        if (got_output) {
-            printf("Write frame %3d (size=%5d)\n", i, pkt.size);
-            fwrite(pkt.data, 1, pkt.size, f);
-            av_free_packet(&pkt);
-        }
-    }
-
-    /* get the delayed frames */
-    for (got_output = 1; got_output; i++) {
-        fflush(stdout);
-
-        ret = avcodec_encode_video2(c, &pkt, NULL, &got_output);
-        if (ret < 0) {
-            fprintf(stderr, "Error encoding frame\n");
-            exit(1);
-        }
-
-        if (got_output) {
-            printf("Write frame %3d (size=%5d)\n", i, pkt.size);
-            fwrite(pkt.data, 1, pkt.size, f);
-            av_free_packet(&pkt);
-        }
-    }
-
-    /* add sequence end code to have a real mpeg file */
-    fwrite(endcode, 1, sizeof(endcode), f);
-    fclose(f);
-
-    avcodec_close(c);
-    av_free(c);
-    av_freep(&frame->data[0]);
-    avcodec_free_frame(&frame);
-    printf("\n");
-}
-
-/*
- * Video decoding example
- */
-
-static void pgm_save(unsigned char *buf, int wrap, int xsize, int ysize,
-                     char *filename)
-{
-    FILE *f;
-    int i;
-
-    f=fopen(filename,"w");
-    fprintf(f,"P5\n%d %d\n%d\n",xsize,ysize,255);
-    for(i=0;i<ysize;i++)
-        fwrite(buf + i * wrap,1,xsize,f);
-    fclose(f);
-}
-
-static int decode_write_frame(const char *outfilename, AVCodecContext *avctx,
-                              AVFrame *frame, int *frame_count, AVPacket *pkt, int last)
-{
-    int len, got_frame;
-    char buf[1024];
-
-    len = avcodec_decode_video2(avctx, frame, &got_frame, pkt);
-    if (len < 0) {
-        fprintf(stderr, "Error while decoding frame %d\n", *frame_count);
-        return len;
-    }
-    if (got_frame) {
-        printf("Saving %sframe %3d\n", last ? "last " : "", *frame_count);
-        fflush(stdout);
-
-        /* the picture is allocated by the decoder, no need to free it */
-        snprintf(buf, sizeof(buf), outfilename, *frame_count);
-        pgm_save(frame->data[0], frame->linesize[0],
-                 avctx->width, avctx->height, buf);
-        (*frame_count)++;
-    }
-    if (pkt->data) {
-        pkt->size -= len;
-        pkt->data += len;
-    }
-    return 0;
-}
-
-static void video_decode_example(const char *outfilename, const char *filename)
-{
-    AVCodec *codec;
-    AVCodecContext *c= NULL;
-    int frame_count;
-    FILE *f;
-    AVFrame *frame;
-    uint8_t inbuf[INBUF_SIZE + FF_INPUT_BUFFER_PADDING_SIZE];
-    AVPacket avpkt;
-
-    av_init_packet(&avpkt);
-
-    /* set end of buffer to 0 (this ensures that no overreading happens for damaged mpeg streams) */
-    memset(inbuf + INBUF_SIZE, 0, FF_INPUT_BUFFER_PADDING_SIZE);
-
-    printf("Decode video file %s to %s\n", filename, outfilename);
-
-    /* find the mpeg1 video decoder */
-    codec = avcodec_find_decoder(AV_CODEC_ID_MPEG1VIDEO);
-    if (!codec) {
-        fprintf(stderr, "Codec not found\n");
-        exit(1);
-    }
-
-    c = avcodec_alloc_context3(codec);
-    if (!c) {
-        fprintf(stderr, "Could not allocate video codec context\n");
-        exit(1);
-    }
-
-    if(codec->capabilities&CODEC_CAP_TRUNCATED)
-        c->flags|= CODEC_FLAG_TRUNCATED; /* we do not send complete frames */
-
-    /* For some codecs, such as msmpeg4 and mpeg4, width and height
-       MUST be initialized there because this information is not
-       available in the bitstream. */
-
-    /* open it */
-    if (avcodec_open2(c, codec, NULL) < 0) {
-        fprintf(stderr, "Could not open codec\n");
-        exit(1);
-    }
-
-    f = fopen(filename, "rb");
-    if (!f) {
-        fprintf(stderr, "Could not open %s\n", filename);
-        exit(1);
-    }
-
-    frame = avcodec_alloc_frame();
-    if (!frame) {
-        fprintf(stderr, "Could not allocate video frame\n");
-        exit(1);
-    }
-
-    frame_count = 0;
-    for(;;) {
-        avpkt.size = fread(inbuf, 1, INBUF_SIZE, f);
-        if (avpkt.size == 0)
-            break;
-
-        /* NOTE1: some codecs are stream based (mpegvideo, mpegaudio)
-           and this is the only method to use them because you cannot
-           know the compressed data size before analysing it.
-
-           BUT some other codecs (msmpeg4, mpeg4) are inherently frame
-           based, so you must call them with all the data for one
-           frame exactly. You must also initialize 'width' and
-           'height' before initializing them. */
-
-        /* NOTE2: some codecs allow the raw parameters (frame size,
-           sample rate) to be changed at any frame. We handle this, so
-           you should also take care of it */
-
-        /* here, we use a stream based decoder (mpeg1video), so we
-           feed decoder and see if it could decode a frame */
-        avpkt.data = inbuf;
-        while (avpkt.size > 0)
-            if (decode_write_frame(outfilename, c, frame, &frame_count, &avpkt, 0) < 0)
-                exit(1);
-    }
-
-    /* some codecs, such as MPEG, transmit the I and P frame with a
-       latency of one frame. You must do the following to have a
-       chance to get the last frame of the video */
-    avpkt.data = NULL;
-    avpkt.size = 0;
-    decode_write_frame(outfilename, c, frame, &frame_count, &avpkt, 1);
-
-    fclose(f);
-
-    avcodec_close(c);
-    av_free(c);
-    avcodec_free_frame(&frame);
-    printf("\n");
-}
-
-int main(int argc, char **argv)
-{
-    const char *output_type;
-
-    /* register all the codecs */
-    avcodec_register_all();
-
-    if (argc < 2) {
-        printf("usage: %s output_type\n"
-               "API example program to decode/encode a media stream with libavcodec.\n"
-               "This program generates a synthetic stream and encodes it to a file\n"
-               "named test.h264, test.mp2 or test.mpg depending on output_type.\n"
-               "The encoded stream is then decoded and written to a raw data output.\n"
-               "output_type must be choosen between 'h264', 'mp2', 'mpg'.\n",
-               argv[0]);
-        return 1;
-    }
-    output_type = argv[1];
-
-    if (!strcmp(output_type, "h264")) {
-        video_encode_example("test.h264", AV_CODEC_ID_H264);
-    } else if (!strcmp(output_type, "mp2")) {
-        audio_encode_example("test.mp2");
-        audio_decode_example("test.sw", "test.mp2");
-    } else if (!strcmp(output_type, "mpg")) {
-        video_encode_example("test.mpg", AV_CODEC_ID_MPEG1VIDEO);
-        video_decode_example("test%02d.pgm", "test.mpg");
-    } else {
-        fprintf(stderr, "Invalid output type '%s', choose between 'h264', 'mp2', or 'mpg'\n",
-                output_type);
-        return 1;
-    }
-
-    return 0;
-}

omxplayer-2014.02.11.tar.gz/ffmpeg/doc/examples/demuxing.c Deleted

@@ -1,341 +0,0 @@
-/*
- * Copyright (c) 2012 Stefano Sabatini
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-/**
- * @file
- * libavformat demuxing API use example.
- *
- * Show how to use the libavformat and libavcodec API to demux and
- * decode audio and video data.
- * @example doc/examples/demuxing.c
- */
-
-#include <libavutil/imgutils.h>
-#include <libavutil/samplefmt.h>
-#include <libavutil/timestamp.h>
-#include <libavformat/avformat.h>
-
-static AVFormatContext *fmt_ctx = NULL;
-static AVCodecContext *video_dec_ctx = NULL, *audio_dec_ctx;
-static AVStream *video_stream = NULL, *audio_stream = NULL;
-static const char *src_filename = NULL;
-static const char *video_dst_filename = NULL;
-static const char *audio_dst_filename = NULL;
-static FILE *video_dst_file = NULL;
-static FILE *audio_dst_file = NULL;
-
-static uint8_t *video_dst_data[4] = {NULL};
-static int      video_dst_linesize[4];
-static int video_dst_bufsize;
-
-static int video_stream_idx = -1, audio_stream_idx = -1;
-static AVFrame *frame = NULL;
-static AVPacket pkt;
-static int video_frame_count = 0;
-static int audio_frame_count = 0;
-
-static int decode_packet(int *got_frame, int cached)
-{
-    int ret = 0;
-    int decoded = pkt.size;
-
-    if (pkt.stream_index == video_stream_idx) {
-        /* decode video frame */
-        ret = avcodec_decode_video2(video_dec_ctx, frame, got_frame, &pkt);
-        if (ret < 0) {
-            fprintf(stderr, "Error decoding video frame\n");
-            return ret;
-        }
-
-        if (*got_frame) {
-            printf("video_frame%s n:%d coded_n:%d pts:%s\n",
-                   cached ? "(cached)" : "",
-                   video_frame_count++, frame->coded_picture_number,
-                   av_ts2timestr(frame->pts, &video_dec_ctx->time_base));
-
-            /* copy decoded frame to destination buffer:
-             * this is required since rawvideo expects non aligned data */
-            av_image_copy(video_dst_data, video_dst_linesize,
-                          (const uint8_t **)(frame->data), frame->linesize,
-                          video_dec_ctx->pix_fmt, video_dec_ctx->width, video_dec_ctx->height);
-
-            /* write to rawvideo file */
-            fwrite(video_dst_data[0], 1, video_dst_bufsize, video_dst_file);
-        }
-    } else if (pkt.stream_index == audio_stream_idx) {
-        /* decode audio frame */
-        ret = avcodec_decode_audio4(audio_dec_ctx, frame, got_frame, &pkt);
-        if (ret < 0) {
-            fprintf(stderr, "Error decoding audio frame\n");
-            return ret;
-        }
-        /* Some audio decoders decode only part of the packet, and have to be
-         * called again with the remainder of the packet data.
-         * Sample: fate-suite/lossless-audio/luckynight-partial.shn
-         * Also, some decoders might over-read the packet. */
-        decoded = FFMIN(ret, pkt.size);
-
-        if (*got_frame) {
-            size_t unpadded_linesize = frame->nb_samples * av_get_bytes_per_sample(frame->format);
-            printf("audio_frame%s n:%d nb_samples:%d pts:%s\n",
-                   cached ? "(cached)" : "",
-                   audio_frame_count++, frame->nb_samples,
-                   av_ts2timestr(frame->pts, &audio_dec_ctx->time_base));
-
-            /* Write the raw audio data samples of the first plane. This works
-             * fine for packed formats (e.g. AV_SAMPLE_FMT_S16). However,
-             * most audio decoders output planar audio, which uses a separate
-             * plane of audio samples for each channel (e.g. AV_SAMPLE_FMT_S16P).
-             * In other words, this code will write only the first audio channel
-             * in these cases.
-             * You should use libswresample or libavfilter to convert the frame
-             * to packed data. */
-            fwrite(frame->extended_data[0], 1, unpadded_linesize, audio_dst_file);
-        }
-    }
-
-    return decoded;
-}
-
-static int open_codec_context(int *stream_idx,
-                              AVFormatContext *fmt_ctx, enum AVMediaType type)
-{
-    int ret;
-    AVStream *st;
-    AVCodecContext *dec_ctx = NULL;
-    AVCodec *dec = NULL;
-
-    ret = av_find_best_stream(fmt_ctx, type, -1, -1, NULL, 0);
-    if (ret < 0) {
-        fprintf(stderr, "Could not find %s stream in input file '%s'\n",
-                av_get_media_type_string(type), src_filename);
-        return ret;
-    } else {
-        *stream_idx = ret;
-        st = fmt_ctx->streams[*stream_idx];
-
-        /* find decoder for the stream */
-        dec_ctx = st->codec;
-        dec = avcodec_find_decoder(dec_ctx->codec_id);
-        if (!dec) {
-            fprintf(stderr, "Failed to find %s codec\n",
-                    av_get_media_type_string(type));
-            return ret;
-        }
-
-        if ((ret = avcodec_open2(dec_ctx, dec, NULL)) < 0) {
-            fprintf(stderr, "Failed to open %s codec\n",
-                    av_get_media_type_string(type));
-            return ret;
-        }
-    }
-
-    return 0;
-}
-
-static int get_format_from_sample_fmt(const char **fmt,
-                                      enum AVSampleFormat sample_fmt)
-{
-    int i;
-    struct sample_fmt_entry {
-        enum AVSampleFormat sample_fmt; const char *fmt_be, *fmt_le;
-    } sample_fmt_entries[] = {
-        { AV_SAMPLE_FMT_U8,  "u8",    "u8"    },
-        { AV_SAMPLE_FMT_S16, "s16be", "s16le" },
-        { AV_SAMPLE_FMT_S32, "s32be", "s32le" },
-        { AV_SAMPLE_FMT_FLT, "f32be", "f32le" },
-        { AV_SAMPLE_FMT_DBL, "f64be", "f64le" },
-    };
-    *fmt = NULL;
-
-    for (i = 0; i < FF_ARRAY_ELEMS(sample_fmt_entries); i++) {
-        struct sample_fmt_entry *entry = &sample_fmt_entries[i];
-        if (sample_fmt == entry->sample_fmt) {
-            *fmt = AV_NE(entry->fmt_be, entry->fmt_le);
-            return 0;
-        }
-    }
-
-    fprintf(stderr,
-            "sample format %s is not supported as output format\n",
-            av_get_sample_fmt_name(sample_fmt));
-    return -1;
-}
-
-int main (int argc, char **argv)
-{
-    int ret = 0, got_frame;
-
-    if (argc != 4) {
-        fprintf(stderr, "usage: %s input_file video_output_file audio_output_file\n"
-                "API example program to show how to read frames from an input file.\n"
-                "This program reads frames from a file, decodes them, and writes decoded\n"
-                "video frames to a rawvideo file named video_output_file, and decoded\n"
-                "audio frames to a rawaudio file named audio_output_file.\n"
-                "\n", argv[0]);
-        exit(1);
-    }
-    src_filename = argv[1];
-    video_dst_filename = argv[2];
-    audio_dst_filename = argv[3];
-
-    /* register all formats and codecs */
-    av_register_all();
-
-    /* open input file, and allocate format context */
-    if (avformat_open_input(&fmt_ctx, src_filename, NULL, NULL) < 0) {
-        fprintf(stderr, "Could not open source file %s\n", src_filename);
-        exit(1);
-    }
-
-    /* retrieve stream information */
-    if (avformat_find_stream_info(fmt_ctx, NULL) < 0) {
-        fprintf(stderr, "Could not find stream information\n");
-        exit(1);
-    }
-
-    if (open_codec_context(&video_stream_idx, fmt_ctx, AVMEDIA_TYPE_VIDEO) >= 0) {
-        video_stream = fmt_ctx->streams[video_stream_idx];
-        video_dec_ctx = video_stream->codec;
-
-        video_dst_file = fopen(video_dst_filename, "wb");
-        if (!video_dst_file) {
-            fprintf(stderr, "Could not open destination file %s\n", video_dst_filename);
-            ret = 1;
-            goto end;
-        }
-
-        /* allocate image where the decoded image will be put */
-        ret = av_image_alloc(video_dst_data, video_dst_linesize,
-                             video_dec_ctx->width, video_dec_ctx->height,
-                             video_dec_ctx->pix_fmt, 1);
-        if (ret < 0) {
-            fprintf(stderr, "Could not allocate raw video buffer\n");
-            goto end;
-        }
-        video_dst_bufsize = ret;
-    }
-
-    if (open_codec_context(&audio_stream_idx, fmt_ctx, AVMEDIA_TYPE_AUDIO) >= 0) {
-        audio_stream = fmt_ctx->streams[audio_stream_idx];
-        audio_dec_ctx = audio_stream->codec;
-        audio_dst_file = fopen(audio_dst_filename, "wb");
-        if (!audio_dst_file) {
-            fprintf(stderr, "Could not open destination file %s\n", video_dst_filename);
-            ret = 1;
-            goto end;
-        }
-    }
-
-    /* dump input information to stderr */
-    av_dump_format(fmt_ctx, 0, src_filename, 0);
-
-    if (!audio_stream && !video_stream) {
-        fprintf(stderr, "Could not find audio or video stream in the input, aborting\n");
-        ret = 1;
-        goto end;
-    }
-
-    frame = avcodec_alloc_frame();
-    if (!frame) {
-        fprintf(stderr, "Could not allocate frame\n");
-        ret = AVERROR(ENOMEM);
-        goto end;
-    }
-
-    /* initialize packet, set data to NULL, let the demuxer fill it */
-    av_init_packet(&pkt);
-    pkt.data = NULL;
-    pkt.size = 0;
-
-    if (video_stream)
-        printf("Demuxing video from file '%s' into '%s'\n", src_filename, video_dst_filename);
-    if (audio_stream)
-        printf("Demuxing audio from file '%s' into '%s'\n", src_filename, audio_dst_filename);
-
-    /* read frames from the file */
-    while (av_read_frame(fmt_ctx, &pkt) >= 0) {
-        AVPacket orig_pkt = pkt;
-        do {
-            ret = decode_packet(&got_frame, 0);
-            if (ret < 0)
-                break;
-            pkt.data += ret;
-            pkt.size -= ret;
-        } while (pkt.size > 0);
-        av_free_packet(&orig_pkt);
-    }
-
-    /* flush cached frames */
-    pkt.data = NULL;
-    pkt.size = 0;
-    do {
-        decode_packet(&got_frame, 1);
-    } while (got_frame);
-
-    printf("Demuxing succeeded.\n");
-
-    if (video_stream) {
-        printf("Play the output video file with the command:\n"
-               "ffplay -f rawvideo -pix_fmt %s -video_size %dx%d %s\n",
-               av_get_pix_fmt_name(video_dec_ctx->pix_fmt), video_dec_ctx->width, video_dec_ctx->height,
-               video_dst_filename);
-    }
-
-    if (audio_stream) {
-        enum AVSampleFormat sfmt = audio_dec_ctx->sample_fmt;
-        int n_channels = audio_dec_ctx->channels;
-        const char *fmt;
-
-        if (av_sample_fmt_is_planar(sfmt)) {
-            const char *packed = av_get_sample_fmt_name(sfmt);
-            printf("Warning: the sample format the decoder produced is planar "
-                   "(%s). This example will output the first channel only.\n",
-                   packed ? packed : "?");
-            sfmt = av_get_packed_sample_fmt(sfmt);
-            n_channels = 1;
-        }
-
-        if ((ret = get_format_from_sample_fmt(&fmt, sfmt)) < 0)
-            goto end;
-
-        printf("Play the output audio file with the command:\n"
-               "ffplay -f %s -ac %d -ar %d %s\n",
-               fmt, n_channels, audio_dec_ctx->sample_rate,
-               audio_dst_filename);
-    }
-
-end:
-    if (video_dec_ctx)
-        avcodec_close(video_dec_ctx);
-    if (audio_dec_ctx)
-        avcodec_close(audio_dec_ctx);
-    avformat_close_input(&fmt_ctx);
-    if (video_dst_file)
-        fclose(video_dst_file);
-    if (audio_dst_file)
-        fclose(audio_dst_file);
-    av_free(frame);
-    av_free(video_dst_data[0]);
-
-    return ret < 0;
-}

omxplayer-2014.02.11.tar.gz/ffmpeg/doc/git-howto.txt Deleted

@@ -1,273 +0,0 @@
-
-About Git write access:
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Before everything else, you should know how to use GIT properly.
-Luckily Git comes with excellent documentation.
-
-  git --help
-  man git
-
-shows you the available subcommands,
-
-  git <command> --help
-  man git-<command>
-
-shows information about the subcommand <command>.
-
-The most comprehensive manual is the website Git Reference
-
-http://gitref.org/
-
-For more information about the Git project, visit
-
-http://git-scm.com/
-
-Consult these resources whenever you have problems, they are quite exhaustive.
-
-You do not need a special username or password.
-All you need is to provide a ssh public key to the Git server admin.
-
-What follows now is a basic introduction to Git and some FFmpeg-specific
-guidelines. Read it at least once, if you are granted commit privileges to the
-FFmpeg project you are expected to be familiar with these rules.
-
-
-
-I. BASICS:
-==========
-
-0. Get GIT:
-
-  Most distributions have a git package, if not
-  You can get git from http://git-scm.com/
-
-
-1. Cloning the source tree:
-
-    git clone git://source.ffmpeg.org/ffmpeg <target>
-
-  This will put the FFmpeg sources into the directory <target>.
-
-    git clone git@source.ffmpeg.org:ffmpeg <target>
-
-  This will put the FFmpeg sources into the directory <target> and let
-  you push back your changes to the remote repository.
-
-
-2. Updating the source tree to the latest revision:
-
-    git pull (--ff-only)
-
-  pulls in the latest changes from the tracked branch. The tracked branch
-  can be remote. By default the master branch tracks the branch master in
-  the remote origin.
-  Caveat: Since merge commits are forbidden at least for the initial
-          months of git --ff-only or --rebase (see below) are recommended.
-          --ff-only will fail and not create merge commits if your branch
-          has diverged (has a different history) from the tracked branch.
-
-2.a Rebasing your local branches:
-
-    git pull --rebase
-
-  fetches the changes from the main repository and replays your local commits
-  over it. This is required to keep all your local changes at the top of
-  FFmpeg's master tree. The master tree will reject pushes with merge commits.
-
-
-3. Adding/removing files/directories:
-
-    git add [-A] <filename/dirname>
-    git rm [-r] <filename/dirname>
-
-  GIT needs to get notified of all changes you make to your working
-  directory that makes files appear or disappear.
-  Line moves across files are automatically tracked.
-
-
-4. Showing modifications:
-
-    git diff <filename(s)>
-
-  will show all local modifications in your working directory as unified diff.
-
-
-5. Inspecting the changelog:
-
-    git log <filename(s)>
-
-  You may also use the graphical tools like gitview or gitk or the web
-  interface available at http://source.ffmpeg.org
-
-6. Checking source tree status:
-
-    git status
-
-  detects all the changes you made and lists what actions will be taken in case
-  of a commit (additions, modifications, deletions, etc.).
-
-
-7. Committing:
-
-    git diff --check
-
-  to double check your changes before committing them to avoid trouble later
-  on. All experienced developers do this on each and every commit, no matter
-  how small.
-  Every one of them has been saved from looking like a fool by this many times.
-  It's very easy for stray debug output or cosmetic modifications to slip in,
-  please avoid problems through this extra level of scrutiny.
-
-  For cosmetics-only commits you should get (almost) empty output from
-
-    git diff -w -b <filename(s)>
-
-  Also check the output of
-
-    git status
-
-  to make sure you don't have untracked files or deletions.
-
-    git add [-i|-p|-A] <filenames/dirnames>
-
-  Make sure you have told git your name and email address, e.g. by running
-    git config --global user.name "My Name"
-    git config --global user.email my@email.invalid
-  (--global to set the global configuration for all your git checkouts).
-
-  Git will select the changes to the files for commit. Optionally you can use
-  the interactive or the patch mode to select hunk by hunk what should be
-  added to the commit.
-
-    git commit
-
-  Git will commit the selected changes to your current local branch.
-
-  You will be prompted for a log message in an editor, which is either
-  set in your personal configuration file through
-
-    git config core.editor
-
-  or set by one of the following environment variables:
-  GIT_EDITOR, VISUAL or EDITOR.
-
-  Log messages should be concise but descriptive. Explain why you made a change,
-  what you did will be obvious from the changes themselves most of the time.
-  Saying just "bug fix" or "10l" is bad. Remember that people of varying skill
-  levels look at and educate themselves while reading through your code. Don't
-  include filenames in log messages, Git provides that information.
-
-  Possibly make the commit message have a terse, descriptive first line, an
-  empty line and then a full description. The first line will be used to name
-  the patch by git format-patch.
-
-
-8. Renaming/moving/copying files or contents of files:
-
-  Git automatically tracks such changes, making those normal commits.
-
-    mv/cp path/file otherpath/otherfile
-
-    git add [-A] .
-
-    git commit
-
-  Do not move, rename or copy files of which you are not the maintainer without
-  discussing it on the mailing list first!
-
-9. Reverting broken commits
-
-    git revert <commit>
-
-  git revert will generate a revert commit. This will not make the faulty
-  commit disappear from the history.
-
-    git reset <commit>
-
-  git reset will uncommit the changes till <commit> rewriting the current
-  branch history.
-
-    git commit --amend
-
-  allows to amend the last commit details quickly.
-
-    git rebase -i origin/master
-
-  will replay local commits over the main repository allowing to edit,
-  merge or remove some of them in the process.
-
-  Note that the reset, commit --amend and rebase rewrite history, so you
-  should use them ONLY on your local or topic branches.
-
-  The main repository will reject those changes.
-
-10. Preparing a patchset.
-
-    git format-patch <commit> [-o directory]
-
-  will generate a set of patches for each commit between <commit> and
-  current HEAD. E.g.
-
-    git format-patch origin/master
-
-  will generate patches for all commits on current branch which are not
-  present in upstream.
-  A useful shortcut is also
-
-    git format-patch -n
-
-  which will generate patches from last n commits.
-  By default the patches are created in the current directory.
-
-11. Sending patches for review
-
-    git send-email <commit list|directory>
-
-  will send the patches created by git format-patch or directly generates
-  them. All the email fields can be configured in the global/local
-  configuration or overridden by command line.
-  Note that this tool must often be installed separately (e.g. git-email
-  package on Debian-based distros).
-
-12. Pushing changes to remote trees
-
-    git push
-
-  Will push the changes to the default remote (origin).
-  Git will prevent you from pushing changes if the local and remote trees are
-  out of sync. Refer to 2 and 2.a to sync the local tree.
-
-    git remote add <name> <url>
-
-  Will add additional remote with a name reference, it is useful if you want
-  to push your local branch for review on a remote host.
-
-    git push <remote> <refspec>
-
-  Will push the changes to the remote repository. Omitting refspec makes git
-  push update all the remote branches matching the local ones.
-
-13. Finding a specific svn revision
-
-  Since version 1.7.1 git supports ':/foo' syntax for specifying commits
-  based on a regular expression. see man gitrevisions
-
-    git show :/'as revision 23456'
-
-  will show the svn changeset r23456. With older git versions searching in
-  the git log output is the easiest option (especially if a pager with
-  search capabilities is used).
-  This commit can be checked out with
-
-    git checkout -b svn_23456 :/'as revision 23456'
-
-  or for git < 1.7.1 with
-
-    git checkout -b svn_23456 $SHA1
-
-  where $SHA1 is the commit SHA1 from the 'git log' output.
-
-
-Contact the project admins <root at ffmpeg dot org> if you have technical
-problems with the GIT server.

omxplayer-2014.02.11.tar.gz/ffmpeg/doc/soc.txt Deleted

@@ -1,24 +0,0 @@
-Google Summer of Code and similar project guidelines
-
-Summer of Code is a project by Google in which students are paid to implement
-some nice new features for various participating open source projects ...
-
-This text is a collection of things to take care of for the next soc as
-it's a little late for this year's soc (2006).
-
-The Goal:
-Our goal in respect to soc is and must be of course exactly one thing and
-that is to improve FFmpeg, to reach this goal, code must
-* conform to the development policy and patch submission guidelines
-* must improve FFmpeg somehow (faster, smaller, "better",
-  more codecs supported, fewer bugs, cleaner, ...)
-
-for mentors and other developers to help students to reach that goal it is
-essential that changes to their codebase are publicly visible, clean and
-easy reviewable that again leads us to:
-* use of a revision control system like git
-* separation of cosmetic from non-cosmetic changes (this is almost entirely
-  ignored by mentors and students in soc 2006 which might lead to a surprise
-  when the code will be reviewed at the end before a possible inclusion in
-  FFmpeg, individual changes were generally not reviewable due to cosmetics).
-* frequent commits, so that comments can be provided early

omxplayer-2014.02.11.tar.gz/ffmpeg/doc/viterbi.txt Deleted

@@ -1,109 +0,0 @@
-This is a quick description of the viterbi aka dynamic programing
-algorthm.
-
-Its reason for existence is that wikipedia has become very poor on
-describing algorithms in a way that makes it useable for understanding
-them or anything else actually. It tends now to describe the very same
-algorithm under 50 different names and pages with few understandable
-by even people who fully understand the algorithm and the theory behind.
-
-Problem description: (that is what it can solve)
-assume we have a 2d table, or you could call it a graph or matrix if you
-prefer
-
-    O   O   O   O   O   O   O
-
-    O   O   O   O   O   O   O
-
-    O   O   O   O   O   O   O
-
-    O   O   O   O   O   O   O
-
-
-That table has edges connecting points from each column to the next column
-and each edge has a score like: (only some edge and scores shown to keep it
-readable)
-
-
-    O--5--O-----O-----O-----O-----O
-     2   / 7   / \   / \   / \   /
-      \ /   \ /   \ /   \ /   \ /
-    O7-/--O--/--O--/--O--/--O--/--O
-     \/ \/ 1/ \/ \/ \/ \/ \/ \/ \/
-     /\ /\ 2\ /\ /\ /\ /\ /\ /\ /\
-    O3-/--O--/--O--/--O--/--O--/--O
-      / \   / \   / \   / \   / \
-     1   \ 9   \ /   \ /   \ /   \
-    O--2--O--1--O--5--O--3--O--8--O
-
-
-
-Our goal is to find a path from left to right through it which
-minimizes the sum of the score of all edges.
-(and of course left/right is just a convention here it could be top down too)
-Similarly the minimum could be the maximum by just fliping the sign,
-Example of a path with scores:
-
-    O   O   O   O   O   O   O
-
->---O.  O   O  .O-2-O   O   O
-      5.     .7      .
-    O   O-1-O   O   O 8 O   O
-                       .
-    O   O   O   O   O   O-1-O---> (sum here is 24)
-
-
-The viterbi algorthm now solves this simply column by column
-For the previous column each point has a best path and a associated
-score:
-
-    O-----5     O
-     \
-      \
-    O  \  1     O
-        \/
-        /\
-    O  /  2     O
-      /
-     /
-    O-----2     O
-
-
-To move one column forward we just need to find the best path and associated
-scores for the next column
-here are some edges we could choose from:
-
-
-    O-----5--3--O
-     \      \8
-      \       \
-    O  \  1--9--O
-        \/  \3
-        /\     \
-    O  /  2--1--O
-      /     \2
-     /        \
-    O-----2--4--O
-
-Finding the new best paths and scores for each point of our new column is
-trivial given we know the previous column best paths and scores:
-
-    O-----0-----8
-     \
-      \
-    O  \  0----10
-        \/
-        /\
-    O  /  0-----3
-      /     \
-     /        \
-    O     0     4
-
-
-the viterbi algorthm continues exactly like this column for column until the
-end and then just picks the path with the best score (above that would be the
-one with score 3)
-
-
-Author: Michael niedermayer
-Copyright LGPL

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/bfin/mpegvideo_bfin.c Deleted

@@ -1,152 +0,0 @@
-/*
- * BlackFin MPEGVIDEO OPTIMIZATIONS
- *
- * Copyright (C) 2007 Marc Hoffman <mmh@pleasantst.com>
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * FFmpeg is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include "libavutil/attributes.h"
-#include "libavcodec/avcodec.h"
-#include "libavcodec/mpegvideo.h"
-#include "dsputil_bfin.h"
-
-static int dct_quantize_bfin (MpegEncContext *s,
-                              int16_t *block, int n,
-                              int qscale, int *overflow)
-{
-    int last_non_zero, q, start_i;
-    const short *qmat;
-    short *bias;
-    const uint8_t *scantable= s->intra_scantable.scantable;
-    short dc;
-    int   max=0;
-
-    PROF("fdct",0);
-    s->dsp.fdct(block);
-    EPROF();
-
-    PROF("denoise",1);
-    if(s->dct_error_sum)
-        s->denoise_dct(s, block);
-    EPROF();
-
-    PROF("quant-init",2);
-    if (s->mb_intra) {
-        if (!s->h263_aic) {
-            if (n < 4)
-                q = s->y_dc_scale;
-            else
-                q = s->c_dc_scale;
-            q = q << 3;
-        } else
-            /* For AIC we skip quant/dequant of INTRADC */
-            q = 1 << 3;
-
-        /* note: block[0] is assumed to be positive */
-        dc = block[0] = (block[0] + (q >> 1)) / q;
-        start_i = 1;
-        last_non_zero = 0;
-        if(n<4){
-            bias = s->q_intra_matrix16[qscale][1];
-            qmat = s->q_intra_matrix16[qscale][0];
-        }else{
-            bias = s->q_chroma_intra_matrix16[qscale][1];
-            qmat = s->q_chroma_intra_matrix16[qscale][0];
-        }
-
-    } else {
-        start_i = 0;
-        last_non_zero = -1;
-        bias = s->q_inter_matrix16[qscale][1];
-        qmat = s->q_inter_matrix16[qscale][0];
-
-    }
-    EPROF();
-
-    PROF("quantize",4);
-
-    /*  for(i=start_i; i<64; i++) {                           */
-    /*      sign     = (block[i]>>15)|1;                      */
-    /*      level    = ((abs(block[i])+bias[0])*qmat[i])>>16; */
-    /*      if (level < 0) level = 0;                         */
-    /*      max     |= level;                                 */
-    /*      level    = level * sign;                          */
-    /*      block[i] = level;                                 */
-    /*  } */
-
-    __asm__ volatile
-        ("i2=%1;\n\t"
-         "r1=[%1++];                                                         \n\t"
-         "r0=r1>>>15 (v);                                                    \n\t"
-         "lsetup (0f,1f) lc0=%3;                                             \n\t"
-         "0:   r0=r0|%4;                                                     \n\t"
-         "     r1=abs r1 (v)                                    || r2=[%2++];\n\t"
-         "     r1=r1+|+%5;                                                   \n\t"
-         "     r1=max(r1,%6) (v);                                            \n\t"
-         "     r1.h=(a1 =r1.h*r2.h), r1.l=(a0 =r1.l*r2.l) (tfu);             \n\t"
-         "     %0=%0|r1;                                                     \n\t"
-         "     r0.h=(a1 =r1.h*r0.h), r0.l=(a0 =r1.l*r0.l) (is)  || r1=[%1++];\n\t"
-         "1:   r0=r1>>>15 (v)                                   || [i2++]=r0;\n\t"
-         "r1=%0>>16;                                                         \n\t"
-         "%0=%0|r1;                                                          \n\t"
-         "%0.h=0;                                                            \n\t"
-         : "=&d" (max)
-         : "b" (block), "b" (qmat), "a" (32), "d" (0x00010001), "d" (bias[0]*0x10001), "d" (0)
-         : "R0","R1","R2", "I2");
-    if (start_i == 1) block[0] = dc;
-
-    EPROF();
-
-
-    PROF("zzscan",5);
-
-    __asm__ volatile
-        ("r0=b[%1--] (x);         \n\t"
-         "lsetup (0f,1f) lc0=%3;  \n\t"     /*    for(i=63; i>=start_i; i--) { */
-         "0: p0=r0;               \n\t"     /*        j = scantable[i];        */
-         "   p0=%2+(p0<<1);       \n\t"     /*        if (block[j]) {          */
-         "   r0=w[p0];            \n\t"     /*           last_non_zero = i;    */
-         "   cc=r0==0;            \n\t"     /*           break;                */
-         "   if !cc jump 2f;      \n\t"     /*        }                        */
-         "1: r0=b[%1--] (x);      \n\t"     /*    }                            */
-         "   %0=%4;               \n\t"
-         "   jump 3f;             \n\t"
-         "2: %0=lc0;              \n\t"
-         "3:\n\t"
-
-         : "=d" (last_non_zero)
-         : "a" (scantable+63), "a" (block), "a" (63), "d" (last_non_zero)
-         : "P0","R0");
-
-    EPROF();
-
-    *overflow= s->max_qcoeff < max; //overflow might have happened
-
-    bfprof();
-
-    /* we need this permutation so that we correct the IDCT, we only permute the !=0 elements */
-    if (s->dsp.idct_permutation_type != FF_NO_IDCT_PERM)
-        ff_block_permute(block, s->dsp.idct_permutation, scantable, last_non_zero);
-
-    return last_non_zero;
-}
-
-av_cold void ff_MPV_common_init_bfin (MpegEncContext *s)
-{
-/*     s->dct_quantize= dct_quantize_bfin; */
-}

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/dv_vlc_data.h Deleted

@@ -1,259 +0,0 @@
-/*
- * VLC constants for DV codec
- * Copyright (c) 2002 Fabrice Bellard
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * FFmpeg is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * VLC constants for DV codec.
- */
-
-#ifndef AVCODEC_DV_VLC_DATA_H
-#define AVCODEC_DV_VLC_DATA_H
-
-#include <stdint.h>
-
-#define NB_DV_VLC 409
-
-/*
- * There's a catch about the following three tables: the mapping they establish
- * between (run, level) and vlc is not 1-1. So you have to watch out for that
- * when building misc. tables. E.g. (1, 0) can be either 0x7cf or 0x1f82.
- */
-static const uint16_t dv_vlc_bits[NB_DV_VLC] = {
- 0x0000, 0x0002, 0x0007, 0x0008, 0x0009, 0x0014, 0x0015, 0x0016,
- 0x0017, 0x0030, 0x0031, 0x0032, 0x0033, 0x0068, 0x0069, 0x006a,
- 0x006b, 0x006c, 0x006d, 0x006e, 0x006f, 0x00e0, 0x00e1, 0x00e2,
- 0x00e3, 0x00e4, 0x00e5, 0x00e6, 0x00e7, 0x00e8, 0x00e9, 0x00ea,
- 0x00eb, 0x00ec, 0x00ed, 0x00ee, 0x00ef, 0x01e0, 0x01e1, 0x01e2,
- 0x01e3, 0x01e4, 0x01e5, 0x01e6, 0x01e7, 0x01e8, 0x01e9, 0x01ea,
- 0x01eb, 0x01ec, 0x01ed, 0x01ee, 0x01ef, 0x03e0, 0x03e1, 0x03e2,
- 0x03e3, 0x03e4, 0x03e5, 0x03e6, 0x07ce, 0x07cf, 0x07d0, 0x07d1,
- 0x07d2, 0x07d3, 0x07d4, 0x07d5, 0x0fac, 0x0fad, 0x0fae, 0x0faf,
- 0x0fb0, 0x0fb1, 0x0fb2, 0x0fb3, 0x0fb4, 0x0fb5, 0x0fb6, 0x0fb7,
- 0x0fb8, 0x0fb9, 0x0fba, 0x0fbb, 0x0fbc, 0x0fbd, 0x0fbe, 0x0fbf,
- 0x1f80, 0x1f81, 0x1f82, 0x1f83, 0x1f84, 0x1f85, 0x1f86, 0x1f87,
- 0x1f88, 0x1f89, 0x1f8a, 0x1f8b, 0x1f8c, 0x1f8d, 0x1f8e, 0x1f8f,
- 0x1f90, 0x1f91, 0x1f92, 0x1f93, 0x1f94, 0x1f95, 0x1f96, 0x1f97,
- 0x1f98, 0x1f99, 0x1f9a, 0x1f9b, 0x1f9c, 0x1f9d, 0x1f9e, 0x1f9f,
- 0x1fa0, 0x1fa1, 0x1fa2, 0x1fa3, 0x1fa4, 0x1fa5, 0x1fa6, 0x1fa7,
- 0x1fa8, 0x1fa9, 0x1faa, 0x1fab, 0x1fac, 0x1fad, 0x1fae, 0x1faf,
- 0x1fb0, 0x1fb1, 0x1fb2, 0x1fb3, 0x1fb4, 0x1fb5, 0x1fb6, 0x1fb7,
- 0x1fb8, 0x1fb9, 0x1fba, 0x1fbb, 0x1fbc, 0x1fbd, 0x1fbe, 0x1fbf,
- 0x7f00, 0x7f01, 0x7f02, 0x7f03, 0x7f04, 0x7f05, 0x7f06, 0x7f07,
- 0x7f08, 0x7f09, 0x7f0a, 0x7f0b, 0x7f0c, 0x7f0d, 0x7f0e, 0x7f0f,
- 0x7f10, 0x7f11, 0x7f12, 0x7f13, 0x7f14, 0x7f15, 0x7f16, 0x7f17,
- 0x7f18, 0x7f19, 0x7f1a, 0x7f1b, 0x7f1c, 0x7f1d, 0x7f1e, 0x7f1f,
- 0x7f20, 0x7f21, 0x7f22, 0x7f23, 0x7f24, 0x7f25, 0x7f26, 0x7f27,
- 0x7f28, 0x7f29, 0x7f2a, 0x7f2b, 0x7f2c, 0x7f2d, 0x7f2e, 0x7f2f,
- 0x7f30, 0x7f31, 0x7f32, 0x7f33, 0x7f34, 0x7f35, 0x7f36, 0x7f37,
- 0x7f38, 0x7f39, 0x7f3a, 0x7f3b, 0x7f3c, 0x7f3d, 0x7f3e, 0x7f3f,
- 0x7f40, 0x7f41, 0x7f42, 0x7f43, 0x7f44, 0x7f45, 0x7f46, 0x7f47,
- 0x7f48, 0x7f49, 0x7f4a, 0x7f4b, 0x7f4c, 0x7f4d, 0x7f4e, 0x7f4f,
- 0x7f50, 0x7f51, 0x7f52, 0x7f53, 0x7f54, 0x7f55, 0x7f56, 0x7f57,
- 0x7f58, 0x7f59, 0x7f5a, 0x7f5b, 0x7f5c, 0x7f5d, 0x7f5e, 0x7f5f,
- 0x7f60, 0x7f61, 0x7f62, 0x7f63, 0x7f64, 0x7f65, 0x7f66, 0x7f67,
- 0x7f68, 0x7f69, 0x7f6a, 0x7f6b, 0x7f6c, 0x7f6d, 0x7f6e, 0x7f6f,
- 0x7f70, 0x7f71, 0x7f72, 0x7f73, 0x7f74, 0x7f75, 0x7f76, 0x7f77,
- 0x7f78, 0x7f79, 0x7f7a, 0x7f7b, 0x7f7c, 0x7f7d, 0x7f7e, 0x7f7f,
- 0x7f80, 0x7f81, 0x7f82, 0x7f83, 0x7f84, 0x7f85, 0x7f86, 0x7f87,
- 0x7f88, 0x7f89, 0x7f8a, 0x7f8b, 0x7f8c, 0x7f8d, 0x7f8e, 0x7f8f,
- 0x7f90, 0x7f91, 0x7f92, 0x7f93, 0x7f94, 0x7f95, 0x7f96, 0x7f97,
- 0x7f98, 0x7f99, 0x7f9a, 0x7f9b, 0x7f9c, 0x7f9d, 0x7f9e, 0x7f9f,
- 0x7fa0, 0x7fa1, 0x7fa2, 0x7fa3, 0x7fa4, 0x7fa5, 0x7fa6, 0x7fa7,
- 0x7fa8, 0x7fa9, 0x7faa, 0x7fab, 0x7fac, 0x7fad, 0x7fae, 0x7faf,
- 0x7fb0, 0x7fb1, 0x7fb2, 0x7fb3, 0x7fb4, 0x7fb5, 0x7fb6, 0x7fb7,
- 0x7fb8, 0x7fb9, 0x7fba, 0x7fbb, 0x7fbc, 0x7fbd, 0x7fbe, 0x7fbf,
- 0x7fc0, 0x7fc1, 0x7fc2, 0x7fc3, 0x7fc4, 0x7fc5, 0x7fc6, 0x7fc7,
- 0x7fc8, 0x7fc9, 0x7fca, 0x7fcb, 0x7fcc, 0x7fcd, 0x7fce, 0x7fcf,
- 0x7fd0, 0x7fd1, 0x7fd2, 0x7fd3, 0x7fd4, 0x7fd5, 0x7fd6, 0x7fd7,
- 0x7fd8, 0x7fd9, 0x7fda, 0x7fdb, 0x7fdc, 0x7fdd, 0x7fde, 0x7fdf,
- 0x7fe0, 0x7fe1, 0x7fe2, 0x7fe3, 0x7fe4, 0x7fe5, 0x7fe6, 0x7fe7,
- 0x7fe8, 0x7fe9, 0x7fea, 0x7feb, 0x7fec, 0x7fed, 0x7fee, 0x7fef,
- 0x7ff0, 0x7ff1, 0x7ff2, 0x7ff3, 0x7ff4, 0x7ff5, 0x7ff6, 0x7ff7,
- 0x7ff8, 0x7ff9, 0x7ffa, 0x7ffb, 0x7ffc, 0x7ffd, 0x7ffe, 0x7fff,
- 0x0006,
-};
-
-static const uint8_t dv_vlc_len[NB_DV_VLC] = {
-  2,  3,  4,  4,  4,  5,  5,  5,
-  5,  6,  6,  6,  6,  7,  7,  7,
-  7,  7,  7,  7,  7,  8,  8,  8,
-  8,  8,  8,  8,  8,  8,  8,  8,
-  8,  8,  8,  8,  8,  9,  9,  9,
-  9,  9,  9,  9,  9,  9,  9,  9,
-  9,  9,  9,  9,  9, 10, 10, 10,
- 10, 10, 10, 10, 11, 11, 11, 11,
- 11, 11, 11, 11, 12, 12, 12, 12,
- 12, 12, 12, 12, 12, 12, 12, 12,
- 12, 12, 12, 12, 12, 12, 12, 12,
- 13, 13, 13, 13, 13, 13, 13, 13,
- 13, 13, 13, 13, 13, 13, 13, 13,
- 13, 13, 13, 13, 13, 13, 13, 13,
- 13, 13, 13, 13, 13, 13, 13, 13,
- 13, 13, 13, 13, 13, 13, 13, 13,
- 13, 13, 13, 13, 13, 13, 13, 13,
- 13, 13, 13, 13, 13, 13, 13, 13,
- 13, 13, 13, 13, 13, 13, 13, 13,
- 15, 15, 15, 15, 15, 15, 15, 15,
- 15, 15, 15, 15, 15, 15, 15, 15,
- 15, 15, 15, 15, 15, 15, 15, 15,
- 15, 15, 15, 15, 15, 15, 15, 15,
- 15, 15, 15, 15, 15, 15, 15, 15,
- 15, 15, 15, 15, 15, 15, 15, 15,
- 15, 15, 15, 15, 15, 15, 15, 15,
- 15, 15, 15, 15, 15, 15, 15, 15,
- 15, 15, 15, 15, 15, 15, 15, 15,
- 15, 15, 15, 15, 15, 15, 15, 15,
- 15, 15, 15, 15, 15, 15, 15, 15,
- 15, 15, 15, 15, 15, 15, 15, 15,
- 15, 15, 15, 15, 15, 15, 15, 15,
- 15, 15, 15, 15, 15, 15, 15, 15,
- 15, 15, 15, 15, 15, 15, 15, 15,
- 15, 15, 15, 15, 15, 15, 15, 15,
- 15, 15, 15, 15, 15, 15, 15, 15,
- 15, 15, 15, 15, 15, 15, 15, 15,
- 15, 15, 15, 15, 15, 15, 15, 15,
- 15, 15, 15, 15, 15, 15, 15, 15,
- 15, 15, 15, 15, 15, 15, 15, 15,
- 15, 15, 15, 15, 15, 15, 15, 15,
- 15, 15, 15, 15, 15, 15, 15, 15,
- 15, 15, 15, 15, 15, 15, 15, 15,
- 15, 15, 15, 15, 15, 15, 15, 15,
- 15, 15, 15, 15, 15, 15, 15, 15,
- 15, 15, 15, 15, 15, 15, 15, 15,
- 15, 15, 15, 15, 15, 15, 15, 15,
- 15, 15, 15, 15, 15, 15, 15, 15,
- 15, 15, 15, 15, 15, 15, 15, 15,
- 15, 15, 15, 15, 15, 15, 15, 15,
- 15, 15, 15, 15, 15, 15, 15, 15,
-  4,
-};
-
-static const uint8_t dv_vlc_run[NB_DV_VLC] = {
-  0,  0,  1,  0,  0,  2,  1,  0,
-  0,  3,  4,  0,  0,  5,  6,  2,
-  1,  1,  0,  0,  0,  7,  8,  9,
- 10,  3,  4,  2,  1,  1,  1,  0,
-  0,  0,  0,  0,  0, 11, 12, 13,
- 14,  5,  6,  3,  4,  2,  2,  1,
-  0,  0,  0,  0,  0,  5,  3,  3,
-  2,  1,  1,  1,  0,  1,  6,  4,
-  3,  1,  1,  1,  2,  3,  4,  5,
-  7,  8,  9, 10,  7,  8,  4,  3,
-  2,  2,  2,  2,  2,  1,  1,  1,
-  0,  1,  2,  3,  4,  5,  6,  7,
-  8,  9, 10, 11, 12, 13, 14, 15,
- 16, 17, 18, 19, 20, 21, 22, 23,
- 24, 25, 26, 27, 28, 29, 30, 31,
- 32, 33, 34, 35, 36, 37, 38, 39,
- 40, 41, 42, 43, 44, 45, 46, 47,
- 48, 49, 50, 51, 52, 53, 54, 55,
- 56, 57, 58, 59, 60, 61, 62, 63,
-  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,
-127,
-};
-
-static const uint8_t dv_vlc_level[NB_DV_VLC] = {
-   1,   2,   1,   3,   4,   1,   2,   5,
-   6,   1,   1,   7,   8,   1,   1,   2,
-   3,   4,   9,  10,  11,   1,   1,   1,
-   1,   2,   2,   3,   5,   6,   7,  12,
-  13,  14,  15,  16,  17,   1,   1,   1,
-   1,   2,   2,   3,   3,   4,   5,   8,
-  18,  19,  20,  21,  22,   3,   4,   5,
-   6,   9,  10,  11,   0,   0,   3,   4,
-   6,  12,  13,  14,   0,   0,   0,   0,
-   2,   2,   2,   2,   3,   3,   5,   7,
-   7,   8,   9,  10,  11,  15,  16,  17,
-   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   1,   2,   3,   4,   5,   6,   7,
-   8,   9,  10,  11,  12,  13,  14,  15,
-  16,  17,  18,  19,  20,  21,  22,  23,
-  24,  25,  26,  27,  28,  29,  30,  31,
-  32,  33,  34,  35,  36,  37,  38,  39,
-  40,  41,  42,  43,  44,  45,  46,  47,
-  48,  49,  50,  51,  52,  53,  54,  55,
-  56,  57,  58,  59,  60,  61,  62,  63,
-  64,  65,  66,  67,  68,  69,  70,  71,
-  72,  73,  74,  75,  76,  77,  78,  79,
-  80,  81,  82,  83,  84,  85,  86,  87,
-  88,  89,  90,  91,  92,  93,  94,  95,
-  96,  97,  98,  99, 100, 101, 102, 103,
- 104, 105, 106, 107, 108, 109, 110, 111,
- 112, 113, 114, 115, 116, 117, 118, 119,
- 120, 121, 122, 123, 124, 125, 126, 127,
- 128, 129, 130, 131, 132, 133, 134, 135,
- 136, 137, 138, 139, 140, 141, 142, 143,
- 144, 145, 146, 147, 148, 149, 150, 151,
- 152, 153, 154, 155, 156, 157, 158, 159,
- 160, 161, 162, 163, 164, 165, 166, 167,
- 168, 169, 170, 171, 172, 173, 174, 175,
- 176, 177, 178, 179, 180, 181, 182, 183,
- 184, 185, 186, 187, 188, 189, 190, 191,
- 192, 193, 194, 195, 196, 197, 198, 199,
- 200, 201, 202, 203, 204, 205, 206, 207,
- 208, 209, 210, 211, 212, 213, 214, 215,
- 216, 217, 218, 219, 220, 221, 222, 223,
- 224, 225, 226, 227, 228, 229, 230, 231,
- 232, 233, 234, 235, 236, 237, 238, 239,
- 240, 241, 242, 243, 244, 245, 246, 247,
- 248, 249, 250, 251, 252, 253, 254, 255,
-   0,
-};
-
-#endif /* AVCODEC_DV_VLC_DATA_H */

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/fft.c Deleted

@@ -1,530 +0,0 @@
-/*
- * FFT/IFFT transforms
- * Copyright (c) 2008 Loren Merritt
- * Copyright (c) 2002 Fabrice Bellard
- * Partly based on libdjbfft by D. J. Bernstein
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * FFmpeg is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * FFT/IFFT transforms.
- */
-
-#include <stdlib.h>
-#include <string.h>
-#include "libavutil/mathematics.h"
-#include "fft.h"
-#include "fft-internal.h"
-
-#if CONFIG_FFT_FIXED_32
-#include "fft_table.h"
-#else /* CONFIG_FFT_FIXED_32 */
-
-/* cos(2*pi*x/n) for 0<=x<=n/4, followed by its reverse */
-#if !CONFIG_HARDCODED_TABLES
-COSTABLE(16);
-COSTABLE(32);
-COSTABLE(64);
-COSTABLE(128);
-COSTABLE(256);
-COSTABLE(512);
-COSTABLE(1024);
-COSTABLE(2048);
-COSTABLE(4096);
-COSTABLE(8192);
-COSTABLE(16384);
-COSTABLE(32768);
-COSTABLE(65536);
-#endif
-COSTABLE_CONST FFTSample * const FFT_NAME(ff_cos_tabs)[] = {
-    NULL, NULL, NULL, NULL,
-    FFT_NAME(ff_cos_16),
-    FFT_NAME(ff_cos_32),
-    FFT_NAME(ff_cos_64),
-    FFT_NAME(ff_cos_128),
-    FFT_NAME(ff_cos_256),
-    FFT_NAME(ff_cos_512),
-    FFT_NAME(ff_cos_1024),
-    FFT_NAME(ff_cos_2048),
-    FFT_NAME(ff_cos_4096),
-    FFT_NAME(ff_cos_8192),
-    FFT_NAME(ff_cos_16384),
-    FFT_NAME(ff_cos_32768),
-    FFT_NAME(ff_cos_65536),
-};
-
-#endif /* CONFIG_FFT_FIXED_32 */
-
-static void fft_permute_c(FFTContext *s, FFTComplex *z);
-static void fft_calc_c(FFTContext *s, FFTComplex *z);
-
-static int split_radix_permutation(int i, int n, int inverse)
-{
-    int m;
-    if(n <= 2) return i&1;
-    m = n >> 1;
-    if(!(i&m))            return split_radix_permutation(i, m, inverse)*2;
-    m >>= 1;
-    if(inverse == !(i&m)) return split_radix_permutation(i, m, inverse)*4 + 1;
-    else                  return split_radix_permutation(i, m, inverse)*4 - 1;
-}
-
-av_cold void ff_init_ff_cos_tabs(int index)
-{
-#if (!CONFIG_HARDCODED_TABLES) && (!CONFIG_FFT_FIXED_32)
-    int i;
-    int m = 1<<index;
-    double freq = 2*M_PI/m;
-    FFTSample *tab = FFT_NAME(ff_cos_tabs)[index];
-    for(i=0; i<=m/4; i++)
-        tab[i] = FIX15(cos(i*freq));
-    for(i=1; i<m/4; i++)
-        tab[m/2-i] = tab[i];
-#endif
-}
-
-static const int avx_tab[] = {
-    0, 4, 1, 5, 8, 12, 9, 13, 2, 6, 3, 7, 10, 14, 11, 15
-};
-
-static int is_second_half_of_fft32(int i, int n)
-{
-    if (n <= 32)
-        return i >= 16;
-    else if (i < n/2)
-        return is_second_half_of_fft32(i, n/2);
-    else if (i < 3*n/4)
-        return is_second_half_of_fft32(i - n/2, n/4);
-    else
-        return is_second_half_of_fft32(i - 3*n/4, n/4);
-}
-
-static av_cold void fft_perm_avx(FFTContext *s)
-{
-    int i;
-    int n = 1 << s->nbits;
-
-    for (i = 0; i < n; i += 16) {
-        int k;
-        if (is_second_half_of_fft32(i, n)) {
-            for (k = 0; k < 16; k++)
-                s->revtab[-split_radix_permutation(i + k, n, s->inverse) & (n - 1)] =
-                    i + avx_tab[k];
-
-        } else {
-            for (k = 0; k < 16; k++) {
-                int j = i + k;
-                j = (j & ~7) | ((j >> 1) & 3) | ((j << 2) & 4);
-                s->revtab[-split_radix_permutation(i + k, n, s->inverse) & (n - 1)] = j;
-            }
-        }
-    }
-}
-
-av_cold int ff_fft_init(FFTContext *s, int nbits, int inverse)
-{
-    int i, j, n;
-
-    if (nbits < 2 || nbits > 16)
-        goto fail;
-    s->nbits = nbits;
-    n = 1 << nbits;
-
-    s->revtab = av_malloc(n * sizeof(uint16_t));
-    if (!s->revtab)
-        goto fail;
-    s->tmp_buf = av_malloc(n * sizeof(FFTComplex));
-    if (!s->tmp_buf)
-        goto fail;
-    s->inverse = inverse;
-    s->fft_permutation = FF_FFT_PERM_DEFAULT;
-
-    s->fft_permute = fft_permute_c;
-    s->fft_calc    = fft_calc_c;
-#if CONFIG_MDCT
-    s->imdct_calc  = ff_imdct_calc_c;
-    s->imdct_half  = ff_imdct_half_c;
-    s->mdct_calc   = ff_mdct_calc_c;
-#endif
-
-#if CONFIG_FFT_FIXED_32
-    {
-        int n=0;
-        ff_fft_lut_init(fft_offsets_lut, 0, 1 << 16, &n);
-    }
-#else /* CONFIG_FFT_FIXED_32 */
-#if CONFIG_FFT_FLOAT
-    if (ARCH_ARM)     ff_fft_init_arm(s);
-    if (ARCH_PPC)     ff_fft_init_ppc(s);
-    if (ARCH_X86)     ff_fft_init_x86(s);
-    if (CONFIG_MDCT)  s->mdct_calcw = s->mdct_calc;
-    if (HAVE_MIPSFPU) ff_fft_init_mips(s);
-#else
-    if (CONFIG_MDCT)  s->mdct_calcw = ff_mdct_calcw_c;
-    if (ARCH_ARM)     ff_fft_fixed_init_arm(s);
-#endif
-    for(j=4; j<=nbits; j++) {
-        ff_init_ff_cos_tabs(j);
-    }
-#endif /* CONFIG_FFT_FIXED_32 */
-
-
-    if (s->fft_permutation == FF_FFT_PERM_AVX) {
-        fft_perm_avx(s);
-    } else {
-        for(i=0; i<n; i++) {
-            j = i;
-            if (s->fft_permutation == FF_FFT_PERM_SWAP_LSBS)
-                j = (j&~3) | ((j>>1)&1) | ((j<<1)&2);
-            s->revtab[-split_radix_permutation(i, n, s->inverse) & (n-1)] = j;
-        }
-    }
-
-    return 0;
- fail:
-    av_freep(&s->revtab);
-    av_freep(&s->tmp_buf);
-    return -1;
-}
-
-static void fft_permute_c(FFTContext *s, FFTComplex *z)
-{
-    int j, np;
-    const uint16_t *revtab = s->revtab;
-    np = 1 << s->nbits;
-    /* TODO: handle split-radix permute in a more optimal way, probably in-place */
-    for(j=0;j<np;j++) s->tmp_buf[revtab[j]] = z[j];
-    memcpy(z, s->tmp_buf, np * sizeof(FFTComplex));
-}
-
-av_cold void ff_fft_end(FFTContext *s)
-{
-    av_freep(&s->revtab);
-    av_freep(&s->tmp_buf);
-}
-
-#if CONFIG_FFT_FIXED_32
-
-static void fft_calc_c(FFTContext *s, FFTComplex *z) {
-
-    int nbits, i, n, num_transforms, offset, step;
-    int n4, n2, n34;
-    FFTSample tmp1, tmp2, tmp3, tmp4, tmp5, tmp6, tmp7, tmp8;
-    FFTComplex *tmpz;
-    FFTSample w_re, w_im;
-    FFTSample *w_re_ptr, *w_im_ptr;
-    const int fft_size = (1 << s->nbits);
-    int64_t accu;
-
-    num_transforms = (0x2aab >> (16 - s->nbits)) | 1;
-
-    for (n=0; n<num_transforms; n++){
-        offset = fft_offsets_lut[n] << 2;
-        tmpz = z + offset;
-
-        tmp1 = tmpz[0].re + tmpz[1].re;
-        tmp5 = tmpz[2].re + tmpz[3].re;
-        tmp2 = tmpz[0].im + tmpz[1].im;
-        tmp6 = tmpz[2].im + tmpz[3].im;
-        tmp3 = tmpz[0].re - tmpz[1].re;
-        tmp8 = tmpz[2].im - tmpz[3].im;
-        tmp4 = tmpz[0].im - tmpz[1].im;
-        tmp7 = tmpz[2].re - tmpz[3].re;
-
-        tmpz[0].re = tmp1 + tmp5;
-        tmpz[2].re = tmp1 - tmp5;
-        tmpz[0].im = tmp2 + tmp6;
-        tmpz[2].im = tmp2 - tmp6;
-        tmpz[1].re = tmp3 + tmp8;
-        tmpz[3].re = tmp3 - tmp8;
-        tmpz[1].im = tmp4 - tmp7;
-        tmpz[3].im = tmp4 + tmp7;
-    }
-
-    if (fft_size < 8)
-        return;
-
-    num_transforms = (num_transforms >> 1) | 1;
-
-    for (n=0; n<num_transforms; n++){
-        offset = fft_offsets_lut[n] << 3;
-        tmpz = z + offset;
-
-        tmp1 = tmpz[4].re + tmpz[5].re;
-        tmp3 = tmpz[6].re + tmpz[7].re;
-        tmp2 = tmpz[4].im + tmpz[5].im;
-        tmp4 = tmpz[6].im + tmpz[7].im;
-        tmp5 = tmp1 + tmp3;
-        tmp7 = tmp1 - tmp3;
-        tmp6 = tmp2 + tmp4;
-        tmp8 = tmp2 - tmp4;
-
-        tmp1 = tmpz[4].re - tmpz[5].re;
-        tmp2 = tmpz[4].im - tmpz[5].im;
-        tmp3 = tmpz[6].re - tmpz[7].re;
-        tmp4 = tmpz[6].im - tmpz[7].im;
-
-        tmpz[4].re = tmpz[0].re - tmp5;
-        tmpz[0].re = tmpz[0].re + tmp5;
-        tmpz[4].im = tmpz[0].im - tmp6;
-        tmpz[0].im = tmpz[0].im + tmp6;
-        tmpz[6].re = tmpz[2].re - tmp8;
-        tmpz[2].re = tmpz[2].re + tmp8;
-        tmpz[6].im = tmpz[2].im + tmp7;
-        tmpz[2].im = tmpz[2].im - tmp7;
-
-        accu = (int64_t)Q31(M_SQRT1_2)*(tmp1 + tmp2);
-        tmp5 = (int32_t)((accu + 0x40000000) >> 31);
-        accu = (int64_t)Q31(M_SQRT1_2)*(tmp3 - tmp4);
-        tmp7 = (int32_t)((accu + 0x40000000) >> 31);
-        accu = (int64_t)Q31(M_SQRT1_2)*(tmp2 - tmp1);
-        tmp6 = (int32_t)((accu + 0x40000000) >> 31);
-        accu = (int64_t)Q31(M_SQRT1_2)*(tmp3 + tmp4);
-        tmp8 = (int32_t)((accu + 0x40000000) >> 31);
-        tmp1 = tmp5 + tmp7;
-        tmp3 = tmp5 - tmp7;
-        tmp2 = tmp6 + tmp8;
-        tmp4 = tmp6 - tmp8;
-
-        tmpz[5].re = tmpz[1].re - tmp1;
-        tmpz[1].re = tmpz[1].re + tmp1;
-        tmpz[5].im = tmpz[1].im - tmp2;
-        tmpz[1].im = tmpz[1].im + tmp2;
-        tmpz[7].re = tmpz[3].re - tmp4;
-        tmpz[3].re = tmpz[3].re + tmp4;
-        tmpz[7].im = tmpz[3].im + tmp3;
-        tmpz[3].im = tmpz[3].im - tmp3;
-    }
-
-    step = 1 << ((MAX_LOG2_NFFT-4) - 4);
-    n4 = 4;
-
-    for (nbits=4; nbits<=s->nbits; nbits++){
-        n2  = 2*n4;
-        n34 = 3*n4;
-        num_transforms = (num_transforms >> 1) | 1;
-
-        for (n=0; n<num_transforms; n++){
-            offset = fft_offsets_lut[n] << nbits;
-            tmpz = z + offset;
-
-            tmp5 = tmpz[ n2].re + tmpz[n34].re;
-            tmp1 = tmpz[ n2].re - tmpz[n34].re;
-            tmp6 = tmpz[ n2].im + tmpz[n34].im;
-            tmp2 = tmpz[ n2].im - tmpz[n34].im;
-
-            tmpz[ n2].re = tmpz[ 0].re - tmp5;
-            tmpz[  0].re = tmpz[ 0].re + tmp5;
-            tmpz[ n2].im = tmpz[ 0].im - tmp6;
-            tmpz[  0].im = tmpz[ 0].im + tmp6;
-            tmpz[n34].re = tmpz[n4].re - tmp2;
-            tmpz[ n4].re = tmpz[n4].re + tmp2;
-            tmpz[n34].im = tmpz[n4].im + tmp1;
-            tmpz[ n4].im = tmpz[n4].im - tmp1;
-
-            w_re_ptr = w_tab_sr + step;
-            w_im_ptr = w_tab_sr + MAX_FFT_SIZE/(4*16) - step;
-
-            for (i=1; i<n4; i++){
-                w_re = w_re_ptr[0];
-                w_im = w_im_ptr[0];
-                accu  = (int64_t)w_re*tmpz[ n2+i].re;
-                accu += (int64_t)w_im*tmpz[ n2+i].im;
-                tmp1 = (int32_t)((accu + 0x40000000) >> 31);
-                accu  = (int64_t)w_re*tmpz[ n2+i].im;
-                accu -= (int64_t)w_im*tmpz[ n2+i].re;
-                tmp2 = (int32_t)((accu + 0x40000000) >> 31);
-                accu  = (int64_t)w_re*tmpz[n34+i].re;
-                accu -= (int64_t)w_im*tmpz[n34+i].im;
-                tmp3 = (int32_t)((accu + 0x40000000) >> 31);
-                accu  = (int64_t)w_re*tmpz[n34+i].im;
-                accu += (int64_t)w_im*tmpz[n34+i].re;
-                tmp4 = (int32_t)((accu + 0x40000000) >> 31);
-
-                tmp5 = tmp1 + tmp3;
-                tmp1 = tmp1 - tmp3;
-                tmp6 = tmp2 + tmp4;
-                tmp2 = tmp2 - tmp4;
-
-                tmpz[ n2+i].re = tmpz[   i].re - tmp5;
-                tmpz[    i].re = tmpz[   i].re + tmp5;
-                tmpz[ n2+i].im = tmpz[   i].im - tmp6;
-                tmpz[    i].im = tmpz[   i].im + tmp6;
-                tmpz[n34+i].re = tmpz[n4+i].re - tmp2;
-                tmpz[ n4+i].re = tmpz[n4+i].re + tmp2;
-                tmpz[n34+i].im = tmpz[n4+i].im + tmp1;
-                tmpz[ n4+i].im = tmpz[n4+i].im - tmp1;
-
-                w_re_ptr += step;
-                w_im_ptr -= step;
-            }
-        }
-        step >>= 1;
-        n4   <<= 1;
-    }
-}
-
-#else /* CONFIG_FFT_FIXED_32 */
-
-#define BUTTERFLIES(a0,a1,a2,a3) {\
-    BF(t3, t5, t5, t1);\
-    BF(a2.re, a0.re, a0.re, t5);\
-    BF(a3.im, a1.im, a1.im, t3);\
-    BF(t4, t6, t2, t6);\
-    BF(a3.re, a1.re, a1.re, t4);\
-    BF(a2.im, a0.im, a0.im, t6);\
-}
-
-// force loading all the inputs before storing any.
-// this is slightly slower for small data, but avoids store->load aliasing
-// for addresses separated by large powers of 2.
-#define BUTTERFLIES_BIG(a0,a1,a2,a3) {\
-    FFTSample r0=a0.re, i0=a0.im, r1=a1.re, i1=a1.im;\
-    BF(t3, t5, t5, t1);\
-    BF(a2.re, a0.re, r0, t5);\
-    BF(a3.im, a1.im, i1, t3);\
-    BF(t4, t6, t2, t6);\
-    BF(a3.re, a1.re, r1, t4);\
-    BF(a2.im, a0.im, i0, t6);\
-}
-
-#define TRANSFORM(a0,a1,a2,a3,wre,wim) {\
-    CMUL(t1, t2, a2.re, a2.im, wre, -wim);\
-    CMUL(t5, t6, a3.re, a3.im, wre,  wim);\
-    BUTTERFLIES(a0,a1,a2,a3)\
-}
-
-#define TRANSFORM_ZERO(a0,a1,a2,a3) {\
-    t1 = a2.re;\
-    t2 = a2.im;\
-    t5 = a3.re;\
-    t6 = a3.im;\
-    BUTTERFLIES(a0,a1,a2,a3)\
-}
-
-/* z[0...8n-1], w[1...2n-1] */
-#define PASS(name)\
-static void name(FFTComplex *z, const FFTSample *wre, unsigned int n)\
-{\
-    FFTDouble t1, t2, t3, t4, t5, t6;\
-    int o1 = 2*n;\
-    int o2 = 4*n;\
-    int o3 = 6*n;\
-    const FFTSample *wim = wre+o1;\
-    n--;\
-\
-    TRANSFORM_ZERO(z[0],z[o1],z[o2],z[o3]);\
-    TRANSFORM(z[1],z[o1+1],z[o2+1],z[o3+1],wre[1],wim[-1]);\
-    do {\
-        z += 2;\
-        wre += 2;\
-        wim -= 2;\
-        TRANSFORM(z[0],z[o1],z[o2],z[o3],wre[0],wim[0]);\
-        TRANSFORM(z[1],z[o1+1],z[o2+1],z[o3+1],wre[1],wim[-1]);\
-    } while(--n);\
-}
-
-PASS(pass)
-#undef BUTTERFLIES
-#define BUTTERFLIES BUTTERFLIES_BIG
-PASS(pass_big)
-
-#define DECL_FFT(n,n2,n4)\
-static void fft##n(FFTComplex *z)\
-{\
-    fft##n2(z);\
-    fft##n4(z+n4*2);\
-    fft##n4(z+n4*3);\
-    pass(z,FFT_NAME(ff_cos_##n),n4/2);\
-}
-
-static void fft4(FFTComplex *z)
-{
-    FFTDouble t1, t2, t3, t4, t5, t6, t7, t8;
-
-    BF(t3, t1, z[0].re, z[1].re);
-    BF(t8, t6, z[3].re, z[2].re);
-    BF(z[2].re, z[0].re, t1, t6);
-    BF(t4, t2, z[0].im, z[1].im);
-    BF(t7, t5, z[2].im, z[3].im);
-    BF(z[3].im, z[1].im, t4, t8);
-    BF(z[3].re, z[1].re, t3, t7);
-    BF(z[2].im, z[0].im, t2, t5);
-}
-
-static void fft8(FFTComplex *z)
-{
-    FFTDouble t1, t2, t3, t4, t5, t6;
-
-    fft4(z);
-
-    BF(t1, z[5].re, z[4].re, -z[5].re);
-    BF(t2, z[5].im, z[4].im, -z[5].im);
-    BF(t5, z[7].re, z[6].re, -z[7].re);
-    BF(t6, z[7].im, z[6].im, -z[7].im);
-
-    BUTTERFLIES(z[0],z[2],z[4],z[6]);
-    TRANSFORM(z[1],z[3],z[5],z[7],sqrthalf,sqrthalf);
-}
-
-#if !CONFIG_SMALL
-static void fft16(FFTComplex *z)
-{
-    FFTDouble t1, t2, t3, t4, t5, t6;
-    FFTSample cos_16_1 = FFT_NAME(ff_cos_16)[1];
-    FFTSample cos_16_3 = FFT_NAME(ff_cos_16)[3];
-
-    fft8(z);
-    fft4(z+8);
-    fft4(z+12);
-
-    TRANSFORM_ZERO(z[0],z[4],z[8],z[12]);
-    TRANSFORM(z[2],z[6],z[10],z[14],sqrthalf,sqrthalf);
-    TRANSFORM(z[1],z[5],z[9],z[13],cos_16_1,cos_16_3);
-    TRANSFORM(z[3],z[7],z[11],z[15],cos_16_3,cos_16_1);
-}
-#else
-DECL_FFT(16,8,4)
-#endif
-DECL_FFT(32,16,8)
-DECL_FFT(64,32,16)
-DECL_FFT(128,64,32)
-DECL_FFT(256,128,64)
-DECL_FFT(512,256,128)
-#if !CONFIG_SMALL
-#define pass pass_big
-#endif
-DECL_FFT(1024,512,256)
-DECL_FFT(2048,1024,512)
-DECL_FFT(4096,2048,1024)
-DECL_FFT(8192,4096,2048)
-DECL_FFT(16384,8192,4096)
-DECL_FFT(32768,16384,8192)
-DECL_FFT(65536,32768,16384)
-
-static void (* const fft_dispatch[])(FFTComplex*) = {
-    fft4, fft8, fft16, fft32, fft64, fft128, fft256, fft512, fft1024,
-    fft2048, fft4096, fft8192, fft16384, fft32768, fft65536,
-};
-
-static void fft_calc_c(FFTContext *s, FFTComplex *z)
-{
-    fft_dispatch[s->nbits-2](z);
-}
-#endif /* CONFIG_FFT_FIXED_32 */

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/mdct.c Deleted

@@ -1,207 +0,0 @@
-/*
- * MDCT/IMDCT transforms
- * Copyright (c) 2002 Fabrice Bellard
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * FFmpeg is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include <stdlib.h>
-#include <string.h>
-#include "libavutil/common.h"
-#include "libavutil/mathematics.h"
-#include "fft.h"
-#include "fft-internal.h"
-
-/**
- * @file
- * MDCT/IMDCT transforms.
- */
-
-#if CONFIG_FFT_FLOAT
-#   define RSCALE(x) (x)
-#else
-#if CONFIG_FFT_FIXED_32
-#   define RSCALE(x) (((x) + 32) >> 6)
-#else /* CONFIG_FFT_FIXED_32 */
-#   define RSCALE(x) ((x) >> 1)
-#endif /* CONFIG_FFT_FIXED_32 */
-#endif
-
-/**
- * init MDCT or IMDCT computation.
- */
-av_cold int ff_mdct_init(FFTContext *s, int nbits, int inverse, double scale)
-{
-    int n, n4, i;
-    double alpha, theta;
-    int tstep;
-
-    memset(s, 0, sizeof(*s));
-    n = 1 << nbits;
-    s->mdct_bits = nbits;
-    s->mdct_size = n;
-    n4 = n >> 2;
-    s->mdct_permutation = FF_MDCT_PERM_NONE;
-
-    if (ff_fft_init(s, s->mdct_bits - 2, inverse) < 0)
-        goto fail;
-
-    s->tcos = av_malloc(n/2 * sizeof(FFTSample));
-    if (!s->tcos)
-        goto fail;
-
-    switch (s->mdct_permutation) {
-    case FF_MDCT_PERM_NONE:
-        s->tsin = s->tcos + n4;
-        tstep = 1;
-        break;
-    case FF_MDCT_PERM_INTERLEAVE:
-        s->tsin = s->tcos + 1;
-        tstep = 2;
-        break;
-    default:
-        goto fail;
-    }
-
-    theta = 1.0 / 8.0 + (scale < 0 ? n4 : 0);
-    scale = sqrt(fabs(scale));
-    for(i=0;i<n4;i++) {
-        alpha = 2 * M_PI * (i + theta) / n;
-        s->tcos[i*tstep] = FIX15(-cos(alpha) * scale);
-        s->tsin[i*tstep] = FIX15(-sin(alpha) * scale);
-    }
-    return 0;
- fail:
-    ff_mdct_end(s);
-    return -1;
-}
-
-/**
- * Compute the middle half of the inverse MDCT of size N = 2^nbits,
- * thus excluding the parts that can be derived by symmetry
- * @param output N/2 samples
- * @param input N/2 samples
- */
-void ff_imdct_half_c(FFTContext *s, FFTSample *output, const FFTSample *input)
-{
-    int k, n8, n4, n2, n, j;
-    const uint16_t *revtab = s->revtab;
-    const FFTSample *tcos = s->tcos;
-    const FFTSample *tsin = s->tsin;
-    const FFTSample *in1, *in2;
-    FFTComplex *z = (FFTComplex *)output;
-
-    n = 1 << s->mdct_bits;
-    n2 = n >> 1;
-    n4 = n >> 2;
-    n8 = n >> 3;
-
-    /* pre rotation */
-    in1 = input;
-    in2 = input + n2 - 1;
-    for(k = 0; k < n4; k++) {
-        j=revtab[k];
-        CMUL(z[j].re, z[j].im, *in2, *in1, tcos[k], tsin[k]);
-        in1 += 2;
-        in2 -= 2;
-    }
-    s->fft_calc(s, z);
-
-    /* post rotation + reordering */
-    for(k = 0; k < n8; k++) {
-        FFTSample r0, i0, r1, i1;
-        CMUL(r0, i1, z[n8-k-1].im, z[n8-k-1].re, tsin[n8-k-1], tcos[n8-k-1]);
-        CMUL(r1, i0, z[n8+k  ].im, z[n8+k  ].re, tsin[n8+k  ], tcos[n8+k  ]);
-        z[n8-k-1].re = r0;
-        z[n8-k-1].im = i0;
-        z[n8+k  ].re = r1;
-        z[n8+k  ].im = i1;
-    }
-}
-
-/**
- * Compute inverse MDCT of size N = 2^nbits
- * @param output N samples
- * @param input N/2 samples
- */
-void ff_imdct_calc_c(FFTContext *s, FFTSample *output, const FFTSample *input)
-{
-    int k;
-    int n = 1 << s->mdct_bits;
-    int n2 = n >> 1;
-    int n4 = n >> 2;
-
-    ff_imdct_half_c(s, output+n4, input);
-
-    for(k = 0; k < n4; k++) {
-        output[k] = -output[n2-k-1];
-        output[n-k-1] = output[n2+k];
-    }
-}
-
-/**
- * Compute MDCT of size N = 2^nbits
- * @param input N samples
- * @param out N/2 samples
- */
-void ff_mdct_calc_c(FFTContext *s, FFTSample *out, const FFTSample *input)
-{
-    int i, j, n, n8, n4, n2, n3;
-    FFTDouble re, im;
-    const uint16_t *revtab = s->revtab;
-    const FFTSample *tcos = s->tcos;
-    const FFTSample *tsin = s->tsin;
-    FFTComplex *x = (FFTComplex *)out;
-
-    n = 1 << s->mdct_bits;
-    n2 = n >> 1;
-    n4 = n >> 2;
-    n8 = n >> 3;
-    n3 = 3 * n4;
-
-    /* pre rotation */
-    for(i=0;i<n8;i++) {
-        re = RSCALE(-input[2*i+n3] - input[n3-1-2*i]);
-        im = RSCALE(-input[n4+2*i] + input[n4-1-2*i]);
-        j = revtab[i];
-        CMUL(x[j].re, x[j].im, re, im, -tcos[i], tsin[i]);
-
-        re = RSCALE( input[2*i]    - input[n2-1-2*i]);
-        im = RSCALE(-input[n2+2*i] - input[ n-1-2*i]);
-        j = revtab[n8 + i];
-        CMUL(x[j].re, x[j].im, re, im, -tcos[n8 + i], tsin[n8 + i]);
-    }
-
-    s->fft_calc(s, x);
-
-    /* post rotation */
-    for(i=0;i<n8;i++) {
-        FFTSample r0, i0, r1, i1;
-        CMUL(i1, r0, x[n8-i-1].re, x[n8-i-1].im, -tsin[n8-i-1], -tcos[n8-i-1]);
-        CMUL(i0, r1, x[n8+i  ].re, x[n8+i  ].im, -tsin[n8+i  ], -tcos[n8+i  ]);
-        x[n8-i-1].re = r0;
-        x[n8-i-1].im = i0;
-        x[n8+i  ].re = r1;
-        x[n8+i  ].im = i1;
-    }
-}
-
-av_cold void ff_mdct_end(FFTContext *s)
-{
-    av_freep(&s->tcos);
-    ff_fft_end(s);
-}

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/mp3_header_compress_bsf.c Deleted

@@ -1,87 +0,0 @@
-/*
- * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * FFmpeg is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include "libavutil/common.h"
-#include "libavutil/intreadwrite.h"
-#include "avcodec.h"
-#include "mpegaudiodecheader.h"
-
-
-static int mp3_header_compress(AVBitStreamFilterContext *bsfc, AVCodecContext *avctx, const char *args,
-                     uint8_t **poutbuf, int *poutbuf_size,
-                     const uint8_t *buf, int buf_size, int keyframe){
-    uint32_t header, extraheader;
-    int mode_extension, header_size;
-
-    if(avctx->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL){
-        av_log(avctx, AV_LOG_ERROR, "not standards compliant\n");
-        return -1;
-    }
-
-    header = AV_RB32(buf);
-    mode_extension= (header>>4)&3;
-
-    if(ff_mpa_check_header(header) < 0 || (header&0x60000) != 0x20000){
-output_unchanged:
-        *poutbuf= (uint8_t *) buf;
-        *poutbuf_size= buf_size;
-
-        av_log(avctx, AV_LOG_INFO, "cannot compress %08X\n", header);
-        return 0;
-    }
-
-    if(avctx->extradata_size == 0){
-        avctx->extradata_size=15;
-        avctx->extradata= av_malloc(avctx->extradata_size);
-        strcpy(avctx->extradata, "FFCMP3 0.0");
-        memcpy(avctx->extradata+11, buf, 4);
-    }
-    if(avctx->extradata_size != 15){
-        av_log(avctx, AV_LOG_ERROR, "Extradata invalid\n");
-        return -1;
-    }
-    extraheader = AV_RB32(avctx->extradata+11);
-    if((extraheader&MP3_MASK) != (header&MP3_MASK))
-        goto output_unchanged;
-
-    header_size= (header&0x10000) ? 4 : 6;
-
-    *poutbuf_size= buf_size - header_size;
-    *poutbuf= av_malloc(buf_size - header_size + FF_INPUT_BUFFER_PADDING_SIZE);
-    memcpy(*poutbuf, buf + header_size, buf_size - header_size + FF_INPUT_BUFFER_PADDING_SIZE);
-
-    if(avctx->channels==2){
-        if((header & (3<<19)) != 3<<19){
-            (*poutbuf)[1] &= 0x3F;
-            (*poutbuf)[1] |= mode_extension<<6;
-            FFSWAP(int, (*poutbuf)[1], (*poutbuf)[2]);
-        }else{
-            (*poutbuf)[1] &= 0x8F;
-            (*poutbuf)[1] |= mode_extension<<4;
-        }
-    }
-
-    return 1;
-}
-
-AVBitStreamFilter ff_mp3_header_compress_bsf={
-    .name   = "mp3comp",
-    .filter = mp3_header_compress,
-};

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/mpegaudiodec.c Deleted

@@ -1,2079 +0,0 @@
-/*
- * MPEG Audio decoder
- * Copyright (c) 2001, 2002 Fabrice Bellard
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * FFmpeg is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * MPEG Audio decoder
- */
-
-#include "libavutil/attributes.h"
-#include "libavutil/avassert.h"
-#include "libavutil/channel_layout.h"
-#include "libavutil/float_dsp.h"
-#include "libavutil/libm.h"
-#include "avcodec.h"
-#include "get_bits.h"
-#include "internal.h"
-#include "mathops.h"
-#include "mpegaudiodsp.h"
-
-/*
- * TODO:
- *  - test lsf / mpeg25 extensively.
- */
-
-#include "mpegaudio.h"
-#include "mpegaudiodecheader.h"
-
-#define BACKSTEP_SIZE 512
-#define EXTRABYTES 24
-#define LAST_BUF_SIZE 2 * BACKSTEP_SIZE + EXTRABYTES
-
-/* layer 3 "granule" */
-typedef struct GranuleDef {
-    uint8_t scfsi;
-    int part2_3_length;
-    int big_values;
-    int global_gain;
-    int scalefac_compress;
-    uint8_t block_type;
-    uint8_t switch_point;
-    int table_select[3];
-    int subblock_gain[3];
-    uint8_t scalefac_scale;
-    uint8_t count1table_select;
-    int region_size[3]; /* number of huffman codes in each region */
-    int preflag;
-    int short_start, long_end; /* long/short band indexes */
-    uint8_t scale_factors[40];
-    DECLARE_ALIGNED(16, INTFLOAT, sb_hybrid)[SBLIMIT * 18]; /* 576 samples */
-} GranuleDef;
-
-typedef struct MPADecodeContext {
-    MPA_DECODE_HEADER
-    uint8_t last_buf[LAST_BUF_SIZE];
-    int last_buf_size;
-    /* next header (used in free format parsing) */
-    uint32_t free_format_next_header;
-    GetBitContext gb;
-    GetBitContext in_gb;
-    DECLARE_ALIGNED(32, MPA_INT, synth_buf)[MPA_MAX_CHANNELS][512 * 2];
-    int synth_buf_offset[MPA_MAX_CHANNELS];
-    DECLARE_ALIGNED(32, INTFLOAT, sb_samples)[MPA_MAX_CHANNELS][36][SBLIMIT];
-    INTFLOAT mdct_buf[MPA_MAX_CHANNELS][SBLIMIT * 18]; /* previous samples, for layer 3 MDCT */
-    GranuleDef granules[2][2]; /* Used in Layer 3 */
-    int adu_mode; ///< 0 for standard mp3, 1 for adu formatted mp3
-    int dither_state;
-    int err_recognition;
-    AVCodecContext* avctx;
-    MPADSPContext mpadsp;
-    AVFloatDSPContext fdsp;
-    AVFrame *frame;
-} MPADecodeContext;
-
-#if CONFIG_FLOAT
-#   define SHR(a,b)       ((a)*(1.0f/(1<<(b))))
-#   define FIXR_OLD(a)    ((int)((a) * FRAC_ONE + 0.5))
-#   define FIXR(x)        ((float)(x))
-#   define FIXHR(x)       ((float)(x))
-#   define MULH3(x, y, s) ((s)*(y)*(x))
-#   define MULLx(x, y, s) ((y)*(x))
-#   define RENAME(a) a ## _float
-#   define OUT_FMT   AV_SAMPLE_FMT_FLT
-#   define OUT_FMT_P AV_SAMPLE_FMT_FLTP
-#else
-#   define SHR(a,b)       ((a)>>(b))
-/* WARNING: only correct for positive numbers */
-#   define FIXR_OLD(a)    ((int)((a) * FRAC_ONE + 0.5))
-#   define FIXR(a)        ((int)((a) * FRAC_ONE + 0.5))
-#   define FIXHR(a)       ((int)((a) * (1LL<<32) + 0.5))
-#   define MULH3(x, y, s) MULH((s)*(x), y)
-#   define MULLx(x, y, s) MULL(x,y,s)
-#   define RENAME(a)      a ## _fixed
-#   define OUT_FMT   AV_SAMPLE_FMT_S16
-#   define OUT_FMT_P AV_SAMPLE_FMT_S16P
-#endif
-
-/****************/
-
-#define HEADER_SIZE 4
-
-#include "mpegaudiodata.h"
-#include "mpegaudiodectab.h"
-
-/* vlc structure for decoding layer 3 huffman tables */
-static VLC huff_vlc[16];
-static VLC_TYPE huff_vlc_tables[
-    0 + 128 + 128 + 128 + 130 + 128 + 154 + 166 +
-  142 + 204 + 190 + 170 + 542 + 460 + 662 + 414
-  ][2];
-static const int huff_vlc_tables_sizes[16] = {
-    0,  128,  128,  128,  130,  128,  154,  166,
-  142,  204,  190,  170,  542,  460,  662,  414
-};
-static VLC huff_quad_vlc[2];
-static VLC_TYPE  huff_quad_vlc_tables[128+16][2];
-static const int huff_quad_vlc_tables_sizes[2] = { 128, 16 };
-/* computed from band_size_long */
-static uint16_t band_index_long[9][23];
-#include "mpegaudio_tablegen.h"
-/* intensity stereo coef table */
-static INTFLOAT is_table[2][16];
-static INTFLOAT is_table_lsf[2][2][16];
-static INTFLOAT csa_table[8][4];
-
-static int16_t division_tab3[1<<6 ];
-static int16_t division_tab5[1<<8 ];
-static int16_t division_tab9[1<<11];
-
-static int16_t * const division_tabs[4] = {
-    division_tab3, division_tab5, NULL, division_tab9
-};
-
-/* lower 2 bits: modulo 3, higher bits: shift */
-static uint16_t scale_factor_modshift[64];
-/* [i][j]:  2^(-j/3) * FRAC_ONE * 2^(i+2) / (2^(i+2) - 1) */
-static int32_t scale_factor_mult[15][3];
-/* mult table for layer 2 group quantization */
-
-#define SCALE_GEN(v) \
-{ FIXR_OLD(1.0 * (v)), FIXR_OLD(0.7937005259 * (v)), FIXR_OLD(0.6299605249 * (v)) }
-
-static const int32_t scale_factor_mult2[3][3] = {
-    SCALE_GEN(4.0 / 3.0), /* 3 steps */
-    SCALE_GEN(4.0 / 5.0), /* 5 steps */
-    SCALE_GEN(4.0 / 9.0), /* 9 steps */
-};
-
-/**
- * Convert region offsets to region sizes and truncate
- * size to big_values.
- */
-static void region_offset2size(GranuleDef *g)
-{
-    int i, k, j = 0;
-    g->region_size[2] = 576 / 2;
-    for (i = 0; i < 3; i++) {
-        k = FFMIN(g->region_size[i], g->big_values);
-        g->region_size[i] = k - j;
-        j = k;
-    }
-}
-
-static void init_short_region(MPADecodeContext *s, GranuleDef *g)
-{
-    if (g->block_type == 2) {
-        if (s->sample_rate_index != 8)
-            g->region_size[0] = (36 / 2);
-        else
-            g->region_size[0] = (72 / 2);
-    } else {
-        if (s->sample_rate_index <= 2)
-            g->region_size[0] = (36 / 2);
-        else if (s->sample_rate_index != 8)
-            g->region_size[0] = (54 / 2);
-        else
-            g->region_size[0] = (108 / 2);
-    }
-    g->region_size[1] = (576 / 2);
-}
-
-static void init_long_region(MPADecodeContext *s, GranuleDef *g,
-                             int ra1, int ra2)
-{
-    int l;
-    g->region_size[0] = band_index_long[s->sample_rate_index][ra1 + 1] >> 1;
-    /* should not overflow */
-    l = FFMIN(ra1 + ra2 + 2, 22);
-    g->region_size[1] = band_index_long[s->sample_rate_index][      l] >> 1;
-}
-
-static void compute_band_indexes(MPADecodeContext *s, GranuleDef *g)
-{
-    if (g->block_type == 2) {
-        if (g->switch_point) {
-            if(s->sample_rate_index == 8)
-                avpriv_request_sample(s->avctx, "switch point in 8khz");
-            /* if switched mode, we handle the 36 first samples as
-                long blocks.  For 8000Hz, we handle the 72 first
-                exponents as long blocks */
-            if (s->sample_rate_index <= 2)
-                g->long_end = 8;
-            else
-                g->long_end = 6;
-
-            g->short_start = 3;
-        } else {
-            g->long_end    = 0;
-            g->short_start = 0;
-        }
-    } else {
-        g->short_start = 13;
-        g->long_end    = 22;
-    }
-}
-
-/* layer 1 unscaling */
-/* n = number of bits of the mantissa minus 1 */
-static inline int l1_unscale(int n, int mant, int scale_factor)
-{
-    int shift, mod;
-    int64_t val;
-
-    shift   = scale_factor_modshift[scale_factor];
-    mod     = shift & 3;
-    shift >>= 2;
-    val     = MUL64(mant + (-1 << n) + 1, scale_factor_mult[n-1][mod]);
-    shift  += n;
-    /* NOTE: at this point, 1 <= shift >= 21 + 15 */
-    return (int)((val + (1LL << (shift - 1))) >> shift);
-}
-
-static inline int l2_unscale_group(int steps, int mant, int scale_factor)
-{
-    int shift, mod, val;
-
-    shift   = scale_factor_modshift[scale_factor];
-    mod     = shift & 3;
-    shift >>= 2;
-
-    val = (mant - (steps >> 1)) * scale_factor_mult2[steps >> 2][mod];
-    /* NOTE: at this point, 0 <= shift <= 21 */
-    if (shift > 0)
-        val = (val + (1 << (shift - 1))) >> shift;
-    return val;
-}
-
-/* compute value^(4/3) * 2^(exponent/4). It normalized to FRAC_BITS */
-static inline int l3_unscale(int value, int exponent)
-{
-    unsigned int m;
-    int e;
-
-    e  = table_4_3_exp  [4 * value + (exponent & 3)];
-    m  = table_4_3_value[4 * value + (exponent & 3)];
-    e -= exponent >> 2;
-#ifdef DEBUG
-    if(e < 1)
-        av_log(NULL, AV_LOG_WARNING, "l3_unscale: e is %d\n", e);
-#endif
-    if (e > 31)
-        return 0;
-    m = (m + (1 << (e - 1))) >> e;
-
-    return m;
-}
-
-static av_cold void decode_init_static(void)
-{
-    int i, j, k;
-    int offset;
-
-    /* scale factors table for layer 1/2 */
-    for (i = 0; i < 64; i++) {
-        int shift, mod;
-        /* 1.0 (i = 3) is normalized to 2 ^ FRAC_BITS */
-        shift = i / 3;
-        mod   = i % 3;
-        scale_factor_modshift[i] = mod | (shift << 2);
-    }
-
-    /* scale factor multiply for layer 1 */
-    for (i = 0; i < 15; i++) {
-        int n, norm;
-        n = i + 2;
-        norm = ((INT64_C(1) << n) * FRAC_ONE) / ((1 << n) - 1);
-        scale_factor_mult[i][0] = MULLx(norm, FIXR(1.0          * 2.0), FRAC_BITS);
-        scale_factor_mult[i][1] = MULLx(norm, FIXR(0.7937005259 * 2.0), FRAC_BITS);
-        scale_factor_mult[i][2] = MULLx(norm, FIXR(0.6299605249 * 2.0), FRAC_BITS);
-        av_dlog(NULL, "%d: norm=%x s=%x %x %x\n", i, norm,
-                scale_factor_mult[i][0],
-                scale_factor_mult[i][1],
-                scale_factor_mult[i][2]);
-    }
-
-    RENAME(ff_mpa_synth_init)(RENAME(ff_mpa_synth_window));
-
-    /* huffman decode tables */
-    offset = 0;
-    for (i = 1; i < 16; i++) {
-        const HuffTable *h = &mpa_huff_tables[i];
-        int xsize, x, y;
-        uint8_t  tmp_bits [512] = { 0 };
-        uint16_t tmp_codes[512] = { 0 };
-
-        xsize = h->xsize;
-
-        j = 0;
-        for (x = 0; x < xsize; x++) {
-            for (y = 0; y < xsize; y++) {
-                tmp_bits [(x << 5) | y | ((x&&y)<<4)]= h->bits [j  ];
-                tmp_codes[(x << 5) | y | ((x&&y)<<4)]= h->codes[j++];
-            }
-        }
-
-        /* XXX: fail test */
-        huff_vlc[i].table = huff_vlc_tables+offset;
-        huff_vlc[i].table_allocated = huff_vlc_tables_sizes[i];
-        init_vlc(&huff_vlc[i], 7, 512,
-                 tmp_bits, 1, 1, tmp_codes, 2, 2,
-                 INIT_VLC_USE_NEW_STATIC);
-        offset += huff_vlc_tables_sizes[i];
-    }
-    av_assert0(offset == FF_ARRAY_ELEMS(huff_vlc_tables));
-
-    offset = 0;
-    for (i = 0; i < 2; i++) {
-        huff_quad_vlc[i].table = huff_quad_vlc_tables+offset;
-        huff_quad_vlc[i].table_allocated = huff_quad_vlc_tables_sizes[i];
-        init_vlc(&huff_quad_vlc[i], i == 0 ? 7 : 4, 16,
-                 mpa_quad_bits[i], 1, 1, mpa_quad_codes[i], 1, 1,
-                 INIT_VLC_USE_NEW_STATIC);
-        offset += huff_quad_vlc_tables_sizes[i];
-    }
-    av_assert0(offset == FF_ARRAY_ELEMS(huff_quad_vlc_tables));
-
-    for (i = 0; i < 9; i++) {
-        k = 0;
-        for (j = 0; j < 22; j++) {
-            band_index_long[i][j] = k;
-            k += band_size_long[i][j];
-        }
-        band_index_long[i][22] = k;
-    }
-
-    /* compute n ^ (4/3) and store it in mantissa/exp format */
-
-    mpegaudio_tableinit();
-
-    for (i = 0; i < 4; i++) {
-        if (ff_mpa_quant_bits[i] < 0) {
-            for (j = 0; j < (1 << (-ff_mpa_quant_bits[i]+1)); j++) {
-                int val1, val2, val3, steps;
-                int val = j;
-                steps   = ff_mpa_quant_steps[i];
-                val1    = val % steps;
-                val    /= steps;
-                val2    = val % steps;
-                val3    = val / steps;
-                division_tabs[i][j] = val1 + (val2 << 4) + (val3 << 8);
-            }
-        }
-    }
-
-
-    for (i = 0; i < 7; i++) {
-        float f;
-        INTFLOAT v;
-        if (i != 6) {
-            f = tan((double)i * M_PI / 12.0);
-            v = FIXR(f / (1.0 + f));
-        } else {
-            v = FIXR(1.0);
-        }
-        is_table[0][    i] = v;
-        is_table[1][6 - i] = v;
-    }
-    /* invalid values */
-    for (i = 7; i < 16; i++)
-        is_table[0][i] = is_table[1][i] = 0.0;
-
-    for (i = 0; i < 16; i++) {
-        double f;
-        int e, k;
-
-        for (j = 0; j < 2; j++) {
-            e = -(j + 1) * ((i + 1) >> 1);
-            f = exp2(e / 4.0);
-            k = i & 1;
-            is_table_lsf[j][k ^ 1][i] = FIXR(f);
-            is_table_lsf[j][k    ][i] = FIXR(1.0);
-            av_dlog(NULL, "is_table_lsf %d %d: %f %f\n",
-                    i, j, (float) is_table_lsf[j][0][i],
-                    (float) is_table_lsf[j][1][i]);
-        }
-    }
-
-    for (i = 0; i < 8; i++) {
-        float ci, cs, ca;
-        ci = ci_table[i];
-        cs = 1.0 / sqrt(1.0 + ci * ci);
-        ca = cs * ci;
-#if !CONFIG_FLOAT
-        csa_table[i][0] = FIXHR(cs/4);
-        csa_table[i][1] = FIXHR(ca/4);
-        csa_table[i][2] = FIXHR(ca/4) + FIXHR(cs/4);
-        csa_table[i][3] = FIXHR(ca/4) - FIXHR(cs/4);
-#else
-        csa_table[i][0] = cs;
-        csa_table[i][1] = ca;
-        csa_table[i][2] = ca + cs;
-        csa_table[i][3] = ca - cs;
-#endif
-    }
-}
-
-static av_cold int decode_init(AVCodecContext * avctx)
-{
-    static int initialized_tables = 0;
-    MPADecodeContext *s = avctx->priv_data;
-
-    if (!initialized_tables) {
-        decode_init_static();
-        initialized_tables = 1;
-    }
-
-    s->avctx = avctx;
-
-    avpriv_float_dsp_init(&s->fdsp, avctx->flags & CODEC_FLAG_BITEXACT);
-    ff_mpadsp_init(&s->mpadsp);
-
-    if (avctx->request_sample_fmt == OUT_FMT &&
-        avctx->codec_id != AV_CODEC_ID_MP3ON4)
-        avctx->sample_fmt = OUT_FMT;
-    else
-        avctx->sample_fmt = OUT_FMT_P;
-    s->err_recognition = avctx->err_recognition;
-
-    if (avctx->codec_id == AV_CODEC_ID_MP3ADU)
-        s->adu_mode = 1;
-
-    return 0;
-}
-
-#define C3 FIXHR(0.86602540378443864676/2)
-#define C4 FIXHR(0.70710678118654752439/2) //0.5 / cos(pi*(9)/36)
-#define C5 FIXHR(0.51763809020504152469/2) //0.5 / cos(pi*(5)/36)
-#define C6 FIXHR(1.93185165257813657349/4) //0.5 / cos(pi*(15)/36)
-
-/* 12 points IMDCT. We compute it "by hand" by factorizing obvious
-   cases. */
-static void imdct12(INTFLOAT *out, INTFLOAT *in)
-{
-    INTFLOAT in0, in1, in2, in3, in4, in5, t1, t2;
-
-    in0  = in[0*3];
-    in1  = in[1*3] + in[0*3];
-    in2  = in[2*3] + in[1*3];
-    in3  = in[3*3] + in[2*3];
-    in4  = in[4*3] + in[3*3];
-    in5  = in[5*3] + in[4*3];
-    in5 += in3;
-    in3 += in1;
-
-    in2  = MULH3(in2, C3, 2);
-    in3  = MULH3(in3, C3, 4);
-
-    t1   = in0 - in4;
-    t2   = MULH3(in1 - in5, C4, 2);
-
-    out[ 7] =
-    out[10] = t1 + t2;
-    out[ 1] =
-    out[ 4] = t1 - t2;
-
-    in0    += SHR(in4, 1);
-    in4     = in0 + in2;
-    in5    += 2*in1;
-    in1     = MULH3(in5 + in3, C5, 1);
-    out[ 8] =
-    out[ 9] = in4 + in1;
-    out[ 2] =
-    out[ 3] = in4 - in1;
-
-    in0    -= in2;
-    in5     = MULH3(in5 - in3, C6, 2);
-    out[ 0] =
-    out[ 5] = in0 - in5;
-    out[ 6] =
-    out[11] = in0 + in5;
-}
-
-/* return the number of decoded frames */
-static int mp_decode_layer1(MPADecodeContext *s)
-{
-    int bound, i, v, n, ch, j, mant;
-    uint8_t allocation[MPA_MAX_CHANNELS][SBLIMIT];
-    uint8_t scale_factors[MPA_MAX_CHANNELS][SBLIMIT];
-
-    if (s->mode == MPA_JSTEREO)
-        bound = (s->mode_ext + 1) * 4;
-    else
-        bound = SBLIMIT;
-
-    /* allocation bits */
-    for (i = 0; i < bound; i++) {
-        for (ch = 0; ch < s->nb_channels; ch++) {
-            allocation[ch][i] = get_bits(&s->gb, 4);
-        }
-    }
-    for (i = bound; i < SBLIMIT; i++)
-        allocation[0][i] = get_bits(&s->gb, 4);
-
-    /* scale factors */
-    for (i = 0; i < bound; i++) {
-        for (ch = 0; ch < s->nb_channels; ch++) {
-            if (allocation[ch][i])
-                scale_factors[ch][i] = get_bits(&s->gb, 6);
-        }
-    }
-    for (i = bound; i < SBLIMIT; i++) {
-        if (allocation[0][i]) {
-            scale_factors[0][i] = get_bits(&s->gb, 6);
-            scale_factors[1][i] = get_bits(&s->gb, 6);
-        }
-    }
-
-    /* compute samples */
-    for (j = 0; j < 12; j++) {
-        for (i = 0; i < bound; i++) {
-            for (ch = 0; ch < s->nb_channels; ch++) {
-                n = allocation[ch][i];
-                if (n) {
-                    mant = get_bits(&s->gb, n + 1);
-                    v = l1_unscale(n, mant, scale_factors[ch][i]);
-                } else {
-                    v = 0;
-                }
-                s->sb_samples[ch][j][i] = v;
-            }
-        }
-        for (i = bound; i < SBLIMIT; i++) {
-            n = allocation[0][i];
-            if (n) {
-                mant = get_bits(&s->gb, n + 1);
-                v = l1_unscale(n, mant, scale_factors[0][i]);
-                s->sb_samples[0][j][i] = v;
-                v = l1_unscale(n, mant, scale_factors[1][i]);
-                s->sb_samples[1][j][i] = v;
-            } else {
-                s->sb_samples[0][j][i] = 0;
-                s->sb_samples[1][j][i] = 0;
-            }
-        }
-    }
-    return 12;
-}
-
-static int mp_decode_layer2(MPADecodeContext *s)
-{
-    int sblimit; /* number of used subbands */
-    const unsigned char *alloc_table;
-    int table, bit_alloc_bits, i, j, ch, bound, v;
-    unsigned char bit_alloc[MPA_MAX_CHANNELS][SBLIMIT];
-    unsigned char scale_code[MPA_MAX_CHANNELS][SBLIMIT];
-    unsigned char scale_factors[MPA_MAX_CHANNELS][SBLIMIT][3], *sf;
-    int scale, qindex, bits, steps, k, l, m, b;
-
-    /* select decoding table */
-    table = ff_mpa_l2_select_table(s->bit_rate / 1000, s->nb_channels,
-                                   s->sample_rate, s->lsf);
-    sblimit     = ff_mpa_sblimit_table[table];
-    alloc_table = ff_mpa_alloc_tables[table];
-
-    if (s->mode == MPA_JSTEREO)
-        bound = (s->mode_ext + 1) * 4;
-    else
-        bound = sblimit;
-
-    av_dlog(s->avctx, "bound=%d sblimit=%d\n", bound, sblimit);
-
-    /* sanity check */
-    if (bound > sblimit)
-        bound = sblimit;
-
-    /* parse bit allocation */
-    j = 0;
-    for (i = 0; i < bound; i++) {
-        bit_alloc_bits = alloc_table[j];
-        for (ch = 0; ch < s->nb_channels; ch++)
-            bit_alloc[ch][i] = get_bits(&s->gb, bit_alloc_bits);
-        j += 1 << bit_alloc_bits;
-    }
-    for (i = bound; i < sblimit; i++) {
-        bit_alloc_bits = alloc_table[j];
-        v = get_bits(&s->gb, bit_alloc_bits);
-        bit_alloc[0][i] = v;
-        bit_alloc[1][i] = v;
-        j += 1 << bit_alloc_bits;
-    }
-
-    /* scale codes */
-    for (i = 0; i < sblimit; i++) {
-        for (ch = 0; ch < s->nb_channels; ch++) {
-            if (bit_alloc[ch][i])
-                scale_code[ch][i] = get_bits(&s->gb, 2);
-        }
-    }
-
-    /* scale factors */
-    for (i = 0; i < sblimit; i++) {
-        for (ch = 0; ch < s->nb_channels; ch++) {
-            if (bit_alloc[ch][i]) {
-                sf = scale_factors[ch][i];
-                switch (scale_code[ch][i]) {
-                default:
-                case 0:
-                    sf[0] = get_bits(&s->gb, 6);
-                    sf[1] = get_bits(&s->gb, 6);
-                    sf[2] = get_bits(&s->gb, 6);
-                    break;
-                case 2:
-                    sf[0] = get_bits(&s->gb, 6);
-                    sf[1] = sf[0];
-                    sf[2] = sf[0];
-                    break;
-                case 1:
-                    sf[0] = get_bits(&s->gb, 6);
-                    sf[2] = get_bits(&s->gb, 6);
-                    sf[1] = sf[0];
-                    break;
-                case 3:
-                    sf[0] = get_bits(&s->gb, 6);
-                    sf[2] = get_bits(&s->gb, 6);
-                    sf[1] = sf[2];
-                    break;
-                }
-            }
-        }
-    }
-
-    /* samples */
-    for (k = 0; k < 3; k++) {
-        for (l = 0; l < 12; l += 3) {
-            j = 0;
-            for (i = 0; i < bound; i++) {
-                bit_alloc_bits = alloc_table[j];
-                for (ch = 0; ch < s->nb_channels; ch++) {
-                    b = bit_alloc[ch][i];
-                    if (b) {
-                        scale = scale_factors[ch][i][k];
-                        qindex = alloc_table[j+b];
-                        bits = ff_mpa_quant_bits[qindex];
-                        if (bits < 0) {
-                            int v2;
-                            /* 3 values at the same time */
-                            v = get_bits(&s->gb, -bits);
-                            v2 = division_tabs[qindex][v];
-                            steps  = ff_mpa_quant_steps[qindex];
-
-                            s->sb_samples[ch][k * 12 + l + 0][i] =
-                                l2_unscale_group(steps,  v2       & 15, scale);
-                            s->sb_samples[ch][k * 12 + l + 1][i] =
-                                l2_unscale_group(steps, (v2 >> 4) & 15, scale);
-                            s->sb_samples[ch][k * 12 + l + 2][i] =
-                                l2_unscale_group(steps,  v2 >> 8      , scale);
-                        } else {
-                            for (m = 0; m < 3; m++) {
-                                v = get_bits(&s->gb, bits);
-                                v = l1_unscale(bits - 1, v, scale);
-                                s->sb_samples[ch][k * 12 + l + m][i] = v;
-                            }
-                        }
-                    } else {
-                        s->sb_samples[ch][k * 12 + l + 0][i] = 0;
-                        s->sb_samples[ch][k * 12 + l + 1][i] = 0;
-                        s->sb_samples[ch][k * 12 + l + 2][i] = 0;
-                    }
-                }
-                /* next subband in alloc table */
-                j += 1 << bit_alloc_bits;
-            }
-            /* XXX: find a way to avoid this duplication of code */
-            for (i = bound; i < sblimit; i++) {
-                bit_alloc_bits = alloc_table[j];
-                b = bit_alloc[0][i];
-                if (b) {
-                    int mant, scale0, scale1;
-                    scale0 = scale_factors[0][i][k];
-                    scale1 = scale_factors[1][i][k];
-                    qindex = alloc_table[j+b];
-                    bits = ff_mpa_quant_bits[qindex];
-                    if (bits < 0) {
-                        /* 3 values at the same time */
-                        v = get_bits(&s->gb, -bits);
-                        steps = ff_mpa_quant_steps[qindex];
-                        mant = v % steps;
-                        v = v / steps;
-                        s->sb_samples[0][k * 12 + l + 0][i] =
-                            l2_unscale_group(steps, mant, scale0);
-                        s->sb_samples[1][k * 12 + l + 0][i] =
-                            l2_unscale_group(steps, mant, scale1);
-                        mant = v % steps;
-                        v = v / steps;
-                        s->sb_samples[0][k * 12 + l + 1][i] =
-                            l2_unscale_group(steps, mant, scale0);
-                        s->sb_samples[1][k * 12 + l + 1][i] =
-                            l2_unscale_group(steps, mant, scale1);
-                        s->sb_samples[0][k * 12 + l + 2][i] =
-                            l2_unscale_group(steps, v, scale0);
-                        s->sb_samples[1][k * 12 + l + 2][i] =
-                            l2_unscale_group(steps, v, scale1);
-                    } else {
-                        for (m = 0; m < 3; m++) {
-                            mant = get_bits(&s->gb, bits);
-                            s->sb_samples[0][k * 12 + l + m][i] =
-                                l1_unscale(bits - 1, mant, scale0);
-                            s->sb_samples[1][k * 12 + l + m][i] =
-                                l1_unscale(bits - 1, mant, scale1);
-                        }
-                    }
-                } else {
-                    s->sb_samples[0][k * 12 + l + 0][i] = 0;
-                    s->sb_samples[0][k * 12 + l + 1][i] = 0;
-                    s->sb_samples[0][k * 12 + l + 2][i] = 0;
-                    s->sb_samples[1][k * 12 + l + 0][i] = 0;
-                    s->sb_samples[1][k * 12 + l + 1][i] = 0;
-                    s->sb_samples[1][k * 12 + l + 2][i] = 0;
-                }
-                /* next subband in alloc table */
-                j += 1 << bit_alloc_bits;
-            }
-            /* fill remaining samples to zero */
-            for (i = sblimit; i < SBLIMIT; i++) {
-                for (ch = 0; ch < s->nb_channels; ch++) {
-                    s->sb_samples[ch][k * 12 + l + 0][i] = 0;
-                    s->sb_samples[ch][k * 12 + l + 1][i] = 0;
-                    s->sb_samples[ch][k * 12 + l + 2][i] = 0;
-                }
-            }
-        }
-    }
-    return 3 * 12;
-}
-
-#define SPLIT(dst,sf,n)             \
-    if (n == 3) {                   \
-        int m = (sf * 171) >> 9;    \
-        dst   = sf - 3 * m;         \
-        sf    = m;                  \
-    } else if (n == 4) {            \
-        dst  = sf & 3;              \
-        sf >>= 2;                   \
-    } else if (n == 5) {            \
-        int m = (sf * 205) >> 10;   \
-        dst   = sf - 5 * m;         \
-        sf    = m;                  \
-    } else if (n == 6) {            \
-        int m = (sf * 171) >> 10;   \
-        dst   = sf - 6 * m;         \
-        sf    = m;                  \
-    } else {                        \
-        dst = 0;                    \
-    }
-
-static av_always_inline void lsf_sf_expand(int *slen, int sf, int n1, int n2,
-                                           int n3)
-{
-    SPLIT(slen[3], sf, n3)
-    SPLIT(slen[2], sf, n2)
-    SPLIT(slen[1], sf, n1)
-    slen[0] = sf;
-}
-
-static void exponents_from_scale_factors(MPADecodeContext *s, GranuleDef *g,
-                                         int16_t *exponents)
-{
-    const uint8_t *bstab, *pretab;
-    int len, i, j, k, l, v0, shift, gain, gains[3];
-    int16_t *exp_ptr;
-
-    exp_ptr = exponents;
-    gain    = g->global_gain - 210;
-    shift   = g->scalefac_scale + 1;
-
-    bstab  = band_size_long[s->sample_rate_index];
-    pretab = mpa_pretab[g->preflag];
-    for (i = 0; i < g->long_end; i++) {
-        v0 = gain - ((g->scale_factors[i] + pretab[i]) << shift) + 400;
-        len = bstab[i];
-        for (j = len; j > 0; j--)
-            *exp_ptr++ = v0;
-    }
-
-    if (g->short_start < 13) {
-        bstab    = band_size_short[s->sample_rate_index];
-        gains[0] = gain - (g->subblock_gain[0] << 3);
-        gains[1] = gain - (g->subblock_gain[1] << 3);
-        gains[2] = gain - (g->subblock_gain[2] << 3);
-        k        = g->long_end;
-        for (i = g->short_start; i < 13; i++) {
-            len = bstab[i];
-            for (l = 0; l < 3; l++) {
-                v0 = gains[l] - (g->scale_factors[k++] << shift) + 400;
-                for (j = len; j > 0; j--)
-                    *exp_ptr++ = v0;
-            }
-        }
-    }
-}
-
-/* handle n = 0 too */
-static inline int get_bitsz(GetBitContext *s, int n)
-{
-    return n ? get_bits(s, n) : 0;
-}
-
-
-static void switch_buffer(MPADecodeContext *s, int *pos, int *end_pos,
-                          int *end_pos2)
-{
-    if (s->in_gb.buffer && *pos >= s->gb.size_in_bits) {
-        s->gb           = s->in_gb;
-        s->in_gb.buffer = NULL;
-        av_assert2((get_bits_count(&s->gb) & 7) == 0);
-        skip_bits_long(&s->gb, *pos - *end_pos);
-        *end_pos2 =
-        *end_pos  = *end_pos2 + get_bits_count(&s->gb) - *pos;
-        *pos      = get_bits_count(&s->gb);
-    }
-}
-
-/* Following is a optimized code for
-            INTFLOAT v = *src
-            if(get_bits1(&s->gb))
-                v = -v;
-            *dst = v;
-*/
-#if CONFIG_FLOAT
-#define READ_FLIP_SIGN(dst,src)                     \
-    v = AV_RN32A(src) ^ (get_bits1(&s->gb) << 31);  \
-    AV_WN32A(dst, v);
-#else
-#define READ_FLIP_SIGN(dst,src)     \
-    v      = -get_bits1(&s->gb);    \
-    *(dst) = (*(src) ^ v) - v;
-#endif
-
-static int huffman_decode(MPADecodeContext *s, GranuleDef *g,
-                          int16_t *exponents, int end_pos2)
-{
-    int s_index;
-    int i;
-    int last_pos, bits_left;
-    VLC *vlc;
-    int end_pos = FFMIN(end_pos2, s->gb.size_in_bits);
-
-    /* low frequencies (called big values) */
-    s_index = 0;
-    for (i = 0; i < 3; i++) {
-        int j, k, l, linbits;
-        j = g->region_size[i];
-        if (j == 0)
-            continue;
-        /* select vlc table */
-        k       = g->table_select[i];
-        l       = mpa_huff_data[k][0];
-        linbits = mpa_huff_data[k][1];
-        vlc     = &huff_vlc[l];
-
-        if (!l) {
-            memset(&g->sb_hybrid[s_index], 0, sizeof(*g->sb_hybrid) * 2 * j);
-            s_index += 2 * j;
-            continue;
-        }
-
-        /* read huffcode and compute each couple */
-        for (; j > 0; j--) {
-            int exponent, x, y;
-            int v;
-            int pos = get_bits_count(&s->gb);
-
-            if (pos >= end_pos){
-                switch_buffer(s, &pos, &end_pos, &end_pos2);
-                if (pos >= end_pos)
-                    break;
-            }
-            y = get_vlc2(&s->gb, vlc->table, 7, 3);
-
-            if (!y) {
-                g->sb_hybrid[s_index  ] =
-                g->sb_hybrid[s_index+1] = 0;
-                s_index += 2;
-                continue;
-            }
-
-            exponent= exponents[s_index];
-
-            av_dlog(s->avctx, "region=%d n=%d x=%d y=%d exp=%d\n",
-                    i, g->region_size[i] - j, x, y, exponent);
-            if (y & 16) {
-                x = y >> 5;
-                y = y & 0x0f;
-                if (x < 15) {
-                    READ_FLIP_SIGN(g->sb_hybrid + s_index, RENAME(expval_table)[exponent] + x)
-                } else {
-                    x += get_bitsz(&s->gb, linbits);
-                    v  = l3_unscale(x, exponent);
-                    if (get_bits1(&s->gb))
-                        v = -v;
-                    g->sb_hybrid[s_index] = v;
-                }
-                if (y < 15) {
-                    READ_FLIP_SIGN(g->sb_hybrid + s_index + 1, RENAME(expval_table)[exponent] + y)
-                } else {
-                    y += get_bitsz(&s->gb, linbits);
-                    v  = l3_unscale(y, exponent);
-                    if (get_bits1(&s->gb))
-                        v = -v;
-                    g->sb_hybrid[s_index+1] = v;
-                }
-            } else {
-                x = y >> 5;
-                y = y & 0x0f;
-                x += y;
-                if (x < 15) {
-                    READ_FLIP_SIGN(g->sb_hybrid + s_index + !!y, RENAME(expval_table)[exponent] + x)
-                } else {
-                    x += get_bitsz(&s->gb, linbits);
-                    v  = l3_unscale(x, exponent);
-                    if (get_bits1(&s->gb))
-                        v = -v;
-                    g->sb_hybrid[s_index+!!y] = v;
-                }
-                g->sb_hybrid[s_index + !y] = 0;
-            }
-            s_index += 2;
-        }
-    }
-
-    /* high frequencies */
-    vlc = &huff_quad_vlc[g->count1table_select];
-    last_pos = 0;
-    while (s_index <= 572) {
-        int pos, code;
-        pos = get_bits_count(&s->gb);
-        if (pos >= end_pos) {
-            if (pos > end_pos2 && last_pos) {
-                /* some encoders generate an incorrect size for this
-                   part. We must go back into the data */
-                s_index -= 4;
-                skip_bits_long(&s->gb, last_pos - pos);
-                av_log(s->avctx, AV_LOG_INFO, "overread, skip %d enddists: %d %d\n", last_pos - pos, end_pos-pos, end_pos2-pos);
-                if(s->err_recognition & (AV_EF_BITSTREAM|AV_EF_COMPLIANT))
-                    s_index=0;
-                break;
-            }
-            switch_buffer(s, &pos, &end_pos, &end_pos2);
-            if (pos >= end_pos)
-                break;
-        }
-        last_pos = pos;
-
-        code = get_vlc2(&s->gb, vlc->table, vlc->bits, 1);
-        av_dlog(s->avctx, "t=%d code=%d\n", g->count1table_select, code);
-        g->sb_hybrid[s_index+0] =
-        g->sb_hybrid[s_index+1] =
-        g->sb_hybrid[s_index+2] =
-        g->sb_hybrid[s_index+3] = 0;
-        while (code) {
-            static const int idxtab[16] = { 3,3,2,2,1,1,1,1,0,0,0,0,0,0,0,0 };
-            int v;
-            int pos = s_index + idxtab[code];
-            code   ^= 8 >> idxtab[code];
-            READ_FLIP_SIGN(g->sb_hybrid + pos, RENAME(exp_table)+exponents[pos])
-        }
-        s_index += 4;
-    }
-    /* skip extension bits */
-    bits_left = end_pos2 - get_bits_count(&s->gb);
-    if (bits_left < 0 && (s->err_recognition & (AV_EF_BUFFER|AV_EF_COMPLIANT))) {
-        av_log(s->avctx, AV_LOG_ERROR, "bits_left=%d\n", bits_left);
-        s_index=0;
-    } else if (bits_left > 0 && (s->err_recognition & (AV_EF_BUFFER|AV_EF_AGGRESSIVE))) {
-        av_log(s->avctx, AV_LOG_ERROR, "bits_left=%d\n", bits_left);
-        s_index = 0;
-    }
-    memset(&g->sb_hybrid[s_index], 0, sizeof(*g->sb_hybrid) * (576 - s_index));
-    skip_bits_long(&s->gb, bits_left);
-
-    i = get_bits_count(&s->gb);
-    switch_buffer(s, &i, &end_pos, &end_pos2);
-
-    return 0;
-}
-
-/* Reorder short blocks from bitstream order to interleaved order. It
-   would be faster to do it in parsing, but the code would be far more
-   complicated */
-static void reorder_block(MPADecodeContext *s, GranuleDef *g)
-{
-    int i, j, len;
-    INTFLOAT *ptr, *dst, *ptr1;
-    INTFLOAT tmp[576];
-
-    if (g->block_type != 2)
-        return;
-
-    if (g->switch_point) {
-        if (s->sample_rate_index != 8)
-            ptr = g->sb_hybrid + 36;
-        else
-            ptr = g->sb_hybrid + 72;
-    } else {
-        ptr = g->sb_hybrid;
-    }
-
-    for (i = g->short_start; i < 13; i++) {
-        len  = band_size_short[s->sample_rate_index][i];
-        ptr1 = ptr;
-        dst  = tmp;
-        for (j = len; j > 0; j--) {
-            *dst++ = ptr[0*len];
-            *dst++ = ptr[1*len];
-            *dst++ = ptr[2*len];
-            ptr++;
-        }
-        ptr += 2 * len;
-        memcpy(ptr1, tmp, len * 3 * sizeof(*ptr1));
-    }
-}
-
-#define ISQRT2 FIXR(0.70710678118654752440)
-
-static void compute_stereo(MPADecodeContext *s, GranuleDef *g0, GranuleDef *g1)
-{
-    int i, j, k, l;
-    int sf_max, sf, len, non_zero_found;
-    INTFLOAT (*is_tab)[16], *tab0, *tab1, tmp0, tmp1, v1, v2;
-    int non_zero_found_short[3];
-
-    /* intensity stereo */
-    if (s->mode_ext & MODE_EXT_I_STEREO) {
-        if (!s->lsf) {
-            is_tab = is_table;
-            sf_max = 7;
-        } else {
-            is_tab = is_table_lsf[g1->scalefac_compress & 1];
-            sf_max = 16;
-        }
-
-        tab0 = g0->sb_hybrid + 576;
-        tab1 = g1->sb_hybrid + 576;
-
-        non_zero_found_short[0] = 0;
-        non_zero_found_short[1] = 0;
-        non_zero_found_short[2] = 0;
-        k = (13 - g1->short_start) * 3 + g1->long_end - 3;
-        for (i = 12; i >= g1->short_start; i--) {
-            /* for last band, use previous scale factor */
-            if (i != 11)
-                k -= 3;
-            len = band_size_short[s->sample_rate_index][i];
-            for (l = 2; l >= 0; l--) {
-                tab0 -= len;
-                tab1 -= len;
-                if (!non_zero_found_short[l]) {
-                    /* test if non zero band. if so, stop doing i-stereo */
-                    for (j = 0; j < len; j++) {
-                        if (tab1[j] != 0) {
-                            non_zero_found_short[l] = 1;
-                            goto found1;
-                        }
-                    }
-                    sf = g1->scale_factors[k + l];
-                    if (sf >= sf_max)
-                        goto found1;
-
-                    v1 = is_tab[0][sf];
-                    v2 = is_tab[1][sf];
-                    for (j = 0; j < len; j++) {
-                        tmp0    = tab0[j];
-                        tab0[j] = MULLx(tmp0, v1, FRAC_BITS);
-                        tab1[j] = MULLx(tmp0, v2, FRAC_BITS);
-                    }
-                } else {
-found1:
-                    if (s->mode_ext & MODE_EXT_MS_STEREO) {
-                        /* lower part of the spectrum : do ms stereo
-                           if enabled */
-                        for (j = 0; j < len; j++) {
-                            tmp0    = tab0[j];
-                            tmp1    = tab1[j];
-                            tab0[j] = MULLx(tmp0 + tmp1, ISQRT2, FRAC_BITS);
-                            tab1[j] = MULLx(tmp0 - tmp1, ISQRT2, FRAC_BITS);
-                        }
-                    }
-                }
-            }
-        }
-
-        non_zero_found = non_zero_found_short[0] |
-                         non_zero_found_short[1] |
-                         non_zero_found_short[2];
-
-        for (i = g1->long_end - 1;i >= 0;i--) {
-            len   = band_size_long[s->sample_rate_index][i];
-            tab0 -= len;
-            tab1 -= len;
-            /* test if non zero band. if so, stop doing i-stereo */
-            if (!non_zero_found) {
-                for (j = 0; j < len; j++) {
-                    if (tab1[j] != 0) {
-                        non_zero_found = 1;
-                        goto found2;
-                    }
-                }
-                /* for last band, use previous scale factor */
-                k  = (i == 21) ? 20 : i;
-                sf = g1->scale_factors[k];
-                if (sf >= sf_max)
-                    goto found2;
-                v1 = is_tab[0][sf];
-                v2 = is_tab[1][sf];
-                for (j = 0; j < len; j++) {
-                    tmp0    = tab0[j];
-                    tab0[j] = MULLx(tmp0, v1, FRAC_BITS);
-                    tab1[j] = MULLx(tmp0, v2, FRAC_BITS);
-                }
-            } else {
-found2:
-                if (s->mode_ext & MODE_EXT_MS_STEREO) {
-                    /* lower part of the spectrum : do ms stereo
-                       if enabled */
-                    for (j = 0; j < len; j++) {
-                        tmp0    = tab0[j];
-                        tmp1    = tab1[j];
-                        tab0[j] = MULLx(tmp0 + tmp1, ISQRT2, FRAC_BITS);
-                        tab1[j] = MULLx(tmp0 - tmp1, ISQRT2, FRAC_BITS);
-                    }
-                }
-            }
-        }
-    } else if (s->mode_ext & MODE_EXT_MS_STEREO) {
-        /* ms stereo ONLY */
-        /* NOTE: the 1/sqrt(2) normalization factor is included in the
-           global gain */
-#if CONFIG_FLOAT
-       s->fdsp.butterflies_float(g0->sb_hybrid, g1->sb_hybrid, 576);
-#else
-        tab0 = g0->sb_hybrid;
-        tab1 = g1->sb_hybrid;
-        for (i = 0; i < 576; i++) {
-            tmp0    = tab0[i];
-            tmp1    = tab1[i];
-            tab0[i] = tmp0 + tmp1;
-            tab1[i] = tmp0 - tmp1;
-        }
-#endif
-    }
-}
-
-#if CONFIG_FLOAT
-#if HAVE_MIPSFPU
-#   include "mips/compute_antialias_float.h"
-#endif /* HAVE_MIPSFPU */
-#else
-#if HAVE_MIPSDSPR1
-#   include "mips/compute_antialias_fixed.h"
-#endif /* HAVE_MIPSDSPR1 */
-#endif /* CONFIG_FLOAT */
-
-#ifndef compute_antialias
-#if CONFIG_FLOAT
-#define AA(j) do {                                                      \
-        float tmp0 = ptr[-1-j];                                         \
-        float tmp1 = ptr[   j];                                         \
-        ptr[-1-j] = tmp0 * csa_table[j][0] - tmp1 * csa_table[j][1];    \
-        ptr[   j] = tmp0 * csa_table[j][1] + tmp1 * csa_table[j][0];    \
-    } while (0)
-#else
-#define AA(j) do {                                              \
-        int tmp0 = ptr[-1-j];                                   \
-        int tmp1 = ptr[   j];                                   \
-        int tmp2 = MULH(tmp0 + tmp1, csa_table[j][0]);          \
-        ptr[-1-j] = 4 * (tmp2 - MULH(tmp1, csa_table[j][2]));   \
-        ptr[   j] = 4 * (tmp2 + MULH(tmp0, csa_table[j][3]));   \
-    } while (0)
-#endif
-
-static void compute_antialias(MPADecodeContext *s, GranuleDef *g)
-{
-    INTFLOAT *ptr;
-    int n, i;
-
-    /* we antialias only "long" bands */
-    if (g->block_type == 2) {
-        if (!g->switch_point)
-            return;
-        /* XXX: check this for 8000Hz case */
-        n = 1;
-    } else {
-        n = SBLIMIT - 1;
-    }
-
-    ptr = g->sb_hybrid + 18;
-    for (i = n; i > 0; i--) {
-        AA(0);
-        AA(1);
-        AA(2);
-        AA(3);
-        AA(4);
-        AA(5);
-        AA(6);
-        AA(7);
-
-        ptr += 18;
-    }
-}
-#endif /* compute_antialias */
-
-static void compute_imdct(MPADecodeContext *s, GranuleDef *g,
-                          INTFLOAT *sb_samples, INTFLOAT *mdct_buf)
-{
-    INTFLOAT *win, *out_ptr, *ptr, *buf, *ptr1;
-    INTFLOAT out2[12];
-    int i, j, mdct_long_end, sblimit;
-
-    /* find last non zero block */
-    ptr  = g->sb_hybrid + 576;
-    ptr1 = g->sb_hybrid + 2 * 18;
-    while (ptr >= ptr1) {
-        int32_t *p;
-        ptr -= 6;
-        p    = (int32_t*)ptr;
-        if (p[0] | p[1] | p[2] | p[3] | p[4] | p[5])
-            break;
-    }
-    sblimit = ((ptr - g->sb_hybrid) / 18) + 1;
-
-    if (g->block_type == 2) {
-        /* XXX: check for 8000 Hz */
-        if (g->switch_point)
-            mdct_long_end = 2;
-        else
-            mdct_long_end = 0;
-    } else {
-        mdct_long_end = sblimit;
-    }
-
-    s->mpadsp.RENAME(imdct36_blocks)(sb_samples, mdct_buf, g->sb_hybrid,
-                                     mdct_long_end, g->switch_point,
-                                     g->block_type);
-
-    buf = mdct_buf + 4*18*(mdct_long_end >> 2) + (mdct_long_end & 3);
-    ptr = g->sb_hybrid + 18 * mdct_long_end;
-
-    for (j = mdct_long_end; j < sblimit; j++) {
-        /* select frequency inversion */
-        win     = RENAME(ff_mdct_win)[2 + (4  & -(j & 1))];
-        out_ptr = sb_samples + j;
-
-        for (i = 0; i < 6; i++) {
-            *out_ptr = buf[4*i];
-            out_ptr += SBLIMIT;
-        }
-        imdct12(out2, ptr + 0);
-        for (i = 0; i < 6; i++) {
-            *out_ptr     = MULH3(out2[i    ], win[i    ], 1) + buf[4*(i + 6*1)];
-            buf[4*(i + 6*2)] = MULH3(out2[i + 6], win[i + 6], 1);
-            out_ptr += SBLIMIT;
-        }
-        imdct12(out2, ptr + 1);
-        for (i = 0; i < 6; i++) {
-            *out_ptr     = MULH3(out2[i    ], win[i    ], 1) + buf[4*(i + 6*2)];
-            buf[4*(i + 6*0)] = MULH3(out2[i + 6], win[i + 6], 1);
-            out_ptr += SBLIMIT;
-        }
-        imdct12(out2, ptr + 2);
-        for (i = 0; i < 6; i++) {
-            buf[4*(i + 6*0)] = MULH3(out2[i    ], win[i    ], 1) + buf[4*(i + 6*0)];
-            buf[4*(i + 6*1)] = MULH3(out2[i + 6], win[i + 6], 1);
-            buf[4*(i + 6*2)] = 0;
-        }
-        ptr += 18;
-        buf += (j&3) != 3 ? 1 : (4*18-3);
-    }
-    /* zero bands */
-    for (j = sblimit; j < SBLIMIT; j++) {
-        /* overlap */
-        out_ptr = sb_samples + j;
-        for (i = 0; i < 18; i++) {
-            *out_ptr = buf[4*i];
-            buf[4*i]   = 0;
-            out_ptr += SBLIMIT;
-        }
-        buf += (j&3) != 3 ? 1 : (4*18-3);
-    }
-}
-
-/* main layer3 decoding function */
-static int mp_decode_layer3(MPADecodeContext *s)
-{
-    int nb_granules, main_data_begin;
-    int gr, ch, blocksplit_flag, i, j, k, n, bits_pos;
-    GranuleDef *g;
-    int16_t exponents[576]; //FIXME try INTFLOAT
-
-    /* read side info */
-    if (s->lsf) {
-        main_data_begin = get_bits(&s->gb, 8);
-        skip_bits(&s->gb, s->nb_channels);
-        nb_granules = 1;
-    } else {
-        main_data_begin = get_bits(&s->gb, 9);
-        if (s->nb_channels == 2)
-            skip_bits(&s->gb, 3);
-        else
-            skip_bits(&s->gb, 5);
-        nb_granules = 2;
-        for (ch = 0; ch < s->nb_channels; ch++) {
-            s->granules[ch][0].scfsi = 0;/* all scale factors are transmitted */
-            s->granules[ch][1].scfsi = get_bits(&s->gb, 4);
-        }
-    }
-
-    for (gr = 0; gr < nb_granules; gr++) {
-        for (ch = 0; ch < s->nb_channels; ch++) {
-            av_dlog(s->avctx, "gr=%d ch=%d: side_info\n", gr, ch);
-            g = &s->granules[ch][gr];
-            g->part2_3_length = get_bits(&s->gb, 12);
-            g->big_values     = get_bits(&s->gb,  9);
-            if (g->big_values > 288) {
-                av_log(s->avctx, AV_LOG_ERROR, "big_values too big\n");
-                return AVERROR_INVALIDDATA;
-            }
-
-            g->global_gain = get_bits(&s->gb, 8);
-            /* if MS stereo only is selected, we precompute the
-               1/sqrt(2) renormalization factor */
-            if ((s->mode_ext & (MODE_EXT_MS_STEREO | MODE_EXT_I_STEREO)) ==
-                MODE_EXT_MS_STEREO)
-                g->global_gain -= 2;
-            if (s->lsf)
-                g->scalefac_compress = get_bits(&s->gb, 9);
-            else
-                g->scalefac_compress = get_bits(&s->gb, 4);
-            blocksplit_flag = get_bits1(&s->gb);
-            if (blocksplit_flag) {
-                g->block_type = get_bits(&s->gb, 2);
-                if (g->block_type == 0) {
-                    av_log(s->avctx, AV_LOG_ERROR, "invalid block type\n");
-                    return AVERROR_INVALIDDATA;
-                }
-                g->switch_point = get_bits1(&s->gb);
-                for (i = 0; i < 2; i++)
-                    g->table_select[i] = get_bits(&s->gb, 5);
-                for (i = 0; i < 3; i++)
-                    g->subblock_gain[i] = get_bits(&s->gb, 3);
-                init_short_region(s, g);
-            } else {
-                int region_address1, region_address2;
-                g->block_type = 0;
-                g->switch_point = 0;
-                for (i = 0; i < 3; i++)
-                    g->table_select[i] = get_bits(&s->gb, 5);
-                /* compute huffman coded region sizes */
-                region_address1 = get_bits(&s->gb, 4);
-                region_address2 = get_bits(&s->gb, 3);
-                av_dlog(s->avctx, "region1=%d region2=%d\n",
-                        region_address1, region_address2);
-                init_long_region(s, g, region_address1, region_address2);
-            }
-            region_offset2size(g);
-            compute_band_indexes(s, g);
-
-            g->preflag = 0;
-            if (!s->lsf)
-                g->preflag = get_bits1(&s->gb);
-            g->scalefac_scale     = get_bits1(&s->gb);
-            g->count1table_select = get_bits1(&s->gb);
-            av_dlog(s->avctx, "block_type=%d switch_point=%d\n",
-                    g->block_type, g->switch_point);
-        }
-    }
-
-    if (!s->adu_mode) {
-        int skip;
-        const uint8_t *ptr = s->gb.buffer + (get_bits_count(&s->gb)>>3);
-        int extrasize = av_clip(get_bits_left(&s->gb) >> 3, 0, EXTRABYTES);
-        av_assert1((get_bits_count(&s->gb) & 7) == 0);
-        /* now we get bits from the main_data_begin offset */
-        av_dlog(s->avctx, "seekback:%d, lastbuf:%d\n",
-                main_data_begin, s->last_buf_size);
-
-        memcpy(s->last_buf + s->last_buf_size, ptr, extrasize);
-        s->in_gb = s->gb;
-        init_get_bits(&s->gb, s->last_buf, s->last_buf_size*8);
-#if !UNCHECKED_BITSTREAM_READER
-        s->gb.size_in_bits_plus8 += FFMAX(extrasize, LAST_BUF_SIZE - s->last_buf_size) * 8;
-#endif
-        s->last_buf_size <<= 3;
-        for (gr = 0; gr < nb_granules && (s->last_buf_size >> 3) < main_data_begin; gr++) {
-            for (ch = 0; ch < s->nb_channels; ch++) {
-                g = &s->granules[ch][gr];
-                s->last_buf_size += g->part2_3_length;
-                memset(g->sb_hybrid, 0, sizeof(g->sb_hybrid));
-                compute_imdct(s, g, &s->sb_samples[ch][18 * gr][0], s->mdct_buf[ch]);
-            }
-        }
-        skip = s->last_buf_size - 8 * main_data_begin;
-        if (skip >= s->gb.size_in_bits && s->in_gb.buffer) {
-            skip_bits_long(&s->in_gb, skip - s->gb.size_in_bits);
-            s->gb           = s->in_gb;
-            s->in_gb.buffer = NULL;
-        } else {
-            skip_bits_long(&s->gb, skip);
-        }
-    } else {
-        gr = 0;
-    }
-
-    for (; gr < nb_granules; gr++) {
-        for (ch = 0; ch < s->nb_channels; ch++) {
-            g = &s->granules[ch][gr];
-            bits_pos = get_bits_count(&s->gb);
-
-            if (!s->lsf) {
-                uint8_t *sc;
-                int slen, slen1, slen2;
-
-                /* MPEG1 scale factors */
-                slen1 = slen_table[0][g->scalefac_compress];
-                slen2 = slen_table[1][g->scalefac_compress];
-                av_dlog(s->avctx, "slen1=%d slen2=%d\n", slen1, slen2);
-                if (g->block_type == 2) {
-                    n = g->switch_point ? 17 : 18;
-                    j = 0;
-                    if (slen1) {
-                        for (i = 0; i < n; i++)
-                            g->scale_factors[j++] = get_bits(&s->gb, slen1);
-                    } else {
-                        for (i = 0; i < n; i++)
-                            g->scale_factors[j++] = 0;
-                    }
-                    if (slen2) {
-                        for (i = 0; i < 18; i++)
-                            g->scale_factors[j++] = get_bits(&s->gb, slen2);
-                        for (i = 0; i < 3; i++)
-                            g->scale_factors[j++] = 0;
-                    } else {
-                        for (i = 0; i < 21; i++)
-                            g->scale_factors[j++] = 0;
-                    }
-                } else {
-                    sc = s->granules[ch][0].scale_factors;
-                    j = 0;
-                    for (k = 0; k < 4; k++) {
-                        n = k == 0 ? 6 : 5;
-                        if ((g->scfsi & (0x8 >> k)) == 0) {
-                            slen = (k < 2) ? slen1 : slen2;
-                            if (slen) {
-                                for (i = 0; i < n; i++)
-                                    g->scale_factors[j++] = get_bits(&s->gb, slen);
-                            } else {
-                                for (i = 0; i < n; i++)
-                                    g->scale_factors[j++] = 0;
-                            }
-                        } else {
-                            /* simply copy from last granule */
-                            for (i = 0; i < n; i++) {
-                                g->scale_factors[j] = sc[j];
-                                j++;
-                            }
-                        }
-                    }
-                    g->scale_factors[j++] = 0;
-                }
-            } else {
-                int tindex, tindex2, slen[4], sl, sf;
-
-                /* LSF scale factors */
-                if (g->block_type == 2)
-                    tindex = g->switch_point ? 2 : 1;
-                else
-                    tindex = 0;
-
-                sf = g->scalefac_compress;
-                if ((s->mode_ext & MODE_EXT_I_STEREO) && ch == 1) {
-                    /* intensity stereo case */
-                    sf >>= 1;
-                    if (sf < 180) {
-                        lsf_sf_expand(slen, sf, 6, 6, 0);
-                        tindex2 = 3;
-                    } else if (sf < 244) {
-                        lsf_sf_expand(slen, sf - 180, 4, 4, 0);
-                        tindex2 = 4;
-                    } else {
-                        lsf_sf_expand(slen, sf - 244, 3, 0, 0);
-                        tindex2 = 5;
-                    }
-                } else {
-                    /* normal case */
-                    if (sf < 400) {
-                        lsf_sf_expand(slen, sf, 5, 4, 4);
-                        tindex2 = 0;
-                    } else if (sf < 500) {
-                        lsf_sf_expand(slen, sf - 400, 5, 4, 0);
-                        tindex2 = 1;
-                    } else {
-                        lsf_sf_expand(slen, sf - 500, 3, 0, 0);
-                        tindex2 = 2;
-                        g->preflag = 1;
-                    }
-                }
-
-                j = 0;
-                for (k = 0; k < 4; k++) {
-                    n  = lsf_nsf_table[tindex2][tindex][k];
-                    sl = slen[k];
-                    if (sl) {
-                        for (i = 0; i < n; i++)
-                            g->scale_factors[j++] = get_bits(&s->gb, sl);
-                    } else {
-                        for (i = 0; i < n; i++)
-                            g->scale_factors[j++] = 0;
-                    }
-                }
-                /* XXX: should compute exact size */
-                for (; j < 40; j++)
-                    g->scale_factors[j] = 0;
-            }
-
-            exponents_from_scale_factors(s, g, exponents);
-
-            /* read Huffman coded residue */
-            huffman_decode(s, g, exponents, bits_pos + g->part2_3_length);
-        } /* ch */
-
-        if (s->mode == MPA_JSTEREO)
-            compute_stereo(s, &s->granules[0][gr], &s->granules[1][gr]);
-
-        for (ch = 0; ch < s->nb_channels; ch++) {
-            g = &s->granules[ch][gr];
-
-            reorder_block(s, g);
-            compute_antialias(s, g);
-            compute_imdct(s, g, &s->sb_samples[ch][18 * gr][0], s->mdct_buf[ch]);
-        }
-    } /* gr */
-    if (get_bits_count(&s->gb) < 0)
-        skip_bits_long(&s->gb, -get_bits_count(&s->gb));
-    return nb_granules * 18;
-}
-
-static int mp_decode_frame(MPADecodeContext *s, OUT_INT **samples,
-                           const uint8_t *buf, int buf_size)
-{
-    int i, nb_frames, ch, ret;
-    OUT_INT *samples_ptr;
-
-    init_get_bits(&s->gb, buf + HEADER_SIZE, (buf_size - HEADER_SIZE) * 8);
-
-    /* skip error protection field */
-    if (s->error_protection)
-        skip_bits(&s->gb, 16);
-
-    switch(s->layer) {
-    case 1:
-        s->avctx->frame_size = 384;
-        nb_frames = mp_decode_layer1(s);
-        break;
-    case 2:
-        s->avctx->frame_size = 1152;
-        nb_frames = mp_decode_layer2(s);
-        break;
-    case 3:
-        s->avctx->frame_size = s->lsf ? 576 : 1152;
-    default:
-        nb_frames = mp_decode_layer3(s);
-
-        s->last_buf_size=0;
-        if (s->in_gb.buffer) {
-            align_get_bits(&s->gb);
-            i = get_bits_left(&s->gb)>>3;
-            if (i >= 0 && i <= BACKSTEP_SIZE) {
-                memmove(s->last_buf, s->gb.buffer + (get_bits_count(&s->gb)>>3), i);
-                s->last_buf_size=i;
-            } else
-                av_log(s->avctx, AV_LOG_ERROR, "invalid old backstep %d\n", i);
-            s->gb           = s->in_gb;
-            s->in_gb.buffer = NULL;
-        }
-
-        align_get_bits(&s->gb);
-        av_assert1((get_bits_count(&s->gb) & 7) == 0);
-        i = get_bits_left(&s->gb) >> 3;
-
-        if (i < 0 || i > BACKSTEP_SIZE || nb_frames < 0) {
-            if (i < 0)
-                av_log(s->avctx, AV_LOG_ERROR, "invalid new backstep %d\n", i);
-            i = FFMIN(BACKSTEP_SIZE, buf_size - HEADER_SIZE);
-        }
-        av_assert1(i <= buf_size - HEADER_SIZE && i >= 0);
-        memcpy(s->last_buf + s->last_buf_size, s->gb.buffer + buf_size - HEADER_SIZE - i, i);
-        s->last_buf_size += i;
-    }
-
-    if(nb_frames < 0)
-        return nb_frames;
-
-    /* get output buffer */
-    if (!samples) {
-        av_assert0(s->frame != NULL);
-        s->frame->nb_samples = s->avctx->frame_size;
-        if ((ret = ff_get_buffer(s->avctx, s->frame, 0)) < 0)
-            return ret;
-        samples = (OUT_INT **)s->frame->extended_data;
-    }
-
-    /* apply the synthesis filter */
-    for (ch = 0; ch < s->nb_channels; ch++) {
-        int sample_stride;
-        if (s->avctx->sample_fmt == OUT_FMT_P) {
-            samples_ptr   = samples[ch];
-            sample_stride = 1;
-        } else {
-            samples_ptr   = samples[0] + ch;
-            sample_stride = s->nb_channels;
-        }
-        for (i = 0; i < nb_frames; i++) {
-            RENAME(ff_mpa_synth_filter)(&s->mpadsp, s->synth_buf[ch],
-                                        &(s->synth_buf_offset[ch]),
-                                        RENAME(ff_mpa_synth_window),
-                                        &s->dither_state, samples_ptr,
-                                        sample_stride, s->sb_samples[ch][i]);
-            samples_ptr += 32 * sample_stride;
-        }
-    }
-
-    return nb_frames * 32 * sizeof(OUT_INT) * s->nb_channels;
-}
-
-static int decode_frame(AVCodecContext * avctx, void *data, int *got_frame_ptr,
-                        AVPacket *avpkt)
-{
-    const uint8_t *buf  = avpkt->data;
-    int buf_size        = avpkt->size;
-    MPADecodeContext *s = avctx->priv_data;
-    uint32_t header;
-    int ret;
-
-    while(buf_size && !*buf){
-        buf++;
-        buf_size--;
-    }
-
-    if (buf_size < HEADER_SIZE)
-        return AVERROR_INVALIDDATA;
-
-    header = AV_RB32(buf);
-    if (header>>8 == AV_RB32("TAG")>>8) {
-        av_log(avctx, AV_LOG_DEBUG, "discarding ID3 tag\n");
-        return buf_size;
-    }
-    if (ff_mpa_check_header(header) < 0) {
-        av_log(avctx, AV_LOG_ERROR, "Header missing\n");
-        return AVERROR_INVALIDDATA;
-    }
-
-    if (avpriv_mpegaudio_decode_header((MPADecodeHeader *)s, header) == 1) {
-        /* free format: prepare to compute frame size */
-        s->frame_size = -1;
-        return AVERROR_INVALIDDATA;
-    }
-    /* update codec info */
-    avctx->channels       = s->nb_channels;
-    avctx->channel_layout = s->nb_channels == 1 ? AV_CH_LAYOUT_MONO : AV_CH_LAYOUT_STEREO;
-    if (!avctx->bit_rate)
-        avctx->bit_rate = s->bit_rate;
-
-    if (s->frame_size <= 0 || s->frame_size > buf_size) {
-        av_log(avctx, AV_LOG_ERROR, "incomplete frame\n");
-        return AVERROR_INVALIDDATA;
-    } else if (s->frame_size < buf_size) {
-        av_log(avctx, AV_LOG_DEBUG, "incorrect frame size - multiple frames in buffer?\n");
-        buf_size= s->frame_size;
-    }
-
-    s->frame = data;
-
-    ret = mp_decode_frame(s, NULL, buf, buf_size);
-    if (ret >= 0) {
-        s->frame->nb_samples = avctx->frame_size;
-        *got_frame_ptr       = 1;
-        avctx->sample_rate   = s->sample_rate;
-        //FIXME maybe move the other codec info stuff from above here too
-    } else {
-        av_log(avctx, AV_LOG_ERROR, "Error while decoding MPEG audio frame.\n");
-        /* Only return an error if the bad frame makes up the whole packet or
-         * the error is related to buffer management.
-         * If there is more data in the packet, just consume the bad frame
-         * instead of returning an error, which would discard the whole
-         * packet. */
-        *got_frame_ptr = 0;
-        if (buf_size == avpkt->size || ret != AVERROR_INVALIDDATA)
-            return ret;
-    }
-    s->frame_size = 0;
-    return buf_size;
-}
-
-static void mp_flush(MPADecodeContext *ctx)
-{
-    memset(ctx->synth_buf, 0, sizeof(ctx->synth_buf));
-    ctx->last_buf_size = 0;
-}
-
-static void flush(AVCodecContext *avctx)
-{
-    mp_flush(avctx->priv_data);
-}
-
-#if CONFIG_MP3ADU_DECODER || CONFIG_MP3ADUFLOAT_DECODER
-static int decode_frame_adu(AVCodecContext *avctx, void *data,
-                            int *got_frame_ptr, AVPacket *avpkt)
-{
-    const uint8_t *buf  = avpkt->data;
-    int buf_size        = avpkt->size;
-    MPADecodeContext *s = avctx->priv_data;
-    uint32_t header;
-    int len, ret;
-    int av_unused out_size;
-
-    len = buf_size;
-
-    // Discard too short frames
-    if (buf_size < HEADER_SIZE) {
-        av_log(avctx, AV_LOG_ERROR, "Packet is too small\n");
-        return AVERROR_INVALIDDATA;
-    }
-
-
-    if (len > MPA_MAX_CODED_FRAME_SIZE)
-        len = MPA_MAX_CODED_FRAME_SIZE;
-
-    // Get header and restore sync word
-    header = AV_RB32(buf) | 0xffe00000;
-
-    if (ff_mpa_check_header(header) < 0) { // Bad header, discard frame
-        av_log(avctx, AV_LOG_ERROR, "Invalid frame header\n");
-        return AVERROR_INVALIDDATA;
-    }
-
-    avpriv_mpegaudio_decode_header((MPADecodeHeader *)s, header);
-    /* update codec info */
-    avctx->sample_rate = s->sample_rate;
-    avctx->channels    = s->nb_channels;
-    if (!avctx->bit_rate)
-        avctx->bit_rate = s->bit_rate;
-
-    s->frame_size = len;
-
-    s->frame = data;
-
-    ret = mp_decode_frame(s, NULL, buf, buf_size);
-    if (ret < 0) {
-        av_log(avctx, AV_LOG_ERROR, "Error while decoding MPEG audio frame.\n");
-        return ret;
-    }
-
-    *got_frame_ptr = 1;
-
-    return buf_size;
-}
-#endif /* CONFIG_MP3ADU_DECODER || CONFIG_MP3ADUFLOAT_DECODER */
-
-#if CONFIG_MP3ON4_DECODER || CONFIG_MP3ON4FLOAT_DECODER
-
-/**
- * Context for MP3On4 decoder
- */
-typedef struct MP3On4DecodeContext {
-    int frames;                     ///< number of mp3 frames per block (number of mp3 decoder instances)
-    int syncword;                   ///< syncword patch
-    const uint8_t *coff;            ///< channel offsets in output buffer
-    MPADecodeContext *mp3decctx[5]; ///< MPADecodeContext for every decoder instance
-} MP3On4DecodeContext;
-
-#include "mpeg4audio.h"
-
-/* Next 3 arrays are indexed by channel config number (passed via codecdata) */
-
-/* number of mp3 decoder instances */
-static const uint8_t mp3Frames[8] = { 0, 1, 1, 2, 3, 3, 4, 5 };
-
-/* offsets into output buffer, assume output order is FL FR C LFE BL BR SL SR */
-static const uint8_t chan_offset[8][5] = {
-    { 0             },
-    { 0             },  // C
-    { 0             },  // FLR
-    { 2, 0          },  // C FLR
-    { 2, 0, 3       },  // C FLR BS
-    { 2, 0, 3       },  // C FLR BLRS
-    { 2, 0, 4, 3    },  // C FLR BLRS LFE
-    { 2, 0, 6, 4, 3 },  // C FLR BLRS BLR LFE
-};
-
-/* mp3on4 channel layouts */
-static const int16_t chan_layout[8] = {
-    0,
-    AV_CH_LAYOUT_MONO,
-    AV_CH_LAYOUT_STEREO,
-    AV_CH_LAYOUT_SURROUND,
-    AV_CH_LAYOUT_4POINT0,
-    AV_CH_LAYOUT_5POINT0,
-    AV_CH_LAYOUT_5POINT1,
-    AV_CH_LAYOUT_7POINT1
-};
-
-static av_cold int decode_close_mp3on4(AVCodecContext * avctx)
-{
-    MP3On4DecodeContext *s = avctx->priv_data;
-    int i;
-
-    for (i = 0; i < s->frames; i++)
-        av_free(s->mp3decctx[i]);
-
-    return 0;
-}
-
-
-static av_cold int decode_init_mp3on4(AVCodecContext * avctx)
-{
-    MP3On4DecodeContext *s = avctx->priv_data;
-    MPEG4AudioConfig cfg;
-    int i;
-
-    if ((avctx->extradata_size < 2) || (avctx->extradata == NULL)) {
-        av_log(avctx, AV_LOG_ERROR, "Codec extradata missing or too short.\n");
-        return AVERROR_INVALIDDATA;
-    }
-
-    avpriv_mpeg4audio_get_config(&cfg, avctx->extradata,
-                                 avctx->extradata_size * 8, 1);
-    if (!cfg.chan_config || cfg.chan_config > 7) {
-        av_log(avctx, AV_LOG_ERROR, "Invalid channel config number.\n");
-        return AVERROR_INVALIDDATA;
-    }
-    s->frames             = mp3Frames[cfg.chan_config];
-    s->coff               = chan_offset[cfg.chan_config];
-    avctx->channels       = ff_mpeg4audio_channels[cfg.chan_config];
-    avctx->channel_layout = chan_layout[cfg.chan_config];
-
-    if (cfg.sample_rate < 16000)
-        s->syncword = 0xffe00000;
-    else
-        s->syncword = 0xfff00000;
-
-    /* Init the first mp3 decoder in standard way, so that all tables get builded
-     * We replace avctx->priv_data with the context of the first decoder so that
-     * decode_init() does not have to be changed.
-     * Other decoders will be initialized here copying data from the first context
-     */
-    // Allocate zeroed memory for the first decoder context
-    s->mp3decctx[0] = av_mallocz(sizeof(MPADecodeContext));
-    if (!s->mp3decctx[0])
-        goto alloc_fail;
-    // Put decoder context in place to make init_decode() happy
-    avctx->priv_data = s->mp3decctx[0];
-    decode_init(avctx);
-    // Restore mp3on4 context pointer
-    avctx->priv_data = s;
-    s->mp3decctx[0]->adu_mode = 1; // Set adu mode
-
-    /* Create a separate codec/context for each frame (first is already ok).
-     * Each frame is 1 or 2 channels - up to 5 frames allowed
-     */
-    for (i = 1; i < s->frames; i++) {
-        s->mp3decctx[i] = av_mallocz(sizeof(MPADecodeContext));
-        if (!s->mp3decctx[i])
-            goto alloc_fail;
-        s->mp3decctx[i]->adu_mode = 1;
-        s->mp3decctx[i]->avctx = avctx;
-        s->mp3decctx[i]->mpadsp = s->mp3decctx[0]->mpadsp;
-    }
-
-    return 0;
-alloc_fail:
-    decode_close_mp3on4(avctx);
-    return AVERROR(ENOMEM);
-}
-
-
-static void flush_mp3on4(AVCodecContext *avctx)
-{
-    int i;
-    MP3On4DecodeContext *s = avctx->priv_data;
-
-    for (i = 0; i < s->frames; i++)
-        mp_flush(s->mp3decctx[i]);
-}
-
-
-static int decode_frame_mp3on4(AVCodecContext *avctx, void *data,
-                               int *got_frame_ptr, AVPacket *avpkt)
-{
-    AVFrame *frame         = data;
-    const uint8_t *buf     = avpkt->data;
-    int buf_size           = avpkt->size;
-    MP3On4DecodeContext *s = avctx->priv_data;
-    MPADecodeContext *m;
-    int fsize, len = buf_size, out_size = 0;
-    uint32_t header;
-    OUT_INT **out_samples;
-    OUT_INT *outptr[2];
-    int fr, ch, ret;
-
-    /* get output buffer */
-    frame->nb_samples = MPA_FRAME_SIZE;
-    if ((ret = ff_get_buffer(avctx, frame, 0)) < 0)
-        return ret;
-    out_samples = (OUT_INT **)frame->extended_data;
-
-    // Discard too short frames
-    if (buf_size < HEADER_SIZE)
-        return AVERROR_INVALIDDATA;
-
-    avctx->bit_rate = 0;
-
-    ch = 0;
-    for (fr = 0; fr < s->frames; fr++) {
-        fsize = AV_RB16(buf) >> 4;
-        fsize = FFMIN3(fsize, len, MPA_MAX_CODED_FRAME_SIZE);
-        m     = s->mp3decctx[fr];
-        av_assert1(m);
-
-        if (fsize < HEADER_SIZE) {
-            av_log(avctx, AV_LOG_ERROR, "Frame size smaller than header size\n");
-            return AVERROR_INVALIDDATA;
-        }
-        header = (AV_RB32(buf) & 0x000fffff) | s->syncword; // patch header
-
-        if (ff_mpa_check_header(header) < 0) // Bad header, discard block
-            break;
-
-        avpriv_mpegaudio_decode_header((MPADecodeHeader *)m, header);
-
-        if (ch + m->nb_channels > avctx->channels ||
-            s->coff[fr] + m->nb_channels > avctx->channels) {
-            av_log(avctx, AV_LOG_ERROR, "frame channel count exceeds codec "
-                                        "channel count\n");
-            return AVERROR_INVALIDDATA;
-        }
-        ch += m->nb_channels;
-
-        outptr[0] = out_samples[s->coff[fr]];
-        if (m->nb_channels > 1)
-            outptr[1] = out_samples[s->coff[fr] + 1];
-
-        if ((ret = mp_decode_frame(m, outptr, buf, fsize)) < 0)
-            return ret;
-
-        out_size += ret;
-        buf      += fsize;
-        len      -= fsize;
-
-        avctx->bit_rate += m->bit_rate;
-    }
-
-    /* update codec info */
-    avctx->sample_rate = s->mp3decctx[0]->sample_rate;
-
-    frame->nb_samples = out_size / (avctx->channels * sizeof(OUT_INT));
-    *got_frame_ptr    = 1;
-
-    return buf_size;
-}
-#endif /* CONFIG_MP3ON4_DECODER || CONFIG_MP3ON4FLOAT_DECODER */
-
-#if !CONFIG_FLOAT
-#if CONFIG_MP1_DECODER
-AVCodec ff_mp1_decoder = {
-    .name           = "mp1",
-    .long_name      = NULL_IF_CONFIG_SMALL("MP1 (MPEG audio layer 1)"),
-    .type           = AVMEDIA_TYPE_AUDIO,
-    .id             = AV_CODEC_ID_MP1,
-    .priv_data_size = sizeof(MPADecodeContext),
-    .init           = decode_init,
-    .decode         = decode_frame,
-    .capabilities   = CODEC_CAP_DR1,
-    .flush          = flush,
-    .sample_fmts    = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16P,
-                                                      AV_SAMPLE_FMT_S16,
-                                                      AV_SAMPLE_FMT_NONE },
-};
-#endif
-#if CONFIG_MP2_DECODER
-AVCodec ff_mp2_decoder = {
-    .name           = "mp2",
-    .long_name      = NULL_IF_CONFIG_SMALL("MP2 (MPEG audio layer 2)"),
-    .type           = AVMEDIA_TYPE_AUDIO,
-    .id             = AV_CODEC_ID_MP2,
-    .priv_data_size = sizeof(MPADecodeContext),
-    .init           = decode_init,
-    .decode         = decode_frame,
-    .capabilities   = CODEC_CAP_DR1,
-    .flush          = flush,
-    .sample_fmts    = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16P,
-                                                      AV_SAMPLE_FMT_S16,
-                                                      AV_SAMPLE_FMT_NONE },
-};
-#endif
-#if CONFIG_MP3_DECODER
-AVCodec ff_mp3_decoder = {
-    .name           = "mp3",
-    .long_name      = NULL_IF_CONFIG_SMALL("MP3 (MPEG audio layer 3)"),
-    .type           = AVMEDIA_TYPE_AUDIO,
-    .id             = AV_CODEC_ID_MP3,
-    .priv_data_size = sizeof(MPADecodeContext),
-    .init           = decode_init,
-    .decode         = decode_frame,
-    .capabilities   = CODEC_CAP_DR1,
-    .flush          = flush,
-    .sample_fmts    = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16P,
-                                                      AV_SAMPLE_FMT_S16,
-                                                      AV_SAMPLE_FMT_NONE },
-};
-#endif
-#if CONFIG_MP3ADU_DECODER
-AVCodec ff_mp3adu_decoder = {
-    .name           = "mp3adu",
-    .long_name      = NULL_IF_CONFIG_SMALL("ADU (Application Data Unit) MP3 (MPEG audio layer 3)"),
-    .type           = AVMEDIA_TYPE_AUDIO,
-    .id             = AV_CODEC_ID_MP3ADU,
-    .priv_data_size = sizeof(MPADecodeContext),
-    .init           = decode_init,
-    .decode         = decode_frame_adu,
-    .capabilities   = CODEC_CAP_DR1,
-    .flush          = flush,
-    .sample_fmts    = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16P,
-                                                      AV_SAMPLE_FMT_S16,
-                                                      AV_SAMPLE_FMT_NONE },
-};
-#endif
-#if CONFIG_MP3ON4_DECODER
-AVCodec ff_mp3on4_decoder = {
-    .name           = "mp3on4",
-    .long_name      = NULL_IF_CONFIG_SMALL("MP3onMP4"),
-    .type           = AVMEDIA_TYPE_AUDIO,
-    .id             = AV_CODEC_ID_MP3ON4,
-    .priv_data_size = sizeof(MP3On4DecodeContext),
-    .init           = decode_init_mp3on4,
-    .close          = decode_close_mp3on4,
-    .decode         = decode_frame_mp3on4,
-    .capabilities   = CODEC_CAP_DR1,
-    .flush          = flush_mp3on4,
-    .sample_fmts    = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16P,
-                                                      AV_SAMPLE_FMT_NONE },
-};
-#endif
-#endif

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/mpegaudioenc.c Deleted

@@ -1,788 +0,0 @@
-/*
- * The simplest mpeg audio layer 2 encoder
- * Copyright (c) 2000, 2001 Fabrice Bellard
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * FFmpeg is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * The simplest mpeg audio layer 2 encoder.
- */
-
-#include "libavutil/channel_layout.h"
-
-#include "avcodec.h"
-#include "internal.h"
-#include "put_bits.h"
-
-#define FRAC_BITS   15   /* fractional bits for sb_samples and dct */
-#define WFRAC_BITS  14   /* fractional bits for window */
-
-#include "mpegaudio.h"
-#include "mpegaudiodsp.h"
-
-/* currently, cannot change these constants (need to modify
-   quantization stage) */
-#define MUL(a,b) (((int64_t)(a) * (int64_t)(b)) >> FRAC_BITS)
-
-#define SAMPLES_BUF_SIZE 4096
-
-typedef struct MpegAudioContext {
-    PutBitContext pb;
-    int nb_channels;
-    int lsf;           /* 1 if mpeg2 low bitrate selected */
-    int bitrate_index; /* bit rate */
-    int freq_index;
-    int frame_size; /* frame size, in bits, without padding */
-    /* padding computation */
-    int frame_frac, frame_frac_incr, do_padding;
-    short samples_buf[MPA_MAX_CHANNELS][SAMPLES_BUF_SIZE]; /* buffer for filter */
-    int samples_offset[MPA_MAX_CHANNELS];       /* offset in samples_buf */
-    int sb_samples[MPA_MAX_CHANNELS][3][12][SBLIMIT];
-    unsigned char scale_factors[MPA_MAX_CHANNELS][SBLIMIT][3]; /* scale factors */
-    /* code to group 3 scale factors */
-    unsigned char scale_code[MPA_MAX_CHANNELS][SBLIMIT];
-    int sblimit; /* number of used subbands */
-    const unsigned char *alloc_table;
-} MpegAudioContext;
-
-/* define it to use floats in quantization (I don't like floats !) */
-#define USE_FLOATS
-
-#include "mpegaudiodata.h"
-#include "mpegaudiotab.h"
-
-static av_cold int MPA_encode_init(AVCodecContext *avctx)
-{
-    MpegAudioContext *s = avctx->priv_data;
-    int freq = avctx->sample_rate;
-    int bitrate = avctx->bit_rate;
-    int channels = avctx->channels;
-    int i, v, table;
-    float a;
-
-    if (channels <= 0 || channels > 2){
-        av_log(avctx, AV_LOG_ERROR, "encoding %d channel(s) is not allowed in mp2\n", channels);
-        return AVERROR(EINVAL);
-    }
-    bitrate = bitrate / 1000;
-    s->nb_channels = channels;
-    avctx->frame_size = MPA_FRAME_SIZE;
-    avctx->delay      = 512 - 32 + 1;
-
-    /* encoding freq */
-    s->lsf = 0;
-    for(i=0;i<3;i++) {
-        if (avpriv_mpa_freq_tab[i] == freq)
-            break;
-        if ((avpriv_mpa_freq_tab[i] / 2) == freq) {
-            s->lsf = 1;
-            break;
-        }
-    }
-    if (i == 3){
-        av_log(avctx, AV_LOG_ERROR, "Sampling rate %d is not allowed in mp2\n", freq);
-        return AVERROR(EINVAL);
-    }
-    s->freq_index = i;
-
-    /* encoding bitrate & frequency */
-    for(i=0;i<15;i++) {
-        if (avpriv_mpa_bitrate_tab[s->lsf][1][i] == bitrate)
-            break;
-    }
-    if (i == 15){
-        av_log(avctx, AV_LOG_ERROR, "bitrate %d is not allowed in mp2\n", bitrate);
-        return AVERROR(EINVAL);
-    }
-    s->bitrate_index = i;
-
-    /* compute total header size & pad bit */
-
-    a = (float)(bitrate * 1000 * MPA_FRAME_SIZE) / (freq * 8.0);
-    s->frame_size = ((int)a) * 8;
-
-    /* frame fractional size to compute padding */
-    s->frame_frac = 0;
-    s->frame_frac_incr = (int)((a - floor(a)) * 65536.0);
-
-    /* select the right allocation table */
-    table = ff_mpa_l2_select_table(bitrate, s->nb_channels, freq, s->lsf);
-
-    /* number of used subbands */
-    s->sblimit = ff_mpa_sblimit_table[table];
-    s->alloc_table = ff_mpa_alloc_tables[table];
-
-    av_dlog(avctx, "%d kb/s, %d Hz, frame_size=%d bits, table=%d, padincr=%x\n",
-            bitrate, freq, s->frame_size, table, s->frame_frac_incr);
-
-    for(i=0;i<s->nb_channels;i++)
-        s->samples_offset[i] = 0;
-
-    for(i=0;i<257;i++) {
-        int v;
-        v = ff_mpa_enwindow[i];
-#if WFRAC_BITS != 16
-        v = (v + (1 << (16 - WFRAC_BITS - 1))) >> (16 - WFRAC_BITS);
-#endif
-        filter_bank[i] = v;
-        if ((i & 63) != 0)
-            v = -v;
-        if (i != 0)
-            filter_bank[512 - i] = v;
-    }
-
-    for(i=0;i<64;i++) {
-        v = (int)(exp2((3 - i) / 3.0) * (1 << 20));
-        if (v <= 0)
-            v = 1;
-        scale_factor_table[i] = v;
-#ifdef USE_FLOATS
-        scale_factor_inv_table[i] = exp2(-(3 - i) / 3.0) / (float)(1 << 20);
-#else
-#define P 15
-        scale_factor_shift[i] = 21 - P - (i / 3);
-        scale_factor_mult[i] = (1 << P) * exp2((i % 3) / 3.0);
-#endif
-    }
-    for(i=0;i<128;i++) {
-        v = i - 64;
-        if (v <= -3)
-            v = 0;
-        else if (v < 0)
-            v = 1;
-        else if (v == 0)
-            v = 2;
-        else if (v < 3)
-            v = 3;
-        else
-            v = 4;
-        scale_diff_table[i] = v;
-    }
-
-    for(i=0;i<17;i++) {
-        v = ff_mpa_quant_bits[i];
-        if (v < 0)
-            v = -v;
-        else
-            v = v * 3;
-        total_quant_bits[i] = 12 * v;
-    }
-
-    return 0;
-}
-
-/* 32 point floating point IDCT without 1/sqrt(2) coef zero scaling */
-static void idct32(int *out, int *tab)
-{
-    int i, j;
-    int *t, *t1, xr;
-    const int *xp = costab32;
-
-    for(j=31;j>=3;j-=2) tab[j] += tab[j - 2];
-
-    t = tab + 30;
-    t1 = tab + 2;
-    do {
-        t[0] += t[-4];
-        t[1] += t[1 - 4];
-        t -= 4;
-    } while (t != t1);
-
-    t = tab + 28;
-    t1 = tab + 4;
-    do {
-        t[0] += t[-8];
-        t[1] += t[1-8];
-        t[2] += t[2-8];
-        t[3] += t[3-8];
-        t -= 8;
-    } while (t != t1);
-
-    t = tab;
-    t1 = tab + 32;
-    do {
-        t[ 3] = -t[ 3];
-        t[ 6] = -t[ 6];
-
-        t[11] = -t[11];
-        t[12] = -t[12];
-        t[13] = -t[13];
-        t[15] = -t[15];
-        t += 16;
-    } while (t != t1);
-
-
-    t = tab;
-    t1 = tab + 8;
-    do {
-        int x1, x2, x3, x4;
-
-        x3 = MUL(t[16], FIX(SQRT2*0.5));
-        x4 = t[0] - x3;
-        x3 = t[0] + x3;
-
-        x2 = MUL(-(t[24] + t[8]), FIX(SQRT2*0.5));
-        x1 = MUL((t[8] - x2), xp[0]);
-        x2 = MUL((t[8] + x2), xp[1]);
-
-        t[ 0] = x3 + x1;
-        t[ 8] = x4 - x2;
-        t[16] = x4 + x2;
-        t[24] = x3 - x1;
-        t++;
-    } while (t != t1);
-
-    xp += 2;
-    t = tab;
-    t1 = tab + 4;
-    do {
-        xr = MUL(t[28],xp[0]);
-        t[28] = (t[0] - xr);
-        t[0] = (t[0] + xr);
-
-        xr = MUL(t[4],xp[1]);
-        t[ 4] = (t[24] - xr);
-        t[24] = (t[24] + xr);
-
-        xr = MUL(t[20],xp[2]);
-        t[20] = (t[8] - xr);
-        t[ 8] = (t[8] + xr);
-
-        xr = MUL(t[12],xp[3]);
-        t[12] = (t[16] - xr);
-        t[16] = (t[16] + xr);
-        t++;
-    } while (t != t1);
-    xp += 4;
-
-    for (i = 0; i < 4; i++) {
-        xr = MUL(tab[30-i*4],xp[0]);
-        tab[30-i*4] = (tab[i*4] - xr);
-        tab[   i*4] = (tab[i*4] + xr);
-
-        xr = MUL(tab[ 2+i*4],xp[1]);
-        tab[ 2+i*4] = (tab[28-i*4] - xr);
-        tab[28-i*4] = (tab[28-i*4] + xr);
-
-        xr = MUL(tab[31-i*4],xp[0]);
-        tab[31-i*4] = (tab[1+i*4] - xr);
-        tab[ 1+i*4] = (tab[1+i*4] + xr);
-
-        xr = MUL(tab[ 3+i*4],xp[1]);
-        tab[ 3+i*4] = (tab[29-i*4] - xr);
-        tab[29-i*4] = (tab[29-i*4] + xr);
-
-        xp += 2;
-    }
-
-    t = tab + 30;
-    t1 = tab + 1;
-    do {
-        xr = MUL(t1[0], *xp);
-        t1[0] = (t[0] - xr);
-        t[0] = (t[0] + xr);
-        t -= 2;
-        t1 += 2;
-        xp++;
-    } while (t >= tab);
-
-    for(i=0;i<32;i++) {
-        out[i] = tab[bitinv32[i]];
-    }
-}
-
-#define WSHIFT (WFRAC_BITS + 15 - FRAC_BITS)
-
-static void filter(MpegAudioContext *s, int ch, const short *samples, int incr)
-{
-    short *p, *q;
-    int sum, offset, i, j;
-    int tmp[64];
-    int tmp1[32];
-    int *out;
-
-    offset = s->samples_offset[ch];
-    out = &s->sb_samples[ch][0][0][0];
-    for(j=0;j<36;j++) {
-        /* 32 samples at once */
-        for(i=0;i<32;i++) {
-            s->samples_buf[ch][offset + (31 - i)] = samples[0];
-            samples += incr;
-        }
-
-        /* filter */
-        p = s->samples_buf[ch] + offset;
-        q = filter_bank;
-        /* maxsum = 23169 */
-        for(i=0;i<64;i++) {
-            sum = p[0*64] * q[0*64];
-            sum += p[1*64] * q[1*64];
-            sum += p[2*64] * q[2*64];
-            sum += p[3*64] * q[3*64];
-            sum += p[4*64] * q[4*64];
-            sum += p[5*64] * q[5*64];
-            sum += p[6*64] * q[6*64];
-            sum += p[7*64] * q[7*64];
-            tmp[i] = sum;
-            p++;
-            q++;
-        }
-        tmp1[0] = tmp[16] >> WSHIFT;
-        for( i=1; i<=16; i++ ) tmp1[i] = (tmp[i+16]+tmp[16-i]) >> WSHIFT;
-        for( i=17; i<=31; i++ ) tmp1[i] = (tmp[i+16]-tmp[80-i]) >> WSHIFT;
-
-        idct32(out, tmp1);
-
-        /* advance of 32 samples */
-        offset -= 32;
-        out += 32;
-        /* handle the wrap around */
-        if (offset < 0) {
-            memmove(s->samples_buf[ch] + SAMPLES_BUF_SIZE - (512 - 32),
-                    s->samples_buf[ch], (512 - 32) * 2);
-            offset = SAMPLES_BUF_SIZE - 512;
-        }
-    }
-    s->samples_offset[ch] = offset;
-}
-
-static void compute_scale_factors(unsigned char scale_code[SBLIMIT],
-                                  unsigned char scale_factors[SBLIMIT][3],
-                                  int sb_samples[3][12][SBLIMIT],
-                                  int sblimit)
-{
-    int *p, vmax, v, n, i, j, k, code;
-    int index, d1, d2;
-    unsigned char *sf = &scale_factors[0][0];
-
-    for(j=0;j<sblimit;j++) {
-        for(i=0;i<3;i++) {
-            /* find the max absolute value */
-            p = &sb_samples[i][0][j];
-            vmax = abs(*p);
-            for(k=1;k<12;k++) {
-                p += SBLIMIT;
-                v = abs(*p);
-                if (v > vmax)
-                    vmax = v;
-            }
-            /* compute the scale factor index using log 2 computations */
-            if (vmax > 1) {
-                n = av_log2(vmax);
-                /* n is the position of the MSB of vmax. now
-                   use at most 2 compares to find the index */
-                index = (21 - n) * 3 - 3;
-                if (index >= 0) {
-                    while (vmax <= scale_factor_table[index+1])
-                        index++;
-                } else {
-                    index = 0; /* very unlikely case of overflow */
-                }
-            } else {
-                index = 62; /* value 63 is not allowed */
-            }
-
-            av_dlog(NULL, "%2d:%d in=%x %x %d\n",
-                    j, i, vmax, scale_factor_table[index], index);
-            /* store the scale factor */
-            av_assert2(index >=0 && index <= 63);
-            sf[i] = index;
-        }
-
-        /* compute the transmission factor : look if the scale factors
-           are close enough to each other */
-        d1 = scale_diff_table[sf[0] - sf[1] + 64];
-        d2 = scale_diff_table[sf[1] - sf[2] + 64];
-
-        /* handle the 25 cases */
-        switch(d1 * 5 + d2) {
-        case 0*5+0:
-        case 0*5+4:
-        case 3*5+4:
-        case 4*5+0:
-        case 4*5+4:
-            code = 0;
-            break;
-        case 0*5+1:
-        case 0*5+2:
-        case 4*5+1:
-        case 4*5+2:
-            code = 3;
-            sf[2] = sf[1];
-            break;
-        case 0*5+3:
-        case 4*5+3:
-            code = 3;
-            sf[1] = sf[2];
-            break;
-        case 1*5+0:
-        case 1*5+4:
-        case 2*5+4:
-            code = 1;
-            sf[1] = sf[0];
-            break;
-        case 1*5+1:
-        case 1*5+2:
-        case 2*5+0:
-        case 2*5+1:
-        case 2*5+2:
-            code = 2;
-            sf[1] = sf[2] = sf[0];
-            break;
-        case 2*5+3:
-        case 3*5+3:
-            code = 2;
-            sf[0] = sf[1] = sf[2];
-            break;
-        case 3*5+0:
-        case 3*5+1:
-        case 3*5+2:
-            code = 2;
-            sf[0] = sf[2] = sf[1];
-            break;
-        case 1*5+3:
-            code = 2;
-            if (sf[0] > sf[2])
-              sf[0] = sf[2];
-            sf[1] = sf[2] = sf[0];
-            break;
-        default:
-            av_assert2(0); //cannot happen
-            code = 0;           /* kill warning */
-        }
-
-        av_dlog(NULL, "%d: %2d %2d %2d %d %d -> %d\n", j,
-                sf[0], sf[1], sf[2], d1, d2, code);
-        scale_code[j] = code;
-        sf += 3;
-    }
-}
-
-/* The most important function : psycho acoustic module. In this
-   encoder there is basically none, so this is the worst you can do,
-   but also this is the simpler. */
-static void psycho_acoustic_model(MpegAudioContext *s, short smr[SBLIMIT])
-{
-    int i;
-
-    for(i=0;i<s->sblimit;i++) {
-        smr[i] = (int)(fixed_smr[i] * 10);
-    }
-}
-
-
-#define SB_NOTALLOCATED  0
-#define SB_ALLOCATED     1
-#define SB_NOMORE        2
-
-/* Try to maximize the smr while using a number of bits inferior to
-   the frame size. I tried to make the code simpler, faster and
-   smaller than other encoders :-) */
-static void compute_bit_allocation(MpegAudioContext *s,
-                                   short smr1[MPA_MAX_CHANNELS][SBLIMIT],
-                                   unsigned char bit_alloc[MPA_MAX_CHANNELS][SBLIMIT],
-                                   int *padding)
-{
-    int i, ch, b, max_smr, max_ch, max_sb, current_frame_size, max_frame_size;
-    int incr;
-    short smr[MPA_MAX_CHANNELS][SBLIMIT];
-    unsigned char subband_status[MPA_MAX_CHANNELS][SBLIMIT];
-    const unsigned char *alloc;
-
-    memcpy(smr, smr1, s->nb_channels * sizeof(short) * SBLIMIT);
-    memset(subband_status, SB_NOTALLOCATED, s->nb_channels * SBLIMIT);
-    memset(bit_alloc, 0, s->nb_channels * SBLIMIT);
-
-    /* compute frame size and padding */
-    max_frame_size = s->frame_size;
-    s->frame_frac += s->frame_frac_incr;
-    if (s->frame_frac >= 65536) {
-        s->frame_frac -= 65536;
-        s->do_padding = 1;
-        max_frame_size += 8;
-    } else {
-        s->do_padding = 0;
-    }
-
-    /* compute the header + bit alloc size */
-    current_frame_size = 32;
-    alloc = s->alloc_table;
-    for(i=0;i<s->sblimit;i++) {
-        incr = alloc[0];
-        current_frame_size += incr * s->nb_channels;
-        alloc += 1 << incr;
-    }
-    for(;;) {
-        /* look for the subband with the largest signal to mask ratio */
-        max_sb = -1;
-        max_ch = -1;
-        max_smr = INT_MIN;
-        for(ch=0;ch<s->nb_channels;ch++) {
-            for(i=0;i<s->sblimit;i++) {
-                if (smr[ch][i] > max_smr && subband_status[ch][i] != SB_NOMORE) {
-                    max_smr = smr[ch][i];
-                    max_sb = i;
-                    max_ch = ch;
-                }
-            }
-        }
-        if (max_sb < 0)
-            break;
-        av_dlog(NULL, "current=%d max=%d max_sb=%d max_ch=%d alloc=%d\n",
-                current_frame_size, max_frame_size, max_sb, max_ch,
-                bit_alloc[max_ch][max_sb]);
-
-        /* find alloc table entry (XXX: not optimal, should use
-           pointer table) */
-        alloc = s->alloc_table;
-        for(i=0;i<max_sb;i++) {
-            alloc += 1 << alloc[0];
-        }
-
-        if (subband_status[max_ch][max_sb] == SB_NOTALLOCATED) {
-            /* nothing was coded for this band: add the necessary bits */
-            incr = 2 + nb_scale_factors[s->scale_code[max_ch][max_sb]] * 6;
-            incr += total_quant_bits[alloc[1]];
-        } else {
-            /* increments bit allocation */
-            b = bit_alloc[max_ch][max_sb];
-            incr = total_quant_bits[alloc[b + 1]] -
-                total_quant_bits[alloc[b]];
-        }
-
-        if (current_frame_size + incr <= max_frame_size) {
-            /* can increase size */
-            b = ++bit_alloc[max_ch][max_sb];
-            current_frame_size += incr;
-            /* decrease smr by the resolution we added */
-            smr[max_ch][max_sb] = smr1[max_ch][max_sb] - quant_snr[alloc[b]];
-            /* max allocation size reached ? */
-            if (b == ((1 << alloc[0]) - 1))
-                subband_status[max_ch][max_sb] = SB_NOMORE;
-            else
-                subband_status[max_ch][max_sb] = SB_ALLOCATED;
-        } else {
-            /* cannot increase the size of this subband */
-            subband_status[max_ch][max_sb] = SB_NOMORE;
-        }
-    }
-    *padding = max_frame_size - current_frame_size;
-    av_assert0(*padding >= 0);
-}
-
-/*
- * Output the mpeg audio layer 2 frame. Note how the code is small
- * compared to other encoders :-)
- */
-static void encode_frame(MpegAudioContext *s,
-                         unsigned char bit_alloc[MPA_MAX_CHANNELS][SBLIMIT],
-                         int padding)
-{
-    int i, j, k, l, bit_alloc_bits, b, ch;
-    unsigned char *sf;
-    int q[3];
-    PutBitContext *p = &s->pb;
-
-    /* header */
-
-    put_bits(p, 12, 0xfff);
-    put_bits(p, 1, 1 - s->lsf); /* 1 = mpeg1 ID, 0 = mpeg2 lsf ID */
-    put_bits(p, 2, 4-2);  /* layer 2 */
-    put_bits(p, 1, 1); /* no error protection */
-    put_bits(p, 4, s->bitrate_index);
-    put_bits(p, 2, s->freq_index);
-    put_bits(p, 1, s->do_padding); /* use padding */
-    put_bits(p, 1, 0);             /* private_bit */
-    put_bits(p, 2, s->nb_channels == 2 ? MPA_STEREO : MPA_MONO);
-    put_bits(p, 2, 0); /* mode_ext */
-    put_bits(p, 1, 0); /* no copyright */
-    put_bits(p, 1, 1); /* original */
-    put_bits(p, 2, 0); /* no emphasis */
-
-    /* bit allocation */
-    j = 0;
-    for(i=0;i<s->sblimit;i++) {
-        bit_alloc_bits = s->alloc_table[j];
-        for(ch=0;ch<s->nb_channels;ch++) {
-            put_bits(p, bit_alloc_bits, bit_alloc[ch][i]);
-        }
-        j += 1 << bit_alloc_bits;
-    }
-
-    /* scale codes */
-    for(i=0;i<s->sblimit;i++) {
-        for(ch=0;ch<s->nb_channels;ch++) {
-            if (bit_alloc[ch][i])
-                put_bits(p, 2, s->scale_code[ch][i]);
-        }
-    }
-
-    /* scale factors */
-    for(i=0;i<s->sblimit;i++) {
-        for(ch=0;ch<s->nb_channels;ch++) {
-            if (bit_alloc[ch][i]) {
-                sf = &s->scale_factors[ch][i][0];
-                switch(s->scale_code[ch][i]) {
-                case 0:
-                    put_bits(p, 6, sf[0]);
-                    put_bits(p, 6, sf[1]);
-                    put_bits(p, 6, sf[2]);
-                    break;
-                case 3:
-                case 1:
-                    put_bits(p, 6, sf[0]);
-                    put_bits(p, 6, sf[2]);
-                    break;
-                case 2:
-                    put_bits(p, 6, sf[0]);
-                    break;
-                }
-            }
-        }
-    }
-
-    /* quantization & write sub band samples */
-
-    for(k=0;k<3;k++) {
-        for(l=0;l<12;l+=3) {
-            j = 0;
-            for(i=0;i<s->sblimit;i++) {
-                bit_alloc_bits = s->alloc_table[j];
-                for(ch=0;ch<s->nb_channels;ch++) {
-                    b = bit_alloc[ch][i];
-                    if (b) {
-                        int qindex, steps, m, sample, bits;
-                        /* we encode 3 sub band samples of the same sub band at a time */
-                        qindex = s->alloc_table[j+b];
-                        steps = ff_mpa_quant_steps[qindex];
-                        for(m=0;m<3;m++) {
-                            sample = s->sb_samples[ch][k][l + m][i];
-                            /* divide by scale factor */
-#ifdef USE_FLOATS
-                            {
-                                float a;
-                                a = (float)sample * scale_factor_inv_table[s->scale_factors[ch][i][k]];
-                                q[m] = (int)((a + 1.0) * steps * 0.5);
-                            }
-#else
-                            {
-                                int q1, e, shift, mult;
-                                e = s->scale_factors[ch][i][k];
-                                shift = scale_factor_shift[e];
-                                mult = scale_factor_mult[e];
-
-                                /* normalize to P bits */
-                                if (shift < 0)
-                                    q1 = sample << (-shift);
-                                else
-                                    q1 = sample >> shift;
-                                q1 = (q1 * mult) >> P;
-                                q[m] = ((q1 + (1 << P)) * steps) >> (P + 1);
-                            }
-#endif
-                            if (q[m] >= steps)
-                                q[m] = steps - 1;
-                            av_assert2(q[m] >= 0 && q[m] < steps);
-                        }
-                        bits = ff_mpa_quant_bits[qindex];
-                        if (bits < 0) {
-                            /* group the 3 values to save bits */
-                            put_bits(p, -bits,
-                                     q[0] + steps * (q[1] + steps * q[2]));
-                        } else {
-                            put_bits(p, bits, q[0]);
-                            put_bits(p, bits, q[1]);
-                            put_bits(p, bits, q[2]);
-                        }
-                    }
-                }
-                /* next subband in alloc table */
-                j += 1 << bit_alloc_bits;
-            }
-        }
-    }
-
-    /* padding */
-    for(i=0;i<padding;i++)
-        put_bits(p, 1, 0);
-
-    /* flush */
-    flush_put_bits(p);
-}
-
-static int MPA_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
-                            const AVFrame *frame, int *got_packet_ptr)
-{
-    MpegAudioContext *s = avctx->priv_data;
-    const int16_t *samples = (const int16_t *)frame->data[0];
-    short smr[MPA_MAX_CHANNELS][SBLIMIT];
-    unsigned char bit_alloc[MPA_MAX_CHANNELS][SBLIMIT];
-    int padding, i, ret;
-
-    for(i=0;i<s->nb_channels;i++) {
-        filter(s, i, samples + i, s->nb_channels);
-    }
-
-    for(i=0;i<s->nb_channels;i++) {
-        compute_scale_factors(s->scale_code[i], s->scale_factors[i],
-                              s->sb_samples[i], s->sblimit);
-    }
-    for(i=0;i<s->nb_channels;i++) {
-        psycho_acoustic_model(s, smr[i]);
-    }
-    compute_bit_allocation(s, smr, bit_alloc, &padding);
-
-    if ((ret = ff_alloc_packet2(avctx, avpkt, MPA_MAX_CODED_FRAME_SIZE)) < 0)
-        return ret;
-
-    init_put_bits(&s->pb, avpkt->data, avpkt->size);
-
-    encode_frame(s, bit_alloc, padding);
-
-    if (frame->pts != AV_NOPTS_VALUE)
-        avpkt->pts = frame->pts - ff_samples_to_time_base(avctx, avctx->delay);
-
-    avpkt->size = put_bits_count(&s->pb) / 8;
-    *got_packet_ptr = 1;
-    return 0;
-}
-
-static const AVCodecDefault mp2_defaults[] = {
-    { "b",    "128k" },
-    { NULL },
-};
-
-AVCodec ff_mp2_encoder = {
-    .name                  = "mp2",
-    .long_name             = NULL_IF_CONFIG_SMALL("MP2 (MPEG audio layer 2)"),
-    .type                  = AVMEDIA_TYPE_AUDIO,
-    .id                    = AV_CODEC_ID_MP2,
-    .priv_data_size        = sizeof(MpegAudioContext),
-    .init                  = MPA_encode_init,
-    .encode2               = MPA_encode_frame,
-    .sample_fmts           = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16,
-                                                            AV_SAMPLE_FMT_NONE },
-    .supported_samplerates = (const int[]){
-        44100, 48000,  32000, 22050, 24000, 16000, 0
-    },
-    .channel_layouts       = (const uint64_t[]){ AV_CH_LAYOUT_MONO,
-                                                 AV_CH_LAYOUT_STEREO,
-                                                 0 },
-    .defaults              = mp2_defaults,
-};

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/timecode.c Deleted

@@ -1,150 +0,0 @@
-/*
- * Copyright (C) 2006 Smartjog S.A.S, Baptiste Coudurier <baptiste.coudurier@gmail.com>
- * Copyright (C) 2011 Smartjog S.A.S, Clément Bœsch      <clement.boesch@smartjog.com>
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * FFmpeg is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * Timecode helpers
- * This *private* API is deprecated, please use the one available in libavutil instead.
- */
-
-#include "version.h"
-
-#if FF_API_OLD_TIMECODE
-
-#include <stdio.h>
-#include "timecode.h"
-#include "libavutil/log.h"
-
-int avpriv_framenum_to_drop_timecode(int frame_num)
-{
-    /* only works for NTSC 29.97 */
-    int d = frame_num / 17982;
-    int m = frame_num % 17982;
-    //if (m < 2) m += 2; /* not needed since -2,-1 / 1798 in C returns 0 */
-    return frame_num + 18 * d + 2 * ((m - 2) / 1798);
-}
-
-uint32_t avpriv_framenum_to_smpte_timecode(unsigned frame, int fps, int drop)
-{
-    return (0                                    << 31) | // color frame flag
-           (drop                                 << 30) | // drop  frame flag
-           ( ((frame % fps) / 10)                << 28) | // tens  of frames
-           ( ((frame % fps) % 10)                << 24) | // units of frames
-           (0                                    << 23) | // field phase (NTSC), b0 (PAL)
-           ((((frame / fps) % 60) / 10)          << 20) | // tens  of seconds
-           ((((frame / fps) % 60) % 10)          << 16) | // units of seconds
-           (0                                    << 15) | // b0 (NTSC), b2 (PAL)
-           ((((frame / (fps * 60)) % 60) / 10)   << 12) | // tens  of minutes
-           ((((frame / (fps * 60)) % 60) % 10)   <<  8) | // units of minutes
-           (0                                    <<  7) | // b1
-           (0                                    <<  6) | // b2 (NTSC), field phase (PAL)
-           ((((frame / (fps * 3600) % 24)) / 10) <<  4) | // tens  of hours
-           (  (frame / (fps * 3600) % 24)) % 10;          // units of hours
-}
-
-int avpriv_check_timecode_rate(void *avcl, AVRational rate, int drop)
-{
-    int fps;
-
-    if (!rate.num || !rate.den) {
-        av_log(avcl, AV_LOG_ERROR, "Timecode frame rate must be specified\n");
-        return -1;
-    }
-    fps = (rate.num + rate.den/2) / rate.den;
-    if (drop && fps != 30) {
-        av_log(avcl, AV_LOG_ERROR, "Drop frame is only allowed with 30000/1001 FPS\n");
-        return -2;
-    }
-    switch (fps) {
-    case 24:
-    case 25:
-    case 30: return  0;
-
-    default:
-        av_log(avcl, AV_LOG_ERROR, "Timecode frame rate not supported\n");
-        return -3;
-    }
-}
-
-char *avpriv_timecode_to_string(char *buf, const struct ff_timecode *tc, unsigned frame)
-{
-    int frame_num = tc->start + frame;
-    int fps = (tc->rate.num + tc->rate.den/2) / tc->rate.den;
-    int hh, mm, ss, ff, neg = 0;
-
-    if (tc->drop)
-        frame_num = avpriv_framenum_to_drop_timecode(frame_num);
-    if (frame_num < 0) {
-        frame_num = -frame_num;
-        neg = 1;
-    }
-    ff = frame_num % fps;
-    ss = frame_num / fps        % 60;
-    mm = frame_num / (fps*60)   % 60;
-    hh = frame_num / (fps*3600);
-    snprintf(buf, 16, "%s%02d:%02d:%02d%c%02d",
-             neg ? "-" : "",
-             hh, mm, ss, tc->drop ? ';' : ':', ff);
-    return buf;
-}
-
-int avpriv_init_smpte_timecode(void *avcl, struct ff_timecode *tc)
-{
-    int hh, mm, ss, ff, fps, ret;
-    char c;
-
-    if (sscanf(tc->str, "%d:%d:%d%c%d", &hh, &mm, &ss, &c, &ff) != 5) {
-        av_log(avcl, AV_LOG_ERROR, "unable to parse timecode, "
-                                   "syntax: hh:mm:ss[:;.]ff\n");
-        return -1;
-    }
-
-    tc->drop  = c != ':'; // drop if ';', '.', ...
-
-    ret = avpriv_check_timecode_rate(avcl, tc->rate, tc->drop);
-    if (ret < 0)
-        return ret;
-
-    fps       = (tc->rate.num + tc->rate.den/2) / tc->rate.den;
-    tc->start = (hh*3600 + mm*60 + ss) * fps + ff;
-
-    if (tc->drop) { /* adjust frame number */
-        int tmins = 60*hh + mm;
-        tc->start -= 2 * (tmins - tmins/10);
-    }
-    return 0;
-}
-
-int ff_framenum_to_drop_timecode(int frame_num)
-{
-    return avpriv_framenum_to_drop_timecode(frame_num);
-}
-
-uint32_t ff_framenum_to_smtpe_timecode(unsigned frame, int fps, int drop)
-{
-    return avpriv_framenum_to_smpte_timecode(frame, fps, drop);
-}
-
-int ff_init_smtpe_timecode(void *avcl, struct ff_timecode *tc)
-{
-    return avpriv_init_smpte_timecode(avcl, tc);
-}
-#endif

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/timecode.h Deleted

@@ -1,106 +0,0 @@
-/*
- * Copyright (C) 2006 Smartjog S.A.S, Baptiste Coudurier <baptiste.coudurier@gmail.com>
- * Copyright (C) 2011 Smartjog S.A.S, Clément Bœsch      <clement.boesch@smartjog.com>
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * FFmpeg is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * Timecode helpers header
- * This *private* API is deprecated, please use the one available in libavutil instead.
- */
-
-#ifndef AVCODEC_TIMECODE_H
-#define AVCODEC_TIMECODE_H
-
-#include "version.h"
-
-#if FF_API_OLD_TIMECODE
-
-#include <stdint.h>
-#include "avcodec.h"
-#include "libavutil/rational.h"
-
-#define TIMECODE_OPT(ctx, flags)                                         \
-    "timecode", "set timecode value following hh:mm:ss[:;.]ff format, "  \
-                "use ';' or '.' before frame number for drop frame",     \
-    offsetof(ctx, tc.str),                                               \
-    AV_OPT_TYPE_STRING, {.str=NULL}, CHAR_MIN, CHAR_MAX, flags
-
-struct ff_timecode {
-    char *str;       ///< string following the hh:mm:ss[:;.]ff format
-    int start;       ///< timecode frame start
-    int drop;        ///< drop flag (1 if drop, else 0)
-    AVRational rate; ///< Frame rate in rational form
-};
-
-/**
- * @brief           Adjust frame number for NTSC drop frame time code
- * @param frame_num Actual frame number to adjust
- * @return          Adjusted frame number
- * @warning         Adjustment is only valid in NTSC 29.97
- */
-int avpriv_framenum_to_drop_timecode(int frame_num);
-
-/**
- * @brief       Convert frame id (timecode) to SMPTE 12M binary representation
- * @param frame Frame number
- * @param fps   Frame rate
- * @param drop  Drop flag
- * @return      The actual binary representation
- */
-uint32_t avpriv_framenum_to_smpte_timecode(unsigned frame, int fps, int drop);
-
-/**
- * @brief       Load timecode string in buf
- * @param buf   Destination buffer
- * @param tc    Timecode struct pointer
- * @param frame Frame id (timecode frame is computed with tc->start+frame)
- * @return a pointer to the buf parameter
- * @note  timecode representation can be a negative timecode and have
- *        more than 24 hours.
- * @note  buf must have enough space to store the timecode representation: 16
- *        bytes is the minimum required size.
- */
-char *avpriv_timecode_to_string(char *buf, const struct ff_timecode *tc, unsigned frame);
-
-/**
- * Check if timecode rate is valid and consistent with the drop flag.
- *
- * @return 0 on success, negative value on failure
- */
-int avpriv_check_timecode_rate(void *avcl, AVRational rate, int drop);
-
-/**
- * Parse SMTPE 12M time representation (hh:mm:ss[:;.]ff). str and rate fields
- * from tc struct must be set.
- *
- * @param avcl A pointer to an arbitrary struct of which the first field is a
- *             pointer to an AVClass struct (used for av_log).
- * @param tc   Timecode struct pointer
- * @return     0 on success, negative value on failure
- * @warning    Adjustement is only valid in NTSC 29.97
- */
-int avpriv_init_smpte_timecode(void *avcl, struct ff_timecode *tc);
-
-attribute_deprecated int ff_framenum_to_drop_timecode(int frame_num);
-attribute_deprecated uint32_t ff_framenum_to_smtpe_timecode(unsigned frame, int fps, int drop);
-attribute_deprecated int ff_init_smtpe_timecode(void *avcl, struct ff_timecode *tc);
-#endif
-
-#endif /* AVCODEC_TIMECODE_H */

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/x86/vp9dsp.asm Deleted

@@ -1,278 +0,0 @@
-;******************************************************************************
-;* VP9 SIMD optimizations
-;*
-;* Copyright (c) 2013 Ronald S. Bultje <rsbultje gmail com>
-;*
-;* This file is part of FFmpeg.
-;*
-;* FFmpeg is free software; you can redistribute it and/or
-;* modify it under the terms of the GNU Lesser General Public
-;* License as published by the Free Software Foundation; either
-;* version 2.1 of the License, or (at your option) any later version.
-;*
-;* FFmpeg is distributed in the hope that it will be useful,
-;* but WITHOUT ANY WARRANTY; without even the implied warranty of
-;* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-;* Lesser General Public License for more details.
-;*
-;* You should have received a copy of the GNU Lesser General Public
-;* License along with FFmpeg; if not, write to the Free Software
-;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-;******************************************************************************
-
-%include "libavutil/x86/x86util.asm"
-
-SECTION_RODATA
-
-; FIXME share with vp8dsp.asm
-pw_256:   times 8 dw 256
-
-%macro F8_TAPS 8
-times 8 db %1, %2
-times 8 db %3, %4
-times 8 db %5, %6
-times 8 db %7, %8
-%endmacro
-; int8_t ff_filters_ssse3[3][15][4][16]
-const filters_ssse3 ; smooth
-                    F8_TAPS -3, -1,  32,  64,  38,   1, -3,  0
-                    F8_TAPS -2, -2,  29,  63,  41,   2, -3,  0
-                    F8_TAPS -2, -2,  26,  63,  43,   4, -4,  0
-                    F8_TAPS -2, -3,  24,  62,  46,   5, -4,  0
-                    F8_TAPS -2, -3,  21,  60,  49,   7, -4,  0
-                    F8_TAPS -1, -4,  18,  59,  51,   9, -4,  0
-                    F8_TAPS -1, -4,  16,  57,  53,  12, -4, -1
-                    F8_TAPS -1, -4,  14,  55,  55,  14, -4, -1
-                    F8_TAPS -1, -4,  12,  53,  57,  16, -4, -1
-                    F8_TAPS  0, -4,   9,  51,  59,  18, -4, -1
-                    F8_TAPS  0, -4,   7,  49,  60,  21, -3, -2
-                    F8_TAPS  0, -4,   5,  46,  62,  24, -3, -2
-                    F8_TAPS  0, -4,   4,  43,  63,  26, -2, -2
-                    F8_TAPS  0, -3,   2,  41,  63,  29, -2, -2
-                    F8_TAPS  0, -3,   1,  38,  64,  32, -1, -3
-                    ; regular
-                    F8_TAPS  0,  1,  -5, 126,   8,  -3,  1,  0
-                    F8_TAPS -1,  3, -10, 122,  18,  -6,  2,  0
-                    F8_TAPS -1,  4, -13, 118,  27,  -9,  3, -1
-                    F8_TAPS -1,  4, -16, 112,  37, -11,  4, -1
-                    F8_TAPS -1,  5, -18, 105,  48, -14,  4, -1
-                    F8_TAPS -1,  5, -19,  97,  58, -16,  5, -1
-                    F8_TAPS -1,  6, -19,  88,  68, -18,  5, -1
-                    F8_TAPS -1,  6, -19,  78,  78, -19,  6, -1
-                    F8_TAPS -1,  5, -18,  68,  88, -19,  6, -1
-                    F8_TAPS -1,  5, -16,  58,  97, -19,  5, -1
-                    F8_TAPS -1,  4, -14,  48, 105, -18,  5, -1
-                    F8_TAPS -1,  4, -11,  37, 112, -16,  4, -1
-                    F8_TAPS -1,  3,  -9,  27, 118, -13,  4, -1
-                    F8_TAPS  0,  2,  -6,  18, 122, -10,  3, -1
-                    F8_TAPS  0,  1,  -3,   8, 126,  -5,  1,  0
-                    ; sharp
-                    F8_TAPS -1,  3,  -7, 127,   8,  -3,  1,  0
-                    F8_TAPS -2,  5, -13, 125,  17,  -6,  3, -1
-                    F8_TAPS -3,  7, -17, 121,  27, -10,  5, -2
-                    F8_TAPS -4,  9, -20, 115,  37, -13,  6, -2
-                    F8_TAPS -4, 10, -23, 108,  48, -16,  8, -3
-                    F8_TAPS -4, 10, -24, 100,  59, -19,  9, -3
-                    F8_TAPS -4, 11, -24,  90,  70, -21, 10, -4
-                    F8_TAPS -4, 11, -23,  80,  80, -23, 11, -4
-                    F8_TAPS -4, 10, -21,  70,  90, -24, 11, -4
-                    F8_TAPS -3,  9, -19,  59, 100, -24, 10, -4
-                    F8_TAPS -3,  8, -16,  48, 108, -23, 10, -4
-                    F8_TAPS -2,  6, -13,  37, 115, -20,  9, -4
-                    F8_TAPS -2,  5, -10,  27, 121, -17,  7, -3
-                    F8_TAPS -1,  3,  -6,  17, 125, -13,  5, -2
-                    F8_TAPS  0,  1,  -3,   8, 127,  -7,  3, -1
-
-SECTION .text
-
-%macro filter_h_fn 1
-%assign %%px mmsize/2
-cglobal %1_8tap_1d_h_ %+ %%px, 6, 6, 11, dst, dstride, src, sstride, h, filtery
-    mova        m6, [pw_256]
-    mova        m7, [filteryq+ 0]
-%if ARCH_X86_64 && mmsize > 8
-    mova        m8, [filteryq+16]
-    mova        m9, [filteryq+32]
-    mova       m10, [filteryq+48]
-%endif
-.loop:
-    movh        m0, [srcq-3]
-    movh        m1, [srcq-2]
-    movh        m2, [srcq-1]
-    movh        m3, [srcq+0]
-    movh        m4, [srcq+1]
-    movh        m5, [srcq+2]
-    punpcklbw   m0, m1
-    punpcklbw   m2, m3
-    movh        m1, [srcq+3]
-    movh        m3, [srcq+4]
-    add       srcq, sstrideq
-    punpcklbw   m4, m5
-    punpcklbw   m1, m3
-    pmaddubsw   m0, m7
-%if ARCH_X86_64 && mmsize > 8
-    pmaddubsw   m2, m8
-    pmaddubsw   m4, m9
-    pmaddubsw   m1, m10
-%else
-    pmaddubsw   m2, [filteryq+16]
-    pmaddubsw   m4, [filteryq+32]
-    pmaddubsw   m1, [filteryq+48]
-%endif
-    paddw       m0, m2
-    paddw       m4, m1
-    paddsw      m0, m4
-    pmulhrsw    m0, m6
-%ifidn %1, avg
-    movh        m1, [dstq]
-%endif
-    packuswb    m0, m0
-%ifidn %1, avg
-    pavgb       m0, m1
-%endif
-    movh    [dstq], m0
-    add       dstq, dstrideq
-    dec         hd
-    jg .loop
-    RET
-%endmacro
-
-INIT_MMX ssse3
-filter_h_fn put
-filter_h_fn avg
-
-INIT_XMM ssse3
-filter_h_fn put
-filter_h_fn avg
-
-%macro filter_v_fn 1
-%assign %%px mmsize/2
-%if ARCH_X86_64
-cglobal %1_8tap_1d_v_ %+ %%px, 6, 8, 11, dst, dstride, src, sstride, h, filtery, src4, sstride3
-%else
-cglobal %1_8tap_1d_v_ %+ %%px, 4, 7, 11, dst, dstride, src, sstride, filtery, src4, sstride3
-    mov   filteryq, r5mp
-%define hd r4mp
-%endif
-    sub       srcq, sstrideq
-    lea  sstride3q, [sstrideq*3]
-    sub       srcq, sstrideq
-    mova        m6, [pw_256]
-    sub       srcq, sstrideq
-    mova        m7, [filteryq+ 0]
-    lea      src4q, [srcq+sstrideq*4]
-%if ARCH_X86_64 && mmsize > 8
-    mova        m8, [filteryq+16]
-    mova        m9, [filteryq+32]
-    mova       m10, [filteryq+48]
-%endif
-.loop:
-    ; FIXME maybe reuse loads from previous rows, or just
-    ; more generally unroll this to prevent multiple loads of
-    ; the same data?
-    movh        m0, [srcq]
-    movh        m1, [srcq+sstrideq]
-    movh        m2, [srcq+sstrideq*2]
-    movh        m3, [srcq+sstride3q]
-    movh        m4, [src4q]
-    movh        m5, [src4q+sstrideq]
-    punpcklbw   m0, m1
-    punpcklbw   m2, m3
-    movh        m1, [src4q+sstrideq*2]
-    movh        m3, [src4q+sstride3q]
-    add       srcq, sstrideq
-    add      src4q, sstrideq
-    punpcklbw   m4, m5
-    punpcklbw   m1, m3
-    pmaddubsw   m0, m7
-%if ARCH_X86_64 && mmsize > 8
-    pmaddubsw   m2, m8
-    pmaddubsw   m4, m9
-    pmaddubsw   m1, m10
-%else
-    pmaddubsw   m2, [filteryq+16]
-    pmaddubsw   m4, [filteryq+32]
-    pmaddubsw   m1, [filteryq+48]
-%endif
-    paddw       m0, m2
-    paddw       m4, m1
-    paddsw      m0, m4
-    pmulhrsw    m0, m6
-%ifidn %1, avg
-    movh        m1, [dstq]
-%endif
-    packuswb    m0, m0
-%ifidn %1, avg
-    pavgb       m0, m1
-%endif
-    movh    [dstq], m0
-    add       dstq, dstrideq
-    dec         hd
-    jg .loop
-    RET
-%endmacro
-
-INIT_MMX ssse3
-filter_v_fn put
-filter_v_fn avg
-
-INIT_XMM ssse3
-filter_v_fn put
-filter_v_fn avg
-
-%macro fpel_fn 6
-%if %2 == 4
-%define %%srcfn movh
-%define %%dstfn movh
-%else
-%define %%srcfn movu
-%define %%dstfn mova
-%endif
-
-%if %2 <= 16
-cglobal %1%2, 5, 7, 4, dst, dstride, src, sstride, h, dstride3, sstride3
-    lea  sstride3q, [sstrideq*3]
-    lea  dstride3q, [dstrideq*3]
-%else
-cglobal %1%2, 5, 5, 4, dst, dstride, src, sstride, h
-%endif
-.loop:
-    %%srcfn     m0, [srcq]
-    %%srcfn     m1, [srcq+s%3]
-    %%srcfn     m2, [srcq+s%4]
-    %%srcfn     m3, [srcq+s%5]
-    lea       srcq, [srcq+sstrideq*%6]
-%ifidn %1, avg
-    pavgb       m0, [dstq]
-    pavgb       m1, [dstq+d%3]
-    pavgb       m2, [dstq+d%4]
-    pavgb       m3, [dstq+d%5]
-%endif
-    %%dstfn [dstq], m0
-    %%dstfn [dstq+d%3], m1
-    %%dstfn [dstq+d%4], m2
-    %%dstfn [dstq+d%5], m3
-    lea       dstq, [dstq+dstrideq*%6]
-    sub         hd, %6
-    jnz .loop
-    RET
-%endmacro
-
-%define d16 16
-%define s16 16
-INIT_MMX mmx
-fpel_fn put, 4,  strideq, strideq*2, stride3q, 4
-fpel_fn put, 8,  strideq, strideq*2, stride3q, 4
-INIT_MMX sse
-fpel_fn avg, 4,  strideq, strideq*2, stride3q, 4
-fpel_fn avg, 8,  strideq, strideq*2, stride3q, 4
-INIT_XMM sse
-fpel_fn put, 16, strideq, strideq*2, stride3q, 4
-fpel_fn put, 32, mmsize,  strideq,   strideq+mmsize, 2
-fpel_fn put, 64, mmsize,  mmsize*2,  mmsize*3, 1
-INIT_XMM sse2
-fpel_fn avg, 16, strideq, strideq*2, stride3q, 4
-fpel_fn avg, 32, mmsize,  strideq,   strideq+mmsize, 2
-fpel_fn avg, 64, mmsize,  mmsize*2,  mmsize*3, 1
-%undef s16
-%undef d16

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/asrc_aevalsrc.c Deleted

@@ -1,242 +0,0 @@
-/*
- * Copyright (c) 2011 Stefano Sabatini
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * FFmpeg is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * eval audio source
- */
-
-#include "libavutil/avassert.h"
-#include "libavutil/avstring.h"
-#include "libavutil/channel_layout.h"
-#include "libavutil/eval.h"
-#include "libavutil/opt.h"
-#include "libavutil/parseutils.h"
-#include "avfilter.h"
-#include "audio.h"
-#include "internal.h"
-
-static const char * const var_names[] = {
-    "n",            ///< number of frame
-    "t",            ///< timestamp expressed in seconds
-    "s",            ///< sample rate
-    NULL
-};
-
-enum var_name {
-    VAR_N,
-    VAR_T,
-    VAR_S,
-    VAR_VARS_NB
-};
-
-typedef struct {
-    const AVClass *class;
-    char *sample_rate_str;
-    int sample_rate;
-    int64_t chlayout;
-    char *chlayout_str;
-    int nb_channels;
-    int64_t pts;
-    AVExpr **expr;
-    char *exprs;
-    int nb_samples;             ///< number of samples per requested frame
-    int64_t duration;
-    uint64_t n;
-    double var_values[VAR_VARS_NB];
-} EvalContext;
-
-#define OFFSET(x) offsetof(EvalContext, x)
-#define FLAGS AV_OPT_FLAG_AUDIO_PARAM|AV_OPT_FLAG_FILTERING_PARAM
-
-static const AVOption aevalsrc_options[]= {
-    { "exprs",       "set the '|'-separated list of channels expressions", OFFSET(exprs), AV_OPT_TYPE_STRING, {.str = NULL}, .flags = FLAGS },
-    { "nb_samples",  "set the number of samples per requested frame", OFFSET(nb_samples),      AV_OPT_TYPE_INT,    {.i64 = 1024},    0,        INT_MAX, FLAGS },
-    { "n",           "set the number of samples per requested frame", OFFSET(nb_samples),      AV_OPT_TYPE_INT,    {.i64 = 1024},    0,        INT_MAX, FLAGS },
-    { "sample_rate", "set the sample rate",                           OFFSET(sample_rate_str), AV_OPT_TYPE_STRING, {.str = "44100"}, CHAR_MIN, CHAR_MAX, FLAGS },
-    { "s",           "set the sample rate",                           OFFSET(sample_rate_str), AV_OPT_TYPE_STRING, {.str = "44100"}, CHAR_MIN, CHAR_MAX, FLAGS },
-    { "duration",    "set audio duration", OFFSET(duration), AV_OPT_TYPE_DURATION, {.i64 = -1}, -1, INT64_MAX, FLAGS },
-    { "d",           "set audio duration", OFFSET(duration), AV_OPT_TYPE_DURATION, {.i64 = -1}, -1, INT64_MAX, FLAGS },
-    { "channel_layout", "set channel layout", OFFSET(chlayout_str), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, FLAGS },
-    { "c",              "set channel layout", OFFSET(chlayout_str), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, FLAGS },
-    { NULL }
-};
-
-AVFILTER_DEFINE_CLASS(aevalsrc);
-
-static av_cold int init(AVFilterContext *ctx)
-{
-    EvalContext *eval = ctx->priv;
-    char *args1 = av_strdup(eval->exprs);
-    char *expr, *buf;
-    int ret;
-
-    if (!args1) {
-        av_log(ctx, AV_LOG_ERROR, "Channels expressions list is empty\n");
-        ret = eval->exprs ? AVERROR(ENOMEM) : AVERROR(EINVAL);
-        goto end;
-    }
-
-    /* parse expressions */
-    buf = args1;
-    while (expr = av_strtok(buf, "|", &buf)) {
-        if (!av_dynarray2_add((void **)&eval->expr, &eval->nb_channels, sizeof(*eval->expr), NULL)) {
-            ret = AVERROR(ENOMEM);
-            goto end;
-        }
-        ret = av_expr_parse(&eval->expr[eval->nb_channels - 1], expr, var_names,
-                            NULL, NULL, NULL, NULL, 0, ctx);
-        if (ret < 0)
-            goto end;
-    }
-
-    if (eval->chlayout_str) {
-        int n;
-        ret = ff_parse_channel_layout(&eval->chlayout, eval->chlayout_str, ctx);
-        if (ret < 0)
-            goto end;
-
-        n = av_get_channel_layout_nb_channels(eval->chlayout);
-        if (n != eval->nb_channels) {
-            av_log(ctx, AV_LOG_ERROR,
-                   "Mismatch between the specified number of channels '%d' "
-                   "and the number of channels '%d' in the specified channel layout '%s'\n",
-                   eval->nb_channels, n, eval->chlayout_str);
-            ret = AVERROR(EINVAL);
-            goto end;
-        }
-    } else {
-        /* guess channel layout from nb expressions/channels */
-        eval->chlayout = av_get_default_channel_layout(eval->nb_channels);
-        if (!eval->chlayout && eval->nb_channels <= 0) {
-            av_log(ctx, AV_LOG_ERROR, "Invalid number of channels '%d' provided\n",
-                   eval->nb_channels);
-            ret = AVERROR(EINVAL);
-            goto end;
-        }
-    }
-
-    if ((ret = ff_parse_sample_rate(&eval->sample_rate, eval->sample_rate_str, ctx)))
-        goto end;
-    eval->n = 0;
-
-end:
-    av_free(args1);
-    return ret;
-}
-
-static av_cold void uninit(AVFilterContext *ctx)
-{
-    EvalContext *eval = ctx->priv;
-    int i;
-
-    for (i = 0; i < eval->nb_channels; i++) {
-        av_expr_free(eval->expr[i]);
-        eval->expr[i] = NULL;
-    }
-    av_freep(&eval->expr);
-}
-
-static int config_props(AVFilterLink *outlink)
-{
-    EvalContext *eval = outlink->src->priv;
-    char buf[128];
-
-    outlink->time_base = (AVRational){1, eval->sample_rate};
-    outlink->sample_rate = eval->sample_rate;
-
-    eval->var_values[VAR_S] = eval->sample_rate;
-
-    av_get_channel_layout_string(buf, sizeof(buf), 0, eval->chlayout);
-
-    av_log(outlink->src, AV_LOG_VERBOSE,
-           "sample_rate:%d chlayout:%s duration:%"PRId64"\n",
-           eval->sample_rate, buf, eval->duration);
-
-    return 0;
-}
-
-static int query_formats(AVFilterContext *ctx)
-{
-    EvalContext *eval = ctx->priv;
-    static const enum AVSampleFormat sample_fmts[] = { AV_SAMPLE_FMT_DBLP, AV_SAMPLE_FMT_NONE };
-    int64_t chlayouts[] = { eval->chlayout ? eval->chlayout : FF_COUNT2LAYOUT(eval->nb_channels) , -1 };
-    int sample_rates[] = { eval->sample_rate, -1 };
-
-    ff_set_common_formats (ctx, ff_make_format_list(sample_fmts));
-    ff_set_common_channel_layouts(ctx, avfilter_make_format64_list(chlayouts));
-    ff_set_common_samplerates(ctx, ff_make_format_list(sample_rates));
-
-    return 0;
-}
-
-static int request_frame(AVFilterLink *outlink)
-{
-    EvalContext *eval = outlink->src->priv;
-    AVFrame *samplesref;
-    int i, j;
-    int64_t t = av_rescale(eval->n, AV_TIME_BASE, eval->sample_rate);
-
-    if (eval->duration >= 0 && t >= eval->duration)
-        return AVERROR_EOF;
-
-    samplesref = ff_get_audio_buffer(outlink, eval->nb_samples);
-    if (!samplesref)
-        return AVERROR(ENOMEM);
-
-    /* evaluate expression for each single sample and for each channel */
-    for (i = 0; i < eval->nb_samples; i++, eval->n++) {
-        eval->var_values[VAR_N] = eval->n;
-        eval->var_values[VAR_T] = eval->var_values[VAR_N] * (double)1/eval->sample_rate;
-
-        for (j = 0; j < eval->nb_channels; j++) {
-            *((double *) samplesref->extended_data[j] + i) =
-                av_expr_eval(eval->expr[j], eval->var_values, NULL);
-        }
-    }
-
-    samplesref->pts = eval->pts;
-    samplesref->sample_rate = eval->sample_rate;
-    eval->pts += eval->nb_samples;
-
-    return ff_filter_frame(outlink, samplesref);
-}
-
-static const AVFilterPad aevalsrc_outputs[] = {
-    {
-        .name          = "default",
-        .type          = AVMEDIA_TYPE_AUDIO,
-        .config_props  = config_props,
-        .request_frame = request_frame,
-    },
-    { NULL }
-};
-
-AVFilter avfilter_asrc_aevalsrc = {
-    .name          = "aevalsrc",
-    .description   = NULL_IF_CONFIG_SMALL("Generate an audio signal generated by an expression."),
-    .query_formats = query_formats,
-    .init          = init,
-    .uninit        = uninit,
-    .priv_size     = sizeof(EvalContext),
-    .inputs        = NULL,
-    .outputs       = aevalsrc_outputs,
-    .priv_class    = &aevalsrc_class,
-};

omxplayer-2014.02.11.tar.gz/ffmpeg/libavutil/lls.c Deleted

@@ -1,179 +0,0 @@
-/*
- * linear least squares model
- *
- * Copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * FFmpeg is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * linear least squares model
- */
-
-#include <math.h>
-#include <string.h>
-
-#include "attributes.h"
-#include "version.h"
-#include "lls.h"
-
-static void update_lls(LLSModel *m, double *var)
-{
-    int i, j;
-
-    for (i = 0; i <= m->indep_count; i++) {
-        for (j = i; j <= m->indep_count; j++) {
-            m->covariance[i][j] += var[i] * var[j];
-        }
-    }
-}
-
-void avpriv_solve_lls(LLSModel *m, double threshold, unsigned short min_order)
-{
-    int i, j, k;
-    double (*factor)[MAX_VARS_ALIGN] = (void *) &m->covariance[1][0];
-    double (*covar) [MAX_VARS_ALIGN] = (void *) &m->covariance[1][1];
-    double *covar_y                = m->covariance[0];
-    int count                      = m->indep_count;
-
-    for (i = 0; i < count; i++) {
-        for (j = i; j < count; j++) {
-            double sum = covar[i][j];
-
-            for (k = i - 1; k >= 0; k--)
-                sum -= factor[i][k] * factor[j][k];
-
-            if (i == j) {
-                if (sum < threshold)
-                    sum = 1.0;
-                factor[i][i] = sqrt(sum);
-            } else {
-                factor[j][i] = sum / factor[i][i];
-            }
-        }
-    }
-
-    for (i = 0; i < count; i++) {
-        double sum = covar_y[i + 1];
-
-        for (k = i - 1; k >= 0; k--)
-            sum -= factor[i][k] * m->coeff[0][k];
-
-        m->coeff[0][i] = sum / factor[i][i];
-    }
-
-    for (j = count - 1; j >= min_order; j--) {
-        for (i = j; i >= 0; i--) {
-            double sum = m->coeff[0][i];
-
-            for (k = i + 1; k <= j; k++)
-                sum -= factor[k][i] * m->coeff[j][k];
-
-            m->coeff[j][i] = sum / factor[i][i];
-        }
-
-        m->variance[j] = covar_y[0];
-
-        for (i = 0; i <= j; i++) {
-            double sum = m->coeff[j][i] * covar[i][i] - 2 * covar_y[i + 1];
-
-            for (k = 0; k < i; k++)
-                sum += 2 * m->coeff[j][k] * covar[k][i];
-
-            m->variance[j] += m->coeff[j][i] * sum;
-        }
-    }
-}
-
-static double evaluate_lls(LLSModel *m, double *param, int order)
-{
-    int i;
-    double out = 0;
-
-    for (i = 0; i <= order; i++)
-        out += param[i] * m->coeff[order][i];
-
-    return out;
-}
-
-av_cold void avpriv_init_lls(LLSModel *m, int indep_count)
-{
-    memset(m, 0, sizeof(LLSModel));
-    m->indep_count = indep_count;
-    m->update_lls = update_lls;
-    m->evaluate_lls = evaluate_lls;
-    if (ARCH_X86)
-        ff_init_lls_x86(m);
-}
-
-#if FF_API_LLS_PRIVATE
-av_cold void av_init_lls(LLSModel *m, int indep_count)
-{
-    avpriv_init_lls(m, indep_count);
-}
-void av_update_lls(LLSModel *m, double *param, double decay)
-{
-    m->update_lls(m, param);
-}
-void av_solve_lls(LLSModel *m, double threshold, int min_order)
-{
-    avpriv_solve_lls(m, threshold, min_order);
-}
-double av_evaluate_lls(LLSModel *m, double *param, int order)
-{
-    return m->evaluate_lls(m, param, order);
-}
-#endif /* FF_API_LLS_PRIVATE */
-
-#ifdef TEST
-
-#include <stdio.h>
-#include <limits.h>
-#include "lfg.h"
-
-int main(void)
-{
-    LLSModel m;
-    int i, order;
-    AVLFG lfg;
-
-    av_lfg_init(&lfg, 1);
-    avpriv_init_lls(&m, 3);
-
-    for (i = 0; i < 100; i++) {
-        LOCAL_ALIGNED(32, double, var, [4]);
-        double eval;
-
-        var[0] = (av_lfg_get(&lfg) / (double) UINT_MAX - 0.5) * 2;
-        var[1] = var[0] + av_lfg_get(&lfg) / (double) UINT_MAX - 0.5;
-        var[2] = var[1] + av_lfg_get(&lfg) / (double) UINT_MAX - 0.5;
-        var[3] = var[2] + av_lfg_get(&lfg) / (double) UINT_MAX - 0.5;
-        m.update_lls(&m, var);
-        avpriv_solve_lls(&m, 0.001, 0);
-        for (order = 0; order < 3; order++) {
-            eval = m.evaluate_lls(&m, var + 1, order);
-            printf("real:%9f order:%d pred:%9f var:%f coeffs:%f %9f %9f\n",
-                   var[0], order, eval, sqrt(m.variance[order] / (i + 1)),
-                   m.coeff[order][0], m.coeff[order][1],
-                   m.coeff[order][2]);
-        }
-    }
-    return 0;
-}
-
-#endif

omxplayer-2014.02.11.tar.gz/ffmpeg/libavutil/lls.h Deleted

@@ -1,71 +0,0 @@
-/*
- * linear least squares model
- *
- * Copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * FFmpeg is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_LLS_H
-#define AVUTIL_LLS_H
-
-#include "common.h"
-#include "mem.h"
-#include "version.h"
-
-#define MAX_VARS 32
-#define MAX_VARS_ALIGN FFALIGN(MAX_VARS+1,4)
-
-//FIXME avoid direct access to LLSModel from outside
-
-/**
- * Linear least squares model.
- */
-typedef struct LLSModel {
-    DECLARE_ALIGNED(32, double, covariance[MAX_VARS_ALIGN][MAX_VARS_ALIGN]);
-    DECLARE_ALIGNED(32, double, coeff[MAX_VARS][MAX_VARS]);
-    double variance[MAX_VARS];
-    int indep_count;
-    /**
-     * Take the outer-product of var[] with itself, and add to the covariance matrix.
-     * @param m this context
-     * @param var training samples, starting with the value to be predicted
-     *            32-byte aligned, and any padding elements must be initialized
-     *            (i.e not denormal/nan).
-     */
-    void (*update_lls)(struct LLSModel *m, double *var);
-    /**
-     * Inner product of var[] and the LPC coefs.
-     * @param m this context
-     * @param var training samples, excluding the value to be predicted. unaligned.
-     * @param order lpc order
-     */
-    double (*evaluate_lls)(struct LLSModel *m, double *var, int order);
-} LLSModel;
-
-void avpriv_init_lls(LLSModel *m, int indep_count);
-void ff_init_lls_x86(LLSModel *m);
-void avpriv_solve_lls(LLSModel *m, double threshold, unsigned short min_order);
-
-#if FF_API_LLS_PRIVATE
-void av_init_lls(LLSModel *m, int indep_count);
-void av_update_lls(LLSModel *m, double *param, double decay);
-void av_solve_lls(LLSModel *m, double threshold, int min_order);
-double av_evaluate_lls(LLSModel *m, double *param, int order);
-#endif /* FF_API_LLS_PRIVATE */
-
-#endif /* AVUTIL_LLS_H */

omxplayer-2014.02.11.tar.gz/ffmpeg/tests/ref/fate/hevc-conformance-TMVP_A_MS_2 Deleted

@@ -1,18 +0,0 @@
-#tb 0: 1/25
-0,          0,          0,        1,   149760, 0xdb5e3b56
-0,          1,          1,        1,   149760, 0x496f2a41
-0,          2,          2,        1,   149760, 0x0690ee0a
-0,          3,          3,        1,   149760, 0x5648fb4e
-0,          4,          4,        1,   149760, 0xd58bbe51
-0,          5,          5,        1,   149760, 0x647c4520
-0,          6,          6,        1,   149760, 0x0e361335
-0,          7,          7,        1,   149760, 0xd1a4289b
-0,          8,          8,        1,   149760, 0x04d29f74
-0,          9,          9,        1,   149760, 0x3bbffc55
-0,         10,         10,        1,   149760, 0xefe30f2b
-0,         11,         11,        1,   149760, 0x3a336f52
-0,         12,         12,        1,   149760, 0x0dffed51
-0,         13,         13,        1,   149760, 0x5a9db757
-0,         14,         14,        1,   149760, 0x5e7313c5
-0,         15,         15,        1,   149760, 0xbffb3a0e
-0,         16,         16,        1,   149760, 0x073966e9

omxplayer-2014.02.11.tar.gz/ffmpeg/tests/ref/fate/hevc-conformance-TSKIP_A_MS_2 Deleted

@@ -1,18 +0,0 @@
-#tb 0: 1/25
-0,          0,          0,        1,  1382400, 0xaea37937
-0,          1,          1,        1,  1382400, 0x39d687d0
-0,          2,          2,        1,  1382400, 0x8ea04595
-0,          3,          3,        1,  1382400, 0x5d5a40d2
-0,          4,          4,        1,  1382400, 0x6915eb4e
-0,          5,          5,        1,  1382400, 0xe8bb612d
-0,          6,          6,        1,  1382400, 0xd331085a
-0,          7,          7,        1,  1382400, 0x2193bc30
-0,          8,          8,        1,  1382400, 0xaeb19418
-0,          9,          9,        1,  1382400, 0xb524eac3
-0,         10,         10,        1,  1382400, 0x141908a2
-0,         11,         11,        1,  1382400, 0x527ab6ac
-0,         12,         12,        1,  1382400, 0xe9a73d9f
-0,         13,         13,        1,  1382400, 0x2eb0aa14
-0,         14,         14,        1,  1382400, 0x6981af42
-0,         15,         15,        1,  1382400, 0xbb0bbd7a
-0,         16,         16,        1,  1382400, 0xf0779b81

omxplayer-2014.02.11.tar.gz/ffmpeg/tests/ref/fate/vp9-segmentation-akiyo Deleted

@@ -1,55 +0,0 @@
-#format: frame checksums
-#version: 1
-#hash: MD5
-#tb 0: 1001/30000
-#stream#, dts,        pts, duration,     size, hash
-0,          0,          0,        1,   152064, 20cf714300c5e28ffb77bf9c682129bc
-0,          1,          1,        1,   152064, 2f271e4de29f87d6b90511fbafdf9fbb
-0,          2,          2,        1,   152064, 2f271e4de29f87d6b90511fbafdf9fbb
-0,          3,          3,        1,   152064, a88532a043f5f2c6bce729a8e20ee5af
-0,          4,          4,        1,   152064, 8d7b5482ed8072a7c95d722783773436
-0,          5,          5,        1,   152064, 04872d8619b163b5e0c20123ccddf7dc
-0,          6,          6,        1,   152064, ed6d9677782aa6e87b6576541391557f
-0,          7,          7,        1,   152064, 689f71108e9bf024cd9ccf48800dcdc7
-0,          8,          8,        1,   152064, f7c555792884499bb62a8e739b201739
-0,          9,          9,        1,   152064, 7fed82c38ce428a178c56f6131eff5ec
-0,         10,         10,        1,   152064, fb638e587ade05baa027bb63edc7ec7c
-0,         11,         11,        1,   152064, 319295f5aa44661a80570e844050156a
-0,         12,         12,        1,   152064, de2d8635966a1cd57290eac449a5fb4b
-0,         13,         13,        1,   152064, 9ac3d711a00aac6b17004bb6451e4cab
-0,         14,         14,        1,   152064, d12eced084e72b5230493e2dc2de0f0a
-0,         15,         15,        1,   152064, 197761d11407fed723a63b8e28cb8e19
-0,         16,         16,        1,   152064, 28d8e807bc142b74f1eaf30dbbf1b7bd
-0,         17,         17,        1,   152064, abe88f1f7490d13ba3def9511beaceec
-0,         18,         18,        1,   152064, 7d297b9c989ebc0408fd41b14900242a
-0,         19,         19,        1,   152064, d5e7adfa2b207d860feff5c894585fd1
-0,         20,         20,        1,   152064, aea3e9de9de237f8379785f3467dc9c9
-0,         21,         21,        1,   152064, 211967cd949c1d83a8cc4c8267aa6034
-0,         22,         22,        1,   152064, 3f49bf8e0434114c15b867be2d53d283
-0,         23,         23,        1,   152064, 8d5e629c0e941ca6f049ed2bb59d09a8
-0,         24,         24,        1,   152064, d359620957877534bc94cd137dc652fe
-0,         25,         25,        1,   152064, 83610fc1969fdfa267e7e462a83ea40c
-0,         26,         26,        1,   152064, b2d20dcc3f77a238ce7210991eebe1a7
-0,         27,         27,        1,   152064, a42ad37808f30e1d968882bf42e9c641
-0,         28,         28,        1,   152064, 55084cded938266a2c3c658dcc162781
-0,         29,         29,        1,   152064, e392a3a7d33e10e95fc9cdf0a2080eac
-0,         30,         30,        1,   152064, 73977c4827463c17e63c0769bb90722f
-0,         31,         31,        1,   152064, cb5dd87344af7d6fd4ed0e06cb90d9c2
-0,         32,         32,        1,   152064, 533338860124e392cef2039468c22f75
-0,         33,         33,        1,   152064, da30f077490042367502a6fe11a46e0f
-0,         34,         34,        1,   152064, 860ab1bfbd3fe6a27bee5ef8c4e0b600
-0,         35,         35,        1,   152064, 339ec3863eaed689d46289ffe47bc45d
-0,         36,         36,        1,   152064, ffa6c990577093106796ed0dee56c483
-0,         37,         37,        1,   152064, 3fcdc2bc064c79f35ea81a715ff089d0
-0,         38,         38,        1,   152064, adaef9ec97e23a542db22bcd23c740bd
-0,         39,         39,        1,   152064, ddcff4bd2c9579181182eb49add0ce3c
-0,         40,         40,        1,   152064, b3b039c84cffb9272c8ddf9086748696
-0,         41,         41,        1,   152064, 70939a961ec1e4697031b79e7ebb7919
-0,         42,         42,        1,   152064, 6b3ff2e003749c6ffeb2d71edecf884c
-0,         43,         43,        1,   152064, 5e4efc96971f81218c472482b5a79374
-0,         44,         44,        1,   152064, 279132c87d81a5747824b06423bf6785
-0,         45,         45,        1,   152064, 1da48caa08007523aab41a56e21dd99b
-0,         46,         46,        1,   152064, 36ecffb2bfcb587d2556fddcbbd3448b
-0,         47,         47,        1,   152064, 7823e3c86cd5a05c2959c7ef4d1cfa89
-0,         48,         48,        1,   152064, b53f78afbad1a43f7aea58814eacd824
-0,         49,         49,        1,   152064, b9b127b4bc54123bec19b2f4a3fa157c

omxplayer-2014.02.11.tar.gz/KeyConfig.h -> omxplayer-2014.03.28.tar.gz/KeyConfig.h Changed

@@ -8,29 +8,34 @@
     enum 
     {
         ACTION_DECREASE_SPEED = 1,
-        ACTION_INCREASE_SPEED,
-        ACTION_REWIND,
-        ACTION_FAST_FORWARD,
-        ACTION_SHOW_INFO,
-        ACTION_PREVIOUS_AUDIO,
-        ACTION_NEXT_AUDIO,
-        ACTION_PREVIOUS_CHAPTER,
-        ACTION_NEXT_CHAPTER,
-        ACTION_PREVIOUS_SUBTITLE,
-        ACTION_NEXT_SUBTITLE,
-        ACTION_TOGGLE_SUBTITLE,
-        ACTION_DECREASE_SUBTITLE_DELAY,
-        ACTION_INCREASE_SUBTITLE_DELAY,
-        ACTION_EXIT,
-        ACTION_PAUSE,
-        ACTION_DECREASE_VOLUME,
-        ACTION_INCREASE_VOLUME,
-        ACTION_SEEK_BACK_SMALL,
-        ACTION_SEEK_FORWARD_SMALL,
-        ACTION_SEEK_BACK_LARGE,
-        ACTION_SEEK_FORWARD_LARGE,
-        ACTION_STEP,
-        ACTION_BLANK
+        ACTION_INCREASE_SPEED = 2,
+        ACTION_REWIND = 3,
+        ACTION_FAST_FORWARD = 4,
+        ACTION_SHOW_INFO = 5,
+        ACTION_PREVIOUS_AUDIO = 6,
+        ACTION_NEXT_AUDIO = 7,
+        ACTION_PREVIOUS_CHAPTER = 8,
+        ACTION_NEXT_CHAPTER = 9,
+        ACTION_PREVIOUS_SUBTITLE = 10,
+        ACTION_NEXT_SUBTITLE = 11,
+        ACTION_TOGGLE_SUBTITLE = 12,
+        ACTION_DECREASE_SUBTITLE_DELAY = 13,
+        ACTION_INCREASE_SUBTITLE_DELAY = 14,
+        ACTION_EXIT = 15,
+        ACTION_PAUSE = 16,
+        ACTION_DECREASE_VOLUME = 17,
+        ACTION_INCREASE_VOLUME = 18,
+        ACTION_SEEK_BACK_SMALL = 19,
+        ACTION_SEEK_FORWARD_SMALL = 20,
+        ACTION_SEEK_BACK_LARGE = 21,
+        ACTION_SEEK_FORWARD_LARGE = 22,
+        ACTION_SEEK_RELATIVE = 25,
+        ACTION_SEEK_ABSOLUTE = 26,
+        ACTION_STEP = 23,
+        ACTION_BLANK = 24,
+        ACTION_MOVE_VIDEO = 27,
+        ACTION_HIDE_VIDEO = 28,
+        ACTION_UNHIDE_VIDEO = 29
     };
 
     #define KEY_LEFT 0x5b44

omxplayer-2014.02.11.tar.gz/Keyboard.cpp -> omxplayer-2014.03.28.tar.gz/Keyboard.cpp Changed

omxplayer-2014.02.11.tar.gz/Keyboard.h -> omxplayer-2014.03.28.tar.gz/Keyboard.h Changed

omxplayer-2014.02.11.tar.gz/Makefile.ffmpeg -> omxplayer-2014.03.28.tar.gz/Makefile.ffmpeg Changed

omxplayer-2014.02.11.tar.gz/OMXAudio.cpp -> omxplayer-2014.03.28.tar.gz/OMXAudio.cpp Changed

@@ -41,6 +41,7 @@
 
 // the size of the audio_render output port buffers
 #define AUDIO_DECODE_OUTPUT_BUFFER (32*1024)
+static const char rounded_up_channels_shift[] = {0,0,1,2,2,3,3,3,3};
 
 static const uint16_t AC3Bitrates[] = {32, 40, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320, 384, 448, 512, 576, 640};
 static const uint16_t AC3FSCod   [] = {48000, 44100, 32000, 0};
@@ -60,6 +61,7 @@
   m_HWDecode        (false  ),
   m_normalize_downmix(true   ),
   m_BytesPerSec     (0      ),
+  m_InputBytesPerSec(0      ),
   m_BufferLen       (0      ),
   m_ChunkLen        (0      ),
   m_InputChannels   (0      ),
@@ -210,7 +212,7 @@
     m_omx_tunnel_clock_analog.Initialize(m_omx_clock, m_omx_clock->GetInputPort(),
       &m_omx_render_analog, m_omx_render_analog.GetInputPort()+1);
 
-    omx_err = m_omx_tunnel_clock_analog.Establish(false);
+    omx_err = m_omx_tunnel_clock_analog.Establish();
     if(omx_err != OMX_ErrorNone)
     {
       CLog::Log(LOGERROR, "%s::%s - m_omx_tunnel_clock_analog.Establish omx_err(0x%08x)", CLASSNAME, __func__, omx_err);
@@ -223,7 +225,7 @@
     m_omx_tunnel_clock_hdmi.Initialize(m_omx_clock, m_omx_clock->GetInputPort() + (m_omx_render_analog.IsInitialized() ? 2 : 0),
       &m_omx_render_hdmi, m_omx_render_hdmi.GetInputPort()+1);
 
-    omx_err = m_omx_tunnel_clock_hdmi.Establish(false);
+    omx_err = m_omx_tunnel_clock_hdmi.Establish();
     if(omx_err != OMX_ErrorNone)
     {
       CLog::Log(LOGERROR, "%s::%s - m_omx_tunnel_clock_hdmi.Establish omx_err(0x%08x)", CLASSNAME, __func__, omx_err);
@@ -236,9 +238,10 @@
   {
     // By default audio_render is the clock master, and if output samples don't fit the timestamps, it will speed up/slow down the clock.
     // This tends to be better for maintaining audio sync and avoiding audio glitches, but can affect video/display sync
+    // when in dual audio mode, make analogue the slave
     OMX_CONFIG_BOOLEANTYPE configBool;
     OMX_INIT_STRUCTURE(configBool);
-    configBool.bEnabled = m_live ? OMX_FALSE:OMX_TRUE;
+    configBool.bEnabled = m_live || m_deviceuse == "omx:both" ? OMX_FALSE:OMX_TRUE;
 
     omx_err = m_omx_render_analog.SetConfig(OMX_IndexConfigBrcmClockReferenceSource, &configBool);
     if (omx_err != OMX_ErrorNone)
@@ -281,7 +284,7 @@
   if( m_omx_splitter.IsInitialized() )
   {
     m_omx_tunnel_splitter_analog.Initialize(&m_omx_splitter, m_omx_splitter.GetOutputPort(), &m_omx_render_analog, m_omx_render_analog.GetInputPort());
-    omx_err = m_omx_tunnel_splitter_analog.Establish(false);
+    omx_err = m_omx_tunnel_splitter_analog.Establish();
     if(omx_err != OMX_ErrorNone)
     {
       CLog::Log(LOGERROR, "COMXAudio::Initialize - Error m_omx_tunnel_splitter_analog.Establish 0x%08x", omx_err);
@@ -289,7 +292,7 @@
     }
 
     m_omx_tunnel_splitter_hdmi.Initialize(&m_omx_splitter, m_omx_splitter.GetOutputPort() + 1, &m_omx_render_hdmi, m_omx_render_hdmi.GetInputPort());
-    omx_err = m_omx_tunnel_splitter_hdmi.Establish(false);
+    omx_err = m_omx_tunnel_splitter_hdmi.Establish();
     if(omx_err != OMX_ErrorNone)
     {
       CLog::Log(LOGERROR, "COMXAudio::Initialize - Error m_omx_tunnel_splitter_hdmi.Establish 0x%08x", omx_err);
@@ -331,7 +334,7 @@
             0, 0, 0, 0);
   }
 
-  omx_err = m_omx_tunnel_decoder.Establish(false);
+  omx_err = m_omx_tunnel_decoder.Establish();
   if(omx_err != OMX_ErrorNone)
   {
     CLog::Log(LOGERROR, "%s::%s - m_omx_tunnel_decoder.Establish omx_err(0x%08x)", CLASSNAME, __func__, omx_err);
@@ -349,7 +352,7 @@
 
   if( m_omx_mixer.IsInitialized() )
   {
-    omx_err = m_omx_tunnel_mixer.Establish(false);
+    omx_err = m_omx_tunnel_mixer.Establish();
     if(omx_err != OMX_ErrorNone)
     {
       CLog::Log(LOGERROR, "%s::%s - m_omx_tunnel_decoder.Establish omx_err(0x%08x)", CLASSNAME, __func__, omx_err);
@@ -476,14 +479,15 @@
 
   m_SampleRate = uiSampleRate;
   m_BitsPerSample = uiBitsPerSample;
-  m_BufferLen     = m_BytesPerSec = m_SampleRate * (16 >> 3) * m_InputChannels;
-  m_BufferLen     *= m_fifo_size;
+
+  m_BytesPerSec   = m_SampleRate * 2 << rounded_up_channels_shift[m_InputChannels];
+  m_BufferLen     = m_BytesPerSec * AUDIO_BUFFER_SECONDS;
+  m_InputBytesPerSec = m_SampleRate * m_BitsPerSample * m_InputChannels >> 3;
 
   // should be big enough that common formats (e.g. 6 channel DTS) fit in a single packet.
   // we don't mind less common formats being split (e.g. ape/wma output large frames)
-  // the audio_decode output buffer size is 32K, and typically we convert from
-  // 6 channel 32bpp float to 8 channel 16bpp in, so a full 48K input buffer will fit the outbut buffer
-  m_ChunkLen      = AUDIO_DECODE_OUTPUT_BUFFER * 2 * 6 / 8;
+  // 6 channel 32bpp float to 8 channel 16bpp in, so a full 48K input buffer will fit the output buffer
+  m_ChunkLen = AUDIO_DECODE_OUTPUT_BUFFER * (m_InputChannels * m_BitsPerSample) >> (rounded_up_channels_shift[m_InputChannels] + 4);
 
   m_wave_header.Samples.wSamplesPerBlock    = 0;
   m_wave_header.Format.nChannels            = m_InputChannels;
@@ -672,7 +676,7 @@
   m_maxLevel      = 0.0f;
 
   CLog::Log(LOGDEBUG, "COMXAudio::Initialize Input bps %d samplerate %d channels %d buffer size %d bytes per second %d",
-      (int)m_pcm_input.nBitPerSample, (int)m_pcm_input.nSamplingRate, (int)m_pcm_input.nChannels, m_BufferLen, m_BytesPerSec);
+      (int)m_pcm_input.nBitPerSample, (int)m_pcm_input.nSamplingRate, (int)m_pcm_input.nChannels, m_BufferLen, m_InputBytesPerSec);
   PrintPCM(&m_pcm_input, std::string("input"));
   CLog::Log(LOGDEBUG, "COMXAudio::Initialize device %s passthrough %d hwdecode %d",
       device.c_str(), m_Passthrough, m_HWDecode);
@@ -711,15 +715,15 @@
 
   m_omx_decoder.FlushInput();
 
-  m_omx_decoder.Deinitialize(true);
+  m_omx_decoder.Deinitialize();
   if ( m_omx_mixer.IsInitialized() )
-    m_omx_mixer.Deinitialize(true);
+    m_omx_mixer.Deinitialize();
   if ( m_omx_splitter.IsInitialized() )
-    m_omx_splitter.Deinitialize(true);
+    m_omx_splitter.Deinitialize();
   if ( m_omx_render_hdmi.IsInitialized() )
-    m_omx_render_hdmi.Deinitialize(true);
+    m_omx_render_hdmi.Deinitialize();
   if ( m_omx_render_analog.IsInitialized() )
-    m_omx_render_analog.Deinitialize(true);
+    m_omx_render_analog.Deinitialize();
 
   m_BytesPerSec = 0;
   m_BufferLen   = 0;
@@ -863,11 +867,11 @@
 //***********************************************************************************************
 unsigned int COMXAudio::AddPackets(const void* data, unsigned int len)
 {
-  return AddPackets(data, len, 0, 0);
+  return AddPackets(data, len, 0, 0, 0);
 }
 
 //***********************************************************************************************
-unsigned int COMXAudio::AddPackets(const void* data, unsigned int len, double dts, double pts)
+unsigned int COMXAudio::AddPackets(const void* data, unsigned int len, double dts, double pts, unsigned int frame_size)
 {
   CSingleLock lock (m_critSection);
 
@@ -917,7 +921,6 @@
 
     // we want audio_decode output buffer size to be no more than AUDIO_DECODE_OUTPUT_BUFFER.
     // it will be 16-bit and rounded up to next power of 2 in channels
-    static const char rounded_up_channels_shift[] = {0,0,1,2,2,3,3,3,3};
     unsigned int max_buffer = AUDIO_DECODE_OUTPUT_BUFFER * (m_InputChannels * m_BitsPerSample) >> (rounded_up_channels_shift[m_InputChannels] + 4);
 
     unsigned int remaining = demuxer_samples-demuxer_samples_sent;
@@ -926,18 +929,30 @@
 
     omx_buffer->nFilledLen = samples * pitch;
 
-    if (samples < demuxer_samples && m_BitsPerSample==32 && !(m_Passthrough || m_HWDecode))
+    unsigned int frames = frame_size ? len/frame_size:0;
+    if ((samples < demuxer_samples || frames > 1) && m_BitsPerSample==32 && !(m_Passthrough || m_HWDecode))
     {
-       uint8_t *dst = omx_buffer->pBuffer;
-       uint8_t *src = demuxer_content + demuxer_samples_sent * (m_BitsPerSample >> 3);
-       // we need to extract samples from planar audio, so the copying needs to be done per plane
-       for (int i=0; i<(int)m_InputChannels; i++)
-       {
-         memcpy(dst, src, omx_buffer->nFilledLen / m_InputChannels);
-         dst += omx_buffer->nFilledLen / m_InputChannels;
-         src += demuxer_samples * (m_BitsPerSample >> 3);
-       }
-       assert(dst <= omx_buffer->pBuffer + m_ChunkLen);
+      const unsigned int sample_pitch   = m_BitsPerSample >> 3;
+      const unsigned int frame_samples  = frame_size / pitch;
+      const unsigned int plane_size     = frame_samples * sample_pitch;
+      const unsigned int out_plane_size = samples * sample_pitch;
+      //CLog::Log(LOGDEBUG, "%s::%s samples:%d/%d ps:%d ops:%d fs:%d pitch:%d filled:%d frames=%d", CLASSNAME, __func__, samples, demuxer_samples, plane_size, out_plane_size, frame_size, pitch, omx_buffer
+      for (unsigned int sample = 0; sample < samples; )
+      {
+        unsigned int frame = (demuxer_samples_sent + sample) / frame_samples;
+        unsigned int sample_in_frame = (demuxer_samples_sent + sample) - frame * frame_samples;
+        int out_remaining = std::min(std::min(frame_samples - sample_in_frame, samples), samples-sample);
+        uint8_t *src = demuxer_content + frame*frame_size + sample_in_frame * sample_pitch;
+        uint8_t *dst = (uint8_t *)omx_buffer->pBuffer + sample * sample_pitch;
+        for (unsigned int channel = 0; channel < m_InputChannels; channel++)
+        {
+          //CLog::Log(LOGDEBUG, "%s::%s copy(%d,%d,%d) (s:%d f:%d sin:%d c:%d)", CLASSNAME, __func__, dst-(uint8_t *)omx_buffer->pBuffer, src-demuxer_content, out_remaining, sample, frame, sample_in_frame
+          memcpy(dst, src, out_remaining * sample_pitch);
+          src += plane_size;
+          dst += out_plane_size;
+        }
+        sample += out_remaining;
+      }
     }
     else
     {
@@ -1099,22 +1114,36 @@
 
 float COMXAudio::GetDelay()
 {
-  unsigned int free = m_omx_decoder.GetInputBufferSize() - m_omx_decoder.GetInputBufferSpace();
-  return m_BytesPerSec ? (float)free / (float)m_BytesPerSec : 0.0f;
+  CSingleLock lock (m_critSection);
+  double stamp = DVD_NOPTS_VALUE;
+  double ret = 0.0;
+  if (m_last_pts != DVD_NOPTS_VALUE && m_av_clock)
+    stamp = m_av_clock->OMXMediaTime();
+  // if possible the delay is current media time - time of last submitted packet
+  if (stamp != DVD_NOPTS_VALUE)
+  {
+    ret = (m_last_pts - stamp) * (1.0 / DVD_TIME_BASE);
+    //CLog::Log(LOGINFO, "%s::%s - %.2f %.0f %.0f", CLASSNAME, __func__, ret, stamp, m_last_pts);
+  }
+  else // just measure the input fifo
+  {
+    unsigned int used = m_omx_decoder.GetInputBufferSize() - m_omx_decoder.GetInputBufferSpace();
+    float ret = m_InputBytesPerSec ? (float)used / (float)m_InputBytesPerSec : 0.0f;
+    //CLog::Log(LOGINFO, "%s::%s - %.2f %d, %d, %d", CLASSNAME, __func__, ret, used, m_omx_decoder.GetInputBufferSize(), m_omx_decoder.GetInputBufferSpace());
+  }
+  return ret;
 }
 
 float COMXAudio::GetCacheTime()
 {
-  float fBufferLenFull = (float)m_BufferLen - (float)GetSpace();
-  if(fBufferLenFull < 0)
-    fBufferLenFull = 0;
-  float ret = m_BytesPerSec ? fBufferLenFull / (float)m_BytesPerSec : 0.0f;
-  return ret;
+  return GetDelay();
 }
 
 float COMXAudio::GetCacheTotal()
 {
-  return m_BytesPerSec ? (float)m_BufferLen / (float)m_BytesPerSec : 0.0f;
+  float audioplus_buffer = m_SampleRate ? 32.0f * 512.0f / m_SampleRate : 0.0f;
+  float input_buffer = m_InputBytesPerSec ? (float)m_omx_decoder.GetInputBufferSize() / (float)m_InputBytesPerSec : 0;
+  return AUDIO_BUFFER_SECONDS + input_buffer + audioplus_buffer;
 }
 
 //***********************************************************************************************

omxplayer-2014.02.11.tar.gz/OMXAudio.h -> omxplayer-2014.03.28.tar.gz/OMXAudio.h Changed

omxplayer-2014.02.11.tar.gz/OMXAudioCodecOMX.cpp -> omxplayer-2014.03.28.tar.gz/OMXAudioCodecOMX.cpp Changed

@@ -25,10 +25,17 @@
 #endif
 #include "utils/log.h"
 
+#include "utils/PCMRemap.h"
+
+// the size of the audio_render output port buffers
+#define AUDIO_DECODE_OUTPUT_BUFFER (32*1024)
+static const char rounded_up_channels_shift[] = {0,0,1,2,2,3,3,3,3};
+
 COMXAudioCodecOMX::COMXAudioCodecOMX()
 {
   m_pBufferOutput = NULL;
   m_iBufferOutputAlloced = 0;
+  m_iBufferOutputUsed = 0;
 
   m_pCodecContext = NULL;
   m_pConvert = NULL;
@@ -36,7 +43,9 @@
 
   m_channels = 0;
   m_pFrame1 = NULL;
+  m_frameSize = 0;
   m_bGotFrame = false;
+  m_bNoConcatenate = false;
   m_iSampleFormat = AV_SAMPLE_FMT_NONE;
   m_desiredSampleFormat = AV_SAMPLE_FMT_NONE;
 }
@@ -46,6 +55,7 @@
   m_dllAvUtil.av_free(m_pBufferOutput);
   m_pBufferOutput = NULL;
   m_iBufferOutputAlloced = 0;
+  m_iBufferOutputUsed = 0;
   Dispose();
 }
 
@@ -82,6 +92,21 @@
   m_pCodecContext->bit_rate = hints.bitrate;
   m_pCodecContext->bits_per_coded_sample = hints.bitspersample;
 
+  // vorbis has variable sized planar output, so skip concatenation
+  if (hints.codec == AV_CODEC_ID_VORBIS)
+    m_bNoConcatenate = true;
+
+  enum PCMLayout layout = PCM_LAYOUT_2_0;// todo: fill in
+  if (hints.codec == AV_CODEC_ID_TRUEHD)
+  {
+    if (layout == PCM_LAYOUT_2_0)
+      m_pCodecContext->request_channel_layout = AV_CH_LAYOUT_STEREO;
+    else if (layout <= PCM_LAYOUT_5_1)
+      m_pCodecContext->request_channel_layout = AV_CH_LAYOUT_5POINT1;
+  }
+  if (m_pCodecContext->request_channel_layout)
+    CLog::Log(LOGNOTICE,"COMXAudioCodecOMX::Open() Requesting channel layout of %d", (unsigned)m_pCodecContext->request_channel_layout);
+
   if(m_pCodecContext->bits_per_coded_sample == 0)
     m_pCodecContext->bits_per_coded_sample = 16;
 
@@ -131,7 +156,7 @@
   m_bGotFrame = false;
 }
 
-int COMXAudioCodecOMX::Decode(BYTE* pData, int iSize)
+int COMXAudioCodecOMX::Decode(BYTE* pData, int iSize, double dts, double pts)
 {
   int iBytesUsed, got_frame;
   if (!m_pCodecContext) return -1;
@@ -166,10 +191,15 @@
   }
 
   m_bGotFrame = true;
+  if (!m_iBufferOutputUsed)
+  {
+    m_dts = dts;
+    m_pts = pts;
+  }
   return iBytesUsed;
 }
 
-int COMXAudioCodecOMX::GetData(BYTE** dst)
+int COMXAudioCodecOMX::GetData(BYTE** dst, double &dts, double &pts)
 {
   if (!m_bGotFrame)
     return 0;
@@ -178,13 +208,11 @@
   int inputSize = m_dllAvUtil.av_samples_get_buffer_size(&inLineSize, m_pCodecContext->channels, m_pFrame1->nb_samples, m_pCodecContext->sample_fmt, 0);
   /* output audio will be packed */
   int outputSize = m_dllAvUtil.av_samples_get_buffer_size(&outLineSize, m_pCodecContext->channels, m_pFrame1->nb_samples, m_desiredSampleFormat, 1);
-  bool cont = !m_pFrame1->data[1] || (m_pFrame1->data[1] == m_pFrame1->data[0] + inLineSize && inLineSize == outLineSize && inLineSize * m_pCodecContext->channels == inputSize);
 
-  if (m_iBufferOutputAlloced < outputSize)
+  if (m_iBufferOutputAlloced < m_iBufferOutputUsed + outputSize)
   {
-     m_dllAvUtil.av_free(m_pBufferOutput);
-     m_pBufferOutput = (BYTE*)m_dllAvUtil.av_malloc(outputSize + FF_INPUT_BUFFER_PADDING_SIZE);
-     m_iBufferOutputAlloced = outputSize;
+     m_pBufferOutput = (BYTE*)m_dllAvUtil.av_realloc(m_pBufferOutput, m_iBufferOutputUsed + outputSize + FF_INPUT_BUFFER_PADDING_SIZE);
+     m_iBufferOutputAlloced = m_iBufferOutputUsed + outputSize;
   }
   *dst = m_pBufferOutput;
 
@@ -207,8 +235,8 @@
                       m_pCodecContext->sample_fmt, m_pCodecContext->sample_rate,
                       0, NULL);
 
-    if(!m_pConvert || m_dllSwResample.swr_init(m_pConvert) < 0)
-    {
+      if(!m_pConvert || m_dllSwResample.swr_init(m_pConvert) < 0)
+      {
         CLog::Log(LOGERROR, "COMXAudioCodecOMX::Decode - Unable to initialise convert format %d to %d", m_pCodecContext->sample_fmt, m_desiredSampleFormat);
         return 0;
       }
@@ -216,7 +244,7 @@
 
     /* use unaligned flag to keep output packed */
     uint8_t *out_planes[m_pCodecContext->channels];
-    if(m_dllAvUtil.av_samples_fill_arrays(out_planes, NULL, m_pBufferOutput, m_pCodecContext->channels, m_pFrame1->nb_samples, m_desiredSampleFormat, 1) < 0 ||
+    if(m_dllAvUtil.av_samples_fill_arrays(out_planes, NULL, m_pBufferOutput + m_iBufferOutputUsed, m_pCodecContext->channels, m_pFrame1->nb_samples, m_desiredSampleFormat, 1) < 0 ||
        m_dllSwResample.swr_convert(m_pConvert, out_planes, m_pFrame1->nb_samples, (const uint8_t **)m_pFrame1->data, m_pFrame1->nb_samples) < 0)
     {
       CLog::Log(LOGERROR, "COMXAudioCodecOMX::Decode - Unable to convert format %d to %d", (int)m_pCodecContext->sample_fmt, m_desiredSampleFormat);
@@ -225,34 +253,45 @@
   }
   else
   {
-    /* if it is already contiguous, just return decoded frame */
-    if (cont)
-    {
-      *dst = m_pFrame1->data[0];
-    }
-    else
+    /* copy to a contiguous buffer */
+    uint8_t *out_planes[m_pCodecContext->channels];
+    if (m_dllAvUtil.av_samples_fill_arrays(out_planes, NULL, m_pBufferOutput + m_iBufferOutputUsed, m_pCodecContext->channels, m_pFrame1->nb_samples, m_desiredSampleFormat, 1) < 0 ||
+      m_dllAvUtil.av_samples_copy(out_planes, m_pFrame1->data, 0, 0, m_pFrame1->nb_samples, m_pCodecContext->channels, m_desiredSampleFormat) < 0 )
     {
-      /* copy to a contiguous buffer */
-      uint8_t *out_planes[m_pCodecContext->channels];
-      if (m_dllAvUtil.av_samples_fill_arrays(out_planes, NULL, m_pBufferOutput, m_pCodecContext->channels, m_pFrame1->nb_samples, m_desiredSampleFormat, 1) < 0 ||
-        m_dllAvUtil.av_samples_copy(out_planes, m_pFrame1->data, 0, 0, m_pFrame1->nb_samples, m_pCodecContext->channels, m_desiredSampleFormat) < 0 )
-      {
-        outputSize = 0;
+      outputSize = 0;
     }
   }
-  }
+  int desired_size = AUDIO_DECODE_OUTPUT_BUFFER * (m_pCodecContext->channels * GetBitsPerSample()) >> (rounded_up_channels_shift[m_pCodecContext->channels] + 4);
+
   if (m_bFirstFrame)
   {
-    CLog::Log(LOGDEBUG, "COMXAudioCodecOMX::GetData size=%d/%d line=%d/%d cont=%d buf=%p", inputSize, outputSize, inLineSize, outLineSize, cont, *dst);
+    CLog::Log(LOGDEBUG, "COMXAudioCodecOMX::GetData size=%d/%d line=%d/%d buf=%p, desired=%d", inputSize, outputSize, inLineSize, outLineSize, *dst, desired_size);
     m_bFirstFrame = false;
   }
-  return outputSize;
+  m_iBufferOutputUsed += outputSize;
+
+  if (!m_bNoConcatenate && m_pCodecContext->sample_fmt == AV_SAMPLE_FMT_FLTP && m_frameSize && (int)m_frameSize != outputSize)
+    CLog::Log(LOGERROR, "COMXAudioCodecOMX::GetData Unexpected change of size (%d->%d)", m_frameSize, outputSize);
+  m_frameSize = outputSize;
+
+  // if next buffer submitted won't fit then flush it out
+  if (m_iBufferOutputUsed + outputSize > desired_size || m_bNoConcatenate)
+  {
+     int ret = m_iBufferOutputUsed;
+     m_bGotFrame = false;
+     m_iBufferOutputUsed = 0;
+     dts = m_dts;
+     pts = m_pts;
+     return ret;
+  }
+  return 0;
 }
 
 void COMXAudioCodecOMX::Reset()
 {
   if (m_pCodecContext) m_dllAvCodec.avcodec_flush_buffers(m_pCodecContext);
   m_bGotFrame = false;
+  m_iBufferOutputUsed = 0;
 }
 
 int COMXAudioCodecOMX::GetChannels()

omxplayer-2014.02.11.tar.gz/OMXAudioCodecOMX.h -> omxplayer-2014.03.28.tar.gz/OMXAudioCodecOMX.h Changed

omxplayer-2014.02.11.tar.gz/OMXClock.cpp -> omxplayer-2014.03.28.tar.gz/OMXClock.cpp Changed

@@ -44,6 +44,8 @@
   m_WaitMask = 0;
   m_eState = OMX_TIME_ClockStateStopped;
   m_eClock = OMX_TIME_RefClockNone;
+  m_last_media_time = 0.0f;
+  m_last_media_time_read = 0.0f;
 
   pthread_mutex_init(&m_lock, NULL);
 }
@@ -114,6 +116,7 @@
     }
     m_eClock = refClock.eClock;
   }
+  m_last_media_time = 0.0f;
   if(lock)
     UnLock();
 
@@ -130,8 +133,6 @@
   if(!m_omx_clock.Initialize((const std::string)componentName, OMX_IndexParamOtherInit))
     return false;
 
-  m_omx_clock.DisableAllPorts();
-
   return true;
 }
 
@@ -140,9 +141,10 @@
   if(m_omx_clock.GetComponent() == NULL)
     return;
 
-  m_omx_clock.Deinitialize(true);
+  m_omx_clock.Deinitialize();
 
   m_omx_speed = DVD_PLAYSPEED_NORMAL;
+  m_last_media_time = 0.0f;
 }
 
 bool OMXClock::OMXStateExecute(bool lock /* = true */)
@@ -157,6 +159,7 @@
 
   if(m_omx_clock.GetState() != OMX_StateExecuting)
   {
+
     OMXStateIdle(false);
 
     omx_err = m_omx_clock.SetStateForComponent(OMX_StateExecuting);
@@ -169,6 +172,7 @@
     }
   }
 
+  m_last_media_time = 0.0f;
   if(lock)
     UnLock();
 
@@ -186,6 +190,7 @@
   if(m_omx_clock.GetState() != OMX_StateIdle)
     m_omx_clock.SetStateForComponent(OMX_StateIdle);
 
+  m_last_media_time = 0.0f;
   if(lock)
     UnLock();
 }
@@ -209,7 +214,7 @@
   OMX_TIME_CONFIG_CLOCKSTATETYPE clock;
   OMX_INIT_STRUCTURE(clock);
 
-  clock.eState = OMX_TIME_ClockStateStopped;
+  clock.eState      = OMX_TIME_ClockStateStopped;
   clock.nOffset     = ToOMXTime(-1000LL * OMX_PRE_ROLL);
 
   omx_err = m_omx_clock.SetConfig(OMX_IndexConfigTimeClockState, &clock);
@@ -220,9 +225,9 @@
       UnLock();
     return false;
   }
-
   m_eState = clock.eState;
 
+  m_last_media_time = 0.0f;
   if(lock)
     UnLock();
 
@@ -253,6 +258,7 @@
     return false;
   }
 
+  m_last_media_time = 0.0f;
   if(lock)
     UnLock();
 
@@ -303,6 +309,7 @@
     }
   }
 
+  m_last_media_time = 0.0f;
   if(lock)
     UnLock();
 
@@ -311,33 +318,45 @@
 
 double OMXClock::OMXMediaTime(bool lock /* = true */)
 {
+  double pts = 0.0;
   if(m_omx_clock.GetComponent() == NULL)
     return 0;
 
-  if(lock)
-    Lock();
+  double now = GetAbsoluteClock();
+  if (now - m_last_media_time_read > DVD_MSEC_TO_TIME(100) || m_last_media_time == 0.0)
+  {
+    if(lock)
+      Lock();
 
-  OMX_ERRORTYPE omx_err = OMX_ErrorNone;
-  double pts = 0;
+    OMX_ERRORTYPE omx_err = OMX_ErrorNone;
 
-  OMX_TIME_CONFIG_TIMESTAMPTYPE timeStamp;
-  OMX_INIT_STRUCTURE(timeStamp);
-  timeStamp.nPortIndex = m_omx_clock.GetInputPort();
+    OMX_TIME_CONFIG_TIMESTAMPTYPE timeStamp;
+    OMX_INIT_STRUCTURE(timeStamp);
+    timeStamp.nPortIndex = m_omx_clock.GetInputPort();
+
+    omx_err = m_omx_clock.GetConfig(OMX_IndexConfigTimeCurrentMediaTime, &timeStamp);
+    if(omx_err != OMX_ErrorNone)
+    {
+      CLog::Log(LOGERROR, "OMXClock::MediaTime error getting OMX_IndexConfigTimeCurrentMediaTime\n");
+      if(lock)
+        UnLock();
+      return 0;
+    }
+
+    pts = FromOMXTime(timeStamp.nTimestamp);
+    //CLog::Log(LOGINFO, "OMXClock::MediaTime %.2f (%.2f, %.2f)", pts, m_last_media_time, now - m_last_media_time_read);
+    m_last_media_time = pts;
+    m_last_media_time_read = now;
 
-  omx_err = m_omx_clock.GetConfig(OMX_IndexConfigTimeCurrentMediaTime, &timeStamp);
-  if(omx_err != OMX_ErrorNone)
-  {
-    CLog::Log(LOGERROR, "OMXClock::MediaTime error getting OMX_IndexConfigTimeCurrentMediaTime\n");
     if(lock)
       UnLock();
-    return 0;
   }
-
-  pts = FromOMXTime(timeStamp.nTimestamp);
-
-  if(lock)
-    UnLock();
-  
+  else
+  {
+    double speed = m_pause ? 0.0 : (double)m_omx_speed / DVD_PLAYSPEED_NORMAL;
+    pts = m_last_media_time + (now - m_last_media_time_read) * speed;
+    //CLog::Log(LOGINFO, "OMXClock::MediaTime cached %.2f (%.2f, %.2f)", pts, m_last_media_time, now - m_last_media_time_read);
+  }
   return pts;
 }
 
@@ -369,7 +388,7 @@
   //CLog::Log(LOGINFO, "OMXClock::ClockAdjustment %.0f %.0f\n", (double)FromOMXTime(timeStamp.nTimestamp), pts);
   if(lock)
     UnLock();
-  
+
   return pts;
 }
 
@@ -410,6 +429,7 @@
   CLog::Log(LOGDEBUG, "OMXClock::OMXMediaTime set config %s = %.2f", index == OMX_IndexConfigTimeCurrentAudioReference ?
        "OMX_IndexConfigTimeCurrentAudioReference":"OMX_IndexConfigTimeCurrentVideoReference", pts);
 
+  m_last_media_time = 0.0f;
   if(lock)
     UnLock();
 
@@ -429,6 +449,7 @@
     if (OMXSetSpeed(0, false, true))
       m_pause = true;
 
+    m_last_media_time = 0.0f;
     if(lock)
       UnLock();
   }
@@ -448,6 +469,7 @@
     if (OMXSetSpeed(m_omx_speed, false, true))
       m_pause = false;
 
+    m_last_media_time = 0.0f;
     if(lock)
       UnLock();
   }
@@ -458,7 +480,7 @@
 {
   if(m_omx_clock.GetComponent() == NULL)
     return false;
-  
+
   if(lock)
     Lock();
 
@@ -466,26 +488,27 @@
 
   if (pause_resume)
   {
-  OMX_ERRORTYPE omx_err = OMX_ErrorNone;
-  OMX_TIME_CONFIG_SCALETYPE scaleType;
-  OMX_INIT_STRUCTURE(scaleType);
+    OMX_ERRORTYPE omx_err = OMX_ErrorNone;
+    OMX_TIME_CONFIG_SCALETYPE scaleType;
+    OMX_INIT_STRUCTURE(scaleType);
 
-  if (TP(speed))
+    if (TP(speed))
       scaleType.xScale = 0; // for trickplay we just pause, and single step
-  else
-    scaleType.xScale = (speed << 16) / DVD_PLAYSPEED_NORMAL;
-  omx_err = m_omx_clock.SetConfig(OMX_IndexConfigTimeScale, &scaleType);
-  if(omx_err != OMX_ErrorNone)
-  {
-    CLog::Log(LOGERROR, "OMXClock::OMXSetSpeed error setting OMX_IndexConfigTimeClockState\n");
-    if(lock)
-      UnLock();
-    return false;
-  }
+    else
+      scaleType.xScale = (speed << 16) / DVD_PLAYSPEED_NORMAL;
+    omx_err = m_omx_clock.SetConfig(OMX_IndexConfigTimeScale, &scaleType);
+    if(omx_err != OMX_ErrorNone)
+    {
+      CLog::Log(LOGERROR, "OMXClock::OMXSetSpeed error setting OMX_IndexConfigTimeClockState\n");
+      if(lock)
+        UnLock();
+      return false;
+    }
   }
   if (!pause_resume)
     m_omx_speed = speed;
 
+  m_last_media_time = 0.0f;
   if(lock)
     UnLock();
 
@@ -509,7 +532,7 @@
   latencyTarget.nFilter = 10;
   latencyTarget.nTarget = 0;
   latencyTarget.nShift = 3;
-  latencyTarget.nSpeedFactor = -200;
+  latencyTarget.nSpeedFactor = -60;
   latencyTarget.nInterFactor = 100;
   latencyTarget.nAdjCap = 100;
 
@@ -522,6 +545,7 @@
     return false;
   }
 
+  m_last_media_time = 0.0f;
   if(lock)
     UnLock();

omxplayer-2014.02.11.tar.gz/OMXClock.h -> omxplayer-2014.03.28.tar.gz/OMXClock.h Changed

omxplayer-2014.02.11.tar.gz/OMXControl.cpp -> omxplayer-2014.03.28.tar.gz/OMXControl.cpp Changed

@@ -7,6 +7,7 @@
 #include <dbus/dbus.h>
 
 #include <string>
+#include <sstream>
 #include <utility>
 
 #include "utils/log.h"
@@ -15,18 +16,35 @@
 
 #define CLASSNAME "OMXControl"
 
+OMXControlResult::OMXControlResult( int newKey ) {
+  key = newKey;
+}
+
+OMXControlResult::OMXControlResult( int newKey, int64_t newArg ) {
+  key = newKey;
+  arg = newArg;
+}
+
+OMXControlResult::OMXControlResult( int newKey, const char *newArg ) {
+  key = newKey;
+  winarg = newArg;
+}
+
+int OMXControlResult::getKey() {
+  return key;
+}
+
+int64_t OMXControlResult::getArg() {
+  return arg;
+}
+
+const char *OMXControlResult::getWinArg() {
+  return winarg;
+}
+
 OMXControl::OMXControl() 
 {
-  if (dbus_connect() < 0) 
-  {
-    CLog::Log(LOGWARNING, "DBus connection failed");
-  } 
-  else 
-  {
-    CLog::Log(LOGDEBUG, "DBus connection succeeded");
-  }
 
-  dbus_threads_init_default();
 }
 
 OMXControl::~OMXControl() 
@@ -34,23 +52,49 @@
     dbus_disconnect();
 }
 
-void OMXControl::init(OMXClock *m_av_clock, OMXPlayerAudio *m_player_audio) 
+void OMXControl::init(OMXClock *m_av_clock, OMXPlayerAudio *m_player_audio, OMXPlayerSubtitles *m_player_subtitles, OMXReader *m_omx_reader, std::string& dbus_name)
 {
-  clock = m_av_clock;
-  audio = m_player_audio;
+  clock     = m_av_clock;
+  audio     = m_player_audio;
+  subtitles = m_player_subtitles;
+  reader    = m_omx_reader;
+
+  if (dbus_connect(dbus_name) < 0)
+  {
+    CLog::Log(LOGWARNING, "DBus connection failed, trying alternate");
+    dbus_disconnect();
+    std::stringstream ss;
+    ss << getpid();
+    dbus_name += ".instance";
+    dbus_name += ss.str();
+    if (dbus_connect(dbus_name) < 0)
+    {
+      CLog::Log(LOGWARNING, "DBus connection failed, alternate failed, will continue without DBus");
+      dbus_disconnect();
+    } else {
+      CLog::Log(LOGDEBUG, "DBus connection succeeded");
+      dbus_threads_init_default();
+    }
+  }
+  else
+  {
+    CLog::Log(LOGDEBUG, "DBus connection succeeded");
+    dbus_threads_init_default();
+  }
 }
-void OMXControl::dispatch() 
+
+void OMXControl::dispatch()
 {
   if (bus)
     dbus_connection_read_write_dispatch(bus, 0);
 }
 
-int OMXControl::dbus_connect() 
+int OMXControl::dbus_connect(std::string& dbus_name)
 {
   DBusError error;
 
   dbus_error_init(&error);
-  if (!(bus = dbus_bus_get_private(DBUS_BUS_SESSION, &error))) 
+  if (!(bus = dbus_bus_get_private(DBUS_BUS_SESSION, &error)))
   {
     CLog::Log(LOGWARNING, "dbus_bus_get_private(): %s", error.message);
         goto fail;
@@ -60,17 +104,17 @@
 
   if (dbus_bus_request_name(
         bus,
-        OMXPLAYER_DBUS_NAME,
+        dbus_name.c_str(),
         DBUS_NAME_FLAG_DO_NOT_QUEUE,
-        &error) != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) 
+        &error) != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER)
   {
-        if (dbus_error_is_set(&error)) 
+        if (dbus_error_is_set(&error))
         {
             CLog::Log(LOGWARNING, "dbus_bus_request_name(): %s", error.message);
             goto fail;
         }
 
-        CLog::Log(LOGWARNING, "Failed to acquire D-Bus name '%s'", OMXPLAYER_DBUS_NAME);
+        CLog::Log(LOGWARNING, "Failed to acquire D-Bus name '%s'", dbus_name.c_str());
         goto fail;
     }
 
@@ -80,7 +124,7 @@
     if (dbus_error_is_set(&error))
         dbus_error_free(&error);
 
-    if (bus) 
+    if (bus)
     {
         dbus_connection_close(bus);
         dbus_connection_unref(bus);
@@ -90,9 +134,9 @@
     return -1;
 }
 
-void OMXControl::dbus_disconnect() 
+void OMXControl::dbus_disconnect()
 {
-    if (bus) 
+    if (bus)
     {
         dbus_connection_close(bus);
         dbus_connection_unref(bus);
@@ -100,176 +144,382 @@
     }
 }
 
-int OMXControl::getEvent() 
+OMXControlResult OMXControl::getEvent()
 {
   if (!bus)
     return KeyConfig::ACTION_BLANK;
-  
+
   dispatch();
   DBusMessage *m = dbus_connection_pop_message(bus);
 
-  if (m == NULL) 
+  if (m == NULL)
     return KeyConfig::ACTION_BLANK;
-  if (dbus_message_is_method_call(m, OMXPLAYER_DBUS_INTERFACE_ROOT, "Quit")) 
+
+  CLog::Log(LOGDEBUG, "Popped message member: %s interface: %s type: %d path: %s", dbus_message_get_member(m), dbus_message_get_interface(m), dbus_message_get_type(m), dbus_message_get_path(m) );
+
+  if (dbus_message_is_method_call(m, OMXPLAYER_DBUS_INTERFACE_ROOT, "Quit"))
   {
     dbus_respond_ok(m);
     return KeyConfig::ACTION_EXIT;
-  } 
+  }
   else if (dbus_message_is_method_call(m, DBUS_INTERFACE_PROPERTIES, "CanQuit")
-      || dbus_message_is_method_call(m, DBUS_INTERFACE_PROPERTIES, "Fullscreen")) 
+      || dbus_message_is_method_call(m, DBUS_INTERFACE_PROPERTIES, "Fullscreen"))
   {
     dbus_respond_boolean(m, 1);
     return KeyConfig::ACTION_BLANK;
-  } 
+  }
   else if (dbus_message_is_method_call(m, DBUS_INTERFACE_PROPERTIES, "CanSetFullscreen")
       || dbus_message_is_method_call(m, DBUS_INTERFACE_PROPERTIES, "CanRaise")
-      || dbus_message_is_method_call(m, DBUS_INTERFACE_PROPERTIES, "HasTrackList")) 
+      || dbus_message_is_method_call(m, DBUS_INTERFACE_PROPERTIES, "HasTrackList"))
   {
     dbus_respond_boolean(m, 0);
     return KeyConfig::ACTION_BLANK;
-  } 
-  else if (dbus_message_is_method_call(m, DBUS_INTERFACE_PROPERTIES, "Identity")) 
+  }
+  else if (dbus_message_is_method_call(m, DBUS_INTERFACE_PROPERTIES, "Identity"))
   {
     dbus_respond_string(m, "OMXPlayer");
     return KeyConfig::ACTION_BLANK;
-  } 
-  else if (dbus_message_is_method_call(m, DBUS_INTERFACE_PROPERTIES, "SupportedUriSchemes")) 
+  }
+  else if (dbus_message_is_method_call(m, DBUS_INTERFACE_PROPERTIES, "SupportedUriSchemes"))
   {
     const char *UriSchemes[] = {"file", "http"};
     dbus_respond_array(m, UriSchemes, 2); // Array is of length 2
     return KeyConfig::ACTION_BLANK;
-  } 
-  else if (dbus_message_is_method_call(m, DBUS_INTERFACE_PROPERTIES, "SupportedMimeTypes")) 
+  }
+  else if (dbus_message_is_method_call(m, DBUS_INTERFACE_PROPERTIES, "SupportedMimeTypes"))
   {
     const char *MimeTypes[] = {}; // Needs supplying
     dbus_respond_array(m, MimeTypes, 0);
     return KeyConfig::ACTION_BLANK;
-  } 
+  }
   else if (dbus_message_is_method_call(m, DBUS_INTERFACE_PROPERTIES, "CanGoNext")
-        || dbus_message_is_method_call(m, DBUS_INTERFACE_PROPERTIES, "CanGoPrevious")
-        || dbus_message_is_method_call(m, DBUS_INTERFACE_PROPERTIES, "CanSeek")) 
+        || dbus_message_is_method_call(m, DBUS_INTERFACE_PROPERTIES, "CanGoPrevious"))
   {
     dbus_respond_boolean(m, 0);
     return KeyConfig::ACTION_BLANK;
-  } 
+  }
+  else if (dbus_message_is_method_call(m, DBUS_INTERFACE_PROPERTIES, "CanSeek"))
+  {
+    dbus_respond_boolean(m, reader->CanSeek());
+    return KeyConfig::ACTION_BLANK;
+  }
   else if (dbus_message_is_method_call(m, DBUS_INTERFACE_PROPERTIES, "CanControl")
         || dbus_message_is_method_call(m, DBUS_INTERFACE_PROPERTIES, "CanPlay")
-        || dbus_message_is_method_call(m, DBUS_INTERFACE_PROPERTIES, "CanPause")) 
+        || dbus_message_is_method_call(m, DBUS_INTERFACE_PROPERTIES, "CanPause"))
   {
     dbus_respond_boolean(m, 1);
-  } 
-  else if (dbus_message_is_method_call(m, OMXPLAYER_DBUS_INTERFACE_PLAYER, "Next")) 
+  }
+  else if (dbus_message_is_method_call(m, OMXPLAYER_DBUS_INTERFACE_PLAYER, "Next"))
   {
     dbus_respond_ok(m);
     return KeyConfig::ACTION_NEXT_CHAPTER;
-  } 
-  else if (dbus_message_is_method_call(m, OMXPLAYER_DBUS_INTERFACE_PLAYER, "Previous")) 
+  }
+  else if (dbus_message_is_method_call(m, OMXPLAYER_DBUS_INTERFACE_PLAYER, "Previous"))
   {
     dbus_respond_ok(m);
     return KeyConfig::ACTION_PREVIOUS_CHAPTER;
-  } 
-  else if (dbus_message_is_method_call(m, OMXPLAYER_DBUS_INTERFACE_PLAYER, "Pause")) 
-  {
-    dbus_respond_ok(m);
-    return KeyConfig::ACTION_PAUSE;
-  } 
-  else if (dbus_message_is_method_call(m, OMXPLAYER_DBUS_INTERFACE_PLAYER, "PlayPause")) 
+  }
+  else if (dbus_message_is_method_call(m, OMXPLAYER_DBUS_INTERFACE_PLAYER, "Pause")
+        || dbus_message_is_method_call(m, OMXPLAYER_DBUS_INTERFACE_PLAYER, "PlayPause"))
   {
     dbus_respond_ok(m);
     return KeyConfig::ACTION_PAUSE;
-  } 
-  else if (dbus_message_is_method_call(m, OMXPLAYER_DBUS_INTERFACE_PLAYER, "Stop")) 
+  }
+  else if (dbus_message_is_method_call(m, OMXPLAYER_DBUS_INTERFACE_PLAYER, "Stop"))
   {
     dbus_respond_ok(m);
     return KeyConfig::ACTION_EXIT;
-  } 
-  else if (dbus_message_is_method_call(m, OMXPLAYER_DBUS_INTERFACE_PLAYER, "Seek")) 
+  }
+  else if (dbus_message_is_method_call(m, OMXPLAYER_DBUS_INTERFACE_PLAYER, "Seek"))
   {
     DBusError error;
     dbus_error_init(&error);
 
-    long offset;
+    int64_t offset;
     dbus_message_get_args(m, &error, DBUS_TYPE_INT64, &offset, DBUS_TYPE_INVALID);
 
     // Make sure a value is sent for seeking
-    if (dbus_error_is_set(&error)) 
+    if (dbus_error_is_set(&error))
     {
+          CLog::Log(LOGWARNING, "Seek D-Bus Error: %s", error.message );
           dbus_error_free(&error);
           dbus_respond_ok(m);
           return KeyConfig::ACTION_BLANK;
-    } 
-    else 
+    }
+    else
     {
-      dbus_respond_int64(m, offset);
-      if (offset < 0) 
+          dbus_respond_int64(m, offset);
+          return OMXControlResult(KeyConfig::ACTION_SEEK_RELATIVE, offset);
+    }
+  }
+  else if (dbus_message_is_method_call(m, OMXPLAYER_DBUS_INTERFACE_PLAYER, "SetPosition"))
+    {
+      DBusError error;
+      dbus_error_init(&error);
+
+      int64_t position;
+      const char *oPath; // ignoring path right now because we don't have a playlist
+      dbus_message_get_args(m, &error, DBUS_TYPE_OBJECT_PATH, &oPath, DBUS_TYPE_INT64, &position, DBUS_TYPE_INVALID);
+
+      // Make sure a value is sent for setting position
+      if (dbus_error_is_set(&error))
       {
-        return KeyConfig::ACTION_SEEK_BACK_SMALL;
-      } 
-      else if (offset > 0) 
+            CLog::Log(LOGWARNING, "SetPosition D-Bus Error: %s", error.message );
+            dbus_error_free(&error);
+            dbus_respond_ok(m);
+            return KeyConfig::ACTION_BLANK;
+      }
+      else
       {
-        return KeyConfig::ACTION_SEEK_FORWARD_SMALL;
+            dbus_respond_int64(m, position);
+            return OMXControlResult(KeyConfig::ACTION_SEEK_ABSOLUTE, position);
       }
     }
-    return KeyConfig::ACTION_BLANK;
-  } 
-  else if (dbus_message_is_method_call(m, DBUS_INTERFACE_PROPERTIES, "PlaybackStatus")) 
+  else if (dbus_message_is_method_call(m, DBUS_INTERFACE_PROPERTIES, "PlaybackStatus"))
   {
     const char *status;
-    if (clock->OMXIsPaused()) 
+    if (clock->OMXIsPaused())
     {
       status = "Paused";
-    } 
-    else 
+    }
+    else
     {
       status = "Playing";
     }
 
     dbus_respond_string(m, status);
     return KeyConfig::ACTION_BLANK;
-  } 
-  else if (dbus_message_is_method_call(m, DBUS_INTERFACE_PROPERTIES, "Volume")) 
+  }
+  else if (dbus_message_is_method_call(m, DBUS_INTERFACE_PROPERTIES, "Volume"))
   {
     DBusError error;
     dbus_error_init(&error);
 
-    double vol;
-    dbus_message_get_args(m, &error, DBUS_TYPE_DOUBLE, &vol, DBUS_TYPE_INVALID);
+    double volume;
+    dbus_message_get_args(m, &error, DBUS_TYPE_DOUBLE, &volume, DBUS_TYPE_INVALID);
 
-    if (dbus_error_is_set(&error)) 
+    if (dbus_error_is_set(&error))
     { // i.e. Get current volume
       dbus_error_free(&error);
-      long volume = audio->GetVolume(); // Volume in millibels
-      double r = pow(10, volume / 2000.0);
-      dbus_respond_double(m, r);
+      dbus_respond_double(m, audio->GetVolume());
       return KeyConfig::ACTION_BLANK;
-    } 
-    else 
+    }
+    else
     {
-      long volume = static_cast<long>(2000.0 * log10(vol));
       audio->SetVolume(volume);
-      dbus_respond_ok(m);
+      dbus_respond_double(m, volume);
       return KeyConfig::ACTION_BLANK;
     }
-  } 
-  else if (dbus_message_is_method_call(m, DBUS_INTERFACE_PROPERTIES, "Time_In_Us")) 
+  }
+  else if (dbus_message_is_method_call(m, DBUS_INTERFACE_PROPERTIES, "Mute"))
+  {
+    audio->SetMute(true);
+    dbus_respond_ok(m);
+    return KeyConfig::ACTION_BLANK;
+  }
+  else if (dbus_message_is_method_call(m, DBUS_INTERFACE_PROPERTIES, "Unmute"))
+  {
+    audio->SetMute(false);
+    dbus_respond_ok(m);
+    return KeyConfig::ACTION_BLANK;
+  }
+  else if (dbus_message_is_method_call(m, DBUS_INTERFACE_PROPERTIES, "Position"))
   {
-    long pos = clock->OMXMediaTime();
+    // Returns the current position in microseconds
+    int64_t pos = clock->OMXMediaTime();
     dbus_respond_int64(m, pos);
     return KeyConfig::ACTION_BLANK;
-  } 
-  else if (dbus_message_is_method_call(m, DBUS_INTERFACE_PROPERTIES, "MinimumRate")) 
+  }
+  else if (dbus_message_is_method_call(m, DBUS_INTERFACE_PROPERTIES, "Duration"))
+  {
+    // Returns the duration in microseconds
+    int64_t dur = reader->GetStreamLength();
+    dur *= 1000; // ms -> us
+    dbus_respond_int64(m, dur);
+    return KeyConfig::ACTION_BLANK;
+  }
+  else if (dbus_message_is_method_call(m, DBUS_INTERFACE_PROPERTIES, "MinimumRate"))
   {
     dbus_respond_double(m, 0.0);
     return KeyConfig::ACTION_BLANK;
-  } 
-  else if (dbus_message_is_method_call(m, DBUS_INTERFACE_PROPERTIES, "MaximumRate")) 
+  }
+  else if (dbus_message_is_method_call(m, DBUS_INTERFACE_PROPERTIES, "MaximumRate"))
   {
     dbus_respond_double(m, 1.125);
     return KeyConfig::ACTION_BLANK;
 
     // Implement extra OMXPlayer controls
-  } 
-  else if (dbus_message_is_method_call(m, OMXPLAYER_DBUS_INTERFACE_PLAYER, "Action")) 
+  }
+  else if (dbus_message_is_method_call(m, OMXPLAYER_DBUS_INTERFACE_PLAYER, "ListSubtitles"))
+  {
+    int count = reader->SubtitleStreamCount();
+    char** values = new char*[count];
+
+    for (int i=0; i < count; i++)
+    {
+       asprintf(&values[i], "%d:%s:%s:%s:%s", i,
+                                              reader->GetStreamLanguage(OMXSTREAM_SUBTITLE, i).c_str(),
+                                              reader->GetStreamName(OMXSTREAM_SUBTITLE, i).c_str(),
+                                              reader->GetCodecName(OMXSTREAM_SUBTITLE, i).c_str(),
+                                              ((int)subtitles->GetActiveStream() == i) ? "active" : "");
+    }
+
+    dbus_respond_array(m, (const char**)values, count);
+
+    // Cleanup
+    for (int i=0; i < count; i++)
+    {
+      delete[] values[i];
+    }
+
+    return KeyConfig::ACTION_BLANK;
+  }
+  else if (dbus_message_is_method_call(m, OMXPLAYER_DBUS_INTERFACE_PLAYER, "VideoPos"))
+  {
+    DBusError error;
+    dbus_error_init(&error);
+
+    const char *win;
+    const char *oPath; // ignoring path right now because we don't have a playlist
+    dbus_message_get_args(m, &error, DBUS_TYPE_OBJECT_PATH, &oPath, DBUS_TYPE_STRING, &win, DBUS_TYPE_INVALID);
+
+    // Make sure a value is sent for setting VideoPos
+    if (dbus_error_is_set(&error))
+    {
+      CLog::Log(LOGWARNING, "VideoPos D-Bus Error: %s", error.message );
+      dbus_error_free(&error);
+      dbus_respond_ok(m);
+      return KeyConfig::ACTION_BLANK;
+    }
+    else
+    {
+      dbus_respond_string(m, win);
+      return OMXControlResult(KeyConfig::ACTION_MOVE_VIDEO, win);
+    }
+  }
+  else if (dbus_message_is_method_call(m, OMXPLAYER_DBUS_INTERFACE_PLAYER, "HideVideo"))
+  {
+    dbus_respond_ok(m);
+    return KeyConfig::ACTION_HIDE_VIDEO;
+  }
+  else if (dbus_message_is_method_call(m, OMXPLAYER_DBUS_INTERFACE_PLAYER, "UnHideVideo"))
+  {
+    dbus_respond_ok(m);
+    return KeyConfig::ACTION_UNHIDE_VIDEO;
+  }
+  else if (dbus_message_is_method_call(m, OMXPLAYER_DBUS_INTERFACE_PLAYER, "ListAudio"))
+  {
+    int count = reader->AudioStreamCount();
+    char** values = new char*[count];
+
+    for (int i=0; i < count; i++)
+    {
+       asprintf(&values[i], "%d:%s:%s:%s:%s", i,
+                                              reader->GetStreamLanguage(OMXSTREAM_AUDIO, i).c_str(),
+                                              reader->GetStreamName(OMXSTREAM_AUDIO, i).c_str(),
+                                              reader->GetCodecName(OMXSTREAM_AUDIO, i).c_str(),
+                                              (reader->GetAudioIndex() == i) ? "active" : "");
+    }
+
+    dbus_respond_array(m, (const char**)values, count);
+
+    // Cleanup
+    for (int i=0; i < count; i++)
+    {
+      delete[] values[i];
+    }
+
+    return KeyConfig::ACTION_BLANK;
+  }
+  else if (dbus_message_is_method_call(m, OMXPLAYER_DBUS_INTERFACE_PLAYER, "ListVideo"))
+  {
+    int count = reader->AudioStreamCount();
+    char** values = new char*[count];
+
+    for (int i=0; i < count; i++)
+    {
+       asprintf(&values[i], "%d:%s:%s:%s:%s", i,
+                                              reader->GetStreamLanguage(OMXSTREAM_VIDEO, i).c_str(),
+                                              reader->GetStreamName(OMXSTREAM_VIDEO, i).c_str(),
+                                              reader->GetCodecName(OMXSTREAM_VIDEO, i).c_str(),
+                                              (reader->GetVideoIndex() == i) ? "active" : "");
+    }
+
+    dbus_respond_array(m, (const char**)values, count);
+
+    // Cleanup
+    for (int i=0; i < count; i++)
+    {
+      delete[] values[i];
+    }
+
+    return KeyConfig::ACTION_BLANK;
+  }
+  else if (dbus_message_is_method_call(m, OMXPLAYER_DBUS_INTERFACE_PLAYER, "SelectSubtitle"))
+  {
+    DBusError error;
+    dbus_error_init(&error);
+
+    int index;
+    dbus_message_get_args(m, &error, DBUS_TYPE_INT32, &index, DBUS_TYPE_INVALID);
+
+    if (dbus_error_is_set(&error))
+    {
+      dbus_error_free(&error);
+      dbus_respond_boolean(m, 0);
+    }
+    else
+    {
+      if (reader->SetActiveStream(OMXSTREAM_SUBTITLE, index))
+      {
+        subtitles->SetActiveStream(reader->GetSubtitleIndex());
+        dbus_respond_boolean(m, 1);
+      }
+      else {
+        dbus_respond_boolean(m, 0);
+      }
+    }
+    return KeyConfig::ACTION_BLANK;
+  }
+  else if (dbus_message_is_method_call(m, OMXPLAYER_DBUS_INTERFACE_PLAYER, "SelectAudio"))
+  {
+    DBusError error;
+    dbus_error_init(&error);
+
+    int index;
+    dbus_message_get_args(m, &error, DBUS_TYPE_INT32, &index, DBUS_TYPE_INVALID);
+
+    if (dbus_error_is_set(&error))
+    {
+      dbus_error_free(&error);
+      dbus_respond_boolean(m, 0);
+    }
+    else
+    {
+      if (reader->SetActiveStream(OMXSTREAM_AUDIO, index))
+      {
+        dbus_respond_boolean(m, 1);
+      }
+      else {
+        dbus_respond_boolean(m, 0);
+      }
+    }
+    return KeyConfig::ACTION_BLANK;
+  }
+  // TODO: SelectVideo ???
+  else if (dbus_message_is_method_call(m, OMXPLAYER_DBUS_INTERFACE_PLAYER, "ShowSubtitles"))
+  {
+    subtitles->SetVisible(true);
+    dbus_respond_ok(m);
+    return KeyConfig::ACTION_BLANK;
+  }
+  else if (dbus_message_is_method_call(m, OMXPLAYER_DBUS_INTERFACE_PLAYER, "HideSubtitles"))
+  {
+    subtitles->SetVisible(false);
+    dbus_respond_ok(m);
+    return KeyConfig::ACTION_BLANK;
+  }
+  else if (dbus_message_is_method_call(m, OMXPLAYER_DBUS_INTERFACE_PLAYER, "Action"))
   {
     DBusError error;
     dbus_error_init(&error);
@@ -277,29 +527,32 @@
     int action;
     dbus_message_get_args(m, &error, DBUS_TYPE_INT32, &action, DBUS_TYPE_INVALID);
 
-    if (dbus_error_is_set(&error)) 
+    if (dbus_error_is_set(&error))
     {
       dbus_error_free(&error);
       dbus_respond_ok(m);
       return KeyConfig::ACTION_BLANK;
-    } 
-    else 
+    }
+    else
     {
       dbus_respond_ok(m);
       return action; // Directly return enum
     }
   }
+  else {
+    CLog::Log(LOGWARNING, "Unhandled dbus message, member: %s interface: %s type: %d path: %s", dbus_message_get_member(m), dbus_message_get_interface(m), dbus_message_get_type(m), dbus_message_get_path(m) );
+  }
 
   return KeyConfig::ACTION_BLANK;
 }
 
-DBusHandlerResult OMXControl::dbus_respond_ok(DBusMessage *m) 
+DBusHandlerResult OMXControl::dbus_respond_ok(DBusMessage *m)
 {
   DBusMessage *reply;
 
   reply = dbus_message_new_method_return(m);
 
-  if (!reply) 
+  if (!reply)
     return DBUS_HANDLER_RESULT_NEED_MEMORY;
 
   dbus_connection_send(bus, reply, NULL);
@@ -308,13 +561,13 @@
   return DBUS_HANDLER_RESULT_HANDLED;
 }
 
-DBusHandlerResult OMXControl::dbus_respond_string(DBusMessage *m, const char *text) 
+DBusHandlerResult OMXControl::dbus_respond_string(DBusMessage *m, const char *text)
 {
   DBusMessage *reply;
 
   reply = dbus_message_new_method_return(m);
 
-  if (!reply) 
+  if (!reply)
   {
     CLog::Log(LOGWARNING, "Failed to allocate message");
     return DBUS_HANDLER_RESULT_NEED_MEMORY;
@@ -327,13 +580,13 @@
   return DBUS_HANDLER_RESULT_HANDLED;
 }
 
-DBusHandlerResult OMXControl::dbus_respond_int64(DBusMessage *m, int64_t i) 
+DBusHandlerResult OMXControl::dbus_respond_int64(DBusMessage *m, int64_t i)
 {
   DBusMessage *reply;
 
   reply = dbus_message_new_method_return(m);
 
-  if (!reply) 
+  if (!reply)
   {
     CLog::Log(LOGWARNING, "Failed to allocate message");
     return DBUS_HANDLER_RESULT_NEED_MEMORY;
@@ -346,7 +599,7 @@
   return DBUS_HANDLER_RESULT_HANDLED;
 }
 
-DBusHandlerResult OMXControl::dbus_respond_double(DBusMessage *m, double d) 
+DBusHandlerResult OMXControl::dbus_respond_double(DBusMessage *m, double d)
 {
   DBusMessage *reply;
 
@@ -365,13 +618,13 @@
   return DBUS_HANDLER_RESULT_HANDLED;
 }
 
-DBusHandlerResult OMXControl::dbus_respond_boolean(DBusMessage *m, int b) 
+DBusHandlerResult OMXControl::dbus_respond_boolean(DBusMessage *m, int b)
 {
   DBusMessage *reply;
 
   reply = dbus_message_new_method_return(m);
 
-  if (!reply) 
+  if (!reply)
   {
     CLog::Log(LOGWARNING, "Failed to allocate message");
     return DBUS_HANDLER_RESULT_NEED_MEMORY;
@@ -384,13 +637,13 @@
   return DBUS_HANDLER_RESULT_HANDLED;
 }
 
-DBusHandlerResult OMXControl::dbus_respond_array(DBusMessage *m, const char *array[], int size) 
+DBusHandlerResult OMXControl::dbus_respond_array(DBusMessage *m, const char *array[], int size)
 {
   DBusMessage *reply;
 
   reply = dbus_message_new_method_return(m);
 
-  if (!reply) 
+  if (!reply)
   {
     CLog::Log(LOGWARNING, "Failed to allocate message");
     return DBUS_HANDLER_RESULT_NEED_MEMORY;

omxplayer-2014.02.11.tar.gz/OMXControl.h -> omxplayer-2014.03.28.tar.gz/OMXControl.h Changed

@@ -1,4 +1,3 @@
-#define OMXPLAYER_DBUS_NAME "org.mpris.MediaPlayer2.omxplayer"
 #define OMXPLAYER_DBUS_PATH_SERVER "/org/mpris/MediaPlayer2"  
 #define OMXPLAYER_DBUS_INTERFACE_ROOT "org.mpris.MediaPlayer2"
 #define OMXPLAYER_DBUS_INTERFACE_PLAYER "org.mpris.MediaPlayer2.Player"
@@ -6,21 +5,38 @@
 #include <dbus/dbus.h>
 #include "OMXClock.h"
 #include "OMXPlayerAudio.h"
+#include "OMXPlayerSubtitles.h"
+
+class OMXControlResult {
+  int key;
+  int64_t arg;
+  const char *winarg;
+
+public:
+   OMXControlResult(int);
+   OMXControlResult(int, int64_t);
+   OMXControlResult(int, const char *);
+   int getKey();
+   int64_t getArg();
+   const char *getWinArg();
+};
 
 class OMXControl
 {
 protected:
-  DBusConnection *bus;
-  OMXClock       *clock;
-  OMXPlayerAudio *audio;
+  DBusConnection     *bus;
+  OMXClock           *clock;
+  OMXPlayerAudio     *audio;
+  OMXReader          *reader;
+  OMXPlayerSubtitles *subtitles;
 public:
   OMXControl();
   ~OMXControl();
-  void init(OMXClock *m_av_clock, OMXPlayerAudio *m_player_audio);
-  int getEvent();
+  void init(OMXClock *m_av_clock, OMXPlayerAudio *m_player_audio, OMXPlayerSubtitles *m_player_subtitles, OMXReader *m_omx_reader, std::string& dbus_name);
+  OMXControlResult getEvent();
   void dispatch();
 private:
-  int dbus_connect();
+  int dbus_connect(std::string& dbus_name);
   void dbus_disconnect();
   DBusHandlerResult dbus_respond_ok(DBusMessage *m);
   DBusHandlerResult dbus_respond_int64(DBusMessage *m, int64_t i);
@@ -29,4 +45,3 @@
   DBusHandlerResult dbus_respond_string(DBusMessage *m, const char *text);
   DBusHandlerResult dbus_respond_array(DBusMessage *m, const char *array[], int size);
 };
-

omxplayer-2014.02.11.tar.gz/OMXCore.cpp -> omxplayer-2014.03.28.tar.gz/OMXCore.cpp Changed

@@ -62,7 +62,6 @@
   m_dst_component       = NULL;
   m_src_port            = 0;
   m_dst_port            = 0;
-  m_portSettingsChanged = false;
   m_tunnel_set          = false;
   m_DllOMX              = DllOMX::GetDllOMX();
 }
@@ -91,9 +90,6 @@
 
   OMX_ERRORTYPE omx_err = OMX_ErrorNone;
 
-  if(m_src_component->GetComponent() && m_portSettingsChanged && !noWait)
-    omx_err = m_src_component->WaitForEvent(OMX_EventPortSettingsChanged);
-
   if(m_src_component->GetComponent())
   {
     omx_err = m_src_component->DisablePort(m_src_port, false);
@@ -161,7 +157,7 @@
   return OMX_ErrorNone;
 }
 
-OMX_ERRORTYPE COMXCoreTunel::Establish(bool portSettingsChanged, bool enable_ports /* = true */, bool disable_ports /* = false */)
+OMX_ERRORTYPE COMXCoreTunel::Establish(bool enable_ports /* = true */, bool disable_ports /* = false */)
 {
   OMX_ERRORTYPE omx_err = OMX_ErrorNone;
   OMX_PARAM_U32TYPE param;
@@ -171,8 +167,8 @@
   {
     return OMX_ErrorUndefined;
   }
-#if 1
-  if(m_src_component->GetState() == OMX_StateLoaded && m_src_component->GetName() != "OMX.broadcom.clock")
+
+  if(m_src_component->GetState() == OMX_StateLoaded)
   {
     omx_err = m_src_component->SetStateForComponent(OMX_StateIdle);
     if(omx_err != OMX_ErrorNone)
@@ -182,15 +178,6 @@
       return omx_err;
     }
   }
-#endif
-  if(portSettingsChanged)
-  {
-    omx_err = m_src_component->WaitForEvent(OMX_EventPortSettingsChanged);
-    if(omx_err != OMX_ErrorNone)
-    {
-      return omx_err;
-    }
-  }
 
   if(m_src_component->GetComponent() && disable_ports)
   {
@@ -303,8 +290,6 @@
     }
   }
 
-  m_portSettingsChanged = portSettingsChanged;
-
   return OMX_ErrorNone;
 }
 
@@ -350,7 +335,7 @@
 
 COMXCoreComponent::~COMXCoreComponent()
 {
-  Deinitialize(true);
+  Deinitialize();
 
   pthread_mutex_destroy(&m_omx_input_mutex);
   pthread_mutex_destroy(&m_omx_output_mutex);
@@ -462,7 +447,7 @@
 
 void COMXCoreComponent::FlushInput()
 {
-  if(!m_handle)
+  if(!m_handle || m_resource_error)
     return;
 
   OMX_ERRORTYPE omx_err = OMX_ErrorNone;
@@ -474,12 +459,17 @@
     CLog::Log(LOGERROR, "COMXCoreComponent::FlushInput - Error on component %s omx_err(0x%08x)", 
               m_componentName.c_str(), (int)omx_err);
   }
-  WaitForCommand(OMX_CommandFlush, m_input_port);
+  omx_err = WaitForCommand(OMX_CommandFlush, m_input_port);
+  if(omx_err != OMX_ErrorNone)
+  {
+    CLog::Log(LOGERROR, "COMXCoreComponent::FlushInput - %s WaitForCommand omx_err(0x%08x)",
+              m_componentName.c_str(), (int)omx_err);
+  }
 }
 
 void COMXCoreComponent::FlushOutput()
 {
-  if(!m_handle)
+  if(!m_handle || m_resource_error)
     return;
 
   OMX_ERRORTYPE omx_err = OMX_ErrorNone;
@@ -491,7 +481,12 @@
     CLog::Log(LOGERROR, "COMXCoreComponent::FlushOutput - Error on component %s omx_err(0x%08x)", 
               m_componentName.c_str(), (int)omx_err);
   }
-  WaitForCommand(OMX_CommandFlush, m_output_port);
+  omx_err = WaitForCommand(OMX_CommandFlush, m_output_port);
+  if(omx_err != OMX_ErrorNone)
+  {
+    CLog::Log(LOGERROR, "COMXCoreComponent::FlushOutput - %s WaitForCommand omx_err(0x%08x)",
+              m_componentName.c_str(), (int)omx_err);
+  }
 }
 
 // timeout in milliseconds
@@ -561,6 +556,7 @@
   return omx_output_buffer;
 }
 
+
 OMX_ERRORTYPE COMXCoreComponent::WaitForInputDone(long timeout /*=200*/)
 {
   OMX_ERRORTYPE omx_err = OMX_ErrorNone;
@@ -1162,7 +1158,12 @@
 
   OMX_STATETYPE state;
 
-  OMX_GetState(m_handle, &state);
+  OMX_ERRORTYPE omx_err = OMX_GetState(m_handle, &state);
+  if (omx_err != OMX_ErrorNone)
+  {
+    CLog::Log(LOGERROR, "COMXCoreComponent::GetState - %s failed with omx_err(0x%x)\n",
+      m_componentName.c_str(), omx_err);
+  }
   return state;
 }
 
@@ -1320,22 +1321,99 @@
 
 OMX_ERRORTYPE COMXCoreComponent::UseEGLImage(OMX_BUFFERHEADERTYPE** ppBufferHdr, OMX_U32 nPortIndex, OMX_PTR pAppPrivate, void* eglImage)
 {
+if (m_callbacks.FillBufferDone == &COMXCoreComponent::DecoderFillBufferDoneCallback)
+{
+  OMX_ERRORTYPE omx_err = OMX_ErrorNone;
+
   if(!m_handle)
     return OMX_ErrorUndefined;
 
-  OMX_ERRORTYPE omx_err;
+  m_omx_output_use_buffers = false;
 
-  omx_err = OMX_UseEGLImage(m_handle, ppBufferHdr, nPortIndex, pAppPrivate, eglImage);
-  if(omx_err != OMX_ErrorNone) 
+  OMX_PARAM_PORTDEFINITIONTYPE portFormat;
+  OMX_INIT_STRUCTURE(portFormat);
+  portFormat.nPortIndex = m_output_port;
+
+  omx_err = OMX_GetParameter(m_handle, OMX_IndexParamPortDefinition, &portFormat);
+  if(omx_err != OMX_ErrorNone)
+    return omx_err;
+
+  if(GetState() != OMX_StateIdle)
+  {
+    if(GetState() != OMX_StateLoaded)
+      SetStateForComponent(OMX_StateLoaded);
+
+    SetStateForComponent(OMX_StateIdle);
+  }
+
+  omx_err = EnablePort(m_output_port, false);
+  if(omx_err != OMX_ErrorNone)
   {
-    CLog::Log(LOGERROR, "COMXCoreComponent::UseEGLImage - %s failed with omx_err(0x%x)\n", 
+    CLog::Log(LOGERROR, "%s::%s - %s EnablePort failed with omx_err(0x%x)", CLASSNAME, __func__,
               m_componentName.c_str(), omx_err);
+    return omx_err;
+  }
+
+  m_output_alignment     = portFormat.nBufferAlignment;
+  m_output_buffer_count  = portFormat.nBufferCountActual;
+  m_output_buffer_size   = portFormat.nBufferSize;
+
+  if (portFormat.nBufferCountActual != 1)
+  {
+    CLog::Log(LOGERROR, "%s::%s - %s nBufferCountActual unexpected %d", CLASSNAME, __func__,
+              m_componentName.c_str(), portFormat.nBufferCountActual);
+    return omx_err;
+  }
+
+  CLog::Log(LOGDEBUG, "%s::%s component(%s) - port(%d), nBufferCountMin(%u), nBufferCountActual(%u), nBufferSize(%u) nBufferAlignmen(%u)\n",
+            CLASSNAME, __func__, m_componentName.c_str(), m_output_port, portFormat.nBufferCountMin,
+            portFormat.nBufferCountActual, portFormat.nBufferSize, portFormat.nBufferAlignment);
+
+  for (size_t i = 0; i < portFormat.nBufferCountActual; i++)
+  {
+    omx_err = OMX_UseEGLImage(m_handle, ppBufferHdr, nPortIndex, pAppPrivate, eglImage);
+    if(omx_err != OMX_ErrorNone)
+    {
+      CLog::Log(LOGERROR, "%s::%s - %s failed with omx_err(0x%x)\n",
+                CLASSNAME, __func__, m_componentName.c_str(), omx_err);
+      return omx_err;
+    }
+
+    OMX_BUFFERHEADERTYPE *buffer = *ppBufferHdr;
+    buffer->nOutputPortIndex = m_output_port;
+    buffer->nFilledLen       = 0;
+    buffer->nOffset          = 0;
+    buffer->pAppPrivate      = (void*)i;
+    m_omx_output_buffers.push_back(buffer);
+    m_omx_output_available.push(buffer);
+  }
+
+  omx_err = WaitForCommand(OMX_CommandPortEnable, m_output_port);
+  if(omx_err != OMX_ErrorNone)
+  {
+    CLog::Log(LOGERROR, " %s::%s - %s EnablePort failed with omx_err(0x%x)\n",
+              CLASSNAME, __func__, m_componentName.c_str(), omx_err);
+      return omx_err;
   }
+  m_flush_output = false;
 
   return omx_err;
 }
+else
+{
+  OMX_ERRORTYPE omx_err;
+    omx_err = OMX_UseEGLImage(m_handle, ppBufferHdr, nPortIndex, pAppPrivate, eglImage);
+    if(omx_err != OMX_ErrorNone)
+    {
+      CLog::Log(LOGERROR, "%s::%s - %s failed with omx_err(0x%x)\n",
+                CLASSNAME, __func__, m_componentName.c_str(), omx_err);
+      return omx_err;
+    }
+  return omx_err;
+}
+}
 
-bool COMXCoreComponent::Initialize( const std::string &component_name, OMX_INDEXTYPE index)
+bool COMXCoreComponent::Initialize( const std::string &component_name, OMX_INDEXTYPE index, OMX_CALLBACKTYPE *callbacks)
 {
   OMX_ERRORTYPE omx_err;
 
@@ -1370,6 +1448,13 @@
   m_callbacks.EmptyBufferDone = &COMXCoreComponent::DecoderEmptyBufferDoneCallback;
   m_callbacks.FillBufferDone  = &COMXCoreComponent::DecoderFillBufferDoneCallback;
 
+  if (callbacks && callbacks->EventHandler)
+    m_callbacks.EventHandler    = callbacks->EventHandler;
+  if (callbacks && callbacks->EmptyBufferDone)
+    m_callbacks.EmptyBufferDone = callbacks->EmptyBufferDone;
+  if (callbacks && callbacks->FillBufferDone)
+    m_callbacks.FillBufferDone  = callbacks->FillBufferDone;
+
   // Get video component handle setting up callbacks, component is in loaded state on return.
   if(!m_handle)
   {
@@ -1378,7 +1463,7 @@
     {
       CLog::Log(LOGERROR, "COMXCoreComponent::Initialize - could not get component handle for %s omx_err(0x%08x)\n",
           component_name.c_str(), (int)omx_err);
-      Deinitialize(true);
+      Deinitialize();
       return false;
     }
   }
@@ -1393,14 +1478,11 @@
         component_name.c_str(), (int)omx_err);
   }
 
-  if(m_componentName != "OMX.broadcom.clock")
+  omx_err = DisableAllPorts();
+  if (omx_err != OMX_ErrorNone)
   {
-    omx_err = DisableAllPorts();
-    if (omx_err != OMX_ErrorNone)
-    {
-      CLog::Log(LOGERROR, "COMXCoreComponent::Initialize - error disable ports on component %s omx_err(0x%08x)\n",
-          component_name.c_str(), (int)omx_err);
-    }
+    CLog::Log(LOGERROR, "COMXCoreComponent::Initialize - error disable ports on component %s omx_err(0x%08x)\n",
+        component_name.c_str(), (int)omx_err);
   }
 
   m_input_port  = port_param.nStartPortNumber;
@@ -1437,7 +1519,7 @@
   pthread_mutex_unlock(&m_omx_eos_mutex);
 }
 
-bool COMXCoreComponent::Deinitialize(bool free_component /* = false */)
+bool COMXCoreComponent::Deinitialize()
 {
   OMX_ERRORTYPE omx_err;
 
@@ -1455,23 +1537,20 @@
 
     TransitionToStateLoaded();
 
-    if(free_component)
+    CLog::Log(LOGDEBUG, "COMXCoreComponent::Deinitialize : %s handle %p\n",
+        m_componentName.c_str(), m_handle);
+    omx_err = m_DllOMX->OMX_FreeHandle(m_handle);
+    if (omx_err != OMX_ErrorNone)
     {
-      CLog::Log(LOGDEBUG, "COMXCoreComponent::Deinitialize : %s handle %p\n",
-          m_componentName.c_str(), m_handle);
-      omx_err = m_DllOMX->OMX_FreeHandle(m_handle);
-      if (omx_err != OMX_ErrorNone)
-      {
-        CLog::Log(LOGERROR, "COMXCoreComponent::Deinitialize - failed to free handle for component %s omx_err(0x%08x)",
-            m_componentName.c_str(), omx_err);
-      }  
-      m_handle = NULL;
-
-      m_input_port      = 0;
-      m_output_port     = 0;
-      m_componentName   = "";
-      m_resource_error  = false;
+      CLog::Log(LOGERROR, "COMXCoreComponent::Deinitialize - failed to free handle for component %s omx_err(0x%08x)",
+          m_componentName.c_str(), omx_err);
     }
+    m_handle = NULL;
+
+    m_input_port      = 0;
+    m_output_port     = 0;
+    m_componentName   = "";
+    m_resource_error  = false;
   }
 
   return true;

omxplayer-2014.02.11.tar.gz/OMXCore.h -> omxplayer-2014.03.28.tar.gz/OMXCore.h Changed

@@ -72,9 +72,8 @@
   void Initialize(COMXCoreComponent *src_component, unsigned int src_port, COMXCoreComponent *dst_component, unsigned int dst_port);
   bool IsInitialized();
   OMX_ERRORTYPE Deestablish(bool noWait = false);
-  OMX_ERRORTYPE Establish(bool portSettingsChanged, bool enable_ports = true, bool disable_ports = false);
+  OMX_ERRORTYPE Establish(bool enable_ports = true, bool disable_ports = false);
 private:
-  bool              m_portSettingsChanged;
   COMXCoreComponent *m_src_component;
   COMXCoreComponent *m_dst_component;
   unsigned int      m_src_port;
@@ -110,9 +109,9 @@
   OMX_ERRORTYPE DisablePort(unsigned int port, bool wait = true);
   OMX_ERRORTYPE UseEGLImage(OMX_BUFFERHEADERTYPE** ppBufferHdr, OMX_U32 nPortIndex, OMX_PTR pAppPrivate, void* eglImage);
 
-  bool          Initialize( const std::string &component_name, OMX_INDEXTYPE index);
+  bool          Initialize( const std::string &component_name, OMX_INDEXTYPE index, OMX_CALLBACKTYPE *callbacks = NULL);
   bool          IsInitialized();
-  bool          Deinitialize(bool free_component = false);
+  bool          Deinitialize();
 
   // OMXCore Decoder delegate callback routines.
   static OMX_ERRORTYPE DecoderEventHandlerCallback(OMX_HANDLETYPE hComponent, OMX_PTR pAppData,

omxplayer-2014.02.11.tar.gz/OMXPlayerAudio.cpp -> omxplayer-2014.03.28.tar.gz/OMXPlayerAudio.cpp Changed

@@ -243,9 +243,10 @@
 
   if(!m_passthrough && !m_hw_decode)
   {
+    double dts = pkt->dts, pts=pkt->pts;
     while(data_len > 0)
     {
-      int len = m_pAudioCodec->Decode((BYTE *)data_dec, data_len);
+      int len = m_pAudioCodec->Decode((BYTE *)data_dec, data_len, dts, pts);
       if( (len < 0) || (len >  data_len) )
       {
         m_pAudioCodec->Reset();
@@ -256,7 +257,7 @@
       data_len -= len;
 
       uint8_t *decoded;
-      int decoded_size = m_pAudioCodec->GetData(&decoded);
+      int decoded_size = m_pAudioCodec->GetData(&decoded, dts, pts);
 
       if(decoded_size <=0)
         continue;
@@ -269,7 +270,7 @@
 
       int ret = 0;
 
-      ret = m_decoder->AddPackets(decoded, decoded_size, pkt->dts, pkt->pts);
+      ret = m_decoder->AddPackets(decoded, decoded_size, dts, pts, m_pAudioCodec->GetFrameSize());
       if(ret != decoded_size)
       {
         printf("error ret %d decoded_size %d\n", ret, decoded_size);
@@ -284,7 +285,7 @@
       if(m_flush_requested) return true;
     }
 
-    m_decoder->AddPackets(pkt->data, pkt->size, pkt->dts, pkt->pts);
+    m_decoder->AddPackets(pkt->data, pkt->size, pkt->dts, pkt->pts, 0);
   }
 
   return true;

omxplayer-2014.02.11.tar.gz/OMXPlayerSubtitles.cpp -> omxplayer-2014.03.28.tar.gz/OMXPlayerSubtitles.cpp Changed

omxplayer-2014.02.11.tar.gz/OMXPlayerSubtitles.h -> omxplayer-2014.03.28.tar.gz/OMXPlayerSubtitles.h Changed

omxplayer-2014.02.11.tar.gz/OMXPlayerVideo.cpp -> omxplayer-2014.03.28.tar.gz/OMXPlayerVideo.cpp Changed

@@ -52,6 +52,7 @@
   m_max_data_size = 10 * 1024 * 1024;
   m_fifo_size     = (float)80*1024*60 / (1024*1024);
   m_history_valid_pts = 0;
+  m_layer = 0;
 
   pthread_cond_init(&m_packet_cond, NULL);
   pthread_cond_init(&m_picture_cond, NULL);
@@ -108,7 +109,7 @@
 }
 
 bool OMXPlayerVideo::Open(COMXStreamInfo &hints, OMXClock *av_clock, const CRect& DestRect, EDEINTERLACEMODE deinterlace, bool hdmi_clock_sync, bool use_thread,
-                             float display_aspect, float queue_size, float fifo_size)
+                             float display_aspect, int layer, float queue_size, float fifo_size)
 {
   if (!m_dllAvUtil.Load() || !m_dllAvCodec.Load() || !m_dllAvFormat.Load() || !av_clock)
     return false;
@@ -134,6 +135,7 @@
   m_iSubtitleDelay = 0;
   m_pSubtitleCodec = NULL;
   m_DestRect    = DestRect;
+  m_layer       = layer;
   if (queue_size != 0.0)
     m_max_data_size = queue_size * 1024 * 1024;
   if (fifo_size != 0.0)
@@ -431,7 +433,7 @@
   m_frametime = (double)DVD_TIME_BASE / m_fps;
 
   m_decoder = new COMXVideo();
-  if(!m_decoder->Open(m_hints, m_av_clock, m_DestRect, m_display_aspect, m_Deinterlace, m_hdmi_clock_sync, m_fifo_size))
+  if(!m_decoder->Open(m_hints, m_av_clock, m_DestRect, m_display_aspect, m_Deinterlace, m_hdmi_clock_sync, m_layer, m_fifo_size))
   {
     CloseDecoder();
     return false;

omxplayer-2014.02.11.tar.gz/OMXPlayerVideo.h -> omxplayer-2014.03.28.tar.gz/OMXPlayerVideo.h Changed

omxplayer-2014.02.11.tar.gz/OMXReader.cpp -> omxplayer-2014.03.28.tar.gz/OMXReader.cpp Changed

@@ -39,6 +39,23 @@
 
 static bool g_abort = false;
 
+static int64_t timeout_start;
+static int64_t timeout_default_duration;
+static int64_t timeout_duration;
+
+static int64_t CurrentHostCounter(void)
+{
+  struct timespec now;
+  clock_gettime(CLOCK_MONOTONIC, &now);
+  return( ((int64_t)now.tv_sec * 1000000000LL) + now.tv_nsec );
+}
+
+#define RESET_TIMEOUT(x) do { \
+  timeout_start = CurrentHostCounter(); \
+  timeout_duration = (x) * timeout_default_duration; \
+} while (0)
+
+
 OMXReader::OMXReader()
 {
   m_open        = false;
@@ -80,13 +97,23 @@
 
 static int interrupt_cb(void *unused)
 {
-  if(g_abort)
-    return 1;
-  return 0;
+  int ret = 0;
+  if (g_abort)
+  {
+    CLog::Log(LOGERROR, "COMXPlayer::interrupt_cb - Told to abort");
+    ret = 1;
+  }
+  else if (timeout_duration && CurrentHostCounter() - timeout_start > timeout_duration)
+  {
+    CLog::Log(LOGERROR, "COMXPlayer::interrupt_cb - Timed out");
+    ret = 1;
+  }
+  return ret;
 }
 
 static int dvd_file_read(void *h, uint8_t* buf, int size)
 {
+  RESET_TIMEOUT(1);
   if(interrupt_cb(NULL))
     return -1;
 
@@ -96,6 +123,7 @@
 
 static offset_t dvd_file_seek(void *h, offset_t pos, int whence)
 {
+  RESET_TIMEOUT(1);
   if(interrupt_cb(NULL))
     return -1;
 
@@ -106,16 +134,18 @@
     return pFile->Seek(pos, whence & ~AVSEEK_FORCE);
 }
 
-bool OMXReader::Open(std::string filename, bool dump_format, bool live /* =false */)
+bool OMXReader::Open(std::string filename, bool dump_format, bool live /* =false */, float timeout /* = 0.0f */)
 {
   if (!m_dllAvUtil.Load() || !m_dllAvCodec.Load() || !m_dllAvFormat.Load())
     return false;
-  
+
+  timeout_default_duration = (int64_t) (timeout * 1e9);
   m_iCurrentPts = DVD_NOPTS_VALUE;
   m_filename    = filename; 
   m_speed       = DVD_PLAYSPEED_NORMAL;
   m_program     = UINT_MAX;
   const AVIOInterruptCB int_cb = { interrupt_cb, NULL };
+  RESET_TIMEOUT(3);
 
   ClearStreams();
 
@@ -128,11 +158,19 @@
   unsigned char *buffer   = NULL;
   unsigned int  flags     = READ_TRUNCATED | READ_BITRATE | READ_CHUNKED;
 
+  m_pFormatContext     = m_dllAvFormat.avformat_alloc_context();
+
+  // set the interrupt callback, appeared in libavformat 53.15.0
+  m_pFormatContext->interrupt_callback = int_cb;
+
+  // if format can be nonblocking, let's use that
+  m_pFormatContext->flags |= AVFMT_FLAG_NONBLOCK;
+
   if(m_filename.substr(0, 8) == "shout://" )
     m_filename.replace(0, 8, "http://");
 
   if(m_filename.substr(0,6) == "mms://" || m_filename.substr(0,7) == "mmsh://" || m_filename.substr(0,7) == "mmst://" || m_filename.substr(0,7) == "mmsu://" ||
-      m_filename.substr(0,7) == "http://" || 
+      m_filename.substr(0,7) == "http://" || m_filename.substr(0,8) == "https://" ||
       m_filename.substr(0,7) == "rtmp://" || m_filename.substr(0,6) == "udp://" ||
       m_filename.substr(0,7) == "rtsp://" )
   {
@@ -193,7 +231,6 @@
       return false;
     }
 
-    m_pFormatContext     = m_dllAvFormat.avformat_alloc_context();
     m_pFormatContext->pb = m_ioContext;
     result = m_dllAvFormat.avformat_open_input(&m_pFormatContext, m_filename.c_str(), iformat, NULL);
     if(result < 0)
@@ -203,15 +240,9 @@
     }
   }
 
-  // set the interrupt callback, appeared in libavformat 53.15.0
-  m_pFormatContext->interrupt_callback = int_cb;
-
   m_bMatroska = strncmp(m_pFormatContext->iformat->name, "matroska", 8) == 0; // for "matroska.webm"
   m_bAVI = strcmp(m_pFormatContext->iformat->name, "avi") == 0;
 
-  // if format can be nonblocking, let's use that
-  m_pFormatContext->flags |= AVFMT_FLAG_NONBLOCK;
-
   // analyse very short to speed up mjpeg playback start
   if (iformat && (strcmp(iformat->name, "mjpeg") == 0) && m_ioContext->seekable == 0)
     m_pFormatContext->max_analyze_duration = 500000;
@@ -379,7 +410,7 @@
   if (m_pFormatContext->start_time != (int64_t)AV_NOPTS_VALUE)
     seek_pts += m_pFormatContext->start_time;
 
-
+  RESET_TIMEOUT(1);
   int ret = m_dllAvFormat.av_seek_frame(m_pFormatContext, -1, seek_pts, backwords ? AVSEEK_FLAG_BACKWARD : 0);
 
   if(ret >= 0)
@@ -418,7 +449,7 @@
   OMXPacket *m_omx_pkt = NULL;
   int       result = -1;
 
-  if(!m_pFormatContext)
+  if(!m_pFormatContext || m_eof)
     return NULL;
 
   Lock();
@@ -432,6 +463,7 @@
   pkt.data = NULL;
   pkt.stream_index = MAX_OMX_STREAMS;
 
+  RESET_TIMEOUT(1);
   result = m_dllAvFormat.av_read_frame(m_pFormatContext, &pkt);
   if (result < 0)
   {
@@ -441,7 +473,8 @@
     UnLock();
     return NULL;
   }
-  else if (pkt.size < 0 || pkt.stream_index >= MAX_OMX_STREAMS)
+
+  if (pkt.size < 0 || pkt.stream_index >= MAX_OMX_STREAMS || interrupt_cb(NULL))
   {
     // XXX, in some cases ffmpeg returns a negative packet size
     if(m_pFormatContext->pb && !m_pFormatContext->pb->eof_reached)

omxplayer-2014.02.11.tar.gz/OMXReader.h -> omxplayer-2014.03.28.tar.gz/OMXReader.h Changed

omxplayer-2014.02.11.tar.gz/OMXVideo.cpp -> omxplayer-2014.03.28.tar.gz/OMXVideo.cpp Changed

@@ -80,6 +80,7 @@
   m_transform         = OMX_DISPLAY_ROT0;
   m_first_text        = true;
   m_pixel_aspect      = 1.0f;
+  m_layer             = 0;
 }
 
 COMXVideo::~COMXVideo()
@@ -176,13 +177,13 @@
 
   if (m_settings_changed)
   {
-    CLog::Log(LOGDEBUG, "%s::%s - %dx%d@%.2f interlace:%d deinterlace:%d par:%.2f", CLASSNAME, __func__,
+    CLog::Log(LOGDEBUG, "%s::%s - %dx%d@%.2f interlace:%d deinterlace:%d par:%.2f layer:%d", CLASSNAME, __func__,
         port_image.format.video.nFrameWidth, port_image.format.video.nFrameHeight,
-        port_image.format.video.xFramerate / (float)(1<<16), 0, m_deinterlace, m_pixel_aspect);
+        port_image.format.video.xFramerate / (float)(1<<16), 0, m_deinterlace, m_pixel_aspect, m_layer);
 
-    printf("V:PortSettingsChanged: %dx%d@%.2f interlace:%d deinterlace:%d par:%.2f\n",
+    printf("V:PortSettingsChanged: %dx%d@%.2f interlace:%d deinterlace:%d par:%.2f layer:%d\n",
         port_image.format.video.nFrameWidth, port_image.format.video.nFrameHeight,
-        port_image.format.video.xFramerate / (float)(1<<16), 0, m_deinterlace, m_pixel_aspect);
+        port_image.format.video.xFramerate / (float)(1<<16), 0, m_deinterlace, m_pixel_aspect, m_layer);
 
     SetVideoRect(m_src_rect, m_dst_rect);
     m_omx_decoder.EnablePort(m_omx_decoder.GetOutputPort(), true);
@@ -206,13 +207,13 @@
 
   m_omx_render.ResetEos();
 
-  CLog::Log(LOGDEBUG, "%s::%s - %dx%d@%.2f interlace:%d deinterlace:%d par:%.2f", CLASSNAME, __func__,
+  CLog::Log(LOGDEBUG, "%s::%s - %dx%d@%.2f interlace:%d deinterlace:%d par:%.2f layer:%d", CLASSNAME, __func__,
       port_image.format.video.nFrameWidth, port_image.format.video.nFrameHeight,
-      port_image.format.video.xFramerate / (float)(1<<16), interlace.eMode, m_deinterlace, m_pixel_aspect);
+      port_image.format.video.xFramerate / (float)(1<<16), interlace.eMode, m_deinterlace, m_pixel_aspect, m_layer);
 
-  printf("V:PortSettingsChanged: %dx%d@%.2f interlace:%d deinterlace:%d par:%.2f\n",
+  printf("V:PortSettingsChanged: %dx%d@%.2f interlace:%d deinterlace:%d par:%.2f layer:%d\n",
       port_image.format.video.nFrameWidth, port_image.format.video.nFrameHeight,
-      port_image.format.video.xFramerate / (float)(1<<16), interlace.eMode, m_deinterlace, m_pixel_aspect);
+      port_image.format.video.xFramerate / (float)(1<<16), interlace.eMode, m_deinterlace, m_pixel_aspect, m_layer);
 
   if(!m_omx_sched.Initialize("OMX.broadcom.video_scheduler", OMX_IndexParamVideoInit))
     return false;
@@ -227,7 +228,8 @@
   OMX_INIT_STRUCTURE(configDisplay);
   configDisplay.nPortIndex = m_omx_render.GetInputPort();
 
-  configDisplay.set = OMX_DISPLAY_SET_TRANSFORM;
+  configDisplay.set = (OMX_DISPLAYSETTYPE)(OMX_DISPLAY_SET_TRANSFORM | OMX_DISPLAY_SET_LAYER);
+  configDisplay.layer = m_layer;
   configDisplay.transform = m_transform;
   omx_err = m_omx_render.SetConfig(OMX_IndexConfigDisplayRegion, &configDisplay);
   if(omx_err != OMX_ErrorNone)
@@ -289,14 +291,14 @@
   m_omx_tunnel_sched.Initialize(&m_omx_sched, m_omx_sched.GetOutputPort(), &m_omx_render, m_omx_render.GetInputPort());
   m_omx_tunnel_clock.Initialize(m_omx_clock, m_omx_clock->GetInputPort() + 1, &m_omx_sched, m_omx_sched.GetOutputPort() + 1);
 
-  omx_err = m_omx_tunnel_clock.Establish(false);
+  omx_err = m_omx_tunnel_clock.Establish();
   if(omx_err != OMX_ErrorNone)
   {
     CLog::Log(LOGERROR, "%s::%s - m_omx_tunnel_clock.Establish omx_err(0x%08x)", CLASSNAME, __func__, omx_err);
     return false;
   }
 
-  omx_err = m_omx_tunnel_decoder.Establish(false);
+  omx_err = m_omx_tunnel_decoder.Establish();
   if (omx_err != OMX_ErrorNone)
   {
     CLog::Log(LOGERROR, "%s::%s - m_omx_tunnel_decoder.Establish omx_err(0x%08x)", CLASSNAME, __func__, omx_err);
@@ -305,7 +307,7 @@
 
   if(m_deinterlace)
   {
-    omx_err = m_omx_tunnel_image_fx.Establish(false);
+    omx_err = m_omx_tunnel_image_fx.Establish();
     if(omx_err != OMX_ErrorNone)
     {
       CLog::Log(LOGERROR, "%s::%s - m_omx_tunnel_image_fx.Establish omx_err(0x%08x)", CLASSNAME, __func__, omx_err);
@@ -320,7 +322,7 @@
     }
   }
 
-  omx_err = m_omx_tunnel_sched.Establish(false);
+  omx_err = m_omx_tunnel_sched.Establish();
   if(omx_err != OMX_ErrorNone)
   {
     CLog::Log(LOGERROR, "%s::%s - m_omx_tunnel_sched.Establish omx_err(0x%08x)", CLASSNAME, __func__, omx_err);
@@ -345,7 +347,7 @@
   return true;
 }
 
-bool COMXVideo::Open(COMXStreamInfo &hints, OMXClock *clock, const CRect &DestRect, float display_aspect, EDEINTERLACEMODE deinterlace, bool hdmi_clock_sync, float fifo_size)
+bool COMXVideo::Open(COMXStreamInfo &hints, OMXClock *clock, const CRect &DestRect, float display_aspect, EDEINTERLACEMODE deinterlace, bool hdmi_clock_sync, int layer, float fifo_size)
 {
   CSingleLock lock (m_critSection);
   bool vflip = false;
@@ -368,6 +370,8 @@
   m_hdmi_clock_sync = hdmi_clock_sync;
   m_submitted_eos = false;
   m_failed_eos    = false;
+  
+  m_layer = layer;
 
   if(!m_decoded_width || !m_decoded_height)
     return false;
@@ -716,7 +720,7 @@
     return false;
   }
 
-  omx_err = m_omx_tunnel_text.Establish(false);
+  omx_err = m_omx_tunnel_text.Establish();
   if(omx_err != OMX_ErrorNone)
   {
     CLog::Log(LOGERROR, "COMXVideo::Open m_omx_tunnel_text.Establish\n");
@@ -786,12 +790,12 @@
 
   m_omx_decoder.FlushInput();
 
-  m_omx_sched.Deinitialize(true);
-  m_omx_decoder.Deinitialize(true);
+  m_omx_sched.Deinitialize();
+  m_omx_decoder.Deinitialize();
   if(m_deinterlace)
-    m_omx_image_fx.Deinitialize(true);
-  m_omx_render.Deinitialize(true);
-  m_omx_tunnel_text.Deestablish(true);
+    m_omx_image_fx.Deinitialize();
+  m_omx_render.Deinitialize();
+  m_omx_tunnel_text.Deestablish();
 
   m_is_open       = false;

omxplayer-2014.02.11.tar.gz/OMXVideo.h -> omxplayer-2014.03.28.tar.gz/OMXVideo.h Changed

omxplayer-2014.02.11.tar.gz/README.md -> omxplayer-2014.03.28.tar.gz/README.md Changed

@@ -65,6 +65,7 @@
          -g / --genlog                  generate log file
          -l / --pos n                   start position (hh:mm:ss)
          -b / --blank                   set background to black
+              --loop                    loop file. Ignored if file is not seekable, start position applied if given
               --no-boost-on-downmix     don't boost volume when downmixing
               --vol n                   Set initial volume in millibels (default 0)
               --no-osd                  do not display status information on screen
@@ -84,6 +85,7 @@
               --audio_queue n           Size of audio input queue in MB
               --video_queue n           Size of video input queue in MB
               --threshold   n           Amount of buffered data required to come out of buffering in seconds
+              --timeout     n           Amount of time a file/network operation can stall for before timing out (default 10s)
               --orientation n           Set orientation of video (0, 90, 180 or 270)
               --fps n                   Set fps of video where timestamps are not present
               --live                    Set for live tv or vod type stream
@@ -168,3 +170,370 @@
     REWIND:left
     SEEK_FORWARD_SMALL:hex 0x4f43
     EXIT:q
+
+## DBUS Control
+
+`omxplayer` can be controlled via DBUS.  There are three interfaces, all of
+which present a different set of commands.  For examples on working with DBUS
+take a look at the supplied [dbuscontrol.sh](blob/master/dbuscontrol.sh) file.
+
+### Root Interface
+
+The root interface is accessible under the name
+`org.mpris.MediaPlayer2`.
+
+#### Quit
+
+Stops the currently playing video.  This will cause the currently running
+omxplayer process to terminate.
+
+   Params       |   Type   
+:-------------: | -------
+ Return         | `null`
+
+### Properties Interface
+
+The properties interface is accessible under the name
+`org.freedesktop.DBus.Properties`.
+
+#### CanQuit
+
+Whether or not the player can quit.
+
+   Params       |   Type   
+:-------------: | ---------
+ Return         | `boolean`
+
+#### Fullscreen
+
+Whether or not the player can is fullscreen.
+
+   Params       |   Type   
+:-------------: | ---------
+ Return         | `boolean`
+
+#### CanSetFullscreen
+
+Whether or not the player can set fullscreen.
+
+   Params       |   Type   
+:-------------: | ---------
+ Return         | `boolean`
+
+#### CanRaise
+
+Not sure what this means.
+
+   Params       |   Type   
+:-------------: | ---------
+ Return         | `boolean`
+
+#### HasTrackList
+
+Whether or not the player has a track list.
+
+   Params       |   Type   
+:-------------: | ---------
+ Return         | `boolean`
+
+#### Identity
+
+Name of the player.
+
+   Params       |   Type   
+:-------------: | --------
+ Return         | `string`
+
+#### SupportedUriSchemes
+
+Playable URI formats.
+
+   Params       |   Type   
+:-------------: | ----------
+ Return         | `string[]`
+
+#### SupportedMimeTypes
+
+Supported mime types.  **Note**: currently not implemented.
+
+   Params       |   Type   
+:-------------: | ----------
+ Return         | `string[]`
+
+#### CanGoNext
+
+Whether or not the play can skip to the next track.
+
+   Params       |   Type   
+:-------------: | ---------
+ Return         | `boolean`
+
+#### CanGoPrevious
+
+Whether or not the player can skip to the previous track.
+
+   Params       |   Type   
+:-------------: | ---------
+ Return         | `boolean`
+
+#### CanSeek
+
+Whether or not the player can seek.
+
+   Params       |   Type   
+:-------------: | ---------
+ Return         | `boolean`
+
+
+#### CanControl
+
+Whether or not the player can be controlled.
+
+   Params       |   Type   
+:-------------: | ---------
+ Return         | `boolean`
+
+#### CanPlay
+
+Whether or not the player can play.
+
+Return type: `boolean`.
+
+#### CanPause
+
+Whether or not the player can pause.
+
+   Params       |   Type
+:-------------: | ---------
+ Return         | `boolean`
+
+#### PlaybackStatus
+
+The current state of the player, either "Paused" or "Playing".
+
+   Params       |   Type
+:-------------: | ---------
+ Return         | `string` 
+
+#### Volume
+
+When called with an argument it will set the volume and return the current
+volume.  When called without an argument it will simply return the current
+volume.  As defined by the [MPRIS][MPRIS_volume] specifications, this value
+should be greater than or equal to 0 and no larger than about 1.
+
+Millibels can be converted to/from acceptable values using the following:
+
+    volume = pow(10, mB / 2000.0);
+    mB     = 2000.0 * log10(volume)
+
+   Params       |   Type    | Description
+:-------------:	| --------- | ---------------------------
+ 1 (optional)   | `double`  | Volume to set
+ Return         | `double`  | Current volume
+
+[MPRIS_volume]: http://specifications.freedesktop.org/mpris-spec/latest/Player_Interface.html#Simple-Type:Volume
+
+#### Mute
+
+Mute the audio stream.  If the volume is already muted, this does nothing.
+
+   Params       |   Type
+:-------------: | -------
+ Return         | `null` 
+
+#### Unmute
+
+Unmute the audio stream.  If the stream is already unmuted, this does nothing.
+
+   Params       |   Type
+:-------------: | -------
+ Return         | `null` 
+
+#### Position
+
+Returns the current position of the playing media.
+
+   Params       |   Type    | Description
+:-------------: | --------- | --------------------------------
+ Return         | `int64`   | Current position in microseconds
+
+#### Duration
+
+Returns the total length of the playing media.
+
+   Params       |   Type    | Description
+:-------------: | --------- | ----------------------------
+ Return         | `int64`   | Total length in microseconds
+
+
+#### MinimumRate
+
+Returns the minimum playback rate of the video.
+
+   Params       |   Type
+:-------------: | -------
+ Return         | `double` 
+
+#### MaximumRate
+
+Returns the maximum playback rate of the video.
+
+   Params       |   Type
+:-------------: | -------
+ Return         | `double` 
+
+
+### Player Interface
+
+
+#### Next
+
+Skip to the next chapter.
+
+   Params       |   Type
+:-------------: | -------
+ Return         | `null` 
+
+#### Previous
+
+Skip to the previous chapter.
+
+   Params       |   Type
+:-------------: | -------
+ Return         | `null` 
+
+#### Pause
+
+Toggles the play state.  If the video is playing, it will be paused, if it is
+paused it will start playing.
+
+   Params       |   Type
+:-------------: | -------
+ Return         | `null` 
+
+#### PlayPause
+
+Same as the `Pause` method.
+
+#### Stop
+
+Stops the video.
+
+   Params       |   Type
+:-------------: | -------
+ Return         | `null` 
+
+#### Seek
+
+Perform a *relative* seek, i.e. seek plus or minus a certain number of
+microseconds from the current position in the video.
+
+   Params       |   Type            | Description
+:-------------: | ----------------- | ---------------------------
+ 1              | `int64`           | Microseconds to seek
+ Return         | `null` or `int64` | If the supplied offset is invalid, `null` is returned, otherwise the offset (in microseconds) is returned
+
+#### SetPosition
+
+Seeks to a specific location in the file.  This is an *absolute* seek.
+
+   Params       |   Type            | Description
+:-------------: | ----------------- | ------------------------------------
+ 1              | `string`          | Path (not currently used)
+ 2              | `int64`           | Position to seek to, in microseconds
+ Return         | `null` or `int64` | If the supplied position is invalid, `null` is returned, otherwise the position (in microseconds) is returned
+
+
+#### ListSubtitles
+
+Returns a array of all known subtitles.  The length of the array is the number
+of subtitles.  Each item in the araay is a string in the following format:
+
+    <index>:<language>:<name>:<codec>:<active>
+
+Any of the fields may be blank, except for `index`.  `language` is the language
+code, such as `eng`, `chi`, `swe`, etc.  `name` is a description of the
+subtitle, such as `foreign parts` or `SDH`.  `codec` is the name of the codec
+used by the subtitle, sudh as `subrip`.  `active` is either the string `active`
+or an empty string.
+
+   Params       |   Type
+:-------------: | ----------
+ Return         | `string[]` 
+
+#### ListAudio
+
+Returns and array of all known audio streams.  The length of the array is the
+number of streams.  Each item in the array is a string in the following format:
+
+    <index>:<language>:<name>:<codec>:<active>
+
+See `ListSubtitles` for a description of what each of these fields means.  An
+example of a possible string is:
+
+    0:eng:DD 5.1:ac3:active
+
+   Params       |   Type
+:-------------: | ----------
+ Return         | `string[]` 
+
+#### ListVideo
+
+Returns and array of all known video streams.  The length of the array is the
+number of streams.  Each item in the array is a string in the following format:
+
+    <index>:<language>:<name>:<codec>:<active>
+
+See `ListSubtitles` for a description of what each of these fields means.  An
+example of a possible string is:
+
+    0:eng:x264:h264:active
+
+#### SelectSubtitle
+
+Selects the subtitle at a given index.
+
+   Params       |   Type    | Description
+:-------------: | ----------| ------------------------------------
+ 1              | `int32`   | Index of subtitle to select
+ Return         | `boolean` | Returns `true` if subtitle was selected, `false otherwise
+
+
+#### SelectAudio
+
+Selects the audio stream at a given index.
+
+   Params       |   Type    | Description
+:-------------: | ----------| ------------------------------------
+ 1              | `int32`   | Index of audio stream to select
+ Return         | `boolean` | Returns `true` if stream was selected, `false otherwise
+
+#### ShowSubtitles
+
+Turns on subtitles.
+
+   Params       |   Type 
+:-------------: | -------
+ Return         | `null` 
+
+#### HideSubtitles
+
+Turns off subtitles.
+
+   Params       |   Type 
+:-------------: | -------
+ Return         | `null` 
+
+#### Action
+
+Execute a "keyboard" command.  For available codes, see
+[KeyConfig.h](blob/master/KeyConfig.h).
+
+
+   Params       |   Type    | Description
+:-------------: | ----------| ------------------
+ 1              | `int32`   | Command to execute
+ Return         | `null`    | 
+
+

omxplayer-2014.03.28.tar.gz/dbuscontrol.sh Added

@@ -0,0 +1,73 @@
+#!/bin/bash
+
+#set -x
+
+OMXPLAYER_DBUS_ADDR="/tmp/omxplayerdbus"
+OMXPLAYER_DBUS_PID="/tmp/omxplayerdbus.pid"
+export DBUS_SESSION_BUS_ADDRESS=`cat $OMXPLAYER_DBUS_ADDR`
+export DBUS_SESSION_BUS_PID=`cat $OMXPLAYER_DBUS_PID`
+
+[ -z "$DBUS_SESSION_BUS_ADDRESS" ] && { echo "Must have DBUS_SESSION_BUS_ADDRESS" >&2; exit 1; }
+
+case $1 in
+status)
+	duration=`dbus-send --print-reply=literal --session --reply-timeout=500 --dest=org.mpris.MediaPlayer2.omxplayer /org/mpris/MediaPlayer2 org.freedesktop.DBus.Properties.Duration`
+	[ $? -ne 0 ] && exit 1
+	duration="$(awk '{print $2}' <<< "$duration")"
+
+	position=`dbus-send --print-reply=literal --session --reply-timeout=500 --dest=org.mpris.MediaPlayer2.omxplayer /org/mpris/MediaPlayer2 org.freedesktop.DBus.Properties.Position`
+	[ $? -ne 0 ] && exit 1
+	position="$(awk '{print $2}' <<< "$position")"
+
+	playstatus=`dbus-send --print-reply=literal --session --reply-timeout=500 --dest=org.mpris.MediaPlayer2.omxplayer /org/mpris/MediaPlayer2 org.freedesktop.DBus.Properties.PlaybackStatus`
+	[ $? -ne 0 ] && exit 1
+	playstatus="$(sed 's/^ *//;s/ *$//;' <<< "$playstatus")"
+
+	paused="true"
+	[ "$playstatus" == "Playing" ] && paused="false"
+	echo "Duration: $duration"
+	echo "Position: $position"
+	echo "Paused: $paused"
+	;;
+
+pause)
+	dbus-send --print-reply=literal --session --dest=org.mpris.MediaPlayer2.omxplayer /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player.Action int32:16 >/dev/null
+	;;
+
+stop)
+	dbus-send --print-reply=literal --session --dest=org.mpris.MediaPlayer2.omxplayer /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player.Action int32:15 >/dev/null
+	;;
+
+seek)
+	dbus-send --print-reply=literal --session --dest=org.mpris.MediaPlayer2.omxplayer /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player.Seek int64:$2 >/dev/null
+	;;
+
+setposition)
+	dbus-send --print-reply=literal --session --dest=org.mpris.MediaPlayer2.omxplayer /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player.SetPosition objpath:/not/used int64:$2 >/dev/null
+	;;
+
+setvideopos)
+	dbus-send --print-reply=literal --session --dest=org.mpris.MediaPlayer2.omxplayer /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player.VideoPos objpath:/not/used string:"$2 $3 $4 $5" >/dev/null
+	;;
+
+hidevideo)
+	dbus-send --print-reply=literal --session --dest=org.mpris.MediaPlayer2.omxplayer /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player.Action int32:28 >/dev/null
+	;;
+
+unhidevideo)
+	dbus-send --print-reply=literal --session --dest=org.mpris.MediaPlayer2.omxplayer /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player.Action int32:29 >/dev/null
+	;;
+
+volumeup)
+	dbus-send --print-reply=literal --session --dest=org.mpris.MediaPlayer2.omxplayer /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player.Action int32:18 >/dev/null
+	;;
+
+volumedown)
+	dbus-send --print-reply=literal --session --dest=org.mpris.MediaPlayer2.omxplayer /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player.Action int32:17 >/dev/null
+	;;
+
+*)
+	echo "usage: $0 status|pause|stop|seek|volumeup|volumedown|setposition [position in microseconds]|hidevideo|unhidevideo|setvideopos [x1 y1 x2 y2]" >&2
+	exit 1
+	;;
+esac

omxplayer-2014.02.11.tar.gz/ffmpeg/.git/HEAD -> omxplayer-2014.03.28.tar.gz/ffmpeg/.git/HEAD Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/.git/index -> omxplayer-2014.03.28.tar.gz/ffmpeg/.git/index Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/.git/logs/HEAD -> omxplayer-2014.03.28.tar.gz/ffmpeg/.git/logs/HEAD Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/.git/logs/refs/heads/master -> omxplayer-2014.03.28.tar.gz/ffmpeg/.git/logs/refs/heads/master Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/.git/logs/refs/remotes/origin/HEAD -> omxplayer-2014.03.28.tar.gz/ffmpeg/.git/logs/refs/remotes/origin/HEAD Changed

omxplayer-2014.03.28.tar.gz/ffmpeg/.git/objects/pack/pack-75a43f1e2e0bb6043dca7bffa395844f76aad08d.idx Added

omxplayer-2014.03.28.tar.gz/ffmpeg/.git/objects/pack/pack-75a43f1e2e0bb6043dca7bffa395844f76aad08d.pack Added

omxplayer-2014.02.11.tar.gz/ffmpeg/.git/packed-refs -> omxplayer-2014.03.28.tar.gz/ffmpeg/.git/packed-refs Changed

@@ -1,18 +1,19 @@
 # pack-refs with: peeled 
-1ffac25d31eb4aa7dd8680dbc5ae132007796e98 refs/remotes/origin/master
+879072018f682012d05a400e44df29daef831f47 refs/remotes/origin/master
 ea4e8e642acc8c192a129470cb58c45beb62940b refs/remotes/origin/oldabi
-41216ebb9e53bfa25b1bf39b66c15ab7d2902929 refs/remotes/origin/release/0.10
-69f724a538ef2eb27a1cb39c3a6091b5bf899838 refs/remotes/origin/release/0.11
+6f9e6ac6aa3c670cb5c9f853095ae47fe0c40487 refs/remotes/origin/release/0.10
+7a56695ced39dc6ef2db9e78a76792172e39068a refs/remotes/origin/release/0.11
 b012da4019e3991a9b274e99eebf7e7de41b035e refs/remotes/origin/release/0.5
 101e1b36cccda73709c31b54c90fa1fa7f432d14 refs/remotes/origin/release/0.6
 cce6bdc7583997420a7a55406366afbe97f16de6 refs/remotes/origin/release/0.7
 8925c44db1a2f041b7a1f5d0a889a502bdd4d848 refs/remotes/origin/release/0.8
-320df1c7c0fe9e92bec65c7117939e7859801b96 refs/remotes/origin/release/0.9
-a4c804d0a2ca1590c258e2be5c69b319b0ed3e69 refs/remotes/origin/release/1.0
-08dde7567dea076363e3b9f3d02a738390a698fa refs/remotes/origin/release/1.1
-89c917fcd92c5e5ae7f226ceb7b1e6a12c82cba7 refs/remotes/origin/release/1.2
-b4552cc9b8c37410f754af5d34d24e7b8a9b4b0e refs/remotes/origin/release/2.0
-d0e0329e9d3d2a330dfe9e66d2b30aa6e36db5d6 refs/remotes/origin/release/2.1
+d55059d048bd6247b7bd1ae7830253f7b9358f13 refs/remotes/origin/release/0.9
+be66ae3b015115aa72bd1bf56946e7c6309f1f14 refs/remotes/origin/release/1.0
+c6f2ad9f944d07379072553a310bedc94cd2e74f refs/remotes/origin/release/1.1
+5202621ac413ff82a65ee81d145e5ee704360c22 refs/remotes/origin/release/1.2
+5ee384c4eb6b4f6cc724bc2e72a31a3bc9839247 refs/remotes/origin/release/2.0
+3c880d2765139e204e2132e6c6e4c7b65addaa9d refs/remotes/origin/release/2.1
+31c21d2f690533ed9e8652b130d5ce4cad1fb13f refs/remotes/origin/release/2.2
 77bb6835ba752bb9335d208963a53227bbb1bc63 refs/tags/N
 c33e40f19534faec00293c53fe99943532becadb refs/tags/ffmpeg-0.6.3
 ^ace432f62cdcedf812e7c4d77fc5b03322170fa8
@@ -24,6 +25,8 @@
 ^58e212c1fbad5df87ea91c85711361325cc84be1
 1b407890e1327dc0deb16e68a6196994da7f4bad refs/tags/n0.10.11
 ^41216ebb9e53bfa25b1bf39b66c15ab7d2902929
+19f510073f72d7ffea42e467fe878b1db02ede49 refs/tags/n0.10.12
+^6f9e6ac6aa3c670cb5c9f853095ae47fe0c40487
 8edfd1ac3ef6639e98bce9033505b0a7715ef19e refs/tags/n0.10.2
 ^f139838d6473c7b5152178f602cb953a824c2ff9
 6add62f5eb5c7d65a8fac6032e9d51ff8a60ed76 refs/tags/n0.10.3
@@ -50,6 +53,8 @@
 ^aba32d84630cb17b68fd41d465d17580465f1d9e
 e39310ac97d27f6649e461f6ea90ab3ea022f546 refs/tags/n0.11.4
 ^6fd54e4f2ec08a4065563b25248ad56ba7680015
+1f8f980756d9985349bee326e4318540dc5d4c87 refs/tags/n0.11.5
+^aa1fdf1a6457331d5c0e737a8680e69fe0fc0439
 76402b61522ad414fc393523b5720cf0ed8c7df7 refs/tags/n0.5.10
 ^9eaec5b8f010c805fd8e77216a1ec67eb20b1466
 3c2dff582cc4034df3fac322c41c869bdafe9e8c refs/tags/n0.5.11
@@ -148,6 +153,8 @@
 ^5d6982c13bba56115125de68969f46906038b73e
 67c89b31fa21bc5f55b3bbfde7c184654dac266f refs/tags/n0.9.3
 ^dae552fbca8f3c132fb40d0234aa8edef86642d1
+d115fc0455b254aefce986d8d803ba91926fdcc2 refs/tags/n0.9.4
+^d55059d048bd6247b7bd1ae7830253f7b9358f13
 066ee8ed226163c6011447d6865ae2e9a339e091 refs/tags/n1.0
 ^a74f292d4ab3e800853c3ab7536418e6eb584b27
 234a846cac274267de15caf82724b69a4939c717 refs/tags/n1.0.1
@@ -166,6 +173,8 @@
 ^25881786697d721bd5b112c4f375c7e68d3c9c4b
 9a8a9250ec2994ba1e3401ebc4eb774dca96b5c6 refs/tags/n1.0.8
 ^fcd46cfbbd90564232dc10a2d4753bf0f251ae98
+2c088ee8a72acdd294c2695bdcd4e1534171b045 refs/tags/n1.0.9
+^08f53e1b14ff0e6f1d935c5c2d2f2eefbdf73c25
 9146e13dbbd14f08b90fcc26f5fa302b0dc6312e refs/tags/n1.1
 ^79013a59c0605472fe941ca9ff01324c1320f874
 36dcdb654ae9ad8b5f31703e0e6ca69e29d231d8 refs/tags/n1.1.1
@@ -184,6 +193,8 @@
 ^4bc7c1ba8e9ac2173b04869c9244517add7ff19f
 5ce523a2a33fc4167f5b0fa95ef4d71ce58cea2f refs/tags/n1.1.8
 ^1017b5914cecb447ee04d7b1c9c8562daa442da3
+c52fa4e6fa9ad792c09cbb6b8de05b165b61878e refs/tags/n1.1.9
+^26e1bccec65d73ee37b5a76791e52cdd6c21658e
 a700d997996e94944fed4c440ff8a0b1703bd9fd refs/tags/n1.2
 ^e820e3a2591a0d544925ff1522d2a688a647f1b0
 b28719ddb2c40b3b6d8f8ff67f6b85799d33111e refs/tags/n1.2.1
@@ -196,6 +207,8 @@
 ^14e258d847f7ff3e9713abae5c1554f39e6bc341
 a849dff4c607d3a6ac507affde2b28275be4b1e2 refs/tags/n1.2.5
 ^5a0a156e88f7f07b96f9522677ee79c64c8a5c19
+3ede9020a86f8985fe2c55e0724a99dabf9920cf refs/tags/n1.2.6
+^e63346f7e8d36f99ec85733823de6d1a0fd31f4f
 5832b45bec5213745def5c29cebc42a0ad116fcc refs/tags/n2.0
 ^2b8b2ba19fe0ca6594cb09439b9ead2c328a79d8
 2a8107cc231446a92fc0c2dcb1f8ca9758887786 refs/tags/n2.0.1
@@ -204,6 +217,8 @@
 ^9d0bb7fc3991b030603acfe899e6f001e530c89a
 18e21e2e50d822e078415b718fc3b3b34e70cfd3 refs/tags/n2.0.3
 ^b4552cc9b8c37410f754af5d34d24e7b8a9b4b0e
+b5a3a46b38bbbd7d5e9dcc3a54597769d8459478 refs/tags/n2.0.4
+^7de7bd4f563a1431bdac59dae5d8e930e71405e6
 ce3b6d4ed88e752c4579ac0f2555b007afe690f4 refs/tags/n2.1
 ^35a7b73590c49e92a252ca81a9f1d3e844553f4e
 2d6dc06fd64481ed9a1361c255106266af328e77 refs/tags/n2.1.1
@@ -212,6 +227,14 @@
 ^29353dd3f8159089ecf2fa0886f94f4cf32e75f2
 cb63407c67f47ea5d30d255e593708762f29d29b refs/tags/n2.1.3
 ^eda6effcabcf9c238e4635eb058d72371336e09b
+d094c7196ce14c71874f7c13a3bd211efbb38cef refs/tags/n2.1.4
+^d3139c9733f1994fb86825e0d1fd2a5abf3be7b5
+3a1741352d4e97ef7b62473bf28799d696db684d refs/tags/n2.2
+^d2c76782e0e8a676159865f7c6e368ab0b1b6b51
+c5a2833c6df28b1ecddcb2ae91ea9c235415f002 refs/tags/n2.2-rc1
+^ecc5e42d92eb9c82b808d3b1bbff3ae00d9d5cce
+022d9029b9e8bb46be6bced344c2da9ef19843ff refs/tags/n2.2-rc2
+^6ba07e9948d5c9bcb7a0f270f150fbb2f99074e1
 110c4b2a211fbf6779edb6361931680bf4e7b429 refs/tags/v0.5
 ^f8429ed58cefea1669bc127cf2b1905b4893e3f2
 a7570b887039beeda20813d8989f291749a73810 refs/tags/v0.5.1

omxplayer-2014.02.11.tar.gz/ffmpeg/.git/refs/heads/master -> omxplayer-2014.03.28.tar.gz/ffmpeg/.git/refs/heads/master Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/.gitignore -> omxplayer-2014.03.28.tar.gz/ffmpeg/.gitignore Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/Changelog -> omxplayer-2014.03.28.tar.gz/ffmpeg/Changelog Changed

@@ -1,7 +1,34 @@
 Entries are sorted chronologically from oldest to youngest within each release,
 releases are sorted from youngest to oldest.
 
-version <next>
+version 2.2:
+
+- HNM version 4 demuxer and video decoder
+- Live HDS muxer
+- setsar/setdar filters now support variables in ratio expressions
+- elbg filter
+- string validation in ffprobe
+- support for decoding through VDPAU in ffmpeg (the -hwaccel option)
+- complete Voxware MetaSound decoder
+- remove mp3_header_compress bitstream filter
+- Windows resource files for shared libraries
+- aeval filter
+- stereoscopic 3d metadata handling
+- WebP encoding via libwebp
+- ATRAC3+ decoder
+- VP8 in Ogg demuxing
+- side & metadata support in NUT
+- framepack filter
+- XYZ12 rawvideo support in NUT
+- Exif metadata support in WebP decoder
+- OpenGL device
+- Use metadata_header_padding to control padding in ID3 tags (currently used in
+  MP3, AIFF, and OMA files), FLAC header, and the AVI "junk" block.
+- Mirillis FIC video decoder
+- Support DNx444
+- libx265 encoder
+- dejudder filter
+- Autodetect VDA like all other hardware accelerations
 
 
 version 2.1:
@@ -46,7 +73,8 @@
 - ReplayGain scanner
 - Enhanced Low Delay AAC (ER AAC ELD) decoding (no LD SBR support)
 - Linux framebuffer output device
-- HEVC decoder, raw HEVC demuxer, HEVC demuxing in TS, Matroska and MP4
+- HEVC decoder
+- raw HEVC, HEVC in MOV/MP4, HEVC in Matroska, HEVC in MPEG-TS demuxing
 - mergeplanes filter
 
 
@@ -62,7 +90,7 @@
 - 10% faster aac encoding on x86 and MIPS
 - sine audio filter source
 - WebP demuxing and decoding support
-- new ffmpeg options -filter_script and -filter_complex_script, which allow a
+- ffmpeg options -filter_script and -filter_complex_script, which allow a
   filtergraph description to be read from a file
 - OpenCL support
 - audio phaser filter
@@ -70,7 +98,7 @@
 - libquvi demuxer
 - uniform options syntax across all filters
 - telecine filter
-- new interlace filter
+- interlace filter
 - smptehdbars source
 - inverse telecine filters (fieldmatch and decimate)
 - colorbalance filter

omxplayer-2014.02.11.tar.gz/ffmpeg/LICENSE -> omxplayer-2014.03.28.tar.gz/ffmpeg/LICENSE Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/MAINTAINERS -> omxplayer-2014.03.28.tar.gz/ffmpeg/MAINTAINERS Changed

@@ -31,7 +31,7 @@
   ffprobe.c                             Stefano Sabatini
 
 ffserver:
-  ffserver.c, ffserver.h                Baptiste Coudurier
+  ffserver.c                            Reynaldo H. Verdejo Pinochet
 
 Commandline utility code:
   cmdutils.c, cmdutils.h                Michael Niedermayer
@@ -142,6 +142,7 @@
   ass*                                  Aurelien Jacobs
   asv*                                  Michael Niedermayer
   atrac3*                               Benjamin Larsson
+  atrac3plus*                           Maxim Poliakovski
   bgmc.c, bgmc.h                        Thilo Borgmann
   bink.c                                Kostya Shishkov
   binkaudio.c                           Peter Ross
@@ -150,6 +151,7 @@
   cdxl.c                                Paul B Mahol
   celp_filters.*                        Vitor Sessak
   cinepak.c                             Roberto Togni
+  cinepakenc.c                          Rl / Aetey G.T. AB
   cljr                                  Alex Beregszaszi
   cllc.c                                Derek Buitenhuis
   cook.c, cookdata.h                    Benjamin Larsson
@@ -197,8 +199,11 @@
   libtheoraenc.c                        David Conrad
   libutvideo*                           Derek Buitenhuis
   libvorbis.c                           David Conrad
+  libvpx*                               James Zern
   libx264.c                             Mans Rullgard, Jason Garrett-Glaser
+  libx265.c                             Derek Buitenhuis
   libxavs.c                             Stefan Gehrer
+  libzvbi-teletextdec.c                 Marton Balint
   loco.c                                Kostya Shishkov
   lzo.h, lzo.c                          Reimar Doeffinger
   mdec.c                                Michael Niedermayer
@@ -266,6 +271,7 @@
   vp5                                   Aurelien Jacobs
   vp6                                   Aurelien Jacobs
   vp8                                   David Conrad, Jason Garrett-Glaser, Ronald Bultje
+  vp9                                   Ronald Bultje, Clément Bœsch
   vqavideo.c                            Mike Melanson
   wavpack.c                             Kostya Shishkov
   wmaprodec.c                           Sascha Sommer
@@ -301,6 +307,7 @@
   iec61883.c                            Georg Lippitsch
   lavfi                                 Stefano Sabatini
   libdc1394.c                           Roman Shaposhnik
+  opengl_enc.c                          Lukasz Marek
   pulse_audio_enc.c                     Lukasz Marek
   sdl                                   Stefano Sabatini
   v4l2.c                                Luca Abeni
@@ -329,6 +336,7 @@
   avf_avectorscope.c                    Paul B Mahol
   vf_blend.c                            Paul B Mahol
   vf_colorbalance.c                     Paul B Mahol
+  vf_dejudder.c                         Nicholas Robbins
   vf_delogo.c                           Jean Delvare (CC <khali@linux-fr.org>)
   vf_drawbox.c/drawgrid                 Andrey Utkin
   vf_extractplanes.c                    Paul B Mahol
@@ -385,6 +393,7 @@
   flvdec.c, flvenc.c                    Michael Niedermayer
   gxf.c                                 Reimar Doeffinger
   gxfenc.c                              Baptiste Coudurier
+  hls.c                                 Anssi Hannula
   idcin.c                               Mike Melanson
   idroqdec.c                            Mike Melanson
   iff.c                                 Jaikrishnan Menon
@@ -444,6 +453,7 @@
   siff.c                                Kostya Shishkov
   smacker.c                             Kostya Shishkov
   smjpeg*                               Paul B Mahol
+  spdif*                                Anssi Hannula
   srtdec.c                              Aurelien Jacobs
   swf.c                                 Baptiste Coudurier
   takdec.c                              Paul B Mahol
@@ -501,8 +511,9 @@
 Releases
 ========
 
+2.2                                     Michael Niedermayer
 2.1                                     Michael Niedermayer
-2.0                                     Michael Niedermayer
+1.2                                     Michael Niedermayer
 
 If you want to maintain an older release, please contact us

omxplayer-2014.02.11.tar.gz/ffmpeg/Makefile -> omxplayer-2014.03.28.tar.gz/ffmpeg/Makefile Changed

@@ -6,29 +6,34 @@
 vpath %.h    $(SRC_PATH)
 vpath %.S    $(SRC_PATH)
 vpath %.asm  $(SRC_PATH)
+vpath %.rc   $(SRC_PATH)
 vpath %.v    $(SRC_PATH)
 vpath %.texi $(SRC_PATH)
 vpath %/fate_config.sh.template $(SRC_PATH)
 
-PROGS-$(CONFIG_FFMPEG)   += ffmpeg
-PROGS-$(CONFIG_FFPLAY)   += ffplay
-PROGS-$(CONFIG_FFPROBE)  += ffprobe
-PROGS-$(CONFIG_FFSERVER) += ffserver
+AVPROGS-$(CONFIG_FFMPEG)   += ffmpeg
+AVPROGS-$(CONFIG_FFPLAY)   += ffplay
+AVPROGS-$(CONFIG_FFPROBE)  += ffprobe
+AVPROGS-$(CONFIG_FFSERVER) += ffserver
 
-PROGS      := $(PROGS-yes:%=%$(PROGSSUF)$(EXESUF))
-INSTPROGS   = $(PROGS-yes:%=%$(PROGSSUF)$(EXESUF))
+AVPROGS    := $(AVPROGS-yes:%=%$(PROGSSUF)$(EXESUF))
+INSTPROGS   = $(AVPROGS-yes:%=%$(PROGSSUF)$(EXESUF))
+PROGS      += $(AVPROGS)
 
-OBJS        = cmdutils.o $(EXEOBJS)
-OBJS-ffmpeg = ffmpeg_opt.o ffmpeg_filter.o
+AVBASENAMES  = ffmpeg ffplay ffprobe ffserver
+ALLAVPROGS   = $(AVBASENAMES:%=%$(PROGSSUF)$(EXESUF))
+ALLAVPROGS_G = $(AVBASENAMES:%=%$(PROGSSUF)_g$(EXESUF))
+
+$(foreach prog,$(AVBASENAMES),$(eval OBJS-$(prog) += cmdutils.o))
+$(foreach prog,$(AVBASENAMES),$(eval OBJS-$(prog)-$(CONFIG_OPENCL) += cmdutils_opencl.o))
+
+OBJS-ffmpeg                   += ffmpeg_opt.o ffmpeg_filter.o
+OBJS-ffmpeg-$(HAVE_VDPAU_X11) += ffmpeg_vdpau.o
 TESTTOOLS   = audiogen videogen rotozoom tiny_psnr tiny_ssim base64
 HOSTPROGS  := $(TESTTOOLS:%=tests/%) doc/print_options
-TOOLS       = qt-faststart trasher
+TOOLS       = qt-faststart trasher uncoded_frame
 TOOLS-$(CONFIG_ZLIB) += cws2fws
 
-BASENAMES   = ffmpeg ffplay ffprobe ffserver
-ALLPROGS    = $(BASENAMES:%=%$(PROGSSUF)$(EXESUF))
-ALLPROGS_G  = $(BASENAMES:%=%$(PROGSSUF)_g$(EXESUF))
-
 FFLIBS-$(CONFIG_AVDEVICE) += avdevice
 FFLIBS-$(CONFIG_AVFILTER) += avfilter
 FFLIBS-$(CONFIG_AVFORMAT) += avformat
@@ -50,16 +55,14 @@
 FF_EXTRALIBS := $(FFEXTRALIBS)
 FF_DEP_LIBS  := $(DEP_LIBS)
 
-all: $(PROGS)
-
-$(PROGS): %$(EXESUF): %_g$(EXESUF)
-	$(CP) $< $@
-	$(STRIP) $@
+all: $(AVPROGS)
 
 $(TOOLS): %$(EXESUF): %.o $(EXEOBJS)
 	$(LD) $(LDFLAGS) $(LD_O) $^ $(ELIBS)
 
 tools/cws2fws$(EXESUF): ELIBS = $(ZLIB)
+tools/uncoded_frame$(EXESUF): $(FF_DEP_LIBS)
+tools/uncoded_frame$(EXESUF): ELIBS = $(FF_EXTRALIBS)
 
 config.h: .config
 .config: $(wildcard $(FFLIBS:%=$(SRC_PATH)/lib%/all*.c))
@@ -73,7 +76,7 @@
                ALTIVEC-OBJS VIS-OBJS                                     \
                MMX-OBJS YASM-OBJS                                        \
                MIPSFPU-OBJS MIPSDSPR2-OBJS MIPSDSPR1-OBJS MIPS32R2-OBJS  \
-               OBJS HOSTOBJS TESTOBJS
+               OBJS SLIBOBJS HOSTOBJS TESTOBJS
 
 define RESET
 $(1) :=
@@ -90,8 +93,10 @@
 
 $(foreach D,$(FFLIBS),$(eval $(call DOSUBDIR,lib$(D))))
 
+include $(SRC_PATH)/doc/Makefile
+
 define DOPROG
-OBJS-$(1) += $(1).o cmdutils.o $(EXEOBJS)
+OBJS-$(1) += $(1).o $(EXEOBJS) $(OBJS-$(1)-yes)
 $(1)$(PROGSSUF)_g$(EXESUF): $$(OBJS-$(1))
 $$(OBJS-$(1)): CFLAGS  += $(CFLAGS-$(1))
 $(1)$(PROGSSUF)_g$(EXESUF): LDFLAGS += $(LDFLAGS-$(1))
@@ -99,7 +104,13 @@
 -include $$(OBJS-$(1):.o=.d)
 endef
 
-$(foreach P,$(PROGS-yes),$(eval $(call DOPROG,$(P))))
+$(foreach P,$(PROGS),$(eval $(call DOPROG,$(P:$(PROGSSUF)$(EXESUF)=))))
+
+ffprobe.o cmdutils.o : libavutil/ffversion.h
+
+$(PROGS): %$(PROGSSUF)$(EXESUF): %$(PROGSSUF)_g$(EXESUF)
+	$(CP) $< $@
+	$(STRIP) $@
 
 %$(PROGSSUF)_g$(EXESUF): %.o $(FF_DEP_LIBS)
 	$(LD) $(LDFLAGS) $(LD_O) $(OBJS-$*) $(FF_EXTRALIBS)
@@ -114,14 +125,14 @@
 .version: $(wildcard $(GIT_LOG)) $(VERSION_SH) config.mak
 .version: M=@
 
-version.h .version:
-	$(M)$(VERSION_SH) $(SRC_PATH) version.h $(EXTRA_VERSION)
+libavutil/ffversion.h .version:
+	$(M)$(VERSION_SH) $(SRC_PATH) libavutil/ffversion.h $(EXTRA_VERSION)
 	$(Q)touch .version
 
 # force version.sh to run whenever version might have changed
 -include .version
 
-ifdef PROGS
+ifdef AVPROGS
 install: install-progs install-data
 endif
 
@@ -132,7 +143,7 @@
 install-progs-yes:
 install-progs-$(CONFIG_SHARED): install-libs
 
-install-progs: install-progs-yes $(PROGS)
+install-progs: install-progs-yes $(AVPROGS)
 	$(Q)mkdir -p "$(BINDIR)"
 	$(INSTALL) -c -m 755 $(INSTPROGS) "$(BINDIR)"
 
@@ -144,13 +155,13 @@
 uninstall: uninstall-libs uninstall-headers uninstall-progs uninstall-data
 
 uninstall-progs:
-	$(RM) $(addprefix "$(BINDIR)/", $(ALLPROGS))
+	$(RM) $(addprefix "$(BINDIR)/", $(ALLAVPROGS))
 
 uninstall-data:
 	$(RM) -r "$(DATADIR)"
 
 clean::
-	$(RM) $(ALLPROGS) $(ALLPROGS_G)
+	$(RM) $(ALLAVPROGS) $(ALLAVPROGS_G)
 	$(RM) $(CLEANSUFFIXES)
 	$(RM) $(CLEANSUFFIXES:%=tools/%)
 	$(RM) -r coverage-html
@@ -158,14 +169,13 @@
 
 distclean::
 	$(RM) $(DISTCLEANSUFFIXES)
-	$(RM) config.* .config libavutil/avconfig.h .version version.h libavcodec/codec_names.h
+	$(RM) config.* .config libavutil/avconfig.h .version version.h libavutil/ffversion.h libavcodec/codec_names.h
 
 config:
 	$(SRC_PATH)/configure $(value FFMPEG_CONFIGURATION)
 
 check: all alltools examples testprogs fate
 
-include $(SRC_PATH)/doc/Makefile
 include $(SRC_PATH)/tests/Makefile
 
 $(sort $(OBJDIRS)):

omxplayer-2014.02.11.tar.gz/ffmpeg/RELEASE -> omxplayer-2014.03.28.tar.gz/ffmpeg/RELEASE Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/VERSION -> omxplayer-2014.03.28.tar.gz/ffmpeg/VERSION Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/cmdutils.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/cmdutils.c Changed

@@ -20,6 +20,7 @@
  */
 
 #include <string.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <errno.h>
 #include <math.h>
@@ -48,8 +49,8 @@
 #include "libavutil/dict.h"
 #include "libavutil/opt.h"
 #include "libavutil/cpu.h"
+#include "libavutil/ffversion.h"
 #include "cmdutils.h"
-#include "version.h"
 #if CONFIG_NETWORK
 #include "libavformat/network.h"
 #endif
@@ -57,10 +58,6 @@
 #include <sys/time.h>
 #include <sys/resource.h>
 #endif
-#if CONFIG_OPENCL
-#include "libavutil/opencl.h"
-#endif
-
 
 static int init_report(const char *env);
 
@@ -68,9 +65,8 @@
 AVDictionary *swr_opts;
 AVDictionary *format_opts, *codec_opts, *resample_opts;
 
-const int this_year = 2013;
-
 static FILE *report_file;
+int hide_banner = 0;
 
 void init_opts(void)
 {
@@ -496,6 +492,9 @@
             fflush(report_file);
         }
     }
+    idx = locate_option(argc, argv, options, "hide_banner");
+    if (idx)
+        hide_banner = 1;
 }
 
 static const AVOption *opt_find(void *obj, const char *name, const char *unit,
@@ -986,26 +985,6 @@
     return 0;
 }
 
-#if CONFIG_OPENCL
-int opt_opencl(void *optctx, const char *opt, const char *arg)
-{
-    char *key, *value;
-    const char *opts = arg;
-    int ret = 0;
-    while (*opts) {
-        ret = av_opt_get_key_value(&opts, "=", ":", 0, &key, &value);
-        if (ret < 0)
-            return ret;
-        ret = av_opencl_set_option(key, value);
-        if (ret < 0)
-            return ret;
-        if (*opts)
-            opts++;
-    }
-    return ret;
-}
-#endif
-
 void print_error(const char *filename, int err)
 {
     char errbuf[128];
@@ -1071,7 +1050,7 @@
     av_log(NULL, level, "%s version " FFMPEG_VERSION, program_name);
     if (flags & SHOW_COPYRIGHT)
         av_log(NULL, level, " Copyright (c) %d-%d the FFmpeg developers",
-               program_birth_year, this_year);
+               program_birth_year, CONFIG_THIS_YEAR);
     av_log(NULL, level, "\n");
     av_log(NULL, level, "%sbuilt on %s %s with %s\n",
            indent, __DATE__, __TIME__, CC_IDENT);
@@ -1079,10 +1058,36 @@
     av_log(NULL, level, "%sconfiguration: " FFMPEG_CONFIGURATION "\n", indent);
 }
 
+static void print_buildconf(int flags, int level)
+{
+    const char *indent = flags & INDENT ? "  " : "";
+    char str[] = { FFMPEG_CONFIGURATION };
+    char *conflist, *remove_tilde, *splitconf;
+
+    // Change all the ' --' strings to '~--' so that
+    // they can be identified as tokens.
+    while ((conflist = strstr(str, " --")) != NULL) {
+        strncpy(conflist, "~--", 3);
+    }
+
+    // Compensate for the weirdness this would cause
+    // when passing 'pkg-config --static'.
+    while ((remove_tilde = strstr(str, "pkg-config~")) != NULL) {
+        strncpy(remove_tilde, "pkg-config ", 11);
+    }
+
+    splitconf = strtok(str, "~");
+    av_log(NULL, level, "\n%sconfiguration:\n", indent);
+    while (splitconf != NULL) {
+        av_log(NULL, level, "%s%s%s\n", indent, indent, splitconf);
+        splitconf = strtok(NULL, "~");
+    }
+}
+
 void show_banner(int argc, char **argv, const OptionDef *options)
 {
     int idx = locate_option(argc, argv, options, "version");
-    if (idx)
+    if (hide_banner || idx)
         return;
 
     print_program_info (INDENT|SHOW_COPYRIGHT, AV_LOG_INFO);
@@ -1099,6 +1104,14 @@
     return 0;
 }
 
+int show_buildconf(void *optctx, const char *opt, const char *arg)
+{
+    av_log_set_callback(log_callback_help);
+    print_buildconf      (INDENT|0, AV_LOG_INFO);
+
+    return 0;
+}
+
 int show_license(void *optctx, const char *opt, const char *arg)
 {
 #if CONFIG_NONFREE
@@ -1518,7 +1531,7 @@
     return 0;
 }
 
-void show_colors(void *optctx, const char *opt, const char *arg)
+int show_colors(void *optctx, const char *opt, const char *arg)
 {
     const char *name;
     const uint8_t *rgb;
@@ -1528,6 +1541,8 @@
 
     for (i = 0; name = av_get_known_color_name(i, &rgb); i++)
         printf("%-32s #%02x%02x%02x\n", name, rgb[0], rgb[1], rgb[2]);
+
+    return 0;
 }
 
 int show_pix_fmts(void *optctx, const char *opt, const char *arg)
@@ -1789,7 +1804,7 @@
 int cmdutils_read_file(const char *filename, char **bufptr, size_t *size)
 {
     int ret;
-    FILE *f = fopen(filename, "rb");
+    FILE *f = av_fopen_utf8(filename, "rb");
 
     if (!f) {
         av_log(NULL, AV_LOG_ERROR, "Cannot read file '%s': %s\n", filename,

omxplayer-2014.02.11.tar.gz/ffmpeg/cmdutils.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/cmdutils.h Changed

@@ -43,16 +43,12 @@
  */
 extern const int program_birth_year;
 
-/**
- * this year, defined by the program for show_banner()
- */
-extern const int this_year;
-
 extern AVCodecContext *avcodec_opts[AVMEDIA_TYPE_NB];
 extern AVFormatContext *avformat_opts;
 extern struct SwsContext *sws_opts;
 extern AVDictionary *swr_opts;
 extern AVDictionary *format_opts, *codec_opts, *resample_opts;
+extern int hide_banner;
 
 /**
  * Register a program-specific cleanup routine.
@@ -103,8 +99,12 @@
 
 int opt_codec_debug(void *optctx, const char *opt, const char *arg);
 
+#if CONFIG_OPENCL
 int opt_opencl(void *optctx, const char *opt, const char *arg);
 
+int opt_opencl_bench(void *optctx, const char *opt, const char *arg);
+#endif
+
 /**
  * Limit the execution time.
  */
@@ -415,6 +415,13 @@
 int show_version(void *optctx, const char *opt, const char *arg);
 
 /**
+ * Print the build configuration of the program to stdout. The contents
+ * depend on the definition of FFMPEG_CONFIGURATION.
+ * This option processing function does not utilize the arguments.
+ */
+int show_buildconf(void *optctx, const char *opt, const char *arg);
+
+/**
  * Print the license of the program to stdout. The license depends on
  * the license of the libraries compiled into the program.
  * This option processing function does not utilize the arguments.
@@ -492,7 +499,7 @@
  * Print a listing containing all the color names and values recognized
  * by the program.
  */
-void show_colors(void *optctx, const char *opt, const char *arg);
+int show_colors(void *optctx, const char *opt, const char *arg);
 
 /**
  * Return a positive value if a line read from standard input

omxplayer-2014.02.11.tar.gz/ffmpeg/cmdutils_common_opts.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/cmdutils_common_opts.h Changed

@@ -4,6 +4,7 @@
     { "help"       , OPT_EXIT, {.func_arg = show_help},         "show help", "topic" },
     { "-help"      , OPT_EXIT, {.func_arg = show_help},         "show help", "topic" },
     { "version"    , OPT_EXIT, {.func_arg = show_version},      "show version" },
+    { "buildconf"  , OPT_EXIT, {.func_arg = show_buildconf},    "show build configuration" },
     { "formats"    , OPT_EXIT, {.func_arg = show_formats  },    "show available formats" },
     { "codecs"     , OPT_EXIT, {.func_arg = show_codecs   },    "show available codecs" },
     { "decoders"   , OPT_EXIT, {.func_arg = show_decoders },    "show available decoders" },
@@ -20,6 +21,8 @@
     { "report"     , 0,        {(void*)opt_report}, "generate a report" },
     { "max_alloc"  , HAS_ARG,  {.func_arg = opt_max_alloc},     "set maximum size of a single allocated block", "bytes" },
     { "cpuflags"   , HAS_ARG | OPT_EXPERT, { .func_arg = opt_cpuflags }, "force specific cpu flags", "flags" },
+    { "hide_banner", OPT_BOOL | OPT_EXPERT, {&hide_banner},     "do not show program banner", "hide_banner" },
 #if CONFIG_OPENCL
+    { "opencl_bench", OPT_EXIT, {.func_arg = opt_opencl_bench}, "run benchmark on all OpenCL devices and show results" },
     { "opencl_options", HAS_ARG, {.func_arg = opt_opencl},      "set OpenCL environment options" },
 #endif

omxplayer-2014.03.28.tar.gz/ffmpeg/cmdutils_opencl.c Added

@@ -0,0 +1,274 @@
+/*
+ * Copyright (C) 2013 Lenny Wang
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "libavutil/opt.h"
+#include "libavutil/time.h"
+#include "libavutil/log.h"
+#include "libavutil/opencl.h"
+#include "cmdutils.h"
+
+typedef struct {
+    int platform_idx;
+    int device_idx;
+    char device_name[64];
+    int64_t runtime;
+} OpenCLDeviceBenchmark;
+
+const char *ocl_bench_source = AV_OPENCL_KERNEL(
+inline unsigned char clip_uint8(int a)
+{
+    if (a & (~0xFF))
+        return (-a)>>31;
+    else
+        return a;
+}
+
+kernel void unsharp_bench(
+                    global unsigned char *src,
+                    global unsigned char *dst,
+                    global int *mask,
+                    int width,
+                    int height)
+{
+    int i, j, local_idx, lc_idx, sum = 0;
+    int2 thread_idx, block_idx, global_idx, lm_idx;
+    thread_idx.x = get_local_id(0);
+    thread_idx.y = get_local_id(1);
+    block_idx.x = get_group_id(0);
+    block_idx.y = get_group_id(1);
+    global_idx.x = get_global_id(0);
+    global_idx.y = get_global_id(1);
+    local uchar data[32][32];
+    local int lc[128];
+
+    for (i = 0; i <= 1; i++) {
+        lm_idx.y = -8 + (block_idx.y + i) * 16 + thread_idx.y;
+        lm_idx.y = lm_idx.y < 0 ? 0 : lm_idx.y;
+        lm_idx.y = lm_idx.y >= height ? height - 1: lm_idx.y;
+        for (j = 0; j <= 1; j++) {
+            lm_idx.x = -8 + (block_idx.x + j) * 16 + thread_idx.x;
+            lm_idx.x = lm_idx.x < 0 ? 0 : lm_idx.x;
+            lm_idx.x = lm_idx.x >= width ? width - 1: lm_idx.x;
+            data[i*16 + thread_idx.y][j*16 + thread_idx.x] = src[lm_idx.y*width + lm_idx.x];
+        }
+    }
+    local_idx = thread_idx.y*16 + thread_idx.x;
+    if (local_idx < 128)
+        lc[local_idx] = mask[local_idx];
+    barrier(CLK_LOCAL_MEM_FENCE);
+
+    \n#pragma unroll\n
+    for (i = -4; i <= 4; i++) {
+        lm_idx.y = 8 + i + thread_idx.y;
+        \n#pragma unroll\n
+        for (j = -4; j <= 4; j++) {
+            lm_idx.x = 8 + j + thread_idx.x;
+            lc_idx = (i + 4)*8 + j + 4;
+            sum += (int)data[lm_idx.y][lm_idx.x] * lc[lc_idx];
+        }
+    }
+    int temp = (int)data[thread_idx.y + 8][thread_idx.x + 8];
+    int res = temp + (((temp - (int)((sum + 1<<15) >> 16))) >> 16);
+    if (global_idx.x < width && global_idx.y < height)
+        dst[global_idx.x + global_idx.y*width] = clip_uint8(res);
+}
+);
+
+#define OCLCHECK(method, ... )                                                 \
+do {                                                                           \
+    status = method(__VA_ARGS__);                                              \
+    if (status != CL_SUCCESS) {                                                \
+        av_log(NULL, AV_LOG_ERROR, # method " error '%s'\n",                   \
+               av_opencl_errstr(status));                                      \
+        ret = AVERROR_EXTERNAL;                                                \
+        goto end;                                                              \
+    }                                                                          \
+} while (0)
+
+#define CREATEBUF(out, flags, size)                                            \
+do {                                                                           \
+    out = clCreateBuffer(ext_opencl_env->context, flags, size, NULL, &status); \
+    if (status != CL_SUCCESS) {                                                \
+        av_log(NULL, AV_LOG_ERROR, "Could not create OpenCL buffer\n");        \
+        ret = AVERROR_EXTERNAL;                                                \
+        goto end;                                                              \
+    }                                                                          \
+} while (0)
+
+static void fill_rand_int(int *data, int n)
+{
+    int i;
+    srand(av_gettime());
+    for (i = 0; i < n; i++)
+        data[i] = rand();
+}
+
+#define OPENCL_NB_ITER 5
+static int64_t run_opencl_bench(AVOpenCLExternalEnv *ext_opencl_env)
+{
+    int i, arg = 0, width = 1920, height = 1088;
+    int64_t start, ret = 0;
+    cl_int status;
+    size_t kernel_len;
+    char *inbuf;
+    int *mask;
+    int buf_size = width * height * sizeof(char);
+    int mask_size = sizeof(uint32_t) * 128;
+
+    cl_mem cl_mask, cl_inbuf, cl_outbuf;
+    cl_kernel kernel = NULL;
+    cl_program program = NULL;
+    size_t local_work_size_2d[2] = {16, 16};
+    size_t global_work_size_2d[2] = {(size_t)width, (size_t)height};
+
+    if (!(inbuf = av_malloc(buf_size)) || !(mask = av_malloc(mask_size))) {
+        av_log(NULL, AV_LOG_ERROR, "Out of memory\n");
+        ret = AVERROR(ENOMEM);
+        goto end;
+    }
+    fill_rand_int((int*)inbuf, buf_size/4);
+    fill_rand_int(mask, mask_size/4);
+
+    CREATEBUF(cl_mask, CL_MEM_READ_ONLY, mask_size);
+    CREATEBUF(cl_inbuf, CL_MEM_READ_ONLY, buf_size);
+    CREATEBUF(cl_outbuf, CL_MEM_READ_WRITE, buf_size);
+
+    kernel_len = strlen(ocl_bench_source);
+    program = clCreateProgramWithSource(ext_opencl_env->context, 1, &ocl_bench_source,
+                                        &kernel_len, &status);
+    if (status != CL_SUCCESS || !program) {
+        av_log(NULL, AV_LOG_ERROR, "OpenCL unable to create benchmark program\n");
+        ret = AVERROR_EXTERNAL;
+        goto end;
+    }
+    status = clBuildProgram(program, 1, &(ext_opencl_env->device_id), NULL, NULL, NULL);
+    if (status != CL_SUCCESS) {
+        av_log(NULL, AV_LOG_ERROR, "OpenCL unable to build benchmark program\n");
+        ret = AVERROR_EXTERNAL;
+        goto end;
+    }
+    kernel = clCreateKernel(program, "unsharp_bench", &status);
+    if (status != CL_SUCCESS) {
+        av_log(NULL, AV_LOG_ERROR, "OpenCL unable to create benchmark kernel\n");
+        ret = AVERROR_EXTERNAL;
+        goto end;
+    }
+
+    OCLCHECK(clEnqueueWriteBuffer, ext_opencl_env->command_queue, cl_inbuf, CL_TRUE, 0,
+             buf_size, inbuf, 0, NULL, NULL);
+    OCLCHECK(clEnqueueWriteBuffer, ext_opencl_env->command_queue, cl_mask, CL_TRUE, 0,
+             mask_size, mask, 0, NULL, NULL);
+    OCLCHECK(clSetKernelArg, kernel, arg++, sizeof(cl_mem), &cl_inbuf);
+    OCLCHECK(clSetKernelArg, kernel, arg++, sizeof(cl_mem), &cl_outbuf);
+    OCLCHECK(clSetKernelArg, kernel, arg++, sizeof(cl_mem), &cl_mask);
+    OCLCHECK(clSetKernelArg, kernel, arg++, sizeof(cl_int), &width);
+    OCLCHECK(clSetKernelArg, kernel, arg++, sizeof(cl_int), &height);
+
+    start = av_gettime();
+    for (i = 0; i < OPENCL_NB_ITER; i++)
+        OCLCHECK(clEnqueueNDRangeKernel, ext_opencl_env->command_queue, kernel, 2, NULL,
+                 global_work_size_2d, local_work_size_2d, 0, NULL, NULL);
+    clFinish(ext_opencl_env->command_queue);
+    ret = (av_gettime() - start)/OPENCL_NB_ITER;
+end:
+    if (kernel)
+        clReleaseKernel(kernel);
+    if (program)
+        clReleaseProgram(program);
+    if (cl_inbuf)
+        clReleaseMemObject(cl_inbuf);
+    if (cl_outbuf)
+        clReleaseMemObject(cl_outbuf);
+    if (cl_mask)
+        clReleaseMemObject(cl_mask);
+    av_free(inbuf);
+    av_free(mask);
+    return ret;
+}
+
+static int compare_ocl_device_desc(const void *a, const void *b)
+{
+    return ((OpenCLDeviceBenchmark*)a)->runtime - ((OpenCLDeviceBenchmark*)b)->runtime;
+}
+
+int opt_opencl_bench(void *optctx, const char *opt, const char *arg)
+{
+    int i, j, nb_devices = 0, count = 0;
+    int64_t score = 0;
+    AVOpenCLDeviceList *device_list;
+    AVOpenCLDeviceNode *device_node = NULL;
+    OpenCLDeviceBenchmark *devices = NULL;
+    cl_platform_id platform;
+
+    av_opencl_get_device_list(&device_list);
+    for (i = 0; i < device_list->platform_num; i++)
+        nb_devices += device_list->platform_node[i]->device_num;
+    if (!nb_devices) {
+        av_log(NULL, AV_LOG_ERROR, "No OpenCL device detected!\n");
+        return AVERROR(EINVAL);
+    }
+    if (!(devices = av_malloc(sizeof(OpenCLDeviceBenchmark) * nb_devices))) {
+        av_log(NULL, AV_LOG_ERROR, "Could not allocate buffer\n");
+        return AVERROR(ENOMEM);
+    }
+
+    for (i = 0; i < device_list->platform_num; i++) {
+        for (j = 0; j < device_list->platform_node[i]->device_num; j++) {
+            device_node = device_list->platform_node[i]->device_node[j];
+            platform = device_list->platform_node[i]->platform_id;
+            score = av_opencl_benchmark(device_node, platform, run_opencl_bench);
+            if (score > 0) {
+                devices[count].platform_idx = i;
+                devices[count].device_idx = j;
+                devices[count].runtime = score;
+                strcpy(devices[count].device_name, device_node->device_name);
+                count++;
+            }
+        }
+    }
+    qsort(devices, count, sizeof(OpenCLDeviceBenchmark), compare_ocl_device_desc);
+    fprintf(stderr, "platform_idx\tdevice_idx\tdevice_name\truntime\n");
+    for (i = 0; i < count; i++)
+        fprintf(stdout, "%d\t%d\t%s\t%"PRId64"\n",
+                devices[i].platform_idx, devices[i].device_idx,
+                devices[i].device_name, devices[i].runtime);
+
+    av_opencl_free_device_list(&device_list);
+    av_free(devices);
+    return 0;
+}
+
+int opt_opencl(void *optctx, const char *opt, const char *arg)
+{
+    char *key, *value;
+    const char *opts = arg;
+    int ret = 0;
+    while (*opts) {
+        ret = av_opt_get_key_value(&opts, "=", ":", 0, &key, &value);
+        if (ret < 0)
+            return ret;
+        ret = av_opencl_set_option(key, value);
+        if (ret < 0)
+            return ret;
+        if (*opts)
+            opts++;
+    }
+    return ret;
+}

omxplayer-2014.02.11.tar.gz/ffmpeg/common.mak -> omxplayer-2014.03.28.tar.gz/ffmpeg/common.mak Changed

@@ -10,7 +10,7 @@
 ifndef V
 Q      = @
 ECHO   = printf "$(1)\t%s\n" $(2)
-BRIEF  = CC CXX HOSTCC HOSTLD AS YASM AR LD STRIP CP
+BRIEF  = CC CXX HOSTCC HOSTLD AS YASM AR LD STRIP CP WINDRES
 SILENT = DEPCC DEPHOSTCC DEPAS DEPYASM RANLIB RM
 
 MSG    = $@
@@ -43,6 +43,7 @@
 COMPILE_C = $(call COMPILE,CC)
 COMPILE_CXX = $(call COMPILE,CXX)
 COMPILE_S = $(call COMPILE,AS)
+COMPILE_HOSTC = $(call COMPILE,HOSTCC)
 
 %.o: %.c
 	$(COMPILE_C)
@@ -56,6 +57,12 @@
 %.o: %.S
 	$(COMPILE_S)
 
+%_host.o: %.c
+	$(COMPILE_HOSTC)
+
+%.o: %.rc
+	$(WINDRES) $(IFLAGS) --preprocessor "$(DEPWINDRES) -E -xc-header -DRC_INVOKED $(CC_DEPFLAGS)" -o $@ $<
+
 %.i: %.c
 	$(CC) $(CCFLAGS) $(CC_E) $<
 
@@ -82,14 +89,15 @@
 include $(SRC_PATH)/arch.mak
 
 OBJS      += $(OBJS-yes)
+SLIBOBJS  += $(SLIBOBJS-yes)
 FFLIBS    := $(FFLIBS-yes) $(FFLIBS)
 TESTPROGS += $(TESTPROGS-yes)
 
 LDLIBS       = $(FFLIBS:%=%$(BUILDSUF))
 FFEXTRALIBS := $(LDLIBS:%=$(LD_LIB)) $(EXTRALIBS)
 
-EXAMPLES  := $(EXAMPLES:%=$(SUBDIR)%-example$(EXESUF))
 OBJS      := $(sort $(OBJS:%=$(SUBDIR)%))
+SLIBOBJS  := $(sort $(SLIBOBJS:%=$(SUBDIR)%))
 TESTOBJS  := $(TESTOBJS:%=$(SUBDIR)%) $(TESTPROGS:%=$(SUBDIR)%-test.o)
 TESTPROGS := $(TESTPROGS:%=$(SUBDIR)%-test$(EXESUF))
 HOSTOBJS  := $(HOSTPROGS:%=$(SUBDIR)%.o)
@@ -113,18 +121,19 @@
 alltools: $(TOOLS)
 
 $(HOSTOBJS): %.o: %.c
-	$(call COMPILE,HOSTCC)
+	$(COMPILE_HOSTC)
 
 $(HOSTPROGS): %$(HOSTEXESUF): %.o
-	$(HOSTLD) $(HOSTLDFLAGS) $(HOSTLD_O) $< $(HOSTLIBS)
+	$(HOSTLD) $(HOSTLDFLAGS) $(HOSTLD_O) $^ $(HOSTLIBS)
 
 $(OBJS):     | $(sort $(dir $(OBJS)))
 $(HOBJS):    | $(sort $(dir $(HOBJS)))
 $(HOSTOBJS): | $(sort $(dir $(HOSTOBJS)))
+$(SLIBOBJS): | $(sort $(dir $(SLIBOBJS)))
 $(TESTOBJS): | $(sort $(dir $(TESTOBJS)))
 $(TOOLOBJS): | tools
 
-OBJDIRS := $(OBJDIRS) $(dir $(OBJS) $(HOBJS) $(HOSTOBJS) $(TESTOBJS))
+OBJDIRS := $(OBJDIRS) $(dir $(OBJS) $(HOBJS) $(HOSTOBJS) $(SLIBOBJS) $(TESTOBJS))
 
 CLEANSUFFIXES     = *.d *.o *~ *.h.c *.map *.ver *.ho *.gcno *.gcda
 DISTCLEANSUFFIXES = *.pc
@@ -139,4 +148,4 @@
 
 $(eval $(RULES))
 
--include $(wildcard $(OBJS:.o=.d) $(HOSTOBJS:.o=.d) $(TESTOBJS:.o=.d) $(HOBJS:.o=.d))
+-include $(wildcard $(OBJS:.o=.d) $(HOSTOBJS:.o=.d) $(TESTOBJS:.o=.d) $(HOBJS:.o=.d) $(SLIBOBJS:.o=.d))

omxplayer-2014.02.11.tar.gz/ffmpeg/compat/getopt.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/compat/getopt.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/compat/os2threads.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/compat/os2threads.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/compat/va_copy.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/compat/va_copy.h Changed

omxplayer-2014.03.28.tar.gz/ffmpeg/compat/windows Added

omxplayer-2014.03.28.tar.gz/ffmpeg/compat/windows/makedef Added

@@ -0,0 +1,132 @@
+#!/bin/sh
+
+# Copyright (c) 2013, Derek Buitenhuis
+#
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+# mktemp isn't POSIX, so supply an implementation
+mktemp() {
+    echo "${2%%XXX*}.${HOSTNAME}.${UID}.$$"
+}
+
+if [ $# -lt 2 ]; then
+    echo "Usage: makedef <version_script> <objects>" >&2
+    exit 0
+fi
+
+vscript=$1
+shift
+
+if [ ! -f "$vscript" ]; then
+    echo "Version script does not exist" >&2
+    exit 1
+fi
+
+for object in "$@"; do
+    if [ ! -f "$object" ]; then
+        echo "Object does not exist: ${object}" >&2
+        exit 1
+    fi
+done
+
+# Create a lib temporarily to dump symbols from.
+# It's just much easier to do it this way
+libname=$(mktemp -u "library").lib
+
+trap 'rm -f -- $libname' EXIT
+
+lib -out:${libname} $@ >/dev/null
+if [ $? != 0 ]; then
+    echo "Could not create temporary library." >&2
+    exit 1
+fi
+
+IFS='
+'
+
+# Determine if we're building for x86 or x86_64 and
+# set the symbol prefix accordingly.
+prefix=""
+arch=$(dumpbin -headers ${libname} |
+       tr '\t' ' ' |
+       grep '^ \+.\+machine \+(.\+)' |
+       head -1 |
+       sed -e 's/^ \{1,\}.\{1,\} \{1,\}machine \{1,\}($...$).*/\1/')
+
+if [ "${arch}" = "x86" ]; then
+    prefix="_"
+else
+    if [ "${arch}" != "ARM" ] && [ "${arch}" != "x64" ]; then
+        echo "Unknown machine type." >&2
+        exit 1
+    fi
+fi
+
+started=0
+regex="none"
+
+for line in $(cat ${vscript} | tr '\t' ' '); do
+    # We only care about global symbols
+    echo "${line}" | grep -q '^ \+global:'
+    if [ $? = 0 ]; then
+        started=1
+        line=$(echo "${line}" | sed -e 's/^ \{1,\}global: *//')
+    else
+        echo "${line}" | grep -q '^ \+local:'
+        if [ $? = 0 ]; then
+            started=0
+        fi
+    fi
+
+    if [ ${started} = 0 ]; then
+        continue
+    fi
+
+    # Handle multiple symbols on one line
+    IFS=';'
+
+    # Work around stupid expansion to filenames
+    line=$(echo "${line}" | sed -e 's/\*/.\\+/g')
+    for exp in ${line}; do
+        # Remove leading and trailing whitespace
+        exp=$(echo "${exp}" | sed -e 's/^ *//' -e 's/ *$//')
+
+        if [ "${regex}" = "none" ]; then
+            regex="${exp}"
+        else
+            regex="${regex};${exp}"
+        fi
+    done
+
+    IFS='
+'
+done
+
+dump=$(dumpbin -linkermember:1 ${libname})
+
+rm ${libname}
+
+IFS=';'
+list=""
+for exp in ${regex}; do
+    list="${list}"'
+'$(echo "${dump}" |
+          sed -e '/public symbols/,$!d' -e '/^ \{1,\}Summary/,$d' -e "s/ \{1,\}${prefix}/ /" -e 's/ \{1,\}/ /g' |
+          tail -n +2 |
+          cut -d' ' -f3 |
+          grep "^${exp}" |
+          sed -e 's/^/    /')
+done
+
+echo "EXPORTS"
+echo "${list}" | sort | uniq | tail -n +2

omxplayer-2014.02.11.tar.gz/ffmpeg/configure -> omxplayer-2014.03.28.tar.gz/ffmpeg/configure Changed

@@ -87,6 +87,8 @@
   --shlibdir=DIR           install shared libs in DIR [PREFIX/lib]
   --incdir=DIR             install includes in DIR [PREFIX/include]
   --mandir=DIR             install man page in DIR [PREFIX/share/man]
+  --enable-rpath           use rpath to allow installing libraries in paths
+                           not part of the dynamic linker search path
 
 Licensing options:
   --enable-gpl             allow use of GPL code, the resulting libs
@@ -105,6 +107,7 @@
   --disable-all            disable building components, libraries and programs
   --enable-incompatible-libav-abi enable incompatible Libav fork ABI [no]
   --enable-incompatible-fork-abi  enable incompatible Libav fork ABI (deprecated) [no]
+  --enable-raise-major     increase major version numbers in sonames [no]
 
 Program options:
   --disable-programs       do not build command line programs
@@ -146,7 +149,7 @@
 Hardware accelerators:
   --disable-dxva2          disable DXVA2 code [autodetect]
   --disable-vaapi          disable VAAPI code [autodetect]
-  --enable-vda             enable VDA code
+  --disable-vda            disable VDA code [autodetect]
   --disable-vdpau          disable VDPAU code [autodetect]
 
 Individual component options:
@@ -239,14 +242,18 @@
                            native implementation exists [no]
   --enable-libvpx          enable VP8 and VP9 de/encoding via libvpx [no]
   --enable-libwavpack      enable wavpack encoding via libwavpack [no]
+  --enable-libwebp         enable WebP encoding via libwebp [no]
   --enable-libx264         enable H.264 encoding via x264 [no]
+  --enable-libx265         enable HEVC encoding via x265 [no]
   --enable-libxavs         enable AVS encoding via xavs [no]
   --enable-libxvid         enable Xvid encoding via xvidcore,
                            native MPEG-4/Xvid encoder exists [no]
   --enable-libzmq          enable message passing via libzmq [no]
   --enable-libzvbi         enable teletext support via libzvbi [no]
+  --enable-decklink        enable Blackmagick DeckLink output [no]
   --enable-openal          enable OpenAL 1.1 capture support [no]
   --enable-opencl          enable OpenCL code
+  --enable-opengl          enable OpenGL rendering [no]
   --enable-openssl         enable openssl [no]
   --enable-x11grab         enable X11 grabbing [no]
   --disable-zlib           disable zlib [autodetect]
@@ -265,6 +272,7 @@
   --nm=NM                  use nm tool NM [$nm_default]
   --ar=AR                  use archive tool AR [$ar_default]
   --as=AS                  use assembler AS [$as_default]
+  --windres=WINDRES        use windows resource compiler WINDRES [$windres_default]
   --yasmexe=EXE            use yasm-compatible assembler EXE [$yasmexe_default]
   --cc=CC                  use C compiler CC [$cc_default]
   --cxx=CXX                use C compiler CXX [$cxx_default]
@@ -314,6 +322,8 @@
   --disable-sse4           disable SSE4 optimizations
   --disable-sse42          disable SSE4.2 optimizations
   --disable-avx            disable AVX optimizations
+  --disable-xop            disable XOP optimizations
+  --disable-fma3           disable FMA3 optimizations
   --disable-fma4           disable FMA4 optimizations
   --disable-avx2           disable AVX2 optimizations
   --disable-armv5te        disable armv5te optimizations
@@ -345,6 +355,8 @@
   --enable-ftrapv          Trap arithmetic overflows
   --samples=PATH           location of test samples for FATE, if not set use
                            \$FATE_SAMPLES at make invocation time.
+  --enable-neon-clobber-test check NEON registers for clobbering (should be
+                           used only for debugging purposes)
   --enable-xmm-clobber-test check XMM registers for clobbering (Win64-only;
                            should be used only for debugging purposes)
   --enable-random          randomly enable/disable components
@@ -728,6 +740,10 @@
     append LDFLAGS $($ldflags_filter "$@")
 }
 
+add_stripflags(){
+    append ASMSTRIPFLAGS "$@"
+}
+
 add_extralibs(){
     prepend extralibs $($ldflags_filter "$@")
 }
@@ -836,6 +852,13 @@
     check_cmd $ld $LDFLAGS $flags $(ld_o $TMPE) $TMPO $libs $extralibs
 }
 
+print_include(){
+    hdr=$1
+    test "${hdr%.h}" = "${hdr}" &&
+        echo "#include $hdr"    ||
+        echo "#include <$hdr>"
+}
+
 check_code(){
     log check_code "$@"
     check=$1
@@ -844,7 +867,7 @@
     shift 3
     {
         for hdr in $headers; do
-            echo "#include <$hdr>"
+            print_include $hdr
         done
         echo "int main(void) { $code; return 0; }"
     } | check_$check "$@"
@@ -857,14 +880,19 @@
 EOF
 }
 
-check_cflags(){
-    log check_cflags "$@"
+test_cflags(){
+    log test_cflags "$@"
     set -- $($cflags_filter "$@")
-    check_cc "$@" <<EOF && append CFLAGS "$@"
+    check_cc "$@" <<EOF
 int x;
 EOF
 }
 
+check_cflags(){
+    log check_cflags "$@"
+    test_cflags "$@" && add_cflags "$@"
+}
+
 check_cxxflags(){
     log check_cxxflags "$@"
     set -- $($cflags_filter "$@")
@@ -885,6 +913,20 @@
     test_ldflags "$@" && add_ldflags "$@"
 }
 
+test_stripflags(){
+    log test_stripflags "$@"
+    # call check_cc to get a fresh TMPO
+    check_cc <<EOF
+int main(void) { return 0; }
+EOF
+    check_cmd $strip $ASMSTRIPFLAGS "$@" $TMPO
+}
+
+check_stripflags(){
+    log check_stripflags "$@"
+    test_stripflags "$@" && add_stripflags "$@"
+}
+
 check_header(){
     log check_header "$@"
     header=$1
@@ -928,7 +970,7 @@
     shift 2
     {
         for hdr in $headers; do
-            echo "#include <$hdr>"
+            print_include $hdr
         done
         for func in $funcs; do
             echo "long check_$func(void) { return (long) $func; }"
@@ -995,11 +1037,12 @@
 
 check_pkg_config(){
     log check_pkg_config "$@"
-    pkg="$1"
+    pkgandversion="$1"
+    pkg="${1%% *}"
     headers="$2"
     funcs="$3"
     shift 3
-    check_cmd $pkg_config --exists --print-errors $pkg || return
+    check_cmd $pkg_config --exists --print-errors $pkgandversion || return
     pkg_cflags=$($pkg_config --cflags $pkg)
     pkg_libs=$($pkg_config --libs $pkg)
     check_func_headers "$headers" "$funcs" $pkg_cflags $pkg_libs "$@" &&
@@ -1102,6 +1145,30 @@
     add_extralibs $(get_safe ${pkg}_libs)
 }
 
+require_libfreetype(){
+    log require_libfreetype "$@"
+    pkg="freetype2"
+    check_cmd $pkg_config --exists --print-errors $pkg \
+      || die "ERROR: $pkg not found"
+    pkg_cflags=$($pkg_config --cflags $pkg)
+    pkg_libs=$($pkg_config --libs $pkg)
+    {
+        echo "#include <ft2build.h>"
+        echo "#include FT_FREETYPE_H"
+        echo "long check_func(void) { return (long) FT_Init_FreeType; }"
+        echo "int main(void) { return 0; }"
+    } | check_ld "cc" $pkg_cflags $pkg_libs \
+      && set_safe ${pkg}_cflags $pkg_cflags \
+      && set_safe ${pkg}_libs   $pkg_libs \
+      || die "ERROR: $pkg not found"
+    add_cflags    $(get_safe ${pkg}_cflags)
+    add_extralibs $(get_safe ${pkg}_libs)
+}
+
+hostcc_e(){
+    eval printf '%s\\n' $HOSTCC_E
+}
+
 hostcc_o(){
     eval printf '%s\\n' $HOSTCC_O
 }
@@ -1113,6 +1180,13 @@
     check_cmd $host_cc $host_cflags "$@" $HOSTCC_C $(hostcc_o $TMPO) $TMPC
 }
 
+check_host_cpp(){
+    log check_host_cpp "$@"
+    cat > $TMPC
+    log_file $TMPC
+    check_cmd $host_cc $HOSTCPPFLAGS $HOSTCFLAGS "$@" $(hostcc_e $TMPO) $TMPC
+}
+
 check_host_cppflags(){
     log check_host_cppflags "$@"
     check_host_cc "$@" <<EOF && append host_cppflags "$@"
@@ -1128,6 +1202,19 @@
 EOF
 }
 
+check_host_cpp_condition(){
+    log check_host_cpp_condition "$@"
+    header=$1
+    condition=$2
+    shift 2
+    check_host_cpp "$@" <<EOF
+#include <$header>
+#if !($condition)
+#error "unsatisfied condition: $condition"
+#endif
+EOF
+}
+
 apply(){
     file=$1
     shift
@@ -1157,10 +1244,26 @@
     protocols
 "
 
+EXAMPLE_LIST="
+    avio_reading_example
+    avcodec_example
+    demuxing_decoding_example
+    filter_audio_example
+    filtering_audio_example
+    filtering_video_example
+    metadata_example
+    muxing_example
+    remuxing_example
+    resampling_audio_example
+    scaling_video_example
+    transcode_aac_example
+"
+
 EXTERNAL_LIBRARY_LIST="
     avisynth
     bzlib
     crystalhd
+    decklink
     fontconfig
     frei0r
     gnutls
@@ -1208,13 +1311,16 @@
     libvorbis
     libvpx
     libwavpack
+    libwebp
     libx264
+    libx265
     libxavs
     libxvid
     libzmq
     libzvbi
     openal
     opencl
+    opengl
     openssl
     x11grab
     zlib
@@ -1233,6 +1339,7 @@
     vaapi
     vda
     vdpau
+    xvmc
 "
 
 LIBRARY_LIST="
@@ -1257,6 +1364,7 @@
 CONFIG_LIST="
     $COMPONENT_LIST
     $DOCUMENT_LIST
+    $EXAMPLE_LIST
     $EXTERNAL_LIBRARY_LIST
     $HWACCEL_LIST
     $LIBRARY_LIST
@@ -1277,9 +1385,11 @@
     mdct
     memalign_hack
     memory_poisoning
+    neon_clobber_test
     network
     nonfree
     pic
+    raise_major
     rdft
     runtime_cpudetect
     safe_bitstream_reader
@@ -1346,6 +1456,8 @@
     amd3dnowext
     avx
     avx2
+    cpunop
+    fma3
     fma4
     i686
     mmx
@@ -1356,6 +1468,7 @@
     sse4
     sse42
     ssse3
+    xop
 '
 
 ARCH_EXT_LIST="
@@ -1427,7 +1540,6 @@
     altivec_h
     arpa_inet_h
     asm_mod_q
-    asm_mod_y
     asm_types_h
     atomic_cas_ptr
     atomics_native
@@ -1439,7 +1551,6 @@
     clock_gettime
     closesocket
     CommandLineToArgvW
-    cpunop
     CryptGenRandom
     dcbzl
     dev_bktr_ioctl_bt848_h
@@ -1454,6 +1565,7 @@
     dxva_h
     ebp_available
     ebx_available
+    ES2_gl_h
     fast_64bit
     fast_clz
     fast_cmov
@@ -1470,7 +1582,9 @@
     getservbyport
     gettimeofday
     glob
+    glXGetProcAddress
     gnu_as
+    gnu_windres
     gsm_h
     ibm_asm
     inet_aton
@@ -1480,6 +1594,7 @@
     jack_port_get_latency_range
     kbhit
     ldbrx
+    libc_msvcrt
     libdc1394_1
     libdc1394_2
     local_aligned_16
@@ -1499,9 +1614,9 @@
     mm_empty
     mmap
     mprotect
-    msvcrt
     nanosleep
     openjpeg_1_5_openjpeg_h
+    OpenGL_gl3_h
     PeekNamedPipe
     perl
     pod2man
@@ -1552,11 +1667,14 @@
     threads
     unistd_h
     usleep
+    vdpau_x11
     vfp_args
     VirtualAlloc
+    wglGetProcAddress
     windows_h
     winsock2_h
     xform_asm
+    xlib
     xmm_clobbers
 "
 
@@ -1571,13 +1689,16 @@
     gcrypt
     golomb
     gplv3
+    h263dsp
     h264chroma
     h264dsp
     h264pred
     h264qpel
     hpeldsp
     huffman
+    intrax8
     lgplv3
+    llviddsp
     lpc
     mpegaudio
     mpegaudiodsp
@@ -1606,6 +1727,7 @@
     logging
     lto
     optimizations
+    rpath
     stripping
 "
 
@@ -1675,8 +1797,8 @@
 armv5te_deps="arm"
 armv6_deps="arm"
 armv6t2_deps="arm"
-neon_deps="arm"
-vfp_deps="arm"
+neon_deps_any="aarch64 arm"
+vfp_deps_any="aarch64 arm"
 vfpv3_deps="vfp"
 
 map 'eval ${v}_inline_deps=inline_asm' $ARCH_EXT_LIST_ARM
@@ -1697,6 +1819,7 @@
 
 amd3dnow_deps="mmx"
 amd3dnowext_deps="amd3dnow"
+i686_deps="x86"
 mmx_deps="x86"
 mmxext_deps="mmx"
 sse_deps="mmxext"
@@ -1706,6 +1829,8 @@
 sse4_deps="ssse3"
 sse42_deps="sse4"
 avx_deps="sse42"
+xop_deps="avx"
+fma3_deps="avx"
 fma4_deps="avx"
 avx2_deps="avx"
 
@@ -1720,17 +1845,25 @@
     eval ${ext}_suggest='"${ext}_external ${ext}_inline"'
 done
 
-aligned_stack_if_any="ppc x86"
-fast_64bit_if_any="alpha ia64 mips64 parisc64 ppc64 sparc64 x86_64"
-fast_clz_if_any="alpha avr32 mips ppc x86"
-fast_unaligned_if_any="ppc x86"
+aligned_stack_if_any="aarch64 ppc x86"
+fast_64bit_if_any="aarch64 alpha ia64 mips64 parisc64 ppc64 sparc64 x86_64"
+fast_clz_if_any="aarch64 alpha avr32 mips ppc x86"
+fast_unaligned_if_any="aarch64 ppc x86"
 
-inline_asm_deps="!tms470"
 need_memalign="altivec neon sse"
 
+# system capabilities
+log2_deps="!libc_msvcrt"
+
 symver_if_any="symver_asm_label symver_gnu_asm"
 
-log2_deps="!msvcrt"
+# threading support
+atomics_gcc_if="sync_val_compare_and_swap"
+atomics_suncc_if="atomic_cas_ptr machine_rw_barrier"
+atomics_win32_if="MemoryBarrier"
+atomics_native_if_any="$ATOMICS_LIST"
+w32threads_deps="atomics_native"
+threads_if_any="$THREADS_LIST"
 
 # subsystems
 dct_select="rdft"
@@ -1765,6 +1898,7 @@
 asv2_encoder_select="dsputil"
 atrac1_decoder_select="mdct sinewin"
 atrac3_decoder_select="mdct"
+atrac3p_decoder_select="mdct sinewin"
 avrn_decoder_select="exif"
 bink_decoder_select="dsputil hpeldsp"
 binkaudio_dct_decoder_select="mdct rdft dct sinewin"
@@ -1790,8 +1924,9 @@
 exr_decoder_select="zlib"
 ffv1_decoder_select="dsputil golomb rangecoder"
 ffv1_encoder_select="dsputil rangecoder"
-ffvhuff_decoder_select="dsputil"
-ffvhuff_encoder_select="dsputil huffman"
+ffvhuff_decoder_select="dsputil llviddsp"
+ffvhuff_encoder_select="dsputil huffman llviddsp"
+fic_decoder_select="dsputil golomb"
 flac_decoder_select="golomb"
 flac_encoder_select="dsputil golomb lpc"
 flashsv_decoder_select="zlib"
@@ -1806,15 +1941,15 @@
 g729_decoder_select="dsputil"
 h261_decoder_select="error_resilience mpegvideo"
 h261_encoder_select="aandcttables mpegvideoenc"
-h263_decoder_select="error_resilience h263_parser mpegvideo"
-h263_encoder_select="aandcttables mpegvideoenc"
+h263_decoder_select="error_resilience h263_parser h263dsp mpegvideo"
+h263_encoder_select="aandcttables h263dsp mpegvideoenc"
 h263i_decoder_select="h263_decoder"
 h263p_encoder_select="h263_encoder"
 h264_decoder_select="golomb h264chroma h264dsp h264pred h264qpel videodsp"
 h264_decoder_suggest="error_resilience"
 hevc_decoder_select="dsputil golomb videodsp"
-huffyuv_decoder_select="dsputil"
-huffyuv_encoder_select="dsputil huffman"
+huffyuv_decoder_select="dsputil llviddsp"
+huffyuv_encoder_select="dsputil huffman llviddsp"
 iac_decoder_select="dsputil fft mdct sinewin"
 imc_decoder_select="dsputil fft mdct sinewin"
 indeo3_decoder_select="hpeldsp"
@@ -1848,9 +1983,9 @@
 mpeg_xvmc_decoder_deps="X11_extensions_XvMClib_h"
 mpeg_xvmc_decoder_select="mpeg2video_decoder"
 mpeg1video_decoder_select="error_resilience mpegvideo"
-mpeg1video_encoder_select="aandcttables mpegvideoenc"
+mpeg1video_encoder_select="aandcttables mpegvideoenc h263dsp"
 mpeg2video_decoder_select="error_resilience mpegvideo"
-mpeg2video_encoder_select="aandcttables mpegvideoenc"
+mpeg2video_encoder_select="aandcttables mpegvideoenc h263dsp"
 mpeg4_decoder_select="h263_decoder mpeg4video_parser"
 mpeg4_encoder_select="h263_encoder"
 msmpeg4v1_decoder_select="h263_decoder"
@@ -1872,9 +2007,9 @@
 ra_144_encoder_select="audio_frame_queue lpc"
 ralf_decoder_select="golomb"
 rtjpeg_decoder_select="dsputil"
-rv10_decoder_select="error_resilience h263_decoder"
+rv10_decoder_select="error_resilience h263_decoder h263dsp"
 rv10_encoder_select="h263_encoder"
-rv20_decoder_select="error_resilience h263_decoder"
+rv20_decoder_select="error_resilience h263_decoder h263dsp"
 rv20_encoder_select="h263_encoder"
 rv30_decoder_select="error_resilience golomb h264chroma h264pred h264qpel mpegvideo videodsp"
 rv40_decoder_select="error_resilience golomb h264chroma h264pred h264qpel mpegvideo videodsp"
@@ -1882,8 +2017,8 @@
 sipr_decoder_select="lsp"
 snow_decoder_select="dsputil dwt h264qpel hpeldsp rangecoder"
 snow_encoder_select="aandcttables dsputil dwt h264qpel hpeldsp mpegvideoenc rangecoder"
-sonic_decoder_select="golomb"
-sonic_encoder_select="golomb"
+sonic_decoder_select="golomb rangecoder"
+sonic_encoder_select="golomb rangecoder"
 sonic_ls_encoder_select="golomb"
 sp5x_decoder_select="dsputil hpeldsp exif"
 svq1_decoder_select="hpeldsp"
@@ -1903,7 +2038,7 @@
 utvideo_decoder_select="dsputil"
 utvideo_encoder_select="dsputil huffman"
 vble_decoder_select="dsputil"
-vc1_decoder_select="error_resilience h263_decoder h264chroma h264qpel"
+vc1_decoder_select="error_resilience h263_decoder h264chroma h264qpel intrax8"
 vc1image_decoder_select="vc1_decoder"
 vorbis_decoder_select="mdct"
 vorbis_encoder_select="mdct"
@@ -1923,7 +2058,7 @@
 wmavoice_decoder_select="lsp rdft dct mdct sinewin"
 wmv1_decoder_select="h263_decoder"
 wmv1_encoder_select="h263_encoder"
-wmv2_decoder_select="h263_decoder videodsp"
+wmv2_decoder_select="h263_decoder intrax8 videodsp"
 wmv2_encoder_select="h263_encoder"
 wmv3_decoder_select="vc1_decoder"
 wmv3image_decoder_select="wmv3_decoder"
@@ -1940,6 +2075,7 @@
 vda_deps="VideoDecodeAcceleration_VDADecoder_h pthreads"
 vda_extralibs="-framework CoreFoundation -framework VideoDecodeAcceleration -framework QuartzCore"
 vdpau_deps="vdpau_vdpau_h vdpau_vdpau_x11_h"
+xvmc_deps="X11_extensions_XvMClib_h"
 
 h263_vaapi_hwaccel_deps="vaapi"
 h263_vaapi_hwaccel_select="h263_decoder"
@@ -1960,10 +2096,14 @@
 h264_vdpau_hwaccel_select="h264_decoder"
 mpeg_vdpau_decoder_deps="vdpau"
 mpeg_vdpau_decoder_select="mpeg2video_decoder"
+mpeg_xvmc_hwaccel_deps="xvmc"
+mpeg_xvmc_hwaccel_select="mpeg2video_decoder"
 mpeg1_vdpau_decoder_deps="vdpau"
 mpeg1_vdpau_decoder_select="mpeg1video_decoder"
 mpeg1_vdpau_hwaccel_deps="vdpau"
 mpeg1_vdpau_hwaccel_select="mpeg1video_decoder"
+mpeg1_xvmc_hwaccel_deps="xvmc"
+mpeg1_xvmc_hwaccel_select="mpeg1video_decoder"
 mpeg2_crystalhd_decoder_select="crystalhd"
 mpeg2_dxva2_hwaccel_deps="dxva2"
 mpeg2_dxva2_hwaccel_select="mpeg2video_decoder"
@@ -1971,6 +2111,8 @@
 mpeg2_vaapi_hwaccel_select="mpeg2video_decoder"
 mpeg2_vdpau_hwaccel_deps="vdpau"
 mpeg2_vdpau_hwaccel_select="mpeg2video_decoder"
+mpeg2_xvmc_hwaccel_deps="xvmc"
+mpeg2_xvmc_hwaccel_select="mpeg2video_decoder"
 mpeg4_crystalhd_decoder_select="crystalhd"
 mpeg4_vaapi_hwaccel_deps="vaapi"
 mpeg4_vaapi_hwaccel_select="mpeg4_decoder"
@@ -1996,7 +2138,8 @@
 
 # parsers
 h264_parser_select="golomb h264chroma h264dsp h264pred h264qpel videodsp"
-mpeg4video_parser_select="error_resilience mpegvideo"
+hevc_parser_select="hevc_decoder"
+mpeg4video_parser_select="error_resilience h263dsp mpegvideo"
 mpegvideo_parser_select="error_resilience mpegvideo"
 vc1_parser_select="mpegvideo"
 
@@ -2049,8 +2192,10 @@
 libvpx_vp9_decoder_deps="libvpx"
 libvpx_vp9_encoder_deps="libvpx"
 libwavpack_encoder_deps="libwavpack"
+libwebp_encoder_deps="libwebp"
 libx264_encoder_deps="libx264"
 libx264rgb_encoder_deps="libx264"
+libx265_encoder_deps="libx265"
 libxavs_encoder_deps="libxavs"
 libxvid_encoder_deps="libxvid"
 libutvideo_decoder_deps="libutvideo"
@@ -2074,6 +2219,7 @@
 eac3_demuxer_select="ac3_parser"
 f4v_muxer_select="mov_muxer"
 flac_demuxer_select="flac_parser"
+hds_muxer_select="flv_muxer"
 hls_muxer_select="mpegts_muxer"
 ipod_muxer_select="mov_muxer"
 ismv_muxer_select="mov_muxer"
@@ -2115,6 +2261,7 @@
 wav_muxer_select="riffenc"
 webm_muxer_select="riffenc"
 wtv_demuxer_select="riffdec"
+wtv_muxer_select="riffenc"
 xmv_demuxer_select="riffdec"
 xwma_demuxer_select="riffdec"
 
@@ -2123,6 +2270,8 @@
 alsa_outdev_deps="alsa_asoundlib_h"
 bktr_indev_deps_any="dev_bktr_ioctl_bt848_h machine_ioctl_bt848_h dev_video_bktr_ioctl_bt848_h dev_ic_bt8xx_h"
 caca_outdev_deps="libcaca"
+decklink_outdev_deps="decklink pthreads"
+decklink_outdev_extralibs="-lstdc++"
 dshow_indev_deps="IBaseFilter"
 dshow_indev_extralibs="-lpsapi -lole32 -lstrmiids -luuid"
 dv1394_indev_deps="dv1394"
@@ -2136,6 +2285,7 @@
 libdc1394_indev_deps="libdc1394"
 libv4l2_indev_deps="libv4l2"
 openal_indev_deps="openal"
+opengl_outdev_deps="opengl"
 oss_indev_deps_any="soundcard_h sys_soundcard_h"
 oss_outdev_deps_any="soundcard_h sys_soundcard_h"
 pulse_indev_deps="libpulse"
@@ -2205,7 +2355,7 @@
 colormatrix_filter_deps="gpl"
 cropdetect_filter_deps="gpl"
 dctdnoiz_filter_deps="avcodec"
-dctdnoiz_filter_select="fft"
+dctdnoiz_filter_select="dct"
 delogo_filter_deps="gpl"
 deshake_filter_deps="avcodec"
 deshake_filter_select="dsputil"
@@ -2250,12 +2400,25 @@
 tinterlace_filter_deps="gpl"
 vidstabdetect_filter_deps="libvidstab"
 vidstabtransform_filter_deps="libvidstab"
-yadif_filter_deps="gpl"
 pixfmts_super2xsai_test_deps="super2xsai_filter"
 tinterlace_merge_test_deps="tinterlace_filter"
 tinterlace_pad_test_deps="tinterlace_filter"
 zmq_filter_deps="libzmq"
 
+# examples
+avio_reading="avformat avcodec avutil"
+avcodec_example_deps="avcodec avutil"
+demuxing_decoding_example_deps="avcodec avformat avutil"
+filter_audio_example_deps="avfilter avutil"
+filtering_audio_example_deps="avfilter avcodec avformat avutil"
+filtering_video_example_deps="avfilter avcodec avformat avutil"
+metadata_example_deps="avformat avutil"
+muxing_example_deps="avcodec avformat avutil swscale"
+remuxing_example_deps="avcodec avformat avutil"
+resampling_audio_example_deps="avutil swresample"
+scaling_video_example_deps="avutil swscale"
+transcode_aac_example_deps="avcodec avformat swresample"
+
 # libraries
 avcodec_deps="avutil"
 avdevice_deps="avutil avcodec avformat"
@@ -2271,17 +2434,17 @@
                null_filter
                setpts_filter trim_filter"
 ffplay_deps="avcodec avformat swscale swresample sdl"
+ffplay_libs='$sdl_libs'
 ffplay_select="rdft crop_filter"
 ffprobe_deps="avcodec avformat"
 ffserver_deps="avformat fork sarestart"
 ffserver_select="ffm_muxer rtp_protocol rtsp_demuxer"
-ffserver_extralibs='$ldl'
 
 # documentation
 podpages_deps="perl"
 manpages_deps="perl pod2man"
-htmlpages_deps="texi2html"
-txtpages_deps="makeinfo"
+htmlpages_deps="perl texi2html"
+txtpages_deps="perl makeinfo"
 doc_deps_any="manpages htmlpages podpages txtpages"
 
 # default parameters
@@ -2312,6 +2475,7 @@
 ranlib="ranlib"
 strip_default="strip"
 yasmexe_default="yasm"
+windres_default="windres"
 
 nogas=":"
 
@@ -2326,6 +2490,7 @@
 # configurable options
 enable $PROGRAM_LIST
 enable $DOCUMENT_LIST
+enable $EXAMPLE_LIST
 enable $(filter_out avresample $LIBRARY_LIST)
 enable stripping
 
@@ -2339,7 +2504,7 @@
 enable swscale_alpha
 
 # Enable hwaccels by default.
-enable dxva2 vaapi vdpau
+enable dxva2 vaapi vda vdpau xvmc
 
 # build settings
 SHFLAGS='-shared -Wl,-soname,$$(@F)'
@@ -2371,11 +2536,10 @@
 LD_LIB='-l%'
 LD_PATH='-L'
 HOSTCC_C='-c'
+HOSTCC_E='-E -o $@'
 HOSTCC_O='-o $@'
 HOSTLD_O='-o $@'
 
-host_cflags='-O3 -g'
-host_cppflags='-D_ISOC99_SOURCE -D_XOPEN_SOURCE=600'
 host_libs='-lm'
 host_cflags_filter=echo
 host_ldflags_filter=echo
@@ -2581,6 +2745,7 @@
 pkg_config_default="${cross_prefix}${pkg_config_default}"
 ranlib="${cross_prefix}${ranlib}"
 strip_default="${cross_prefix}${strip_default}"
+windres_default="${cross_prefix}${windres_default}"
 
 sysinclude_default="${sysroot}/usr/include"
 
@@ -2597,6 +2762,11 @@
         add_cflags  -fsanitize=thread -pie
         add_ldflags -fsanitize=thread -pie
     ;;
+    clang-usan)
+        cc_default="clang"
+        add_cflags  -fsanitize=undefined
+        add_ldflags -fsanitize=undefined
+    ;;
     gcc-asan)
         cc_default="gcc"
         add_cflags  -fsanitize=address
@@ -2607,6 +2777,11 @@
         add_cflags  -fsanitize=thread -pie -fPIC
         add_ldflags -fsanitize=thread -pie -fPIC
     ;;
+    gcc-usan)
+        cc_default="gcc"
+        add_cflags  -fsanitize=undefined
+        add_ldflags -fsanitize=undefined
+    ;;
     valgrind-massif)
         target_exec_default=${valgrind:-"valgrind"}
         target_exec_args="--tool=massif --alloc-fn=av_malloc --alloc-fn=av_mallocz --alloc-fn=av_calloc --alloc-fn=av_fast_padded_malloc --alloc-fn=av_fast_malloc --alloc-fn=av_realloc_f --alloc-fn=av_fast_realloc --alloc-fn=av_realloc"
@@ -2616,23 +2791,44 @@
         target_exec_args="--error-exitcode=1 --malloc-fill=0x2a --track-origins=yes --leak-check=full --gen-suppressions=all --suppressions=$source_path/tests/fate-valgrind.supp"
     ;;
     msvc)
-        cc_default="c99wrap cl"
-        ld_default="c99wrap link"
+        # Check whether the current MSVC version needs the C99 converter.
+        # From MSVC 2013 (compiler major version 18) onwards, it does actually
+        # support enough of C99 to build ffmpeg. Default to the new
+        # behaviour if the regexp was unable to match anything, since this
+        # successfully parses the version number of existing supported
+        # versions that require the converter (MSVC 2010 and 2012).
+        cl_major_ver=$(cl 2>&1 | sed -n 's/.*Version $[[:digit:]]\{1,\}$\..*/\1/p')
+        if [ -z "$cl_major_ver" ] || [ $cl_major_ver -ge 18 ]; then
+            cc_default="cl"
+        else
+            cc_default="c99wrap cl"
+        fi
+        ld_default="link"
         nm_default="dumpbin -symbols"
         ar_default="lib"
         target_os_default="win32"
+        # Use a relative path for TMPDIR. This makes sure all the
+        # ffconf temp files are written with a relative path, avoiding
+        # issues with msys/win32 path conversion for MSVC parameters
+        # such as -Fo<file> or -out:<file>.
+        TMPDIR=.
     ;;
     icl)
-        cc_default="c99wrap -noconv icl"
-        ld_default="c99wrap xilink"
+        cc_default="icl"
+        ld_default="xilink"
         nm_default="dumpbin -symbols"
         ar_default="xilib"
         target_os_default="win32"
+        TMPDIR=.
     ;;
     gcov)
         add_cflags  -fprofile-arcs -ftest-coverage
         add_ldflags -fprofile-arcs -ftest-coverage
     ;;
+    hardened)
+        add_cflags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -fno-strict-overflow -fstack-protector-all
+        add_ldflags -Wl,-z,relro -Wl,-z,now
+    ;;
     ?*)
         die "Unknown toolchain $toolchain"
     ;;
@@ -2878,7 +3074,9 @@
     unset _depflags _DEPCMD _DEPFLAGS
     _flags_filter=echo
 
-    if $_cc -v 2>&1 | grep -q '^gcc.*LLVM'; then
+    if $_cc --version 2>&1 | grep -q '^GNU assembler'; then
+        true # no-op to avoid reading stdin in following checks
+    elif $_cc -v 2>&1 | grep -q '^gcc.*LLVM'; then
         _type=llvm_gcc
         gcc_extra_ver=$(expr "$($_cc --version | head -n1)" : '.*$(.*)$')
         _ident="llvm-gcc $($_cc -dumpversion) $gcc_extra_ver"
@@ -2945,7 +3143,7 @@
     elif $_cc -v 2>&1 | grep -q clang; then
         _type=clang
         _ident=$($_cc --version | head -n1)
-        _depflags='-MMD'
+        _depflags='-MMD -MF $(@:.o=.d) -MT $@'
         _cflags_speed='-O3'
         _cflags_size='-Os'
     elif $_cc -V 2>&1 | grep -q Sun; then
@@ -2986,15 +3184,13 @@
         _DEPFLAGS='$(CPPFLAGS) $(CFLAGS) -showIncludes -Zs'
         _cflags_speed="-O2"
         _cflags_size="-O1"
-        # Nonstandard output options, to avoid msys path conversion issues.
-        # Relies on wrapper to remap it.
         if $_cc 2>&1 | grep -q Linker; then
-            _ld_o='-out $@'
+            _ld_o='-out:$@'
         else
             _ld_o='-Fe$@'
         fi
-        _cc_o='-Fo $@'
-        _cc_e='-P -Fi $@'
+        _cc_o='-Fo$@'
+        _cc_e='-P -Fi$@'
         _flags_filter=msvc_flags
         _ld_lib='lib%.a'
         _ld_path='-libpath:'
@@ -3012,14 +3208,12 @@
         # versions (tested) as well.
         _cflags_speed="-O2"
         _cflags_size="-O1 -Oi" # -O1 without -Oi miscompiles stuff
-        # Nonstandard output options, to avoid msys path conversion issues.
-        # Relies on wrapper to remap it.
         if $_cc 2>&1 | grep -q Linker; then
-            _ld_o='-out $@'
+            _ld_o='-out:$@'
         else
             _ld_o='-Fe$@'
         fi
-        _cc_o='-Fo $@'
+        _cc_o='-Fo$@'
         _cc_e='-P'
         _flags_filter=icl_flags
         _ld_lib='lib%.a'
@@ -3080,7 +3274,7 @@
 : ${dep_cc_default:=$cc}
 : ${ld_default:=$cc}
 : ${host_ld_default:=$host_cc}
-set_default ar as dep_cc ld host_ld
+set_default ar as dep_cc ld host_ld windres
 
 probe_cc as "$as"
 asflags_filter=$_flags_filter
@@ -3130,6 +3324,9 @@
         gcc|llvm_gcc|clang)
             add_cppflags --sysroot="$sysroot"
             add_ldflags --sysroot="$sysroot"
+# On Darwin --sysroot may be ignored, -isysroot always affects headers and linking
+            add_cppflags -isysroot "$sysroot"
+            add_ldflags -isysroot "$sysroot"
         ;;
         tms470)
             add_cppflags -I"$sysinclude"
@@ -3438,8 +3635,10 @@
 #include <stdlib.h>
 EOF
 
+add_host_cppflags -D_ISOC99_SOURCE
 check_host_cflags -std=c99
 check_host_cflags -Wall
+check_host_cflags -O3
 
 check_64bit(){
     arch32=$1
@@ -3465,6 +3664,10 @@
         check_64bit ppc ppc64 'sizeof(void *) > 4'
         spic=$shared
     ;;
+    s390)
+        check_64bit s390 s390x 'sizeof(void *) > 4'
+        spic=$shared
+    ;;
     sparc)
         check_64bit sparc sparc64 'sizeof(void *) > 4'
         spic=$shared
@@ -3501,7 +3704,6 @@
         SHFLAGS='-shared -Wl,-h,$$(@F)'
         enabled x86 && SHFLAGS="-mimpure-text $SHFLAGS"
         network_extralibs="-lsocket -lnsl"
-        add_cppflags -D__EXTENSIONS__ -D_XOPEN_SOURCE=600
         # When using suncc to build, the Solaris linker will mark
         # an executable with each instruction set encountered by
         # the Solaris assembler.  As our libraries contain their own
@@ -3562,6 +3764,7 @@
         elif enabled arm; then
             LIBTARGET=arm-wince
         fi
+        enabled shared && ! enabled small && check_cmd $windres --version && enable gnu_windres
         check_ldflags -Wl,--nxcompat
         check_ldflags -Wl,--dynamicbase
         shlibdir_default="$bindir_default"
@@ -3588,6 +3791,7 @@
         enable dos_paths
         ;;
     win32|win64)
+        disable symver
         if enabled shared; then
             # Link to the import library instead of the normal static library
             # for shared libs.
@@ -3600,7 +3804,7 @@
         SLIBSUF=".dll"
         SLIBNAME_WITH_VERSION='$(SLIBPREF)$(FULLNAME)-$(LIBVERSION)$(SLIBSUF)'
         SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(FULLNAME)-$(LIBMAJOR)$(SLIBSUF)'
-        SLIB_CREATE_DEF_CMD='makedef $(SUBDIR)lib$(NAME).ver $(OBJS) > $$(@:$(SLIBSUF)=.def)'
+        SLIB_CREATE_DEF_CMD='$(SRC_PATH)/compat/windows/makedef $(SUBDIR)lib$(NAME).ver $(OBJS) > $$(@:$(SLIBSUF)=.def)'
         SLIB_INSTALL_NAME='$(SLIBNAME_WITH_MAJOR)'
         SLIB_INSTALL_LINKS=
         SLIB_INSTALL_EXTRA_SHLIB='$(SLIBNAME:$(SLIBSUF)=.lib)'
@@ -3623,6 +3827,7 @@
         SHFLAGS='-shared -Wl,--out-implib,$(SUBDIR)lib$(FULLNAME).dll.a'
         objformat="win32"
         enable dos_paths
+        enabled shared && ! enabled small && check_cmd $windres --version && enable gnu_windres
         ;;
     *-dos|freedos|opendos)
         network_extralibs="-lsocket"
@@ -3708,56 +3913,79 @@
 
 # determine libc flavour
 
-# uclibc defines __GLIBC__, so it needs to be checked before glibc.
-if check_cpp_condition features.h "defined __UCLIBC__"; then
-    libc_type=uclibc
-    add_cppflags -D_POSIX_C_SOURCE=200112 -D_XOPEN_SOURCE=600
-elif check_cpp_condition features.h "defined __GLIBC__"; then
-    libc_type=glibc
-    add_cppflags -D_POSIX_C_SOURCE=200112 -D_XOPEN_SOURCE=600
-# MinGW headers can be installed on Cygwin, so check for newlib first.
-elif check_cpp_condition newlib.h "defined _NEWLIB_VERSION"; then
-    libc_type=newlib
-    add_cppflags -U__STRICT_ANSI__
-elif check_header _mingw.h; then
-    libc_type=mingw
-    check_cpp_condition _mingw.h \
-        "defined (__MINGW64_VERSION_MAJOR) || (__MINGW32_MAJOR_VERSION > 3) || \
+probe_libc(){
+    pfx=$1
+    pfx_no_=${pfx%_}
+    # uclibc defines __GLIBC__, so it needs to be checked before glibc.
+    if check_${pfx}cpp_condition features.h "defined __UCLIBC__"; then
+        eval ${pfx}libc_type=uclibc
+        add_${pfx}cppflags -D_POSIX_C_SOURCE=200112 -D_XOPEN_SOURCE=600
+    elif check_${pfx}cpp_condition features.h "defined __GLIBC__"; then
+        eval ${pfx}libc_type=glibc
+        add_${pfx}cppflags -D_POSIX_C_SOURCE=200112 -D_XOPEN_SOURCE=600
+    # MinGW headers can be installed on Cygwin, so check for newlib first.
+    elif check_${pfx}cpp_condition newlib.h "defined _NEWLIB_VERSION"; then
+        eval ${pfx}libc_type=newlib
+        add_${pfx}cppflags -U__STRICT_ANSI__
+    # MinGW64 is backwards compatible with MinGW32, so check for it first.
+    elif check_${pfx}cpp_condition _mingw.h "defined __MINGW64_VERSION_MAJOR"; then
+        eval ${pfx}libc_type=mingw64
+        if check_${pfx}cpp_condition _mingw.h "__MINGW64_VERSION_MAJOR < 3"; then
+            add_compat msvcrt/snprintf.o
+            add_cflags "-include $source_path/compat/msvcrt/snprintf.h"
+        fi
+        add_${pfx}cppflags -U__STRICT_ANSI__ -D__USE_MINGW_ANSI_STDIO=1
+        eval test \$${pfx_no_}cc_type = "gcc" &&
+            add_${pfx}cppflags -D__printf__=__gnu_printf__
+    elif check_${pfx}cpp_condition _mingw.h "defined __MINGW_VERSION"  ||
+         check_${pfx}cpp_condition _mingw.h "defined __MINGW32_VERSION"; then
+        eval ${pfx}libc_type=mingw32
+        check_${pfx}cpp_condition _mingw.h "__MINGW32_MAJOR_VERSION > 3 || \
             (__MINGW32_MAJOR_VERSION == 3 && __MINGW32_MINOR_VERSION >= 15)" ||
-        die "ERROR: MinGW runtime version must be >= 3.15."
-    add_cppflags -U__STRICT_ANSI__
-    if check_cpp_condition _mingw.h "defined(__MINGW64_VERSION_MAJOR) && \
-            __MINGW64_VERSION_MAJOR < 3"; then
-        add_compat msvcrt/snprintf.o
-        add_cflags "-include $source_path/compat/msvcrt/snprintf.h"
-    else
-        add_cppflags -D__USE_MINGW_ANSI_STDIO=1
+            die "ERROR: MinGW32 runtime version must be >= 3.15."
+        add_${pfx}cppflags -U__STRICT_ANSI__ -D__USE_MINGW_ANSI_STDIO=1
+        eval test \$${pfx_no_}cc_type = "gcc" &&
+            add_${pfx}cppflags -D__printf__=__gnu_printf__
+    elif check_${pfx}cpp_condition crtversion.h "defined _VC_CRT_MAJOR_VERSION"; then
+        eval ${pfx}libc_type=msvcrt
+        # The MSVC 2010 headers (Win 7.0 SDK) set _WIN32_WINNT to
+        # 0x601 by default unless something else is set by the user.
+        # This can easily lead to us detecting functions only present
+        # in such new versions and producing binaries requiring windows 7.0.
+        # Therefore explicitly set the default to XP unless the user has
+        # set something else on the command line.
+        check_${pfx}cpp_condition stdlib.h "defined(_WIN32_WINNT)" ||
+            add_${pfx}cppflags -D_WIN32_WINNT=0x0502
+    elif check_${pfx}cpp_condition stddef.h "defined __KLIBC__"; then
+        eval ${pfx}libc_type=klibc
+    elif check_${pfx}cpp_condition sys/cdefs.h "defined __BIONIC__"; then
+        eval ${pfx}libc_type=bionic
+    elif check_${pfx}cpp_condition sys/brand.h "defined LABELED_BRAND_NAME"; then
+        eval ${pfx}libc_type=solaris
+        add_${pfx}cppflags -D__EXTENSIONS__ -D_XOPEN_SOURCE=600
     fi
-elif check_func_headers stdlib.h _get_doserrno; then
-    libc_type=msvcrt
-    add_compat strtod.o strtod=avpriv_strtod
-    add_compat msvcrt/snprintf.o snprintf=avpriv_snprintf   \
-                                 _snprintf=avpriv_snprintf  \
-                                 vsnprintf=avpriv_vsnprintf
-    # The MSVC 2010 headers (Win 7.0 SDK) set _WIN32_WINNT to
-    # 0x601 by default unless something else is set by the user.
-    # This can easily lead to us detecting functions only present
-    # in such new versions and producing binaries requiring windows 7.0.
-    # Therefore explicitly set the default to XP unless the user has
-    # set something else on the command line.
-    check_cpp_condition stdlib.h "defined(_WIN32_WINNT)" || add_cppflags -D_WIN32_WINNT=0x0502
-elif check_cpp_condition stddef.h "defined __KLIBC__"; then
-    libc_type=klibc
-elif check_cpp_condition sys/cdefs.h "defined __BIONIC__"; then
-    libc_type=bionic
-    add_compat strtod.o strtod=avpriv_strtod
-fi
+}
+
+probe_libc
+test -n "$libc_type" && enable libc_$libc_type
+probe_libc host_
+test -n "$host_libc_type" && enable host_libc_$host_libc_type
 
-test -n "$libc_type" && enable $libc_type
+case $libc_type in
+    bionic)
+        add_compat strtod.o strtod=avpriv_strtod
+        ;;
+    msvcrt)
+        add_compat strtod.o strtod=avpriv_strtod
+        add_compat msvcrt/snprintf.o snprintf=avpriv_snprintf   \
+                                     _snprintf=avpriv_snprintf  \
+                                     vsnprintf=avpriv_vsnprintf
+        ;;
+esac
 
 # hacks for compiler/libc/os combinations
 
-if enabled_all tms470 glibc; then
+if enabled_all tms470 libc_glibc; then
     CPPFLAGS="-I${source_path}/compat/tms470 ${CPPFLAGS}"
     add_cppflags -D__USER_LABEL_PREFIX__=
     add_cppflags -D__builtin_memset=memset
@@ -3765,7 +3993,7 @@
     add_cflags   -pds=48    # incompatible redefinition of macro
 fi
 
-if enabled_all ccc glibc; then
+if enabled_all ccc libc_glibc; then
     add_ldflags -Wl,-z,now  # calls to libots crash without this
 fi
 
@@ -3808,6 +4036,7 @@
 die_license_disabled gpl libutvideo
 die_license_disabled gpl libvidstab
 die_license_disabled gpl libx264
+die_license_disabled gpl libx265
 die_license_disabled gpl libxavs
 die_license_disabled gpl libxvid
 die_license_disabled gpl libzvbi
@@ -3879,7 +4108,14 @@
 
 check_inline_asm inline_asm_labels '"1:\n"'
 
-if enabled alpha; then
+if enabled aarch64; then
+    # internal assembler in clang 3.3 does not support this instruction
+    enabled neon && check_insn neon 'ext   v0.8B, v0.8B, v1.8B, #1'
+    enabled vfp  && check_insn vfp  'fmadd d0,    d0,    d1,    d2'
+
+    map 'enabled_any ${v}_external ${v}_inline || disable $v' $ARCH_EXT_LIST_ARM
+
+elif enabled alpha; then
 
     check_cflags -mieee
 
@@ -3917,7 +4153,6 @@
             $ARCH_EXT_LIST_ARM
 
     check_inline_asm asm_mod_q '"add r0, %Q0, %R0" :: "r"((long long)0)'
-    check_inline_asm asm_mod_y '"vmul.i32 d0, d0, %y0" :: "x"(0)'
 
     [ $target_os != win32 ] && enabled_all armv6t2 shared !pic && enable_weak_pic
 
@@ -3945,7 +4180,8 @@
 
     enable local_aligned_8 local_aligned_16
 
-    check_inline_asm dcbzl     '"dcbzl 0, %0" :: "r"(0)'
+    [ $cpu != e500 -a $cpu != e500v2 ] &&
+     check_inline_asm dcbzl    '"dcbzl 0, %0" :: "r"(0)'
     check_inline_asm ibm_asm   '"add 0, 0, 0"'
     check_inline_asm ppc4xx    '"maclhw r10, r11, r12"'
     check_inline_asm xform_asm '"lwzx %1, %y0" :: "Z"(*(int*)0), "r"(0)'
@@ -4025,8 +4261,10 @@
         check_yasm "movbe ecx, [5]" && enable yasm ||
             die "yasm/nasm not found or too old. Use --disable-yasm for a crippled build."
         check_yasm "vextractf128 xmm0, ymm0, 0"      || disable avx_external avresample
+        check_yasm "vpmacsdd xmm0, xmm1, xmm2, xmm3" || disable xop_external
+        check_yasm "vfmadd132ps ymm0, ymm1, ymm2"    || disable fma3_external
         check_yasm "vfmaddps ymm0, ymm1, ymm2, ymm3" || disable fma4_external
-        check_yasm "CPU amdnop" && enable cpunop
+        check_yasm "CPU amdnop" || disable cpunop
     fi
 
     case "$cpu" in
@@ -4069,6 +4307,7 @@
     check_type netinet/sctp.h "struct sctp_event_subscribe"
     check_func getaddrinfo $network_extralibs
     check_func getservbyport $network_extralibs
+    check_func inet_aton $network_extralibs
     # Prefer arpa/inet.h over winsock2
     if check_header arpa/inet.h ; then
         check_func closesocket
@@ -4076,7 +4315,7 @@
         check_func_headers winsock2.h closesocket -lws2 &&
             network_extralibs="-lws2" ||
         { check_func_headers winsock2.h closesocket -lws2_32 &&
-            network_extralibs="-lws2_32"; }
+            network_extralibs="-lws2_32"; } || disable winsock2_h network
         check_func_headers ws2tcpip.h getaddrinfo $network_extralibs
         check_type ws2tcpip.h socklen_t
         check_type ws2tcpip.h "struct addrinfo"
@@ -4105,7 +4344,6 @@
 check_func  getrusage
 check_struct "sys/time.h sys/resource.h" "struct rusage" ru_maxrss
 check_func  gettimeofday
-check_func  inet_aton $network_extralibs
 check_func  isatty
 check_func  localtime_r
 check_func  ${malloc_prefix}memalign            && enable memalign
@@ -4167,30 +4405,29 @@
 check_header X11/extensions/XvMClib.h
 check_header asm/types.h
 
-disabled  zlib || check_lib   zlib.h      zlibVersion -lz   || disable  zlib
-disabled bzlib || check_lib2 bzlib.h BZ2_bzlibVersion -lbz2 || disable bzlib
-
 if ! disabled w32threads && ! enabled pthreads; then
-    check_func_headers "windows.h process.h" _beginthreadex && enable w32threads
+    check_func_headers "windows.h process.h" _beginthreadex &&
+        enable w32threads || disable w32threads
 fi
 
 # check for some common methods of building with pthread support
 # do this before the optional library checks as some of them require pthreads
 if ! disabled pthreads && ! enabled w32threads && ! enabled os2threads; then
     enable pthreads
-    if check_func pthread_create; then
-        :
-    elif check_func pthread_create -pthread; then
+    if check_func pthread_join -pthread && check_func pthread_create -pthread; then
         add_cflags -pthread
         add_extralibs -pthread
-    elif check_func pthread_create -pthreads; then
+    elif check_func pthread_join -pthreads && check_func pthread_create -pthreads; then
         add_cflags -pthreads
         add_extralibs -pthreads
-    elif check_func pthread_create -lpthreadGC2; then
+    elif check_func pthread_join -lpthreadGC2 && check_func pthread_create -lpthreadGC2; then
         add_extralibs -lpthreadGC2
-    elif ! check_lib pthread.h pthread_create -lpthread; then
+    elif check_lib pthread.h pthread_join -lpthread && check_lib pthread.h pthread_create -lpthread; then
+        :
+    elif ! check_func pthread_join && ! check_func pthread_create; then
         disable pthreads
     fi
+    check_code cc "pthread.h" "static pthread_mutex_t atomic_lock = PTHREAD_MUTEX_INITIALIZER" || disable pthreads
 fi
 
 for thread in $THREADS_LIST; do
@@ -4205,9 +4442,8 @@
   check_func pthread_cancel
 fi
 
-enabled sync_val_compare_and_swap && enable atomics_gcc
-enabled_all atomic_cas_ptr machine_rw_barrier && enable atomics_suncc
-enabled MemoryBarrier && enable atomics_win32
+disabled  zlib || check_lib   zlib.h      zlibVersion -lz   || disable  zlib
+disabled bzlib || check_lib2 bzlib.h BZ2_bzlibVersion -lbz2 || disable bzlib
 
 check_lib math.h sin -lm && LIBM="-lm"
 disabled crystalhd || check_lib libcrystalhd/libcrystalhd_if.h DtsCrystalHDVersion -lcrystalhd || disable crystalhd
@@ -4224,6 +4460,7 @@
 enabled avisynth          && { { check_lib2 "windows.h" LoadLibrary; } ||
                                { check_lib2 "dlfcn.h" dlopen -ldl; } ||
                                die "ERROR: LoadLibrary/dlopen not found for avisynth"; }
+enabled decklink          && { check_header DeckLinkAPI.h || die "ERROR: DeckLinkAPI.h header not found"; }
 enabled fontconfig        && require_pkg_config fontconfig "fontconfig/fontconfig.h" FcInit
 enabled frei0r            && { check_header frei0r.h || die "ERROR: frei0r.h header not found"; }
 enabled gnutls            && require_pkg_config gnutls gnutls/gnutls.h gnutls_global_init
@@ -4231,7 +4468,7 @@
 enabled libiec61883       && require libiec61883 libiec61883/iec61883.h iec61883_cmp_connect -lraw1394 -lavc1394 -lrom1394 -liec61883
 enabled libaacplus        && require "libaacplus >= 2.0.0" aacplus.h aacplusEncOpen -laacplus
 enabled libass            && require_pkg_config libass ass/ass.h ass_library_init
-enabled libbluray         && require libbluray libbluray/bluray.h bd_open -lbluray
+enabled libbluray         && require_pkg_config libbluray libbluray/bluray.h bd_open
 enabled libcelt           && require libcelt celt/celt.h celt_decode -lcelt0 &&
                              { check_lib celt/celt.h celt_decoder_create_custom -lcelt0 ||
                                die "ERROR: libcelt must be installed and version must be >= 0.11.0."; }
@@ -4240,7 +4477,7 @@
 enabled libfdk_aac        && require libfdk_aac fdk-aac/aacenc_lib.h aacEncOpen -lfdk-aac
 flite_libs="-lflite_cmu_time_awb -lflite_cmu_us_awb -lflite_cmu_us_kal -lflite_cmu_us_kal16 -lflite_cmu_us_rms -lflite_cmu_us_slt -lflite_usenglish -lflite_cmulex -lflite"
 enabled libflite          && require2 libflite "flite/flite.h" flite_init $flite_libs
-enabled libfreetype       && require_pkg_config freetype2 "ft2build.h freetype/freetype.h" FT_Init_FreeType
+enabled libfreetype       && require_libfreetype
 enabled libgme            && require  libgme gme/gme.h gme_new_emu -lgme -lstdc++
 enabled libgsm            && { for gsm_hdr in "gsm.h" "gsm/gsm.h"; do
                                    check_lib "${gsm_hdr}" gsm_create -lgsm && break;
@@ -4273,7 +4510,7 @@
                                die "ERROR: libtwolame must be installed and version must be >= 0.3.10"; }
 enabled libutvideo        && require_cpp utvideo "stdint.h stdlib.h utvideo/utvideo.h utvideo/Codec.h" 'CCodec*' -lutvideo -lstdc++
 enabled libv4l2           && require_pkg_config libv4l2 libv4l2.h v4l2_ioctl
-enabled libvidstab        && require_pkg_config vidstab vid.stab/libvidstab.h vsMotionDetectInit
+enabled libvidstab        && require_pkg_config "vidstab >= 0.98" vid.stab/libvidstab.h vsMotionDetectInit
 enabled libvo_aacenc      && require libvo_aacenc vo-aacenc/voAAC.h voGetAACEncAPI -lvo-aacenc
 enabled libvo_amrwbenc    && require libvo_amrwbenc vo-amrwbenc/enc_if.h E_IF_init -lvo-amrwbenc
 enabled libvorbis         && require libvorbis vorbis/vorbisenc.h vorbis_info_init -lvorbisenc -lvorbis -logg
@@ -4283,11 +4520,15 @@
     enabled libvpx_vp8_encoder && { check_lib2 "vpx/vpx_encoder.h vpx/vp8cx.h" "vpx_codec_enc_init_ver VP8E_SET_MAX_INTRA_BITRATE_PCT" -lvpx ||
                                     die "ERROR: libvpx encoder version must be >=0.9.7"; }
     enabled libvpx_vp9_decoder && { check_lib2 "vpx/vpx_decoder.h vpx/vp8dx.h" "vpx_codec_vp9_dx" -lvpx || disable libvpx_vp9_decoder; }
-    enabled libvpx_vp9_encoder && { check_lib2 "vpx/vpx_encoder.h vpx/vp8cx.h" "vpx_codec_vp9_cx" -lvpx || disable libvpx_vp9_encoder; } }
+    enabled libvpx_vp9_encoder && { check_lib2 "vpx/vpx_encoder.h vpx/vp8cx.h" "vpx_codec_vp9_cx VP9E_SET_SVC" -lvpx || disable libvpx_vp9_encoder; } }
 enabled libwavpack        && require libwavpack wavpack/wavpack.h WavpackOpenFileOutput  -lwavpack
+enabled libwebp           && require_pkg_config libwebp webp/encode.h WebPGetEncoderVersion
 enabled libx264           && require libx264 x264.h x264_encoder_encode -lx264 &&
                              { check_cpp_condition x264.h "X264_BUILD >= 118" ||
                                die "ERROR: libx264 must be installed and version must be >= 0.118."; }
+enabled libx265           && require_pkg_config x265 x265.h x265_encoder_encode &&
+                             { check_cpp_condition x265.h "X265_BUILD >= 7" ||
+                               die "ERROR: libx265 version must be >= 7."; }
 enabled libxavs           && require libxavs xavs.h xavs_encoder_encode -lxavs
 enabled libxvid           && require libxvid xvid.h xvid_global -lxvidcore
 enabled libzmq            && require_pkg_config libzmq zmq.h zmq_ctx_new
@@ -4305,6 +4546,12 @@
                              { check_cpp_condition "OpenCL/cl.h" "defined(CL_VERSION_1_2)" ||
                                check_cpp_condition "CL/cl.h" "defined(CL_VERSION_1_2)" ||
                                die "ERROR: opencl must be installed and version must be 1.2 or compatible"; }
+enabled opengl            && { check_lib GL/glx.h glXGetProcAddress "-lGL" ||
+                               check_lib2 windows.h wglGetProcAddress "-lopengl32 -lgdi32" ||
+                               check_lib2 OpenGL/gl3.h glGetError "-Wl,-framework,OpenGL" ||
+                               check_lib2 ES2/gl.h glGetError "-isysroot=${sysroot} -Wl,-framework,OpenGLES" ||
+                               die "ERROR: opengl not found."
+                             }
 enabled openssl           && { check_lib openssl/ssl.h SSL_library_init -lssl -lcrypto ||
                                check_lib openssl/ssl.h SSL_library_init -lssl32 -leay32 ||
                                check_lib openssl/ssl.h SSL_library_init -lssl -lcrypto -lws2_32 -lgdi32 ||
@@ -4343,8 +4590,8 @@
 
 texi2html --help 2> /dev/null | grep -q 'init-file' && enable texi2html || disable texi2html
 makeinfo --version > /dev/null 2>&1 && enable makeinfo  || disable makeinfo
-perl --version > /dev/null 2>&1 && enable perl || disable perl
-pod2man --help > /dev/null 2>&1 && enable pod2man || disable pod2man
+perl -v            > /dev/null 2>&1 && enable perl      || disable perl
+pod2man --help     > /dev/null 2>&1 && enable pod2man   || disable pod2man
 rsync --help 2> /dev/null | grep -q 'contimeout' && enable rsync_contimeout || disable rsync_contimeout
 
 check_header linux/fb.h
@@ -4395,10 +4642,12 @@
     die "ERROR: libcdio-paranoia not found"
 fi
 
+check_lib X11/Xlib.h XOpenDisplay -lX11 && enable xlib
+
 enabled x11grab                                           &&
-require X11 X11/Xlib.h XOpenDisplay -lX11                 &&
 require Xext X11/extensions/XShm.h XShmCreateImage -lXext &&
-require Xfixes X11/extensions/Xfixes.h XFixesGetCursorImage -lXfixes
+require Xfixes X11/extensions/Xfixes.h XFixesGetCursorImage -lXfixes &&
+{ enabled xlib || die "ERROR: Xlib not found"; }
 
 enabled vaapi &&
     check_lib va/va.h vaInitialize -lva ||
@@ -4408,6 +4657,11 @@
     check_cpp_condition vdpau/vdpau.h "defined VDP_DECODER_PROFILE_MPEG4_PART2_ASP" ||
     disable vdpau
 
+enabled vdpau && enabled xlib &&
+    check_func_headers "vdpau/vdpau.h vdpau/vdpau_x11.h" vdp_device_create_x11 -lvdpau &&
+    prepend ffmpeg_libs $($ldflags_filter "-lvdpau") &&
+    enable vdpau_x11
+
 # Funny iconv installations are not unusual, so check it after all flags have been set
 disabled iconv || check_func_headers iconv.h iconv || check_lib2 iconv.h iconv -liconv || disable iconv
 
@@ -4416,13 +4670,9 @@
 # add some useful compiler flags if supported
 check_cflags -Wdeclaration-after-statement
 check_cflags -Wall
-check_cflags -Wno-parentheses
-check_cflags -Wno-switch
-check_cflags -Wno-format-zero-length
 check_cflags -Wdisabled-optimization
 check_cflags -Wpointer-arith
 check_cflags -Wredundant-decls
-check_cflags -Wno-pointer-sign
 check_cflags -Wwrite-strings
 check_cflags -Wtype-limits
 check_cflags -Wundef
@@ -4431,11 +4681,38 @@
 check_cflags -Wstrict-prototypes
 enabled extra_warnings && check_cflags -Winline
 
+check_disable_warning(){
+    warning_flag=-W${1#-Wno-}
+    test_cflags $warning_flag && add_cflags $1
+}
+
+check_disable_warning -Wno-parentheses
+check_disable_warning -Wno-switch
+check_disable_warning -Wno-format-zero-length
+check_disable_warning -Wno-pointer-sign
+
 # add some linker flags
 check_ldflags -Wl,--warn-common
 check_ldflags -Wl,-rpath-link=libpostproc:libswresample:libswscale:libavfilter:libavdevice:libavformat:libavcodec:libavutil:libavresample
+enabled rpath && add_ldflags -Wl,-rpath=$libdir
 test_ldflags -Wl,-Bsymbolic && append SHFLAGS -Wl,-Bsymbolic
 
+# add some strip flags
+# -wN '..@*' is more selective than -x, but not available everywhere.
+check_stripflags -wN \'..@*\' || check_stripflags -x
+
+enabled neon_clobber_test &&
+    check_ldflags -Wl,--wrap,avcodec_open2              \
+                  -Wl,--wrap,avcodec_decode_audio4      \
+                  -Wl,--wrap,avcodec_decode_video2      \
+                  -Wl,--wrap,avcodec_decode_subtitle2   \
+                  -Wl,--wrap,avcodec_encode_audio2      \
+                  -Wl,--wrap,avcodec_encode_video2      \
+                  -Wl,--wrap,avcodec_encode_subtitle    \
+                  -Wl,--wrap,swr_convert                \
+                  -Wl,--wrap,avresample_convert ||
+    disable neon_clobber_test
+
 enabled xmm_clobber_test &&
     check_ldflags -Wl,--wrap,avcodec_open2              \
                   -Wl,--wrap,avcodec_decode_audio4      \
@@ -4445,6 +4722,8 @@
                   -Wl,--wrap,avcodec_encode_video       \
                   -Wl,--wrap,avcodec_encode_video2      \
                   -Wl,--wrap,avcodec_encode_subtitle    \
+                  -Wl,--wrap,swr_convert                \
+                  -Wl,--wrap,avresample_convert         \
                   -Wl,--wrap,sws_scale ||
     disable xmm_clobber_test
 
@@ -4529,6 +4808,7 @@
     check_cflags -Werror=missing-prototypes
     check_cflags -Werror=return-type
     check_cflags -Werror=vla
+    enabled extra_warnings || check_disable_warning -Wno-maybe-uninitialized
 elif enabled llvm_gcc; then
     check_cflags -mllvm -stack-alignment=16
 elif enabled clang; then
@@ -4550,6 +4830,7 @@
     add_cflags -W${armcc_opt},--diag_suppress=513  # pointer sign
 elif enabled tms470; then
     add_cflags -pds=824 -pds=837
+    disable inline_asm
 elif enabled pathscale; then
     add_cflags -fstrict-overflow -OPT:wrap_around_unsafe_opt=OFF
 elif enabled_any msvc icl; then
@@ -4569,6 +4850,18 @@
     fi
 fi
 
+case $as_type in
+    clang)
+        add_asflags -Qunused-arguments
+    ;;
+esac
+
+case $ld_type in
+    clang)
+        check_ldflags -Qunused-arguments
+    ;;
+esac
+
 case $target_os in
     osf1)
         enabled ccc && add_ldflags '-Wl,-expect_unresolved,*'
@@ -4579,10 +4872,6 @@
 esac
 
 enable frame_thread_encoder
-enabled_any $THREADS_LIST      && enable threads
-enabled_any $ATOMICS_LIST      && enable atomics_native
-
-enabled threads && ! enabled pthreads && ! enabled atomics_native && die "non pthread threading without atomics not supported, try adding --enable-pthreads or --cpu=i486 or higher if you are on x86"
 
 enabled asm || { arch=c; disable $ARCH_LIST $ARCH_EXT_LIST; }
 
@@ -4591,6 +4880,8 @@
            $HAVE_LIST         \
            $ALL_COMPONENTS    \
 
+enabled threads && ! enabled pthreads && ! enabled atomics_native && die "non pthread threading without atomics not supported, try adding --enable-pthreads or --cpu=i486 or higher if you are on x86"
+
 
 if test $target_os = "haiku"; then
     disable memalign
@@ -4630,6 +4921,11 @@
 echo "install prefix            $prefix"
 echo "source path               $source_path"
 echo "C compiler                $cc"
+echo "C library                 $libc_type"
+if test "$host_cc" != "$cc"; then
+    echo "host C compiler           $host_cc"
+    echo "host C library            $host_libc_type"
+fi
 echo "ARCH                      $arch ($cpu)"
 if test "$build_suffix" != ""; then
     echo "build suffix              $build_suffix"
@@ -4651,12 +4947,18 @@
     echo "SSE enabled               ${sse-no}"
     echo "SSSE3 enabled             ${ssse3-no}"
     echo "AVX enabled               ${avx-no}"
+    echo "XOP enabled               ${xop-no}"
+    echo "FMA3 enabled              ${fma3-no}"
     echo "FMA4 enabled              ${fma4-no}"
     echo "i686 features enabled     ${i686-no}"
     echo "CMOV is fast              ${fast_cmov-no}"
     echo "EBX available             ${ebx_available-no}"
     echo "EBP available             ${ebp_available-no}"
 fi
+if enabled aarch64; then
+    echo "NEON enabled              ${neon-no}"
+    echo "VFP enabled               ${vfp-no}"
+fi
 if enabled arm; then
     echo "ARMv5TE enabled           ${armv5te-no}"
     echo "ARMv6 enabled             ${armv6-no}"
@@ -4727,7 +5029,7 @@
 
 echo "Creating config.mak, config.h, and doc/config.texi..."
 
-test -e Makefile || $ln_s "$source_path/Makefile" .
+test -e Makefile || echo "include $source_path/Makefile" > Makefile
 
 enabled stripping || strip="echo skipping strip"
 
@@ -4784,8 +5086,11 @@
 LD_LIB=$LD_LIB
 LD_PATH=$LD_PATH
 DLLTOOL=$dlltool
+WINDRES=$windres
+DEPWINDRES=$dep_cc
 LDFLAGS=$LDFLAGS
 SHFLAGS=$(echo $($ldflags_filter $SHFLAGS))
+ASMSTRIPFLAGS=$ASMSTRIPFLAGS
 YASMFLAGS=$YASMFLAGS
 BUILDSUF=$build_suffix
 PROGSSUF=$progs_suffix
@@ -4822,7 +5127,6 @@
 TARGET_EXEC=$target_exec $target_exec_args
 TARGET_PATH=$target_path
 TARGET_SAMPLES=${target_samples:-\$(SAMPLES)}
-LIBS-ffplay=$sdl_libs
 CFLAGS-ffplay=$sdl_cflags
 ZLIB=$($ldflags_filter -lz)
 LIB_INSTALL_EXTRA_CMD=$LIB_INSTALL_EXTRA_CMD
@@ -4849,6 +5153,7 @@
     name=$(toupper $lcname)
     file=$source_path/$lcname/version.h
     eval $(awk "/#define ${name}_VERSION_M/ { print \$2 \"=\" \$3 }" "$file")
+    enabled raise_major && eval ${name}_VERSION_MAJOR=$((${name}_VERSION_MAJOR+100))
     eval ${name}_VERSION=\$${name}_VERSION_MAJOR.\$${name}_VERSION_MINOR.\$${name}_VERSION_MICRO
     eval echo "${lcname}_VERSION=\$${name}_VERSION" >> config.mak
     eval echo "${lcname}_VERSION_MAJOR=\$${name}_VERSION_MAJOR" >> config.mak
@@ -4857,18 +5162,27 @@
 
 map 'get_version $v' $LIBRARY_LIST
 
+print_program_libs(){
+    eval "program_libs=\$${1}_libs"
+    eval echo "LIBS-${1}=${program_libs}" >> config.mak
+}
+
+map 'print_program_libs $v' $PROGRAM_LIST
+
 cat > $TMPH <<EOF
 /* Automatically generated by configure - do not modify! */
 #ifndef FFMPEG_CONFIG_H
 #define FFMPEG_CONFIG_H
 #define FFMPEG_CONFIGURATION "$(c_escape $FFMPEG_CONFIGURATION)"
 #define FFMPEG_LICENSE "$(c_escape $license)"
+#define CONFIG_THIS_YEAR 2014
 #define FFMPEG_DATADIR "$(eval c_escape $datadir)"
 #define AVCONV_DATADIR "$(eval c_escape $datadir)"
 #define CC_IDENT "$(c_escape ${cc_ident:-Unknown compiler})"
 #define av_restrict $_restrict
 #define EXTERN_PREFIX "${extern_prefix}"
 #define EXTERN_ASM ${extern_prefix}
+#define BUILDSUF "$build_suffix"
 #define SLIBSUF "$SLIBSUF"
 #define HAVE_MMX2 HAVE_MMXEXT
 EOF
@@ -4945,7 +5259,7 @@
 Requires: $(enabled shared || echo $requires)
 Requires.private: $(enabled shared && echo $requires)
 Conflicts:
-Libs: -L\${libdir} -l${shortname} $(enabled shared || echo $libs)
+Libs: -L\${libdir} $(enabled rpath && echo "-Wl,-rpath,\${libdir}") -l${shortname} $(enabled shared || echo $libs)
 Libs.private: $(enabled shared && echo $libs)
 Cflags: -I\${includedir}
 EOF
@@ -4990,26 +5304,3 @@
 pkgconfig_generate libavresample "Libav audio resampling library"       "$LIBAVRESAMPLE_VERSION" "$extralibs" "libavutil${build_suffix} = $LIBAVUTIL_VERSION"
 pkgconfig_generate libswscale    "FFmpeg image rescaling library"       "$LIBSWSCALE_VERSION"    "$LIBM"      "libavutil${build_suffix} = $LIBAVUTIL_VERSION"
 pkgconfig_generate libswresample "FFmpeg audio resampling library"      "$LIBSWRESAMPLE_VERSION" "$LIBM"      "libavutil${build_suffix} = $LIBAVUTIL_VERSION"
-
-fix_ffmpeg_remote(){
-    git_remote_from=$1
-    git_remote_to=$2
-    fixme_remote=$(git --git-dir=$source_path/.git --work-tree=$source_path remote -v | grep $git_remote_from | cut -f 1 | sort | uniq)
-    if [ "$fixme_remote" != "" ]; then
-        echolog "
-Outdated domain in git config, the official domain for ffmpeg git is since
-November 2011, source.ffmpeg.org, both the old and the new point to the same
-repository and server. To update it enter the following commands:
-"
-        for remote in $fixme_remote; do
-            echolog "git remote set-url $remote $git_remote_to"
-        done
-    fi
-}
-
-if test -f "$source_path/.git/config"; then
-    remote_from=git.videolan.org
-    remote_to=source.ffmpeg.org
-    fix_ffmpeg_remote git@$remote_from:ffmpeg   git@$remote_to:ffmpeg
-    fix_ffmpeg_remote git://$remote_from/ffmpeg git://$remote_to/ffmpeg
-fi

omxplayer-2014.02.11.tar.gz/ffmpeg/doc/APIchanges -> omxplayer-2014.03.28.tar.gz/ffmpeg/doc/APIchanges Changed

@@ -4,7 +4,7 @@
 The last version increases were:
 libavcodec:    2013-03-xx
 libavdevice:   2013-03-xx
-libavfilter:   2012-06-22
+libavfilter:   2013-12-xx
 libavformat:   2013-03-xx
 libavresample: 2012-10-05
 libpostproc:   2011-04-18
@@ -15,6 +15,136 @@
 
 API changes, most recent first:
 
+2014-03-18 - e9c8a9a - lsws 2.5.102
+  Make gray16 full-scale.
+
+2014-xx-xx - xxxxxxx - lavu 53.05.0 - frame.h
+  Add av_frame_copy() for copying the frame data.
+
+2014-02-xx - xxxxxxx - lswr 0.18.100 - swresample.h
+  Add swr_is_initialized() for checking whether a resample context is initialized.
+
+2014-02-xx - xxxxxxx - lavr 1.2.0 - avresample.h
+  Add avresample_is_open() for checking whether a resample context is open.
+
+2014-xx-xx - xxxxxxx - lavu 53.04.0  - opt.h
+  Add AV_OPT_FLAG_EXPORT and AV_OPT_FLAG_READONLY to mark options meant (only)
+  for reading.
+
+2014-xx-xx - xxxxxxx - lavu 53.03.01 - opt.h
+  Deprecate unused AV_OPT_FLAG_METADATA.
+
+2014-02-xx - xxxxxxx - lavd 55.10.100 - avdevice.h
+  Add avdevice_list_devices() and avdevice_free_list_devices()
+
+2014-02-16 - db3c970 - lavf 55.33.100 - avio.h
+  Add avio_find_protocol_name() to find out the name of the protocol that would
+  be selected for a given URL.
+
+2014-02-xx - xxxxxxx - lavu 53.3.0 - frame.h
+  Add AV_FRAME_DATA_DOWNMIX_INFO value to the AVFrameSideDataType enum and
+  downmix_info.h API, which identify downmix-related metadata.
+
+2014-02-11 - 1b05ac2 - lavf 55.32.100 - avformat.h
+  Add av_write_uncoded_frame() and av_interleaved_write_uncoded_frame().
+
+2014-02-04 - 3adb5f8 / d9ae103 - lavf 55.30.100 / 55.11.0 - avformat.h
+  Add AVFormatContext.max_interleave_delta for controlling amount of buffering
+  when interleaving.
+
+2014-02-02 - xxxxxxx - lavf 55.29.100 - avformat.h
+  Add output_ts_offset muxing option to AVFormatContext.
+
+2014-01-27 - 102bd64 - lavd 55.7.100 - avdevice.h
+                       lavf 55.28.100 - avformat.h
+  Add avdevice_dev_to_app_control_message() function.
+
+2014-01-27 - 7151411 - lavd 55.6.100 - avdevice.h
+                       lavf 55.27.100 - avformat.h
+  Add avdevice_app_to_dev_control_message() function.
+
+2014-01-24 - 86bee79 - lavf 55.26.100 - avformat.h
+  Add AVFormatContext option metadata_header_padding to allow control over the
+  amount of padding added.
+
+2014-01-20 - eef74b2 / 93c553c - lavc 55.48.102 / 55.32.1 - avcodec.h
+  Edges are not required anymore on video buffers allocated by get_buffer2()
+  (i.e. as if the CODEC_FLAG_EMU_EDGE flag was always on). Deprecate
+  CODEC_FLAG_EMU_EDGE and avcodec_get_edge_width().
+
+2014-01-19 - xxxxxxx - lavf 55.25.100 - avformat.h
+  Add avformat_get_mov_video_tags() and avformat_get_mov_audio_tags().
+
+2014-01-19 - xxxxxxx - lavu 52.63.100 - rational.h
+  Add av_make_q() function.
+
+2014-01-05 - 4cf4da9 / 5b4797a - lavu 52.62.100 / 53.2.0 - frame.h
+  Add AV_FRAME_DATA_MATRIXENCODING value to the AVFrameSideDataType enum, which
+  identifies AVMatrixEncoding data.
+
+2014-01-05 - 751385f / 5c437fb - lavu 52.61.100 / 53.1.0 - channel_layout.h
+  Add values for various Dolby flags to the AVMatrixEncoding enum.
+
+2014-01-04 - xxxxxxx - lavu 52.60.100 - mathematics.h
+  Add av_add_stable() function.
+
+2013-12-22 - xxxxxxx - lavu 52.59.100 - avstring.h
+  Add av_strnlen() function.
+
+2013-12-xx - xxxxxxx - lavu 52.57.100 - opencl.h
+  Add av_opencl_benchmark() function.
+
+2013-11-xx - xxxxxxx - lavu 52.56.100 - ffversion.h
+  Moves version.h to libavutil/ffversion.h.
+  Install ffversion.h and make it public.
+
+2013-12-11 - 29c83d2 / b9fb59d,409a143 / 9431356,44967ab / d7b3ee9 - lavc 55.45.101 / 55.28.1 - avcodec.h
+  av_frame_alloc(), av_frame_unref() and av_frame_free() now can and should be
+  used instead of avcodec_alloc_frame(), avcodec_get_frame_defaults() and
+  avcodec_free_frame() respectively. The latter three functions are deprecated.
+
+2013-12-09 - 7a60348 / 7e244c6- - lavu 52.58.100 / 52.20.0 - frame.h
+  Add AV_FRAME_DATA_STEREO3D value to the AVFrameSideDataType enum and
+  stereo3d.h API, that identify codec-independent stereo3d information.
+
+2013-11-26 - 625b290 / 1eaac1d- - lavu 52.55.100 / 52.19.0 - frame.h
+  Add AV_FRAME_DATA_A53_CC value to the AVFrameSideDataType enum, which
+  identifies ATSC A53 Part 4 Closed Captions data.
+
+2013-11-XX - xxxxxxx - lavu 52.54.100 - avstring.h
+  Add av_utf8_decode() function.
+
+2013-11-22 - fb7d70c - lavc 55.44.100 - avcodec.h
+  Add HEVC profiles
+
+2013-11-xx - xxxxxxx - lavc 55.44.100 - avcodec.h
+  Add av_packet_{un,}pack_dictionary()
+  Add AV_PKT_METADATA_UPDATE side data type, used to transmit key/value
+  strings between a stream and the application.
+
+2013-11-14 - 7c888ae / cce3e0a - lavu 52.53.100 / 52.18.0 - mem.h
+  Move av_fast_malloc() and av_fast_realloc() for libavcodec to libavutil.
+
+2013-11-14 - b71e4d8 / 8941971 - lavc 55.43.100 / 55.27.0 - avcodec.h
+  Deprecate AVCodecContext.error_rate, it is replaced by the 'error_rate'
+  private option of the mpegvideo encoder family.
+
+2013-11-14 - 31c09b7 / 728c465 - lavc 55.26.0 - vdpau.h
+  Add av_vdpau_get_profile().
+  Add av_vdpau_alloc_context(). This function must from now on be
+  used for allocating AVVDPAUContext.
+
+2013-11-04 - be41f21 / cd8f772 - lavc 55.41.100 / 55.25.0 - avcodec.h
+                       lavu 52.51.100 - frame.h
+  Add ITU-R BT.2020 and other not yet included values to color primaries,
+  transfer characteristics and colorspaces.
+
+2013-11-04 - xxxxxxx - lavu 52.50.100 - avutil.h
+  Add av_fopen_utf8()
+
+2013-10-31 - 78265fc / 28096e0 - lavu 52.49.100 / 52.17.0 - frame.h
+  Add AVFrame.flags and AV_FRAME_FLAG_CORRUPT.
+
 2013-10-27 - xxxxxxx - lavc 55.39.100 - avcodec.h
   Add CODEC_CAP_DELAY support to avcodec_decode_subtitle2.
 
@@ -35,11 +165,11 @@
   Add audio/video/subtitle AVCodec fields to AVFormatContext to force specific
   decoders
 
-2013-08-xx - xxxxxxx - lavfi 3.11.0 - avfilter.h
+2013-09-28 - 7381d31 / 0767bfd - lavfi 3.88.100 / 3.11.0 - avfilter.h
   Add AVFilterGraph.execute and AVFilterGraph.opaque for custom slice threading
   implementations.
 
-2013-09-21 - xxxxxxx - lavu 52.16.0 - pixfmt.h
+2013-09-21 - 85f8a3c / e208e6d - lavu 52.46.100 / 52.16.0 - pixfmt.h
   Add interleaved 4:2:2 8/10-bit formats AV_PIX_FMT_NV16 and
   AV_PIX_FMT_NV20.

omxplayer-2014.02.11.tar.gz/ffmpeg/doc/Doxyfile -> omxplayer-2014.03.28.tar.gz/ffmpeg/doc/Doxyfile Changed

@@ -31,7 +31,7 @@
 # This could be handy for archiving the generated documentation or
 # if some version control system is used.
 
-PROJECT_NUMBER         = 2.1
+PROJECT_NUMBER         = 2.2
 
 # With the PROJECT_LOGO tag one can specify a logo or icon that is included
 # in the documentation. The maximum height of the logo should not exceed 55
@@ -793,13 +793,13 @@
 # each generated HTML page. If it is left blank doxygen will generate a
 # standard header.
 
-#HTML_HEADER            = doc/doxy/header.html
+HTML_HEADER            =
 
 # The HTML_FOOTER tag can be used to specify a personal HTML footer for
 # each generated HTML page. If it is left blank doxygen will generate a
 # standard footer.
 
-#HTML_FOOTER            = doc/doxy/footer.html
+HTML_FOOTER            =
 
 # The HTML_STYLESHEET tag can be used to specify a user-defined cascading
 # style sheet that is used by each HTML page. It can be used to
@@ -808,7 +808,7 @@
 # the style sheet file to the HTML output directory, so don't put your own
 # stylesheet in the HTML output directory as well, or it will be erased!
 
-#HTML_STYLESHEET        = doc/doxy/doxy_stylesheet.css
+HTML_STYLESHEET        =
 
 # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output.
 # Doxygen will adjust the colors in the stylesheet and background images

omxplayer-2014.02.11.tar.gz/ffmpeg/doc/Makefile -> omxplayer-2014.03.28.tar.gz/ffmpeg/doc/Makefile Changed

@@ -14,11 +14,11 @@
 COMPONENTS-$(CONFIG_AVDEVICE)   += ffmpeg-devices
 COMPONENTS-$(CONFIG_AVFILTER)   += ffmpeg-filters
 
-MANPAGES1   = $(PROGS-yes:%=doc/%.1)    $(PROGS-yes:%=doc/%-all.1)    $(COMPONENTS-yes:%=doc/%.1)
+MANPAGES1   = $(AVPROGS-yes:%=doc/%.1)    $(AVPROGS-yes:%=doc/%-all.1)    $(COMPONENTS-yes:%=doc/%.1)
 MANPAGES3   = $(LIBRARIES-yes:%=doc/%.3)
 MANPAGES    = $(MANPAGES1) $(MANPAGES3)
-PODPAGES    = $(PROGS-yes:%=doc/%.pod)  $(PROGS-yes:%=doc/%-all.pod)  $(COMPONENTS-yes:%=doc/%.pod)  $(LIBRARIES-yes:%=doc/%.pod)
-HTMLPAGES   = $(PROGS-yes:%=doc/%.html) $(PROGS-yes:%=doc/%-all.html) $(COMPONENTS-yes:%=doc/%.html) $(LIBRARIES-yes:%=doc/%.html) \
+PODPAGES    = $(AVPROGS-yes:%=doc/%.pod)  $(AVPROGS-yes:%=doc/%-all.pod)  $(COMPONENTS-yes:%=doc/%.pod)  $(LIBRARIES-yes:%=doc/%.pod)
+HTMLPAGES   = $(AVPROGS-yes:%=doc/%.html) $(AVPROGS-yes:%=doc/%-all.html) $(COMPONENTS-yes:%=doc/%.html) $(LIBRARIES-yes:%=doc/%.html) \
               doc/developer.html                                        \
               doc/faq.html                                              \
               doc/fate.html                                             \
@@ -36,6 +36,25 @@
 DOCS-$(CONFIG_TXTPAGES)  += $(TXTPAGES)
 DOCS = $(DOCS-yes)
 
+DOC_EXAMPLES-$(CONFIG_AVIO_READING_EXAMPLE)      += avio_reading
+DOC_EXAMPLES-$(CONFIG_AVCODEC_EXAMPLE)           += avcodec
+DOC_EXAMPLES-$(CONFIG_DEMUXING_DECODING_EXAMPLE) += demuxing_decoding
+DOC_EXAMPLES-$(CONFIG_FILTER_AUDIO_EXAMPLE)      += filter_audio
+DOC_EXAMPLES-$(CONFIG_FILTERING_AUDIO_EXAMPLE)   += filtering_audio
+DOC_EXAMPLES-$(CONFIG_FILTERING_VIDEO_EXAMPLE)   += filtering_video
+DOC_EXAMPLES-$(CONFIG_METADATA_EXAMPLE)          += metadata
+DOC_EXAMPLES-$(CONFIG_MUXING_EXAMPLE)            += muxing
+DOC_EXAMPLES-$(CONFIG_REMUXING_EXAMPLE)          += remuxing
+DOC_EXAMPLES-$(CONFIG_RESAMPLING_AUDIO_EXAMPLE)  += resampling_audio
+DOC_EXAMPLES-$(CONFIG_SCALING_VIDEO_EXAMPLE)     += scaling_video
+DOC_EXAMPLES-$(CONFIG_TRANSCODE_AAC_EXAMPLE)     += transcode_aac
+ALL_DOC_EXAMPLES_LIST = $(DOC_EXAMPLES-) $(DOC_EXAMPLES-yes)
+
+DOC_EXAMPLES       := $(DOC_EXAMPLES-yes:%=doc/examples/%$(PROGSSUF)$(EXESUF))
+ALL_DOC_EXAMPLES   := $(ALL_DOC_EXAMPLES_LIST:%=doc/examples/%$(PROGSSUF)$(EXESUF))
+ALL_DOC_EXAMPLES_G := $(ALL_DOC_EXAMPLES_LIST:%=doc/examples/%$(PROGSSUF)_g$(EXESUF))
+PROGS              += $(DOC_EXAMPLES)
+
 all-$(CONFIG_DOC): doc
 
 doc: documentation
@@ -43,7 +62,9 @@
 apidoc: doc/doxy/html
 documentation: $(DOCS)
 
-TEXIDEP = awk '/^@(verbatim)?include/ { printf "$@: $(@D)/%s\n", $$2 }' <$< >$(@:%=%.d)
+examples: $(DOC_EXAMPLES)
+
+TEXIDEP = perl $(SRC_PATH)/doc/texidep.pl $(SRC_PATH) $< $@ >$(@:%=%.d)
 
 doc/%.txt: TAG = TXT
 doc/%.txt: doc/%.texi
@@ -84,9 +105,13 @@
 	$(M)pod2man --section=3 --center=" " --release=" " $< > $@
 
 $(DOCS) doc/doxy/html: | doc/
+$(DOC_EXAMPLES:%$(EXESUF)=%.o): | doc/examples
+OBJDIRS += doc/examples
 
-doc/doxy/html: $(SRC_PATH)/doc/Doxyfile $(INSTHEADERS)
-	$(M)$(SRC_PATH)/doc/doxy-wrapper.sh $(SRC_PATH) $^
+DOXY_INPUT      = $(addprefix $(SRC_PATH)/, $(INSTHEADERS) $(DOC_EXAMPLES:%$(EXESUF)=%.c) $(LIB_EXAMPLES:%$(EXESUF)=%.c))
+
+doc/doxy/html: $(SRC_PATH)/doc/Doxyfile $(DOXY_INPUT)
+	$(M)$(SRC_PATH)/doc/doxy-wrapper.sh $(SRC_PATH) $< $(DOXY_INPUT)
 
 install-doc: install-html install-man
 
@@ -120,7 +145,7 @@
 	$(RM) -r "$(DOCDIR)"
 
 uninstall-man:
-	$(RM) $(addprefix "$(MANDIR)/man1/",$(PROGS-yes:%=%.1) $(PROGS-yes:%=%-all.1) $(COMPONENTS-yes:%=%.1))
+	$(RM) $(addprefix "$(MANDIR)/man1/",$(AVPROGS-yes:%=%.1) $(AVPROGS-yes:%=%-all.1) $(COMPONENTS-yes:%=%.1))
 	$(RM) $(addprefix "$(MANDIR)/man3/",$(LIBRARIES-yes:%=%.3))
 
 clean:: docclean
@@ -128,8 +153,13 @@
 distclean:: docclean
 	$(RM) doc/config.texi
 
-docclean:
-	$(RM) $(TXTPAGES) doc/*.html doc/*.pod doc/*.1 doc/*.3 $(CLEANSUFFIXES:%=doc/%) doc/avoptions_*.texi
+examplesclean:
+	$(RM) $(ALL_DOC_EXAMPLES) $(ALL_DOC_EXAMPLES_G)
+	$(RM) $(CLEANSUFFIXES:%=doc/examples/%)
+
+docclean: examplesclean
+	$(RM) $(CLEANSUFFIXES:%=doc/%)
+	$(RM) $(TXTPAGES) doc/*.html doc/*.pod doc/*.1 doc/*.3 doc/avoptions_*.texi
 	$(RM) -r doc/doxy/html
 
 -include $(wildcard $(DOCS:%=%.d))

omxplayer-2014.02.11.tar.gz/ffmpeg/doc/RELEASE_NOTES -> omxplayer-2014.03.28.tar.gz/ffmpeg/doc/RELEASE_NOTES Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/doc/bitstream_filters.texi -> omxplayer-2014.03.28.tar.gz/ffmpeg/doc/bitstream_filters.texi Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/doc/codecs.texi -> omxplayer-2014.03.28.tar.gz/ffmpeg/doc/codecs.texi Changed

@@ -172,7 +172,13 @@
 Set max difference between the quantizer scale (VBR).
 
 @item bf @var{integer} (@emph{encoding,video})
-Set max number of B frames.
+Set max number of B frames between non-B-frames.
+
+Must be an integer between -1 and 16. 0 means that B-frames are
+disabled. If a value of -1 is used, it will choose an automatic value
+depending on the encoder.
+
+Default value is 0.
 
 @item b_qfactor @var{float} (@emph{encoding,video})
 Set qp factor between P and B frames.
@@ -871,6 +877,9 @@
 
 @item skip_exp @var{integer} (@emph{encoding,video})
 Set frame skip exponent.
+Negative values behave identical to the corresponding positive ones, except
+that the score is normalized.
+Positive values exist primarly for compatibility reasons and are not so useful.
 
 @item skipcmp @var{integer} (@emph{encoding,video})
 Set frame skip compare function.
@@ -1083,5 +1092,9 @@
 
 @c man end CODEC OPTIONS
 
+@ifclear config-writeonly
 @include decoders.texi
+@end ifclear
+@ifclear config-readonly
 @include encoders.texi
+@end ifclear

omxplayer-2014.02.11.tar.gz/ffmpeg/doc/decoders.texi -> omxplayer-2014.03.28.tar.gz/ffmpeg/doc/decoders.texi Changed

@@ -14,7 +14,7 @@
 with the options @code{--enable-decoder=@var{DECODER}} /
 @code{--disable-decoder=@var{DECODER}}.
 
-The option @code{-codecs} of the ff* tools will display the list of
+The option @code{-decoders} of the ff* tools will display the list of
 enabled decoders.
 
 @c man end DECODERS
@@ -52,6 +52,37 @@
 @chapter Audio Decoders
 @c man begin AUDIO DECODERS
 
+A description of some of the currently available audio decoders
+follows.
+
+@section ac3
+
+AC-3 audio decoder.
+
+This decoder implements part of ATSC A/52:2010 and ETSI TS 102 366, as well as
+the undocumented RealAudio 3 (a.k.a. dnet).
+
+@subsubsection AC-3 Decoder Options
+
+@table @option
+
+@item -drc_scale @var{value}
+Dynamic Range Scale Factor. The factor to apply to dynamic range values
+from the AC-3 stream. This factor is applied exponentially.
+There are 3 notable scale factor ranges:
+@table @option
+@item drc_scale == 0
+DRC disabled. Produces full range audio.
+@item 0 < drc_scale <= 1
+DRC enabled.  Applies a fraction of the stream DRC value.
+Audio reproduction is between full range and full compression.
+@item drc_scale > 1
+DRC enabled. Applies drc_scale asymmetrically.
+Loud sounds are fully compressed.  Soft sounds are enhanced.
+@end table
+
+@end table
+
 @section ffwavesynth
 
 Internal wave synthetizer.

omxplayer-2014.02.11.tar.gz/ffmpeg/doc/default.css -> omxplayer-2014.03.28.tar.gz/ffmpeg/doc/default.css Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/doc/developer.texi -> omxplayer-2014.03.28.tar.gz/ffmpeg/doc/developer.texi Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/doc/devices.texi -> omxplayer-2014.03.28.tar.gz/ffmpeg/doc/devices.texi Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/doc/doxy-wrapper.sh -> omxplayer-2014.03.28.tar.gz/ffmpeg/doc/doxy-wrapper.sh Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/doc/encoders.texi -> omxplayer-2014.03.28.tar.gz/ffmpeg/doc/encoders.texi Changed

@@ -14,7 +14,7 @@
 with the options @code{--enable-encoder=@var{ENCODER}} /
 @code{--disable-encoder=@var{ENCODER}}.
 
-The option @code{-codecs} of the ff* tools will display the list of
+The option @code{-encoders} of the ff* tools will display the list of
 enabled encoders.
 
 @c man end ENCODERS
@@ -38,8 +38,8 @@
 time. For a more stable AAC encoder, see @ref{libvo-aacenc}. However, be warned
 that it has a worse quality reported by some users.
 
-@c Comment this out until somebody writes the respective documentation.
-@c See also @ref{libfaac}, @ref{libaacplus}, and @ref{libfdk-aac-enc}.
+@c todo @ref{libaacplus}
+See also @ref{libfdk-aac-enc,,libfdk_aac} and @ref{libfaac}.
 
 @subsection Options
 
@@ -494,6 +494,285 @@
 
 @end table
 
+@anchor{libfaac}
+@section libfaac
+
+libfaac AAC (Advanced Audio Coding) encoder wrapper.
+
+Requires the presence of the libfaac headers and library during
+configuration. You need to explicitly configure the build with
+@code{--enable-libfaac --enable-nonfree}.
+
+This encoder is considered to be of higher quality with respect to the
+@ref{aacenc,,the native experimental FFmpeg AAC encoder}.
+
+For more information see the libfaac project at
+@url{http://www.audiocoding.com/faac.html/}.
+
+@subsection Options
+
+The following shared FFmpeg codec options are recognized.
+
+The following options are supported by the libfaac wrapper. The
+@command{faac}-equivalent of the options are listed in parentheses.
+
+@table @option
+@item b (@emph{-b})
+Set bit rate in bits/s for ABR (Average Bit Rate) mode. If the bit rate
+is not explicitly specified, it is automatically set to a suitable
+value depending on the selected profile. @command{faac} bitrate is
+expressed in kilobits/s.
+
+Note that libfaac does not support CBR (Constant Bit Rate) but only
+ABR (Average Bit Rate).
+
+If VBR mode is enabled this option is ignored.
+
+@item ar (@emph{-R})
+Set audio sampling rate (in Hz).
+
+@item ac (@emph{-c})
+Set the number of audio channels.
+
+@item cutoff (@emph{-C})
+Set cutoff frequency. If not specified (or explicitly set to 0) it
+will use a value automatically computed by the library. Default value
+is 0.
+
+@item profile
+Set audio profile.
+
+The following profiles are recognized:
+@table @samp
+@item aac_main
+Main AAC (Main)
+
+@item aac_low
+Low Complexity AAC (LC)
+
+@item aac_ssr
+Scalable Sample Rate (SSR)
+
+@item aac_ltp
+Long Term Prediction (LTP)
+@end table
+
+If not specified it is set to @samp{aac_low}.
+
+@item flags +qscale
+Set constant quality VBR (Variable Bit Rate) mode.
+
+@item global_quality
+Set quality in VBR mode as an integer number of lambda units.
+
+Only relevant when VBR mode is enabled with @code{flags +qscale}.  The
+value is converted to QP units by dividing it by @code{FF_QP2LAMBDA},
+and used to set the quality value used by libfaac. A reasonable range
+for the option value in QP units is [10-500], the higher the value the
+higher the quality.
+
+@item q (@emph{-q})
+Enable VBR mode when set to a non-negative value, and set constant
+quality value as a double floating point value in QP units.
+
+The value sets the quality value used by libfaac. A reasonable range
+for the option value is [10-500], the higher the value the higher the
+quality.
+
+This option is valid only using the @command{ffmpeg} command-line
+tool. For library interface users, use @option{global_quality}.
+@end table
+
+@subsection Examples
+
+@itemize
+@item
+Use @command{ffmpeg} to convert an audio file to ABR 128 kbps AAC in an M4A (MP4)
+container:
+@example
+ffmpeg -i input.wav -codec:a libfaac -b:a 128k -output.m4a
+@end example
+
+@item
+Use @command{ffmpeg} to convert an audio file to VBR AAC, using the
+LTP AAC profile:
+@example
+ffmpeg -i input.wav -c:a libfaac -profile:a aac_ltp -q:a 100 output.m4a
+@end example
+@end itemize
+
+@anchor{libfdk-aac-enc}
+@section libfdk_aac
+
+libfdk-aac AAC (Advanced Audio Coding) encoder wrapper.
+
+The libfdk-aac library is based on the Fraunhofer FDK AAC code from
+the Android project.
+
+Requires the presence of the libfdk-aac headers and library during
+configuration. You need to explicitly configure the build with
+@code{--enable-libfdk-aac}. The library is also incompatible with GPL,
+so if you allow the use of GPL, you should configure with
+@code{--enable-gpl --enable-nonfree --enable-libfdk-aac}.
+
+This encoder is considered to be of higher quality with respect to
+both @ref{aacenc,,the native experimental FFmpeg AAC encoder} and
+@ref{libfaac}.
+
+VBR encoding, enabled through the @option{vbr} or @option{flags
++qscale} options, is experimental and only works with some
+combinations of parameters.
+
+Support for encoding 7.1 audio is only available with libfdk-aac 0.1.3 or
+higher.
+
+For more information see the fdk-aac project at
+@url{http://sourceforge.net/p/opencore-amr/fdk-aac/}.
+
+@subsection Options
+
+The following options are mapped on the shared FFmpeg codec options.
+
+@table @option
+@item b
+Set bit rate in bits/s. If the bitrate is not explicitly specified, it
+is automatically set to a suitable value depending on the selected
+profile.
+
+In case VBR mode is enabled the option is ignored.
+
+@item ar
+Set audio sampling rate (in Hz).
+
+@item channels
+Set the number of audio channels.
+
+@item flags +qscale
+Enable fixed quality, VBR (Variable Bit Rate) mode.
+Note that VBR is implicitly enabled when the @option{vbr} value is
+positive.
+
+@item cutoff
+Set cutoff frequency. If not specified (or explicitly set to 0) it
+will use a value automatically computed by the library. Default value
+is 0.
+
+@item profile
+Set audio profile.
+
+The following profiles are recognized:
+@table @samp
+@item aac_low
+Low Complexity AAC (LC)
+
+@item aac_he
+High Efficiency AAC (HE-AAC)
+
+@item aac_he_v2
+High Efficiency AAC version 2 (HE-AACv2)
+
+@item aac_ld
+Low Delay AAC (LD)
+
+@item aac_eld
+Enhanced Low Delay AAC (ELD)
+@end table
+
+If not specified it is set to @samp{aac_low}.
+@end table
+
+The following are private options of the libfdk_aac encoder.
+
+@table @option
+@item afterburner
+Enable afterburner feature if set to 1, disabled if set to 0. This
+improves the quality but also the required processing power.
+
+Default value is 1.
+
+@item eld_sbr
+Enable SBR (Spectral Band Replication) for ELD if set to 1, disabled
+if set to 0.
+
+Default value is 0.
+
+@item signaling
+Set SBR/PS signaling style.
+
+It can assume one of the following values:
+@table @samp
+@item default
+choose signaling implicitly (explicit hierarchical by default,
+implicit if global header is disabled)
+
+@item implicit
+implicit backwards compatible signaling
+
+@item explicit_sbr
+explicit SBR, implicit PS signaling
+
+@item explicit_hierarchical
+explicit hierarchical signaling
+@end table
+
+Default value is @samp{default}.
+
+@item latm
+Output LATM/LOAS encapsulated data if set to 1, disabled if set to 0.
+
+Default value is 0.
+
+@item header_period
+Set StreamMuxConfig and PCE repetition period (in frames) for sending
+in-band configuration buffers within LATM/LOAS transport layer.
+
+Must be a 16-bits non-negative integer.
+
+Default value is 0.
+
+@item vbr
+Set VBR mode, from 1 to 5. 1 is lowest quality (though still pretty
+good) and 5 is highest quality. A value of 0 will disable VBR, and CBR
+(Constant Bit Rate) is enabled.
+
+Currently only the @samp{aac_low} profile supports VBR encoding.
+
+VBR modes 1-5 correspond to roughly the following average bit rates:
+
+@table @samp
+@item 1
+32 kbps/channel
+@item 2
+40 kbps/channel
+@item 3
+48-56 kbps/channel
+@item 4
+64 kbps/channel
+@item 5
+about 80-96 kbps/channel
+@end table
+
+Default value is 0.
+@end table
+
+@subsection Examples
+
+@itemize
+@item
+Use @command{ffmpeg} to convert an audio file to VBR AAC in an M4A (MP4)
+container:
+@example
+ffmpeg -i input.wav -codec:a libfdk_aac -vbr 3 output.m4a
+@end example
+
+@item
+Use @command{ffmpeg} to convert an audio file to CBR 64k kbps AAC, using the
+High-Efficiency AAC profile:
+@example
+ffmpeg -i input.wav -c:a libfdk_aac -profile:a aac_he -b:a 64k output.m4a
+@end example
+@end itemize
+
 @anchor{libmp3lame}
 @section libmp3lame
 
@@ -513,7 +792,7 @@
 
 @table @option
 @item b (@emph{-b})
-Set bitrate expressed in bits/s for CBR. LAME @code{bitrate} is
+Set bitrate expressed in bits/s for CBR or ABR. LAME @code{bitrate} is
 expressed in kilobits/s.
 
 @item q (@emph{-V})
@@ -535,6 +814,11 @@
 Enable the encoder to use (on a frame by frame basis) either L/R
 stereo or mid/side stereo. Default value is 1.
 
+@item abr (@emph{--abr})
+Enable the encoder to use ABR when set to 1. The @command{lame}
+@option{--abr} sets the target bitrate, while this options only
+tells FFmpeg to use ABR still relies on @option{b} to set bitrate.
+
 @end table
 
 @section libopencore-amrnb
@@ -786,7 +1070,7 @@
 argument must be exactly the following: 2.5, 5, 10, 20, 40, 60. Smaller
 frame sizes achieve lower latency but less quality at a given bitrate.
 Sizes greater than 20ms are only interesting at fairly low bitrates.
-The default of FFmpeg is 10ms, but is 20ms in @command{opusenc}.
+The default is 20ms.
 
 @item packet_loss (@emph{expect-loss})
 Set expected packet loss percentage. The default is 0.
@@ -863,32 +1147,111 @@
 
 @end table
 
+@anchor{libwavpack}
 @section libwavpack
 
 A wrapper providing WavPack encoding through libwavpack.
 
 Only lossless mode using 32-bit integer samples is supported currently.
-The @option{compression_level} option can be used to control speed vs.
-compression tradeoff, with the values mapped to libwavpack as follows:
+
+Requires the presence of the libwavpack headers and library during
+configuration. You need to explicitly configure the build with
+@code{--enable-libwavpack}.
+
+Note that a libavcodec-native encoder for the WavPack codec exists so users can
+encode audios with this codec without using this encoder. See @ref{wavpackenc}.
+
+@subsection Options
+
+@command{wavpack} command line utility's corresponding options are listed in
+parentheses, if any.
 
 @table @option
+@item frame_size (@emph{--blocksize})
+Default is 32768.
 
-@item 0
-Fast mode - corresponding to the wavpack @option{-f} option.
+@item compression_level
+Set speed vs. compression tradeoff. Acceptable arguments are listed below:
+
+@table @samp
+@item 0 (@emph{-f})
+Fast mode.
 
 @item 1
 Normal (default) settings.
 
-@item 2
-High quality - corresponding to the wavpack @option{-h} option.
+@item 2 (@emph{-h})
+High quality.
 
-@item 3
-Very high quality - corresponding to the wavpack @option{-hh} option.
+@item 3 (@emph{-hh})
+Very high quality.
+
+@item 4-8 (@emph{-hh -x}@var{EXTRAPROC})
+Same as @samp{3}, but with extra processing enabled.
+
+@samp{4} is the same as @option{-x2} and @samp{8} is the same as @option{-x6}.
+
+@end table
+@end table
+
+@anchor{wavpackenc}
+@section wavpack
+
+WavPack lossless audio encoder.
+
+This is a libavcodec-native WavPack encoder. There is also an encoder based on
+libwavpack, but there is virtually no reason to use that encoder.
+
+See also @ref{libwavpack}.
+
+@subsection Options
+
+The equivalent options for @command{wavpack} command line utility are listed in
+parentheses.
+
+@subsubsection Shared options
+
+The following shared options are effective for this encoder. Only special notes
+about this particular encoder will be documented here. For the general meaning
+of the options, see @ref{codec-options,,the Codec Options chapter}.
+
+@table @option
+@item frame_size (@emph{--blocksize})
+For this encoder, the range for this option is between 128 and 131072. Default
+is automatically decided based on sample rate and number of channel.
 
-@item 4-8
-Same as 3, but with extra processing enabled - corresponding to the wavpack
-@option{-x} option. I.e. 4 is the same as @option{-x2} and 8 is the same as
-@option{-x6}.
+For the complete formula of calculating default, see
+@file{libavcodec/wavpackenc.c}.
+
+@item compression_level (@emph{-f}, @emph{-h}, @emph{-hh}, and @emph{-x})
+This option's syntax is consistent with @ref{libwavpack}'s.
+@end table
+
+@subsubsection Private options
+
+@table @option
+@item joint_stereo (@emph{-j})
+Set whether to enable joint stereo. Valid values are:
+
+@table @samp
+@item on (@emph{1})
+Force mid/side audio encoding.
+@item off (@emph{0})
+Force left/right audio encoding.
+@item auto
+Let the encoder decide automatically.
+@end table
+
+@item optimize_mono
+Set whether to enable optimization for mono. This option is only effective for
+non-mono streams. Available values:
+
+@table @samp
+@item on
+enabled
+@item off
+disabled
+@end table
 
 @end table
 
@@ -902,12 +1265,15 @@
 
 @section libtheora
 
-Theora format supported through libtheora.
+libtheora Theora encoder wrapper.
 
 Requires the presence of the libtheora headers and library during
 configuration. You need to explicitly configure the build with
 @code{--enable-libtheora}.
 
+For more informations about the libtheora project see
+@url{http://www.theora.org/}.
+
 @subsection Options
 
 The following global options are mapped to internal libtheora options
@@ -915,11 +1281,11 @@
 
 @table @option
 @item b
-Set the video bitrate, only works if the @code{qscale} flag in
-@option{flags} is not enabled.
+Set the video bitrate in bit/s for CBR (Constant Bit Rate) mode.  In
+case VBR (Variable Bit Rate) mode is enabled this option is ignored.
 
 @item flags
-Used to enable constant quality mode encoding through the
+Used to enable constant quality mode (VBR) encoding through the
 @option{qscale} flag, and to enable the @code{pass1} and @code{pass2}
 modes.
 
@@ -927,18 +1293,40 @@
 Set the GOP size.
 
 @item global_quality
-Set the global quality in lambda units, only works if the
-@code{qscale} flag in @option{flags} is enabled. The value is clipped
-in the [0 - 10*@code{FF_QP2LAMBDA}] range, and then multiplied for 6.3
-to get a value in the native libtheora range [0-63]. A higher value
-corresponds to a higher quality.
-
-For example, to set maximum constant quality encoding with
-@command{ffmpeg}:
+Set the global quality as an integer in lambda units.
+
+Only relevant when VBR mode is enabled with @code{flags +qscale}. The
+value is converted to QP units by dividing it by @code{FF_QP2LAMBDA},
+clipped in the [0 - 10] range, and then multiplied by 6.3 to get a
+value in the native libtheora range [0-63]. A higher value corresponds
+to a higher quality.
+
+@item q
+Enable VBR mode when set to a non-negative value, and set constant
+quality value as a double floating point value in QP units.
+
+The value is clipped in the [0-10] range, and then multiplied by 6.3
+to get a value in the native libtheora range [0-63].
+
+This option is valid only using the @command{ffmpeg} command-line
+tool. For library interface users, use @option{global_quality}.
+@end table
+
+@subsection Examples
+
+@itemize
+@item
+Set maximum constant quality (VBR) encoding with @command{ffmpeg}:
 @example
-ffmpeg -i INPUT -flags:v qscale -global_quality:v "10*QP2LAMBDA" -codec:v libtheora OUTPUT.ogg
+ffmpeg -i INPUT -codec:v libtheora -q:v 10 OUTPUT.ogg
 @end example
-@end table
+
+@item
+Use @command{ffmpeg} to convert a CBR 1000 kbps Theora video stream:
+@example
+ffmpeg -i INPUT -codec:v libtheora -b:v 1000k OUTPUT.ogg
+@end example
+@end itemize
 
 @section libvpx
 
@@ -1059,7 +1447,69 @@
 For more information about libvpx see:
 @url{http://www.webmproject.org/}
 
-@section libx264
+
+@section libwebp
+
+libwebp WebP Image encoder wrapper
+
+libwebp is Google's official encoder for WebP images. It can encode in either
+lossy or lossless mode. Lossy images are essentially a wrapper around a VP8
+frame. Lossless images are a separate codec developed by Google.
+
+@subsection Pixel Format
+
+Currently, libwebp only supports YUV420 for lossy and RGB for lossless due
+to limitations of the format and libwebp. Alpha is supported for either mode.
+Because of API limitations, if RGB is passed in when encoding lossy or YUV is
+passed in for encoding lossless, the pixel format will automatically be
+converted using functions from libwebp. This is not ideal and is done only for
+convenience.
+
+@subsection Options
+
+@table @option
+
+@item -lossless @var{boolean}
+Enables/Disables use of lossless mode. Default is 0.
+
+@item -compression_level @var{integer}
+For lossy, this is a quality/speed tradeoff. Higher values give better quality
+for a given size at the cost of increased encoding time. For lossless, this is
+a size/speed tradeoff. Higher values give smaller size at the cost of increased
+encoding time. More specifically, it controls the number of extra algorithms
+and compression tools used, and varies the combination of these tools. This
+maps to the @var{method} option in libwebp. The valid range is 0 to 6.
+Default is 4.
+
+@item -qscale @var{float}
+For lossy encoding, this controls image quality, 0 to 100. For lossless
+encoding, this controls the effort and time spent at compressing more. The
+default value is 75. Note that for usage via libavcodec, this option is called
+@var{global_quality} and must be multiplied by @var{FF_QP2LAMBDA}.
+
+@item -preset @var{type}
+Configuration preset. This does some automatic settings based on the general
+type of the image.
+@table @option
+@item none
+Do not use a preset.
+@item default
+Use the encoder default.
+@item picture
+Digital picture, like portrait, inner shot
+@item photo
+Outdoor photograph, with natural lighting
+@item drawing
+Hand or line drawing, with high-contrast details
+@item icon
+Small-sized colorful images
+@item text
+Text-like
+@end table
+
+@end table
+
+@section libx264, libx264rgb
 
 x264 H.264/MPEG-4 AVC encoder wrapper.
 
@@ -1081,6 +1531,16 @@
 The x264 project website is at
 @url{http://www.videolan.org/developers/x264.html}.
 
+The libx264rgb encoder is the same as libx264, except it accepts packed RGB
+pixel formats as input instead of YUV.
+
+@subsection Supported Pixel Formats
+
+x264 supports 8- to 10-bit color spaces. The exact bit depth is controlled at
+x264's configure time. FFmpeg only supports one bit depth in one particular
+build. In other words, it is not possible to build one FFmpeg with multiple
+versions of x264 with different bit depths.
+
 @subsection Options
 
 The following options are supported by the libx264 wrapper. The

omxplayer-2014.02.11.tar.gz/ffmpeg/doc/examples/Makefile -> omxplayer-2014.03.28.tar.gz/ffmpeg/doc/examples/Makefile Changed

@@ -11,19 +11,22 @@
 CFLAGS := $(shell pkg-config --cflags $(FFMPEG_LIBS)) $(CFLAGS)
 LDLIBS := $(shell pkg-config --libs $(FFMPEG_LIBS)) $(LDLIBS)
 
-EXAMPLES=       decoding_encoding                  \
-                demuxing                           \
+EXAMPLES=       avio_reading                       \
+                avcodec                            \
+                demuxing_decoding                  \
                 filtering_video                    \
                 filtering_audio                    \
                 metadata                           \
                 muxing                             \
+                remuxing                           \
                 resampling_audio                   \
                 scaling_video                      \
+                transcode_aac                      \
 
 OBJS=$(addsuffix .o,$(EXAMPLES))
 
 # the following examples make explicit use of the math library
-decoding_encoding: LDLIBS += -lm
+avcodec:           LDLIBS += -lm
 muxing:            LDLIBS += -lm
 resampling_audio:  LDLIBS += -lm

omxplayer-2014.02.11.tar.gz/ffmpeg/doc/examples/README -> omxplayer-2014.03.28.tar.gz/ffmpeg/doc/examples/README Changed

@@ -5,14 +5,19 @@
 that you have them installed and working on your system.
 
 
-1) Build the installed examples in a generic read/write user directory
+Method 1: build the installed examples in a generic read/write user directory
 
 Copy to a read/write user directory and just use "make", it will link
 to the libraries on your system, assuming the PKG_CONFIG_PATH is
 correctly configured.
 
-2) Build the examples in-tree
+Method 2: build the examples in-tree
 
 Assuming you are in the source FFmpeg checkout directory, you need to build
-FFmpeg (no need to make install in any prefix). Then you can go into
-doc/examples and run a command such as PKG_CONFIG_PATH=pc-uninstalled make.
+FFmpeg (no need to make install in any prefix). Then just run "make examples".
+This will build the examples using the FFmpeg build system. You can clean those
+examples using "make examplesclean"
+
+If you want to try the dedicated Makefile examples (to emulate the first
+method), go into doc/examples and run a command such as
+PKG_CONFIG_PATH=pc-uninstalled make.

omxplayer-2014.03.28.tar.gz/ffmpeg/doc/examples/avcodec.c Added

@@ -0,0 +1,658 @@
+/*
+ * Copyright (c) 2001 Fabrice Bellard
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+/**
+ * @file
+ * libavcodec API use example.
+ *
+ * @example avcodec.c
+ * Note that libavcodec only handles codecs (mpeg, mpeg4, etc...),
+ * not file formats (avi, vob, mp4, mov, mkv, mxf, flv, mpegts, mpegps, etc...). See library 'libavformat' for the
+ * format handling
+ */
+
+#include <math.h>
+
+#include <libavutil/opt.h>
+#include <libavcodec/avcodec.h>
+#include <libavutil/channel_layout.h>
+#include <libavutil/common.h>
+#include <libavutil/imgutils.h>
+#include <libavutil/mathematics.h>
+#include <libavutil/samplefmt.h>
+
+#define INBUF_SIZE 4096
+#define AUDIO_INBUF_SIZE 20480
+#define AUDIO_REFILL_THRESH 4096
+
+/* check that a given sample format is supported by the encoder */
+static int check_sample_fmt(AVCodec *codec, enum AVSampleFormat sample_fmt)
+{
+    const enum AVSampleFormat *p = codec->sample_fmts;
+
+    while (*p != AV_SAMPLE_FMT_NONE) {
+        if (*p == sample_fmt)
+            return 1;
+        p++;
+    }
+    return 0;
+}
+
+/* just pick the highest supported samplerate */
+static int select_sample_rate(AVCodec *codec)
+{
+    const int *p;
+    int best_samplerate = 0;
+
+    if (!codec->supported_samplerates)
+        return 44100;
+
+    p = codec->supported_samplerates;
+    while (*p) {
+        best_samplerate = FFMAX(*p, best_samplerate);
+        p++;
+    }
+    return best_samplerate;
+}
+
+/* select layout with the highest channel count */
+static int select_channel_layout(AVCodec *codec)
+{
+    const uint64_t *p;
+    uint64_t best_ch_layout = 0;
+    int best_nb_channels   = 0;
+
+    if (!codec->channel_layouts)
+        return AV_CH_LAYOUT_STEREO;
+
+    p = codec->channel_layouts;
+    while (*p) {
+        int nb_channels = av_get_channel_layout_nb_channels(*p);
+
+        if (nb_channels > best_nb_channels) {
+            best_ch_layout    = *p;
+            best_nb_channels = nb_channels;
+        }
+        p++;
+    }
+    return best_ch_layout;
+}
+
+/*
+ * Audio encoding example
+ */
+static void audio_encode_example(const char *filename)
+{
+    AVCodec *codec;
+    AVCodecContext *c= NULL;
+    AVFrame *frame;
+    AVPacket pkt;
+    int i, j, k, ret, got_output;
+    int buffer_size;
+    FILE *f;
+    uint16_t *samples;
+    float t, tincr;
+
+    printf("Encode audio file %s\n", filename);
+
+    /* find the MP2 encoder */
+    codec = avcodec_find_encoder(AV_CODEC_ID_MP2);
+    if (!codec) {
+        fprintf(stderr, "Codec not found\n");
+        exit(1);
+    }
+
+    c = avcodec_alloc_context3(codec);
+    if (!c) {
+        fprintf(stderr, "Could not allocate audio codec context\n");
+        exit(1);
+    }
+
+    /* put sample parameters */
+    c->bit_rate = 64000;
+
+    /* check that the encoder supports s16 pcm input */
+    c->sample_fmt = AV_SAMPLE_FMT_S16;
+    if (!check_sample_fmt(codec, c->sample_fmt)) {
+        fprintf(stderr, "Encoder does not support sample format %s",
+                av_get_sample_fmt_name(c->sample_fmt));
+        exit(1);
+    }
+
+    /* select other audio parameters supported by the encoder */
+    c->sample_rate    = select_sample_rate(codec);
+    c->channel_layout = select_channel_layout(codec);
+    c->channels       = av_get_channel_layout_nb_channels(c->channel_layout);
+
+    /* open it */
+    if (avcodec_open2(c, codec, NULL) < 0) {
+        fprintf(stderr, "Could not open codec\n");
+        exit(1);
+    }
+
+    f = fopen(filename, "wb");
+    if (!f) {
+        fprintf(stderr, "Could not open %s\n", filename);
+        exit(1);
+    }
+
+    /* frame containing input raw audio */
+    frame = av_frame_alloc();
+    if (!frame) {
+        fprintf(stderr, "Could not allocate audio frame\n");
+        exit(1);
+    }
+
+    frame->nb_samples     = c->frame_size;
+    frame->format         = c->sample_fmt;
+    frame->channel_layout = c->channel_layout;
+
+    /* the codec gives us the frame size, in samples,
+     * we calculate the size of the samples buffer in bytes */
+    buffer_size = av_samples_get_buffer_size(NULL, c->channels, c->frame_size,
+                                             c->sample_fmt, 0);
+    if (buffer_size < 0) {
+        fprintf(stderr, "Could not get sample buffer size\n");
+        exit(1);
+    }
+    samples = av_malloc(buffer_size);
+    if (!samples) {
+        fprintf(stderr, "Could not allocate %d bytes for samples buffer\n",
+                buffer_size);
+        exit(1);
+    }
+    /* setup the data pointers in the AVFrame */
+    ret = avcodec_fill_audio_frame(frame, c->channels, c->sample_fmt,
+                                   (const uint8_t*)samples, buffer_size, 0);
+    if (ret < 0) {
+        fprintf(stderr, "Could not setup audio frame\n");
+        exit(1);
+    }
+
+    /* encode a single tone sound */
+    t = 0;
+    tincr = 2 * M_PI * 440.0 / c->sample_rate;
+    for (i = 0; i < 200; i++) {
+        av_init_packet(&pkt);
+        pkt.data = NULL; // packet data will be allocated by the encoder
+        pkt.size = 0;
+
+        for (j = 0; j < c->frame_size; j++) {
+            samples[2*j] = (int)(sin(t) * 10000);
+
+            for (k = 1; k < c->channels; k++)
+                samples[2*j + k] = samples[2*j];
+            t += tincr;
+        }
+        /* encode the samples */
+        ret = avcodec_encode_audio2(c, &pkt, frame, &got_output);
+        if (ret < 0) {
+            fprintf(stderr, "Error encoding audio frame\n");
+            exit(1);
+        }
+        if (got_output) {
+            fwrite(pkt.data, 1, pkt.size, f);
+            av_free_packet(&pkt);
+        }
+    }
+
+    /* get the delayed frames */
+    for (got_output = 1; got_output; i++) {
+        ret = avcodec_encode_audio2(c, &pkt, NULL, &got_output);
+        if (ret < 0) {
+            fprintf(stderr, "Error encoding frame\n");
+            exit(1);
+        }
+
+        if (got_output) {
+            fwrite(pkt.data, 1, pkt.size, f);
+            av_free_packet(&pkt);
+        }
+    }
+    fclose(f);
+
+    av_freep(&samples);
+    av_frame_free(&frame);
+    avcodec_close(c);
+    av_free(c);
+}
+
+/*
+ * Audio decoding.
+ */
+static void audio_decode_example(const char *outfilename, const char *filename)
+{
+    AVCodec *codec;
+    AVCodecContext *c= NULL;
+    int len;
+    FILE *f, *outfile;
+    uint8_t inbuf[AUDIO_INBUF_SIZE + FF_INPUT_BUFFER_PADDING_SIZE];
+    AVPacket avpkt;
+    AVFrame *decoded_frame = NULL;
+
+    av_init_packet(&avpkt);
+
+    printf("Decode audio file %s to %s\n", filename, outfilename);
+
+    /* find the mpeg audio decoder */
+    codec = avcodec_find_decoder(AV_CODEC_ID_MP2);
+    if (!codec) {
+        fprintf(stderr, "Codec not found\n");
+        exit(1);
+    }
+
+    c = avcodec_alloc_context3(codec);
+    if (!c) {
+        fprintf(stderr, "Could not allocate audio codec context\n");
+        exit(1);
+    }
+
+    /* open it */
+    if (avcodec_open2(c, codec, NULL) < 0) {
+        fprintf(stderr, "Could not open codec\n");
+        exit(1);
+    }
+
+    f = fopen(filename, "rb");
+    if (!f) {
+        fprintf(stderr, "Could not open %s\n", filename);
+        exit(1);
+    }
+    outfile = fopen(outfilename, "wb");
+    if (!outfile) {
+        av_free(c);
+        exit(1);
+    }
+
+    /* decode until eof */
+    avpkt.data = inbuf;
+    avpkt.size = fread(inbuf, 1, AUDIO_INBUF_SIZE, f);
+
+    while (avpkt.size > 0) {
+        int got_frame = 0;
+
+        if (!decoded_frame) {
+            if (!(decoded_frame = av_frame_alloc())) {
+                fprintf(stderr, "Could not allocate audio frame\n");
+                exit(1);
+            }
+        }
+
+        len = avcodec_decode_audio4(c, decoded_frame, &got_frame, &avpkt);
+        if (len < 0) {
+            fprintf(stderr, "Error while decoding\n");
+            exit(1);
+        }
+        if (got_frame) {
+            /* if a frame has been decoded, output it */
+            int data_size = av_samples_get_buffer_size(NULL, c->channels,
+                                                       decoded_frame->nb_samples,
+                                                       c->sample_fmt, 1);
+            if (data_size < 0) {
+                /* This should not occur, checking just for paranoia */
+                fprintf(stderr, "Failed to calculate data size\n");
+                exit(1);
+            }
+            fwrite(decoded_frame->data[0], 1, data_size, outfile);
+        }
+        avpkt.size -= len;
+        avpkt.data += len;
+        avpkt.dts =
+        avpkt.pts = AV_NOPTS_VALUE;
+        if (avpkt.size < AUDIO_REFILL_THRESH) {
+            /* Refill the input buffer, to avoid trying to decode
+             * incomplete frames. Instead of this, one could also use
+             * a parser, or use a proper container format through
+             * libavformat. */
+            memmove(inbuf, avpkt.data, avpkt.size);
+            avpkt.data = inbuf;
+            len = fread(avpkt.data + avpkt.size, 1,
+                        AUDIO_INBUF_SIZE - avpkt.size, f);
+            if (len > 0)
+                avpkt.size += len;
+        }
+    }
+
+    fclose(outfile);
+    fclose(f);
+
+    avcodec_close(c);
+    av_free(c);
+    av_frame_free(&decoded_frame);
+}
+
+/*
+ * Video encoding example
+ */
+static void video_encode_example(const char *filename, int codec_id)
+{
+    AVCodec *codec;
+    AVCodecContext *c= NULL;
+    int i, ret, x, y, got_output;
+    FILE *f;
+    AVFrame *frame;
+    AVPacket pkt;
+    uint8_t endcode[] = { 0, 0, 1, 0xb7 };
+
+    printf("Encode video file %s\n", filename);
+
+    /* find the mpeg1 video encoder */
+    codec = avcodec_find_encoder(codec_id);
+    if (!codec) {
+        fprintf(stderr, "Codec not found\n");
+        exit(1);
+    }
+
+    c = avcodec_alloc_context3(codec);
+    if (!c) {
+        fprintf(stderr, "Could not allocate video codec context\n");
+        exit(1);
+    }
+
+    /* put sample parameters */
+    c->bit_rate = 400000;
+    /* resolution must be a multiple of two */
+    c->width = 352;
+    c->height = 288;
+    /* frames per second */
+    c->time_base = (AVRational){1,25};
+    c->gop_size = 10; /* emit one intra frame every ten frames */
+    c->max_b_frames = 1;
+    c->pix_fmt = AV_PIX_FMT_YUV420P;
+
+    if (codec_id == AV_CODEC_ID_H264)
+        av_opt_set(c->priv_data, "preset", "slow", 0);
+
+    /* open it */
+    if (avcodec_open2(c, codec, NULL) < 0) {
+        fprintf(stderr, "Could not open codec\n");
+        exit(1);
+    }
+
+    f = fopen(filename, "wb");
+    if (!f) {
+        fprintf(stderr, "Could not open %s\n", filename);
+        exit(1);
+    }
+
+    frame = av_frame_alloc();
+    if (!frame) {
+        fprintf(stderr, "Could not allocate video frame\n");
+        exit(1);
+    }
+    frame->format = c->pix_fmt;
+    frame->width  = c->width;
+    frame->height = c->height;
+
+    /* the image can be allocated by any means and av_image_alloc() is
+     * just the most convenient way if av_malloc() is to be used */
+    ret = av_image_alloc(frame->data, frame->linesize, c->width, c->height,
+                         c->pix_fmt, 32);
+    if (ret < 0) {
+        fprintf(stderr, "Could not allocate raw picture buffer\n");
+        exit(1);
+    }
+
+    /* encode 1 second of video */
+    for (i = 0; i < 25; i++) {
+        av_init_packet(&pkt);
+        pkt.data = NULL;    // packet data will be allocated by the encoder
+        pkt.size = 0;
+
+        fflush(stdout);
+        /* prepare a dummy image */
+        /* Y */
+        for (y = 0; y < c->height; y++) {
+            for (x = 0; x < c->width; x++) {
+                frame->data[0][y * frame->linesize[0] + x] = x + y + i * 3;
+            }
+        }
+
+        /* Cb and Cr */
+        for (y = 0; y < c->height/2; y++) {
+            for (x = 0; x < c->width/2; x++) {
+                frame->data[1][y * frame->linesize[1] + x] = 128 + y + i * 2;
+                frame->data[2][y * frame->linesize[2] + x] = 64 + x + i * 5;
+            }
+        }
+
+        frame->pts = i;
+
+        /* encode the image */
+        ret = avcodec_encode_video2(c, &pkt, frame, &got_output);
+        if (ret < 0) {
+            fprintf(stderr, "Error encoding frame\n");
+            exit(1);
+        }
+
+        if (got_output) {
+            printf("Write frame %3d (size=%5d)\n", i, pkt.size);
+            fwrite(pkt.data, 1, pkt.size, f);
+            av_free_packet(&pkt);
+        }
+    }
+
+    /* get the delayed frames */
+    for (got_output = 1; got_output; i++) {
+        fflush(stdout);
+
+        ret = avcodec_encode_video2(c, &pkt, NULL, &got_output);
+        if (ret < 0) {
+            fprintf(stderr, "Error encoding frame\n");
+            exit(1);
+        }
+
+        if (got_output) {
+            printf("Write frame %3d (size=%5d)\n", i, pkt.size);
+            fwrite(pkt.data, 1, pkt.size, f);
+            av_free_packet(&pkt);
+        }
+    }
+
+    /* add sequence end code to have a real mpeg file */
+    fwrite(endcode, 1, sizeof(endcode), f);
+    fclose(f);
+
+    avcodec_close(c);
+    av_free(c);
+    av_freep(&frame->data[0]);
+    av_frame_free(&frame);
+    printf("\n");
+}
+
+/*
+ * Video decoding example
+ */
+
+static void pgm_save(unsigned char *buf, int wrap, int xsize, int ysize,
+                     char *filename)
+{
+    FILE *f;
+    int i;
+
+    f = fopen(filename,"w");
+    fprintf(f, "P5\n%d %d\n%d\n", xsize, ysize, 255);
+    for (i = 0; i < ysize; i++)
+        fwrite(buf + i * wrap, 1, xsize, f);
+    fclose(f);
+}
+
+static int decode_write_frame(const char *outfilename, AVCodecContext *avctx,
+                              AVFrame *frame, int *frame_count, AVPacket *pkt, int last)
+{
+    int len, got_frame;
+    char buf[1024];
+
+    len = avcodec_decode_video2(avctx, frame, &got_frame, pkt);
+    if (len < 0) {
+        fprintf(stderr, "Error while decoding frame %d\n", *frame_count);
+        return len;
+    }
+    if (got_frame) {
+        printf("Saving %sframe %3d\n", last ? "last " : "", *frame_count);
+        fflush(stdout);
+
+        /* the picture is allocated by the decoder, no need to free it */
+        snprintf(buf, sizeof(buf), outfilename, *frame_count);
+        pgm_save(frame->data[0], frame->linesize[0],
+                 avctx->width, avctx->height, buf);
+        (*frame_count)++;
+    }
+    if (pkt->data) {
+        pkt->size -= len;
+        pkt->data += len;
+    }
+    return 0;
+}
+
+static void video_decode_example(const char *outfilename, const char *filename)
+{
+    AVCodec *codec;
+    AVCodecContext *c= NULL;
+    int frame_count;
+    FILE *f;
+    AVFrame *frame;
+    uint8_t inbuf[INBUF_SIZE + FF_INPUT_BUFFER_PADDING_SIZE];
+    AVPacket avpkt;
+
+    av_init_packet(&avpkt);
+
+    /* set end of buffer to 0 (this ensures that no overreading happens for damaged mpeg streams) */
+    memset(inbuf + INBUF_SIZE, 0, FF_INPUT_BUFFER_PADDING_SIZE);
+
+    printf("Decode video file %s to %s\n", filename, outfilename);
+
+    /* find the mpeg1 video decoder */
+    codec = avcodec_find_decoder(AV_CODEC_ID_MPEG1VIDEO);
+    if (!codec) {
+        fprintf(stderr, "Codec not found\n");
+        exit(1);
+    }
+
+    c = avcodec_alloc_context3(codec);
+    if (!c) {
+        fprintf(stderr, "Could not allocate video codec context\n");
+        exit(1);
+    }
+
+    if(codec->capabilities&CODEC_CAP_TRUNCATED)
+        c->flags|= CODEC_FLAG_TRUNCATED; /* we do not send complete frames */
+
+    /* For some codecs, such as msmpeg4 and mpeg4, width and height
+       MUST be initialized there because this information is not
+       available in the bitstream. */
+
+    /* open it */
+    if (avcodec_open2(c, codec, NULL) < 0) {
+        fprintf(stderr, "Could not open codec\n");
+        exit(1);
+    }
+
+    f = fopen(filename, "rb");
+    if (!f) {
+        fprintf(stderr, "Could not open %s\n", filename);
+        exit(1);
+    }
+
+    frame = av_frame_alloc();
+    if (!frame) {
+        fprintf(stderr, "Could not allocate video frame\n");
+        exit(1);
+    }
+
+    frame_count = 0;
+    for (;;) {
+        avpkt.size = fread(inbuf, 1, INBUF_SIZE, f);
+        if (avpkt.size == 0)
+            break;
+
+        /* NOTE1: some codecs are stream based (mpegvideo, mpegaudio)
+           and this is the only method to use them because you cannot
+           know the compressed data size before analysing it.
+
+           BUT some other codecs (msmpeg4, mpeg4) are inherently frame
+           based, so you must call them with all the data for one
+           frame exactly. You must also initialize 'width' and
+           'height' before initializing them. */
+
+        /* NOTE2: some codecs allow the raw parameters (frame size,
+           sample rate) to be changed at any frame. We handle this, so
+           you should also take care of it */
+
+        /* here, we use a stream based decoder (mpeg1video), so we
+           feed decoder and see if it could decode a frame */
+        avpkt.data = inbuf;
+        while (avpkt.size > 0)
+            if (decode_write_frame(outfilename, c, frame, &frame_count, &avpkt, 0) < 0)
+                exit(1);
+    }
+
+    /* some codecs, such as MPEG, transmit the I and P frame with a
+       latency of one frame. You must do the following to have a
+       chance to get the last frame of the video */
+    avpkt.data = NULL;
+    avpkt.size = 0;
+    decode_write_frame(outfilename, c, frame, &frame_count, &avpkt, 1);
+
+    fclose(f);
+
+    avcodec_close(c);
+    av_free(c);
+    av_frame_free(&frame);
+    printf("\n");
+}
+
+int main(int argc, char **argv)
+{
+    const char *output_type;
+
+    /* register all the codecs */
+    avcodec_register_all();
+
+    if (argc < 2) {
+        printf("usage: %s output_type\n"
+               "API example program to decode/encode a media stream with libavcodec.\n"
+               "This program generates a synthetic stream and encodes it to a file\n"
+               "named test.h264, test.mp2 or test.mpg depending on output_type.\n"
+               "The encoded stream is then decoded and written to a raw data output.\n"
+               "output_type must be choosen between 'h264', 'mp2', 'mpg'.\n",
+               argv[0]);
+        return 1;
+    }
+    output_type = argv[1];
+
+    if (!strcmp(output_type, "h264")) {
+        video_encode_example("test.h264", AV_CODEC_ID_H264);
+    } else if (!strcmp(output_type, "mp2")) {
+        audio_encode_example("test.mp2");
+        audio_decode_example("test.sw", "test.mp2");
+    } else if (!strcmp(output_type, "mpg")) {
+        video_encode_example("test.mpg", AV_CODEC_ID_MPEG1VIDEO);
+        video_decode_example("test%02d.pgm", "test.mpg");
+    } else {
+        fprintf(stderr, "Invalid output type '%s', choose between 'h264', 'mp2', or 'mpg'\n",
+                output_type);
+        return 1;
+    }
+
+    return 0;
+}

omxplayer-2014.03.28.tar.gz/ffmpeg/doc/examples/avio_reading.c Added

@@ -0,0 +1,132 @@
+/*
+ * Copyright (c) 2014 Stefano Sabatini
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+/**
+ * @file
+ * libavformat AVIOContext API example.
+ *
+ * Make libavformat demuxer access media content through a custom
+ * AVIOContext read callback.
+ * @example avio_reading.c
+ */
+
+#include <libavcodec/avcodec.h>
+#include <libavformat/avformat.h>
+#include <libavformat/avio.h>
+#include <libavutil/file.h>
+
+struct buffer_data {
+    uint8_t *ptr;
+    size_t size; ///< size left in the buffer
+};
+
+static int read_packet(void *opaque, uint8_t *buf, int buf_size)
+{
+    struct buffer_data *bd = (struct buffer_data *)opaque;
+    buf_size = FFMIN(buf_size, bd->size);
+
+    printf("ptr:%p size:%zu\n", bd->ptr, bd->size);
+
+    /* copy internal buffer data to buf */
+    memcpy(buf, bd->ptr, buf_size);
+    bd->ptr  += buf_size;
+    bd->size -= buf_size;
+
+    return buf_size;
+}
+
+int main(int argc, char *argv[])
+{
+    AVFormatContext *fmt_ctx = NULL;
+    AVIOContext *avio_ctx = NULL;
+    uint8_t *buffer = NULL, *avio_ctx_buffer = NULL;
+    size_t buffer_size, avio_ctx_buffer_size = 4096;
+    char *input_filename = NULL;
+    int ret = 0;
+    struct buffer_data bd = { 0 };
+
+    if (argc != 2) {
+        fprintf(stderr, "usage: %s input_file\n"
+                "API example program to show how to read from a custom buffer "
+                "accessed through AVIOContext.\n", argv[0]);
+        return 1;
+    }
+    input_filename = argv[1];
+
+    /* register codecs and formats and other lavf/lavc components*/
+    av_register_all();
+
+    /* slurp file content into buffer */
+    ret = av_file_map(input_filename, &buffer, &buffer_size, 0, NULL);
+    if (ret < 0)
+        goto end;
+
+    /* fill opaque structure used by the AVIOContext read callback */
+    bd.ptr  = buffer;
+    bd.size = buffer_size;
+
+    if (!(fmt_ctx = avformat_alloc_context())) {
+        ret = AVERROR(ENOMEM);
+        goto end;
+    }
+
+    avio_ctx_buffer = av_malloc(avio_ctx_buffer_size);
+    if (!avio_ctx_buffer) {
+        ret = AVERROR(ENOMEM);
+        goto end;
+    }
+    avio_ctx = avio_alloc_context(avio_ctx_buffer, avio_ctx_buffer_size,
+                                  0, &bd, &read_packet, NULL, NULL);
+    if (!avio_ctx) {
+        ret = AVERROR(ENOMEM);
+        goto end;
+    }
+    fmt_ctx->pb = avio_ctx;
+
+    ret = avformat_open_input(&fmt_ctx, NULL, NULL, NULL);
+    if (ret < 0) {
+        fprintf(stderr, "Could not open input\n");
+        goto end;
+    }
+
+    ret = avformat_find_stream_info(fmt_ctx, NULL);
+    if (ret < 0) {
+        fprintf(stderr, "Could not find stream information\n");
+        goto end;
+    }
+
+    av_dump_format(fmt_ctx, 0, input_filename, 0);
+
+end:
+    avformat_close_input(&fmt_ctx);
+    /* note: the internal buffer could have changed, and be != avio_ctx_buffer */
+    av_freep(&avio_ctx->buffer);
+    av_freep(&avio_ctx);
+    av_file_unmap(buffer, buffer_size);
+
+    if (ret < 0) {
+        fprintf(stderr, "Error occurred: %s\n", av_err2str(ret));
+        return 1;
+    }
+
+    return 0;
+}

omxplayer-2014.03.28.tar.gz/ffmpeg/doc/examples/demuxing_decoding.c Added

@@ -0,0 +1,386 @@
+/*
+ * Copyright (c) 2012 Stefano Sabatini
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+/**
+ * @file
+ * Demuxing and decoding example.
+ *
+ * Show how to use the libavformat and libavcodec API to demux and
+ * decode audio and video data.
+ * @example demuxing_decoding.c
+ */
+
+#include <libavutil/imgutils.h>
+#include <libavutil/samplefmt.h>
+#include <libavutil/timestamp.h>
+#include <libavformat/avformat.h>
+
+static AVFormatContext *fmt_ctx = NULL;
+static AVCodecContext *video_dec_ctx = NULL, *audio_dec_ctx;
+static AVStream *video_stream = NULL, *audio_stream = NULL;
+static const char *src_filename = NULL;
+static const char *video_dst_filename = NULL;
+static const char *audio_dst_filename = NULL;
+static FILE *video_dst_file = NULL;
+static FILE *audio_dst_file = NULL;
+
+static uint8_t *video_dst_data[4] = {NULL};
+static int      video_dst_linesize[4];
+static int video_dst_bufsize;
+
+static int video_stream_idx = -1, audio_stream_idx = -1;
+static AVFrame *frame = NULL;
+static AVPacket pkt;
+static int video_frame_count = 0;
+static int audio_frame_count = 0;
+
+/* The different ways of decoding and managing data memory. You are not
+ * supposed to support all the modes in your application but pick the one most
+ * appropriate to your needs. Look for the use of api_mode in this example to
+ * see what are the differences of API usage between them */
+enum {
+    API_MODE_OLD                  = 0, /* old method, deprecated */
+    API_MODE_NEW_API_REF_COUNT    = 1, /* new method, using the frame reference counting */
+    API_MODE_NEW_API_NO_REF_COUNT = 2, /* new method, without reference counting */
+};
+
+static int api_mode = API_MODE_OLD;
+
+static int decode_packet(int *got_frame, int cached)
+{
+    int ret = 0;
+    int decoded = pkt.size;
+
+    *got_frame = 0;
+
+    if (pkt.stream_index == video_stream_idx) {
+        /* decode video frame */
+        ret = avcodec_decode_video2(video_dec_ctx, frame, got_frame, &pkt);
+        if (ret < 0) {
+            fprintf(stderr, "Error decoding video frame (%s)\n", av_err2str(ret));
+            return ret;
+        }
+
+        if (*got_frame) {
+            printf("video_frame%s n:%d coded_n:%d pts:%s\n",
+                   cached ? "(cached)" : "",
+                   video_frame_count++, frame->coded_picture_number,
+                   av_ts2timestr(frame->pts, &video_dec_ctx->time_base));
+
+            /* copy decoded frame to destination buffer:
+             * this is required since rawvideo expects non aligned data */
+            av_image_copy(video_dst_data, video_dst_linesize,
+                          (const uint8_t **)(frame->data), frame->linesize,
+                          video_dec_ctx->pix_fmt, video_dec_ctx->width, video_dec_ctx->height);
+
+            /* write to rawvideo file */
+            fwrite(video_dst_data[0], 1, video_dst_bufsize, video_dst_file);
+        }
+    } else if (pkt.stream_index == audio_stream_idx) {
+        /* decode audio frame */
+        ret = avcodec_decode_audio4(audio_dec_ctx, frame, got_frame, &pkt);
+        if (ret < 0) {
+            fprintf(stderr, "Error decoding audio frame (%s)\n", av_err2str(ret));
+            return ret;
+        }
+        /* Some audio decoders decode only part of the packet, and have to be
+         * called again with the remainder of the packet data.
+         * Sample: fate-suite/lossless-audio/luckynight-partial.shn
+         * Also, some decoders might over-read the packet. */
+        decoded = FFMIN(ret, pkt.size);
+
+        if (*got_frame) {
+            size_t unpadded_linesize = frame->nb_samples * av_get_bytes_per_sample(frame->format);
+            printf("audio_frame%s n:%d nb_samples:%d pts:%s\n",
+                   cached ? "(cached)" : "",
+                   audio_frame_count++, frame->nb_samples,
+                   av_ts2timestr(frame->pts, &audio_dec_ctx->time_base));
+
+            /* Write the raw audio data samples of the first plane. This works
+             * fine for packed formats (e.g. AV_SAMPLE_FMT_S16). However,
+             * most audio decoders output planar audio, which uses a separate
+             * plane of audio samples for each channel (e.g. AV_SAMPLE_FMT_S16P).
+             * In other words, this code will write only the first audio channel
+             * in these cases.
+             * You should use libswresample or libavfilter to convert the frame
+             * to packed data. */
+            fwrite(frame->extended_data[0], 1, unpadded_linesize, audio_dst_file);
+        }
+    }
+
+    /* If we use the new API with reference counting, we own the data and need
+     * to de-reference it when we don't use it anymore */
+    if (*got_frame && api_mode == API_MODE_NEW_API_REF_COUNT)
+        av_frame_unref(frame);
+
+    return decoded;
+}
+
+static int open_codec_context(int *stream_idx,
+                              AVFormatContext *fmt_ctx, enum AVMediaType type)
+{
+    int ret;
+    AVStream *st;
+    AVCodecContext *dec_ctx = NULL;
+    AVCodec *dec = NULL;
+    AVDictionary *opts = NULL;
+
+    ret = av_find_best_stream(fmt_ctx, type, -1, -1, NULL, 0);
+    if (ret < 0) {
+        fprintf(stderr, "Could not find %s stream in input file '%s'\n",
+                av_get_media_type_string(type), src_filename);
+        return ret;
+    } else {
+        *stream_idx = ret;
+        st = fmt_ctx->streams[*stream_idx];
+
+        /* find decoder for the stream */
+        dec_ctx = st->codec;
+        dec = avcodec_find_decoder(dec_ctx->codec_id);
+        if (!dec) {
+            fprintf(stderr, "Failed to find %s codec\n",
+                    av_get_media_type_string(type));
+            return AVERROR(EINVAL);
+        }
+
+        /* Init the decoders, with or without reference counting */
+        if (api_mode == API_MODE_NEW_API_REF_COUNT)
+            av_dict_set(&opts, "refcounted_frames", "1", 0);
+        if ((ret = avcodec_open2(dec_ctx, dec, &opts)) < 0) {
+            fprintf(stderr, "Failed to open %s codec\n",
+                    av_get_media_type_string(type));
+            return ret;
+        }
+    }
+
+    return 0;
+}
+
+static int get_format_from_sample_fmt(const char **fmt,
+                                      enum AVSampleFormat sample_fmt)
+{
+    int i;
+    struct sample_fmt_entry {
+        enum AVSampleFormat sample_fmt; const char *fmt_be, *fmt_le;
+    } sample_fmt_entries[] = {
+        { AV_SAMPLE_FMT_U8,  "u8",    "u8"    },
+        { AV_SAMPLE_FMT_S16, "s16be", "s16le" },
+        { AV_SAMPLE_FMT_S32, "s32be", "s32le" },
+        { AV_SAMPLE_FMT_FLT, "f32be", "f32le" },
+        { AV_SAMPLE_FMT_DBL, "f64be", "f64le" },
+    };
+    *fmt = NULL;
+
+    for (i = 0; i < FF_ARRAY_ELEMS(sample_fmt_entries); i++) {
+        struct sample_fmt_entry *entry = &sample_fmt_entries[i];
+        if (sample_fmt == entry->sample_fmt) {
+            *fmt = AV_NE(entry->fmt_be, entry->fmt_le);
+            return 0;
+        }
+    }
+
+    fprintf(stderr,
+            "sample format %s is not supported as output format\n",
+            av_get_sample_fmt_name(sample_fmt));
+    return -1;
+}
+
+int main (int argc, char **argv)
+{
+    int ret = 0, got_frame;
+
+    if (argc != 4 && argc != 5) {
+        fprintf(stderr, "usage: %s [-refcount=<old|new_norefcount|new_refcount>] "
+                "input_file video_output_file audio_output_file\n"
+                "API example program to show how to read frames from an input file.\n"
+                "This program reads frames from a file, decodes them, and writes decoded\n"
+                "video frames to a rawvideo file named video_output_file, and decoded\n"
+                "audio frames to a rawaudio file named audio_output_file.\n\n"
+                "If the -refcount option is specified, the program use the\n"
+                "reference counting frame system which allows keeping a copy of\n"
+                "the data for longer than one decode call. If unset, it's using\n"
+                "the classic old method.\n"
+                "\n", argv[0]);
+        exit(1);
+    }
+    if (argc == 5) {
+        const char *mode = argv[1] + strlen("-refcount=");
+        if      (!strcmp(mode, "old"))            api_mode = API_MODE_OLD;
+        else if (!strcmp(mode, "new_norefcount")) api_mode = API_MODE_NEW_API_NO_REF_COUNT;
+        else if (!strcmp(mode, "new_refcount"))   api_mode = API_MODE_NEW_API_REF_COUNT;
+        else {
+            fprintf(stderr, "unknow mode '%s'\n", mode);
+            exit(1);
+        }
+        argv++;
+    }
+    src_filename = argv[1];
+    video_dst_filename = argv[2];
+    audio_dst_filename = argv[3];
+
+    /* register all formats and codecs */
+    av_register_all();
+
+    /* open input file, and allocate format context */
+    if (avformat_open_input(&fmt_ctx, src_filename, NULL, NULL) < 0) {
+        fprintf(stderr, "Could not open source file %s\n", src_filename);
+        exit(1);
+    }
+
+    /* retrieve stream information */
+    if (avformat_find_stream_info(fmt_ctx, NULL) < 0) {
+        fprintf(stderr, "Could not find stream information\n");
+        exit(1);
+    }
+
+    if (open_codec_context(&video_stream_idx, fmt_ctx, AVMEDIA_TYPE_VIDEO) >= 0) {
+        video_stream = fmt_ctx->streams[video_stream_idx];
+        video_dec_ctx = video_stream->codec;
+
+        video_dst_file = fopen(video_dst_filename, "wb");
+        if (!video_dst_file) {
+            fprintf(stderr, "Could not open destination file %s\n", video_dst_filename);
+            ret = 1;
+            goto end;
+        }
+
+        /* allocate image where the decoded image will be put */
+        ret = av_image_alloc(video_dst_data, video_dst_linesize,
+                             video_dec_ctx->width, video_dec_ctx->height,
+                             video_dec_ctx->pix_fmt, 1);
+        if (ret < 0) {
+            fprintf(stderr, "Could not allocate raw video buffer\n");
+            goto end;
+        }
+        video_dst_bufsize = ret;
+    }
+
+    if (open_codec_context(&audio_stream_idx, fmt_ctx, AVMEDIA_TYPE_AUDIO) >= 0) {
+        audio_stream = fmt_ctx->streams[audio_stream_idx];
+        audio_dec_ctx = audio_stream->codec;
+        audio_dst_file = fopen(audio_dst_filename, "wb");
+        if (!audio_dst_file) {
+            fprintf(stderr, "Could not open destination file %s\n", video_dst_filename);
+            ret = 1;
+            goto end;
+        }
+    }
+
+    /* dump input information to stderr */
+    av_dump_format(fmt_ctx, 0, src_filename, 0);
+
+    if (!audio_stream && !video_stream) {
+        fprintf(stderr, "Could not find audio or video stream in the input, aborting\n");
+        ret = 1;
+        goto end;
+    }
+
+    /* When using the new API, you need to use the libavutil/frame.h API, while
+     * the classic frame management is available in libavcodec */
+    if (api_mode == API_MODE_OLD)
+        frame = avcodec_alloc_frame();
+    else
+        frame = av_frame_alloc();
+    if (!frame) {
+        fprintf(stderr, "Could not allocate frame\n");
+        ret = AVERROR(ENOMEM);
+        goto end;
+    }
+
+    /* initialize packet, set data to NULL, let the demuxer fill it */
+    av_init_packet(&pkt);
+    pkt.data = NULL;
+    pkt.size = 0;
+
+    if (video_stream)
+        printf("Demuxing video from file '%s' into '%s'\n", src_filename, video_dst_filename);
+    if (audio_stream)
+        printf("Demuxing audio from file '%s' into '%s'\n", src_filename, audio_dst_filename);
+
+    /* read frames from the file */
+    while (av_read_frame(fmt_ctx, &pkt) >= 0) {
+        AVPacket orig_pkt = pkt;
+        do {
+            ret = decode_packet(&got_frame, 0);
+            if (ret < 0)
+                break;
+            pkt.data += ret;
+            pkt.size -= ret;
+        } while (pkt.size > 0);
+        av_free_packet(&orig_pkt);
+    }
+
+    /* flush cached frames */
+    pkt.data = NULL;
+    pkt.size = 0;
+    do {
+        decode_packet(&got_frame, 1);
+    } while (got_frame);
+
+    printf("Demuxing succeeded.\n");
+
+    if (video_stream) {
+        printf("Play the output video file with the command:\n"
+               "ffplay -f rawvideo -pix_fmt %s -video_size %dx%d %s\n",
+               av_get_pix_fmt_name(video_dec_ctx->pix_fmt), video_dec_ctx->width, video_dec_ctx->height,
+               video_dst_filename);
+    }
+
+    if (audio_stream) {
+        enum AVSampleFormat sfmt = audio_dec_ctx->sample_fmt;
+        int n_channels = audio_dec_ctx->channels;
+        const char *fmt;
+
+        if (av_sample_fmt_is_planar(sfmt)) {
+            const char *packed = av_get_sample_fmt_name(sfmt);
+            printf("Warning: the sample format the decoder produced is planar "
+                   "(%s). This example will output the first channel only.\n",
+                   packed ? packed : "?");
+            sfmt = av_get_packed_sample_fmt(sfmt);
+            n_channels = 1;
+        }
+
+        if ((ret = get_format_from_sample_fmt(&fmt, sfmt)) < 0)
+            goto end;
+
+        printf("Play the output audio file with the command:\n"
+               "ffplay -f %s -ac %d -ar %d %s\n",
+               fmt, n_channels, audio_dec_ctx->sample_rate,
+               audio_dst_filename);
+    }
+
+end:
+    avcodec_close(video_dec_ctx);
+    avcodec_close(audio_dec_ctx);
+    avformat_close_input(&fmt_ctx);
+    if (video_dst_file)
+        fclose(video_dst_file);
+    if (audio_dst_file)
+        fclose(audio_dst_file);
+    if (api_mode == API_MODE_OLD)
+        avcodec_free_frame(&frame);
+    else
+        av_frame_free(&frame);
+    av_free(video_dst_data[0]);
+
+    return ret < 0;
+}

omxplayer-2014.03.28.tar.gz/ffmpeg/doc/examples/filter_audio.c Added

@@ -0,0 +1,364 @@
+/*
+ * copyright (c) 2013 Andrew Kelley
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * libavfilter API usage example.
+ *
+ * @example filter_audio.c
+ * This example will generate a sine wave audio,
+ * pass it through a simple filter chain, and then compute the MD5 checksum of
+ * the output data.
+ *
+ * The filter chain it uses is:
+ * (input) -> abuffer -> volume -> aformat -> abuffersink -> (output)
+ *
+ * abuffer: This provides the endpoint where you can feed the decoded samples.
+ * volume: In this example we hardcode it to 0.90.
+ * aformat: This converts the samples to the samplefreq, channel layout,
+ *          and sample format required by the audio device.
+ * abuffersink: This provides the endpoint where you can read the samples after
+ *              they have passed through the filter chain.
+ */
+
+#include <inttypes.h>
+#include <math.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "libavutil/channel_layout.h"
+#include "libavutil/md5.h"
+#include "libavutil/opt.h"
+#include "libavutil/samplefmt.h"
+
+#include "libavfilter/avfilter.h"
+#include "libavfilter/buffersink.h"
+#include "libavfilter/buffersrc.h"
+
+#define INPUT_SAMPLERATE     48000
+#define INPUT_FORMAT         AV_SAMPLE_FMT_FLTP
+#define INPUT_CHANNEL_LAYOUT AV_CH_LAYOUT_5POINT0
+
+#define VOLUME_VAL 0.90
+
+static int init_filter_graph(AVFilterGraph **graph, AVFilterContext **src,
+                             AVFilterContext **sink)
+{
+    AVFilterGraph *filter_graph;
+    AVFilterContext *abuffer_ctx;
+    AVFilter        *abuffer;
+    AVFilterContext *volume_ctx;
+    AVFilter        *volume;
+    AVFilterContext *aformat_ctx;
+    AVFilter        *aformat;
+    AVFilterContext *abuffersink_ctx;
+    AVFilter        *abuffersink;
+
+    AVDictionary *options_dict = NULL;
+    uint8_t options_str[1024];
+    uint8_t ch_layout[64];
+
+    int err;
+
+    /* Create a new filtergraph, which will contain all the filters. */
+    filter_graph = avfilter_graph_alloc();
+    if (!filter_graph) {
+        fprintf(stderr, "Unable to create filter graph.\n");
+        return AVERROR(ENOMEM);
+    }
+
+    /* Create the abuffer filter;
+     * it will be used for feeding the data into the graph. */
+    abuffer = avfilter_get_by_name("abuffer");
+    if (!abuffer) {
+        fprintf(stderr, "Could not find the abuffer filter.\n");
+        return AVERROR_FILTER_NOT_FOUND;
+    }
+
+    abuffer_ctx = avfilter_graph_alloc_filter(filter_graph, abuffer, "src");
+    if (!abuffer_ctx) {
+        fprintf(stderr, "Could not allocate the abuffer instance.\n");
+        return AVERROR(ENOMEM);
+    }
+
+    /* Set the filter options through the AVOptions API. */
+    av_get_channel_layout_string(ch_layout, sizeof(ch_layout), 0, INPUT_CHANNEL_LAYOUT);
+    av_opt_set    (abuffer_ctx, "channel_layout", ch_layout,                            AV_OPT_SEARCH_CHILDREN);
+    av_opt_set    (abuffer_ctx, "sample_fmt",     av_get_sample_fmt_name(INPUT_FORMAT), AV_OPT_SEARCH_CHILDREN);
+    av_opt_set_q  (abuffer_ctx, "time_base",      (AVRational){ 1, INPUT_SAMPLERATE },  AV_OPT_SEARCH_CHILDREN);
+    av_opt_set_int(abuffer_ctx, "sample_rate",    INPUT_SAMPLERATE,                     AV_OPT_SEARCH_CHILDREN);
+
+    /* Now initialize the filter; we pass NULL options, since we have already
+     * set all the options above. */
+    err = avfilter_init_str(abuffer_ctx, NULL);
+    if (err < 0) {
+        fprintf(stderr, "Could not initialize the abuffer filter.\n");
+        return err;
+    }
+
+    /* Create volume filter. */
+    volume = avfilter_get_by_name("volume");
+    if (!volume) {
+        fprintf(stderr, "Could not find the volume filter.\n");
+        return AVERROR_FILTER_NOT_FOUND;
+    }
+
+    volume_ctx = avfilter_graph_alloc_filter(filter_graph, volume, "volume");
+    if (!volume_ctx) {
+        fprintf(stderr, "Could not allocate the volume instance.\n");
+        return AVERROR(ENOMEM);
+    }
+
+    /* A different way of passing the options is as key/value pairs in a
+     * dictionary. */
+    av_dict_set(&options_dict, "volume", AV_STRINGIFY(VOLUME_VAL), 0);
+    err = avfilter_init_dict(volume_ctx, &options_dict);
+    av_dict_free(&options_dict);
+    if (err < 0) {
+        fprintf(stderr, "Could not initialize the volume filter.\n");
+        return err;
+    }
+
+    /* Create the aformat filter;
+     * it ensures that the output is of the format we want. */
+    aformat = avfilter_get_by_name("aformat");
+    if (!aformat) {
+        fprintf(stderr, "Could not find the aformat filter.\n");
+        return AVERROR_FILTER_NOT_FOUND;
+    }
+
+    aformat_ctx = avfilter_graph_alloc_filter(filter_graph, aformat, "aformat");
+    if (!aformat_ctx) {
+        fprintf(stderr, "Could not allocate the aformat instance.\n");
+        return AVERROR(ENOMEM);
+    }
+
+    /* A third way of passing the options is in a string of the form
+     * key1=value1:key2=value2.... */
+    snprintf(options_str, sizeof(options_str),
+             "sample_fmts=%s:sample_rates=%d:channel_layouts=0x%"PRIx64,
+             av_get_sample_fmt_name(AV_SAMPLE_FMT_S16), 44100,
+             (uint64_t)AV_CH_LAYOUT_STEREO);
+    err = avfilter_init_str(aformat_ctx, options_str);
+    if (err < 0) {
+        av_log(NULL, AV_LOG_ERROR, "Could not initialize the aformat filter.\n");
+        return err;
+    }
+
+    /* Finally create the abuffersink filter;
+     * it will be used to get the filtered data out of the graph. */
+    abuffersink = avfilter_get_by_name("abuffersink");
+    if (!abuffersink) {
+        fprintf(stderr, "Could not find the abuffersink filter.\n");
+        return AVERROR_FILTER_NOT_FOUND;
+    }
+
+    abuffersink_ctx = avfilter_graph_alloc_filter(filter_graph, abuffersink, "sink");
+    if (!abuffersink_ctx) {
+        fprintf(stderr, "Could not allocate the abuffersink instance.\n");
+        return AVERROR(ENOMEM);
+    }
+
+    /* This filter takes no options. */
+    err = avfilter_init_str(abuffersink_ctx, NULL);
+    if (err < 0) {
+        fprintf(stderr, "Could not initialize the abuffersink instance.\n");
+        return err;
+    }
+
+    /* Connect the filters;
+     * in this simple case the filters just form a linear chain. */
+    err = avfilter_link(abuffer_ctx, 0, volume_ctx, 0);
+    if (err >= 0)
+        err = avfilter_link(volume_ctx, 0, aformat_ctx, 0);
+    if (err >= 0)
+        err = avfilter_link(aformat_ctx, 0, abuffersink_ctx, 0);
+    if (err < 0) {
+        fprintf(stderr, "Error connecting filters\n");
+        return err;
+    }
+
+    /* Configure the graph. */
+    err = avfilter_graph_config(filter_graph, NULL);
+    if (err < 0) {
+        av_log(NULL, AV_LOG_ERROR, "Error configuring the filter graph\n");
+        return err;
+    }
+
+    *graph = filter_graph;
+    *src   = abuffer_ctx;
+    *sink  = abuffersink_ctx;
+
+    return 0;
+}
+
+/* Do something useful with the filtered data: this simple
+ * example just prints the MD5 checksum of each plane to stdout. */
+static int process_output(struct AVMD5 *md5, AVFrame *frame)
+{
+    int planar     = av_sample_fmt_is_planar(frame->format);
+    int channels   = av_get_channel_layout_nb_channels(frame->channel_layout);
+    int planes     = planar ? channels : 1;
+    int bps        = av_get_bytes_per_sample(frame->format);
+    int plane_size = bps * frame->nb_samples * (planar ? 1 : channels);
+    int i, j;
+
+    for (i = 0; i < planes; i++) {
+        uint8_t checksum[16];
+
+        av_md5_init(md5);
+        av_md5_sum(checksum, frame->extended_data[i], plane_size);
+
+        fprintf(stdout, "plane %d: 0x", i);
+        for (j = 0; j < sizeof(checksum); j++)
+            fprintf(stdout, "%02X", checksum[j]);
+        fprintf(stdout, "\n");
+    }
+    fprintf(stdout, "\n");
+
+    return 0;
+}
+
+/* Construct a frame of audio data to be filtered;
+ * this simple example just synthesizes a sine wave. */
+static int get_input(AVFrame *frame, int frame_num)
+{
+    int err, i, j;
+
+#define FRAME_SIZE 1024
+
+    /* Set up the frame properties and allocate the buffer for the data. */
+    frame->sample_rate    = INPUT_SAMPLERATE;
+    frame->format         = INPUT_FORMAT;
+    frame->channel_layout = INPUT_CHANNEL_LAYOUT;
+    frame->nb_samples     = FRAME_SIZE;
+    frame->pts            = frame_num * FRAME_SIZE;
+
+    err = av_frame_get_buffer(frame, 0);
+    if (err < 0)
+        return err;
+
+    /* Fill the data for each channel. */
+    for (i = 0; i < 5; i++) {
+        float *data = (float*)frame->extended_data[i];
+
+        for (j = 0; j < frame->nb_samples; j++)
+            data[j] = sin(2 * M_PI * (frame_num + j) * (i + 1) / FRAME_SIZE);
+    }
+
+    return 0;
+}
+
+int main(int argc, char *argv[])
+{
+    struct AVMD5 *md5;
+    AVFilterGraph *graph;
+    AVFilterContext *src, *sink;
+    AVFrame *frame;
+    uint8_t errstr[1024];
+    float duration;
+    int err, nb_frames, i;
+
+    if (argc < 2) {
+        fprintf(stderr, "Usage: %s <duration>\n", argv[0]);
+        return 1;
+    }
+
+    duration  = atof(argv[1]);
+    nb_frames = duration * INPUT_SAMPLERATE / FRAME_SIZE;
+    if (nb_frames <= 0) {
+        fprintf(stderr, "Invalid duration: %s\n", argv[1]);
+        return 1;
+    }
+
+    avfilter_register_all();
+
+    /* Allocate the frame we will be using to store the data. */
+    frame  = av_frame_alloc();
+    if (!frame) {
+        fprintf(stderr, "Error allocating the frame\n");
+        return 1;
+    }
+
+    md5 = av_md5_alloc();
+    if (!md5) {
+        fprintf(stderr, "Error allocating the MD5 context\n");
+        return 1;
+    }
+
+    /* Set up the filtergraph. */
+    err = init_filter_graph(&graph, &src, &sink);
+    if (err < 0) {
+        fprintf(stderr, "Unable to init filter graph:");
+        goto fail;
+    }
+
+    /* the main filtering loop */
+    for (i = 0; i < nb_frames; i++) {
+        /* get an input frame to be filtered */
+        err = get_input(frame, i);
+        if (err < 0) {
+            fprintf(stderr, "Error generating input frame:");
+            goto fail;
+        }
+
+        /* Send the frame to the input of the filtergraph. */
+        err = av_buffersrc_add_frame(src, frame);
+        if (err < 0) {
+            av_frame_unref(frame);
+            fprintf(stderr, "Error submitting the frame to the filtergraph:");
+            goto fail;
+        }
+
+        /* Get all the filtered output that is available. */
+        while ((err = av_buffersink_get_frame(sink, frame)) >= 0) {
+            /* now do something with our filtered frame */
+            err = process_output(md5, frame);
+            if (err < 0) {
+                fprintf(stderr, "Error processing the filtered frame:");
+                goto fail;
+            }
+            av_frame_unref(frame);
+        }
+
+        if (err == AVERROR(EAGAIN)) {
+            /* Need to feed more frames in. */
+            continue;
+        } else if (err == AVERROR_EOF) {
+            /* Nothing more to do, finish. */
+            break;
+        } else if (err < 0) {
+            /* An error occurred. */
+            fprintf(stderr, "Error filtering the data:");
+            goto fail;
+        }
+    }
+
+    avfilter_graph_free(&graph);
+    av_frame_free(&frame);
+    av_freep(&md5);
+
+    return 0;
+
+fail:
+    av_strerror(err, errstr, sizeof(errstr));
+    fprintf(stderr, "%s\n", errstr);
+    return 1;
+}

omxplayer-2014.02.11.tar.gz/ffmpeg/doc/examples/filtering_audio.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/doc/examples/filtering_audio.c Changed

@@ -25,7 +25,7 @@
 /**
  * @file
  * API example for audio decoding and filtering
- * @example doc/examples/filtering_audio.c
+ * @example filtering_audio.c
  */
 
 #include <unistd.h>
@@ -85,7 +85,7 @@
 static int init_filters(const char *filters_descr)
 {
     char args[512];
-    int ret;
+    int ret = 0;
     AVFilter *abuffersrc  = avfilter_get_by_name("abuffer");
     AVFilter *abuffersink = avfilter_get_by_name("abuffersink");
     AVFilterInOut *outputs = avfilter_inout_alloc();
@@ -97,6 +97,10 @@
     AVRational time_base = fmt_ctx->streams[audio_stream_index]->time_base;
 
     filter_graph = avfilter_graph_alloc();
+    if (!outputs || !inputs || !filter_graph) {
+        ret = AVERROR(ENOMEM);
+        goto end;
+    }
 
     /* buffer audio source: the decoded frames from the decoder will be inserted here. */
     if (!dec_ctx->channel_layout)
@@ -109,7 +113,7 @@
                                        args, NULL, filter_graph);
     if (ret < 0) {
         av_log(NULL, AV_LOG_ERROR, "Cannot create audio buffer source\n");
-        return ret;
+        goto end;
     }
 
     /* buffer audio sink: to terminate the filter chain. */
@@ -117,28 +121,28 @@
                                        NULL, NULL, filter_graph);
     if (ret < 0) {
         av_log(NULL, AV_LOG_ERROR, "Cannot create audio buffer sink\n");
-        return ret;
+        goto end;
     }
 
     ret = av_opt_set_int_list(buffersink_ctx, "sample_fmts", out_sample_fmts, -1,
                               AV_OPT_SEARCH_CHILDREN);
     if (ret < 0) {
         av_log(NULL, AV_LOG_ERROR, "Cannot set output sample format\n");
-        return ret;
+        goto end;
     }
 
     ret = av_opt_set_int_list(buffersink_ctx, "channel_layouts", out_channel_layouts, -1,
                               AV_OPT_SEARCH_CHILDREN);
     if (ret < 0) {
         av_log(NULL, AV_LOG_ERROR, "Cannot set output channel layout\n");
-        return ret;
+        goto end;
     }
 
     ret = av_opt_set_int_list(buffersink_ctx, "sample_rates", out_sample_rates, -1,
                               AV_OPT_SEARCH_CHILDREN);
     if (ret < 0) {
         av_log(NULL, AV_LOG_ERROR, "Cannot set output sample rate\n");
-        return ret;
+        goto end;
     }
 
     /* Endpoints for the filter graph. */
@@ -153,11 +157,11 @@
     inputs->next       = NULL;
 
     if ((ret = avfilter_graph_parse_ptr(filter_graph, filters_descr,
-                                    &inputs, &outputs, NULL)) < 0)
-        return ret;
+                                        &inputs, &outputs, NULL)) < 0)
+        goto end;
 
     if ((ret = avfilter_graph_config(filter_graph, NULL)) < 0)
-        return ret;
+        goto end;
 
     /* Print summary of the sink buffer
      * Note: args buffer is reused to store channel layout string */
@@ -168,7 +172,11 @@
            (char *)av_x_if_null(av_get_sample_fmt_name(outlink->format), "?"),
            args);
 
-    return 0;
+end:
+    avfilter_inout_free(&inputs);
+    avfilter_inout_free(&outputs);
+
+    return ret;
 }
 
 static void print_frame(const AVFrame *frame)
@@ -188,7 +196,7 @@
 int main(int argc, char **argv)
 {
     int ret;
-    AVPacket packet;
+    AVPacket packet0, packet;
     AVFrame *frame = av_frame_alloc();
     AVFrame *filt_frame = av_frame_alloc();
     int got_frame;
@@ -202,7 +210,6 @@
         exit(1);
     }
 
-    avcodec_register_all();
     av_register_all();
     avfilter_register_all();
 
@@ -212,18 +219,24 @@
         goto end;
 
     /* read all packets */
+    packet0.data = NULL;
+    packet.data = NULL;
     while (1) {
-        if ((ret = av_read_frame(fmt_ctx, &packet)) < 0)
-            break;
+        if (!packet0.data) {
+            if ((ret = av_read_frame(fmt_ctx, &packet)) < 0)
+                break;
+            packet0 = packet;
+        }
 
         if (packet.stream_index == audio_stream_index) {
-            avcodec_get_frame_defaults(frame);
             got_frame = 0;
             ret = avcodec_decode_audio4(dec_ctx, frame, &got_frame, &packet);
             if (ret < 0) {
                 av_log(NULL, AV_LOG_ERROR, "Error decoding audio\n");
                 continue;
             }
+            packet.size -= ret;
+            packet.data += ret;
 
             if (got_frame) {
                 /* push the audio data from decoded frame into the filtergraph */
@@ -235,29 +248,31 @@
                 /* pull filtered audio from the filtergraph */
                 while (1) {
                     ret = av_buffersink_get_frame(buffersink_ctx, filt_frame);
-                    if(ret == AVERROR(EAGAIN) || ret == AVERROR_EOF)
+                    if (ret == AVERROR(EAGAIN) || ret == AVERROR_EOF)
                         break;
-                    if(ret < 0)
+                    if (ret < 0)
                         goto end;
                     print_frame(filt_frame);
                     av_frame_unref(filt_frame);
                 }
             }
+
+            if (packet.size <= 0)
+                av_free_packet(&packet0);
+        } else {
+            /* discard non-wanted packets */
+            av_free_packet(&packet0);
         }
-        av_free_packet(&packet);
     }
 end:
     avfilter_graph_free(&filter_graph);
-    if (dec_ctx)
-        avcodec_close(dec_ctx);
+    avcodec_close(dec_ctx);
     avformat_close_input(&fmt_ctx);
     av_frame_free(&frame);
     av_frame_free(&filt_frame);
 
     if (ret < 0 && ret != AVERROR_EOF) {
-        char buf[1024];
-        av_strerror(ret, buf, sizeof(buf));
-        fprintf(stderr, "Error occurred: %s\n", buf);
+        fprintf(stderr, "Error occurred: %s\n", av_err2str(ret));
         exit(1);
     }

omxplayer-2014.02.11.tar.gz/ffmpeg/doc/examples/filtering_video.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/doc/examples/filtering_video.c Changed

@@ -24,7 +24,7 @@
 /**
  * @file
  * API example for decoding and filtering
- * @example doc/examples/filtering_video.c
+ * @example filtering_video.c
  */
 
 #define _XOPEN_SOURCE 600 /* for usleep */
@@ -36,6 +36,7 @@
 #include <libavfilter/avcodec.h>
 #include <libavfilter/buffersink.h>
 #include <libavfilter/buffersrc.h>
+#include <libavutil/opt.h>
 
 const char *filter_descr = "scale=78:24";
 
@@ -70,6 +71,7 @@
     }
     video_stream_index = ret;
     dec_ctx = fmt_ctx->streams[video_stream_index]->codec;
+    av_opt_set_int(dec_ctx, "refcounted_frames", 1, 0);
 
     /* init the video decoder */
     if ((ret = avcodec_open2(dec_ctx, dec, NULL)) < 0) {
@@ -83,15 +85,18 @@
 static int init_filters(const char *filters_descr)
 {
     char args[512];
-    int ret;
+    int ret = 0;
     AVFilter *buffersrc  = avfilter_get_by_name("buffer");
     AVFilter *buffersink = avfilter_get_by_name("buffersink");
     AVFilterInOut *outputs = avfilter_inout_alloc();
     AVFilterInOut *inputs  = avfilter_inout_alloc();
     enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_GRAY8, AV_PIX_FMT_NONE };
-    AVBufferSinkParams *buffersink_params;
 
     filter_graph = avfilter_graph_alloc();
+    if (!outputs || !inputs || !filter_graph) {
+        ret = AVERROR(ENOMEM);
+        goto end;
+    }
 
     /* buffer video source: the decoded frames from the decoder will be inserted here. */
     snprintf(args, sizeof(args),
@@ -104,18 +109,22 @@
                                        args, NULL, filter_graph);
     if (ret < 0) {
         av_log(NULL, AV_LOG_ERROR, "Cannot create buffer source\n");
-        return ret;
+        goto end;
     }
 
     /* buffer video sink: to terminate the filter chain. */
-    buffersink_params = av_buffersink_params_alloc();
-    buffersink_params->pixel_fmts = pix_fmts;
     ret = avfilter_graph_create_filter(&buffersink_ctx, buffersink, "out",
-                                       NULL, buffersink_params, filter_graph);
-    av_free(buffersink_params);
+                                       NULL, NULL, filter_graph);
     if (ret < 0) {
         av_log(NULL, AV_LOG_ERROR, "Cannot create buffer sink\n");
-        return ret;
+        goto end;
+    }
+
+    ret = av_opt_set_int_list(buffersink_ctx, "pix_fmts", pix_fmts,
+                              AV_PIX_FMT_NONE, AV_OPT_SEARCH_CHILDREN);
+    if (ret < 0) {
+        av_log(NULL, AV_LOG_ERROR, "Cannot set output pixel format\n");
+        goto end;
     }
 
     /* Endpoints for the filter graph. */
@@ -131,11 +140,16 @@
 
     if ((ret = avfilter_graph_parse_ptr(filter_graph, filters_descr,
                                     &inputs, &outputs, NULL)) < 0)
-        return ret;
+        goto end;
 
     if ((ret = avfilter_graph_config(filter_graph, NULL)) < 0)
-        return ret;
-    return 0;
+        goto end;
+
+end:
+    avfilter_inout_free(&inputs);
+    avfilter_inout_free(&outputs);
+
+    return ret;
 }
 
 static void display_frame(const AVFrame *frame, AVRational time_base)
@@ -186,7 +200,6 @@
         exit(1);
     }
 
-    avcodec_register_all();
     av_register_all();
     avfilter_register_all();
 
@@ -201,7 +214,6 @@
             break;
 
         if (packet.stream_index == video_stream_index) {
-            avcodec_get_frame_defaults(frame);
             got_frame = 0;
             ret = avcodec_decode_video2(dec_ctx, frame, &got_frame, &packet);
             if (ret < 0) {
@@ -228,22 +240,20 @@
                     display_frame(filt_frame, buffersink_ctx->inputs[0]->time_base);
                     av_frame_unref(filt_frame);
                 }
+                av_frame_unref(frame);
             }
         }
         av_free_packet(&packet);
     }
 end:
     avfilter_graph_free(&filter_graph);
-    if (dec_ctx)
-        avcodec_close(dec_ctx);
+    avcodec_close(dec_ctx);
     avformat_close_input(&fmt_ctx);
     av_frame_free(&frame);
     av_frame_free(&filt_frame);
 
     if (ret < 0 && ret != AVERROR_EOF) {
-        char buf[1024];
-        av_strerror(ret, buf, sizeof(buf));
-        fprintf(stderr, "Error occurred: %s\n", buf);
+        fprintf(stderr, "Error occurred: %s\n", av_err2str(ret));
         exit(1);
     }

omxplayer-2014.02.11.tar.gz/ffmpeg/doc/examples/metadata.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/doc/examples/metadata.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/doc/examples/muxing.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/doc/examples/muxing.c Changed

@@ -24,9 +24,9 @@
  * @file
  * libavformat API example.
  *
- * Output a media file in any supported libavformat format.
- * The default codecs are used.
- * @example doc/examples/muxing.c
+ * Output a media file in any supported libavformat format. The default
+ * codecs are used.
+ * @example muxing.c
  */
 
 #include <stdlib.h>
@@ -36,18 +36,43 @@
 
 #include <libavutil/opt.h>
 #include <libavutil/mathematics.h>
+#include <libavutil/timestamp.h>
 #include <libavformat/avformat.h>
 #include <libswscale/swscale.h>
 #include <libswresample/swresample.h>
 
-/* 5 seconds stream duration */
-#define STREAM_DURATION   200.0
+static int audio_is_eof, video_is_eof;
+
+#define STREAM_DURATION   10.0
 #define STREAM_FRAME_RATE 25 /* 25 images/s */
-#define STREAM_NB_FRAMES  ((int)(STREAM_DURATION * STREAM_FRAME_RATE))
 #define STREAM_PIX_FMT    AV_PIX_FMT_YUV420P /* default pix_fmt */
 
 static int sws_flags = SWS_BICUBIC;
 
+static void log_packet(const AVFormatContext *fmt_ctx, const AVPacket *pkt)
+{
+    AVRational *time_base = &fmt_ctx->streams[pkt->stream_index]->time_base;
+
+    printf("pts:%s pts_time:%s dts:%s dts_time:%s duration:%s duration_time:%s stream_index:%d\n",
+           av_ts2str(pkt->pts), av_ts2timestr(pkt->pts, time_base),
+           av_ts2str(pkt->dts), av_ts2timestr(pkt->dts, time_base),
+           av_ts2str(pkt->duration), av_ts2timestr(pkt->duration, time_base),
+           pkt->stream_index);
+}
+
+static int write_frame(AVFormatContext *fmt_ctx, const AVRational *time_base, AVStream *st, AVPacket *pkt)
+{
+    /* rescale output packet timestamp values from codec to stream timebase */
+    pkt->pts = av_rescale_q_rnd(pkt->pts, *time_base, st->time_base, AV_ROUND_NEAR_INF|AV_ROUND_PASS_MINMAX);
+    pkt->dts = av_rescale_q_rnd(pkt->dts, *time_base, st->time_base, AV_ROUND_NEAR_INF|AV_ROUND_PASS_MINMAX);
+    pkt->duration = av_rescale_q(pkt->duration, *time_base, st->time_base);
+    pkt->stream_index = st->index;
+
+    /* Write the compressed frame to the media file. */
+    log_packet(fmt_ctx, pkt);
+    return av_interleaved_write_frame(fmt_ctx, pkt);
+}
+
 /* Add an output stream. */
 static AVStream *add_stream(AVFormatContext *oc, AVCodec **codec,
                             enum AVCodecID codec_id)
@@ -73,7 +98,8 @@
 
     switch ((*codec)->type) {
     case AVMEDIA_TYPE_AUDIO:
-        c->sample_fmt  = AV_SAMPLE_FMT_FLTP;
+        c->sample_fmt  = (*codec)->sample_fmts ?
+            (*codec)->sample_fmts[0] : AV_SAMPLE_FMT_FLTP;
         c->bit_rate    = 64000;
         c->sample_rate = 44100;
         c->channels    = 2;
@@ -122,6 +148,7 @@
 
 static float t, tincr, tincr2;
 
+AVFrame *audio_frame;
 static uint8_t **src_samples_data;
 static int       src_samples_linesize;
 static int       src_nb_samples;
@@ -130,6 +157,7 @@
 uint8_t **dst_samples_data;
 int       dst_samples_linesize;
 int       dst_samples_size;
+int samples_count;
 
 struct SwrContext *swr_ctx = NULL;
 
@@ -140,6 +168,13 @@
 
     c = st->codec;
 
+    /* allocate and init a re-usable frame */
+    audio_frame = av_frame_alloc();
+    if (!audio_frame) {
+        fprintf(stderr, "Could not allocate audio frame\n");
+        exit(1);
+    }
+
     /* open it */
     ret = avcodec_open2(c, codec, NULL);
     if (ret < 0) {
@@ -157,12 +192,17 @@
         10000 : c->frame_size;
 
     ret = av_samples_alloc_array_and_samples(&src_samples_data, &src_samples_linesize, c->channels,
-                                             src_nb_samples, c->sample_fmt, 0);
+                                             src_nb_samples, AV_SAMPLE_FMT_S16, 0);
     if (ret < 0) {
         fprintf(stderr, "Could not allocate source samples\n");
         exit(1);
     }
 
+    /* compute the number of converted samples: buffering is avoided
+     * ensuring that the output buffer will contain at least all the
+     * converted input samples */
+    max_dst_nb_samples = src_nb_samples;
+
     /* create resampler context */
     if (c->sample_fmt != AV_SAMPLE_FMT_S16) {
         swr_ctx = swr_alloc();
@@ -184,17 +224,15 @@
             fprintf(stderr, "Failed to initialize the resampling context\n");
             exit(1);
         }
-    }
 
-    /* compute the number of converted samples: buffering is avoided
-     * ensuring that the output buffer will contain at least all the
-     * converted input samples */
-    max_dst_nb_samples = src_nb_samples;
-    ret = av_samples_alloc_array_and_samples(&dst_samples_data, &dst_samples_linesize, c->channels,
-                                             max_dst_nb_samples, c->sample_fmt, 0);
-    if (ret < 0) {
-        fprintf(stderr, "Could not allocate destination samples\n");
-        exit(1);
+        ret = av_samples_alloc_array_and_samples(&dst_samples_data, &dst_samples_linesize, c->channels,
+                                                 max_dst_nb_samples, c->sample_fmt, 0);
+        if (ret < 0) {
+            fprintf(stderr, "Could not allocate destination samples\n");
+            exit(1);
+        }
+    } else {
+        dst_samples_data = src_samples_data;
     }
     dst_samples_size = av_samples_get_buffer_size(NULL, c->channels, max_dst_nb_samples,
                                                   c->sample_fmt, 0);
@@ -217,77 +255,83 @@
     }
 }
 
-static void write_audio_frame(AVFormatContext *oc, AVStream *st)
+static void write_audio_frame(AVFormatContext *oc, AVStream *st, int flush)
 {
     AVCodecContext *c;
     AVPacket pkt = { 0 }; // data and size must be 0;
-    AVFrame *frame = avcodec_alloc_frame();
     int got_packet, ret, dst_nb_samples;
 
     av_init_packet(&pkt);
     c = st->codec;
 
-    get_audio_frame((int16_t *)src_samples_data[0], src_nb_samples, c->channels);
-
-    /* convert samples from native format to destination codec format, using the resampler */
-    if (swr_ctx) {
-        /* compute destination number of samples */
-        dst_nb_samples = av_rescale_rnd(swr_get_delay(swr_ctx, c->sample_rate) + src_nb_samples,
-                                        c->sample_rate, c->sample_rate, AV_ROUND_UP);
-        if (dst_nb_samples > max_dst_nb_samples) {
-            av_free(dst_samples_data[0]);
-            ret = av_samples_alloc(dst_samples_data, &dst_samples_linesize, c->channels,
-                                   dst_nb_samples, c->sample_fmt, 0);
-            if (ret < 0)
+    if (!flush) {
+        get_audio_frame((int16_t *)src_samples_data[0], src_nb_samples, c->channels);
+
+        /* convert samples from native format to destination codec format, using the resampler */
+        if (swr_ctx) {
+            /* compute destination number of samples */
+            dst_nb_samples = av_rescale_rnd(swr_get_delay(swr_ctx, c->sample_rate) + src_nb_samples,
+                                            c->sample_rate, c->sample_rate, AV_ROUND_UP);
+            if (dst_nb_samples > max_dst_nb_samples) {
+                av_free(dst_samples_data[0]);
+                ret = av_samples_alloc(dst_samples_data, &dst_samples_linesize, c->channels,
+                                       dst_nb_samples, c->sample_fmt, 0);
+                if (ret < 0)
+                    exit(1);
+                max_dst_nb_samples = dst_nb_samples;
+                dst_samples_size = av_samples_get_buffer_size(NULL, c->channels, dst_nb_samples,
+                                                              c->sample_fmt, 0);
+            }
+
+            /* convert to destination format */
+            ret = swr_convert(swr_ctx,
+                              dst_samples_data, dst_nb_samples,
+                              (const uint8_t **)src_samples_data, src_nb_samples);
+            if (ret < 0) {
+                fprintf(stderr, "Error while converting\n");
                 exit(1);
-            max_dst_nb_samples = dst_nb_samples;
-            dst_samples_size = av_samples_get_buffer_size(NULL, c->channels, dst_nb_samples,
-                                                          c->sample_fmt, 0);
+            }
+        } else {
+            dst_nb_samples = src_nb_samples;
         }
 
-        /* convert to destination format */
-        ret = swr_convert(swr_ctx,
-                          dst_samples_data, dst_nb_samples,
-                          (const uint8_t **)src_samples_data, src_nb_samples);
-        if (ret < 0) {
-            fprintf(stderr, "Error while converting\n");
-            exit(1);
-        }
-    } else {
-        dst_samples_data[0] = src_samples_data[0];
-        dst_nb_samples = src_nb_samples;
+        audio_frame->nb_samples = dst_nb_samples;
+        audio_frame->pts = av_rescale_q(samples_count, (AVRational){1, c->sample_rate}, c->time_base);
+        avcodec_fill_audio_frame(audio_frame, c->channels, c->sample_fmt,
+                                 dst_samples_data[0], dst_samples_size, 0);
+        samples_count += dst_nb_samples;
     }
 
-    frame->nb_samples = dst_nb_samples;
-    avcodec_fill_audio_frame(frame, c->channels, c->sample_fmt,
-                             dst_samples_data[0], dst_samples_size, 0);
-
-    ret = avcodec_encode_audio2(c, &pkt, frame, &got_packet);
+    ret = avcodec_encode_audio2(c, &pkt, flush ? NULL : audio_frame, &got_packet);
     if (ret < 0) {
         fprintf(stderr, "Error encoding audio frame: %s\n", av_err2str(ret));
         exit(1);
     }
 
-    if (!got_packet)
+    if (!got_packet) {
+        if (flush)
+            audio_is_eof = 1;
         return;
+    }
 
-    pkt.stream_index = st->index;
-
-    /* Write the compressed frame to the media file. */
-    ret = av_interleaved_write_frame(oc, &pkt);
-    if (ret != 0) {
+    ret = write_frame(oc, &c->time_base, st, &pkt);
+    if (ret < 0) {
         fprintf(stderr, "Error while writing audio frame: %s\n",
                 av_err2str(ret));
         exit(1);
     }
-    avcodec_free_frame(&frame);
 }
 
 static void close_audio(AVFormatContext *oc, AVStream *st)
 {
     avcodec_close(st->codec);
+    if (dst_samples_data != src_samples_data) {
+        av_free(dst_samples_data[0]);
+        av_free(dst_samples_data);
+    }
     av_free(src_samples_data[0]);
-    av_free(dst_samples_data[0]);
+    av_free(src_samples_data);
+    av_frame_free(&audio_frame);
 }
 
 /**************************************************************/
@@ -310,11 +354,14 @@
     }
 
     /* allocate and init a re-usable frame */
-    frame = avcodec_alloc_frame();
+    frame = av_frame_alloc();
     if (!frame) {
         fprintf(stderr, "Could not allocate video frame\n");
         exit(1);
     }
+    frame->format = c->pix_fmt;
+    frame->width = c->width;
+    frame->height = c->height;
 
     /* Allocate the encoded raw picture. */
     ret = avpicture_alloc(&dst_picture, c->pix_fmt, c->width, c->height);
@@ -361,17 +408,13 @@
     }
 }
 
-static void write_video_frame(AVFormatContext *oc, AVStream *st)
+static void write_video_frame(AVFormatContext *oc, AVStream *st, int flush)
 {
     int ret;
     static struct SwsContext *sws_ctx;
     AVCodecContext *c = st->codec;
 
-    if (frame_count >= STREAM_NB_FRAMES) {
-        /* No more frames to compress. The codec has a latency of a few
-         * frames if using B-frames, so we get the last frames by
-         * passing the same picture again. */
-    } else {
+    if (!flush) {
         if (c->pix_fmt != AV_PIX_FMT_YUV420P) {
             /* as we only generate a YUV420P picture, we must convert it
              * to the codec pixel format if needed */
@@ -394,7 +437,7 @@
         }
     }
 
-    if (oc->oformat->flags & AVFMT_RAWPICTURE) {
+    if (oc->oformat->flags & AVFMT_RAWPICTURE && !flush) {
         /* Raw video case - directly store the picture in the packet */
         AVPacket pkt;
         av_init_packet(&pkt);
@@ -411,23 +454,24 @@
         av_init_packet(&pkt);
 
         /* encode the image */
-        ret = avcodec_encode_video2(c, &pkt, frame, &got_packet);
+        frame->pts = frame_count;
+        ret = avcodec_encode_video2(c, &pkt, flush ? NULL : frame, &got_packet);
         if (ret < 0) {
             fprintf(stderr, "Error encoding video frame: %s\n", av_err2str(ret));
             exit(1);
         }
         /* If size is zero, it means the image was buffered. */
 
-        if (!ret && got_packet && pkt.size) {
-            pkt.stream_index = st->index;
-
-            /* Write the compressed frame to the media file. */
-            ret = av_interleaved_write_frame(oc, &pkt);
+        if (got_packet) {
+            ret = write_frame(oc, &c->time_base, st, &pkt);
         } else {
+            if (flush)
+                video_is_eof = 1;
             ret = 0;
         }
     }
-    if (ret != 0) {
+
+    if (ret < 0) {
         fprintf(stderr, "Error while writing video frame: %s\n", av_err2str(ret));
         exit(1);
     }
@@ -439,7 +483,7 @@
     avcodec_close(st->codec);
     av_free(src_picture.data[0]);
     av_free(dst_picture.data[0]);
-    av_free(frame);
+    av_frame_free(&frame);
 }
 
 /**************************************************************/
@@ -453,7 +497,7 @@
     AVStream *audio_st, *video_st;
     AVCodec *audio_codec, *video_codec;
     double audio_time, video_time;
-    int ret;
+    int flush, ret;
 
     /* Initialize libavcodec, and register all codecs and formats. */
     av_register_all();
@@ -477,9 +521,9 @@
         printf("Could not deduce output format from file extension: using MPEG.\n");
         avformat_alloc_output_context2(&oc, NULL, "mpeg", filename);
     }
-    if (!oc) {
+    if (!oc)
         return 1;
-    }
+
     fmt = oc->oformat;
 
     /* Add the audio and video streams using the default format codecs
@@ -487,12 +531,10 @@
     video_st = NULL;
     audio_st = NULL;
 
-    if (fmt->video_codec != AV_CODEC_ID_NONE) {
+    if (fmt->video_codec != AV_CODEC_ID_NONE)
         video_st = add_stream(oc, &video_codec, fmt->video_codec);
-    }
-    if (fmt->audio_codec != AV_CODEC_ID_NONE) {
+    if (fmt->audio_codec != AV_CODEC_ID_NONE)
         audio_st = add_stream(oc, &audio_codec, fmt->audio_codec);
-    }
 
     /* Now that all the parameters are set, we can open the audio and
      * video codecs and allocate the necessary encode buffers. */
@@ -521,23 +563,23 @@
         return 1;
     }
 
-    if (frame)
-        frame->pts = 0;
-    for (;;) {
+    flush = 0;
+    while ((video_st && !video_is_eof) || (audio_st && !audio_is_eof)) {
         /* Compute current audio and video time. */
-        audio_time = audio_st ? audio_st->pts.val * av_q2d(audio_st->time_base) : 0.0;
-        video_time = video_st ? video_st->pts.val * av_q2d(video_st->time_base) : 0.0;
+        audio_time = (audio_st && !audio_is_eof) ? audio_st->pts.val * av_q2d(audio_st->time_base) : INFINITY;
+        video_time = (video_st && !video_is_eof) ? video_st->pts.val * av_q2d(video_st->time_base) : INFINITY;
 
-        if ((!audio_st || audio_time >= STREAM_DURATION) &&
-            (!video_st || video_time >= STREAM_DURATION))
-            break;
+        if (!flush &&
+            (!audio_st || audio_time >= STREAM_DURATION) &&
+            (!video_st || video_time >= STREAM_DURATION)) {
+            flush = 1;
+        }
 
         /* write interleaved audio and video frames */
-        if (!video_st || (video_st && audio_st && audio_time < video_time)) {
-            write_audio_frame(oc, audio_st);
-        } else {
-            write_video_frame(oc, video_st);
-            frame->pts += av_rescale_q(1, video_st->codec->time_base, video_st->time_base);
+        if (audio_st && !audio_is_eof && audio_time <= video_time) {
+            write_audio_frame(oc, audio_st, flush);
+        } else if (video_st && !video_is_eof && video_time < audio_time) {
+            write_video_frame(oc, video_st, flush);
         }
     }

omxplayer-2014.03.28.tar.gz/ffmpeg/doc/examples/remuxing.c Added

@@ -0,0 +1,164 @@
+/*
+ * Copyright (c) 2013 Stefano Sabatini
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+/**
+ * @file
+ * libavformat/libavcodec demuxing and muxing API example.
+ *
+ * Remux streams from one container format to another.
+ * @example remuxing.c
+ */
+
+#include <libavutil/timestamp.h>
+#include <libavformat/avformat.h>
+
+static void log_packet(const AVFormatContext *fmt_ctx, const AVPacket *pkt, const char *tag)
+{
+    AVRational *time_base = &fmt_ctx->streams[pkt->stream_index]->time_base;
+
+    printf("%s: pts:%s pts_time:%s dts:%s dts_time:%s duration:%s duration_time:%s stream_index:%d\n",
+           tag,
+           av_ts2str(pkt->pts), av_ts2timestr(pkt->pts, time_base),
+           av_ts2str(pkt->dts), av_ts2timestr(pkt->dts, time_base),
+           av_ts2str(pkt->duration), av_ts2timestr(pkt->duration, time_base),
+           pkt->stream_index);
+}
+
+int main(int argc, char **argv)
+{
+    AVOutputFormat *ofmt = NULL;
+    AVFormatContext *ifmt_ctx = NULL, *ofmt_ctx = NULL;
+    AVPacket pkt;
+    const char *in_filename, *out_filename;
+    int ret, i;
+
+    if (argc < 3) {
+        printf("usage: %s input output\n"
+               "API example program to remux a media file with libavformat and libavcodec.\n"
+               "The output format is guessed according to the file extension.\n"
+               "\n", argv[0]);
+        return 1;
+    }
+
+    in_filename  = argv[1];
+    out_filename = argv[2];
+
+    av_register_all();
+
+    if ((ret = avformat_open_input(&ifmt_ctx, in_filename, 0, 0)) < 0) {
+        fprintf(stderr, "Could not open input file '%s'", in_filename);
+        goto end;
+    }
+
+    if ((ret = avformat_find_stream_info(ifmt_ctx, 0)) < 0) {
+        fprintf(stderr, "Failed to retrieve input stream information");
+        goto end;
+    }
+
+    av_dump_format(ifmt_ctx, 0, in_filename, 0);
+
+    avformat_alloc_output_context2(&ofmt_ctx, NULL, NULL, out_filename);
+    if (!ofmt_ctx) {
+        fprintf(stderr, "Could not create output context\n");
+        ret = AVERROR_UNKNOWN;
+        goto end;
+    }
+
+    ofmt = ofmt_ctx->oformat;
+
+    for (i = 0; i < ifmt_ctx->nb_streams; i++) {
+        AVStream *in_stream = ifmt_ctx->streams[i];
+        AVStream *out_stream = avformat_new_stream(ofmt_ctx, in_stream->codec->codec);
+        if (!out_stream) {
+            fprintf(stderr, "Failed allocating output stream\n");
+            ret = AVERROR_UNKNOWN;
+            goto end;
+        }
+
+        ret = avcodec_copy_context(out_stream->codec, in_stream->codec);
+        if (ret < 0) {
+            fprintf(stderr, "Failed to copy context from input to output stream codec context\n");
+            goto end;
+        }
+        if (ofmt_ctx->oformat->flags & AVFMT_GLOBALHEADER)
+            out_stream->codec->flags |= CODEC_FLAG_GLOBAL_HEADER;
+    }
+    av_dump_format(ofmt_ctx, 0, out_filename, 1);
+
+    if (!(ofmt->flags & AVFMT_NOFILE)) {
+        ret = avio_open(&ofmt_ctx->pb, out_filename, AVIO_FLAG_WRITE);
+        if (ret < 0) {
+            fprintf(stderr, "Could not open output file '%s'", out_filename);
+            goto end;
+        }
+    }
+
+    ret = avformat_write_header(ofmt_ctx, NULL);
+    if (ret < 0) {
+        fprintf(stderr, "Error occurred when opening output file\n");
+        goto end;
+    }
+
+    while (1) {
+        AVStream *in_stream, *out_stream;
+
+        ret = av_read_frame(ifmt_ctx, &pkt);
+        if (ret < 0)
+            break;
+
+        in_stream  = ifmt_ctx->streams[pkt.stream_index];
+        out_stream = ofmt_ctx->streams[pkt.stream_index];
+
+        log_packet(ifmt_ctx, &pkt, "in");
+
+        /* copy packet */
+        pkt.pts = av_rescale_q_rnd(pkt.pts, in_stream->time_base, out_stream->time_base, AV_ROUND_NEAR_INF|AV_ROUND_PASS_MINMAX);
+        pkt.dts = av_rescale_q_rnd(pkt.dts, in_stream->time_base, out_stream->time_base, AV_ROUND_NEAR_INF|AV_ROUND_PASS_MINMAX);
+        pkt.duration = av_rescale_q(pkt.duration, in_stream->time_base, out_stream->time_base);
+        pkt.pos = -1;
+        log_packet(ofmt_ctx, &pkt, "out");
+
+        ret = av_interleaved_write_frame(ofmt_ctx, &pkt);
+        if (ret < 0) {
+            fprintf(stderr, "Error muxing packet\n");
+            break;
+        }
+        av_free_packet(&pkt);
+    }
+
+    av_write_trailer(ofmt_ctx);
+end:
+
+    avformat_close_input(&ifmt_ctx);
+
+    /* close output */
+    if (ofmt_ctx && !(ofmt->flags & AVFMT_NOFILE))
+        avio_close(ofmt_ctx->pb);
+    avformat_free_context(ofmt_ctx);
+
+    if (ret < 0 && ret != AVERROR_EOF) {
+        fprintf(stderr, "Error occurred: %s\n", av_err2str(ret));
+        return 1;
+    }
+
+    return 0;
+}

omxplayer-2014.02.11.tar.gz/ffmpeg/doc/examples/resampling_audio.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/doc/examples/resampling_audio.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/doc/examples/scaling_video.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/doc/examples/scaling_video.c Changed

omxplayer-2014.03.28.tar.gz/ffmpeg/doc/examples/transcode_aac.c Added

@@ -0,0 +1,755 @@
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * simple audio converter
+ *
+ * @example transcode_aac.c
+ * Convert an input audio file to AAC in an MP4 container using FFmpeg.
+ * @author Andreas Unterweger (dustsigns@gmail.com)
+ */
+
+#include <stdio.h>
+
+#include "libavformat/avformat.h"
+#include "libavformat/avio.h"
+
+#include "libavcodec/avcodec.h"
+
+#include "libavutil/audio_fifo.h"
+#include "libavutil/avassert.h"
+#include "libavutil/avstring.h"
+#include "libavutil/frame.h"
+#include "libavutil/opt.h"
+
+#include "libswresample/swresample.h"
+
+/** The output bit rate in kbit/s */
+#define OUTPUT_BIT_RATE 48000
+/** The number of output channels */
+#define OUTPUT_CHANNELS 2
+/** The audio sample output format */
+#define OUTPUT_SAMPLE_FORMAT AV_SAMPLE_FMT_S16
+
+/**
+ * Convert an error code into a text message.
+ * @param error Error code to be converted
+ * @return Corresponding error text (not thread-safe)
+ */
+static char *const get_error_text(const int error)
+{
+    static char error_buffer[255];
+    av_strerror(error, error_buffer, sizeof(error_buffer));
+    return error_buffer;
+}
+
+/** Open an input file and the required decoder. */
+static int open_input_file(const char *filename,
+                           AVFormatContext **input_format_context,
+                           AVCodecContext **input_codec_context)
+{
+    AVCodec *input_codec;
+    int error;
+
+    /** Open the input file to read from it. */
+    if ((error = avformat_open_input(input_format_context, filename, NULL,
+                                     NULL)) < 0) {
+        fprintf(stderr, "Could not open input file '%s' (error '%s')\n",
+                filename, get_error_text(error));
+        *input_format_context = NULL;
+        return error;
+    }
+
+    /** Get information on the input file (number of streams etc.). */
+    if ((error = avformat_find_stream_info(*input_format_context, NULL)) < 0) {
+        fprintf(stderr, "Could not open find stream info (error '%s')\n",
+                get_error_text(error));
+        avformat_close_input(input_format_context);
+        return error;
+    }
+
+    /** Make sure that there is only one stream in the input file. */
+    if ((*input_format_context)->nb_streams != 1) {
+        fprintf(stderr, "Expected one audio input stream, but found %d\n",
+                (*input_format_context)->nb_streams);
+        avformat_close_input(input_format_context);
+        return AVERROR_EXIT;
+    }
+
+    /** Find a decoder for the audio stream. */
+    if (!(input_codec = avcodec_find_decoder((*input_format_context)->streams[0]->codec->codec_id))) {
+        fprintf(stderr, "Could not find input codec\n");
+        avformat_close_input(input_format_context);
+        return AVERROR_EXIT;
+    }
+
+    /** Open the decoder for the audio stream to use it later. */
+    if ((error = avcodec_open2((*input_format_context)->streams[0]->codec,
+                               input_codec, NULL)) < 0) {
+        fprintf(stderr, "Could not open input codec (error '%s')\n",
+                get_error_text(error));
+        avformat_close_input(input_format_context);
+        return error;
+    }
+
+    /** Save the decoder context for easier access later. */
+    *input_codec_context = (*input_format_context)->streams[0]->codec;
+
+    return 0;
+}
+
+/**
+ * Open an output file and the required encoder.
+ * Also set some basic encoder parameters.
+ * Some of these parameters are based on the input file's parameters.
+ */
+static int open_output_file(const char *filename,
+                            AVCodecContext *input_codec_context,
+                            AVFormatContext **output_format_context,
+                            AVCodecContext **output_codec_context)
+{
+    AVIOContext *output_io_context = NULL;
+    AVStream *stream               = NULL;
+    AVCodec *output_codec          = NULL;
+    int error;
+
+    /** Open the output file to write to it. */
+    if ((error = avio_open(&output_io_context, filename,
+                           AVIO_FLAG_WRITE)) < 0) {
+        fprintf(stderr, "Could not open output file '%s' (error '%s')\n",
+                filename, get_error_text(error));
+        return error;
+    }
+
+    /** Create a new format context for the output container format. */
+    if (!(*output_format_context = avformat_alloc_context())) {
+        fprintf(stderr, "Could not allocate output format context\n");
+        return AVERROR(ENOMEM);
+    }
+
+    /** Associate the output file (pointer) with the container format context. */
+    (*output_format_context)->pb = output_io_context;
+
+    /** Guess the desired container format based on the file extension. */
+    if (!((*output_format_context)->oformat = av_guess_format(NULL, filename,
+                                                              NULL))) {
+        fprintf(stderr, "Could not find output file format\n");
+        goto cleanup;
+    }
+
+    av_strlcpy((*output_format_context)->filename, filename,
+               sizeof((*output_format_context)->filename));
+
+    /** Find the encoder to be used by its name. */
+    if (!(output_codec = avcodec_find_encoder(AV_CODEC_ID_AAC))) {
+        fprintf(stderr, "Could not find an AAC encoder.\n");
+        goto cleanup;
+    }
+
+    /** Create a new audio stream in the output file container. */
+    if (!(stream = avformat_new_stream(*output_format_context, output_codec))) {
+        fprintf(stderr, "Could not create new stream\n");
+        error = AVERROR(ENOMEM);
+        goto cleanup;
+    }
+
+    /** Save the encoder context for easiert access later. */
+    *output_codec_context = stream->codec;
+
+    /**
+     * Set the basic encoder parameters.
+     * The input file's sample rate is used to avoid a sample rate conversion.
+     */
+    (*output_codec_context)->channels       = OUTPUT_CHANNELS;
+    (*output_codec_context)->channel_layout = av_get_default_channel_layout(OUTPUT_CHANNELS);
+    (*output_codec_context)->sample_rate    = input_codec_context->sample_rate;
+    (*output_codec_context)->sample_fmt     = AV_SAMPLE_FMT_S16;
+    (*output_codec_context)->bit_rate       = OUTPUT_BIT_RATE;
+
+    /**
+     * Some container formats (like MP4) require global headers to be present
+     * Mark the encoder so that it behaves accordingly.
+     */
+    if ((*output_format_context)->oformat->flags & AVFMT_GLOBALHEADER)
+        (*output_codec_context)->flags |= CODEC_FLAG_GLOBAL_HEADER;
+
+    /** Open the encoder for the audio stream to use it later. */
+    if ((error = avcodec_open2(*output_codec_context, output_codec, NULL)) < 0) {
+        fprintf(stderr, "Could not open output codec (error '%s')\n",
+                get_error_text(error));
+        goto cleanup;
+    }
+
+    return 0;
+
+cleanup:
+    avio_close((*output_format_context)->pb);
+    avformat_free_context(*output_format_context);
+    *output_format_context = NULL;
+    return error < 0 ? error : AVERROR_EXIT;
+}
+
+/** Initialize one data packet for reading or writing. */
+static void init_packet(AVPacket *packet)
+{
+    av_init_packet(packet);
+    /** Set the packet data and size so that it is recognized as being empty. */
+    packet->data = NULL;
+    packet->size = 0;
+}
+
+/** Initialize one audio frame for reading from the input file */
+static int init_input_frame(AVFrame **frame)
+{
+    if (!(*frame = av_frame_alloc())) {
+        fprintf(stderr, "Could not allocate input frame\n");
+        return AVERROR(ENOMEM);
+    }
+    return 0;
+}
+
+/**
+ * Initialize the audio resampler based on the input and output codec settings.
+ * If the input and output sample formats differ, a conversion is required
+ * libswresample takes care of this, but requires initialization.
+ */
+static int init_resampler(AVCodecContext *input_codec_context,
+                          AVCodecContext *output_codec_context,
+                          SwrContext **resample_context)
+{
+        int error;
+
+        /**
+         * Create a resampler context for the conversion.
+         * Set the conversion parameters.
+         * Default channel layouts based on the number of channels
+         * are assumed for simplicity (they are sometimes not detected
+         * properly by the demuxer and/or decoder).
+         */
+        *resample_context = swr_alloc_set_opts(NULL,
+                                              av_get_default_channel_layout(output_codec_context->channels),
+                                              output_codec_context->sample_fmt,
+                                              output_codec_context->sample_rate,
+                                              av_get_default_channel_layout(input_codec_context->channels),
+                                              input_codec_context->sample_fmt,
+                                              input_codec_context->sample_rate,
+                                              0, NULL);
+        if (!*resample_context) {
+            fprintf(stderr, "Could not allocate resample context\n");
+            return AVERROR(ENOMEM);
+        }
+        /**
+        * Perform a sanity check so that the number of converted samples is
+        * not greater than the number of samples to be converted.
+        * If the sample rates differ, this case has to be handled differently
+        */
+        av_assert0(output_codec_context->sample_rate == input_codec_context->sample_rate);
+
+        /** Open the resampler with the specified parameters. */
+        if ((error = swr_init(*resample_context)) < 0) {
+            fprintf(stderr, "Could not open resample context\n");
+            swr_free(resample_context);
+            return error;
+        }
+    return 0;
+}
+
+/** Initialize a FIFO buffer for the audio samples to be encoded. */
+static int init_fifo(AVAudioFifo **fifo)
+{
+    /** Create the FIFO buffer based on the specified output sample format. */
+    if (!(*fifo = av_audio_fifo_alloc(OUTPUT_SAMPLE_FORMAT, OUTPUT_CHANNELS, 1))) {
+        fprintf(stderr, "Could not allocate FIFO\n");
+        return AVERROR(ENOMEM);
+    }
+    return 0;
+}
+
+/** Write the header of the output file container. */
+static int write_output_file_header(AVFormatContext *output_format_context)
+{
+    int error;
+    if ((error = avformat_write_header(output_format_context, NULL)) < 0) {
+        fprintf(stderr, "Could not write output file header (error '%s')\n",
+                get_error_text(error));
+        return error;
+    }
+    return 0;
+}
+
+/** Decode one audio frame from the input file. */
+static int decode_audio_frame(AVFrame *frame,
+                              AVFormatContext *input_format_context,
+                              AVCodecContext *input_codec_context,
+                              int *data_present, int *finished)
+{
+    /** Packet used for temporary storage. */
+    AVPacket input_packet;
+    int error;
+    init_packet(&input_packet);
+
+    /** Read one audio frame from the input file into a temporary packet. */
+    if ((error = av_read_frame(input_format_context, &input_packet)) < 0) {
+        /** If we are the the end of the file, flush the decoder below. */
+        if (error == AVERROR_EOF)
+            *finished = 1;
+        else {
+            fprintf(stderr, "Could not read frame (error '%s')\n",
+                    get_error_text(error));
+            return error;
+        }
+    }
+
+    /**
+     * Decode the audio frame stored in the temporary packet.
+     * The input audio stream decoder is used to do this.
+     * If we are at the end of the file, pass an empty packet to the decoder
+     * to flush it.
+     */
+    if ((error = avcodec_decode_audio4(input_codec_context, frame,
+                                       data_present, &input_packet)) < 0) {
+        fprintf(stderr, "Could not decode frame (error '%s')\n",
+                get_error_text(error));
+        av_free_packet(&input_packet);
+        return error;
+    }
+
+    /**
+     * If the decoder has not been flushed completely, we are not finished,
+     * so that this function has to be called again.
+     */
+    if (*finished && *data_present)
+        *finished = 0;
+    av_free_packet(&input_packet);
+    return 0;
+}
+
+/**
+ * Initialize a temporary storage for the specified number of audio samples.
+ * The conversion requires temporary storage due to the different format.
+ * The number of audio samples to be allocated is specified in frame_size.
+ */
+static int init_converted_samples(uint8_t ***converted_input_samples,
+                                  AVCodecContext *output_codec_context,
+                                  int frame_size)
+{
+    int error;
+
+    /**
+     * Allocate as many pointers as there are audio channels.
+     * Each pointer will later point to the audio samples of the corresponding
+     * channels (although it may be NULL for interleaved formats).
+     */
+    if (!(*converted_input_samples = calloc(output_codec_context->channels,
+                                            sizeof(**converted_input_samples)))) {
+        fprintf(stderr, "Could not allocate converted input sample pointers\n");
+        return AVERROR(ENOMEM);
+    }
+
+    /**
+     * Allocate memory for the samples of all channels in one consecutive
+     * block for convenience.
+     */
+    if ((error = av_samples_alloc(*converted_input_samples, NULL,
+                                  output_codec_context->channels,
+                                  frame_size,
+                                  output_codec_context->sample_fmt, 0)) < 0) {
+        fprintf(stderr,
+                "Could not allocate converted input samples (error '%s')\n",
+                get_error_text(error));
+        av_freep(&(*converted_input_samples)[0]);
+        free(*converted_input_samples);
+        return error;
+    }
+    return 0;
+}
+
+/**
+ * Convert the input audio samples into the output sample format.
+ * The conversion happens on a per-frame basis, the size of which is specified
+ * by frame_size.
+ */
+static int convert_samples(const uint8_t **input_data,
+                           uint8_t **converted_data, const int frame_size,
+                           SwrContext *resample_context)
+{
+    int error;
+
+    /** Convert the samples using the resampler. */
+    if ((error = swr_convert(resample_context,
+                             converted_data, frame_size,
+                             input_data    , frame_size)) < 0) {
+        fprintf(stderr, "Could not convert input samples (error '%s')\n",
+                get_error_text(error));
+        return error;
+    }
+
+    return 0;
+}
+
+/** Add converted input audio samples to the FIFO buffer for later processing. */
+static int add_samples_to_fifo(AVAudioFifo *fifo,
+                               uint8_t **converted_input_samples,
+                               const int frame_size)
+{
+    int error;
+
+    /**
+     * Make the FIFO as large as it needs to be to hold both,
+     * the old and the new samples.
+     */
+    if ((error = av_audio_fifo_realloc(fifo, av_audio_fifo_size(fifo) + frame_size)) < 0) {
+        fprintf(stderr, "Could not reallocate FIFO\n");
+        return error;
+    }
+
+    /** Store the new samples in the FIFO buffer. */
+    if (av_audio_fifo_write(fifo, (void **)converted_input_samples,
+                            frame_size) < frame_size) {
+        fprintf(stderr, "Could not write data to FIFO\n");
+        return AVERROR_EXIT;
+    }
+    return 0;
+}
+
+/**
+ * Read one audio frame from the input file, decodes, converts and stores
+ * it in the FIFO buffer.
+ */
+static int read_decode_convert_and_store(AVAudioFifo *fifo,
+                                         AVFormatContext *input_format_context,
+                                         AVCodecContext *input_codec_context,
+                                         AVCodecContext *output_codec_context,
+                                         SwrContext *resampler_context,
+                                         int *finished)
+{
+    /** Temporary storage of the input samples of the frame read from the file. */
+    AVFrame *input_frame = NULL;
+    /** Temporary storage for the converted input samples. */
+    uint8_t **converted_input_samples = NULL;
+    int data_present;
+    int ret = AVERROR_EXIT;
+
+    /** Initialize temporary storage for one input frame. */
+    if (init_input_frame(&input_frame))
+        goto cleanup;
+    /** Decode one frame worth of audio samples. */
+    if (decode_audio_frame(input_frame, input_format_context,
+                           input_codec_context, &data_present, finished))
+        goto cleanup;
+    /**
+     * If we are at the end of the file and there are no more samples
+     * in the decoder which are delayed, we are actually finished.
+     * This must not be treated as an error.
+     */
+    if (*finished && !data_present) {
+        ret = 0;
+        goto cleanup;
+    }
+    /** If there is decoded data, convert and store it */
+    if (data_present) {
+        /** Initialize the temporary storage for the converted input samples. */
+        if (init_converted_samples(&converted_input_samples, output_codec_context,
+                                   input_frame->nb_samples))
+            goto cleanup;
+
+        /**
+         * Convert the input samples to the desired output sample format.
+         * This requires a temporary storage provided by converted_input_samples.
+         */
+        if (convert_samples((const uint8_t**)input_frame->extended_data, converted_input_samples,
+                            input_frame->nb_samples, resampler_context))
+            goto cleanup;
+
+        /** Add the converted input samples to the FIFO buffer for later processing. */
+        if (add_samples_to_fifo(fifo, converted_input_samples,
+                                input_frame->nb_samples))
+            goto cleanup;
+        ret = 0;
+    }
+    ret = 0;
+
+cleanup:
+    if (converted_input_samples) {
+        av_freep(&converted_input_samples[0]);
+        free(converted_input_samples);
+    }
+    av_frame_free(&input_frame);
+
+    return ret;
+}
+
+/**
+ * Initialize one input frame for writing to the output file.
+ * The frame will be exactly frame_size samples large.
+ */
+static int init_output_frame(AVFrame **frame,
+                             AVCodecContext *output_codec_context,
+                             int frame_size)
+{
+    int error;
+
+    /** Create a new frame to store the audio samples. */
+    if (!(*frame = av_frame_alloc())) {
+        fprintf(stderr, "Could not allocate output frame\n");
+        return AVERROR_EXIT;
+    }
+
+    /**
+     * Set the frame's parameters, especially its size and format.
+     * av_frame_get_buffer needs this to allocate memory for the
+     * audio samples of the frame.
+     * Default channel layouts based on the number of channels
+     * are assumed for simplicity.
+     */
+    (*frame)->nb_samples     = frame_size;
+    (*frame)->channel_layout = output_codec_context->channel_layout;
+    (*frame)->format         = output_codec_context->sample_fmt;
+    (*frame)->sample_rate    = output_codec_context->sample_rate;
+
+    /**
+     * Allocate the samples of the created frame. This call will make
+     * sure that the audio frame can hold as many samples as specified.
+     */
+    if ((error = av_frame_get_buffer(*frame, 0)) < 0) {
+        fprintf(stderr, "Could allocate output frame samples (error '%s')\n",
+                get_error_text(error));
+        av_frame_free(frame);
+        return error;
+    }
+
+    return 0;
+}
+
+/** Encode one frame worth of audio to the output file. */
+static int encode_audio_frame(AVFrame *frame,
+                              AVFormatContext *output_format_context,
+                              AVCodecContext *output_codec_context,
+                              int *data_present)
+{
+    /** Packet used for temporary storage. */
+    AVPacket output_packet;
+    int error;
+    init_packet(&output_packet);
+
+    /**
+     * Encode the audio frame and store it in the temporary packet.
+     * The output audio stream encoder is used to do this.
+     */
+    if ((error = avcodec_encode_audio2(output_codec_context, &output_packet,
+                                       frame, data_present)) < 0) {
+        fprintf(stderr, "Could not encode frame (error '%s')\n",
+                get_error_text(error));
+        av_free_packet(&output_packet);
+        return error;
+    }
+
+    /** Write one audio frame from the temporary packet to the output file. */
+    if (*data_present) {
+        if ((error = av_write_frame(output_format_context, &output_packet)) < 0) {
+            fprintf(stderr, "Could not write frame (error '%s')\n",
+                    get_error_text(error));
+            av_free_packet(&output_packet);
+            return error;
+        }
+
+        av_free_packet(&output_packet);
+    }
+
+    return 0;
+}
+
+/**
+ * Load one audio frame from the FIFO buffer, encode and write it to the
+ * output file.
+ */
+static int load_encode_and_write(AVAudioFifo *fifo,
+                                 AVFormatContext *output_format_context,
+                                 AVCodecContext *output_codec_context)
+{
+    /** Temporary storage of the output samples of the frame written to the file. */
+    AVFrame *output_frame;
+    /**
+     * Use the maximum number of possible samples per frame.
+     * If there is less than the maximum possible frame size in the FIFO
+     * buffer use this number. Otherwise, use the maximum possible frame size
+     */
+    const int frame_size = FFMIN(av_audio_fifo_size(fifo),
+                                 output_codec_context->frame_size);
+    int data_written;
+
+    /** Initialize temporary storage for one output frame. */
+    if (init_output_frame(&output_frame, output_codec_context, frame_size))
+        return AVERROR_EXIT;
+
+    /**
+     * Read as many samples from the FIFO buffer as required to fill the frame.
+     * The samples are stored in the frame temporarily.
+     */
+    if (av_audio_fifo_read(fifo, (void **)output_frame->data, frame_size) < frame_size) {
+        fprintf(stderr, "Could not read data from FIFO\n");
+        av_frame_free(&output_frame);
+        return AVERROR_EXIT;
+    }
+
+    /** Encode one frame worth of audio samples. */
+    if (encode_audio_frame(output_frame, output_format_context,
+                           output_codec_context, &data_written)) {
+        av_frame_free(&output_frame);
+        return AVERROR_EXIT;
+    }
+    av_frame_free(&output_frame);
+    return 0;
+}
+
+/** Write the trailer of the output file container. */
+static int write_output_file_trailer(AVFormatContext *output_format_context)
+{
+    int error;
+    if ((error = av_write_trailer(output_format_context)) < 0) {
+        fprintf(stderr, "Could not write output file trailer (error '%s')\n",
+                get_error_text(error));
+        return error;
+    }
+    return 0;
+}
+
+/** Convert an audio file to an AAC file in an MP4 container. */
+int main(int argc, char **argv)
+{
+    AVFormatContext *input_format_context = NULL, *output_format_context = NULL;
+    AVCodecContext *input_codec_context = NULL, *output_codec_context = NULL;
+    SwrContext *resample_context = NULL;
+    AVAudioFifo *fifo = NULL;
+    int ret = AVERROR_EXIT;
+
+    if (argc < 3) {
+        fprintf(stderr, "Usage: %s <input file> <output file>\n", argv[0]);
+        exit(1);
+    }
+
+    /** Register all codecs and formats so that they can be used. */
+    av_register_all();
+    /** Open the input file for reading. */
+    if (open_input_file(argv[1], &input_format_context,
+                        &input_codec_context))
+        goto cleanup;
+    /** Open the output file for writing. */
+    if (open_output_file(argv[2], input_codec_context,
+                         &output_format_context, &output_codec_context))
+        goto cleanup;
+    /** Initialize the resampler to be able to convert audio sample formats. */
+    if (init_resampler(input_codec_context, output_codec_context,
+                       &resample_context))
+        goto cleanup;
+    /** Initialize the FIFO buffer to store audio samples to be encoded. */
+    if (init_fifo(&fifo))
+        goto cleanup;
+    /** Write the header of the output file container. */
+    if (write_output_file_header(output_format_context))
+        goto cleanup;
+
+    /**
+     * Loop as long as we have input samples to read or output samples
+     * to write; abort as soon as we have neither.
+     */
+    while (1) {
+        /** Use the encoder's desired frame size for processing. */
+        const int output_frame_size = output_codec_context->frame_size;
+        int finished                = 0;
+
+        /**
+         * Make sure that there is one frame worth of samples in the FIFO
+         * buffer so that the encoder can do its work.
+         * Since the decoder's and the encoder's frame size may differ, we
+         * need to FIFO buffer to store as many frames worth of input samples
+         * that they make up at least one frame worth of output samples.
+         */
+        while (av_audio_fifo_size(fifo) < output_frame_size) {
+            /**
+             * Decode one frame worth of audio samples, convert it to the
+             * output sample format and put it into the FIFO buffer.
+             */
+            if (read_decode_convert_and_store(fifo, input_format_context,
+                                              input_codec_context,
+                                              output_codec_context,
+                                              resample_context, &finished))
+                goto cleanup;
+
+            /**
+             * If we are at the end of the input file, we continue
+             * encoding the remaining audio samples to the output file.
+             */
+            if (finished)
+                break;
+        }
+
+        /**
+         * If we have enough samples for the encoder, we encode them.
+         * At the end of the file, we pass the remaining samples to
+         * the encoder.
+         */
+        while (av_audio_fifo_size(fifo) >= output_frame_size ||
+               (finished && av_audio_fifo_size(fifo) > 0))
+            /**
+             * Take one frame worth of audio samples from the FIFO buffer,
+             * encode it and write it to the output file.
+             */
+            if (load_encode_and_write(fifo, output_format_context,
+                                      output_codec_context))
+                goto cleanup;
+
+        /**
+         * If we are at the end of the input file and have encoded
+         * all remaining samples, we can exit this loop and finish.
+         */
+        if (finished) {
+            int data_written;
+            /** Flush the encoder as it may have delayed frames. */
+            do {
+                if (encode_audio_frame(NULL, output_format_context,
+                                       output_codec_context, &data_written))
+                    goto cleanup;
+            } while (data_written);
+            break;
+        }
+    }
+
+    /** Write the trailer of the output file container. */
+    if (write_output_file_trailer(output_format_context))
+        goto cleanup;
+    ret = 0;
+
+cleanup:
+    if (fifo)
+        av_audio_fifo_free(fifo);
+    swr_free(&resample_context);
+    if (output_codec_context)
+        avcodec_close(output_codec_context);
+    if (output_format_context) {
+        avio_close(output_format_context->pb);
+        avformat_free_context(output_format_context);
+    }
+    if (input_codec_context)
+        avcodec_close(input_codec_context);
+    if (input_format_context)
+        avformat_close_input(&input_format_context);
+
+    return ret;
+}

omxplayer-2014.02.11.tar.gz/ffmpeg/doc/faq.texi -> omxplayer-2014.03.28.tar.gz/ffmpeg/doc/faq.texi Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/doc/ffmpeg.texi -> omxplayer-2014.03.28.tar.gz/ffmpeg/doc/ffmpeg.texi Changed

@@ -80,11 +80,22 @@
 the following diagram:
 
 @example
- _______              ______________               _________              ______________            ________
-|       |            |              |             |         |            |              |          |        |
-| input |  demuxer   | encoded data |   decoder   | decoded |  encoder   | encoded data |  muxer   | output |
-| file  | ---------> | packets      |  ---------> | frames  | ---------> | packets      | -------> | file   |
-|_______|            |______________|             |_________|            |______________|          |________|
+ _______              ______________
+|       |            |              |
+| input |  demuxer   | encoded data |   decoder
+| file  | ---------> | packets      | -----+
+|_______|            |______________|      |
+                                           v
+                                       _________
+                                      |         |
+                                      | decoded |
+                                      | frames  |
+ ________             ______________  |_________|
+|        |           |              |      |
+| output | <-------- | encoded data | <----+
+| file   |   muxer   | packets      |   encoder
+|________|           |______________|
+
 
 @end example
 
@@ -112,11 +123,11 @@
 an additional step between decoding and encoding:
 
 @example
- _________                        __________              ______________
-|         |                      |          |            |              |
-| decoded |  simple filtergraph  | filtered |  encoder   | encoded data |
-| frames  | -------------------> | frames   | ---------> | packets      |
-|_________|                      |__________|            |______________|
+ _________               __________              ______________
+|         |  simple     |          |            |              |
+| decoded |  fltrgrph   | filtered |  encoder   | encoded data |
+| frames  | ----------> | frames   | ---------> | packets      |
+|_________|             |__________|            |______________|
 
 @end example
 
@@ -125,10 +136,10 @@
 A simple filtergraph for video can look for example like this:
 
 @example
- _______        _____________        _______        _____        ________
-|       |      |             |      |       |      |     |      |        |
-| input | ---> | deinterlace | ---> | scale | ---> | fps | ---> | output |
-|_______|      |_____________|      |_______|      |_____|      |________|
+ _______        _____________        _______        ________
+|       |      |             |      |       |      |        |
+| input | ---> | deinterlace | ---> | scale | ---> | output |
+|_______|      |_____________|      |_______|      |________|
 
 @end example
 
@@ -285,23 +296,20 @@
 @var{position} may be either in seconds or in @code{hh:mm:ss[.xxx]} form.
 
 @item -itsoffset @var{offset} (@emph{input})
-Set the input time offset in seconds.
-@code{[-]hh:mm:ss[.xxx]} syntax is also supported.
-The offset is added to the timestamps of the input files.
-Specifying a positive offset means that the corresponding
-streams are delayed by @var{offset} seconds.
+Set the input time offset.
+
+@var{offset} must be a time duration specification,
+see @ref{time duration syntax,,the Time duration section in the ffmpeg-utils(1) manual,ffmpeg-utils}.
+
+The offset is added to the timestamps of the input files. Specifying
+a positive offset means that the corresponding streams are delayed by
+the time duration specified in @var{offset}.
 
-@item -timestamp @var{time} (@emph{output})
+@item -timestamp @var{date} (@emph{output})
 Set the recording timestamp in the container.
-The syntax for @var{time} is:
-@example
-now|([(YYYY-MM-DD|YYYYMMDD)[T|t| ]]((HH:MM:SS[.m...])|(HHMMSS[.m...]))[Z|z])
-@end example
-If the value is "now" it takes the current time.
-Time is local time unless 'Z' or 'z' is appended, in which case it is
-interpreted as UTC.
-If the year-month-day part is not specified it takes the current
-year-month-day.
+
+@var{date} must be a time duration specification,
+see @ref{date syntax,,the Date section in the ffmpeg-utils(1) manual,ffmpeg-utils}.
 
 @item -metadata[:metadata_specifier] @var{key}=@var{value} (@emph{output,per-metadata})
 Set a metadata key/value pair.
@@ -348,8 +356,13 @@
 
 @item -q[:@var{stream_specifier}] @var{q} (@emph{output,per-stream})
 @itemx -qscale[:@var{stream_specifier}] @var{q} (@emph{output,per-stream})
-Use fixed quality scale (VBR). The meaning of @var{q} is
+Use fixed quality scale (VBR). The meaning of @var{q}/@var{qscale} is
 codec-dependent.
+If @var{qscale} is used without a @var{stream_specifier} then it applies only
+to the video stream, this is to maintain compatibility with previous behavior
+and as specifying the same codec specific value to 2 different codecs that is
+audio and video generally is not what is intended when no stream_specifier is
+used.
 
 @anchor{filter_option}
 @item -filter[:@var{stream_specifier}] @var{filtergraph} (@emph{output,per-stream})
@@ -503,9 +516,6 @@
 @file{PREFIX-N.log}, where N is a number specific to the output
 stream
 
-@item -vlang @var{code}
-Set the ISO 639 language code (3 letters) of the current video stream.
-
 @item -vf @var{filtergraph} (@emph{output})
 Create the filtergraph specified by @var{filtergraph} and use it to
 filter the stream.
@@ -616,6 +626,42 @@
 @item -copyinkf[:@var{stream_specifier}] (@emph{output,per-stream})
 When doing stream copy, copy also non-key frames found at the
 beginning.
+
+@item -hwaccel[:@var{stream_specifier}] @var{hwaccel} (@emph{input,per-stream})
+Use hardware acceleration to decode the matching stream(s). The allowed values
+of @var{hwaccel} are:
+@table @option
+@item none
+Do not use any hardware acceleration (the default).
+
+@item auto
+Automatically select the hardware acceleration method.
+
+@item vdpau
+Use VDPAU (Video Decode and Presentation API for Unix) hardware acceleration.
+@end table
+
+This option has no effect if the selected hwaccel is not available or not
+supported by the chosen decoder.
+
+Note that most acceleration methods are intended for playback and will not be
+faster than software decoding on modern CPUs. Additionally, @command{ffmpeg}
+will usually need to copy the decoded frames from the GPU memory into the system
+memory, resulting in further performance loss. This option is thus mainly
+useful for testing.
+
+@item -hwaccel_device[:@var{stream_specifier}] @var{hwaccel_device} (@emph{input,per-stream})
+Select a device to use for hardware acceleration.
+
+This option only makes sense when the @option{-hwaccel} option is also
+specified. Its exact meaning depends on the specific hardware acceleration
+method chosen.
+
+@table @option
+@item vdpau
+For VDPAU, this option specifies the X11 display/screen to use. If this option
+is not specified, the value of the @var{DISPLAY} environment variable is used
+@end table
 @end table
 
 @section Audio Options
@@ -668,8 +714,6 @@
 @section Subtitle options:
 
 @table @option
-@item -slang @var{code}
-Set the ISO 639 language code (3 letters) of the current subtitle stream.
 @item -scodec @var{codec} (@emph{input/output})
 Set the subtitle codec. This is an alias for @code{-codec:s}.
 @item -sn (@emph{output})
@@ -998,7 +1042,7 @@
 ffmpeg -i file.mov -an -vn -bsf:s mov2textsub -c:s copy -f rawvideo sub.txt
 @end example
 
-@item -tag[:@var{stream_specifier}] @var{codec_tag} (@emph{per-stream})
+@item -tag[:@var{stream_specifier}] @var{codec_tag} (@emph{input/output,per-stream})
 Force a tag/fourcc for matching streams.
 
 @item -timecode @var{hh}:@var{mm}:@var{ss}SEP@var{ff}
@@ -1072,12 +1116,14 @@
 e.g. when copying some streams and transcoding the others.
 
 @item -override_ffserver (@emph{global})
-Overrides the input specifications from ffserver. Using this option you can
-map any input stream to ffserver and control many aspects of the encoding from
-ffmpeg. Without this option ffmpeg will transmit to ffserver what is requested by
-ffserver.
+Overrides the input specifications from @command{ffserver}. Using this
+option you can map any input stream to @command{ffserver} and control
+many aspects of the encoding from @command{ffmpeg}. Without this
+option @command{ffmpeg} will transmit to @command{ffserver} what is
+requested by @command{ffserver}.
+
 The option is intended for cases where features are needed that cannot be
-specified to ffserver but can be to ffmpeg.
+specified to @command{ffserver} but can be to @command{ffmpeg}.
 
 @end table

omxplayer-2014.02.11.tar.gz/ffmpeg/doc/ffplay.texi -> omxplayer-2014.03.28.tar.gz/ffmpeg/doc/ffplay.texi Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/doc/ffprobe.texi -> omxplayer-2014.03.28.tar.gz/ffmpeg/doc/ffprobe.texi Changed

@@ -197,11 +197,11 @@
 section with name "PACKET".
 
 @item -show_frames
-Show information about each frame contained in the input multimedia
-stream.
+Show information about each frame and subtitle contained in the input
+multimedia stream.
 
 The information for each single frame is printed within a dedicated
-section with name "FRAME".
+section with name "FRAME" or "SUBTITLE".
 
 @item -show_streams
 Show information about each media stream contained in the input
@@ -337,6 +337,39 @@
 to adopt. The options are specified as a list of @var{key}=@var{value}
 pairs, separated by ":".
 
+All writers support the following options:
+
+@table @option
+@item string_validation, sv
+Set string validation mode.
+
+The following values are accepted.
+@table @samp
+@item fail
+The writer will fail immediately in case an invalid string (UTF-8)
+sequence or code point is found in the input. This is especially
+useful to validate input metadata.
+
+@item ignore
+Any validation error will be ignored. This will result in possibly
+broken output, especially with the json or xml writer.
+
+@item replace
+The writer will substitute invalid UTF-8 sequences or code points with
+the string specified with the @option{string_validation_replacement}.
+@end table
+
+Default value is @samp{replace}.
+
+@item string_validation_replacement, svr
+Set replacement string to use in case @option{string_validation} is
+set to @samp{replace}.
+
+In case the option is not specified, the writer will assume the empty
+string, that is it will remove the invalid sequences from the input
+strings.
+@end table
+
 A description of the currently available writers follows.
 
 @section default
@@ -566,6 +599,7 @@
 
 @include config.texi
 @ifset config-all
+@set config-readonly
 @ifset config-avutil
 @include utils.texi
 @end ifset

omxplayer-2014.02.11.tar.gz/ffmpeg/doc/ffprobe.xsd -> omxplayer-2014.03.28.tar.gz/ffmpeg/doc/ffprobe.xsd Changed

@@ -28,7 +28,10 @@
 
     <xsd:complexType name="framesType">
         <xsd:sequence>
-            <xsd:element name="frame" type="ffprobe:frameType" minOccurs="0" maxOccurs="unbounded"/>
+            <xsd:choice minOccurs="0" maxOccurs="unbounded">
+                <xsd:element name="frame" type="ffprobe:frameType" minOccurs="0" maxOccurs="unbounded"/>
+                <xsd:element name="subtitle" type="ffprobe:subtitleType" minOccurs="0" maxOccurs="unbounded"/>
+            </xsd:choice>
         </xsd:sequence>
     </xsd:complexType>
 
@@ -58,6 +61,8 @@
       <xsd:attribute name="pkt_pts_time"  type="xsd:float"/>
       <xsd:attribute name="pkt_dts"       type="xsd:long" />
       <xsd:attribute name="pkt_dts_time"  type="xsd:float"/>
+      <xsd:attribute name="best_effort_timestamp"      type="xsd:long" />
+      <xsd:attribute name="best_effort_timestamp_time" type="xsd:float" />
       <xsd:attribute name="pkt_duration"  type="xsd:long" />
       <xsd:attribute name="pkt_duration_time" type="xsd:float"/>
       <xsd:attribute name="pkt_pos"       type="xsd:long" />
@@ -82,6 +87,16 @@
       <xsd:attribute name="repeat_pict"            type="xsd:int"   />
     </xsd:complexType>
 
+    <xsd:complexType name="subtitleType">
+      <xsd:attribute name="media_type"         type="xsd:string" fixed="subtitle" use="required"/>
+      <xsd:attribute name="pts"                type="xsd:long" />
+      <xsd:attribute name="pts_time"           type="xsd:float"/>
+      <xsd:attribute name="format"             type="xsd:int"  />
+      <xsd:attribute name="start_display_time" type="xsd:int"  />
+      <xsd:attribute name="end_display_time"   type="xsd:int"  />
+      <xsd:attribute name="num_rects"          type="xsd:int"  />
+    </xsd:complexType>
+
     <xsd:complexType name="streamsType">
         <xsd:sequence>
             <xsd:element name="stream" type="ffprobe:streamType" minOccurs="0" maxOccurs="unbounded"/>

omxplayer-2014.02.11.tar.gz/ffmpeg/doc/ffserver.conf -> omxplayer-2014.03.28.tar.gz/ffmpeg/doc/ffserver.conf Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/doc/ffserver.texi -> omxplayer-2014.03.28.tar.gz/ffmpeg/doc/ffserver.texi Changed

@@ -16,11 +16,14 @@
 @chapter Description
 @c man begin DESCRIPTION
 
-@command{ffserver} is a streaming server for both audio and video. It
-supports several live feeds, streaming from files and time shifting on
-live feeds (you can seek to positions in the past on each live feed,
-provided you specify a big enough feed storage in
-@file{ffserver.conf}).
+@command{ffserver} is a streaming server for both audio and video.
+It supports several live feeds, streaming from files and time shifting
+on live feeds. You can seek to positions in the past on each live
+feed, provided you specify a big enough feed storage.
+
+@command{ffserver} is configured through a configuration file, which
+is read at startup. If not explicitly specified, it will read from
+@file{/etc/ffserver.conf}.
 
 @command{ffserver} receives prerecorded files or FFM streams from some
 @command{ffmpeg} instance as input, then streams them over
@@ -39,10 +42,126 @@
 formats, each one specified by a @code{<Stream>} section in the
 configuration file.
 
+@chapter Detailed description
+
+@command{ffserver} works by forwarding streams encoded by
+@command{ffmpeg}, or pre-recorded streams which are read from disk.
+
+Precisely, @command{ffserver} acts as an HTTP server, accepting POST
+requests from @command{ffmpeg} to acquire the stream to publish, and
+serving RTSP clients or HTTP clients GET requests with the stream
+media content.
+
+A feed is an @ref{FFM} stream created by @command{ffmpeg}, and sent to
+a port where @command{ffserver} is listening.
+
+Each feed is identified by a unique name, corresponding to the name
+of the resource published on @command{ffserver}, and is configured by
+a dedicated @code{Feed} section in the configuration file.
+
+The feed publish URL is given by:
+@example
+http://@var{ffserver_ip_address}:@var{http_port}/@var{feed_name}
+@end example
+
+where @var{ffserver_ip_address} is the IP address of the machine where
+@command{ffserver} is installed, @var{http_port} is the port number of
+the HTTP server (configured through the @option{Port} option), and
+@var{feed_name} is the name of the corresponding feed defined in the
+configuration file.
+
+Each feed is associated to a file which is stored on disk. This stored
+file is used to allow to send pre-recorded data to a player as fast as
+possible when new content is added in real-time to the stream.
+
+A "live-stream" or "stream" is a resource published by
+@command{ffserver}, and made accessible through the HTTP protocol to
+clients.
+
+A stream can be connected to a feed, or to a file. In the first case,
+the published stream is forwarded from the corresponding feed
+generated by a running instance of @command{ffmpeg}, in the second
+case the stream is read from a pre-recorded file.
+
+Each stream is identified by a unique name, corresponding to the name
+of the resource served by @command{ffserver}, and is configured by
+a dedicated @code{Stream} section in the configuration file.
+
+The stream access HTTP URL is given by:
+@example
+http://@var{ffserver_ip_address}:@var{http_port}/@var{stream_name}[@var{options}]
+@end example
+
+The stream access RTSP URL is given by:
+@example
+http://@var{ffserver_ip_address}:@var{rtsp_port}/@var{stream_name}[@var{options}]
+@end example
+
+@var{stream_name} is the name of the corresponding stream defined in
+the configuration file. @var{options} is a list of options specified
+after the URL which affects how the stream is served by
+@command{ffserver}. @var{http_port} and @var{rtsp_port} are the HTTP
+and RTSP ports configured with the options @var{Port} and
+@var{RTSPPort} respectively.
+
+In case the stream is associated to a feed, the encoding parameters
+must be configured in the stream configuration. They are sent to
+@command{ffmpeg} when setting up the encoding. This allows
+@command{ffserver} to define the encoding parameters used by
+the @command{ffmpeg} encoders.
+
+The @command{ffmpeg} @option{override_ffserver} commandline option
+allows to override the encoding parameters set by the server.
+
+Multiple streams can be connected to the same feed.
+
+For example, you can have a situation described by the following
+graph:
+@example
+               _________       __________
+              |         |     |          |
+ffmpeg 1 -----| feed 1  |-----| stream 1 |
+    \         |_________|\    |__________|
+     \                    \
+      \                    \   __________
+       \                    \ |          |
+        \                    \| stream 2 |
+         \                    |__________|
+          \
+           \   _________       __________
+            \ |         |     |          |
+             \| feed 2  |-----| stream 3 |
+              |_________|     |__________|
+
+               _________       __________
+              |         |     |          |
+ffmpeg 2 -----| feed 3  |-----| stream 4 |
+              |_________|     |__________|
+
+               _________       __________
+              |         |     |          |
+              | file 1  |-----| stream 5 |
+              |_________|     |__________|
+@end example
+
+@anchor{FFM}
+@section FFM, FFM2 formats
+
+FFM and FFM2 are formats used by ffserver. They allow storing a wide variety of
+video and audio streams and encoding options, and can store a moving time segment
+of an infinite movie or a whole movie.
+
+FFM is version specific, and there is limited compatibility of FFM files
+generated by one version of ffmpeg/ffserver and another version of
+ffmpeg/ffserver. It may work but it is not guaranteed to work.
+
+FFM2 is extensible while maintaining compatibility and should work between
+differing versions of tools. FFM2 is the default.
+
 @section Status stream
 
-ffserver supports an HTTP interface which exposes the current status
-of the server.
+@command{ffserver} supports an HTTP interface which exposes the
+current status of the server.
 
 Simply point your browser to the address of the special status stream
 specified in the configuration file.
@@ -61,27 +180,8 @@
 then the server will post a page with the status information when
 the special stream @file{status.html} is requested.
 
-@section What can this do?
-
-When properly configured and running, you can capture video and audio in real
-time from a suitable capture card, and stream it out over the Internet to
-either Windows Media Player or RealAudio player (with some restrictions).
-
-It can also stream from files, though that is currently broken. Very often, a
-web server can be used to serve up the files just as well.
-
-It can stream prerecorded video from .ffm files, though it is somewhat tricky
-to make it work correctly.
-
 @section How do I make it work?
 
-First, build the kit. It *really* helps to have installed LAME first. Then when
-you run the ffserver ./configure, make sure that you have the
-@code{--enable-libmp3lame} flag turned on.
-
-LAME is important as it allows for streaming audio to Windows Media Player.
-Don't ask why the other audio types do not work.
-
 As a simple test, just run the following two command lines where INPUTFILE
 is some file which you can decode with ffmpeg:
 
@@ -109,35 +209,6 @@
 frame rates etc). Then install ffserver and ffmpeg, write a script to start
 them up, and off you go.
 
-@section Troubleshooting
-
-@subsection I don't hear any audio, but video is fine.
-
-Maybe you didn't install LAME, or got your ./configure statement wrong. Check
-the ffmpeg output to see if a line referring to MP3 is present. If not, then
-your configuration was incorrect. If it is, then maybe your wiring is not
-set up correctly. Maybe the sound card is not getting data from the right
-input source. Maybe you have a really awful audio interface (like I do)
-that only captures in stereo and also requires that one channel be flipped.
-If you are one of these people, then export 'AUDIO_FLIP_LEFT=1' before
-starting ffmpeg.
-
-@subsection The audio and video lose sync after a while.
-
-Yes, they do.
-
-@subsection After a long while, the video update rate goes way down in WMP.
-
-Yes, it does. Who knows why?
-
-@subsection WMP 6.4 behaves differently to WMP 7.
-
-Yes, it does. Any thoughts on this would be gratefully received. These
-differences extend to embedding WMP into a web page. [There are two
-object IDs that you can use: The old one, which does not play well, and
-the new one, which does (both tested on the same system). However,
-I suspect that the new one is not available unless you have installed WMP 7].
-
 @section What else can it do?
 
 You can replay video from .ffm files that was recorded earlier.
@@ -177,9 +248,6 @@
 is found. This further reduces the startup delay by not transferring data
 that will be discarded.
 
-* You may want to adjust the MaxBandwidth in the ffserver.conf to limit
-the amount of bandwidth consumed by live streams.
-
 @section Why does the ?buffer / Preroll stop working after a time?
 
 It turns out that (on my machine at least) the number of frames successfully
@@ -213,19 +281,6 @@
 For example:   @samp{http://localhost:8080/test.asf?date=2002-07-26T23:05:00}.
 @c man end
 
-@section What is FFM, FFM2
-
-FFM and FFM2 are formats used by ffserver. They allow storing a wide variety of
-video and audio streams and encoding options, and can store a moving time segment
-of an infinite movie or a whole movie.
-
-FFM is version specific, and there is limited compatibility of FFM files
-generated by one version of ffmpeg/ffserver and another version of
-ffmpeg/ffserver. It may work but it is not guaranteed to work.
-
-FFM2 is extensible while maintaining compatibility and should work between
-differing versions of tools. FFM2 is the default.
-
 @chapter Options
 @c man begin OPTIONS
 
@@ -235,15 +290,540 @@
 
 @table @option
 @item -f @var{configfile}
-Use @file{configfile} instead of @file{/etc/ffserver.conf}.
+Read configuration file @file{configfile}. If not specified it will
+read by default from @file{/etc/ffserver.conf}.
+
 @item -n
-Enable no-launch mode. This option disables all the Launch directives
-within the various <Stream> sections. Since ffserver will not launch
-any ffmpeg instances, you will have to launch them manually.
+Enable no-launch mode. This option disables all the @code{Launch}
+directives within the various @code{<Feed>} sections. Since
+@command{ffserver} will not launch any @command{ffmpeg} instances, you
+will have to launch them manually.
+
 @item -d
-Enable debug mode. This option increases log verbosity, directs log
-messages to stdout.
+Enable debug mode. This option increases log verbosity, and directs
+log messages to stdout. When specified, the @option{CustomLog} option
+is ignored.
+@end table
+
+@chapter Configuration file syntax
+
+@command{ffserver} reads a configuration file containing global
+options and settings for each stream and feed.
+
+The configuration file consists of global options and dedicated
+sections, which must be introduced by "<@var{SECTION_NAME}
+@var{ARGS}>" on a separate line and must be terminated by a line in
+the form "</@var{SECTION_NAME}>". @var{ARGS} is optional.
+
+Currently the following sections are recognized: @samp{Feed},
+@samp{Stream}, @samp{Redirect}.
+
+A line starting with @code{#} is ignored and treated as a comment.
+
+Name of options and sections are case-insensitive.
+
+@section ACL syntax
+An ACL (Access Control List) specifies the address which are allowed
+to access a given stream, or to write a given feed.
+
+It accepts the folling forms
+@itemize
+@item
+Allow/deny access to @var{address}.
+@example
+ACL ALLOW <address>
+ACL DENY <address>
+@end example
+
+@item
+Allow/deny access to ranges of addresses from @var{first_address} to
+@var{last_address}.
+@example
+ACL ALLOW <first_address> <last_address>
+ACL DENY <first_address> <last_address>
+@end example
+@end itemize
+
+You can repeat the ACL allow/deny as often as you like. It is on a per
+stream basis. The first match defines the action. If there are no matches,
+then the default is the inverse of the last ACL statement.
+
+Thus 'ACL allow localhost' only allows access from localhost.
+'ACL deny 1.0.0.0 1.255.255.255' would deny the whole of network 1 and
+allow everybody else.
+
+@section Global options
+@table @option
+@item Port @var{port_number}
+@item RTSPPort @var{port_number}
+
+Set TCP port number on which the HTTP/RTSP server is listening. You
+must select a different port from your standard HTTP web server if it
+is running on the same computer.
+
+If not specified, no corresponding server will be created.
+
+@item BindAddress @var{ip_address}
+@item RTSPBindAddress @var{ip_address}
+Set address on which the HTTP/RTSP server is bound. Only useful if you
+have several network interfaces.
+
+@item MaxHTTPConnections @var{n}
+Set number of simultaneous HTTP connections that can be handled. It
+has to be defined @emph{before} the @option{MaxClients} parameter,
+since it defines the @option{MaxClients} maximum limit.
+
+Default value is 2000.
+
+@item MaxClients @var{n}
+Set number of simultaneous requests that can be handled. Since
+@command{ffserver} is very fast, it is more likely that you will want
+to leave this high and use @option{MaxBandwidth}.
+
+Default value is 5.
+
+@item MaxBandwidth @var{kbps}
+Set the maximum amount of kbit/sec that you are prepared to consume
+when streaming to clients.
+
+Default value is 1000.
+
+@item CustomLog @var{filename}
+Set access log file (uses standard Apache log file format). '-' is the
+standard output.
+
+If not specified @command{ffserver} will produce no log.
+
+In case the commandline option @option{-d} is specified this option is
+ignored, and the log is written to standard output.
+
+@item NoDaemon
+Set no-daemon mode. This option is currently ignored since now
+@command{ffserver} will always work in no-daemon mode, and is
+deprecated.
+@end table
+
+@section Feed section
+
+A Feed section defines a feed provided to @command{ffserver}.
+
+Each live feed contains one video and/or audio sequence coming from an
+@command{ffmpeg} encoder or another @command{ffserver}. This sequence
+may be encoded simultaneously with several codecs at several
+resolutions.
+
+A feed instance specification is introduced by a line in the form:
+@example
+<Feed FEED_FILENAME>
+@end example
+
+where @var{FEED_FILENAME} specifies the unique name of the FFM stream.
+
+The following options are recognized within a Feed section.
+
+@table @option
+@item File @var{filename}
+@item ReadOnlyFile @var{filename}
+Set the path where the feed file is stored on disk.
+
+If not specified, the @file{/tmp/FEED.ffm} is assumed, where
+@var{FEED} is the feed name.
+
+If @option{ReadOnlyFile} is used the file is marked as read-only and
+it will not be deleted or updated.
+
+@item Truncate
+Truncate the feed file, rather than appending to it. By default
+@command{ffserver} will append data to the file, until the maximum
+file size value is reached (see @option{FileMaxSize} option).
+
+@item FileMaxSize @var{size}
+Set maximum size of the feed file in bytes. 0 means unlimited. The
+postfixes @code{K} (2^10), @code{M} (2^20), and @code{G} (2^30) are
+recognized.
+
+Default value is 5M.
+
+@item Launch @var{args}
+Launch an @command{ffmpeg} command when creating @command{ffserver}.
+
+@var{args} must be a sequence of arguments to be provided to an
+@command{ffmpeg} instance. The first provided argument is ignored, and
+it is replaced by a path with the same dirname of the @command{ffserver}
+instance, followed by the remaining argument and terminated with a
+path corresponding to the feed.
+
+When the launched process exits, @command{ffserver} will launch
+another program instance.
+
+In case you need a more complex @command{ffmpeg} configuration,
+e.g. if you need to generate multiple FFM feeds with a single
+@command{ffmpeg} instance, you should launch @command{ffmpeg} by hand.
+
+This option is ignored in case the commandline option @option{-n} is
+specified.
+
+@item ACL @var{spec}
+Specify the list of IP address which are allowed or denied to write
+the feed. Multiple ACL options can be specified.
 @end table
+
+@section Stream section
+
+A Stream section defines a stream provided by @command{ffserver}, and
+identified by a single name.
+
+The stream is sent when answering a request containing the stream
+name.
+
+A stream section must be introduced by the line:
+@example
+<Stream STREAM_NAME>
+@end example
+
+where @var{STREAM_NAME} specifies the unique name of the stream.
+
+The following options are recognized within a Stream section.
+
+Encoding options are marked with the @emph{encoding} tag, and they are
+used to set the encoding parameters, and are mapped to libavcodec
+encoding options. Not all encoding options are supported, in
+particular it is not possible to set encoder private options. In order
+to override the encoding options specified by @command{ffserver}, you
+can use the @command{ffmpeg} @option{override_ffserver} commandline
+option.
+
+Only one of the @option{Feed} and @option{File} options should be set.
+
+@table @option
+@item Feed @var{feed_name}
+Set the input feed. @var{feed_name} must correspond to an existing
+feed defined in a @code{Feed} section.
+
+When this option is set, encoding options are used to setup the
+encoding operated by the remote @command{ffmpeg} process.
+
+@item File @var{filename}
+Set the filename of the pre-recorded input file to stream.
+
+When this option is set, encoding options are ignored and the input
+file content is re-streamed as is.
+
+@item Format @var{format_name}
+Set the format of the output stream.
+
+Must be the name of a format recognized by FFmpeg. If set to
+@samp{status}, it is treated as a status stream.
+
+@item InputFormat @var{format_name}
+Set input format. If not specified, it is automatically guessed.
+
+@item Preroll @var{n}
+Set this to the number of seconds backwards in time to start. Note that
+most players will buffer 5-10 seconds of video, and also you need to allow
+for a keyframe to appear in the data stream.
+
+Default value is 0.
+
+@item StartSendOnKey
+Do not send stream until it gets the first key frame. By default
+@command{ffserver} will send data immediately.
+
+@item MaxTime @var{n}
+Set the number of seconds to run. This value set the maximum duration
+of the stream a client will be able to receive.
+
+A value of 0 means that no limit is set on the stream duration.
+
+@item ACL @var{spec}
+Set ACL for the stream.
+
+@item DynamicACL @var{spec}
+
+@item RTSPOption @var{option}
+
+@item MulticastAddress @var{address}
+
+@item MulticastPort @var{port}
+
+@item MulticastTTL @var{integer}
+
+@item NoLoop
+
+@item FaviconURL @var{url}
+Set favicon (favourite icon) for the server status page. It is ignored
+for regular streams.
+
+@item Author @var{value}
+@item Comment @var{value}
+@item Copyright @var{value}
+@item Title @var{value}
+Set metadata corresponding to the option. All these options are
+deprecated in favor of @option{Metadata}.
+
+@item Metadata @var{key} @var{value}
+Set metadata value on the output stream.
+
+@item NoAudio
+@item NoVideo
+Suppress audio/video.
+
+@item AudioCodec @var{codec_name} (@emph{encoding,audio})
+Set audio codec.
+
+@item AudioBitRate @var{rate} (@emph{encoding,audio})
+Set bitrate for the audio stream in kbits per second.
+
+@item AudioChannels @var{n} (@emph{encoding,audio})
+Set number of audio channels.
+
+@item AudioSampleRate @var{n} (@emph{encoding,audio})
+Set sampling frequency for audio. When using low bitrates, you should
+lower this frequency to 22050 or 11025. The supported frequencies
+depend on the selected audio codec.
+
+@item AVOptionAudio @var{option} @var{value} (@emph{encoding,audio})
+Set generic option for audio stream.
+
+@item AVPresetAudio @var{preset} (@emph{encoding,audio})
+Set preset for audio stream.
+
+@item VideoCodec @var{codec_name} (@emph{encoding,video})
+Set video codec.
+
+@item VideoBitRate @var{n} (@emph{encoding,video})
+Set bitrate for the video stream in kbits per second.
+
+@item VideoBitRateRange @var{range} (@emph{encoding,video})
+Set video bitrate range.
+
+A range must be specified in the form @var{minrate}-@var{maxrate}, and
+specifies the @option{minrate} and @option{maxrate} encoding options
+expressed in kbits per second.
+
+@item VideoBitRateRangeTolerance @var{n} (@emph{encoding,video})
+Set video bitrate tolerance in kbits per second.
+
+@item PixelFormat @var{pixel_format} (@emph{encoding,video})
+Set video pixel format.
+
+@item Debug @var{integer} (@emph{encoding,video})
+Set video @option{debug} encoding option.
+
+@item Strict @var{integer} (@emph{encoding,video})
+Set video @option{strict} encoding option.
+
+@item VideoBufferSize @var{n} (@emph{encoding,video})
+Set ratecontrol buffer size, expressed in KB.
+
+@item VideoFrameRate @var{n} (@emph{encoding,video})
+Set number of video frames per second.
+
+@item VideoSize (@emph{encoding,video})
+Set size of the video frame, must be an abbreviation or in the form
+@var{W}x@var{H}.  See @ref{video size syntax,,the Video size section
+in the ffmpeg-utils(1) manual,ffmpeg-utils}.
+
+Default value is @code{160x128}.
+
+@item VideoIntraOnly (@emph{encoding,video})
+Transmit only intra frames (useful for low bitrates, but kills frame rate).
+
+@item VideoGopSize @var{n} (@emph{encoding,video})
+If non-intra only, an intra frame is transmitted every VideoGopSize
+frames. Video synchronization can only begin at an intra frame.
+
+@item VideoTag @var{tag} (@emph{encoding,video})
+Set video tag.
+
+@item VideoHighQuality (@emph{encoding,video})
+@item Video4MotionVector (@emph{encoding,video})
+
+@item BitExact (@emph{encoding,video})
+Set bitexact encoding flag.
+
+@item IdctSimple (@emph{encoding,video})
+Set simple IDCT algorithm.
+
+@item Qscale @var{n} (@emph{encoding,video})
+Enable constant quality encoding, and set video qscale (quantization
+scale) value, expressed in @var{n} QP units.
+
+@item VideoQMin @var{n} (@emph{encoding,video})
+@item VideoQMax @var{n} (@emph{encoding,video})
+Set video qmin/qmax.
+
+@item VideoQDiff @var{integer} (@emph{encoding,video})
+Set video @option{qdiff} encoding option.
+
+@item LumiMask @var{float} (@emph{encoding,video})
+@item DarkMask @var{float} (@emph{encoding,video})
+Set @option{lumi_mask}/@option{dark_mask} encoding options.
+
+@item AVOptionVideo @var{option} @var{value} (@emph{encoding,video})
+Set generic option for video stream.
+
+@item AVPresetVideo @var{preset} (@emph{encoding,video})
+Set preset for video stream.
+
+@var{preset} must be the path of a preset file.
+@end table
+
+@subsection Server status stream
+
+A server status stream is a special stream which is used to show
+statistics about the @command{ffserver} operations.
+
+It must be specified setting the option @option{Format} to
+@samp{status}.
+
+@section Redirect section
+
+A redirect section specifies where to redirect the requested URL to
+another page.
+
+A redirect section must be introduced by the line:
+@example
+<Redirect NAME>
+@end example
+
+where @var{NAME} is the name of the page which should be redirected.
+
+It only accepts the option @option{URL}, which specify the redirection
+URL.
+
+@chapter Stream examples
+
+@itemize
+@item
+Multipart JPEG
+@example
+<Stream test.mjpg>
+Feed feed1.ffm
+Format mpjpeg
+VideoFrameRate 2
+VideoIntraOnly
+NoAudio
+Strict -1
+</Stream>
+@end example
+
+@item
+Single JPEG
+@example
+<Stream test.jpg>
+Feed feed1.ffm
+Format jpeg
+VideoFrameRate 2
+VideoIntraOnly
+VideoSize 352x240
+NoAudio
+Strict -1
+</Stream>
+@end example
+
+@item
+Flash
+@example
+<Stream test.swf>
+Feed feed1.ffm
+Format swf
+VideoFrameRate 2
+VideoIntraOnly
+NoAudio
+</Stream>
+@end example
+
+@item
+ASF compatible
+@example
+<Stream test.asf>
+Feed feed1.ffm
+Format asf
+VideoFrameRate 15
+VideoSize 352x240
+VideoBitRate 256
+VideoBufferSize 40
+VideoGopSize 30
+AudioBitRate 64
+StartSendOnKey
+</Stream>
+@end example
+
+@item
+MP3 audio
+@example
+<Stream test.mp3>
+Feed feed1.ffm
+Format mp2
+AudioCodec mp3
+AudioBitRate 64
+AudioChannels 1
+AudioSampleRate 44100
+NoVideo
+</Stream>
+@end example
+
+@item
+Ogg Vorbis audio
+@example
+<Stream test.ogg>
+Feed feed1.ffm
+Metadata title "Stream title"
+AudioBitRate 64
+AudioChannels 2
+AudioSampleRate 44100
+NoVideo
+</Stream>
+@end example
+
+@item
+Real with audio only at 32 kbits
+@example
+<Stream test.ra>
+Feed feed1.ffm
+Format rm
+AudioBitRate 32
+NoVideo
+</Stream>
+@end example
+
+@item
+Real with audio and video at 64 kbits
+@example
+<Stream test.rm>
+Feed feed1.ffm
+Format rm
+AudioBitRate 32
+VideoBitRate 128
+VideoFrameRate 25
+VideoGopSize 25
+</Stream>
+@end example
+
+@item
+For stream coming from a file: you only need to set the input filename
+and optionally a new format.
+
+@example
+<Stream file.rm>
+File "/usr/local/httpd/htdocs/tlive.rm"
+NoAudio
+</Stream>
+@end example
+
+@example
+<Stream file.asf>
+File "/usr/local/httpd/htdocs/test.asf"
+NoAudio
+Metadata author "Me"
+Metadata copyright "Super MegaCorp"
+Metadata title "Test stream from disk"
+Metadata comment "Test comment"
+</Stream>
+@end example
+@end itemize
+
 @c man end
 
 @include config.texi

omxplayer-2014.02.11.tar.gz/ffmpeg/doc/fftools-common-opts.texi -> omxplayer-2014.03.28.tar.gz/ffmpeg/doc/fftools-common-opts.texi Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/doc/filters.texi -> omxplayer-2014.03.28.tar.gz/ffmpeg/doc/filters.texi Changed

@@ -198,7 +198,7 @@
 pads must be connected. A filtergraph is considered valid if all the
 filter input and output pads of all the filterchains are connected.
 
-Libavfilter will automatically insert scale filters where format
+Libavfilter will automatically insert @ref{scale} filters where format
 conversion is required. It is possible to specify swscale flags
 for those automatically inserted scalers by prepending
 @code{sws_flags=@var{flags};}
@@ -217,29 +217,45 @@
 
 @section Notes on filtergraph escaping
 
-Some filter arguments require the use of special characters, typically
-@code{:} to separate key=value pairs in a named options list. In this
-case the user should perform a first level escaping when specifying
-the filter arguments. For example, consider the following literal
-string to be embedded in the @ref{drawtext} filter arguments:
+Filtergraph description composition entails several levels of
+escaping. See @ref{quoting_and_escaping,,the "Quoting and escaping"
+section in the ffmpeg-utils(1) manual,ffmpeg-utils} for more
+information about the employed escaping procedure.
+
+A first level escaping affects the content of each filter option
+value, which may contain the special character @code{:} used to
+separate values, or one of the escaping characters @code{\'}.
+
+A second level escaping affects the whole filter description, which
+may contain the escaping characters @code{\'} or the special
+characters @code{[],;} used by the filtergraph description.
+
+Finally, when you specify a filtergraph on a shell commandline, you
+need to perform a third level escaping for the shell special
+characters contained within it.
+
+For example, consider the following string to be embedded in
+the @ref{drawtext} filter description @option{text} value:
 @example
 this is a 'string': may contain one, or more, special characters
 @end example
 
-Since @code{:} is special for the filter arguments syntax, it needs to
-be escaped, so you get:
+This string contains the @code{'} special escaping character, and the
+@code{:} special character, so it needs to be escaped in this way:
 @example
 text=this is a \'string\'\: may contain one, or more, special characters
 @end example
 
 A second level of escaping is required when embedding the filter
-arguments in a filtergraph description, in order to escape all the
+description in a filtergraph description, in order to escape all the
 filtergraph special characters. Thus the example above becomes:
 @example
 drawtext=text=this is a \\\'string\\\'\\: may contain one\, or more\, special characters
 @end example
+(note that in addition to the @code{\'} escaping special characters,
+also @code{,} needs to be escaped).
 
-Finally an additional level of escaping may be needed when writing the
+Finally an additional level of escaping is needed when writing the
 filtergraph description in a shell command, which depends on the
 escaping rules of the adopted shell. For example, assuming that
 @code{\} is special and needs to be escaped with another @code{\}, the
@@ -248,26 +264,6 @@
 -vf "drawtext=text=this is a \\\\\\'string\\\\\\'\\\\: may contain one\\, or more\\, special characters"
 @end example
 
-Sometimes, it might be more convenient to employ quoting in place of
-escaping. For example the string:
-@example
-Caesar: tu quoque, Brute, fili mi
-@end example
-
-Can be quoted in the filter arguments as:
-@example
-text='Caesar: tu quoque, Brute, fili mi'
-@end example
-
-And finally inserted in a filtergraph like:
-@example
-drawtext=text=\'Caesar: tu quoque\, Brute\, fili mi\'
-@end example
-
-See the ``Quoting and escaping'' section in the ffmpeg-utils manual
-for more information about the escaping and quoting rules adopted by
-FFmpeg.
-
 @chapter Timeline editing
 
 Some filters support a generic @option{enable} option. For the filters
@@ -371,7 +367,7 @@
 Delay first channel by 1.5 seconds, the third channel by 0.5 seconds and leave
 the second channel (and any other channels that may be present) unchanged.
 @example
-adelay=1500:0:500
+adelay=1500|0|500
 @end example
 @end itemize
 
@@ -435,6 +431,70 @@
 @end example
 @end itemize
 
+@section aeval
+
+Modify an audio signal according to the specified expressions.
+
+This filter accepts one or more expressions (one for each channel),
+which are evaluated and used to modify a corresponding audio signal.
+
+This filter accepts the following options:
+
+@table @option
+@item exprs
+Set the '|'-separated expressions list for each separate channel. If
+the number of input channels is greater than the number of
+expressions, the last specified expression is used for the remaining
+output channels.
+
+@item channel_layout, c
+Set output channel layout. If not specified, the channel layout is
+specified by the number of expressions. If set to @samp{same}, it will
+use by default the same input channel layout.
+@end table
+
+Each expression in @var{exprs} can contain the following constants and functions:
+
+@table @option
+@item ch
+channel number of the current expression
+
+@item n
+number of the evaluated sample, starting from 0
+
+@item s
+sample rate
+
+@item t
+time of the evaluated sample expressed in seconds
+
+@item nb_in_channels
+@item nb_out_channels
+input and output number of channels
+
+@item val(CH)
+the value of input channel with number @var{CH}
+@end table
+
+Note: this filter is slow. For faster processing you should use a
+dedicated filter.
+
+@subsection Examples
+
+@itemize
+@item
+Half volume:
+@example
+aeval=val(ch)/2:c=same
+@end example
+
+@item
+Invert phase of the second channel:
+@example
+eval=val(0)|-val(1)
+@end example
+@end itemize
+
 @section afade
 
 Apply fade-in/out effect to input audio.
@@ -1207,79 +1267,76 @@
 @end example
 
 @section compand
-
 Compress or expand audio dynamic range.
 
 A description of the accepted options follows.
 
 @table @option
+
 @item attacks
 @item decays
-Set list of times in seconds for each channel over which the instantaneous
-level of the input signal is averaged to determine its volume.
-@option{attacks} refers to increase of volume and @option{decays} refers
-to decrease of volume.
-For most situations, the attack time (response to the audio getting louder)
-should be shorter than the decay time because the human ear is more sensitive
-to sudden loud audio than sudden soft audio.
-Typical value for attack is @code{0.3} seconds and for decay @code{0.8}
-seconds.
+Set list of times in seconds for each channel over which the instantaneous level
+of the input signal is averaged to determine its volume. @var{attacks} refers to
+increase of volume and @var{decays} refers to decrease of volume. For most
+situations, the attack time (response to the audio getting louder) should be
+shorter than the decay time because the human ear is more sensitive to sudden
+loud audio than sudden soft audio. A typical value for attack is 0.3 seconds and
+a typical value for decay is 0.8 seconds.
 
 @item points
-Set list of points for transfer function, specified in dB relative to maximum
-possible signal amplitude.
-Each key points list need to be defined using the following syntax:
-@code{x0/y0 x1/y1 x2/y2 ...}.
-
-The input values must be in strictly increasing order but the transfer
-function does not have to be monotonically rising.
-The point @code{0/0} is assumed but may be overridden (by @code{0/out-dBn}).
-Typical values for the transfer function are @code{-70/-70 -60/-20}.
+Set list of points for the transfer function, specified in dB relative to the
+maximum possible signal amplitude. Each key points list must be defined using
+the following syntax: @code{x0/y0|x1/y1|x2/y2|....} or
+@code{x0/y0 x1/y1 x2/y2 ....}
+
+The input values must be in strictly increasing order but the transfer function
+does not have to be monotonically rising. The point @code{0/0} is assumed but
+may be overridden (by @code{0/out-dBn}). Typical values for the transfer
+function are @code{-70/-70|-60/-20}.
 
 @item soft-knee
-Set amount for which the points at where adjacent line segments on the
-transfer function meet will be rounded. Defaults is @code{0.01}.
+Set the curve radius in dB for all joints. Defaults to 0.01.
 
 @item gain
-Set additional gain in dB to be applied at all points on the transfer function
-and allows easy adjustment of the overall gain.
-Default is @code{0}.
+Set additional gain in dB to be applied at all points on the transfer function.
+This allows easy adjustment of the overall gain. Defaults to 0.
 
 @item volume
 Set initial volume in dB to be assumed for each channel when filtering starts.
-This permits the user to supply a nominal level initially, so that,
-for example, a very large gain is not applied to initial signal levels before
-the companding has begun to operate. A typical value for audio which is
-initially quiet is -90 dB. Default is @code{0}.
+This permits the user to supply a nominal level initially, so that, for
+example, a very large gain is not applied to initial signal levels before the
+companding has begun to operate. A typical value for audio which is initially
+quiet is -90 dB. Defaults to 0.
 
 @item delay
-Set delay in seconds. Default is @code{0}. The input audio
-is analysed immediately, but audio is delayed before being fed to the
-volume adjuster. Specifying a delay approximately equal to the attack/decay
-times allows the filter to effectively operate in predictive rather than
-reactive mode.
+Set delay in seconds. The input audio is analyzed immediately, but audio is
+delayed before being fed to the volume adjuster. Specifying a delay
+approximately equal to the attack/decay times allows the filter to effectively
+operate in predictive rather than reactive mode. Defaults to 0.
+
 @end table
 
 @subsection Examples
+
 @itemize
 @item
-Make music with both quiet and loud passages suitable for listening
-in a noisy environment:
+Make music with both quiet and loud passages suitable for listening in a noisy
+environment:
 @example
-compand=.3 .3:1 1:-90/-60 -60/-40 -40/-30 -20/-20:6:0:-90:0.2
+compand=.3|.3:1|1:-90/-60|-60/-40|-40/-30|-20/-20:6:0:-90:0.2
 @end example
 
 @item
-Noise-gate for when the noise is at a lower level than the signal:
+Noise gate for when the noise is at a lower level than the signal:
 @example
-compand=.1 .1:.2 .2:-900/-900 -50.1/-900 -50/-50:.01:0:-90:.1
+compand=.1|.1:.2|.2:-900/-900|-50.1/-900|-50/-50:.01:0:-90:.1
 @end example
 
 @item
-Here is another noise-gate, this time for when the noise is at a higher level
+Here is another noise gate, this time for when the noise is at a higher level
 than the signal (making it, in some ways, similar to squelch):
 @example
-compand=.1 .1:.1 .1:-45.1/-45.1 -45/-900 0/-900:.01:45:-90:.1
+compand=.1|.1:.1|.1:-45.1/-45.1|-45/-900|0/-900:.01:45:-90:.1
 @end example
 @end itemize
 
@@ -1331,6 +1388,21 @@
 Beware of clipping when using a positive gain.
 @end table
 
+@subsection Examples
+@itemize
+@item
+Attenuate 10 dB at 1000 Hz, with a bandwidth of 200 Hz:
+@example
+equalizer=f=1000:width_type=h:width=200:g=-10
+@end example
+
+@item
+Apply 2 dB gain at 1000 Hz with Q 1 and attenuate 5 dB at 100 Hz with Q 2:
+@example
+equalizer=f=1000:width_type=q:width=1:g=2,equalizer=f=100:width_type=q:width=2:g=-5
+@end example
+@end itemize
+
 @section highpass
 
 Apply a high-pass filter with 3dB point frequency.
@@ -1732,7 +1804,7 @@
 @table @option
 
 @item volume
-Expresses how the audio volume will be increased or decreased.
+Set audio volume expression.
 
 Output values are clipped to the maximum value.
 
@@ -1741,7 +1813,7 @@
 @var{output_volume} = @var{volume} * @var{input_volume}
 @end example
 
-Default value for @var{volume} is 1.0.
+Default value for @var{volume} is "1.0".
 
 @item precision
 Set the mathematical precision.
@@ -1757,6 +1829,66 @@
 @item double
 64-bit floating-point; limits input sample format to DBL.
 @end table
+
+@item eval
+Set when the volume expression is evaluated.
+
+It accepts the following values:
+@table @samp
+@item once
+only evaluate expression once during the filter initialization, or
+when the @samp{volume} command is sent
+
+@item frame
+evaluate expression for each incoming frame
+@end table
+
+Default value is @samp{once}.
+@end table
+
+The volume expression can contain the following parameters.
+
+@table @option
+@item n
+frame number (starting at zero)
+@item nb_channels
+number of channels
+@item nb_consumed_samples
+number of samples consumed by the filter
+@item nb_samples
+number of samples in the current frame
+@item pos
+original frame position in the file
+@item pts
+frame PTS
+@item sample_rate
+sample rate
+@item startpts
+PTS at start of stream
+@item startt
+time at start of stream
+@item t
+frame time
+@item tb
+timestamp timebase
+@item volume
+last set volume value
+@end table
+
+Note that when @option{eval} is set to @samp{once} only the
+@var{sample_rate} and @var{tb} variables are available, all other
+variables will evaluate to NAN.
+
+@subsection Commands
+
+This filter supports the following commands:
+@table @option
+@item volume
+Modify the volume expression.
+The command accepts the same syntax of the corresponding option.
+
+If the specified expression is not valid, it is kept at its current
+value.
 @end table
 
 @subsection Examples
@@ -1781,6 +1913,12 @@
 @example
 volume=volume=6dB:precision=fixed
 @end example
+
+@item
+Fade volume after time 10 with an annihilation period of 5 seconds:
+@example
+volume='if(lt(t,10),1,max(1-(t-10)/5,0))':eval=frame
+@end example
 @end itemize
 
 @section volumedetect
@@ -1896,7 +2034,8 @@
 @item exprs
 Set the '|'-separated expressions list for each separate channel. In case the
 @option{channel_layout} option is not specified, the selected channel layout
-depends on the number of provided expressions.
+depends on the number of provided expressions. Otherwise the last
+specified expression is applied to the remaining output channels.
 
 @item channel_layout, c
 Set the channel layout. The number of channels in the specified layout
@@ -2412,6 +2551,24 @@
 @example
 blend=all_expr='if(eq(mod(X,2),mod(Y,2)),A,B)'
 @end example
+
+@item
+Apply uncover left effect:
+@example
+blend=all_expr='if(gte(N*SW+X,W),A,B)'
+@end example
+
+@item
+Apply uncover down effect:
+@example
+blend=all_expr='if(gte(Y-N*SH,0),A,B)'
+@end example
+
+@item
+Apply uncover up-left effect:
+@example
+blend=all_expr='if(gte(T*SH*40+Y,H)*gte((T*40*SW+X)*W/H,W),A,B)'
+@end example
 @end itemize
 
 @section boxblur
@@ -3055,6 +3212,38 @@
 @code{1}.
 @end table
 
+@section dejudder
+
+Remove judder produced by partially interlaced telecined content.
+
+Judder can be introduced, for instance, by @ref{pullup} filter. If the original
+source was partially telecined content then the output of @code{pullup,dejudder}
+will have a variable frame rate. May change the recorded frame rate of the
+container. Aside from that change, this filter will not affect constant frame
+rate video.
+
+The option available in this filter is:
+@table @option
+
+@item cycle
+Specify the length of the window over which the judder repeats.
+
+Accepts any interger greater than 1. Useful values are:
+@table @samp
+
+@item 4
+If the original was telecined from 24 to 30 fps (Film to NTSC).
+
+@item 5
+If the original was telecined from 25 to 30 fps (PAL to NTSC).
+
+@item 20
+If a mixture of the two.
+@end table
+
+The default is @samp{4}.
+@end table
+
 @section delogo
 
 Suppress a TV station logo by a simple interpolation of the surrounding
@@ -3384,6 +3573,16 @@
 
 The default value of @var{boxcolor} is "white".
 
+@item borderw
+Set the width of the border to be drawn around the text using @var{bordercolor}.
+The default value of @var{borderw} is 0.
+
+@item bordercolor
+Set the color to be used for drawing border around text. For the syntax of this
+option, check the "Color" section in the ffmpeg-utils manual.
+
+The default value of @var{bordercolor} is "black".
+
 @item expansion
 Select how the @var{text} is expanded. Can be either @code{none},
 @code{strftime} (deprecated) or
@@ -3430,7 +3629,7 @@
 @item no_autohint
 @end table
 
-Default value is "render".
+Default value is "default".
 
 For more information consult the documentation for the FT_LOAD_*
 libfreetype flags.
@@ -3772,6 +3971,32 @@
 @end example
 @end itemize
 
+@section elbg
+
+Apply a posterize effect using the ELBG (Enhanced LBG) algorithm.
+
+For each input image, the filter will compute the optimal mapping from
+the input to the output given the codebook length, that is the number
+of distinct output colors.
+
+This filter accepts the following options.
+
+@table @option
+@item codebook_length, l
+Set codebook length. The value must be a positive integer, and
+represents the number of distinct output colors. Default value is 256.
+
+@item nb_steps, n
+Set the maximum number of iterations to apply for computing the optimal
+mapping. The higher the value the better the result and the higher the
+computation time. Default value is 1.
+
+@item seed, s
+Set a random seed, must be an integer included between 0 and
+UINT32_MAX. If not specified, or if explicitly set to -1, the filter
+will try to use a good random seed on a best effort basis.
+@end table
+
 @section fade
 
 Apply fade-in/out effect to input video.
@@ -3791,7 +4016,8 @@
 @item nb_frames, n
 The number of frames for which the fade effect has to last. At the end of the
 fade-in effect the output video will have the same intensity as the input video,
-at the end of the fade-out transition the output video will be completely black.
+at the end of the fade-out transition the output video will be filled with the
+selected @option{color}.
 Default is 25.
 
 @item alpha
@@ -3806,8 +4032,12 @@
 @item duration, d
 The number of seconds for which the fade effect has to last. At the end of the
 fade-in effect the output video will have the same intensity as the input video,
-at the end of the fade-out transition the output video will be completely black.
+at the end of the fade-out transition the output video will be filled with the
+selected @option{color}.
 If both duration and nb_frames are specified, duration is used. Default is 0.
+
+@item color, c
+Specify the color of the fade. Default is "black".
 @end table
 
 @subsection Examples
@@ -3838,9 +4068,9 @@
 @end example
 
 @item
-Make first 5 frames black, then fade in from frame 5-24:
+Make first 5 frames yellow, then fade in from frame 5-24:
 @example
-fade=in:5:20
+fade=in:5:20:color=yellow
 @end example
 
 @item
@@ -4265,6 +4495,7 @@
 @end example
 @end itemize
 
+@anchor{fps}
 @section fps
 
 Convert the video to specified constant frame rate by duplicating or dropping
@@ -4325,6 +4556,51 @@
 @end example
 @end itemize
 
+@section framepack
+
+Pack two different video streams into a stereoscopic video, setting proper
+metadata on supported codecs. The two views should have the same size and
+framerate and processing will stop when the shorter video ends. Please note
+that you may conveniently adjust view properties with the @ref{scale} and
+@ref{fps} filters.
+
+This filter accepts the following named parameters:
+@table @option
+
+@item format
+Desired packing format. Supported values are:
+
+@table @option
+
+@item sbs
+Views are next to each other (default).
+
+@item tab
+Views are on top of each other.
+
+@item lines
+Views are packed by line.
+
+@item columns
+Views are eacked by column.
+
+@item frameseq
+Views are temporally interleaved.
+
+@end table
+
+@end table
+
+Some examples follow:
+
+@example
+# Convert left and right views into a frame sequential video.
+ffmpeg -i LEFT -i RIGHT -filter_complex framepack=frameseq OUTPUT
+
+# Convert views into a side-by-side video with the same output resolution as the input.
+ffmpeg -i LEFT -i RIGHT -filter_complex [0:v]scale=w=iw/2[left],[1:v]scale=w=iw/2[right],[left][right]framepack=sbs OUTPUT
+@end example
+
 @section framestep
 
 Select one frame every N-th frame.
@@ -4690,8 +4966,8 @@
 
 Compute and draw a color distribution histogram for the input video.
 
-The computed histogram is a representation of distribution of color components
-in an image.
+The computed histogram is a representation of the color component
+distribution in an image.
 
 The filter accepts the following options:
 
@@ -4702,41 +4978,38 @@
 It accepts the following values:
 @table @samp
 @item levels
-standard histogram that display color components distribution in an image.
-Displays color graph for each color component. Shows distribution
-of the Y, U, V, A or R, G, B components, depending on input format,
-in current frame. Bellow each graph is color component scale meter.
+Standard histogram that displays the color components distribution in an
+image. Displays color graph for each color component. Shows distribution of
+the Y, U, V, A or R, G, B components, depending on input format, in the
+current frame. Below each graph a color component scale meter is shown.
 
 @item color
-chroma values in vectorscope, if brighter more such chroma values are
-distributed in an image.
-Displays chroma values (U/V color placement) in two dimensional graph
-(which is called a vectorscope). It can be used to read of the hue and
-saturation of the current frame. At a same time it is a histogram.
-The whiter a pixel in the vectorscope, the more pixels of the input frame
-correspond to that pixel (that is the more pixels have this chroma value).
-The V component is displayed on the horizontal (X) axis, with the leftmost
-side being V = 0 and the rightmost side being V = 255.
-The U component is displayed on the vertical (Y) axis, with the top
-representing U = 0 and the bottom representing U = 255.
-
-The position of a white pixel in the graph corresponds to the chroma value
-of a pixel of the input clip. So the graph can be used to read of the
-hue (color flavor) and the saturation (the dominance of the hue in the color).
-As the hue of a color changes, it moves around the square. At the center of
-the square, the saturation is zero, which means that the corresponding pixel
-has no color. If you increase the amount of a specific color, while leaving
-the other colors unchanged, the saturation increases, and you move towards
+Displays chroma values (U/V color placement) in a two dimensional
+graph (which is called a vectorscope). The brighter a pixel in the
+vectorscope, the more pixels of the input frame correspond to that pixel
+(i.e., more pixels have this chroma value). The V component is displayed on
+the horizontal (X) axis, with the leftmost side being V = 0 and the rightmost
+side being V = 255. The U component is displayed on the vertical (Y) axis,
+with the top representing U = 0 and the bottom representing U = 255.
+
+The position of a white pixel in the graph corresponds to the chroma value of
+a pixel of the input clip. The graph can therefore be used to read the hue
+(color flavor) and the saturation (the dominance of the hue in the color). As
+the hue of a color changes, it moves around the square. At the center of the
+square the saturation is zero, which means that the corresponding pixel has no
+color. If the amount of a specific color is increased (while leaving the other
+colors unchanged) the saturation increases, and the indicator moves towards
 the edge of the square.
 
 @item color2
-chroma values in vectorscope, similar as @code{color} but actual chroma values
+Chroma values in vectorscope, similar as @code{color} but actual chroma values
 are displayed.
 
 @item waveform
-per row/column color component graph. In row mode graph in the left side represents
-color component value 0 and right side represents value = 255. In column mode top
-side represents color component value = 0 and bottom side represents value = 255.
+Per row/column color component graph. In row mode, the graph on the left side
+represents color component value 0 and the right side represents value = 255.
+In column mode, the top side represents color component value = 0 and bottom
+side represents value = 255.
 @end table
 Default value is @code{levels}.
 
@@ -4749,8 +5022,8 @@
 Allowed range is [0, 40].
 
 @item step
-Set step for @code{waveform} mode. Smaller values are useful to find out how much
-of same luminance values across input rows/columns are distributed.
+Set step for @code{waveform} mode. Smaller values are useful to find out how
+many values of the same luminance are distributed across input rows/columns.
 Default value is @code{10}. Allowed range is [1, 255].
 
 @item waveform_mode
@@ -4769,26 +5042,25 @@
 @table @samp
 @item parade
 Display separate graph for the color components side by side in
-@code{row} waveform mode or one below other in @code{column} waveform mode
-for @code{waveform} histogram mode. For @code{levels} histogram mode
-per color component graphs are placed one bellow other.
-
-This display mode in @code{waveform} histogram mode makes it easy to spot
-color casts in the highlights and shadows of an image, by comparing the
-contours of the top and the bottom of each waveform.
-Since whites, grays, and blacks are characterized by
-exactly equal amounts of red, green, and blue, neutral areas of the
-picture should display three waveforms of roughly equal width/height.
-If not, the correction is easy to make by making adjustments to level the
-three waveforms.
+@code{row} waveform mode or one below the other in @code{column} waveform mode
+for @code{waveform} histogram mode. For @code{levels} histogram mode,
+per color component graphs are placed below each other.
+
+Using this display mode in @code{waveform} histogram mode makes it easy to
+spot color casts in the highlights and shadows of an image, by comparing the
+contours of the top and the bottom graphs of each waveform. Since whites,
+grays, and blacks are characterized by exactly equal amounts of red, green,
+and blue, neutral areas of the picture should display three waveforms of
+roughly equal width/height. If not, the correction is easy to perform by
+making level adjustments the three waveforms.
 
 @item overlay
-Presents information that's identical to that in the @code{parade}, except
+Presents information identical to that in the @code{parade}, except
 that the graphs representing color components are superimposed directly
 over one another.
 
-This display mode in @code{waveform} histogram mode can make it easier to spot
-the relative differences or similarities in overlapping areas of the color
+This display mode in @code{waveform} histogram mode makes it easier to spot
+relative differences or similarities in overlapping areas of the color
 components that are supposed to be identical, such as neutral whites, grays,
 or blacks.
 @end table
@@ -5003,7 +5275,8 @@
 
 Simple interlacing filter from progressive contents. This interleaves upper (or
 lower) lines from odd frames with lower (or upper) lines from even frames,
-halving the frame rate and preserving image height.
+halving the frame rate and preserving image height. A vertical lowpass filter
+is always applied in order to avoid twitter effects and reduce moiré patterns.
 
 @example
    Original        Original             New Frame
@@ -5023,10 +5296,6 @@
 @item scan
 determines whether the interlaced frame is taken from the even (tff - default)
 or odd (bff) lines of the progressive frame.
-
-@item lowpass
-Enable (default) or disable the vertical lowpass filter to avoid twitter
-interlacing and reduce moire patterns.
 @end table
 
 @section kerndeint
@@ -5662,6 +5931,19 @@
 the expression is invalid, it is set to a huge value (meaning that the
 overlay will not be displayed within the output visible area).
 
+@item eof_action
+The action to take when EOF is encountered on the secondary input, accepts one
+of the following values:
+
+@table @option
+@item repeat
+repeat the last frame (the default)
+@item endall
+end both streams
+@item pass
+pass through the main input
+@end table
+
 @item eval
 Set when the expressions for @option{x}, and @option{y} are evaluated.
 
@@ -5689,6 +5971,9 @@
 @item yuv420
 force YUV420 output
 
+@item yuv422
+force YUV422 output
+
 @item yuv444
 force YUV444 output
 
@@ -5740,6 +6025,7 @@
 
 @item t
 timestamp expressed in seconds, NAN if the input timestamp is unknown
+
 @end table
 
 Note that the @var{n}, @var{pos}, @var{t} variables are available only
@@ -5836,6 +6122,14 @@
 @end example
 
 @item
+mask 10-20 seconds of a video by applying the delogo filter to a section
+@example
+ffmpeg -i test.avi -codec:v:0 wmv2 -ar 11025 -b:v 9000k
+-vf '[in]split[split_main][split_delogo];[split_delogo]trim=start=360:end=371,delogo=0:0:640:480[delogoed];[split_main][delogoed]overlay=eof_action=pass[out]'
+masked.avi
+@end example
+
+@item
 Chain several overlays in cascade:
 @example
 nullsrc=s=200x200 [bg];
@@ -6365,6 +6659,7 @@
 reference file @file{ref_movie.mpg}. The PSNR of each individual frame
 is stored in @file{stats.log}.
 
+@anchor{pullup}
 @section pullup
 
 Pulldown reversal (inverse telecine) filter, capable of handling mixed
@@ -6422,9 +6717,11 @@
 load and make pullup usable in realtime on slow machines.
 @end table
 
-For example to inverse telecined NTSC input:
+For best results (without duplicated frames in the output file) it is
+necessary to change the output frame rate. For example, to inverse
+telecine NTSC input:
 @example
-pullup,fps=24000/1001
+ffmpeg -i input -vf pullup -r 24000/1001 ...
 @end example
 
 @section removelogo
@@ -6512,11 +6809,11 @@
 
 @item in_w, iw
 @item in_h, ih
-the input video width and heigth
+the input video width and height
 
 @item out_w, ow
 @item out_h, oh
-the output width and heigth, that is the size of the padded area as
+the output width and height, that is the size of the padded area as
 specified by the @var{width} and @var{height} expressions
 
 @item rotw(a)
@@ -6544,6 +6841,12 @@
 @end example
 
 @item
+Rotate the input by 45 degrees clockwise:
+@example
+rotate=45*PI/180
+@end example
+
+@item
 Apply a constant rotation with period T, starting from an angle of PI/3:
 @example
 rotate=PI/3+2*PI*t/T
@@ -6620,6 +6923,7 @@
 Each chroma option value, if not explicitly specified, is set to the
 corresponding luma option value.
 
+@anchor{scale}
 @section scale
 
 Scale (resize) the input video, using the libswscale library.
@@ -6651,6 +6955,11 @@
 other specified dimension. If both of them are -1, the input size is
 used
 
+If one of the values is -n with n > 1, the scale filter will also use a value
+that maintains the aspect ratio of the input image, calculated from the other
+specified dimension. After that it will, however, make sure that the calculated
+dimension is divisible by n and adjust the value if necessary.
+
 See below for the list of accepted constants for use in the dimension
 expression.
 
@@ -6802,7 +7111,12 @@
 
 @item hsub
 @item vsub
-horizontal and vertical chroma subsample values. For example for the
+horizontal and vertical input chroma subsample values. For example for the
+pixel format "yuv422p" @var{hsub} is 2 and @var{vsub} is 1.
+
+@item ohsub
+@item ovsub
+horizontal and vertical output chroma subsample values. For example for the
 pixel format "yuv422p" @var{hsub} is 2 and @var{vsub} is 1.
 @end table
 
@@ -6952,6 +7266,31 @@
 
 @end table
 
+The parameter @var{sar} is an expression containing
+the following constants:
+
+@table @option
+@item E, PI, PHI
+the corresponding mathematical approximated values for e
+(euler number), pi (greek PI), phi (golden ratio)
+
+@item w, h
+the input width and height
+
+@item a
+same as @var{w} / @var{h}
+
+@item sar
+input sample aspect ratio
+
+@item dar
+input display aspect ratio, it is the same as (@var{w} / @var{h}) * @var{sar}
+
+@item hsub, vsub
+horizontal and vertical chroma subsample values. For example for the
+pixel format "yuv422p" @var{hsub} is 2 and @var{vsub} is 1.
+@end table
+
 @subsection Examples
 
 @itemize
@@ -7784,7 +8123,7 @@
 @item accuracy
 Set the accuracy of the detection process. It must be a value in the
 range 1-15. A value of 1 means low accuracy, a value of 15 means high
-accuracy. Default value is 9.
+accuracy. Default value is 15.
 
 @item stepsize
 Set stepsize of the search process. The region around minimum is
@@ -7856,31 +8195,47 @@
 To enable compilation of this filter you need to configure FFmpeg with
 @code{--enable-libvidstab}.
 
-This filter accepts the following options:
+@subsection Options
 
 @table @option
-
 @item input
-path to the file used to read the transforms (default: @file{transforms.trf})
+Set path to the file used to read the transforms. Default value is
+@file{transforms.trf}).
 
 @item smoothing
-number of frames (value*2 + 1) used for lowpass filtering the camera movements
-(default: 10). For example a number of 10 means that 21 frames are used
-(10 in the past and 10 in the future) to smoothen the motion in the
-video. A larger values leads to a smoother video, but limits the
-acceleration of the camera (pan/tilt movements).
+Set the number of frames (value*2 + 1) used for lowpass filtering the
+camera movements. Default value is 10.
+
+For example a number of 10 means that 21 frames are used (10 in the
+past and 10 in the future) to smoothen the motion in the video. A
+larger values leads to a smoother video, but limits the acceleration
+of the camera (pan/tilt movements). 0 is a special case where a
+static camera is simulated.
+
+@item optalgo
+Set the camera path optimization algorithm.
+
+Accepted values are:
+@table @samp
+@item gauss
+gaussian kernel low-pass filter on camera motion (default)
+@item avg
+averaging on transformations
+@end table
 
 @item maxshift
-maximal number of pixels to translate frames (default: -1 no limit)
+Set maximal number of pixels to translate frames. Default value is -1,
+meaning no limit.
 
 @item maxangle
-maximal angle in radians (degree*PI/180) to rotate frames (default: -1
-no limit)
+Set maximal angle in radians (degree*PI/180) to rotate frames. Default
+value is -1, meaning no limit.
 
 @item crop
-How to deal with borders that may be visible due to movement
-compensation. Available values are:
+Specify how to deal with borders that may be visible due to movement
+compensation.
 
+Available values are:
 @table @samp
 @item keep
 keep image information from previous frame (default)
@@ -7889,46 +8244,41 @@
 @end table
 
 @item invert
-@table @samp
-@item 0
-keep transforms normal (default)
-@item 1
-invert transforms
-@end table
+Invert transforms if set to 1. Default value is 0.
 
 @item relative
-consider transforms as
-@table @samp
-@item 0
-absolute
-@item 1
-relative to previous frame (default)
-@end table
+Consider transforms as relative to previsou frame if set to 1,
+absolute if set to 0. Default value is 0.
 
 @item zoom
-percentage to zoom (default: 0)
-@table @samp
-@item >0
-zoom in
-@item <0
-zoom out
-@end table
+Set percentage to zoom. A positive value will result in a zoom-in
+effect, a negative value in a zoom-out effect. Default value is 0 (no
+zoom).
 
 @item optzoom
-set optimal zooming to avoid borders
+Set optimal zooming to avoid borders.
+
+Accepted values are:
 @table @samp
 @item 0
 disabled
 @item 1
-optimal static zoom value is determined (only very strong movements will lead to visible borders) (default)
+optimal static zoom value is determined (only very strong movements
+will lead to visible borders) (default)
 @item 2
-optimal adaptive zoom value is determined (no borders will be visible)
+optimal adaptive zoom value is determined (no borders will be
+visible), see @option{zoomspeed}
 @end table
-Note that the value given at zoom is added to the one calculated
-here.
+
+Note that the value given at zoom is added to the one calculated here.
+
+@item zoomspeed
+Set percent to zoom maximally each frame (enabled when
+@option{optzoom} is set to 2). Range is from 0 to 5, default value is
+0.25.
 
 @item interpol
-type of interpolation
+Specify type of interpolation.
 
 Available values are:
 @table @samp
@@ -7943,40 +8293,39 @@
 @end table
 
 @item tripod
-virtual tripod mode means that the video is stabilized such that the
-camera stays stationary. Use also @code{tripod} option of
-@ref{vidstabdetect}.
-@table @samp
-@item 0
-off (default)
-@item 1
-virtual tripod mode: equivalent to @code{relative=0:smoothing=0}
-@end table
+Enable virtual tripod mode if set to 1, which is equivalent to
+@code{relative=0:smoothing=0}. Default value is 0.
+
+Use also @code{tripod} option of @ref{vidstabdetect}.
 
+@item debug
+Increase log verbosity if set to 1. Also the detected global motions
+are written to the temporary file @file{global_motions.trf}. Default
+value is 0.
 @end table
 
 @subsection Examples
 
 @itemize
 @item
-typical call with default default values:
- (note the unsharp filter which is always recommended)
+Use @command{ffmpeg} for a typical stabilization with default values:
 @example
 ffmpeg -i inp.mpeg -vf vidstabtransform,unsharp=5:5:0.8:3:3:0.4 inp_stabilized.mpeg
 @end example
 
+Note the use of the unsharp filter which is always recommended.
+
 @item
-zoom in a bit more and load transform data from a given file
+Zoom in a bit more and load transform data from a given file:
 @example
 vidstabtransform=zoom=5:input="mytransforms.trf"
 @end example
 
 @item
-smoothen the video even more
+Smoothen the video even more:
 @example
 vidstabtransform=smoothing=30
 @end example
-
 @end itemize
 
 @section vflip
@@ -9018,6 +9367,29 @@
 
 By default, the logging level is set to @var{info}. If the @option{video} or
 the @option{metadata} options are set, it switches to @var{verbose}.
+
+@item peak
+Set peak mode(s).
+
+Available modes can be cumulated (the option is a @code{flag} type). Possible
+values are:
+@table @samp
+@item none
+Disable any peak mode (default).
+@item sample
+Enable sample-peak mode.
+
+Simple peak mode looking for the higher sample value. It logs a message
+for sample-peak (identified by @code{SPK}).
+@item true
+Enable true-peak mode.
+
+If enabled, the peak lookup is done on an over-sampled version of the input
+stream for better peak accuracy. It logs a message for true-peak.
+(identified by @code{TPK}) and true-peak per frame (identified by @code{FTPK}).
+This mode requires a build with @code{libswresample}.
+@end table
+
 @end table
 
 @subsection Examples
@@ -9689,6 +10061,23 @@
 alternative color scheme. @code{0} is no saturation at all.
 Saturation must be in [-10.0, 10.0] range.
 Default value is @code{1}.
+
+@item win_func
+Set window function.
+
+It accepts the following values:
+@table @samp
+@item none
+No samples pre-processing (do not expect this to be faster)
+@item hann
+Hann window
+@item hamming
+Hamming window
+@item blackman
+Blackman window
+@end table
+
+Default value is @code{hann}.
 @end table
 
 The usage is very similar to the showwaves filter; see the examples in that

omxplayer-2014.02.11.tar.gz/ffmpeg/doc/formats.texi -> omxplayer-2014.03.28.tar.gz/ffmpeg/doc/formats.texi Changed

@@ -125,18 +125,26 @@
 Use wallclock as timestamps.
 
 @item avoid_negative_ts @var{integer} (@emph{output})
-Shift timestamps to make them non-negative. A value of 1 enables shifting,
-a value of 0 disables it, the default value of -1 enables shifting
-when required by the target format.
+
+Possible values:
+@table @samp
+@item make_non_negative
+Shift timestamps to make them non-negative.
+Also note that this affects only leading negative timestamps, and not
+non-monotonic negative timestamps.
+@item make_zero
+Shift timestamps so that the first timestamp is 0.
+@item auto (default)
+Enables shifting when required by the target format.
+@item disabled
+Disables shifting of timestamp.
+@end table
 
 When shifting is enabled, all output timestamps are shifted by the
 same amount. Audio, video, and subtitles desynching and relative
 timestamp differences are preserved compared to how they would have
 been without shifting.
 
-Also note that this affects only leading negative timestamps, and not
-non-monotonic negative timestamps.
-
 @item skip_initial_bytes @var{integer} (@emph{input})
 Set number of bytes to skip before reading header and frames if set to 1.
 Default is 0.
@@ -148,6 +156,18 @@
 Flush the underlying I/O stream after each packet. Default 1 enables it, and
 has the effect of reducing the latency; 0 disables it and may slightly
 increase performance in some cases.
+
+@item output_ts_offset @var{offset} (@emph{output})
+Set the output time offset.
+
+@var{offset} must be a time duration specification,
+see @ref{time duration syntax,,the Time duration section in the ffmpeg-utils(1) manual,ffmpeg-utils}.
+
+The offset is added by the muxer to the output timestamps.
+
+Specifying a positive offset means that the corresponding streams are
+delayed bt the time duration specified in @var{offset}. Default value
+is @code{0} (meaning that no offset is applied).
 @end table
 
 @c man end FORMAT OPTIONS
@@ -183,6 +203,10 @@
 @code{avformat_match_stream_specifier()} function declared in the
 @file{libavformat/avformat.h} header.
 
+@ifclear config-writeonly
 @include demuxers.texi
+@end ifclear
+@ifclear config-readonly
 @include muxers.texi
+@end ifclear
 @include metadata.texi

omxplayer-2014.02.11.tar.gz/ffmpeg/doc/general.texi -> omxplayer-2014.03.28.tar.gz/ffmpeg/doc/general.texi Changed

@@ -122,6 +122,20 @@
 details), you must upgrade FFmpeg's license to GPL in order to use it.
 @end float
 
+@section x265
+
+FFmpeg can make use of the x265 library for HEVC encoding.
+
+Go to @url{http://x265.org/developers.html} and follow the instructions
+for installing the library. Then pass @code{--enable-libx265} to configure
+to enable it.
+
+@float note
+x265 is under the GNU Public License Version 2 or later
+(see @url{http://www.gnu.org/licenses/old-licenses/gpl-2.0.html} for
+details), you must upgrade FFmpeg's license to GPL in order to use it.
+@end float
+
 @section libilbc
 
 iLBC is a narrowband speech codec that has been made freely available
@@ -148,6 +162,27 @@
 you must upgrade FFmpeg's license to GPL in order to use it.
 @end float
 
+@section AviSynth
+
+FFmpeg can read AviSynth scripts as input. To enable support, pass
+@code{--enable-avisynth} to configure.  The correct headers are
+included in compat/avisynth/, which allows the user to enable support
+without needing to search for these headers themselves.
+
+For Windows, supported AviSynth variants are
+@url{http://avisynth.nl, AviSynth 2.5 or 2.6} for 32-bit builds and
+@url{http://avs-plus.net, AviSynth+ 0.1} for 32-bit and 64-bit builds.
+
+For Linux and OS X, the supported AviSynth variant is
+@url{https://github.com/avxsynth/avxsynth, AvxSynth}.
+
+@float NOTE
+AviSynth and AvxSynth are loaded dynamically.  Distributors can build FFmpeg
+with @code{--enable-avisynth}, and the binaries will work regardless of the
+end user having AviSynth or AvxSynth installed - they'll only need to be
+installed to use AviSynth scripts (obviously).
+@end float
+
 
 @chapter Supported File Formats, Codecs or Features
 
@@ -249,6 +284,8 @@
 @item GXF                       @tab X @tab X
     @tab General eXchange Format SMPTE 360M, used by Thomson Grass Valley
          playout servers.
+@item HNM @tab   @tab X
+    @tab Only version 4 supported, used in some games from Cryo Interactive
 @item iCEDraw File              @tab   @tab X
 @item ICO                       @tab X @tab X
     @tab Microsoft Windows ICO
@@ -299,6 +336,8 @@
     @tab also known as DVB Transport Stream
 @item MPEG-4                    @tab X @tab X
     @tab MPEG-4 is a variant of QuickTime.
+@item Mirillis FIC video        @tab   @tab X
+    @tab No cursor rendering.
 @item MIME multipart JPEG       @tab X @tab
 @item MSN TCP webcam            @tab   @tab X
     @tab Used by MSN Messenger webcam streams.
@@ -338,6 +377,7 @@
 @item raw H.261                 @tab X @tab X
 @item raw H.263                 @tab X @tab X
 @item raw H.264                 @tab X @tab X
+@item raw HEVC                  @tab X @tab X
 @item raw Ingenient MJPEG       @tab   @tab X
 @item raw MJPEG                 @tab X @tab X
 @item raw MLP                   @tab   @tab X
@@ -488,8 +528,8 @@
     @tab YUV, JPEG and some extension is not supported yet.
 @item Truevision Targa  @tab X @tab X
     @tab Targa (.TGA) image format
-@item WebP         @tab @tab X
-    @tab WebP image format
+@item WebP         @tab E @tab X
+    @tab WebP image format, encoding supported through external library libwebp
 @item XBM  @tab X @tab X
     @tab X BitMap image format
 @item XFace @tab X @tab X
@@ -607,6 +647,9 @@
 @item H.263+ / H.263-1998 / H.263 version 2  @tab  X  @tab  X
 @item H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10  @tab  E  @tab  X
     @tab encoding supported through external library libx264
+@item HEVC                   @tab  X  @tab  X
+    @tab encoding supported through the external library libx265
+@item HNM version 4          @tab     @tab  X
 @item HuffYUV                @tab  X  @tab  X
 @item HuffYUV FFmpeg variant @tab  X  @tab  X
 @item IBM Ultimotion         @tab     @tab  X
@@ -658,7 +701,6 @@
 @item Mobotix MxPEG video    @tab     @tab  X
 @item Motion Pixels video    @tab     @tab  X
 @item MPEG-1 video           @tab  X  @tab  X
-@item MPEG-1/2 video XvMC (X-Video Motion Compensation)  @tab     @tab  X
 @item MPEG-2 video           @tab  X  @tab  X
 @item MPEG-4 part 2          @tab  X  @tab  X
     @tab libxvidcore can be used alternatively for encoding.
@@ -829,6 +871,7 @@
     @tab QuickTime fourcc 'alac'
 @item ATRAC1                 @tab     @tab  X
 @item ATRAC3                 @tab     @tab  X
+@item ATRAC3+                @tab     @tab  X
 @item Bink Audio             @tab     @tab  X
     @tab Used in Bink and Smacker files in many games.
 @item CELT                   @tab     @tab  E
@@ -939,7 +982,6 @@
 @item Vorbis                 @tab  E  @tab  X
     @tab A native but very primitive encoder exists.
 @item Voxware MetaSound      @tab     @tab  X
-    @tab imperfect and incomplete support
 @item WavPack                @tab  X  @tab  X
 @item Westwood Audio (SND1)  @tab     @tab  X
 @item Windows Media Audio 1  @tab  X  @tab  X
@@ -993,6 +1035,7 @@
 @multitable @columnfractions .4 .1
 @item Name         @tab Support
 @item file         @tab X
+@item FTP          @tab X
 @item Gopher       @tab X
 @item HLS          @tab X
 @item HTTP         @tab X
@@ -1008,6 +1051,7 @@
 @item RTMPTS       @tab X
 @item RTP          @tab X
 @item SCTP         @tab X
+@item SFTP         @tab E
 @item TCP          @tab X
 @item TLS          @tab X
 @item UDP          @tab X
@@ -1027,13 +1071,14 @@
 @item caca              @tab        @tab X
 @item DV1394            @tab X      @tab
 @item Lavfi virtual device @tab X   @tab
-@item Linux framebuffer @tab X      @tab
+@item Linux framebuffer @tab X      @tab X
 @item JACK              @tab X      @tab
 @item LIBCDIO           @tab X
 @item LIBDC1394         @tab X      @tab
 @item OpenAL            @tab X
+@item OpenGL            @tab        @tab X
 @item OSS               @tab X      @tab X
-@item Pulseaudio        @tab X      @tab
+@item PulseAudio        @tab X      @tab X
 @item SDL               @tab        @tab X
 @item Video4Linux2      @tab X      @tab X
 @item VfW capture       @tab X      @tab

omxplayer-2014.02.11.tar.gz/ffmpeg/doc/libavutil.texi -> omxplayer-2014.03.28.tar.gz/ffmpeg/doc/libavutil.texi Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/doc/muxers.texi -> omxplayer-2014.03.28.tar.gz/ffmpeg/doc/muxers.texi Changed

@@ -23,6 +23,8 @@
 
 Audio Interchange File Format muxer.
 
+@subsection Options
+
 It accepts the following options:
 
 @table @option
@@ -49,6 +51,10 @@
 CRC=0x@var{CRC}, where @var{CRC} is a hexadecimal number 0-padded to
 8 digits containing the CRC for all the decoded input frames.
 
+See also the @ref{framecrc} muxer.
+
+@subsection Examples
+
 For example to compute the CRC of the input, and store it in the file
 @file{out.crc}:
 @example
@@ -68,8 +74,6 @@
 ffmpeg -i INPUT -c:a pcm_u8 -c:v mpeg2video -f crc -
 @end example
 
-See also the @ref{framecrc} muxer.
-
 @anchor{framecrc}
 @section framecrc
 
@@ -89,6 +93,8 @@
 @var{CRC} is a hexadecimal number 0-padded to 8 digits containing the
 CRC of the packet.
 
+@subsection Examples
+
 For example to compute the CRC of the audio and video frames in
 @file{INPUT}, converted to raw audio and video packets, and store it
 in the file @file{out.crc}:
@@ -132,6 +138,8 @@
 @var{MD5} is a hexadecimal number representing the computed MD5 hash
 for the packet.
 
+@subsection Examples
+
 For example to compute the MD5 of the audio and video frames in
 @file{INPUT}, converted to raw audio and video packets, and store it
 in the file @file{out.md5}:
@@ -146,30 +154,89 @@
 
 See also the @ref{md5} muxer.
 
+@anchor{gif}
+@section gif
+
+Animated GIF muxer.
+
+It accepts the following options:
+
+@table @option
+@item loop
+Set the number of times to loop the output. Use @code{-1} for no loop, @code{0}
+for looping indefinitely (default).
+
+@item final_delay
+Force the delay (expressed in centiseconds) after the last frame. Each frame
+ends with a delay until the next frame. The default is @code{-1}, which is a
+special value to tell the muxer to re-use the previous delay. In case of a
+loop, you might want to customize this value to mark a pause for instance.
+@end table
+
+For example, to encode a gif looping 10 times, with a 5 seconds delay between
+the loops:
+@example
+ffmpeg -i INPUT -loop 10 -final_delay 500 out.gif
+@end example
+
+Note 1: if you wish to extract the frames in separate GIF files, you need to
+force the @ref{image2} muxer:
+@example
+ffmpeg -i INPUT -c:v gif -f image2 "out%d.gif"
+@end example
+
+Note 2: the GIF format has a very small time base: the delay between two frames
+can not be smaller than one centi second.
+
 @anchor{hls}
 @section hls
 
 Apple HTTP Live Streaming muxer that segments MPEG-TS according to
-the HTTP Live Streaming specification.
+the HTTP Live Streaming (HLS) specification.
 
 It creates a playlist file and numbered segment files. The output
 filename specifies the playlist filename; the segment filenames
 receive the same basename as the playlist, a sequential number and
 a .ts extension.
 
+For example, to convert an input file with @command{ffmpeg}:
 @example
 ffmpeg -i in.nut out.m3u8
 @end example
 
+See also the @ref{segment} muxer, which provides a more generic and
+flexible implementation of a segmenter, and can be used to perform HLS
+segmentation.
+
+@subsection Options
+
+This muxer supports the following options:
+
 @table @option
-@item -hls_time @var{seconds}
-Set the segment length in seconds.
-@item -hls_list_size @var{size}
-Set the maximum number of playlist entries.
-@item -hls_wrap @var{wrap}
-Set the number after which index wraps.
-@item -start_number @var{number}
-Start the sequence from @var{number}.
+@item hls_time @var{seconds}
+Set the segment length in seconds. Default value is 2.
+
+@item hls_list_size @var{size}
+Set the maximum number of playlist entries. If set to 0 the list file
+will contain all the segments. Default value is 5.
+
+@item hls_wrap @var{wrap}
+Set the number after which the segment filename number (the number
+specified in each segment file) wraps. If set to 0 the number will be
+never wrapped. Default value is 0.
+
+This option is useful to avoid to fill the disk with many segment
+files, and limits the maximum number of segment files written to disk
+to @var{wrap}.
+
+@item start_number @var{number}
+Start the playlist sequence number from @var{number}. Default value is
+0.
+
+Note that the playlist sequence number must be unique for each segment
+and it is not to be confused with the segment filename sequence number
+which can be cyclic, for example if the @option{wrap} option is
+specified.
 @end table
 
 @anchor{ico}
@@ -235,6 +302,8 @@
 form @file{img%-1.jpg}, @file{img%-2.jpg}, ..., @file{img%-10.jpg},
 etc.
 
+@subsection Examples
+
 The following example shows how to use @command{ffmpeg} for creating a
 sequence of files @file{img-001.jpeg}, @file{img-002.jpeg}, ...,
 taking one image every second from the input video:
@@ -257,16 +326,32 @@
 ffmpeg -i in.avi -f image2 -frames:v 1 img.jpeg
 @end example
 
-@table @option
-@item start_number @var{number}
-Start the sequence from @var{number}. Default value is 1. Must be a
-non-negative number.
+The @option{strftime} option allows you to expand the filename with
+date and time information. Check the documentation of
+the @code{strftime()} function for the syntax.
+
+For example to generate image files from the @code{strftime()}
+"%Y-%m-%d_%H-%M-%S" pattern, the following @command{ffmpeg} command
+can be used:
+@example
+ffmpeg -f v4l2 -r 1 -i /dev/video0 -f image2 -strftime 1 "%Y-%m-%d_%H-%M-%S.jpg"
+@end example
 
-@item -update @var{number}
-If @var{number} is nonzero, the filename will always be interpreted as just a
-filename, not a pattern, and this file will be continuously overwritten with new
-images.
+@subsection Options
 
+@table @option
+@item start_number
+Start the sequence from the specified number. Default value is 1. Must
+be a non-negative number.
+
+@item update
+If set to 1, the filename will always be interpreted as just a
+filename, not a pattern, and the corresponding file will be continuously
+overwritten with new images. Default value is 0.
+
+@item strftime
+If set to 1, expand the filename with date and time information from
+@code{strftime()}. Default value is 0.
 @end table
 
 The image muxer supports the .Y.U.V image file format. This format is
@@ -281,25 +366,27 @@
 
 This muxer implements the matroska and webm container specs.
 
+@subsection Metadata
+
 The recognized metadata settings in this muxer are:
 
 @table @option
+@item title
+Set title name provided to a single track.
 
-@item title=@var{title name}
-Name provided to a single track
-@end table
+@item language
+Specify the language of the track in the Matroska languages form.
 
-@table @option
+The language can be either the 3 letters bibliographic ISO-639-2 (ISO
+639-2/B) form (like "fre" for French), or a language code mixed with a
+country code for specialities in languages (like "fre-ca" for Canadian
+French).
 
-@item language=@var{language name}
-Specifies the language of the track in the Matroska languages form
-@end table
+@item stereo_mode
+Set stereo 3D video layout of two views in a single video track.
 
-@table @option
-
-@item stereo_mode=@var{mode}
-Stereo 3D video layout of two views in a single video track
-@table @option
+The following values are recognized:
+@table @samp
 @item mono
 video is not stereo
 @item left_right
@@ -338,10 +425,11 @@
 ffmpeg -i sample_left_right_clip.mpg -an -c:v libvpx -metadata stereo_mode=left_right -y stereo_clip.webm
 @end example
 
+@subsection Options
+
 This muxer supports the following options:
 
 @table @option
-
 @item reserve_index_space
 By default, this muxer writes the index for seeking (called cues in Matroska
 terms) at the end of the file, because it cannot know in advance how much space
@@ -356,7 +444,6 @@
 
 Note that cues are only written if the output is seekable and this option will
 have no effect if it is not.
-
 @end table
 
 @anchor{md5}
@@ -386,7 +473,9 @@
 
 See also the @ref{framemd5} muxer.
 
-@section MOV/MP4/ISMV
+@section mov, mp4, ismv
+
+MOV/MP4/ISMV (Smooth Streaming) muxer.
 
 The mov/mp4/ismv muxer supports fragmentation. Normally, a MOV/MP4
 file has all the metadata about all packets stored in one location
@@ -402,6 +491,8 @@
 every single packet in memory until the file is closed). The downside
 is that it is less compatible with other applications.
 
+@subsection Options
+
 Fragmentation is enabled by setting one of the AVOptions that define
 how to cut the file into fragments:
 
@@ -458,6 +549,8 @@
 Add RTP hinting tracks to the output file.
 @end table
 
+@subsection Example
+
 Smooth Streaming content can be pushed in real time to a publishing
 point on IIS with this muxer. Example:
 @example
@@ -468,12 +561,15 @@
 
 The MP3 muxer writes a raw MP3 stream with an ID3v2 header at the beginning and
 optionally an ID3v1 tag at the end. ID3v2.3 and ID3v2.4 are supported, the
-@code{id3v2_version} option controls which one is used. The legacy ID3v1 tag is
-not written by default, but may be enabled with the @code{write_id3v1} option.
+@code{id3v2_version} option controls which one is used. Setting
+@code{id3v2_version} to 0 will disable the ID3v2 header completely. The legacy
+ID3v1 tag is not written by default, but may be enabled with the
+@code{write_id3v1} option.
 
-For seekable output the muxer also writes a Xing frame at the beginning, which
-contains the number of frames in the file. It is useful for computing duration
-of VBR files.
+The muxer may also write a Xing frame at the beginning, which contains the
+number of frames in the file. It is useful for computing duration of VBR files.
+The Xing frame is written if the output stream is seekable and if the
+@code{write_xing} option is set to 1 (the default).
 
 The muxer supports writing ID3v2 attached pictures (APIC frames). The pictures
 are supplied to the muxer in form of a video stream with a single packet. There
@@ -500,12 +596,24 @@
 -metadata:s:v title="Album cover" -metadata:s:v comment="Cover (Front)" out.mp3
 @end example
 
+Write a "clean" MP3 without any extra features:
+@example
+ffmpeg -i input.wav -write_xing 0 -id3v2_version 0 out.mp3
+@end example
+
 @section mpegts
 
 MPEG transport stream muxer.
 
 This muxer implements ISO 13818-1 and part of ETSI EN 300 468.
 
+The recognized metadata settings in mpegts muxer are @code{service_provider}
+and @code{service_name}. If they are not set the default for
+@code{service_provider} is "FFmpeg" and the default for
+@code{service_name} is "Service01".
+
+@subsection Options
+
 The muxer options are:
 
 @table @option
@@ -558,10 +666,7 @@
 Use LATM packetization for AAC.
 @end table
 
-The recognized metadata settings in mpegts muxer are @code{service_provider}
-and @code{service_name}. If they are not set the default for
-@code{service_provider} is "FFmpeg" and the default for
-@code{service_name} is "Service01".
+@subsection Example
 
 @example
 ffmpeg -i file.mpg -c copy \
@@ -612,11 +717,12 @@
 overhead.
 @end table
 
+@anchor{segment}
 @section segment, stream_segment, ssegment
 
 Basic stream segmenter.
 
-The segmenter muxer outputs streams to a number of separate files of nearly
+This muxer outputs streams to a number of separate files of nearly
 fixed duration. Output filename pattern can be set in a fashion similar to
 @ref{image2}.
 
@@ -638,7 +744,14 @@
 
 Optionally it can generate a list of the created segments, by setting
 the option @var{segment_list}. The list type is specified by the
-@var{segment_list_type} option.
+@var{segment_list_type} option. The entry filenames in the segment
+list are set by default to the basename of the corresponding segment
+files.
+
+See also the @ref{hls} muxer, which provides a more specific
+implementation for HLS segmentation.
+
+@subsection Options
 
 The segment muxer supports the following options:
 
@@ -670,13 +783,15 @@
 Allow live-friendly file generation.
 @end table
 
-Default value is @code{samp}.
-
 @item segment_list_size @var{size}
 Update the list file so that it contains at most the last @var{size}
 segments. If 0 the list file will contain all the segments. Default
 value is 0.
 
+@item segment_list_entry_prefix @var{prefix}
+Set @var{prefix} to prepend to the name of each entry filename. By
+default no prefix is applied.
+
 @item segment_list_type @var{type}
 Specify the format for the segment list file.
 
@@ -748,7 +863,7 @@
 @var{force_key_frames} may not be set accurately because of rounding
 issues, with the consequence that a key frame time may result set just
 before the specified time. For constant frame rate videos a value of
-1/2*@var{frame_rate} should address the worst case mismatch between
+1/(2*@var{frame_rate}) should address the worst case mismatch between
 the specified time and the time set by @var{force_key_frames}.
 
 @item segment_times @var{times}
@@ -849,8 +964,8 @@
 The slave outputs are specified in the file name given to the muxer,
 separated by '|'. If any of the slave name contains the '|' separator,
 leading or trailing spaces or any special character, it must be
-escaped (see the ``Quoting and escaping'' section in the ffmpeg-utils
-manual).
+escaped (see @ref{quoting_and_escaping,,the "Quoting and escaping"
+section in the ffmpeg-utils(1) manual,ffmpeg-utils}).
 
 Muxer options can be specified for each slave by prepending them as a list of
 @var{key}=@var{value} pairs separated by ':', between square brackets. If
@@ -865,9 +980,12 @@
 
 @item bsfs[/@var{spec}]
 Specify a list of bitstream filters to apply to the specified
-output. It is possible to specify to which streams a given bitstream
-filter applies, by appending a stream specifier to the option
-separated by @code{/}. If the stream specifier is not specified, the
+output.
+
+It is possible to specify to which streams a given bitstream filter
+applies, by appending a stream specifier to the option separated by
+@code{/}. @var{spec} must be a stream specifier (see @ref{Format
+stream specifiers}).  If the stream specifier is not specified, the
 bistream filters will be applied to all streams in the output.
 
 Several bitstream filters can be specified, separated by ",".
@@ -878,7 +996,8 @@
 all the input streams.
 @end table
 
-Some examples follow.
+@subsection Examples
+
 @itemize
 @item
 Encode something and both archive it in a WebM file and stream it
@@ -899,6 +1018,15 @@
 ffmpeg -i ... -map 0 -flags +global_header -c:v libx264 -c:a aac -strict experimental
        -f tee "[bsfs/v=dump_extra]out.ts|[movflags=+faststart]out.mp4|[select=a]out.aac"
 @end example
+
+@item
+As below, but select only stream @code{a:1} for the audio output. Note
+that a second level escaping must be performed, as ":" is a special
+character used to separate options.
+@example
+ffmpeg -i ... -map 0 -flags +global_header -c:v libx264 -c:a aac -strict experimental
+       -f tee "[bsfs/v=dump_extra]out.ts|[movflags=+faststart]out.mp4|[select=\'a:1\']out.aac"
+@end example
 @end itemize
 
 Note: some codecs may need different options depending on the output format;

omxplayer-2014.02.11.tar.gz/ffmpeg/doc/outdevs.texi -> omxplayer-2014.03.28.tar.gz/ffmpeg/doc/outdevs.texi Changed

@@ -22,6 +22,22 @@
 
 ALSA (Advanced Linux Sound Architecture) output device.
 
+@subsection Examples
+
+@itemize
+@item
+Play a file on default ALSA device:
+@example
+ffmpeg -i INPUT -f alsa default
+@end example
+
+@item
+Play a file on soundcard 1, audio device 7:
+@example
+ffmpeg -i INPUT -f alsa hw:1,7
+@end example
+@end itemize
+
 @section caca
 
 CACA output device.
@@ -104,6 +120,68 @@
 @end example
 @end itemize
 
+@section decklink
+
+The decklink output device provides playback capabilities for Blackmagic
+DeckLink devices.
+
+To enable this output device, you need the Blackmagic DeckLink SDK and you
+need to configure with the appropriate @code{--extra-cflags}
+and @code{--extra-ldflags}.
+On Windows, you need to run the IDL files through @command{widl}.
+
+DeckLink is very picky about the formats it supports. Pixel format is always
+uyvy422, framerate and video size must be determined for your device with
+@command{-list_formats 1}. Audio sample rate is always 48 kHz.
+
+@subsection Options
+
+@table @option
+
+@item list_devices
+If set to @option{true}, print a list of devices and exit.
+Defaults to @option{false}.
+
+@item list_formats
+If set to @option{true}, print a list of supported formats and exit.
+Defaults to @option{false}.
+
+@item preroll
+Amount of time to preroll video in seconds.
+Defaults to @option{0.5}.
+
+@end table
+
+@subsection Examples
+
+@itemize
+
+@item
+List output devices:
+@example
+ffmpeg -i test.avi -f decklink -list_devices 1 dummy
+@end example
+
+@item
+List supported formats:
+@example
+ffmpeg -i test.avi -f decklink -list_formats 1 'DeckLink Mini Monitor'
+@end example
+
+@item
+Play video clip:
+@example
+ffmpeg -i test.avi -f decklink -pix_fmt uyvy422 'DeckLink Mini Monitor'
+@end example
+
+@item
+Play video clip with non-standard framerate or video size:
+@example
+ffmpeg -i test.avi -f decklink -pix_fmt uyvy422 -s 720x486 -r 24000/1001 'DeckLink Mini Monitor'
+@end example
+
+@end itemize
+
 @section fbdev
 
 Linux framebuffer output device.
@@ -133,6 +211,41 @@
 
 See also @url{http://linux-fbdev.sourceforge.net/}, and fbset(1).
 
+@section opengl
+OpenGL output device.
+
+To enable this output device you need to configure FFmpeg with @code{--enable-opengl}.
+
+Device allows to render to OpenGL context.
+Context may be provided by application or default SDL window is created.
+
+When device renders to external context, application must implement handlers for following messages:
+@code{AV_CTL_MESSAGE_CREATE_WINDOW_BUFFER} - create OpenGL context on current thread.
+@code{AV_CTL_MESSAGE_PREPARE_WINDOW_BUFFER} - make OpenGL context current.
+@code{AV_CTL_MESSAGE_DISPLAY_WINDOW_BUFFER} - swap buffers.
+@code{AV_CTL_MESSAGE_DESTROY_WINDOW_BUFFER} - destroy OpenGL context.
+Application is also required to inform a device about current resolution by sending @code{AV_DEVICE_WINDOW_RESIZED} message.
+
+@subsection Options
+@table @option
+
+@item background
+Set background color. Black is a default.
+@item no_window
+Disables default SDL window when set to non-zero value.
+Application must provide OpenGL context and both @code{window_size_cb} and @code{window_swap_buffers_cb} callbacks when set.
+@item window_title
+Set the SDL window title, if not specified default to the filename specified for the output device.
+Ignored when @option{no_window} is set.
+
+@end table
+
+@subsection Examples
+Play a file on SDL window using OpenGL rendering:
+@example
+ffmpeg  -i INPUT -f opengl "window title"
+@end example
+
 @section oss
 
 OSS (Open Sound System) output device.
@@ -164,6 +277,19 @@
 Specify the device to use. Default device is used when not provided.
 List of output devices can be obtained with command @command{pactl list sinks}.
 
+@item buffer_size
+@item buffer_duration
+Control the size and duration of the PulseAudio buffer. A small buffer
+gives more control, but requires more frequent updates.
+
+@option{buffer_size} specifies size in bytes while
+@option{buffer_duration} specifies duration in milliseconds.
+
+When both options are provided then the highest value is used
+(duration is recalculated to bytes using stream parameters). If they
+are set to 0 (which is default), the device will use the default
+PulseAudio duration value. By default PulseAudio set buffer duration
+to around 2 seconds.
 @end table
 
 @subsection Examples
@@ -206,7 +332,17 @@
 
 @item window_fullscreen
 Set fullscreen mode when non-zero value is provided.
-Zero is a default.
+Default value is zero.
+@end table
+
+@subsection Interactive commands
+
+The window created by the device can be controlled through the
+following interactive commands.
+
+@table @key
+@item q, ESC
+Quit the device immediately.
 @end table
 
 @subsection Examples

omxplayer-2014.02.11.tar.gz/ffmpeg/doc/platform.texi -> omxplayer-2014.03.28.tar.gz/ffmpeg/doc/platform.texi Changed

@@ -51,8 +51,9 @@
 unacelerated code.
 
 Mac OS X on PowerPC or ARM (iPhone) requires a preprocessor from
+@url{https://github.com/FFmpeg/gas-preprocessor} or
 @url{http://github.com/yuvi/gas-preprocessor} to build the optimized
-assembler functions. Just download the Perl script and put it somewhere
+assembler functions. Put the Perl script somewhere
 in your PATH, FFmpeg's configure will pick it up automatically.
 
 Mac OS X on amd64 and x86 requires @command{yasm} to build most of the
@@ -108,14 +109,16 @@
 
 @section Microsoft Visual C++ or Intel C++ Compiler for Windows
 
-FFmpeg can be built with MSVC or ICL using a C99-to-C89 conversion utility and
-wrapper. For ICL, only the wrapper is used, since ICL supports C99.
+FFmpeg can be built with MSVC 2012 or earlier using a C99-to-C89 conversion utility
+and wrapper, or with MSVC 2013 and ICL natively.
 
 You will need the following prerequisites:
 
 @itemize
-@item @uref{http://download.videolan.org/pub/contrib/c99-to-c89/, C99-to-C89 Converter & Wrapper}
+@item @uref{https://github.com/libav/c99-to-c89/, C99-to-C89 Converter & Wrapper}
+(if using MSVC 2012 or earlier)
 @item @uref{http://code.google.com/p/msinttypes/, msinttypes}
+(if using MSVC 2012 or earlier)
 @item @uref{http://www.mingw.org/, MSYS}
 @item @uref{http://yasm.tortall.net/, YASM}
 @item @uref{http://gnuwin32.sourceforge.net/packages/bc.htm, bc for Windows} if
@@ -125,14 +128,16 @@
 To set up a proper environment in MSYS, you need to run @code{msys.bat} from
 the Visual Studio or Intel Compiler command prompt.
 
-Place @code{makedef}, @code{c99wrap.exe}, @code{c99conv.exe}, and @code{yasm.exe}
-somewhere in your @code{PATH}.
+Place @code{yasm.exe} somewhere in your @code{PATH}. If using MSVC 2012 or
+earlier, place @code{c99wrap.exe} and @code{c99conv.exe} somewhere in your
+@code{PATH} as well.
 
-Next, make sure @code{inttypes.h} and any other headers and libs you want to use
-are located in a spot that the compiler can see. Do so by modifying the @code{LIB}
-and @code{INCLUDE} environment variables to include the @strong{Windows} paths to
-these directories. Alternatively, you can try and use the
-@code{--extra-cflags}/@code{--extra-ldflags} configure options.
+Next, make sure any other headers and libs you want to use, such as zlib, are
+located in a spot that the compiler can see. Do so by modifying the @code{LIB}
+and @code{INCLUDE} environment variables to include the @strong{Windows-style}
+paths to these directories. Alternatively, you can try and use the
+@code{--extra-cflags}/@code{--extra-ldflags} configure options. If using MSVC
+2012 or earlier, place @code{inttypes.h} somewhere the compiler can see too.
 
 Finally, run:
 
@@ -182,7 +187,9 @@
 @itemize
 @item Visual Studio 2010 Pro and Express
 @item Visual Studio 2012 Pro and Express
+@item Visual Studio 2013 Pro and Express
 @item Intel Composer XE 2013
+@item Intel Composer XE 2013 SP1
 @end itemize
 Anything else is not officially supported.

omxplayer-2014.02.11.tar.gz/ffmpeg/doc/protocols.texi -> omxplayer-2014.03.28.tar.gz/ffmpeg/doc/protocols.texi Changed

@@ -117,7 +117,19 @@
 
 File access protocol.
 
-Allow to read from or read to a file.
+Allow to read from or write to a file.
+
+A file URL can have the form:
+@example
+file:@var{filename}
+@end example
+
+where @var{filename} is the path of the file to read.
+
+An URL that does not have a protocol prefix will be assumed to be a
+file URL. Depending on the build, an URL that looks like a Windows
+path with the drive letter at the beginning will also be assumed to be
+a file URL (usually not the case in builds for unix-like systems).
 
 For example to read from a file @file{input.mpeg} with @command{ffmpeg}
 use the command:
@@ -125,10 +137,6 @@
 ffmpeg -i file:input.mpeg output.mpeg
 @end example
 
-The ff* tools default to the file protocol, that is a resource
-specified with the name "FILE.mpeg" is interpreted as the URL
-"file:FILE.mpeg".
-
 This protocol accepts the following options:
 
 @table @option
@@ -205,7 +213,7 @@
 
 HTTP (Hyper Text Transfer Protocol).
 
-This protocol accepts the following options.
+This protocol accepts the following options:
 
 @table @option
 @item seekable
@@ -215,32 +223,33 @@
 value is -1.
 
 @item chunked_post
-If set to 1 use chunked transfer-encoding for posts, default is 1.
+If set to 1 use chunked Transfer-Encoding for posts, default is 1.
+
+@item content_type
+Set a specific content type for the POST messages.
 
 @item headers
 Set custom HTTP headers, can override built in default headers. The
 value must be a string encoding the headers.
 
-@item content_type
-Force a content type.
-
-@item user-agent
-Override User-Agent header. If not specified the protocol will use a
-string describing the libavformat build.
-
 @item multiple_requests
-Use persistent connections if set to 1. By default it is 0.
+Use persistent connections if set to 1, default is 0.
 
 @item post_data
 Set custom HTTP post data.
 
+@item user-agent
+@item user_agent
+Override the User-Agent header. If not specified the protocol will use a
+string describing the libavformat build. ("Lavf/<version>")
+
 @item timeout
 Set timeout of socket I/O operations used by the underlying low level
 operation. By default it is set to -1, which means that the timeout is
 not specified.
 
 @item mime_type
-Set MIME type.
+Export the MIME type.
 
 @item icy
 If set to 1 request ICY (SHOUTcast) metadata from the server. If the server
@@ -249,17 +258,25 @@
 The default is 0.
 
 @item icy_metadata_headers
-If the server supports ICY metadata, this contains the ICY specific HTTP reply
-headers, separated with newline characters.
+If the server supports ICY metadata, this contains the ICY-specific HTTP reply
+headers, separated by newline characters.
 
 @item icy_metadata_packet
 If the server supports ICY metadata, and @option{icy} was set to 1, this
-contains the last non-empty metadata packet sent by the server.
+contains the last non-empty metadata packet sent by the server. It should be
+polled in regular intervals by applications interested in mid-stream metadata
+updates.
 
 @item cookies
 Set the cookies to be sent in future requests. The format of each cookie is the
 same as the value of a Set-Cookie HTTP response field. Multiple cookies can be
 delimited by a newline character.
+
+@item offset
+Set initial byte offset.
+
+@item end_offset
+Try to limit the request to bytes preceding this offset.
 @end table
 
 @subsection HTTP Cookies
@@ -544,6 +561,10 @@
 Truncate existing files on write, if set to 1. A value of 0 prevents
 truncating. Default value is 1.
 
+@item private_key
+Specify the path of the file containing private key to use during authorization.
+By default libssh searches for keys in the @file{~/.ssh/} directory.
+
 @end table
 
 Example: Play a file stored on remote server.
@@ -661,6 +682,8 @@
 
 @section rtsp
 
+Real-Time Streaming Protocol.
+
 RTSP is not technically a protocol handler in libavformat, it is a demuxer
 and muxer. The demuxer supports both normal RTSP (with data transferred
 over RTP; this is used by e.g. Apple and Microsoft) and Real-RTSP (with
@@ -675,14 +698,22 @@
 rtsp://@var{hostname}[:@var{port}]/@var{path}
 @end example
 
-The following options (set on the @command{ffmpeg}/@command{ffplay} command
-line, or set in code via @code{AVOption}s or in @code{avformat_open_input}),
-are supported:
+Options can be set on the @command{ffmpeg}/@command{ffplay} command
+line, or set in code via @code{AVOption}s or in
+@code{avformat_open_input}.
 
-Flags for @code{rtsp_transport}:
+The following options are supported.
 
 @table @option
+@item initial_pause
+Do not start playing the stream immediately if set to 1. Default value
+is 0.
 
+@item rtsp_transport
+Set RTSP trasport protocols.
+
+It accepts the following values:
+@table @samp
 @item udp
 Use UDP as lower transport protocol.
 
@@ -700,17 +731,56 @@
 
 Multiple lower transport protocols may be specified, in that case they are
 tried one at a time (if the setup of one fails, the next one is tried).
-For the muxer, only the @code{tcp} and @code{udp} options are supported.
+For the muxer, only the @samp{tcp} and @samp{udp} options are supported.
 
-Flags for @code{rtsp_flags}:
+@item rtsp_flags
+Set RTSP flags.
 
-@table @option
+The following values are accepted:
+@table @samp
 @item filter_src
 Accept packets only from negotiated peer address and port.
 @item listen
 Act as a server, listening for an incoming connection.
 @end table
 
+Default value is @samp{none}.
+
+@item allowed_media_types
+Set media types to accept from the server.
+
+The following flags are accepted:
+@table @samp
+@item video
+@item audio
+@item data
+@end table
+
+By default it accepts all media types.
+
+@item min_port
+Set minimum local UDP port. Default value is 5000.
+
+@item max_port
+Set maximum local UDP port. Default value is 65000.
+
+@item timeout
+Set maximum timeout (in seconds) to wait for incoming connections.
+
+A value of -1 mean infinite (default). This option implies the
+@option{rtsp_flags} set to @samp{listen}.
+
+@item reorder_queue_size
+Set number of packets to buffer for handling of reordered packets.
+
+@item stimeout
+Set socket TCP I/O timeout in micro seconds.
+
+@item user-agent
+Override User-Agent header. If not specified, it default to the
+libavformat identifier string.
+@end table
+
 When receiving data over UDP, the demuxer tries to reorder received packets
 (since they may arrive out of order, or packets may get lost totally). This
 can be disabled by setting the maximum demuxing delay to zero (via
@@ -721,36 +791,36 @@
 @code{-ast} @var{n} for video and audio respectively, and can be switched
 on the fly by pressing @code{v} and @code{a}.
 
-Example command lines:
+@subsection Examples
 
-To watch a stream over UDP, with a max reordering delay of 0.5 seconds:
+The following examples all make use of the @command{ffplay} and
+@command{ffmpeg} tools.
 
+@itemize
+@item
+Watch a stream over UDP, with a max reordering delay of 0.5 seconds:
 @example
 ffplay -max_delay 500000 -rtsp_transport udp rtsp://server/video.mp4
 @end example
 
-To watch a stream tunneled over HTTP:
-
+@item
+Watch a stream tunneled over HTTP:
 @example
 ffplay -rtsp_transport http rtsp://server/video.mp4
 @end example
 
-To send a stream in realtime to a RTSP server, for others to watch:
-
+@item
+Send a stream in realtime to a RTSP server, for others to watch:
 @example
 ffmpeg -re -i @var{input} -f rtsp -muxdelay 0.1 rtsp://server/live.sdp
 @end example
 
-To receive a stream in realtime:
-
+@item
+Receive a stream in realtime:
 @example
 ffmpeg -rtsp_flags listen -i rtsp://ownaddress/live.sdp @var{output}
 @end example
-
-@table @option
-@item stimeout
-Socket IO timeout in micro seconds.
-@end table
+@end itemize
 
 @section sap
 
@@ -897,23 +967,32 @@
 tcp://@var{hostname}:@var{port}[?@var{options}]
 @end example
 
-@table @option
+@var{options} contains a list of &-separated options of the form
+@var{key}=@var{val}.
 
-@item listen
-Listen for an incoming connection
+The list of supported options follows.
+
+@table @option
+@item listen=@var{1|0}
+Listen for an incoming connection. Default value is 0.
 
 @item timeout=@var{microseconds}
-In read mode: if no data arrived in more than this time interval, raise error.
-In write mode: if socket cannot be written in more than this time interval, raise error.
-This also sets timeout on TCP connection establishing.
+Set raise error timeout, expressed in microseconds.
 
+This option is only relevant in read mode: if no data arrived in more
+than this time interval, raise error.
+
+@item listen_timeout=@var{microseconds}
+Set listen timeout, expressed in microseconds.
+@end table
+
+The following example shows how to setup a listening TCP connection
+with @command{ffmpeg}, which is then accessed with @command{ffplay}:
 @example
 ffmpeg -i @var{input} -f @var{format} tcp://@var{hostname}:@var{port}?listen
 ffplay tcp://@var{hostname}:@var{port}
 @end example
 
-@end table
-
 @section tls
 
 Transport Layer Security (TLS) / Secure Sockets Layer (SSL)
@@ -979,7 +1058,7 @@
 
 User Datagram Protocol.
 
-The required syntax for a UDP url is:
+The required syntax for an UDP URL is:
 @example
 udp://@var{hostname}:@var{port}[?@var{options}]
 @end example
@@ -994,7 +1073,6 @@
 The list of supported options follows.
 
 @table @option
-
 @item buffer_size=@var{size}
 Set the UDP socket buffer size in bytes. This is used both for the
 receiving and the sending buffer size.
@@ -1044,25 +1122,34 @@
 value is 0.
 
 @item timeout=@var{microseconds}
-In read mode: if no data arrived in more than this time interval, raise error.
+Set raise error timeout, expressed in microseconds.
+
+This option is only relevant in read mode: if no data arrived in more
+than this time interval, raise error.
 @end table
 
-Some usage examples of the UDP protocol with @command{ffmpeg} follow.
+@subsection Examples
 
-To stream over UDP to a remote endpoint:
+@itemize
+@item
+Use @command{ffmpeg} to stream over UDP to a remote endpoint:
 @example
 ffmpeg -i @var{input} -f @var{format} udp://@var{hostname}:@var{port}
 @end example
 
-To stream in mpegts format over UDP using 188 sized UDP packets, using a large input buffer:
+@item
+Use @command{ffmpeg} to stream in mpegts format over UDP using 188
+sized UDP packets, using a large input buffer:
 @example
 ffmpeg -i @var{input} -f mpegts udp://@var{hostname}:@var{port}?pkt_size=188&buffer_size=65535
 @end example
 
-To receive over UDP from a remote endpoint:
+@item
+Use @command{ffmpeg} to receive over UDP from a remote endpoint:
 @example
-ffmpeg -i udp://[@var{multicast-address}]:@var{port}
+ffmpeg -i udp://[@var{multicast-address}]:@var{port} ...
 @end example
+@end itemize
 
 @section unix

omxplayer-2014.02.11.tar.gz/ffmpeg/doc/texi2pod.pl -> omxplayer-2014.03.28.tar.gz/ffmpeg/doc/texi2pod.pl Changed

omxplayer-2014.03.28.tar.gz/ffmpeg/doc/texidep.pl Added

omxplayer-2014.02.11.tar.gz/ffmpeg/doc/utils.texi -> omxplayer-2014.03.28.tar.gz/ffmpeg/doc/utils.texi Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/ffmpeg.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/ffmpeg.c Changed

@@ -30,6 +30,8 @@
 #include <stdlib.h>
 #include <errno.h>
 #include <limits.h>
+#include <stdint.h>
+
 #if HAVE_ISATTY
 #if HAVE_IO_H
 #include <io.h>
@@ -38,9 +40,9 @@
 #include <unistd.h>
 #endif
 #endif
+
 #include "libavformat/avformat.h"
 #include "libavdevice/avdevice.h"
-#include "libswscale/swscale.h"
 #include "libswresample/swresample.h"
 #include "libavutil/opt.h"
 #include "libavutil/channel_layout.h"
@@ -123,6 +125,7 @@
 static int run_as_daemon  = 0;
 static int64_t video_size = 0;
 static int64_t audio_size = 0;
+static int64_t data_size = 0;
 static int64_t subtitle_size = 0;
 static int64_t extra_size = 0;
 static int nb_frames_dup = 0;
@@ -311,6 +314,7 @@
 
 static volatile int received_sigterm = 0;
 static volatile int received_nb_signals = 0;
+static int main_return_code = 0;
 
 static void
 sigterm_handler(int sig)
@@ -319,7 +323,7 @@
     received_nb_signals++;
     term_exit();
     if(received_nb_signals > 3)
-        exit_program(123);
+        exit(123);
 }
 
 void term_init(void)
@@ -466,7 +470,9 @@
             bsfc = next;
         }
         output_streams[i]->bitstream_filters = NULL;
-        avcodec_free_frame(&output_streams[i]->filtered_frame);
+        av_frame_free(&output_streams[i]->filtered_frame);
+
+        av_parser_close(output_streams[i]->parser);
 
         av_freep(&output_streams[i]->forced_keyframes);
         av_expr_free(output_streams[i]->forced_keyframes_pexpr);
@@ -488,6 +494,7 @@
         avsubtitle_free(&input_streams[i]->prev_sub.subtitle);
         av_frame_free(&input_streams[i]->sub2video.frame);
         av_freep(&input_streams[i]->filters);
+        av_freep(&input_streams[i]->hwaccel_device);
         av_freep(&input_streams[i]);
     }
 
@@ -542,6 +549,15 @@
     }
 }
 
+static void close_all_output_streams(OutputStream *ost, OSTFinished this_stream, OSTFinished others)
+{
+    int i;
+    for (i = 0; i < nb_output_streams; i++) {
+        OutputStream *ost2 = output_streams[i];
+        ost2->finished |= ost == ost2 ? this_stream : others;
+    }
+}
+
 static void write_frame(AVFormatContext *s, AVPacket *pkt, OutputStream *ost)
 {
     AVBitStreamFilterContext *bsfc = ost->bitstream_filters;
@@ -642,7 +658,8 @@
     ret = av_interleaved_write_frame(s, pkt);
     if (ret < 0) {
         print_error("av_interleaved_write_frame()", ret);
-        exit_program(1);
+        main_return_code = 1;
+        close_all_output_streams(ost, MUXER_FINISHED | ENCODER_FINISHED, ENCODER_FINISHED);
     }
 }
 
@@ -650,7 +667,7 @@
 {
     OutputFile *of = output_files[ost->file_index];
 
-    ost->finished = 1;
+    ost->finished |= ENCODER_FINISHED;
     if (of->shortest) {
         int64_t end = av_rescale_q(ost->sync_opts - ost->first_pts, ost->st->codec->time_base, AV_TIME_BASE_Q);
         of->recording_time = FFMIN(of->recording_time, end);
@@ -690,6 +707,12 @@
 
     av_assert0(pkt.size || !pkt.data);
     update_benchmark(NULL);
+    if (debug_ts) {
+        av_log(NULL, AV_LOG_INFO, "encoder <- type:audio "
+               "frame_pts:%s frame_pts_time:%s time_base:%d/%d\n",
+               av_ts2str(frame->pts), av_ts2timestr(frame->pts, &enc->time_base),
+               enc->time_base.num, enc->time_base.den);
+    }
     if (avcodec_encode_audio2(enc, &pkt, frame, &got_packet) < 0) {
         av_log(NULL, AV_LOG_FATAL, "Audio encoding failed (avcodec_encode_audio2)\n");
         exit_program(1);
@@ -817,10 +840,29 @@
     nb_frames = 1;
 
     format_video_sync = video_sync_method;
-    if (format_video_sync == VSYNC_AUTO)
-        format_video_sync = (s->oformat->flags & AVFMT_VARIABLE_FPS) ? ((s->oformat->flags & AVFMT_NOTIMESTAMPS) ? VSYNC_PASSTHROUGH : VSYNC_VFR) : VSYNC_CFR;
+    if (format_video_sync == VSYNC_AUTO) {
+        if(!strcmp(s->oformat->name, "avi")) {
+            format_video_sync = VSYNC_VFR;
+        } else
+            format_video_sync = (s->oformat->flags & AVFMT_VARIABLE_FPS) ? ((s->oformat->flags & AVFMT_NOTIMESTAMPS) ? VSYNC_PASSTHROUGH : VSYNC_VFR) : VSYNC_CFR;
+        if (   ist
+            && format_video_sync == VSYNC_CFR
+            && input_files[ist->file_index]->ctx->nb_streams == 1
+            && input_files[ist->file_index]->input_ts_offset == 0) {
+            format_video_sync = VSYNC_VSCFR;
+        }
+        if (format_video_sync == VSYNC_CFR && copy_ts) {
+            format_video_sync = VSYNC_VSCFR;
+        }
+    }
 
     switch (format_video_sync) {
+    case VSYNC_VSCFR:
+        if (ost->frame_number == 0 && delta - duration >= 0.5) {
+            av_log(NULL, AV_LOG_DEBUG, "Not duplicating %d initial frames\n", (int)lrintf(delta - duration));
+            delta = duration;
+            ost->sync_opts = lrint(sync_ipts);
+        }
     case VSYNC_CFR:
         // FIXME set to 0.5 after we fix some dts/pts bugs like in avidec.c
         if (delta < -1.1)
@@ -945,6 +987,13 @@
         }
 
         update_benchmark(NULL);
+        if (debug_ts) {
+            av_log(NULL, AV_LOG_INFO, "encoder <- type:video "
+                   "frame_pts:%s frame_pts_time:%s time_base:%d/%d\n",
+                   av_ts2str(in_picture->pts), av_ts2timestr(in_picture->pts, &enc->time_base),
+                   enc->time_base.num, enc->time_base.den);
+        }
+
         ret = avcodec_encode_video2(enc, &pkt, in_picture, &got_packet);
         update_benchmark("encode_video %d.%d", ost->file_index, ost->index);
         if (ret < 0) {
@@ -953,6 +1002,13 @@
         }
 
         if (got_packet) {
+            if (debug_ts) {
+                av_log(NULL, AV_LOG_INFO, "encoder -> type:video "
+                       "pkt_pts:%s pkt_pts_time:%s pkt_dts:%s pkt_dts_time:%s\n",
+                       av_ts2str(pkt.pts), av_ts2timestr(pkt.pts, &enc->time_base),
+                       av_ts2str(pkt.dts), av_ts2timestr(pkt.dts, &enc->time_base));
+            }
+
             if (pkt.pts == AV_NOPTS_VALUE && !(enc->codec->capabilities & CODEC_CAP_DELAY))
                 pkt.pts = ost->sync_opts;
 
@@ -1049,19 +1105,21 @@
     for (i = 0; i < nb_output_streams; i++) {
         OutputStream *ost = output_streams[i];
         OutputFile    *of = output_files[ost->file_index];
+        AVFilterContext *filter;
+        AVCodecContext *enc = ost->st->codec;
         int ret = 0;
 
         if (!ost->filter)
             continue;
+        filter = ost->filter->filter;
 
-        if (!ost->filtered_frame && !(ost->filtered_frame = avcodec_alloc_frame())) {
+        if (!ost->filtered_frame && !(ost->filtered_frame = av_frame_alloc())) {
             return AVERROR(ENOMEM);
-        } else
-            avcodec_get_frame_defaults(ost->filtered_frame);
+        }
         filtered_frame = ost->filtered_frame;
 
         while (1) {
-            ret = av_buffersink_get_frame_flags(ost->filter->filter, filtered_frame,
+            ret = av_buffersink_get_frame_flags(filter, filtered_frame,
                                                AV_BUFFERSINK_FLAG_NO_REQUEST);
             if (ret < 0) {
                 if (ret != AVERROR(EAGAIN) && ret != AVERROR_EOF) {
@@ -1070,32 +1128,38 @@
                 }
                 break;
             }
+            if (ost->finished) {
+                av_frame_unref(filtered_frame);
+                continue;
+            }
             frame_pts = AV_NOPTS_VALUE;
             if (filtered_frame->pts != AV_NOPTS_VALUE) {
                 int64_t start_time = (of->start_time == AV_NOPTS_VALUE) ? 0 : of->start_time;
-                filtered_frame->pts = frame_pts = av_rescale_q(filtered_frame->pts,
-                                                ost->filter->filter->inputs[0]->time_base,
-                                                ost->st->codec->time_base) -
-                                    av_rescale_q(start_time,
-                                                AV_TIME_BASE_Q,
-                                                ost->st->codec->time_base);
+                filtered_frame->pts = frame_pts =
+                    av_rescale_q(filtered_frame->pts, filter->inputs[0]->time_base, enc->time_base) -
+                    av_rescale_q(start_time, AV_TIME_BASE_Q, enc->time_base);
             }
             //if (ost->source_index >= 0)
             //    *filtered_frame= *input_streams[ost->source_index]->decoded_frame; //for me_threshold
 
-
-            switch (ost->filter->filter->inputs[0]->type) {
+            switch (filter->inputs[0]->type) {
             case AVMEDIA_TYPE_VIDEO:
                 filtered_frame->pts = frame_pts;
                 if (!ost->frame_aspect_ratio.num)
-                    ost->st->codec->sample_aspect_ratio = filtered_frame->sample_aspect_ratio;
+                    enc->sample_aspect_ratio = filtered_frame->sample_aspect_ratio;
+
+                if (debug_ts) {
+                    av_log(NULL, AV_LOG_INFO, "filter -> pts:%s pts_time:%s time_base:%d/%d\n",
+                            av_ts2str(filtered_frame->pts), av_ts2timestr(filtered_frame->pts, &enc->time_base),
+                            enc->time_base.num, enc->time_base.den);
+                }
 
                 do_video_out(of->ctx, ost, filtered_frame);
                 break;
             case AVMEDIA_TYPE_AUDIO:
                 filtered_frame->pts = frame_pts;
-                if (!(ost->st->codec->codec->capabilities & CODEC_CAP_PARAM_CHANGE) &&
-                    ost->st->codec->channels != av_frame_get_channels(filtered_frame)) {
+                if (!(enc->codec->capabilities & CODEC_CAP_PARAM_CHANGE) &&
+                    enc->channels != av_frame_get_channels(filtered_frame)) {
                     av_log(NULL, AV_LOG_ERROR,
                            "Audio filter graph output is not normalized and encoder does not support parameter changes\n");
                     break;
@@ -1276,16 +1340,21 @@
     }
 
     if (is_last_report) {
-        int64_t raw= audio_size + video_size + subtitle_size + extra_size;
+        int64_t raw   = audio_size + video_size + data_size + subtitle_size + extra_size;
+        float percent = 0.0;
+
+        if (raw)
+            percent = 100.0 * (total_size - raw) / raw;
+
         av_log(NULL, AV_LOG_INFO, "\n");
-        av_log(NULL, AV_LOG_INFO, "video:%1.0fkB audio:%1.0fkB subtitle:%1.0f global headers:%1.0fkB muxing overhead %f%%\n",
+        av_log(NULL, AV_LOG_INFO, "video:%1.0fkB audio:%1.0fkB subtitle:%1.0f data:%1.0f global headers:%1.0fkB muxing overhead %f%%\n",
                video_size / 1024.0,
                audio_size / 1024.0,
                subtitle_size / 1024.0,
+               data_size / 1024.0,
                extra_size / 1024.0,
-               100.0 * (total_size - raw) / raw
-        );
-        if(video_size + audio_size + subtitle_size + extra_size == 0){
+               percent);
+        if(video_size + data_size + audio_size + subtitle_size + extra_size == 0){
             av_log(NULL, AV_LOG_WARNING, "Output file is empty, nothing was encoded (check -ss / -t / -frames parameters if used)\n");
         }
     }
@@ -1331,6 +1400,7 @@
 
             if (encode) {
                 AVPacket pkt;
+                int pkt_size;
                 int got_packet;
                 av_init_packet(&pkt);
                 pkt.data = NULL;
@@ -1343,7 +1413,6 @@
                     av_log(NULL, AV_LOG_FATAL, "%s encoding failed\n", desc);
                     exit_program(1);
                 }
-                *size += pkt.size;
                 if (ost->logfile && enc->stats_out) {
                     fprintf(ost->logfile, "%s", enc->stats_out);
                 }
@@ -1351,15 +1420,21 @@
                     stop_encoding = 1;
                     break;
                 }
+                if (ost->finished & MUXER_FINISHED) {
+                    av_free_packet(&pkt);
+                    continue;
+                }
+                *size += pkt.size;
                 if (pkt.pts != AV_NOPTS_VALUE)
                     pkt.pts = av_rescale_q(pkt.pts, enc->time_base, ost->st->time_base);
                 if (pkt.dts != AV_NOPTS_VALUE)
                     pkt.dts = av_rescale_q(pkt.dts, enc->time_base, ost->st->time_base);
                 if (pkt.duration > 0)
                     pkt.duration = av_rescale_q(pkt.duration, enc->time_base, ost->st->time_base);
+                pkt_size = pkt.size;
                 write_frame(os, &pkt, ost);
                 if (ost->st->codec->codec_type == AVMEDIA_TYPE_VIDEO && vstats_filename) {
-                    do_video_stats(ost, pkt.size);
+                    do_video_stats(ost, pkt_size);
                 }
             }
 
@@ -1380,6 +1455,9 @@
     if (ost->source_index != ist_index)
         return 0;
 
+    if (ost->finished)
+        return 0;
+
     if (of->start_time != AV_NOPTS_VALUE && ist->pts < of->start_time)
         return 0;
 
@@ -1434,6 +1512,8 @@
     else if (ost->st->codec->codec_type == AVMEDIA_TYPE_VIDEO) {
         video_size += pkt->size;
         ost->sync_opts++;
+    } else if (ost->st->codec->codec_type == AVMEDIA_TYPE_DATA) {
+        data_size += pkt->size;
     } else if (ost->st->codec->codec_type == AVMEDIA_TYPE_SUBTITLE) {
         subtitle_size += pkt->size;
     }
@@ -1467,7 +1547,10 @@
        && ost->st->codec->codec_id != AV_CODEC_ID_MPEG2VIDEO
        && ost->st->codec->codec_id != AV_CODEC_ID_VC1
        ) {
-        if (av_parser_change(ist->st->parser, ost->st->codec, &opkt.data, &opkt.size, pkt->data, pkt->size, pkt->flags & AV_PKT_FLAG_KEY)) {
+        if (av_parser_change(ost->parser, ost->st->codec,
+                             &opkt.data, &opkt.size,
+                             pkt->data, pkt->size,
+                             pkt->flags & AV_PKT_FLAG_KEY)) {
             opkt.buf = av_buffer_create(opkt.data, opkt.size, av_buffer_default_free, NULL, 0);
             if (!opkt.buf)
                 exit_program(1);
@@ -1476,6 +1559,7 @@
         opkt.data = pkt->data;
         opkt.size = pkt->size;
     }
+    av_copy_packet_side_data(&opkt, pkt);
 
     if (ost->st->codec->codec_type == AVMEDIA_TYPE_VIDEO && (of->ctx->oformat->flags & AVFMT_RAWPICTURE)) {
         /* store AVPicture in AVPacket, as expected by the output format */
@@ -1516,7 +1600,7 @@
     int i, ret, err = 0, resample_changed;
     AVRational decoded_frame_tb;
 
-    if (!ist->decoded_frame && !(ist->decoded_frame = avcodec_alloc_frame()))
+    if (!ist->decoded_frame && !(ist->decoded_frame = av_frame_alloc()))
         return AVERROR(ENOMEM);
     if (!ist->filter_frame && !(ist->filter_frame = av_frame_alloc()))
         return AVERROR(ENOMEM);
@@ -1652,7 +1736,6 @@
 static int decode_video(InputStream *ist, AVPacket *pkt, int *got_output)
 {
     AVFrame *decoded_frame, *f;
-    void *buffer_to_free = NULL;
     int i, ret = 0, err = 0, resample_changed;
     int64_t best_effort_timestamp;
     AVRational *frame_sample_aspect;
@@ -1687,18 +1770,26 @@
     if(ist->top_field_first>=0)
         decoded_frame->top_field_first = ist->top_field_first;
 
+    if (ist->hwaccel_retrieve_data && decoded_frame->format == ist->hwaccel_pix_fmt) {
+        err = ist->hwaccel_retrieve_data(ist->st->codec, decoded_frame);
+        if (err < 0)
+            goto fail;
+    }
+    ist->hwaccel_retrieved_pix_fmt = decoded_frame->format;
+
     best_effort_timestamp= av_frame_get_best_effort_timestamp(decoded_frame);
     if(best_effort_timestamp != AV_NOPTS_VALUE)
         ist->next_pts = ist->pts = av_rescale_q(decoded_frame->pts = best_effort_timestamp, ist->st->time_base, AV_TIME_BASE_Q);
 
     if (debug_ts) {
         av_log(NULL, AV_LOG_INFO, "decoder -> ist_index:%d type:video "
-                "frame_pts:%s frame_pts_time:%s best_effort_ts:%"PRId64" best_effort_ts_time:%s keyframe:%d frame_type:%d \n",
-                ist->st->index, av_ts2str(decoded_frame->pts),
-                av_ts2timestr(decoded_frame->pts, &ist->st->time_base),
-                best_effort_timestamp,
-                av_ts2timestr(best_effort_timestamp, &ist->st->time_base),
-                decoded_frame->key_frame, decoded_frame->pict_type);
+               "frame_pts:%s frame_pts_time:%s best_effort_ts:%"PRId64" best_effort_ts_time:%s keyframe:%d frame_type:%d time_base:%d/%d\n",
+               ist->st->index, av_ts2str(decoded_frame->pts),
+               av_ts2timestr(decoded_frame->pts, &ist->st->time_base),
+               best_effort_timestamp,
+               av_ts2timestr(best_effort_timestamp, &ist->st->time_base),
+               decoded_frame->key_frame, decoded_frame->pict_type,
+               ist->st->time_base.num, ist->st->time_base.den);
     }
 
     pkt->size = 0;
@@ -1751,9 +1842,9 @@
         }
     }
 
+fail:
     av_frame_unref(ist->filter_frame);
     av_frame_unref(decoded_frame);
-    av_free(buffer_to_free);
     return err < 0 ? err : ret;
 }
 
@@ -1773,25 +1864,32 @@
     }
 
     if (ist->fix_sub_duration) {
+        int end = 1;
         if (ist->prev_sub.got_output) {
-            int end = av_rescale(subtitle.pts - ist->prev_sub.subtitle.pts,
-                                 1000, AV_TIME_BASE);
+            end = av_rescale(subtitle.pts - ist->prev_sub.subtitle.pts,
+                             1000, AV_TIME_BASE);
             if (end < ist->prev_sub.subtitle.end_display_time) {
                 av_log(ist->st->codec, AV_LOG_DEBUG,
-                       "Subtitle duration reduced from %d to %d\n",
-                       ist->prev_sub.subtitle.end_display_time, end);
+                       "Subtitle duration reduced from %d to %d%s\n",
+                       ist->prev_sub.subtitle.end_display_time, end,
+                       end <= 0 ? ", dropping it" : "");
                 ist->prev_sub.subtitle.end_display_time = end;
             }
         }
         FFSWAP(int,        *got_output, ist->prev_sub.got_output);
         FFSWAP(int,        ret,         ist->prev_sub.ret);
         FFSWAP(AVSubtitle, subtitle,    ist->prev_sub.subtitle);
+        if (end <= 0)
+            goto out;
     }
 
+    if (!*got_output)
+        return ret;
+
     sub2video_update(ist, &subtitle);
 
-    if (!*got_output || !subtitle.num_rects)
-        return ret;
+    if (!subtitle.num_rects)
+        goto out;
 
     for (i = 0; i < nb_output_streams; i++) {
         OutputStream *ost = output_streams[i];
@@ -1802,6 +1900,7 @@
         do_subtitle_out(output_files[ost->file_index]->ctx, ost, ist, &subtitle);
     }
 
+out:
     avsubtitle_free(&subtitle);
     return ret;
 }
@@ -1963,6 +2062,63 @@
     av_freep(&avc);
 }
 
+static const HWAccel *get_hwaccel(enum AVPixelFormat pix_fmt)
+{
+    int i;
+    for (i = 0; hwaccels[i].name; i++)
+        if (hwaccels[i].pix_fmt == pix_fmt)
+            return &hwaccels[i];
+    return NULL;
+}
+
+static enum AVPixelFormat get_format(AVCodecContext *s, const enum AVPixelFormat *pix_fmts)
+{
+    InputStream *ist = s->opaque;
+    const enum AVPixelFormat *p;
+    int ret;
+
+    for (p = pix_fmts; *p != -1; p++) {
+        const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(*p);
+        const HWAccel *hwaccel;
+
+        if (!(desc->flags & AV_PIX_FMT_FLAG_HWACCEL))
+            break;
+
+        hwaccel = get_hwaccel(*p);
+        if (!hwaccel ||
+            (ist->active_hwaccel_id && ist->active_hwaccel_id != hwaccel->id) ||
+            (ist->hwaccel_id != HWACCEL_AUTO && ist->hwaccel_id != hwaccel->id))
+            continue;
+
+        ret = hwaccel->init(s);
+        if (ret < 0) {
+            if (ist->hwaccel_id == hwaccel->id) {
+                av_log(NULL, AV_LOG_FATAL,
+                       "%s hwaccel requested for input stream #%d:%d, "
+                       "but cannot be initialized.\n", hwaccel->name,
+                       ist->file_index, ist->st->index);
+                exit_program(1);
+            }
+            continue;
+        }
+        ist->active_hwaccel_id = hwaccel->id;
+        ist->hwaccel_pix_fmt   = *p;
+        break;
+    }
+
+    return *p;
+}
+
+static int get_buffer(AVCodecContext *s, AVFrame *frame, int flags)
+{
+    InputStream *ist = s->opaque;
+
+    if (ist->hwaccel_get_buffer && frame->format == ist->hwaccel_pix_fmt)
+        return ist->hwaccel_get_buffer(s, frame, flags);
+
+    return avcodec_default_get_buffer2(s, frame, flags);
+}
+
 static int init_input_stream(int ist_index, char *error, int error_len)
 {
     int ret;
@@ -1976,21 +2132,23 @@
             return AVERROR(EINVAL);
         }
 
+        ist->st->codec->opaque      = ist;
+        ist->st->codec->get_format  = get_format;
+        ist->st->codec->get_buffer2 = get_buffer;
+        ist->st->codec->thread_safe_callbacks = 1;
+
         av_opt_set_int(ist->st->codec, "refcounted_frames", 1, 0);
 
         if (!av_dict_get(ist->opts, "threads", NULL, 0))
             av_dict_set(&ist->opts, "threads", "auto", 0);
         if ((ret = avcodec_open2(ist->st->codec, codec, &ist->opts)) < 0) {
-            char errbuf[128];
             if (ret == AVERROR_EXPERIMENTAL)
                 abort_codec_experimental(codec, 0);
 
-            av_strerror(ret, errbuf, sizeof(errbuf));
-
             snprintf(error, error_len,
                      "Error while opening decoder for input stream "
                      "#%d:%d : %s",
-                     ist->file_index, ist->st->index, errbuf);
+                     ist->file_index, ist->st->index, av_err2str(ret));
             return ret;
         }
         assert_avoptions(ist->opts);
@@ -1998,7 +2156,6 @@
 
     ist->next_pts = AV_NOPTS_VALUE;
     ist->next_dts = AV_NOPTS_VALUE;
-    ist->is_start = 1;
 
     return 0;
 }
@@ -2258,6 +2415,8 @@
             av_reduce(&codec->time_base.num, &codec->time_base.den,
                         codec->time_base.num, codec->time_base.den, INT_MAX);
 
+            ost->parser = av_parser_init(codec->codec_id);
+
             switch (codec->codec_type) {
             case AVMEDIA_TYPE_AUDIO:
                 if (audio_volume != 256) {
@@ -2270,6 +2429,7 @@
                 codec->frame_size         = icodec->frame_size;
                 codec->audio_service_type = icodec->audio_service_type;
                 codec->block_align        = icodec->block_align;
+                codec->delay              = icodec->delay;
                 if((codec->block_align == 1 || codec->block_align == 1152 || codec->block_align == 576) && codec->codec_id == AV_CODEC_ID_MP3)
                     codec->block_align= 0;
                 if(codec->codec_id == AV_CODEC_ID_AC3)
@@ -2336,12 +2496,25 @@
                 if (ist && !ost->frame_rate.num)
                     ost->frame_rate = ist->framerate;
                 if (ist && !ost->frame_rate.num)
-                    ost->frame_rate = ist->st->r_frame_rate.num ? ist->st->r_frame_rate : (AVRational){25, 1};
+                    ost->frame_rate = ist->st->r_frame_rate;
+                if (ist && !ost->frame_rate.num) {
+                    ost->frame_rate = (AVRational){25, 1};
+                    av_log(NULL, AV_LOG_WARNING,
+                           "No information "
+                           "about the input framerate is available. Falling "
+                           "back to a default value of 25fps for output stream #%d:%d. Use the -r option "
+                           "if you want a different framerate.\n",
+                           ost->file_index, ost->index);
+                }
 //                    ost->frame_rate = ist->st->avg_frame_rate.num ? ist->st->avg_frame_rate : (AVRational){25, 1};
                 if (ost->enc && ost->enc->supported_framerates && !ost->force_fps) {
                     int idx = av_find_nearest_q_idx(ost->frame_rate, ost->enc->supported_framerates);
                     ost->frame_rate = ost->enc->supported_framerates[idx];
                 }
+                if (codec->codec_id == AV_CODEC_ID_MPEG4) {
+                    av_reduce(&ost->frame_rate.num, &ost->frame_rate.den,
+                              ost->frame_rate.num, ost->frame_rate.den, 65535);
+                }
             }
 
             switch (codec->codec_type) {
@@ -2357,7 +2530,7 @@
                 if (ost->filter && !(codec->time_base.num && codec->time_base.den))
                     codec->time_base = ost->filter->filter->inputs[0]->time_base;
                 if (   av_q2d(codec->time_base) < 0.001 && video_sync_method != VSYNC_PASSTHROUGH
-                   && (video_sync_method == VSYNC_CFR || (video_sync_method == VSYNC_AUTO && !(oc->oformat->flags & AVFMT_VARIABLE_FPS)))){
+                   && (video_sync_method == VSYNC_CFR || video_sync_method == VSYNC_VSCFR || (video_sync_method == VSYNC_AUTO && !(oc->oformat->flags & AVFMT_VARIABLE_FPS)))){
                     av_log(oc, AV_LOG_WARNING, "Frame rate very high for a muxer not efficiently supporting it.\n"
                                                "Please consider specifying a lower framerate, a different muxer or -vsync 2\n");
                 }
@@ -2447,7 +2620,7 @@
                         codec->stats_in = logbuffer;
                     }
                     if (codec->flags & CODEC_FLAG_PASS1) {
-                        f = fopen(logfilename, "wb");
+                        f = av_fopen_utf8(logfilename, "wb");
                         if (!f) {
                             av_log(NULL, AV_LOG_FATAL, "Cannot write log file '%s' for pass-1 encoding: %s\n",
                                 logfilename, strerror(errno));
@@ -2497,9 +2670,6 @@
                 av_log(NULL, AV_LOG_WARNING, "The bitrate parameter is set too low."
                                              " It takes bits/s as argument, not kbits/s\n");
             extra_size += ost->st->codec->extradata_size;
-
-            if (ost->st->codec->me_threshold)
-                input_streams[ost->source_index]->st->codec->debug |= FF_DEBUG_MV;
         } else {
             av_opt_set_dict(ost->st->codec, &ost->opts);
         }
@@ -2536,12 +2706,10 @@
         oc = output_files[i]->ctx;
         oc->interrupt_callback = int_cb;
         if ((ret = avformat_write_header(oc, &output_files[i]->opts)) < 0) {
-            char errbuf[128];
-            av_strerror(ret, errbuf, sizeof(errbuf));
             snprintf(error, sizeof(error),
                      "Could not write header for output file #%d "
                      "(incorrect codec parameters ?): %s",
-                     i, errbuf);
+                     i, av_err2str(ret));
             ret = AVERROR(EINVAL);
             goto dump_format;
         }
@@ -2795,11 +2963,15 @@
 
         av_dup_packet(&pkt);
         av_fifo_generic_write(f->fifo, &pkt, sizeof(pkt), NULL);
+        pthread_cond_signal(&f->fifo_cond);
 
         pthread_mutex_unlock(&f->fifo_lock);
     }
 
+    pthread_mutex_lock(&f->fifo_lock);
     f->finished = 1;
+    pthread_cond_signal(&f->fifo_cond);
+    pthread_mutex_unlock(&f->fifo_lock);
     return NULL;
 }
 
@@ -2851,6 +3023,10 @@
         if (!(f->fifo = av_fifo_alloc(8*sizeof(AVPacket))))
             return AVERROR(ENOMEM);
 
+        if (f->ctx->pb ? !f->ctx->pb->seekable :
+            strcmp(f->ctx->iformat->name, "lavfi"))
+            f->non_blocking = 1;
+
         pthread_mutex_init(&f->fifo_lock, NULL);
         pthread_cond_init (&f->fifo_cond, NULL);
 
@@ -2866,14 +3042,22 @@
 
     pthread_mutex_lock(&f->fifo_lock);
 
+    while (1) {
     if (av_fifo_size(f->fifo)) {
         av_fifo_generic_read(f->fifo, pkt, sizeof(*pkt), NULL);
         pthread_cond_signal(&f->fifo_cond);
+        break;
     } else {
-        if (f->finished)
+        if (f->finished) {
             ret = AVERROR_EOF;
-        else
+            break;
+        }
+        if (f->non_blocking) {
             ret = AVERROR(EAGAIN);
+            break;
+        }
+        pthread_cond_wait(&f->fifo_cond, &f->fifo_lock);
+    }
     }
 
     pthread_mutex_unlock(&f->fifo_lock);
@@ -3064,22 +3248,21 @@
         int64_t pkt_dts = av_rescale_q(pkt.dts, ist->st->time_base, AV_TIME_BASE_Q);
         int64_t delta   = pkt_dts - ist->next_dts;
         if (is->iformat->flags & AVFMT_TS_DISCONT) {
-        if(delta < -1LL*dts_delta_threshold*AV_TIME_BASE ||
-            (delta > 1LL*dts_delta_threshold*AV_TIME_BASE &&
-                ist->st->codec->codec_type != AVMEDIA_TYPE_SUBTITLE) ||
-            pkt_dts + AV_TIME_BASE/10 < ist->pts){
-            ifile->ts_offset -= delta;
-            av_log(NULL, AV_LOG_DEBUG,
-                   "timestamp discontinuity %"PRId64", new offset= %"PRId64"\n",
-                   delta, ifile->ts_offset);
-            pkt.dts -= av_rescale_q(delta, AV_TIME_BASE_Q, ist->st->time_base);
-            if (pkt.pts != AV_NOPTS_VALUE)
-                pkt.pts -= av_rescale_q(delta, AV_TIME_BASE_Q, ist->st->time_base);
-        }
+            if (delta < -1LL*dts_delta_threshold*AV_TIME_BASE ||
+                (delta > 1LL*dts_delta_threshold*AV_TIME_BASE &&
+                 ist->st->codec->codec_type != AVMEDIA_TYPE_SUBTITLE) ||
+                pkt_dts + AV_TIME_BASE/10 < FFMAX(ist->pts, ist->dts)) {
+                ifile->ts_offset -= delta;
+                av_log(NULL, AV_LOG_DEBUG,
+                       "timestamp discontinuity %"PRId64", new offset= %"PRId64"\n",
+                       delta, ifile->ts_offset);
+                pkt.dts -= av_rescale_q(delta, AV_TIME_BASE_Q, ist->st->time_base);
+                if (pkt.pts != AV_NOPTS_VALUE)
+                    pkt.pts -= av_rescale_q(delta, AV_TIME_BASE_Q, ist->st->time_base);
+            }
         } else {
             if ( delta < -1LL*dts_error_threshold*AV_TIME_BASE ||
-                (delta > 1LL*dts_error_threshold*AV_TIME_BASE && ist->st->codec->codec_type != AVMEDIA_TYPE_SUBTITLE)
-               ) {
+                (delta > 1LL*dts_error_threshold*AV_TIME_BASE && ist->st->codec->codec_type != AVMEDIA_TYPE_SUBTITLE)) {
                 av_log(NULL, AV_LOG_WARNING, "DTS %"PRId64", next:%"PRId64" st:%d invalid dropping\n", pkt.dts, ist->next_dts, pkt.stream_index);
                 pkt.dts = AV_NOPTS_VALUE;
             }
@@ -3087,8 +3270,7 @@
                 int64_t pkt_pts = av_rescale_q(pkt.pts, ist->st->time_base, AV_TIME_BASE_Q);
                 delta   = pkt_pts - ist->next_dts;
                 if ( delta < -1LL*dts_error_threshold*AV_TIME_BASE ||
-                    (delta > 1LL*dts_error_threshold*AV_TIME_BASE && ist->st->codec->codec_type != AVMEDIA_TYPE_SUBTITLE)
-                   ) {
+                    (delta > 1LL*dts_error_threshold*AV_TIME_BASE && ist->st->codec->codec_type != AVMEDIA_TYPE_SUBTITLE)) {
                     av_log(NULL, AV_LOG_WARNING, "PTS %"PRId64", next:%"PRId64" invalid dropping st:%d\n", pkt.pts, ist->next_dts, pkt.stream_index);
                     pkt.pts = AV_NOPTS_VALUE;
                 }
@@ -3112,10 +3294,8 @@
 
     ret = output_packet(ist, &pkt);
     if (ret < 0) {
-        char buf[128];
-        av_strerror(ret, buf, sizeof(buf));
         av_log(NULL, AV_LOG_ERROR, "Error while decoding stream #%d:%d: %s\n",
-                ist->file_index, ist->st->index, buf);
+               ist->file_index, ist->st->index, av_err2str(ret));
         if (exit_on_error)
             exit_program(1);
     }
@@ -3308,6 +3488,8 @@
         ist = input_streams[i];
         if (ist->decoding_needed) {
             avcodec_close(ist->st->codec);
+            if (ist->hwaccel_uninit)
+                ist->hwaccel_uninit(ist->st->codec);
         }
     }
 
@@ -3447,6 +3629,6 @@
     if ((decode_error_stat[0] + decode_error_stat[1]) * max_error_rate < decode_error_stat[1])
         exit_program(69);
 
-    exit_program(received_nb_signals ? 255 : 0);
-    return 0;
+    exit_program(received_nb_signals ? 255 : main_return_code);
+    return main_return_code;
 }

omxplayer-2014.02.11.tar.gz/ffmpeg/ffmpeg.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/ffmpeg.h Changed

@@ -51,10 +51,24 @@
 #define VSYNC_PASSTHROUGH 0
 #define VSYNC_CFR         1
 #define VSYNC_VFR         2
+#define VSYNC_VSCFR       0xfe
 #define VSYNC_DROP        0xff
 
 #define MAX_STREAMS 1024    /* arbitrary sanity check value */
 
+enum HWAccelID {
+    HWACCEL_NONE = 0,
+    HWACCEL_AUTO,
+    HWACCEL_VDPAU,
+};
+
+typedef struct HWAccel {
+    const char *name;
+    int (*init)(AVCodecContext *s);
+    enum HWAccelID id;
+    enum AVPixelFormat pix_fmt;
+} HWAccel;
+
 /* select an input stream for an output stream */
 typedef struct StreamMap {
     int disabled;           /* 1 is this mapping is disabled by a negative map */
@@ -99,6 +113,10 @@
     int        nb_ts_scale;
     SpecifierOpt *dump_attachment;
     int        nb_dump_attachment;
+    SpecifierOpt *hwaccels;
+    int        nb_hwaccels;
+    SpecifierOpt *hwaccel_devices;
+    int        nb_hwaccel_devices;
 
     /* output options */
     StreamMap *stream_maps;
@@ -153,6 +171,8 @@
     int        nb_intra_matrices;
     SpecifierOpt *inter_matrices;
     int        nb_inter_matrices;
+    SpecifierOpt *chroma_intra_matrices;
+    int        nb_chroma_intra_matrices;
     SpecifierOpt *top_field_first;
     int        nb_top_field_first;
     SpecifierOpt *metadata_map;
@@ -235,7 +255,6 @@
     int64_t filter_in_rescale_delta_last;
 
     double ts_scale;
-    int is_start;            /* is 1 at the start and after a discontinuity */
     int saw_first_ts;
     int showed_multi_packet_warning;
     AVDictionary *opts;
@@ -274,6 +293,19 @@
     int        nb_filters;
 
     int reinit_filters;
+
+    /* hwaccel options */
+    enum HWAccelID hwaccel_id;
+    char  *hwaccel_device;
+
+    /* hwaccel context */
+    enum HWAccelID active_hwaccel_id;
+    void  *hwaccel_ctx;
+    void (*hwaccel_uninit)(AVCodecContext *s);
+    int  (*hwaccel_get_buffer)(AVCodecContext *s, AVFrame *frame, int flags);
+    int  (*hwaccel_retrieve_data)(AVCodecContext *s, AVFrame *frame);
+    enum AVPixelFormat hwaccel_pix_fmt;
+    enum AVPixelFormat hwaccel_retrieved_pix_fmt;
 } InputStream;
 
 typedef struct InputFile {
@@ -281,6 +313,7 @@
     int eof_reached;      /* true if eof reached */
     int eagain;           /* true if last read attempt returned EAGAIN */
     int ist_index;        /* index of first stream in input_streams */
+    int64_t input_ts_offset;
     int64_t ts_offset;
     int64_t last_ts;
     int64_t start_time;   /* user-specified start time in AV_TIME_BASE or AV_NOPTS_VALUE */
@@ -293,6 +326,7 @@
 
 #if HAVE_PTHREADS
     pthread_t thread;           /* thread reading from this file */
+    int non_blocking;           /* reading packets from the thread should not block */
     int finished;               /* the thread has exited */
     int joined;                 /* the thread has been joined */
     pthread_mutex_t fifo_lock;  /* lock for access to fifo */
@@ -312,6 +346,11 @@
 
 extern const char *const forced_keyframes_const_names[];
 
+typedef enum {
+    ENCODER_FINISHED = 1,
+    MUXER_FINISHED = 2,
+} OSTFinished ;
+
 typedef struct OutputStream {
     int file_index;          /* file index */
     int index;               /* stream index in the output file */
@@ -357,13 +396,15 @@
 
     OutputFilter *filter;
     char *avfilter;
+    char *filters;         ///< filtergraph associated to the -filter option
+    char *filters_script;  ///< filtergraph script associated to the -filter_script option
 
     int64_t sws_flags;
     AVDictionary *opts;
     AVDictionary *swr_opts;
     AVDictionary *resample_opts;
     char *apad;
-    int finished;        /* no more packets should be written for this stream */
+    OSTFinished finished;        /* no more packets should be written for this stream */
     int unavailable;                     /* true if the steram is unavailable (possibly temporarily) */
     int stream_copy;
     const char *attachment_filename;
@@ -371,6 +412,8 @@
     int copy_prior_start;
 
     int keep_pix_fmt;
+
+    AVCodecParserContext *parser;
 } OutputStream;
 
 typedef struct OutputFile {
@@ -425,6 +468,8 @@
 extern const AVIOInterruptCB int_cb;
 
 extern const OptionDef options[];
+extern const HWAccel hwaccels[];
+
 
 void term_init(void);
 void term_exit(void);
@@ -448,4 +493,6 @@
 
 int ffmpeg_parse_options(int argc, char **argv);
 
+int vdpau_init(AVCodecContext *s);
+
 #endif /* FFMPEG_H */

omxplayer-2014.02.11.tar.gz/ffmpeg/ffmpeg_filter.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/ffmpeg_filter.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/ffmpeg_opt.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/ffmpeg_opt.c Changed

@@ -62,6 +62,14 @@
             outvar = o->name[i].u.type;\
     }\
 }
+
+const HWAccel hwaccels[] = {
+#if HAVE_VDPAU_X11
+    { "vdpau", vdpau_init, HWACCEL_VDPAU, AV_PIX_FMT_VDPAU },
+#endif
+    { 0 },
+};
+
 char *vstats_filename;
 
 float audio_drift_threshold = 0.1;
@@ -551,13 +559,14 @@
 static void add_input_streams(OptionsContext *o, AVFormatContext *ic)
 {
     int i;
-    char *next, *codec_tag = NULL;
 
     for (i = 0; i < ic->nb_streams; i++) {
         AVStream *st = ic->streams[i];
         AVCodecContext *dec = st->codec;
         InputStream *ist = av_mallocz(sizeof(*ist));
-        char *framerate = NULL;
+        char *framerate = NULL, *hwaccel = NULL, *hwaccel_device = NULL;
+        char *codec_tag = NULL;
+        char *next;
 
         if (!ist)
             exit_program(1);
@@ -612,6 +621,41 @@
             ist->top_field_first = -1;
             MATCH_PER_STREAM_OPT(top_field_first, i, ist->top_field_first, ic, st);
 
+            MATCH_PER_STREAM_OPT(hwaccels, str, hwaccel, ic, st);
+            if (hwaccel) {
+                if (!strcmp(hwaccel, "none"))
+                    ist->hwaccel_id = HWACCEL_NONE;
+                else if (!strcmp(hwaccel, "auto"))
+                    ist->hwaccel_id = HWACCEL_AUTO;
+                else {
+                    int i;
+                    for (i = 0; hwaccels[i].name; i++) {
+                        if (!strcmp(hwaccels[i].name, hwaccel)) {
+                            ist->hwaccel_id = hwaccels[i].id;
+                            break;
+                        }
+                    }
+
+                    if (!ist->hwaccel_id) {
+                        av_log(NULL, AV_LOG_FATAL, "Unrecognized hwaccel: %s.\n",
+                               hwaccel);
+                        av_log(NULL, AV_LOG_FATAL, "Supported hwaccels: ");
+                        for (i = 0; hwaccels[i].name; i++)
+                            av_log(NULL, AV_LOG_FATAL, "%s ", hwaccels[i].name);
+                        av_log(NULL, AV_LOG_FATAL, "\n");
+                        exit_program(1);
+                    }
+                }
+            }
+
+            MATCH_PER_STREAM_OPT(hwaccel_devices, str, hwaccel_device, ic, st);
+            if (hwaccel_device) {
+                ist->hwaccel_device = av_strdup(hwaccel_device);
+                if (!ist->hwaccel_device)
+                    exit_program(1);
+            }
+            ist->hwaccel_pix_fmt = AV_PIX_FMT_NONE;
+
             break;
         case AVMEDIA_TYPE_AUDIO:
             ist->guess_layout_max = INT_MAX;
@@ -654,10 +698,9 @@
         exit_program(1);
     }
 
-    if (!file_overwrite &&
-        (strchr(filename, ':') == NULL || filename[1] == ':' ||
-         av_strstart(filename, "file:", NULL))) {
-        if (avio_check(filename, 0) == 0) {
+    if (!file_overwrite) {
+        const char *proto_name = avio_find_protocol_name(filename);
+        if (proto_name && !strcmp(proto_name, "file") && avio_check(filename, 0) == 0) {
             if (stdin_interaction && !no_file_overwrite) {
                 fprintf(stderr,"File '%s' already exists. Overwrite ? [y/N] ", filename);
                 fflush(stderr);
@@ -852,6 +895,7 @@
     f->ist_index  = nb_input_streams - ic->nb_streams;
     f->start_time = o->start_time;
     f->recording_time = o->recording_time;
+    f->input_ts_offset = o->input_ts_offset;
     f->ts_offset  = o->input_ts_offset - (copy_ts ? 0 : timestamp);
     f->nb_streams = ic->nb_streams;
     f->rate_emu   = o->rate_emu;
@@ -871,8 +915,13 @@
         const AVClass *class = avcodec_get_class();
         const AVOption *option = av_opt_find(&class, e->key, NULL, 0,
                                              AV_OPT_SEARCH_CHILDREN | AV_OPT_SEARCH_FAKE_OBJ);
-        if (!option)
+        const AVClass *fclass = avformat_get_class();
+        const AVOption *foption = av_opt_find(&fclass, e->key, NULL, 0,
+                                             AV_OPT_SEARCH_CHILDREN | AV_OPT_SEARCH_FAKE_OBJ);
+        if (!option || foption)
             continue;
+
+
         if (!(option->flags & AV_OPT_FLAG_DECODING_PARAM)) {
             av_log(NULL, AV_LOG_ERROR, "Codec AVOption %s (%s) specified for "
                    "input file #%d (%s) is not a decoding option.\n", e->key,
@@ -929,14 +978,14 @@
 
 static int get_preset_file_2(const char *preset_name, const char *codec_name, AVIOContext **s)
 {
-    int i, ret = 1;
+    int i, ret = -1;
     char filename[1000];
     const char *base[3] = { getenv("AVCONV_DATADIR"),
                             getenv("HOME"),
                             AVCONV_DATADIR,
                             };
 
-    for (i = 0; i < FF_ARRAY_ELEMS(base) && ret; i++) {
+    for (i = 0; i < FF_ARRAY_ELEMS(base) && ret < 0; i++) {
         if (!base[i])
             continue;
         if (codec_name) {
@@ -944,7 +993,7 @@
                      i != 1 ? "" : "/.avconv", codec_name, preset_name);
             ret = avio_open2(s, filename, AVIO_FLAG_READ, &int_cb, NULL);
         }
-        if (ret) {
+        if (ret < 0) {
             snprintf(filename, sizeof(filename), "%s%s/%s.avpreset", base[i],
                      i != 1 ? "" : "/.avconv", preset_name);
             ret = avio_open2(s, filename, AVIO_FLAG_READ, &int_cb, NULL);
@@ -1151,26 +1200,36 @@
                              OutputStream *ost)
 {
     AVStream *st = ost->st;
-    char *filter = NULL, *filter_script = NULL;
 
-    MATCH_PER_STREAM_OPT(filter_scripts, str, filter_script, oc, st);
-    MATCH_PER_STREAM_OPT(filters, str, filter, oc, st);
-
-    if (filter_script && filter) {
+    if (ost->filters_script && ost->filters) {
         av_log(NULL, AV_LOG_ERROR, "Both -filter and -filter_script set for "
                "output stream #%d:%d.\n", nb_output_files, st->index);
         exit_program(1);
     }
 
-    if (filter_script)
-        return read_file(filter_script);
-    else if (filter)
-        return av_strdup(filter);
+    if (ost->filters_script)
+        return read_file(ost->filters_script);
+    else if (ost->filters)
+        return av_strdup(ost->filters);
 
     return av_strdup(st->codec->codec_type == AVMEDIA_TYPE_VIDEO ?
                      "null" : "anull");
 }
 
+static void check_streamcopy_filters(OptionsContext *o, AVFormatContext *oc,
+                                     const OutputStream *ost, enum AVMediaType type)
+{
+    if (ost->filters_script || ost->filters) {
+        av_log(NULL, AV_LOG_ERROR,
+               "%s '%s' was defined for %s output stream %d:%d but codec copy was selected.\n"
+               "Filtering and streamcopy cannot be used together.\n",
+               ost->filters ? "Filtergraph" : "Filtergraph script",
+               ost->filters ? ost->filters : ost->filters_script,
+               av_get_media_type_string(type), ost->file_index, ost->index);
+        exit_program(1);
+    }
+}
+
 static OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc, int source_index)
 {
     AVStream *st;
@@ -1199,11 +1258,15 @@
         ost->frame_aspect_ratio = q;
     }
 
+    MATCH_PER_STREAM_OPT(filter_scripts, str, ost->filters_script, oc, st);
+    MATCH_PER_STREAM_OPT(filters,        str, ost->filters,        oc, st);
+
     if (!ost->stream_copy) {
         const char *p = NULL;
         char *frame_size = NULL;
         char *frame_pix_fmt = NULL;
         char *intra_matrix = NULL, *inter_matrix = NULL;
+        char *chroma_intra_matrix = NULL;
         int do_pass = 0;
         int i;
 
@@ -1236,6 +1299,16 @@
             }
             parse_matrix_coeffs(video_enc->intra_matrix, intra_matrix);
         }
+        MATCH_PER_STREAM_OPT(chroma_intra_matrices, str, chroma_intra_matrix, oc, st);
+        if (chroma_intra_matrix) {
+            uint16_t *p = av_mallocz(sizeof(*video_enc->chroma_intra_matrix) * 64);
+            if (!p) {
+                av_log(NULL, AV_LOG_FATAL, "Could not allocate memory for intra matrix.\n");
+                exit_program(1);
+            }
+            av_codec_set_chroma_intra_matrix(video_enc, p);
+            parse_matrix_coeffs(p, chroma_intra_matrix);
+        }
         MATCH_PER_STREAM_OPT(inter_matrices, str, inter_matrix, oc, st);
         if (inter_matrix) {
             if (!(video_enc->inter_matrix = av_mallocz(sizeof(*video_enc->inter_matrix) * 64))) {
@@ -1311,6 +1384,9 @@
         MATCH_PER_STREAM_OPT(copy_initial_nonkeyframes, i, ost->copy_initial_nonkeyframes, oc ,st);
     }
 
+    if (ost->stream_copy)
+        check_streamcopy_filters(o, oc, ost, AVMEDIA_TYPE_VIDEO);
+
     return ost;
 }
 
@@ -1327,6 +1403,9 @@
     audio_enc = st->codec;
     audio_enc->codec_type = AVMEDIA_TYPE_AUDIO;
 
+    MATCH_PER_STREAM_OPT(filter_scripts, str, ost->filters_script, oc, st);
+    MATCH_PER_STREAM_OPT(filters,        str, ost->filters,        oc, st);
+
     if (!ost->stream_copy) {
         char *sample_fmt = NULL;
 
@@ -1364,6 +1443,9 @@
         }
     }
 
+    if (ost->stream_copy)
+        check_streamcopy_filters(o, oc, ost, AVMEDIA_TYPE_AUDIO);
+
     return ost;
 }
 
@@ -1548,6 +1630,18 @@
         exit_program(1);
     }
 
+    if (ost->avfilter && (ost->filters || ost->filters_script)) {
+        const char *opt = ost->filters ? "-vf/-af/-filter" : "-filter_script";
+        av_log(NULL, AV_LOG_ERROR,
+               "%s '%s' was specified through the %s option "
+               "for output stream %d:%d, which is fed from a complex filtergraph.\n"
+               "%s and -filter_complex cannot be used together for the same stream.\n",
+               ost->filters ? "Filtergraph" : "Filtergraph script",
+               ost->filters ? ost->filters : ost->filters_script,
+               opt, ost->file_index, ost->index, opt);
+        exit_program(1);
+    }
+
     if (configure_output_filter(ofilter->graph, ofilter, ofilter->out_tmp) < 0) {
         av_log(NULL, AV_LOG_FATAL, "Error configuring filter.\n");
         exit_program(1);
@@ -1727,7 +1821,7 @@
 
         /* subtitles: pick first */
         MATCH_PER_TYPE_OPT(codec_names, str, subtitle_codec_name, oc, "s");
-        if (!o->subtitle_disable && (oc->oformat->subtitle_codec != AV_CODEC_ID_NONE || subtitle_codec_name)) {
+        if (!o->subtitle_disable && (avcodec_find_encoder(oc->oformat->subtitle_codec) || subtitle_codec_name)) {
             for (i = 0; i < nb_input_streams; i++)
                 if (input_streams[i]->st->codec->codec_type == AVMEDIA_TYPE_SUBTITLE) {
                     new_subtitle_stream(o, oc, i);
@@ -2055,23 +2149,22 @@
         opt_video_codec(o, "c:v", "mpeg1video");
         opt_audio_codec(o, "c:a", "mp2");
         parse_option(o, "f", "vcd", options);
-        av_dict_set(&o->g->codec_opts, "b:v", arg, 0);
 
         parse_option(o, "s", norm == PAL ? "352x288" : "352x240", options);
         parse_option(o, "r", frame_rates[norm], options);
-        av_dict_set(&o->g->codec_opts, "g", norm == PAL ? "15" : "18", 0);
+        av_dict_set(&o->g->codec_opts, "g", norm == PAL ? "15" : "18", AV_DICT_DONT_OVERWRITE);
 
-        av_dict_set(&o->g->codec_opts, "b:v", "1150000", 0);
-        av_dict_set(&o->g->codec_opts, "maxrate", "1150000", 0);
-        av_dict_set(&o->g->codec_opts, "minrate", "1150000", 0);
-        av_dict_set(&o->g->codec_opts, "bufsize", "327680", 0); // 40*1024*8;
+        av_dict_set(&o->g->codec_opts, "b:v", "1150000", AV_DICT_DONT_OVERWRITE);
+        av_dict_set(&o->g->codec_opts, "maxrate", "1150000", AV_DICT_DONT_OVERWRITE);
+        av_dict_set(&o->g->codec_opts, "minrate", "1150000", AV_DICT_DONT_OVERWRITE);
+        av_dict_set(&o->g->codec_opts, "bufsize", "327680", AV_DICT_DONT_OVERWRITE); // 40*1024*8;
 
-        av_dict_set(&o->g->codec_opts, "b:a", "224000", 0);
+        av_dict_set(&o->g->codec_opts, "b:a", "224000", AV_DICT_DONT_OVERWRITE);
         parse_option(o, "ar", "44100", options);
         parse_option(o, "ac", "2", options);
 
-        av_dict_set(&o->g->format_opts, "packetsize", "2324", 0);
-        av_dict_set(&o->g->format_opts, "muxrate", "1411200", 0); // 2352 * 75 * 8;
+        av_dict_set(&o->g->format_opts, "packetsize", "2324", AV_DICT_DONT_OVERWRITE);
+        av_dict_set(&o->g->format_opts, "muxrate", "1411200", AV_DICT_DONT_OVERWRITE); // 2352 * 75 * 8;
 
         /* We have to offset the PTS, so that it is consistent with the SCR.
            SCR starts at 36000, but the first two packs contain only padding
@@ -2088,18 +2181,18 @@
         parse_option(o, "s", norm == PAL ? "480x576" : "480x480", options);
         parse_option(o, "r", frame_rates[norm], options);
         parse_option(o, "pix_fmt", "yuv420p", options);
-        av_dict_set(&o->g->codec_opts, "g", norm == PAL ? "15" : "18", 0);
+        av_dict_set(&o->g->codec_opts, "g", norm == PAL ? "15" : "18", AV_DICT_DONT_OVERWRITE);
 
-        av_dict_set(&o->g->codec_opts, "b:v", "2040000", 0);
-        av_dict_set(&o->g->codec_opts, "maxrate", "2516000", 0);
-        av_dict_set(&o->g->codec_opts, "minrate", "0", 0); // 1145000;
-        av_dict_set(&o->g->codec_opts, "bufsize", "1835008", 0); // 224*1024*8;
-        av_dict_set(&o->g->codec_opts, "scan_offset", "1", 0);
+        av_dict_set(&o->g->codec_opts, "b:v", "2040000", AV_DICT_DONT_OVERWRITE);
+        av_dict_set(&o->g->codec_opts, "maxrate", "2516000", AV_DICT_DONT_OVERWRITE);
+        av_dict_set(&o->g->codec_opts, "minrate", "0", AV_DICT_DONT_OVERWRITE); // 1145000;
+        av_dict_set(&o->g->codec_opts, "bufsize", "1835008", AV_DICT_DONT_OVERWRITE); // 224*1024*8;
+        av_dict_set(&o->g->codec_opts, "scan_offset", "1", AV_DICT_DONT_OVERWRITE);
 
-        av_dict_set(&o->g->codec_opts, "b:a", "224000", 0);
+        av_dict_set(&o->g->codec_opts, "b:a", "224000", AV_DICT_DONT_OVERWRITE);
         parse_option(o, "ar", "44100", options);
 
-        av_dict_set(&o->g->format_opts, "packetsize", "2324", 0);
+        av_dict_set(&o->g->format_opts, "packetsize", "2324", AV_DICT_DONT_OVERWRITE);
 
     } else if (!strcmp(arg, "dvd")) {
 
@@ -2110,17 +2203,17 @@
         parse_option(o, "s", norm == PAL ? "720x576" : "720x480", options);
         parse_option(o, "r", frame_rates[norm], options);
         parse_option(o, "pix_fmt", "yuv420p", options);
-        av_dict_set(&o->g->codec_opts, "g", norm == PAL ? "15" : "18", 0);
+        av_dict_set(&o->g->codec_opts, "g", norm == PAL ? "15" : "18", AV_DICT_DONT_OVERWRITE);
 
-        av_dict_set(&o->g->codec_opts, "b:v", "6000000", 0);
-        av_dict_set(&o->g->codec_opts, "maxrate", "9000000", 0);
-        av_dict_set(&o->g->codec_opts, "minrate", "0", 0); // 1500000;
-        av_dict_set(&o->g->codec_opts, "bufsize", "1835008", 0); // 224*1024*8;
+        av_dict_set(&o->g->codec_opts, "b:v", "6000000", AV_DICT_DONT_OVERWRITE);
+        av_dict_set(&o->g->codec_opts, "maxrate", "9000000", AV_DICT_DONT_OVERWRITE);
+        av_dict_set(&o->g->codec_opts, "minrate", "0", AV_DICT_DONT_OVERWRITE); // 1500000;
+        av_dict_set(&o->g->codec_opts, "bufsize", "1835008", AV_DICT_DONT_OVERWRITE); // 224*1024*8;
 
-        av_dict_set(&o->g->format_opts, "packetsize", "2048", 0);  // from www.mpucoder.com: DVD sectors contain 2048 bytes of data, this is also the size of one pack.
-        av_dict_set(&o->g->format_opts, "muxrate", "10080000", 0); // from mplex project: data_rate = 1260000. mux_rate = data_rate * 8
+        av_dict_set(&o->g->format_opts, "packetsize", "2048", AV_DICT_DONT_OVERWRITE);  // from www.mpucoder.com: DVD sectors contain 2048 bytes of data, this is also the size of one pack.
+        av_dict_set(&o->g->format_opts, "muxrate", "10080000", AV_DICT_DONT_OVERWRITE); // from mplex project: data_rate = 1260000. mux_rate = data_rate * 8
 
-        av_dict_set(&o->g->codec_opts, "b:a", "448000", 0);
+        av_dict_set(&o->g->codec_opts, "b:a", "448000", AV_DICT_DONT_OVERWRITE);
         parse_option(o, "ar", "48000", options);
 
     } else if (!strncmp(arg, "dv", 2)) {
@@ -2688,7 +2781,7 @@
     { "frames",         OPT_INT64 | HAS_ARG | OPT_SPEC | OPT_OUTPUT, { .off = OFFSET(max_frames) },
         "set the number of frames to record", "number" },
     { "tag",            OPT_STRING | HAS_ARG | OPT_SPEC |
-                        OPT_EXPERT | OPT_OUTPUT,                     { .off = OFFSET(codec_tags) },
+                        OPT_EXPERT | OPT_OUTPUT | OPT_INPUT,         { .off = OFFSET(codec_tags) },
         "force codec tag/fourcc", "fourcc/tag" },
     { "q",              HAS_ARG | OPT_EXPERT | OPT_DOUBLE |
                         OPT_SPEC | OPT_OUTPUT,                       { .off = OFFSET(qscale) },
@@ -2779,6 +2872,9 @@
     { "inter_matrix", OPT_VIDEO | HAS_ARG | OPT_EXPERT  | OPT_STRING | OPT_SPEC |
                       OPT_OUTPUT,                                                { .off = OFFSET(inter_matrices) },
         "specify inter matrix coeffs", "matrix" },
+    { "chroma_intra_matrix", OPT_VIDEO | HAS_ARG | OPT_EXPERT  | OPT_STRING | OPT_SPEC |
+                      OPT_OUTPUT,                                                { .off = OFFSET(chroma_intra_matrices) },
+        "specify intra matrix coeffs", "matrix" },
     { "top",          OPT_VIDEO | HAS_ARG | OPT_EXPERT  | OPT_INT| OPT_SPEC |
                       OPT_INPUT | OPT_OUTPUT,                                    { .off = OFFSET(top_field_first) },
         "top=1/bottom=0/auto=-1 field first", "" },
@@ -2800,6 +2896,12 @@
         "force key frames at specified timestamps", "timestamps" },
     { "b",            OPT_VIDEO | HAS_ARG | OPT_PERFILE | OPT_OUTPUT,            { .func_arg = opt_bitrate },
         "video bitrate (please use -b:v)", "bitrate" },
+    { "hwaccel",          OPT_VIDEO | OPT_STRING | HAS_ARG | OPT_EXPERT |
+                          OPT_SPEC | OPT_INPUT,                                  { .off = OFFSET(hwaccels) },
+        "use HW accelerated decoding", "hwaccel name" },
+    { "hwaccel_device",   OPT_VIDEO | OPT_STRING | HAS_ARG | OPT_EXPERT |
+                          OPT_SPEC | OPT_INPUT,                                  { .off = OFFSET(hwaccel_devices) },
+        "select a device for HW acceleration" "devicename" },
 
     /* audio options */
     { "aframes",        OPT_AUDIO | HAS_ARG  | OPT_PERFILE | OPT_OUTPUT,           { .func_arg = opt_audio_frames },

omxplayer-2014.03.28.tar.gz/ffmpeg/ffmpeg_vdpau.c Added

@@ -0,0 +1,335 @@
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <stdint.h>
+
+#include <vdpau/vdpau.h>
+#include <vdpau/vdpau_x11.h>
+
+#include <X11/Xlib.h>
+
+#include "ffmpeg.h"
+
+#include "libavcodec/vdpau.h"
+
+#include "libavutil/avassert.h"
+#include "libavutil/buffer.h"
+#include "libavutil/frame.h"
+#include "libavutil/pixfmt.h"
+
+typedef struct VDPAUContext {
+    Display *dpy;
+
+    VdpDevice  device;
+    VdpDecoder decoder;
+    VdpGetProcAddress *get_proc_address;
+
+    VdpGetErrorString                               *get_error_string;
+    VdpGetInformationString                         *get_information_string;
+    VdpDeviceDestroy                                *device_destroy;
+    VdpDecoderCreate                                *decoder_create;
+    VdpDecoderDestroy                               *decoder_destroy;
+    VdpDecoderRender                                *decoder_render;
+    VdpVideoSurfaceCreate                           *video_surface_create;
+    VdpVideoSurfaceDestroy                          *video_surface_destroy;
+    VdpVideoSurfaceGetBitsYCbCr                     *video_surface_get_bits;
+    VdpVideoSurfaceGetParameters                    *video_surface_get_parameters;
+    VdpVideoSurfaceQueryGetPutBitsYCbCrCapabilities *video_surface_query;
+
+    AVFrame *tmp_frame;
+
+    enum AVPixelFormat pix_fmt;
+    VdpYCbCrFormat vdpau_format;
+} VDPAUContext;
+
+static void vdpau_uninit(AVCodecContext *s)
+{
+    InputStream  *ist = s->opaque;
+    VDPAUContext *ctx = ist->hwaccel_ctx;
+
+    ist->hwaccel_uninit        = NULL;
+    ist->hwaccel_get_buffer    = NULL;
+    ist->hwaccel_retrieve_data = NULL;
+
+    if (ctx->decoder_destroy)
+        ctx->decoder_destroy(ctx->decoder);
+
+    if (ctx->device_destroy)
+        ctx->device_destroy(ctx->device);
+
+    if (ctx->dpy)
+        XCloseDisplay(ctx->dpy);
+
+    av_frame_free(&ctx->tmp_frame);
+
+    av_freep(&ist->hwaccel_ctx);
+    av_freep(&s->hwaccel_context);
+}
+
+static void vdpau_release_buffer(void *opaque, uint8_t *data)
+{
+    VdpVideoSurface surface = *(VdpVideoSurface*)data;
+    VDPAUContext *ctx = opaque;
+
+    ctx->video_surface_destroy(surface);
+    av_freep(&data);
+}
+
+static int vdpau_get_buffer(AVCodecContext *s, AVFrame *frame, int flags)
+{
+    InputStream         *ist = s->opaque;
+    VDPAUContext        *ctx = ist->hwaccel_ctx;
+    VdpVideoSurface *surface;
+    VdpStatus err;
+
+    av_assert0(frame->format == AV_PIX_FMT_VDPAU);
+
+    surface = av_malloc(sizeof(*surface));
+    if (!surface)
+        return AVERROR(ENOMEM);
+
+    frame->buf[0] = av_buffer_create((uint8_t*)surface, sizeof(*surface),
+                                     vdpau_release_buffer, ctx,
+                                     AV_BUFFER_FLAG_READONLY);
+    if (!frame->buf[0]) {
+        av_freep(&surface);
+        return AVERROR(ENOMEM);
+    }
+
+    // properly we should keep a pool of surfaces instead of creating
+    // them anew for each frame, but since we don't care about speed
+    // much in this code, we don't bother
+    err = ctx->video_surface_create(ctx->device, VDP_CHROMA_TYPE_420,
+                                    frame->width, frame->height, surface);
+    if (err != VDP_STATUS_OK) {
+        av_log(NULL, AV_LOG_ERROR, "Error allocating a VDPAU video surface: %s\n",
+               ctx->get_error_string(err));
+        av_buffer_unref(&frame->buf[0]);
+        return AVERROR_UNKNOWN;
+    }
+
+    frame->data[3] = (uint8_t*)(uintptr_t)*surface;
+
+    return 0;
+}
+
+static int vdpau_retrieve_data(AVCodecContext *s, AVFrame *frame)
+{
+    VdpVideoSurface surface = (VdpVideoSurface)(uintptr_t)frame->data[3];
+    InputStream        *ist = s->opaque;
+    VDPAUContext       *ctx = ist->hwaccel_ctx;
+    VdpStatus err;
+    int ret, chroma_type;
+
+    err = ctx->video_surface_get_parameters(surface, &chroma_type,
+                                            &ctx->tmp_frame->width,
+                                            &ctx->tmp_frame->height);
+    if (err != VDP_STATUS_OK) {
+        av_log(NULL, AV_LOG_ERROR, "Error getting surface parameters: %s\n",
+               ctx->get_error_string(err));
+        return AVERROR_UNKNOWN;
+    }
+    ctx->tmp_frame->format = ctx->pix_fmt;
+
+    ret = av_frame_get_buffer(ctx->tmp_frame, 32);
+    if (ret < 0)
+        return ret;
+
+    ctx->tmp_frame->width  = frame->width;
+    ctx->tmp_frame->height = frame->height;
+
+    err = ctx->video_surface_get_bits(surface, ctx->vdpau_format,
+                                      (void * const *)ctx->tmp_frame->data,
+                                      ctx->tmp_frame->linesize);
+    if (err != VDP_STATUS_OK) {
+        av_log(NULL, AV_LOG_ERROR, "Error retrieving frame data from VDPAU: %s\n",
+               ctx->get_error_string(err));
+        ret = AVERROR_UNKNOWN;
+        goto fail;
+    }
+
+    if (ctx->vdpau_format == VDP_YCBCR_FORMAT_YV12)
+        FFSWAP(uint8_t*, ctx->tmp_frame->data[1], ctx->tmp_frame->data[2]);
+
+    ret = av_frame_copy_props(ctx->tmp_frame, frame);
+    if (ret < 0)
+        goto fail;
+
+    av_frame_unref(frame);
+    av_frame_move_ref(frame, ctx->tmp_frame);
+    return 0;
+
+fail:
+    av_frame_unref(ctx->tmp_frame);
+    return ret;
+}
+
+static const int vdpau_formats[][2] = {
+    { VDP_YCBCR_FORMAT_YV12, AV_PIX_FMT_YUV420P },
+    { VDP_YCBCR_FORMAT_NV12, AV_PIX_FMT_NV12 },
+    { VDP_YCBCR_FORMAT_YUYV, AV_PIX_FMT_YUYV422 },
+    { VDP_YCBCR_FORMAT_UYVY, AV_PIX_FMT_UYVY422 },
+};
+
+static int vdpau_alloc(AVCodecContext *s)
+{
+    InputStream  *ist = s->opaque;
+    int loglevel = (ist->hwaccel_id == HWACCEL_AUTO) ? AV_LOG_VERBOSE : AV_LOG_ERROR;
+    AVVDPAUContext *vdpau_ctx;
+    VDPAUContext *ctx;
+    const char *display, *vendor;
+    VdpStatus err;
+    int i;
+
+    ctx = av_mallocz(sizeof(*ctx));
+    if (!ctx)
+        return AVERROR(ENOMEM);
+
+    ist->hwaccel_ctx           = ctx;
+    ist->hwaccel_uninit        = vdpau_uninit;
+    ist->hwaccel_get_buffer    = vdpau_get_buffer;
+    ist->hwaccel_retrieve_data = vdpau_retrieve_data;
+
+    ctx->tmp_frame = av_frame_alloc();
+    if (!ctx->tmp_frame)
+        goto fail;
+
+    ctx->dpy = XOpenDisplay(ist->hwaccel_device);
+    if (!ctx->dpy) {
+        av_log(NULL, loglevel, "Cannot open the X11 display %s.\n",
+               XDisplayName(ist->hwaccel_device));
+        goto fail;
+    }
+    display = XDisplayString(ctx->dpy);
+
+    err = vdp_device_create_x11(ctx->dpy, XDefaultScreen(ctx->dpy), &ctx->device,
+                                &ctx->get_proc_address);
+    if (err != VDP_STATUS_OK) {
+        av_log(NULL, loglevel, "VDPAU device creation on X11 display %s failed.\n",
+               display);
+        goto fail;
+    }
+
+#define GET_CALLBACK(id, result)                                                \
+do {                                                                            \
+    void *tmp;                                                                  \
+    err = ctx->get_proc_address(ctx->device, id, &tmp);                         \
+    if (err != VDP_STATUS_OK) {                                                 \
+        av_log(NULL, loglevel, "Error getting the " #id " callback.\n");        \
+        goto fail;                                                              \
+    }                                                                           \
+    ctx->result = tmp;                                                          \
+} while (0)
+
+    GET_CALLBACK(VDP_FUNC_ID_GET_ERROR_STRING,               get_error_string);
+    GET_CALLBACK(VDP_FUNC_ID_GET_INFORMATION_STRING,         get_information_string);
+    GET_CALLBACK(VDP_FUNC_ID_DEVICE_DESTROY,                 device_destroy);
+    GET_CALLBACK(VDP_FUNC_ID_DECODER_CREATE,                 decoder_create);
+    GET_CALLBACK(VDP_FUNC_ID_DECODER_DESTROY,                decoder_destroy);
+    GET_CALLBACK(VDP_FUNC_ID_DECODER_RENDER,                 decoder_render);
+    GET_CALLBACK(VDP_FUNC_ID_VIDEO_SURFACE_CREATE,           video_surface_create);
+    GET_CALLBACK(VDP_FUNC_ID_VIDEO_SURFACE_DESTROY,          video_surface_destroy);
+    GET_CALLBACK(VDP_FUNC_ID_VIDEO_SURFACE_GET_BITS_Y_CB_CR, video_surface_get_bits);
+    GET_CALLBACK(VDP_FUNC_ID_VIDEO_SURFACE_GET_PARAMETERS,   video_surface_get_parameters);
+    GET_CALLBACK(VDP_FUNC_ID_VIDEO_SURFACE_QUERY_GET_PUT_BITS_Y_CB_CR_CAPABILITIES,
+                 video_surface_query);
+
+    for (i = 0; i < FF_ARRAY_ELEMS(vdpau_formats); i++) {
+        VdpBool supported;
+        err = ctx->video_surface_query(ctx->device, VDP_CHROMA_TYPE_420,
+                                       vdpau_formats[i][0], &supported);
+        if (err != VDP_STATUS_OK) {
+            av_log(NULL, loglevel,
+                   "Error querying VDPAU surface capabilities: %s\n",
+                   ctx->get_error_string(err));
+            goto fail;
+        }
+        if (supported)
+            break;
+    }
+    if (i == FF_ARRAY_ELEMS(vdpau_formats)) {
+        av_log(NULL, loglevel,
+               "No supported VDPAU format for retrieving the data.\n");
+        return AVERROR(EINVAL);
+    }
+    ctx->vdpau_format = vdpau_formats[i][0];
+    ctx->pix_fmt      = vdpau_formats[i][1];
+
+    vdpau_ctx = av_vdpau_alloc_context();
+    if (!vdpau_ctx)
+        goto fail;
+    vdpau_ctx->render = ctx->decoder_render;
+
+    s->hwaccel_context = vdpau_ctx;
+
+    ctx->get_information_string(&vendor);
+    av_log(NULL, AV_LOG_VERBOSE, "Using VDPAU -- %s -- on X11 display %s, "
+           "to decode input stream #%d:%d.\n", vendor,
+           display, ist->file_index, ist->st->index);
+
+    return 0;
+
+fail:
+    av_log(NULL, loglevel, "VDPAU init failed for stream #%d:%d.\n",
+           ist->file_index, ist->st->index);
+    vdpau_uninit(s);
+    return AVERROR(EINVAL);
+}
+
+int vdpau_init(AVCodecContext *s)
+{
+    InputStream *ist = s->opaque;
+    int loglevel = (ist->hwaccel_id == HWACCEL_AUTO) ? AV_LOG_VERBOSE : AV_LOG_ERROR;
+    AVVDPAUContext *vdpau_ctx;
+    VDPAUContext *ctx;
+    VdpStatus err;
+    int profile, ret;
+
+    if (!ist->hwaccel_ctx) {
+        ret = vdpau_alloc(s);
+        if (ret < 0)
+            return ret;
+    }
+    ctx       = ist->hwaccel_ctx;
+    vdpau_ctx = s->hwaccel_context;
+
+    ret = av_vdpau_get_profile(s, &profile);
+    if (ret < 0) {
+        av_log(NULL, loglevel, "No known VDPAU decoder profile for this stream.\n");
+        return AVERROR(EINVAL);
+    }
+
+    if (ctx->decoder)
+        ctx->decoder_destroy(ctx->decoder);
+
+    err = ctx->decoder_create(ctx->device, profile,
+                              s->coded_width, s->coded_height,
+                              16, &ctx->decoder);
+    if (err != VDP_STATUS_OK) {
+        av_log(NULL, loglevel, "Error creating the VDPAU decoder: %s\n",
+               ctx->get_error_string(err));
+        return AVERROR_UNKNOWN;
+    }
+
+    vdpau_ctx->decoder = ctx->decoder;
+
+    ist->hwaccel_get_buffer    = vdpau_get_buffer;
+    ist->hwaccel_retrieve_data = vdpau_retrieve_data;
+
+    return 0;
+}

omxplayer-2014.02.11.tar.gz/ffmpeg/ffplay.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/ffplay.c Changed

@@ -28,6 +28,8 @@
 #include <math.h>
 #include <limits.h>
 #include <signal.h>
+#include <stdint.h>
+
 #include "libavutil/avstring.h"
 #include "libavutil/colorspace.h"
 #include "libavutil/mathematics.h"
@@ -121,6 +123,7 @@
 
 typedef struct VideoPicture {
     double pts;             // presentation timestamp for this picture
+    double duration;        // estimated duration based on frame rate
     int64_t pos;            // byte position in file
     SDL_Overlay *bmp;
     int width, height; /* source height & width */
@@ -142,6 +145,8 @@
     int channels;
     int64_t channel_layout;
     enum AVSampleFormat fmt;
+    int frame_size;
+    int bytes_per_sec;
 } AudioParams;
 
 typedef struct Clock {
@@ -242,13 +247,8 @@
     SDL_cond *subpq_cond;
 
     double frame_timer;
-    double frame_last_pts;
-    double frame_last_duration;
-    double frame_last_dropped_pts;
     double frame_last_returned_time;
     double frame_last_filter_delay;
-    int64_t frame_last_dropped_pos;
-    int frame_last_dropped_serial;
     int video_stream;
     AVStream *video_st;
     PacketQueue videoq;
@@ -359,8 +359,6 @@
         return 0;
 }
 
-static int packet_queue_put(PacketQueue *q, AVPacket *pkt);
-
 static int packet_queue_put_private(PacketQueue *q, AVPacket *pkt)
 {
     MyAVPacketList *pkt1;
@@ -1068,20 +1066,24 @@
     exit(123);
 }
 
+static void set_default_window_size(VideoPicture *vp)
+{
+    SDL_Rect rect;
+    calculate_display_rect(&rect, 0, 0, INT_MAX, vp->height, vp);
+    default_width  = rect.w;
+    default_height = rect.h;
+}
+
 static int video_open(VideoState *is, int force_set_video_mode, VideoPicture *vp)
 {
     int flags = SDL_HWSURFACE | SDL_ASYNCBLIT | SDL_HWACCEL;
     int w,h;
-    SDL_Rect rect;
 
     if (is_full_screen) flags |= SDL_FULLSCREEN;
     else                flags |= SDL_RESIZABLE;
 
-    if (vp && vp->width) {
-        calculate_display_rect(&rect, 0, 0, INT_MAX, vp->height, vp);
-        default_width  = rect.w;
-        default_height = rect.h;
-    }
+    if (vp && vp->width)
+        set_default_window_size(vp);
 
     if (is_full_screen && fs_screen_width) {
         w = fs_screen_width;
@@ -1292,6 +1294,18 @@
     return delay;
 }
 
+static double vp_duration(VideoState *is, VideoPicture *vp, VideoPicture *nextvp) {
+    if (vp->serial == nextvp->serial) {
+        double duration = nextvp->pts - vp->pts;
+        if (isnan(duration) || duration <= 0 || duration > is->max_frame_duration)
+            return vp->duration;
+        else
+            return duration;
+    } else {
+        return 0.0;
+    }
+}
+
 static void pictq_next_picture(VideoState *is) {
     /* update queue size and signal for next picture */
     if (++is->pictq_rindex == VIDEO_PICTURE_QUEUE_SIZE)
@@ -1327,14 +1341,12 @@
     set_clock(&is->vidclk, pts, serial);
     sync_clock_to_slave(&is->extclk, &is->vidclk);
     is->video_current_pos = pos;
-    is->frame_last_pts = pts;
 }
 
 /* called to display each frame */
 static void video_refresh(void *opaque, double *remaining_time)
 {
     VideoState *is = opaque;
-    VideoPicture *vp;
     double time;
 
     SubPicture *sp, *sp2;
@@ -1357,37 +1369,34 @@
             redisplay = pictq_prev_picture(is);
 retry:
         if (is->pictq_size == 0) {
-            SDL_LockMutex(is->pictq_mutex);
-            if (is->frame_last_dropped_pts != AV_NOPTS_VALUE && is->frame_last_dropped_pts > is->frame_last_pts) {
-                update_video_pts(is, is->frame_last_dropped_pts, is->frame_last_dropped_pos, is->frame_last_dropped_serial);
-                is->frame_last_dropped_pts = AV_NOPTS_VALUE;
-            }
-            SDL_UnlockMutex(is->pictq_mutex);
             // nothing to do, no picture to display in the queue
         } else {
             double last_duration, duration, delay;
+            VideoPicture *vp, *lastvp;
+
             /* dequeue the picture */
             vp = &is->pictq[is->pictq_rindex];
+            lastvp = &is->pictq[(is->pictq_rindex + VIDEO_PICTURE_QUEUE_SIZE - 1) % VIDEO_PICTURE_QUEUE_SIZE];
 
             if (vp->serial != is->videoq.serial) {
                 pictq_next_picture(is);
+                is->video_current_pos = -1;
                 redisplay = 0;
                 goto retry;
             }
 
+            if (lastvp->serial != vp->serial && !redisplay)
+                is->frame_timer = av_gettime() / 1000000.0;
+
             if (is->paused)
                 goto display;
 
             /* compute nominal last_duration */
-            last_duration = vp->pts - is->frame_last_pts;
-            if (!isnan(last_duration) && last_duration > 0 && last_duration < is->max_frame_duration) {
-                /* if duration of the last frame was sane, update last_duration in video state */
-                is->frame_last_duration = last_duration;
-            }
+            last_duration = vp_duration(is, lastvp, vp);
             if (redisplay)
                 delay = 0.0;
             else
-                delay = compute_target_delay(is->frame_last_duration, is);
+                delay = compute_target_delay(last_duration, is);
 
             time= av_gettime()/1000000.0;
             if (time < is->frame_timer + delay && !redisplay) {
@@ -1406,7 +1415,7 @@
 
             if (is->pictq_size > 1) {
                 VideoPicture *nextvp = &is->pictq[(is->pictq_rindex + 1) % VIDEO_PICTURE_QUEUE_SIZE];
-                duration = nextvp->pts - vp->pts;
+                duration = vp_duration(is, vp, nextvp);
                 if(!is->step && (redisplay || framedrop>0 || (framedrop && get_master_sync_type(is) != AV_SYNC_VIDEO_MASTER)) && time > is->frame_timer + duration){
                     if (!redisplay)
                         is->frame_drops_late++;
@@ -1549,7 +1558,7 @@
     }
 }
 
-static int queue_picture(VideoState *is, AVFrame *src_frame, double pts, int64_t pos, int serial)
+static int queue_picture(VideoState *is, AVFrame *src_frame, double pts, double duration, int64_t pos, int serial)
 {
     VideoPicture *vp;
 
@@ -1599,7 +1608,7 @@
         }
         /* if the queue is aborted, we have to pop the pending ALLOC event or wait for the allocation to complete */
         if (is->videoq.abort_request && SDL_PeepEvents(&event, 1, SDL_GETEVENT, SDL_EVENTMASK(FF_ALLOC_EVENT)) != 1) {
-            while (!vp->allocated) {
+            while (!vp->allocated && !is->abort_request) {
                 SDL_CondWait(is->pictq_cond, is->pictq_mutex);
             }
         }
@@ -1646,6 +1655,7 @@
         SDL_UnlockYUVOverlay(vp->bmp);
 
         vp->pts = pts;
+        vp->duration = duration;
         vp->pos = pos;
         vp->serial = serial;
 
@@ -1668,18 +1678,6 @@
 
     if (pkt->data == flush_pkt.data) {
         avcodec_flush_buffers(is->video_st->codec);
-
-        SDL_LockMutex(is->pictq_mutex);
-        // Make sure there are no long delay timers (ideally we should just flush the queue but that's harder)
-        while (is->pictq_size && !is->videoq.abort_request) {
-            SDL_CondWait(is->pictq_cond, is->pictq_mutex);
-        }
-        is->video_current_pos = -1;
-        is->frame_last_pts = AV_NOPTS_VALUE;
-        is->frame_last_duration = 0;
-        is->frame_timer = (double)av_gettime() / 1000000.0;
-        is->frame_last_dropped_pts = AV_NOPTS_VALUE;
-        SDL_UnlockMutex(is->pictq_mutex);
         return 0;
     }
 
@@ -1707,23 +1705,17 @@
         frame->sample_aspect_ratio = av_guess_sample_aspect_ratio(is->ic, is->video_st, frame);
 
         if (framedrop>0 || (framedrop && get_master_sync_type(is) != AV_SYNC_VIDEO_MASTER)) {
-            SDL_LockMutex(is->pictq_mutex);
-            if (is->frame_last_pts != AV_NOPTS_VALUE && frame->pts != AV_NOPTS_VALUE) {
-                double clockdiff = get_clock(&is->vidclk) - get_master_clock(is);
-                double ptsdiff = dpts - is->frame_last_pts;
-                if (!isnan(clockdiff) && fabs(clockdiff) < AV_NOSYNC_THRESHOLD &&
-                    !isnan(ptsdiff) && ptsdiff > 0 && ptsdiff < AV_NOSYNC_THRESHOLD &&
-                    clockdiff + ptsdiff - is->frame_last_filter_delay < 0 &&
+            if (frame->pts != AV_NOPTS_VALUE) {
+                double diff = dpts - get_master_clock(is);
+                if (!isnan(diff) && fabs(diff) < AV_NOSYNC_THRESHOLD &&
+                    diff - is->frame_last_filter_delay < 0 &&
+                    *serial == is->vidclk.serial &&
                     is->videoq.nb_packets) {
-                    is->frame_last_dropped_pos = av_frame_get_pkt_pos(frame);
-                    is->frame_last_dropped_pts = dpts;
-                    is->frame_last_dropped_serial = *serial;
                     is->frame_drops_early++;
                     av_frame_unref(frame);
                     ret = 0;
                 }
             }
-            SDL_UnlockMutex(is->pictq_mutex);
         }
 
         return ret;
@@ -1735,7 +1727,8 @@
 static int configure_filtergraph(AVFilterGraph *graph, const char *filtergraph,
                                  AVFilterContext *source_ctx, AVFilterContext *sink_ctx)
 {
-    int ret;
+    int ret, i;
+    int nb_filters = graph->nb_filters;
     AVFilterInOut *outputs = NULL, *inputs = NULL;
 
     if (filtergraph) {
@@ -1763,6 +1756,10 @@
             goto fail;
     }
 
+    /* Reorder the filters to ensure that inputs of the custom filters are merged first */
+    for (i = 0; i < graph->nb_filters - nb_filters; i++)
+        FFSWAP(AVFilterContext*, graph->filters[i], graph->filters[i + nb_filters]);
+
     ret = avfilter_graph_config(graph, NULL);
 fail:
     avfilter_inout_free(&outputs);
@@ -1909,8 +1906,11 @@
     VideoState *is = arg;
     AVFrame *frame = av_frame_alloc();
     double pts;
+    double duration;
     int ret;
     int serial = 0;
+    AVRational tb = is->video_st->time_base;
+    AVRational frame_rate = av_guess_frame_rate(is->ic, is->video_st, NULL);
 
 #if CONFIG_AVFILTER
     AVFilterGraph *graph = avfilter_graph_alloc();
@@ -1925,7 +1925,6 @@
         while (is->paused && !is->videoq.abort_request)
             SDL_Delay(10);
 
-        avcodec_get_frame_defaults(frame);
         av_free_packet(&pkt);
 
         ret = get_video_frame(is, frame, &pkt, &serial);
@@ -1952,7 +1951,6 @@
                 event.type = FF_QUIT_EVENT;
                 event.user.data1 = is;
                 SDL_PushEvent(&event);
-                av_free_packet(&pkt);
                 goto the_end;
             }
             filt_in  = is->in_video_filter;
@@ -1961,14 +1959,12 @@
             last_h = frame->height;
             last_format = frame->format;
             last_serial = serial;
+            frame_rate = filt_out->inputs[0]->frame_rate;
         }
 
         ret = av_buffersrc_add_frame(filt_in, frame);
         if (ret < 0)
             goto the_end;
-        av_frame_unref(frame);
-        avcodec_get_frame_defaults(frame);
-        av_free_packet(&pkt);
 
         while (ret >= 0) {
             is->frame_last_returned_time = av_gettime() / 1000000.0;
@@ -1984,22 +1980,20 @@
             is->frame_last_filter_delay = av_gettime() / 1000000.0 - is->frame_last_returned_time;
             if (fabs(is->frame_last_filter_delay) > AV_NOSYNC_THRESHOLD / 10.0)
                 is->frame_last_filter_delay = 0;
-
-            pts = (frame->pts == AV_NOPTS_VALUE) ? NAN : frame->pts * av_q2d(filt_out->inputs[0]->time_base);
-            ret = queue_picture(is, frame, pts, av_frame_get_pkt_pos(frame), serial);
+            tb = filt_out->inputs[0]->time_base;
+#endif
+            duration = (frame_rate.num && frame_rate.den ? av_q2d((AVRational){frame_rate.den, frame_rate.num}) : 0);
+            pts = (frame->pts == AV_NOPTS_VALUE) ? NAN : frame->pts * av_q2d(tb);
+            ret = queue_picture(is, frame, pts, duration, av_frame_get_pkt_pos(frame), serial);
             av_frame_unref(frame);
+#if CONFIG_AVFILTER
         }
-#else
-        pts = (frame->pts == AV_NOPTS_VALUE) ? NAN : frame->pts * av_q2d(is->video_st->time_base);
-        ret = queue_picture(is, frame, pts, av_frame_get_pkt_pos(frame), serial);
-        av_frame_unref(frame);
 #endif
 
         if (ret < 0)
             goto the_end;
     }
  the_end:
-    avcodec_flush_buffers(is->video_st->codec);
 #if CONFIG_AVFILTER
     avfilter_graph_free(&graph);
 #endif
@@ -2169,11 +2163,10 @@
         /* NOTE: the audio packet can contain several frames */
         while (pkt_temp->stream_index != -1 || is->audio_buf_frames_pending) {
             if (!is->frame) {
-                if (!(is->frame = avcodec_alloc_frame()))
+                if (!(is->frame = av_frame_alloc()))
                     return AVERROR(ENOMEM);
             } else {
                 av_frame_unref(is->frame);
-                avcodec_get_frame_defaults(is->frame);
             }
 
             if (is->audioq.serial != is->audio_pkt_temp_serial)
@@ -2248,7 +2241,6 @@
 
                 if ((ret = av_buffersrc_add_frame(is->in_audio_filter, is->frame)) < 0)
                     return ret;
-                av_frame_unref(is->frame);
 #endif
             }
 #if CONFIG_AVFILTER
@@ -2385,8 +2377,6 @@
 {
     VideoState *is = opaque;
     int audio_size, len1;
-    int bytes_per_sec;
-    int frame_size = av_samples_get_buffer_size(NULL, is->audio_tgt.channels, 1, is->audio_tgt.fmt, 1);
 
     audio_callback_time = av_gettime();
 
@@ -2396,7 +2386,7 @@
            if (audio_size < 0) {
                 /* if error, just output silence */
                is->audio_buf      = is->silence_buf;
-               is->audio_buf_size = sizeof(is->silence_buf) / frame_size * frame_size;
+               is->audio_buf_size = sizeof(is->silence_buf) / is->audio_tgt.frame_size * is->audio_tgt.frame_size;
            } else {
                if (is->show_mode != SHOW_MODE_VIDEO)
                    update_sample_display(is, (int16_t *)is->audio_buf, audio_size);
@@ -2412,11 +2402,10 @@
         stream += len1;
         is->audio_buf_index += len1;
     }
-    bytes_per_sec = is->audio_tgt.freq * is->audio_tgt.channels * av_get_bytes_per_sample(is->audio_tgt.fmt);
     is->audio_write_buf_size = is->audio_buf_size - is->audio_buf_index;
     /* Let's assume the audio driver that is used by SDL has two periods. */
     if (!isnan(is->audio_clock)) {
-        set_clock_at(&is->audclk, is->audio_clock - (double)(2 * is->audio_hw_buf_size + is->audio_write_buf_size) / bytes_per_sec, is->audio_clock_serial, audio_callback_time / 1000000.0);
+        set_clock_at(&is->audclk, is->audio_clock - (double)(2 * is->audio_hw_buf_size + is->audio_write_buf_size) / is->audio_tgt.bytes_per_sec, is->audio_clock_serial, audio_callback_time / 1000000.0);
         sync_clock_to_slave(&is->extclk, &is->audclk);
     }
 }
@@ -2475,6 +2464,12 @@
     audio_hw_params->freq = spec.freq;
     audio_hw_params->channel_layout = wanted_channel_layout;
     audio_hw_params->channels =  spec.channels;
+    audio_hw_params->frame_size = av_samples_get_buffer_size(NULL, audio_hw_params->channels, 1, audio_hw_params->fmt, 1);
+    audio_hw_params->bytes_per_sec = av_samples_get_buffer_size(NULL, audio_hw_params->channels, audio_hw_params->freq, audio_hw_params->fmt, 1);
+    if (audio_hw_params->bytes_per_sec <= 0 || audio_hw_params->frame_size <= 0) {
+        av_log(NULL, AV_LOG_ERROR, "av_samples_get_buffer_size failed\n");
+        return -1;
+    }
     return spec.size;
 }
 
@@ -2579,7 +2574,7 @@
         is->audio_diff_avg_count = 0;
         /* since we do not have a precise anough audio fifo fullness,
            we correct audio sync only if larger than this threshold */
-        is->audio_diff_threshold = 2.0 * is->audio_hw_buf_size / av_samples_get_buffer_size(NULL, is->audio_tgt.channels, is->audio_tgt.freq, is->audio_tgt.fmt, 1);
+        is->audio_diff_threshold = 2.0 * is->audio_hw_buf_size / is->audio_tgt.bytes_per_sec;
 
         memset(&is->audio_pkt, 0, sizeof(is->audio_pkt));
         memset(&is->audio_pkt_temp, 0, sizeof(is->audio_pkt_temp));
@@ -2824,6 +2819,13 @@
     }
 
     is->show_mode = show_mode;
+    if (st_index[AVMEDIA_TYPE_VIDEO] >= 0) {
+        AVStream *st = ic->streams[st_index[AVMEDIA_TYPE_VIDEO]];
+        AVCodecContext *avctx = st->codec;
+        VideoPicture vp = {.width = avctx->width, .height = avctx->height, .sar = av_guess_sample_aspect_ratio(ic, st, NULL)};
+        if (vp.width)
+            set_default_window_size(&vp);
+    }
 
     /* open the streams */
     if (st_index[AVMEDIA_TYPE_AUDIO] >= 0) {
@@ -2946,6 +2948,8 @@
                 packet_queue_put_nullpacket(&is->videoq, is->video_stream);
             if (is->audio_stream >= 0)
                 packet_queue_put_nullpacket(&is->audioq, is->audio_stream);
+            if (is->subtitle_stream >= 0)
+                packet_queue_put_nullpacket(&is->subtitleq, is->subtitle_stream);
             SDL_Delay(10);
             eof=0;
             continue;
@@ -3166,6 +3170,33 @@
     }
 }
 
+static void seek_chapter(VideoState *is, int incr)
+{
+    int64_t pos = get_master_clock(is) * AV_TIME_BASE;
+    int i;
+
+    if (!is->ic->nb_chapters)
+        return;
+
+    /* find the current chapter */
+    for (i = 0; i < is->ic->nb_chapters; i++) {
+        AVChapter *ch = is->ic->chapters[i];
+        if (av_compare_ts(pos, AV_TIME_BASE_Q, ch->start, ch->time_base) < 0) {
+            i--;
+            break;
+        }
+    }
+
+    i += incr;
+    i = FFMAX(i, 0);
+    if (i >= is->ic->nb_chapters)
+        return;
+
+    av_log(NULL, AV_LOG_VERBOSE, "Seeking to chapter %d.\n", i);
+    stream_seek(is, av_rescale_q(is->ic->chapters[i]->start, is->ic->chapters[i]->time_base,
+                                 AV_TIME_BASE_Q), 0, 0);
+}
+
 /* handle an event sent by the GUI */
 static void event_loop(VideoState *cur_stream)
 {
@@ -3215,11 +3246,19 @@
                 toggle_audio_display(cur_stream);
                 break;
             case SDLK_PAGEUP:
-                incr = 600.0;
-                goto do_seek;
+                if (cur_stream->ic->nb_chapters <= 1) {
+                    incr = 600.0;
+                    goto do_seek;
+                }
+                seek_chapter(cur_stream, 1);
+                break;
             case SDLK_PAGEDOWN:
-                incr = -600.0;
-                goto do_seek;
+                if (cur_stream->ic->nb_chapters <= 1) {
+                    incr = -600.0;
+                    goto do_seek;
+                }
+                seek_chapter(cur_stream, -1);
+                break;
             case SDLK_LEFT:
                 incr = -10.0;
                 goto do_seek;
@@ -3552,7 +3591,6 @@
     parse_loglevel(argc, argv, options);
 
     /* register all codecs, demux and protocols */
-    avcodec_register_all();
 #if CONFIG_AVDEVICE
     avdevice_register_all();
 #endif

omxplayer-2014.02.11.tar.gz/ffmpeg/ffprobe.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/ffprobe.c Changed

@@ -24,7 +24,7 @@
  */
 
 #include "config.h"
-#include "version.h"
+#include "libavutil/ffversion.h"
 
 #include <string.h>
 
@@ -66,6 +66,12 @@
 static int do_show_program_version  = 0;
 static int do_show_library_versions = 0;
 
+static int do_show_chapter_tags = 0;
+static int do_show_format_tags = 0;
+static int do_show_frame_tags = 0;
+static int do_show_program_tags = 0;
+static int do_show_stream_tags = 0;
+
 static int show_value_unit              = 0;
 static int use_value_prefix             = 0;
 static int use_byte_value_binary_prefix = 0;
@@ -135,6 +141,7 @@
     SECTION_ID_STREAM_DISPOSITION,
     SECTION_ID_STREAMS,
     SECTION_ID_STREAM_TAGS,
+    SECTION_ID_SUBTITLE,
 } SectionID;
 
 static struct section sections[] = {
@@ -144,7 +151,7 @@
     [SECTION_ID_ERROR] =              { SECTION_ID_ERROR, "error", 0, { -1 } },
     [SECTION_ID_FORMAT] =             { SECTION_ID_FORMAT, "format", 0, { SECTION_ID_FORMAT_TAGS, -1 } },
     [SECTION_ID_FORMAT_TAGS] =        { SECTION_ID_FORMAT_TAGS, "tags", SECTION_FLAG_HAS_VARIABLE_FIELDS, { -1 }, .element_name = "tag", .unique_name = "format_tags" },
-    [SECTION_ID_FRAMES] =             { SECTION_ID_FRAMES, "frames", SECTION_FLAG_IS_ARRAY, { SECTION_ID_FRAME, -1 } },
+    [SECTION_ID_FRAMES] =             { SECTION_ID_FRAMES, "frames", SECTION_FLAG_IS_ARRAY, { SECTION_ID_FRAME, SECTION_ID_SUBTITLE, -1 } },
     [SECTION_ID_FRAME] =              { SECTION_ID_FRAME, "frame", 0, { SECTION_ID_FRAME_TAGS, -1 } },
     [SECTION_ID_FRAME_TAGS] =         { SECTION_ID_FRAME_TAGS, "tags", SECTION_FLAG_HAS_VARIABLE_FIELDS, { -1 }, .element_name = "tag", .unique_name = "frame_tags" },
     [SECTION_ID_LIBRARY_VERSIONS] =   { SECTION_ID_LIBRARY_VERSIONS, "library_versions", SECTION_FLAG_IS_ARRAY, { SECTION_ID_LIBRARY_VERSION, -1 } },
@@ -167,6 +174,7 @@
     [SECTION_ID_STREAM] =             { SECTION_ID_STREAM, "stream", 0, { SECTION_ID_STREAM_DISPOSITION, SECTION_ID_STREAM_TAGS, -1 } },
     [SECTION_ID_STREAM_DISPOSITION] = { SECTION_ID_STREAM_DISPOSITION, "disposition", 0, { -1 }, .unique_name = "stream_disposition" },
     [SECTION_ID_STREAM_TAGS] =        { SECTION_ID_STREAM_TAGS, "tags", SECTION_FLAG_HAS_VARIABLE_FIELDS, { -1 }, .element_name = "tag", .unique_name = "stream_tags" },
+    [SECTION_ID_SUBTITLE] =           { SECTION_ID_SUBTITLE, "subtitle", 0, { -1 } },
 };
 
 static const OptionDef *options;
@@ -258,6 +266,13 @@
 #define WRITER_FLAG_DISPLAY_OPTIONAL_FIELDS 1
 #define WRITER_FLAG_PUT_PACKETS_AND_FRAMES_IN_SAME_CHAPTER 2
 
+typedef enum {
+    WRITER_STRING_VALIDATION_FAIL,
+    WRITER_STRING_VALIDATION_REPLACE,
+    WRITER_STRING_VALIDATION_IGNORE,
+    WRITER_STRING_VALIDATION_NB
+} StringValidation;
+
 typedef struct Writer {
     const AVClass *priv_class;      ///< private class of the writer, if any
     int priv_size;                  ///< private size for the writer context
@@ -298,6 +313,10 @@
     unsigned int nb_section_packet; ///< number of the packet section in case we are in "packets_and_frames" section
     unsigned int nb_section_frame;  ///< number of the frame  section in case we are in "packets_and_frames" section
     unsigned int nb_section_packet_frame; ///< nb_section_packet or nb_section_frame according if is_packets_and_frames
+
+    StringValidation string_validation;
+    char *string_validation_replacement;
+    unsigned int string_validation_utf8_flags;
 };
 
 static const char *writer_get_name(void *p)
@@ -306,11 +325,35 @@
     return wctx->writer->name;
 }
 
+#define OFFSET(x) offsetof(WriterContext, x)
+
+static const AVOption writer_options[] = {
+    { "string_validation", "set string validation mode",
+      OFFSET(string_validation), AV_OPT_TYPE_INT, {.i64=WRITER_STRING_VALIDATION_REPLACE}, 0, WRITER_STRING_VALIDATION_NB-1, .unit = "sv" },
+    { "sv", "set string validation mode",
+      OFFSET(string_validation), AV_OPT_TYPE_INT, {.i64=WRITER_STRING_VALIDATION_REPLACE}, 0, WRITER_STRING_VALIDATION_NB-1, .unit = "sv" },
+    { "ignore",  NULL, 0, AV_OPT_TYPE_CONST, {.i64 = WRITER_STRING_VALIDATION_IGNORE},  .unit = "sv" },
+    { "replace", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = WRITER_STRING_VALIDATION_REPLACE}, .unit = "sv" },
+    { "fail",    NULL, 0, AV_OPT_TYPE_CONST, {.i64 = WRITER_STRING_VALIDATION_FAIL},    .unit = "sv" },
+    { "string_validation_replacement", "set string validation replacement string", OFFSET(string_validation_replacement), AV_OPT_TYPE_STRING, {.str=""}},
+    { "svr", "set string validation replacement string", OFFSET(string_validation_replacement), AV_OPT_TYPE_STRING, {.str=""}},
+    { NULL }
+};
+
+static void *writer_child_next(void *obj, void *prev)
+{
+    WriterContext *ctx = obj;
+    if (!prev && ctx->writer && ctx->writer->priv_class && ctx->priv)
+        return ctx->priv;
+    return NULL;
+}
+
 static const AVClass writer_class = {
-    "Writer",
-    writer_get_name,
-    NULL,
-    LIBAVUTIL_VERSION_INT,
+    .class_name = "Writer",
+    .item_name  = writer_get_name,
+    .option     = writer_options,
+    .version    = LIBAVUTIL_VERSION_INT,
+    .child_next = writer_child_next,
 };
 
 static void writer_close(WriterContext **wctx)
@@ -327,9 +370,19 @@
     if ((*wctx)->writer->priv_class)
         av_opt_free((*wctx)->priv);
     av_freep(&((*wctx)->priv));
+    av_opt_free(*wctx);
     av_freep(wctx);
 }
 
+static void bprint_bytes(AVBPrint *bp, const uint8_t *ubuf, size_t ubuf_size)
+{
+    int i;
+    av_bprintf(bp, "0X");
+    for (i = 0; i < ubuf_size; i++)
+        av_bprintf(bp, "%02X", ubuf[i]);
+}
+
+
 static int writer_open(WriterContext **wctx, const Writer *writer, const char *args,
                        const struct section *sections, int nb_sections)
 {
@@ -351,14 +404,55 @@
     (*wctx)->sections = sections;
     (*wctx)->nb_sections = nb_sections;
 
+    av_opt_set_defaults(*wctx);
+
     if (writer->priv_class) {
         void *priv_ctx = (*wctx)->priv;
         *((const AVClass **)priv_ctx) = writer->priv_class;
         av_opt_set_defaults(priv_ctx);
+    }
 
-        if (args &&
-            (ret = av_set_options_string(priv_ctx, args, "=", ":")) < 0)
+    /* convert options to dictionary */
+    if (args) {
+        AVDictionary *opts = NULL;
+        AVDictionaryEntry *opt = NULL;
+
+        if ((ret = av_dict_parse_string(&opts, args, "=", ":", 0)) < 0) {
+            av_log(*wctx, AV_LOG_ERROR, "Failed to parse option string '%s' provided to writer context\n", args);
+            av_dict_free(&opts);
             goto fail;
+        }
+
+        while ((opt = av_dict_get(opts, "", opt, AV_DICT_IGNORE_SUFFIX))) {
+            if ((ret = av_opt_set(*wctx, opt->key, opt->value, AV_OPT_SEARCH_CHILDREN)) < 0) {
+                av_log(*wctx, AV_LOG_ERROR, "Failed to set option '%s' with value '%s' provided to writer context\n",
+                       opt->key, opt->value);
+                av_dict_free(&opts);
+                goto fail;
+            }
+        }
+
+        av_dict_free(&opts);
+    }
+
+    /* validate replace string */
+    {
+        const uint8_t *p = (*wctx)->string_validation_replacement;
+        const uint8_t *endp = p + strlen(p);
+        while (*p) {
+            const uint8_t *p0 = p;
+            int32_t code;
+            ret = av_utf8_decode(&code, &p, endp, (*wctx)->string_validation_utf8_flags);
+            if (ret < 0) {
+                AVBPrint bp;
+                av_bprint_init(&bp, 0, AV_BPRINT_SIZE_AUTOMATIC);
+                bprint_bytes(&bp, p0, p-p0),
+                    av_log(wctx, AV_LOG_ERROR,
+                           "Invalid UTF8 sequence %s found in string validation replace '%s'\n",
+                           bp.str, (*wctx)->string_validation_replacement);
+                return ret;
+            }
+        }
     }
 
     for (i = 0; i < SECTION_MAX_NB_LEVELS; i++)
@@ -428,18 +522,98 @@
     }
 }
 
-static inline void writer_print_string(WriterContext *wctx,
-                                       const char *key, const char *val, int opt)
+static inline int validate_string(WriterContext *wctx, char **dstp, const char *src)
+{
+    const uint8_t *p, *endp;
+    AVBPrint dstbuf;
+    int invalid_chars_nb = 0, ret = 0;
+
+    av_bprint_init(&dstbuf, 0, AV_BPRINT_SIZE_UNLIMITED);
+
+    endp = src + strlen(src);
+    for (p = (uint8_t *)src; *p;) {
+        uint32_t code;
+        int invalid = 0;
+        const uint8_t *p0 = p;
+
+        if (av_utf8_decode(&code, &p, endp, wctx->string_validation_utf8_flags) < 0) {
+            AVBPrint bp;
+            av_bprint_init(&bp, 0, AV_BPRINT_SIZE_AUTOMATIC);
+            bprint_bytes(&bp, p0, p-p0);
+            av_log(wctx, AV_LOG_DEBUG,
+                   "Invalid UTF-8 sequence %s found in string '%s'\n", bp.str, src);
+            invalid = 1;
+        }
+
+        if (invalid) {
+            invalid_chars_nb++;
+
+            switch (wctx->string_validation) {
+            case WRITER_STRING_VALIDATION_FAIL:
+                av_log(wctx, AV_LOG_ERROR,
+                       "Invalid UTF-8 sequence found in string '%s'\n", src);
+                ret = AVERROR_INVALIDDATA;
+                goto end;
+                break;
+
+            case WRITER_STRING_VALIDATION_REPLACE:
+                av_bprintf(&dstbuf, "%s", wctx->string_validation_replacement);
+                break;
+            }
+        }
+
+        if (!invalid || wctx->string_validation == WRITER_STRING_VALIDATION_IGNORE)
+            av_bprint_append_data(&dstbuf, p0, p-p0);
+    }
+
+    if (invalid_chars_nb && wctx->string_validation == WRITER_STRING_VALIDATION_REPLACE) {
+        av_log(wctx, AV_LOG_WARNING,
+               "%d invalid UTF-8 sequence(s) found in string '%s', replaced with '%s'\n",
+               invalid_chars_nb, src, wctx->string_validation_replacement);
+    }
+
+end:
+    av_bprint_finalize(&dstbuf, dstp);
+    return ret;
+}
+
+#define PRINT_STRING_OPT      1
+#define PRINT_STRING_VALIDATE 2
+
+static inline int writer_print_string(WriterContext *wctx,
+                                      const char *key, const char *val, int flags)
 {
     const struct section *section = wctx->section[wctx->level];
+    int ret = 0;
 
-    if (opt && !(wctx->writer->flags & WRITER_FLAG_DISPLAY_OPTIONAL_FIELDS))
-        return;
+    if ((flags & PRINT_STRING_OPT)
+        && !(wctx->writer->flags & WRITER_FLAG_DISPLAY_OPTIONAL_FIELDS))
+        return 0;
 
     if (section->show_all_entries || av_dict_get(section->entries_to_show, key, NULL, 0)) {
-        wctx->writer->print_string(wctx, key, val);
+        if (flags & PRINT_STRING_VALIDATE) {
+            char *key1 = NULL, *val1 = NULL;
+            ret = validate_string(wctx, &key1, key);
+            if (ret < 0) goto end;
+            ret = validate_string(wctx, &val1, val);
+            if (ret < 0) goto end;
+            wctx->writer->print_string(wctx, key1, val1);
+        end:
+            if (ret < 0) {
+                av_log(wctx, AV_LOG_ERROR,
+                       "Invalid key=value string combination %s=%s in section %s\n",
+                       key, val, section->unique_name);
+            }
+            av_free(key1);
+            av_free(val1);
+        } else {
+            wctx->writer->print_string(wctx, key, val);
+        }
+
         wctx->nb_item[wctx->level]++;
     }
+
+    return ret;
 }
 
 static inline void writer_print_rational(WriterContext *wctx,
@@ -457,7 +631,7 @@
     char buf[128];
 
     if ((!is_duration && ts == AV_NOPTS_VALUE) || (is_duration && ts == 0)) {
-        writer_print_string(wctx, key, "N/A", 1);
+        writer_print_string(wctx, key, "N/A", PRINT_STRING_OPT);
     } else {
         double d = ts * av_q2d(*time_base);
         struct unit_value uv;
@@ -471,7 +645,7 @@
 static void writer_print_ts(WriterContext *wctx, const char *key, int64_t ts, int is_duration)
 {
     if ((!is_duration && ts == AV_NOPTS_VALUE) || (is_duration && ts == 0)) {
-        writer_print_string(wctx, key, "N/A", 1);
+        writer_print_string(wctx, key, "N/A", PRINT_STRING_OPT);
     } else {
         writer_print_integer(wctx, key, ts);
     }
@@ -540,9 +714,9 @@
     return #name ;                                  \
 }                                                   \
 static const AVClass name##_class = {               \
-    #name,                                          \
-    name##_get_name,                                \
-    name##_options                                  \
+    .class_name = #name,                            \
+    .item_name  = name##_get_name,                  \
+    .option     = name##_options                    \
 }
 
 /* Default output */
@@ -554,6 +728,7 @@
     int nested_section[SECTION_MAX_NB_LEVELS];
 } DefaultContext;
 
+#undef OFFSET
 #define OFFSET(x) offsetof(DefaultContext, x)
 
 static const AVOption default_options[] = {
@@ -1440,7 +1615,8 @@
 #define print_int(k, v)         writer_print_integer(w, k, v)
 #define print_q(k, v, s)        writer_print_rational(w, k, v, s)
 #define print_str(k, v)         writer_print_string(w, k, v, 0)
-#define print_str_opt(k, v)     writer_print_string(w, k, v, 1)
+#define print_str_opt(k, v)     writer_print_string(w, k, v, PRINT_STRING_OPT)
+#define print_str_validate(k, v) writer_print_string(w, k, v, PRINT_STRING_VALIDATE)
 #define print_time(k, v, tb)    writer_print_time(w, k, v, tb, 0)
 #define print_ts(k, v)          writer_print_ts(w, k, v, 0)
 #define print_duration_time(k, v, tb) writer_print_time(w, k, v, tb, 1)
@@ -1455,16 +1631,22 @@
 #define print_section_header(s) writer_print_section_header(w, s)
 #define print_section_footer(s) writer_print_section_footer(w, s)
 
-static inline void show_tags(WriterContext *wctx, AVDictionary *tags, int section_id)
+static inline int show_tags(WriterContext *w, AVDictionary *tags, int section_id)
 {
     AVDictionaryEntry *tag = NULL;
+    int ret = 0;
 
     if (!tags)
-        return;
-    writer_print_section_header(wctx, section_id);
-    while ((tag = av_dict_get(tags, "", tag, AV_DICT_IGNORE_SUFFIX)))
-        writer_print_string(wctx, tag->key, tag->value, 0);
-    writer_print_section_footer(wctx);
+        return 0;
+    writer_print_section_header(w, section_id);
+
+    while ((tag = av_dict_get(tags, "", tag, AV_DICT_IGNORE_SUFFIX))) {
+        if ((ret = print_str_validate(tag->key, tag->value)) < 0)
+            break;
+    }
+    writer_print_section_footer(w);
+
+    return ret;
 }
 
 static void show_packet(WriterContext *w, AVFormatContext *fmt_ctx, AVPacket *pkt, int packet_idx)
@@ -1502,6 +1684,29 @@
     fflush(stdout);
 }
 
+static void show_subtitle(WriterContext *w, AVSubtitle *sub, AVStream *stream,
+                          AVFormatContext *fmt_ctx)
+{
+    AVBPrint pbuf;
+
+    av_bprint_init(&pbuf, 1, AV_BPRINT_SIZE_UNLIMITED);
+
+    writer_print_section_header(w, SECTION_ID_SUBTITLE);
+
+    print_str ("media_type",         "subtitle");
+    print_ts  ("pts",                 sub->pts);
+    print_time("pts_time",            sub->pts, &AV_TIME_BASE_Q);
+    print_int ("format",              sub->format);
+    print_int ("start_display_time",  sub->start_display_time);
+    print_int ("end_display_time",    sub->end_display_time);
+    print_int ("num_rects",           sub->num_rects);
+
+    writer_print_section_footer(w);
+
+    av_bprint_finalize(&pbuf, NULL);
+    fflush(stdout);
+}
+
 static void show_frame(WriterContext *w, AVFrame *frame, AVStream *stream,
                        AVFormatContext *fmt_ctx)
 {
@@ -1520,6 +1725,8 @@
     print_time("pkt_pts_time",          frame->pkt_pts, &stream->time_base);
     print_ts  ("pkt_dts",               frame->pkt_dts);
     print_time("pkt_dts_time",          frame->pkt_dts, &stream->time_base);
+    print_ts  ("best_effort_timestamp", av_frame_get_best_effort_timestamp(frame));
+    print_time("best_effort_timestamp_time", av_frame_get_best_effort_timestamp(frame), &stream->time_base);
     print_duration_ts  ("pkt_duration",      av_frame_get_pkt_duration(frame));
     print_duration_time("pkt_duration_time", av_frame_get_pkt_duration(frame), &stream->time_base);
     if (av_frame_get_pkt_pos (frame) != -1) print_fmt    ("pkt_pos", "%"PRId64, av_frame_get_pkt_pos(frame));
@@ -1565,7 +1772,8 @@
             print_str_opt("channel_layout", "unknown");
         break;
     }
-    show_tags(w, av_frame_get_metadata(frame), SECTION_ID_FRAME_TAGS);
+    if (do_show_frame_tags)
+        show_tags(w, av_frame_get_metadata(frame), SECTION_ID_FRAME_TAGS);
 
     writer_print_section_footer(w);
 
@@ -1578,9 +1786,9 @@
                                           AVFrame *frame, AVPacket *pkt)
 {
     AVCodecContext *dec_ctx = fmt_ctx->streams[pkt->stream_index]->codec;
+    AVSubtitle sub;
     int ret = 0, got_frame = 0;
 
-    avcodec_get_frame_defaults(frame);
     if (dec_ctx->codec) {
         switch (dec_ctx->codec_type) {
         case AVMEDIA_TYPE_VIDEO:
@@ -1590,6 +1798,10 @@
         case AVMEDIA_TYPE_AUDIO:
             ret = avcodec_decode_audio4(dec_ctx, frame, &got_frame, pkt);
             break;
+
+        case AVMEDIA_TYPE_SUBTITLE:
+            ret = avcodec_decode_subtitle2(dec_ctx, &sub, &got_frame, pkt);
+            break;
         }
     }
 
@@ -1599,9 +1811,15 @@
     pkt->data += ret;
     pkt->size -= ret;
     if (got_frame) {
+        int is_sub = (dec_ctx->codec_type == AVMEDIA_TYPE_SUBTITLE);
         nb_streams_frames[pkt->stream_index]++;
         if (do_show_frames)
-            show_frame(w, frame, fmt_ctx->streams[pkt->stream_index], fmt_ctx);
+            if (is_sub)
+                show_subtitle(w, &sub, fmt_ctx->streams[pkt->stream_index], fmt_ctx);
+            else
+                show_frame(w, frame, fmt_ctx->streams[pkt->stream_index], fmt_ctx);
+        if (is_sub)
+            avsubtitle_free(&sub);
     }
     return got_frame;
 }
@@ -1634,7 +1852,7 @@
                                  const ReadInterval *interval, int64_t *cur_ts)
 {
     AVPacket pkt, pkt1;
-    AVFrame frame;
+    AVFrame *frame = NULL;
     int ret = 0, i = 0, frame_count = 0;
     int64_t start = -INT64_MAX, end = interval->end;
     int has_start = 0, has_end = interval->has_end && !interval->end_is_offset;
@@ -1668,6 +1886,11 @@
         }
     }
 
+    frame = av_frame_alloc();
+    if (!frame) {
+        ret = AVERROR(ENOMEM);
+        goto end;
+    }
     while (!av_read_frame(fmt_ctx, &pkt)) {
         if (selected_streams[pkt.stream_index]) {
             AVRational tb = fmt_ctx->streams[pkt.stream_index]->time_base;
@@ -1700,7 +1923,7 @@
             }
             if (do_read_frames) {
                 pkt1 = pkt;
-                while (pkt1.size && process_frame(w, fmt_ctx, &frame, &pkt1) > 0);
+                while (pkt1.size && process_frame(w, fmt_ctx, frame, &pkt1) > 0);
             }
         }
         av_free_packet(&pkt);
@@ -1712,10 +1935,11 @@
     for (i = 0; i < fmt_ctx->nb_streams; i++) {
         pkt.stream_index = i;
         if (do_read_frames)
-            while (process_frame(w, fmt_ctx, &frame, &pkt) > 0);
+            while (process_frame(w, fmt_ctx, frame, &pkt) > 0);
     }
 
 end:
+    av_frame_free(&frame);
     if (ret < 0) {
         av_log(NULL, AV_LOG_ERROR, "Could not read packets in interval ");
         log_read_interval(interval, NULL, AV_LOG_ERROR);
@@ -1723,7 +1947,7 @@
     return ret;
 }
 
-static void read_packets(WriterContext *w, AVFormatContext *fmt_ctx)
+static int read_packets(WriterContext *w, AVFormatContext *fmt_ctx)
 {
     int i, ret = 0;
     int64_t cur_ts = fmt_ctx->start_time;
@@ -1738,9 +1962,11 @@
                 break;
         }
     }
+
+    return ret;
 }
 
-static void show_stream(WriterContext *w, AVFormatContext *fmt_ctx, int stream_idx, int in_program)
+static int show_stream(WriterContext *w, AVFormatContext *fmt_ctx, int stream_idx, int in_program)
 {
     AVStream *stream = fmt_ctx->streams[stream_idx];
     AVCodecContext *dec_ctx;
@@ -1749,6 +1975,7 @@
     const char *s;
     AVRational sar, dar;
     AVBPrint pbuf;
+    int ret = 0;
 
     av_bprint_init(&pbuf, 1, AV_BPRINT_SIZE_UNLIMITED);
 
@@ -1903,26 +2130,35 @@
     writer_print_section_footer(w);
     }
 
-    show_tags(w, stream->metadata, in_program ? SECTION_ID_PROGRAM_STREAM_TAGS : SECTION_ID_STREAM_TAGS);
+    if (do_show_stream_tags)
+        ret = show_tags(w, stream->metadata, in_program ? SECTION_ID_PROGRAM_STREAM_TAGS : SECTION_ID_STREAM_TAGS);
 
     writer_print_section_footer(w);
     av_bprint_finalize(&pbuf, NULL);
     fflush(stdout);
+
+    return ret;
 }
 
-static void show_streams(WriterContext *w, AVFormatContext *fmt_ctx)
+static int show_streams(WriterContext *w, AVFormatContext *fmt_ctx)
 {
-    int i;
+    int i, ret = 0;
+
     writer_print_section_header(w, SECTION_ID_STREAMS);
     for (i = 0; i < fmt_ctx->nb_streams; i++)
-        if (selected_streams[i])
-            show_stream(w, fmt_ctx, i, 0);
+        if (selected_streams[i]) {
+            ret = show_stream(w, fmt_ctx, i, 0);
+            if (ret < 0)
+                break;
+        }
     writer_print_section_footer(w);
+
+    return ret;
 }
 
-static void show_program(WriterContext *w, AVFormatContext *fmt_ctx, AVProgram *program)
+static int show_program(WriterContext *w, AVFormatContext *fmt_ctx, AVProgram *program)
 {
-    int i;
+    int i, ret = 0;
 
     writer_print_section_header(w, SECTION_ID_PROGRAM);
     print_int("program_id", program->id);
@@ -1934,35 +2170,46 @@
     print_time("start_time", program->start_time, &AV_TIME_BASE_Q);
     print_ts("end_pts", program->end_time);
     print_time("end_time", program->end_time, &AV_TIME_BASE_Q);
-    show_tags(w, program->metadata, SECTION_ID_PROGRAM_TAGS);
+    if (do_show_program_tags)
+        ret = show_tags(w, program->metadata, SECTION_ID_PROGRAM_TAGS);
+    if (ret < 0)
+        goto end;
 
     writer_print_section_header(w, SECTION_ID_PROGRAM_STREAMS);
     for (i = 0; i < program->nb_stream_indexes; i++) {
-        if (selected_streams[program->stream_index[i]])
-            show_stream(w, fmt_ctx, program->stream_index[i], 1);
+        if (selected_streams[program->stream_index[i]]) {
+            ret = show_stream(w, fmt_ctx, program->stream_index[i], 1);
+            if (ret < 0)
+                break;
+        }
     }
     writer_print_section_footer(w);
 
+end:
     writer_print_section_footer(w);
+    return ret;
 }
 
-static void show_programs(WriterContext *w, AVFormatContext *fmt_ctx)
+static int show_programs(WriterContext *w, AVFormatContext *fmt_ctx)
 {
-    int i;
+    int i, ret = 0;
 
     writer_print_section_header(w, SECTION_ID_PROGRAMS);
     for (i = 0; i < fmt_ctx->nb_programs; i++) {
         AVProgram *program = fmt_ctx->programs[i];
         if (!program)
             continue;
-        show_program(w, fmt_ctx, program);
+        ret = show_program(w, fmt_ctx, program);
+        if (ret < 0)
+            break;
     }
     writer_print_section_footer(w);
+    return ret;
 }
 
-static void show_chapters(WriterContext *w, AVFormatContext *fmt_ctx)
+static int show_chapters(WriterContext *w, AVFormatContext *fmt_ctx)
 {
-    int i;
+    int i, ret = 0;
 
     writer_print_section_header(w, SECTION_ID_CHAPTERS);
     for (i = 0; i < fmt_ctx->nb_chapters; i++) {
@@ -1975,19 +2222,23 @@
         print_time("start_time", chapter->start, &chapter->time_base);
         print_int("end", chapter->end);
         print_time("end_time", chapter->end, &chapter->time_base);
-        show_tags(w, chapter->metadata, SECTION_ID_CHAPTER_TAGS);
+        if (do_show_chapter_tags)
+            ret = show_tags(w, chapter->metadata, SECTION_ID_CHAPTER_TAGS);
         writer_print_section_footer(w);
     }
     writer_print_section_footer(w);
+
+    return ret;
 }
 
-static void show_format(WriterContext *w, AVFormatContext *fmt_ctx)
+static int show_format(WriterContext *w, AVFormatContext *fmt_ctx)
 {
     char val_str[128];
     int64_t size = fmt_ctx->pb ? avio_size(fmt_ctx->pb) : -1;
+    int ret = 0;
 
     writer_print_section_header(w, SECTION_ID_FORMAT);
-    print_str("filename",         fmt_ctx->filename);
+    print_str_validate("filename", fmt_ctx->filename);
     print_int("nb_streams",       fmt_ctx->nb_streams);
     print_int("nb_programs",      fmt_ctx->nb_programs);
     print_str("format_name",      fmt_ctx->iformat->name);
@@ -2002,10 +2253,12 @@
     if (fmt_ctx->bit_rate > 0) print_val    ("bit_rate", fmt_ctx->bit_rate, unit_bit_per_second_str);
     else                       print_str_opt("bit_rate", "N/A");
     print_int("probe_score", av_format_get_probe_score(fmt_ctx));
-    show_tags(w, fmt_ctx->metadata, SECTION_ID_FORMAT_TAGS);
+    if (do_show_format_tags)
+        ret = show_tags(w, fmt_ctx->metadata, SECTION_ID_FORMAT_TAGS);
 
     writer_print_section_footer(w);
     fflush(stdout);
+    return ret;
 }
 
 static void show_error(WriterContext *w, int err)
@@ -2111,6 +2364,8 @@
     if (ret < 0)
         return ret;
 
+#define CHECK_END if (ret < 0) goto end
+
     nb_streams_frames  = av_calloc(fmt_ctx->nb_streams, sizeof(*nb_streams_frames));
     nb_streams_packets = av_calloc(fmt_ctx->nb_streams, sizeof(*nb_streams_packets));
     selected_streams   = av_calloc(fmt_ctx->nb_streams, sizeof(*selected_streams));
@@ -2120,8 +2375,7 @@
             ret = avformat_match_stream_specifier(fmt_ctx,
                                                   fmt_ctx->streams[i],
                                                   stream_specifier);
-            if (ret < 0)
-                goto end;
+            CHECK_END;
             else
                 selected_streams[i] = ret;
             ret = 0;
@@ -2140,18 +2394,29 @@
             section_id = SECTION_ID_FRAMES;
         if (do_show_frames || do_show_packets)
             writer_print_section_header(wctx, section_id);
-        read_packets(wctx, fmt_ctx);
+        ret = read_packets(wctx, fmt_ctx);
         if (do_show_frames || do_show_packets)
             writer_print_section_footer(wctx);
+        CHECK_END;
+    }
+
+    if (do_show_programs) {
+        ret = show_programs(wctx, fmt_ctx);
+        CHECK_END;
+    }
+
+    if (do_show_streams) {
+        ret = show_streams(wctx, fmt_ctx);
+        CHECK_END;
+    }
+    if (do_show_chapters) {
+        ret = show_chapters(wctx, fmt_ctx);
+        CHECK_END;
+    }
+    if (do_show_format) {
+        ret = show_format(wctx, fmt_ctx);
+        CHECK_END;
     }
-    if (do_show_programs)
-        show_programs(wctx, fmt_ctx);
-    if (do_show_streams)
-        show_streams(wctx, fmt_ctx);
-    if (do_show_chapters)
-        show_chapters(wctx, fmt_ctx);
-    if (do_show_format)
-        show_format(wctx, fmt_ctx);
 
 end:
     close_input_file(&fmt_ctx);
@@ -2177,7 +2442,7 @@
     writer_print_section_header(w, SECTION_ID_PROGRAM_VERSION);
     print_str("version", FFMPEG_VERSION);
     print_fmt("copyright", "Copyright (c) %d-%d the FFmpeg developers",
-              program_birth_year, this_year);
+              program_birth_year, CONFIG_THIS_YEAR);
     print_str("build_date", __DATE__);
     print_str("build_time", __TIME__);
     print_str("compiler_ident", CC_IDENT);
@@ -2648,6 +2913,12 @@
     SET_DO_SHOW(STREAM_DISPOSITION, stream_disposition);
     SET_DO_SHOW(PROGRAM_STREAM_DISPOSITION, stream_disposition);
 
+    SET_DO_SHOW(CHAPTER_TAGS, chapter_tags);
+    SET_DO_SHOW(FORMAT_TAGS, format_tags);
+    SET_DO_SHOW(FRAME_TAGS, frame_tags);
+    SET_DO_SHOW(PROGRAM_TAGS, program_tags);
+    SET_DO_SHOW(STREAM_TAGS, stream_tags);
+
     if (do_bitexact && (do_show_program_version || do_show_library_versions)) {
         av_log(NULL, AV_LOG_ERROR,
                "-bitexact and -show_program_version or -show_library_versions "
@@ -2676,6 +2947,9 @@
 
     if ((ret = writer_open(&wctx, w, w_args,
                            sections, FF_ARRAY_ELEMS(sections))) >= 0) {
+        if (w == &xml_writer)
+            wctx->string_validation_utf8_flags |= AV_UTF8_FLAG_EXCLUDE_XML_INVALID_CONTROL_CODES;
+
         writer_print_section_header(wctx, SECTION_ID_ROOT);
 
         if (do_show_program_version)

omxplayer-2014.02.11.tar.gz/ffmpeg/ffserver.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/ffserver.c Changed

@@ -216,6 +216,7 @@
     struct FFStream *feed;   /* feed we are using (can be null if
                                 coming from file) */
     AVDictionary *in_opts;   /* input parameters */
+    AVDictionary *metadata;  /* metadata to set on the stream */
     AVInputFormat *ifmt;       /* if non NULL, force input format */
     AVOutputFormat *fmt;
     IPAddressACL *acl;
@@ -228,10 +229,6 @@
     int feed_streams[MAX_STREAMS]; /* index of streams in the feed */
     char feed_filename[1024]; /* file name of the feed storage, or
                                  input file name for a stream */
-    char author[512];
-    char title[512];
-    char copyright[512];
-    char comment[512];
     pid_t pid;  /* Of ffmpeg process */
     time_t pid_start;  /* Of ffmpeg process */
     char **child_argv;
@@ -290,8 +287,7 @@
 static void rtsp_cmd_options(HTTPContext *c, const char *url);
 static void rtsp_cmd_setup(HTTPContext *c, const char *url, RTSPMessageHeader *h);
 static void rtsp_cmd_play(HTTPContext *c, const char *url, RTSPMessageHeader *h);
-static void rtsp_cmd_pause(HTTPContext *c, const char *url, RTSPMessageHeader *h);
-static void rtsp_cmd_teardown(HTTPContext *c, const char *url, RTSPMessageHeader *h);
+static void rtsp_cmd_interrupt(HTTPContext *c, const char *url, RTSPMessageHeader *h, int pause_only);
 
 /* SDP handling */
 static int prepare_sdp_description(FFStream *stream, uint8_t **pbuffer,
@@ -509,8 +505,9 @@
                 char *slash;
                 int i;
 
+                /* replace "ffserver" with "ffmpeg" in the path of current
+                 * program. Ignore user provided path */
                 av_strlcpy(pathname, my_program_name, sizeof(pathname));
-
                 slash = strrchr(pathname, '/');
                 if (!slash)
                     slash = pathname;
@@ -630,17 +627,16 @@
                 }
             }
 
-            /* change state to send data */
             rtp_c->state = HTTPSTATE_SEND_DATA;
         }
     }
 }
 
-/* main loop of the http server */
+/* main loop of the HTTP server */
 static int http_server(void)
 {
     int server_fd = 0, rtsp_server_fd = 0;
-    int ret, delay, delay1;
+    int ret, delay;
     struct pollfd *poll_table, *poll_entry;
     HTTPContext *c, *c_next;
 
@@ -704,18 +700,19 @@
             case HTTPSTATE_SEND_DATA:
             case HTTPSTATE_SEND_DATA_TRAILER:
                 if (!c->is_packetized) {
-                    /* for TCP, we output as much as we can (may need to put a limit) */
+                    /* for TCP, we output as much as we can
+                     * (may need to put a limit) */
                     c->poll_entry = poll_entry;
                     poll_entry->fd = fd;
                     poll_entry->events = POLLOUT;
                     poll_entry++;
                 } else {
                     /* when ffserver is doing the timing, we work by
-                       looking at which packet need to be sent every
+                       looking at which packet needs to be sent every
                        10 ms */
-                    delay1 = 10; /* one tick wait XXX: 10 ms assumed */
-                    if (delay1 < delay)
-                        delay = delay1;
+                    /* one tick wait XXX: 10 ms assumed */
+                    if (delay > 10)
+                        delay = 10;
                 }
                 break;
             case HTTPSTATE_WAIT_REQUEST:
@@ -755,8 +752,8 @@
         for(c = first_http_ctx; c != NULL; c = c_next) {
             c_next = c->next;
             if (handle_connection(c) < 0) {
-                /* close and free the connection */
                 log_connection(c);
+                /* close and free the connection */
                 close_connection(c);
             }
         }
@@ -1005,9 +1002,7 @@
         if (len < 0) {
             if (ff_neterrno() != AVERROR(EAGAIN) &&
                 ff_neterrno() != AVERROR(EINTR)) {
-                /* error : close connection */
-                av_freep(&c->pb_buffer);
-                return -1;
+                goto close_connection;
             }
         } else {
             c->buffer_ptr += len;
@@ -1019,7 +1014,8 @@
                 /* if error, exit */
                 if (c->http_error)
                     return -1;
-                /* all the buffer was sent : synchronize to the incoming stream */
+                /* all the buffer was sent : synchronize to the incoming
+                 * stream */
                 c->state = HTTPSTATE_SEND_DATA_HEADER;
                 c->buffer_ptr = c->buffer_end = c->buffer;
             }
@@ -1030,7 +1026,7 @@
     case HTTPSTATE_SEND_DATA_HEADER:
     case HTTPSTATE_SEND_DATA_TRAILER:
         /* for packetized output, we consider we can always write (the
-           input streams sets the speed). It may be better to verify
+           input streams set the speed). It may be better to verify
            that we do not rely too much on the kernel queues */
         if (!c->is_packetized) {
             if (c->poll_entry->revents & (POLLERR | POLLHUP))
@@ -1064,10 +1060,8 @@
         break;
 
     case RTSPSTATE_SEND_REPLY:
-        if (c->poll_entry->revents & (POLLERR | POLLHUP)) {
-            av_freep(&c->pb_buffer);
-            return -1;
-        }
+        if (c->poll_entry->revents & (POLLERR | POLLHUP))
+            goto close_connection;
         /* no need to write if no events */
         if (!(c->poll_entry->revents & POLLOUT))
             return 0;
@@ -1075,9 +1069,7 @@
         if (len < 0) {
             if (ff_neterrno() != AVERROR(EAGAIN) &&
                 ff_neterrno() != AVERROR(EINTR)) {
-                /* error : close connection */
-                av_freep(&c->pb_buffer);
-                return -1;
+                goto close_connection;
             }
         } else {
             c->buffer_ptr += len;
@@ -1122,6 +1114,10 @@
         return -1;
     }
     return 0;
+
+close_connection:
+    av_freep(&c->pb_buffer);
+    return -1;
 }
 
 static int extract_rates(char *rates, int ratelen, const char *request)
@@ -1460,7 +1456,7 @@
 }
 
 /* compute the real filename of a file by matching it without its
-   extensions to all the stream filenames */
+   extensions to all the stream's filenames */
 static void compute_real_filename(char *filename, int max_size)
 {
     char file1[1024];
@@ -1494,7 +1490,7 @@
     REDIR_SDP,
 };
 
-/* parse http request and prepare header */
+/* parse HTTP request and prepare header */
 static int http_parse_request(HTTPContext *c)
 {
     const char *p;
@@ -1865,7 +1861,7 @@
         goto send_error;
     }
 
-    /* prepare http header */
+    /* prepare HTTP header */
     c->buffer[0] = 0;
     av_strlcatf(c->buffer, c->buffer_size, "HTTP/1.0 200 OK\r\n");
     mime_type = c->stream->fmt->mime_type;
@@ -1944,7 +1940,7 @@
     }
 
     avio_printf(pb, "HTTP/1.0 200 OK\r\n");
-    avio_printf(pb, "Content-type: %s\r\n", "text/html");
+    avio_printf(pb, "Content-type: text/html\r\n");
     avio_printf(pb, "Pragma: no-cache\r\n");
     avio_printf(pb, "\r\n");
 
@@ -2183,8 +2179,10 @@
         buf_size = FFM_PACKET_SIZE;
         /* compute position (absolute time) */
         if (av_find_info_tag(buf, sizeof(buf), "date", info)) {
-            if ((ret = av_parse_time(&stream_pos, buf, 0)) < 0)
+            if ((ret = av_parse_time(&stream_pos, buf, 0)) < 0) {
+                http_log("Invalid date specification '%s' for stream\n", buf);
                 return ret;
+            }
         } else if (av_find_info_tag(buf, sizeof(buf), "buffer", info)) {
             int prebuffer = strtol(buf, 0, 10);
             stream_pos = av_gettime() - prebuffer * (int64_t)1000000;
@@ -2195,18 +2193,22 @@
         buf_size = 0;
         /* compute position (relative time) */
         if (av_find_info_tag(buf, sizeof(buf), "date", info)) {
-            if ((ret = av_parse_time(&stream_pos, buf, 1)) < 0)
+            if ((ret = av_parse_time(&stream_pos, buf, 1)) < 0) {
+                http_log("Invalid date specification '%s' for stream\n", buf);
                 return ret;
+            }
         } else
             stream_pos = 0;
     }
-    if (input_filename[0] == '\0')
-        return -1;
+    if (!input_filename[0]) {
+        http_log("No filename was specified for stream\n");
+        return AVERROR(EINVAL);
+    }
 
     /* open stream */
     if ((ret = avformat_open_input(&s, input_filename, c->stream->ifmt, &c->stream->in_opts)) < 0) {
-        http_log("could not open %s: %d\n", input_filename, ret);
-        return -1;
+        http_log("Could not open input '%s': %s\n", input_filename, av_err2str(ret));
+        return ret;
     }
 
     /* set buffer size */
@@ -2214,14 +2216,15 @@
 
     s->flags |= AVFMT_FLAG_GENPTS;
     c->fmt_in = s;
-    if (strcmp(s->iformat->name, "ffm") && avformat_find_stream_info(c->fmt_in, NULL) < 0) {
-        http_log("Could not find stream info '%s'\n", input_filename);
+    if (strcmp(s->iformat->name, "ffm") &&
+        (ret = avformat_find_stream_info(c->fmt_in, NULL)) < 0) {
+        http_log("Could not find stream info for input '%s'\n", input_filename);
         avformat_close_input(&s);
-        return -1;
+        return ret;
     }
 
-    /* choose stream as clock source (we favorize video stream if
-       present) for packet sending */
+    /* choose stream as clock source (we favor the video stream if
+     * present) for packet sending */
     c->pts_stream_index = 0;
     for(i=0;i<c->stream->nb_streams;i++) {
         if (c->pts_stream_index == 0 &&
@@ -2270,12 +2273,10 @@
     av_freep(&c->pb_buffer);
     switch(c->state) {
     case HTTPSTATE_SEND_DATA_HEADER:
-        memset(&c->fmt_ctx, 0, sizeof(c->fmt_ctx));
-        av_dict_set(&c->fmt_ctx.metadata, "author"   , c->stream->author   , 0);
-        av_dict_set(&c->fmt_ctx.metadata, "comment"  , c->stream->comment  , 0);
-        av_dict_set(&c->fmt_ctx.metadata, "copyright", c->stream->copyright, 0);
-        av_dict_set(&c->fmt_ctx.metadata, "title"    , c->stream->title    , 0);
-
+        ctx = avformat_alloc_context();
+        c->fmt_ctx = *ctx;
+        av_freep(&ctx);
+        av_dict_copy(&(c->fmt_ctx.metadata), c->stream->metadata, 0);
         c->fmt_ctx.streams = av_mallocz(sizeof(AVStream *) * c->stream->nb_streams);
 
         for(i=0;i<c->stream->nb_streams;i++) {
@@ -2290,8 +2291,8 @@
 
             *(c->fmt_ctx.streams[i]) = *src;
             c->fmt_ctx.streams[i]->priv_data = 0;
-            c->fmt_ctx.streams[i]->codec->frame_number = 0; /* XXX: should be done in
-                                           AVStream, not in codec */
+            /* XXX: should be done in AVStream, not in codec */
+            c->fmt_ctx.streams[i]->codec->frame_number = 0;
         }
         /* set output format parameters */
         c->fmt_ctx.oformat = c->stream->fmt;
@@ -2309,13 +2310,14 @@
         /*
          * HACK to avoid mpeg ps muxer to spit many underflow errors
          * Default value from FFmpeg
-         * Try to set it use configuration option
+         * Try to set it using configuration option
          */
         c->fmt_ctx.max_delay = (int)(0.7*AV_TIME_BASE);
 
-        if (avformat_write_header(&c->fmt_ctx, NULL) < 0) {
-            http_log("Error writing output header\n");
-            return -1;
+        if ((ret = avformat_write_header(&c->fmt_ctx, NULL)) < 0) {
+            http_log("Error writing output header for stream '%s': %s\n",
+                     c->stream->filename, av_err2str(ret));
+            return ret;
         }
         av_dict_free(&c->fmt_ctx.metadata);
 
@@ -2359,7 +2361,7 @@
                         goto redo;
                     } else {
                     no_loop:
-                        /* must send trailer now because eof or error */
+                        /* must send trailer now because EOF or error */
                         c->state = HTTPSTATE_SEND_DATA_TRAILER;
                     }
                 }
@@ -2401,8 +2403,8 @@
                 send_it:
                     ist = c->fmt_in->streams[source_index];
                     /* specific handling for RTP: we use several
-                       output stream (one for each RTP
-                       connection). XXX: need more abstract handling */
+                     * output streams (one for each RTP connection).
+                     * XXX: need more abstract handling */
                     if (c->is_packetized) {
                         /* compute send time and duration */
                         c->cur_pts = av_rescale_q(pkt.dts, ist->time_base, AV_TIME_BASE_Q);
@@ -2446,8 +2448,9 @@
                     if (pkt.pts != AV_NOPTS_VALUE)
                         pkt.pts = av_rescale_q(pkt.pts, ist->time_base, ost->time_base);
                     pkt.duration = av_rescale_q(pkt.duration, ist->time_base, ost->time_base);
-                    if (av_write_frame(ctx, &pkt) < 0) {
-                        http_log("Error writing frame to output\n");
+                    if ((ret = av_write_frame(ctx, &pkt)) < 0) {
+                        http_log("Error writing frame to output for stream '%s': %s\n",
+                                 c->stream->filename, av_err2str(ret));
                         c->state = HTTPSTATE_SEND_DATA_TRAILER;
                     }
 
@@ -2491,7 +2494,7 @@
 
 /* should convert the format at the same time */
 /* send data starting at c->buffer_ptr to the output connection
-   (either UDP or TCP connection) */
+ * (either UDP or TCP) */
 static int http_send_data(HTTPContext *c)
 {
     int len, ret;
@@ -2614,19 +2617,26 @@
 static int http_start_receive_data(HTTPContext *c)
 {
     int fd;
+    int ret;
 
-    if (c->stream->feed_opened)
-        return -1;
+    if (c->stream->feed_opened) {
+        http_log("Stream feed '%s' was not opened\n", c->stream->feed_filename);
+        return AVERROR(EINVAL);
+    }
 
     /* Don't permit writing to this one */
-    if (c->stream->readonly)
-        return -1;
+    if (c->stream->readonly) {
+        http_log("Cannot write to read-only file '%s'\n", c->stream->feed_filename);
+        return AVERROR(EINVAL);
+    }
 
     /* open feed */
     fd = open(c->stream->feed_filename, O_RDWR);
     if (fd < 0) {
-        http_log("Error opening feeder file: %s\n", strerror(errno));
-        return -1;
+        ret = AVERROR(errno);
+        http_log("Could not open feed file '%s': %s\n",
+                 c->stream->feed_filename, strerror(errno));
+        return ret;
     }
     c->feed_fd = fd;
 
@@ -2635,13 +2645,19 @@
         ffm_write_write_index(c->feed_fd, FFM_PACKET_SIZE);
         http_log("Truncating feed file '%s'\n", c->stream->feed_filename);
         if (ftruncate(c->feed_fd, FFM_PACKET_SIZE) < 0) {
-            http_log("Error truncating feed file: %s\n", strerror(errno));
-            return -1;
+            ret = AVERROR(errno);
+            http_log("Error truncating feed file '%s': %s\n",
+                     c->stream->feed_filename, strerror(errno));
+            return ret;
         }
     } else {
-        if ((c->stream->feed_write_index = ffm_read_write_index(fd)) < 0) {
-            http_log("Error reading write index from feed file: %s\n", strerror(errno));
-            return -1;
+        ret = ffm_read_write_index(fd);
+        if (ret < 0) {
+            http_log("Error reading write index from feed file '%s': %s\n",
+                     c->stream->feed_filename, strerror(errno));
+            return ret;
+        } else {
+            c->stream->feed_write_index = ret;
         }
     }
 
@@ -2945,9 +2961,9 @@
     else if (!strcmp(cmd, "PLAY"))
         rtsp_cmd_play(c, url, header);
     else if (!strcmp(cmd, "PAUSE"))
-        rtsp_cmd_pause(c, url, header);
+        rtsp_cmd_interrupt(c, url, header, 1);
     else if (!strcmp(cmd, "TEARDOWN"))
-        rtsp_cmd_teardown(c, url, header);
+        rtsp_cmd_interrupt(c, url, header, 0);
     else
         rtsp_reply_error(c, RTSP_STATUS_METHOD);
 
@@ -2970,6 +2986,7 @@
     AVFormatContext *avc;
     AVStream *avs = NULL;
     AVOutputFormat *rtp_format = av_guess_format("rtp", NULL, NULL);
+    AVDictionaryEntry *entry = av_dict_get(stream->metadata, "title", NULL, 0);
     int i;
 
     avc =  avformat_alloc_context();
@@ -2978,7 +2995,7 @@
     }
     avc->oformat = rtp_format;
     av_dict_set(&avc->metadata, "title",
-               stream->title[0] ? stream->title : "No Title", 0);
+                entry ? entry->value : "No Title", 0);
     avc->nb_streams = stream->nb_streams;
     if (stream->is_multicast) {
         snprintf(avc->filename, 1024, "rtp://%s:%d?multicast=1?ttl=%d",
@@ -3300,7 +3317,7 @@
     avio_printf(c->pb, "\r\n");
 }
 
-static void rtsp_cmd_pause(HTTPContext *c, const char *url, RTSPMessageHeader *h)
+static void rtsp_cmd_interrupt(HTTPContext *c, const char *url, RTSPMessageHeader *h, int pause_only)
 {
     HTTPContext *rtp_c;
 
@@ -3310,29 +3327,14 @@
         return;
     }
 
-    if (rtp_c->state != HTTPSTATE_SEND_DATA &&
-        rtp_c->state != HTTPSTATE_WAIT_FEED) {
-        rtsp_reply_error(c, RTSP_STATUS_STATE);
-        return;
-    }
-
-    rtp_c->state = HTTPSTATE_READY;
-    rtp_c->first_pts = AV_NOPTS_VALUE;
-    /* now everything is OK, so we can send the connection parameters */
-    rtsp_reply_header(c, RTSP_STATUS_OK);
-    /* session ID */
-    avio_printf(c->pb, "Session: %s\r\n", rtp_c->session_id);
-    avio_printf(c->pb, "\r\n");
-}
-
-static void rtsp_cmd_teardown(HTTPContext *c, const char *url, RTSPMessageHeader *h)
-{
-    HTTPContext *rtp_c;
-
-    rtp_c = find_rtp_session_with_url(url, h->session_id);
-    if (!rtp_c) {
-        rtsp_reply_error(c, RTSP_STATUS_SESSION);
-        return;
+    if (pause_only) {
+        if (rtp_c->state != HTTPSTATE_SEND_DATA &&
+            rtp_c->state != HTTPSTATE_WAIT_FEED) {
+            rtsp_reply_error(c, RTSP_STATUS_STATE);
+            return;
+        }
+        rtp_c->state = HTTPSTATE_READY;
+        rtp_c->first_pts = AV_NOPTS_VALUE;
     }
 
     /* now everything is OK, so we can send the connection parameters */
@@ -3341,11 +3343,10 @@
     avio_printf(c->pb, "Session: %s\r\n", rtp_c->session_id);
     avio_printf(c->pb, "\r\n");
 
-    /* abort the session */
-    close_connection(rtp_c);
+    if (!pause_only)
+        close_connection(rtp_c);
 }
 
-
 /********************************************************************/
 /* RTP handling */
 
@@ -3490,7 +3491,8 @@
              ipaddr, ntohs(dest_addr->sin_port),
              c->stream->filename, stream_index, c->protocol);
 
-    /* normally, no packets should be output here, but the packet size may be checked */
+    /* normally, no packets should be output here, but the packet size may
+     * be checked */
     if (ffio_open_dyn_packet_buf(&ctx->pb, max_packet_size) < 0) {
         /* XXX: close stream */
         goto fail;
@@ -3532,7 +3534,7 @@
         }
     } else {
         /* live streams must use the actual feed's codec since it may be
-         * updated later to carry extradata needed by the streams.
+         * updated later to carry extradata needed by them.
          */
         fst->codec = codec;
     }
@@ -3669,9 +3671,14 @@
                 av_dict_set(&stream->in_opts, "mpeg2ts_compute_pcr", "1", 0);
             }
 
-            http_log("Opening file '%s'\n", stream->feed_filename);
+            if (!stream->feed_filename[0]) {
+                http_log("Unspecified feed file for stream '%s'\n", stream->filename);
+                goto fail;
+            }
+
+            http_log("Opening feed file '%s' for stream '%s'\n", stream->feed_filename, stream->filename);
             if ((ret = avformat_open_input(&infile, stream->feed_filename, stream->ifmt, &stream->in_opts)) < 0) {
-                http_log("Could not open '%s': %d\n", stream->feed_filename, ret);
+                http_log("Could not open '%s': %s\n", stream->feed_filename, av_err2str(ret));
                 /* remove stream (no need to spend more time on it) */
             fail:
                 remove_stream(stream);
@@ -3796,7 +3803,7 @@
             }
         }
         if (avio_check(feed->feed_filename, AVIO_FLAG_WRITE) <= 0) {
-            AVFormatContext s1 = {0}, *s = &s1;
+            AVFormatContext *s = avformat_alloc_context();
 
             if (feed->readonly) {
                 http_log("Unable to create feed file '%s' as it is marked readonly\n",
@@ -3820,6 +3827,9 @@
             /* XXX: need better api */
             av_freep(&s->priv_data);
             avio_close(s->pb);
+            s->streams = NULL;
+            s->nb_streams = 0;
+            avformat_free_context(s);
         }
         /* get feed size and write index */
         fd = open(feed->feed_filename, O_RDONLY);
@@ -3942,24 +3952,13 @@
     memcpy(st->codec, av, sizeof(AVCodecContext));
 }
 
-static enum AVCodecID opt_audio_codec(const char *arg)
-{
-    AVCodec *p= avcodec_find_encoder_by_name(arg);
-
-    if (p == NULL || p->type != AVMEDIA_TYPE_AUDIO)
-        return AV_CODEC_ID_NONE;
-
-    return p->id;
-}
-
-static enum AVCodecID opt_video_codec(const char *arg)
+static enum AVCodecID opt_codec(const char *name, enum AVMediaType type)
 {
-    AVCodec *p= avcodec_find_encoder_by_name(arg);
+    AVCodec *codec = avcodec_find_encoder_by_name(name);
 
-    if (p == NULL || p->type != AVMEDIA_TYPE_VIDEO)
+    if (!codec || codec->type != type)
         return AV_CODEC_ID_NONE;
-
-    return p->id;
+    return codec->id;
 }
 
 static int ffserver_opt_default(const char *opt, const char *arg,
@@ -3998,9 +3997,9 @@
             break;
         }
         if(!strcmp(tmp, "acodec")){
-            *audio_id = opt_audio_codec(tmp2);
+            *audio_id = opt_codec(tmp2, AVMEDIA_TYPE_AUDIO);
         }else if(!strcmp(tmp, "vcodec")){
-            *video_id = opt_video_codec(tmp2);
+            *video_id = opt_codec(tmp2, AVMEDIA_TYPE_VIDEO);
         }else if(!strcmp(tmp, "scodec")){
             /* opt_subtitle_codec(tmp2); */
         }else if(ffserver_opt_default(tmp, tmp2, avctx, type) < 0){
@@ -4015,8 +4014,7 @@
     return ret;
 }
 
-static AVOutputFormat *ffserver_guess_format(const char *short_name, const char *filename,
-                                             const char *mime_type)
+static AVOutputFormat *ffserver_guess_format(const char *short_name, const char *filename, const char *mime_type)
 {
     AVOutputFormat *fmt = av_guess_format(short_name, filename, mime_type);
 
@@ -4034,12 +4032,12 @@
     return fmt;
 }
 
-static void report_config_error(const char *filename, int line_num, int *errors, const char *fmt, ...)
+static void report_config_error(const char *filename, int line_num, int log_level, int *errors, const char *fmt, ...)
 {
     va_list vl;
     va_start(vl, fmt);
-    fprintf(stderr, "%s:%d: ", filename, line_num);
-    vfprintf(stderr, fmt, vl);
+    av_log(NULL, log_level, "%s:%d: ", filename, line_num);
+    av_vlog(NULL, log_level, fmt, vl);
     va_end(vl);
 
     (*errors)++;
@@ -4050,21 +4048,23 @@
     FILE *f;
     char line[1024];
     char cmd[64];
-    char arg[1024];
+    char arg[1024], arg2[1024];
     const char *p;
-    int val, errors, line_num;
+    int val, errors, warnings, line_num;
     FFStream **last_stream, *stream, *redirect;
     FFStream **last_feed, *feed, *s;
     AVCodecContext audio_enc, video_enc;
     enum AVCodecID audio_id, video_id;
+    int ret = 0;
 
     f = fopen(filename, "r");
     if (!f) {
-        perror(filename);
-        return -1;
+        ret = AVERROR(errno);
+        av_log(NULL, AV_LOG_ERROR, "Could not open the configuration file '%s'\n", filename);
+        return ret;
     }
 
-    errors = 0;
+    errors = warnings = 0;
     line_num = 0;
     first_stream = NULL;
     last_stream = &first_stream;
@@ -4075,8 +4075,9 @@
     redirect = NULL;
     audio_id = AV_CODEC_ID_NONE;
     video_id = AV_CODEC_ID_NONE;
+#define ERROR(...)   report_config_error(filename, line_num, AV_LOG_ERROR,   &errors,   __VA_ARGS__)
+#define WARNING(...) report_config_error(filename, line_num, AV_LOG_WARNING, &warnings, __VA_ARGS__)
 
-#define ERROR(...) report_config_error(filename, line_num, &errors, __VA_ARGS__)
     for(;;) {
         if (fgets(line, sizeof(line), f) == NULL)
             break;
@@ -4102,7 +4103,7 @@
                 ERROR("%s:%d: Invalid host/IP address: %s\n", arg);
             }
         } else if (!av_strcasecmp(cmd, "NoDaemon")) {
-            // do nothing here, its the default now
+            WARNING("NoDaemon option has no effect, you should remove it\n");
         } else if (!av_strcasecmp(cmd, "RTSPPort")) {
             get_arg(arg, sizeof(arg), &p);
             val = atoi(arg);
@@ -4149,6 +4150,10 @@
                 ERROR("Already in a tag\n");
             } else {
                 feed = av_mallocz(sizeof(FFStream));
+                if (!feed) {
+                    ret = AVERROR(ENOMEM);
+                    goto end;
+                }
                 get_arg(feed->filename, sizeof(feed->filename), &p);
                 q = strrchr(feed->filename, '>');
                 if (*q)
@@ -4161,7 +4166,7 @@
                 }
 
                 feed->fmt = av_guess_format("ffm", NULL, NULL);
-                /* defaut feed file */
+                /* default feed file */
                 snprintf(feed->feed_filename, sizeof(feed->feed_filename),
                          "/tmp/%s.ffm", feed->filename);
                 feed->feed_max_size = 5 * 1024 * 1024;
@@ -4180,36 +4185,50 @@
                 int i;
 
                 feed->child_argv = av_mallocz(64 * sizeof(char *));
-
+                if (!feed->child_argv) {
+                    ret = AVERROR(ENOMEM);
+                    goto end;
+                }
                 for (i = 0; i < 62; i++) {
                     get_arg(arg, sizeof(arg), &p);
                     if (!arg[0])
                         break;
 
                     feed->child_argv[i] = av_strdup(arg);
+                    if (!feed->child_argv[i]) {
+                        ret = AVERROR(ENOMEM);
+                        goto end;
+                    }
                 }
 
-                feed->child_argv[i] = av_asprintf("http://%s:%d/%s",
-                        (my_http_addr.sin_addr.s_addr == INADDR_ANY) ? "127.0.0.1" :
-                    inet_ntoa(my_http_addr.sin_addr),
-                    ntohs(my_http_addr.sin_port), feed->filename);
+                feed->child_argv[i] =
+                    av_asprintf("http://%s:%d/%s",
+                                (my_http_addr.sin_addr.s_addr == INADDR_ANY) ? "127.0.0.1" :
+                                inet_ntoa(my_http_addr.sin_addr), ntohs(my_http_addr.sin_port),
+                                feed->filename);
+                if (!feed->child_argv[i]) {
+                    ret = AVERROR(ENOMEM);
+                    goto end;
+                }
             }
-        } else if (!av_strcasecmp(cmd, "ReadOnlyFile")) {
+        } else if (!av_strcasecmp(cmd, "File") || !av_strcasecmp(cmd, "ReadOnlyFile")) {
             if (feed) {
                 get_arg(feed->feed_filename, sizeof(feed->feed_filename), &p);
-                feed->readonly = 1;
+                feed->readonly = !av_strcasecmp(cmd, "ReadOnlyFile");
             } else if (stream) {
                 get_arg(stream->feed_filename, sizeof(stream->feed_filename), &p);
             }
-        } else if (!av_strcasecmp(cmd, "File")) {
-            if (feed) {
-                get_arg(feed->feed_filename, sizeof(feed->feed_filename), &p);
-            } else if (stream)
-                get_arg(stream->feed_filename, sizeof(stream->feed_filename), &p);
         } else if (!av_strcasecmp(cmd, "Truncate")) {
             if (feed) {
                 get_arg(arg, sizeof(arg), &p);
-                feed->truncate = strtod(arg, NULL);
+                /* assume Truncate is true in case no argument is specified */
+                if (!arg[0]) {
+                    feed->truncate = 1;
+                } else {
+                    WARNING("Truncate N syntax in configuration file is deprecated, "
+                            "use Truncate alone with no arguments\n");
+                    feed->truncate = strtod(arg, NULL);
+                }
             }
         } else if (!av_strcasecmp(cmd, "FileMaxSize")) {
             if (feed) {
@@ -4249,6 +4268,10 @@
             } else {
                 FFStream *s;
                 stream = av_mallocz(sizeof(FFStream));
+                if (!stream) {
+                    ret = AVERROR(ENOMEM);
+                    goto end;
+                }
                 get_arg(stream->filename, sizeof(stream->filename), &p);
                 q = strrchr(stream->filename, '>');
                 if (q)
@@ -4286,7 +4309,7 @@
                     sfeed = sfeed->next_feed;
                 }
                 if (!sfeed)
-                    ERROR("feed '%s' not defined\n", arg);
+                    ERROR("Feed with name '%s' for stream '%s' is not defined\n", arg, stream->filename);
                 else
                     stream->feed = sfeed;
             }
@@ -4325,18 +4348,36 @@
             } else {
                 ERROR("FaviconURL only permitted for status streams\n");
             }
-        } else if (!av_strcasecmp(cmd, "Author")) {
-            if (stream)
-                get_arg(stream->author, sizeof(stream->author), &p);
-        } else if (!av_strcasecmp(cmd, "Comment")) {
-            if (stream)
-                get_arg(stream->comment, sizeof(stream->comment), &p);
-        } else if (!av_strcasecmp(cmd, "Copyright")) {
-            if (stream)
-                get_arg(stream->copyright, sizeof(stream->copyright), &p);
-        } else if (!av_strcasecmp(cmd, "Title")) {
-            if (stream)
-                get_arg(stream->title, sizeof(stream->title), &p);
+        } else if (!av_strcasecmp(cmd, "Author")    ||
+                   !av_strcasecmp(cmd, "Comment")   ||
+                   !av_strcasecmp(cmd, "Copyright") ||
+                   !av_strcasecmp(cmd, "Title")) {
+            get_arg(arg, sizeof(arg), &p);
+
+            if (stream) {
+                char key[32];
+                int i, ret;
+
+                for (i = 0; i < strlen(cmd); i++)
+                    key[i] = av_tolower(cmd[i]);
+                key[i] = 0;
+                WARNING("'%s' option in configuration file is deprecated, "
+                        "use 'Metadata %s VALUE' instead\n", cmd, key);
+                if ((ret = av_dict_set(&stream->metadata, key, arg, 0)) < 0) {
+                    ERROR("Could not set metadata '%s' to value '%s': %s\n",
+                          key, arg, av_err2str(ret));
+                }
+            }
+        } else if (!av_strcasecmp(cmd, "Metadata")) {
+            get_arg(arg, sizeof(arg), &p);
+            get_arg(arg2, sizeof(arg2), &p);
+            if (stream) {
+                int ret;
+                if ((ret = av_dict_set(&stream->metadata, arg, arg2, 0)) < 0) {
+                    ERROR("Could not set metadata '%s' to value '%s': %s\n",
+                          arg, arg2, av_err2str(ret));
+                }
+            }
         } else if (!av_strcasecmp(cmd, "Preroll")) {
             get_arg(arg, sizeof(arg), &p);
             if (stream)
@@ -4346,13 +4387,13 @@
                 stream->send_on_key = 1;
         } else if (!av_strcasecmp(cmd, "AudioCodec")) {
             get_arg(arg, sizeof(arg), &p);
-            audio_id = opt_audio_codec(arg);
+            audio_id = opt_codec(arg, AVMEDIA_TYPE_AUDIO);
             if (audio_id == AV_CODEC_ID_NONE) {
                 ERROR("Unknown AudioCodec: %s\n", arg);
             }
         } else if (!av_strcasecmp(cmd, "VideoCodec")) {
             get_arg(arg, sizeof(arg), &p);
-            video_id = opt_video_codec(arg);
+            video_id = opt_codec(arg, AVMEDIA_TYPE_VIDEO);
             if (video_id == AV_CODEC_ID_NONE) {
                 ERROR("Unknown VideoCodec: %s\n", arg);
             }
@@ -4372,11 +4413,6 @@
             get_arg(arg, sizeof(arg), &p);
             if (stream)
                 audio_enc.sample_rate = atoi(arg);
-        } else if (!av_strcasecmp(cmd, "AudioQuality")) {
-            get_arg(arg, sizeof(arg), &p);
-            if (stream) {
-//                audio_enc.quality = atof(arg) * 1000;
-            }
         } else if (!av_strcasecmp(cmd, "VideoBitRateRange")) {
             if (stream) {
                 int minrate, maxrate;
@@ -4418,10 +4454,14 @@
         } else if (!av_strcasecmp(cmd, "VideoSize")) {
             get_arg(arg, sizeof(arg), &p);
             if (stream) {
-                av_parse_video_size(&video_enc.width, &video_enc.height, arg);
-                if ((video_enc.width % 16) != 0 ||
-                    (video_enc.height % 16) != 0) {
-                    ERROR("Image size must be a multiple of 16\n");
+                ret = av_parse_video_size(&video_enc.width, &video_enc.height, arg);
+                if (ret < 0) {
+                    ERROR("Invalid video size '%s'\n", arg);
+                } else {
+                    if ((video_enc.width % 16) != 0 ||
+                        (video_enc.height % 16) != 0) {
+                        ERROR("Image size must be a multiple of 16\n");
+                    }
                 }
             }
         } else if (!av_strcasecmp(cmd, "VideoFrameRate")) {
@@ -4460,7 +4500,6 @@
             }
         } else if (!av_strcasecmp(cmd, "AVOptionVideo") ||
                    !av_strcasecmp(cmd, "AVOptionAudio")) {
-            char arg2[1024];
             AVCodecContext *avctx;
             int type;
             get_arg(arg, sizeof(arg), &p);
@@ -4473,7 +4512,7 @@
                 type = AV_OPT_FLAG_AUDIO_PARAM;
             }
             if (ffserver_opt_default(arg, arg2, avctx, type|AV_OPT_FLAG_ENCODING_PARAM)) {
-                ERROR("AVOption error: %s %s\n", arg, arg2);
+                ERROR("Error setting %s option to %s %s\n", cmd, arg, arg2);
             }
         } else if (!av_strcasecmp(cmd, "AVPresetVideo") ||
                    !av_strcasecmp(cmd, "AVPresetAudio")) {
@@ -4604,6 +4643,10 @@
                 ERROR("Already in a tag\n");
             } else {
                 redirect = av_mallocz(sizeof(FFStream));
+                if (!redirect) {
+                    ret = AVERROR(ENOMEM);
+                    goto end;
+                }
                 *last_stream = redirect;
                 last_stream = &redirect->next;
 
@@ -4633,9 +4676,12 @@
     }
 #undef ERROR
 
+end:
     fclose(f);
+    if (ret < 0)
+        return ret;
     if (errors)
-        return -1;
+        return AVERROR(EINVAL);
     else
         return 0;
 }
@@ -4690,6 +4736,7 @@
 int main(int argc, char **argv)
 {
     struct sigaction sigact = { { 0 } };
+    int ret = 0;
 
     config_filename = av_strdup("/etc/ffserver.conf");
 
@@ -4711,8 +4758,9 @@
     sigact.sa_flags = SA_NOCLDSTOP | SA_RESTART;
     sigaction(SIGCHLD, &sigact, 0);
 
-    if (parse_ffconfig(config_filename) < 0) {
-        fprintf(stderr, "Incorrect config file - exiting.\n");
+    if ((ret = parse_ffconfig(config_filename)) < 0) {
+        fprintf(stderr, "Error reading configuration file '%s': %s\n",
+                config_filename, av_err2str(ret));
         exit(1);
     }
     av_freep(&config_filename);

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/4xm.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/4xm.c Changed

@@ -26,6 +26,7 @@
 
 #include "libavutil/avassert.h"
 #include "libavutil/frame.h"
+#include "libavutil/imgutils.h"
 #include "libavutil/intreadwrite.h"
 #include "avcodec.h"
 #include "bytestream.h"
@@ -131,7 +132,8 @@
 typedef struct FourXContext {
     AVCodecContext *avctx;
     DSPContext dsp;
-    AVFrame *current_picture, *last_picture;
+    uint16_t *frame_buffer;
+    uint16_t *last_frame_buffer;
     GetBitContext pre_gb;          ///< ac/dc prefix
     GetBitContext gb;
     GetByteContext g;
@@ -341,7 +343,7 @@
     int code        = get_vlc2(&f->gb,
                                block_type_vlc[1 - (f->version > 1)][index].table,
                                BLOCK_TYPE_VLC_BITS, 1);
-    uint16_t *start = (uint16_t *)f->last_picture->data[0];
+    uint16_t *start = f->last_frame_buffer;
     uint16_t *end   = start + stride * (f->avctx->height - h + 1) - (1 << log2w);
     int ret;
     int scale   = 1;
@@ -414,29 +416,18 @@
     return 0;
 }
 
-static int decode_p_frame(FourXContext *f, AVFrame *frame,
-                          const uint8_t *buf, int length)
+static int decode_p_frame(FourXContext *f, const uint8_t *buf, int length)
 {
     int x, y;
     const int width  = f->avctx->width;
     const int height = f->avctx->height;
-    uint16_t *dst    = (uint16_t *)frame->data[0];
-    const int stride =             frame->linesize[0] >> 1;
+    uint16_t *dst    = f->frame_buffer;
     uint16_t *src;
     unsigned int bitstream_size, bytestream_size, wordstream_size, extra,
                  bytestream_offset, wordstream_offset;
     int ret;
 
-    if (!f->last_picture->data[0]) {
-        if ((ret = ff_get_buffer(f->avctx, f->last_picture,
-                                 AV_GET_BUFFER_FLAG_REF)) < 0) {
-            return ret;
-        }
-        for (y=0; y<f->avctx->height; y++)
-            memset(f->last_picture->data[0] + y*f->last_picture->linesize[0], 0, 2*f->avctx->width);
-    }
-
-    src = (uint16_t *)f->last_picture->data[0];
+    src = f->last_frame_buffer;
 
     if (f->version > 1) {
         extra           = 20;
@@ -461,14 +452,12 @@
         return AVERROR_INVALIDDATA;
     }
 
-    av_fast_malloc(&f->bitstream_buffer, &f->bitstream_buffer_size,
-                   bitstream_size + FF_INPUT_BUFFER_PADDING_SIZE);
+    av_fast_padded_malloc(&f->bitstream_buffer, &f->bitstream_buffer_size,
+                          bitstream_size);
     if (!f->bitstream_buffer)
         return AVERROR(ENOMEM);
     f->dsp.bswap_buf(f->bitstream_buffer, (const uint32_t*)(buf + extra),
                      bitstream_size / 4);
-    memset((uint8_t*)f->bitstream_buffer + bitstream_size,
-           0, FF_INPUT_BUFFER_PADDING_SIZE);
     init_get_bits(&f->gb, f->bitstream_buffer, 8 * bitstream_size);
 
     wordstream_offset = extra + bitstream_size;
@@ -478,14 +467,14 @@
     bytestream2_init(&f->g, buf + bytestream_offset,
                      length - bytestream_offset);
 
-    init_mv(f, frame->linesize[0]);
+    init_mv(f, width * 2);
 
     for (y = 0; y < height; y += 8) {
         for (x = 0; x < width; x += 8)
-            if ((ret = decode_p_block(f, dst + x, src + x, 3, 3, stride)) < 0)
+            if ((ret = decode_p_block(f, dst + x, src + x, 3, 3, width)) < 0)
                 return ret;
-        src += 8 * stride;
-        dst += 8 * stride;
+        src += 8 * width;
+        dst += 8 * width;
     }
 
     return 0;
@@ -550,12 +539,12 @@
     return 0;
 }
 
-static inline void idct_put(FourXContext *f, AVFrame *frame, int x, int y)
+static inline void idct_put(FourXContext *f, int x, int y)
 {
     int16_t (*block)[64] = f->block;
-    int stride           = frame->linesize[0] >> 1;
+    int stride           = f->avctx->width;
     int i;
-    uint16_t *dst = ((uint16_t*)frame->data[0]) + y * stride + x;
+    uint16_t *dst = f->frame_buffer + y * stride + x;
 
     for (i = 0; i < 4; i++) {
         block[i][0] += 0x80 * 8 * 8;
@@ -715,14 +704,13 @@
     return red / 3 * 1024 + green / 3 * 32 + blue / 3;
 }
 
-static int decode_i2_frame(FourXContext *f, AVFrame *frame, const uint8_t *buf, int length)
+static int decode_i2_frame(FourXContext *f, const uint8_t *buf, int length)
 {
     int x, y, x2, y2;
     const int width  = f->avctx->width;
     const int height = f->avctx->height;
     const int mbs    = (FFALIGN(width, 16) >> 4) * (FFALIGN(height, 16) >> 4);
-    uint16_t *dst    = (uint16_t*)frame->data[0];
-    const int stride =            frame->linesize[0]>>1;
+    uint16_t *dst    = f->frame_buffer;
     const uint8_t *buf_end = buf + length;
     GetByteContext g3;
 
@@ -753,18 +741,18 @@
             for (y2 = 0; y2 < 16; y2++) {
                 for (x2 = 0; x2 < 16; x2++) {
                     int index = 2 * (x2 >> 2) + 8 * (y2 >> 2);
-                    dst[y2 * stride + x2] = color[(bits >> index) & 3];
+                    dst[y2 * width + x2] = color[(bits >> index) & 3];
                 }
             }
             dst += 16;
         }
-        dst += 16 * stride - x;
+        dst += 16 * width - x;
     }
 
     return 0;
 }
 
-static int decode_i_frame(FourXContext *f, AVFrame *frame, const uint8_t *buf, int length)
+static int decode_i_frame(FourXContext *f, const uint8_t *buf, int length)
 {
     int x, y, ret;
     const int width  = f->avctx->width;
@@ -803,14 +791,12 @@
 
     prestream_size = length + buf - prestream;
 
-    av_fast_malloc(&f->bitstream_buffer, &f->bitstream_buffer_size,
-                   prestream_size + FF_INPUT_BUFFER_PADDING_SIZE);
+    av_fast_padded_malloc(&f->bitstream_buffer, &f->bitstream_buffer_size,
+                          prestream_size);
     if (!f->bitstream_buffer)
         return AVERROR(ENOMEM);
     f->dsp.bswap_buf(f->bitstream_buffer, (const uint32_t*)prestream,
                      prestream_size / 4);
-    memset((uint8_t*)f->bitstream_buffer + prestream_size,
-           0, FF_INPUT_BUFFER_PADDING_SIZE);
     init_get_bits(&f->pre_gb, f->bitstream_buffer, 8 * prestream_size);
 
     f->last_dc = 0 * 128 * 8 * 8;
@@ -820,7 +806,7 @@
             if ((ret = decode_i_mb(f)) < 0)
                 return ret;
 
-            idct_put(f, frame, x, y);
+            idct_put(f, x, y);
         }
     }
 
@@ -923,29 +909,24 @@
         frame_size = buf_size - 12;
     }
 
-    FFSWAP(AVFrame*, f->current_picture, f->last_picture);
-
-    // alternatively we would have to use our own buffer management
-    avctx->flags |= CODEC_FLAG_EMU_EDGE;
-
-    if ((ret = ff_reget_buffer(avctx, f->current_picture)) < 0)
+    if ((ret = ff_get_buffer(avctx, picture, 0)) < 0)
         return ret;
 
     if (frame_4cc == AV_RL32("ifr2")) {
-        f->current_picture->pict_type = AV_PICTURE_TYPE_I;
-        if ((ret = decode_i2_frame(f, f->current_picture, buf - 4, frame_size + 4)) < 0) {
+        picture->pict_type = AV_PICTURE_TYPE_I;
+        if ((ret = decode_i2_frame(f, buf - 4, frame_size + 4)) < 0) {
             av_log(f->avctx, AV_LOG_ERROR, "decode i2 frame failed\n");
             return ret;
         }
     } else if (frame_4cc == AV_RL32("ifrm")) {
-        f->current_picture->pict_type = AV_PICTURE_TYPE_I;
-        if ((ret = decode_i_frame(f, f->current_picture, buf, frame_size)) < 0) {
+        picture->pict_type = AV_PICTURE_TYPE_I;
+        if ((ret = decode_i_frame(f, buf, frame_size)) < 0) {
             av_log(f->avctx, AV_LOG_ERROR, "decode i frame failed\n");
             return ret;
         }
     } else if (frame_4cc == AV_RL32("pfrm") || frame_4cc == AV_RL32("pfr2")) {
-        f->current_picture->pict_type = AV_PICTURE_TYPE_P;
-        if ((ret = decode_p_frame(f, f->current_picture, buf, frame_size)) < 0) {
+        picture->pict_type = AV_PICTURE_TYPE_P;
+        if ((ret = decode_p_frame(f, buf, frame_size)) < 0) {
             av_log(f->avctx, AV_LOG_ERROR, "decode p frame failed\n");
             return ret;
         }
@@ -957,10 +938,13 @@
                buf_size);
     }
 
-    f->current_picture->key_frame = f->current_picture->pict_type == AV_PICTURE_TYPE_I;
+    picture->key_frame = picture->pict_type == AV_PICTURE_TYPE_I;
+
+    av_image_copy_plane(picture->data[0], picture->linesize[0],
+                        (const uint8_t*)f->frame_buffer,  avctx->width * 2,
+                        avctx->width * 2, avctx->height);
+    FFSWAP(uint16_t *, f->frame_buffer, f->last_frame_buffer);
 
-    if ((ret = av_frame_ref(picture, f->current_picture)) < 0)
-        return ret;
     *got_frame = 1;
 
     emms_c();
@@ -968,9 +952,28 @@
     return buf_size;
 }
 
+static av_cold int decode_end(AVCodecContext *avctx)
+{
+    FourXContext * const f = avctx->priv_data;
+    int i;
+
+    av_freep(&f->frame_buffer);
+    av_freep(&f->last_frame_buffer);
+    av_freep(&f->bitstream_buffer);
+    f->bitstream_buffer_size = 0;
+    for (i = 0; i < CFRAME_BUFFER_COUNT; i++) {
+        av_freep(&f->cfrm[i].data);
+        f->cfrm[i].allocated_size = 0;
+    }
+    ff_free_vlc(&f->pre_vlc);
+
+    return 0;
+}
+
 static av_cold int decode_init(AVCodecContext *avctx)
 {
     FourXContext * const f = avctx->priv_data;
+    int ret;
 
     if (avctx->extradata_size != 4 || !avctx->extradata) {
         av_log(avctx, AV_LOG_ERROR, "extradata wrong or missing\n");
@@ -981,6 +984,17 @@
         return AVERROR_INVALIDDATA;
     }
 
+    ret = av_image_check_size(avctx->width, avctx->height, 0, avctx);
+    if (ret < 0)
+        return ret;
+
+    f->frame_buffer      = av_mallocz(avctx->width * avctx->height * 2);
+    f->last_frame_buffer = av_mallocz(avctx->width * avctx->height * 2);
+    if (!f->frame_buffer || !f->last_frame_buffer) {
+        decode_end(avctx);
+        return AVERROR(ENOMEM);
+    }
+
     f->version = AV_RL32(avctx->extradata) >> 16;
     ff_dsputil_init(&f->dsp, avctx);
     f->avctx = avctx;
@@ -991,30 +1005,6 @@
     else
         avctx->pix_fmt = AV_PIX_FMT_BGR555;
 
-    f->current_picture = av_frame_alloc();
-    f->last_picture    = av_frame_alloc();
-    if (!f->current_picture  || !f->last_picture)
-        return AVERROR(ENOMEM);
-
-    return 0;
-}
-
-
-static av_cold int decode_end(AVCodecContext *avctx)
-{
-    FourXContext * const f = avctx->priv_data;
-    int i;
-
-    av_freep(&f->bitstream_buffer);
-    f->bitstream_buffer_size = 0;
-    for (i = 0; i < CFRAME_BUFFER_COUNT; i++) {
-        av_freep(&f->cfrm[i].data);
-        f->cfrm[i].allocated_size = 0;
-    }
-    ff_free_vlc(&f->pre_vlc);
-    av_frame_free(&f->current_picture);
-    av_frame_free(&f->last_picture);
-
     return 0;
 }

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/Makefile -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/Makefile Changed

@@ -26,13 +26,10 @@
        options.o                                                        \
        parser.o                                                         \
        raw.o                                                            \
-       rawdec.o                                                         \
        resample.o                                                       \
        resample2.o                                                      \
        utils.o                                                          \
 
-OBJS-$(HAVE_MSVCRT) += file_open.o
-
 # parts needed for many different codecs
 OBJS-$(CONFIG_AANDCTTABLES)            += aandcttab.o
 OBJS-$(CONFIG_AC3DSP)                  += ac3dsp.o
@@ -50,13 +47,16 @@
                                           fft_fixed_32.o fft_init_table.o \
                                           $(FFT-OBJS-yes)
 OBJS-$(CONFIG_GOLOMB)                  += golomb.o
+OBJS-$(CONFIG_H263DSP)                 += h263dsp.o
 OBJS-$(CONFIG_H264CHROMA)              += h264chroma.o
 OBJS-$(CONFIG_H264DSP)                 += h264dsp.o h264idct.o
 OBJS-$(CONFIG_H264PRED)                += h264pred.o
 OBJS-$(CONFIG_H264QPEL)                += h264qpel.o
 OBJS-$(CONFIG_HPELDSP)                 += hpeldsp.o
 OBJS-$(CONFIG_HUFFMAN)                 += huffman.o
+OBJS-$(CONFIG_INTRAX8)                 += intrax8.o intrax8dsp.o
 OBJS-$(CONFIG_LIBXVID)                 += libxvid_rc.o
+OBJS-$(CONFIG_LLVIDDSP)                += lossless_videodsp.o
 OBJS-$(CONFIG_LPC)                     += lpc.o
 OBJS-$(CONFIG_LSP)                     += lsp.o
 OBJS-$(CONFIG_MDCT)                    += mdct_fixed.o mdct_float.o mdct_fixed_32.o
@@ -125,6 +125,8 @@
 OBJS-$(CONFIG_ASV2_ENCODER)            += asvenc.o asv.o mpeg12data.o
 OBJS-$(CONFIG_ATRAC1_DECODER)          += atrac1.o atrac.o
 OBJS-$(CONFIG_ATRAC3_DECODER)          += atrac3.o atrac.o
+OBJS-$(CONFIG_ATRAC3P_DECODER)         += atrac3plusdec.o atrac3plus.o \
+                                          atrac3plusdsp.o atrac.o
 OBJS-$(CONFIG_AURA_DECODER)            += cyuv.o
 OBJS-$(CONFIG_AURA2_DECODER)           += aura.o
 OBJS-$(CONFIG_AVRN_DECODER)            += avrndec.o mjpegdec.o mjpeg.o
@@ -152,6 +154,7 @@
 OBJS-$(CONFIG_CDGRAPHICS_DECODER)      += cdgraphics.o
 OBJS-$(CONFIG_CDXL_DECODER)            += cdxl.o
 OBJS-$(CONFIG_CINEPAK_DECODER)         += cinepak.o
+OBJS-$(CONFIG_CINEPAK_ENCODER)         += cinepakenc.o elbg.o
 OBJS-$(CONFIG_CLJR_DECODER)            += cljr.o
 OBJS-$(CONFIG_CLJR_ENCODER)            += cljr.o
 OBJS-$(CONFIG_CLLC_DECODER)            += cllc.o
@@ -178,7 +181,7 @@
 OBJS-$(CONFIG_DVDSUB_DECODER)          += dvdsubdec.o
 OBJS-$(CONFIG_DVDSUB_ENCODER)          += dvdsubenc.o
 OBJS-$(CONFIG_DVVIDEO_DECODER)         += dvdec.o dv.o dvdata.o dv_profile.o
-OBJS-$(CONFIG_DVVIDEO_ENCODER)         += dv.o dvdata.o dv_profile.o
+OBJS-$(CONFIG_DVVIDEO_ENCODER)         += dvenc.o dv.o dvdata.o dv_profile.o
 OBJS-$(CONFIG_DXA_DECODER)             += dxa.o
 OBJS-$(CONFIG_DXTORY_DECODER)          += dxtory.o
 OBJS-$(CONFIG_EAC3_DECODER)            += eac3dec.o eac3_data.o
@@ -202,6 +205,7 @@
 OBJS-$(CONFIG_FFVHUFF_DECODER)         += huffyuv.o huffyuvdec.o
 OBJS-$(CONFIG_FFVHUFF_ENCODER)         += huffyuv.o huffyuvenc.o
 OBJS-$(CONFIG_FFWAVESYNTH_DECODER)     += ffwavesynth.o
+OBJS-$(CONFIG_FIC_DECODER)             += fic.o
 OBJS-$(CONFIG_FLAC_DECODER)            += flacdec.o flacdata.o flac.o flacdsp.o
 OBJS-$(CONFIG_FLAC_ENCODER)            += flacenc.o flacdata.o flac.o flacdsp.o vorbis_data.o
 OBJS-$(CONFIG_FLASHSV_DECODER)         += flashsv.o
@@ -236,7 +240,7 @@
 OBJS-$(CONFIG_HEVC_DECODER)            += hevc.o hevc_mvs.o hevc_ps.o hevc_sei.o \
                                           hevc_cabac.o hevc_refs.o hevcpred.o    \
                                           hevcdsp.o hevc_filter.o cabac.o
-
+OBJS-$(CONFIG_HNM4_VIDEO_DECODER)      += hnm4video.o
 OBJS-$(CONFIG_HUFFYUV_DECODER)         += huffyuv.o huffyuvdec.o
 OBJS-$(CONFIG_HUFFYUV_ENCODER)         += huffyuv.o huffyuvenc.o
 OBJS-$(CONFIG_IAC_DECODER)             += imc.o
@@ -280,40 +284,34 @@
 OBJS-$(CONFIG_MOTIONPIXELS_DECODER)    += motionpixels.o
 OBJS-$(CONFIG_MOVTEXT_DECODER)         += movtextdec.o ass.o
 OBJS-$(CONFIG_MOVTEXT_ENCODER)         += movtextenc.o ass_split.o
-OBJS-$(CONFIG_MP1_DECODER)             += mpegaudiodec.o
+OBJS-$(CONFIG_MP1_DECODER)             += mpegaudiodec_fixed.o
 OBJS-$(CONFIG_MP1FLOAT_DECODER)        += mpegaudiodec_float.o
-OBJS-$(CONFIG_MP2_DECODER)             += mpegaudiodec.o
-OBJS-$(CONFIG_MP2_ENCODER)             += mpegaudioenc.o mpegaudio.o \
+OBJS-$(CONFIG_MP2_DECODER)             += mpegaudiodec_fixed.o
+OBJS-$(CONFIG_MP2_ENCODER)             += mpegaudioenc_float.o mpegaudio.o \
+                                          mpegaudiodata.o mpegaudiodsp_data.o
+OBJS-$(CONFIG_MP2FIXED_ENCODER)        += mpegaudioenc_fixed.o mpegaudio.o \
                                           mpegaudiodata.o mpegaudiodsp_data.o
 OBJS-$(CONFIG_MP2FLOAT_DECODER)        += mpegaudiodec_float.o
-OBJS-$(CONFIG_MP3_DECODER)             += mpegaudiodec.o
-OBJS-$(CONFIG_MP3ADU_DECODER)          += mpegaudiodec.o
+OBJS-$(CONFIG_MP3_DECODER)             += mpegaudiodec_fixed.o
+OBJS-$(CONFIG_MP3ADU_DECODER)          += mpegaudiodec_fixed.o
 OBJS-$(CONFIG_MP3ADUFLOAT_DECODER)     += mpegaudiodec_float.o
 OBJS-$(CONFIG_MP3FLOAT_DECODER)        += mpegaudiodec_float.o
-OBJS-$(CONFIG_MP3ON4_DECODER)          += mpegaudiodec.o mpeg4audio.o
+OBJS-$(CONFIG_MP3ON4_DECODER)          += mpegaudiodec_fixed.o mpeg4audio.o
 OBJS-$(CONFIG_MP3ON4FLOAT_DECODER)     += mpegaudiodec_float.o mpeg4audio.o
 OBJS-$(CONFIG_MPC7_DECODER)            += mpc7.o mpc.o
 OBJS-$(CONFIG_MPC8_DECODER)            += mpc8.o mpc.o
 OBJS-$(CONFIG_MPEGVIDEO_DECODER)       += mpeg12.o mpeg12data.o \
                                           mpegvideo.o error_resilience.o
-OBJS-$(CONFIG_MPEG_XVMC_DECODER)       += mpegvideo_xvmc.o
 OBJS-$(CONFIG_MPEG1VIDEO_DECODER)      += mpeg12dec.o mpeg12.o mpeg12data.o
 OBJS-$(CONFIG_MPEG1VIDEO_ENCODER)      += mpeg12enc.o mpeg12.o
 OBJS-$(CONFIG_MPEG2VIDEO_DECODER)      += mpeg12dec.o mpeg12.o mpeg12data.o
-OBJS-$(CONFIG_MPEG2VIDEO_ENCODER)      += mpeg12enc.o mpeg12.o          \
-                                          timecode.o
+OBJS-$(CONFIG_MPEG2VIDEO_ENCODER)      += mpeg12enc.o mpeg12.o
 OBJS-$(CONFIG_MPL2_DECODER)            += mpl2dec.o ass.o
 OBJS-$(CONFIG_MSMPEG4V1_DECODER)       += msmpeg4dec.o msmpeg4.o msmpeg4data.o
-OBJS-$(CONFIG_MSMPEG4V2_DECODER)       += msmpeg4dec.o msmpeg4.o msmpeg4data.o \
-                                          h263dec.o h263.o ituh263dec.o \
-                                          mpeg4videodec.o
-OBJS-$(CONFIG_MSMPEG4V2_ENCODER)       += msmpeg4.o msmpeg4enc.o msmpeg4data.o \
-                                          h263.o
-OBJS-$(CONFIG_MSMPEG4V3_DECODER)       += msmpeg4dec.o msmpeg4.o msmpeg4data.o \
-                                          h263dec.o h263.o ituh263dec.o \
-                                          mpeg4videodec.o
-OBJS-$(CONFIG_MSMPEG4V3_ENCODER)       += msmpeg4.o msmpeg4enc.o msmpeg4data.o \
-                                          h263.o
+OBJS-$(CONFIG_MSMPEG4V2_DECODER)       += msmpeg4dec.o msmpeg4.o msmpeg4data.o
+OBJS-$(CONFIG_MSMPEG4V2_ENCODER)       += msmpeg4enc.o msmpeg4.o msmpeg4data.o
+OBJS-$(CONFIG_MSMPEG4V3_DECODER)       += msmpeg4dec.o msmpeg4.o msmpeg4data.o
+OBJS-$(CONFIG_MSMPEG4V3_ENCODER)       += msmpeg4enc.o msmpeg4.o msmpeg4data.o
 OBJS-$(CONFIG_MSRLE_DECODER)           += msrle.o msrledec.o
 OBJS-$(CONFIG_MSA1_DECODER)            += mss3.o mss34dsp.o
 OBJS-$(CONFIG_MSS1_DECODER)            += mss1.o mss12.o
@@ -331,27 +329,27 @@
 OBJS-$(CONFIG_PAF_VIDEO_DECODER)       += paf.o
 OBJS-$(CONFIG_PAF_AUDIO_DECODER)       += paf.o
 OBJS-$(CONFIG_PAM_DECODER)             += pnmdec.o pnm.o
-OBJS-$(CONFIG_PAM_ENCODER)             += pamenc.o pnm.o
+OBJS-$(CONFIG_PAM_ENCODER)             += pamenc.o
 OBJS-$(CONFIG_PBM_DECODER)             += pnmdec.o pnm.o
-OBJS-$(CONFIG_PBM_ENCODER)             += pnmenc.o pnm.o
+OBJS-$(CONFIG_PBM_ENCODER)             += pnmenc.o
 OBJS-$(CONFIG_PCX_DECODER)             += pcx.o
 OBJS-$(CONFIG_PCX_ENCODER)             += pcxenc.o
 OBJS-$(CONFIG_PGM_DECODER)             += pnmdec.o pnm.o
-OBJS-$(CONFIG_PGM_ENCODER)             += pnmenc.o pnm.o
+OBJS-$(CONFIG_PGM_ENCODER)             += pnmenc.o
 OBJS-$(CONFIG_PGMYUV_DECODER)          += pnmdec.o pnm.o
-OBJS-$(CONFIG_PGMYUV_ENCODER)          += pnmenc.o pnm.o
+OBJS-$(CONFIG_PGMYUV_ENCODER)          += pnmenc.o
 OBJS-$(CONFIG_PGSSUB_DECODER)          += pgssubdec.o
 OBJS-$(CONFIG_PICTOR_DECODER)          += pictordec.o cga_data.o
 OBJS-$(CONFIG_PJS_DECODER)             += textdec.o ass.o
 OBJS-$(CONFIG_PNG_DECODER)             += png.o pngdec.o pngdsp.o
 OBJS-$(CONFIG_PNG_ENCODER)             += png.o pngenc.o
 OBJS-$(CONFIG_PPM_DECODER)             += pnmdec.o pnm.o
-OBJS-$(CONFIG_PPM_ENCODER)             += pnmenc.o pnm.o
+OBJS-$(CONFIG_PPM_ENCODER)             += pnmenc.o
 OBJS-$(CONFIG_PRORES_DECODER)          += proresdec2.o proresdsp.o proresdata.o
 OBJS-$(CONFIG_PRORES_LGPL_DECODER)     += proresdec_lgpl.o proresdsp.o proresdata.o
 OBJS-$(CONFIG_PRORES_ENCODER)          += proresenc_anatoliy.o
 OBJS-$(CONFIG_PRORES_AW_ENCODER)       += proresenc_anatoliy.o
-OBJS-$(CONFIG_PRORES_KS_ENCODER)       += proresenc_kostya.o proresdata.o proresdsp.o
+OBJS-$(CONFIG_PRORES_KS_ENCODER)       += proresenc_kostya.o proresdata.o
 OBJS-$(CONFIG_PTX_DECODER)             += ptx.o
 OBJS-$(CONFIG_QCELP_DECODER)           += qcelpdec.o                     \
                                           celp_filters.o acelp_vectors.o \
@@ -440,7 +438,7 @@
 OBJS-$(CONFIG_TRUESPEECH_DECODER)      += truespeech.o
 OBJS-$(CONFIG_TSCC_DECODER)            += tscc.o msrledec.o
 OBJS-$(CONFIG_TSCC2_DECODER)           += tscc2.o
-OBJS-$(CONFIG_TTA_DECODER)             += tta.o ttadata.o
+OBJS-$(CONFIG_TTA_DECODER)             += tta.o ttadata.o ttadsp.o
 OBJS-$(CONFIG_TTA_ENCODER)             += ttaenc.o ttadata.o
 OBJS-$(CONFIG_TWINVQ_DECODER)          += twinvqdec.o twinvq.o
 OBJS-$(CONFIG_TXD_DECODER)             += txd.o s3tc.o
@@ -460,7 +458,7 @@
 OBJS-$(CONFIG_VBLE_DECODER)            += vble.o
 OBJS-$(CONFIG_VC1_DECODER)             += vc1dec.o vc1.o vc1data.o vc1dsp.o \
                                           msmpeg4dec.o msmpeg4.o msmpeg4data.o \
-                                          intrax8.o intrax8dsp.o wmv2dsp.o
+                                          wmv2dsp.o
 OBJS-$(CONFIG_VCR1_DECODER)            += vcr1.o
 OBJS-$(CONFIG_VMDAUDIO_DECODER)        += vmdav.o
 OBJS-$(CONFIG_VMDVIDEO_DECODER)        += vmdav.o
@@ -481,7 +479,7 @@
 OBJS-$(CONFIG_WAVPACK_DECODER)         += wavpack.o
 OBJS-$(CONFIG_WAVPACK_ENCODER)         += wavpackenc.o
 OBJS-$(CONFIG_WEBP_DECODER)            += vp8.o vp8dsp.o vp56rac.o
-OBJS-$(CONFIG_WEBP_DECODER)            += webp.o
+OBJS-$(CONFIG_WEBP_DECODER)            += webp.o exif.o tiff_common.o
 OBJS-$(CONFIG_WEBVTT_DECODER)          += webvttdec.o
 OBJS-$(CONFIG_WMALOSSLESS_DECODER)     += wmalosslessdec.o wma_common.o
 OBJS-$(CONFIG_WMAPRO_DECODER)          += wmaprodec.o wma.o wma_common.o
@@ -494,8 +492,7 @@
                                           acelp_vectors.o acelp_filters.o
 OBJS-$(CONFIG_WMV1_DECODER)            += msmpeg4dec.o msmpeg4.o msmpeg4data.o
 OBJS-$(CONFIG_WMV2_DECODER)            += wmv2dec.o wmv2.o wmv2dsp.o \
-                                          msmpeg4dec.o msmpeg4.o msmpeg4data.o \
-                                          intrax8.o intrax8dsp.o
+                                          msmpeg4dec.o msmpeg4.o msmpeg4data.o
 OBJS-$(CONFIG_WMV2_ENCODER)            += wmv2enc.o wmv2.o wmv2dsp.o \
                                           msmpeg4.o msmpeg4enc.o msmpeg4data.o
 OBJS-$(CONFIG_WNV1_DECODER)            += wnv1.o
@@ -598,6 +595,7 @@
 OBJS-$(CONFIG_ADPCM_G722_ENCODER)         += g722.o g722enc.o
 OBJS-$(CONFIG_ADPCM_G726_DECODER)         += g726.o
 OBJS-$(CONFIG_ADPCM_G726_ENCODER)         += g726.o
+OBJS-$(CONFIG_ADPCM_G726LE_DECODER)       += g726.o
 OBJS-$(CONFIG_ADPCM_IMA_AMV_DECODER)      += adpcm.o adpcm_data.o
 OBJS-$(CONFIG_ADPCM_IMA_APC_DECODER)      += adpcm.o adpcm_data.o
 OBJS-$(CONFIG_ADPCM_IMA_DK3_DECODER)      += adpcm.o adpcm_data.o
@@ -634,9 +632,11 @@
 OBJS-$(CONFIG_H264_VDA_HWACCEL)           += vda_h264.o
 OBJS-$(CONFIG_H264_VDPAU_HWACCEL)         += vdpau_h264.o
 OBJS-$(CONFIG_MPEG1_VDPAU_HWACCEL)        += vdpau_mpeg12.o
+OBJS-$(CONFIG_MPEG1_XVMC_HWACCEL)         += mpegvideo_xvmc.o
 OBJS-$(CONFIG_MPEG2_DXVA2_HWACCEL)        += dxva2_mpeg2.o
 OBJS-$(CONFIG_MPEG2_VAAPI_HWACCEL)        += vaapi_mpeg2.o vaapi_mpeg.o
 OBJS-$(CONFIG_MPEG2_VDPAU_HWACCEL)        += vdpau_mpeg12.o
+OBJS-$(CONFIG_MPEG2_XVMC_HWACCEL)         += mpegvideo_xvmc.o
 OBJS-$(CONFIG_MPEG4_VAAPI_HWACCEL)        += vaapi_mpeg4.o vaapi_mpeg.o
 OBJS-$(CONFIG_MPEG4_VDPAU_HWACCEL)        += vdpau_mpeg4.o
 OBJS-$(CONFIG_VC1_DXVA2_HWACCEL)          += dxva2_vc1.o
@@ -649,7 +649,7 @@
 OBJS-$(CONFIG_CAF_DEMUXER)             += mpeg4audio.o mpegaudiodata.o  \
                                           ac3tab.o
 OBJS-$(CONFIG_DV_DEMUXER)              += dv_profile.o
-OBJS-$(CONFIG_DV_MUXER)                += dv_profile.o timecode.o
+OBJS-$(CONFIG_DV_MUXER)                += dv_profile.o
 OBJS-$(CONFIG_FLAC_DEMUXER)            += flac.o flacdata.o vorbis_data.o \
                                           vorbis_parser.o xiph.o
 OBJS-$(CONFIG_FLAC_MUXER)              += flac.o flacdata.o vorbis_data.o
@@ -665,11 +665,11 @@
                                           flac.o flacdata.o vorbis_data.o xiph.o
 OBJS-$(CONFIG_MP2_MUXER)               += mpegaudiodata.o mpegaudiodecheader.o
 OBJS-$(CONFIG_MP3_MUXER)               += mpegaudiodata.o mpegaudiodecheader.o
-OBJS-$(CONFIG_MOV_DEMUXER)             += mpeg4audio.o mpegaudiodata.o ac3tab.o timecode.o
+OBJS-$(CONFIG_MOV_DEMUXER)             += mpeg4audio.o mpegaudiodata.o ac3tab.o
 OBJS-$(CONFIG_MOV_MUXER)               += mpeg4audio.o mpegaudiodata.o
 OBJS-$(CONFIG_MPEGTS_MUXER)            += mpeg4audio.o
 OBJS-$(CONFIG_MPEGTS_DEMUXER)          += mpeg4audio.o mpegaudiodata.o
-OBJS-$(CONFIG_MXF_MUXER)               += timecode.o dnxhddata.o
+OBJS-$(CONFIG_MXF_MUXER)               += dnxhddata.o
 OBJS-$(CONFIG_NUT_MUXER)               += mpegaudiodata.o
 OBJS-$(CONFIG_OGG_DEMUXER)             += xiph.o flac.o flacdata.o     \
                                           mpeg12data.o vorbis_parser.o \
@@ -686,6 +686,9 @@
                                           vorbis_data.o
 OBJS-$(CONFIG_WTV_DEMUXER)             += mpeg4audio.o mpegaudiodata.o
 
+# libavfilter dependencies
+OBJS-$(CONFIG_ELBG_FILTER)             += elbg.o
+
 # external codec libraries
 OBJS-$(CONFIG_LIBAACPLUS_ENCODER)         += libaacplus.o
 OBJS-$(CONFIG_LIBCELT_DECODER)            += libcelt_dec.o
@@ -727,10 +730,12 @@
                                              vorbis_data.o vorbis_parser.o xiph.o
 OBJS-$(CONFIG_LIBVPX_VP8_DECODER)         += libvpxdec.o
 OBJS-$(CONFIG_LIBVPX_VP8_ENCODER)         += libvpxenc.o
-OBJS-$(CONFIG_LIBVPX_VP9_DECODER)         += libvpxdec.o
-OBJS-$(CONFIG_LIBVPX_VP9_ENCODER)         += libvpxenc.o
+OBJS-$(CONFIG_LIBVPX_VP9_DECODER)         += libvpxdec.o libvpx.o
+OBJS-$(CONFIG_LIBVPX_VP9_ENCODER)         += libvpxenc.o libvpx.o
 OBJS-$(CONFIG_LIBWAVPACK_ENCODER)         += libwavpackenc.o
+OBJS-$(CONFIG_LIBWEBP_ENCODER)            += libwebpenc.o
 OBJS-$(CONFIG_LIBX264_ENCODER)            += libx264.o
+OBJS-$(CONFIG_LIBX265_ENCODER)            += libx265.o
 OBJS-$(CONFIG_LIBXAVS_ENCODER)            += libxavs.o
 OBJS-$(CONFIG_LIBXVID_ENCODER)            += libxvid.o
 OBJS-$(CONFIG_LIBZVBI_TELETEXT_DECODER)   += libzvbi-teletextdec.o
@@ -773,6 +778,7 @@
                                           mpegaudiodecheader.o mpegaudiodata.o
 OBJS-$(CONFIG_MPEGVIDEO_PARSER)        += mpegvideo_parser.o    \
                                           mpeg12.o mpeg12data.o
+OBJS-$(CONFIG_PNG_PARSER)              += png_parser.o
 OBJS-$(CONFIG_PNM_PARSER)              += pnm_parser.o pnm.o
 OBJS-$(CONFIG_RV30_PARSER)             += rv34_parser.o
 OBJS-$(CONFIG_RV40_PARSER)             += rv34_parser.o
@@ -783,6 +789,7 @@
 OBJS-$(CONFIG_VORBIS_PARSER)           += vorbis_parser.o xiph.o
 OBJS-$(CONFIG_VP3_PARSER)              += vp3_parser.o
 OBJS-$(CONFIG_VP8_PARSER)              += vp8_parser.o
+OBJS-$(CONFIG_VP9_PARSER)              += vp9_parser.o
 
 # bitstream filters
 OBJS-$(CONFIG_AAC_ADTSTOASC_BSF)          += aac_adtstoasc_bsf.o aacadtsdec.o \
@@ -794,7 +801,6 @@
 OBJS-$(CONFIG_MJPEG2JPEG_BSF)             += mjpeg2jpeg_bsf.o mjpeg.o
 OBJS-$(CONFIG_MJPEGA_DUMP_HEADER_BSF)     += mjpega_dump_header_bsf.o
 OBJS-$(CONFIG_MOV2TEXTSUB_BSF)            += movsub_bsf.o
-OBJS-$(CONFIG_MP3_HEADER_COMPRESS_BSF)    += mp3_header_compress_bsf.o
 OBJS-$(CONFIG_MP3_HEADER_DECOMPRESS_BSF)  += mp3_header_decompress_bsf.o \
                                              mpegaudiodata.o
 OBJS-$(CONFIG_NOISE_BSF)                  += noise_bsf.o
@@ -802,12 +808,14 @@
 OBJS-$(CONFIG_TEXT2MOVSUB_BSF)            += movsub_bsf.o
 
 # thread libraries
-OBJS-$(HAVE_PTHREADS)                  += pthread.o
-OBJS-$(HAVE_W32THREADS)                += pthread.o
-OBJS-$(HAVE_OS2THREADS)                += pthread.o
+OBJS-$(HAVE_LIBC_MSVCRT)               += file_open.o
+OBJS-$(HAVE_THREADS)                   += pthread.o pthread_slice.o pthread_frame.o
 
 OBJS-$(CONFIG_FRAME_THREAD_ENCODER)    += frame_thread_encoder.o
 
+# Windows resource file
+SLIBOBJS-$(HAVE_GNU_WINDRES)           += avcodecres.o
+
 SKIPHEADERS                            += %_tablegen.h                  \
                                           %_tables.h                    \
                                           aac_tablegen_decl.h           \
@@ -819,7 +827,7 @@
 SKIPHEADERS-$(CONFIG_DXVA2)            += dxva2.h dxva2_internal.h
 SKIPHEADERS-$(CONFIG_LIBSCHROEDINGER)  += libschroedinger.h
 SKIPHEADERS-$(CONFIG_LIBUTVIDEO)       += libutvideo.h
-SKIPHEADERS-$(CONFIG_MPEG_XVMC_DECODER) += xvmc.h
+SKIPHEADERS-$(CONFIG_XVMC)             += xvmc.h
 SKIPHEADERS-$(CONFIG_VAAPI)            += vaapi_internal.h
 SKIPHEADERS-$(CONFIG_VDA)              += vda.h
 SKIPHEADERS-$(CONFIG_VDPAU)            += vdpau.h vdpau_internal.h
@@ -854,6 +862,7 @@
 CLEANFILES = *_tables.c *_tables.h *_tablegen$(HOSTEXESUF)
 
 $(SUBDIR)dct-test$(EXESUF): $(SUBDIR)dctref.o $(SUBDIR)aandcttab.o
+$(SUBDIR)dv_tablegen$(HOSTEXESUF): $(SUBDIR)dvdata_host.o
 
 TRIG_TABLES  = cos cos_fixed sin
 TRIG_TABLES := $(TRIG_TABLES:%=$(SUBDIR)%_tables.c)
@@ -879,9 +888,9 @@
 $(SUBDIR)aacdec.o: $(SUBDIR)cbrt_tables.h
 $(SUBDIR)aacps.o: $(SUBDIR)aacps_tables.h
 $(SUBDIR)aactab.o: $(SUBDIR)aac_tables.h
-$(SUBDIR)dv.o: $(SUBDIR)dv_tables.h
+$(SUBDIR)dvenc.o: $(SUBDIR)dv_tables.h
 $(SUBDIR)sinewin.o: $(SUBDIR)sinewin_tables.h
-$(SUBDIR)mpegaudiodec.o: $(SUBDIR)mpegaudio_tables.h
+$(SUBDIR)mpegaudiodec_fixed.o: $(SUBDIR)mpegaudio_tables.h
 $(SUBDIR)mpegaudiodec_float.o: $(SUBDIR)mpegaudio_tables.h
 $(SUBDIR)motionpixels.o: $(SUBDIR)motionpixels_tables.h
 $(SUBDIR)pcm.o: $(SUBDIR)pcm_tables.h

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/a64multienc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/a64multienc.c Changed

@@ -40,9 +40,6 @@
 #define C64YRES 200
 
 typedef struct A64Context {
-    /* general variables */
-    AVFrame picture;
-
     /* variables for multicolor modes */
     AVLFG randctx;
     int mc_lifetime;
@@ -189,6 +186,7 @@
 static av_cold int a64multi_close_encoder(AVCodecContext *avctx)
 {
     A64Context *c = avctx->priv_data;
+    av_frame_free(&avctx->coded_frame);
     av_free(c->mc_meta_charset);
     av_free(c->mc_best_cb);
     av_free(c->mc_charset);
@@ -197,7 +195,7 @@
     return 0;
 }
 
-static av_cold int a64multi_init_encoder(AVCodecContext *avctx)
+static av_cold int a64multi_encode_init(AVCodecContext *avctx)
 {
     A64Context *c = avctx->priv_data;
     int a;
@@ -240,8 +238,12 @@
     AV_WB32(avctx->extradata, c->mc_lifetime);
     AV_WB32(avctx->extradata + 16, INTERLACED);
 
-    avcodec_get_frame_defaults(&c->picture);
-    avctx->coded_frame            = &c->picture;
+    avctx->coded_frame = av_frame_alloc();
+    if (!avctx->coded_frame) {
+        a64multi_close_encoder(avctx);
+        return AVERROR(ENOMEM);
+    }
+
     avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I;
     avctx->coded_frame->key_frame = 1;
     if (!avctx->codec_tag)
@@ -271,7 +273,7 @@
                                  const AVFrame *pict, int *got_packet)
 {
     A64Context *c = avctx->priv_data;
-    AVFrame *const p = &c->picture;
+    AVFrame *const p = avctx->coded_frame;
 
     int frame;
     int x, y;
@@ -338,8 +340,8 @@
             buf = pkt->data;
 
             /* calc optimal new charset + charmaps */
-            ff_init_elbg(meta, 32, 1000 * c->mc_lifetime, best_cb, CHARSET_CHARS, 50, charmap, &c->randctx);
-            ff_do_elbg  (meta, 32, 1000 * c->mc_lifetime, best_cb, CHARSET_CHARS, 50, charmap, &c->randctx);
+            avpriv_init_elbg(meta, 32, 1000 * c->mc_lifetime, best_cb, CHARSET_CHARS, 50, charmap, &c->randctx);
+            avpriv_do_elbg  (meta, 32, 1000 * c->mc_lifetime, best_cb, CHARSET_CHARS, 50, charmap, &c->randctx);
 
             /* create colorram map and a c64 readable charset */
             render_charset(avctx, charset, colram);
@@ -400,7 +402,7 @@
     .type           = AVMEDIA_TYPE_VIDEO,
     .id             = AV_CODEC_ID_A64_MULTI,
     .priv_data_size = sizeof(A64Context),
-    .init           = a64multi_init_encoder,
+    .init           = a64multi_encode_init,
     .encode2        = a64multi_encode_frame,
     .close          = a64multi_close_encoder,
     .pix_fmts       = (const enum AVPixelFormat[]) {AV_PIX_FMT_GRAY8, AV_PIX_FMT_NONE},
@@ -414,7 +416,7 @@
     .type           = AVMEDIA_TYPE_VIDEO,
     .id             = AV_CODEC_ID_A64_MULTI5,
     .priv_data_size = sizeof(A64Context),
-    .init           = a64multi_init_encoder,
+    .init           = a64multi_encode_init,
     .encode2        = a64multi_encode_frame,
     .close          = a64multi_close_encoder,
     .pix_fmts       = (const enum AVPixelFormat[]) {AV_PIX_FMT_GRAY8, AV_PIX_FMT_NONE},

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/aac_ac3_parser.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/aac_ac3_parser.c Changed

@@ -20,6 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/channel_layout.h"
 #include "libavutil/common.h"
 #include "parser.h"
 #include "aac_ac3_parser.h"
@@ -82,14 +83,23 @@
     if (avctx->codec_id != AV_CODEC_ID_AAC) {
         avctx->sample_rate = s->sample_rate;
 
-        /* allow downmixing to stereo (or mono for AC-3) */
-        if(avctx->request_channels > 0 &&
-                avctx->request_channels < s->channels &&
-                (avctx->request_channels <= 2 ||
-                (avctx->request_channels == 1 &&
-                (avctx->codec_id == AV_CODEC_ID_AC3 ||
-                 avctx->codec_id == AV_CODEC_ID_EAC3)))) {
-            avctx->channels = avctx->request_channels;
+        /* (E-)AC-3: allow downmixing to stereo or mono */
+#if FF_API_REQUEST_CHANNELS
+FF_DISABLE_DEPRECATION_WARNINGS
+        if (avctx->request_channels == 1)
+            avctx->request_channel_layout = AV_CH_LAYOUT_MONO;
+        else if (avctx->request_channels == 2)
+            avctx->request_channel_layout = AV_CH_LAYOUT_STEREO;
+FF_ENABLE_DEPRECATION_WARNINGS
+#endif
+        if (s->channels > 1 &&
+            avctx->request_channel_layout == AV_CH_LAYOUT_MONO) {
+            avctx->channels       = 1;
+            avctx->channel_layout = AV_CH_LAYOUT_MONO;
+        } else if (s->channels > 2 &&
+                   avctx->request_channel_layout == AV_CH_LAYOUT_STEREO) {
+            avctx->channels       = 2;
+            avctx->channel_layout = AV_CH_LAYOUT_STEREO;
         } else {
             avctx->channels = s->channels;
             avctx->channel_layout = s->channel_layout;

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/aac_adtstoasc_bsf.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/aac_adtstoasc_bsf.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/aacdec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/aacdec.c Changed

@@ -74,6 +74,7 @@
  * N                    SinuSoidal Coding (Transient, Sinusoid, Noise)
  * Y                    Parametric Stereo
  * N                    Direct Stream Transfer
+ * Y                    Enhanced AAC Low Delay (ER AAC ELD)
  *
  * Note: - HE AAC v1 comprises LC AAC with Spectral Band Replication.
  *       - HE AAC v2 comprises LC AAC with Spectral Band Replication and
@@ -104,6 +105,7 @@
 #include <assert.h>
 #include <errno.h>
 #include <math.h>
+#include <stdint.h>
 #include <string.h>
 
 #if ARCH_ARM
@@ -194,6 +196,9 @@
 
     /* get output buffer */
     av_frame_unref(ac->frame);
+    if (!avctx->channels)
+        return 1;
+
     ac->frame->nb_samples = 2048;
     if ((ret = ff_get_buffer(avctx, ac->frame, 0)) < 0)
         return ret;
@@ -532,6 +537,25 @@
     *tags = tags_per_config[channel_config];
     memcpy(layout_map, aac_channel_layout_map[channel_config - 1],
            *tags * sizeof(*layout_map));
+
+    /*
+     * AAC specification has 7.1(wide) as a default layout for 8-channel streams.
+     * However, at least Nero AAC encoder encodes 7.1 streams using the default
+     * channel config 7, mapping the side channels of the original audio stream
+     * to the second AAC_CHANNEL_FRONT pair in the AAC stream. Similarly, e.g. FAAD
+     * decodes the second AAC_CHANNEL_FRONT pair as side channels, therefore decoding
+     * the incorrect streams as if they were correct (and as the encoder intended).
+     *
+     * As actual intended 7.1(wide) streams are very rare, default to assuming a
+     * 7.1 layout was intended.
+     */
+    if (channel_config == 7 && avctx->strict_std_compliance < FF_COMPLIANCE_STRICT) {
+        av_log(avctx, AV_LOG_INFO, "Assuming an incorrectly encoded 7.1 channel layout"
+               " instead of a spec-compliant 7.1(wide) layout, use -strict %d to decode"
+               " according to the specification instead.\n", FF_COMPLIANCE_STRICT);
+        layout_map[2][2] = AAC_CHANNEL_SIDE;
+    }
+
     return 0;
 }
 
@@ -1112,7 +1136,6 @@
     ff_mdct_init(&ac->mdct_ltp,   11, 0, -2.0 * 32768.0);
     // window initialization
     ff_kbd_window_init(ff_aac_kbd_long_1024, 4.0, 1024);
-    ff_kbd_window_init(ff_aac_kbd_long_512,  4.0, 512);
     ff_kbd_window_init(ff_aac_kbd_short_128, 6.0, 128);
     ff_init_ff_sine_windows(10);
     ff_init_ff_sine_windows( 9);
@@ -1225,13 +1248,14 @@
         if (aot == AOT_ER_AAC_LD || aot == AOT_ER_AAC_ELD) {
             ics->swb_offset        =     ff_swb_offset_512[ac->oc[1].m4ac.sampling_index];
             ics->num_swb           =    ff_aac_num_swb_512[ac->oc[1].m4ac.sampling_index];
+            ics->tns_max_bands     =  ff_tns_max_bands_512[ac->oc[1].m4ac.sampling_index];
             if (!ics->num_swb || !ics->swb_offset)
                 return AVERROR_BUG;
         } else {
             ics->swb_offset        =    ff_swb_offset_1024[ac->oc[1].m4ac.sampling_index];
             ics->num_swb           =   ff_aac_num_swb_1024[ac->oc[1].m4ac.sampling_index];
+            ics->tns_max_bands     = ff_tns_max_bands_1024[ac->oc[1].m4ac.sampling_index];
         }
-        ics->tns_max_bands         = ff_tns_max_bands_1024[ac->oc[1].m4ac.sampling_index];
         if (aot != AOT_ER_AAC_ELD) {
             ics->predictor_present     = get_bits1(gb);
             ics->predictor_reset_group = 0;
@@ -1402,12 +1426,12 @@
         return -1;
     pulse->pos[0]    = swb_offset[pulse_swb];
     pulse->pos[0]   += get_bits(gb, 5);
-    if (pulse->pos[0] > 1023)
+    if (pulse->pos[0] >= swb_offset[num_swb])
         return -1;
     pulse->amp[0]    = get_bits(gb, 4);
     for (i = 1; i < pulse->num_pulse; i++) {
         pulse->pos[i] = get_bits(gb, 5) + pulse->pos[i - 1];
-        if (pulse->pos[i] > 1023)
+        if (pulse->pos[i] >= swb_offset[num_swb])
             return -1;
         pulse->amp[i] = get_bits(gb, 4);
     }
@@ -2262,10 +2286,12 @@
         } else if (ac->oc[1].m4ac.ps == -1 && ac->oc[1].status < OC_LOCKED && ac->avctx->channels == 1) {
             ac->oc[1].m4ac.sbr = 1;
             ac->oc[1].m4ac.ps = 1;
+            ac->avctx->profile = FF_PROFILE_AAC_HE_V2;
             output_configure(ac, ac->oc[1].layout_map, ac->oc[1].layout_map_tags,
                              ac->oc[1].status, 1);
         } else {
             ac->oc[1].m4ac.sbr = 1;
+            ac->avctx->profile = FF_PROFILE_AAC_HE;
         }
         res = ff_decode_sbr_extension(ac, &che->sbr, gb, crc_flag, cnt, elem_type);
         break;
@@ -2505,14 +2531,20 @@
     float *in    = sce->coeffs;
     float *out   = sce->ret;
     float *saved = sce->saved;
-    const float *lwindow_prev = ics->use_kb_window[1] ? ff_aac_kbd_long_512 : ff_sine_512;
     float *buf  = ac->buf_mdct;
 
     // imdct
     ac->mdct.imdct_half(&ac->mdct_ld, buf, in);
 
     // window overlapping
-    ac->fdsp.vector_fmul_window(out, saved, buf, lwindow_prev, 256);
+    if (ics->use_kb_window[1]) {
+        // AAC LD uses a low overlap sine window instead of a KBD window
+        memcpy(out, saved, 192 * sizeof(float));
+        ac->fdsp.vector_fmul_window(out + 192, saved + 192, buf, ff_sine_128, 64);
+        memcpy(                     out + 320, buf + 64, 192 * sizeof(float));
+    } else {
+        ac->fdsp.vector_fmul_window(out, saved, buf, ff_sine_512, 256);
+    }
 
     // buffer update
     memcpy(saved, buf + 256, 256 * sizeof(float));
@@ -2533,7 +2565,7 @@
     // Inverse transform, mapped to the conventional IMDCT by
     // Chivukula, R.K.; Reznik, Y.A.; Devarajan, V.,
     // "Efficient algorithms for MPEG-4 AAC-ELD, AAC-LD and AAC-LC filterbanks,"
-    // Audio, Language and Image Processing, 2008. ICALIP 2008. International Conference on
+    // International Conference on Audio, Language and Image Processing, ICALIP 2008.
     // URL: http://ieeexplore.ieee.org/stamp/stamp.jsp?tp=&arnumber=4590245&isnumber=4589950
     for (i = 0; i < n2; i+=2) {
         float temp;
@@ -2800,6 +2832,10 @@
     if ((err = frame_configure_elements(avctx)) < 0)
         return err;
 
+    // The FF_PROFILE_AAC_* defines are all object_type - 1
+    // This may lead to an undefined profile being signaled
+    ac->avctx->profile = ac->oc[1].m4ac.object_type - 1;
+
     ac->tags_mapped = 0;
 
     if (chan_config < 0 || chan_config >= 8) {
@@ -2836,6 +2872,7 @@
     spectral_to_sample(ac);
 
     ac->frame->nb_samples = samples;
+    ac->frame->sample_rate = avctx->sample_rate;
     *got_frame_ptr = 1;
 
     skip_bits_long(gb, get_bits_left(gb));
@@ -2869,6 +2906,10 @@
     if ((err = frame_configure_elements(avctx)) < 0)
         goto fail;
 
+    // The FF_PROFILE_AAC_* defines are all object_type - 1
+    // This may lead to an undefined profile being signaled
+    ac->avctx->profile = ac->oc[1].m4ac.object_type - 1;
+
     ac->tags_mapped = 0;
     // parse
     while ((elem_type = get_bits(gb, 3)) != TYPE_END) {
@@ -2966,22 +3007,6 @@
 
     multiplier = (ac->oc[1].m4ac.sbr == 1) ? ac->oc[1].m4ac.ext_sample_rate > ac->oc[1].m4ac.sample_rate : 0;
     samples <<= multiplier;
-    /* for dual-mono audio (SCE + SCE) */
-    is_dmono = ac->dmono_mode && sce_count == 2 &&
-               ac->oc[1].channel_layout == (AV_CH_FRONT_LEFT | AV_CH_FRONT_RIGHT);
-
-    if (samples)
-        ac->frame->nb_samples = samples;
-    else
-        av_frame_unref(ac->frame);
-    *got_frame_ptr = !!samples;
-
-    if (is_dmono) {
-        if (ac->dmono_mode == 1)
-            ((AVFrame *)data)->data[1] =((AVFrame *)data)->data[0];
-        else if (ac->dmono_mode == 2)
-            ((AVFrame *)data)->data[0] =((AVFrame *)data)->data[1];
-    }
 
     if (ac->oc[1].status && audio_found) {
         avctx->sample_rate = ac->oc[1].m4ac.sample_rate << multiplier;
@@ -2995,6 +3020,25 @@
         if (side && side_size>=4)
             AV_WL32(side, 2*AV_RL32(side));
     }
+
+    *got_frame_ptr = !!samples;
+    if (samples) {
+        ac->frame->nb_samples = samples;
+        ac->frame->sample_rate = avctx->sample_rate;
+    } else
+        av_frame_unref(ac->frame);
+    *got_frame_ptr = !!samples;
+
+    /* for dual-mono audio (SCE + SCE) */
+    is_dmono = ac->dmono_mode && sce_count == 2 &&
+               ac->oc[1].channel_layout == (AV_CH_FRONT_LEFT | AV_CH_FRONT_RIGHT);
+    if (is_dmono) {
+        if (ac->dmono_mode == 1)
+            ((AVFrame *)data)->data[1] =((AVFrame *)data)->data[0];
+        else if (ac->dmono_mode == 2)
+            ((AVFrame *)data)->data[0] =((AVFrame *)data)->data[1];
+    }
+
     return 0;
 fail:
     pop_output_configuration(ac);

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/aacps.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/aacps.c Changed

@@ -322,14 +322,15 @@
 }
 
 /** Split one subband into 6 subsubbands with a complex filter */
-static void hybrid6_cx(PSDSPContext *dsp, float (*in)[2], float (*out)[32][2], const float (*filter)[8][2], int len)
+static void hybrid6_cx(PSDSPContext *dsp, float (*in)[2], float (*out)[32][2],
+                       TABLE_CONST float (*filter)[8][2], int len)
 {
     int i;
     int N = 8;
     LOCAL_ALIGNED_16(float, temp, [8], [2]);
 
     for (i = 0; i < len; i++, in++) {
-        dsp->hybrid_analysis(temp, in, filter, 1, N);
+        dsp->hybrid_analysis(temp, in, (const float (*)[8][2]) filter, 1, N);
         out[0][i][0] = temp[6][0];
         out[0][i][1] = temp[6][1];
         out[1][i][0] = temp[7][0];
@@ -345,12 +346,14 @@
     }
 }
 
-static void hybrid4_8_12_cx(PSDSPContext *dsp, float (*in)[2], float (*out)[32][2], const float (*filter)[8][2], int N, int len)
+static void hybrid4_8_12_cx(PSDSPContext *dsp,
+                            float (*in)[2], float (*out)[32][2],
+                            TABLE_CONST float (*filter)[8][2], int N, int len)
 {
     int i;
 
     for (i = 0; i < len; i++, in++) {
-        dsp->hybrid_analysis(out[0] + i, in, filter, 32, N);
+        dsp->hybrid_analysis(out[0] + i, in, (const float (*)[8][2]) filter, 32, N);
     }
 }
 
@@ -429,6 +432,7 @@
 #define DECAY_SLOPE      0.05f
 /// Number of frequency bands that can be addressed by the parameter index, b(k)
 static const int   NR_PAR_BANDS[]      = { 20, 34 };
+static const int   NR_IPDOPD_BANDS[]   = { 11, 17 };
 /// Number of frequency bands that can be addressed by the sub subband index, k
 static const int   NR_BANDS[]          = { 71, 91 };
 /// Start frequency band for the all-pass filter decay slope
@@ -685,7 +689,8 @@
             memcpy(ap_delay[k][m],   ap_delay[k][m]+numQMFSlots,           5*sizeof(ap_delay[k][m][0]));
         }
         ps->dsp.decorrelate(out[k], delay[k] + PS_MAX_DELAY - 2, ap_delay[k],
-                            phi_fract[is34][k], Q_fract_allpass[is34][k],
+                            phi_fract[is34][k],
+                            (const float (*)[2]) Q_fract_allpass[is34][k],
                             transient_gain[b], g_decay_slope, nL - n0);
     }
     for (; k < SHORT_DELAY_BAND[is34]; k++) {
@@ -763,7 +768,7 @@
     int8_t (*ipd_mapped)[PS_MAX_NR_IIDICC] = ipd_mapped_buf;
     int8_t (*opd_mapped)[PS_MAX_NR_IIDICC] = opd_mapped_buf;
     const int8_t *k_to_i = is34 ? k_to_i_34 : k_to_i_20;
-    const float (*H_LUT)[8][4] = (PS_BASELINE || ps->icc_mode < 3) ? HA : HB;
+    TABLE_CONST float (*H_LUT)[8][4] = (PS_BASELINE || ps->icc_mode < 3) ? HA : HB;
 
     //Remapping
     if (ps->num_env_old) {
@@ -824,7 +829,7 @@
             h21 = H_LUT[iid_mapped[e][b] + 7 + 23 * ps->iid_quant][icc_mapped[e][b]][2];
             h22 = H_LUT[iid_mapped[e][b] + 7 + 23 * ps->iid_quant][icc_mapped[e][b]][3];
 
-            if (!PS_BASELINE && ps->enable_ipdopd && 2*b <= NR_PAR_BANDS[is34]) {
+            if (!PS_BASELINE && ps->enable_ipdopd && b < NR_IPDOPD_BANDS[is34]) {
                 //The spec say says to only run this smoother when enable_ipdopd
                 //is set but the reference decoder appears to run it constantly
                 float h11i, h12i, h21i, h22i;
@@ -914,7 +919,7 @@
         memset(ps->ap_delay + top, 0, (NR_ALLPASS_BANDS[is34] - top)*sizeof(ps->ap_delay[0]));
 
     hybrid_analysis(&ps->dsp, Lbuf, ps->in_buf, L, is34, len);
-    decorrelation(ps, Rbuf, Lbuf, is34);
+    decorrelation(ps, Rbuf, (const float (*)[32][2]) Lbuf, is34);
     stereo_processing(ps, Lbuf, Rbuf, is34);
     hybrid_synthesis(&ps->dsp, L, Lbuf, is34, len);
     hybrid_synthesis(&ps->dsp, R, Rbuf, is34, len);

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/aacps_tablegen.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/aacps_tablegen.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/aacps_tablegen.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/aacps_tablegen.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/aacpsdsp.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/aacpsdsp.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/aacpsdsp.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/aacpsdsp.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/aacsbr.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/aacsbr.c Changed

@@ -932,6 +932,7 @@
         } else {
 #if 1
             *num_bits_left -= ff_ps_read_data(ac->avctx, gb, &sbr->ps, *num_bits_left);
+            ac->avctx->profile = FF_PROFILE_AAC_HE_V2;
 #else
             avpriv_report_missing_feature(ac->avctx, "Parametric Stereo");
             skip_bits_long(gb, *num_bits_left); // bs_fill_bits
@@ -1701,12 +1702,18 @@
         sbr_qmf_analysis(&ac->fdsp, &sbr->mdct_ana, &sbr->dsp, ch ? R : L, sbr->data[ch].analysis_filterbank_samples,
                          (float*)sbr->qmf_filter_scratch,
                          sbr->data[ch].W, sbr->data[ch].Ypos);
-        sbr->c.sbr_lf_gen(ac, sbr, sbr->X_low, sbr->data[ch].W, sbr->data[ch].Ypos);
+        sbr->c.sbr_lf_gen(ac, sbr, sbr->X_low,
+                          (const float (*)[32][32][2]) sbr->data[ch].W,
+                          sbr->data[ch].Ypos);
         sbr->data[ch].Ypos ^= 1;
         if (sbr->start) {
-            sbr->c.sbr_hf_inverse_filter(&sbr->dsp, sbr->alpha0, sbr->alpha1, sbr->X_low, sbr->k[0]);
+            sbr->c.sbr_hf_inverse_filter(&sbr->dsp, sbr->alpha0, sbr->alpha1,
+                                         (const float (*)[40][2]) sbr->X_low, sbr->k[0]);
             sbr_chirp(sbr, &sbr->data[ch]);
-            sbr_hf_gen(ac, sbr, sbr->X_high, sbr->X_low, sbr->alpha0, sbr->alpha1,
+            sbr_hf_gen(ac, sbr, sbr->X_high,
+                       (const float (*)[40][2]) sbr->X_low,
+                       (const float (*)[2]) sbr->alpha0,
+                       (const float (*)[2]) sbr->alpha1,
                        sbr->data[ch].bw_array, sbr->data[ch].t_env,
                        sbr->data[ch].bs_num_env);
 
@@ -1716,16 +1723,17 @@
                 sbr_env_estimate(sbr->e_curr, sbr->X_high, sbr, &sbr->data[ch]);
                 sbr_gain_calc(ac, sbr, &sbr->data[ch], sbr->data[ch].e_a);
                 sbr->c.sbr_hf_assemble(sbr->data[ch].Y[sbr->data[ch].Ypos],
-                                sbr->X_high, sbr, &sbr->data[ch],
+                                (const float (*)[40][2]) sbr->X_high,
+                                sbr, &sbr->data[ch],
                                 sbr->data[ch].e_a);
             }
         }
 
         /* synthesis */
         sbr->c.sbr_x_gen(sbr, sbr->X[ch],
-                  sbr->data[ch].Y[1-sbr->data[ch].Ypos],
-                  sbr->data[ch].Y[  sbr->data[ch].Ypos],
-                  sbr->X_low, ch);
+                  (const float (*)[64][2]) sbr->data[ch].Y[1-sbr->data[ch].Ypos],
+                  (const float (*)[64][2]) sbr->data[ch].Y[  sbr->data[ch].Ypos],
+                  (const float (*)[40][2]) sbr->X_low, ch);
     }
 
     if (ac->oc[1].m4ac.ps == 1) {

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/aactab.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/aactab.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/aactab.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/aactab.h Changed

omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/aarch64 Added

omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/aarch64/Makefile Added

omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/aarch64/h264chroma_init_aarch64.c Added

@@ -0,0 +1,59 @@
+/*
+ * ARM NEON optimised H.264 chroma functions
+ * Copyright (c) 2008 Mans Rullgard <mans@mansr.com>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <stdint.h>
+
+#include "libavutil/attributes.h"
+#include "libavutil/cpu.h"
+#include "libavutil/aarch64/cpu.h"
+#include "libavcodec/h264chroma.h"
+
+#include "config.h"
+
+void ff_put_h264_chroma_mc8_neon(uint8_t *dst, uint8_t *src, int stride,
+                                 int h, int x, int y);
+void ff_put_h264_chroma_mc4_neon(uint8_t *dst, uint8_t *src, int stride,
+                                 int h, int x, int y);
+void ff_put_h264_chroma_mc2_neon(uint8_t *dst, uint8_t *src, int stride,
+                                 int h, int x, int y);
+
+void ff_avg_h264_chroma_mc8_neon(uint8_t *dst, uint8_t *src, int stride,
+                                 int h, int x, int y);
+void ff_avg_h264_chroma_mc4_neon(uint8_t *dst, uint8_t *src, int stride,
+                                 int h, int x, int y);
+void ff_avg_h264_chroma_mc2_neon(uint8_t *dst, uint8_t *src, int stride,
+                                 int h, int x, int y);
+
+av_cold void ff_h264chroma_init_aarch64(H264ChromaContext *c, int bit_depth)
+{
+    const int high_bit_depth = bit_depth > 8;
+    int cpu_flags = av_get_cpu_flags();
+
+    if (have_neon(cpu_flags) && !high_bit_depth) {
+        c->put_h264_chroma_pixels_tab[0] = ff_put_h264_chroma_mc8_neon;
+        c->put_h264_chroma_pixels_tab[1] = ff_put_h264_chroma_mc4_neon;
+        c->put_h264_chroma_pixels_tab[2] = ff_put_h264_chroma_mc2_neon;
+
+        c->avg_h264_chroma_pixels_tab[0] = ff_avg_h264_chroma_mc8_neon;
+        c->avg_h264_chroma_pixels_tab[1] = ff_avg_h264_chroma_mc4_neon;
+        c->avg_h264_chroma_pixels_tab[2] = ff_avg_h264_chroma_mc2_neon;
+    }
+}

omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/aarch64/h264cmc_neon.S Added

@@ -0,0 +1,402 @@
+/*
+ * Copyright (c) 2008 Mans Rullgard <mans@mansr.com>
+ * Copyright (c) 2013 Janne Grunau <janne-libav@jannau.net>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "libavutil/aarch64/asm.S"
+
+/* chroma_mc8(uint8_t *dst, uint8_t *src, int stride, int h, int x, int y) */
+.macro  h264_chroma_mc8 type, codec=h264
+function ff_\type\()_\codec\()_chroma_mc8_neon, export=1
+        sxtw            x2,  w2
+  .ifc \type,avg
+        mov             x8,  x0
+  .endif
+        prfm            pldl1strm, [x1]
+        prfm            pldl1strm, [x1, x2]
+  .ifc \codec,rv40
+        movrel          x6,  rv40bias
+        lsr             w9,  w5,  #1
+        lsr             w10, w4,  #1
+        lsl             w9,  w9,  #3
+        lsl             w10, w10, #1
+        add             w9,  w9,  w10
+        add             x6,  x6,  w9, UXTW
+        ld1r            {v22.8H}, [x6]
+  .endif
+  .ifc \codec,vc1
+        movi            v22.8H,   #28
+  .endif
+        mul             w7,  w4,  w5
+        lsl             w14, w5,  #3
+        lsl             w13, w4,  #3
+        cmp             w7,  #0
+        sub             w6,  w14, w7
+        sub             w12, w13, w7
+        sub             w4,  w7,  w13
+        sub             w4,  w4,  w14
+        add             w4,  w4,  #64
+        b.eq            2f
+
+        dup             v0.8B,  w4
+        dup             v1.8B,  w12
+        ld1             {v4.8B, v5.8B}, [x1], x2
+        dup             v2.8B,  w6
+        dup             v3.8B,  w7
+        ext             v5.8B,  v4.8B,  v5.8B,  #1
+1:      ld1             {v6.8B, v7.8B}, [x1], x2
+        umull           v16.8H, v4.8B,  v0.8B
+        umlal           v16.8H, v5.8B,  v1.8B
+        ext             v7.8B,  v6.8B,  v7.8B,  #1
+        ld1             {v4.8B, v5.8B}, [x1], x2
+        umlal           v16.8H, v6.8B,  v2.8B
+        prfm            pldl1strm, [x1]
+        ext             v5.8B,  v4.8B,  v5.8B,  #1
+        umlal           v16.8H, v7.8B,  v3.8B
+        umull           v17.8H, v6.8B,  v0.8B
+        subs            w3,  w3,  #2
+        umlal           v17.8H, v7.8B, v1.8B
+        umlal           v17.8H, v4.8B, v2.8B
+        umlal           v17.8H, v5.8B, v3.8B
+        prfm            pldl1strm, [x1, x2]
+  .ifc \codec,h264
+        rshrn           v16.8B, v16.8H, #6
+        rshrn           v17.8B, v17.8H, #6
+  .else
+        add             v16.8H, v16.8H, v22.8H
+        add             v17.8H, v17.8H, v22.8H
+        shrn            v16.8B, v16.8H, #6
+        shrn            v17.8B, v17.8H, #6
+  .endif
+  .ifc \type,avg
+        ld1             {v20.8B}, [x8], x2
+        ld1             {v21.8B}, [x8], x2
+        urhadd          v16.8B, v16.8B, v20.8B
+        urhadd          v17.8B, v17.8B, v21.8B
+  .endif
+        st1             {v16.8B}, [x0], x2
+        st1             {v17.8B}, [x0], x2
+        b.gt            1b
+        ret
+
+2:      tst             w6,  w6
+        add             w12, w12, w6
+        dup             v0.8B, w4
+        dup             v1.8B, w12
+        b.eq            4f
+
+        ld1             {v4.8B}, [x1], x2
+3:      ld1             {v6.8B}, [x1], x2
+        umull           v16.8H, v4.8B,  v0.8B
+        umlal           v16.8H, v6.8B,  v1.8B
+        ld1             {v4.8B}, [x1], x2
+        umull           v17.8H, v6.8B,  v0.8B
+        umlal           v17.8H, v4.8B,  v1.8B
+        prfm            pldl1strm, [x1]
+  .ifc \codec,h264
+        rshrn           v16.8B, v16.8H, #6
+        rshrn           v17.8B, v17.8H, #6
+  .else
+        add             v16.8H, v16.8H, v22.8H
+        add             v17.8H, v17.8H, v22.8H
+        shrn            v16.8B, v16.8H, #6
+        shrn            v17.8B, v17.8H, #6
+  .endif
+        prfm            pldl1strm, [x1, x2]
+  .ifc \type,avg
+        ld1             {v20.8B}, [x8], x2
+        ld1             {v21.8B}, [x8], x2
+        urhadd          v16.8B, v16.8B, v20.8B
+        urhadd          v17.8B, v17.8B, v21.8B
+  .endif
+        subs            w3,  w3,  #2
+        st1             {v16.8B}, [x0], x2
+        st1             {v17.8B}, [x0], x2
+        b.gt            3b
+        ret
+
+4:      ld1             {v4.8B, v5.8B}, [x1], x2
+        ld1             {v6.8B, v7.8B}, [x1], x2
+        ext             v5.8B,  v4.8B,  v5.8B,  #1
+        ext             v7.8B,  v6.8B,  v7.8B,  #1
+        prfm            pldl1strm, [x1]
+        subs            w3,  w3,  #2
+        umull           v16.8H, v4.8B, v0.8B
+        umlal           v16.8H, v5.8B, v1.8B
+        umull           v17.8H, v6.8B, v0.8B
+        umlal           v17.8H, v7.8B, v1.8B
+        prfm            pldl1strm, [x1, x2]
+  .ifc \codec,h264
+        rshrn           v16.8B, v16.8H, #6
+        rshrn           v17.8B, v17.8H, #6
+  .else
+        add             v16.8H, v16.8H, v22.8H
+        add             v17.8H, v17.8H, v22.8H
+        shrn            v16.8B, v16.8H, #6
+        shrn            v17.8B, v17.8H, #6
+  .endif
+  .ifc \type,avg
+        ld1             {v20.8B}, [x8], x2
+        ld1             {v21.8B}, [x8], x2
+        urhadd          v16.8B, v16.8B, v20.8B
+        urhadd          v17.8B, v17.8B, v21.8B
+  .endif
+        st1             {v16.8B}, [x0], x2
+        st1             {v17.8B}, [x0], x2
+        b.gt            4b
+        ret
+endfunc
+.endm
+
+/* chroma_mc4(uint8_t *dst, uint8_t *src, int stride, int h, int x, int y) */
+.macro  h264_chroma_mc4 type, codec=h264
+function ff_\type\()_\codec\()_chroma_mc4_neon, export=1
+        sxtw            x2,  w2
+  .ifc \type,avg
+        mov             x8,  x0
+  .endif
+        prfm            pldl1strm, [x1]
+        prfm            pldl1strm, [x1, x2]
+  .ifc \codec,rv40
+        movrel          x6,  rv40bias
+        lsr             w9,  w5,  #1
+        lsr             w10, w4,  #1
+        lsl             w9,  w9,  #3
+        lsl             w10, w10, #1
+        add             w9,  w9,  w10
+        add             x6,  x6,  w9, UXTW
+        ld1r            {v22.8H}, [x6]
+  .endif
+  .ifc \codec,vc1
+        movi            v22.8H,   #28
+  .endif
+        mul             w7,  w4,  w5
+        lsl             w14, w5,  #3
+        lsl             w13, w4,  #3
+        cmp             w7,  #0
+        sub             w6,  w14, w7
+        sub             w12, w13, w7
+        sub             w4,  w7,  w13
+        sub             w4,  w4,  w14
+        add             w4,  w4,  #64
+        b.eq            2f
+
+        dup             v24.8B,  w4
+        dup             v25.8B,  w12
+        ld1             {v4.8B}, [x1], x2
+        dup             v26.8B,  w6
+        dup             v27.8B,  w7
+        ext             v5.8B,  v4.8B,  v5.8B, #1
+        trn1            v0.2S,  v24.2S, v25.2S
+        trn1            v2.2S,  v26.2S, v27.2S
+        trn1            v4.2S,  v4.2S,  v5.2S
+1:      ld1             {v6.8B}, [x1], x2
+        ext             v7.8B,  v6.8B,  v7.8B, #1
+        trn1            v6.2S,  v6.2S,  v7.2S
+        umull           v18.8H, v4.8B,  v0.8B
+        umlal           v18.8H, v6.8B,  v2.8B
+        ld1             {v4.8B}, [x1], x2
+        ext             v5.8B,  v4.8B,  v5.8B, #1
+        trn1            v4.2S,  v4.2S,  v5.2S
+        prfm            pldl1strm, [x1]
+        umull           v19.8H, v6.8B,  v0.8B
+        umlal           v19.8H, v4.8B,  v2.8B
+        trn1            v30.2D, v18.2D, v19.2D
+        trn2            v31.2D, v18.2D, v19.2D
+        add             v18.8H, v30.8H, v31.8H
+  .ifc \codec,h264
+        rshrn           v16.8B, v18.8H, #6
+  .else
+        add             v18.8H, v18.8H, v22.8H
+        shrn            v16.8B, v18.8H, #6
+  .endif
+        subs            w3,  w3,  #2
+        prfm            pldl1strm, [x1, x2]
+  .ifc \type,avg
+        ld1             {v20.S}[0], [x8], x2
+        ld1             {v20.S}[1], [x8], x2
+        urhadd          v16.8B, v16.8B, v20.8B
+  .endif
+        st1             {v16.S}[0], [x0], x2
+        st1             {v16.S}[1], [x0], x2
+        b.gt            1b
+        ret
+
+2:      tst             w6,  w6
+        add             w12, w12, w6
+        dup             v30.8B, w4
+        dup             v31.8B, w12
+        trn1            v0.2S,  v30.2S, v31.2S
+        trn2            v1.2S,  v30.2S, v31.2S
+        b.eq            4f
+
+        ext             v1.8B,  v0.8B,  v1.8B, #4
+        ld1             {v4.S}[0], [x1], x2
+3:      ld1             {v4.S}[1], [x1], x2
+        umull           v18.8H, v4.8B,  v0.8B
+        ld1             {v4.S}[0], [x1], x2
+        umull           v19.8H, v4.8B,  v1.8B
+        trn1            v30.2D, v18.2D, v19.2D
+        trn2            v31.2D, v18.2D, v19.2D
+        add             v18.8H, v30.8H, v31.8H
+        prfm            pldl1strm, [x1]
+  .ifc \codec,h264
+        rshrn           v16.8B, v18.8H, #6
+  .else
+        add             v18.8H, v18.8H, v22.8H
+        shrn            v16.8B, v18.8H, #6
+  .endif
+  .ifc \type,avg
+        ld1             {v20.S}[0], [x8], x2
+        ld1             {v20.S}[1], [x8], x2
+        urhadd          v16.8B, v16.8B, v20.8B
+  .endif
+        subs            w3,  w3,  #2
+        prfm            pldl1strm, [x1, x2]
+        st1             {v16.S}[0], [x0], x2
+        st1             {v16.S}[1], [x0], x2
+        b.gt            3b
+        ret
+
+4:      ld1             {v4.8B}, [x1], x2
+        ld1             {v6.8B}, [x1], x2
+        ext             v5.8B,  v4.8B,  v5.8B, #1
+        ext             v7.8B,  v6.8B,  v7.8B, #1
+        trn1            v4.2S,  v4.2S,  v5.2S
+        trn1            v6.2S,  v6.2S,  v7.2S
+        umull           v18.8H, v4.8B,  v0.8B
+        umull           v19.8H, v6.8B,  v0.8B
+        subs            w3,  w3,  #2
+        trn1            v30.2D, v18.2D, v19.2D
+        trn2            v31.2D, v18.2D, v19.2D
+        add             v18.8H, v30.8H, v31.8H
+        prfm            pldl1strm, [x1]
+  .ifc \codec,h264
+        rshrn           v16.8B, v18.8H, #6
+  .else
+        add             v18.8H, v18.8H, v22.8H
+        shrn            v16.8B, v18.8H, #6
+  .endif
+  .ifc \type,avg
+        ld1             {v20.S}[0], [x8], x2
+        ld1             {v20.S}[1], [x8], x2
+        urhadd          v16.8B, v16.8B, v20.8B
+  .endif
+        prfm            pldl1strm, [x1]
+        st1             {v16.S}[0], [x0], x2
+        st1             {v16.S}[1], [x0], x2
+        b.gt            4b
+        ret
+endfunc
+.endm
+
+.macro  h264_chroma_mc2 type
+function ff_\type\()_h264_chroma_mc2_neon, export=1
+        sxtw            x2,  w2
+        prfm            pldl1strm, [x1]
+        prfm            pldl1strm, [x1, x2]
+        orr             w7,  w4,  w5
+        cbz             w7,  2f
+
+        mul             w7,  w4,  w5
+        lsl             w14, w5,  #3
+        lsl             w13, w4,  #3
+        sub             w6,  w14, w7
+        sub             w12, w13, w7
+        sub             w4,  w7,  w13
+        sub             w4,  w4,  w14
+        add             w4,  w4,  #64
+        dup             v0.8B,  w4
+        dup             v2.8B,  w12
+        dup             v1.8B,  w6
+        dup             v3.8B,  w7
+        trn1            v0.4H,  v0.4H,  v2.4H
+        trn1            v1.4H,  v1.4H,  v3.4H
+1:
+        ld1             {v4.S}[0],  [x1], x2
+        ld1             {v4.S}[1],  [x1], x2
+        rev64           v5.2S,  v4.2S
+        ld1             {v5.S}[1],  [x1]
+        ext             v6.8B,  v4.8B,  v5.8B,  #1
+        ext             v7.8B,  v5.8B,  v4.8B,  #1
+        trn1            v4.4H,  v4.4H,  v6.4H
+        trn1            v5.4H,  v5.4H,  v7.4H
+        umull           v16.8H, v4.8B,  v0.8B
+        umlal           v16.8H, v5.8B,  v1.8B
+  .ifc \type,avg
+        ld1             {v18.H}[0], [x0], x2
+        ld1             {v18.H}[2], [x0]
+        sub             x0,  x0,  x2
+  .endif
+        rev64           v17.4S, v16.4S
+        add             v16.8H, v16.8H, v17.8H
+        rshrn           v16.8B, v16.8H, #6
+  .ifc \type,avg
+        urhadd          v16.8B, v16.8B, v18.8B
+  .endif
+        st1             {v16.H}[0], [x0], x2
+        st1             {v16.H}[2], [x0], x2
+        subs            w3,  w3,  #2
+        b.gt            1b
+        ret
+
+2:
+        ld1             {v16.H}[0], [x1], x2
+        ld1             {v16.H}[1], [x1], x2
+  .ifc \type,avg
+        ld1             {v18.H}[0], [x0], x2
+        ld1             {v18.H}[1], [x0]
+        sub             x0,  x0,  x2
+        urhadd          v16.8B, v16.8B, v18.8B
+  .endif
+        st1             {v16.H}[0], [x0], x2
+        st1             {v16.H}[1], [x0], x2
+        subs            w3,  w3,  #2
+        b.gt            2b
+        ret
+endfunc
+.endm
+
+        h264_chroma_mc8 put
+        h264_chroma_mc8 avg
+        h264_chroma_mc4 put
+        h264_chroma_mc4 avg
+        h264_chroma_mc2 put
+        h264_chroma_mc2 avg
+
+#if CONFIG_RV40_DECODER
+const   rv40bias
+        .short           0, 16, 32, 16
+        .short          32, 28, 32, 28
+        .short           0, 32, 16, 32
+        .short          32, 28, 32, 28
+endconst
+
+        h264_chroma_mc8 put, rv40
+        h264_chroma_mc8 avg, rv40
+        h264_chroma_mc4 put, rv40
+        h264_chroma_mc4 avg, rv40
+#endif
+
+#if CONFIG_VC1_DECODER
+        h264_chroma_mc8 put, vc1
+        h264_chroma_mc8 avg, vc1
+        h264_chroma_mc4 put, vc1
+        h264_chroma_mc4 avg, vc1
+#endif

omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/aarch64/h264dsp_init_aarch64.c Added

@@ -0,0 +1,101 @@
+/*
+ * Copyright (c) 2010 Mans Rullgard <mans@mansr.com>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <stdint.h>
+
+#include "libavutil/attributes.h"
+#include "libavutil/cpu.h"
+#include "libavutil/aarch64/cpu.h"
+#include "libavcodec/h264dsp.h"
+
+void ff_h264_v_loop_filter_luma_neon(uint8_t *pix, int stride, int alpha,
+                                     int beta, int8_t *tc0);
+void ff_h264_h_loop_filter_luma_neon(uint8_t *pix, int stride, int alpha,
+                                     int beta, int8_t *tc0);
+void ff_h264_v_loop_filter_chroma_neon(uint8_t *pix, int stride, int alpha,
+                                       int beta, int8_t *tc0);
+void ff_h264_h_loop_filter_chroma_neon(uint8_t *pix, int stride, int alpha,
+                                       int beta, int8_t *tc0);
+
+void ff_weight_h264_pixels_16_neon(uint8_t *dst, int stride, int height,
+                                   int log2_den, int weight, int offset);
+void ff_weight_h264_pixels_8_neon(uint8_t *dst, int stride, int height,
+                                  int log2_den, int weight, int offset);
+void ff_weight_h264_pixels_4_neon(uint8_t *dst, int stride, int height,
+                                  int log2_den, int weight, int offset);
+
+void ff_biweight_h264_pixels_16_neon(uint8_t *dst, uint8_t *src, int stride,
+                                     int height, int log2_den, int weightd,
+                                     int weights, int offset);
+void ff_biweight_h264_pixels_8_neon(uint8_t *dst, uint8_t *src, int stride,
+                                    int height, int log2_den, int weightd,
+                                    int weights, int offset);
+void ff_biweight_h264_pixels_4_neon(uint8_t *dst, uint8_t *src, int stride,
+                                    int height, int log2_den, int weightd,
+                                    int weights, int offset);
+
+void ff_h264_idct_add_neon(uint8_t *dst, int16_t *block, int stride);
+void ff_h264_idct_dc_add_neon(uint8_t *dst, int16_t *block, int stride);
+void ff_h264_idct_add16_neon(uint8_t *dst, const int *block_offset,
+                             int16_t *block, int stride,
+                             const uint8_t nnzc[6*8]);
+void ff_h264_idct_add16intra_neon(uint8_t *dst, const int *block_offset,
+                                  int16_t *block, int stride,
+                                  const uint8_t nnzc[6*8]);
+void ff_h264_idct_add8_neon(uint8_t **dest, const int *block_offset,
+                            int16_t *block, int stride,
+                            const uint8_t nnzc[6*8]);
+
+void ff_h264_idct8_add_neon(uint8_t *dst, int16_t *block, int stride);
+void ff_h264_idct8_dc_add_neon(uint8_t *dst, int16_t *block, int stride);
+void ff_h264_idct8_add4_neon(uint8_t *dst, const int *block_offset,
+                             int16_t *block, int stride,
+                             const uint8_t nnzc[6*8]);
+
+av_cold void ff_h264dsp_init_aarch64(H264DSPContext *c, const int bit_depth,
+                                     const int chroma_format_idc)
+{
+    int cpu_flags = av_get_cpu_flags();
+
+    if (have_neon(cpu_flags) && bit_depth == 8) {
+        c->h264_v_loop_filter_luma   = ff_h264_v_loop_filter_luma_neon;
+        c->h264_h_loop_filter_luma   = ff_h264_h_loop_filter_luma_neon;
+        c->h264_v_loop_filter_chroma = ff_h264_v_loop_filter_chroma_neon;
+        c->h264_h_loop_filter_chroma = ff_h264_h_loop_filter_chroma_neon;
+
+        c->weight_h264_pixels_tab[0] = ff_weight_h264_pixels_16_neon;
+        c->weight_h264_pixels_tab[1] = ff_weight_h264_pixels_8_neon;
+        c->weight_h264_pixels_tab[2] = ff_weight_h264_pixels_4_neon;
+
+        c->biweight_h264_pixels_tab[0] = ff_biweight_h264_pixels_16_neon;
+        c->biweight_h264_pixels_tab[1] = ff_biweight_h264_pixels_8_neon;
+        c->biweight_h264_pixels_tab[2] = ff_biweight_h264_pixels_4_neon;
+
+        c->h264_idct_add        = ff_h264_idct_add_neon;
+        c->h264_idct_dc_add     = ff_h264_idct_dc_add_neon;
+        c->h264_idct_add16      = ff_h264_idct_add16_neon;
+        c->h264_idct_add16intra = ff_h264_idct_add16intra_neon;
+        if (chroma_format_idc <= 1)
+            c->h264_idct_add8   = ff_h264_idct_add8_neon;
+        c->h264_idct8_add       = ff_h264_idct8_add_neon;
+        c->h264_idct8_dc_add    = ff_h264_idct8_dc_add_neon;
+        c->h264_idct8_add4      = ff_h264_idct8_add4_neon;
+    }
+}

omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/aarch64/h264dsp_neon.S Added

@@ -0,0 +1,498 @@
+/*
+ * Copyright (c) 2008 Mans Rullgard <mans@mansr.com>
+ * Copyright (c) 2013 Janne Grunau <janne-libav@jannau.net>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "libavutil/aarch64/asm.S"
+#include "neon.S"
+
+.macro  h264_loop_filter_start
+        cmp             w2,  #0
+        ldr             w6,  [x4]
+        ccmp            w3,  #0, #0, ne
+        mov             v24.S[0], w6
+        and             w6,  w6,  w6,  lsl #16
+        b.eq            1f
+        ands            w6,  w6,  w6,  lsl #8
+        b.ge            2f
+1:
+        ret
+2:
+.endm
+
+.macro  h264_loop_filter_luma
+        dup             v22.16B, w2                     // alpha
+        uxtl            v24.8H,  v24.8B
+        uabd            v21.16B, v16.16B, v0.16B        // abs(p0 - q0)
+        uxtl            v24.4S,  v24.4H
+        uabd            v28.16B, v18.16B, v16.16B       // abs(p1 - p0)
+        sli             v24.8H,  v24.8H,  #8
+        uabd            v30.16B, v2.16B,  v0.16B        // abs(q1 - q0)
+        sli             v24.4S,  v24.4S,  #16
+        cmhi            v21.16B, v22.16B, v21.16B       // < alpha
+        dup             v22.16B, w3                     // beta
+        cmlt            v23.16B, v24.16B, #0
+        cmhi            v28.16B, v22.16B, v28.16B       // < beta
+        cmhi            v30.16B, v22.16B, v30.16B       // < beta
+        bic             v21.16B, v21.16B, v23.16B
+        uabd            v17.16B, v20.16B, v16.16B       // abs(p2 - p0)
+        and             v21.16B, v21.16B, v28.16B
+        uabd            v19.16B,  v4.16B,  v0.16B       // abs(q2 - q0)
+        cmhi            v17.16B, v22.16B, v17.16B       // < beta
+        and             v21.16B, v21.16B, v30.16B
+        cmhi            v19.16B, v22.16B, v19.16B       // < beta
+        and             v17.16B, v17.16B, v21.16B
+        and             v19.16B, v19.16B, v21.16B
+        and             v24.16B, v24.16B, v21.16B
+        urhadd          v28.16B, v16.16B,  v0.16B
+        sub             v21.16B, v24.16B, v17.16B
+        uqadd           v23.16B, v18.16B, v24.16B
+        uhadd           v20.16B, v20.16B, v28.16B
+        sub             v21.16B, v21.16B, v19.16B
+        uhadd           v28.16B,  v4.16B, v28.16B
+        umin            v23.16B, v23.16B, v20.16B
+        uqsub           v22.16B, v18.16B, v24.16B
+        uqadd           v4.16B,   v2.16B, v24.16B
+        umax            v23.16B, v23.16B, v22.16B
+        uqsub           v22.16B,  v2.16B, v24.16B
+        umin            v28.16B,  v4.16B, v28.16B
+        uxtl            v4.8H,    v0.8B
+        umax            v28.16B, v28.16B, v22.16B
+        uxtl2           v20.8H,   v0.16B
+        usubw           v4.8H,    v4.8H,  v16.8B
+        usubw2          v20.8H,  v20.8H,  v16.16B
+        shl             v4.8H,    v4.8H,  #2
+        shl             v20.8H,  v20.8H,  #2
+        uaddw           v4.8H,    v4.8H,  v18.8B
+        uaddw2          v20.8H,  v20.8H,  v18.16B
+        usubw           v4.8H,    v4.8H,   v2.8B
+        usubw2          v20.8H,  v20.8H,   v2.16B
+        rshrn           v4.8B,    v4.8H,  #3
+        rshrn2          v4.16B,  v20.8H,  #3
+        bsl             v17.16B, v23.16B, v18.16B
+        bsl             v19.16B, v28.16B,  v2.16B
+        neg             v23.16B, v21.16B
+        uxtl            v28.8H,  v16.8B
+        smin            v4.16B,   v4.16B, v21.16B
+        uxtl2           v21.8H,  v16.16B
+        smax            v4.16B,   v4.16B, v23.16B
+        uxtl            v22.8H,   v0.8B
+        uxtl2           v24.8H,   v0.16B
+        saddw           v28.8H,  v28.8H,  v4.8B
+        saddw2          v21.8H,  v21.8H,  v4.16B
+        ssubw           v22.8H,  v22.8H,  v4.8B
+        ssubw2          v24.8H,  v24.8H,  v4.16B
+        sqxtun          v16.8B,  v28.8H
+        sqxtun2         v16.16B, v21.8H
+        sqxtun          v0.8B,   v22.8H
+        sqxtun2         v0.16B,  v24.8H
+.endm
+
+function ff_h264_v_loop_filter_luma_neon, export=1
+        h264_loop_filter_start
+        sxtw            x1,  w1
+
+        ld1             {v0.16B},  [x0], x1
+        ld1             {v2.16B},  [x0], x1
+        ld1             {v4.16B},  [x0], x1
+        sub             x0,  x0,  x1, lsl #2
+        sub             x0,  x0,  x1, lsl #1
+        ld1             {v20.16B},  [x0], x1
+        ld1             {v18.16B},  [x0], x1
+        ld1             {v16.16B},  [x0], x1
+
+        h264_loop_filter_luma
+
+        sub             x0,  x0,  x1, lsl #1
+        st1             {v17.16B},  [x0], x1
+        st1             {v16.16B}, [x0], x1
+        st1             {v0.16B},  [x0], x1
+        st1             {v19.16B}, [x0]
+
+        ret
+endfunc
+
+function ff_h264_h_loop_filter_luma_neon, export=1
+        h264_loop_filter_start
+
+        sub             x0,  x0,  #4
+        ld1             {v6.8B},  [x0], x1
+        ld1             {v20.8B}, [x0], x1
+        ld1             {v18.8B}, [x0], x1
+        ld1             {v16.8B}, [x0], x1
+        ld1             {v0.8B},  [x0], x1
+        ld1             {v2.8B},  [x0], x1
+        ld1             {v4.8B},  [x0], x1
+        ld1             {v26.8B}, [x0], x1
+        ld1             {v6.D}[1],  [x0], x1
+        ld1             {v20.D}[1], [x0], x1
+        ld1             {v18.D}[1], [x0], x1
+        ld1             {v16.D}[1], [x0], x1
+        ld1             {v0.D}[1],  [x0], x1
+        ld1             {v2.D}[1],  [x0], x1
+        ld1             {v4.D}[1],  [x0], x1
+        ld1             {v26.D}[1], [x0], x1
+
+        transpose_8x16B v6, v20, v18, v16, v0, v2, v4, v26, v21, v23
+
+        h264_loop_filter_luma
+
+        transpose_4x16B v17, v16, v0, v19, v21, v23, v25, v27
+
+        sub             x0,  x0,  x1, lsl #4
+        add             x0,  x0,  #2
+        st1             {v17.S}[0],  [x0], x1
+        st1             {v16.S}[0], [x0], x1
+        st1             {v0.S}[0],  [x0], x1
+        st1             {v19.S}[0], [x0], x1
+        st1             {v17.S}[1],  [x0], x1
+        st1             {v16.S}[1], [x0], x1
+        st1             {v0.S}[1],  [x0], x1
+        st1             {v19.S}[1], [x0], x1
+        st1             {v17.S}[2],  [x0], x1
+        st1             {v16.S}[2], [x0], x1
+        st1             {v0.S}[2],  [x0], x1
+        st1             {v19.S}[2], [x0], x1
+        st1             {v17.S}[3],  [x0], x1
+        st1             {v16.S}[3], [x0], x1
+        st1             {v0.S}[3],  [x0], x1
+        st1             {v19.S}[3], [x0], x1
+
+        ret
+endfunc
+
+.macro  h264_loop_filter_chroma
+        dup             v22.8B, w2              // alpha
+        uxtl            v24.8H, v24.8B
+        uabd            v26.8B, v16.8B, v0.8B   // abs(p0 - q0)
+        uxtl            v4.8H,  v0.8B
+        uabd            v28.8B, v18.8B, v16.8B  // abs(p1 - p0)
+        usubw           v4.8H,  v4.8H,  v16.8B
+        sli             v24.8H, v24.8H, #8
+        shl             v4.8H,  v4.8H,  #2
+        uabd            v30.8B, v2.8B,  v0.8B   // abs(q1 - q0)
+        uaddw           v4.8H,  v4.8H,  v18.8B
+        cmhi            v26.8B, v22.8B, v26.8B  // < alpha
+        usubw           v4.8H,  v4.8H,  v2.8B
+        dup             v22.8B, w3              // beta
+        rshrn           v4.8B,  v4.8H,  #3
+        cmhi            v28.8B, v22.8B, v28.8B  // < beta
+        cmhi            v30.8B, v22.8B, v30.8B  // < beta
+        smin            v4.8B,  v4.8B,  v24.8B
+        neg             v25.8B, v24.8B
+        and             v26.8B, v26.8B, v28.8B
+        smax            v4.8B,  v4.8B,  v25.8B
+        and             v26.8B, v26.8B, v30.8B
+        uxtl            v22.8H, v0.8B
+        and             v4.8B,  v4.8B,  v26.8B
+        uxtl            v28.8H, v16.8B
+        saddw           v28.8H, v28.8H, v4.8B
+        ssubw           v22.8H, v22.8H, v4.8B
+        sqxtun          v16.8B, v28.8H
+        sqxtun          v0.8B,  v22.8H
+.endm
+
+function ff_h264_v_loop_filter_chroma_neon, export=1
+        h264_loop_filter_start
+
+        sub             x0,  x0,  x1, lsl #1
+        ld1             {v18.8B}, [x0], x1
+        ld1             {v16.8B}, [x0], x1
+        ld1             {v0.8B},  [x0], x1
+        ld1             {v2.8B},  [x0]
+
+        h264_loop_filter_chroma
+
+        sub             x0,  x0,  x1, lsl #1
+        st1             {v16.8B}, [x0], x1
+        st1             {v0.8B},  [x0], x1
+
+        ret
+endfunc
+
+function ff_h264_h_loop_filter_chroma_neon, export=1
+        h264_loop_filter_start
+
+        sub             x0,  x0,  #2
+        ld1             {v18.S}[0], [x0], x1
+        ld1             {v16.S}[0], [x0], x1
+        ld1             {v0.S}[0],  [x0], x1
+        ld1             {v2.S}[0],  [x0], x1
+        ld1             {v18.S}[1], [x0], x1
+        ld1             {v16.S}[1], [x0], x1
+        ld1             {v0.S}[1],  [x0], x1
+        ld1             {v2.S}[1],  [x0], x1
+
+        transpose_4x8B  v18, v16, v0, v2, v28, v29, v30, v31
+
+        h264_loop_filter_chroma
+
+        transpose_4x8B  v18, v16, v0, v2, v28, v29, v30, v31
+
+        sub             x0,  x0,  x1, lsl #3
+        st1             {v18.S}[0], [x0], x1
+        st1             {v16.S}[0], [x0], x1
+        st1             {v0.S}[0],  [x0], x1
+        st1             {v2.S}[0],  [x0], x1
+        st1             {v18.S}[1], [x0], x1
+        st1             {v16.S}[1], [x0], x1
+        st1             {v0.S}[1],  [x0], x1
+        st1             {v2.S}[1],  [x0], x1
+
+        ret
+endfunc
+
+.macro  biweight_16     macs, macd
+        dup             v0.16B,  w5
+        dup             v1.16B,  w6
+        mov             v4.16B,  v16.16B
+        mov             v6.16B,  v16.16B
+1:      subs            w3,  w3,  #2
+        ld1             {v20.16B}, [x0], x2
+        \macd           v4.8H,   v0.8B,  v20.8B
+        \macd\()2       v6.8H,   v0.16B, v20.16B
+        ld1             {v22.16B}, [x1], x2
+        \macs           v4.8H,   v1.8B,  v22.8B
+        \macs\()2       v6.8H,   v1.16B, v22.16B
+        mov             v24.16B, v16.16B
+        ld1             {v28.16B}, [x0], x2
+        mov             v26.16B, v16.16B
+        \macd           v24.8H,  v0.8B,  v28.8B
+        \macd\()2       v26.8H,  v0.16B, v28.16B
+        ld1             {v30.16B}, [x1], x2
+        \macs           v24.8H,  v1.8B,  v30.8B
+        \macs\()2       v26.8H,  v1.16B, v30.16B
+        sshl            v4.8H,   v4.8H,  v18.8H
+        sshl            v6.8H,   v6.8H,  v18.8H
+        sqxtun          v4.8B,   v4.8H
+        sqxtun2         v4.16B,  v6.8H
+        sshl            v24.8H,  v24.8H, v18.8H
+        sshl            v26.8H,  v26.8H, v18.8H
+        sqxtun          v24.8B,  v24.8H
+        sqxtun2         v24.16B, v26.8H
+        mov             v6.16B,  v16.16B
+        st1             {v4.16B},  [x7], x2
+        mov             v4.16B,  v16.16B
+        st1             {v24.16B}, [x7], x2
+        b.ne            1b
+        ret
+.endm
+
+.macro  biweight_8      macs, macd
+        dup             v0.8B,  w5
+        dup             v1.8B,  w6
+        mov             v2.16B,  v16.16B
+        mov             v20.16B, v16.16B
+1:      subs            w3,  w3,  #2
+        ld1             {v4.8B}, [x0], x2
+        \macd           v2.8H,  v0.8B,  v4.8B
+        ld1             {v5.8B}, [x1], x2
+        \macs           v2.8H,  v1.8B,  v5.8B
+        ld1             {v6.8B}, [x0], x2
+        \macd           v20.8H, v0.8B,  v6.8B
+        ld1             {v7.8B}, [x1], x2
+        \macs           v20.8H, v1.8B,  v7.8B
+        sshl            v2.8H,  v2.8H,  v18.8H
+        sqxtun          v2.8B,  v2.8H
+        sshl            v20.8H, v20.8H, v18.8H
+        sqxtun          v4.8B,  v20.8H
+        mov             v20.16B, v16.16B
+        st1             {v2.8B}, [x7], x2
+        mov             v2.16B,  v16.16B
+        st1             {v4.8B}, [x7], x2
+        b.ne            1b
+        ret
+.endm
+
+.macro  biweight_4      macs, macd
+        dup             v0.8B,  w5
+        dup             v1.8B,  w6
+        mov             v2.16B, v16.16B
+        mov             v20.16B,v16.16B
+1:      subs            w3,  w3,  #4
+        ld1             {v4.S}[0], [x0], x2
+        ld1             {v4.S}[1], [x0], x2
+        \macd           v2.8H,  v0.8B,  v4.8B
+        ld1             {v5.S}[0], [x1], x2
+        ld1             {v5.S}[1], [x1], x2
+        \macs           v2.8H,  v1.8B,  v5.8B
+        b.lt            2f
+        ld1             {v6.S}[0], [x0], x2
+        ld1             {v6.S}[1], [x0], x2
+        \macd           v20.8H, v0.8B,  v6.8B
+        ld1             {v7.S}[0], [x1], x2
+        ld1             {v7.S}[1], [x1], x2
+        \macs           v20.8H, v1.8B,  v7.8B
+        sshl            v2.8H,  v2.8H,  v18.8H
+        sqxtun          v2.8B,  v2.8H
+        sshl            v20.8H, v20.8H, v18.8H
+        sqxtun          v4.8B,  v20.8H
+        mov             v20.16B, v16.16B
+        st1             {v2.S}[0], [x7], x2
+        st1             {v2.S}[1], [x7], x2
+        mov             v2.16B,  v16.16B
+        st1             {v4.S}[0], [x7], x2
+        st1             {v4.S}[1], [x7], x2
+        b.ne            1b
+        ret
+2:      sshl            v2.8H,  v2.8H,  v18.8H
+        sqxtun          v2.8B,  v2.8H
+        st1             {v2.S}[0], [x7], x2
+        st1             {v2.S}[1], [x7], x2
+        ret
+.endm
+
+.macro  biweight_func   w
+function ff_biweight_h264_pixels_\w\()_neon, export=1
+        sxtw            x2,  w2
+        lsr             w8,  w5,  #31
+        add             w7,  w7,  #1
+        eor             w8,  w8,  w6,  lsr #30
+        orr             w7,  w7,  #1
+        dup             v18.8H,   w4
+        lsl             w7,  w7,  w4
+        not             v18.16B,  v18.16B
+        dup             v16.8H,   w7
+        mov             x7,  x0
+        cbz             w8,  10f
+        subs            w8,  w8,  #1
+        b.eq            20f
+        subs            w8,  w8,  #1
+        b.eq            30f
+        b               40f
+10:     biweight_\w     umlal, umlal
+20:     neg             w5, w5
+        biweight_\w     umlal, umlsl
+30:     neg             w5, w5
+        neg             w6, w6
+        biweight_\w     umlsl, umlsl
+40:     neg             w6, w6
+        biweight_\w     umlsl, umlal
+endfunc
+.endm
+
+        biweight_func   16
+        biweight_func   8
+        biweight_func   4
+
+.macro  weight_16       add
+        dup             v0.16B,  w4
+1:      subs            w2,  w2,  #2
+        ld1             {v20.16B}, [x0], x1
+        umull           v4.8H,   v0.8B,  v20.8B
+        umull2          v6.8H,   v0.16B, v20.16B
+        ld1             {v28.16B}, [x0], x1
+        umull           v24.8H,  v0.8B,  v28.8B
+        umull2          v26.8H,  v0.16B, v28.16B
+        \add            v4.8H,   v16.8H, v4.8H
+        srshl           v4.8H,   v4.8H,  v18.8H
+        \add            v6.8H,   v16.8H, v6.8H
+        srshl           v6.8H,   v6.8H,  v18.8H
+        sqxtun          v4.8B,   v4.8H
+        sqxtun2         v4.16B,  v6.8H
+        \add            v24.8H,  v16.8H, v24.8H
+        srshl           v24.8H,  v24.8H, v18.8H
+        \add            v26.8H,  v16.8H, v26.8H
+        srshl           v26.8H,  v26.8H, v18.8H
+        sqxtun          v24.8B,  v24.8H
+        sqxtun2         v24.16B, v26.8H
+        st1             {v4.16B},  [x5], x1
+        st1             {v24.16B}, [x5], x1
+        b.ne            1b
+        ret
+.endm
+
+.macro  weight_8        add
+        dup             v0.8B,  w4
+1:      subs            w2,  w2,  #2
+        ld1             {v4.8B}, [x0], x1
+        umull           v2.8H,  v0.8B,  v4.8B
+        ld1             {v6.8B}, [x0], x1
+        umull           v20.8H, v0.8B,  v6.8B
+        \add            v2.8H,  v16.8H,  v2.8H
+        srshl           v2.8H,  v2.8H,  v18.8H
+        sqxtun          v2.8B,  v2.8H
+        \add            v20.8H, v16.8H,  v20.8H
+        srshl           v20.8H, v20.8H, v18.8H
+        sqxtun          v4.8B,  v20.8H
+        st1             {v2.8B}, [x5], x1
+        st1             {v4.8B}, [x5], x1
+        b.ne            1b
+        ret
+.endm
+
+.macro  weight_4        add
+        dup             v0.8B,  w4
+1:      subs            w2,  w2,  #4
+        ld1             {v4.S}[0], [x0], x1
+        ld1             {v4.S}[1], [x0], x1
+        umull           v2.8H,  v0.8B,  v4.8B
+        b.lt            2f
+        ld1             {v6.S}[0], [x0], x1
+        ld1             {v6.S}[1], [x0], x1
+        umull           v20.8H, v0.8B,  v6.8B
+        \add            v2.8H,  v16.8H,  v2.8H
+        srshl           v2.8H,  v2.8H,  v18.8H
+        sqxtun          v2.8B,  v2.8H
+        \add            v20.8H, v16.8H,  v20.8H
+        srshl           v20.8H, v20.8h, v18.8H
+        sqxtun          v4.8B,  v20.8H
+        st1             {v2.S}[0], [x5], x1
+        st1             {v2.S}[1], [x5], x1
+        st1             {v4.S}[0], [x5], x1
+        st1             {v4.S}[1], [x5], x1
+        b.ne            1b
+        ret
+2:      \add            v2.8H,  v16.8H,  v2.8H
+        srshl           v2.8H,  v2.8H,  v18.8H
+        sqxtun          v2.8B,  v2.8H
+        st1             {v2.S}[0], [x5], x1
+        st1             {v2.S}[1], [x5], x1
+        ret
+.endm
+
+.macro  weight_func     w
+function ff_weight_h264_pixels_\w\()_neon, export=1
+        sxtw            x1,  w1
+        cmp             w3,  #1
+        mov             w6,  #1
+        lsl             w5,  w5,  w3
+        dup             v16.8H,  w5
+        mov             x5,  x0
+        b.le            20f
+        sub             w6,  w6,  w3
+        dup             v18.8H,  w6
+        cmp             w4, #0
+        b.lt            10f
+        weight_\w       shadd
+10:     neg             w4,  w4
+        weight_\w       shsub
+20:     neg             w6,  w3
+        dup             v18.8H,  w6
+        cmp             w4,  #0
+        b.lt            10f
+        weight_\w       add
+10:     neg             w4,  w4
+        weight_\w       sub
+endfunc
+.endm
+
+        weight_func     16
+        weight_func     8
+        weight_func     4

omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/aarch64/h264idct_neon.S Added

@@ -0,0 +1,408 @@
+/*
+ * Copyright (c) 2008 Mans Rullgard <mans@mansr.com>
+ * Copyright (c) 2013 Janne Grunau <janne-libav@jannau.net>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "libavutil/aarch64/asm.S"
+#include "neon.S"
+
+function ff_h264_idct_add_neon, export=1
+        ld1             {v0.4H, v1.4H, v2.4H, v3.4H},  [x1]
+        sxtw            x2,     w2
+        movi            v30.8H, #0
+
+        add             v4.4H,  v0.4H,  v2.4H
+        sshr            v16.4H, v1.4H,  #1
+        st1             {v30.8H},    [x1], #16
+        sshr            v17.4H, v3.4H,  #1
+        st1             {v30.8H},    [x1], #16
+        sub             v5.4H,  v0.4H,  v2.4H
+        add             v6.4H,  v1.4H,  v17.4H
+        sub             v7.4H,  v16.4H, v3.4H
+        add             v0.4H,  v4.4H,  v6.4H
+        add             v1.4H,  v5.4H,  v7.4H
+        sub             v2.4H,  v4.4H,  v6.4H
+        sub             v3.4H,  v5.4H,  v7.4H
+
+        transpose_4x4H  v0, v1, v2, v3, v4, v5, v6, v7
+
+        add             v4.4H,  v0.4H,  v3.4H
+        ld1             {v18.S}[0], [x0], x2
+        sshr            v16.4H,  v2.4H,  #1
+        sshr            v17.4H,  v1.4H,  #1
+        ld1             {v19.S}[1], [x0], x2
+        sub             v5.4H,  v0.4H,  v3.4H
+        ld1             {v18.S}[1], [x0], x2
+        add             v6.4H,  v16.4H, v1.4H
+        ins             v4.D[1],  v5.D[0]
+        sub             v7.4H,  v2.4H,  v17.4H
+        ld1             {v19.S}[0], [x0], x2
+        ins             v6.D[1],  v7.D[0]
+        sub             x0,  x0,  x2, lsl #2
+        add             v0.8H,  v4.8H,  v6.8H
+        sub             v1.8H,  v4.8H,  v6.8H
+
+        srshr           v0.8H,  v0.8H,  #6
+        srshr           v1.8H,  v1.8H,  #6
+
+        uaddw           v0.8H,  v0.8H,  v18.8B
+        uaddw           v1.8H,  v1.8H,  v19.8B
+
+        sqxtun          v0.8B, v0.8H
+        sqxtun          v1.8B, v1.8H
+
+        st1             {v0.S}[0],  [x0], x2
+        st1             {v1.S}[1],  [x0], x2
+        st1             {v0.S}[1],  [x0], x2
+        st1             {v1.S}[0],  [x0], x2
+
+        sub             x1,  x1,  #32
+        ret
+endfunc
+
+function ff_h264_idct_dc_add_neon, export=1
+        sxtw            x2,  w2
+        mov             w3,       #0
+        ld1r            {v2.8H},  [x1]
+        strh            w3,       [x1]
+        srshr           v2.8H,  v2.8H,  #6
+        ld1             {v0.S}[0],  [x0], x2
+        ld1             {v0.S}[1],  [x0], x2
+        uaddw           v3.8H,  v2.8H,  v0.8B
+        ld1             {v1.S}[0],  [x0], x2
+        ld1             {v1.S}[1],  [x0], x2
+        uaddw           v4.8H,  v2.8H,  v1.8B
+        sqxtun          v0.8B,  v3.8H
+        sqxtun          v1.8B,  v4.8H
+        sub             x0,  x0,  x2, lsl #2
+        st1             {v0.S}[0],  [x0], x2
+        st1             {v0.S}[1],  [x0], x2
+        st1             {v1.S}[0],  [x0], x2
+        st1             {v1.S}[1],  [x0], x2
+        ret
+endfunc
+
+function ff_h264_idct_add16_neon, export=1
+        mov             x12, x30
+        mov             x6,  x0         // dest
+        mov             x5,  x1         // block_offset
+        mov             x1,  x2         // block
+        mov             w9,  w3         // stride
+        movrel          x7,  scan8
+        mov             x10, #16
+        movrel          x13, X(ff_h264_idct_dc_add_neon)
+        movrel          x14, X(ff_h264_idct_add_neon)
+1:      mov             w2,  w9
+        ldrb            w3,  [x7], #1
+        ldrsw           x0,  [x5], #4
+        ldrb            w3,  [x4,  w3,  uxtw]
+        subs            w3,  w3,  #1
+        b.lt            2f
+        ldrsh           w3,  [x1]
+        add             x0,  x0,  x6
+        ccmp            w3,  #0,  #4,  eq
+        csel            x15, x13, x14, ne
+        blr             x15
+2:      subs            x10, x10, #1
+        add             x1,  x1,  #32
+        b.ne            1b
+        ret             x12
+endfunc
+
+function ff_h264_idct_add16intra_neon, export=1
+        mov             x12, x30
+        mov             x6,  x0         // dest
+        mov             x5,  x1         // block_offset
+        mov             x1,  x2         // block
+        mov             w9,  w3         // stride
+        movrel          x7,  scan8
+        mov             x10, #16
+        movrel          x13, X(ff_h264_idct_dc_add_neon)
+        movrel          x14, X(ff_h264_idct_add_neon)
+1:      mov             w2,  w9
+        ldrb            w3,  [x7], #1
+        ldrsw           x0,  [x5], #4
+        ldrb            w3,  [x4,  w3,  uxtw]
+        add             x0,  x0,  x6
+        cmp             w3,  #0
+        ldrsh           w3,  [x1]
+        csel            x15, x13, x14, eq
+        ccmp            w3,  #0,  #0,  eq
+        b.eq            2f
+        blr             x15
+2:      subs            x10, x10, #1
+        add             x1,  x1,  #32
+        b.ne            1b
+        ret             x12
+endfunc
+
+function ff_h264_idct_add8_neon, export=1
+        sub             sp,  sp, #0x40
+        stp             x19, x20, [sp]
+        mov             x12, x30
+        ldp             x6,  x15, [x0]          // dest[0], dest[1]
+        add             x5,  x1,  #16*4         // block_offset
+        add             x9,  x2,  #16*32        // block
+        mov             w19, w3                 // stride
+        movrel          x13, X(ff_h264_idct_dc_add_neon)
+        movrel          x14, X(ff_h264_idct_add_neon)
+        movrel          x7,  scan8+16
+        mov             x10, #0
+        mov             x11, #16
+1:      mov             w2,  w19
+        ldrb            w3,  [x7, x10]          // scan8[i]
+        ldrsw           x0,  [x5, x10, lsl #2]  // block_offset[i]
+        ldrb            w3,  [x4, w3,  uxtw]    // nnzc[ scan8[i] ]
+        add             x0,  x0,  x6            // block_offset[i] + dst[j-1]
+        add             x1,  x9,  x10, lsl #5   // block + i * 16
+        cmp             w3,  #0
+        ldrsh           w3,  [x1]               // block[i*16]
+        csel            x20, x13, x14, eq
+        ccmp            w3,  #0,  #0,  eq
+        b.eq            2f
+        blr             x20
+2:      add             x10, x10, #1
+        cmp             x10, #4
+        csel            x10, x11, x10, eq     // mov x10, #16
+        csel            x6,  x15, x6,  eq
+        cmp             x10, #20
+        b.lt            1b
+        ldp             x19, x20, [sp]
+        add             sp,  sp,  #0x40
+        ret             x12
+endfunc
+
+.macro  idct8x8_cols    pass
+  .if \pass == 0
+        va      .req    v18
+        vb      .req    v30
+        sshr            v18.8H, v26.8H, #1
+        add             v16.8H, v24.8H, v28.8H
+        ld1             {v30.8H, v31.8H}, [x1]
+        st1             {v19.8H}, [x1],  #16
+        st1             {v19.8H}, [x1],  #16
+        sub             v17.8H,  v24.8H, v28.8H
+        sshr            v19.8H,  v30.8H, #1
+        sub             v18.8H,  v18.8H,  v30.8H
+        add             v19.8H,  v19.8H,  v26.8H
+  .else
+        va      .req    v30
+        vb      .req    v18
+        sshr            v30.8H, v26.8H, #1
+        sshr            v19.8H, v18.8H, #1
+        add             v16.8H, v24.8H, v28.8H
+        sub             v17.8H, v24.8H, v28.8H
+        sub             v30.8H, v30.8H, v18.8H
+        add             v19.8H, v19.8H, v26.8H
+  .endif
+        add             v26.8H, v17.8H, va.8H
+        sub             v28.8H, v17.8H, va.8H
+        add             v24.8H, v16.8H, v19.8H
+        sub             vb.8H,  v16.8H, v19.8H
+        sub             v16.8H, v29.8H, v27.8H
+        add             v17.8H, v31.8H, v25.8H
+        sub             va.8H,  v31.8H, v25.8H
+        add             v19.8H, v29.8H, v27.8H
+        sub             v16.8H, v16.8H, v31.8H
+        sub             v17.8H, v17.8H, v27.8H
+        add             va.8H,  va.8H,  v29.8H
+        add             v19.8H, v19.8H, v25.8H
+        sshr            v25.8H, v25.8H, #1
+        sshr            v27.8H, v27.8H, #1
+        sshr            v29.8H, v29.8H, #1
+        sshr            v31.8H, v31.8H, #1
+        sub             v16.8H, v16.8H, v31.8H
+        sub             v17.8H, v17.8H, v27.8H
+        add             va.8H,  va.8H,  v29.8H
+        add             v19.8H, v19.8H, v25.8H
+        sshr            v25.8H, v16.8H, #2
+        sshr            v27.8H, v17.8H, #2
+        sshr            v29.8H, va.8H,  #2
+        sshr            v31.8H, v19.8H, #2
+        sub             v19.8H, v19.8H, v25.8H
+        sub             va.8H,  v27.8H, va.8H
+        add             v17.8H, v17.8H, v29.8H
+        add             v16.8H, v16.8H, v31.8H
+  .if \pass == 0
+        sub             v31.8H, v24.8H, v19.8H
+        add             v24.8H, v24.8H, v19.8H
+        add             v25.8H, v26.8H, v18.8H
+        sub             v18.8H, v26.8H, v18.8H
+        add             v26.8H, v28.8H, v17.8H
+        add             v27.8H, v30.8H, v16.8H
+        sub             v29.8H, v28.8H, v17.8H
+        sub             v28.8H, v30.8H, v16.8H
+  .else
+        sub             v31.8H, v24.8H, v19.8H
+        add             v24.8H, v24.8H, v19.8H
+        add             v25.8H, v26.8H, v30.8H
+        sub             v30.8H, v26.8H, v30.8H
+        add             v26.8H, v28.8H, v17.8H
+        sub             v29.8H, v28.8H, v17.8H
+        add             v27.8H, v18.8H, v16.8H
+        sub             v28.8H, v18.8H, v16.8H
+  .endif
+        .unreq          va
+        .unreq          vb
+.endm
+
+function ff_h264_idct8_add_neon, export=1
+        movi            v19.8H,   #0
+        ld1             {v24.8H, v25.8H}, [x1]
+        st1             {v19.8H},  [x1],   #16
+        st1             {v19.8H},  [x1],   #16
+        ld1             {v26.8H, v27.8H}, [x1]
+        st1             {v19.8H},  [x1],   #16
+        st1             {v19.8H},  [x1],   #16
+        ld1             {v28.8H, v29.8H}, [x1]
+        st1             {v19.8H},  [x1],   #16
+        st1             {v19.8H},  [x1],   #16
+
+        idct8x8_cols    0
+        transpose_8x8H  v24, v25, v26, v27, v28, v29, v18, v31, v6, v7
+        idct8x8_cols    1
+
+        mov             x3,  x0
+        srshr           v24.8H, v24.8H, #6
+        ld1             {v0.8B},     [x0], x2
+        srshr           v25.8H, v25.8H, #6
+        ld1             {v1.8B},     [x0], x2
+        srshr           v26.8H, v26.8H, #6
+        ld1             {v2.8B},     [x0], x2
+        srshr           v27.8H, v27.8H, #6
+        ld1             {v3.8B},     [x0], x2
+        srshr           v28.8H, v28.8H, #6
+        ld1             {v4.8B},     [x0], x2
+        srshr           v29.8H, v29.8H, #6
+        ld1             {v5.8B},     [x0], x2
+        srshr           v30.8H, v30.8H, #6
+        ld1             {v6.8B},     [x0], x2
+        srshr           v31.8H, v31.8H, #6
+        ld1             {v7.8B},     [x0], x2
+        uaddw           v24.8H, v24.8H, v0.8B
+        uaddw           v25.8H, v25.8H, v1.8B
+        uaddw           v26.8H, v26.8H, v2.8B
+        sqxtun          v0.8B,  v24.8H
+        uaddw           v27.8H, v27.8H, v3.8B
+        sqxtun          v1.8B,  v25.8H
+        uaddw           v28.8H, v28.8H, v4.8B
+        sqxtun          v2.8B,  v26.8H
+        st1             {v0.8B},     [x3], x2
+        uaddw           v29.8H, v29.8H, v5.8B
+        sqxtun          v3.8B,  v27.8H
+        st1             {v1.8B},     [x3], x2
+        uaddw           v30.8H, v30.8H, v6.8B
+        sqxtun          v4.8B,  v28.8H
+        st1             {v2.8B},     [x3], x2
+        uaddw           v31.8H, v31.8H, v7.8B
+        sqxtun          v5.8B,  v29.8H
+        st1             {v3.8B},     [x3], x2
+        sqxtun          v6.8B,  v30.8H
+        sqxtun          v7.8B,  v31.8H
+        st1             {v4.8B},     [x3], x2
+        st1             {v5.8B},     [x3], x2
+        st1             {v6.8B},     [x3], x2
+        st1             {v7.8B},     [x3], x2
+
+        sub             x1,  x1,  #128
+        ret
+endfunc
+
+function ff_h264_idct8_dc_add_neon, export=1
+        mov             w3,       #0
+        sxtw            x2,       w2
+        ld1r            {v31.8H}, [x1]
+        strh            w3,       [x1]
+        ld1             {v0.8B},  [x0], x2
+        srshr           v31.8H, v31.8H, #6
+        ld1             {v1.8B},     [x0], x2
+        ld1             {v2.8B},     [x0], x2
+        uaddw           v24.8H, v31.8H, v0.8B
+        ld1             {v3.8B},     [x0], x2
+        uaddw           v25.8H, v31.8H, v1.8B
+        ld1             {v4.8B},     [x0], x2
+        uaddw           v26.8H, v31.8H, v2.8B
+        ld1             {v5.8B},     [x0], x2
+        uaddw           v27.8H, v31.8H, v3.8B
+        ld1             {v6.8B},     [x0], x2
+        uaddw           v28.8H, v31.8H, v4.8B
+        ld1             {v7.8B},     [x0], x2
+        uaddw           v29.8H, v31.8H, v5.8B
+        uaddw           v30.8H, v31.8H, v6.8B
+        uaddw           v31.8H, v31.8H, v7.8B
+        sqxtun          v0.8B,  v24.8H
+        sqxtun          v1.8B,  v25.8H
+        sqxtun          v2.8B,  v26.8H
+        sqxtun          v3.8B,  v27.8H
+        sub             x0,  x0,  x2, lsl #3
+        st1             {v0.8B},     [x0], x2
+        sqxtun          v4.8B,  v28.8H
+        st1             {v1.8B},     [x0], x2
+        sqxtun          v5.8B,  v29.8H
+        st1             {v2.8B},     [x0], x2
+        sqxtun          v6.8B,  v30.8H
+        st1             {v3.8B},     [x0], x2
+        sqxtun          v7.8B,  v31.8H
+        st1             {v4.8B},     [x0], x2
+        st1             {v5.8B},     [x0], x2
+        st1             {v6.8B},     [x0], x2
+        st1             {v7.8B},     [x0], x2
+        ret
+endfunc
+
+function ff_h264_idct8_add4_neon, export=1
+        mov             x12, x30
+        mov             x6,  x0
+        mov             x5,  x1
+        mov             x1,  x2
+        mov             w2,  w3
+        movrel          x7,  scan8
+        mov             w10, #16
+        movrel          x13, X(ff_h264_idct8_dc_add_neon)
+        movrel          x14, X(ff_h264_idct8_add_neon)
+1:      ldrb            w9,  [x7], #4
+        ldrsw           x0,  [x5], #16
+        ldrb            w9,  [x4, w9, UXTW]
+        subs            w9,  w9,  #1
+        b.lt            2f
+        ldrsh           w11,  [x1]
+        add             x0,  x6,  x0
+        ccmp            w11, #0,  #4,  eq
+        csel            x15, x13, x14, ne
+        blr             x15
+2:      subs            w10, w10, #4
+        add             x1,  x1,  #128
+        b.ne            1b
+        ret             x12
+endfunc
+
+const   scan8
+        .byte           4+ 1*8, 5+ 1*8, 4+ 2*8, 5+ 2*8
+        .byte           6+ 1*8, 7+ 1*8, 6+ 2*8, 7+ 2*8
+        .byte           4+ 3*8, 5+ 3*8, 4+ 4*8, 5+ 4*8
+        .byte           6+ 3*8, 7+ 3*8, 6+ 4*8, 7+ 4*8
+        .byte           4+ 6*8, 5+ 6*8, 4+ 7*8, 5+ 7*8
+        .byte           6+ 6*8, 7+ 6*8, 6+ 7*8, 7+ 7*8
+        .byte           4+ 8*8, 5+ 8*8, 4+ 9*8, 5+ 9*8
+        .byte           6+ 8*8, 7+ 8*8, 6+ 9*8, 7+ 9*8
+        .byte           4+11*8, 5+11*8, 4+12*8, 5+12*8
+        .byte           6+11*8, 7+11*8, 6+12*8, 7+12*8
+        .byte           4+13*8, 5+13*8, 4+14*8, 5+14*8
+        .byte           6+13*8, 7+13*8, 6+14*8, 7+14*8
+endconst

omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/aarch64/h264qpel_init_aarch64.c Added

@@ -0,0 +1,172 @@
+/*
+ * ARM NEON optimised DSP functions
+ * Copyright (c) 2008 Mans Rullgard <mans@mansr.com>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <stdint.h>
+
+#include "config.h"
+#include "libavutil/attributes.h"
+#include "libavutil/cpu.h"
+#include "libavutil/aarch64/cpu.h"
+#include "libavcodec/h264qpel.h"
+
+void ff_put_h264_qpel16_mc00_neon(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
+void ff_put_h264_qpel16_mc10_neon(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
+void ff_put_h264_qpel16_mc20_neon(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
+void ff_put_h264_qpel16_mc30_neon(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
+void ff_put_h264_qpel16_mc01_neon(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
+void ff_put_h264_qpel16_mc11_neon(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
+void ff_put_h264_qpel16_mc21_neon(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
+void ff_put_h264_qpel16_mc31_neon(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
+void ff_put_h264_qpel16_mc02_neon(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
+void ff_put_h264_qpel16_mc12_neon(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
+void ff_put_h264_qpel16_mc22_neon(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
+void ff_put_h264_qpel16_mc32_neon(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
+void ff_put_h264_qpel16_mc03_neon(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
+void ff_put_h264_qpel16_mc13_neon(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
+void ff_put_h264_qpel16_mc23_neon(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
+void ff_put_h264_qpel16_mc33_neon(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
+
+void ff_put_h264_qpel8_mc00_neon(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
+void ff_put_h264_qpel8_mc10_neon(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
+void ff_put_h264_qpel8_mc20_neon(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
+void ff_put_h264_qpel8_mc30_neon(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
+void ff_put_h264_qpel8_mc01_neon(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
+void ff_put_h264_qpel8_mc11_neon(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
+void ff_put_h264_qpel8_mc21_neon(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
+void ff_put_h264_qpel8_mc31_neon(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
+void ff_put_h264_qpel8_mc02_neon(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
+void ff_put_h264_qpel8_mc12_neon(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
+void ff_put_h264_qpel8_mc22_neon(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
+void ff_put_h264_qpel8_mc32_neon(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
+void ff_put_h264_qpel8_mc03_neon(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
+void ff_put_h264_qpel8_mc13_neon(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
+void ff_put_h264_qpel8_mc23_neon(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
+void ff_put_h264_qpel8_mc33_neon(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
+
+void ff_avg_h264_qpel16_mc00_neon(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
+void ff_avg_h264_qpel16_mc10_neon(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
+void ff_avg_h264_qpel16_mc20_neon(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
+void ff_avg_h264_qpel16_mc30_neon(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
+void ff_avg_h264_qpel16_mc01_neon(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
+void ff_avg_h264_qpel16_mc11_neon(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
+void ff_avg_h264_qpel16_mc21_neon(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
+void ff_avg_h264_qpel16_mc31_neon(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
+void ff_avg_h264_qpel16_mc02_neon(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
+void ff_avg_h264_qpel16_mc12_neon(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
+void ff_avg_h264_qpel16_mc22_neon(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
+void ff_avg_h264_qpel16_mc32_neon(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
+void ff_avg_h264_qpel16_mc03_neon(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
+void ff_avg_h264_qpel16_mc13_neon(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
+void ff_avg_h264_qpel16_mc23_neon(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
+void ff_avg_h264_qpel16_mc33_neon(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
+
+void ff_avg_h264_qpel8_mc00_neon(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
+void ff_avg_h264_qpel8_mc10_neon(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
+void ff_avg_h264_qpel8_mc20_neon(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
+void ff_avg_h264_qpel8_mc30_neon(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
+void ff_avg_h264_qpel8_mc01_neon(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
+void ff_avg_h264_qpel8_mc11_neon(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
+void ff_avg_h264_qpel8_mc21_neon(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
+void ff_avg_h264_qpel8_mc31_neon(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
+void ff_avg_h264_qpel8_mc02_neon(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
+void ff_avg_h264_qpel8_mc12_neon(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
+void ff_avg_h264_qpel8_mc22_neon(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
+void ff_avg_h264_qpel8_mc32_neon(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
+void ff_avg_h264_qpel8_mc03_neon(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
+void ff_avg_h264_qpel8_mc13_neon(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
+void ff_avg_h264_qpel8_mc23_neon(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
+void ff_avg_h264_qpel8_mc33_neon(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
+
+av_cold void ff_h264qpel_init_aarch64(H264QpelContext *c, int bit_depth)
+{
+    const int high_bit_depth = bit_depth > 8;
+    int cpu_flags = av_get_cpu_flags();
+
+    if (have_neon(cpu_flags) && !high_bit_depth) {
+        c->put_h264_qpel_pixels_tab[0][ 0] = ff_put_h264_qpel16_mc00_neon;
+        c->put_h264_qpel_pixels_tab[0][ 1] = ff_put_h264_qpel16_mc10_neon;
+        c->put_h264_qpel_pixels_tab[0][ 2] = ff_put_h264_qpel16_mc20_neon;
+        c->put_h264_qpel_pixels_tab[0][ 3] = ff_put_h264_qpel16_mc30_neon;
+        c->put_h264_qpel_pixels_tab[0][ 4] = ff_put_h264_qpel16_mc01_neon;
+        c->put_h264_qpel_pixels_tab[0][ 5] = ff_put_h264_qpel16_mc11_neon;
+        c->put_h264_qpel_pixels_tab[0][ 6] = ff_put_h264_qpel16_mc21_neon;
+        c->put_h264_qpel_pixels_tab[0][ 7] = ff_put_h264_qpel16_mc31_neon;
+        c->put_h264_qpel_pixels_tab[0][ 8] = ff_put_h264_qpel16_mc02_neon;
+        c->put_h264_qpel_pixels_tab[0][ 9] = ff_put_h264_qpel16_mc12_neon;
+        c->put_h264_qpel_pixels_tab[0][10] = ff_put_h264_qpel16_mc22_neon;
+        c->put_h264_qpel_pixels_tab[0][11] = ff_put_h264_qpel16_mc32_neon;
+        c->put_h264_qpel_pixels_tab[0][12] = ff_put_h264_qpel16_mc03_neon;
+        c->put_h264_qpel_pixels_tab[0][13] = ff_put_h264_qpel16_mc13_neon;
+        c->put_h264_qpel_pixels_tab[0][14] = ff_put_h264_qpel16_mc23_neon;
+        c->put_h264_qpel_pixels_tab[0][15] = ff_put_h264_qpel16_mc33_neon;
+
+        c->put_h264_qpel_pixels_tab[1][ 0] = ff_put_h264_qpel8_mc00_neon;
+        c->put_h264_qpel_pixels_tab[1][ 1] = ff_put_h264_qpel8_mc10_neon;
+        c->put_h264_qpel_pixels_tab[1][ 2] = ff_put_h264_qpel8_mc20_neon;
+        c->put_h264_qpel_pixels_tab[1][ 3] = ff_put_h264_qpel8_mc30_neon;
+        c->put_h264_qpel_pixels_tab[1][ 4] = ff_put_h264_qpel8_mc01_neon;
+        c->put_h264_qpel_pixels_tab[1][ 5] = ff_put_h264_qpel8_mc11_neon;
+        c->put_h264_qpel_pixels_tab[1][ 6] = ff_put_h264_qpel8_mc21_neon;
+        c->put_h264_qpel_pixels_tab[1][ 7] = ff_put_h264_qpel8_mc31_neon;
+        c->put_h264_qpel_pixels_tab[1][ 8] = ff_put_h264_qpel8_mc02_neon;
+        c->put_h264_qpel_pixels_tab[1][ 9] = ff_put_h264_qpel8_mc12_neon;
+        c->put_h264_qpel_pixels_tab[1][10] = ff_put_h264_qpel8_mc22_neon;
+        c->put_h264_qpel_pixels_tab[1][11] = ff_put_h264_qpel8_mc32_neon;
+        c->put_h264_qpel_pixels_tab[1][12] = ff_put_h264_qpel8_mc03_neon;
+        c->put_h264_qpel_pixels_tab[1][13] = ff_put_h264_qpel8_mc13_neon;
+        c->put_h264_qpel_pixels_tab[1][14] = ff_put_h264_qpel8_mc23_neon;
+        c->put_h264_qpel_pixels_tab[1][15] = ff_put_h264_qpel8_mc33_neon;
+
+        c->avg_h264_qpel_pixels_tab[0][ 0] = ff_avg_h264_qpel16_mc00_neon;
+        c->avg_h264_qpel_pixels_tab[0][ 1] = ff_avg_h264_qpel16_mc10_neon;
+        c->avg_h264_qpel_pixels_tab[0][ 2] = ff_avg_h264_qpel16_mc20_neon;
+        c->avg_h264_qpel_pixels_tab[0][ 3] = ff_avg_h264_qpel16_mc30_neon;
+        c->avg_h264_qpel_pixels_tab[0][ 4] = ff_avg_h264_qpel16_mc01_neon;
+        c->avg_h264_qpel_pixels_tab[0][ 5] = ff_avg_h264_qpel16_mc11_neon;
+        c->avg_h264_qpel_pixels_tab[0][ 6] = ff_avg_h264_qpel16_mc21_neon;
+        c->avg_h264_qpel_pixels_tab[0][ 7] = ff_avg_h264_qpel16_mc31_neon;
+        c->avg_h264_qpel_pixels_tab[0][ 8] = ff_avg_h264_qpel16_mc02_neon;
+        c->avg_h264_qpel_pixels_tab[0][ 9] = ff_avg_h264_qpel16_mc12_neon;
+        c->avg_h264_qpel_pixels_tab[0][10] = ff_avg_h264_qpel16_mc22_neon;
+        c->avg_h264_qpel_pixels_tab[0][11] = ff_avg_h264_qpel16_mc32_neon;
+        c->avg_h264_qpel_pixels_tab[0][12] = ff_avg_h264_qpel16_mc03_neon;
+        c->avg_h264_qpel_pixels_tab[0][13] = ff_avg_h264_qpel16_mc13_neon;
+        c->avg_h264_qpel_pixels_tab[0][14] = ff_avg_h264_qpel16_mc23_neon;
+        c->avg_h264_qpel_pixels_tab[0][15] = ff_avg_h264_qpel16_mc33_neon;
+
+        c->avg_h264_qpel_pixels_tab[1][ 0] = ff_avg_h264_qpel8_mc00_neon;
+        c->avg_h264_qpel_pixels_tab[1][ 1] = ff_avg_h264_qpel8_mc10_neon;
+        c->avg_h264_qpel_pixels_tab[1][ 2] = ff_avg_h264_qpel8_mc20_neon;
+        c->avg_h264_qpel_pixels_tab[1][ 3] = ff_avg_h264_qpel8_mc30_neon;
+        c->avg_h264_qpel_pixels_tab[1][ 4] = ff_avg_h264_qpel8_mc01_neon;
+        c->avg_h264_qpel_pixels_tab[1][ 5] = ff_avg_h264_qpel8_mc11_neon;
+        c->avg_h264_qpel_pixels_tab[1][ 6] = ff_avg_h264_qpel8_mc21_neon;
+        c->avg_h264_qpel_pixels_tab[1][ 7] = ff_avg_h264_qpel8_mc31_neon;
+        c->avg_h264_qpel_pixels_tab[1][ 8] = ff_avg_h264_qpel8_mc02_neon;
+        c->avg_h264_qpel_pixels_tab[1][ 9] = ff_avg_h264_qpel8_mc12_neon;
+        c->avg_h264_qpel_pixels_tab[1][10] = ff_avg_h264_qpel8_mc22_neon;
+        c->avg_h264_qpel_pixels_tab[1][11] = ff_avg_h264_qpel8_mc32_neon;
+        c->avg_h264_qpel_pixels_tab[1][12] = ff_avg_h264_qpel8_mc03_neon;
+        c->avg_h264_qpel_pixels_tab[1][13] = ff_avg_h264_qpel8_mc13_neon;
+        c->avg_h264_qpel_pixels_tab[1][14] = ff_avg_h264_qpel8_mc23_neon;
+        c->avg_h264_qpel_pixels_tab[1][15] = ff_avg_h264_qpel8_mc33_neon;
+    }
+}

omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/aarch64/h264qpel_neon.S Added

@@ -0,0 +1,934 @@
+/*
+ * Copyright (c) 2008 Mans Rullgard <mans@mansr.com>
+ * Copyright (c) 2013 Janne Grunau <janne-libav@jannau.net>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "libavutil/aarch64/asm.S"
+#include "neon.S"
+
+        /* H.264 qpel MC */
+
+.macro  lowpass_const   r
+        movz            \r, #20, lsl #16
+        movk            \r, #5
+        mov             v6.S[0], \r
+.endm
+
+//trashes v0-v5
+.macro  lowpass_8       r0,  r1,  r2,  r3,  d0,  d1,  narrow=1
+        ext             v2.8B,      \r0\().8B, \r1\().8B, #2
+        ext             v3.8B,      \r0\().8B, \r1\().8B, #3
+        uaddl           v2.8H,      v2.8B,     v3.8B
+        ext             v4.8B,      \r0\().8B, \r1\().8B, #1
+        ext             v5.8B,      \r0\().8B, \r1\().8B, #4
+        uaddl           v4.8H,      v4.8B,     v5.8B
+        ext             v1.8B,      \r0\().8B, \r1\().8B, #5
+        uaddl           \d0\().8H,  \r0\().8B, v1.8B
+        ext             v0.8B,      \r2\().8B, \r3\().8B, #2
+        mla             \d0\().8H,  v2.8H,     v6.H[1]
+        ext             v1.8B,      \r2\().8B, \r3\().8B, #3
+        uaddl           v0.8H,      v0.8B,     v1.8B
+        ext             v1.8B,      \r2\().8B, \r3\().8B, #1
+        mls             \d0\().8H,  v4.8H,     v6.H[0]
+        ext             v3.8B,      \r2\().8B, \r3\().8B, #4
+        uaddl           v1.8H,      v1.8B,     v3.8B
+        ext             v2.8B,      \r2\().8B, \r3\().8B, #5
+        uaddl           \d1\().8H,  \r2\().8B, v2.8B
+        mla             \d1\().8H,  v0.8H,     v6.H[1]
+        mls             \d1\().8H,  v1.8H,     v6.H[0]
+  .if \narrow
+        sqrshrun        \d0\().8B,  \d0\().8H, #5
+        sqrshrun        \d1\().8B,  \d1\().8H, #5
+  .endif
+.endm
+
+//trashes v0-v5, v7, v30-v31
+.macro  lowpass_8H      r0,  r1
+        ext             v0.16B,     \r0\().16B, \r0\().16B, #2
+        ext             v1.16B,     \r0\().16B, \r0\().16B, #3
+        uaddl           v0.8H,      v0.8B,      v1.8B
+        ext             v2.16B,     \r0\().16B, \r0\().16B, #1
+        ext             v3.16B,     \r0\().16B, \r0\().16B, #4
+        uaddl           v2.8H,      v2.8B,      v3.8B
+        ext             v30.16B,    \r0\().16B, \r0\().16B, #5
+        uaddl           \r0\().8H,  \r0\().8B,  v30.8B
+        ext             v4.16B,     \r1\().16B, \r1\().16B, #2
+        mla             \r0\().8H,  v0.8H,      v6.H[1]
+        ext             v5.16B,     \r1\().16B, \r1\().16B, #3
+        uaddl           v4.8H,      v4.8B,      v5.8B
+        ext             v7.16B,     \r1\().16B, \r1\().16B, #1
+        mls             \r0\().8H,  v2.8H,      v6.H[0]
+        ext             v0.16B,     \r1\().16B, \r1\().16B, #4
+        uaddl           v7.8H,      v7.8B,      v0.8B
+        ext             v31.16B,    \r1\().16B, \r1\().16B, #5
+        uaddl           \r1\().8H,  \r1\().8B,  v31.8B
+        mla             \r1\().8H,  v4.8H,      v6.H[1]
+        mls             \r1\().8H,  v7.8H,      v6.H[0]
+.endm
+
+// trashes v2-v5, v30
+.macro  lowpass_8_1     r0,  r1,  d0,  narrow=1
+        ext             v2.8B,     \r0\().8B, \r1\().8B, #2
+        ext             v3.8B,     \r0\().8B, \r1\().8B, #3
+        uaddl           v2.8H,     v2.8B,     v3.8B
+        ext             v4.8B,     \r0\().8B, \r1\().8B, #1
+        ext             v5.8B,     \r0\().8B, \r1\().8B, #4
+        uaddl           v4.8H,     v4.8B,     v5.8B
+        ext             v30.8B,    \r0\().8B, \r1\().8B, #5
+        uaddl           \d0\().8H, \r0\().8B, v30.8B
+        mla             \d0\().8H, v2.8H,     v6.H[1]
+        mls             \d0\().8H, v4.8H,     v6.H[0]
+  .if \narrow
+        sqrshrun        \d0\().8B, \d0\().8H, #5
+  .endif
+.endm
+
+// trashed v0-v7
+.macro  lowpass_8.16    r0,  r1,  r2
+        ext             v1.16B,     \r0\().16B, \r1\().16B, #4
+        ext             v0.16B,     \r0\().16B, \r1\().16B, #6
+        saddl           v5.4S,      v1.4H,      v0.4H
+        ext             v2.16B,     \r0\().16B, \r1\().16B, #2
+        saddl2          v1.4S,      v1.8H,      v0.8H
+        ext             v3.16B,     \r0\().16B, \r1\().16B, #8
+        saddl           v6.4S,      v2.4H,      v3.4H
+        ext             \r1\().16B, \r0\().16B, \r1\().16B, #10
+        saddl2          v2.4S,      v2.8H,      v3.8H
+        saddl           v0.4S,      \r0\().4H,  \r1\().4H
+        saddl2          v4.4S,      \r0\().8H,  \r1\().8H
+
+        shl             v3.4S,  v5.4S,  #4
+        shl             v5.4S,  v5.4S,  #2
+        shl             v7.4S,  v6.4S,  #2
+        add             v5.4S,  v5.4S,  v3.4S
+        add             v6.4S,  v6.4S,  v7.4S
+
+        shl             v3.4S,  v1.4S,  #4
+        shl             v1.4S,  v1.4S,  #2
+        shl             v7.4S,  v2.4S,  #2
+        add             v1.4S,  v1.4S,  v3.4S
+        add             v2.4S,  v2.4S,  v7.4S
+
+        add             v5.4S,  v5.4S,  v0.4S
+        sub             v5.4S,  v5.4S,  v6.4S
+
+        add             v1.4S,  v1.4S,  v4.4S
+        sub             v1.4S,  v1.4S,  v2.4S
+
+        rshrn           v5.4H,  v5.4S,  #10
+        rshrn2          v5.8H,  v1.4S,  #10
+
+        sqxtun          \r2\().8B,  v5.8H
+.endm
+
+function put_h264_qpel16_h_lowpass_neon_packed
+        mov             x4,  x30
+        mov             x12, #16
+        mov             x3,  #8
+        bl              put_h264_qpel8_h_lowpass_neon
+        sub             x1,  x1,  x2, lsl #4
+        add             x1,  x1,  #8
+        mov             x12, #16
+        mov             x30, x4
+        b               put_h264_qpel8_h_lowpass_neon
+endfunc
+
+.macro  h264_qpel_h_lowpass type
+function \type\()_h264_qpel16_h_lowpass_neon
+        mov             x13, x30
+        mov             x12, #16
+        bl              \type\()_h264_qpel8_h_lowpass_neon
+        sub             x0,  x0,  x3, lsl #4
+        sub             x1,  x1,  x2, lsl #4
+        add             x0,  x0,  #8
+        add             x1,  x1,  #8
+        mov             x12, #16
+        mov             x30, x13
+endfunc
+
+function \type\()_h264_qpel8_h_lowpass_neon
+1:      ld1             {v28.8B, v29.8B}, [x1], x2
+        ld1             {v16.8B, v17.8B}, [x1], x2
+        subs            x12, x12, #2
+        lowpass_8       v28, v29, v16, v17, v28, v16
+  .ifc \type,avg
+        ld1             {v2.8B},    [x0], x3
+        urhadd          v28.8B, v28.8B,  v2.8B
+        ld1             {v3.8B},    [x0]
+        urhadd          v16.8B, v16.8B, v3.8B
+        sub             x0,  x0,  x3
+  .endif
+        st1             {v28.8B},    [x0], x3
+        st1             {v16.8B},    [x0], x3
+        b.ne            1b
+        ret
+endfunc
+.endm
+
+        h264_qpel_h_lowpass put
+        h264_qpel_h_lowpass avg
+
+.macro  h264_qpel_h_lowpass_l2 type
+function \type\()_h264_qpel16_h_lowpass_l2_neon
+        mov             x13, x30
+        mov             x12, #16
+        bl              \type\()_h264_qpel8_h_lowpass_l2_neon
+        sub             x0,  x0,  x2, lsl #4
+        sub             x1,  x1,  x2, lsl #4
+        sub             x3,  x3,  x2, lsl #4
+        add             x0,  x0,  #8
+        add             x1,  x1,  #8
+        add             x3,  x3,  #8
+        mov             x12, #16
+        mov             x30, x13
+endfunc
+
+function \type\()_h264_qpel8_h_lowpass_l2_neon
+1:      ld1             {v26.8B, v27.8B}, [x1], x2
+        ld1             {v16.8B, v17.8B}, [x1], x2
+        ld1             {v28.8B},     [x3], x2
+        ld1             {v29.8B},     [x3], x2
+        subs            x12, x12, #2
+        lowpass_8       v26, v27, v16, v17, v26, v27
+        urhadd          v26.8B, v26.8B, v28.8B
+        urhadd          v27.8B, v27.8B, v29.8B
+  .ifc \type,avg
+        ld1             {v2.8B},      [x0], x2
+        urhadd          v26.8B, v26.8B, v2.8B
+        ld1             {v3.8B},      [x0]
+        urhadd          v27.8B, v27.8B, v3.8B
+        sub             x0,  x0,  x2
+  .endif
+        st1             {v26.8B},     [x0], x2
+        st1             {v27.8B},     [x0], x2
+        b.ne            1b
+        ret
+endfunc
+.endm
+
+        h264_qpel_h_lowpass_l2 put
+        h264_qpel_h_lowpass_l2 avg
+
+function put_h264_qpel16_v_lowpass_neon_packed
+        mov             x4,  x30
+        mov             x2,  #8
+        bl              put_h264_qpel8_v_lowpass_neon
+        sub             x1,  x1,  x3, lsl #2
+        bl              put_h264_qpel8_v_lowpass_neon
+        sub             x1,  x1,  x3, lsl #4
+        sub             x1,  x1,  x3, lsl #2
+        add             x1,  x1,  #8
+        bl              put_h264_qpel8_v_lowpass_neon
+        sub             x1,  x1,  x3, lsl #2
+        mov             x30, x4
+        b               put_h264_qpel8_v_lowpass_neon
+endfunc
+
+.macro  h264_qpel_v_lowpass type
+function \type\()_h264_qpel16_v_lowpass_neon
+        mov             x4,  x30
+        bl              \type\()_h264_qpel8_v_lowpass_neon
+        sub             x1,  x1,  x3, lsl #2
+        bl              \type\()_h264_qpel8_v_lowpass_neon
+        sub             x0,  x0,  x2, lsl #4
+        add             x0,  x0,  #8
+        sub             x1,  x1,  x3, lsl #4
+        sub             x1,  x1,  x3, lsl #2
+        add             x1,  x1,  #8
+        bl              \type\()_h264_qpel8_v_lowpass_neon
+        sub             x1,  x1,  x3, lsl #2
+        mov             x30, x4
+endfunc
+
+function \type\()_h264_qpel8_v_lowpass_neon
+        ld1             {v16.8B}, [x1], x3
+        ld1             {v18.8B}, [x1], x3
+        ld1             {v20.8B}, [x1], x3
+        ld1             {v22.8B}, [x1], x3
+        ld1             {v24.8B}, [x1], x3
+        ld1             {v26.8B}, [x1], x3
+        ld1             {v28.8B}, [x1], x3
+        ld1             {v30.8B}, [x1], x3
+        ld1             {v17.8B}, [x1], x3
+        ld1             {v19.8B}, [x1], x3
+        ld1             {v21.8B}, [x1], x3
+        ld1             {v23.8B}, [x1], x3
+        ld1             {v25.8B}, [x1]
+
+        transpose_8x8B  v16, v18, v20, v22, v24, v26, v28, v30, v0,  v1
+        transpose_8x8B  v17, v19, v21, v23, v25, v27, v29, v31, v0,  v1
+        lowpass_8       v16, v17, v18, v19, v16, v17
+        lowpass_8       v20, v21, v22, v23, v18, v19
+        lowpass_8       v24, v25, v26, v27, v20, v21
+        lowpass_8       v28, v29, v30, v31, v22, v23
+        transpose_8x8B  v16, v17, v18, v19, v20, v21, v22, v23, v0,  v1
+
+  .ifc \type,avg
+        ld1             {v24.8B},  [x0], x2
+        urhadd          v16.8B, v16.8B, v24.8B
+        ld1             {v25.8B}, [x0], x2
+        urhadd          v17.8B, v17.8B, v25.8B
+        ld1             {v26.8B}, [x0], x2
+        urhadd          v18.8B, v18.8B, v26.8B
+        ld1             {v27.8B}, [x0], x2
+        urhadd          v19.8B, v19.8B, v27.8B
+        ld1             {v28.8B}, [x0], x2
+        urhadd          v20.8B, v20.8B, v28.8B
+        ld1             {v29.8B}, [x0], x2
+        urhadd          v21.8B, v21.8B, v29.8B
+        ld1             {v30.8B}, [x0], x2
+        urhadd          v22.8B, v22.8B, v30.8B
+        ld1             {v31.8B}, [x0], x2
+        urhadd          v23.8B, v23.8B, v31.8B
+        sub             x0,  x0,  x2,  lsl #3
+  .endif
+
+        st1             {v16.8B}, [x0], x2
+        st1             {v17.8B}, [x0], x2
+        st1             {v18.8B}, [x0], x2
+        st1             {v19.8B}, [x0], x2
+        st1             {v20.8B}, [x0], x2
+        st1             {v21.8B}, [x0], x2
+        st1             {v22.8B}, [x0], x2
+        st1             {v23.8B}, [x0], x2
+
+        ret
+endfunc
+.endm
+
+        h264_qpel_v_lowpass put
+        h264_qpel_v_lowpass avg
+
+.macro  h264_qpel_v_lowpass_l2 type
+function \type\()_h264_qpel16_v_lowpass_l2_neon
+        mov             x4,  x30
+        bl              \type\()_h264_qpel8_v_lowpass_l2_neon
+        sub             x1,  x1,  x3, lsl #2
+        bl              \type\()_h264_qpel8_v_lowpass_l2_neon
+        sub             x0,  x0,  x3, lsl #4
+        sub             x12, x12, x2, lsl #4
+        add             x0,  x0,  #8
+        add             x12, x12, #8
+        sub             x1,  x1,  x3, lsl #4
+        sub             x1,  x1,  x3, lsl #2
+        add             x1,  x1,  #8
+        bl              \type\()_h264_qpel8_v_lowpass_l2_neon
+        sub             x1,  x1,  x3, lsl #2
+        mov             x30, x4
+endfunc
+
+function \type\()_h264_qpel8_v_lowpass_l2_neon
+        ld1             {v16.8B}, [x1], x3
+        ld1             {v18.8B}, [x1], x3
+        ld1             {v20.8B}, [x1], x3
+        ld1             {v22.8B}, [x1], x3
+        ld1             {v24.8B}, [x1], x3
+        ld1             {v26.8B}, [x1], x3
+        ld1             {v28.8B}, [x1], x3
+        ld1             {v30.8B}, [x1], x3
+        ld1             {v17.8B}, [x1], x3
+        ld1             {v19.8B}, [x1], x3
+        ld1             {v21.8B}, [x1], x3
+        ld1             {v23.8B}, [x1], x3
+        ld1             {v25.8B}, [x1]
+
+        transpose_8x8B  v16, v18, v20, v22, v24, v26, v28, v30, v0,  v1
+        transpose_8x8B  v17, v19, v21, v23, v25, v27, v29, v31, v0,  v1
+        lowpass_8       v16, v17, v18, v19, v16, v17
+        lowpass_8       v20, v21, v22, v23, v18, v19
+        lowpass_8       v24, v25, v26, v27, v20, v21
+        lowpass_8       v28, v29, v30, v31, v22, v23
+        transpose_8x8B  v16, v17, v18, v19, v20, v21, v22, v23, v0,  v1
+
+        ld1             {v24.8B},  [x12], x2
+        ld1             {v25.8B},  [x12], x2
+        ld1             {v26.8B},  [x12], x2
+        ld1             {v27.8B},  [x12], x2
+        ld1             {v28.8B},  [x12], x2
+        urhadd          v16.8B, v24.8B, v16.8B
+        urhadd          v17.8B, v25.8B, v17.8B
+        ld1             {v29.8B},  [x12], x2
+        urhadd          v18.8B, v26.8B, v18.8B
+        urhadd          v19.8B, v27.8B, v19.8B
+        ld1             {v30.8B}, [x12], x2
+        urhadd          v20.8B, v28.8B, v20.8B
+        urhadd          v21.8B, v29.8B, v21.8B
+        ld1             {v31.8B}, [x12], x2
+        urhadd          v22.8B, v30.8B, v22.8B
+        urhadd          v23.8B, v31.8B, v23.8B
+
+  .ifc \type,avg
+        ld1             {v24.8B}, [x0], x3
+        urhadd          v16.8B, v16.8B, v24.8B
+        ld1             {v25.8B}, [x0], x3
+        urhadd          v17.8B, v17.8B, v25.8B
+        ld1             {v26.8B}, [x0], x3
+        urhadd          v18.8B, v18.8B, v26.8B
+        ld1             {v27.8B}, [x0], x3
+        urhadd          v19.8B, v19.8B, v27.8B
+        ld1             {v28.8B}, [x0], x3
+        urhadd          v20.8B, v20.8B, v28.8B
+        ld1             {v29.8B}, [x0], x3
+        urhadd          v21.8B, v21.8B, v29.8B
+        ld1             {v30.8B}, [x0], x3
+        urhadd          v22.8B, v22.8B, v30.8B
+        ld1             {v31.8B}, [x0], x3
+        urhadd          v23.8B, v23.8B, v31.8B
+        sub             x0,  x0,  x3,  lsl #3
+  .endif
+
+        st1             {v16.8B}, [x0], x3
+        st1             {v17.8B}, [x0], x3
+        st1             {v18.8B}, [x0], x3
+        st1             {v19.8B}, [x0], x3
+        st1             {v20.8B}, [x0], x3
+        st1             {v21.8B}, [x0], x3
+        st1             {v22.8B}, [x0], x3
+        st1             {v23.8B}, [x0], x3
+
+        ret
+endfunc
+.endm
+
+        h264_qpel_v_lowpass_l2 put
+        h264_qpel_v_lowpass_l2 avg
+
+function put_h264_qpel8_hv_lowpass_neon_top
+        lowpass_const   w12
+        ld1             {v16.8H}, [x1], x3
+        ld1             {v17.8H}, [x1], x3
+        ld1             {v18.8H}, [x1], x3
+        ld1             {v19.8H}, [x1], x3
+        ld1             {v20.8H}, [x1], x3
+        ld1             {v21.8H}, [x1], x3
+        ld1             {v22.8H}, [x1], x3
+        ld1             {v23.8H}, [x1], x3
+        ld1             {v24.8H}, [x1], x3
+        ld1             {v25.8H}, [x1], x3
+        ld1             {v26.8H}, [x1], x3
+        ld1             {v27.8H}, [x1], x3
+        ld1             {v28.8H}, [x1]
+        lowpass_8H      v16, v17
+        lowpass_8H      v18, v19
+        lowpass_8H      v20, v21
+        lowpass_8H      v22, v23
+        lowpass_8H      v24, v25
+        lowpass_8H      v26, v27
+        lowpass_8H      v28, v29
+
+        transpose_8x8H  v16, v17, v18, v19, v20, v21, v22, v23, v0,  v1
+        transpose_8x8H  v24, v25, v26, v27, v28, v29, v30, v31, v0,  v1
+
+        lowpass_8.16    v16, v24, v16
+        lowpass_8.16    v17, v25, v17
+
+        lowpass_8.16    v18, v26, v18
+        lowpass_8.16    v19, v27, v19
+
+        lowpass_8.16    v20, v28, v20
+        lowpass_8.16    v21, v29, v21
+
+        lowpass_8.16    v22, v30, v22
+        lowpass_8.16    v23, v31, v23
+
+        transpose_8x8B v16, v17, v18, v19, v20, v21, v22, v23, v0,  v1
+
+        ret
+endfunc
+
+.macro  h264_qpel8_hv_lowpass type
+function \type\()_h264_qpel8_hv_lowpass_neon
+        mov             x10, x30
+        bl              put_h264_qpel8_hv_lowpass_neon_top
+  .ifc \type,avg
+        ld1             {v0.8B},      [x0], x2
+        urhadd          v16.8B, v16.8B, v0.8B
+        ld1             {v1.8B},      [x0], x2
+        urhadd          v17.8B, v17.8B, v1.8B
+        ld1             {v2.8B},      [x0], x2
+        urhadd          v18.8B, v18.8B, v2.8B
+        ld1             {v3.8B},      [x0], x2
+        urhadd          v19.8B, v19.8B, v3.8B
+        ld1             {v4.8B},      [x0], x2
+        urhadd          v20.8B, v20.8B, v4.8B
+        ld1             {v5.8B},      [x0], x2
+        urhadd          v21.8B, v21.8B, v5.8B
+        ld1             {v6.8B},      [x0], x2
+        urhadd          v22.8B, v22.8B, v6.8B
+        ld1             {v7.8B},      [x0], x2
+        urhadd          v23.8B, v23.8B, v7.8B
+        sub             x0,  x0,  x2,  lsl #3
+  .endif
+
+        st1             {v16.8B},     [x0], x2
+        st1             {v17.8B},     [x0], x2
+        st1             {v18.8B},     [x0], x2
+        st1             {v19.8B},     [x0], x2
+        st1             {v20.8B},     [x0], x2
+        st1             {v21.8B},     [x0], x2
+        st1             {v22.8B},     [x0], x2
+        st1             {v23.8B},     [x0], x2
+
+        ret             x10
+endfunc
+.endm
+
+        h264_qpel8_hv_lowpass put
+        h264_qpel8_hv_lowpass avg
+
+.macro  h264_qpel8_hv_lowpass_l2 type
+function \type\()_h264_qpel8_hv_lowpass_l2_neon
+        mov             x10, x30
+        bl              put_h264_qpel8_hv_lowpass_neon_top
+
+        ld1             {v0.8B, v1.8B},  [x2], #16
+        ld1             {v2.8B, v3.8B},  [x2], #16
+        urhadd          v0.8B,  v0.8B,  v16.8B
+        urhadd          v1.8B,  v1.8B,  v17.8B
+        ld1             {v4.8B, v5.8B},  [x2], #16
+        urhadd          v2.8B,  v2.8B,  v18.8B
+        urhadd          v3.8B,  v3.8B,  v19.8B
+        ld1             {v6.8B, v7.8B},  [x2], #16
+        urhadd          v4.8B,  v4.8B,  v20.8B
+        urhadd          v5.8B,  v5.8B,  v21.8B
+        urhadd          v6.8B,  v6.8B,  v22.8B
+        urhadd          v7.8B,  v7.8B,  v23.8B
+  .ifc \type,avg
+        ld1             {v16.8B},     [x0], x3
+        urhadd          v0.8B,  v0.8B,  v16.8B
+        ld1             {v17.8B},     [x0], x3
+        urhadd          v1.8B,  v1.8B,  v17.8B
+        ld1             {v18.8B},     [x0], x3
+        urhadd          v2.8B,  v2.8B,  v18.8B
+        ld1             {v19.8B},     [x0], x3
+        urhadd          v3.8B,  v3.8B,  v19.8B
+        ld1             {v20.8B},     [x0], x3
+        urhadd          v4.8B,  v4.8B,  v20.8B
+        ld1             {v21.8B},     [x0], x3
+        urhadd          v5.8B,  v5.8B,  v21.8B
+        ld1             {v22.8B},     [x0], x3
+        urhadd          v6.8B,  v6.8B,  v22.8B
+        ld1             {v23.8B},     [x0], x3
+        urhadd          v7.8B,  v7.8B,  v23.8B
+        sub             x0,  x0,  x3,  lsl #3
+  .endif
+        st1             {v0.8B},      [x0], x3
+        st1             {v1.8B},      [x0], x3
+        st1             {v2.8B},      [x0], x3
+        st1             {v3.8B},      [x0], x3
+        st1             {v4.8B},      [x0], x3
+        st1             {v5.8B},      [x0], x3
+        st1             {v6.8B},      [x0], x3
+        st1             {v7.8B},      [x0], x3
+
+        ret             x10
+endfunc
+.endm
+
+        h264_qpel8_hv_lowpass_l2 put
+        h264_qpel8_hv_lowpass_l2 avg
+
+.macro  h264_qpel16_hv  type
+function \type\()_h264_qpel16_hv_lowpass_neon
+        mov             x13, x30
+        bl              \type\()_h264_qpel8_hv_lowpass_neon
+        sub             x1,  x1,  x3, lsl #2
+        bl              \type\()_h264_qpel8_hv_lowpass_neon
+        sub             x1,  x1,  x3, lsl #4
+        sub             x1,  x1,  x3, lsl #2
+        add             x1,  x1,  #8
+        sub             x0,  x0,  x2, lsl #4
+        add             x0,  x0,  #8
+        bl              \type\()_h264_qpel8_hv_lowpass_neon
+        sub             x1,  x1,  x3, lsl #2
+        mov             x30, x13
+        b               \type\()_h264_qpel8_hv_lowpass_neon
+endfunc
+
+function \type\()_h264_qpel16_hv_lowpass_l2_neon
+        mov             x13, x30
+        sub             x2,  x4,  #256
+        bl              \type\()_h264_qpel8_hv_lowpass_l2_neon
+        sub             x1,  x1,  x3, lsl #2
+        bl              \type\()_h264_qpel8_hv_lowpass_l2_neon
+        sub             x1,  x1,  x3, lsl #4
+        sub             x1,  x1,  x3, lsl #2
+        add             x1,  x1,  #8
+        sub             x0,  x0,  x3, lsl #4
+        add             x0,  x0,  #8
+        bl              \type\()_h264_qpel8_hv_lowpass_l2_neon
+        sub             x1,  x1,  x3, lsl #2
+        mov             x30, x13
+        b               \type\()_h264_qpel8_hv_lowpass_l2_neon
+endfunc
+.endm
+
+        h264_qpel16_hv put
+        h264_qpel16_hv avg
+
+.macro  h264_qpel8      type
+function ff_\type\()_h264_qpel8_mc10_neon, export=1
+        lowpass_const   w3
+        mov             x3,  x1
+        sub             x1,  x1,  #2
+        mov             x12, #8
+        b               \type\()_h264_qpel8_h_lowpass_l2_neon
+endfunc
+
+function ff_\type\()_h264_qpel8_mc20_neon, export=1
+        lowpass_const   w3
+        sub             x1,  x1,  #2
+        mov             x3,  x2
+        mov             x12, #8
+        b               \type\()_h264_qpel8_h_lowpass_neon
+endfunc
+
+function ff_\type\()_h264_qpel8_mc30_neon, export=1
+        lowpass_const   w3
+        add             x3,  x1,  #1
+        sub             x1,  x1,  #2
+        mov             x12, #8
+        b               \type\()_h264_qpel8_h_lowpass_l2_neon
+endfunc
+
+function ff_\type\()_h264_qpel8_mc01_neon, export=1
+        mov             x14, x30
+        mov             x12, x1
+\type\()_h264_qpel8_mc01:
+        lowpass_const   w3
+        mov             x3,  x2
+        sub             x1,  x1,  x2, lsl #1
+        bl              \type\()_h264_qpel8_v_lowpass_l2_neon
+        ret             x14
+endfunc
+
+function ff_\type\()_h264_qpel8_mc11_neon, export=1
+        mov             x14, x30
+        mov             x8,  x0
+        mov             x9,  x1
+\type\()_h264_qpel8_mc11:
+        lowpass_const   w3
+        mov             x11, sp
+        sub             sp,  sp,  #64
+        mov             x0,  sp
+        sub             x1,  x1,  #2
+        mov             x3,  #8
+        mov             x12, #8
+        bl              put_h264_qpel8_h_lowpass_neon
+        mov             x0,  x8
+        mov             x3,  x2
+        mov             x12, sp
+        sub             x1,  x9,  x2, lsl #1
+        mov             x2,  #8
+        bl              \type\()_h264_qpel8_v_lowpass_l2_neon
+        mov             sp,  x11
+        ret             x14
+endfunc
+
+function ff_\type\()_h264_qpel8_mc21_neon, export=1
+        mov             x14, x30
+        mov             x8,  x0
+        mov             x9,  x1
+\type\()_h264_qpel8_mc21:
+        lowpass_const   w3
+        mov             x11, sp
+        sub             sp,  sp,  #(8*8+16*12)
+        sub             x1,  x1,  #2
+        mov             x3,  #8
+        mov             x0,  sp
+        mov             x12, #8
+        bl              put_h264_qpel8_h_lowpass_neon
+        mov             x4,  x0
+        mov             x0,  x8
+        sub             x1,  x9,  x2, lsl #1
+        sub             x1,  x1,  #2
+        mov             x3,  x2
+        sub             x2,  x4,  #64
+        bl              \type\()_h264_qpel8_hv_lowpass_l2_neon
+        mov             sp,  x11
+        ret             x14
+endfunc
+
+function ff_\type\()_h264_qpel8_mc31_neon, export=1
+        add             x1,  x1,  #1
+        mov             x14, x30
+        mov             x8,  x0
+        mov             x9,  x1
+        sub             x1,  x1,  #1
+        b               \type\()_h264_qpel8_mc11
+endfunc
+
+function ff_\type\()_h264_qpel8_mc02_neon, export=1
+        mov             x14, x30
+        lowpass_const   w3
+        sub             x1,  x1,  x2, lsl #1
+        mov             x3,  x2
+        bl              \type\()_h264_qpel8_v_lowpass_neon
+        ret             x14
+endfunc
+
+function ff_\type\()_h264_qpel8_mc12_neon, export=1
+        mov             x14, x30
+        mov             x8,  x0
+        mov             x9,  x1
+\type\()_h264_qpel8_mc12:
+        lowpass_const   w3
+        mov             x11, sp
+        sub             sp,  sp,  #(8*8+16*12)
+        sub             x1,  x1,  x2, lsl #1
+        mov             x3,  x2
+        mov             x2,  #8
+        mov             x0,  sp
+        bl              put_h264_qpel8_v_lowpass_neon
+        mov             x4,  x0
+        mov             x0,  x8
+        sub             x1,  x9,  x3, lsl #1
+        sub             x1,  x1,  #2
+        sub             x2,  x4,  #64
+        bl              \type\()_h264_qpel8_hv_lowpass_l2_neon
+        mov             sp,  x11
+        ret             x14
+endfunc
+
+function ff_\type\()_h264_qpel8_mc22_neon, export=1
+        mov             x14, x30
+        mov             x11, sp
+        sub             x1,  x1,  x2, lsl #1
+        sub             x1,  x1,  #2
+        mov             x3,  x2
+        bl              \type\()_h264_qpel8_hv_lowpass_neon
+        mov             sp,  x11
+        ret             x14
+endfunc
+
+function ff_\type\()_h264_qpel8_mc32_neon, export=1
+        mov             x14, x30
+        mov             x8,  x0
+        mov             x9,  x1
+        add             x1,  x1,  #1
+        b               \type\()_h264_qpel8_mc12
+endfunc
+
+function ff_\type\()_h264_qpel8_mc03_neon, export=1
+        mov             x14, x30
+        add             x12, x1,  x2
+        b               \type\()_h264_qpel8_mc01
+endfunc
+
+function ff_\type\()_h264_qpel8_mc13_neon, export=1
+        mov             x14, x30
+        mov             x8,  x0
+        mov             x9,  x1
+        add             x1,  x1,  x2
+        b               \type\()_h264_qpel8_mc11
+endfunc
+
+function ff_\type\()_h264_qpel8_mc23_neon, export=1
+        mov             x14, x30
+        mov             x8,  x0
+        mov             x9,  x1
+        add             x1,  x1,  x2
+        b               \type\()_h264_qpel8_mc21
+endfunc
+
+function ff_\type\()_h264_qpel8_mc33_neon, export=1
+        add             x1,  x1,  #1
+        mov             x14, x30
+        mov             x8,  x0
+        mov             x9,  x1
+        add             x1,  x1,  x2
+        sub             x1,  x1,  #1
+        b               \type\()_h264_qpel8_mc11
+endfunc
+.endm
+
+        h264_qpel8 put
+        h264_qpel8 avg
+
+.macro  h264_qpel16     type
+function ff_\type\()_h264_qpel16_mc10_neon, export=1
+        lowpass_const   w3
+        mov             x3,  x1
+        sub             x1,  x1,  #2
+        b               \type\()_h264_qpel16_h_lowpass_l2_neon
+endfunc
+
+function ff_\type\()_h264_qpel16_mc20_neon, export=1
+        lowpass_const   w3
+        sub             x1,  x1,  #2
+        mov             x3,  x2
+        b               \type\()_h264_qpel16_h_lowpass_neon
+endfunc
+
+function ff_\type\()_h264_qpel16_mc30_neon, export=1
+        lowpass_const   w3
+        add             x3,  x1,  #1
+        sub             x1,  x1,  #2
+        b               \type\()_h264_qpel16_h_lowpass_l2_neon
+endfunc
+
+function ff_\type\()_h264_qpel16_mc01_neon, export=1
+        mov             x14, x30
+        mov             x12, x1
+\type\()_h264_qpel16_mc01:
+        lowpass_const   w3
+        mov             x3,  x2
+        sub             x1,  x1,  x2, lsl #1
+        bl              \type\()_h264_qpel16_v_lowpass_l2_neon
+        ret             x14
+endfunc
+
+function ff_\type\()_h264_qpel16_mc11_neon, export=1
+        mov             x14, x30
+        mov             x8,  x0
+        mov             x9,  x1
+\type\()_h264_qpel16_mc11:
+        lowpass_const   w3
+        mov             x11, sp
+        sub             sp,  sp,  #256
+        mov             x0,  sp
+        sub             x1,  x1,  #2
+        mov             x3,  #16
+        bl              put_h264_qpel16_h_lowpass_neon
+        mov             x0,  x8
+        mov             x3,  x2
+        mov             x12, sp
+        sub             x1,  x9,  x2, lsl #1
+        mov             x2,  #16
+        bl              \type\()_h264_qpel16_v_lowpass_l2_neon
+        mov             sp,  x11
+        ret             x14
+endfunc
+
+function ff_\type\()_h264_qpel16_mc21_neon, export=1
+        mov             x14, x30
+        mov             x8,  x0
+        mov             x9,  x1
+\type\()_h264_qpel16_mc21:
+        lowpass_const   w3
+        mov             x11, sp
+        sub             sp,  sp,  #(16*16+16*12)
+        sub             x1,  x1,  #2
+        mov             x0,  sp
+        bl              put_h264_qpel16_h_lowpass_neon_packed
+        mov             x4,  x0
+        mov             x0,  x8
+        sub             x1,  x9,  x2, lsl #1
+        sub             x1,  x1,  #2
+        mov             x3,  x2
+        bl              \type\()_h264_qpel16_hv_lowpass_l2_neon
+        mov             sp,  x11
+        ret             x14
+endfunc
+
+function ff_\type\()_h264_qpel16_mc31_neon, export=1
+        add             x1,  x1,  #1
+        mov             x14, x30
+        mov             x8,  x0
+        mov             x9,  x1
+        sub             x1,  x1,  #1
+        b               \type\()_h264_qpel16_mc11
+endfunc
+
+function ff_\type\()_h264_qpel16_mc02_neon, export=1
+        mov             x14, x30
+        lowpass_const   w3
+        sub             x1,  x1,  x2, lsl #1
+        mov             x3,  x2
+        bl              \type\()_h264_qpel16_v_lowpass_neon
+        ret             x14
+endfunc
+
+function ff_\type\()_h264_qpel16_mc12_neon, export=1
+        mov             x14, x30
+        mov             x8,  x0
+        mov             x9,  x1
+\type\()_h264_qpel16_mc12:
+        lowpass_const   w3
+        mov             x11, sp
+        sub             sp,  sp,  #(16*16+16*12)
+        sub             x1,  x1,  x2, lsl #1
+        mov             x0,  sp
+        mov             x3,  x2
+        bl              put_h264_qpel16_v_lowpass_neon_packed
+        mov             x4,  x0
+        mov             x0,  x8
+        sub             x1,  x9,  x3, lsl #1
+        sub             x1,  x1,  #2
+        mov             x2,  x3
+        bl              \type\()_h264_qpel16_hv_lowpass_l2_neon
+        mov             sp,  x11
+        ret             x14
+endfunc
+
+function ff_\type\()_h264_qpel16_mc22_neon, export=1
+        mov             x14, x30
+        lowpass_const   w3
+        mov             x11, sp
+        sub             x1,  x1,  x2, lsl #1
+        sub             x1,  x1,  #2
+        mov             x3,  x2
+        bl              \type\()_h264_qpel16_hv_lowpass_neon
+        mov             sp,  x11 // restore stack
+        ret             x14
+endfunc
+
+function ff_\type\()_h264_qpel16_mc32_neon, export=1
+        mov             x14, x30
+        mov             x8,  x0
+        mov             x9,  x1
+        add             x1,  x1,  #1
+        b               \type\()_h264_qpel16_mc12
+endfunc
+
+function ff_\type\()_h264_qpel16_mc03_neon, export=1
+        mov             x14, x30
+        add             x12, x1,  x2
+        b               \type\()_h264_qpel16_mc01
+endfunc
+
+function ff_\type\()_h264_qpel16_mc13_neon, export=1
+        mov             x14, x30
+        mov             x8,  x0
+        mov             x9,  x1
+        add             x1,  x1,  x2
+        b               \type\()_h264_qpel16_mc11
+endfunc
+
+function ff_\type\()_h264_qpel16_mc23_neon, export=1
+        mov             x14, x30
+        mov             x8,  x0
+        mov             x9,  x1
+        add             x1,  x1,  x2
+        b               \type\()_h264_qpel16_mc21
+endfunc
+
+function ff_\type\()_h264_qpel16_mc33_neon, export=1
+        add             x1,  x1,  #1
+        mov             x14, x30
+        mov             x8,  x0
+        mov             x9,  x1
+        add             x1,  x1,  x2
+        sub             x1,  x1,  #1
+        b               \type\()_h264_qpel16_mc11
+endfunc
+.endm
+
+        h264_qpel16 put
+        h264_qpel16 avg

omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/aarch64/hpeldsp_init_aarch64.c Added

@@ -0,0 +1,123 @@
+/*
+ * ARM NEON optimised DSP functions
+ * Copyright (c) 2008 Mans Rullgard <mans@mansr.com>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <stddef.h>
+#include <stdint.h>
+
+#include "config.h"
+
+#include "libavutil/attributes.h"
+#include "libavutil/cpu.h"
+#include "libavutil/aarch64/cpu.h"
+#include "libavcodec/hpeldsp.h"
+
+void     ff_put_pixels16_neon(uint8_t *block, const uint8_t *pixels,
+                              ptrdiff_t line_size, int h);
+void  ff_put_pixels16_x2_neon(uint8_t *block, const uint8_t *pixels,
+                              ptrdiff_t line_size, int h);
+void  ff_put_pixels16_y2_neon(uint8_t *block, const uint8_t *pixels,
+                              ptrdiff_t line_size, int h);
+void ff_put_pixels16_xy2_neon(uint8_t *block, const uint8_t *pixels,
+                              ptrdiff_t line_size, int h);
+void      ff_put_pixels8_neon(uint8_t *block, const uint8_t *pixels,
+                              ptrdiff_t line_size, int h);
+void   ff_put_pixels8_x2_neon(uint8_t *block, const uint8_t *pixels,
+                              ptrdiff_t line_size, int h);
+void   ff_put_pixels8_y2_neon(uint8_t *block, const uint8_t *pixels,
+                              ptrdiff_t line_size, int h);
+void  ff_put_pixels8_xy2_neon(uint8_t *block, const uint8_t *pixels,
+                              ptrdiff_t line_size, int h);
+
+void  ff_put_pixels16_x2_no_rnd_neon(uint8_t *block, const uint8_t *pixels,
+                                     ptrdiff_t line_size, int h);
+void  ff_put_pixels16_y2_no_rnd_neon(uint8_t *block, const uint8_t *pixels,
+                                     ptrdiff_t line_size, int h);
+void ff_put_pixels16_xy2_no_rnd_neon(uint8_t *block, const uint8_t *pixels,
+                                     ptrdiff_t line_size, int h);
+void   ff_put_pixels8_x2_no_rnd_neon(uint8_t *block, const uint8_t *pixels,
+                                     ptrdiff_t line_size, int h);
+void   ff_put_pixels8_y2_no_rnd_neon(uint8_t *block, const uint8_t *pixels,
+                                     ptrdiff_t line_size, int h);
+void  ff_put_pixels8_xy2_no_rnd_neon(uint8_t *block, const uint8_t *pixels,
+                                     ptrdiff_t line_size, int h);
+
+void     ff_avg_pixels16_neon(uint8_t *block, const uint8_t *pixels,
+                              ptrdiff_t line_size, int h);
+void  ff_avg_pixels16_x2_neon(uint8_t *block, const uint8_t *pixels,
+                              ptrdiff_t line_size, int h);
+void  ff_avg_pixels16_y2_neon(uint8_t *block, const uint8_t *pixels,
+                              ptrdiff_t line_size, int h);
+void ff_avg_pixels16_xy2_neon(uint8_t *block, const uint8_t *pixels,
+                              ptrdiff_t line_size, int h);
+void      ff_avg_pixels8_neon(uint8_t *block, const uint8_t *pixels,
+                              ptrdiff_t line_size, int h);
+void   ff_avg_pixels8_x2_neon(uint8_t *block, const uint8_t *pixels,
+                              ptrdiff_t line_size, int h);
+void   ff_avg_pixels8_y2_neon(uint8_t *block, const uint8_t *pixels,
+                              ptrdiff_t line_size, int h);
+void  ff_avg_pixels8_xy2_neon(uint8_t *block, const uint8_t *pixels,
+                              ptrdiff_t line_size, int h);
+
+void  ff_avg_pixels16_x2_no_rnd_neon(uint8_t *block, const uint8_t *pixels,
+                                     ptrdiff_t line_size, int h);
+void  ff_avg_pixels16_y2_no_rnd_neon(uint8_t *block, const uint8_t *pixels,
+                                     ptrdiff_t line_size, int h);
+void ff_avg_pixels16_xy2_no_rnd_neon(uint8_t *block, const uint8_t *pixels,
+                                     ptrdiff_t line_size, int h);
+
+av_cold void ff_hpeldsp_init_aarch64(HpelDSPContext *c, int flags)
+{
+    int cpu_flags = av_get_cpu_flags();
+
+    if (have_neon(cpu_flags)) {
+        c->put_pixels_tab[0][0] = ff_put_pixels16_neon;
+        c->put_pixels_tab[0][1] = ff_put_pixels16_x2_neon;
+        c->put_pixels_tab[0][2] = ff_put_pixels16_y2_neon;
+        c->put_pixels_tab[0][3] = ff_put_pixels16_xy2_neon;
+        c->put_pixels_tab[1][0] = ff_put_pixels8_neon;
+        c->put_pixels_tab[1][1] = ff_put_pixels8_x2_neon;
+        c->put_pixels_tab[1][2] = ff_put_pixels8_y2_neon;
+        c->put_pixels_tab[1][3] = ff_put_pixels8_xy2_neon;
+
+        c->put_no_rnd_pixels_tab[0][0] = ff_put_pixels16_neon;
+        c->put_no_rnd_pixels_tab[0][1] = ff_put_pixels16_x2_no_rnd_neon;
+        c->put_no_rnd_pixels_tab[0][2] = ff_put_pixels16_y2_no_rnd_neon;
+        c->put_no_rnd_pixels_tab[0][3] = ff_put_pixels16_xy2_no_rnd_neon;
+        c->put_no_rnd_pixels_tab[1][0] = ff_put_pixels8_neon;
+        c->put_no_rnd_pixels_tab[1][1] = ff_put_pixels8_x2_no_rnd_neon;
+        c->put_no_rnd_pixels_tab[1][2] = ff_put_pixels8_y2_no_rnd_neon;
+        c->put_no_rnd_pixels_tab[1][3] = ff_put_pixels8_xy2_no_rnd_neon;
+
+        c->avg_pixels_tab[0][0] = ff_avg_pixels16_neon;
+        c->avg_pixels_tab[0][1] = ff_avg_pixels16_x2_neon;
+        c->avg_pixels_tab[0][2] = ff_avg_pixels16_y2_neon;
+        c->avg_pixels_tab[0][3] = ff_avg_pixels16_xy2_neon;
+        c->avg_pixels_tab[1][0] = ff_avg_pixels8_neon;
+        c->avg_pixels_tab[1][1] = ff_avg_pixels8_x2_neon;
+        c->avg_pixels_tab[1][2] = ff_avg_pixels8_y2_neon;
+        c->avg_pixels_tab[1][3] = ff_avg_pixels8_xy2_neon;
+
+        c->avg_no_rnd_pixels_tab[0] = ff_avg_pixels16_neon;
+        c->avg_no_rnd_pixels_tab[1] = ff_avg_pixels16_x2_no_rnd_neon;
+        c->avg_no_rnd_pixels_tab[2] = ff_avg_pixels16_y2_no_rnd_neon;
+        c->avg_no_rnd_pixels_tab[3] = ff_avg_pixels16_xy2_no_rnd_neon;
+    }
+}

omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/aarch64/hpeldsp_neon.S Added

@@ -0,0 +1,397 @@
+/*
+ * ARM NEON optimised DSP functions
+ * Copyright (c) 2008 Mans Rullgard <mans@mansr.com>
+ * Copyright (c) 2013 Janne Grunau <janne-libav@jannau.net>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "libavutil/aarch64/asm.S"
+
+.macro  pixels16        rnd=1, avg=0
+  .if \avg
+        mov             x12, x0
+  .endif
+1:      ld1             {v0.16B},  [x1], x2
+        ld1             {v1.16B},  [x1], x2
+        ld1             {v2.16B},  [x1], x2
+        ld1             {v3.16B},  [x1], x2
+  .if \avg
+        ld1             {v4.16B},  [x12], x2
+        urhadd          v0.16B,  v0.16B,  v4.16B
+        ld1             {v5.16B},  [x12], x2
+        urhadd          v1.16B,  v1.16B,  v5.16B
+        ld1             {v6.16B},  [x12], x2
+        urhadd          v2.16B,  v2.16B,  v6.16B
+        ld1             {v7.16B},  [x12], x2
+        urhadd          v3.16B,  v3.16B,  v7.16B
+  .endif
+        subs            w3,  w3,  #4
+        st1             {v0.16B},  [x0], x2
+        st1             {v1.16B},  [x0], x2
+        st1             {v2.16B},  [x0], x2
+        st1             {v3.16B},  [x0], x2
+        b.ne            1b
+        ret
+.endm
+
+.macro  pixels16_x2     rnd=1, avg=0
+1:      ld1             {v0.16B, v1.16B}, [x1], x2
+        ld1             {v2.16B, v3.16B}, [x1], x2
+        subs            w3,  w3,  #2
+        ext             v1.16B,  v0.16B,  v1.16B,  #1
+        avg             v0.16B,  v0.16B,  v1.16B
+        ext             v3.16B,  v2.16B,  v3.16B,  #1
+        avg             v2.16B,  v2.16B,  v3.16B
+  .if \avg
+        ld1             {v1.16B}, [x0], x2
+        ld1             {v3.16B}, [x0]
+        urhadd          v0.16B,  v0.16B,  v1.16B
+        urhadd          v2.16B,  v2.16B,  v3.16B
+        sub             x0,  x0,  x2
+  .endif
+        st1             {v0.16B}, [x0], x2
+        st1             {v2.16B}, [x0], x2
+        b.ne            1b
+        ret
+.endm
+
+.macro  pixels16_y2     rnd=1, avg=0
+        sub             w3,  w3,  #2
+        ld1             {v0.16B}, [x1], x2
+        ld1             {v1.16B}, [x1], x2
+1:      subs            w3,  w3,  #2
+        avg             v2.16B,  v0.16B,  v1.16B
+        ld1             {v0.16B}, [x1], x2
+        avg             v3.16B,  v0.16B,  v1.16B
+        ld1             {v1.16B}, [x1], x2
+  .if \avg
+        ld1             {v4.16B}, [x0], x2
+        ld1             {v5.16B}, [x0]
+        urhadd          v2.16B,  v2.16B,  v4.16B
+        urhadd          v3.16B,  v3.16B,  v5.16B
+        sub             x0,  x0,  x2
+  .endif
+        st1             {v2.16B}, [x0], x2
+        st1             {v3.16B}, [x0], x2
+        b.ne            1b
+
+        avg             v2.16B,  v0.16B,  v1.16B
+        ld1             {v0.16B}, [x1], x2
+        avg             v3.16B,  v0.16B,  v1.16B
+  .if \avg
+        ld1             {v4.16B}, [x0], x2
+        ld1             {v5.16B}, [x0]
+        urhadd          v2.16B,  v2.16B,  v4.16B
+        urhadd          v3.16B,  v3.16B,  v5.16B
+        sub             x0,  x0,  x2
+  .endif
+        st1             {v2.16B},     [x0], x2
+        st1             {v3.16B},     [x0], x2
+
+        ret
+.endm
+
+.macro  pixels16_xy2    rnd=1, avg=0
+        sub             w3,  w3,  #2
+        ld1             {v0.16B, v1.16B}, [x1], x2
+        ld1             {v4.16B, v5.16B}, [x1], x2
+NRND    movi            v26.8H, #1
+        ext             v1.16B,  v0.16B,  v1.16B,  #1
+        ext             v5.16B,  v4.16B,  v5.16B,  #1
+        uaddl           v16.8H,  v0.8B,   v1.8B
+        uaddl2          v20.8H,  v0.16B,  v1.16B
+        uaddl           v18.8H,  v4.8B,   v5.8B
+        uaddl2          v22.8H,  v4.16B,  v5.16B
+1:      subs            w3,  w3,  #2
+        ld1             {v0.16B, v1.16B}, [x1], x2
+        add             v24.8H,  v16.8H,  v18.8H
+NRND    add             v24.8H,  v24.8H,  v26.8H
+        ext             v30.16B, v0.16B,  v1.16B,  #1
+        add             v1.8H,   v20.8H,  v22.8H
+        mshrn           v28.8B,  v24.8H,  #2
+NRND    add             v1.8H,   v1.8H,   v26.8H
+        mshrn2          v28.16B, v1.8H,   #2
+  .if \avg
+        ld1             {v16.16B},        [x0]
+        urhadd          v28.16B, v28.16B, v16.16B
+  .endif
+        uaddl           v16.8H,  v0.8B,   v30.8B
+        ld1             {v2.16B, v3.16B}, [x1], x2
+        uaddl2          v20.8H,  v0.16B,  v30.16B
+        st1             {v28.16B},        [x0], x2
+        add             v24.8H,  v16.8H,  v18.8H
+NRND    add             v24.8H,  v24.8H,  v26.8H
+        ext             v3.16B,  v2.16B,  v3.16B,  #1
+        add             v0.8H,   v20.8H,  v22.8H
+        mshrn           v30.8B,  v24.8H,  #2
+NRND    add             v0.8H,   v0.8H,   v26.8H
+        mshrn2          v30.16B, v0.8H,   #2
+  .if \avg
+        ld1             {v18.16B},        [x0]
+        urhadd          v30.16B, v30.16B, v18.16B
+  .endif
+        uaddl           v18.8H,   v2.8B,  v3.8B
+        uaddl2          v22.8H,   v2.16B, v3.16B
+        st1             {v30.16B},        [x0], x2
+        b.gt            1b
+
+        ld1             {v0.16B, v1.16B}, [x1], x2
+        add             v24.8H,  v16.8H,  v18.8H
+NRND    add             v24.8H,  v24.8H,  v26.8H
+        ext             v30.16B, v0.16B,  v1.16B,  #1
+        add             v1.8H,   v20.8H,  v22.8H
+        mshrn           v28.8B,  v24.8H,  #2
+NRND    add             v1.8H,   v1.8H,   v26.8H
+        mshrn2          v28.16B, v1.8H,   #2
+  .if \avg
+        ld1             {v16.16B},        [x0]
+        urhadd          v28.16B, v28.16B, v16.16B
+  .endif
+        uaddl           v16.8H,  v0.8B,   v30.8B
+        uaddl2          v20.8H,  v0.16B,  v30.16B
+        st1             {v28.16B},        [x0], x2
+        add             v24.8H,  v16.8H,  v18.8H
+NRND    add             v24.8H,  v24.8H,  v26.8H
+        add             v0.8H,   v20.8H,  v22.8H
+        mshrn           v30.8B,  v24.8H,  #2
+NRND    add             v0.8H,   v0.8H,   v26.8H
+        mshrn2          v30.16B, v0.8H,   #2
+  .if \avg
+        ld1             {v18.16B},        [x0]
+        urhadd          v30.16B, v30.16B, v18.16B
+  .endif
+        st1             {v30.16B},        [x0], x2
+
+        ret
+.endm
+
+.macro  pixels8         rnd=1, avg=0
+1:      ld1             {v0.8B}, [x1], x2
+        ld1             {v1.8B}, [x1], x2
+        ld1             {v2.8B}, [x1], x2
+        ld1             {v3.8B}, [x1], x2
+  .if \avg
+        ld1             {v4.8B}, [x0], x2
+        urhadd          v0.8B,  v0.8B,  v4.8B
+        ld1             {v5.8B}, [x0], x2
+        urhadd          v1.8B,  v1.8B,  v5.8B
+        ld1             {v6.8B}, [x0], x2
+        urhadd          v2.8B,  v2.8B,  v6.8B
+        ld1             {v7.8B}, [x0], x2
+        urhadd          v3.8B,  v3.8B,  v7.8B
+        sub             x0,  x0,  x2,  lsl #2
+  .endif
+        subs            w3,  w3,  #4
+        st1             {v0.8B}, [x0], x2
+        st1             {v1.8B}, [x0], x2
+        st1             {v2.8B}, [x0], x2
+        st1             {v3.8B}, [x0], x2
+        b.ne            1b
+        ret
+.endm
+
+.macro  pixels8_x2      rnd=1, avg=0
+1:      ld1             {v0.8B, v1.8B}, [x1], x2
+        ext             v1.8B,  v0.8B,  v1.8B,  #1
+        ld1             {v2.8B, v3.8B}, [x1], x2
+        ext             v3.8B,  v2.8B,  v3.8B,  #1
+        subs            w3,  w3,  #2
+        avg             v0.8B,   v0.8B,   v1.8B
+        avg             v2.8B,   v2.8B,   v3.8B
+  .if \avg
+        ld1             {v4.8B},     [x0], x2
+        ld1             {v5.8B},     [x0]
+        urhadd          v0.8B,   v0.8B,   v4.8B
+        urhadd          v2.8B,   v2.8B,   v5.8B
+        sub             x0,  x0,  x2
+  .endif
+        st1             {v0.8B}, [x0], x2
+        st1             {v2.8B}, [x0], x2
+        b.ne            1b
+        ret
+.endm
+
+.macro  pixels8_y2      rnd=1, avg=0
+        sub             w3,  w3,  #2
+        ld1             {v0.8B},  [x1], x2
+        ld1             {v1.8B},  [x1], x2
+1:      subs            w3,  w3,  #2
+        avg             v4.8B,  v0.8B,  v1.8B
+        ld1             {v0.8B},  [x1], x2
+        avg             v5.8B,  v0.8B,  v1.8B
+        ld1             {v1.8B},  [x1], x2
+  .if \avg
+        ld1             {v2.8B},     [x0], x2
+        ld1             {v3.8B},     [x0]
+        urhadd          v4.8B,  v4.8B,  v2.8B
+        urhadd          v5.8B,  v5.8B,  v3.8B
+        sub             x0,  x0,  x2
+  .endif
+        st1             {v4.8B},     [x0], x2
+        st1             {v5.8B},     [x0], x2
+        b.ne            1b
+
+        avg             v4.8B,  v0.8B,  v1.8B
+        ld1             {v0.8B},  [x1], x2
+        avg             v5.8B,  v0.8B,  v1.8B
+  .if \avg
+        ld1             {v2.8B},     [x0], x2
+        ld1             {v3.8B},     [x0]
+        urhadd          v4.8B,  v4.8B,  v2.8B
+        urhadd          v5.8B,  v5.8B,  v3.8B
+        sub             x0,  x0,  x2
+  .endif
+        st1             {v4.8B},     [x0], x2
+        st1             {v5.8B},     [x0], x2
+
+        ret
+.endm
+
+.macro  pixels8_xy2     rnd=1, avg=0
+        sub             w3,  w3,  #2
+        ld1             {v0.16B},     [x1], x2
+        ld1             {v1.16B},     [x1], x2
+NRND    movi            v19.8H, #1
+        ext             v4.16B,  v0.16B,  v4.16B,  #1
+        ext             v6.16B,  v1.16B,  v6.16B,  #1
+        uaddl           v16.8H,  v0.8B,  v4.8B
+        uaddl           v17.8H,  v1.8B,  v6.8B
+1:      subs            w3,  w3,  #2
+        ld1             {v0.16B},     [x1], x2
+        add             v18.8H, v16.8H,  v17.8H
+        ext             v4.16B,  v0.16B,  v4.16B,  #1
+NRND    add             v18.8H, v18.8H, v19.8H
+        uaddl           v16.8H,  v0.8B,  v4.8B
+        mshrn           v5.8B,  v18.8H, #2
+        ld1             {v1.16B},     [x1], x2
+        add             v18.8H, v16.8H,  v17.8H
+  .if \avg
+        ld1             {v7.8B},     [x0]
+        urhadd          v5.8B,  v5.8B,  v7.8B
+  .endif
+NRND    add             v18.8H, v18.8H, v19.8H
+        st1             {v5.8B},     [x0], x2
+        mshrn           v7.8B,  v18.8H, #2
+  .if \avg
+        ld1             {v5.8B},     [x0]
+        urhadd          v7.8B,  v7.8B,  v5.8B
+  .endif
+        ext             v6.16B,  v1.16B,  v6.16B,  #1
+        uaddl           v17.8H,  v1.8B,   v6.8B
+        st1             {v7.8B},     [x0], x2
+        b.gt            1b
+
+        ld1             {v0.16B},     [x1], x2
+        add             v18.8H, v16.8H, v17.8H
+        ext             v4.16B, v0.16B, v4.16B,  #1
+NRND    add             v18.8H, v18.8H, v19.8H
+        uaddl           v16.8H,  v0.8B, v4.8B
+        mshrn           v5.8B,  v18.8H, #2
+        add             v18.8H, v16.8H, v17.8H
+  .if \avg
+        ld1             {v7.8B},     [x0]
+        urhadd          v5.8B,  v5.8B,  v7.8B
+  .endif
+NRND    add             v18.8H, v18.8H, v19.8H
+        st1             {v5.8B},     [x0], x2
+        mshrn           v7.8B,  v18.8H, #2
+  .if \avg
+        ld1             {v5.8B},     [x0]
+        urhadd          v7.8B,  v7.8B,  v5.8B
+  .endif
+        st1             {v7.8B},     [x0], x2
+
+        ret
+.endm
+
+.macro  pixfunc         pfx, name, suf, rnd=1, avg=0
+  .if \rnd
+    .macro avg  rd, rn, rm
+        urhadd          \rd, \rn, \rm
+    .endm
+    .macro mshrn rd, rn, rm
+        rshrn           \rd, \rn, \rm
+    .endm
+    .macro mshrn2 rd, rn, rm
+        rshrn2          \rd, \rn, \rm
+    .endm
+    .macro NRND insn:vararg
+    .endm
+  .else
+    .macro avg  rd, rn, rm
+        uhadd           \rd, \rn, \rm
+    .endm
+    .macro mshrn rd, rn, rm
+        shrn            \rd, \rn, \rm
+    .endm
+    .macro mshrn2 rd, rn, rm
+        shrn2           \rd, \rn, \rm
+    .endm
+    .macro NRND insn:vararg
+        \insn
+    .endm
+  .endif
+function ff_\pfx\name\suf\()_neon, export=1
+        \name           \rnd, \avg
+endfunc
+        .purgem         avg
+        .purgem         mshrn
+        .purgem         mshrn2
+        .purgem         NRND
+.endm
+
+.macro  pixfunc2        pfx, name, avg=0
+        pixfunc         \pfx, \name,          rnd=1, avg=\avg
+        pixfunc         \pfx, \name, _no_rnd, rnd=0, avg=\avg
+.endm
+
+function ff_put_h264_qpel16_mc00_neon, export=1
+        mov             w3,  #16
+endfunc
+
+        pixfunc         put_, pixels16,     avg=0
+        pixfunc2        put_, pixels16_x2,  avg=0
+        pixfunc2        put_, pixels16_y2,  avg=0
+        pixfunc2        put_, pixels16_xy2, avg=0
+
+function ff_avg_h264_qpel16_mc00_neon, export=1
+        mov             w3,  #16
+endfunc
+
+        pixfunc         avg_, pixels16,     avg=1
+        pixfunc2        avg_, pixels16_x2,  avg=1
+        pixfunc2        avg_, pixels16_y2,  avg=1
+        pixfunc2        avg_, pixels16_xy2, avg=1
+
+function ff_put_h264_qpel8_mc00_neon, export=1
+        mov             w3,  #8
+endfunc
+
+        pixfunc         put_, pixels8,     avg=0
+        pixfunc2        put_, pixels8_x2,  avg=0
+        pixfunc2        put_, pixels8_y2,  avg=0
+        pixfunc2        put_, pixels8_xy2, avg=0
+
+function ff_avg_h264_qpel8_mc00_neon, export=1
+        mov             w3,  #8
+endfunc
+
+        pixfunc         avg_, pixels8,     avg=1
+        pixfunc         avg_, pixels8_x2,  avg=1
+        pixfunc         avg_, pixels8_y2,  avg=1
+        pixfunc         avg_, pixels8_xy2, avg=1

omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/aarch64/neon.S Added

@@ -0,0 +1,149 @@
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+.macro  transpose_8x8B  r0, r1, r2, r3, r4, r5, r6, r7, r8, r9
+        trn1            \r8\().8B,  \r0\().8B,  \r1\().8B
+        trn2            \r9\().8B,  \r0\().8B,  \r1\().8B
+        trn1            \r1\().8B,  \r2\().8B,  \r3\().8B
+        trn2            \r3\().8B,  \r2\().8B,  \r3\().8B
+        trn1            \r0\().8B,  \r4\().8B,  \r5\().8B
+        trn2            \r5\().8B,  \r4\().8B,  \r5\().8B
+        trn1            \r2\().8B,  \r6\().8B,  \r7\().8B
+        trn2            \r7\().8B,  \r6\().8B,  \r7\().8B
+
+        trn1            \r4\().4H,  \r0\().4H,  \r2\().4H
+        trn2            \r2\().4H,  \r0\().4H,  \r2\().4H
+        trn1            \r6\().4H,  \r5\().4H,  \r7\().4H
+        trn2            \r7\().4H,  \r5\().4H,  \r7\().4H
+        trn1            \r5\().4H,  \r9\().4H,  \r3\().4H
+        trn2            \r9\().4H,  \r9\().4H,  \r3\().4H
+        trn1            \r3\().4H,  \r8\().4H,  \r1\().4H
+        trn2            \r8\().4H,  \r8\().4H,  \r1\().4H
+
+        trn1            \r0\().2S,  \r3\().2S,  \r4\().2S
+        trn2            \r4\().2S,  \r3\().2S,  \r4\().2S
+
+        trn1            \r1\().2S,  \r5\().2S,  \r6\().2S
+        trn2            \r5\().2S,  \r5\().2S,  \r6\().2S
+
+        trn2            \r6\().2S,  \r8\().2S,  \r2\().2S
+        trn1            \r2\().2S,  \r8\().2S,  \r2\().2S
+
+        trn1            \r3\().2S,  \r9\().2S,  \r7\().2S
+        trn2            \r7\().2S,  \r9\().2S,  \r7\().2S
+.endm
+
+.macro  transpose_8x16B r0, r1, r2, r3, r4, r5, r6, r7, t0, t1
+        trn1            \t0\().16B, \r0\().16B, \r1\().16B
+        trn2            \t1\().16B, \r0\().16B, \r1\().16B
+        trn1            \r1\().16B, \r2\().16B, \r3\().16B
+        trn2            \r3\().16B, \r2\().16B, \r3\().16B
+        trn1            \r0\().16B, \r4\().16B, \r5\().16B
+        trn2            \r5\().16B, \r4\().16B, \r5\().16B
+        trn1            \r2\().16B, \r6\().16B, \r7\().16B
+        trn2            \r7\().16B, \r6\().16B, \r7\().16B
+
+        trn1            \r4\().8H,  \r0\().8H,  \r2\().8H
+        trn2            \r2\().8H,  \r0\().8H,  \r2\().8H
+        trn1            \r6\().8H,  \r5\().8H,  \r7\().8H
+        trn2            \r7\().8H,  \r5\().8H,  \r7\().8H
+        trn1            \r5\().8H,  \t1\().8H,  \r3\().8H
+        trn2            \t1\().8H,  \t1\().8H,  \r3\().8H
+        trn1            \r3\().8H,  \t0\().8H,  \r1\().8H
+        trn2            \t0\().8H,  \t0\().8H,  \r1\().8H
+
+        trn1            \r0\().4S,  \r3\().4S,  \r4\().4S
+        trn2            \r4\().4S,  \r3\().4S,  \r4\().4S
+
+        trn1            \r1\().4S,  \r5\().4S,  \r6\().4S
+        trn2            \r5\().4S,  \r5\().4S,  \r6\().4S
+
+        trn2            \r6\().4S,  \t0\().4S,  \r2\().4S
+        trn1            \r2\().4S,  \t0\().4S,  \r2\().4S
+
+        trn1            \r3\().4S,  \t1\().4S,  \r7\().4S
+        trn2            \r7\().4S,  \t1\().4S,  \r7\().4S
+.endm
+
+.macro  transpose_4x16B r0, r1, r2, r3, t4, t5, t6, t7
+        trn1            \t4\().16B, \r0\().16B,  \r1\().16B
+        trn2            \t5\().16B, \r0\().16B,  \r1\().16B
+        trn1            \t6\().16B, \r2\().16B,  \r3\().16B
+        trn2            \t7\().16B, \r2\().16B,  \r3\().16B
+
+        trn1            \r0\().8H,  \t4\().8H,  \t6\().8H
+        trn2            \r2\().8H,  \t4\().8H,  \t6\().8H
+        trn1            \r1\().8H,  \t5\().8H,  \t7\().8H
+        trn2            \r3\().8H,  \t5\().8H,  \t7\().8H
+.endm
+
+.macro  transpose_4x8B  r0, r1, r2, r3, t4, t5, t6, t7
+        trn1            \t4\().8B,  \r0\().8B,  \r1\().8B
+        trn2            \t5\().8B,  \r0\().8B,  \r1\().8B
+        trn1            \t6\().8B,  \r2\().8B,  \r3\().8B
+        trn2            \t7\().8B,  \r2\().8B,  \r3\().8B
+
+        trn1            \r0\().4H,  \t4\().4H,  \t6\().4H
+        trn2            \r2\().4H,  \t4\().4H,  \t6\().4H
+        trn1            \r1\().4H,  \t5\().4H,  \t7\().4H
+        trn2            \r3\().4H,  \t5\().4H,  \t7\().4H
+.endm
+
+.macro  transpose_4x4H  r0, r1, r2, r3, r4, r5, r6, r7
+        trn1            \r4\().4H,  \r0\().4H,  \r1\().4H
+        trn2            \r5\().4H,  \r0\().4H,  \r1\().4H
+        trn1            \r7\().4H,  \r3\().4H,  \r2\().4H
+        trn2            \r6\().4H,  \r3\().4H,  \r2\().4H
+        trn1            \r0\().2S,  \r4\().2S,  \r7\().2S
+        trn2            \r3\().2S,  \r4\().2S,  \r7\().2S
+        trn1            \r1\().2S,  \r5\().2S,  \r6\().2S
+        trn2            \r2\().2S,  \r5\().2S,  \r6\().2S
+.endm
+
+.macro  transpose_8x8H  r0, r1, r2, r3, r4, r5, r6, r7, r8, r9
+        trn1            \r8\().8H,  \r0\().8H,  \r1\().8H
+        trn2            \r9\().8H,  \r0\().8H,  \r1\().8H
+        trn1            \r1\().8H,  \r2\().8H,  \r3\().8H
+        trn2            \r3\().8H,  \r2\().8H,  \r3\().8H
+        trn1            \r0\().8H,  \r4\().8H,  \r5\().8H
+        trn2            \r5\().8H,  \r4\().8H,  \r5\().8H
+        trn1            \r2\().8H,  \r6\().8H,  \r7\().8H
+        trn2            \r7\().8H,  \r6\().8H,  \r7\().8H
+
+        trn1            \r4\().4S,  \r0\().4S,  \r2\().4S
+        trn2            \r2\().4S,  \r0\().4S,  \r2\().4S
+        trn1            \r6\().4S,  \r5\().4S,  \r7\().4S
+        trn2            \r7\().4S,  \r5\().4S,  \r7\().4S
+        trn1            \r5\().4S,  \r9\().4S,  \r3\().4S
+        trn2            \r9\().4S,  \r9\().4S,  \r3\().4S
+        trn1            \r3\().4S,  \r8\().4S,  \r1\().4S
+        trn2            \r8\().4S,  \r8\().4S,  \r1\().4S
+
+        trn1            \r0\().2D,  \r3\().2D,  \r4\().2D
+        trn2            \r4\().2D,  \r3\().2D,  \r4\().2D
+
+        trn1            \r1\().2D,  \r5\().2D,  \r6\().2D
+        trn2            \r5\().2D,  \r5\().2D,  \r6\().2D
+
+        trn2            \r6\().2D,  \r8\().2D,  \r2\().2D
+        trn1            \r2\().2D,  \r8\().2D,  \r2\().2D
+
+        trn1            \r3\().2D,  \r9\().2D,  \r7\().2D
+        trn2            \r7\().2D,  \r9\().2D,  \r7\().2D
+
+.endm

omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/aarch64/neontest.c Added

@@ -0,0 +1,79 @@
+/*
+ * check NEON registers for clobbers
+ * Copyright (c) 2013 Martin Storsjo
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "libavcodec/avcodec.h"
+#include "libavutil/aarch64/neontest.h"
+
+wrap(avcodec_open2(AVCodecContext *avctx,
+                   AVCodec *codec,
+                   AVDictionary **options))
+{
+    testneonclobbers(avcodec_open2, avctx, codec, options);
+}
+
+wrap(avcodec_decode_audio4(AVCodecContext *avctx,
+                           AVFrame *frame,
+                           int *got_frame_ptr,
+                           AVPacket *avpkt))
+{
+    testneonclobbers(avcodec_decode_audio4, avctx, frame,
+                     got_frame_ptr, avpkt);
+}
+
+wrap(avcodec_decode_video2(AVCodecContext *avctx,
+                           AVFrame *picture,
+                           int *got_picture_ptr,
+                           AVPacket *avpkt))
+{
+    testneonclobbers(avcodec_decode_video2, avctx, picture,
+                     got_picture_ptr, avpkt);
+}
+
+wrap(avcodec_decode_subtitle2(AVCodecContext *avctx,
+                              AVSubtitle *sub,
+                              int *got_sub_ptr,
+                              AVPacket *avpkt))
+{
+    testneonclobbers(avcodec_decode_subtitle2, avctx, sub,
+                     got_sub_ptr, avpkt);
+}
+
+wrap(avcodec_encode_audio2(AVCodecContext *avctx,
+                           AVPacket *avpkt,
+                           const AVFrame *frame,
+                           int *got_packet_ptr))
+{
+    testneonclobbers(avcodec_encode_audio2, avctx, avpkt, frame,
+                     got_packet_ptr);
+}
+
+wrap(avcodec_encode_subtitle(AVCodecContext *avctx,
+                             uint8_t *buf, int buf_size,
+                             const AVSubtitle *sub))
+{
+    testneonclobbers(avcodec_encode_subtitle, avctx, buf, buf_size, sub);
+}
+
+wrap(avcodec_encode_video2(AVCodecContext *avctx, AVPacket *avpkt,
+                           const AVFrame *frame, int *got_packet_ptr))
+{
+    testneonclobbers(avcodec_encode_video2, avctx, avpkt, frame, got_packet_ptr);
+}

omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/aarch64/rv40dsp_init_aarch64.c Added

@@ -0,0 +1,48 @@
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <stdint.h>
+
+#include "libavutil/attributes.h"
+#include "libavutil/cpu.h"
+#include "libavutil/aarch64/cpu.h"
+#include "libavcodec/rv34dsp.h"
+
+#include "config.h"
+
+void ff_put_rv40_chroma_mc8_neon(uint8_t *dst, uint8_t *src, int stride, int h,
+                                 int x, int y);
+void ff_put_rv40_chroma_mc4_neon(uint8_t *dst, uint8_t *src, int stride, int h,
+                                 int x, int y);
+
+void ff_avg_rv40_chroma_mc8_neon(uint8_t *dst, uint8_t *src, int stride, int h,
+                                 int x, int y);
+void ff_avg_rv40_chroma_mc4_neon(uint8_t *dst, uint8_t *src, int stride, int h,
+                                 int x, int y);
+
+av_cold void ff_rv40dsp_init_aarch64(RV34DSPContext *c)
+{
+    int cpu_flags = av_get_cpu_flags();
+
+    if (have_neon(cpu_flags)) {
+        c->put_chroma_pixels_tab[0] = ff_put_rv40_chroma_mc8_neon;
+        c->put_chroma_pixels_tab[1] = ff_put_rv40_chroma_mc4_neon;
+        c->avg_chroma_pixels_tab[0] = ff_avg_rv40_chroma_mc8_neon;
+        c->avg_chroma_pixels_tab[1] = ff_avg_rv40_chroma_mc4_neon;
+    }
+}

omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/aarch64/vc1dsp_init_aarch64.c Added

@@ -0,0 +1,47 @@
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <stdint.h>
+
+#include "libavutil/attributes.h"
+#include "libavutil/cpu.h"
+#include "libavutil/aarch64/cpu.h"
+#include "libavcodec/vc1dsp.h"
+
+#include "config.h"
+
+void ff_put_vc1_chroma_mc8_neon(uint8_t *dst, uint8_t *src, int stride, int h,
+                                int x, int y);
+void ff_avg_vc1_chroma_mc8_neon(uint8_t *dst, uint8_t *src, int stride, int h,
+                                int x, int y);
+void ff_put_vc1_chroma_mc4_neon(uint8_t *dst, uint8_t *src, int stride, int h,
+                                int x, int y);
+void ff_avg_vc1_chroma_mc4_neon(uint8_t *dst, uint8_t *src, int stride, int h,
+                                int x, int y);
+
+av_cold void ff_vc1dsp_init_aarch64(VC1DSPContext *dsp)
+{
+    int cpu_flags = av_get_cpu_flags();
+
+    if (have_neon(cpu_flags)) {
+        dsp->put_no_rnd_vc1_chroma_pixels_tab[0] = ff_put_vc1_chroma_mc8_neon;
+        dsp->avg_no_rnd_vc1_chroma_pixels_tab[0] = ff_avg_vc1_chroma_mc8_neon;
+        dsp->put_no_rnd_vc1_chroma_pixels_tab[1] = ff_put_vc1_chroma_mc4_neon;
+        dsp->avg_no_rnd_vc1_chroma_pixels_tab[1] = ff_avg_vc1_chroma_mc4_neon;
+    }
+}

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/ac3.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/ac3.h Changed

@@ -82,6 +82,38 @@
     AC3_CHMODE_3F2R
 } AC3ChannelMode;
 
+/** Dolby Surround mode */
+typedef enum AC3DolbySurroundMode {
+    AC3_DSURMOD_NOTINDICATED = 0,
+    AC3_DSURMOD_OFF,
+    AC3_DSURMOD_ON,
+    AC3_DSURMOD_RESERVED
+} AC3DolbySurroundMode;
+
+/** Dolby Surround EX mode */
+typedef enum AC3DolbySurroundEXMode {
+    AC3_DSUREXMOD_NOTINDICATED = 0,
+    AC3_DSUREXMOD_OFF,
+    AC3_DSUREXMOD_ON,
+    AC3_DSUREXMOD_PLIIZ
+} AC3DolbySurroundEXMode;
+
+/** Dolby Headphone mode */
+typedef enum AC3DolbyHeadphoneMode {
+    AC3_DHEADPHONMOD_NOTINDICATED = 0,
+    AC3_DHEADPHONMOD_OFF,
+    AC3_DHEADPHONMOD_ON,
+    AC3_DHEADPHONMOD_RESERVED
+} AC3DolbyHeadphoneMode;
+
+/** Preferred Stereo Downmix mode */
+typedef enum AC3PreferredStereoDownmixMode {
+    AC3_DMIXMOD_NOTINDICATED = 0,
+    AC3_DMIXMOD_LTRT,
+    AC3_DMIXMOD_LORO,
+    AC3_DMIXMOD_DPLII // reserved value in A/52, but used by encoders to indicate DPL2
+} AC3PreferredStereoDownmixMode;
+
 typedef struct AC3BitAllocParameters {
     int sr_code;
     int sr_shift;
@@ -110,6 +142,9 @@
     int surround_mix_level;                 ///< Surround mix level index
     uint16_t channel_map;
     int num_blocks;                         ///< number of audio blocks
+#if AV_HAVE_INCOMPATIBLE_LIBAV_ABI
+    int dolby_surround_mode;
+#endif
     /** @} */
 
     /** @name Derived values
@@ -122,6 +157,9 @@
     uint16_t frame_size;
     uint64_t channel_layout;
     /** @} */
+#if !AV_HAVE_INCOMPATIBLE_LIBAV_ABI
+    int dolby_surround_mode;
+#endif
 } AC3HeaderInfo;
 
 typedef enum {

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/ac3_parser.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/ac3_parser.c Changed

@@ -47,9 +47,16 @@
 static const uint8_t surround_levels[4] = { 4, 6, 7, 6 };
 
 
-int avpriv_ac3_parse_header(GetBitContext *gbc, AC3HeaderInfo *hdr)
+int avpriv_ac3_parse_header2(GetBitContext *gbc, AC3HeaderInfo **phdr)
 {
     int frame_size_code;
+    AC3HeaderInfo *hdr;
+
+    if (!*phdr)
+        *phdr = av_mallocz(sizeof(AC3HeaderInfo));
+    if (!*phdr)
+        return AVERROR(ENOMEM);
+    hdr = *phdr;
 
     memset(hdr, 0, sizeof(*hdr));
 
@@ -68,6 +75,9 @@
     hdr->center_mix_level   = 5;  // -4.5dB
     hdr->surround_mix_level = 6;  // -6.0dB
 
+    /* set default dolby surround mode */
+    hdr->dolby_surround_mode = AC3_DSURMOD_NOTINDICATED;
+
     if(hdr->bitstream_id <= 10) {
         /* Normal AC-3 */
         hdr->crc1 = get_bits(gbc, 16);
@@ -85,7 +95,7 @@
         hdr->channel_mode = get_bits(gbc, 3);
 
         if(hdr->channel_mode == AC3_CHMODE_STEREO) {
-            skip_bits(gbc, 2); // skip dsurmod
+            hdr->dolby_surround_mode = get_bits(gbc, 2);
         } else {
             if((hdr->channel_mode & 1) && hdr->channel_mode != AC3_CHMODE_MONO)
                 hdr->  center_mix_level =   center_levels[get_bits(gbc, 2)];
@@ -141,6 +151,15 @@
     return 0;
 }
 
+int avpriv_ac3_parse_header(GetBitContext *gbc, AC3HeaderInfo *hdr)
+{
+    AC3HeaderInfo tmp, *ptmp = &tmp;
+    int ret = avpriv_ac3_parse_header2(gbc, &ptmp);
+
+    memcpy(hdr, ptmp, ((intptr_t)&tmp.channel_layout) - ((intptr_t)&tmp) + sizeof(uint64_t));
+    return ret;
+}
+
 static int ac3_sync(uint64_t state, AACAC3ParseContext *hdr_info,
         int *need_next_header, int *new_frame_start)
 {
@@ -149,11 +168,11 @@
         uint64_t u64;
         uint8_t  u8[8];
     } tmp = { av_be2ne64(state) };
-    AC3HeaderInfo hdr;
+    AC3HeaderInfo hdr, *phdr = &hdr;
     GetBitContext gbc;
 
     init_get_bits(&gbc, tmp.u8+8-AC3_HEADER_SIZE, 54);
-    err = avpriv_ac3_parse_header(&gbc, &hdr);
+    err = avpriv_ac3_parse_header2(&gbc, &phdr);
 
     if(err < 0)
         return 0;

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/ac3_parser.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/ac3_parser.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/ac3dec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/ac3dec.c Changed

@@ -29,7 +29,9 @@
 #include <math.h>
 #include <string.h>
 
+#include "libavutil/channel_layout.h"
 #include "libavutil/crc.h"
+#include "libavutil/downmix_info.h"
 #include "libavutil/opt.h"
 #include "internal.h"
 #include "aac_ac3_parser.h"
@@ -76,6 +78,15 @@
     LEVEL_MINUS_9DB
 };
 
+/** Adjustments in dB gain (LFE, +10 to -21 dB) */
+static const float gain_levels_lfe[32] = {
+    3.162275, 2.818382, 2.511886, 2.238719, 1.995261, 1.778278, 1.584893,
+    1.412536, 1.258924, 1.122018, 1.000000, 0.891251, 0.794328, 0.707946,
+    0.630957, 0.562341, 0.501187, 0.446683, 0.398107, 0.354813, 0.316227,
+    0.281838, 0.251188, 0.223872, 0.199526, 0.177828, 0.158489, 0.141253,
+    0.125892, 0.112201, 0.100000, 0.089125
+};
+
 /**
  * Table for default stereo downmixing coefficients
  * reference: Section 7.8.2 Downmixing Into Two Channels
@@ -178,11 +189,20 @@
     avctx->sample_fmt = AV_SAMPLE_FMT_FLTP;
 
     /* allow downmixing to stereo or mono */
-    if (avctx->channels > 0 && avctx->request_channels > 0 &&
-            avctx->request_channels < avctx->channels &&
-            avctx->request_channels <= 2) {
-        avctx->channels = avctx->request_channels;
-    }
+#if FF_API_REQUEST_CHANNELS
+FF_DISABLE_DEPRECATION_WARNINGS
+    if (avctx->request_channels == 1)
+        avctx->request_channel_layout = AV_CH_LAYOUT_MONO;
+    else if (avctx->request_channels == 2)
+        avctx->request_channel_layout = AV_CH_LAYOUT_STEREO;
+FF_ENABLE_DEPRECATION_WARNINGS
+#endif
+    if (avctx->channels > 1 &&
+        avctx->request_channel_layout == AV_CH_LAYOUT_MONO)
+        avctx->channels = 1;
+    else if (avctx->channels > 2 &&
+             avctx->request_channel_layout == AV_CH_LAYOUT_STEREO)
+        avctx->channels = 2;
     s->downmixed = 1;
 
     for (i = 0; i < AC3_MAX_CHANNELS; i++) {
@@ -217,12 +237,26 @@
 
     skip_bits(gbc, 2); //skip copyright bit and original bitstream bit
 
-    /* skip the timecodes (or extra bitstream information for Alternate Syntax)
-       TODO: read & use the xbsi1 downmix levels */
-    if (get_bits1(gbc))
-        skip_bits(gbc, 14); //skip timecode1 / xbsi1
-    if (get_bits1(gbc))
-        skip_bits(gbc, 14); //skip timecode2 / xbsi2
+    /* skip the timecodes or parse the Alternate Bit Stream Syntax */
+    if (s->bitstream_id != 6) {
+        if (get_bits1(gbc))
+            skip_bits(gbc, 14); //skip timecode1
+        if (get_bits1(gbc))
+            skip_bits(gbc, 14); //skip timecode2
+    } else {
+        if (get_bits1(gbc)) {
+            s->preferred_downmix       = get_bits(gbc, 2);
+            s->center_mix_level_ltrt   = get_bits(gbc, 3);
+            s->surround_mix_level_ltrt = av_clip(get_bits(gbc, 3), 3, 7);
+            s->center_mix_level        = get_bits(gbc, 3);
+            s->surround_mix_level      = av_clip(get_bits(gbc, 3), 3, 7);
+        }
+        if (get_bits1(gbc)) {
+            s->dolby_surround_ex_mode = get_bits(gbc, 2);
+            s->dolby_headphone_mode   = get_bits(gbc, 2);
+            skip_bits(gbc, 10); // skip adconvtyp (1), xbsi2 (8), encinfo (1)
+        }
+    }
 
     /* skip additional bitstream info */
     if (get_bits1(gbc)) {
@@ -240,18 +274,18 @@
  */
 static int parse_frame_header(AC3DecodeContext *s)
 {
-    AC3HeaderInfo hdr;
+    AC3HeaderInfo hdr, *phdr=&hdr;
     int err;
 
-    err = avpriv_ac3_parse_header(&s->gbc, &hdr);
+    err = avpriv_ac3_parse_header2(&s->gbc, &phdr);
     if (err)
         return err;
 
     /* get decoding parameters from header info */
     s->bit_alloc_params.sr_code     = hdr.sr_code;
+    s->bitstream_id                 = hdr.bitstream_id;
     s->bitstream_mode               = hdr.bitstream_mode;
     s->channel_mode                 = hdr.channel_mode;
-    s->channel_layout               = hdr.channel_layout;
     s->lfe_on                       = hdr.lfe_on;
     s->bit_alloc_params.sr_shift    = hdr.sr_shift;
     s->sample_rate                  = hdr.sample_rate;
@@ -260,11 +294,18 @@
     s->fbw_channels                 = s->channels - s->lfe_on;
     s->lfe_ch                       = s->fbw_channels + 1;
     s->frame_size                   = hdr.frame_size;
+    s->preferred_downmix            = AC3_DMIXMOD_NOTINDICATED;
     s->center_mix_level             = hdr.center_mix_level;
+    s->center_mix_level_ltrt        = 4; // -3.0dB
     s->surround_mix_level           = hdr.surround_mix_level;
+    s->surround_mix_level_ltrt      = 4; // -3.0dB
+    s->lfe_mix_level_exists         = 0;
     s->num_blocks                   = hdr.num_blocks;
     s->frame_type                   = hdr.frame_type;
     s->substreamid                  = hdr.substreamid;
+    s->dolby_surround_mode          = hdr.dolby_surround_mode;
+    s->dolby_surround_ex_mode       = AC3_DSUREXMOD_NOTINDICATED;
+    s->dolby_headphone_mode         = AC3_DHEADPHONMOD_NOTINDICATED;
 
     if (s->lfe_on) {
         s->start_freq[s->lfe_ch]     = 0;
@@ -273,7 +314,7 @@
         s->channel_in_cpl[s->lfe_ch] = 0;
     }
 
-    if (hdr.bitstream_id <= 10) {
+    if (s->bitstream_id <= 10) {
         s->eac3                  = 0;
         s->snr_offset_strategy   = 2;
         s->block_switch_syntax   = 1;
@@ -488,6 +529,10 @@
             break;
         default: /* 6 to 15 */
             /* Shift mantissa and sign-extend it. */
+            if (bap > 15) {
+                av_log(s->avctx, AV_LOG_ERROR, "bap %d is invalid in plain AC-3\n", bap);
+                bap = 15;
+            }
             mantissa = get_sbits(gbc, quantization_tab[bap]);
             mantissa <<= 24 - quantization_tab[bap];
             break;
@@ -747,8 +792,13 @@
     i = !s->channel_mode;
     do {
         if (get_bits1(gbc)) {
-            s->dynamic_range[i] = ((dynamic_range_tab[get_bits(gbc, 8)] - 1.0) *
-                                  s->drc_scale) + 1.0;
+            /* Allow asymmetric application of DRC when drc_scale > 1.
+               Amplification of quiet sounds is enhanced */
+            float range = dynamic_range_tab[get_bits(gbc, 8)];
+            if (range > 1.0 || s->drc_scale <= 1.0)
+                s->dynamic_range[i] = powf(range, s->drc_scale);
+            else
+                s->dynamic_range[i] = range;
         } else if (blk == 0) {
             s->dynamic_range[i] = 1.0f;
         }
@@ -1271,6 +1321,8 @@
     int blk, ch, err, ret;
     const uint8_t *channel_map;
     const float *output[AC3_MAX_CHANNELS];
+    enum AVMatrixEncoding matrix_encoding;
+    AVDownmixInfo *downmix_info;
 
     /* copy input buffer to decoder context to avoid reading past the end
        of the buffer, which can be caused by a damaged input stream. */
@@ -1330,6 +1382,8 @@
             if (av_crc(av_crc_get_table(AV_CRC_16_ANSI), 0, &buf[2],
                        s->frame_size - 2)) {
                 av_log(avctx, AV_LOG_ERROR, "frame CRC mismatch\n");
+                if (avctx->err_recognition & AV_EF_EXPLODE)
+                    return AVERROR_INVALIDDATA;
                 err = AAC_AC3_PARSE_ERROR_CRC;
             }
         }
@@ -1347,14 +1401,15 @@
         s->output_mode  = s->channel_mode;
         if (s->lfe_on)
             s->output_mode |= AC3_OUTPUT_LFEON;
-        if (avctx->request_channels > 0 && avctx->request_channels <= 2 &&
-                avctx->request_channels < s->channels) {
-            s->out_channels = avctx->request_channels;
-            s->output_mode  = avctx->request_channels == 1 ? AC3_CHMODE_MONO : AC3_CHMODE_STEREO;
-            s->channel_layout = avpriv_ac3_channel_layout_tab[s->output_mode];
+        if (s->channels > 1 &&
+            avctx->request_channel_layout == AV_CH_LAYOUT_MONO) {
+            s->out_channels = 1;
+            s->output_mode  = AC3_CHMODE_MONO;
+        } else if (s->channels > 2 &&
+                   avctx->request_channel_layout == AV_CH_LAYOUT_STEREO) {
+            s->out_channels = 2;
+            s->output_mode  = AC3_CHMODE_STEREO;
         }
-        avctx->channels       = s->out_channels;
-        avctx->channel_layout = s->channel_layout;
 
         s->loro_center_mix_level   = gain_levels[s->  center_mix_level];
         s->loro_surround_mix_level = gain_levels[s->surround_mix_level];
@@ -1370,6 +1425,9 @@
         return AVERROR_INVALIDDATA;
     }
     avctx->channels = s->out_channels;
+    avctx->channel_layout = avpriv_ac3_channel_layout_tab[s->output_mode & ~AC3_OUTPUT_LFEON];
+    if (s->output_mode & AC3_OUTPUT_LFEON)
+        avctx->channel_layout |= AV_CH_LOW_FREQUENCY;
 
     /* set audio service type based on bitstream mode for AC-3 */
     avctx->audio_service_type = s->bitstream_mode;
@@ -1413,6 +1471,62 @@
     for (ch = 0; ch < s->out_channels; ch++)
         memcpy(s->output[ch], output[ch], sizeof(**output) * AC3_BLOCK_SIZE);
 
+    /*
+     * AVMatrixEncoding
+     *
+     * Check whether the input layout is compatible, and make sure we're not
+     * downmixing (else the matrix encoding is no longer applicable).
+     */
+    matrix_encoding = AV_MATRIX_ENCODING_NONE;
+    if (s->channel_mode == AC3_CHMODE_STEREO &&
+        s->channel_mode == (s->output_mode & ~AC3_OUTPUT_LFEON)) {
+        if (s->dolby_surround_mode == AC3_DSURMOD_ON)
+            matrix_encoding = AV_MATRIX_ENCODING_DOLBY;
+        else if (s->dolby_headphone_mode == AC3_DHEADPHONMOD_ON)
+            matrix_encoding = AV_MATRIX_ENCODING_DOLBYHEADPHONE;
+    } else if (s->channel_mode >= AC3_CHMODE_2F2R &&
+               s->channel_mode == (s->output_mode & ~AC3_OUTPUT_LFEON)) {
+        switch (s->dolby_surround_ex_mode) {
+        case AC3_DSUREXMOD_ON: // EX or PLIIx
+            matrix_encoding = AV_MATRIX_ENCODING_DOLBYEX;
+            break;
+        case AC3_DSUREXMOD_PLIIZ:
+            matrix_encoding = AV_MATRIX_ENCODING_DPLIIZ;
+            break;
+        default: // not indicated or off
+            break;
+        }
+    }
+    if ((ret = ff_side_data_update_matrix_encoding(frame, matrix_encoding)) < 0)
+        return ret;
+
+    /* AVDownmixInfo */
+    if ((downmix_info = av_downmix_info_update_side_data(frame))) {
+        switch (s->preferred_downmix) {
+        case AC3_DMIXMOD_LTRT:
+            downmix_info->preferred_downmix_type = AV_DOWNMIX_TYPE_LTRT;
+            break;
+        case AC3_DMIXMOD_LORO:
+            downmix_info->preferred_downmix_type = AV_DOWNMIX_TYPE_LORO;
+            break;
+        case AC3_DMIXMOD_DPLII:
+            downmix_info->preferred_downmix_type = AV_DOWNMIX_TYPE_DPLII;
+            break;
+        default:
+            downmix_info->preferred_downmix_type = AV_DOWNMIX_TYPE_UNKNOWN;
+            break;
+        }
+        downmix_info->center_mix_level        = gain_levels[s->       center_mix_level];
+        downmix_info->center_mix_level_ltrt   = gain_levels[s->  center_mix_level_ltrt];
+        downmix_info->surround_mix_level      = gain_levels[s->     surround_mix_level];
+        downmix_info->surround_mix_level_ltrt = gain_levels[s->surround_mix_level_ltrt];
+        if (s->lfe_mix_level_exists)
+            downmix_info->lfe_mix_level       = gain_levels_lfe[s->lfe_mix_level];
+        else
+            downmix_info->lfe_mix_level       = 0.0; // -inf dB
+    } else
+        return AVERROR(ENOMEM);
+
     *got_frame_ptr = 1;
 
     return FFMIN(buf_size, s->frame_size);
@@ -1433,7 +1547,7 @@
 #define OFFSET(x) offsetof(AC3DecodeContext, x)
 #define PAR (AV_OPT_FLAG_DECODING_PARAM | AV_OPT_FLAG_AUDIO_PARAM)
 static const AVOption options[] = {
-    { "drc_scale", "percentage of dynamic range compression to apply", OFFSET(drc_scale), AV_OPT_TYPE_FLOAT, {.dbl = 1.0}, 0.0, 1.0, PAR },
+    { "drc_scale", "percentage of dynamic range compression to apply", OFFSET(drc_scale), AV_OPT_TYPE_FLOAT, {.dbl = 1.0}, 0.0, 6.0, PAR },
 
 {"dmix_mode", "Preferred Stereo Downmix Mode", OFFSET(preferred_stereo_downmix), AV_OPT_TYPE_INT, {.i64 = -1 }, -1, 2, 0, "dmix_mode"},
 {"ltrt_cmixlev",   "Lt/Rt Center Mix Level",   OFFSET(ltrt_center_mix_level),    AV_OPT_TYPE_FLOAT, {.dbl = -1.0 }, -1.0, 2.0, 0},

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/ac3dec.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/ac3dec.h Changed

@@ -79,14 +79,22 @@
     int bit_rate;                           ///< stream bit rate, in bits-per-second
     int sample_rate;                        ///< sample frequency, in Hz
     int num_blocks;                         ///< number of audio blocks
+    int bitstream_id;                       ///< bitstream id                           (bsid)
     int bitstream_mode;                     ///< bitstream mode                         (bsmod)
     int channel_mode;                       ///< channel mode                           (acmod)
-    int channel_layout;                     ///< channel layout
     int lfe_on;                             ///< lfe channel in use
     int channel_map;                        ///< custom channel map
+    int preferred_downmix;                  ///< Preferred 2-channel downmix mode       (dmixmod)
     int center_mix_level;                   ///< Center mix level index
+    int center_mix_level_ltrt;              ///< Center mix level index for Lt/Rt       (ltrtcmixlev)
     int surround_mix_level;                 ///< Surround mix level index
+    int surround_mix_level_ltrt;            ///< Surround mix level index for Lt/Rt     (ltrtsurmixlev)
+    int lfe_mix_level_exists;               ///< indicates if lfemixlevcod is specified (lfemixlevcode)
+    int lfe_mix_level;                      ///< LFE mix level index                    (lfemixlevcod)
     int eac3;                               ///< indicates if current frame is E-AC-3
+    int dolby_surround_mode;                ///< dolby surround mode                    (dsurmod)
+    int dolby_surround_ex_mode;             ///< dolby surround ex mode                 (dsurexmod)
+    int dolby_headphone_mode;               ///< dolby headphone mode                   (dheadphonmod)
 ///@}
 
     int preferred_stereo_downmix;

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/ac3dsp.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/ac3dsp.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/ac3dsp.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/ac3dsp.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/ac3enc_fixed.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/ac3enc_fixed.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/ac3enc_float.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/ac3enc_float.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/ac3enc_template.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/ac3enc_template.c Changed

@@ -34,10 +34,6 @@
 
 static void scale_coefficients(AC3EncodeContext *s);
 
-static void apply_window(void *dsp, SampleType *output,
-                         const SampleType *input, const SampleType *window,
-                         unsigned int len);
-
 static int normalize_samples(AC3EncodeContext *s);
 
 static void clip_coefficients(DSPContext *dsp, CoefType *coef, unsigned int len);
@@ -105,11 +101,11 @@
             const SampleType *input_samples = &s->planar_samples[ch][blk * AC3_BLOCK_SIZE];
 
 #if CONFIG_AC3ENC_FLOAT
-            apply_window(&s->fdsp, s->windowed_samples, input_samples,
-                         s->mdct_window, AC3_WINDOW_SIZE);
+            s->fdsp.vector_fmul(s->windowed_samples, input_samples,
+                                s->mdct_window, AC3_WINDOW_SIZE);
 #else
-            apply_window(&s->dsp, s->windowed_samples, input_samples,
-                         s->mdct_window, AC3_WINDOW_SIZE);
+            s->ac3dsp.apply_window_int16(s->windowed_samples, input_samples,
+                                         s->mdct_window, AC3_WINDOW_SIZE);
 #endif
 
             if (s->fixed_point)

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/ac3tab.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/ac3tab.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/adpcm.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/adpcm.c Changed

@@ -471,9 +471,11 @@
  * @param[out] coded_samples set to the number of samples as coded in the
  *                           packet, or 0 if the codec does not encode the
  *                           number of samples in each frame.
+ * @param[out] approx_nb_samples set to non-zero if the number of samples
+ *                               returned is an approximation.
  */
 static int get_nb_samples(AVCodecContext *avctx, GetByteContext *gb,
-                          int buf_size, int *coded_samples)
+                          int buf_size, int *coded_samples, int *approx_nb_samples)
 {
     ADPCMDecodeContext *s = avctx->priv_data;
     int nb_samples        = 0;
@@ -482,6 +484,7 @@
     int header_size;
 
     *coded_samples = 0;
+    *approx_nb_samples = 0;
 
     if(ch <= 0)
         return 0;
@@ -552,10 +555,12 @@
         case AV_CODEC_ID_ADPCM_EA_R2:
             header_size    = 4 + 5 * ch;
             *coded_samples = bytestream2_get_le32(gb);
+            *approx_nb_samples = 1;
             break;
         case AV_CODEC_ID_ADPCM_EA_R3:
             header_size    = 4 + 5 * ch;
             *coded_samples = bytestream2_get_be32(gb);
+            *approx_nb_samples = 1;
             break;
         }
         *coded_samples -= *coded_samples % 28;
@@ -663,11 +668,11 @@
     int16_t **samples_p;
     int st; /* stereo */
     int count1, count2;
-    int nb_samples, coded_samples, ret;
+    int nb_samples, coded_samples, approx_nb_samples, ret;
     GetByteContext gb;
 
     bytestream2_init(&gb, buf, buf_size);
-    nb_samples = get_nb_samples(avctx, &gb, buf_size, &coded_samples);
+    nb_samples = get_nb_samples(avctx, &gb, buf_size, &coded_samples, &approx_nb_samples);
     if (nb_samples <= 0) {
         av_log(avctx, AV_LOG_ERROR, "invalid number of samples in packet\n");
         return AVERROR_INVALIDDATA;
@@ -683,7 +688,7 @@
     /* use coded_samples when applicable */
     /* it is always <= nb_samples, so the output buffer will be large enough */
     if (coded_samples) {
-        if (coded_samples != nb_samples)
+        if (!approx_nb_samples && coded_samples != nb_samples)
             av_log(avctx, AV_LOG_WARNING, "mismatch in coded sample count\n");
         frame->nb_samples = nb_samples = coded_samples;
     }
@@ -917,6 +922,9 @@
             *samples++ = c->status[0].predictor + c->status[1].predictor;
             *samples++ = c->status[0].predictor - c->status[1].predictor;
         }
+
+        if ((bytestream2_tell(&gb) & 1))
+            bytestream2_skip(&gb, 1);
         break;
     }
     case AV_CODEC_ID_ADPCM_IMA_ISS:
@@ -1310,7 +1318,7 @@
                                                        byte & 0x0F, 4, 0);
             }
         } else if (avctx->codec->id == AV_CODEC_ID_ADPCM_SBPRO_3) {
-            for (n = nb_samples / 3; n > 0; n--) {
+            for (n = (nb_samples<<st) / 3; n > 0; n--) {
                 int byte = bytestream2_get_byteu(&gb);
                 *samples++ = adpcm_sbpro_expand_nibble(&c->status[0],
                                                         byte >> 5        , 3, 0);

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/adpcm_data.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/adpcm_data.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/adpcm_data.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/adpcm_data.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/adx.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/adx.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/adxdec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/adxdec.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/alac.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/alac.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/allcodecs.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/allcodecs.c Changed

@@ -24,8 +24,9 @@
  * Provide registration of all codecs, parsers and bitstream filters for libavcodec.
  */
 
-#include "avcodec.h"
 #include "config.h"
+#include "avcodec.h"
+#include "version.h"
 
 #define REGISTER_HWACCEL(X, x)                                          \
     {                                                                   \
@@ -79,7 +80,9 @@
     REGISTER_HWACCEL(H264_VAAPI,        h264_vaapi);
     REGISTER_HWACCEL(H264_VDA,          h264_vda);
     REGISTER_HWACCEL(H264_VDPAU,        h264_vdpau);
+    REGISTER_HWACCEL(MPEG1_XVMC,        mpeg1_xvmc);
     REGISTER_HWACCEL(MPEG1_VDPAU,       mpeg1_vdpau);
+    REGISTER_HWACCEL(MPEG2_XVMC,        mpeg2_xvmc);
     REGISTER_HWACCEL(MPEG2_DXVA2,       mpeg2_dxva2);
     REGISTER_HWACCEL(MPEG2_VAAPI,       mpeg2_vaapi);
     REGISTER_HWACCEL(MPEG2_VDPAU,       mpeg2_vdpau);
@@ -119,7 +122,7 @@
     REGISTER_DECODER(CAVS,              cavs);
     REGISTER_DECODER(CDGRAPHICS,        cdgraphics);
     REGISTER_DECODER(CDXL,              cdxl);
-    REGISTER_DECODER(CINEPAK,           cinepak);
+    REGISTER_ENCDEC (CINEPAK,           cinepak);
     REGISTER_ENCDEC (CLJR,              cljr);
     REGISTER_DECODER(CLLC,              cllc);
     REGISTER_ENCDEC (COMFORTNOISE,      comfortnoise);
@@ -147,6 +150,7 @@
     REGISTER_DECODER(EXR,               exr);
     REGISTER_ENCDEC (FFV1,              ffv1);
     REGISTER_ENCDEC (FFVHUFF,           ffvhuff);
+    REGISTER_DECODER(FIC,               fic);
     REGISTER_ENCDEC (FLASHSV,           flashsv);
     REGISTER_ENCDEC (FLASHSV2,          flashsv2);
     REGISTER_DECODER(FLIC,              flic);
@@ -165,6 +169,7 @@
     REGISTER_DECODER(H264_VDA,          h264_vda);
     REGISTER_DECODER(H264_VDPAU,        h264_vdpau);
     REGISTER_DECODER(HEVC,              hevc);
+    REGISTER_DECODER(HNM4_VIDEO,        hnm4_video);
     REGISTER_ENCDEC (HUFFYUV,           huffyuv);
     REGISTER_DECODER(IDCIN,             idcin);
     REGISTER_DECODER(IFF_BYTERUN1,      iff_byterun1);
@@ -188,7 +193,9 @@
     REGISTER_DECODER(MJPEGB,            mjpegb);
     REGISTER_DECODER(MMVIDEO,           mmvideo);
     REGISTER_DECODER(MOTIONPIXELS,      motionpixels);
+#if FF_API_XVMC
     REGISTER_DECODER(MPEG_XVMC,         mpeg_xvmc);
+#endif /* FF_API_XVMC */
     REGISTER_ENCDEC (MPEG1VIDEO,        mpeg1video);
     REGISTER_ENCDEC (MPEG2VIDEO,        mpeg2video);
     REGISTER_ENCDEC (MPEG4,             mpeg4);
@@ -322,6 +329,7 @@
     REGISTER_DECODER(APE,               ape);
     REGISTER_DECODER(ATRAC1,            atrac1);
     REGISTER_DECODER(ATRAC3,            atrac3);
+    REGISTER_DECODER(ATRAC3P,           atrac3p);
     REGISTER_DECODER(BINKAUDIO_DCT,     binkaudio_dct);
     REGISTER_DECODER(BINKAUDIO_RDFT,    binkaudio_rdft);
     REGISTER_DECODER(BMV_AUDIO,         bmv_audio);
@@ -346,6 +354,7 @@
     REGISTER_DECODER(MP1FLOAT,          mp1float);
     REGISTER_ENCDEC (MP2,               mp2);
     REGISTER_DECODER(MP2FLOAT,          mp2float);
+    REGISTER_ENCODER(MP2FIXED,          mp2fixed);
     REGISTER_DECODER(MP3,               mp3);
     REGISTER_DECODER(MP3FLOAT,          mp3float);
     REGISTER_DECODER(MP3ADU,            mp3adu);
@@ -504,8 +513,10 @@
     REGISTER_ENCDEC (LIBVPX_VP8,        libvpx_vp8);
     REGISTER_ENCDEC (LIBVPX_VP9,        libvpx_vp9);
     REGISTER_ENCODER(LIBWAVPACK,        libwavpack);
+    REGISTER_ENCODER(LIBWEBP,           libwebp);
     REGISTER_ENCODER(LIBX264,           libx264);
     REGISTER_ENCODER(LIBX264RGB,        libx264rgb);
+    REGISTER_ENCODER(LIBX265,           libx265);
     REGISTER_ENCODER(LIBXAVS,           libxavs);
     REGISTER_ENCODER(LIBXVID,           libxvid);
     REGISTER_DECODER(LIBZVBI_TELETEXT,  libzvbi_teletext);
@@ -551,6 +562,7 @@
     REGISTER_PARSER(VORBIS,             vorbis);
     REGISTER_PARSER(VP3,                vp3);
     REGISTER_PARSER(VP8,                vp8);
+    REGISTER_PARSER(VP9,                vp9);
 
     /* bitstream filters */
     REGISTER_BSF(AAC_ADTSTOASC,         aac_adtstoasc);
@@ -560,7 +572,6 @@
     REGISTER_BSF(IMX_DUMP_HEADER,       imx_dump_header);
     REGISTER_BSF(MJPEG2JPEG,            mjpeg2jpeg);
     REGISTER_BSF(MJPEGA_DUMP_HEADER,    mjpega_dump_header);
-    REGISTER_BSF(MP3_HEADER_COMPRESS,   mp3_header_compress);
     REGISTER_BSF(MP3_HEADER_DECOMPRESS, mp3_header_decompress);
     REGISTER_BSF(MOV2TEXTSUB,           mov2textsub);
     REGISTER_BSF(NOISE,                 noise);

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/alsdec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/alsdec.c Changed

@@ -688,7 +688,11 @@
         } else {
             *bd->opt_order = sconf->max_order;
         }
-
+        if (*bd->opt_order > bd->block_length) {
+            *bd->opt_order = bd->block_length;
+            av_log(avctx, AV_LOG_ERROR, "Predictor order too large.\n");
+            return AVERROR_INVALIDDATA;
+        }
         opt_order = *bd->opt_order;
 
         if (opt_order) {
@@ -1263,14 +1267,16 @@
     bd->quant_cof   = ctx->quant_cof[c];
     bd->raw_samples = ctx->raw_samples[c] + offset;
 
-    dep = 0;
-    while (!ch[dep].stop_flag) {
+    for (dep = 0; !ch[dep].stop_flag; dep++) {
         unsigned int smp;
         unsigned int begin = 1;
         unsigned int end   = bd->block_length - 1;
         int64_t y;
         int32_t *master = ctx->raw_samples[ch[dep].master_channel] + offset;
 
+        if (ch[dep].master_channel == c)
+            continue;
+
         if (ch[dep].time_diff_flag) {
             int t = ch[dep].time_diff_index;
 
@@ -1302,8 +1308,6 @@
                 bd->raw_samples[smp] += y >> 7;
             }
         }
-
-        dep++;
     }
 
     return 0;
@@ -1391,6 +1395,11 @@
 
         for (b = 0; b < ctx->num_blocks; b++) {
             bd.block_length = div_blocks[b];
+            if (bd.block_length <= 0) {
+                av_log(ctx->avctx, AV_LOG_WARNING,
+                       "Invalid block length %d in channel data!\n", bd.block_length);
+                continue;
+            }
 
             for (c = 0; c < avctx->channels; c++) {
                 bd.const_block = ctx->const_block + c;
@@ -1565,6 +1574,8 @@
         if (ctx->cur_frame_length != sconf->frame_length &&
             ctx->crc_org != ctx->crc) {
             av_log(avctx, AV_LOG_ERROR, "CRC error.\n");
+            if (avctx->err_recognition & AV_EF_EXPLODE)
+                return AVERROR_INVALIDDATA;
         }
     }

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/ansi.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/ansi.c Changed

@@ -91,7 +91,7 @@
     s->bg          = DEFAULT_BG_COLOR;
 
     if (!avctx->width || !avctx->height)
-        avcodec_set_dimensions(avctx, 80<<3, 25<<4);
+        ff_set_dimensions(avctx, 80 << 3, 25 << 4);
 
     return 0;
 }
@@ -182,7 +182,10 @@
 static int execute_code(AVCodecContext * avctx, int c)
 {
     AnsiContext *s = avctx->priv_data;
-    int ret, i, width, height;
+    int ret, i;
+    int width  = avctx->width;
+    int height = avctx->height;
+
     switch(c) {
     case 'A': //Cursor Up
         s->y = FFMAX(s->y - (s->nb_args > 0 ? s->args[0]*s->font_height : s->font_height), 0);
@@ -205,8 +208,6 @@
     case 'l': //reset screen mode
         if (s->nb_args < 2)
             s->args[0] = DEFAULT_SCREEN_MODE;
-        width = avctx->width;
-        height = avctx->height;
         switch(s->args[0]) {
         case 0: case 1: case 4: case 5: case 13: case 19: //320x200 (25 rows)
             s->font = avpriv_cga_font;
@@ -247,7 +248,9 @@
         s->y = av_clip(s->y, 0, height - s->font_height);
         if (width != avctx->width || height != avctx->height) {
             av_frame_unref(s->frame);
-            avcodec_set_dimensions(avctx, width, height);
+            ret = ff_set_dimensions(avctx, width, height);
+            if (ret < 0)
+                return ret;
             if ((ret = ff_get_buffer(avctx, s->frame,
                                      AV_GET_BUFFER_FLAG_REF)) < 0)
                 return ret;
@@ -417,7 +420,7 @@
             switch(buf[0]) {
             case '0': case '1': case '2': case '3': case '4':
             case '5': case '6': case '7': case '8': case '9':
-                if (s->nb_args < MAX_NB_ARGS)
+                if (s->nb_args < MAX_NB_ARGS && s->args[s->nb_args] < 6553)
                     s->args[s->nb_args] = FFMAX(s->args[s->nb_args], 0) * 10 + buf[0] - '0';
                 break;
             case ';':

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/apedec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/apedec.c Changed

@@ -603,10 +603,14 @@
         rice->ksum += out[i];
     }
     rice->k = av_log2(rice->ksum / 10) + 1;
+    if (rice->k >= 24)
+        return;
     for (; i < 64; i++) {
         out[i] = get_rice_ook(&ctx->gb, rice->k);
         rice->ksum += out[i];
         rice->k = av_log2(rice->ksum / ((i + 1) * 2)) + 1;
+        if (rice->k >= 24)
+            return;
     }
     ksummax = 1 << rice->k + 7;
     ksummin = rice->k ? (1 << rice->k + 6) : 0;
@@ -1434,7 +1438,7 @@
         }
         if (s->fileversion < 3950) // previous versions overread two bytes
             buf_size += 2;
-        av_fast_malloc(&s->data, &s->data_size, buf_size);
+        av_fast_padded_malloc(&s->data, &s->data_size, buf_size);
         if (!s->data)
             return AVERROR(ENOMEM);
         s->dsp.bswap_buf((uint32_t*)s->data, (const uint32_t*)buf, buf_size >> 2);
@@ -1456,7 +1460,8 @@
             }
             s->ptr += offset;
         } else {
-            init_get_bits(&s->gb, s->ptr, (s->data_end - s->ptr) * 8);
+            if ((ret = init_get_bits8(&s->gb, s->ptr, s->data_end - s->ptr)) < 0)
+                return ret;
             if (s->fileversion > 3800)
                 skip_bits_long(&s->gb, offset * 8);
             else

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/arm/Makefile -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/arm/Makefile Changed

@@ -15,6 +15,7 @@
                                           arm/fft_fixed_init_arm.o
 OBJS-$(CONFIG_FLAC_DECODER)            += arm/flacdsp_init_arm.o        \
                                           arm/flacdsp_arm.o
+OBJS-$(CONFIG_FLAC_ENCODER)            += arm/flacdsp_init_arm.o
 OBJS-$(CONFIG_H264CHROMA)              += arm/h264chroma_init_arm.o
 OBJS-$(CONFIG_H264DSP)                 += arm/h264dsp_init_arm.o
 OBJS-$(CONFIG_H264PRED)                += arm/h264pred_init_arm.o
@@ -23,6 +24,8 @@
                                           arm/hpeldsp_arm.o
 OBJS-$(CONFIG_MPEGAUDIODSP)            += arm/mpegaudiodsp_init_arm.o
 OBJS-$(CONFIG_MPEGVIDEO)               += arm/mpegvideo_arm.o
+OBJS-$(CONFIG_NEON_CLOBBER_TEST)       += arm/neontest.o
+OBJS-$(CONFIG_VC1_DECODER)             += arm/vc1dsp_init_arm.o
 OBJS-$(CONFIG_VORBIS_DECODER)          += arm/vorbisdsp_init_arm.o
 OBJS-$(CONFIG_VP3DSP)                  += arm/vp3dsp_init_arm.o
 OBJS-$(CONFIG_VP6_DECODER)             += arm/vp6dsp_init_arm.o
@@ -88,6 +91,8 @@
 NEON-OBJS-$(CONFIG_RV30_DECODER)       += arm/rv34dsp_neon.o
 NEON-OBJS-$(CONFIG_RV40_DECODER)       += arm/rv34dsp_neon.o            \
                                           arm/rv40dsp_neon.o
+NEON-OBJS-$(CONFIG_VC1_DECODER)        += arm/vc1dsp_init_neon.o        \
+                                          arm/vc1dsp_neon.o
 NEON-OBJS-$(CONFIG_VORBIS_DECODER)     += arm/vorbisdsp_neon.o
 NEON-OBJS-$(CONFIG_VP3DSP)             += arm/vp3dsp_neon.o
 NEON-OBJS-$(CONFIG_VP6_DECODER)        += arm/vp6dsp_neon.o

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/arm/ac3dsp_init_arm.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/arm/ac3dsp_init_arm.c Changed

@@ -31,6 +31,8 @@
 void ff_ac3_rshift_int32_neon(int32_t *src, unsigned len, unsigned shift);
 void ff_float_to_fixed24_neon(int32_t *dst, const float *src, unsigned int len);
 void ff_ac3_extract_exponents_neon(uint8_t *exp, int32_t *coef, int nb_coefs);
+void ff_apply_window_int16_neon(int16_t *dst, const int16_t *src,
+                                const int16_t *window, unsigned n);
 void ff_ac3_sum_square_butterfly_int32_neon(int64_t sum[4],
                                             const int32_t *coef0,
                                             const int32_t *coef1,
@@ -64,6 +66,7 @@
         c->ac3_rshift_int32      = ff_ac3_rshift_int32_neon;
         c->float_to_fixed24      = ff_float_to_fixed24_neon;
         c->extract_exponents     = ff_ac3_extract_exponents_neon;
+        c->apply_window_int16    = ff_apply_window_int16_neon;
         c->sum_square_butterfly_int32 = ff_ac3_sum_square_butterfly_int32_neon;
         c->sum_square_butterfly_float = ff_ac3_sum_square_butterfly_float_neon;
     }

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/arm/ac3dsp_neon.S -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/arm/ac3dsp_neon.S Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/arm/dca.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/arm/dca.h Changed

@@ -24,6 +24,7 @@
 #include <stdint.h>
 
 #include "config.h"
+#include "libavcodec/dcadsp.h"
 #include "libavcodec/mathops.h"
 
 #if HAVE_ARMV6_INLINE && AV_GCC_VERSION_AT_LEAST(4,4) && !CONFIG_THUMB
@@ -78,26 +79,4 @@
 
 #endif
 
-#if HAVE_NEON_INLINE && HAVE_ASM_MOD_Y
-
-#define int8x8_fmul_int32 int8x8_fmul_int32
-static inline void int8x8_fmul_int32(float *dst, const int8_t *src, int scale)
-{
-    __asm__ ("vcvt.f32.s32 %2,  %2,  #4         \n"
-             "vld1.8       {d0},     [%1,:64]   \n"
-             "vmovl.s8     q0,  d0              \n"
-             "vmovl.s16    q1,  d1              \n"
-             "vmovl.s16    q0,  d0              \n"
-             "vcvt.f32.s32 q0,  q0              \n"
-             "vcvt.f32.s32 q1,  q1              \n"
-             "vmul.f32     q0,  q0,  %y2        \n"
-             "vmul.f32     q1,  q1,  %y2        \n"
-             "vst1.32      {q0-q1},  [%m0,:128] \n"
-             : "=Um"(*(float (*)[8])dst)
-             : "r"(src), "x"(scale)
-             : "d0", "d1", "d2", "d3");
-}
-
-#endif
-
 #endif /* AVCODEC_ARM_DCA_H */

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/arm/dcadsp_init_arm.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/arm/dcadsp_init_arm.c Changed

@@ -24,16 +24,18 @@
 #include "libavutil/attributes.h"
 #include "libavcodec/dcadsp.h"
 
-void ff_dca_lfe_fir_vfp(float *out, const float *in, const float *coefs,
-                        int decifactor, float scale);
+void ff_dca_lfe_fir0_neon(float *out, const float *in, const float *coefs);
+void ff_dca_lfe_fir1_neon(float *out, const float *in, const float *coefs);
+
+void ff_dca_lfe_fir32_vfp(float *out, const float *in, const float *coefs);
+void ff_dca_lfe_fir64_vfp(float *out, const float *in, const float *coefs);
+
 void ff_dca_qmf_32_subbands_vfp(float samples_in[32][8], int sb_act,
                                 SynthFilterContext *synth, FFTContext *imdct,
                                 float synth_buf_ptr[512],
                                 int *synth_buf_offset, float synth_buf2[32],
                                 const float window[512], float *samples_out,
                                 float raXin[32], float scale);
-void ff_dca_lfe_fir_neon(float *out, const float *in, const float *coefs,
-                         int decifactor, float scale);
 
 void ff_synth_filter_float_vfp(FFTContext *imdct,
                                float *synth_buf_ptr, int *synth_buf_offset,
@@ -47,16 +49,26 @@
                                 float out[32], const float in[32],
                                 float scale);
 
+void ff_decode_hf_neon(float dst[DCA_SUBBANDS][8],
+                       const int32_t vq_num[DCA_SUBBANDS],
+                       const int8_t hf_vq[1024][32], intptr_t vq_offset,
+                       int32_t scale[DCA_SUBBANDS][2],
+                       intptr_t start, intptr_t end);
+
 av_cold void ff_dcadsp_init_arm(DCADSPContext *s)
 {
     int cpu_flags = av_get_cpu_flags();
 
     if (have_vfp(cpu_flags) && !have_vfpv3(cpu_flags)) {
-        s->lfe_fir = ff_dca_lfe_fir_vfp;
+        s->lfe_fir[0]      = ff_dca_lfe_fir32_vfp;
+        s->lfe_fir[1]      = ff_dca_lfe_fir64_vfp;
         s->qmf_32_subbands = ff_dca_qmf_32_subbands_vfp;
     }
-    if (have_neon(cpu_flags))
-        s->lfe_fir = ff_dca_lfe_fir_neon;
+    if (have_neon(cpu_flags)) {
+        s->lfe_fir[0] = ff_dca_lfe_fir0_neon;
+        s->lfe_fir[1] = ff_dca_lfe_fir1_neon;
+        s->decode_hf  = ff_decode_hf_neon;
+    }
 }
 
 av_cold void ff_synth_filter_init_arm(SynthFilterContext *s)

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/arm/dcadsp_neon.S -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/arm/dcadsp_neon.S Changed

@@ -20,17 +20,50 @@
 
 #include "libavutil/arm/asm.S"
 
-function ff_dca_lfe_fir_neon, export=1
+function ff_decode_hf_neon, export=1
+        push            {r4-r5,lr}
+        add             r2,  r2,  r3
+        ldr             r3,       [sp, #12]
+        ldrd            r4,  r5,  [sp, #16]
+        add             r3,  r3,  r4, lsl #3
+        add             r1,  r1,  r4, lsl #2
+        add             r0,  r0,  r4, lsl #5
+
+1:      ldr_post        lr,  r1,  #4
+        add             r4,  r4,  #1
+        add             lr,  r2,  lr, lsl #5
+        cmp             r4,  r5
+        vld1.32         {d7},     [r3]!
+        vld1.8          {d0},     [lr,:64]
+        vcvt.f32.s32    d7,  d7,  #4
+        vmovl.s8        q1,  d0
+        vmovl.s16       q0,  d2
+        vmovl.s16       q1,  d3
+        vcvt.f32.s32    q0,  q0
+        vcvt.f32.s32    q1,  q1
+        vmul.f32        q0,  q0,  d7[0]
+        vmul.f32        q1,  q1,  d7[0]
+        vst1.32         {q0-q1},  [r0,:128]!
+        bne             1b
+
+        pop             {r4-r5,pc}
+endfunc
+
+function ff_dca_lfe_fir0_neon, export=1
         push            {r4-r6,lr}
+        mov             r3,  #32                @ decifactor
+        mov             r6,  #256/32
+        b               dca_lfe_fir
+endfunc
 
+function ff_dca_lfe_fir1_neon, export=1
+        push            {r4-r6,lr}
+        mov             r3,  #64                @ decifactor
+        mov             r6,  #256/64
+dca_lfe_fir:
         add             r4,  r0,  r3,  lsl #2   @ out2
         add             r5,  r2,  #256*4-16     @ cf1
         sub             r1,  r1,  #12
-        cmp             r3,  #32
-        ite             eq
-        moveq           r6,  #256/32
-        movne           r6,  #256/64
-NOVFP   vldr            s0,  [sp, #16]          @ scale
         mov             lr,  #-16
 1:
         vmov.f32        q2,  #0.0               @ v0
@@ -51,8 +84,7 @@
         subs            r3,  r3,  #1
         vadd.f32        d4,  d4,  d5
         vadd.f32        d6,  d6,  d7
-        vpadd.f32       d4,  d4,  d6
-        vmul.f32        d5,  d4,  d0[0]
+        vpadd.f32       d5,  d4,  d6
         vst1.32         {d5[0]},  [r0,:32]!
         vst1.32         {d5[1]},  [r4,:32]!
         bne             1b

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/arm/dcadsp_vfp.S -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/arm/dcadsp_vfp.S Changed

@@ -24,12 +24,9 @@
 POUT          .req    a1
 PIN           .req    a2
 PCOEF         .req    a3
-DECIFACTOR    .req    a4
 OLDFPSCR      .req    a4
 COUNTER       .req    ip
 
-SCALE32       .req    s28  @ use vector of 4 in place of 9th scalar when decifactor=32 / JMAX=8
-SCALE64       .req    s0   @ spare register in scalar bank when decifactor=64 / JMAX=4
 IN0           .req    s4
 IN1           .req    s5
 IN2           .req    s6
@@ -77,9 +74,6 @@
         vldr    COEF5, [PCOEF, #X + (1*JMAX + 1) * Y]
         vldr    COEF6, [PCOEF, #X + (2*JMAX + 1) * Y]
  .endif
- .ifnc "\tail",""
-        vmul.f  POST0, POST0, SCALE\decifactor  @ vector operation (SCALE may be scalar)
- .endif
  .ifnc "\head",""
         vldr    COEF7, [PCOEF, #X + (3*JMAX + 1) * Y]
    .ifc "\tail",""
@@ -129,10 +123,17 @@
 .endm
 
 .macro dca_lfe_fir  decifactor
+function ff_dca_lfe_fir\decifactor\()_vfp, export=1
+        fmrx    OLDFPSCR, FPSCR
+        ldr     ip, =0x03030000         @ RunFast mode, short vectors of length 4, stride 1
+        fmxr    FPSCR, ip
+        vldr    IN0, [PIN, #-0*4]
+        vldr    IN1, [PIN, #-1*4]
+        vldr    IN2, [PIN, #-2*4]
+        vldr    IN3, [PIN, #-3*4]
  .if \decifactor == 32
   .set JMAX, 8
         vpush   {s16-s31}
-        vmov    SCALE32, s0             @ duplicate scalar across vector
         vldr    IN4, [PIN, #-4*4]
         vldr    IN5, [PIN, #-5*4]
         vldr    IN6, [PIN, #-6*4]
@@ -165,37 +166,19 @@
  .endif
         fmxr    FPSCR, OLDFPSCR
         bx      lr
+endfunc
 .endm
 
-
-/* void ff_dca_lfe_fir_vfp(float *out, const float *in, const float *coefs,
- *                         int decifactor, float scale)
- */
-function ff_dca_lfe_fir_vfp, export=1
-        teq     DECIFACTOR, #32
-        fmrx    OLDFPSCR, FPSCR
-        ldr     ip, =0x03030000         @ RunFast mode, short vectors of length 4, stride 1
-        fmxr    FPSCR, ip
-NOVFP   vldr    s0, [sp]
-        vldr    IN0, [PIN, #-0*4]
-        vldr    IN1, [PIN, #-1*4]
-        vldr    IN2, [PIN, #-2*4]
-        vldr    IN3, [PIN, #-3*4]
-        beq     32f
-64:     dca_lfe_fir  64
+        dca_lfe_fir  64
  .ltorg
-32:     dca_lfe_fir  32
-endfunc
+        dca_lfe_fir  32
 
         .unreq  POUT
         .unreq  PIN
         .unreq  PCOEF
-        .unreq  DECIFACTOR
         .unreq  OLDFPSCR
         .unreq  COUNTER
 
-        .unreq  SCALE32
-        .unreq  SCALE64
         .unreq  IN0
         .unreq  IN1
         .unreq  IN2

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/arm/dsputil_arm.S -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/arm/dsputil_arm.S Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/arm/dsputil_arm.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/arm/dsputil_arm.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/arm/dsputil_init_neon.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/arm/dsputil_init_neon.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/arm/dsputil_neon.S -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/arm/dsputil_neon.S Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/arm/fft_fixed_init_arm.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/arm/fft_fixed_init_arm.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/arm/flacdsp_init_arm.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/arm/flacdsp_init_arm.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/arm/fmtconvert_neon.S -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/arm/fmtconvert_neon.S Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/arm/h264cmc_neon.S -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/arm/h264cmc_neon.S Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/arm/h264dsp_armv6.S -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/arm/h264dsp_armv6.S Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/arm/h264dsp_init_arm.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/arm/h264dsp_init_arm.c Changed

@@ -75,30 +75,30 @@
 {
 #if HAVE_NEON
     if (bit_depth == 8) {
-    c->h264_v_loop_filter_luma   = ff_h264_v_loop_filter_luma_neon;
-    c->h264_h_loop_filter_luma   = ff_h264_h_loop_filter_luma_neon;
-    if(chroma_format_idc == 1){
-    c->h264_v_loop_filter_chroma = ff_h264_v_loop_filter_chroma_neon;
-    c->h264_h_loop_filter_chroma = ff_h264_h_loop_filter_chroma_neon;
-    }
+        c->h264_v_loop_filter_luma   = ff_h264_v_loop_filter_luma_neon;
+        c->h264_h_loop_filter_luma   = ff_h264_h_loop_filter_luma_neon;
+        if(chroma_format_idc == 1){
+        c->h264_v_loop_filter_chroma = ff_h264_v_loop_filter_chroma_neon;
+        c->h264_h_loop_filter_chroma = ff_h264_h_loop_filter_chroma_neon;
+        }
 
-    c->weight_h264_pixels_tab[0] = ff_weight_h264_pixels_16_neon;
-    c->weight_h264_pixels_tab[1] = ff_weight_h264_pixels_8_neon;
-    c->weight_h264_pixels_tab[2] = ff_weight_h264_pixels_4_neon;
+        c->weight_h264_pixels_tab[0] = ff_weight_h264_pixels_16_neon;
+        c->weight_h264_pixels_tab[1] = ff_weight_h264_pixels_8_neon;
+        c->weight_h264_pixels_tab[2] = ff_weight_h264_pixels_4_neon;
 
-    c->biweight_h264_pixels_tab[0] = ff_biweight_h264_pixels_16_neon;
-    c->biweight_h264_pixels_tab[1] = ff_biweight_h264_pixels_8_neon;
-    c->biweight_h264_pixels_tab[2] = ff_biweight_h264_pixels_4_neon;
+        c->biweight_h264_pixels_tab[0] = ff_biweight_h264_pixels_16_neon;
+        c->biweight_h264_pixels_tab[1] = ff_biweight_h264_pixels_8_neon;
+        c->biweight_h264_pixels_tab[2] = ff_biweight_h264_pixels_4_neon;
 
-    c->h264_idct_add        = ff_h264_idct_add_neon;
-    c->h264_idct_dc_add     = ff_h264_idct_dc_add_neon;
-    c->h264_idct_add16      = ff_h264_idct_add16_neon;
-    c->h264_idct_add16intra = ff_h264_idct_add16intra_neon;
-    if (chroma_format_idc == 1)
-        c->h264_idct_add8   = ff_h264_idct_add8_neon;
-    c->h264_idct8_add       = ff_h264_idct8_add_neon;
-    c->h264_idct8_dc_add    = ff_h264_idct8_dc_add_neon;
-    c->h264_idct8_add4      = ff_h264_idct8_add4_neon;
+        c->h264_idct_add        = ff_h264_idct_add_neon;
+        c->h264_idct_dc_add     = ff_h264_idct_dc_add_neon;
+        c->h264_idct_add16      = ff_h264_idct_add16_neon;
+        c->h264_idct_add16intra = ff_h264_idct_add16intra_neon;
+        if (chroma_format_idc <= 1)
+            c->h264_idct_add8   = ff_h264_idct_add8_neon;
+        c->h264_idct8_add       = ff_h264_idct8_add_neon;
+        c->h264_idct8_dc_add    = ff_h264_idct8_dc_add_neon;
+        c->h264_idct8_add4      = ff_h264_idct8_add4_neon;
     }
 #endif // HAVE_NEON
 }

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/arm/h264idct_neon.S -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/arm/h264idct_neon.S Changed

@@ -113,8 +113,8 @@
         movne           lr,  #0
         cmp             lr,  #0
         ite             ne
-        adrne           lr,  ff_h264_idct_dc_add_neon + CONFIG_THUMB
-        adreq           lr,  ff_h264_idct_add_neon    + CONFIG_THUMB
+        adrne           lr,  X(ff_h264_idct_dc_add_neon) + CONFIG_THUMB
+        adreq           lr,  X(ff_h264_idct_add_neon)    + CONFIG_THUMB
         blx             lr
 2:      subs            ip,  ip,  #1
         add             r1,  r1,  #32
@@ -138,8 +138,8 @@
         cmp             r8,  #0
         ldrsh           r8,  [r1]
         iteet           ne
-        adrne           lr,  ff_h264_idct_add_neon    + CONFIG_THUMB
-        adreq           lr,  ff_h264_idct_dc_add_neon + CONFIG_THUMB
+        adrne           lr,  X(ff_h264_idct_add_neon)    + CONFIG_THUMB
+        adreq           lr,  X(ff_h264_idct_dc_add_neon) + CONFIG_THUMB
         cmpeq           r8,  #0
         blxne           lr
         subs            ip,  ip,  #1
@@ -166,8 +166,8 @@
         cmp             r8,  #0
         ldrsh           r8,  [r1]
         iteet           ne
-        adrne           lr,  ff_h264_idct_add_neon    + CONFIG_THUMB
-        adreq           lr,  ff_h264_idct_dc_add_neon + CONFIG_THUMB
+        adrne           lr,  X(ff_h264_idct_add_neon)    + CONFIG_THUMB
+        adreq           lr,  X(ff_h264_idct_dc_add_neon) + CONFIG_THUMB
         cmpeq           r8,  #0
         blxne           lr
         add             r12, r12, #1
@@ -388,8 +388,8 @@
         movne           lr,  #0
         cmp             lr,  #0
         ite             ne
-        adrne           lr,  ff_h264_idct8_dc_add_neon + CONFIG_THUMB
-        adreq           lr,  ff_h264_idct8_add_neon    + CONFIG_THUMB
+        adrne           lr,  X(ff_h264_idct8_dc_add_neon) + CONFIG_THUMB
+        adreq           lr,  X(ff_h264_idct8_add_neon)    + CONFIG_THUMB
         blx             lr
 2:      subs            r12, r12, #4
         add             r1,  r1,  #128

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/arm/hpeldsp_arm.S -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/arm/hpeldsp_arm.S Changed

@@ -89,8 +89,7 @@
 .endm
 
 @ ----------------------------------------------------------------
-        .align 5
-function ff_put_pixels16_arm, export=1
+function ff_put_pixels16_arm, export=1, align=5
         @ void func(uint8_t *block, const uint8_t *pixels, int line_size, int h)
         @ block = word aligned, pixles = unaligned
         pld             [r1]
@@ -141,8 +140,7 @@
 endfunc
 
 @ ----------------------------------------------------------------
-        .align 5
-function ff_put_pixels8_arm, export=1
+function ff_put_pixels8_arm, export=1, align=5
         @ void func(uint8_t *block, const uint8_t *pixels, int line_size, int h)
         @ block = word aligned, pixles = unaligned
         pld             [r1]
@@ -193,8 +191,7 @@
 endfunc
 
 @ ----------------------------------------------------------------
-        .align 5
-function ff_put_pixels8_x2_arm, export=1
+function ff_put_pixels8_x2_arm, export=1, align=5
         @ void func(uint8_t *block, const uint8_t *pixels, int line_size, int h)
         @ block = word aligned, pixles = unaligned
         pld             [r1]
@@ -252,8 +249,7 @@
         pop             {r4-r10,pc}
 endfunc
 
-        .align 5
-function ff_put_no_rnd_pixels8_x2_arm, export=1
+function ff_put_no_rnd_pixels8_x2_arm, export=1, align=5
         @ void func(uint8_t *block, const uint8_t *pixels, int line_size, int h)
         @ block = word aligned, pixles = unaligned
         pld             [r1]
@@ -313,8 +309,7 @@
 
 
 @ ----------------------------------------------------------------
-        .align 5
-function ff_put_pixels8_y2_arm, export=1
+function ff_put_pixels8_y2_arm, export=1, align=5
         @ void func(uint8_t *block, const uint8_t *pixels, int line_size, int h)
         @ block = word aligned, pixles = unaligned
         pld             [r1]
@@ -411,8 +406,7 @@
         pop             {r4-r11,pc}
 endfunc
 
-        .align 5
-function ff_put_no_rnd_pixels8_y2_arm, export=1
+function ff_put_no_rnd_pixels8_y2_arm, export=1, align=5
         @ void func(uint8_t *block, const uint8_t *pixels, int line_size, int h)
         @ block = word aligned, pixles = unaligned
         pld             [r1]
@@ -578,8 +572,7 @@
         pop             {r4-r11,pc}
 .endm
 
-        .align 5
-function ff_put_pixels8_xy2_arm, export=1
+function ff_put_pixels8_xy2_arm, export=1, align=5
         @ void func(uint8_t *block, const uint8_t *pixels, int line_size, int h)
         @ block = word aligned, pixles = unaligned
         pld             [r1]
@@ -594,8 +587,7 @@
 4:      RND_XY2_EXPAND  3, lsl
 endfunc
 
-        .align 5
-function ff_put_no_rnd_pixels8_xy2_arm, export=1
+function ff_put_no_rnd_pixels8_xy2_arm, export=1, align=5
         @ void func(uint8_t *block, const uint8_t *pixels, int line_size, int h)
         @ block = word aligned, pixles = unaligned
         pld             [r1]

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/arm/hpeldsp_arm.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/arm/hpeldsp_arm.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/arm/hpeldsp_armv6.S -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/arm/hpeldsp_armv6.S Changed

@@ -23,11 +23,11 @@
 .macro  call_2x_pixels  type, subp
 function ff_\type\()_pixels16\subp\()_armv6, export=1
         push            {r0-r3, lr}
-        bl              ff_\type\()_pixels8\subp\()_armv6
+        bl              X(ff_\type\()_pixels8\subp\()_armv6)
         pop             {r0-r3, lr}
         add             r0,  r0,  #8
         add             r1,  r1,  #8
-        b               ff_\type\()_pixels8\subp\()_armv6
+        b               X(ff_\type\()_pixels8\subp\()_armv6)
 endfunc
 .endm
 
@@ -144,10 +144,11 @@
         eor             r7,  r5,  r7
         uadd8           r10, r10, r6
         and             r7,  r7,  r12
-        ldr_pre         r6,  r1,  r2
+        ldrc_pre        ne,  r6,  r1,  r2
         uadd8           r11, r11, r7
         strd_post       r8,  r9,  r0,  r2
-        ldr             r7,  [r1, #4]
+        it              ne
+        ldrne           r7,  [r1, #4]
         strd_post       r10, r11, r0,  r2
         bne             1b
 
@@ -196,9 +197,10 @@
         uhadd8          r9,  r5,  r7
         ldr             r5,  [r1, #4]
         uhadd8          r12, r4,  r6
-        ldr_pre         r6,  r1,  r2
+        ldrc_pre        ne,  r6,  r1,  r2
         uhadd8          r14, r5,  r7
-        ldr             r7,  [r1, #4]
+        it              ne
+        ldrne           r7,  [r1, #4]
         stm             r0,  {r8,r9}
         add             r0,  r0,  r2
         stm             r0,  {r12,r14}

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/arm/int_neon.S -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/arm/int_neon.S Changed

@@ -21,8 +21,6 @@
 
 #include "libavutil/arm/asm.S"
 
-        .fpu neon
-
 function ff_scalarproduct_int16_neon, export=1
         vmov.i16        q0,  #0
         vmov.i16        q1,  #0
@@ -37,14 +35,14 @@
         vmlal.s16       q2,  d18,  d22
         vmlal.s16       q3,  d19,  d23
         subs            r2,  r2,   #16
-        bne             1b
+        bgt             1b
 
         vpadd.s32       d16, d0,   d1
         vpadd.s32       d17, d2,   d3
-        vpadd.s32       d10, d4,   d5
-        vpadd.s32       d11, d6,   d7
+        vpadd.s32       d18, d4,   d5
+        vpadd.s32       d19, d6,   d7
         vpadd.s32       d0,  d16,  d17
-        vpadd.s32       d1,  d10,  d11
+        vpadd.s32       d1,  d18,  d19
         vpadd.s32       d2,  d0,   d1
         vpaddl.s32      d3,  d2
         vmov.32         r0,  d3[0]
@@ -77,14 +75,14 @@
         vst1.16         {q10},     [r12,:128]!
         subs            r3,  r3,   #16
         vst1.16         {q13},     [r12,:128]!
-        bne             1b
+        bgt             1b
 
         vpadd.s32       d16, d0,   d1
         vpadd.s32       d17, d2,   d3
-        vpadd.s32       d10, d4,   d5
-        vpadd.s32       d11, d6,   d7
+        vpadd.s32       d18, d4,   d5
+        vpadd.s32       d19, d6,   d7
         vpadd.s32       d0,  d16,  d17
-        vpadd.s32       d1,  d10,  d11
+        vpadd.s32       d1,  d18,  d19
         vpadd.s32       d2,  d0,   d1
         vpaddl.s32      d3,  d2
         vmov.32         r0,  d3[0]

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/arm/mdct_neon.S -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/arm/mdct_neon.S Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/arm/mpegvideo_arm.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/arm/mpegvideo_arm.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/arm/mpegvideo_neon.S -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/arm/mpegvideo_neon.S Changed

omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/arm/neontest.c Added

@@ -0,0 +1,79 @@
+/*
+ * check NEON registers for clobbers
+ * Copyright (c) 2013 Martin Storsjo
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "libavcodec/avcodec.h"
+#include "libavutil/arm/neontest.h"
+
+wrap(avcodec_open2(AVCodecContext *avctx,
+                   AVCodec *codec,
+                   AVDictionary **options))
+{
+    testneonclobbers(avcodec_open2, avctx, codec, options);
+}
+
+wrap(avcodec_decode_audio4(AVCodecContext *avctx,
+                           AVFrame *frame,
+                           int *got_frame_ptr,
+                           AVPacket *avpkt))
+{
+    testneonclobbers(avcodec_decode_audio4, avctx, frame,
+                     got_frame_ptr, avpkt);
+}
+
+wrap(avcodec_decode_video2(AVCodecContext *avctx,
+                           AVFrame *picture,
+                           int *got_picture_ptr,
+                           AVPacket *avpkt))
+{
+    testneonclobbers(avcodec_decode_video2, avctx, picture,
+                     got_picture_ptr, avpkt);
+}
+
+wrap(avcodec_decode_subtitle2(AVCodecContext *avctx,
+                              AVSubtitle *sub,
+                              int *got_sub_ptr,
+                              AVPacket *avpkt))
+{
+    testneonclobbers(avcodec_decode_subtitle2, avctx, sub,
+                     got_sub_ptr, avpkt);
+}
+
+wrap(avcodec_encode_audio2(AVCodecContext *avctx,
+                           AVPacket *avpkt,
+                           const AVFrame *frame,
+                           int *got_packet_ptr))
+{
+    testneonclobbers(avcodec_encode_audio2, avctx, avpkt, frame,
+                     got_packet_ptr);
+}
+
+wrap(avcodec_encode_subtitle(AVCodecContext *avctx,
+                             uint8_t *buf, int buf_size,
+                             const AVSubtitle *sub))
+{
+    testneonclobbers(avcodec_encode_subtitle, avctx, buf, buf_size, sub);
+}
+
+wrap(avcodec_encode_video2(AVCodecContext *avctx, AVPacket *avpkt,
+                           const AVFrame *frame, int *got_packet_ptr))
+{
+    testneonclobbers(avcodec_encode_video2, avctx, avpkt, frame, got_packet_ptr);
+}

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/arm/simple_idct_arm.S -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/arm/simple_idct_arm.S Changed

omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/arm/vc1dsp.h Added

omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/arm/vc1dsp_init_arm.c Added

@@ -0,0 +1,32 @@
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <stdint.h>
+
+#include "libavutil/attributes.h"
+#include "libavutil/arm/cpu.h"
+#include "libavcodec/vc1dsp.h"
+#include "vc1dsp.h"
+
+av_cold void ff_vc1dsp_init_arm(VC1DSPContext *dsp)
+{
+    int cpu_flags = av_get_cpu_flags();
+
+    if (have_neon(cpu_flags))
+        ff_vc1dsp_init_neon(dsp);
+}

omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/arm/vc1dsp_init_neon.c Added

@@ -0,0 +1,114 @@
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <stdint.h>
+
+#include "libavutil/attributes.h"
+#include "libavcodec/vc1dsp.h"
+#include "vc1dsp.h"
+
+void ff_vc1_inv_trans_8x8_neon(int16_t *block);
+void ff_vc1_inv_trans_4x8_neon(uint8_t *dest, int linesize, int16_t *block);
+void ff_vc1_inv_trans_8x4_neon(uint8_t *dest, int linesize, int16_t *block);
+void ff_vc1_inv_trans_4x4_neon(uint8_t *dest, int linesize, int16_t *block);
+
+void ff_vc1_inv_trans_8x8_dc_neon(uint8_t *dest, int linesize, int16_t *block);
+void ff_vc1_inv_trans_4x8_dc_neon(uint8_t *dest, int linesize, int16_t *block);
+void ff_vc1_inv_trans_8x4_dc_neon(uint8_t *dest, int linesize, int16_t *block);
+void ff_vc1_inv_trans_4x4_dc_neon(uint8_t *dest, int linesize, int16_t *block);
+
+void ff_put_pixels8x8_neon(uint8_t *block, const uint8_t *pixels,
+                           ptrdiff_t line_size, int rnd);
+
+void ff_put_vc1_mspel_mc10_neon(uint8_t *dst, const uint8_t *src,
+                                ptrdiff_t stride, int rnd);
+void ff_put_vc1_mspel_mc20_neon(uint8_t *dst, const uint8_t *src,
+                                ptrdiff_t stride, int rnd);
+void ff_put_vc1_mspel_mc30_neon(uint8_t *dst, const uint8_t *src,
+                                ptrdiff_t stride, int rnd);
+
+void ff_put_vc1_mspel_mc01_neon(uint8_t *dst, const uint8_t *src,
+                                ptrdiff_t stride, int rnd);
+void ff_put_vc1_mspel_mc02_neon(uint8_t *dst, const uint8_t *src,
+                                ptrdiff_t stride, int rnd);
+void ff_put_vc1_mspel_mc03_neon(uint8_t *dst, const uint8_t *src,
+                                ptrdiff_t stride, int rnd);
+
+void ff_put_vc1_mspel_mc11_neon(uint8_t *dst, const uint8_t *src,
+                                ptrdiff_t stride, int rnd);
+void ff_put_vc1_mspel_mc12_neon(uint8_t *dst, const uint8_t *src,
+                                ptrdiff_t stride, int rnd);
+void ff_put_vc1_mspel_mc13_neon(uint8_t *dst, const uint8_t *src,
+                                ptrdiff_t stride, int rnd);
+
+void ff_put_vc1_mspel_mc21_neon(uint8_t *dst, const uint8_t *src,
+                                ptrdiff_t stride, int rnd);
+void ff_put_vc1_mspel_mc22_neon(uint8_t *dst, const uint8_t *src,
+                                ptrdiff_t stride, int rnd);
+void ff_put_vc1_mspel_mc23_neon(uint8_t *dst, const uint8_t *src,
+                                ptrdiff_t stride, int rnd);
+
+void ff_put_vc1_mspel_mc31_neon(uint8_t *dst, const uint8_t *src,
+                                ptrdiff_t stride, int rnd);
+void ff_put_vc1_mspel_mc32_neon(uint8_t *dst, const uint8_t *src,
+                                ptrdiff_t stride, int rnd);
+void ff_put_vc1_mspel_mc33_neon(uint8_t *dst, const uint8_t *src,
+                                ptrdiff_t stride, int rnd);
+
+void ff_put_vc1_chroma_mc8_neon(uint8_t *dst, uint8_t *src, int stride, int h,
+                                int x, int y);
+void ff_avg_vc1_chroma_mc8_neon(uint8_t *dst, uint8_t *src, int stride, int h,
+                                int x, int y);
+void ff_put_vc1_chroma_mc4_neon(uint8_t *dst, uint8_t *src, int stride, int h,
+                                int x, int y);
+void ff_avg_vc1_chroma_mc4_neon(uint8_t *dst, uint8_t *src, int stride, int h,
+                                int x, int y);
+
+av_cold void ff_vc1dsp_init_neon(VC1DSPContext *dsp)
+{
+    dsp->vc1_inv_trans_8x8 = ff_vc1_inv_trans_8x8_neon;
+    dsp->vc1_inv_trans_4x8 = ff_vc1_inv_trans_4x8_neon;
+    dsp->vc1_inv_trans_8x4 = ff_vc1_inv_trans_8x4_neon;
+    dsp->vc1_inv_trans_4x4 = ff_vc1_inv_trans_4x4_neon;
+    dsp->vc1_inv_trans_8x8_dc = ff_vc1_inv_trans_8x8_dc_neon;
+    dsp->vc1_inv_trans_4x8_dc = ff_vc1_inv_trans_4x8_dc_neon;
+    dsp->vc1_inv_trans_8x4_dc = ff_vc1_inv_trans_8x4_dc_neon;
+    dsp->vc1_inv_trans_4x4_dc = ff_vc1_inv_trans_4x4_dc_neon;
+
+    dsp->put_vc1_mspel_pixels_tab[ 0] = ff_put_pixels8x8_neon;
+    dsp->put_vc1_mspel_pixels_tab[ 1] = ff_put_vc1_mspel_mc10_neon;
+    dsp->put_vc1_mspel_pixels_tab[ 2] = ff_put_vc1_mspel_mc20_neon;
+    dsp->put_vc1_mspel_pixels_tab[ 3] = ff_put_vc1_mspel_mc30_neon;
+    dsp->put_vc1_mspel_pixels_tab[ 4] = ff_put_vc1_mspel_mc01_neon;
+    dsp->put_vc1_mspel_pixels_tab[ 5] = ff_put_vc1_mspel_mc11_neon;
+    dsp->put_vc1_mspel_pixels_tab[ 6] = ff_put_vc1_mspel_mc21_neon;
+    dsp->put_vc1_mspel_pixels_tab[ 7] = ff_put_vc1_mspel_mc31_neon;
+    dsp->put_vc1_mspel_pixels_tab[ 8] = ff_put_vc1_mspel_mc02_neon;
+    dsp->put_vc1_mspel_pixels_tab[ 9] = ff_put_vc1_mspel_mc12_neon;
+    dsp->put_vc1_mspel_pixels_tab[10] = ff_put_vc1_mspel_mc22_neon;
+    dsp->put_vc1_mspel_pixels_tab[11] = ff_put_vc1_mspel_mc32_neon;
+    dsp->put_vc1_mspel_pixels_tab[12] = ff_put_vc1_mspel_mc03_neon;
+    dsp->put_vc1_mspel_pixels_tab[13] = ff_put_vc1_mspel_mc13_neon;
+    dsp->put_vc1_mspel_pixels_tab[14] = ff_put_vc1_mspel_mc23_neon;
+    dsp->put_vc1_mspel_pixels_tab[15] = ff_put_vc1_mspel_mc33_neon;
+
+    dsp->put_no_rnd_vc1_chroma_pixels_tab[0] = ff_put_vc1_chroma_mc8_neon;
+    dsp->avg_no_rnd_vc1_chroma_pixels_tab[0] = ff_avg_vc1_chroma_mc8_neon;
+    dsp->put_no_rnd_vc1_chroma_pixels_tab[1] = ff_put_vc1_chroma_mc4_neon;
+    dsp->avg_no_rnd_vc1_chroma_pixels_tab[1] = ff_avg_vc1_chroma_mc4_neon;
+}

omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/arm/vc1dsp_neon.S Added

@@ -0,0 +1,1170 @@
+/*
+ * VC1 NEON optimisations
+ *
+ * Copyright (c) 2010 Rob Clark <rob@ti.com>
+ * Copyright (c) 2011 Mans Rullgard <mans@mansr.com>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "libavutil/arm/asm.S"
+#include "neon.S"
+
+@ Transpose rows into columns of a matrix of 16-bit elements. For 4x4, pass
+@ double-word registers, for 8x4, pass quad-word registers.
+.macro transpose16 r0, r1, r2, r3
+        @ At this point:
+        @   row[0]  r0
+        @   row[1]  r1
+        @   row[2]  r2
+        @   row[3]  r3
+
+        vtrn.16         \r0,  \r1         @ first and second row
+        vtrn.16         \r2,  \r3         @ third and fourth row
+        vtrn.32         \r0,  \r2         @ first and third row
+        vtrn.32         \r1,  \r3         @ second and fourth row
+
+        @ At this point, if registers are quad-word:
+        @   column[0]   d0
+        @   column[1]   d2
+        @   column[2]   d4
+        @   column[3]   d6
+        @   column[4]   d1
+        @   column[5]   d3
+        @   column[6]   d5
+        @   column[7]   d7
+
+        @ At this point, if registers are double-word:
+        @   column[0]   d0
+        @   column[1]   d1
+        @   column[2]   d2
+        @   column[3]   d3
+.endm
+
+@ ff_vc1_inv_trans_{4,8}x{4,8}_neon and overflow: The input values in the file
+@ are supposed to be in a specific range as to allow for 16-bit math without
+@ causing overflows, but sometimes the input values are just big enough to
+@ barely cause overflow in vadd instructions like:
+@
+@   vadd.i16  q0, q8, q10
+@   vshr.s16  q0, q0, #\rshift
+@
+@ To prevent these borderline cases from overflowing, we just need one more
+@ bit of precision, which is accomplished by replacing the sequence above with:
+@
+@   vhadd.s16 q0, q8, q10
+@   vshr.s16  q0, q0, #(\rshift -1)
+@
+@ This works because vhadd is a single instruction that adds, then shifts to
+@ the right once, all before writing the result to the destination register.
+@
+@ Even with this workaround, there were still some files that caused overflows
+@ in ff_vc1_inv_trans_8x8_neon. See the comments in ff_vc1_inv_trans_8x8_neon
+@ for the additional workaround.
+
+@ Takes 4 columns of 8 values each and operates on it. Modeled after the first
+@ for loop in vc1_inv_trans_4x8_c.
+@ Input columns: q0 q1 q2 q3
+@ Output columns: q0 q1 q2 q3
+@ Trashes: r12 q8 q9 q10 q11 q12 q13
+.macro vc1_inv_trans_4x8_helper add rshift
+        @ Compute temp1, temp2 and setup scalar #17, #22, #10
+        vadd.i16        q12,   q0,  q2              @ temp1 = src[0] + src[2]
+        movw            r12,   #17
+        vsub.i16        q13,   q0,  q2              @ temp2 = src[0] - src[2]
+        movt            r12,   #22
+        vmov.32         d0[0], r12
+        movw            r12,   #10
+        vmov.16         d1[0], r12
+
+        vmov.i16        q8,  #\add                  @ t1 will accumulate here
+        vmov.i16        q9,  #\add                  @ t2 will accumulate here
+
+        vmul.i16        q10, q1,  d0[1]             @ t3 = 22 * (src[1])
+        vmul.i16        q11, q3,  d0[1]             @ t4 = 22 * (src[3])
+
+        vmla.i16        q8,  q12, d0[0]             @ t1 = 17 * (temp1) + 4
+        vmla.i16        q9,  q13, d0[0]             @ t2 = 17 * (temp2) + 4
+
+        vmla.i16        q10, q3,  d1[0]             @ t3 += 10 * src[3]
+        vmls.i16        q11, q1,  d1[0]             @ t4 -= 10 * src[1]
+
+        vhadd.s16       q0,  q8,  q10               @ dst[0] = (t1 + t3) >> 1
+        vhsub.s16       q3,  q8,  q10               @ dst[3] = (t1 - t3) >> 1
+        vhsub.s16       q1,  q9,  q11               @ dst[1] = (t2 - t4) >> 1
+        vhadd.s16       q2,  q9,  q11               @ dst[2] = (t2 + t4) >> 1
+
+        @ Halving add/sub above already did one shift
+        vshr.s16        q0,  q0,  #(\rshift - 1)    @ dst[0] >>= (rshift - 1)
+        vshr.s16        q3,  q3,  #(\rshift - 1)    @ dst[3] >>= (rshift - 1)
+        vshr.s16        q1,  q1,  #(\rshift - 1)    @ dst[1] >>= (rshift - 1)
+        vshr.s16        q2,  q2,  #(\rshift - 1)    @ dst[2] >>= (rshift - 1)
+.endm
+
+@ Takes 8 columns of 4 values each and operates on it. Modeled after the second
+@ for loop in vc1_inv_trans_4x8_c.
+@ Input columns: d0 d2 d4 d6 d1 d3 d5 d7
+@ Output columns: d16 d17 d18 d19 d21 d20 d23 d22
+@ Trashes all NEON registers (and r12) except for: q4 q5 q6 q7
+.macro vc1_inv_trans_8x4_helper add add1beforeshift rshift
+        @ At this point:
+        @   src[0]      d0 overwritten later
+        @   src[8]      d2
+        @   src[16]     d4 overwritten later
+        @   src[24]     d6
+        @   src[32]     d1 overwritten later
+        @   src[40]     d3
+        @   src[48]     d5 overwritten later
+        @   src[56]     d7
+
+        movw            r12,   #12
+        vmov.i16        q14,   #\add            @ t1|t2 will accumulate here
+        movt            r12,   #6
+
+        vadd.i16        d20,   d0,  d1          @ temp1 = src[0] + src[32]
+        vsub.i16        d21,   d0,  d1          @ temp2 = src[0] - src[32]
+        vmov.i32        d0[0], r12              @ 16-bit: d0[0] = #12, d0[1] = #6
+
+        vshl.i16        q15,   q2,  #4          @ t3|t4 = 16 * (src[16]|src[48])
+        vswp            d4,    d5               @ q2 = src[48]|src[16]
+        vmla.i16        q14,   q10, d0[0]       @ t1|t2 = 12 * (temp1|temp2) + 64
+        movw            r12,   #15
+        movt            r12,   #9
+        vmov.i32        d0[1], r12              @ 16-bit: d0[2] = #15, d0[3] = #9
+        vneg.s16        d31,   d31              @ t4 = -t4
+        vmla.i16        q15,   q2,  d0[1]       @ t3|t4 += 6 * (src[48]|src[16])
+
+        @ At this point:
+        @   d0[2]   #15
+        @   d0[3]   #9
+        @   q1      src[8]|src[40]
+        @   q3      src[24]|src[56]
+        @   q14     old t1|t2
+        @   q15     old t3|t4
+
+        vshl.i16        q8,  q1,  #4            @ t1|t2 = 16 * (src[8]|src[40])
+        vswp            d2,  d3                 @ q1 = src[40]|src[8]
+        vshl.i16        q12, q3,  #4            @ temp3a|temp4a = 16 * src[24]|src[56]
+        vswp            d6,  d7                 @ q3 = src[56]|src[24]
+        vshl.i16        q13, q1,  #2            @ temp3b|temp4b = 4 * (src[40]|src[8])
+        vshl.i16        q2,  q3,  #2            @ temp1|temp2 = 4 * (src[56]|src[24])
+        vswp            d3,  d6                 @ q1 = src[40]|src[56], q3 = src[8]|src[24]
+        vsub.i16        q9,  q13, q12           @ t3|t4 = - (temp3a|temp4a) + (temp3b|temp4b)
+        vadd.i16        q8,  q8,  q2            @ t1|t2 += temp1|temp2
+        vmul.i16        q12, q3,  d0[3]         @ temp3|temp4 = 9 * src[8]|src[24]
+        vmla.i16        q8,  q1,  d0[3]         @ t1|t2 += 9 * (src[40]|src[56])
+        vswp            d6,  d7                 @ q3 = src[24]|src[8]
+        vswp            d2,  d3                 @ q1 = src[56]|src[40]
+
+        vsub.i16        q11, q14, q15           @ t8|t7 = old t1|t2 - old t3|t4
+        vadd.i16        q10, q14, q15           @ t5|t6 = old t1|t2 + old t3|t4
+  .if \add1beforeshift
+        vmov.i16        q15, #1
+  .endif
+
+        vadd.i16        d18, d18, d24           @ t3 += temp3
+        vsub.i16        d19, d19, d25           @ t4 -= temp4
+
+        vswp            d22, d23                @ q11 = t7|t8
+
+        vneg.s16        d17, d17                @ t2 = -t2
+        vmla.i16        q9,  q1,  d0[2]         @ t3|t4 += 15 * src[56]|src[40]
+        vmla.i16        q8,  q3,  d0[2]         @ t1|t2 += 15 * src[24]|src[8]
+
+        @ At this point:
+        @   t1  d16
+        @   t2  d17
+        @   t3  d18
+        @   t4  d19
+        @   t5  d20
+        @   t6  d21
+        @   t7  d22
+        @   t8  d23
+        @   #1  q15
+
+  .if \add1beforeshift
+        vadd.i16        q3,  q15, q10           @ line[7,6] = t5|t6 + 1
+        vadd.i16        q2,  q15, q11           @ line[5,4] = t7|t8 + 1
+  .endif
+
+        @ Sometimes this overflows, so to get one additional bit of precision, use
+        @ a single instruction that both adds and shifts right (halving).
+        vhadd.s16       q1,  q9,  q11           @ line[2,3] = (t3|t4 + t7|t8) >> 1
+        vhadd.s16       q0,  q8,  q10           @ line[0,1] = (t1|t2 + t5|t6) >> 1
+  .if \add1beforeshift
+        vhsub.s16       q2,  q2,  q9            @ line[5,4] = (t7|t8 - t3|t4 + 1) >> 1
+        vhsub.s16       q3,  q3,  q8            @ line[7,6] = (t5|t6 - t1|t2 + 1) >> 1
+  .else
+        vhsub.s16       q2,  q11, q9            @ line[5,4] = (t7|t8 - t3|t4) >> 1
+        vhsub.s16       q3,  q10, q8            @ line[7,6] = (t5|t6 - t1|t2) >> 1
+  .endif
+
+        vshr.s16        q9,  q1,  #(\rshift - 1)    @ one shift is already done by vhadd/vhsub above
+        vshr.s16        q8,  q0,  #(\rshift - 1)
+        vshr.s16        q10, q2,  #(\rshift - 1)
+        vshr.s16        q11, q3,  #(\rshift - 1)
+
+        @ At this point:
+        @   dst[0]   d16
+        @   dst[1]   d17
+        @   dst[2]   d18
+        @   dst[3]   d19
+        @   dst[4]   d21
+        @   dst[5]   d20
+        @   dst[6]   d23
+        @   dst[7]   d22
+.endm
+
+@ This is modeled after the first and second for loop in vc1_inv_trans_8x8_c.
+@ Input columns:  q8, q9, q10, q11, q12, q13, q14, q15
+@ Output columns: q8, q9, q10, q11, q12, q13, q14, q15
+@ Trashes all NEON registers (and r12) except for: q4 q5 q6 q7
+.macro vc1_inv_trans_8x8_helper add add1beforeshift rshift
+        @ This actually computes half of t1, t2, t3, t4, as explained below
+        @ near `tNhalf`.
+        vmov.i16        q0,    #(6 / 2)         @ q0 = #6/2
+        vshl.i16        q1,    q10, #3          @ t3 = 16/2 * src[16]
+        vshl.i16        q3,    q14, #3          @ temp4 = 16/2 * src[48]
+        vmul.i16        q2,    q10, q0          @ t4 = 6/2 * src[16]
+        vmla.i16        q1,    q14, q0          @ t3 += 6/2 * src[48]
+        @ unused: q0, q10, q14
+        vmov.i16        q0,    #(12 / 2)        @ q0 = #12/2
+        vadd.i16        q10,   q8,  q12         @ temp1 = src[0] + src[32]
+        vsub.i16        q14,   q8,  q12         @ temp2 = src[0] - src[32]
+        @ unused: q8, q12
+        vmov.i16        q8,    #(\add / 2)      @ t1 will accumulate here
+        vmov.i16        q12,   #(\add / 2)      @ t2 will accumulate here
+        movw            r12,   #15
+        vsub.i16        q2,    q2,  q3          @ t4 = 6/2 * src[16] - 16/2 * src[48]
+        movt            r12,   #9
+        @ unused: q3
+        vmla.i16        q8,    q10, q0          @ t1 = 12/2 * temp1 + add
+        vmla.i16        q12,   q14, q0          @ t2 = 12/2 * temp2 + add
+        vmov.i32        d0[0], r12
+        @ unused: q3, q10, q14
+
+        @ At this point:
+        @   q0          d0=#15|#9
+        @   q1  old t3
+        @   q2  old t4
+        @   q3
+        @   q8  old t1
+        @   q9          src[8]
+        @   q10
+        @   q11         src[24]
+        @   q12 old t2
+        @   q13         src[40]
+        @   q14
+        @   q15         src[56]
+
+        @ unused: q3, q10, q14
+        movw            r12,   #16
+        vshl.i16        q3,    q9,  #4          @ t1 = 16 * src[8]
+        movt            r12,   #4
+        vshl.i16        q10,   q9,  #2          @ t4 = 4 * src[8]
+        vmov.i32        d1[0], r12
+        vmul.i16        q14,   q9,  d0[0]       @ t2 = 15 * src[8]
+        vmul.i16        q9,    q9,  d0[1]       @ t3 = 9 * src[8]
+        @ unused: none
+        vmla.i16        q3,    q11, d0[0]       @ t1 += 15 * src[24]
+        vmls.i16        q10,   q11, d0[1]       @ t4 -= 9 * src[24]
+        vmls.i16        q14,   q11, d1[1]       @ t2 -= 4 * src[24]
+        vmls.i16        q9,    q11, d1[0]       @ t3 -= 16 * src[24]
+        @ unused: q11
+        vmla.i16        q3,    q13, d0[1]       @ t1 += 9 * src[40]
+        vmla.i16        q10,   q13, d0[0]       @ t4 += 15 * src[40]
+        vmls.i16        q14,   q13, d1[0]       @ t2 -= 16 * src[40]
+        vmla.i16        q9,    q13, d1[1]       @ t3 += 4 * src[40]
+        @ unused: q11, q13
+
+        @ Compute t5, t6, t7, t8 from old t1, t2, t3, t4. Actually, it computes
+        @ half of t5, t6, t7, t8 since t1, t2, t3, t4 are halved.
+        vadd.i16        q11,   q8,  q1          @ t5 = t1 + t3
+        vsub.i16        q1,    q8,  q1          @ t8 = t1 - t3
+        vadd.i16        q13,   q12, q2          @ t6 = t2 + t4
+        vsub.i16        q2,    q12, q2          @ t7 = t2 - t4
+        @ unused: q8, q12
+
+  .if \add1beforeshift
+        vmov.i16        q12,   #1
+  .endif
+
+        @ unused: q8
+        vmla.i16        q3,    q15, d1[1]       @ t1 += 4 * src[56]
+        vmls.i16        q14,   q15, d0[1]       @ t2 -= 9 * src[56]
+        vmla.i16        q9,    q15, d0[0]       @ t3 += 15 * src[56]
+        vmls.i16        q10,   q15, d1[0]       @ t4 -= 16 * src[56]
+        @ unused: q0, q8, q15
+
+        @ At this point:
+        @   t1      q3
+        @   t2      q14
+        @   t3      q9
+        @   t4      q10
+        @   t5half  q11
+        @   t6half  q13
+        @   t7half  q2
+        @   t8half  q1
+        @   #1      q12
+        @
+        @ tNhalf is half of the value of tN (as described in vc1_inv_trans_8x8_c).
+        @ This is done because sometimes files have input that causes tN + tM to
+        @ overflow. To avoid this overflow, we compute tNhalf, then compute
+        @ tNhalf + tM (which doesn't overflow), and then we use vhadd to compute
+        @ (tNhalf + (tNhalf + tM)) >> 1 which does not overflow because it is
+        @ one instruction.
+
+        @ For each pair of tN and tM, do:
+        @   lineA = t5half + t1
+        @   if add1beforeshift:  t1 -= 1
+        @   lineA = (t5half + lineA) >> 1
+        @   lineB = t5half - t1
+        @   lineB = (t5half + lineB) >> 1
+        @   lineA >>= rshift - 1
+        @   lineB >>= rshift - 1
+
+        vadd.i16        q8,  q11, q3                @ q8 = t5half + t1
+  .if \add1beforeshift
+        vsub.i16        q3,  q3,  q12               @ q3 = t1 - 1
+  .endif
+
+        vadd.i16        q0,  q13, q14               @ q0  = t6half + t2
+  .if \add1beforeshift
+        vsub.i16        q14, q14, q12               @ q14 = t2 - 1
+  .endif
+
+        vadd.i16        q15, q2,  q9                @ q15 = t7half + t3
+  .if \add1beforeshift
+        vsub.i16        q9,  q9,  q12               @ q9  = t3 - 1
+  .endif
+        @ unused: none
+
+        vhadd.s16       q8,  q11, q8                @ q8  = (t5half + t5half + t1) >> 1
+        vsub.i16        q3,  q11, q3                @ q3  = t5half - t1 + 1
+
+        vhadd.s16       q0,  q13, q0                @ q0  = (t6half + t6half + t2) >> 1
+        vsub.i16        q14, q13, q14               @ q14 = t6half - t2 + 1
+
+        vhadd.s16       q15, q2,  q15               @ q15 = (t7half + t7half + t3) >> 1
+        vsub.i16        q9,  q2,  q9                @ q9  = t7half - t3 + 1
+
+        vhadd.s16       q3,  q11, q3                @ q3  = (t5half + t5half - t1 + 1) >> 1
+        @ unused: q11
+
+        vadd.i16        q11, q1,  q10               @ q11 = t8half + t4
+  .if \add1beforeshift
+        vsub.i16        q10, q10, q12               @ q10 = t4 - 1
+  .endif
+        @ unused: q12
+
+        vhadd.s16       q14, q13, q14               @ q14 = (t6half + t6half - t2 + 1) >> 1
+        @ unused: q12, q13
+        vhadd.s16       q13, q2,  q9                @ q9  = (t7half + t7half - t3 + 1) >> 1
+        @ unused: q12, q2, q9
+
+        vsub.i16        q10, q1,  q10               @ q10 = t8half - t4 + 1
+        vhadd.s16       q11, q1,  q11               @ q11 = (t8half + t8half + t4) >> 1
+
+        vshr.s16        q8,  q8,  #(\rshift - 1)    @ q8  = line[0]
+        vhadd.s16       q12, q1,  q10               @ q12 = (t8half + t8half - t4 + 1) >> 1
+        vshr.s16        q9,  q0,  #(\rshift - 1)    @ q9  = line[1]
+        vshr.s16        q10, q15, #(\rshift - 1)    @ q10 = line[2]
+        vshr.s16        q11, q11, #(\rshift - 1)    @ q11 = line[3]
+        vshr.s16        q12, q12, #(\rshift - 1)    @ q12 = line[4]
+        vshr.s16        q13, q13, #(\rshift - 1)    @ q13 = line[5]
+        vshr.s16        q14, q14, #(\rshift - 1)    @ q14 = line[6]
+        vshr.s16        q15, q3,  #(\rshift - 1)    @ q15 = line[7]
+.endm
+
+@ (int16_t *block [r0])
+function ff_vc1_inv_trans_8x8_neon, export=1
+        vld1.64         {q8-q9},   [r0,:128]!
+        vld1.64         {q10-q11}, [r0,:128]!
+        vld1.64         {q12-q13}, [r0,:128]!
+        vld1.64         {q14-q15}, [r0,:128]
+        sub             r0, r0, #(16 * 2 * 3)   @ restore r0
+
+        @ At this point:
+        @   src[0]  q8
+        @   src[8]  q9
+        @   src[16] q10
+        @   src[24] q11
+        @   src[32] q12
+        @   src[40] q13
+        @   src[48] q14
+        @   src[56] q15
+
+        vc1_inv_trans_8x8_helper add=4 add1beforeshift=0 rshift=3
+
+        @ Transpose result matrix of 8x8
+        swap4           d17, d19, d21, d23, d24, d26, d28, d30
+        transpose16_4x4 q8,  q9,  q10, q11, q12, q13, q14, q15
+
+        vc1_inv_trans_8x8_helper add=64 add1beforeshift=1 rshift=7
+
+        vst1.64         {q8-q9},   [r0,:128]!
+        vst1.64         {q10-q11}, [r0,:128]!
+        vst1.64         {q12-q13}, [r0,:128]!
+        vst1.64         {q14-q15}, [r0,:128]
+
+        bx              lr
+endfunc
+
+@ (uint8_t *dest [r0], int linesize [r1], int16_t *block [r2])
+function ff_vc1_inv_trans_8x4_neon, export=1
+        vld1.64         {q0-q1}, [r2,:128]!     @ load 8 * 4 * 2 = 64 bytes / 16 bytes per quad = 4 quad registers
+        vld1.64         {q2-q3}, [r2,:128]
+
+        transpose16     q0 q1 q2 q3             @ transpose rows to columns
+
+        @ At this point:
+        @   src[0]   d0
+        @   src[1]   d2
+        @   src[2]   d4
+        @   src[3]   d6
+        @   src[4]   d1
+        @   src[5]   d3
+        @   src[6]   d5
+        @   src[7]   d7
+
+        vc1_inv_trans_8x4_helper    add=4 add1beforeshift=0 rshift=3
+
+        @ Move output to more standardized registers
+        vmov        d0, d16
+        vmov        d2, d17
+        vmov        d4, d18
+        vmov        d6, d19
+        vmov        d1, d21
+        vmov        d3, d20
+        vmov        d5, d23
+        vmov        d7, d22
+
+        @ At this point:
+        @   dst[0]   d0
+        @   dst[1]   d2
+        @   dst[2]   d4
+        @   dst[3]   d6
+        @   dst[4]   d1
+        @   dst[5]   d3
+        @   dst[6]   d5
+        @   dst[7]   d7
+
+        transpose16     q0 q1 q2 q3   @ turn columns into rows
+
+        @ At this point:
+        @   row[0] q0
+        @   row[1] q1
+        @   row[2] q2
+        @   row[3] q3
+
+        vc1_inv_trans_4x8_helper    add=64 rshift=7
+
+        @ At this point:
+        @   line[0].l   d0
+        @   line[0].h   d1
+        @   line[1].l   d2
+        @   line[1].h   d3
+        @   line[2].l   d4
+        @   line[2].h   d5
+        @   line[3].l   d6
+        @   line[3].h   d7
+
+        @ unused registers: q12, q13, q14, q15
+
+        vld1.64         {d28}, [r0,:64], r1     @ read dest
+        vld1.64         {d29}, [r0,:64], r1
+        vld1.64         {d30}, [r0,:64], r1
+        vld1.64         {d31}, [r0,:64], r1
+        sub             r0,  r0,  r1, lsl #2    @ restore original r0 value
+
+        vaddw.u8        q0,  q0,  d28           @ line[0] += dest[0]
+        vaddw.u8        q1,  q1,  d29           @ line[1] += dest[1]
+        vaddw.u8        q2,  q2,  d30           @ line[2] += dest[2]
+        vaddw.u8        q3,  q3,  d31           @ line[3] += dest[3]
+
+        vqmovun.s16     d0,  q0                 @ line[0]
+        vqmovun.s16     d1,  q1                 @ line[1]
+        vqmovun.s16     d2,  q2                 @ line[2]
+        vqmovun.s16     d3,  q3                 @ line[3]
+
+        vst1.64         {d0},  [r0,:64], r1     @ write dest
+        vst1.64         {d1},  [r0,:64], r1
+        vst1.64         {d2},  [r0,:64], r1
+        vst1.64         {d3},  [r0,:64]
+
+        bx              lr
+endfunc
+
+@ (uint8_t *dest [r0], int linesize [r1], int16_t *block [r2])
+function ff_vc1_inv_trans_4x8_neon, export=1
+        mov             r12, #(8 * 2)  @ 8 elements per line, each element 2 bytes
+        vld4.16         {d0[],  d2[],  d4[],  d6[]},  [r2,:64], r12     @ read each column into a q register
+        vld4.16         {d0[1], d2[1], d4[1], d6[1]}, [r2,:64], r12
+        vld4.16         {d0[2], d2[2], d4[2], d6[2]}, [r2,:64], r12
+        vld4.16         {d0[3], d2[3], d4[3], d6[3]}, [r2,:64], r12
+        vld4.16         {d1[],  d3[],  d5[],  d7[]},  [r2,:64], r12
+        vld4.16         {d1[1], d3[1], d5[1], d7[1]}, [r2,:64], r12
+        vld4.16         {d1[2], d3[2], d5[2], d7[2]}, [r2,:64], r12
+        vld4.16         {d1[3], d3[3], d5[3], d7[3]}, [r2,:64]
+
+        vc1_inv_trans_4x8_helper    add=4 rshift=3
+
+        @ At this point:
+        @   dst[0] = q0
+        @   dst[1] = q1
+        @   dst[2] = q2
+        @   dst[3] = q3
+
+        transpose16     q0 q1 q2 q3     @ Transpose rows (registers) into columns
+
+        vc1_inv_trans_8x4_helper    add=64 add1beforeshift=1 rshift=7
+
+        vld1.32         {d28[]},  [r0,:32], r1  @ read dest
+        vld1.32         {d28[1]}, [r0,:32], r1
+        vld1.32         {d29[]},  [r0,:32], r1
+        vld1.32         {d29[1]}, [r0,:32], r1
+
+        vld1.32         {d30[]},  [r0,:32], r1
+        vld1.32         {d30[0]}, [r0,:32], r1
+        vld1.32         {d31[]},  [r0,:32], r1
+        vld1.32         {d31[0]}, [r0,:32], r1
+        sub             r0,  r0,  r1, lsl #3    @ restore original r0 value
+
+        vaddw.u8        q8,  q8,  d28           @ line[0,1] += dest[0,1]
+        vaddw.u8        q9,  q9,  d29           @ line[2,3] += dest[2,3]
+        vaddw.u8        q10, q10, d30           @ line[5,4] += dest[5,4]
+        vaddw.u8        q11, q11, d31           @ line[7,6] += dest[7,6]
+
+        vqmovun.s16     d16, q8                 @ clip(line[0,1])
+        vqmovun.s16     d18, q9                 @ clip(line[2,3])
+        vqmovun.s16     d20, q10                @ clip(line[5,4])
+        vqmovun.s16     d22, q11                @ clip(line[7,6])
+
+        vst1.32         {d16[0]}, [r0,:32], r1  @ write dest
+        vst1.32         {d16[1]}, [r0,:32], r1
+        vst1.32         {d18[0]}, [r0,:32], r1
+        vst1.32         {d18[1]}, [r0,:32], r1
+
+        vst1.32         {d20[1]}, [r0,:32], r1
+        vst1.32         {d20[0]}, [r0,:32], r1
+        vst1.32         {d22[1]}, [r0,:32], r1
+        vst1.32         {d22[0]}, [r0,:32]
+
+        bx              lr
+endfunc
+
+@ Setup constants in registers which are used by vc1_inv_trans_4x4_helper
+.macro vc1_inv_trans_4x4_helper_setup
+        vmov.i16        q13, #17
+        vmov.i16        q14, #22
+        vmov.i16        d30, #10                @ only need double-word, not quad-word
+.endm
+
+@ This is modeled after the first for loop in vc1_inv_trans_4x4_c.
+.macro vc1_inv_trans_4x4_helper add rshift
+        vmov.i16        q2,  #\add              @ t1|t2 will accumulate here
+
+        vadd.i16        d16, d0,  d1            @ temp1 = src[0] + src[2]
+        vsub.i16        d17, d0,  d1            @ temp2 = src[0] - src[2]
+        vmul.i16        q3,  q14, q1            @ t3|t4 = 22 * (src[1]|src[3])
+        vmla.i16        q2,  q13, q8            @ t1|t2 = 17 * (temp1|temp2) + add
+        vmla.i16        d6,  d30, d3            @ t3 += 10 * src[3]
+        vmls.i16        d7,  d30, d2            @ t4 -= 10 * src[1]
+
+        vadd.i16        q0,  q2,  q3            @ dst[0,2] = (t1|t2 + t3|t4)
+        vsub.i16        q1,  q2,  q3            @ dst[3,1] = (t1|t2 - t3|t4)
+        vshr.s16        q0,  q0,  #\rshift      @ dst[0,2] >>= rshift
+        vshr.s16        q1,  q1,  #\rshift      @ dst[3,1] >>= rshift
+.endm
+
+@ (uint8_t *dest [r0], int linesize [r1], int16_t *block [r2])
+function ff_vc1_inv_trans_4x4_neon, export=1
+        mov             r12, #(8 * 2)  @ 8 elements per line, each element 2 bytes
+        vld4.16         {d0[],  d1[],  d2[],  d3[]},  [r2,:64], r12     @ read each column into a register
+        vld4.16         {d0[1], d1[1], d2[1], d3[1]}, [r2,:64], r12
+        vld4.16         {d0[2], d1[2], d2[2], d3[2]}, [r2,:64], r12
+        vld4.16         {d0[3], d1[3], d2[3], d3[3]}, [r2,:64]
+
+        vswp            d1,  d2         @ so that we can later access column 1 and column 3 as a single q1 register
+
+        vc1_inv_trans_4x4_helper_setup
+
+        @ At this point:
+        @   src[0] = d0
+        @   src[1] = d2
+        @   src[2] = d1
+        @   src[3] = d3
+
+        vc1_inv_trans_4x4_helper add=4 rshift=3      @ compute t1, t2, t3, t4 and combine them into dst[0-3]
+
+        @ At this point:
+        @   dst[0] = d0
+        @   dst[1] = d3
+        @   dst[2] = d1
+        @   dst[3] = d2
+
+        transpose16     d0 d3 d1 d2     @ Transpose rows (registers) into columns
+
+        @ At this point:
+        @   src[0]  = d0
+        @   src[8]  = d3
+        @   src[16] = d1
+        @   src[24] = d2
+
+        vswp            d2,  d3         @ so that we can later access column 1 and column 3 in order as a single q1 register
+
+        @ At this point:
+        @   src[0]  = d0
+        @   src[8]  = d2
+        @   src[16] = d1
+        @   src[24] = d3
+
+        vc1_inv_trans_4x4_helper add=64 rshift=7              @ compute t1, t2, t3, t4 and combine them into dst[0-3]
+
+        @ At this point:
+        @   line[0] = d0
+        @   line[1] = d3
+        @   line[2] = d1
+        @   line[3] = d2
+
+        vld1.32         {d18[]},  [r0,:32], r1  @ read dest
+        vld1.32         {d19[]},  [r0,:32], r1
+        vld1.32         {d18[1]}, [r0,:32], r1
+        vld1.32         {d19[0]}, [r0,:32], r1
+        sub             r0,  r0,  r1, lsl #2    @ restore original r0 value
+
+        vaddw.u8        q0,  q0,  d18           @ line[0,2] += dest[0,2]
+        vaddw.u8        q1,  q1,  d19           @ line[3,1] += dest[3,1]
+
+        vqmovun.s16     d0,  q0                 @ clip(line[0,2])
+        vqmovun.s16     d1,  q1                 @ clip(line[3,1])
+
+        vst1.32         {d0[0]},  [r0,:32], r1  @ write dest
+        vst1.32         {d1[1]},  [r0,:32], r1
+        vst1.32         {d0[1]},  [r0,:32], r1
+        vst1.32         {d1[0]},  [r0,:32]
+
+        bx              lr
+endfunc
+
+@ The absolute value of multiplication constants from vc1_mspel_filter and vc1_mspel_{ver,hor}_filter_16bits.
+@ The sign is embedded in the code below that carries out the multiplication (mspel_filter{,.16}).
+#define MSPEL_MODE_1_MUL_CONSTANTS  4 53 18 3
+#define MSPEL_MODE_2_MUL_CONSTANTS  1 9  9  1
+#define MSPEL_MODE_3_MUL_CONSTANTS  3 18 53 4
+
+@ These constants are from reading the source code of vc1_mspel_mc and determining the value that
+@ is added to `rnd` to result in the variable `r`, and the value of the variable `shift`.
+#define MSPEL_MODES_11_ADDSHIFT_CONSTANTS   15 5
+#define MSPEL_MODES_12_ADDSHIFT_CONSTANTS   3  3
+#define MSPEL_MODES_13_ADDSHIFT_CONSTANTS   15 5
+#define MSPEL_MODES_21_ADDSHIFT_CONSTANTS   MSPEL_MODES_12_ADDSHIFT_CONSTANTS
+#define MSPEL_MODES_22_ADDSHIFT_CONSTANTS   0  1
+#define MSPEL_MODES_23_ADDSHIFT_CONSTANTS   3  3
+#define MSPEL_MODES_31_ADDSHIFT_CONSTANTS   MSPEL_MODES_13_ADDSHIFT_CONSTANTS
+#define MSPEL_MODES_32_ADDSHIFT_CONSTANTS   MSPEL_MODES_23_ADDSHIFT_CONSTANTS
+#define MSPEL_MODES_33_ADDSHIFT_CONSTANTS   15 5
+
+@ The addition and shift constants from vc1_mspel_filter.
+#define MSPEL_MODE_1_ADDSHIFT_CONSTANTS     32 6
+#define MSPEL_MODE_2_ADDSHIFT_CONSTANTS     8  4
+#define MSPEL_MODE_3_ADDSHIFT_CONSTANTS     32 6
+
+@ Setup constants in registers for a subsequent use of mspel_filter{,.16}.
+.macro mspel_constants typesize reg_a reg_b reg_c reg_d filter_a filter_b filter_c filter_d reg_add filter_add_register
+  @ Define double-word register aliases. Typesize should be i8 or i16.
+  ra .dn \reg_a\().\typesize
+  rb .dn \reg_b\().\typesize
+  rc .dn \reg_c\().\typesize
+  rd .dn \reg_d\().\typesize
+
+  @ Only set the register if the value is not 1 and unique
+  .if \filter_a != 1
+        vmov            ra,  #\filter_a              @ ra = filter_a
+  .endif
+        vmov            rb,  #\filter_b              @ rb = filter_b
+  .if \filter_b != \filter_c
+        vmov            rc,  #\filter_c              @ rc = filter_c
+  .endif
+  .if \filter_d != 1
+        vmov            rd,  #\filter_d              @ rd = filter_d
+  .endif
+  @ vdup to double the size of typesize
+  .ifc \typesize,i8
+        vdup.16         \reg_add,  \filter_add_register     @ reg_add = filter_add_register
+  .else
+        vdup.32         \reg_add,  \filter_add_register     @ reg_add = filter_add_register
+  .endif
+
+  .unreq ra
+  .unreq rb
+  .unreq rc
+  .unreq rd
+.endm
+
+@ After mspel_constants has been used, do the filtering.
+.macro mspel_filter acc dest src0 src1 src2 src3 filter_a filter_b filter_c filter_d reg_a reg_b reg_c reg_d reg_add filter_shift narrow=1
+  .if \filter_a != 1
+        @ If filter_a != 1, then we need a move and subtract instruction
+        vmov            \acc,  \reg_add                     @ acc = reg_add
+        vmlsl.u8        \acc,  \reg_a,  \src0               @ acc -= filter_a * src[-stride]
+  .else
+        @ If filter_a is 1, then just subtract without an extra move
+        vsubw.u8        \acc,  \reg_add,  \src0             @ acc = reg_add - src[-stride]      @ since filter_a == 1
+  .endif
+        vmlal.u8        \acc,  \reg_b,  \src1               @ acc += filter_b * src[0]
+  .if \filter_b != \filter_c
+        vmlal.u8        \acc,  \reg_c,  \src2               @ acc += filter_c * src[stride]
+  .else
+        @ If filter_b is the same as filter_c, use the same reg_b register
+        vmlal.u8        \acc,  \reg_b,  \src2               @ acc += filter_c * src[stride]     @ where filter_c == filter_b
+  .endif
+  .if \filter_d != 1
+        @ If filter_d != 1, then do a multiply accumulate
+        vmlsl.u8        \acc,  \reg_d,  \src3               @ acc -= filter_d * src[stride * 2]
+  .else
+        @ If filter_d is 1, then just do a subtract
+        vsubw.u8        \acc,  \acc,    \src3               @ acc -= src[stride * 2]            @ since filter_d == 1
+  .endif
+  .if \narrow
+        vqshrun.s16     \dest, \acc,    #\filter_shift      @ dest = clip_uint8(acc >> filter_shift)
+  .else
+        vshr.s16        \dest, \acc,    #\filter_shift      @ dest = acc >> filter_shift
+  .endif
+.endm
+
+@ This is similar to mspel_filter, but the input is 16-bit instead of 8-bit and narrow=0 is not supported.
+.macro mspel_filter.16 acc0 acc1 acc0_0 acc0_1 dest src0 src1 src2 src3 src4 src5 src6 src7 filter_a filter_b filter_c filter_d reg_a reg_b reg_c reg_d reg_add filter_shift
+  .if \filter_a != 1
+        vmov            \acc0,  \reg_add
+        vmov            \acc1,  \reg_add
+        vmlsl.s16       \acc0,  \reg_a,  \src0
+        vmlsl.s16       \acc1,  \reg_a,  \src1
+  .else
+        vsubw.s16       \acc0,  \reg_add,  \src0
+        vsubw.s16       \acc1,  \reg_add,  \src1
+  .endif
+        vmlal.s16       \acc0,  \reg_b,  \src2
+        vmlal.s16       \acc1,  \reg_b,  \src3
+  .if \filter_b != \filter_c
+        vmlal.s16       \acc0,  \reg_c,  \src4
+        vmlal.s16       \acc1,  \reg_c,  \src5
+  .else
+        vmlal.s16       \acc0,  \reg_b,  \src4
+        vmlal.s16       \acc1,  \reg_b,  \src5
+  .endif
+  .if \filter_d != 1
+        vmlsl.s16       \acc0,  \reg_d,  \src6
+        vmlsl.s16       \acc1,  \reg_d,  \src7
+  .else
+        vsubw.s16       \acc0,  \acc0,   \src6
+        vsubw.s16       \acc1,  \acc1,   \src7
+  .endif
+        @ Use acc0_0 and acc0_1 as temp space
+        vqshrun.s32     \acc0_0, \acc0,  #\filter_shift     @ Shift and narrow with saturation from s32 to u16
+        vqshrun.s32     \acc0_1, \acc1,  #\filter_shift
+        vqmovn.u16      \dest,  \acc0                       @ Narrow with saturation from u16 to u8
+.endm
+
+@ Register usage for put_vc1_mspel_mc functions. Registers marked 'hv' are only used in put_vc1_mspel_mc_hv.
+@
+@   r0        adjusted dst
+@   r1        adjusted src
+@   r2        stride
+@   r3        adjusted rnd
+@   r4 [hv]   tmp
+@   r11 [hv]  sp saved
+@   r12       loop counter
+@   d0        src[-stride]
+@   d1        src[0]
+@   d2        src[stride]
+@   d3        src[stride * 2]
+@   q0 [hv]   src[-stride]
+@   q1 [hv]   src[0]
+@   q2 [hv]   src[stride]
+@   q3 [hv]   src[stride * 2]
+@   d21       often result from mspel_filter
+@   q11       accumulator 0
+@   q12 [hv]  accumulator 1
+@   q13       accumulator initial value
+@   d28       filter_a
+@   d29       filter_b
+@   d30       filter_c
+@   d31       filter_d
+
+@ (uint8_t *dst [r0], const uint8_t *src [r1], ptrdiff_t stride [r2], int rnd [r3])
+.macro put_vc1_mspel_mc_hv hmode vmode filter_h_a filter_h_b filter_h_c filter_h_d filter_v_a filter_v_b filter_v_c filter_v_d filter_add filter_shift
+function ff_put_vc1_mspel_mc\hmode\()\vmode\()_neon, export=1
+        push            {r4, r11, lr}
+        mov             r11, sp                 @ r11 = stack pointer before realignmnet
+A       bic             sp,  sp,  #15           @ sp = round down to multiple of 16 bytes
+T       bic             r4,  r11, #15
+T       mov             sp,  r4
+        sub             sp,  sp,  #(8*2*16)     @ make space for 8 rows * 2 byte per element * 16 elements per row (to fit 11 actual elements per row)
+        mov             r4,  sp                 @ r4 = int16_t tmp[8 * 16]
+
+        sub             r1,  r1,  #1            @ src -= 1
+  .if \filter_add != 0
+        add             r3,  r3,  #\filter_add  @ r3 = filter_add + rnd
+  .endif
+        mov             r12, #8                 @ loop counter
+        sub             r1,  r1,  r2            @ r1 = &src[-stride]      @ slide back
+
+        @ Do vertical filtering from src into tmp
+        mspel_constants i8 d28 d29 d30 d31 \filter_v_a \filter_v_b \filter_v_c \filter_v_d q13 r3
+
+        vld1.64         {d0,d1}, [r1], r2
+        vld1.64         {d2,d3}, [r1], r2
+        vld1.64         {d4,d5}, [r1], r2
+
+1:
+        subs            r12,  r12,  #4
+
+        vld1.64         {d6,d7}, [r1], r2
+        mspel_filter    q11 q11 d0 d2 d4 d6 \filter_v_a \filter_v_b \filter_v_c \filter_v_d d28 d29 d30 d31 q13 \filter_shift narrow=0
+        mspel_filter    q12 q12 d1 d3 d5 d7 \filter_v_a \filter_v_b \filter_v_c \filter_v_d d28 d29 d30 d31 q13 \filter_shift narrow=0
+        vst1.64         {q11,q12}, [r4,:128]!   @ store and increment
+
+        vld1.64         {d0,d1}, [r1], r2
+        mspel_filter    q11 q11 d2 d4 d6 d0 \filter_v_a \filter_v_b \filter_v_c \filter_v_d d28 d29 d30 d31 q13 \filter_shift narrow=0
+        mspel_filter    q12 q12 d3 d5 d7 d1 \filter_v_a \filter_v_b \filter_v_c \filter_v_d d28 d29 d30 d31 q13 \filter_shift narrow=0
+        vst1.64         {q11,q12}, [r4,:128]!   @ store and increment
+
+        vld1.64         {d2,d3}, [r1], r2
+        mspel_filter    q11 q11 d4 d6 d0 d2 \filter_v_a \filter_v_b \filter_v_c \filter_v_d d28 d29 d30 d31 q13 \filter_shift narrow=0
+        mspel_filter    q12 q12 d5 d7 d1 d3 \filter_v_a \filter_v_b \filter_v_c \filter_v_d d28 d29 d30 d31 q13 \filter_shift narrow=0
+        vst1.64         {q11,q12}, [r4,:128]!   @ store and increment
+
+        vld1.64         {d4,d5}, [r1], r2
+        mspel_filter    q11 q11 d6 d0 d2 d4 \filter_v_a \filter_v_b \filter_v_c \filter_v_d d28 d29 d30 d31 q13 \filter_shift narrow=0
+        mspel_filter    q12 q12 d7 d1 d3 d5 \filter_v_a \filter_v_b \filter_v_c \filter_v_d d28 d29 d30 d31 q13 \filter_shift narrow=0
+        vst1.64         {q11,q12}, [r4,:128]!   @ store and increment
+
+        bne             1b
+
+        rsb             r3,   r3,  #(64 + \filter_add)      @ r3 = (64 + filter_add) - r3
+        mov             r12,  #8                @ loop counter
+        mov             r4,   sp                @ r4 = tmp
+
+        @ Do horizontal filtering from temp to dst
+        mspel_constants i16 d28 d29 d30 d31 \filter_h_a \filter_h_b \filter_h_c \filter_h_d q13 r3
+
+2:
+        subs            r12,  r12,  #1
+
+        vld1.64         {q0,q1}, [r4,:128]!     @ read one line of tmp
+        vext.16         q2,   q0,   q1,  #2
+        vext.16         q3,   q0,   q1,  #3
+        vext.16         q1,   q0,   q1,  #1     @ do last because it writes to q1 which is read by the other vext instructions
+
+        mspel_filter.16 q11 q12 d22 d23 d21 d0 d1 d2 d3 d4 d5 d6 d7 \filter_h_a \filter_h_b \filter_h_c \filter_h_d d28 d29 d30 d31 q13 7
+
+        vst1.64         {d21}, [r0,:64], r2     @ store and increment dst
+
+        bne             2b
+
+        mov             sp,  r11
+        pop             {r4, r11, pc}
+endfunc
+.endm
+
+@ Use C preprocessor and assembler macros to expand to functions for horizontal and vertical filtering.
+#define PUT_VC1_MSPEL_MC_HV(hmode, vmode)   \
+    put_vc1_mspel_mc_hv hmode vmode \
+        MSPEL_MODE_ ## hmode ## _MUL_CONSTANTS \
+        MSPEL_MODE_ ## vmode ## _MUL_CONSTANTS \
+        MSPEL_MODES_ ## hmode ## vmode ## _ADDSHIFT_CONSTANTS
+
+PUT_VC1_MSPEL_MC_HV(1, 1)
+PUT_VC1_MSPEL_MC_HV(1, 2)
+PUT_VC1_MSPEL_MC_HV(1, 3)
+PUT_VC1_MSPEL_MC_HV(2, 1)
+PUT_VC1_MSPEL_MC_HV(2, 2)
+PUT_VC1_MSPEL_MC_HV(2, 3)
+PUT_VC1_MSPEL_MC_HV(3, 1)
+PUT_VC1_MSPEL_MC_HV(3, 2)
+PUT_VC1_MSPEL_MC_HV(3, 3)
+
+#undef PUT_VC1_MSPEL_MC_HV
+
+.macro  put_vc1_mspel_mc_h_only hmode filter_a filter_b filter_c filter_d filter_add filter_shift
+function ff_put_vc1_mspel_mc\hmode\()0_neon, export=1
+        rsb             r3,   r3,   #\filter_add        @ r3 = filter_add - r = filter_add - rnd
+        mov             r12,  #8                        @ loop counter
+        sub             r1,   r1,   #1                  @ slide back, using immediate
+
+        mspel_constants i8 d28 d29 d30 d31 \filter_a \filter_b \filter_c \filter_d q13 r3
+
+1:
+        subs            r12,  r12,  #1
+
+        vld1.64         {d0,d1}, [r1], r2               @ read 16 bytes even though we only need 11, also src += stride
+        vext.8          d2,   d0,   d1,  #2
+        vext.8          d3,   d0,   d1,  #3
+        vext.8          d1,   d0,   d1,  #1             @ do last because it writes to d1 which is read by the other vext instructions
+
+        mspel_filter    q11 d21 d0 d1 d2 d3 \filter_a \filter_b \filter_c \filter_d d28 d29 d30 d31 q13 \filter_shift
+
+        vst1.64         {d21}, [r0,:64], r2             @ store and increment dst
+
+        bne             1b
+
+        bx              lr
+endfunc
+.endm
+
+@ Use C preprocessor and assembler macros to expand to functions for horizontal only filtering.
+#define PUT_VC1_MSPEL_MC_H_ONLY(hmode) \
+        put_vc1_mspel_mc_h_only hmode MSPEL_MODE_ ## hmode ## _MUL_CONSTANTS MSPEL_MODE_ ## hmode ## _ADDSHIFT_CONSTANTS
+
+PUT_VC1_MSPEL_MC_H_ONLY(1)
+PUT_VC1_MSPEL_MC_H_ONLY(2)
+PUT_VC1_MSPEL_MC_H_ONLY(3)
+
+#undef PUT_VC1_MSPEL_MC_H_ONLY
+
+@ (uint8_t *dst [r0], const uint8_t *src [r1], ptrdiff_t stride [r2], int rnd [r3])
+.macro put_vc1_mspel_mc_v_only vmode filter_a filter_b filter_c filter_d filter_add filter_shift
+function ff_put_vc1_mspel_mc0\vmode\()_neon, export=1
+        add             r3,   r3,   #\filter_add - 1    @ r3 = filter_add - r = filter_add - (1 - rnd) = filter_add - 1 + rnd
+        mov             r12,  #8                        @ loop counter
+        sub             r1,   r1,   r2                  @ r1 = &src[-stride]      @ slide back
+
+        mspel_constants i8 d28 d29 d30 d31 \filter_a \filter_b \filter_c \filter_d q13 r3
+
+        vld1.64         {d0},  [r1], r2                 @ d0 = src[-stride]
+        vld1.64         {d1},  [r1], r2                 @ d1 = src[0]
+        vld1.64         {d2},  [r1], r2                 @ d2 = src[stride]
+
+1:
+        subs            r12,  r12,  #4
+
+        vld1.64         {d3},  [r1], r2                 @ d3 = src[stride * 2]
+        mspel_filter    q11 d21 d0 d1 d2 d3 \filter_a \filter_b \filter_c \filter_d d28 d29 d30 d31 q13 \filter_shift
+        vst1.64         {d21}, [r0,:64], r2             @ store and increment dst
+
+        vld1.64         {d0},  [r1], r2                 @ d0 = next line
+        mspel_filter    q11 d21 d1 d2 d3 d0 \filter_a \filter_b \filter_c \filter_d d28 d29 d30 d31 q13 \filter_shift
+        vst1.64         {d21}, [r0,:64], r2             @ store and increment dst
+
+        vld1.64         {d1},  [r1], r2                 @ d1 = next line
+        mspel_filter    q11 d21 d2 d3 d0 d1 \filter_a \filter_b \filter_c \filter_d d28 d29 d30 d31 q13 \filter_shift
+        vst1.64         {d21}, [r0,:64], r2             @ store and increment dst
+
+        vld1.64         {d2},  [r1], r2                 @ d2 = next line
+        mspel_filter    q11 d21 d3 d0 d1 d2 \filter_a \filter_b \filter_c \filter_d d28 d29 d30 d31 q13 \filter_shift
+        vst1.64         {d21}, [r0,:64], r2             @ store and increment dst
+
+        bne             1b
+
+        bx              lr
+endfunc
+.endm
+
+@ Use C preprocessor and assembler macros to expand to functions for vertical only filtering.
+#define PUT_VC1_MSPEL_MC_V_ONLY(vmode) \
+        put_vc1_mspel_mc_v_only vmode MSPEL_MODE_ ## vmode ## _MUL_CONSTANTS MSPEL_MODE_ ## vmode ## _ADDSHIFT_CONSTANTS
+
+PUT_VC1_MSPEL_MC_V_ONLY(1)
+PUT_VC1_MSPEL_MC_V_ONLY(2)
+PUT_VC1_MSPEL_MC_V_ONLY(3)
+
+#undef PUT_VC1_MSPEL_MC_V_ONLY
+
+function ff_put_pixels8x8_neon, export=1
+        vld1.64         {d0}, [r1], r2
+        vld1.64         {d1}, [r1], r2
+        vld1.64         {d2}, [r1], r2
+        vld1.64         {d3}, [r1], r2
+        vld1.64         {d4}, [r1], r2
+        vld1.64         {d5}, [r1], r2
+        vld1.64         {d6}, [r1], r2
+        vld1.64         {d7}, [r1]
+        vst1.64         {d0}, [r0,:64], r2
+        vst1.64         {d1}, [r0,:64], r2
+        vst1.64         {d2}, [r0,:64], r2
+        vst1.64         {d3}, [r0,:64], r2
+        vst1.64         {d4}, [r0,:64], r2
+        vst1.64         {d5}, [r0,:64], r2
+        vst1.64         {d6}, [r0,:64], r2
+        vst1.64         {d7}, [r0,:64]
+        bx              lr
+endfunc
+
+function ff_vc1_inv_trans_8x8_dc_neon, export=1
+        ldrsh           r2, [r2]              @ int dc = block[0];
+
+        vld1.64         {d0},  [r0,:64], r1
+        vld1.64         {d1},  [r0,:64], r1
+        vld1.64         {d4},  [r0,:64], r1
+        vld1.64         {d5},  [r0,:64], r1
+
+        add             r2, r2, r2, lsl #1    @ dc = (3 * dc +  1) >> 1;
+        vld1.64         {d6},  [r0,:64], r1
+        add             r2, r2, #1
+        vld1.64         {d7},  [r0,:64], r1
+        vld1.64         {d16}, [r0,:64], r1
+        vld1.64         {d17}, [r0,:64], r1
+        asr             r2, r2, #1
+
+        sub             r0,  r0,  r1, lsl #3  @ restore r0 to original value
+
+        add             r2, r2, r2, lsl #1    @ dc = (3 * dc + 16) >> 5;
+        add             r2, r2, #16
+        asr             r2, r2, #5
+
+        vdup.16         q1,  r2               @ dc
+
+        vaddw.u8        q9,   q1,  d0
+        vaddw.u8        q10,  q1,  d1
+        vaddw.u8        q11,  q1,  d4
+        vaddw.u8        q12,  q1,  d5
+        vqmovun.s16     d0,  q9
+        vqmovun.s16     d1,  q10
+        vqmovun.s16     d4,  q11
+        vst1.64         {d0},  [r0,:64], r1
+        vqmovun.s16     d5,  q12
+        vst1.64         {d1},  [r0,:64], r1
+        vaddw.u8        q13,  q1,  d6
+        vst1.64         {d4},  [r0,:64], r1
+        vaddw.u8        q14,  q1,  d7
+        vst1.64         {d5},  [r0,:64], r1
+        vaddw.u8        q15,  q1,  d16
+        vaddw.u8        q1,   q1,  d17        @ this destroys q1
+        vqmovun.s16     d6,  q13
+        vqmovun.s16     d7,  q14
+        vqmovun.s16     d16, q15
+        vqmovun.s16     d17, q1
+        vst1.64         {d6},  [r0,:64], r1
+        vst1.64         {d7},  [r0,:64], r1
+        vst1.64         {d16}, [r0,:64], r1
+        vst1.64         {d17}, [r0,:64]
+        bx              lr
+endfunc
+
+function ff_vc1_inv_trans_8x4_dc_neon, export=1
+        ldrsh           r2, [r2]              @ int dc = block[0];
+
+        vld1.64         {d0},  [r0,:64], r1
+        vld1.64         {d1},  [r0,:64], r1
+        vld1.64         {d4},  [r0,:64], r1
+        vld1.64         {d5},  [r0,:64], r1
+
+        add             r2, r2, r2, lsl #1    @ dc = ( 3 * dc +  1) >> 1;
+
+        sub             r0,  r0,  r1, lsl #2  @ restore r0 to original value
+
+        add             r2, r2, #1
+        asr             r2, r2, #1
+
+        add             r2, r2, r2, lsl #4    @ dc = (17 * dc + 64) >> 7;
+        add             r2, r2, #64
+        asr             r2, r2, #7
+
+        vdup.16         q1,  r2               @ dc
+
+        vaddw.u8        q3,  q1,  d0
+        vaddw.u8        q8,  q1,  d1
+        vaddw.u8        q9,  q1,  d4
+        vaddw.u8        q10, q1,  d5
+        vqmovun.s16     d0,  q3
+        vqmovun.s16     d1,  q8
+        vqmovun.s16     d4,  q9
+        vst1.64         {d0},  [r0,:64], r1
+        vqmovun.s16     d5,  q10
+        vst1.64         {d1},  [r0,:64], r1
+        vst1.64         {d4},  [r0,:64], r1
+        vst1.64         {d5},  [r0,:64]
+        bx              lr
+endfunc
+
+function ff_vc1_inv_trans_4x8_dc_neon, export=1
+        ldrsh           r2, [r2]              @ int dc = block[0];
+
+        vld1.32         {d0[]},   [r0,:32], r1
+        vld1.32         {d1[]},   [r0,:32], r1
+        vld1.32         {d0[1]},  [r0,:32], r1
+        vld1.32         {d1[1]},  [r0,:32], r1
+
+        add             r2, r2, r2, lsl #4    @ dc = (17 * dc +  4) >> 3;
+        vld1.32         {d4[]},   [r0,:32], r1
+        add             r2, r2, #4
+        vld1.32         {d5[]},   [r0,:32], r1
+        vld1.32         {d4[1]},  [r0,:32], r1
+        asr             r2, r2, #3
+        vld1.32         {d5[1]},  [r0,:32], r1
+
+        add             r2, r2, r2, lsl #1    @ dc = (12 * dc + 64) >> 7;
+
+        sub             r0,  r0,  r1, lsl #3  @ restore r0 to original value
+
+        lsl             r2, r2, #2
+        add             r2, r2, #64
+        asr             r2, r2, #7
+
+        vdup.16         q1,  r2               @ dc
+
+        vaddw.u8        q3,  q1,  d0
+        vaddw.u8        q8,  q1,  d1
+        vaddw.u8        q9,  q1,  d4
+        vaddw.u8        q10, q1,  d5
+        vqmovun.s16     d0,  q3
+        vst1.32         {d0[0]},  [r0,:32], r1
+        vqmovun.s16     d1,  q8
+        vst1.32         {d1[0]},  [r0,:32], r1
+        vqmovun.s16     d4,  q9
+        vst1.32         {d0[1]},  [r0,:32], r1
+        vqmovun.s16     d5,  q10
+        vst1.32         {d1[1]},  [r0,:32], r1
+        vst1.32         {d4[0]},  [r0,:32], r1
+        vst1.32         {d5[0]},  [r0,:32], r1
+        vst1.32         {d4[1]},  [r0,:32], r1
+        vst1.32         {d5[1]},  [r0,:32]
+        bx              lr
+endfunc
+
+function ff_vc1_inv_trans_4x4_dc_neon, export=1
+        ldrsh           r2, [r2]              @ int dc = block[0];
+
+        vld1.32         {d0[]},   [r0,:32], r1
+        vld1.32         {d1[]},   [r0,:32], r1
+        vld1.32         {d0[1]},  [r0,:32], r1
+        vld1.32         {d1[1]},  [r0,:32], r1
+
+        add             r2, r2, r2, lsl #4    @ dc = (17 * dc +  4) >> 3;
+
+        sub             r0,  r0,  r1, lsl #2  @ restore r0 to original value
+
+        add             r2, r2, #4
+        asr             r2, r2, #3
+
+        add             r2, r2, r2, lsl #4    @ dc = (17 * dc + 64) >> 7;
+        add             r2, r2, #64
+        asr             r2, r2, #7
+
+        vdup.16         q1,  r2               @ dc
+
+        vaddw.u8        q2,  q1,  d0
+        vaddw.u8        q3,  q1,  d1
+        vqmovun.s16     d0,  q2
+        vst1.32         {d0[0]},  [r0,:32], r1
+        vqmovun.s16     d1,  q3
+        vst1.32         {d1[0]},  [r0,:32], r1
+        vst1.32         {d0[1]},  [r0,:32], r1
+        vst1.32         {d1[1]},  [r0,:32]
+        bx              lr
+endfunc

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/arm/videodsp_armv5te.S -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/arm/videodsp_armv5te.S Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/arm/vp3dsp_init_arm.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/arm/vp3dsp_init_arm.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/arm/vp3dsp_neon.S -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/arm/vp3dsp_neon.S Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/arm/vp8dsp.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/arm/vp8dsp.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/arm/vp8dsp_armv6.S -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/arm/vp8dsp_armv6.S Changed

@@ -359,14 +359,14 @@
 function ff_vp8_idct_dc_add4uv_armv6, export=1
         push            {r4, lr}
 
-        bl              ff_vp8_idct_dc_add_armv6
+        bl              X(ff_vp8_idct_dc_add_armv6)
         add             r0,  r0,  #4
-        bl              ff_vp8_idct_dc_add_armv6
+        bl              X(ff_vp8_idct_dc_add_armv6)
         add             r0,  r0,  r2,  lsl #2
         sub             r0,  r0,  #4
-        bl              ff_vp8_idct_dc_add_armv6
+        bl              X(ff_vp8_idct_dc_add_armv6)
         add             r0,  r0,  #4
-        bl              ff_vp8_idct_dc_add_armv6
+        bl              X(ff_vp8_idct_dc_add_armv6)
 
         pop             {r4, pc}
 endfunc
@@ -375,13 +375,13 @@
 function ff_vp8_idct_dc_add4y_armv6, export=1
         push            {r4, lr}
 
-        bl              ff_vp8_idct_dc_add_armv6
+        bl              X(ff_vp8_idct_dc_add_armv6)
         add             r0,  r0,  #4
-        bl              ff_vp8_idct_dc_add_armv6
+        bl              X(ff_vp8_idct_dc_add_armv6)
         add             r0,  r0,  #4
-        bl              ff_vp8_idct_dc_add_armv6
+        bl              X(ff_vp8_idct_dc_add_armv6)
         add             r0,  r0,  #4
-        bl              ff_vp8_idct_dc_add_armv6
+        bl              X(ff_vp8_idct_dc_add_armv6)
 
         pop             {r4, pc}
 endfunc
@@ -1204,7 +1204,7 @@
         mov             r4,  #\size
         stm             r12, {r4, r5}
         orr             r12, r6,  r7
-        b               vp8_put_\name\()_\hv\()_armv6 + 4
+        b               bl_put_\name\()_\hv\()_armv6
 endfunc
 .endm
 
@@ -1300,6 +1300,7 @@
 
 function vp8_put_epel_h6_armv6
         push            {r1, r4-r11, lr}
+bl_put_epel_h6_armv6:
         sub             r2,  r2,  #2
         movrel          lr,  sixtap_filters_13245600 - 16
         add             lr,  lr,  r12, lsl #3
@@ -1358,6 +1359,7 @@
 
 function vp8_put_epel_v6_armv6
         push            {r1, r4-r11, lr}
+bl_put_epel_v6_armv6:
         movrel          lr,  sixtap_filters_13245600 - 16
         add             lr,  lr,  r12, lsl #3
         str             r3,  [sp, #48]
@@ -1437,6 +1439,7 @@
 
 function vp8_put_epel_h4_armv6
         push            {r1, r4-r11, lr}
+bl_put_epel_h4_armv6:
         subs            r2,  r2,  #1
         movrel          lr,  fourtap_filters_1324 - 4
         add             lr,  lr,  r12, lsl #2
@@ -1483,6 +1486,7 @@
 
 function vp8_put_epel_v4_armv6
         push            {r1, r4-r11, lr}
+bl_put_epel_v4_armv6:
         movrel          lr,  fourtap_filters_1324 - 4
         add             lr,  lr,  r12, lsl #2
         ldm             lr,  {r5, r6}
@@ -1544,6 +1548,7 @@
 
 function vp8_put_bilin_h_armv6
         push            {r1, r4-r11, lr}
+bl_put_bilin_h_armv6:
         rsb             r5,  r12, r12, lsl #16
         ldr             r12, [sp, #44]
         sub             r3,  r3,  r4
@@ -1589,6 +1594,7 @@
 
 function vp8_put_bilin_v_armv6
         push            {r1, r4-r11, lr}
+bl_put_bilin_v_armv6:
         rsb             r5,  r12, r12, lsl #16
         ldr             r12, [sp, #44]
         add             r5,  r5,  #8

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/arm/vp8dsp_init_arm.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/arm/vp8dsp_init_arm.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/arm/vp8dsp_init_armv6.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/arm/vp8dsp_init_armv6.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/arm/vp8dsp_init_neon.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/arm/vp8dsp_init_neon.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/arm/vp8dsp_neon.S -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/arm/vp8dsp_neon.S Changed

@@ -1576,12 +1576,11 @@
 /* Bilinear MC */
 
 function ff_put_vp8_bilin16_h_neon, export=1
-        push            {lr}
-        ldr             lr,  [sp, #8]           @ mx
-        rsb             r12, lr,  #8
-        vdup.8          d0,  lr
+        ldr             r12, [sp, #4]           @ mx
+        vdup.8          d0,  r12
+        rsb             r12, r12, #8
         vdup.8          d1,  r12
-        ldr             r12, [sp, #4]           @ h
+        ldr             r12, [sp]               @ h
 1:
         subs            r12, r12, #2
         vld1.8          {d2-d4},  [r2], r3
@@ -1604,16 +1603,15 @@
         vst1.8          {q3},     [r0,:128], r1
         bgt             1b
 
-        pop             {pc}
+        bx              lr
 endfunc
 
 function ff_put_vp8_bilin16_v_neon, export=1
-        push            {lr}
-        ldr             lr,  [sp, #12]          @ my
-        rsb             r12, lr,  #8
-        vdup.8          d0,  lr
+        ldr             r12, [sp, #8]           @ my
+        vdup.8          d0,  r12
+        rsb             r12, r12, #8
         vdup.8          d1,  r12
-        ldr             r12, [sp, #4]           @ h
+        ldr             r12, [sp]               @ h
         vld1.8          {q1},     [r2], r3
 1:
         subs            r12, r12, #2
@@ -1635,20 +1633,19 @@
         vst1.8          {q3},     [r0,:128], r1
         bgt             1b
 
-        pop             {pc}
+        bx              lr
 endfunc
 
 function ff_put_vp8_bilin16_hv_neon, export=1
-        push            {lr}
-        ldr             lr,  [sp, #8]           @ mx
-        rsb             r12, lr,  #8
-        vdup.8          d0,  lr
+        ldr             r12, [sp, #4]           @ mx
+        vdup.8          d0,  r12
+        rsb             r12, r12, #8
         vdup.8          d1,  r12
-        ldr             lr,  [sp, #12]          @ my
-        rsb             r12, lr,  #8
-        vdup.8          d2,  lr
+        ldr             r12, [sp, #8]           @ my
+        vdup.8          d2,  r12
+        rsb             r12, r12, #8
         vdup.8          d3,  r12
-        ldr             r12, [sp, #4]           @ h
+        ldr             r12, [sp]               @ h
 
         vld1.8          {d4-d6},  [r2], r3
         vext.8          q3,  q2,  q3,  #1
@@ -1692,16 +1689,15 @@
         vst1.8          {q10},    [r0,:128], r1
         bgt             1b
 
-        pop             {pc}
+        bx              lr
 endfunc
 
 function ff_put_vp8_bilin8_h_neon, export=1
-        push            {lr}
-        ldr             lr,  [sp, #8]           @ mx
-        rsb             r12, lr,  #8
-        vdup.8          d0,  lr
+        ldr             r12, [sp, #4]           @ mx
+        vdup.8          d0,  r12
+        rsb             r12, r12, #8
         vdup.8          d1,  r12
-        ldr             r12, [sp, #4]           @ h
+        ldr             r12, [sp]               @ h
 1:
         subs            r12, r12, #2
         vld1.8          {q1},     [r2], r3
@@ -1718,16 +1714,15 @@
         vst1.8          {d16},    [r0,:64], r1
         bgt             1b
 
-        pop             {pc}
+        bx              lr
 endfunc
 
 function ff_put_vp8_bilin8_v_neon, export=1
-        push            {lr}
-        ldr             lr,  [sp, #12]          @ my
-        rsb             r12, lr,  #8
-        vdup.8          d0,  lr
+        ldr             r12, [sp, #8]           @ my
+        vdup.8          d0,  r12
+        rsb             r12, r12,  #8
         vdup.8          d1,  r12
-        ldr             r12, [sp, #4]           @ h
+        ldr             r12, [sp]               @ h
         vld1.8          {d2},     [r2], r3
 1:
         subs            r12, r12, #2
@@ -1743,20 +1738,19 @@
         vst1.8          {d6},     [r0,:64], r1
         bgt             1b
 
-        pop             {pc}
+        bx              lr
 endfunc
 
 function ff_put_vp8_bilin8_hv_neon, export=1
-        push            {lr}
-        ldr             lr,  [sp, #8]           @ mx
-        rsb             r12, lr,  #8
-        vdup.8          d0,  lr
+        ldr             r12, [sp, #4]           @ mx
+        vdup.8          d0,  r12
+        rsb             r12, r12, #8
         vdup.8          d1,  r12
-        ldr             lr,  [sp, #12]          @ my
-        rsb             r12, lr,  #8
-        vdup.8          d2,  lr
+        ldr             r12, [sp, #8]           @ my
+        vdup.8          d2,  r12
+        rsb             r12, r12, #8
         vdup.8          d3,  r12
-        ldr             r12, [sp, #4]           @ h
+        ldr             r12, [sp]               @ h
 
         vld1.8          {q2},     [r2], r3
         vext.8          d5,  d4,  d5,  #1
@@ -1785,16 +1779,15 @@
         vst1.8          {d23},    [r0,:64], r1
         bgt             1b
 
-        pop             {pc}
+        bx              lr
 endfunc
 
 function ff_put_vp8_bilin4_h_neon, export=1
-        push            {lr}
-        ldr             lr,  [sp, #8]           @ mx
-        rsb             r12, lr,  #8
-        vdup.8          d0,  lr
+        ldr             r12, [sp, #4]           @ mx
+        vdup.8          d0,  r12
+        rsb             r12, r12, #8
         vdup.8          d1,  r12
-        ldr             r12, [sp, #4]           @ h
+        ldr             r12, [sp]               @ h
 1:
         subs            r12, r12, #2
         vld1.8          {d2},     [r2], r3
@@ -1809,16 +1802,15 @@
         vst1.32         {d4[1]}, [r0,:32], r1
         bgt             1b
 
-        pop             {pc}
+        bx              lr
 endfunc
 
 function ff_put_vp8_bilin4_v_neon, export=1
-        push            {lr}
-        ldr             lr,  [sp, #12]           @ my
-        rsb             r12, lr,  #8
-        vdup.8          d0,  lr
+        ldr             r12, [sp, #8]           @ my
+        vdup.8          d0,  r12
+        rsb             r12, r12, #8
         vdup.8          d1,  r12
-        ldr             r12, [sp, #4]            @ h
+        ldr             r12, [sp]               @ h
         vld1.32         {d2[]},   [r2], r3
 1:
         vld1.32         {d3[]},   [r2]
@@ -1833,20 +1825,19 @@
         subs            r12, r12, #2
         bgt             1b
 
-        pop             {pc}
+        bx              lr
 endfunc
 
 function ff_put_vp8_bilin4_hv_neon, export=1
-        push            {lr}
-        ldr             lr,  [sp, #8]           @ mx
-        rsb             r12, lr,  #8
-        vdup.8          d0,  lr
+        ldr             r12, [sp, #4]           @ mx
+        vdup.8          d0,  r12
+        rsb             r12, r12, #8
         vdup.8          d1,  r12
-        ldr             lr,  [sp, #12]          @ my
-        rsb             r12, lr,  #8
-        vdup.8          d2,  lr
+        ldr             r12, [sp, #8]           @ my
+        vdup.8          d2,  r12
+        rsb             r12, r12, #8
         vdup.8          d3,  r12
-        ldr             r12, [sp, #4]           @ h
+        ldr             r12, [sp]               @ h
 
         vld1.8          {d4},     [r2], r3
         vext.8          d5,  d4,  d4,  #1
@@ -1872,5 +1863,5 @@
         vst1.32         {d20[1]}, [r0,:32], r1
         bgt             1b
 
-        pop             {pc}
+        bx              lr
 endfunc

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/ass.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/ass.c Changed

@@ -77,14 +77,11 @@
     }
 }
 
-int ff_ass_add_rect(AVSubtitle *sub, const char *dialog,
-                    int ts_start, int duration, int raw)
+int ff_ass_bprint_dialog(AVBPrint *buf, const char *dialog,
+                         int ts_start, int duration, int raw)
 {
-    AVBPrint buf;
-    int ret, dlen;
-    AVSubtitleRect **rects;
+    int dlen;
 
-    av_bprint_init(&buf, 0, AV_BPRINT_SIZE_UNLIMITED);
     if (!raw || raw == 2) {
         long int layer = 0;
 
@@ -101,32 +98,92 @@
                 return AVERROR_INVALIDDATA;
             dialog++;
         }
-        av_bprintf(&buf, "Dialogue: %ld,", layer);
-        insert_ts(&buf, ts_start);
-        insert_ts(&buf, duration == -1 ? -1 : ts_start + duration);
+        av_bprintf(buf, "Dialogue: %ld,", layer);
+        insert_ts(buf, ts_start);
+        insert_ts(buf, duration == -1 ? -1 : ts_start + duration);
         if (raw != 2)
-            av_bprintf(&buf, "Default,");
+            av_bprintf(buf, "Default,");
     }
 
     dlen = strcspn(dialog, "\n");
     dlen += dialog[dlen] == '\n';
 
-    av_bprintf(&buf, "%.*s", dlen, dialog);
+    av_bprintf(buf, "%.*s", dlen, dialog);
     if (raw == 2)
-        av_bprintf(&buf, "\r\n");
+        av_bprintf(buf, "\r\n");
+
+    return dlen;
+}
+
+int ff_ass_add_rect(AVSubtitle *sub, const char *dialog,
+                    int ts_start, int duration, int raw)
+{
+    AVBPrint buf;
+    int ret, dlen;
+    AVSubtitleRect **rects;
+
+    av_bprint_init(&buf, 0, AV_BPRINT_SIZE_UNLIMITED);
+    if ((ret = ff_ass_bprint_dialog(&buf, dialog, ts_start, duration, raw)) < 0)
+        goto err;
+    dlen = ret;
     if (!av_bprint_is_complete(&buf))
-        return AVERROR(ENOMEM);
+        goto errnomem;
 
     rects = av_realloc(sub->rects, (sub->num_rects+1) * sizeof(*sub->rects));
     if (!rects)
-        return AVERROR(ENOMEM);
+        goto errnomem;
     sub->rects = rects;
     sub->end_display_time = FFMAX(sub->end_display_time, 10 * duration);
     rects[sub->num_rects]       = av_mallocz(sizeof(*rects[0]));
     rects[sub->num_rects]->type = SUBTITLE_ASS;
     ret = av_bprint_finalize(&buf, &rects[sub->num_rects]->ass);
     if (ret < 0)
-        return ret;
+        goto err;
     sub->num_rects++;
     return dlen;
+
+errnomem:
+    ret = AVERROR(ENOMEM);
+err:
+    av_bprint_finalize(&buf, NULL);
+    return ret;
+}
+
+void ff_ass_bprint_text_event(AVBPrint *buf, const char *p, int size,
+                             const char *linebreaks, int keep_ass_markup)
+{
+    const char *p_end = p + size;
+
+    for (; p < p_end && *p; p++) {
+
+        /* forced custom line breaks, not accounted as "normal" EOL */
+        if (linebreaks && strchr(linebreaks, *p)) {
+            av_bprintf(buf, "\\N");
+
+        /* standard ASS escaping so random characters don't get mis-interpreted
+         * as ASS */
+        } else if (!keep_ass_markup && strchr("{}\\", *p)) {
+            av_bprintf(buf, "\\%c", *p);
+
+        /* some packets might end abruptly (no \0 at the end, like for example
+         * in some cases of demuxing from a classic video container), some
+         * might be terminated with \n or \r\n which we have to remove (for
+         * consistency with those who haven't), and we also have to deal with
+         * evil cases such as \r at the end of the buffer (and no \0 terminated
+         * character) */
+        } else if (p[0] == '\n') {
+            /* some stuff left so we can insert a line break */
+            if (p < p_end - 1)
+                av_bprintf(buf, "\\N");
+        } else if (p[0] == '\r' && p < p_end - 1 && p[1] == '\n') {
+            /* \r followed by a \n, we can skip it. We don't insert the \N yet
+             * because we don't know if it is followed by more text */
+            continue;
+
+        /* finally, a sane character */
+        } else {
+            av_bprint_chars(buf, *p, 1);
+        }
+    }
+    av_bprintf(buf, "\r\n");
 }

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/ass.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/ass.h Changed

@@ -23,6 +23,7 @@
 #define AVCODEC_ASS_H
 
 #include "avcodec.h"
+#include "libavutil/bprint.h"
 
 /**
  * @name Default values for ASS style
@@ -90,4 +91,38 @@
 int ff_ass_add_rect(AVSubtitle *sub, const char *dialog,
                     int ts_start, int duration, int raw);
 
+/**
+ * Add an ASS dialog line to an AVBPrint buffer.
+ *
+ * @param buf pointer to an initialized AVBPrint buffer
+ * @param dialog ASS dialog to add to sub
+ * @param ts_start start timestamp for this dialog (in 1/100 second unit)
+ * @param duration duration for this dialog (in 1/100 second unit), can be -1
+ *                 to last until the end of the presentation
+ * @param raw when set to 2, it indicates that dialog contains an ASS
+ *                           dialog line as muxed in Matroska
+ *            when set to 1, it indicates that dialog contains a whole SSA
+ *                           dialog line which should be copied as is.
+ *            when set to 0, it indicates that dialog contains only the Text
+ *                           part of the ASS dialog line, the rest of the line
+ *                           will be generated.
+ * @return number of characters read from dialog. It can be less than the whole
+ *         length of dialog, if dialog contains several lines of text.
+ *         A negative value indicates an error.
+ */
+int ff_ass_bprint_dialog(AVBPrint *buf, const char *dialog,
+                         int ts_start, int duration, int raw);
+
+/**
+ * Escape a text subtitle using ASS syntax into an AVBPrint buffer.
+ * Newline characters will be escaped to \N.
+ *
+ * @param buf pointer to an initialized AVBPrint buffer
+ * @param p source text
+ * @param size size of the source text
+ * @param linebreaks additional newline chars, which will be escaped to \N
+ * @param keep_ass_markup braces and backslash will not be escaped if set
+ */
+void ff_ass_bprint_text_event(AVBPrint *buf, const char *p, int size,
+                             const char *linebreaks, int keep_ass_markup);
 #endif /* AVCODEC_ASS_H */

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/asv.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/asv.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/asv.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/asv.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/asvenc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/asvenc.c Changed

@@ -148,14 +148,16 @@
     return 0;
 }
 
-static inline void dct_get(ASV1Context *a, int mb_x, int mb_y){
+static inline void dct_get(ASV1Context *a, const AVFrame *frame,
+                           int mb_x, int mb_y)
+{
     int16_t (*block)[64]= a->block;
-    int linesize= a->picture.linesize[0];
+    int linesize = frame->linesize[0];
     int i;
 
-    uint8_t *ptr_y  = a->picture.data[0] + (mb_y * 16* linesize              ) + mb_x * 16;
-    uint8_t *ptr_cb = a->picture.data[1] + (mb_y * 8 * a->picture.linesize[1]) + mb_x * 8;
-    uint8_t *ptr_cr = a->picture.data[2] + (mb_y * 8 * a->picture.linesize[2]) + mb_x * 8;
+    uint8_t *ptr_y  = frame->data[0] + (mb_y * 16* linesize              ) + mb_x * 16;
+    uint8_t *ptr_cb = frame->data[1] + (mb_y * 8 * frame->linesize[1]) + mb_x * 8;
+    uint8_t *ptr_cr = frame->data[2] + (mb_y * 8 * frame->linesize[2]) + mb_x * 8;
 
     a->dsp.get_pixels(block[0], ptr_y                 , linesize);
     a->dsp.get_pixels(block[1], ptr_y              + 8, linesize);
@@ -165,8 +167,8 @@
         a->dsp.fdct(block[i]);
 
     if(!(a->avctx->flags&CODEC_FLAG_GRAY)){
-        a->dsp.get_pixels(block[4], ptr_cb, a->picture.linesize[1]);
-        a->dsp.get_pixels(block[5], ptr_cr, a->picture.linesize[2]);
+        a->dsp.get_pixels(block[4], ptr_cb, frame->linesize[1]);
+        a->dsp.get_pixels(block[5], ptr_cr, frame->linesize[2]);
         for(i=4; i<6; i++)
             a->dsp.fdct(block[i]);
     }
@@ -176,7 +178,6 @@
                         const AVFrame *pict, int *got_packet)
 {
     ASV1Context * const a = avctx->priv_data;
-    AVFrame * const p= &a->picture;
     int size, ret;
     int mb_x, mb_y;
 
@@ -186,13 +187,9 @@
 
     init_put_bits(&a->pb, pkt->data, pkt->size);
 
-    *p = *pict;
-    p->pict_type= AV_PICTURE_TYPE_I;
-    p->key_frame= 1;
-
     for(mb_y=0; mb_y<a->mb_height2; mb_y++){
         for(mb_x=0; mb_x<a->mb_width2; mb_x++){
-            dct_get(a, mb_x, mb_y);
+            dct_get(a, pict, mb_x, mb_y);
             encode_mb(a, a->block);
         }
     }
@@ -200,7 +197,7 @@
     if(a->mb_width2 != a->mb_width){
         mb_x= a->mb_width2;
         for(mb_y=0; mb_y<a->mb_height2; mb_y++){
-            dct_get(a, mb_x, mb_y);
+            dct_get(a, pict, mb_x, mb_y);
             encode_mb(a, a->block);
         }
     }
@@ -208,7 +205,7 @@
     if(a->mb_height2 != a->mb_height){
         mb_y= a->mb_height2;
         for(mb_x=0; mb_x<a->mb_width; mb_x++){
-            dct_get(a, mb_x, mb_y);
+            dct_get(a, pict, mb_x, mb_y);
             encode_mb(a, a->block);
         }
     }

omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/atrac3plus.c Added

@@ -0,0 +1,1818 @@
+/*
+ * ATRAC3+ compatible decoder
+ *
+ * Copyright (c) 2010-2013 Maxim Poliakovski
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * Bitstream parser for ATRAC3+ decoder.
+ */
+
+#include "libavutil/avassert.h"
+#include "avcodec.h"
+#include "get_bits.h"
+#include "atrac3plus.h"
+#include "atrac3plus_data.h"
+
+static VLC_TYPE tables_data[154276][2];
+static VLC wl_vlc_tabs[4];
+static VLC sf_vlc_tabs[8];
+static VLC ct_vlc_tabs[4];
+static VLC spec_vlc_tabs[112];
+static VLC gain_vlc_tabs[11];
+static VLC tone_vlc_tabs[7];
+
+#define GET_DELTA(gb, delta_bits) \
+    ((delta_bits) ? get_bits((gb), (delta_bits)) : 0)
+
+/**
+ * Generate canonical VLC table from given descriptor.
+ *
+ * @param[in]     cb          ptr to codebook descriptor
+ * @param[in]     xlat        ptr to translation table or NULL
+ * @param[in,out] tab_offset  starting offset to the generated vlc table
+ * @param[out]    out_vlc     ptr to vlc table to be generated
+ */
+static av_cold void build_canonical_huff(const uint8_t *cb, const uint8_t *xlat,
+                                         int *tab_offset, VLC *out_vlc)
+{
+    int i, b;
+    uint16_t codes[256];
+    uint8_t bits[256];
+    unsigned code = 0;
+    int index = 0;
+    int min_len = *cb++; // get shortest codeword length
+    int max_len = *cb++; // get longest  codeword length
+
+    for (b = min_len; b <= max_len; b++) {
+        for (i = *cb++; i > 0; i--) {
+            av_assert0(index < 256);
+            bits[index]  = b;
+            codes[index] = code++;
+            index++;
+        }
+        code <<= 1;
+    }
+
+    out_vlc->table = &tables_data[*tab_offset];
+    out_vlc->table_allocated = 1 << max_len;
+
+    ff_init_vlc_sparse(out_vlc, max_len, index, bits, 1, 1, codes, 2, 2,
+                       xlat, 1, 1, INIT_VLC_USE_NEW_STATIC);
+
+    *tab_offset += 1 << max_len;
+}
+
+av_cold void ff_atrac3p_init_vlcs(void)
+{
+    int i, wl_vlc_offs, ct_vlc_offs, sf_vlc_offs, tab_offset;
+
+    static int wl_nb_bits[4]  = { 2, 3, 5, 5 };
+    static int wl_nb_codes[4] = { 3, 5, 8, 8 };
+    static const uint8_t *wl_bits[4] = {
+        atrac3p_wl_huff_bits1, atrac3p_wl_huff_bits2,
+        atrac3p_wl_huff_bits3, atrac3p_wl_huff_bits4
+    };
+    static const uint8_t *wl_codes[4] = {
+        atrac3p_wl_huff_code1, atrac3p_wl_huff_code2,
+        atrac3p_wl_huff_code3, atrac3p_wl_huff_code4
+    };
+    static const uint8_t *wl_xlats[4] = {
+        atrac3p_wl_huff_xlat1, atrac3p_wl_huff_xlat2, NULL, NULL
+    };
+
+    static int ct_nb_bits[4]  = { 3, 4, 4, 4 };
+    static int ct_nb_codes[4] = { 4, 8, 8, 8 };
+    static const uint8_t *ct_bits[4]  = {
+        atrac3p_ct_huff_bits1, atrac3p_ct_huff_bits2,
+        atrac3p_ct_huff_bits2, atrac3p_ct_huff_bits3
+    };
+    static const uint8_t *ct_codes[4] = {
+        atrac3p_ct_huff_code1, atrac3p_ct_huff_code2,
+        atrac3p_ct_huff_code2, atrac3p_ct_huff_code3
+    };
+    static const uint8_t *ct_xlats[4] = {
+        NULL, NULL, atrac3p_ct_huff_xlat1, NULL
+    };
+
+    static int sf_nb_bits[8]  = {  9,  9,  9,  9,  6,  6,  7,  7 };
+    static int sf_nb_codes[8] = { 64, 64, 64, 64, 16, 16, 16, 16 };
+    static const uint8_t  *sf_bits[8]  = {
+        atrac3p_sf_huff_bits1, atrac3p_sf_huff_bits1, atrac3p_sf_huff_bits2,
+        atrac3p_sf_huff_bits3, atrac3p_sf_huff_bits4, atrac3p_sf_huff_bits4,
+        atrac3p_sf_huff_bits5, atrac3p_sf_huff_bits6
+    };
+    static const uint16_t *sf_codes[8] = {
+        atrac3p_sf_huff_code1, atrac3p_sf_huff_code1, atrac3p_sf_huff_code2,
+        atrac3p_sf_huff_code3, atrac3p_sf_huff_code4, atrac3p_sf_huff_code4,
+        atrac3p_sf_huff_code5, atrac3p_sf_huff_code6
+    };
+    static const uint8_t  *sf_xlats[8] = {
+        atrac3p_sf_huff_xlat1, atrac3p_sf_huff_xlat2, NULL, NULL,
+        atrac3p_sf_huff_xlat4, atrac3p_sf_huff_xlat5, NULL, NULL
+    };
+
+    static const uint8_t *gain_cbs[11] = {
+        atrac3p_huff_gain_npoints1_cb, atrac3p_huff_gain_npoints1_cb,
+        atrac3p_huff_gain_lev1_cb, atrac3p_huff_gain_lev2_cb,
+        atrac3p_huff_gain_lev3_cb, atrac3p_huff_gain_lev4_cb,
+        atrac3p_huff_gain_loc3_cb, atrac3p_huff_gain_loc1_cb,
+        atrac3p_huff_gain_loc4_cb, atrac3p_huff_gain_loc2_cb,
+        atrac3p_huff_gain_loc5_cb
+    };
+    static const uint8_t *gain_xlats[11] = {
+        NULL, atrac3p_huff_gain_npoints2_xlat, atrac3p_huff_gain_lev1_xlat,
+        atrac3p_huff_gain_lev2_xlat, atrac3p_huff_gain_lev3_xlat,
+        atrac3p_huff_gain_lev4_xlat, atrac3p_huff_gain_loc3_xlat,
+        atrac3p_huff_gain_loc1_xlat, atrac3p_huff_gain_loc4_xlat,
+        atrac3p_huff_gain_loc2_xlat, atrac3p_huff_gain_loc5_xlat
+    };
+
+    static const uint8_t *tone_cbs[7] = {
+        atrac3p_huff_tonebands_cb,  atrac3p_huff_numwavs1_cb,
+        atrac3p_huff_numwavs2_cb,   atrac3p_huff_wav_ampsf1_cb,
+        atrac3p_huff_wav_ampsf2_cb, atrac3p_huff_wav_ampsf3_cb,
+        atrac3p_huff_freq_cb
+    };
+    static const uint8_t *tone_xlats[7] = {
+        NULL, NULL, atrac3p_huff_numwavs2_xlat, atrac3p_huff_wav_ampsf1_xlat,
+        atrac3p_huff_wav_ampsf2_xlat, atrac3p_huff_wav_ampsf3_xlat,
+        atrac3p_huff_freq_xlat
+    };
+
+    for (i = 0, wl_vlc_offs = 0, ct_vlc_offs = 2508; i < 4; i++) {
+        wl_vlc_tabs[i].table = &tables_data[wl_vlc_offs];
+        wl_vlc_tabs[i].table_allocated = 1 << wl_nb_bits[i];
+        ct_vlc_tabs[i].table = &tables_data[ct_vlc_offs];
+        ct_vlc_tabs[i].table_allocated = 1 << ct_nb_bits[i];
+
+        ff_init_vlc_sparse(&wl_vlc_tabs[i], wl_nb_bits[i], wl_nb_codes[i],
+                           wl_bits[i],  1, 1,
+                           wl_codes[i], 1, 1,
+                           wl_xlats[i], 1, 1,
+                           INIT_VLC_USE_NEW_STATIC);
+
+        ff_init_vlc_sparse(&ct_vlc_tabs[i], ct_nb_bits[i], ct_nb_codes[i],
+                           ct_bits[i],  1, 1,
+                           ct_codes[i], 1, 1,
+                           ct_xlats[i], 1, 1,
+                           INIT_VLC_USE_NEW_STATIC);
+
+        wl_vlc_offs += wl_vlc_tabs[i].table_allocated;
+        ct_vlc_offs += ct_vlc_tabs[i].table_allocated;
+    }
+
+    for (i = 0, sf_vlc_offs = 76; i < 8; i++) {
+        sf_vlc_tabs[i].table = &tables_data[sf_vlc_offs];
+        sf_vlc_tabs[i].table_allocated = 1 << sf_nb_bits[i];
+
+        ff_init_vlc_sparse(&sf_vlc_tabs[i], sf_nb_bits[i], sf_nb_codes[i],
+                           sf_bits[i],  1, 1,
+                           sf_codes[i], 2, 2,
+                           sf_xlats[i], 1, 1,
+                           INIT_VLC_USE_NEW_STATIC);
+        sf_vlc_offs += sf_vlc_tabs[i].table_allocated;
+    }
+
+    tab_offset = 2564;
+
+    /* build huffman tables for spectrum decoding */
+    for (i = 0; i < 112; i++) {
+        if (atrac3p_spectra_tabs[i].cb)
+            build_canonical_huff(atrac3p_spectra_tabs[i].cb,
+                                 atrac3p_spectra_tabs[i].xlat,
+                                 &tab_offset, &spec_vlc_tabs[i]);
+        else
+            spec_vlc_tabs[i].table = 0;
+    }
+
+    /* build huffman tables for gain data decoding */
+    for (i = 0; i < 11; i++)
+        build_canonical_huff(gain_cbs[i], gain_xlats[i], &tab_offset, &gain_vlc_tabs[i]);
+
+    /* build huffman tables for tone decoding */
+    for (i = 0; i < 7; i++)
+        build_canonical_huff(tone_cbs[i], tone_xlats[i], &tab_offset, &tone_vlc_tabs[i]);
+}
+
+/**
+ * Decode number of coded quantization units.
+ *
+ * @param[in]     gb            the GetBit context
+ * @param[in,out] chan          ptr to the channel parameters
+ * @param[in,out] ctx           ptr to the channel unit context
+ * @param[in]     avctx         ptr to the AVCodecContext
+ * @return result code: 0 = OK, otherwise - error code
+ */
+static int num_coded_units(GetBitContext *gb, Atrac3pChanParams *chan,
+                           Atrac3pChanUnitCtx *ctx, AVCodecContext *avctx)
+{
+    chan->fill_mode = get_bits(gb, 2);
+    if (!chan->fill_mode) {
+        chan->num_coded_vals = ctx->num_quant_units;
+    } else {
+        chan->num_coded_vals = get_bits(gb, 5);
+        if (chan->num_coded_vals > ctx->num_quant_units) {
+            av_log(avctx, AV_LOG_ERROR,
+                   "Invalid number of transmitted units!\n");
+            return AVERROR_INVALIDDATA;
+        }
+
+        if (chan->fill_mode == 3)
+            chan->split_point = get_bits(gb, 2) + (chan->ch_num << 1) + 1;
+    }
+
+    return 0;
+}
+
+/**
+ * Add weighting coefficients to the decoded word-length information.
+ *
+ * @param[in,out] ctx           ptr to the channel unit context
+ * @param[in,out] chan          ptr to the channel parameters
+ * @param[in]     wtab_idx      index of the table of weights
+ * @param[in]     avctx         ptr to the AVCodecContext
+ * @return result code: 0 = OK, otherwise - error code
+ */
+static int add_wordlen_weights(Atrac3pChanUnitCtx *ctx,
+                               Atrac3pChanParams *chan, int wtab_idx,
+                               AVCodecContext *avctx)
+{
+    int i;
+    const int8_t *weights_tab =
+        &atrac3p_wl_weights[chan->ch_num * 3 + wtab_idx - 1][0];
+
+    for (i = 0; i < ctx->num_quant_units; i++) {
+        chan->qu_wordlen[i] += weights_tab[i];
+        if (chan->qu_wordlen[i] < 0 || chan->qu_wordlen[i] > 7) {
+            av_log(avctx, AV_LOG_ERROR,
+                   "WL index out of range: pos=%d, val=%d!\n",
+                   i, chan->qu_wordlen[i]);
+            return AVERROR_INVALIDDATA;
+        }
+    }
+
+    return 0;
+}
+
+/**
+ * Subtract weighting coefficients from decoded scalefactors.
+ *
+ * @param[in,out] ctx           ptr to the channel unit context
+ * @param[in,out] chan          ptr to the channel parameters
+ * @param[in]     wtab_idx      index of table of weights
+ * @param[in]     avctx         ptr to the AVCodecContext
+ * @return result code: 0 = OK, otherwise - error code
+ */
+static int subtract_sf_weights(Atrac3pChanUnitCtx *ctx,
+                               Atrac3pChanParams *chan, int wtab_idx,
+                               AVCodecContext *avctx)
+{
+    int i;
+    const int8_t *weights_tab = &atrac3p_sf_weights[wtab_idx - 1][0];
+
+    for (i = 0; i < ctx->used_quant_units; i++) {
+        chan->qu_sf_idx[i] -= weights_tab[i];
+        if (chan->qu_sf_idx[i] < 0 || chan->qu_sf_idx[i] > 63) {
+            av_log(avctx, AV_LOG_ERROR,
+                   "SF index out of range: pos=%d, val=%d!\n",
+                   i, chan->qu_sf_idx[i]);
+            return AVERROR_INVALIDDATA;
+        }
+    }
+
+    return 0;
+}
+
+/**
+ * Unpack vector quantization tables.
+ *
+ * @param[in]    start_val    start value for the unpacked table
+ * @param[in]    shape_vec    ptr to table to unpack
+ * @param[out]   dst          ptr to output array
+ * @param[in]    num_values   number of values to unpack
+ */
+static inline void unpack_vq_shape(int start_val, const int8_t *shape_vec,
+                                   int *dst, int num_values)
+{
+    int i;
+
+    if (num_values) {
+        dst[0] = dst[1] = dst[2] = start_val;
+        for (i = 3; i < num_values; i++)
+            dst[i] = start_val - shape_vec[atrac3p_qu_num_to_seg[i] - 1];
+    }
+}
+
+#define UNPACK_SF_VQ_SHAPE(gb, dst, num_vals)                            \
+    start_val = get_bits((gb), 6);                                       \
+    unpack_vq_shape(start_val, &atrac3p_sf_shapes[get_bits((gb), 6)][0], \
+                    (dst), (num_vals))
+
+/**
+ * Decode word length for each quantization unit of a channel.
+ *
+ * @param[in]     gb            the GetBit context
+ * @param[in,out] ctx           ptr to the channel unit context
+ * @param[in]     ch_num        channel to process
+ * @param[in]     avctx         ptr to the AVCodecContext
+ * @return result code: 0 = OK, otherwise - error code
+ */
+static int decode_channel_wordlen(GetBitContext *gb, Atrac3pChanUnitCtx *ctx,
+                                  int ch_num, AVCodecContext *avctx)
+{
+    int i, weight_idx = 0, delta, diff, pos, delta_bits, min_val, flag,
+        ret, start_val;
+    VLC *vlc_tab;
+    Atrac3pChanParams *chan     = &ctx->channels[ch_num];
+    Atrac3pChanParams *ref_chan = &ctx->channels[0];
+
+    chan->fill_mode = 0;
+
+    switch (get_bits(gb, 2)) { /* switch according to coding mode */
+    case 0: /* coded using constant number of bits */
+        for (i = 0; i < ctx->num_quant_units; i++)
+            chan->qu_wordlen[i] = get_bits(gb, 3);
+        break;
+    case 1:
+        if (ch_num) {
+            if ((ret = num_coded_units(gb, chan, ctx, avctx)) < 0)
+                return ret;
+
+            if (chan->num_coded_vals) {
+                vlc_tab = &wl_vlc_tabs[get_bits(gb, 2)];
+
+                for (i = 0; i < chan->num_coded_vals; i++) {
+                    delta = get_vlc2(gb, vlc_tab->table, vlc_tab->bits, 1);
+                    chan->qu_wordlen[i] = (ref_chan->qu_wordlen[i] + delta) & 7;
+                }
+            }
+        } else {
+            weight_idx = get_bits(gb, 2);
+            if ((ret = num_coded_units(gb, chan, ctx, avctx)) < 0)
+                return ret;
+
+            if (chan->num_coded_vals) {
+                pos = get_bits(gb, 5);
+                if (pos > chan->num_coded_vals) {
+                    av_log(avctx, AV_LOG_ERROR,
+                           "WL mode 1: invalid position!\n");
+                    return AVERROR_INVALIDDATA;
+                }
+
+                delta_bits = get_bits(gb, 2);
+                min_val    = get_bits(gb, 3);
+
+                for (i = 0; i < pos; i++)
+                    chan->qu_wordlen[i] = get_bits(gb, 3);
+
+                for (i = pos; i < chan->num_coded_vals; i++)
+                    chan->qu_wordlen[i] = (min_val + GET_DELTA(gb, delta_bits)) & 7;
+            }
+        }
+        break;
+    case 2:
+        if ((ret = num_coded_units(gb, chan, ctx, avctx)) < 0)
+            return ret;
+
+        if (ch_num && chan->num_coded_vals) {
+            vlc_tab = &wl_vlc_tabs[get_bits(gb, 2)];
+            delta = get_vlc2(gb, vlc_tab->table, vlc_tab->bits, 1);
+            chan->qu_wordlen[0] = (ref_chan->qu_wordlen[0] + delta) & 7;
+
+            for (i = 1; i < chan->num_coded_vals; i++) {
+                diff = ref_chan->qu_wordlen[i] - ref_chan->qu_wordlen[i - 1];
+                delta = get_vlc2(gb, vlc_tab->table, vlc_tab->bits, 1);
+                chan->qu_wordlen[i] = (chan->qu_wordlen[i - 1] + diff + delta) & 7;
+            }
+        } else if (chan->num_coded_vals) {
+            flag    = get_bits(gb, 1);
+            vlc_tab = &wl_vlc_tabs[get_bits(gb, 1)];
+
+            start_val = get_bits(gb, 3);
+            unpack_vq_shape(start_val,
+                            &atrac3p_wl_shapes[start_val][get_bits(gb, 4)][0],
+                            chan->qu_wordlen, chan->num_coded_vals);
+
+            if (!flag) {
+                for (i = 0; i < chan->num_coded_vals; i++) {
+                    delta = get_vlc2(gb, vlc_tab->table, vlc_tab->bits, 1);
+                    chan->qu_wordlen[i] = (chan->qu_wordlen[i] + delta) & 7;
+                }
+            } else {
+                for (i = 0; i < (chan->num_coded_vals & - 2); i += 2)
+                    if (!get_bits1(gb)) {
+                        chan->qu_wordlen[i]     = (chan->qu_wordlen[i] +
+                                                   get_vlc2(gb, vlc_tab->table,
+                                                            vlc_tab->bits, 1)) & 7;
+                        chan->qu_wordlen[i + 1] = (chan->qu_wordlen[i + 1] +
+                                                   get_vlc2(gb, vlc_tab->table,
+                                                            vlc_tab->bits, 1)) & 7;
+                    }
+
+                if (chan->num_coded_vals & 1)
+                    chan->qu_wordlen[i] = (chan->qu_wordlen[i] +
+                                           get_vlc2(gb, vlc_tab->table,
+                                                    vlc_tab->bits, 1)) & 7;
+            }
+        }
+        break;
+    case 3:
+        weight_idx = get_bits(gb, 2);
+        if ((ret = num_coded_units(gb, chan, ctx, avctx)) < 0)
+            return ret;
+
+        if (chan->num_coded_vals) {
+            vlc_tab = &wl_vlc_tabs[get_bits(gb, 2)];
+
+            /* first coefficient is coded directly */
+            chan->qu_wordlen[0] = get_bits(gb, 3);
+
+            for (i = 1; i < chan->num_coded_vals; i++) {
+                delta = get_vlc2(gb, vlc_tab->table, vlc_tab->bits, 1);
+                chan->qu_wordlen[i] = (chan->qu_wordlen[i - 1] + delta) & 7;
+            }
+        }
+        break;
+    }
+
+    if (chan->fill_mode == 2) {
+        for (i = chan->num_coded_vals; i < ctx->num_quant_units; i++)
+            chan->qu_wordlen[i] = ch_num ? get_bits1(gb) : 1;
+    } else if (chan->fill_mode == 3) {
+        pos = ch_num ? chan->num_coded_vals + chan->split_point
+                     : ctx->num_quant_units - chan->split_point;
+        for (i = chan->num_coded_vals; i < pos; i++)
+            chan->qu_wordlen[i] = 1;
+    }
+
+    if (weight_idx)
+        return add_wordlen_weights(ctx, chan, weight_idx, avctx);
+
+    return 0;
+}
+
+/**
+ * Decode scale factor indexes for each quant unit of a channel.
+ *
+ * @param[in]     gb            the GetBit context
+ * @param[in,out] ctx           ptr to the channel unit context
+ * @param[in]     ch_num        channel to process
+ * @param[in]     avctx         ptr to the AVCodecContext
+ * @return result code: 0 = OK, otherwise - error code
+ */
+static int decode_channel_sf_idx(GetBitContext *gb, Atrac3pChanUnitCtx *ctx,
+                                 int ch_num, AVCodecContext *avctx)
+{
+    int i, weight_idx = 0, delta, diff, num_long_vals,
+        delta_bits, min_val, vlc_sel, start_val;
+    VLC *vlc_tab;
+    Atrac3pChanParams *chan     = &ctx->channels[ch_num];
+    Atrac3pChanParams *ref_chan = &ctx->channels[0];
+
+    switch (get_bits(gb, 2)) { /* switch according to coding mode */
+    case 0: /* coded using constant number of bits */
+        for (i = 0; i < ctx->used_quant_units; i++)
+            chan->qu_sf_idx[i] = get_bits(gb, 6);
+        break;
+    case 1:
+        if (ch_num) {
+            vlc_tab = &sf_vlc_tabs[get_bits(gb, 2)];
+
+            for (i = 0; i < ctx->used_quant_units; i++) {
+                delta = get_vlc2(gb, vlc_tab->table, vlc_tab->bits, 1);
+                chan->qu_sf_idx[i] = (ref_chan->qu_sf_idx[i] + delta) & 0x3F;
+            }
+        } else {
+            weight_idx = get_bits(gb, 2);
+            if (weight_idx == 3) {
+                UNPACK_SF_VQ_SHAPE(gb, chan->qu_sf_idx, ctx->used_quant_units);
+
+                num_long_vals = get_bits(gb, 5);
+                delta_bits    = get_bits(gb, 2);
+                min_val       = get_bits(gb, 4) - 7;
+
+                for (i = 0; i < num_long_vals; i++)
+                    chan->qu_sf_idx[i] = (chan->qu_sf_idx[i] +
+                                          get_bits(gb, 4) - 7) & 0x3F;
+
+                /* all others are: min_val + delta */
+                for (i = num_long_vals; i < ctx->used_quant_units; i++)
+                    chan->qu_sf_idx[i] = (chan->qu_sf_idx[i] + min_val +
+                                          GET_DELTA(gb, delta_bits)) & 0x3F;
+            } else {
+                num_long_vals = get_bits(gb, 5);
+                delta_bits    = get_bits(gb, 3);
+                min_val       = get_bits(gb, 6);
+                if (num_long_vals > ctx->used_quant_units || delta_bits == 7) {
+                    av_log(avctx, AV_LOG_ERROR,
+                           "SF mode 1: invalid parameters!\n");
+                    return AVERROR_INVALIDDATA;
+                }
+
+                /* read full-precision SF indexes */
+                for (i = 0; i < num_long_vals; i++)
+                    chan->qu_sf_idx[i] = get_bits(gb, 6);
+
+                /* all others are: min_val + delta */
+                for (i = num_long_vals; i < ctx->used_quant_units; i++)
+                    chan->qu_sf_idx[i] = (min_val +
+                                          GET_DELTA(gb, delta_bits)) & 0x3F;
+            }
+        }
+        break;
+    case 2:
+        if (ch_num) {
+            vlc_tab = &sf_vlc_tabs[get_bits(gb, 2)];
+
+            delta = get_vlc2(gb, vlc_tab->table, vlc_tab->bits, 1);
+            chan->qu_sf_idx[0] = (ref_chan->qu_sf_idx[0] + delta) & 0x3F;
+
+            for (i = 1; i < ctx->used_quant_units; i++) {
+                diff  = ref_chan->qu_sf_idx[i] - ref_chan->qu_sf_idx[i - 1];
+                delta = get_vlc2(gb, vlc_tab->table, vlc_tab->bits, 1);
+                chan->qu_sf_idx[i] = (chan->qu_sf_idx[i - 1] + diff + delta) & 0x3F;
+            }
+        } else {
+            vlc_tab = &sf_vlc_tabs[get_bits(gb, 2) + 4];
+
+            UNPACK_SF_VQ_SHAPE(gb, chan->qu_sf_idx, ctx->used_quant_units);
+
+            for (i = 0; i < ctx->used_quant_units; i++) {
+                delta = get_vlc2(gb, vlc_tab->table, vlc_tab->bits, 1);
+                chan->qu_sf_idx[i] = (chan->qu_sf_idx[i] +
+                                      sign_extend(delta, 4)) & 0x3F;
+            }
+        }
+        break;
+    case 3:
+        if (ch_num) {
+            /* copy coefficients from reference channel */
+            for (i = 0; i < ctx->used_quant_units; i++)
+                chan->qu_sf_idx[i] = ref_chan->qu_sf_idx[i];
+        } else {
+            weight_idx = get_bits(gb, 2);
+            vlc_sel    = get_bits(gb, 2);
+            vlc_tab    = &sf_vlc_tabs[vlc_sel];
+
+            if (weight_idx == 3) {
+                vlc_tab = &sf_vlc_tabs[vlc_sel + 4];
+
+                UNPACK_SF_VQ_SHAPE(gb, chan->qu_sf_idx, ctx->used_quant_units);
+
+                diff               = (get_bits(gb, 4)    + 56)   & 0x3F;
+                chan->qu_sf_idx[0] = (chan->qu_sf_idx[0] + diff) & 0x3F;
+
+                for (i = 1; i < ctx->used_quant_units; i++) {
+                    delta = get_vlc2(gb, vlc_tab->table, vlc_tab->bits, 1);
+                    diff               = (diff + sign_extend(delta, 4)) & 0x3F;
+                    chan->qu_sf_idx[i] = (diff + chan->qu_sf_idx[i])    & 0x3F;
+                }
+            } else {
+                /* 1st coefficient is coded directly */
+                chan->qu_sf_idx[0] = get_bits(gb, 6);
+
+                for (i = 1; i < ctx->used_quant_units; i++) {
+                    delta = get_vlc2(gb, vlc_tab->table, vlc_tab->bits, 1);
+                    chan->qu_sf_idx[i] = (chan->qu_sf_idx[i - 1] + delta) & 0x3F;
+                }
+            }
+        }
+        break;
+    }
+
+    if (weight_idx && weight_idx < 3)
+        return subtract_sf_weights(ctx, chan, weight_idx, avctx);
+
+    return 0;
+}
+
+/**
+ * Decode word length information for each channel.
+ *
+ * @param[in]     gb            the GetBit context
+ * @param[in,out] ctx           ptr to the channel unit context
+ * @param[in]     num_channels  number of channels to process
+ * @param[in]     avctx         ptr to the AVCodecContext
+ * @return result code: 0 = OK, otherwise - error code
+ */
+static int decode_quant_wordlen(GetBitContext *gb, Atrac3pChanUnitCtx *ctx,
+                                int num_channels, AVCodecContext *avctx)
+{
+    int ch_num, i, ret;
+
+    for (ch_num = 0; ch_num < num_channels; ch_num++) {
+        memset(ctx->channels[ch_num].qu_wordlen, 0,
+               sizeof(ctx->channels[ch_num].qu_wordlen));
+
+        if ((ret = decode_channel_wordlen(gb, ctx, ch_num, avctx)) < 0)
+            return ret;
+    }
+
+    /* scan for last non-zero coeff in both channels and
+     * set number of quant units having coded spectrum */
+    for (i = ctx->num_quant_units - 1; i >= 0; i--)
+        if (ctx->channels[0].qu_wordlen[i] ||
+            (num_channels == 2 && ctx->channels[1].qu_wordlen[i]))
+            break;
+    ctx->used_quant_units = i + 1;
+
+    return 0;
+}
+
+/**
+ * Decode scale factor indexes for each channel.
+ *
+ * @param[in]     gb            the GetBit context
+ * @param[in,out] ctx           ptr to the channel unit context
+ * @param[in]     num_channels  number of channels to process
+ * @param[in]     avctx         ptr to the AVCodecContext
+ * @return result code: 0 = OK, otherwise - error code
+ */
+static int decode_scale_factors(GetBitContext *gb, Atrac3pChanUnitCtx *ctx,
+                                int num_channels, AVCodecContext *avctx)
+{
+    int ch_num, ret;
+
+    if (!ctx->used_quant_units)
+        return 0;
+
+    for (ch_num = 0; ch_num < num_channels; ch_num++) {
+        memset(ctx->channels[ch_num].qu_sf_idx, 0,
+               sizeof(ctx->channels[ch_num].qu_sf_idx));
+
+        if ((ret = decode_channel_sf_idx(gb, ctx, ch_num, avctx)) < 0)
+            return ret;
+    }
+
+    return 0;
+}
+
+/**
+ * Decode number of code table values.
+ *
+ * @param[in]     gb            the GetBit context
+ * @param[in,out] ctx           ptr to the channel unit context
+ * @param[in]     avctx         ptr to the AVCodecContext
+ * @return result code: 0 = OK, otherwise - error code
+ */
+static int get_num_ct_values(GetBitContext *gb, Atrac3pChanUnitCtx *ctx,
+                             AVCodecContext *avctx)
+{
+    int num_coded_vals;
+
+    if (get_bits1(gb)) {
+        num_coded_vals = get_bits(gb, 5);
+        if (num_coded_vals > ctx->used_quant_units) {
+            av_log(avctx, AV_LOG_ERROR,
+                   "Invalid number of code table indexes: %d!\n", num_coded_vals);
+            return AVERROR_INVALIDDATA;
+        }
+        return num_coded_vals;
+    } else
+        return ctx->used_quant_units;
+}
+
+#define DEC_CT_IDX_COMMON(OP)                                           \
+    num_vals = get_num_ct_values(gb, ctx, avctx);                       \
+    if (num_vals < 0)                                                   \
+        return num_vals;                                                \
+                                                                        \
+    for (i = 0; i < num_vals; i++) {                                    \
+        if (chan->qu_wordlen[i]) {                                      \
+            chan->qu_tab_idx[i] = OP;                                   \
+        } else if (ch_num && ref_chan->qu_wordlen[i])                   \
+            /* get clone master flag */                                 \
+            chan->qu_tab_idx[i] = get_bits1(gb);                        \
+    }
+
+#define CODING_DIRECT get_bits(gb, num_bits)
+
+#define CODING_VLC get_vlc2(gb, vlc_tab->table, vlc_tab->bits, 1)
+
+#define CODING_VLC_DELTA                                                \
+    (!i) ? CODING_VLC                                                   \
+         : (pred + get_vlc2(gb, delta_vlc->table,                       \
+                            delta_vlc->bits, 1)) & mask;                \
+    pred = chan->qu_tab_idx[i]
+
+#define CODING_VLC_DIFF                                                 \
+    (ref_chan->qu_tab_idx[i] +                                          \
+     get_vlc2(gb, vlc_tab->table, vlc_tab->bits, 1)) & mask
+
+/**
+ * Decode code table indexes for each quant unit of a channel.
+ *
+ * @param[in]     gb            the GetBit context
+ * @param[in,out] ctx           ptr to the channel unit context
+ * @param[in]     ch_num        channel to process
+ * @param[in]     avctx         ptr to the AVCodecContext
+ * @return result code: 0 = OK, otherwise - error code
+ */
+static int decode_channel_code_tab(GetBitContext *gb, Atrac3pChanUnitCtx *ctx,
+                                   int ch_num, AVCodecContext *avctx)
+{
+    int i, num_vals, num_bits, pred;
+    int mask = ctx->use_full_table ? 7 : 3; /* mask for modular arithmetic */
+    VLC *vlc_tab, *delta_vlc;
+    Atrac3pChanParams *chan     = &ctx->channels[ch_num];
+    Atrac3pChanParams *ref_chan = &ctx->channels[0];
+
+    chan->table_type = get_bits1(gb);
+
+    switch (get_bits(gb, 2)) { /* switch according to coding mode */
+    case 0: /* directly coded */
+        num_bits = ctx->use_full_table + 2;
+        DEC_CT_IDX_COMMON(CODING_DIRECT);
+        break;
+    case 1: /* entropy-coded */
+        vlc_tab = ctx->use_full_table ? &ct_vlc_tabs[1]
+                                      : ct_vlc_tabs;
+        DEC_CT_IDX_COMMON(CODING_VLC);
+        break;
+    case 2: /* entropy-coded delta */
+        if (ctx->use_full_table) {
+            vlc_tab   = &ct_vlc_tabs[1];
+            delta_vlc = &ct_vlc_tabs[2];
+        } else {
+            vlc_tab   = ct_vlc_tabs;
+            delta_vlc = ct_vlc_tabs;
+        }
+        pred = 0;
+        DEC_CT_IDX_COMMON(CODING_VLC_DELTA);
+        break;
+    case 3: /* entropy-coded difference to master */
+        if (ch_num) {
+            vlc_tab = ctx->use_full_table ? &ct_vlc_tabs[3]
+                                          : ct_vlc_tabs;
+            DEC_CT_IDX_COMMON(CODING_VLC_DIFF);
+        }
+        break;
+    }
+
+    return 0;
+}
+
+/**
+ * Decode code table indexes for each channel.
+ *
+ * @param[in]     gb            the GetBit context
+ * @param[in,out] ctx           ptr to the channel unit context
+ * @param[in]     num_channels  number of channels to process
+ * @param[in]     avctx         ptr to the AVCodecContext
+ * @return result code: 0 = OK, otherwise - error code
+ */
+static int decode_code_table_indexes(GetBitContext *gb, Atrac3pChanUnitCtx *ctx,
+                                     int num_channels, AVCodecContext *avctx)
+{
+    int ch_num, ret;
+
+    if (!ctx->used_quant_units)
+        return 0;
+
+    ctx->use_full_table = get_bits1(gb);
+
+    for (ch_num = 0; ch_num < num_channels; ch_num++) {
+        memset(ctx->channels[ch_num].qu_tab_idx, 0,
+               sizeof(ctx->channels[ch_num].qu_tab_idx));
+
+        if ((ret = decode_channel_code_tab(gb, ctx, ch_num, avctx)) < 0)
+            return ret;
+    }
+
+    return 0;
+}
+
+/**
+ * Decode huffman-coded spectral lines for a given quant unit.
+ *
+ * This is a generalized version for all known coding modes.
+ * Its speed can be improved by creating separate functions for each mode.
+ *
+ * @param[in]   gb          the GetBit context
+ * @param[in]   tab         code table telling how to decode spectral lines
+ * @param[in]   vlc_tab     ptr to the huffman table associated with the code table
+ * @param[out]  out         pointer to buffer where decoded data should be stored
+ * @param[in]   num_specs   number of spectral lines to decode
+ */
+static void decode_qu_spectra(GetBitContext *gb, const Atrac3pSpecCodeTab *tab,
+                              VLC *vlc_tab, int16_t *out, const int num_specs)
+{
+    int i, j, pos, cf;
+    int group_size = tab->group_size;
+    int num_coeffs = tab->num_coeffs;
+    int bits       = tab->bits;
+    int is_signed  = tab->is_signed;
+    unsigned val, mask = (1 << bits) - 1;
+
+    for (pos = 0; pos < num_specs;) {
+        if (group_size == 1 || get_bits1(gb)) {
+            for (j = 0; j < group_size; j++) {
+                val = get_vlc2(gb, vlc_tab->table, vlc_tab->bits, 1);
+
+                for (i = 0; i < num_coeffs; i++) {
+                    cf = val & mask;
+                    if (is_signed)
+                        cf = sign_extend(cf, bits);
+                    else if (cf && get_bits1(gb))
+                        cf = -cf;
+
+                    out[pos++] = cf;
+                    val      >>= bits;
+                }
+            }
+        } else /* group skipped */
+            pos += group_size * num_coeffs;
+    }
+}
+
+/**
+ * Decode huffman-coded IMDCT spectrum for all channels.
+ *
+ * @param[in]     gb            the GetBit context
+ * @param[in,out] ctx           ptr to the channel unit context
+ * @param[in]     num_channels  number of channels to process
+ * @param[in]     avctx         ptr to the AVCodecContext
+ */
+static void decode_spectrum(GetBitContext *gb, Atrac3pChanUnitCtx *ctx,
+                            int num_channels, AVCodecContext *avctx)
+{
+    int i, ch_num, qu, wordlen, codetab, tab_index, num_specs;
+    const Atrac3pSpecCodeTab *tab;
+    Atrac3pChanParams *chan;
+
+    for (ch_num = 0; ch_num < num_channels; ch_num++) {
+        chan = &ctx->channels[ch_num];
+
+        memset(chan->spectrum, 0, sizeof(chan->spectrum));
+
+        /* set power compensation level to disabled */
+        memset(chan->power_levs, ATRAC3P_POWER_COMP_OFF, sizeof(chan->power_levs));
+
+        for (qu = 0; qu < ctx->used_quant_units; qu++) {
+            num_specs = ff_atrac3p_qu_to_spec_pos[qu + 1] -
+                        ff_atrac3p_qu_to_spec_pos[qu];
+
+            wordlen = chan->qu_wordlen[qu];
+            codetab = chan->qu_tab_idx[qu];
+            if (wordlen) {
+                if (!ctx->use_full_table)
+                    codetab = atrac3p_ct_restricted_to_full[chan->table_type][wordlen - 1][codetab];
+
+                tab_index = (chan->table_type * 8 + codetab) * 7 + wordlen - 1;
+                tab       = &atrac3p_spectra_tabs[tab_index];
+
+                /* this allows reusing VLC tables */
+                if (tab->redirect >= 0)
+                    tab_index = tab->redirect;
+
+                decode_qu_spectra(gb, tab, &spec_vlc_tabs[tab_index],
+                                  &chan->spectrum[ff_atrac3p_qu_to_spec_pos[qu]],
+                                  num_specs);
+            } else if (ch_num && ctx->channels[0].qu_wordlen[qu] && !codetab) {
+                /* copy coefficients from master */
+                memcpy(&chan->spectrum[ff_atrac3p_qu_to_spec_pos[qu]],
+                       &ctx->channels[0].spectrum[ff_atrac3p_qu_to_spec_pos[qu]],
+                       num_specs *
+                       sizeof(chan->spectrum[ff_atrac3p_qu_to_spec_pos[qu]]));
+                chan->qu_wordlen[qu] = ctx->channels[0].qu_wordlen[qu];
+            }
+        }
+
+        /* Power compensation levels only present in the bitstream
+         * if there are more than 2 quant units. The lowest two units
+         * correspond to the frequencies 0...351 Hz, whose shouldn't
+         * be affected by the power compensation. */
+        if (ctx->used_quant_units > 2) {
+            num_specs = atrac3p_subband_to_num_powgrps[ctx->num_coded_subbands - 1];
+            for (i = 0; i < num_specs; i++)
+                chan->power_levs[i] = get_bits(gb, 4);
+        }
+    }
+}
+
+/**
+ * Retrieve specified amount of flag bits from the input bitstream.
+ * The data can be shortened in the case of the following two common conditions:
+ * if all bits are zero then only one signal bit = 0 will be stored,
+ * if all bits are ones then two signal bits = 1,0 will be stored.
+ * Otherwise, all necessary bits will be directly stored
+ * prefixed by two signal bits = 1,1.
+ *
+ * @param[in]   gb              ptr to the GetBitContext
+ * @param[out]  out             where to place decoded flags
+ * @param[in]   num_flags       number of flags to process
+ * @return: 0 = all flag bits are zero, 1 = there is at least one non-zero flag bit
+ */
+static int get_subband_flags(GetBitContext *gb, uint8_t *out, int num_flags)
+{
+    int i, result;
+
+    memset(out, 0, num_flags);
+
+    result = get_bits1(gb);
+    if (result) {
+        if (get_bits1(gb))
+            for (i = 0; i < num_flags; i++)
+                out[i] = get_bits1(gb);
+        else
+            memset(out, 1, num_flags);
+    }
+
+    return result;
+}
+
+/**
+ * Decode mdct window shape flags for all channels.
+ *
+ * @param[in]     gb            the GetBit context
+ * @param[in,out] ctx           ptr to the channel unit context
+ * @param[in]     num_channels  number of channels to process
+ */
+static void decode_window_shape(GetBitContext *gb, Atrac3pChanUnitCtx *ctx,
+                                int num_channels)
+{
+    int ch_num;
+
+    for (ch_num = 0; ch_num < num_channels; ch_num++)
+        get_subband_flags(gb, ctx->channels[ch_num].wnd_shape,
+                          ctx->num_subbands);
+}
+
+/**
+ * Decode number of gain control points.
+ *
+ * @param[in]     gb              the GetBit context
+ * @param[in,out] ctx             ptr to the channel unit context
+ * @param[in]     ch_num          channel to process
+ * @param[in]     coded_subbands  number of subbands to process
+ * @return result code: 0 = OK, otherwise - error code
+ */
+static int decode_gainc_npoints(GetBitContext *gb, Atrac3pChanUnitCtx *ctx,
+                                int ch_num, int coded_subbands)
+{
+    int i, delta, delta_bits, min_val;
+    Atrac3pChanParams *chan     = &ctx->channels[ch_num];
+    Atrac3pChanParams *ref_chan = &ctx->channels[0];
+
+    switch (get_bits(gb, 2)) { /* switch according to coding mode */
+    case 0: /* fixed-length coding */
+        for (i = 0; i < coded_subbands; i++)
+            chan->gain_data[i].num_points = get_bits(gb, 3);
+        break;
+    case 1: /* variable-length coding */
+        for (i = 0; i < coded_subbands; i++)
+            chan->gain_data[i].num_points =
+                get_vlc2(gb, gain_vlc_tabs[0].table,
+                         gain_vlc_tabs[0].bits, 1);
+        break;
+    case 2:
+        if (ch_num) { /* VLC modulo delta to master channel */
+            for (i = 0; i < coded_subbands; i++) {
+                delta = get_vlc2(gb, gain_vlc_tabs[1].table,
+                                 gain_vlc_tabs[1].bits, 1);
+                chan->gain_data[i].num_points =
+                    (ref_chan->gain_data[i].num_points + delta) & 7;
+            }
+        } else { /* VLC modulo delta to previous */
+            chan->gain_data[0].num_points =
+                get_vlc2(gb, gain_vlc_tabs[0].table,
+                         gain_vlc_tabs[0].bits, 1);
+
+            for (i = 1; i < coded_subbands; i++) {
+                delta = get_vlc2(gb, gain_vlc_tabs[1].table,
+                                 gain_vlc_tabs[1].bits, 1);
+                chan->gain_data[i].num_points =
+                    (chan->gain_data[i - 1].num_points + delta) & 7;
+            }
+        }
+        break;
+    case 3:
+        if (ch_num) { /* copy data from master channel */
+            for (i = 0; i < coded_subbands; i++)
+                chan->gain_data[i].num_points =
+                    ref_chan->gain_data[i].num_points;
+        } else { /* shorter delta to min */
+            delta_bits = get_bits(gb, 2);
+            min_val    = get_bits(gb, 3);
+
+            for (i = 0; i < coded_subbands; i++) {
+                chan->gain_data[i].num_points = min_val + GET_DELTA(gb, delta_bits);
+                if (chan->gain_data[i].num_points > 7)
+                    return AVERROR_INVALIDDATA;
+            }
+        }
+    }
+
+    return 0;
+}
+
+/**
+ * Implements coding mode 3 (slave) for gain compensation levels.
+ *
+ * @param[out]   dst   ptr to the output array
+ * @param[in]    ref   ptr to the reference channel
+ */
+static inline void gainc_level_mode3s(AtracGainInfo *dst, AtracGainInfo *ref)
+{
+    int i;
+
+    for (i = 0; i < dst->num_points; i++)
+        dst->lev_code[i] = (i >= ref->num_points) ? 7 : ref->lev_code[i];
+}
+
+/**
+ * Implements coding mode 1 (master) for gain compensation levels.
+ *
+ * @param[in]     gb     the GetBit context
+ * @param[in]     ctx    ptr to the channel unit context
+ * @param[out]    dst    ptr to the output array
+ */
+static inline void gainc_level_mode1m(GetBitContext *gb,
+                                      Atrac3pChanUnitCtx *ctx,
+                                      AtracGainInfo *dst)
+{
+    int i, delta;
+
+    if (dst->num_points > 0)
+        dst->lev_code[0] = get_vlc2(gb, gain_vlc_tabs[2].table,
+                                    gain_vlc_tabs[2].bits, 1);
+
+    for (i = 1; i < dst->num_points; i++) {
+        delta = get_vlc2(gb, gain_vlc_tabs[3].table,
+                         gain_vlc_tabs[3].bits, 1);
+        dst->lev_code[i] = (dst->lev_code[i - 1] + delta) & 0xF;
+    }
+}
+
+/**
+ * Decode level code for each gain control point.
+ *
+ * @param[in]     gb              the GetBit context
+ * @param[in,out] ctx             ptr to the channel unit context
+ * @param[in]     ch_num          channel to process
+ * @param[in]     coded_subbands  number of subbands to process
+ * @return result code: 0 = OK, otherwise - error code
+ */
+static int decode_gainc_levels(GetBitContext *gb, Atrac3pChanUnitCtx *ctx,
+                               int ch_num, int coded_subbands)
+{
+    int sb, i, delta, delta_bits, min_val, pred;
+    Atrac3pChanParams *chan     = &ctx->channels[ch_num];
+    Atrac3pChanParams *ref_chan = &ctx->channels[0];
+
+    switch (get_bits(gb, 2)) { /* switch according to coding mode */
+    case 0: /* fixed-length coding */
+        for (sb = 0; sb < coded_subbands; sb++)
+            for (i = 0; i < chan->gain_data[sb].num_points; i++)
+                chan->gain_data[sb].lev_code[i] = get_bits(gb, 4);
+        break;
+    case 1:
+        if (ch_num) { /* VLC modulo delta to master channel */
+            for (sb = 0; sb < coded_subbands; sb++)
+                for (i = 0; i < chan->gain_data[sb].num_points; i++) {
+                    delta = get_vlc2(gb, gain_vlc_tabs[5].table,
+                                     gain_vlc_tabs[5].bits, 1);
+                    pred = (i >= ref_chan->gain_data[sb].num_points)
+                           ? 7 : ref_chan->gain_data[sb].lev_code[i];
+                    chan->gain_data[sb].lev_code[i] = (pred + delta) & 0xF;
+                }
+        } else { /* VLC modulo delta to previous */
+            for (sb = 0; sb < coded_subbands; sb++)
+                gainc_level_mode1m(gb, ctx, &chan->gain_data[sb]);
+        }
+        break;
+    case 2:
+        if (ch_num) { /* VLC modulo delta to previous or clone master */
+            for (sb = 0; sb < coded_subbands; sb++)
+                if (chan->gain_data[sb].num_points > 0) {
+                    if (get_bits1(gb))
+                        gainc_level_mode1m(gb, ctx, &chan->gain_data[sb]);
+                    else
+                        gainc_level_mode3s(&chan->gain_data[sb],
+                                           &ref_chan->gain_data[sb]);
+                }
+        } else { /* VLC modulo delta to lev_codes of previous subband */
+            if (chan->gain_data[0].num_points > 0)
+                gainc_level_mode1m(gb, ctx, &chan->gain_data[0]);
+
+            for (sb = 1; sb < coded_subbands; sb++)
+                for (i = 0; i < chan->gain_data[sb].num_points; i++) {
+                    delta = get_vlc2(gb, gain_vlc_tabs[4].table,
+                                     gain_vlc_tabs[4].bits, 1);
+                    pred = (i >= chan->gain_data[sb - 1].num_points)
+                           ? 7 : chan->gain_data[sb - 1].lev_code[i];
+                    chan->gain_data[sb].lev_code[i] = (pred + delta) & 0xF;
+                }
+        }
+        break;
+    case 3:
+        if (ch_num) { /* clone master */
+            for (sb = 0; sb < coded_subbands; sb++)
+                gainc_level_mode3s(&chan->gain_data[sb],
+                                   &ref_chan->gain_data[sb]);
+        } else { /* shorter delta to min */
+            delta_bits = get_bits(gb, 2);
+            min_val    = get_bits(gb, 4);
+
+            for (sb = 0; sb < coded_subbands; sb++)
+                for (i = 0; i < chan->gain_data[sb].num_points; i++) {
+                    chan->gain_data[sb].lev_code[i] = min_val + GET_DELTA(gb, delta_bits);
+                    if (chan->gain_data[sb].lev_code[i] > 15)
+                        return AVERROR_INVALIDDATA;
+                }
+        }
+        break;
+    }
+
+    return 0;
+}
+
+/**
+ * Implements coding mode 0 for gain compensation locations.
+ *
+ * @param[in]     gb     the GetBit context
+ * @param[in]     ctx    ptr to the channel unit context
+ * @param[out]    dst    ptr to the output array
+ * @param[in]     pos    position of the value to be processed
+ */
+static inline void gainc_loc_mode0(GetBitContext *gb, Atrac3pChanUnitCtx *ctx,
+                                   AtracGainInfo *dst, int pos)
+{
+    int delta_bits;
+
+    if (!pos || dst->loc_code[pos - 1] < 15)
+        dst->loc_code[pos] = get_bits(gb, 5);
+    else if (dst->loc_code[pos - 1] >= 30)
+        dst->loc_code[pos] = 31;
+    else {
+        delta_bits         = av_log2(30 - dst->loc_code[pos - 1]) + 1;
+        dst->loc_code[pos] = dst->loc_code[pos - 1] +
+                             get_bits(gb, delta_bits) + 1;
+    }
+}
+
+/**
+ * Implements coding mode 1 for gain compensation locations.
+ *
+ * @param[in]     gb     the GetBit context
+ * @param[in]     ctx    ptr to the channel unit context
+ * @param[out]    dst    ptr to the output array
+ */
+static inline void gainc_loc_mode1(GetBitContext *gb, Atrac3pChanUnitCtx *ctx,
+                                   AtracGainInfo *dst)
+{
+    int i;
+    VLC *tab;
+
+    if (dst->num_points > 0) {
+        /* 1st coefficient is stored directly */
+        dst->loc_code[0] = get_bits(gb, 5);
+
+        for (i = 1; i < dst->num_points; i++) {
+            /* switch VLC according to the curve direction
+             * (ascending/descending) */
+            tab              = (dst->lev_code[i] <= dst->lev_code[i - 1])
+                               ? &gain_vlc_tabs[7]
+                               : &gain_vlc_tabs[9];
+            dst->loc_code[i] = dst->loc_code[i - 1] +
+                               get_vlc2(gb, tab->table, tab->bits, 1);
+        }
+    }
+}
+
+/**
+ * Decode location code for each gain control point.
+ *
+ * @param[in]     gb              the GetBit context
+ * @param[in,out] ctx             ptr to the channel unit context
+ * @param[in]     ch_num          channel to process
+ * @param[in]     coded_subbands  number of subbands to process
+ * @param[in]     avctx           ptr to the AVCodecContext
+ * @return result code: 0 = OK, otherwise - error code
+ */
+static int decode_gainc_loc_codes(GetBitContext *gb, Atrac3pChanUnitCtx *ctx,
+                                  int ch_num, int coded_subbands,
+                                  AVCodecContext *avctx)
+{
+    int sb, i, delta, delta_bits, min_val, pred, more_than_ref;
+    AtracGainInfo *dst, *ref;
+    VLC *tab;
+    Atrac3pChanParams *chan     = &ctx->channels[ch_num];
+    Atrac3pChanParams *ref_chan = &ctx->channels[0];
+
+    switch (get_bits(gb, 2)) { /* switch according to coding mode */
+    case 0: /* sequence of numbers in ascending order */
+        for (sb = 0; sb < coded_subbands; sb++)
+            for (i = 0; i < chan->gain_data[sb].num_points; i++)
+                gainc_loc_mode0(gb, ctx, &chan->gain_data[sb], i);
+        break;
+    case 1:
+        if (ch_num) {
+            for (sb = 0; sb < coded_subbands; sb++) {
+                if (chan->gain_data[sb].num_points <= 0)
+                    continue;
+                dst = &chan->gain_data[sb];
+                ref = &ref_chan->gain_data[sb];
+
+                /* 1st value is vlc-coded modulo delta to master */
+                delta = get_vlc2(gb, gain_vlc_tabs[10].table,
+                                 gain_vlc_tabs[10].bits, 1);
+                pred = ref->num_points > 0 ? ref->loc_code[0] : 0;
+                dst->loc_code[0] = (pred + delta) & 0x1F;
+
+                for (i = 1; i < dst->num_points; i++) {
+                    more_than_ref = i >= ref->num_points;
+                    if (dst->lev_code[i] > dst->lev_code[i - 1]) {
+                        /* ascending curve */
+                        if (more_than_ref) {
+                            delta =
+                                get_vlc2(gb, gain_vlc_tabs[9].table,
+                                         gain_vlc_tabs[9].bits, 1);
+                            dst->loc_code[i] = dst->loc_code[i - 1] + delta;
+                        } else {
+                            if (get_bits1(gb))
+                                gainc_loc_mode0(gb, ctx, dst, i);  // direct coding
+                            else
+                                dst->loc_code[i] = ref->loc_code[i];  // clone master
+                        }
+                    } else { /* descending curve */
+                        tab   = more_than_ref ? &gain_vlc_tabs[7]
+                                              : &gain_vlc_tabs[10];
+                        delta = get_vlc2(gb, tab->table, tab->bits, 1);
+                        if (more_than_ref)
+                            dst->loc_code[i] = dst->loc_code[i - 1] + delta;
+                        else
+                            dst->loc_code[i] = (ref->loc_code[i] + delta) & 0x1F;
+                    }
+                }
+            }
+        } else /* VLC delta to previous */
+            for (sb = 0; sb < coded_subbands; sb++)
+                gainc_loc_mode1(gb, ctx, &chan->gain_data[sb]);
+        break;
+    case 2:
+        if (ch_num) {
+            for (sb = 0; sb < coded_subbands; sb++) {
+                if (chan->gain_data[sb].num_points <= 0)
+                    continue;
+                dst = &chan->gain_data[sb];
+                ref = &ref_chan->gain_data[sb];
+                if (dst->num_points > ref->num_points || get_bits1(gb))
+                    gainc_loc_mode1(gb, ctx, dst);
+                else /* clone master for the whole subband */
+                    for (i = 0; i < chan->gain_data[sb].num_points; i++)
+                        dst->loc_code[i] = ref->loc_code[i];
+            }
+        } else {
+            /* data for the first subband is coded directly */
+            for (i = 0; i < chan->gain_data[0].num_points; i++)
+                gainc_loc_mode0(gb, ctx, &chan->gain_data[0], i);
+
+            for (sb = 1; sb < coded_subbands; sb++) {
+                if (chan->gain_data[sb].num_points <= 0)
+                    continue;
+                dst = &chan->gain_data[sb];
+
+                /* 1st value is vlc-coded modulo delta to the corresponding
+                 * value of the previous subband if any or zero */
+                delta = get_vlc2(gb, gain_vlc_tabs[6].table,
+                                 gain_vlc_tabs[6].bits, 1);
+                pred             = dst[-1].num_points > 0
+                                   ? dst[-1].loc_code[0] : 0;
+                dst->loc_code[0] = (pred + delta) & 0x1F;
+
+                for (i = 1; i < dst->num_points; i++) {
+                    more_than_ref = i >= dst[-1].num_points;
+                    /* Select VLC table according to curve direction and
+                     * presence of prediction. */
+                    tab = &gain_vlc_tabs[(dst->lev_code[i] > dst->lev_code[i - 1]) *
+                                                   2 + more_than_ref + 6];
+                    delta = get_vlc2(gb, tab->table, tab->bits, 1);
+                    if (more_than_ref)
+                        dst->loc_code[i] = dst->loc_code[i - 1] + delta;
+                    else
+                        dst->loc_code[i] = (dst[-1].loc_code[i] + delta) & 0x1F;
+                }
+            }
+        }
+        break;
+    case 3:
+        if (ch_num) { /* clone master or direct or direct coding */
+            for (sb = 0; sb < coded_subbands; sb++)
+                for (i = 0; i < chan->gain_data[sb].num_points; i++) {
+                    if (i >= ref_chan->gain_data[sb].num_points)
+                        gainc_loc_mode0(gb, ctx, &chan->gain_data[sb], i);
+                    else
+                        chan->gain_data[sb].loc_code[i] =
+                            ref_chan->gain_data[sb].loc_code[i];
+                }
+        } else { /* shorter delta to min */
+            delta_bits = get_bits(gb, 2) + 1;
+            min_val    = get_bits(gb, 5);
+
+            for (sb = 0; sb < coded_subbands; sb++)
+                for (i = 0; i < chan->gain_data[sb].num_points; i++)
+                    chan->gain_data[sb].loc_code[i] = min_val + i +
+                                                      get_bits(gb, delta_bits);
+        }
+        break;
+    }
+
+    /* Validate decoded information */
+    for (sb = 0; sb < coded_subbands; sb++) {
+        dst = &chan->gain_data[sb];
+        for (i = 0; i < chan->gain_data[sb].num_points; i++) {
+            if (dst->loc_code[i] < 0 || dst->loc_code[i] > 31 ||
+                (i && dst->loc_code[i] <= dst->loc_code[i - 1])) {
+                av_log(avctx, AV_LOG_ERROR,
+                       "Invalid gain location: ch=%d, sb=%d, pos=%d, val=%d\n",
+                       ch_num, sb, i, dst->loc_code[i]);
+                return AVERROR_INVALIDDATA;
+            }
+        }
+    }
+
+    return 0;
+}
+
+/**
+ * Decode gain control data for all channels.
+ *
+ * @param[in]     gb            the GetBit context
+ * @param[in,out] ctx           ptr to the channel unit context
+ * @param[in]     num_channels  number of channels to process
+ * @param[in]     avctx         ptr to the AVCodecContext
+ * @return result code: 0 = OK, otherwise - error code
+ */
+static int decode_gainc_data(GetBitContext *gb, Atrac3pChanUnitCtx *ctx,
+                             int num_channels, AVCodecContext *avctx)
+{
+    int ch_num, coded_subbands, sb, ret;
+
+    for (ch_num = 0; ch_num < num_channels; ch_num++) {
+        memset(ctx->channels[ch_num].gain_data, 0,
+               sizeof(*ctx->channels[ch_num].gain_data) * ATRAC3P_SUBBANDS);
+
+        if (get_bits1(gb)) { /* gain control data present? */
+            coded_subbands = get_bits(gb, 4) + 1;
+            if (get_bits1(gb)) /* is high band gain data replication on? */
+                ctx->channels[ch_num].num_gain_subbands = get_bits(gb, 4) + 1;
+            else
+                ctx->channels[ch_num].num_gain_subbands = coded_subbands;
+
+            if ((ret = decode_gainc_npoints(gb, ctx, ch_num, coded_subbands)) < 0 ||
+                (ret = decode_gainc_levels(gb, ctx, ch_num, coded_subbands))  < 0 ||
+                (ret = decode_gainc_loc_codes(gb, ctx, ch_num, coded_subbands, avctx)) < 0)
+                return ret;
+
+            if (coded_subbands > 0) { /* propagate gain data if requested */
+                for (sb = coded_subbands; sb < ctx->channels[ch_num].num_gain_subbands; sb++)
+                    ctx->channels[ch_num].gain_data[sb] =
+                        ctx->channels[ch_num].gain_data[sb - 1];
+            }
+        } else {
+            ctx->channels[ch_num].num_gain_subbands = 0;
+        }
+    }
+
+    return 0;
+}
+
+/**
+ * Decode envelope for all tones of a channel.
+ *
+ * @param[in]     gb                the GetBit context
+ * @param[in,out] ctx               ptr to the channel unit context
+ * @param[in]     ch_num            channel to process
+ * @param[in]     band_has_tones    ptr to an array of per-band-flags:
+ *                                  1 - tone data present
+ */
+static void decode_tones_envelope(GetBitContext *gb, Atrac3pChanUnitCtx *ctx,
+                                  int ch_num, int band_has_tones[])
+{
+    int sb;
+    Atrac3pWavesData *dst = ctx->channels[ch_num].tones_info;
+    Atrac3pWavesData *ref = ctx->channels[0].tones_info;
+
+    if (!ch_num || !get_bits1(gb)) { /* mode 0: fixed-length coding */
+        for (sb = 0; sb < ctx->waves_info->num_tone_bands; sb++) {
+            if (!band_has_tones[sb])
+                continue;
+            dst[sb].pend_env.has_start_point = get_bits1(gb);
+            dst[sb].pend_env.start_pos       = dst[sb].pend_env.has_start_point
+                                               ? get_bits(gb, 5) : -1;
+            dst[sb].pend_env.has_stop_point  = get_bits1(gb);
+            dst[sb].pend_env.stop_pos        = dst[sb].pend_env.has_stop_point
+                                               ? get_bits(gb, 5) : 32;
+        }
+    } else { /* mode 1(slave only): copy master */
+        for (sb = 0; sb < ctx->waves_info->num_tone_bands; sb++) {
+            if (!band_has_tones[sb])
+                continue;
+            dst[sb].pend_env.has_start_point = ref[sb].pend_env.has_start_point;
+            dst[sb].pend_env.has_stop_point  = ref[sb].pend_env.has_stop_point;
+            dst[sb].pend_env.start_pos       = ref[sb].pend_env.start_pos;
+            dst[sb].pend_env.stop_pos        = ref[sb].pend_env.stop_pos;
+        }
+    }
+}
+
+/**
+ * Decode number of tones for each subband of a channel.
+ *
+ * @param[in]     gb                the GetBit context
+ * @param[in,out] ctx               ptr to the channel unit context
+ * @param[in]     ch_num            channel to process
+ * @param[in]     band_has_tones    ptr to an array of per-band-flags:
+ *                                  1 - tone data present
+ * @param[in]     avctx             ptr to the AVCodecContext
+ * @return result code: 0 = OK, otherwise - error code
+ */
+static int decode_band_numwavs(GetBitContext *gb, Atrac3pChanUnitCtx *ctx,
+                               int ch_num, int band_has_tones[],
+                               AVCodecContext *avctx)
+{
+    int mode, sb, delta;
+    Atrac3pWavesData *dst = ctx->channels[ch_num].tones_info;
+    Atrac3pWavesData *ref = ctx->channels[0].tones_info;
+
+    mode = get_bits(gb, ch_num + 1);
+    switch (mode) {
+    case 0: /** fixed-length coding */
+        for (sb = 0; sb < ctx->waves_info->num_tone_bands; sb++)
+            if (band_has_tones[sb])
+                dst[sb].num_wavs = get_bits(gb, 4);
+        break;
+    case 1: /** variable-length coding */
+        for (sb = 0; sb < ctx->waves_info->num_tone_bands; sb++)
+            if (band_has_tones[sb])
+                dst[sb].num_wavs =
+                    get_vlc2(gb, tone_vlc_tabs[1].table,
+                             tone_vlc_tabs[1].bits, 1);
+        break;
+    case 2: /** VLC modulo delta to master (slave only) */
+        for (sb = 0; sb < ctx->waves_info->num_tone_bands; sb++)
+            if (band_has_tones[sb]) {
+                delta = get_vlc2(gb, tone_vlc_tabs[2].table,
+                                 tone_vlc_tabs[2].bits, 1);
+                delta = sign_extend(delta, 3);
+                dst[sb].num_wavs = (ref[sb].num_wavs + delta) & 0xF;
+            }
+        break;
+    case 3: /** copy master (slave only) */
+        for (sb = 0; sb < ctx->waves_info->num_tone_bands; sb++)
+            if (band_has_tones[sb])
+                dst[sb].num_wavs = ref[sb].num_wavs;
+        break;
+    }
+
+    /** initialize start tone index for each subband */
+    for (sb = 0; sb < ctx->waves_info->num_tone_bands; sb++)
+        if (band_has_tones[sb]) {
+            if (ctx->waves_info->tones_index + dst[sb].num_wavs > 48) {
+                av_log(avctx, AV_LOG_ERROR,
+                       "Too many tones: %d (max. 48), frame: %d!\n",
+                       ctx->waves_info->tones_index + dst[sb].num_wavs,
+                       avctx->frame_number);
+                return AVERROR_INVALIDDATA;
+            }
+            dst[sb].start_index           = ctx->waves_info->tones_index;
+            ctx->waves_info->tones_index += dst[sb].num_wavs;
+        }
+
+    return 0;
+}
+
+/**
+ * Decode frequency information for each subband of a channel.
+ *
+ * @param[in]     gb                the GetBit context
+ * @param[in,out] ctx               ptr to the channel unit context
+ * @param[in]     ch_num            channel to process
+ * @param[in]     band_has_tones    ptr to an array of per-band-flags:
+ *                                  1 - tone data present
+ */
+static void decode_tones_frequency(GetBitContext *gb, Atrac3pChanUnitCtx *ctx,
+                                   int ch_num, int band_has_tones[])
+{
+    int sb, i, direction, nbits, pred, delta;
+    Atrac3pWaveParam *iwav, *owav;
+    Atrac3pWavesData *dst = ctx->channels[ch_num].tones_info;
+    Atrac3pWavesData *ref = ctx->channels[0].tones_info;
+
+    if (!ch_num || !get_bits1(gb)) { /* mode 0: fixed-length coding */
+        for (sb = 0; sb < ctx->waves_info->num_tone_bands; sb++) {
+            if (!band_has_tones[sb] || !dst[sb].num_wavs)
+                continue;
+            iwav      = &ctx->waves_info->waves[dst[sb].start_index];
+            direction = (dst[sb].num_wavs > 1) ? get_bits1(gb) : 0;
+            if (direction) { /** packed numbers in descending order */
+                if (dst[sb].num_wavs)
+                    iwav[dst[sb].num_wavs - 1].freq_index = get_bits(gb, 10);
+                for (i = dst[sb].num_wavs - 2; i >= 0 ; i--) {
+                    nbits = av_log2(iwav[i+1].freq_index) + 1;
+                    iwav[i].freq_index = get_bits(gb, nbits);
+                }
+            } else { /** packed numbers in ascending order */
+                for (i = 0; i < dst[sb].num_wavs; i++) {
+                    if (!i || iwav[i - 1].freq_index < 512)
+                        iwav[i].freq_index = get_bits(gb, 10);
+                    else {
+                        nbits = av_log2(1023 - iwav[i - 1].freq_index) + 1;
+                        iwav[i].freq_index = get_bits(gb, nbits) +
+                                             1024 - (1 << nbits);
+                    }
+                }
+            }
+        }
+    } else { /* mode 1: VLC modulo delta to master (slave only) */
+        for (sb = 0; sb < ctx->waves_info->num_tone_bands; sb++) {
+            if (!band_has_tones[sb] || !dst[sb].num_wavs)
+                continue;
+            iwav = &ctx->waves_info->waves[ref[sb].start_index];
+            owav = &ctx->waves_info->waves[dst[sb].start_index];
+            for (i = 0; i < dst[sb].num_wavs; i++) {
+                delta = get_vlc2(gb, tone_vlc_tabs[6].table,
+                                 tone_vlc_tabs[6].bits, 1);
+                delta = sign_extend(delta, 8);
+                pred  = (i < ref[sb].num_wavs) ? iwav[i].freq_index :
+                        (ref[sb].num_wavs ? iwav[ref[sb].num_wavs - 1].freq_index : 0);
+                owav[i].freq_index = (pred + delta) & 0x3FF;
+            }
+        }
+    }
+}
+
+/**
+ * Decode amplitude information for each subband of a channel.
+ *
+ * @param[in]     gb                the GetBit context
+ * @param[in,out] ctx               ptr to the channel unit context
+ * @param[in]     ch_num            channel to process
+ * @param[in]     band_has_tones    ptr to an array of per-band-flags:
+ *                                  1 - tone data present
+ */
+static void decode_tones_amplitude(GetBitContext *gb, Atrac3pChanUnitCtx *ctx,
+                                   int ch_num, int band_has_tones[])
+{
+    int mode, sb, j, i, diff, maxdiff, fi, delta, pred;
+    Atrac3pWaveParam *wsrc, *wref;
+    int refwaves[48];
+    Atrac3pWavesData *dst = ctx->channels[ch_num].tones_info;
+    Atrac3pWavesData *ref = ctx->channels[0].tones_info;
+
+    if (ch_num) {
+        for (sb = 0; sb < ctx->waves_info->num_tone_bands; sb++) {
+            if (!band_has_tones[sb] || !dst[sb].num_wavs)
+                continue;
+            wsrc = &ctx->waves_info->waves[dst[sb].start_index];
+            wref = &ctx->waves_info->waves[ref[sb].start_index];
+            for (j = 0; j < dst[sb].num_wavs; j++) {
+                for (i = 0, fi = 0, maxdiff = 1024; i < ref[sb].num_wavs; i++) {
+                    diff = FFABS(wsrc[j].freq_index - wref[i].freq_index);
+                    if (diff < maxdiff) {
+                        maxdiff = diff;
+                        fi      = i;
+                    }
+                }
+
+                if (maxdiff < 8)
+                    refwaves[dst[sb].start_index + j] = fi + ref[sb].start_index;
+                else if (j < ref[sb].num_wavs)
+                    refwaves[dst[sb].start_index + j] = j + ref[sb].start_index;
+                else
+                    refwaves[dst[sb].start_index + j] = -1;
+            }
+        }
+    }
+
+    mode = get_bits(gb, ch_num + 1);
+
+    switch (mode) {
+    case 0: /** fixed-length coding */
+        for (sb = 0; sb < ctx->waves_info->num_tone_bands; sb++) {
+            if (!band_has_tones[sb] || !dst[sb].num_wavs)
+                continue;
+            if (ctx->waves_info->amplitude_mode)
+                for (i = 0; i < dst[sb].num_wavs; i++)
+                    ctx->waves_info->waves[dst[sb].start_index + i].amp_sf = get_bits(gb, 6);
+            else
+                ctx->waves_info->waves[dst[sb].start_index].amp_sf = get_bits(gb, 6);
+        }
+        break;
+    case 1: /** min + VLC delta */
+        for (sb = 0; sb < ctx->waves_info->num_tone_bands; sb++) {
+            if (!band_has_tones[sb] || !dst[sb].num_wavs)
+                continue;
+            if (ctx->waves_info->amplitude_mode)
+                for (i = 0; i < dst[sb].num_wavs; i++)
+                    ctx->waves_info->waves[dst[sb].start_index + i].amp_sf =
+                        get_vlc2(gb, tone_vlc_tabs[3].table,
+                                 tone_vlc_tabs[3].bits, 1) + 20;
+            else
+                ctx->waves_info->waves[dst[sb].start_index].amp_sf =
+                    get_vlc2(gb, tone_vlc_tabs[4].table,
+                             tone_vlc_tabs[4].bits, 1) + 24;
+        }
+        break;
+    case 2: /** VLC modulo delta to master (slave only) */
+        for (sb = 0; sb < ctx->waves_info->num_tone_bands; sb++) {
+            if (!band_has_tones[sb] || !dst[sb].num_wavs)
+                continue;
+            for (i = 0; i < dst[sb].num_wavs; i++) {
+                delta = get_vlc2(gb, tone_vlc_tabs[5].table,
+                                 tone_vlc_tabs[5].bits, 1);
+                delta = sign_extend(delta, 5);
+                pred  = refwaves[dst[sb].start_index + i] >= 0 ?
+                        ctx->waves_info->waves[refwaves[dst[sb].start_index + i]].amp_sf : 34;
+                ctx->waves_info->waves[dst[sb].start_index + i].amp_sf = (pred + delta) & 0x3F;
+            }
+        }
+        break;
+    case 3: /** clone master (slave only) */
+        for (sb = 0; sb < ctx->waves_info->num_tone_bands; sb++) {
+            if (!band_has_tones[sb])
+                continue;
+            for (i = 0; i < dst[sb].num_wavs; i++)
+                ctx->waves_info->waves[dst[sb].start_index + i].amp_sf =
+                    refwaves[dst[sb].start_index + i] >= 0
+                    ? ctx->waves_info->waves[refwaves[dst[sb].start_index + i]].amp_sf
+                    : 32;
+        }
+        break;
+    }
+}
+
+/**
+ * Decode phase information for each subband of a channel.
+ *
+ * @param[in]     gb                the GetBit context
+ * @param[in,out] ctx               ptr to the channel unit context
+ * @param[in]     ch_num            channel to process
+ * @param[in]     band_has_tones    ptr to an array of per-band-flags:
+ *                                  1 - tone data present
+ */
+static void decode_tones_phase(GetBitContext *gb, Atrac3pChanUnitCtx *ctx,
+                               int ch_num, int band_has_tones[])
+{
+    int sb, i;
+    Atrac3pWaveParam *wparam;
+    Atrac3pWavesData *dst = ctx->channels[ch_num].tones_info;
+
+    for (sb = 0; sb < ctx->waves_info->num_tone_bands; sb++) {
+        if (!band_has_tones[sb])
+            continue;
+        wparam = &ctx->waves_info->waves[dst[sb].start_index];
+        for (i = 0; i < dst[sb].num_wavs; i++)
+            wparam[i].phase_index = get_bits(gb, 5);
+    }
+}
+
+/**
+ * Decode tones info for all channels.
+ *
+ * @param[in]     gb            the GetBit context
+ * @param[in,out] ctx           ptr to the channel unit context
+ * @param[in]     num_channels  number of channels to process
+ * @param[in]     avctx         ptr to the AVCodecContext
+ * @return result code: 0 = OK, otherwise - error code
+ */
+static int decode_tones_info(GetBitContext *gb, Atrac3pChanUnitCtx *ctx,
+                             int num_channels, AVCodecContext *avctx)
+{
+    int ch_num, i, ret;
+    int band_has_tones[16];
+
+    for (ch_num = 0; ch_num < num_channels; ch_num++)
+        memset(ctx->channels[ch_num].tones_info, 0,
+               sizeof(*ctx->channels[ch_num].tones_info) * ATRAC3P_SUBBANDS);
+
+    ctx->waves_info->tones_present = get_bits1(gb);
+    if (!ctx->waves_info->tones_present)
+        return 0;
+
+    memset(ctx->waves_info->waves, 0, sizeof(ctx->waves_info->waves));
+
+    ctx->waves_info->amplitude_mode = get_bits1(gb);
+    if (!ctx->waves_info->amplitude_mode) {
+        avpriv_report_missing_feature(avctx, "GHA amplitude mode 0");
+        return AVERROR_PATCHWELCOME;
+    }
+
+    ctx->waves_info->num_tone_bands =
+        get_vlc2(gb, tone_vlc_tabs[0].table,
+                 tone_vlc_tabs[0].bits, 1) + 1;
+
+    if (num_channels == 2) {
+        get_subband_flags(gb, ctx->waves_info->tone_sharing, ctx->waves_info->num_tone_bands);
+        get_subband_flags(gb, ctx->waves_info->tone_master,  ctx->waves_info->num_tone_bands);
+        if (get_subband_flags(gb, ctx->waves_info->phase_shift,
+                              ctx->waves_info->num_tone_bands)) {
+            avpriv_report_missing_feature(avctx, "GHA Phase shifting");
+            return AVERROR_PATCHWELCOME;
+        }
+    }
+
+    ctx->waves_info->tones_index = 0;
+
+    for (ch_num = 0; ch_num < num_channels; ch_num++) {
+        for (i = 0; i < ctx->waves_info->num_tone_bands; i++)
+            band_has_tones[i] = !ch_num ? 1 : !ctx->waves_info->tone_sharing[i];
+
+        decode_tones_envelope(gb, ctx, ch_num, band_has_tones);
+        if ((ret = decode_band_numwavs(gb, ctx, ch_num, band_has_tones,
+                                       avctx)) < 0)
+            return ret;
+
+        decode_tones_frequency(gb, ctx, ch_num, band_has_tones);
+        decode_tones_amplitude(gb, ctx, ch_num, band_has_tones);
+        decode_tones_phase(gb, ctx, ch_num, band_has_tones);
+    }
+
+    if (num_channels == 2) {
+        for (i = 0; i < ctx->waves_info->num_tone_bands; i++) {
+            if (ctx->waves_info->tone_sharing[i])
+                ctx->channels[1].tones_info[i] = ctx->channels[0].tones_info[i];
+
+            if (ctx->waves_info->tone_master[i])
+                FFSWAP(Atrac3pWavesData, ctx->channels[0].tones_info[i],
+                       ctx->channels[1].tones_info[i]);
+        }
+    }
+
+    return 0;
+}
+
+int ff_atrac3p_decode_channel_unit(GetBitContext *gb, Atrac3pChanUnitCtx *ctx,
+                                   int num_channels, AVCodecContext *avctx)
+{
+    int ret;
+
+    /* parse sound header */
+    ctx->num_quant_units = get_bits(gb, 5) + 1;
+    if (ctx->num_quant_units > 28 && ctx->num_quant_units < 32) {
+        av_log(avctx, AV_LOG_ERROR,
+               "Invalid number of quantization units: %d!\n",
+               ctx->num_quant_units);
+        return AVERROR_INVALIDDATA;
+    }
+
+    ctx->mute_flag = get_bits1(gb);
+
+    /* decode various sound parameters */
+    if ((ret = decode_quant_wordlen(gb, ctx, num_channels, avctx)) < 0)
+        return ret;
+
+    ctx->num_subbands       = atrac3p_qu_to_subband[ctx->num_quant_units - 1] + 1;
+    ctx->num_coded_subbands = ctx->used_quant_units
+                              ? atrac3p_qu_to_subband[ctx->used_quant_units - 1] + 1
+                              : 0;
+
+    if ((ret = decode_scale_factors(gb, ctx, num_channels, avctx)) < 0)
+        return ret;
+
+    if ((ret = decode_code_table_indexes(gb, ctx, num_channels, avctx)) < 0)
+        return ret;
+
+    decode_spectrum(gb, ctx, num_channels, avctx);
+
+    if (num_channels == 2) {
+        get_subband_flags(gb, ctx->swap_channels, ctx->num_coded_subbands);
+        get_subband_flags(gb, ctx->negate_coeffs, ctx->num_coded_subbands);
+    }
+
+    decode_window_shape(gb, ctx, num_channels);
+
+    if ((ret = decode_gainc_data(gb, ctx, num_channels, avctx)) < 0)
+        return ret;
+
+    if ((ret = decode_tones_info(gb, ctx, num_channels, avctx)) < 0)
+        return ret;
+
+    /* decode global noise info */
+    ctx->noise_present = get_bits1(gb);
+    if (ctx->noise_present) {
+        ctx->noise_level_index = get_bits(gb, 4);
+        ctx->noise_table_index = get_bits(gb, 4);
+    }
+
+    return 0;
+}

omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/atrac3plus.h Added

@@ -0,0 +1,240 @@
+/*
+ * ATRAC3+ compatible decoder
+ *
+ * Copyright (c) 2010-2013 Maxim Poliakovski
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * Global structures, constants and data for ATRAC3+ decoder.
+ */
+
+#ifndef AVCODEC_ATRAC3PLUS_H
+#define AVCODEC_ATRAC3PLUS_H
+
+#include <stdint.h>
+
+#include "libavutil/float_dsp.h"
+#include "atrac.h"
+#include "avcodec.h"
+#include "fft.h"
+#include "get_bits.h"
+
+/** Global unit sizes */
+#define ATRAC3P_SUBBANDS        16  ///< number of PQF subbands
+#define ATRAC3P_SUBBAND_SAMPLES 128 ///< number of samples per subband
+#define ATRAC3P_FRAME_SAMPLES   (ATRAC3P_SUBBAND_SAMPLES * ATRAC3P_SUBBANDS)
+
+#define ATRAC3P_PQF_FIR_LEN     12  ///< length of the prototype FIR of the PQF
+
+/** Global constants */
+#define ATRAC3P_POWER_COMP_OFF  15  ///< disable power compensation
+
+/** ATRAC3+ channel unit types */
+enum Atrac3pChannelUnitTypes {
+    CH_UNIT_MONO       = 0, ///< unit containing one coded channel
+    CH_UNIT_STEREO     = 1, ///< unit containing two jointly-coded channels
+    CH_UNIT_EXTENSION  = 2, ///< unit containing extension information
+    CH_UNIT_TERMINATOR = 3  ///< unit sequence terminator
+};
+
+/** Per-channel IPQF history */
+typedef struct Atrac3pIPQFChannelCtx {
+    DECLARE_ALIGNED(32, float, buf1)[ATRAC3P_PQF_FIR_LEN * 2][8];
+    DECLARE_ALIGNED(32, float, buf2)[ATRAC3P_PQF_FIR_LEN * 2][8];
+    int pos;
+} Atrac3pIPQFChannelCtx;
+
+/** Amplitude envelope of a group of sine waves */
+typedef struct Atrac3pWaveEnvelope {
+    int has_start_point;    ///< indicates start point within the GHA window
+    int has_stop_point;     ///< indicates stop point within the GHA window
+    int start_pos;          ///< start position expressed in n*4 samples
+    int stop_pos;           ///< stop  position expressed in n*4 samples
+} Atrac3pWaveEnvelope;
+
+/** Parameters of a group of sine waves */
+typedef struct Atrac3pWavesData {
+    Atrac3pWaveEnvelope pend_env;   ///< pending envelope from the previous frame
+    Atrac3pWaveEnvelope curr_env;   ///< group envelope from the current frame
+    int num_wavs;           ///< number of sine waves in the group
+    int start_index;        ///< start index into global tones table for that subband
+} Atrac3pWavesData;
+
+/** Parameters of a single sine wave */
+typedef struct Atrac3pWaveParam {
+    int   freq_index;   ///< wave frequency index
+    int   amp_sf;       ///< quantized amplitude scale factor
+    int   amp_index;    ///< quantized amplitude index
+    int   phase_index;  ///< quantized phase index
+} Atrac3pWaveParam;
+
+/** Sound channel parameters */
+typedef struct Atrac3pChanParams {
+    int ch_num;
+    int num_coded_vals;         ///< number of transmitted quant unit values
+    int fill_mode;
+    int split_point;
+    int table_type;             ///< table type: 0 - tone?, 1- noise?
+    int qu_wordlen[32];         ///< array of word lengths for each quant unit
+    int qu_sf_idx[32];          ///< array of scale factor indexes for each quant unit
+    int qu_tab_idx[32];         ///< array of code table indexes for each quant unit
+    int16_t spectrum[2048];     ///< decoded IMDCT spectrum
+    uint8_t power_levs[5];      ///< power compensation levels
+
+    /* imdct window shape history (2 frames) for overlapping. */
+    uint8_t wnd_shape_hist[2][ATRAC3P_SUBBANDS];    ///< IMDCT window shape, 0=sine/1=steep
+    uint8_t *wnd_shape;         ///< IMDCT window shape for current frame
+    uint8_t *wnd_shape_prev;    ///< IMDCT window shape for previous frame
+
+    /* gain control data history (2 frames) for overlapping. */
+    AtracGainInfo gain_data_hist[2][ATRAC3P_SUBBANDS];  ///< gain control data for all subbands
+    AtracGainInfo *gain_data;       ///< gain control data for next frame
+    AtracGainInfo *gain_data_prev;  ///< gain control data for previous frame
+    int num_gain_subbands;      ///< number of subbands with gain control data
+
+    /* tones data history (2 frames) for overlapping. */
+    Atrac3pWavesData tones_info_hist[2][ATRAC3P_SUBBANDS];
+    Atrac3pWavesData *tones_info;
+    Atrac3pWavesData *tones_info_prev;
+} Atrac3pChanParams;
+
+/* Per-unit sine wave parameters */
+typedef struct Atrac3pWaveSynthParams {
+    int tones_present;                      ///< 1 - tones info present
+    int amplitude_mode;                     ///< 1 - low range, 0 - high range
+    int num_tone_bands;                     ///< number of PQF bands with tones
+    uint8_t tone_sharing[ATRAC3P_SUBBANDS]; ///< 1 - subband-wise tone sharing flags
+    uint8_t tone_master[ATRAC3P_SUBBANDS];  ///< 1 - subband-wise tone channel swapping
+    uint8_t phase_shift[ATRAC3P_SUBBANDS];  ///< 1 - subband-wise 180° phase shifting
+    int tones_index;                        ///< total sum of tones in this unit
+    Atrac3pWaveParam waves[48];
+} Atrac3pWaveSynthParams;
+
+/** Channel unit parameters */
+typedef struct Atrac3pChanUnitCtx {
+    /* channel unit variables */
+    int unit_type;                          ///< unit type (mono/stereo)
+    int num_quant_units;
+    int num_subbands;
+    int used_quant_units;                   ///< number of quant units with coded spectrum
+    int num_coded_subbands;                 ///< number of subbands with coded spectrum
+    int mute_flag;                          ///< mute flag
+    int use_full_table;                     ///< 1 - full table list, 0 - restricted one
+    int noise_present;                      ///< 1 - global noise info present
+    int noise_level_index;                  ///< global noise level index
+    int noise_table_index;                  ///< global noise RNG table index
+    uint8_t swap_channels[ATRAC3P_SUBBANDS];    ///< 1 - perform subband-wise channel swapping
+    uint8_t negate_coeffs[ATRAC3P_SUBBANDS];    ///< 1 - subband-wise IMDCT coefficients negation
+    Atrac3pChanParams channels[2];
+
+    /* Variables related to GHA tones */
+    Atrac3pWaveSynthParams wave_synth_hist[2];     ///< waves synth history for two frames
+    Atrac3pWaveSynthParams *waves_info;
+    Atrac3pWaveSynthParams *waves_info_prev;
+
+    Atrac3pIPQFChannelCtx ipqf_ctx[2];
+    DECLARE_ALIGNED(32, float, prev_buf)[2][ATRAC3P_FRAME_SAMPLES]; ///< overlapping buffer
+} Atrac3pChanUnitCtx;
+
+/**
+ * Initialize VLC tables for bitstream parsing.
+ */
+void ff_atrac3p_init_vlcs(void);
+
+/**
+ * Decode bitstream data of a channel unit.
+ *
+ * @param[in]     gb            the GetBit context
+ * @param[in,out] ctx           ptr to the channel unit context
+ * @param[in]     num_channels  number of channels to process
+ * @param[in]     avctx         ptr to the AVCodecContext
+ * @return result code: 0 = OK, otherwise - error code
+ */
+int ff_atrac3p_decode_channel_unit(GetBitContext *gb, Atrac3pChanUnitCtx *ctx,
+                                   int num_channels, AVCodecContext *avctx);
+
+/**
+ * Initialize IMDCT transform.
+ *
+ * @param[in]   avctx      ptr to the AVCodecContext
+ * @param[in]   mdct_ctx   pointer to MDCT transform context
+ */
+void ff_atrac3p_init_imdct(AVCodecContext *avctx, FFTContext *mdct_ctx);
+
+/**
+ * Initialize sine waves synthesizer.
+ */
+void ff_atrac3p_init_wave_synth(void);
+
+/**
+ * Synthesize sine waves for a particular subband.
+ *
+ * @param[in]   ch_unit   pointer to the channel unit context
+ * @param[in]   fdsp      pointer to float DSP context
+ * @param[in]   ch_num    which channel to process
+ * @param[in]   sb        which subband to process
+ * @param[out]  out       receives processed data
+ */
+void ff_atrac3p_generate_tones(Atrac3pChanUnitCtx *ch_unit, AVFloatDSPContext *fdsp,
+                               int ch_num, int sb, float *out);
+
+/**
+ * Perform power compensation aka noise dithering.
+ *
+ * @param[in]      ctx         ptr to the channel context
+ * @param[in]      ch_index    which channel to process
+ * @param[in,out]  sp          ptr to channel spectrum to process
+ * @param[in]      rng_index   indicates which RNG table to use
+ * @param[in]      sb_num      which subband to process
+ */
+void ff_atrac3p_power_compensation(Atrac3pChanUnitCtx *ctx, int ch_index,
+                                   float *sp, int rng_index, int sb_num);
+
+/**
+ * Regular IMDCT and windowing without overlapping,
+ * with spectrum reversal in the odd subbands.
+ *
+ * @param[in]   fdsp       pointer to float DSP context
+ * @param[in]   mdct_ctx   pointer to MDCT transform context
+ * @param[in]   pIn        float input
+ * @param[out]  pOut       float output
+ * @param[in]   wind_id    which MDCT window to apply
+ * @param[in]   sb         subband number
+ */
+void ff_atrac3p_imdct(AVFloatDSPContext *fdsp, FFTContext *mdct_ctx, float *pIn,
+                      float *pOut, int wind_id, int sb);
+
+/**
+ * Subband synthesis filter based on the polyphase quadrature (pseudo-QMF)
+ * filter bank.
+ *
+ * @param[in]      dct_ctx   ptr to the pre-initialized IDCT context
+ * @param[in,out]  hist      ptr to the filter history
+ * @param[in]      in        input data to process
+ * @param[out]     out       receives processed data
+ */
+void ff_atrac3p_ipqf(FFTContext *dct_ctx, Atrac3pIPQFChannelCtx *hist,
+                     const float *in, float *out);
+
+extern const uint16_t ff_atrac3p_qu_to_spec_pos[33];
+extern const float ff_atrac3p_sf_tab[64];
+extern const float ff_atrac3p_mant_tab[8];
+
+#endif /* AVCODEC_ATRAC3PLUS_H */

omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/atrac3plus_data.h Added

@@ -0,0 +1,1914 @@
+/*
+ * ATRAC3+ compatible decoder
+ *
+ * Copyright (c) 2010-2013 Maxim Poliakovski
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_ATRAC3PLUS_DATA_H
+#define AVCODEC_ATRAC3PLUS_DATA_H
+
+#include <stddef.h>
+#include <stdint.h>
+
+/** VLC tables for wordlen */
+static const uint8_t atrac3p_wl_huff_code1[3] = { 0, 2, 3 };
+
+static const uint8_t atrac3p_wl_huff_bits1[3] = { 1, 2, 2 };
+
+static const uint8_t atrac3p_wl_huff_xlat1[3] = { 0, 1, 7 };
+
+static const uint8_t atrac3p_wl_huff_code2[5] = { 0, 4, 5, 6, 7 };
+
+static const uint8_t atrac3p_wl_huff_bits2[5] = { 1, 3, 3, 3, 3 };
+
+static const uint8_t atrac3p_wl_huff_xlat2[5] = { 0, 1, 2, 6, 7 };
+
+static const uint8_t atrac3p_wl_huff_code3[8] = {
+    0, 4, 0xC, 0x1E, 0x1F, 0xD, 0xE, 5
+};
+
+static const uint8_t atrac3p_wl_huff_bits3[8] = { 1, 3, 4, 5, 5, 4, 4, 3 };
+
+static const uint8_t atrac3p_wl_huff_code4[8] = {
+    0, 4, 0xC, 0xD, 0x1E, 0x1F, 0xE, 5
+};
+
+static const uint8_t atrac3p_wl_huff_bits4[8] = { 1, 3, 4, 4, 5, 5, 4, 3 };
+
+/** VLC tables for scale factor indexes */
+static const uint16_t atrac3p_sf_huff_code1[64] = {
+        0,     2,     3,     4,     5,   0xC,   0xD,  0xE0,
+     0xE1,  0xE2,  0xE3,  0xE4,  0xE5,  0xE6, 0x1CE, 0x1CF,
+    0x1D0, 0x1D1, 0x1D2, 0x1D3, 0x1D4, 0x1D5, 0x1D6, 0x1D7,
+    0x1D8, 0x1D9, 0x1DA, 0x1DB, 0x1DC, 0x1DD, 0x1DE, 0x1DF,
+    0x1E0, 0x1E1, 0x1E2, 0x1E3, 0x1E4, 0x1E5, 0x1E6, 0x1E7,
+    0x1E8, 0x1E9, 0x1EA, 0x1EB, 0x1EC, 0x1ED, 0x1EE, 0x1EF,
+    0x1F0, 0x1F1, 0x1F2, 0x1F3, 0x1F4, 0x1F5, 0x1F6, 0x1F7,
+    0x1F8, 0x1F9, 0x1FA, 0x1FB, 0x1FC, 0x1FD, 0x1FE, 0x1FF
+};
+
+static const uint8_t atrac3p_sf_huff_bits1[64] = {
+    2, 3, 3, 3, 3, 4, 4, 8, 8, 8, 8, 8, 8, 8, 9, 9,
+    9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+    9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+    9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9
+};
+
+static const uint8_t atrac3p_sf_huff_xlat1[64] = {
+     0,  1, 61, 62, 63,  2, 60,  3,  4,  5,  6, 57, 58, 59,  7,  8,
+     9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
+    25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
+    41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56
+};
+
+static const uint8_t atrac3p_sf_huff_xlat2[64] = {
+    0,   1,  2, 62, 63,  3, 61,  4,  5,  6, 57, 58, 59, 60,  7,  8,
+    9,  10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
+    25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
+    41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56
+};
+
+static const uint16_t atrac3p_sf_huff_code2[64] = {
+        0,     4,  0x18,  0x19,  0x70, 0x1CA, 0x1CB, 0x1CC,
+    0x1CD, 0x1CE, 0x1CF, 0x1D0, 0x1D1, 0x1D2, 0x1D3, 0x1D4,
+    0x1D5, 0x1D6, 0x1D7, 0x1D8, 0x1D9, 0x1DA, 0x1DB, 0x1DC,
+    0x1DD, 0x1DE, 0x1DF, 0x1E0, 0x1E1, 0x1E2, 0x1E3, 0x1E4,
+    0x1E5, 0x1E6, 0x1E7, 0x1E8, 0x1E9, 0x1EA, 0x1EB, 0x1EC,
+    0x1ED, 0x1EE, 0x1EF, 0x1F0, 0x1F1, 0x1F2, 0x1F3, 0x1F4,
+    0x1F5, 0x1F6, 0x1F7, 0x1F8, 0x1F9, 0x1FA, 0x1FB, 0x1FC,
+    0x1FD, 0x1FE, 0x1FF,  0xE4,  0x71,  0x1A,  0x1B,     5
+};
+
+static const uint8_t atrac3p_sf_huff_bits2[64] = {
+    1, 3, 5, 5, 7, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+    9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+    9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+    9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 8, 7, 5, 5, 3
+};
+
+static const uint16_t atrac3p_sf_huff_code3[64] = {
+        0,     2,     3,  0x18,  0x19,  0x70, 0x1CC, 0x1CD,
+    0x1CE, 0x1CF, 0x1D0, 0x1D1, 0x1D2, 0x1D3, 0x1D4, 0x1D5,
+    0x1D6, 0x1D7, 0x1D8, 0x1D9, 0x1DA, 0x1DB, 0x1DC, 0x1DD,
+    0x1DE, 0x1DF, 0x1E0, 0x1E1, 0x1E2, 0x1E3, 0x1E4, 0x1E5,
+    0x1E6, 0x1E7, 0x1E8, 0x1E9, 0x1EA, 0x1EB, 0x1EC, 0x1ED,
+    0x1EE, 0x1EF, 0x1F0, 0x1F1, 0x1F2, 0x1F3, 0x1F4, 0x1F5,
+    0x1F6, 0x1F7, 0x1F8, 0x1F9, 0x1FA, 0x1FB, 0x1FC, 0x1FD,
+    0x1FE, 0x1FF,  0x71,  0x72,  0x1A,  0x1B,     4,     5
+};
+
+static const uint8_t atrac3p_sf_huff_bits3[64] = {
+    2, 3, 3, 5, 5, 7, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+    9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+    9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+    9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 7, 7, 5, 5, 3, 3
+};
+
+static const uint16_t atrac3p_sf_huff_code4[16] = {
+    0, 2, 3, 4, 5, 0xC, 0xD, 0x38, 0x39, 0x3A, 0x3B, 0x3C, 0, 0x3D, 0x3E, 0x3F
+};
+
+static const uint8_t atrac3p_sf_huff_bits4[16] = {
+    2, 3, 3, 3, 3, 4, 4, 6, 6, 6, 6, 6, 0, 6, 6, 6
+};
+
+static const uint8_t atrac3p_sf_huff_xlat4[16] = {
+    0, 1, 13, 14, 15, 2, 12, 3, 4, 5, 6, 7, 8, 9, 10, 11
+};
+
+static const uint8_t atrac3p_sf_huff_xlat5[16] = {
+    0, 1, 2, 14, 15, 3, 13, 4, 5, 6, 7, 9, 8, 10, 11, 12
+};
+
+static const uint16_t atrac3p_sf_huff_code5[16] = {
+    0,    4,  0xC, 0x1C, 0x78, 0x79, 0x7A, 0x7B,
+    0, 0x7C, 0x7D, 0x7E, 0x7F, 0x1D, 0xD,     5
+};
+
+static const uint8_t atrac3p_sf_huff_bits5[16] = {
+    1, 3, 4, 5, 7, 7, 7, 7, 0, 7, 7, 7, 7, 5, 4, 3
+};
+
+static const uint16_t atrac3p_sf_huff_code6[16] = {
+    0, 2, 3, 0xC, 0x1C, 0x3C, 0x7C, 0x7D, 0, 0x7E, 0x7F, 0x3D, 0x1D, 0xD, 4, 5
+};
+
+static const uint8_t atrac3p_sf_huff_bits6[16] = {
+    2, 3, 3, 4, 5, 6, 7, 7, 0, 7, 7, 6, 5, 4, 3, 3
+};
+
+/** VLC tables for code table indexes */
+static const uint8_t atrac3p_ct_huff_code1[4] = { 0, 2, 6, 7 };
+
+static const uint8_t atrac3p_ct_huff_bits1[4] = { 1, 2, 3, 3 };
+
+static const uint8_t atrac3p_ct_huff_code2[8] = { 0, 2, 3, 4, 5, 6, 0xE, 0xF };
+
+static const uint8_t atrac3p_ct_huff_bits2[8] = { 2, 3, 3, 3, 3, 3, 4, 4 };
+
+static const uint8_t atrac3p_ct_huff_xlat1[8] = { 0, 1, 2, 3, 6, 7, 4, 5 };
+
+static const uint8_t atrac3p_ct_huff_code3[8] = {
+    0, 4, 0xA, 0xB, 0xC, 0xD, 0xE, 0xF
+};
+
+static const uint8_t atrac3p_ct_huff_bits3[8] = { 1, 3, 4, 4, 4, 4, 4, 4 };
+
+/* weights for quantized word lengths */
+static const int8_t atrac3p_wl_weights[6][32] = {
+    { 5, 5, 4, 4, 3, 3, 2, 2, 1, 1, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+    { 5, 5, 5, 4, 4, 4, 3, 3, 3, 2, 2, 2, 1, 1, 1, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+    { 6, 5, 5, 5, 4, 4, 4, 4, 3, 3, 3, 3, 2, 2, 1, 1,
+      1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0 },
+    { 5, 5, 4, 4, 3, 3, 2, 2, 1, 1, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+    { 5, 5, 5, 4, 4, 4, 3, 3, 3, 2, 2, 2, 1, 1, 1, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+    { 6, 5, 5, 5, 5, 5, 5, 5, 3, 3, 3, 3, 2, 2, 1, 1,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
+};
+
+/* weights for quantized scale factors
+ * sf_weights[i] = i / (tab_idx + 1)
+ * where tab_idx = [1,2] */
+static const int8_t atrac3p_sf_weights[2][32] = {
+    { 0, 0, 1, 1,  2,  2,  3,  3,  4,  4,  5,  5,  6,  6,  7,  7,
+      8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13, 14, 14, 15, 15 },
+    { 0, 0, 0, 1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4,  4,  5,
+      5, 5, 6, 6, 6, 7, 7, 7, 8, 8, 8, 9, 9, 9, 10, 10 }
+};
+
+/** Ungroup table for word length segments.
+ *  Numbers in this table tell which coeff belongs to which segment. */
+static const uint8_t atrac3p_qu_num_to_seg[32] = {
+    0, 0, 0, 1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4, 5,
+    5, 5, 6, 6, 6, 7, 7, 7, 8, 8, 8, 9, 9, 9, 9, 9
+};
+
+/** Map quant unit number to subband number */
+static const uint8_t atrac3p_qu_to_subband[32] = {
+    0, 0, 0, 0, 0, 0, 0, 0, 1, 1,  1,  1,  2,  2,  2, 2,
+    3, 3, 4, 4, 5, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
+};
+
+/** Map subband number to number of power compensation groups */
+static const int atrac3p_subband_to_num_powgrps[16] = {
+    1, 2, 2, 3, 3, 3, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5
+};
+
+/** 3D base shape tables. The values are grouped together as follows:
+ *  [num_start_values = 8][num_shape_tables = 16][num_seg_coeffs = 9]
+ *  For each of the 8 start values there are 16 different shapes each
+ *  9 coefficients long. */
+static const int8_t atrac3p_wl_shapes[8][16][9] = {
+    { {  0,  0,  0,  0,  0,  0,  0, -2, -1 },
+      {  0,  0,  0,  0,  0,  0,  0, -5, -1 },
+      {  0,  0,  0, -7,  0,  0,  0,  0,  0 },
+      {  0,  0,  0,  0,  0, -7,  0,  0,  0 },
+      {  0,  0,  0,  0,  0,  0, -5,  0,  0 },
+      {  0,  0,  0,  0, -5,  0,  0,  0,  0 },
+      { -7, -7,  0,  0,  0,  0,  0,  0,  0 },
+      {  0, -7,  0,  0,  0,  0,  0,  0,  0 },
+      { -2, -2, -5,  0,  0,  0,  0,  0,  0 },
+      {  0,  0,  0, -2, -5,  0,  0,  0,  0 },
+      {  0,  0,  0,  0,  0, -2, -5,  0,  0 },
+      {  0,  0,  0, -5,  0,  0,  0,  0,  0 },
+      {  0, -2, -7, -2,  0,  0,  0,  0,  0 },
+      {  0,  0,  0,  0, -2, -5,  0,  0,  0 },
+      {  0,  0,  0, -5, -5,  0,  0,  0,  0 },
+      {  0,  0,  0, -5, -2,  0,  0,  0,  0 } },
+    { { -1, -5, -3, -2, -1, -1,  0,  0,  0 },
+      { -2, -5, -3, -3, -2, -1, -1,  0,  0 },
+      {  0, -1, -1, -1,  0,  0,  0,  0,  0 },
+      { -1, -3,  0,  0,  0,  0,  0,  0,  0 },
+      { -1, -2,  0,  0,  0,  0,  0,  0,  0 },
+      { -1, -3, -1,  0,  0,  0,  0,  1,  1 },
+      { -1, -5, -3, -3, -2, -1,  0,  0,  0 },
+      { -1, -1, -4, -2, -2, -1, -1,  0,  0 },
+      { -1, -1, -3, -2, -3, -1, -1, -1,  0 },
+      { -1, -4, -2, -3, -1,  0,  0,  0,  0 },
+      {  0, -1, -2, -2, -1, -1,  0,  0,  0 },
+      {  0, -2, -1,  0,  0,  0,  0,  0,  0 },
+      { -1, -1,  0,  0,  0,  0,  0,  0,  0 },
+      { -1, -1, -3, -2, -2, -1, -1, -1,  0 },
+      {  0,  0,  0,  0,  0,  0,  0,  0,  0 },
+      {  0, -1, -3, -2, -2, -1, -1, -1,  0 }, },
+    { { -1, -2,  0,  1,  1,  1,  1,  1,  1 },
+      {  0, -1,  1,  1,  1,  1,  1,  1,  1 },
+      {  0, -2,  1,  1,  1,  1,  1,  1,  1 },
+      {  0, -2,  0,  1,  1,  1,  1,  1,  1 },
+      { -1, -1,  0,  1,  1,  1,  1,  1,  1 },
+      {  0,  0, -1,  0,  1,  1,  1,  1,  1 },
+      { -1, -1,  1,  1,  1,  1,  1,  1,  1 },
+      {  0,  0, -1,  1,  1,  1,  1,  1,  1 },
+      {  0, -1,  0,  1,  1,  1,  1,  1,  1 },
+      { -1, -1, -1,  1,  1,  1,  1,  1,  1 },
+      {  0,  0,  0,  0,  1,  1,  1,  1,  1 },
+      {  0,  0,  0,  1,  1,  1,  1,  1,  1 },
+      {  0, -1, -1,  1,  1,  1,  1,  1,  1 },
+      {  0,  1,  0,  1,  1,  1,  1,  1,  1 },
+      {  0, -3, -2,  1,  1,  1,  1,  2,  2 },
+      { -3, -5, -3,  2,  2,  2,  2,  2,  2 }, },
+    { { -1, -2,  0,  2,  2,  2,  2,  2,  2 },
+      { -1, -2,  0,  1,  2,  2,  2,  2,  2 },
+      {  0, -2,  0,  2,  2,  2,  2,  2,  2 },
+      { -1,  0,  1,  2,  2,  2,  2,  2,  2 },
+      {  0,  0,  1,  2,  2,  2,  2,  2,  2 },
+      {  0, -2,  0,  1,  2,  2,  2,  2,  2 },
+      {  0, -1,  1,  2,  2,  2,  2,  2,  2 },
+      { -1, -1,  0,  2,  2,  2,  2,  2,  2 },
+      { -1, -1,  0,  1,  2,  2,  2,  2,  2 },
+      { -1, -2, -1,  2,  2,  2,  2,  2,  2 },
+      {  0, -1,  0,  2,  2,  2,  2,  2,  2 },
+      {  1,  1,  0,  1,  2,  2,  2,  2,  2 },
+      {  0,  1,  2,  2,  2,  2,  2,  2,  2 },
+      {  1,  0,  0,  1,  2,  2,  2,  2,  2 },
+      {  0,  0,  0,  1,  2,  2,  2,  2,  2 },
+      { -1, -1, -1,  1,  2,  2,  2,  2,  2 }, },
+    { {  0,  1,  2,  3,  3,  3,  3,  3,  3 },
+      {  1,  1,  2,  3,  3,  3,  3,  3,  3 },
+      { -1,  0,  1,  2,  3,  3,  3,  3,  3 },
+      {  0,  0,  2,  3,  3,  3,  3,  3,  3 },
+      { -1,  0,  1,  3,  3,  3,  3,  3,  3 },
+      {  0,  0,  1,  3,  3,  3,  3,  3,  3 },
+      {  1,  2,  3,  3,  3,  3,  3,  3,  3 },
+      {  1,  2,  2,  3,  3,  3,  3,  3,  3 },
+      {  0,  1,  1,  3,  3,  3,  3,  3,  3 },
+      {  0,  0,  1,  2,  3,  3,  3,  3,  3 },
+      { -1,  1,  2,  3,  3,  3,  3,  3,  3 },
+      { -1,  0,  2,  3,  3,  3,  3,  3,  3 },
+      {  2,  2,  3,  3,  3,  3,  3,  3,  3 },
+      {  1,  1,  3,  3,  3,  3,  3,  3,  3 },
+      {  0,  2,  3,  3,  3,  3,  3,  3,  3 },
+      {  0,  1,  1,  2,  3,  3,  3,  3,  3 }, },
+    { {  0,  1,  2,  3,  4,  4,  4,  4,  4 },
+      {  1,  2,  3,  4,  4,  4,  4,  4,  4 },
+      {  0,  0,  2,  3,  4,  4,  4,  4,  4 },
+      {  1,  1,  2,  4,  4,  4,  4,  4,  4 },
+      {  0,  1,  2,  4,  4,  4,  4,  4,  4 },
+      { -1,  0,  1,  3,  4,  4,  4,  4,  4 },
+      {  0,  0,  1,  3,  4,  4,  4,  4,  4 },
+      {  1,  1,  2,  3,  4,  4,  4,  4,  4 },
+      {  0,  1,  1,  3,  4,  4,  4,  4,  4 },
+      {  2,  2,  3,  4,  4,  4,  4,  4,  4 },
+      {  1,  1,  3,  4,  4,  4,  4,  4,  4 },
+      {  1,  2,  2,  4,  4,  4,  4,  4,  4 },
+      { -1,  0,  2,  3,  4,  4,  4,  4,  4 },
+      {  0,  1,  3,  4,  4,  4,  4,  4,  4 },
+      {  1,  2,  2,  3,  4,  4,  4,  4,  4 },
+      {  0,  2,  3,  4,  4,  4,  4,  4,  4 }, },
+    { {  1,  2,  3,  4,  5,  5,  5,  5,  5 },
+      {  0,  1,  2,  3,  4,  5,  5,  5,  5 },
+      {  0,  1,  2,  3,  5,  5,  5,  5,  5 },
+      {  1,  1,  3,  4,  5,  5,  5,  5,  5 },
+      {  1,  1,  2,  4,  5,  5,  5,  5,  5 },
+      {  1,  2,  2,  4,  5,  5,  5,  5,  5 },
+      {  1,  1,  2,  3,  5,  5,  5,  5,  5 },
+      {  2,  2,  3,  4,  5,  5,  5,  5,  5 },
+      {  0,  1,  2,  4,  5,  5,  5,  5,  5 },
+      {  2,  2,  3,  5,  5,  5,  5,  5,  5 },
+      {  1,  2,  3,  5,  5,  5,  5,  5,  5 },
+      {  0,  1,  3,  4,  5,  5,  5,  5,  5 },
+      {  1,  2,  2,  3,  5,  5,  5,  5,  5 },
+      {  2,  3,  4,  5,  5,  5,  5,  5,  5 },
+      {  0,  2,  3,  4,  5,  5,  5,  5,  5 },
+      {  1,  1,  1,  3,  4,  5,  5,  5,  5 }, },
+    { {  1,  2,  3,  4,  5,  5,  5,  6,  6 },
+      {  1,  2,  3,  4,  5,  6,  6,  6,  6 },
+      {  2,  3,  4,  5,  6,  6,  6,  6,  6 },
+      {  1,  2,  3,  4,  6,  6,  6,  6,  6 },
+      {  2,  2,  3,  4,  5,  5,  5,  6,  6 },
+      {  1,  2,  3,  4,  5,  5,  6,  6,  6 },
+      {  2,  2,  3,  4,  6,  6,  6,  6,  6 },
+      {  2,  2,  3,  4,  5,  6,  6,  6,  6 },
+      {  2,  2,  4,  5,  6,  6,  6,  6,  6 },
+      {  2,  2,  3,  5,  6,  6,  6,  6,  6 },
+      {  1,  2,  3,  5,  6,  6,  6,  6,  6 },
+      {  2,  3,  3,  5,  6,  6,  6,  6,  6 },
+      {  1,  2,  4,  5,  6,  6,  6,  6,  6 },
+      {  2,  2,  3,  4,  5,  5,  6,  6,  6 },
+      {  2,  3,  3,  4,  6,  6,  6,  6,  6 },
+      {  1,  3,  4,  5,  6,  6,  6,  6,  6 } }
+};
+
+/** 2D base shape tables for scale factor coding.
+ *  The values are grouped together as follows:
+ *  [num_shape_tables = 64][num_seg_coeffs = 9] */
+static const int8_t atrac3p_sf_shapes[64][9] = {
+    { -3, -2, -1,  0,  3,  5,  6,  8, 40 },
+    { -3, -2,  0,  1,  7,  9, 11, 13, 20 },
+    { -1,  0,  0,  1,  6,  8, 10, 13, 41 },
+    {  0,  0,  0,  2,  5,  5,  6,  8, 14 },
+    {  0,  0,  0,  2,  6,  7,  8, 11, 47 },
+    {  0,  0,  1,  2,  5,  7,  8, 10, 32 },
+    {  0,  0,  1,  3,  8, 10, 12, 14, 47 },
+    {  0,  0,  2,  4,  9, 10, 12, 14, 40 },
+    {  0,  0,  3,  5,  9, 10, 12, 14, 22 },
+    {  0,  1,  3,  5, 10, 14, 18, 22, 31 },
+    {  0,  2,  5,  6, 10, 10, 10, 12, 46 },
+    {  0,  2,  5,  7, 12, 14, 15, 18, 44 },
+    {  1,  1,  4,  5,  7,  7,  8,  9, 15 },
+    {  1,  2,  2,  2,  4,  5,  7,  9, 26 },
+    {  1,  2,  2,  3,  6,  7,  7,  8, 47 },
+    {  1,  2,  2,  3,  6,  8, 10, 13, 22 },
+    {  1,  3,  4,  7, 13, 17, 21, 24, 41 },
+    {  1,  4,  0,  4, 10, 12, 13, 14, 17 },
+    {  2,  3,  3,  3,  6,  8, 10, 13, 48 },
+    {  2,  3,  3,  4,  9, 12, 14, 17, 47 },
+    {  2,  3,  3,  5, 10, 12, 14, 17, 25 },
+    {  2,  3,  5,  7,  8,  9,  9,  9, 13 },
+    {  2,  3,  5,  9, 16, 21, 25, 28, 33 },
+    {  2,  4,  5,  8, 12, 14, 17, 19, 26 },
+    {  2,  4,  6,  8, 12, 13, 13, 15, 20 },
+    {  2,  4,  7, 12, 20, 26, 30, 32, 35 },
+    {  3,  3,  5,  6, 12, 14, 16, 19, 34 },
+    {  3,  4,  4,  5,  7,  9, 10, 11, 48 },
+    {  3,  4,  5,  6,  8,  9, 10, 11, 16 },
+    {  3,  5,  5,  5,  7,  9, 10, 13, 35 },
+    {  3,  5,  5,  7, 10, 12, 13, 15, 49 },
+    {  3,  5,  7,  7,  8,  7,  9, 12, 21 },
+    {  3,  5,  7,  8, 12, 14, 15, 15, 24 },
+    {  3,  5,  7, 10, 16, 21, 24, 27, 44 },
+    {  3,  5,  8, 14, 21, 26, 28, 29, 42 },
+    {  3,  6, 10, 13, 18, 19, 20, 22, 27 },
+    {  3,  6, 11, 16, 24, 27, 28, 29, 31 },
+    {  4,  5,  4,  3,  4,  6,  8, 11, 18 },
+    {  4,  6,  5,  6,  9, 10, 12, 14, 20 },
+    {  4,  6,  7,  6,  6,  6,  7,  8, 46 },
+    {  4,  6,  7,  9, 13, 16, 18, 20, 48 },
+    {  4,  6,  7,  9, 14, 17, 20, 23, 31 },
+    {  4,  6,  9, 11, 14, 15, 15, 17, 21 },
+    {  4,  8, 13, 20, 27, 32, 35, 36, 38 },
+    {  5,  6,  6,  4,  5,  6,  7,  6,  6 },
+    {  5,  7,  7,  8,  9,  9, 10, 12, 49 },
+    {  5,  8,  9,  9, 10, 11, 12, 13, 42 },
+    {  5,  8, 10, 12, 15, 16, 17, 19, 42 },
+    {  5,  8, 12, 17, 26, 31, 32, 33, 44 },
+    {  5,  9, 13, 16, 20, 22, 23, 23, 35 },
+    {  6,  8,  8,  7,  6,  5,  6,  8, 15 },
+    {  6,  8,  8,  8,  9, 10, 12, 16, 24 },
+    {  6,  8,  8,  9, 10, 10, 11, 11, 13 },
+    {  6,  8, 10, 13, 19, 21, 24, 26, 32 },
+    {  6,  9, 10, 11, 13, 13, 14, 16, 49 },
+    {  7,  9,  9, 10, 13, 14, 16, 19, 27 },
+    {  7, 10, 12, 13, 16, 16, 17, 17, 27 },
+    {  7, 10, 12, 14, 17, 19, 20, 22, 48 },
+    {  8,  9, 10,  9, 10, 11, 11, 11, 19 },
+    {  8, 11, 12, 12, 13, 13, 13, 13, 17 },
+    {  8, 11, 13, 14, 16, 17, 19, 20, 27 },
+    {  8, 12, 17, 22, 26, 28, 29, 30, 33 },
+    { 10, 14, 16, 19, 21, 22, 22, 24, 28 },
+    { 10, 15, 17, 18, 21, 22, 23, 25, 43 }
+};
+
+static const uint8_t atrac3p_ct_restricted_to_full[2][7][4] = {
+    { { 0, 5, 4, 1 },
+      { 0, 1, 2, 3 },
+      { 3, 0, 4, 2 },
+      { 4, 0, 1, 2 },
+      { 1, 0, 4, 3 },
+      { 3, 0, 2, 1 },
+      { 0, 3, 1, 2 } },
+    { { 4, 0, 1, 2 },
+      { 0, 3, 2, 1 },
+      { 0, 1, 2, 3 },
+      { 0, 1, 2, 4 },
+      { 0, 1, 2, 3 },
+      { 1, 4, 2, 0 },
+      { 0, 1, 2, 3 } }
+};
+
+/** Tables for spectrum coding */
+static const uint8_t huff_a01_cb[14] = {
+    1, 12, 1, 0, 0, 1, 7, 0, 19, 5, 13, 21, 6, 8
+};
+
+static const uint8_t huff_a01_xlat[81] = {
+    0x00, 0x03, 0x40, 0xC0, 0x10, 0x30, 0x04, 0x0C, 0x01, 0x50, 0xD0, 0x70,
+    0xF0, 0xC4, 0x14, 0x34, 0x4C, 0x1C, 0x3C, 0x41, 0xC1, 0x31, 0x05, 0x0D,
+    0xC3, 0x13, 0x07, 0x0F, 0x44, 0xCC, 0x11, 0x43, 0x33, 0x54, 0x74, 0xDC,
+    0xFC, 0x71, 0x15, 0x4D, 0xCD, 0x1D, 0xD3, 0xC7, 0x37, 0x3F, 0xD4, 0xF4,
+    0x5C, 0x7C, 0x51, 0xD1, 0xF1, 0x45, 0xC5, 0x35, 0xDD, 0x3D, 0x53, 0x73,
+    0xF3, 0x47, 0x17, 0x77, 0x4F, 0xCF, 0x1F, 0x55, 0xF5, 0x7D, 0xD7, 0x5F,
+    0xFF, 0xD5, 0x75, 0x5D, 0xFD, 0x57, 0xF7, 0xDF, 0x7F
+};
+
+static const uint8_t huff_a02_cb[13] = {
+    2, 12, 1, 0, 4, 11, 0, 1, 29, 6, 20, 7, 2
+};
+
+static const uint8_t huff_a02_xlat[81] = {
+    0x00, 0x40, 0x10, 0x04, 0x01, 0x50, 0x44, 0x14, 0x54, 0x41, 0x11, 0x51,
+    0x05, 0x45, 0x15, 0x55, 0x90, 0x80, 0x20, 0x60, 0x84, 0x94, 0x24, 0x64,
+    0x08, 0x48, 0x18, 0x58, 0x81, 0x91, 0x21, 0x85, 0x95, 0x65, 0x09, 0x49,
+    0x19, 0x59, 0x02, 0x42, 0x12, 0x52, 0x06, 0x46, 0x16, 0x56, 0x88, 0x61,
+    0x25, 0x29, 0x69, 0x5A, 0xA0, 0xA4, 0x98, 0x28, 0x68, 0xA1, 0xA5, 0x89,
+    0x99, 0xA9, 0x82, 0x92, 0x22, 0x62, 0x96, 0x26, 0x66, 0x0A, 0x4A, 0x1A,
+    0xA8, 0x86, 0xA6, 0x8A, 0x9A, 0x2A, 0x6A, 0xA2, 0xAA
+};
+
+static const uint8_t huff_a03_cb[9] = { 3, 9, 1, 8, 0, 13, 18, 7, 2 };
+
+static const uint8_t huff_a03_xlat[49] = {
+    0x00, 0x08, 0x38, 0x01, 0x09, 0x39, 0x07, 0x0F, 0x3F, 0x10, 0x30, 0x11,
+    0x31, 0x02, 0x0A, 0x3A, 0x05, 0x06, 0x0E, 0x3E, 0x17, 0x37, 0x18, 0x28,
+    0x19, 0x29, 0x2A, 0x32, 0x03, 0x0B, 0x33, 0x3B, 0x0D, 0x15, 0x3D, 0x16,
+    0x1E, 0x36, 0x1F, 0x2F, 0x12, 0x1A, 0x13, 0x2B, 0x1D, 0x35, 0x2E, 0x1B,
+    0x2D
+};
+
+static const uint8_t huff_a04_cb[4]   = { 2, 3, 2, 4 };
+static const uint8_t huff_a04_xlat[6] = { 1, 2, 0, 3, 4, 5 };
+
+static const uint8_t huff_a05_cb[12] = {
+    3, 12, 1, 3, 5, 8, 12, 23, 72, 68, 31, 2
+};
+
+static const uint8_t huff_a05_xlat[225] = {
+    0x00, 0x10, 0xF0, 0x01, 0x11, 0xF1, 0x0F, 0x1F, 0xFF, 0x20, 0xE0, 0xE1,
+    0x02, 0xF2, 0x0E, 0x1E, 0x2F, 0x30, 0xD0, 0x21, 0x12, 0x22, 0xE2, 0x03,
+    0x0D, 0x2E, 0xEE, 0xFE, 0xEF, 0x40, 0xC0, 0x31, 0xC1, 0xD1, 0x32, 0xD2,
+    0x13, 0x23, 0xE3, 0xF3, 0x04, 0xF4, 0x0C, 0x1C, 0x1D, 0x2D, 0xED, 0xFD,
+    0x3E, 0xDE, 0x3F, 0xDF, 0x50, 0x60, 0x70, 0x90, 0xA0, 0xB0, 0x41, 0x51,
+    0x61, 0x71, 0x91, 0xA1, 0xB1, 0x42, 0x62, 0x92, 0xA2, 0xC2, 0x33, 0xC3,
+    0xD3, 0x14, 0x24, 0x34, 0xD4, 0xE4, 0x05, 0x15, 0xF5, 0x06, 0x16, 0x26,
+    0xE6, 0xF6, 0x07, 0x17, 0xE7, 0xF7, 0x09, 0x19, 0x29, 0xF9, 0x0A, 0x1A,
+    0x2A, 0xEA, 0xFA, 0x0B, 0x1B, 0xFB, 0x2C, 0x3C, 0xDC, 0xEC, 0xFC, 0x3D,
+    0x4D, 0xCD, 0xDD, 0x4E, 0x6E, 0x7E, 0xAE, 0xCE, 0x4F, 0x5F, 0x6F, 0x7F,
+    0x9F, 0xAF, 0xBF, 0xCF, 0x52, 0x72, 0xB2, 0x43, 0x53, 0x63, 0x73, 0x93,
+    0xA3, 0xB3, 0x44, 0x64, 0x74, 0x94, 0xA4, 0xB4, 0xC4, 0x25, 0x35, 0xA5,
+    0xC5, 0xD5, 0xE5, 0x36, 0x46, 0xB6, 0xC6, 0xD6, 0x27, 0x37, 0x47, 0xB7,
+    0xC7, 0xD7, 0x39, 0x49, 0x59, 0xC9, 0xD9, 0xE9, 0x3A, 0x4A, 0x5A, 0xCA,
+    0xDA, 0x2B, 0x3B, 0x4B, 0x6B, 0x7B, 0xDB, 0xEB, 0x4C, 0x5C, 0x6C, 0x7C,
+    0x9C, 0xAC, 0xCC, 0x5D, 0x6D, 0x7D, 0x9D, 0xAD, 0xBD, 0x5E, 0x9E, 0xBE,
+    0x54, 0x45, 0x55, 0x65, 0x75, 0x95, 0xB5, 0x56, 0x66, 0x76, 0x96, 0xA6,
+    0x57, 0x67, 0x97, 0xA7, 0x69, 0x79, 0xA9, 0xB9, 0x6A, 0x7A, 0x9A, 0xAA,
+    0xBA, 0x5B, 0x9B, 0xAB, 0xBB, 0xCB, 0xBC, 0x77, 0x99
+};
+
+static const uint8_t huff_a06_cb[7] = {
+    2, 6, 1, 3, 2, 6, 4
+};
+
+static const uint8_t huff_a06_xlat[16] = {
+    1, 0, 2, 3, 4, 5, 6, 7, 8, 9, 13, 14, 10, 11, 12, 15
+};
+
+static const uint8_t huff_a07_cb[11] = {
+    2, 10, 1, 2, 2, 2, 6, 14, 21, 13, 2
+};
+
+static const uint8_t huff_a07_xlat[63] = {
+    0,   1, 63,  2, 62,  3, 61,  4,  5,  6, 58, 59, 60,  7,  8,  9,
+    10, 26, 27, 28, 36, 37, 38, 54, 55, 56, 57, 11, 12, 13, 14, 15,
+    16, 25, 29, 30, 31, 33, 34, 35, 39, 47, 48, 49, 50, 51, 52, 53,
+    17, 18, 19, 20, 21, 22, 23, 41, 42, 43, 44, 45, 46, 24, 40
+};
+
+static const uint8_t huff_a11_cb[13] = {
+    1, 11, 1, 0, 0, 0, 8, 1, 18, 9, 22, 10, 12
+};
+
+static const uint8_t huff_a11_xlat[81] = {
+    0x00, 0x40, 0xC0, 0x10, 0x30, 0x04, 0x0C, 0x01, 0x03, 0xD0, 0x50, 0x70,
+    0xF0, 0xC4, 0x34, 0x4C, 0xCC, 0x1C, 0x41, 0xC1, 0x31, 0x05, 0x0D, 0x43,
+    0xC3, 0x13, 0x07, 0x0F, 0x44, 0x14, 0x74, 0xDC, 0x3C, 0x11, 0x1D, 0x33,
+    0x37, 0x54, 0xD4, 0xF4, 0x5C, 0x7C, 0xFC, 0xD1, 0x71, 0xF1, 0x15, 0x35,
+    0x4D, 0xCD, 0xDD, 0x3D, 0xD3, 0x73, 0x47, 0xC7, 0x17, 0x77, 0x3F, 0x51,
+    0x45, 0xC5, 0x55, 0x53, 0xF3, 0x4F, 0xCF, 0x1F, 0xFF, 0xD5, 0x75, 0xF5,
+    0x5D, 0x7D, 0xFD, 0x57, 0xD7, 0xF7, 0x5F, 0xDF, 0x7F
+};
+
+static const uint8_t huff_a12_cb[8] = { 5, 10, 16, 11, 32, 19, 1, 2 };
+
+static const uint8_t huff_a12_xlat[81] = {
+    0x00, 0x40, 0x10, 0x50, 0x04, 0x44, 0x14, 0x54, 0x01, 0x41, 0x11, 0x51,
+    0x05, 0x45, 0x15, 0x55, 0x90, 0x94, 0x58, 0x91, 0x95, 0x19, 0x59, 0x06,
+    0x46, 0x16, 0x56, 0x80, 0x60, 0x84, 0x24, 0x64, 0xA4, 0x08, 0x48, 0x18,
+    0x68, 0x81, 0x21, 0x61, 0xA1, 0x85, 0x25, 0x65, 0xA5, 0x09, 0x49, 0x99,
+    0x69, 0xA9, 0x02, 0x42, 0x12, 0x52, 0x96, 0x26, 0x66, 0x1A, 0x5A, 0x20,
+    0xA0, 0x88, 0x98, 0x28, 0xA8, 0x89, 0x29, 0x82, 0x92, 0x22, 0x62, 0x86,
+    0xA6, 0x0A, 0x4A, 0x9A, 0x6A, 0xAA, 0xA2, 0x8A, 0x2A
+};
+
+static const uint8_t huff_a13_cb[12] = {
+    1, 10, 1, 0, 0, 4, 2, 2, 9, 15, 12, 4
+};
+
+static const uint8_t huff_a13_xlat[49] = {
+    0x00, 0x08, 0x38, 0x01, 0x07, 0x39, 0x0F, 0x09, 0x3F, 0x10, 0x30, 0x31,
+    0x02, 0x3A, 0x06, 0x0E, 0x3E, 0x17, 0x18, 0x28, 0x11, 0x29, 0x0A, 0x32,
+    0x03, 0x0B, 0x3B, 0x05, 0x0D, 0x3D, 0x16, 0x1F, 0x37, 0x19, 0x12, 0x1A,
+    0x2A, 0x13, 0x33, 0x15, 0x35, 0x1E, 0x2E, 0x36, 0x2F, 0x1B, 0x2B, 0x1D,
+    0x2D
+};
+
+static const uint8_t huff_a14_cb[12] = {
+    2, 11, 1, 0, 4, 3, 5, 16, 28, 34, 26, 4
+};
+
+static const uint8_t huff_a14_xlat[121] = {
+    0x00, 0x10, 0xF0, 0x01, 0x0F, 0xF1, 0x1F, 0xFF, 0x20, 0xE0, 0x11, 0x02,
+    0x0E, 0x30, 0x50, 0xB0, 0xD0, 0x21, 0xE1, 0x12, 0xF2, 0x03, 0x05, 0x0B,
+    0x0D, 0x1E, 0xFE, 0x2F, 0xEF, 0x40, 0xC0, 0x31, 0x51, 0xB1, 0xC1, 0xD1,
+    0x22, 0x52, 0xE2, 0x13, 0xF3, 0x04, 0x15, 0xF5, 0x1B, 0xEB, 0xFB, 0x0C,
+    0x1D, 0xFD, 0x2E, 0x5E, 0xEE, 0x3F, 0x5F, 0xBF, 0xDF, 0x41, 0x32, 0x42,
+    0xB2, 0xD2, 0x23, 0x53, 0xB3, 0xE3, 0x14, 0x24, 0xE4, 0xF4, 0x25, 0x35,
+    0xD5, 0xE5, 0x2B, 0x3B, 0xDB, 0x1C, 0x2C, 0xBC, 0xEC, 0xFC, 0x2D, 0xBD,
+    0xED, 0x3E, 0x4E, 0xBE, 0xDE, 0x4F, 0xCF, 0xC2, 0x33, 0x43, 0xC3, 0xD3,
+    0x34, 0x44, 0x54, 0xB4, 0xD4, 0x45, 0x55, 0xC5, 0x4B, 0xCB, 0x3C, 0x4C,
+    0x5C, 0xCC, 0xDC, 0x3D, 0x4D, 0x5D, 0xCD, 0xDD, 0xCE, 0xC4, 0xB5, 0x5B,
+    0xBB
+};
+
+static const uint8_t huff_a15_cb[9] = { 5, 11, 9, 12, 16, 44, 98, 42, 4 };
+
+static const uint8_t huff_a15_xlat[225] = {
+    0x00, 0x10, 0xF0, 0x01, 0x11, 0xF1, 0x0F, 0x1F, 0xFF, 0x20, 0xE0, 0x21,
+    0xE1, 0x02, 0x12, 0xF2, 0x0E, 0x1E, 0xFE, 0x2F, 0xEF, 0x30, 0xD0, 0x31,
+    0xD1, 0x22, 0xE2, 0x03, 0x13, 0xF3, 0x0D, 0x1D, 0xFD, 0x2E, 0xEE, 0x3F,
+    0xDF, 0x40, 0x60, 0x70, 0x90, 0xA0, 0xC0, 0x41, 0xC1, 0x32, 0x42, 0xC2,
+    0xD2, 0x23, 0x33, 0xD3, 0xE3, 0x04, 0x14, 0x24, 0xE4, 0xF4, 0x06, 0x16,
+    0xF6, 0x07, 0x09, 0x0A, 0x1A, 0xFA, 0x0C, 0x1C, 0x2C, 0xEC, 0xFC, 0x2D,
+    0x3D, 0xDD, 0xED, 0x3E, 0x4E, 0xCE, 0xDE, 0x4F, 0xCF, 0x50, 0xB0, 0x51,
+    0x61, 0x71, 0x91, 0xA1, 0xB1, 0x52, 0x62, 0x72, 0x92, 0xA2, 0xB2, 0x43,
+    0x53, 0x63, 0x73, 0x93, 0xA3, 0xC3, 0x34, 0x44, 0x64, 0xA4, 0xC4, 0xD4,
+    0x05, 0x15, 0x25, 0x35, 0xD5, 0xE5, 0xF5, 0x26, 0x36, 0x46, 0xC6, 0xD6,
+    0xE6, 0x17, 0x27, 0x37, 0xC7, 0xD7, 0xE7, 0xF7, 0x19, 0x29, 0x39, 0xC9,
+    0xD9, 0xE9, 0xF9, 0x2A, 0x3A, 0x4A, 0x5A, 0xCA, 0xDA, 0xEA, 0x0B, 0x1B,
+    0x2B, 0x3B, 0xCB, 0xDB, 0xEB, 0xFB, 0x3C, 0x4C, 0x6C, 0x7C, 0x9C, 0xAC,
+    0xBC, 0xCC, 0xDC, 0x4D, 0x5D, 0x6D, 0x7D, 0x9D, 0xAD, 0xBD, 0xCD, 0x5E,
+    0x6E, 0x7E, 0x9E, 0xAE, 0xBE, 0x5F, 0x6F, 0x7F, 0x9F, 0xAF, 0xBF, 0xB3,
+    0x54, 0x74, 0x94, 0xB4, 0x45, 0x55, 0x65, 0x75, 0x95, 0xA5, 0xB5, 0xC5,
+    0x56, 0x66, 0x76, 0x96, 0xA6, 0xB6, 0x47, 0x57, 0x67, 0xA7, 0xB7, 0x49,
+    0x59, 0x69, 0xA9, 0xB9, 0x6A, 0x7A, 0x9A, 0xAA, 0xBA, 0x4B, 0x5B, 0x6B,
+    0x7B, 0x9B, 0xAB, 0xBB, 0x5C, 0x77, 0x97, 0x79, 0x99
+};
+
+static const uint8_t huff_a16_cb[13] = {
+    2, 12, 1, 1, 2, 2, 5, 7, 21, 54, 85, 62, 16
+};
+
+static const uint8_t huff_a16_xlat[256] = {
+    0x00, 0x01, 0x10, 0x11, 0x21, 0x12, 0x20, 0x31, 0x02, 0x22, 0x13, 0x30,
+    0x41, 0x32, 0x03, 0x23, 0x14, 0x24, 0x40, 0x51, 0x61, 0xD1, 0xE1, 0x42,
+    0x52, 0xD2, 0x33, 0x43, 0xD3, 0x04, 0x34, 0x05, 0x15, 0x25, 0x16, 0x1D,
+    0x2D, 0x1E, 0x2E, 0x50, 0x60, 0xD0, 0xE0, 0xF0, 0x71, 0x81, 0xF1, 0x62,
+    0x72, 0xE2, 0xF2, 0x53, 0x63, 0xE3, 0xF3, 0x44, 0x54, 0xD4, 0xE4, 0xF4,
+    0x35, 0x45, 0x55, 0xD5, 0xE5, 0xF5, 0x06, 0x26, 0x36, 0xD6, 0x07, 0x17,
+    0x27, 0x37, 0xD7, 0x18, 0x28, 0x1C, 0x0D, 0x3D, 0x4D, 0x5D, 0x6D, 0x8D,
+    0x0E, 0x3E, 0x4E, 0x5E, 0x0F, 0x1F, 0x2F, 0x3F, 0x5F, 0x70, 0x80, 0x90,
+    0xC0, 0x91, 0xA1, 0xB1, 0xC1, 0x82, 0x92, 0xA2, 0xC2, 0x73, 0x83, 0x93,
+    0xA3, 0xC3, 0x64, 0x74, 0x84, 0x94, 0xA4, 0xC4, 0x65, 0x75, 0x85, 0x46,
+    0x56, 0x66, 0xC6, 0xE6, 0xF6, 0x47, 0x57, 0xE7, 0xF7, 0x08, 0x38, 0x48,
+    0x58, 0x68, 0xD8, 0xE8, 0xF8, 0x09, 0x19, 0x29, 0x39, 0x59, 0xD9, 0xE9,
+    0xF9, 0x1A, 0x2A, 0x3A, 0xDA, 0xEA, 0xFA, 0x1B, 0x2B, 0xDB, 0xEB, 0xFB,
+    0x0C, 0x2C, 0x3C, 0xDC, 0xEC, 0x7D, 0x9D, 0xAD, 0xBD, 0xCD, 0x6E, 0x7E,
+    0x8E, 0x9E, 0xAE, 0xBE, 0xCE, 0x4F, 0x6F, 0x7F, 0x8F, 0xAF, 0xA0, 0xB2,
+    0xB3, 0xB4, 0x95, 0xA5, 0xB5, 0xC5, 0x76, 0x86, 0x96, 0xA6, 0xB6, 0x67,
+    0x77, 0x87, 0x97, 0xC7, 0x78, 0x88, 0x98, 0xC8, 0x49, 0x69, 0x79, 0x89,
+    0x99, 0xC9, 0x0A, 0x4A, 0x5A, 0x6A, 0x7A, 0xCA, 0x0B, 0x3B, 0x4B, 0x5B,
+    0x6B, 0xCB, 0x4C, 0x5C, 0x6C, 0x7C, 0x8C, 0x9C, 0xAC, 0xBC, 0xCC, 0xFC,
+    0xDD, 0xED, 0xFD, 0xDE, 0xEE, 0xFE, 0x9F, 0xBF, 0xCF, 0xDF, 0xEF, 0xFF,
+    0xB0, 0xA7, 0xB7, 0xA8, 0xB8, 0xA9, 0xB9, 0x8A, 0x9A, 0xAA, 0xBA, 0x7B,
+    0x8B, 0x9B, 0xAB, 0xBB
+};
+
+static const uint8_t huff_a17_cb[9] = { 3, 9, 3, 2, 5, 7, 17, 23, 6 };
+
+static const uint8_t huff_a17_xlat[63] = {
+    0,   1, 63,  2, 62,  3,  4, 59, 60, 61,  5,  6,  7,  8, 56, 57,
+    58,  9, 10, 11, 12, 13, 14, 26, 27, 36, 37, 38, 50, 51, 52, 53,
+    54, 55, 15, 16, 17, 18, 19, 20, 21, 25, 28, 29, 30, 31, 33, 34,
+    35, 39, 43, 44, 45, 46, 47, 48, 49, 22, 23, 24, 40, 41, 42
+};
+
+static const uint8_t huff_a21_cb[14] = {
+    1, 12, 1, 0, 0, 2, 6, 0, 7, 21, 15, 17, 8, 4
+};
+
+static const uint8_t huff_a21_xlat[81] = {
+    0x00, 0x40, 0xC0, 0x10, 0x30, 0x04, 0x0C, 0x01, 0x03, 0xD0, 0x70, 0x34,
+    0x1C, 0x0D, 0x13, 0x07, 0x50, 0xF0, 0x44, 0xC4, 0x14, 0x74, 0x4C, 0xCC,
+    0xDC, 0x3C, 0x41, 0xC1, 0x11, 0x31, 0x05, 0x1D, 0x43, 0xC3, 0x33, 0x37,
+    0x0F, 0x54, 0xF4, 0xFC, 0xD1, 0x71, 0x15, 0x4D, 0xCD, 0xDD, 0xD3, 0x73,
+    0x47, 0xC7, 0x77, 0x3F, 0xD4, 0x5C, 0x7C, 0x51, 0xF1, 0x45, 0xC5, 0x55,
+    0x35, 0x3D, 0x53, 0xF3, 0x17, 0x4F, 0xCF, 0x1F, 0xFF, 0x75, 0xF5, 0x5D,
+    0x7D, 0xD7, 0xF7, 0x5F, 0xDF, 0xD5, 0xFD, 0x57, 0x7F
+};
+
+static const uint8_t huff_a22_cb[10] = { 2, 9, 1, 4, 0, 4, 3, 8, 3, 2 };
+
+static const uint8_t huff_a22_xlat[25] = {
+    0x00, 0x08, 0x38, 0x01, 0x07, 0x09, 0x39, 0x0F, 0x3F, 0x10, 0x02, 0x06,
+    0x30, 0x11, 0x31, 0x0A, 0x3A, 0x0E, 0x17, 0x37, 0x32, 0x16, 0x3E, 0x12,
+    0x36
+};
+
+static const uint8_t huff_a23_cb[9] = { 3, 9, 5, 0, 4, 6, 10, 16, 8 };
+
+static const uint8_t huff_a23_xlat[49] = {
+    0x00, 0x08, 0x38, 0x01, 0x07, 0x09, 0x39, 0x0F, 0x3F, 0x10, 0x30, 0x02,
+    0x3A, 0x06, 0x0E, 0x18, 0x28, 0x11, 0x31, 0x0A, 0x03, 0x05, 0x3E, 0x17,
+    0x37, 0x19, 0x29, 0x12, 0x2A, 0x32, 0x0B, 0x33, 0x3B, 0x0D, 0x15, 0x3D,
+    0x16, 0x1E, 0x36, 0x1F, 0x2F, 0x1A, 0x13, 0x1B, 0x2B, 0x1D, 0x2D, 0x35,
+    0x2E
+};
+
+static const uint8_t huff_a24_cb[5] = { 2, 4, 3, 1, 2 };
+
+static const uint8_t huff_a25_cb[5] = { 2, 4, 1, 5, 2 };
+
+static const uint8_t huff_a25_xlat[8] = { 1, 0, 2, 3, 4, 5, 6, 7 };
+
+static const uint8_t huff_a26_cb[10] = { 4, 11, 3, 4, 12, 15, 34, 83, 75, 30 };
+
+static const uint8_t huff_a26_xlat[256] = {
+    0x00, 0x01, 0x11, 0x10, 0x21, 0x12, 0x22, 0x20, 0x30, 0x31, 0x41, 0x02,
+    0x32, 0x03, 0x13, 0x23, 0x33, 0x14, 0x24, 0x40, 0x51, 0x61, 0x42, 0x52,
+    0x43, 0x53, 0x04, 0x34, 0x44, 0x15, 0x25, 0x35, 0x16, 0x26, 0x50, 0x60,
+    0x71, 0x81, 0xD1, 0x62, 0x72, 0x82, 0xD2, 0x63, 0x73, 0xD3, 0x54, 0x64,
+    0x05, 0x45, 0x55, 0x65, 0x06, 0x36, 0x46, 0x56, 0x17, 0x27, 0x37, 0x47,
+    0x18, 0x28, 0x38, 0x19, 0x1D, 0x2D, 0x3D, 0x1E, 0x70, 0x80, 0x90, 0xD0,
+    0xE0, 0x91, 0xA1, 0xB1, 0xC1, 0xE1, 0xF1, 0x92, 0xA2, 0xC2, 0xE2, 0xF2,
+    0x83, 0x93, 0xA3, 0xC3, 0xE3, 0xF3, 0x74, 0x84, 0x94, 0xA4, 0xC4, 0xD4,
+    0xE4, 0xF4, 0x75, 0x85, 0x95, 0xD5, 0xE5, 0x66, 0x76, 0x86, 0xD6, 0xE6,
+    0x07, 0x57, 0x67, 0x77, 0xD7, 0x08, 0x48, 0x58, 0x68, 0xD8, 0x09, 0x29,
+    0x39, 0x49, 0x59, 0x69, 0x1A, 0x2A, 0x3A, 0x4A, 0x1B, 0x2B, 0x1C, 0x2C,
+    0x3C, 0x4C, 0x0D, 0x4D, 0x5D, 0x6D, 0x7D, 0x8D, 0x0E, 0x2E, 0x3E, 0x4E,
+    0x5E, 0x6E, 0x1F, 0x2F, 0x3F, 0x4F, 0x5F, 0xA0, 0xB0, 0xC0, 0xF0, 0xB2,
+    0xB3, 0xB4, 0xA5, 0xB5, 0xC5, 0xF5, 0x96, 0xA6, 0xB6, 0xC6, 0xF6, 0x87,
+    0x97, 0xA7, 0xB7, 0xC7, 0xE7, 0xF7, 0x78, 0x88, 0x98, 0xA8, 0xC8, 0xE8,
+    0xF8, 0x79, 0x89, 0x99, 0xC9, 0xD9, 0xE9, 0xF9, 0x0A, 0x5A, 0x6A, 0x7A,
+    0x8A, 0xDA, 0xEA, 0xFA, 0x0B, 0x3B, 0x4B, 0x5B, 0x6B, 0x7B, 0x8B, 0xDB,
+    0x0C, 0x5C, 0x6C, 0x7C, 0x8C, 0x9C, 0xDC, 0x9D, 0xAD, 0xBD, 0xCD, 0x7E,
+    0x8E, 0x9E, 0xAE, 0xBE, 0x0F, 0x6F, 0x7F, 0x8F, 0x9F, 0xAF, 0xB8, 0xA9,
+    0xB9, 0x9A, 0xAA, 0xBA, 0xCA, 0x9B, 0xAB, 0xBB, 0xCB, 0xEB, 0xFB, 0xAC,
+    0xBC, 0xCC, 0xEC, 0xFC, 0xDD, 0xED, 0xFD, 0xCE, 0xDE, 0xEE, 0xFE, 0xBF,
+    0xCF, 0xDF, 0xEF, 0xFF
+};
+
+static const uint8_t huff_a27_cb[7] = { 4, 8, 3, 14, 10, 20, 16 };
+
+static const uint8_t huff_a27_xlat[63] = {
+     0,  2,  3,  1,  5,  6,  7,  9, 54, 55, 56, 58, 59, 60, 61, 62,
+    63,  4,  8, 10, 11, 12, 14, 49, 52, 53, 57, 13, 15, 16, 17, 18,
+    19, 22, 23, 25, 26, 30, 39, 43, 44, 45, 46, 47, 48, 50, 51, 20,
+    21, 24, 27, 28, 29, 31, 33, 34, 35, 36, 37, 38, 40, 41, 42
+};
+
+static const uint8_t huff_a31_cb[8] = { 1, 6, 1, 0, 3, 1, 0, 4 };
+
+static const uint8_t huff_a31_xlat[9] = {
+    0x00, 0x04, 0x0C, 0x01, 0x03, 0x05, 0x0D, 0x07, 0x0F
+};
+
+static const uint8_t huff_a32_cb[13] = {
+    1, 11, 1, 0, 0, 2, 2, 6, 12, 18, 19, 15, 6
+};
+
+static const uint8_t huff_a32_xlat[81] = {
+    0x00, 0x40, 0x01, 0x10, 0x04, 0x80, 0x50, 0x20, 0x14, 0x05, 0x02, 0x90,
+    0x60, 0x44, 0x54, 0x24, 0x08, 0x18, 0x41, 0x11, 0x15, 0x09, 0x06, 0xA0,
+    0x84, 0x94, 0x64, 0xA4, 0x48, 0x58, 0x28, 0x51, 0x21, 0x45, 0x55, 0x25,
+    0x19, 0x12, 0x16, 0x0A, 0x1A, 0x68, 0xA8, 0x81, 0x91, 0x61, 0xA1, 0x85,
+    0x95, 0x65, 0xA5, 0x49, 0x59, 0x29, 0x69, 0x42, 0x52, 0x46, 0x56, 0x2A,
+    0x88, 0x98, 0x89, 0x99, 0xA9, 0x82, 0x92, 0x22, 0x62, 0x86, 0x26, 0x66,
+    0x4A, 0x5A, 0x6A, 0xA2, 0x96, 0xA6, 0x8A, 0x9A, 0xAA
+};
+
+static const uint8_t huff_a33_cb[12] = {
+    3, 12, 1, 1, 13, 1, 14, 28, 33, 81, 32, 52
+};
+
+static const uint8_t huff_a33_xlat[256] = {
+    0x00, 0x10, 0x40, 0x50, 0x04, 0x44, 0x14, 0x54, 0x01, 0x41, 0x11, 0x51,
+    0x05, 0x45, 0x15, 0x55, 0x90, 0x20, 0x94, 0x64, 0x18, 0x21, 0x95, 0x19,
+    0x69, 0x02, 0x52, 0x06, 0x46, 0x16, 0x80, 0x60, 0x84, 0xD4, 0x24, 0x08,
+    0x48, 0x58, 0x68, 0x81, 0x91, 0x61, 0x85, 0x25, 0x65, 0xA5, 0x09, 0x49,
+    0x59, 0x29, 0x42, 0x12, 0x56, 0x96, 0xA6, 0x0A, 0x17, 0x1B, 0xD0, 0xC4,
+    0x74, 0xF4, 0x88, 0xC8, 0x28, 0xA1, 0x71, 0xC5, 0xD5, 0x75, 0x99, 0xB9,
+    0x4D, 0x1D, 0x2D, 0x6D, 0x22, 0x62, 0x66, 0x4A, 0x1A, 0x9A, 0x6A, 0x8E,
+    0x5E, 0x43, 0x23, 0x07, 0x47, 0x57, 0x6B, 0xC0, 0xA0, 0xE0, 0x70, 0xB0,
+    0xA4, 0xE4, 0x34, 0xB4, 0x98, 0xD8, 0xA8, 0x38, 0x78, 0x0C, 0x4C, 0x1C,
+    0x5C, 0x9C, 0x6C, 0x7C, 0xC1, 0xD1, 0xE1, 0x31, 0xE5, 0x35, 0xB5, 0xF5,
+    0x89, 0xA9, 0x79, 0xF9, 0x0D, 0xCD, 0x9D, 0xDD, 0xAD, 0x3D, 0x7D, 0x82,
+    0xC2, 0x92, 0xD2, 0xE2, 0x72, 0xF2, 0x86, 0xD6, 0xE6, 0x76, 0xB6, 0x8A,
+    0x5A, 0xDA, 0xEA, 0xFA, 0x4E, 0x1E, 0x9E, 0xEE, 0x03, 0x13, 0x53, 0x97,
+    0xB7, 0x0B, 0x4B, 0x8B, 0x5B, 0x9B, 0xEB, 0x7B, 0x0F, 0x4F, 0x1F, 0x5F,
+    0x9F, 0x2F, 0x3F, 0xBF, 0xE8, 0xB8, 0xF8, 0x8C, 0x2C, 0x3C, 0xFC, 0xB1,
+    0xC9, 0xD9, 0xE9, 0x39, 0x5D, 0xED, 0xBD, 0xA2, 0x32, 0x26, 0x36, 0x2A,
+    0xAA, 0xBA, 0x0E, 0x2E, 0x6E, 0x83, 0xC3, 0x93, 0x63, 0xB3, 0xA7, 0x37,
+    0x30, 0xF0, 0xCC, 0xDC, 0xAC, 0xEC, 0xBC, 0xF1, 0x8D, 0xFD, 0xB2, 0xC6,
+    0xF6, 0xCA, 0x3A, 0x7A, 0xCE, 0xDE, 0xAE, 0x3E, 0x7E, 0xBE, 0xFE, 0xD3,
+    0xA3, 0xE3, 0x33, 0x73, 0xF3, 0x87, 0xC7, 0xD7, 0x27, 0x67, 0xE7, 0x77,
+    0xF7, 0xCB, 0xDB, 0x2B, 0xAB, 0x3B, 0xBB, 0xFB, 0x8F, 0xCF, 0xDF, 0x6F,
+    0xAF, 0xEF, 0x7F, 0xFF
+};
+
+static const uint8_t huff_a34_cb[7] = { 1, 5, 1, 1, 1, 1, 2 };
+
+static const uint8_t huff_a34_xlat[6] = { 1, 0, 2, 3, 4, 5 };
+
+static const uint8_t huff_a35_cb[11] = { 2, 10, 1, 0, 2, 3, 6, 19, 9, 75, 110 };
+
+static const uint8_t huff_a35_xlat[225] = {
+    0x00, 0xF0, 0x0F, 0x10, 0x01, 0xFF, 0x20, 0xE0, 0x11, 0xF1, 0x0E, 0x1F,
+    0x30, 0x40, 0xD0, 0x21, 0xE1, 0x02, 0x12, 0x22, 0xE2, 0xF2, 0x03, 0x13,
+    0x1E, 0x2E, 0x3E, 0xEE, 0xFE, 0x2F, 0xEF, 0xD2, 0x43, 0xF3, 0x04, 0x0D,
+    0x2D, 0x3D, 0x3F, 0xDF, 0x50, 0x60, 0x70, 0x90, 0xB0, 0x31, 0x41, 0x91,
+    0xA1, 0xC1, 0xD1, 0x42, 0xA2, 0xC2, 0x23, 0x33, 0xE3, 0x24, 0x34, 0xB4,
+    0xD4, 0xF4, 0x05, 0x15, 0x45, 0xE5, 0x16, 0x36, 0x56, 0xA6, 0xC6, 0xD6,
+    0xF6, 0x57, 0xC7, 0xF7, 0x09, 0x29, 0x49, 0x59, 0x69, 0xF9, 0x0A, 0x2A,
+    0x3A, 0x4A, 0xDA, 0xEA, 0xFA, 0x0B, 0x2B, 0xAB, 0xEB, 0xFB, 0x0C, 0x1C,
+    0x2C, 0x3C, 0x4C, 0x5C, 0xCC, 0xDC, 0xFC, 0x1D, 0x4D, 0x6D, 0xBD, 0xCD,
+    0xED, 0xFD, 0x4E, 0x6E, 0xCE, 0xDE, 0x7F, 0xA0, 0xC0, 0x51, 0x61, 0x71,
+    0xB1, 0x32, 0x52, 0x62, 0x72, 0x92, 0xB2, 0x53, 0x63, 0x73, 0x93, 0xA3,
+    0xB3, 0xC3, 0xD3, 0x14, 0x44, 0x54, 0x64, 0x74, 0x94, 0xA4, 0xC4, 0xE4,
+    0x25, 0x35, 0x55, 0x65, 0x75, 0x95, 0xA5, 0xB5, 0xC5, 0xD5, 0xF5, 0x06,
+    0x26, 0x46, 0x66, 0x76, 0x96, 0xB6, 0xE6, 0x07, 0x17, 0x27, 0x37, 0x47,
+    0x67, 0x77, 0x97, 0xA7, 0xB7, 0xD7, 0xE7, 0x19, 0x39, 0x79, 0x99, 0xA9,
+    0xB9, 0xC9, 0xD9, 0xE9, 0x1A, 0x5A, 0x6A, 0x7A, 0x9A, 0xAA, 0xBA, 0xCA,
+    0x1B, 0x3B, 0x4B, 0x5B, 0x6B, 0x7B, 0x9B, 0xBB, 0xCB, 0xDB, 0x6C, 0x7C,
+    0x9C, 0xAC, 0xBC, 0xEC, 0x5D, 0x7D, 0x9D, 0xAD, 0xDD, 0x5E, 0x7E, 0x9E,
+    0xAE, 0xBE, 0x4F, 0x5F, 0x6F, 0x9F, 0xAF, 0xBF, 0xCF
+};
+
+static const uint8_t huff_a36_cb[12] = {
+    3, 12, 1, 3, 5, 5, 13, 27, 69, 96, 35, 2
+};
+
+static const uint8_t huff_a36_xlat[256] = {
+    0x00, 0x10, 0x01, 0x11, 0x20, 0x21, 0x02, 0x12, 0x22, 0x31, 0x41, 0x32,
+    0x13, 0x23, 0x30, 0x40, 0x51, 0x42, 0x03, 0x33, 0x43, 0x04, 0x14, 0x24,
+    0x34, 0x15, 0x25, 0x50, 0x61, 0x71, 0xD1, 0x52, 0x62, 0x72, 0xD2, 0x53,
+    0x63, 0xD3, 0x44, 0x54, 0x64, 0x05, 0x35, 0x45, 0x55, 0x16, 0x26, 0x36,
+    0x46, 0x17, 0x27, 0x1D, 0x2D, 0x3D, 0x60, 0x70, 0xD0, 0x81, 0x91, 0xA1,
+    0xC1, 0xE1, 0xF1, 0x82, 0x92, 0xC2, 0xE2, 0xF2, 0x73, 0x83, 0xE3, 0xF3,
+    0x74, 0x84, 0xC4, 0xD4, 0xE4, 0xF4, 0x65, 0x75, 0x85, 0xD5, 0xE5, 0x06,
+    0x56, 0x66, 0xD6, 0xE6, 0x07, 0x37, 0x47, 0x57, 0x67, 0xD7, 0xE7, 0x18,
+    0x28, 0x38, 0x48, 0x58, 0xD8, 0x19, 0x29, 0x2A, 0x1C, 0x2C, 0x0D, 0x4D,
+    0x5D, 0x6D, 0x7D, 0x8D, 0x9D, 0x1E, 0x2E, 0x3E, 0x4E, 0x5E, 0x6E, 0x7E,
+    0x1F, 0x2F, 0x3F, 0x80, 0x90, 0xA0, 0xC0, 0xE0, 0xF0, 0xB1, 0xA2, 0xB2,
+    0x93, 0xA3, 0xB3, 0xC3, 0x94, 0xA4, 0xB4, 0x95, 0xA5, 0xB5, 0xC5, 0xF5,
+    0x76, 0x86, 0x96, 0xA6, 0xC6, 0xF6, 0x77, 0x87, 0x97, 0xA7, 0xC7, 0xF7,
+    0x08, 0x68, 0x78, 0x88, 0x98, 0xC8, 0xE8, 0xF8, 0x09, 0x39, 0x49, 0x59,
+    0x69, 0x79, 0x89, 0xD9, 0xE9, 0xF9, 0x0A, 0x1A, 0x3A, 0x4A, 0x5A, 0x6A,
+    0xDA, 0xEA, 0xFA, 0x1B, 0x2B, 0x3B, 0x4B, 0x5B, 0xDB, 0xEB, 0xFB, 0x0C,
+    0x3C, 0x4C, 0x5C, 0x6C, 0x7C, 0x8C, 0x9C, 0xDC, 0xEC, 0xAD, 0xBD, 0xCD,
+    0xDD, 0xED, 0x0E, 0x8E, 0x9E, 0xAE, 0xBE, 0x0F, 0x4F, 0x5F, 0x6F, 0x7F,
+    0x8F, 0x9F, 0xAF, 0xB0, 0xB6, 0xB7, 0xA8, 0xB8, 0x99, 0xA9, 0xB9, 0xC9,
+    0x7A, 0x8A, 0x9A, 0xAA, 0xBA, 0xCA, 0x0B, 0x6B, 0x7B, 0x8B, 0x9B, 0xCB,
+    0xAC, 0xBC, 0xCC, 0xFC, 0xFD, 0xCE, 0xDE, 0xEE, 0xFE, 0xBF, 0xCF, 0xDF,
+    0xEF, 0xFF, 0xAB, 0xBB
+};
+
+static const uint8_t huff_a37_cb[7] = { 4, 8, 7, 6, 8, 22, 20 };
+
+static const uint8_t huff_a37_xlat[63] = {
+     0,  1,  2,  3, 61, 62, 63,  4,  5,  6, 58, 59, 60,  7,  8,  9,
+    10, 54, 55, 56, 57, 11, 12, 13, 14, 15, 16, 25, 26, 27, 28, 29,
+    30, 35, 36, 37, 38, 48, 49, 50, 51, 52, 53, 17, 18, 19, 20, 21,
+    22, 23, 24, 31, 33, 34, 39, 40, 41, 42, 43, 44, 45, 46, 47
+};
+
+static const uint8_t huff_a41_cb[14] = {
+    1, 12, 1, 0, 0, 6, 2, 0, 0, 0, 19, 9, 24, 20
+};
+
+static const uint8_t huff_a41_xlat[81] = {
+    0x00, 0x40, 0xC0, 0x10, 0x30, 0x04, 0x0C, 0x01, 0x03, 0x50, 0xD0, 0x70,
+    0xF0, 0xC4, 0x34, 0x4C, 0xCC, 0x1C, 0x41, 0xC1, 0x31, 0x05, 0x0D, 0x43,
+    0xC3, 0x13, 0x07, 0x0F, 0x44, 0x14, 0x74, 0xDC, 0x3C, 0x11, 0x1D, 0x33,
+    0x37, 0x54, 0xD4, 0xF4, 0x5C, 0x7C, 0xFC, 0xD1, 0x71, 0xF1, 0xC5, 0x15,
+    0x35, 0x4D, 0xCD, 0xDD, 0x3D, 0xD3, 0x73, 0x47, 0xC7, 0x17, 0x77, 0x1F,
+    0x3F, 0x51, 0x45, 0x55, 0xD5, 0x75, 0xF5, 0x5D, 0x7D, 0xFD, 0x53, 0xF3,
+    0x57, 0xD7, 0xF7, 0x4F, 0xCF, 0x5F, 0xDF, 0x7F, 0xFF
+};
+
+static const uint8_t huff_a42_cb[10] = { 3, 10, 1, 2, 13, 1, 31, 13, 16, 4 };
+
+static const uint8_t huff_a42_xlat[81] = {
+    0x00, 0x40, 0x01, 0x10, 0x50, 0x04, 0x44, 0x14, 0x54, 0x41, 0x11, 0x51,
+    0x05, 0x45, 0x15, 0x55, 0x59, 0x80, 0x90, 0x20, 0x60, 0x84, 0x94, 0x24,
+    0x64, 0x08, 0x48, 0x18, 0x58, 0x81, 0x91, 0x21, 0x61, 0x85, 0x95, 0x25,
+    0x65, 0x09, 0x49, 0x19, 0x02, 0x42, 0x12, 0x52, 0x06, 0x46, 0x16, 0x56,
+    0xA0, 0xA4, 0x68, 0xA1, 0xA5, 0x99, 0x29, 0x69, 0x96, 0x66, 0x4A, 0x1A,
+    0x5A, 0x88, 0x98, 0x28, 0x89, 0xA9, 0x82, 0x92, 0x22, 0x62, 0x86, 0x26,
+    0xA6, 0x0A, 0x9A, 0x2A, 0x6A, 0xA8, 0xA2, 0x8A, 0xAA
+};
+
+static const uint8_t huff_a43_cb[5] = { 2, 4, 2, 3, 2 };
+
+static const uint8_t huff_a43_xlat[7] = { 0, 7, 1, 2, 6, 3, 5 };
+
+static const uint8_t huff_a44_cb[9] = { 4, 10, 5, 4, 12, 17, 47, 24, 12 };
+
+static const uint8_t huff_a44_xlat[121] = {
+    0x00, 0x10, 0xF0, 0x01, 0x0F, 0x11, 0xF1, 0x1F, 0xFF, 0x20, 0xE0, 0x21,
+    0xE1, 0x02, 0x12, 0xF2, 0x0E, 0x1E, 0xFE, 0x2F, 0xEF, 0x30, 0x50, 0xD0,
+    0xD1, 0x22, 0xE2, 0x03, 0x13, 0xF3, 0x0D, 0x1D, 0x2D, 0xFD, 0x2E, 0xEE,
+    0x3F, 0xDF, 0x40, 0xB0, 0xC0, 0x31, 0x41, 0x51, 0xB1, 0xC1, 0x32, 0xB2,
+    0xC2, 0xD2, 0x23, 0xB3, 0xD3, 0xE3, 0x04, 0x14, 0xE4, 0xF4, 0x05, 0x15,
+    0xD5, 0xE5, 0xF5, 0x0B, 0x1B, 0x2B, 0x3B, 0xEB, 0xFB, 0x0C, 0x1C, 0x2C,
+    0xFC, 0x3D, 0x5D, 0xED, 0x3E, 0x4E, 0x5E, 0xBE, 0xDE, 0x4F, 0x5F, 0xBF,
+    0xCF, 0x42, 0x52, 0x33, 0x53, 0xC3, 0x24, 0xB4, 0xD4, 0x25, 0x35, 0xC5,
+    0x4B, 0xCB, 0xDB, 0x3C, 0x4C, 0x5C, 0xDC, 0xEC, 0x4D, 0xBD, 0xCD, 0xDD,
+    0xCE, 0x43, 0x34, 0x44, 0x54, 0xC4, 0x45, 0x55, 0xB5, 0x5B, 0xBB, 0xBC,
+    0xCC
+};
+
+static const uint8_t huff_a45_cb[5] = { 2, 4, 2, 2, 4 };
+
+static const uint8_t huff_a45_xlat[8] = { 1, 2, 0, 3, 4, 5, 6, 7 };
+
+static const uint8_t huff_a46_cb[7] = { 5, 9, 1, 16, 31, 36, 172 };
+
+static const uint8_t huff_a46_xlat[256] = {
+    0x02, 0x00, 0x30, 0x21, 0x31, 0x41, 0x61, 0x12, 0x22, 0x42, 0x62, 0x43,
+    0x53, 0x24, 0x45, 0x26, 0x27, 0x10, 0x40, 0xB0, 0x01, 0x11, 0x81, 0x32,
+    0x52, 0x72, 0x92, 0x03, 0x13, 0x33, 0x63, 0x14, 0x34, 0x54, 0x64, 0x74,
+    0x05, 0x15, 0x25, 0x35, 0x55, 0x65, 0x06, 0x46, 0x56, 0x57, 0x67, 0x88,
+    0x20, 0x51, 0x91, 0xD1, 0xF2, 0x23, 0x83, 0x93, 0x04, 0x44, 0x84, 0x94,
+    0x75, 0x85, 0xC5, 0x36, 0x66, 0x96, 0xB6, 0x07, 0x37, 0x97, 0x08, 0x28,
+    0x38, 0x48, 0x68, 0x09, 0x69, 0x79, 0x0A, 0x2A, 0x1B, 0x9B, 0x2C, 0x4D,
+    0x50, 0x60, 0x70, 0x80, 0x90, 0xA0, 0xC0, 0xD0, 0xE0, 0xF0, 0x71, 0xA1,
+    0xB1, 0xC1, 0xE1, 0xF1, 0x82, 0xA2, 0xB2, 0xC2, 0xD2, 0xE2, 0x73, 0xA3,
+    0xB3, 0xC3, 0xD3, 0xE3, 0xF3, 0xA4, 0xB4, 0xC4, 0xD4, 0xE4, 0xF4, 0x95,
+    0xA5, 0xB5, 0xD5, 0xE5, 0xF5, 0x16, 0x76, 0x86, 0xA6, 0xC6, 0xD6, 0xE6,
+    0xF6, 0x17, 0x47, 0x77, 0x87, 0xA7, 0xB7, 0xC7, 0xD7, 0xE7, 0xF7, 0x18,
+    0x58, 0x78, 0x98, 0xA8, 0xB8, 0xC8, 0xD8, 0xE8, 0xF8, 0x19, 0x29, 0x39,
+    0x49, 0x59, 0x89, 0x99, 0xA9, 0xB9, 0xC9, 0xD9, 0xE9, 0xF9, 0x1A, 0x3A,
+    0x4A, 0x5A, 0x6A, 0x7A, 0x8A, 0x9A, 0xAA, 0xBA, 0xCA, 0xDA, 0xEA, 0xFA,
+    0x0B, 0x2B, 0x3B, 0x4B, 0x5B, 0x6B, 0x7B, 0x8B, 0xAB, 0xBB, 0xCB, 0xDB,
+    0xEB, 0xFB, 0x0C, 0x1C, 0x3C, 0x4C, 0x5C, 0x6C, 0x7C, 0x8C, 0x9C, 0xAC,
+    0xBC, 0xCC, 0xDC, 0xEC, 0xFC, 0x0D, 0x1D, 0x2D, 0x3D, 0x5D, 0x6D, 0x7D,
+    0x8D, 0x9D, 0xAD, 0xBD, 0xCD, 0xDD, 0xED, 0xFD, 0x0E, 0x1E, 0x2E, 0x3E,
+    0x4E, 0x5E, 0x6E, 0x7E, 0x8E, 0x9E, 0xAE, 0xBE, 0xCE, 0xDE, 0xEE, 0xFE,
+    0x0F, 0x1F, 0x2F, 0x3F, 0x4F, 0x5F, 0x6F, 0x7F, 0x8F, 0x9F, 0xAF, 0xBF,
+    0xCF, 0xDF, 0xEF, 0xFF
+};
+
+static const uint8_t huff_a47_cb[8] = { 4, 9, 5, 12, 9, 12, 15, 10 };
+
+static const uint8_t huff_a47_xlat[63] = {
+     0,  1,  2, 62, 63,  3,  4,  5,  6,  8, 54, 56, 57, 58, 59, 60,
+    61,  7,  9, 10, 11, 12, 13, 14, 53, 55, 15, 16, 17, 18, 19, 20,
+    21, 36, 37, 39, 42, 52, 22, 25, 28, 35, 38, 40, 41, 43, 45, 46,
+    47, 48, 49, 50, 51, 23, 24, 26, 27, 29, 30, 31, 33, 34, 44
+};
+
+static const uint8_t huff_a51_cb[12] = {
+    2, 11, 1, 0, 6, 2, 6, 18, 4, 26, 6, 12
+};
+
+static const uint8_t huff_a51_xlat[81] = {
+    0x00, 0x40, 0xC0, 0x30, 0x04, 0x01, 0x03, 0x10, 0x0C, 0xD0, 0x70, 0x34,
+    0x1C, 0x0D, 0x07, 0x50, 0xF0, 0x44, 0xC4, 0x14, 0x4C, 0xCC, 0x3C, 0x41,
+    0xC1, 0x11, 0x31, 0x05, 0x43, 0xC3, 0x13, 0x33, 0x0F, 0x74, 0xDC, 0x1D,
+    0x37, 0x54, 0xD4, 0xF4, 0x5C, 0x7C, 0xFC, 0xD1, 0x71, 0xF1, 0xC5, 0x15,
+    0x35, 0x4D, 0xCD, 0xDD, 0x3D, 0x53, 0xD3, 0x73, 0x47, 0xC7, 0x17, 0x77,
+    0x4F, 0x1F, 0x3F, 0x51, 0x45, 0x55, 0xF3, 0xCF, 0xFF, 0xD5, 0x75, 0xF5,
+    0x5D, 0x7D, 0xFD, 0x57, 0xD7, 0xF7, 0x5F, 0xDF, 0x7F
+};
+
+static const uint8_t huff_a52_cb[12] = { 1, 10, 1, 0, 2, 2, 0, 4, 3, 8, 3, 2 };
+
+static const uint8_t huff_a52_xlat[25] = {
+    0x00, 0x08, 0x38, 0x01, 0x07, 0x09, 0x39, 0x0F, 0x3F, 0x10, 0x02, 0x06,
+    0x30, 0x11, 0x31, 0x0A, 0x3A, 0x0E, 0x17, 0x37, 0x32, 0x16, 0x3E, 0x12,
+    0x36
+};
+
+static const uint8_t huff_a53_xlat[7] = { 0, 1, 2, 6, 7, 3, 5 };
+
+static const uint8_t huff_a54_cb[8] = { 4, 9, 4, 7, 12, 19, 21, 58 };
+
+static const uint8_t huff_a54_xlat[121] = {
+    0x00, 0x01, 0x0F, 0x1F, 0x10, 0xE0, 0xF0, 0x11, 0xF1, 0x2F, 0xFF, 0x20,
+    0x21, 0xE1, 0x02, 0x12, 0xF2, 0x03, 0xF3, 0x0E, 0x2E, 0xFE, 0x3F, 0x30,
+    0x40, 0xD0, 0xC1, 0xD1, 0x22, 0xC2, 0x33, 0xE3, 0x0C, 0xCC, 0x0D, 0x1D,
+    0x2D, 0xFD, 0x1E, 0x3E, 0x5E, 0xEF, 0xC0, 0x52, 0xB2, 0xD2, 0x43, 0xC3,
+    0xD3, 0x24, 0x45, 0xF5, 0x4B, 0x5B, 0xFB, 0x1C, 0x3D, 0xBD, 0xDD, 0xEE,
+    0xBF, 0xCF, 0xDF, 0x50, 0xB0, 0x31, 0x41, 0x51, 0xB1, 0x32, 0x42, 0xE2,
+    0x13, 0x23, 0x53, 0xB3, 0x04, 0x14, 0x34, 0x44, 0x54, 0xB4, 0xC4, 0xD4,
+    0xE4, 0xF4, 0x05, 0x15, 0x25, 0x35, 0x55, 0xB5, 0xC5, 0xD5, 0xE5, 0x0B,
+    0x1B, 0x2B, 0x3B, 0xBB, 0xCB, 0xDB, 0xEB, 0x2C, 0x3C, 0x4C, 0x5C, 0xBC,
+    0xDC, 0xEC, 0xFC, 0x4D, 0x5D, 0xCD, 0xED, 0x4E, 0xBE, 0xCE, 0xDE, 0x4F,
+    0x5F
+};
+
+static const uint8_t huff_a55_cb[8] = { 1, 6, 1, 1, 1, 0, 3, 2 };
+
+static const uint8_t huff_a55_xlat[8] = { 0, 1, 2, 3, 6, 7, 4, 5 };
+
+static const uint8_t huff_a56_cb[7] = { 3, 7, 1, 8, 6, 8, 8 };
+
+static const uint8_t huff_a56_xlat[31] = {
+    4,  0,  1,  2,  3, 28, 29, 30, 31,  5,  6,  7, 24, 25, 27, 8,
+    9, 14, 19, 21, 22, 23, 26, 10, 11, 12, 13, 15, 17, 18, 20
+};
+
+static const uint8_t huff_a57_cb[9] = { 3, 9, 1, 5, 7, 8, 16, 22, 4 };
+
+static const uint8_t huff_a57_xlat[63] = {
+     0,  1,  2, 61, 62, 63,  3,  4,  5,  6, 58, 59,
+    60,  7,  8,  9, 10, 54, 55, 56, 57, 11, 12, 13,
+    14, 15, 26, 27, 28, 36, 37, 38, 49, 50, 51, 52,
+    53, 16, 17, 18, 19, 20, 21, 23, 24, 25, 29, 30,
+    31, 33, 34, 35, 39, 43, 44, 45, 46, 47, 48, 22,
+    40, 41, 42
+};
+
+static const uint8_t huff_a61_cb[12] = {
+    2, 11, 1, 0, 8, 0, 1, 16, 10, 29, 12, 4
+};
+
+static const uint8_t huff_a61_xlat[81] = {
+    0x00, 0x40, 0xC0, 0x10, 0x30, 0x04, 0x0C, 0x01, 0x03, 0x70, 0x50, 0xD0,
+    0xF0, 0x44, 0xC4, 0x14, 0x34, 0x4C, 0x1C, 0x3C, 0x31, 0x05, 0x0D, 0x13,
+    0x07, 0x0F, 0x74, 0xCC, 0xDC, 0xFC, 0x41, 0xC1, 0x11, 0x43, 0xC3, 0x33,
+    0x54, 0xD4, 0xF4, 0x5C, 0x7C, 0x51, 0xD1, 0x71, 0xF1, 0x45, 0xC5, 0x15,
+    0x35, 0x4D, 0xCD, 0x1D, 0x3D, 0x53, 0xD3, 0x73, 0xF3, 0x47, 0xC7, 0x17,
+    0x37, 0x4F, 0xCF, 0x1F, 0x3F, 0x55, 0xD5, 0x75, 0xF5, 0x5D, 0xDD, 0xFD,
+    0x57, 0xD7, 0x77, 0xF7, 0xFF, 0x7D, 0x5F, 0xDF, 0x7F
+};
+
+static const uint8_t huff_a62_cb[8] = { 3, 8, 5, 2, 2, 9, 5, 2 };
+
+static const uint8_t huff_a62_xlat[25] = {
+    0x00, 0x08, 0x38, 0x01, 0x07, 0x39, 0x0F, 0x09, 0x3F, 0x10, 0x30, 0x31,
+    0x02, 0x3A, 0x06, 0x0E, 0x17, 0x37, 0x11, 0x0A, 0x32, 0x16, 0x3E, 0x12,
+    0x36
+};
+
+static const uint8_t huff_a63_cb[11] = {
+    3, 11, 1, 1, 10, 4, 16, 29, 46, 75, 74
+};
+
+static const uint8_t huff_a63_xlat[256] = {
+    0x00, 0x40, 0x10, 0x50, 0x04, 0x44, 0x14, 0x01, 0x41, 0x05, 0x45, 0x55,
+    0x54, 0x11, 0x51, 0x15, 0x80, 0x90, 0x60, 0x24, 0x64, 0xA4, 0x48, 0x61,
+    0x95, 0x25, 0xA5, 0x02, 0x42, 0x52, 0x16, 0x56, 0x20, 0x84, 0x94, 0x18,
+    0x58, 0x81, 0x91, 0x85, 0x65, 0x09, 0x49, 0x19, 0x59, 0x99, 0x29, 0x69,
+    0x79, 0x5D, 0x12, 0x62, 0x06, 0x46, 0x86, 0x66, 0x1A, 0x5A, 0x6A, 0x47,
+    0x17, 0xC0, 0xA0, 0xE0, 0xC4, 0xD4, 0x74, 0x08, 0x78, 0x0C, 0x4C, 0x1C,
+    0x5C, 0xD1, 0x21, 0xE1, 0x71, 0xC5, 0xE5, 0x75, 0xB5, 0x89, 0xBD, 0x92,
+    0x22, 0x96, 0xA6, 0x36, 0x0A, 0x4A, 0x8A, 0x9A, 0x2A, 0x7A, 0xDE, 0x6E,
+    0x43, 0x13, 0x53, 0x23, 0x07, 0x77, 0x4B, 0x1B, 0x9B, 0x6B, 0x2F, 0xD0,
+    0x30, 0x70, 0xE4, 0x34, 0xF4, 0xC8, 0x98, 0x28, 0x68, 0xA8, 0xE8, 0x38,
+    0xB8, 0xF8, 0x9C, 0x2C, 0x6C, 0x7C, 0xA1, 0xB1, 0xD5, 0x35, 0xC9, 0xD9,
+    0xA9, 0xE9, 0x39, 0xB9, 0xF9, 0xCD, 0x1D, 0x2D, 0xAD, 0x7D, 0xC2, 0xD2,
+    0xA2, 0xB2, 0xF2, 0xC6, 0x26, 0x76, 0xB6, 0xDA, 0xAA, 0xEA, 0x3A, 0xFA,
+    0x0E, 0x4E, 0x2E, 0x7E, 0xBE, 0xFE, 0x03, 0x83, 0x63, 0xA3, 0xB3, 0x87,
+    0x57, 0x97, 0xD7, 0x27, 0x0B, 0x8B, 0x5B, 0x2B, 0xAB, 0xCF, 0x1F, 0x9F,
+    0x7F, 0xBF, 0xB0, 0xF0, 0xB4, 0x88, 0xD8, 0x8C, 0xCC, 0xDC, 0xAC, 0xEC,
+    0x3C, 0xBC, 0xFC, 0xC1, 0x31, 0xF1, 0xF5, 0x0D, 0x4D, 0x8D, 0x9D, 0xDD,
+    0x6D, 0xED, 0x3D, 0xFD, 0x82, 0xE2, 0x32, 0x72, 0xD6, 0xE6, 0xF6, 0xCA,
+    0xBA, 0x8E, 0xCE, 0x1E, 0x5E, 0x9E, 0xAE, 0xEE, 0x3E, 0xC3, 0x93, 0xD3,
+    0xE3, 0x33, 0x73, 0xF3, 0xC7, 0x67, 0xA7, 0xE7, 0x37, 0xB7, 0xF7, 0xCB,
+    0xDB, 0xEB, 0x3B, 0x7B, 0xBB, 0xFB, 0x0F, 0x4F, 0x8F, 0x5F, 0xDF, 0x6F,
+    0xAF, 0xEF, 0x3F, 0xFF
+};
+
+static const uint8_t huff_a64_cb[8] = { 4, 9, 1, 7, 12, 36, 63, 2 };
+
+static const uint8_t huff_a64_xlat[121] = {
+    0x00, 0x10, 0x20, 0xE0, 0xF0, 0x02, 0x0E, 0xEF, 0x30, 0x01, 0x11, 0x21,
+    0x31, 0xF1, 0x12, 0xF2, 0x1E, 0xEE, 0xDF, 0xFF, 0x40, 0xC0, 0xD0, 0xD1,
+    0xE1, 0x22, 0x32, 0x42, 0xD2, 0xE2, 0x03, 0x13, 0x23, 0xB3, 0xC3, 0xE3,
+    0xF3, 0xE4, 0x05, 0xF5, 0x2B, 0x0C, 0xFC, 0x1D, 0x2D, 0xBD, 0xDD, 0xFD,
+    0x2E, 0x4E, 0xDE, 0xFE, 0x0F, 0x1F, 0x2F, 0x3F, 0x50, 0xB0, 0x41, 0x51,
+    0xB1, 0xC1, 0x52, 0xB2, 0xC2, 0x33, 0x43, 0x53, 0xD3, 0x04, 0x14, 0x24,
+    0x34, 0x44, 0x54, 0xB4, 0xC4, 0xD4, 0xF4, 0x15, 0x25, 0x35, 0x45, 0x55,
+    0xB5, 0xC5, 0xD5, 0xE5, 0x0B, 0x1B, 0x3B, 0x4B, 0x5B, 0xBB, 0xCB, 0xDB,
+    0xEB, 0xFB, 0x1C, 0x2C, 0x3C, 0x4C, 0x5C, 0xBC, 0xCC, 0xDC, 0xEC, 0x0D,
+    0x3D, 0x4D, 0x5D, 0xCD, 0xED, 0x3E, 0x5E, 0xBE, 0xCE, 0x4F, 0xCF, 0x5F,
+    0xBF
+};
+
+static const uint8_t huff_a65_cb[8] = { 2, 7, 3, 0, 1, 3, 4, 4 };
+
+static const uint8_t huff_a65_xlat[15] = {
+    0, 1, 15, 14, 2, 3, 13, 4, 6, 10, 12, 5, 7, 9, 11
+};
+
+static const uint8_t huff_a66_cb[11] = { 2, 10, 1, 2, 2, 6, 8, 6, 3, 1, 2 };
+
+static const uint8_t huff_a66_xlat[31] = {
+     0,  1, 31, 2, 30,  3,  4, 15, 17, 28, 29,  5,  6,  7,  8, 24,
+    25, 26, 27, 9, 10, 11, 21, 22, 23, 12, 19, 20, 13, 14, 18
+};
+
+static const uint8_t huff_a67_cb[10] = { 2, 9, 1, 1, 3, 4, 6, 13, 25, 10 };
+
+static const uint8_t huff_a67_xlat[63] = {
+     0,  1,  2, 62, 63,  3,  4, 60, 61,  5,  6,  7, 57, 58, 59,  8,
+     9, 10, 11, 12, 13, 26, 38, 52, 53, 54, 55, 56, 14, 15, 16, 17,
+    18, 19, 25, 27, 28, 29, 30, 31, 33, 34, 35, 36, 37, 39, 45, 46,
+    47, 48, 49, 50, 51, 20, 21, 22, 23, 24, 40, 41, 42, 43, 44
+};
+
+static const uint8_t huff_a71_cb[5] = { 1, 3, 1, 1, 2 };
+
+static const uint8_t huff_a72_cb[12] = {
+    2, 11, 1, 0, 4, 8, 3, 8, 24, 17, 12, 4
+};
+
+static const uint8_t huff_a72_xlat[81] = {
+    0x00, 0x40, 0x10, 0x04, 0x01, 0x50, 0x44, 0x14, 0x54, 0x41, 0x11, 0x05,
+    0x15, 0x51, 0x45, 0x55, 0x80, 0x90, 0x20, 0x64, 0x08, 0x19, 0x02, 0x06,
+    0x60, 0x84, 0x94, 0x24, 0x48, 0x18, 0x58, 0x81, 0x91, 0x21, 0x61, 0x85,
+    0x95, 0x25, 0x65, 0x09, 0x49, 0x59, 0x42, 0x12, 0x52, 0x46, 0x16, 0x56,
+    0xA0, 0xA4, 0x98, 0x28, 0x68, 0xA1, 0xA5, 0x99, 0x29, 0x69, 0x96, 0x26,
+    0x66, 0x0A, 0x4A, 0x1A, 0x5A, 0x88, 0xA8, 0x89, 0xA9, 0x82, 0x92, 0x22,
+    0x62, 0x86, 0xA6, 0x2A, 0x6A, 0xA2, 0x8A, 0x9A, 0xAA
+};
+
+static const uint8_t huff_a73_cb[11] = { 2, 10, 1, 1, 5, 2, 8, 7, 13, 8, 4 };
+
+static const uint8_t huff_a73_xlat[49] = {
+    0x00, 0x08, 0x38, 0x01, 0x39, 0x07, 0x0F, 0x09, 0x3F, 0x10, 0x30, 0x31,
+    0x02, 0x3A, 0x06, 0x0E, 0x17, 0x11, 0x0A, 0x32, 0x0D, 0x16, 0x3E, 0x37,
+    0x18, 0x28, 0x19, 0x29, 0x12, 0x2A, 0x03, 0x3B, 0x05, 0x15, 0x1E, 0x1F,
+    0x2F, 0x1A, 0x0B, 0x2B, 0x33, 0x35, 0x3D, 0x2E, 0x36, 0x13, 0x1B, 0x1D,
+    0x2D
+};
+
+static const uint8_t huff_a74_cb[14] = {
+    1, 12, 1, 0, 0, 4, 0, 4, 5, 9, 30, 45, 21, 2
+};
+
+static const uint8_t huff_a74_xlat[121] = {
+    0x00, 0x10, 0xF0, 0x01, 0x0F, 0x11, 0xF1, 0x1F, 0xFF, 0x20, 0xE0, 0x02,
+    0xF2, 0x0E, 0x21, 0xE1, 0x12, 0xE2, 0x1E, 0x2E, 0xFE, 0x2F, 0xEF, 0x30,
+    0x50, 0xB0, 0xC0, 0xD0, 0x31, 0xB1, 0xD1, 0x22, 0xD2, 0x03, 0x13, 0xE3,
+    0xF3, 0xF4, 0x05, 0xE5, 0xF5, 0x0B, 0x1B, 0x0C, 0x0D, 0x1D, 0x2D, 0xFD,
+    0x3E, 0xEE, 0x3F, 0x5F, 0xDF, 0x40, 0x41, 0x51, 0xC1, 0x32, 0x42, 0x52,
+    0xB2, 0xC2, 0x23, 0x33, 0xB3, 0xC3, 0xD3, 0x04, 0x14, 0x24, 0xD4, 0xE4,
+    0x15, 0x25, 0xC5, 0xD5, 0x2B, 0x3B, 0xEB, 0xFB, 0x1C, 0x2C, 0x3C, 0x5C,
+    0xEC, 0xFC, 0x3D, 0x5D, 0xDD, 0xED, 0x4E, 0x5E, 0xBE, 0xCE, 0xDE, 0x4F,
+    0xBF, 0xCF, 0x43, 0x53, 0x34, 0x54, 0xB4, 0xC4, 0x35, 0x45, 0x55, 0xB5,
+    0x4B, 0x5B, 0xCB, 0xDB, 0x4C, 0xBC, 0xCC, 0xDC, 0x4D, 0xBD, 0xCD, 0x44,
+    0xBB
+};
+
+static const uint8_t huff_a75_cb[7] = { 2, 6, 1, 3, 3, 4, 4 };
+
+static const uint8_t huff_a75_xlat[15] = {
+    0, 1, 14, 15, 2, 3, 13, 4, 6, 10, 12, 5, 7, 9, 11
+};
+
+static const uint8_t huff_a76_cb[12] = {
+    3, 12, 1, 3, 4, 8, 10, 36, 60, 78, 48, 8
+};
+
+static const uint8_t huff_a76_xlat[256] = {
+    0x00, 0x10, 0x01, 0x11, 0x20, 0x21, 0x02, 0x12, 0x30, 0x31, 0x41, 0x22,
+    0x03, 0x13, 0x23, 0x14, 0x40, 0x51, 0x61, 0x32, 0x42, 0x33, 0x04, 0x24,
+    0x15, 0x16, 0x50, 0x60, 0xD0, 0x71, 0x81, 0xD1, 0xE1, 0xF1, 0x52, 0x62,
+    0x72, 0xD2, 0x43, 0x53, 0x63, 0xD3, 0x34, 0x44, 0x54, 0x05, 0x25, 0x35,
+    0x45, 0x06, 0x26, 0x36, 0x17, 0x27, 0x18, 0x0D, 0x1D, 0x2D, 0x3D, 0x1E,
+    0x2E, 0x1F, 0x70, 0x80, 0xE0, 0xF0, 0x91, 0xA1, 0xC1, 0x82, 0x92, 0xC2,
+    0xE2, 0xF2, 0x73, 0x83, 0x93, 0xE3, 0xF3, 0x64, 0x74, 0x84, 0xD4, 0xE4,
+    0xF4, 0x55, 0x65, 0xD5, 0xE5, 0xF5, 0x46, 0x56, 0x66, 0xD6, 0x07, 0x37,
+    0x47, 0x57, 0x08, 0x28, 0x38, 0x48, 0x19, 0x29, 0x39, 0x1A, 0x2A, 0x1B,
+    0x1C, 0x2C, 0x3C, 0x4D, 0x5D, 0x6D, 0x0E, 0x3E, 0x4E, 0x5E, 0x0F, 0x2F,
+    0x3F, 0x4F, 0x90, 0xA0, 0xB0, 0xC0, 0xB1, 0xA2, 0xB2, 0xA3, 0xB3, 0xC3,
+    0x94, 0xA4, 0xB4, 0xC4, 0x75, 0x85, 0x95, 0xA5, 0xC5, 0x76, 0x86, 0x96,
+    0xE6, 0xF6, 0x67, 0x77, 0x87, 0xD7, 0xE7, 0xF7, 0x58, 0x68, 0x78, 0x88,
+    0xD8, 0xE8, 0xF8, 0x09, 0x49, 0x59, 0x69, 0xD9, 0xE9, 0xF9, 0x0A, 0x3A,
+    0x4A, 0x5A, 0xDA, 0xEA, 0x0B, 0x2B, 0x3B, 0x4B, 0xDB, 0x0C, 0x4C, 0x5C,
+    0x6C, 0xDC, 0x7D, 0x8D, 0x9D, 0xAD, 0xBD, 0xCD, 0x6E, 0x7E, 0x8E, 0x9E,
+    0xAE, 0xBE, 0x5F, 0x6F, 0x7F, 0x8F, 0x9F, 0xAF, 0xB5, 0xA6, 0xB6, 0xC6,
+    0x97, 0xA7, 0xC7, 0x98, 0xA8, 0xB8, 0xC8, 0x79, 0x89, 0x99, 0xA9, 0xB9,
+    0xC9, 0x6A, 0x7A, 0x8A, 0x9A, 0xAA, 0xCA, 0xFA, 0x5B, 0x6B, 0x7B, 0x8B,
+    0xCB, 0xEB, 0xFB, 0x7C, 0x8C, 0x9C, 0xAC, 0xBC, 0xEC, 0xFC, 0xDD, 0xED,
+    0xFD, 0xCE, 0xDE, 0xEE, 0xFE, 0xBF, 0xCF, 0xDF, 0xB7, 0xBA, 0x9B, 0xAB,
+    0xBB, 0xCC, 0xEF, 0xFF
+};
+
+static const uint8_t huff_b01_cb[14] = {
+    1, 12, 1, 0, 0, 2, 6, 0, 11, 13, 12, 24, 4, 8
+};
+
+static const uint8_t huff_b01_xlat[81] = {
+    0x00, 0x01, 0x03, 0x40, 0xC0, 0x10, 0x30, 0x04, 0x0C, 0x50, 0xD0, 0x70,
+    0xF0, 0x34, 0x1C, 0x05, 0x0D, 0x13, 0x07, 0x0F, 0x44, 0xC4, 0x14, 0x4C,
+    0xCC, 0x3C, 0x41, 0xC1, 0x11, 0x31, 0x43, 0xC3, 0x33, 0x54, 0x74, 0xDC,
+    0xFC, 0x71, 0x15, 0x4D, 0x1D, 0xD3, 0xC7, 0x37, 0x3F, 0xD4, 0xF4, 0x5C,
+    0x7C, 0x51, 0xD1, 0xF1, 0x45, 0xC5, 0x55, 0x35, 0xCD, 0xDD, 0x3D, 0x53,
+    0x73, 0xF3, 0x47, 0x17, 0x77, 0x4F, 0xCF, 0x1F, 0xFF, 0xF5, 0x7D, 0xD7,
+    0x5F, 0xD5, 0x75, 0x5D, 0xFD, 0x57, 0xF7, 0xDF, 0x7F
+};
+
+static const uint8_t huff_b02_cb[14] = {
+    1, 12, 1, 0, 0, 4, 0, 8, 4, 9, 19, 13, 13, 10
+};
+
+static const uint8_t huff_b02_xlat[81] = {
+    0x00, 0x40, 0x10, 0x04, 0x01, 0x50, 0x44, 0x14, 0x54, 0x41, 0x11, 0x05,
+    0x15, 0x80, 0x51, 0x45, 0x55, 0x90, 0x20, 0x60, 0x24, 0x08, 0x18, 0x09,
+    0x02, 0x06, 0x84, 0x94, 0x64, 0x48, 0x58, 0x81, 0x91, 0x21, 0x61, 0x95,
+    0x25, 0x65, 0x19, 0x59, 0x42, 0x12, 0x46, 0x16, 0x56, 0xA0, 0xA4, 0x28,
+    0x68, 0x85, 0xA5, 0x49, 0x29, 0x69, 0x52, 0x0A, 0x1A, 0x5A, 0x88, 0x98,
+    0xA1, 0x89, 0x99, 0xA9, 0x22, 0x62, 0x96, 0x26, 0x66, 0x4A, 0x6A, 0xA8,
+    0x82, 0x92, 0xA2, 0x86, 0xA6, 0x8A, 0x9A, 0x2A, 0xAA
+};
+
+static const uint8_t huff_b03_cb[11] = { 1, 9, 1, 0, 0, 4, 0, 5, 12, 13, 14 };
+
+static const uint8_t huff_b03_xlat[49] = {
+    0x00, 0x08, 0x38, 0x01, 0x07, 0x30, 0x09, 0x39, 0x0F, 0x3F, 0x10, 0x18,
+    0x28, 0x31, 0x02, 0x3A, 0x03, 0x05, 0x06, 0x0E, 0x17, 0x37, 0x11, 0x19,
+    0x29, 0x0A, 0x32, 0x0B, 0x3B, 0x0D, 0x15, 0x3D, 0x3E, 0x1F, 0x2F, 0x12,
+    0x1A, 0x2A, 0x13, 0x1B, 0x2B, 0x33, 0x1D, 0x2D, 0x35, 0x16, 0x1E, 0x2E,
+    0x36
+};
+
+static const uint8_t huff_b04_cb[12] = {
+    2, 11, 1, 0, 4, 4, 5, 9, 30, 45, 21, 2
+};
+
+static const uint8_t huff_b04_xlat[121] = {
+    0x00, 0x10, 0xF0, 0x01, 0x0F, 0x11, 0xF1, 0x1F, 0xFF, 0x20, 0xE0, 0x02,
+    0xF2, 0x0E, 0x21, 0xE1, 0x12, 0xE2, 0x1E, 0x2E, 0xFE, 0x2F, 0xEF, 0x30,
+    0x50, 0xB0, 0xC0, 0xD0, 0x31, 0xB1, 0xD1, 0x22, 0xD2, 0x03, 0x13, 0xE3,
+    0xF3, 0xF4, 0x05, 0xE5, 0xF5, 0x0B, 0x1B, 0x0C, 0x0D, 0x1D, 0x2D, 0xFD,
+    0x3E, 0xEE, 0x3F, 0x5F, 0xDF, 0x40, 0x41, 0x51, 0xC1, 0x32, 0x42, 0x52,
+    0xB2, 0xC2, 0x23, 0x33, 0xB3, 0xC3, 0xD3, 0x04, 0x14, 0x24, 0xD4, 0xE4,
+    0x15, 0x25, 0xC5, 0xD5, 0x2B, 0x3B, 0xEB, 0xFB, 0x1C, 0x2C, 0x3C, 0x5C,
+    0xEC, 0xFC, 0x3D, 0x5D, 0xDD, 0xED, 0x4E, 0x5E, 0xBE, 0xCE, 0xDE, 0x4F,
+    0xBF, 0xCF, 0x43, 0x53, 0x34, 0x54, 0xB4, 0xC4, 0x35, 0x45, 0x55, 0xB5,
+    0x4B, 0x5B, 0xCB, 0xDB, 0x4C, 0xBC, 0xCC, 0xDC, 0x4D, 0xBD, 0xCD, 0x44,
+    0xBB
+};
+
+static const uint8_t huff_b05_cb[11] = {
+    3, 11, 1, 4, 4, 4, 12, 30, 73, 75, 22
+};
+
+static const uint8_t huff_b05_xlat[225] = {
+    0x00, 0x10, 0xF0, 0x01, 0x0F, 0x11, 0xF1, 0x1F, 0xFF, 0x20, 0xE0, 0x02,
+    0x0E, 0x30, 0xD0, 0x21, 0xE1, 0x12, 0xF2, 0x03, 0x0D, 0x1E, 0xFE, 0x2F,
+    0xEF, 0x40, 0x60, 0x70, 0x90, 0xA0, 0xC0, 0x31, 0xD1, 0x22, 0x32, 0xD2,
+    0xE2, 0x13, 0x23, 0xE3, 0xF3, 0x04, 0x06, 0x07, 0x09, 0x0A, 0x0C, 0x1D,
+    0x2D, 0xFD, 0x2E, 0x3E, 0xEE, 0x3F, 0xDF, 0x50, 0xB0, 0x41, 0x51, 0x61,
+    0x71, 0x91, 0xA1, 0xB1, 0xC1, 0x42, 0x62, 0x72, 0x92, 0xA2, 0xC2, 0x33,
+    0x93, 0xA3, 0xD3, 0x14, 0x24, 0xE4, 0xF4, 0x05, 0x15, 0xF5, 0x16, 0x26,
+    0xD6, 0xE6, 0xF6, 0x17, 0x27, 0xD7, 0xE7, 0xF7, 0x19, 0x29, 0x39, 0xE9,
+    0xF9, 0x1A, 0x2A, 0xEA, 0xFA, 0x0B, 0x1B, 0xFB, 0x1C, 0x2C, 0xEC, 0xFC,
+    0x3D, 0x7D, 0x9D, 0xDD, 0xED, 0x4E, 0x6E, 0x7E, 0x9E, 0xAE, 0xCE, 0xDE,
+    0x4F, 0x5F, 0x6F, 0x7F, 0x9F, 0xAF, 0xBF, 0xCF, 0x52, 0xB2, 0x43, 0x53,
+    0x63, 0x73, 0xB3, 0xC3, 0x34, 0x44, 0x64, 0x74, 0x94, 0xA4, 0xB4, 0xC4,
+    0xD4, 0x25, 0x35, 0x65, 0x75, 0x95, 0xA5, 0xD5, 0xE5, 0x36, 0x46, 0x56,
+    0x66, 0xA6, 0xB6, 0xC6, 0x37, 0x47, 0x57, 0xB7, 0xC7, 0x49, 0x59, 0x69,
+    0xB9, 0xC9, 0xD9, 0x3A, 0x4A, 0x5A, 0x6A, 0xAA, 0xBA, 0xCA, 0xDA, 0x2B,
+    0x3B, 0x6B, 0x7B, 0x9B, 0xAB, 0xDB, 0xEB, 0x3C, 0x4C, 0x6C, 0x7C, 0x9C,
+    0xAC, 0xCC, 0xDC, 0x4D, 0x5D, 0x6D, 0xAD, 0xBD, 0xCD, 0x5E, 0xBE, 0x54,
+    0x45, 0x55, 0xB5, 0xC5, 0x76, 0x96, 0x67, 0x77, 0x97, 0xA7, 0x79, 0x99,
+    0xA9, 0x7A, 0x9A, 0x4B, 0x5B, 0xBB, 0xCB, 0x5C, 0xBC
+};
+
+static const uint8_t huff_b07_cb[9] = { 3, 9, 3, 2, 4, 8, 23, 13, 10 };
+
+static const uint8_t huff_b07_xlat[63] = {
+     0,  1, 63,  2, 62,  3,  4, 60, 61,  5,  6,  7,  8, 56, 57, 58,
+    59,  9, 10, 11, 12, 25, 26, 27, 28, 29, 30, 31, 33, 34, 35, 36,
+    37, 38, 39, 51, 52, 53, 54, 55, 13, 14, 15, 16, 17, 18, 19, 45,
+    46, 47, 48, 49, 50, 20, 21, 22, 23, 24, 40, 41, 42, 43, 44
+};
+
+static const uint8_t huff_b12_cb[10] = { 3, 10, 1, 3, 12, 0, 30, 9, 18, 8 };
+
+static const uint8_t huff_b12_xlat[81] = {
+    0x00, 0x40, 0x04, 0x01, 0x10, 0x50, 0x44, 0x14, 0x54, 0x41, 0x11, 0x51,
+    0x05, 0x45, 0x15, 0x55, 0x80, 0x90, 0x20, 0x60, 0x84, 0x94, 0x24, 0x64,
+    0x08, 0x48, 0x18, 0x81, 0x91, 0x61, 0x85, 0x95, 0x25, 0x65, 0x09, 0x49,
+    0x19, 0x59, 0x02, 0x42, 0x12, 0x52, 0x06, 0x46, 0x16, 0x56, 0xA4, 0x58,
+    0x68, 0x21, 0xA5, 0x29, 0x69, 0x1A, 0x5A, 0xA0, 0x88, 0x98, 0x28, 0xA1,
+    0x89, 0x99, 0xA9, 0x92, 0x22, 0x62, 0x86, 0x96, 0x26, 0x66, 0x0A, 0x4A,
+    0x6A, 0xA8, 0x82, 0xA2, 0xA6, 0x8A, 0x9A, 0x2A, 0xAA
+};
+
+static const uint8_t huff_b14_cb[14] = {
+    1, 12, 1, 0, 0, 4, 0, 3, 5, 16, 28, 34, 26, 4
+};
+
+static const uint8_t huff_b14_xlat[121] = {
+    0x00, 0x10, 0xF0, 0x01, 0x0F, 0xF1, 0x1F, 0xFF, 0x20, 0xE0, 0x11, 0x02,
+    0x0E, 0x30, 0x50, 0xB0, 0xD0, 0x21, 0xE1, 0x12, 0xF2, 0x03, 0x05, 0x0B,
+    0x0D, 0x1E, 0xFE, 0x2F, 0xEF, 0x40, 0xC0, 0x31, 0x51, 0xB1, 0xC1, 0xD1,
+    0x22, 0x52, 0xE2, 0x13, 0xF3, 0x04, 0x15, 0xF5, 0x1B, 0xEB, 0xFB, 0x0C,
+    0x1D, 0xFD, 0x2E, 0x5E, 0xEE, 0x3F, 0x5F, 0xBF, 0xDF, 0x41, 0x32, 0x42,
+    0xB2, 0xD2, 0x23, 0x53, 0xB3, 0xE3, 0x14, 0x24, 0xE4, 0xF4, 0x25, 0x35,
+    0xD5, 0xE5, 0x2B, 0x3B, 0xDB, 0x1C, 0x2C, 0xBC, 0xEC, 0xFC, 0x2D, 0xBD,
+    0xED, 0x3E, 0x4E, 0xBE, 0xDE, 0x4F, 0xCF, 0xC2, 0x33, 0x43, 0xC3, 0xD3,
+    0x34, 0x44, 0x54, 0xB4, 0xD4, 0x45, 0x55, 0xC5, 0x4B, 0xCB, 0x3C, 0x4C,
+    0x5C, 0xCC, 0xDC, 0x3D, 0x4D, 0x5D, 0xCD, 0xDD, 0xCE, 0xC4, 0xB5, 0x5B,
+    0xBB
+};
+
+static const uint8_t huff_b16_cb[11] = {
+    4, 12, 4, 4, 9, 13, 37, 76, 72, 39, 2
+};
+
+static const uint8_t huff_b16_xlat[256] = {
+    0x00, 0x10, 0x01, 0x11, 0x20, 0x21, 0x02, 0x12, 0x30, 0x31, 0x41, 0x22,
+    0x32, 0x03, 0x13, 0x23, 0x14, 0x40, 0x51, 0x61, 0x42, 0x52, 0x33, 0x43,
+    0x04, 0x24, 0x34, 0x15, 0x25, 0x16, 0x50, 0x60, 0x70, 0x71, 0x81, 0xD1,
+    0xE1, 0x62, 0x72, 0x82, 0xD2, 0x53, 0x63, 0x73, 0xD3, 0x44, 0x54, 0x05,
+    0x35, 0x45, 0x55, 0x06, 0x26, 0x36, 0x07, 0x17, 0x27, 0x37, 0x18, 0x28,
+    0x19, 0x1D, 0x2D, 0x3D, 0x1E, 0x2E, 0x1F, 0x80, 0x90, 0xD0, 0xE0, 0xF0,
+    0x91, 0xA1, 0xB1, 0xC1, 0xF1, 0x92, 0xA2, 0xB2, 0xC2, 0xE2, 0xF2, 0x83,
+    0x93, 0xA3, 0xC3, 0xE3, 0xF3, 0x64, 0x74, 0x84, 0x94, 0xD4, 0xE4, 0xF4,
+    0x65, 0x75, 0x85, 0xD5, 0xE5, 0x46, 0x56, 0x66, 0x76, 0xD6, 0xE6, 0x47,
+    0x57, 0x67, 0xD7, 0x08, 0x38, 0x48, 0x58, 0x09, 0x29, 0x39, 0x49, 0x0A,
+    0x1A, 0x2A, 0x3A, 0x1B, 0x2B, 0x0C, 0x1C, 0x2C, 0x3C, 0x0D, 0x4D, 0x5D,
+    0x6D, 0x7D, 0x0E, 0x3E, 0x4E, 0x5E, 0x6E, 0x0F, 0x2F, 0x3F, 0x4F, 0xA0,
+    0xB0, 0xC0, 0xB3, 0xA4, 0xB4, 0xC4, 0x95, 0xA5, 0xB5, 0xC5, 0xF5, 0x86,
+    0x96, 0xA6, 0xB6, 0xC6, 0xF6, 0x77, 0x87, 0x97, 0xA7, 0xC7, 0xE7, 0xF7,
+    0x68, 0x78, 0x88, 0x98, 0xD8, 0xE8, 0xF8, 0x59, 0x69, 0x79, 0x89, 0xD9,
+    0xE9, 0xF9, 0x4A, 0x5A, 0x6A, 0x7A, 0xDA, 0xEA, 0x0B, 0x3B, 0x4B, 0x5B,
+    0xDB, 0xEB, 0x4C, 0x5C, 0x6C, 0x7C, 0x8C, 0xDC, 0x8D, 0x9D, 0xAD, 0xBD,
+    0xCD, 0x7E, 0x8E, 0x9E, 0xAE, 0xBE, 0x5F, 0x6F, 0x7F, 0x8F, 0x9F, 0xB7,
+    0xA8, 0xB8, 0xC8, 0x99, 0xA9, 0xB9, 0xC9, 0x8A, 0x9A, 0xAA, 0xBA, 0xCA,
+    0xFA, 0x6B, 0x7B, 0x8B, 0x9B, 0xAB, 0xBB, 0xCB, 0xFB, 0x9C, 0xAC, 0xBC,
+    0xCC, 0xEC, 0xFC, 0xDD, 0xED, 0xFD, 0xCE, 0xDE, 0xEE, 0xFE, 0xAF, 0xBF,
+    0xCF, 0xDF, 0xEF, 0xFF
+};
+
+static const uint8_t huff_b26_cb[12] = {
+    3, 12, 2, 2, 4, 5, 11, 26, 67, 78, 51, 10
+};
+
+static const uint8_t huff_b26_xlat[256] = {
+    0x00, 0x01, 0x10, 0x11, 0x20, 0x21, 0x02, 0x12, 0x30, 0x31, 0x22, 0x03,
+    0x13, 0x40, 0x41, 0x51, 0x32, 0x42, 0x23, 0x33, 0x04, 0x14, 0x24, 0x15,
+    0x50, 0x61, 0x71, 0xD1, 0xE1, 0x52, 0x62, 0xD2, 0x43, 0x53, 0xD3, 0x34,
+    0x44, 0x05, 0x25, 0x35, 0x06, 0x16, 0x26, 0x17, 0x18, 0x1D, 0x2D, 0x3D,
+    0x1E, 0x2E, 0x60, 0x70, 0x80, 0xD0, 0xE0, 0xF0, 0x81, 0x91, 0xA1, 0xC1,
+    0xF1, 0x72, 0x82, 0x92, 0xC2, 0xE2, 0xF2, 0x63, 0x73, 0xE3, 0xF3, 0x54,
+    0x64, 0x74, 0xD4, 0xE4, 0xF4, 0x45, 0x55, 0x65, 0xD5, 0xE5, 0xF5, 0x36,
+    0x46, 0x56, 0xD6, 0xE6, 0x07, 0x27, 0x37, 0x47, 0xD7, 0x08, 0x28, 0x38,
+    0x19, 0x29, 0x1A, 0x1B, 0x1C, 0x2C, 0x0D, 0x4D, 0x5D, 0x6D, 0x7D, 0x0E,
+    0x3E, 0x4E, 0x5E, 0x6E, 0x0F, 0x1F, 0x2F, 0x3F, 0x4F, 0x90, 0xA0, 0xC0,
+    0xB1, 0xA2, 0xB2, 0x83, 0x93, 0xA3, 0xB3, 0xC3, 0x84, 0x94, 0xA4, 0xC4,
+    0x75, 0x85, 0x95, 0xC5, 0x66, 0x76, 0x86, 0x96, 0xC6, 0xF6, 0x57, 0x67,
+    0x77, 0xE7, 0xF7, 0x48, 0x58, 0x68, 0x78, 0xD8, 0xE8, 0xF8, 0x09, 0x39,
+    0x49, 0x59, 0xD9, 0xE9, 0xF9, 0x0A, 0x2A, 0x3A, 0x4A, 0xDA, 0xEA, 0x0B,
+    0x2B, 0x3B, 0xDB, 0xEB, 0x0C, 0x3C, 0x4C, 0x5C, 0x6C, 0xDC, 0x8D, 0x9D,
+    0xAD, 0xBD, 0xCD, 0x7E, 0x8E, 0x9E, 0xAE, 0xBE, 0xCE, 0x5F, 0x6F, 0x7F,
+    0x8F, 0x9F, 0xAF, 0xB0, 0xB4, 0xA5, 0xB5, 0xA6, 0xB6, 0x87, 0x97, 0xA7,
+    0xB7, 0xC7, 0x88, 0x98, 0xA8, 0xC8, 0x69, 0x79, 0x89, 0x99, 0xA9, 0xC9,
+    0x5A, 0x6A, 0x7A, 0x9A, 0xCA, 0xFA, 0x4B, 0x5B, 0x6B, 0x7B, 0xCB, 0xFB,
+    0x7C, 0x8C, 0x9C, 0xAC, 0xBC, 0xCC, 0xEC, 0xFC, 0xDD, 0xED, 0xFD, 0xDE,
+    0xEE, 0xFE, 0xBF, 0xCF, 0xDF, 0xEF, 0xB8, 0xB9, 0x8A, 0xAA, 0xBA, 0x8B,
+    0x9B, 0xAB, 0xBB, 0xFF
+};
+
+static const uint8_t huff_b32_cb[12] = {
+    2, 11, 1, 0, 4, 6, 7, 10, 22, 11, 16, 4
+};
+
+static const uint8_t huff_b32_xlat[81] = {
+    0x00, 0x40, 0x10, 0x04, 0x01, 0x50, 0x44, 0x14, 0x41, 0x11, 0x05, 0x80,
+    0x54, 0x51, 0x45, 0x15, 0x55, 0x02, 0x90, 0x20, 0x60, 0x84, 0x24, 0x08,
+    0x18, 0x09, 0x12, 0x06, 0xA0, 0x94, 0x64, 0x48, 0x58, 0x81, 0x91, 0x21,
+    0x61, 0x85, 0x95, 0x25, 0x65, 0x49, 0x19, 0x59, 0x42, 0x52, 0x46, 0x16,
+    0x56, 0x0A, 0xA4, 0x28, 0x68, 0xA1, 0xA5, 0x29, 0x69, 0x26, 0x4A, 0x1A,
+    0x5A, 0x88, 0x98, 0xA8, 0x89, 0x99, 0xA9, 0x82, 0x92, 0x22, 0x62, 0x86,
+    0x96, 0x66, 0x9A, 0x2A, 0x6A, 0xA2, 0xA6, 0x8A, 0xAA
+};
+
+static const uint8_t huff_b33_cb[13] = {
+    2, 12, 1, 0, 0, 4, 11, 8, 28, 92, 97, 13, 2
+};
+
+static const uint8_t huff_b33_xlat[256] = {
+    0x00, 0x40, 0x10, 0x04, 0x01, 0x50, 0x44, 0x14, 0x54, 0x41, 0x11, 0x51,
+    0x05, 0x45, 0x15, 0x55, 0x20, 0x95, 0x65, 0x49, 0x59, 0x52, 0x46, 0x16,
+    0x80, 0x90, 0x60, 0x84, 0x94, 0x24, 0x64, 0xA4, 0x08, 0x48, 0x18, 0x58,
+    0x81, 0x91, 0x21, 0x61, 0x85, 0x25, 0x09, 0x19, 0x69, 0x02, 0x42, 0x12,
+    0x06, 0x56, 0x5A, 0x57, 0xD0, 0x74, 0x68, 0x5C, 0xC1, 0xD5, 0xA5, 0xE5,
+    0x75, 0xB5, 0xF5, 0x99, 0xD9, 0xA9, 0xE9, 0x79, 0xB9, 0xF9, 0x1D, 0x5D,
+    0x9D, 0xDD, 0x6D, 0xAD, 0xED, 0x7D, 0xBD, 0xFD, 0x82, 0x92, 0xD2, 0x62,
+    0x96, 0xD6, 0x26, 0x66, 0xA6, 0xE6, 0x76, 0xB6, 0xF6, 0x0A, 0x4A, 0x1A,
+    0x9A, 0xDA, 0x2A, 0x6A, 0xAA, 0xEA, 0x7A, 0xBA, 0xFA, 0x5E, 0x9E, 0xDE,
+    0x6E, 0xAE, 0xEE, 0x7E, 0xBE, 0xFE, 0x03, 0x13, 0x53, 0x17, 0x97, 0xD7,
+    0x67, 0xA7, 0xE7, 0x77, 0xB7, 0xF7, 0x5B, 0x9B, 0xDB, 0x6B, 0xAB, 0xEB,
+    0x7B, 0xBB, 0xFB, 0x5F, 0x9F, 0xDF, 0x6F, 0xAF, 0xEF, 0x7F, 0xBF, 0xFF,
+    0xC0, 0xA0, 0xE0, 0x30, 0xC4, 0xD4, 0xE4, 0x34, 0xB4, 0xF4, 0x88, 0xC8,
+    0x98, 0xD8, 0x28, 0xA8, 0xE8, 0x38, 0x78, 0xB8, 0xF8, 0x0C, 0x4C, 0x1C,
+    0x9C, 0xDC, 0x6C, 0xAC, 0xEC, 0x7C, 0xBC, 0xFC, 0xD1, 0xA1, 0xE1, 0x31,
+    0x71, 0xB1, 0xF1, 0xC5, 0x35, 0x89, 0xC9, 0x29, 0x39, 0x0D, 0x4D, 0x8D,
+    0xCD, 0x2D, 0x3D, 0x22, 0xA2, 0xE2, 0x72, 0xB2, 0xF2, 0x86, 0xC6, 0x36,
+    0x8A, 0xCA, 0x3A, 0x0E, 0x4E, 0x8E, 0xCE, 0x1E, 0x2E, 0x3E, 0x43, 0x83,
+    0x93, 0xD3, 0x23, 0x63, 0xA3, 0xE3, 0x73, 0xB3, 0xF3, 0x07, 0x47, 0x87,
+    0xC7, 0x27, 0x37, 0x4B, 0x8B, 0xCB, 0x1B, 0x2B, 0x3B, 0x4F, 0x8F, 0xCF,
+    0x1F, 0x70, 0xB0, 0xF0, 0x8C, 0xCC, 0x2C, 0x3C, 0xC2, 0x32, 0xC3, 0x0F,
+    0x2F, 0x3F, 0x33, 0x0B
+};
+
+static const uint8_t huff_b35_cb[14] = {
+    1, 12, 1, 0, 0, 0, 4, 6, 6, 14, 42, 63, 59, 30
+};
+
+static const uint8_t huff_b35_xlat[225] = {
+    0x00, 0x10, 0xF0, 0x01, 0x0F, 0x11, 0xF1, 0x02, 0x0E, 0x1F, 0xFF, 0x20,
+    0xE0, 0x21, 0xF2, 0xFE, 0xEF, 0x30, 0xD0, 0xE1, 0x12, 0x22, 0xE2, 0x03,
+    0x0D, 0x1D, 0x1E, 0x2E, 0xEE, 0x2F, 0xDF, 0x40, 0x60, 0x70, 0x90, 0xA0,
+    0xB0, 0xC0, 0x31, 0x71, 0x91, 0xC1, 0xD1, 0x32, 0xD2, 0x13, 0xE3, 0xF3,
+    0x04, 0x05, 0x06, 0x07, 0x17, 0xF7, 0x09, 0x19, 0x0A, 0x1A, 0xFA, 0x0C,
+    0x1C, 0x2D, 0xED, 0xFD, 0x3E, 0x7E, 0xDE, 0x3F, 0x6F, 0x7F, 0x9F, 0xAF,
+    0xCF, 0x50, 0x41, 0x51, 0x61, 0xA1, 0xB1, 0x62, 0x72, 0x92, 0xA2, 0xC2,
+    0x23, 0x33, 0x63, 0x73, 0x93, 0xA3, 0xD3, 0x14, 0x24, 0x34, 0xD4, 0xE4,
+    0xF4, 0x15, 0xF5, 0x16, 0x26, 0xD6, 0xE6, 0xF6, 0x27, 0x37, 0x47, 0xE7,
+    0x29, 0x39, 0xC9, 0xD9, 0xE9, 0xF9, 0x2A, 0xEA, 0x0B, 0x1B, 0xFB, 0x2C,
+    0x7C, 0xEC, 0xFC, 0x3D, 0x4D, 0x6D, 0x7D, 0xDD, 0x4E, 0x5E, 0x6E, 0x9E,
+    0xAE, 0xCE, 0x4F, 0x5F, 0x42, 0x52, 0xB2, 0x43, 0xB3, 0xC3, 0x44, 0x64,
+    0x74, 0x94, 0xA4, 0x25, 0x35, 0x65, 0x75, 0x95, 0xA5, 0xE5, 0x36, 0x46,
+    0x66, 0x76, 0x96, 0xA6, 0xB6, 0xC6, 0x57, 0xA7, 0xB7, 0xC7, 0xD7, 0x59,
+    0xA9, 0xB9, 0x3A, 0x4A, 0x6A, 0xCA, 0xDA, 0x2B, 0x3B, 0x6B, 0x9B, 0xAB,
+    0xDB, 0xEB, 0x3C, 0x6C, 0x9C, 0xAC, 0xCC, 0xDC, 0x5D, 0x9D, 0xAD, 0xBD,
+    0xCD, 0xBE, 0xBF, 0x53, 0x54, 0xB4, 0xC4, 0x45, 0x55, 0xB5, 0xC5, 0xD5,
+    0x56, 0x67, 0x77, 0x97, 0x49, 0x69, 0x79, 0x99, 0x5A, 0x7A, 0x9A, 0xAA,
+    0xBA, 0x4B, 0x5B, 0x7B, 0xBB, 0xCB, 0x4C, 0x5C, 0xBC
+};
+
+static const uint8_t huff_b37_cb[13] = {
+    1, 11, 1, 0, 2, 0, 2, 2, 6, 17, 14, 13, 6
+};
+
+static const uint8_t huff_b37_xlat[63] = {
+     0,  1, 63,  2, 62,  3, 61,  4,  5,  6, 58, 59, 60,  7,  8,  9,
+    10, 25, 26, 27, 28, 29, 34, 35, 37, 38, 39, 55, 56, 57, 11, 13,
+    14, 15, 30, 31, 33, 36, 49, 50, 51, 52, 53, 54, 12, 16, 17, 18,
+    19, 21, 41, 43, 44, 45, 46, 47, 48, 20, 22, 23, 24, 40, 42
+};
+
+static const uint8_t huff_b41_cb[14] = {
+    1, 12, 1, 0, 0, 1, 7, 0, 20, 4, 10, 24, 2, 12
+};
+
+static const uint8_t huff_b41_xlat[81] = {
+    0x00, 0x01, 0x40, 0xC0, 0x10, 0x30, 0x04, 0x0C, 0x03, 0x50, 0xD0, 0x70,
+    0xF0, 0xC4, 0x14, 0x34, 0x4C, 0x1C, 0x3C, 0xC1, 0x11, 0x31, 0x05, 0x0D,
+    0xC3, 0x13, 0x33, 0x07, 0x0F, 0x44, 0xCC, 0x41, 0x43, 0x54, 0x74, 0xDC,
+    0xFC, 0x71, 0x15, 0x4D, 0x1D, 0x37, 0x3F, 0xD4, 0xF4, 0x5C, 0x7C, 0x51,
+    0xD1, 0xF1, 0x45, 0xC5, 0x35, 0xCD, 0xDD, 0x3D, 0x53, 0xD3, 0x73, 0xF3,
+    0x47, 0xC7, 0x17, 0x77, 0x4F, 0xCF, 0x1F, 0x55, 0xFF, 0xD5, 0x75, 0xF5,
+    0x5D, 0x7D, 0xFD, 0x57, 0xD7, 0xF7, 0x5F, 0xDF, 0x7F
+};
+
+static const uint8_t huff_b42_cb[11] = { 1, 9, 1, 0, 1, 3, 2, 3, 7, 4, 4 };
+
+static const uint8_t huff_b42_xlat[25] = {
+    0x00, 0x07, 0x08, 0x38, 0x01, 0x39, 0x0F, 0x10, 0x09, 0x3F, 0x30, 0x31,
+    0x02, 0x3A, 0x06, 0x0E, 0x17, 0x11, 0x0A, 0x3E, 0x37, 0x12, 0x32, 0x16,
+    0x36
+};
+
+static const uint8_t huff_b43_cb[10] = { 2, 9, 1, 1, 3, 4, 9, 15, 12, 4 };
+
+static const uint8_t huff_b43_xlat[49] = {
+    0x00, 0x07, 0x08, 0x38, 0x01, 0x09, 0x39, 0x0F, 0x3F, 0x10, 0x30, 0x31,
+    0x02, 0x3A, 0x06, 0x0E, 0x17, 0x37, 0x18, 0x28, 0x11, 0x19, 0x29, 0x0A,
+    0x03, 0x0B, 0x3B, 0x05, 0x0D, 0x3D, 0x3E, 0x1F, 0x2F, 0x12, 0x1A, 0x2A,
+    0x32, 0x13, 0x33, 0x15, 0x35, 0x16, 0x1E, 0x2E, 0x36, 0x1B, 0x2B, 0x1D,
+    0x2D
+};
+
+static const uint8_t huff_b47_cb[10] = { 2, 9, 1, 1, 3, 4, 6, 14, 22, 12 };
+
+static const uint8_t huff_b47_xlat[63] = {
+     0,  1,  2, 62, 63,  3,  4, 60, 61,  5,  6,  7, 57, 58, 59,  8,
+     9, 10, 11, 12, 26, 27, 37, 38, 52, 53, 54, 55, 56, 13, 14, 15,
+    16, 17, 18, 25, 28, 29, 30, 31, 33, 34, 35, 36, 39, 46, 47, 48,
+    49, 50, 51, 19, 20, 21, 22, 23, 24, 40, 41, 42, 43, 44, 45
+};
+
+static const uint8_t huff_b52_cb[11] = { 1, 9, 1, 0, 1, 3, 2, 3, 7, 4, 4 };
+
+static const uint8_t huff_b52_xlat[25] = {
+    0x00, 0x01, 0x08, 0x38, 0x07, 0x39, 0x0F, 0x30, 0x09, 0x3F, 0x10, 0x31,
+    0x02, 0x3A, 0x06, 0x0E, 0x17, 0x11, 0x0A, 0x3E, 0x37, 0x12, 0x32, 0x16,
+    0x36
+};
+
+static const uint8_t huff_b53_cb[7] = { 1, 5, 1, 1, 1, 0, 4 }; // same as b63!!!
+
+static const uint8_t huff_b53_xlat[7] = { 0, 7, 1, 2, 3, 5, 6 };
+
+static const uint8_t huff_b56_cb[11] = { 1, 9, 1, 0, 2, 0, 2, 4, 11, 9, 2 };
+
+static const uint8_t huff_b56_xlat[31] = {
+     0,  1, 31,  2, 30, 3,  4, 13, 29,  5,  6,  7, 14, 15, 17, 18,
+    19, 26, 27, 28,  8, 9, 12, 20, 21, 22, 23, 24, 25, 10, 11
+};
+
+static const uint8_t huff_b62_cb[14] = {
+    1, 12, 1, 0, 0, 2, 3, 5, 12, 14, 18, 15, 9, 2
+};
+
+static const uint8_t huff_b62_xlat[81] = {
+    0x00, 0x40, 0x01, 0x10, 0x04, 0x02, 0x80, 0x50, 0x90, 0x05, 0x06, 0x20,
+    0x60, 0x44, 0x14, 0x54, 0x24, 0x08, 0x18, 0x41, 0x11, 0x15, 0x09, 0xA0,
+    0x84, 0x94, 0x64, 0xA4, 0x28, 0x51, 0x45, 0x55, 0x19, 0x12, 0x16, 0x0A,
+    0x1A, 0x48, 0x58, 0x68, 0x81, 0x91, 0x21, 0x61, 0x85, 0x95, 0x25, 0x65,
+    0x49, 0x59, 0x29, 0x69, 0x42, 0x46, 0x56, 0x88, 0x98, 0xA8, 0xA1, 0xA5,
+    0x99, 0xA9, 0x52, 0x22, 0x26, 0x66, 0x4A, 0x5A, 0x2A, 0x6A, 0x89, 0x82,
+    0x92, 0x62, 0x86, 0x96, 0xA6, 0x8A, 0xAA, 0xA2, 0x9A
+};
+
+static const uint8_t huff_b63_cb[7] = { 1, 5, 1, 1, 1, 0, 4 };
+
+static const uint8_t huff_b63_xlat[7] = { 0, 1, 7, 2, 3, 5, 6 };
+
+static const uint8_t huff_b64_cb[7] = { 1, 5, 1, 1, 1, 1, 2 };
+
+static const uint8_t huff_b64_xlat[6] = { 1, 0, 2, 5, 3, 4 };
+
+static const uint8_t huff_b65_cb[14] = {
+    1, 12, 1, 0, 0, 2, 2, 2, 6, 12, 34, 92, 54, 20
+};
+
+static const uint8_t huff_b65_xlat[225] = {
+    0x00, 0xF0, 0x01, 0x10, 0x0F, 0x11, 0xF1, 0x20, 0xE0, 0x02, 0x0E, 0x1F,
+    0xFF, 0xD0, 0x21, 0xE1, 0x12, 0xF2, 0x07, 0x0A, 0x0D, 0x1E, 0xFE, 0x2F,
+    0xEF, 0x30, 0x70, 0x90, 0xA0, 0xC0, 0x71, 0x91, 0xC1, 0xD1, 0x32, 0x92,
+    0xE2, 0x03, 0x13, 0x63, 0x04, 0x06, 0xE6, 0xE7, 0xF7, 0x09, 0x19, 0x39,
+    0xFA, 0x0C, 0x1C, 0xDD, 0xED, 0xFD, 0x2E, 0x7E, 0x9E, 0x3F, 0x9F, 0x40,
+    0x50, 0x60, 0xB0, 0x31, 0x41, 0x61, 0xA1, 0xB1, 0x22, 0x42, 0x72, 0xA2,
+    0xB2, 0xC2, 0xD2, 0x23, 0x33, 0x73, 0xA3, 0xC3, 0xD3, 0xE3, 0xF3, 0x14,
+    0x24, 0x34, 0x44, 0x74, 0xD4, 0xE4, 0x05, 0x25, 0x45, 0x65, 0x95, 0xA5,
+    0x16, 0x26, 0x46, 0x76, 0xA6, 0xB6, 0xC6, 0xD6, 0xF6, 0x17, 0x27, 0x37,
+    0x47, 0x67, 0xA7, 0xD7, 0x29, 0x69, 0xB9, 0xD9, 0xE9, 0xF9, 0x1A, 0x2A,
+    0x3A, 0x9A, 0xCA, 0xDA, 0xEA, 0x0B, 0x1B, 0x3B, 0x6B, 0xEB, 0xFB, 0x2C,
+    0x6C, 0xEC, 0xFC, 0x1D, 0x2D, 0x4D, 0x6D, 0x9D, 0xAD, 0x3E, 0x4E, 0x6E,
+    0xAE, 0xCE, 0xEE, 0x4F, 0x5F, 0x6F, 0xDF, 0x51, 0x52, 0x62, 0x43, 0x93,
+    0xB3, 0x54, 0x94, 0xA4, 0xF4, 0x15, 0x75, 0xB5, 0xE5, 0xF5, 0x36, 0x56,
+    0x66, 0x96, 0x57, 0x77, 0x49, 0x59, 0xA9, 0xC9, 0x4A, 0x5A, 0x6A, 0x7A,
+    0xAA, 0xBA, 0x2B, 0x4B, 0x7B, 0x9B, 0xAB, 0xDB, 0x3C, 0x4C, 0x7C, 0x9C,
+    0xAC, 0xBC, 0xCC, 0x3D, 0x5D, 0x7D, 0xBD, 0xCD, 0x5E, 0xBE, 0xDE, 0xBF,
+    0xCF, 0x53, 0x64, 0xB4, 0xC4, 0x35, 0x55, 0xC5, 0xD5, 0x97, 0xB7, 0xC7,
+    0x79, 0x99, 0x5B, 0xBB, 0xCB, 0x5C, 0xDC, 0x7F, 0xAF
+};
+
+static const uint8_t huff_b66_cb[14] = {
+    1, 12, 1, 0, 0, 3, 0, 3, 3, 10, 40, 85, 61, 50
+};
+
+static const uint8_t huff_b66_xlat[256] = {
+    0x00, 0x10, 0x01, 0x11, 0x21, 0x02, 0x12, 0x20, 0x22, 0x13, 0x30, 0x31,
+    0x41, 0xD1, 0xE1, 0x32, 0x52, 0x03, 0x23, 0x2D, 0x40, 0x50, 0x60, 0x80,
+    0xD0, 0xE0, 0x51, 0x61, 0xF1, 0x42, 0x62, 0xD2, 0xE2, 0xF2, 0x33, 0x43,
+    0xC3, 0xD3, 0xE3, 0x04, 0x14, 0xD4, 0xF4, 0x25, 0x35, 0x16, 0x17, 0xF7,
+    0xD8, 0x1C, 0x3C, 0x0D, 0x1D, 0x3D, 0x5D, 0x0E, 0x1E, 0x2E, 0x7E, 0x2F,
+    0xC0, 0xF0, 0x71, 0x81, 0x91, 0xC1, 0x72, 0x82, 0x92, 0xB2, 0xC2, 0x53,
+    0x63, 0x73, 0x93, 0xA3, 0xF3, 0x24, 0x44, 0x64, 0x84, 0xA4, 0xB4, 0x05,
+    0x15, 0x95, 0xD5, 0x06, 0x26, 0x36, 0x46, 0x96, 0xD6, 0xE6, 0xF6, 0x07,
+    0x27, 0x37, 0xD7, 0xE7, 0x08, 0x18, 0x28, 0x38, 0xE8, 0xF8, 0x09, 0x19,
+    0x29, 0xE9, 0xF9, 0x0A, 0x1A, 0xCA, 0xDA, 0xEA, 0x0B, 0x1B, 0xDB, 0xEB,
+    0xFB, 0x2C, 0x4C, 0x5C, 0x7C, 0x8C, 0x4D, 0x6D, 0x8D, 0x9D, 0xFD, 0x3E,
+    0x5E, 0x6E, 0x8E, 0x9E, 0xEE, 0x0F, 0x1F, 0x3F, 0x4F, 0x5F, 0x6F, 0x7F,
+    0xCF, 0x70, 0xA1, 0xA2, 0x83, 0xB3, 0x34, 0x74, 0xC4, 0xE4, 0x55, 0x65,
+    0x85, 0xA5, 0xC5, 0xE5, 0xF5, 0x56, 0x66, 0x76, 0x86, 0xA6, 0xC6, 0x57,
+    0x67, 0x77, 0x97, 0xA7, 0x48, 0x88, 0x98, 0x49, 0x59, 0x79, 0x99, 0x3A,
+    0x4A, 0x8A, 0xBA, 0xFA, 0x2B, 0x7B, 0x0C, 0xAC, 0xBC, 0xCC, 0xEC, 0x7D,
+    0xAD, 0xBD, 0xDD, 0x4E, 0xBE, 0xCE, 0xFE, 0x8F, 0x9F, 0xAF, 0xBF, 0xDF,
+    0xEF, 0xFF, 0x90, 0xA0, 0xB0, 0xB1, 0x54, 0x94, 0x45, 0x75, 0xB5, 0xB6,
+    0x47, 0x87, 0xB7, 0xC7, 0x58, 0x68, 0x78, 0xA8, 0xB8, 0xC8, 0x39, 0x69,
+    0x89, 0xA9, 0xB9, 0xC9, 0xD9, 0x2A, 0x5A, 0x6A, 0x7A, 0x9A, 0xAA, 0x3B,
+    0x4B, 0x5B, 0x6B, 0x8B, 0x9B, 0xAB, 0xBB, 0xCB, 0x6C, 0x9C, 0xDC, 0xFC,
+    0xCD, 0xED, 0xAE, 0xDE
+};
+
+static const uint8_t huff_b67_cb[10] = { 2, 9, 1, 2, 1, 4, 7, 10, 26, 12 };
+
+static const uint8_t huff_b67_xlat[63] = {
+     0,  1, 63, 62,  2,  3, 60, 61,  4,  5,  6,  7, 57, 58, 59,  8,
+     9, 10, 11, 12, 52, 53, 54, 55, 56, 13, 14, 15, 16, 17, 18, 25,
+    26, 27, 28, 29, 30, 31, 33, 34, 35, 36, 37, 38, 39, 46, 47, 48,
+    49, 50, 51, 19, 20, 21, 22, 23, 24, 40, 41, 42, 43, 44, 45
+};
+
+static const uint8_t huff_b71_cb[14] = {
+    1, 12, 1, 0, 0, 1, 7, 0, 19, 5, 13, 23, 0, 12
+};
+
+static const uint8_t huff_b71_xlat[81] = {
+    0x00, 0x03, 0x40, 0xC0, 0x10, 0x30, 0x04, 0x0C, 0x01, 0x50, 0xD0, 0x70,
+    0xF0, 0xC4, 0x14, 0x34, 0x4C, 0x1C, 0x3C, 0xC1, 0x11, 0x31, 0x05, 0x0D,
+    0x13, 0x33, 0x07, 0x0F, 0x44, 0xCC, 0x41, 0x43, 0xC3, 0x54, 0x74, 0xDC,
+    0xFC, 0xF1, 0xC5, 0x15, 0x1D, 0x53, 0xC7, 0x37, 0x4F, 0x3F, 0xD4, 0xF4,
+    0x5C, 0x7C, 0x51, 0xD1, 0x71, 0x45, 0x55, 0x35, 0x4D, 0xCD, 0xDD, 0x3D,
+    0xD3, 0x73, 0xF3, 0x47, 0x17, 0x77, 0xCF, 0x1F, 0xFF, 0xD5, 0x75, 0xF5,
+    0x5D, 0x7D, 0xFD, 0x57, 0xD7, 0xF7, 0x5F, 0xDF, 0x7F
+};
+
+static const uint8_t huff_b73_cb[13] = {
+    1, 11, 1, 0, 0, 0, 1, 4, 9, 4, 103, 110, 24
+};
+
+static const uint8_t huff_b73_xlat[256] = {
+    0x00, 0x40, 0x10, 0x04, 0x01, 0x05, 0x50, 0x14, 0x54, 0x41, 0x11, 0x51,
+    0x45, 0x15, 0x55, 0x44, 0x95, 0x6A, 0x03, 0x80, 0xC0, 0x90, 0xD0, 0x94,
+    0xD4, 0x24, 0x64, 0x58, 0x91, 0xA1, 0x85, 0xD5, 0x25, 0x65, 0xA5, 0xE5,
+    0x75, 0xB5, 0xF5, 0x19, 0x59, 0x99, 0xD9, 0x69, 0xA9, 0xE9, 0x79, 0xB9,
+    0xF9, 0x4D, 0x5D, 0x9D, 0xDD, 0x6D, 0xAD, 0xED, 0x7D, 0xBD, 0xFD, 0x02,
+    0x42, 0x52, 0x06, 0x46, 0x16, 0x56, 0x96, 0xD6, 0x26, 0x66, 0xA6, 0xE6,
+    0x76, 0xB6, 0xF6, 0x1A, 0x5A, 0x9A, 0xDA, 0xAA, 0xEA, 0x7A, 0xBA, 0xFA,
+    0x5E, 0x9E, 0xDE, 0x6E, 0xAE, 0xEE, 0x7E, 0xBE, 0xFE, 0x07, 0x47, 0x57,
+    0x97, 0xD7, 0x67, 0xA7, 0xE7, 0x77, 0xB7, 0xF7, 0x5B, 0x9B, 0xDB, 0x6B,
+    0xAB, 0xEB, 0x7B, 0xBB, 0xFB, 0x5F, 0x9F, 0xDF, 0x6F, 0xAF, 0xEF, 0x7F,
+    0xBF, 0xFF, 0x20, 0x60, 0x70, 0xB0, 0xF0, 0x84, 0xC4, 0xA4, 0xE4, 0x74,
+    0xB4, 0xF4, 0x08, 0x88, 0x18, 0x98, 0xD8, 0x68, 0xA8, 0xE8, 0x78, 0xB8,
+    0xF8, 0x1C, 0x5C, 0x9C, 0xDC, 0x6C, 0xAC, 0xEC, 0x3C, 0x7C, 0xBC, 0xFC,
+    0x81, 0xD1, 0x21, 0x61, 0xE1, 0x71, 0xB1, 0xF1, 0xC5, 0x35, 0x09, 0x49,
+    0x89, 0xC9, 0x29, 0x39, 0x0D, 0x8D, 0xCD, 0x1D, 0x2D, 0x3D, 0x92, 0xD2,
+    0x22, 0x62, 0xA2, 0xE2, 0x72, 0xB2, 0xF2, 0x86, 0xC6, 0x36, 0x0A, 0x4A,
+    0x8A, 0xCA, 0x2A, 0x3A, 0x0E, 0x4E, 0x8E, 0xCE, 0x1E, 0x2E, 0x3E, 0x13,
+    0x53, 0x93, 0xD3, 0x63, 0xA3, 0xE3, 0x73, 0xB3, 0xF3, 0x87, 0xC7, 0x17,
+    0x27, 0x37, 0x0B, 0x4B, 0x8B, 0xCB, 0x1B, 0x2B, 0x3B, 0x0F, 0x4F, 0x8F,
+    0xCF, 0x1F, 0x2F, 0x3F, 0xA0, 0xE0, 0x30, 0x34, 0x48, 0xC8, 0x28, 0x38,
+    0x0C, 0x4C, 0x8C, 0xCC, 0x2C, 0xC1, 0x31, 0x82, 0xC2, 0x12, 0x32, 0x43,
+    0x83, 0xC3, 0x23, 0x33
+};
+
+static const uint8_t huff_b74_cb[8] = { 1, 6, 1, 0, 2, 2, 2, 4 };
+
+static const uint8_t huff_b74_xlat[11] = {
+    0, 1, 15, 2, 14, 5, 13, 3, 4, 11, 12
+};
+
+static const uint8_t huff_b75_cb[13] = {
+    2, 12, 1, 4, 0, 0, 0, 8, 11, 24, 53, 64, 60
+};
+
+static const uint8_t huff_b75_xlat[225] = {
+    0x00, 0x10, 0xF0, 0x01, 0x0F, 0x20, 0xE0, 0x11, 0xF1, 0x02, 0x0E, 0x1F,
+    0xFF, 0xD0, 0x21, 0xE1, 0x12, 0xF2, 0x03, 0x0D, 0x1E, 0xFE, 0x2F, 0xEF,
+    0x30, 0x40, 0x60, 0x70, 0x90, 0xA0, 0xC0, 0x31, 0xD1, 0x22, 0xE2, 0x13,
+    0xF3, 0x04, 0x06, 0x07, 0x09, 0x0C, 0x1D, 0xFD, 0x2E, 0xEE, 0x3F, 0xDF,
+    0x50, 0xB0, 0x41, 0x61, 0x71, 0x91, 0xA1, 0xC1, 0x32, 0x62, 0x72, 0x92,
+    0xA2, 0xD2, 0x23, 0xD3, 0xE3, 0x14, 0xF4, 0x05, 0x16, 0x26, 0xE6, 0xF6,
+    0x17, 0x27, 0xE7, 0xF7, 0x19, 0x29, 0xF9, 0x0A, 0x1A, 0x2A, 0xFA, 0x0B,
+    0x1C, 0x2C, 0xFC, 0x2D, 0x3D, 0xED, 0x3E, 0x4E, 0x7E, 0x9E, 0xDE, 0x4F,
+    0x6F, 0x7F, 0x9F, 0xAF, 0xCF, 0x51, 0xB1, 0x42, 0x52, 0xB2, 0xC2, 0x33,
+    0x63, 0x73, 0x93, 0xA3, 0xB3, 0xC3, 0x24, 0x34, 0x74, 0xA4, 0xD4, 0xE4,
+    0x15, 0x25, 0x65, 0x95, 0xE5, 0xF5, 0x36, 0xD6, 0x37, 0x47, 0xC7, 0xD7,
+    0x39, 0x59, 0xB9, 0xC9, 0xD9, 0xE9, 0x3A, 0x6A, 0xDA, 0xEA, 0x1B, 0x2B,
+    0x9B, 0xAB, 0xEB, 0xFB, 0x6C, 0x7C, 0x9C, 0xAC, 0xEC, 0x4D, 0x6D, 0x7D,
+    0x9D, 0xAD, 0xBD, 0xDD, 0x5E, 0x6E, 0xAE, 0xCE, 0x5F, 0x43, 0x53, 0x44,
+    0x54, 0x64, 0x94, 0xB4, 0xC4, 0x35, 0x45, 0x55, 0x75, 0xA5, 0xB5, 0xC5,
+    0xD5, 0x46, 0x56, 0x66, 0x76, 0x96, 0xA6, 0xB6, 0xC6, 0x57, 0x67, 0x77,
+    0x97, 0xA7, 0xB7, 0x49, 0x69, 0x79, 0x99, 0xA9, 0x4A, 0x5A, 0x7A, 0x9A,
+    0xAA, 0xBA, 0xCA, 0x3B, 0x4B, 0x5B, 0x6B, 0x7B, 0xBB, 0xCB, 0xDB, 0x3C,
+    0x4C, 0x5C, 0xBC, 0xCC, 0xDC, 0x5D, 0xCD, 0xBE, 0xBF
+};
+
+static const uint8_t huff_b77_cb[12] = {
+    2, 11, 1, 0, 4, 6, 10, 12, 7, 15, 4, 4
+};
+
+static const uint8_t huff_b77_xlat[63] = {
+     0,  1,  2, 62, 63,  3,  4,  5, 59, 60, 61,  6,  7,  8,  9, 10,
+    54, 55, 56, 57, 58, 11, 12, 13, 14, 15, 16, 47, 49, 50, 51, 52,
+    53, 17, 18, 19, 20, 45, 46, 48, 21, 22, 23, 24, 25, 26, 27, 37,
+    38, 39, 40, 41, 42, 43, 44, 28, 29, 30, 35, 31, 33, 34, 36
+};
+
+/** Tables for spectrum coding. */
+typedef struct Atrac3pSpecCodeTab {
+    uint8_t group_size;  ///< number of coefficients grouped together
+    uint8_t num_coeffs;  ///< 1 - map index to a single value, > 1 - map index to a vector of values
+    uint8_t bits;        ///< number of bits a single coefficient occupy
+    uint8_t is_signed;   ///< 1 - values in that table are signed ones, otherwise - absolute ones
+
+    int redirect;        ///< if >= 0: tells which huffman table must be reused
+    const uint8_t *cb;   ///< pointer to the codebook descriptor
+    const uint8_t *xlat; ///< pointer to the translation table or NULL if none
+} Atrac3pSpecCodeTab;
+
+static const Atrac3pSpecCodeTab atrac3p_spectra_tabs[112] = {
+    /* table set = A */
+    /* code table = 0 */
+    { 1, 4, 2, 1, -1, huff_a01_cb, huff_a01_xlat }, // wordlen = 1
+    { 1, 4, 2, 0, -1, huff_a02_cb, huff_a02_xlat }, // wordlen = 2
+    { 1, 2, 3, 1, -1, huff_a03_cb, huff_a03_xlat }, // wordlen = 3
+    { 1, 1, 3, 0, -1, huff_a04_cb, huff_a04_xlat }, // wordlen = 4
+    { 1, 2, 4, 1, -1, huff_a05_cb, huff_a05_xlat }, // wordlen = 5
+    { 1, 1, 4, 0, -1, huff_a06_cb, huff_a06_xlat }, // wordlen = 6
+    { 1, 1, 6, 1, -1, huff_a07_cb, huff_a07_xlat }, // wordlen = 7
+
+    /* code table = 1 */
+    { 4, 4, 2, 1, -1, huff_a11_cb, huff_a11_xlat }, // wordlen = 1
+    { 1, 4, 2, 0, -1, huff_a12_cb, huff_a12_xlat }, // wordlen = 2
+    { 1, 2, 3, 1, -1, huff_a13_cb, huff_a13_xlat }, // wordlen = 3
+    { 1, 2, 4, 1, -1, huff_a14_cb, huff_a14_xlat }, // wordlen = 4
+    { 1, 2, 4, 1, -1, huff_a15_cb, huff_a15_xlat }, // wordlen = 5
+    { 1, 2, 4, 0, -1, huff_a16_cb, huff_a16_xlat }, // wordlen = 6
+    { 1, 1, 6, 1, -1, huff_a17_cb, huff_a17_xlat }, // wordlen = 7
+
+    /* code table = 2 */
+    { 1, 4, 2, 1, -1, huff_a21_cb, huff_a21_xlat }, // wordlen = 1
+    { 1, 2, 3, 1, -1, huff_a22_cb, huff_a22_xlat }, // wordlen = 2
+    { 1, 2, 3, 1, -1, huff_a23_cb, huff_a23_xlat }, // wordlen = 3
+    { 1, 1, 3, 0, -1, huff_a24_cb, NULL          }, // wordlen = 4
+    { 1, 1, 3, 0, -1, huff_a25_cb, huff_a25_xlat }, // wordlen = 5
+    { 1, 2, 4, 0, -1, huff_a26_cb, huff_a26_xlat }, // wordlen = 6
+    { 1, 1, 6, 1, -1, huff_a27_cb, huff_a27_xlat }, // wordlen = 7
+
+    /* code table = 3 */
+    { 1, 2, 2, 1, -1, huff_a31_cb, huff_a31_xlat }, // wordlen = 1
+    { 1, 4, 2, 0, -1, huff_a32_cb, huff_a32_xlat }, // wordlen = 2
+    { 1, 4, 2, 0, -1, huff_a33_cb, huff_a33_xlat }, // wordlen = 3
+    { 1, 1, 3, 0, -1, huff_a34_cb, huff_a34_xlat }, // wordlen = 4
+    { 1, 2, 4, 1, -1, huff_a35_cb, huff_a35_xlat }, // wordlen = 5
+    { 1, 2, 4, 0, -1, huff_a36_cb, huff_a36_xlat }, // wordlen = 6
+    { 1, 1, 6, 1, -1, huff_a37_cb, huff_a37_xlat }, // wordlen = 7
+
+    /* code table = 4 */
+    { 1, 4, 2, 1, -1, huff_a41_cb, huff_a41_xlat }, // wordlen = 1
+    { 1, 4, 2, 0, -1, huff_a42_cb, huff_a42_xlat }, // wordlen = 2
+    { 1, 1, 3, 1, -1, huff_a43_cb, huff_a43_xlat }, // wordlen = 3
+    { 1, 2, 4, 1, -1, huff_a44_cb, huff_a44_xlat }, // wordlen = 4
+    { 1, 1, 3, 0, -1, huff_a45_cb, huff_a45_xlat }, // wordlen = 5
+    { 1, 2, 4, 0, -1, huff_a46_cb, huff_a46_xlat }, // wordlen = 6
+    { 1, 1, 6, 1, -1, huff_a47_cb, huff_a47_xlat }, // wordlen = 7
+
+    /* code table = 5 */
+    { 1, 4, 2, 1, -1, huff_a51_cb, huff_a51_xlat }, // wordlen = 1
+    { 1, 2, 3, 1, -1, huff_a52_cb, huff_a52_xlat }, // wordlen = 2
+    { 1, 1, 3, 1, -1, huff_a43_cb, huff_a53_xlat }, // wordlen = 3
+    { 1, 2, 4, 1, -1, huff_a54_cb, huff_a54_xlat }, // wordlen = 4
+    { 1, 1, 3, 0, -1, huff_a55_cb, huff_a55_xlat }, // wordlen = 5
+    { 1, 1, 5, 1, -1, huff_a56_cb, huff_a56_xlat }, // wordlen = 6
+    { 1, 1, 6, 1, -1, huff_a57_cb, huff_a57_xlat }, // wordlen = 7
+
+    /* code table = 6 */
+    { 2, 4, 2, 1, -1, huff_a61_cb, huff_a61_xlat }, // wordlen = 1
+    { 1, 2, 3, 1, -1, huff_a62_cb, huff_a62_xlat }, // wordlen = 2
+    { 1, 4, 2, 0, -1, huff_a63_cb, huff_a63_xlat }, // wordlen = 3
+    { 1, 2, 4, 1, -1, huff_a64_cb, huff_a64_xlat }, // wordlen = 4
+    { 1, 1, 4, 1, -1, huff_a65_cb, huff_a65_xlat }, // wordlen = 5
+    { 1, 1, 5, 1, -1, huff_a66_cb, huff_a66_xlat }, // wordlen = 6
+    { 1, 1, 6, 1, -1, huff_a67_cb, huff_a67_xlat }, // wordlen = 7
+
+    /* code table = 7 */
+    { 1, 2, 1, 0, -1, huff_a71_cb, NULL          }, // wordlen = 1
+    { 2, 4, 2, 0, -1, huff_a72_cb, huff_a72_xlat }, // wordlen = 2
+    { 1, 2, 3, 1, -1, huff_a73_cb, huff_a73_xlat }, // wordlen = 3
+    { 1, 2, 4, 1, -1, huff_a74_cb, huff_a74_xlat }, // wordlen = 4
+    { 1, 1, 4, 1, -1, huff_a75_cb, huff_a75_xlat }, // wordlen = 5
+    { 2, 2, 4, 0, -1, huff_a76_cb, huff_a76_xlat }, // wordlen = 6
+    { 4, 1, 6, 1,  6, NULL,        NULL          }, // wordlen = 7
+
+    /* table set = B */
+    /* code table = 0 */
+    { 4, 4, 2, 1, -1, huff_b01_cb, huff_b01_xlat }, // wordlen = 1
+    { 1, 4, 2, 0, -1, huff_b02_cb, huff_b02_xlat }, // wordlen = 2
+    { 4, 2, 3, 1, -1, huff_b03_cb, huff_b03_xlat }, // wordlen = 3
+    { 1, 2, 4, 1, -1, huff_b04_cb, huff_b04_xlat }, // wordlen = 4
+    { 1, 2, 4, 1, -1, huff_b05_cb, huff_b05_xlat }, // wordlen = 5
+    { 1, 1, 4, 0,  5, NULL,        NULL          }, // wordlen = 6
+    { 1, 1, 6, 1, -1, huff_b07_cb, huff_b07_xlat }, // wordlen = 7
+
+    /* code table = 1 */
+    { 1, 4, 2, 1, 14, NULL,        NULL          }, // wordlen = 1
+    { 1, 4, 2, 0, -1, huff_b12_cb, huff_b12_xlat }, // wordlen = 2
+    { 1, 2, 3, 1,  9, NULL,        NULL          }, // wordlen = 3
+    { 1, 2, 4, 1, -1, huff_b14_cb, huff_b14_xlat }, // wordlen = 4
+    { 1, 2, 4, 1, 11, NULL,        NULL          }, // wordlen = 5
+    { 1, 2, 4, 0, -1, huff_b16_cb, huff_b16_xlat }, // wordlen = 6
+    { 1, 1, 6, 1,  6, NULL,        NULL          }, // wordlen = 7
+
+    /* code table = 2 */
+    { 4, 4, 2, 1, 28, NULL,        NULL          }, // wordlen = 1
+    { 4, 4, 2, 0, 22, NULL,        NULL          }, // wordlen = 2
+    { 1, 2, 3, 1,  2, NULL,        NULL          }, // wordlen = 3
+    { 1, 2, 4, 1, 31, NULL,        NULL          }, // wordlen = 4
+    { 2, 2, 4, 1, 60, NULL,        NULL          }, // wordlen = 5
+    { 2, 2, 4, 0, -1, huff_b26_cb, huff_b26_xlat }, // wordlen = 6
+    { 4, 1, 6, 1,  6, NULL,        NULL          }, // wordlen = 7
+
+    /* code table = 3 */
+    { 1, 4, 2, 1, 35, NULL,        NULL          }, // wordlen = 1
+    { 1, 4, 2, 0, -1, huff_b32_cb, huff_b32_xlat }, // wordlen = 2
+    { 1, 4, 2, 0, -1, huff_b33_cb, huff_b33_xlat }, // wordlen = 3
+    { 2, 2, 4, 1, 59, NULL,        NULL          }, // wordlen = 4
+    { 1, 2, 4, 1, -1, huff_b35_cb, huff_b35_xlat }, // wordlen = 5
+    { 1, 2, 4, 0, 75, NULL,        NULL          }, // wordlen = 6
+    { 1, 1, 6, 1, -1, huff_b37_cb, huff_b37_xlat }, // wordlen = 7
+
+    /* code table = 4 */
+    { 1, 4, 2, 1, -1, huff_b41_cb, huff_b41_xlat }, // wordlen = 1
+    { 4, 2, 3, 1, -1, huff_b42_cb, huff_b42_xlat }, // wordlen = 2
+    { 1, 2, 3, 1, -1, huff_b43_cb, huff_b43_xlat }, // wordlen = 3
+    { 4, 2, 4, 1, 66, NULL,        NULL          }, // wordlen = 4
+    { 1, 1, 3, 0, 32, NULL,        NULL          }, // wordlen = 5
+    { 1, 2, 4, 0, 12, NULL,        NULL          }, // wordlen = 6
+    { 1, 1, 6, 1, -1, huff_b47_cb, huff_b47_xlat }, // wordlen = 7
+
+    /* code table = 5 */
+    { 2, 4, 2, 1, 42, NULL,        NULL          }, // wordlen = 1
+    { 1, 2, 3, 1, -1, huff_b52_cb, huff_b52_xlat }, // wordlen = 2
+    { 4, 1, 3, 1, -1, huff_b53_cb, huff_b53_xlat }, // wordlen = 3
+    { 1, 1, 3, 0, 17, NULL,        NULL          }, // wordlen = 4
+    { 1, 1, 3, 0, 39, NULL,        NULL          }, // wordlen = 5
+    { 1, 1, 5, 1, -1, huff_b56_cb, huff_b56_xlat }, // wordlen = 6
+    { 2, 1, 6, 1, 62, NULL,        NULL          }, // wordlen = 7
+
+    /* code table = 6 */
+    { 1, 4, 2, 1, 28, NULL,        NULL          }, // wordlen = 1
+    { 1, 4, 2, 0, -1, huff_b62_cb, huff_b62_xlat }, // wordlen = 2
+    { 1, 1, 3, 1, -1, huff_b63_cb, huff_b63_xlat }, // wordlen = 3
+    { 1, 1, 3, 0, -1, huff_b64_cb, huff_b64_xlat }, // wordlen = 4
+    { 4, 2, 4, 1, -1, huff_b65_cb, huff_b65_xlat }, // wordlen = 5
+    { 1, 2, 4, 0, -1, huff_b66_cb, huff_b66_xlat }, // wordlen = 6
+    { 1, 1, 6, 1, -1, huff_b67_cb, huff_b67_xlat }, // wordlen = 7
+
+    /* code table = 7 */
+    { 1, 4, 2, 1, -1, huff_b71_cb, huff_b71_xlat }, // wordlen = 1
+    { 4, 4, 2, 0, 78, NULL,        NULL          }, // wordlen = 2
+    { 4, 4, 2, 0, -1, huff_b73_cb, huff_b73_xlat }, // wordlen = 3
+    { 1, 1, 4, 1, -1, huff_b74_cb, huff_b74_xlat }, // wordlen = 4
+    { 1, 2, 4, 1, -1, huff_b75_cb, huff_b75_xlat }, // wordlen = 5
+    { 1, 1, 5, 1, 47, NULL,        NULL          }, // wordlen = 6
+    { 1, 1, 6, 1, -1, huff_b77_cb, huff_b77_xlat }, // wordlen = 7
+};
+
+/* Huffman tables for gain control data. */
+static const uint8_t atrac3p_huff_gain_npoints1_cb[9] = {
+    1, 7, 1, 1, 1, 1, 1, 1, 2
+};
+
+static const uint8_t atrac3p_huff_gain_npoints2_xlat[8] = {
+    0, 1, 7, 2, 6, 3, 4, 5
+};
+
+static const uint8_t atrac3p_huff_gain_lev1_cb[9] = { 1, 7, 1, 0, 2, 2, 1, 2, 8 };
+static const uint8_t atrac3p_huff_gain_lev1_xlat[16] = {
+    7, 5, 8, 6, 9, 4, 10, 11, 0, 1, 2, 3, 12, 13, 14, 15
+};
+
+static const uint8_t atrac3p_huff_gain_lev2_cb[11] = {
+    1, 9, 1, 1, 1, 1, 1, 0, 2, 0, 8
+};
+
+static const uint8_t atrac3p_huff_gain_lev2_xlat[15] = {
+    15, 14, 1, 13, 2, 3, 12, 4, 5, 6, 7, 8, 9, 10, 11
+};
+
+static const uint8_t atrac3p_huff_gain_lev3_cb[11] = {
+    1, 9, 1, 0, 3, 1, 1, 0, 2, 0, 8
+};
+
+static const uint8_t atrac3p_huff_gain_lev3_xlat[16] = {
+    0, 1, 14, 15, 2, 13, 3, 12, 4, 5, 6, 7, 8, 9, 10, 11
+};
+
+static const uint8_t atrac3p_huff_gain_lev4_cb[11] = {
+    1, 9, 1, 1, 1, 1, 1, 0, 1, 2, 8
+};
+
+static const uint8_t atrac3p_huff_gain_lev4_xlat[16] = {
+    0, 1, 15, 14, 2, 13, 3, 12, 4, 5, 6, 7, 8, 9, 10, 11
+};
+
+static const uint8_t atrac3p_huff_gain_loc1_cb[9] = { 2, 8, 1, 2, 4, 4, 4, 0, 16 };
+static const uint8_t atrac3p_huff_gain_loc1_xlat[31] = {
+     1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15, 16,
+    17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31
+};
+
+static const uint8_t atrac3p_huff_gain_loc2_cb[8] = { 3, 8, 5, 3, 2, 3, 2, 16 };
+static const uint8_t atrac3p_huff_gain_loc2_xlat[31] = {
+     2,  3,  4,  5,  6,  1,  7,  8,  9, 10, 11, 12, 13, 14, 15, 16,
+    17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31
+};
+
+static const uint8_t atrac3p_huff_gain_loc3_cb[7] = { 2, 6, 1, 0, 2, 11, 18 };
+static const uint8_t atrac3p_huff_gain_loc3_xlat[32] = {
+    0,   1, 31,  2,  3,  4,  5,  6,  7, 26, 27, 28, 29, 30,  8,  9,
+    10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25
+};
+
+static const uint8_t atrac3p_huff_gain_loc4_cb[5] = { 4, 6, 3, 23, 6 };
+static const uint8_t atrac3p_huff_gain_loc4_xlat[32] = {
+    0,  28, 29,  1,  2,  3,  4, 11, 12, 13, 14, 15, 16, 17, 18, 19,
+    20, 21, 22, 23, 24, 25, 26, 27, 30, 31,  5,  6,  7,  8,  9, 10
+};
+
+static const uint8_t atrac3p_huff_gain_loc5_cb[9] = { 1, 7, 1, 0, 0, 3, 2, 6, 20 };
+static const uint8_t atrac3p_huff_gain_loc5_xlat[32] = {
+    0,   1,  2, 31,  3,  4,  5,  6,  7,  8, 29, 30,  9, 10, 11, 12,
+    13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28
+};
+
+/* Huffman tables for GHA waves data. */
+static const uint8_t atrac3p_huff_tonebands_cb[8] = { 1, 6, 1, 0, 1, 2, 4, 8 };
+static const uint8_t atrac3p_huff_numwavs1_cb[9] = { 1, 7, 1, 1, 1, 1, 1, 1, 2 };
+static const uint8_t atrac3p_huff_numwavs2_cb[8] = { 1, 6, 1, 1, 1, 1, 0, 4 };
+static const uint8_t atrac3p_huff_numwavs2_xlat[8] = { 0, 1, 7, 2, 3, 4, 5, 6 };
+static const uint8_t atrac3p_huff_wav_ampsf1_cb[7] = { 4, 8, 10, 8, 6, 0, 8 };
+static const uint8_t atrac3p_huff_wav_ampsf1_xlat[32] = {
+     8,  9, 10, 11, 12, 13, 14, 15, 16, 17, 5, 6,  7, 18, 19, 20,
+    21, 22,  4, 23, 24, 25, 26, 27,  0,  1, 2, 3, 28, 29, 30, 31
+};
+
+static const uint8_t atrac3p_huff_wav_ampsf2_cb[7] = { 4, 8, 11, 5, 6, 6, 4 };
+static const uint8_t atrac3p_huff_wav_ampsf2_xlat[32] = {
+    18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 14, 15, 16, 17, 29,
+     9, 10, 11, 12, 13, 30,  4,  5,  6,  7,  8, 31,  0,  1,  2,  3
+};
+
+static const uint8_t atrac3p_huff_wav_ampsf3_cb[9] = { 2, 8, 1, 3, 3, 1, 4, 4, 16 };
+static const uint8_t atrac3p_huff_wav_ampsf3_xlat[32] = {
+    0, 1,  2, 31,  3, 29, 30,  4,  5,  6, 27, 28,  7, 24, 25, 26,
+    8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23
+};
+
+static const uint8_t atrac3p_huff_freq_cb[13] = {
+    1, 11, 1, 0, 0, 2, 2, 0, 9, 9, 29, 104, 100
+};
+
+static const uint8_t atrac3p_huff_freq_xlat[256] = {
+      0,   1, 255,   2, 254,   3,   4,   5,   6,   7,   8, 251, 252, 253,   9,  10,
+     11,  12, 246, 247, 248, 249, 250,  13,  14,  15,  16,  17,  18,  19,  20,  21,
+     22,  23,  24,  25,  26,  27,  28,  29,  30,  31,  32,  33,  34,  35,  36,  37,
+     38, 243, 244, 245,  39,  40,  41,  42,  43,  44,  45,  46,  47,  48,  49,  50,
+     51,  52,  53,  54,  55,  56,  57,  58,  59,  60,  61,  62,  63,  64,  65,  66,
+     67,  68,  69,  70,  71,  72,  73,  74,  75,  76,  77,  78,  79,  80,  81,  82,
+     83,  84,  85,  86,  87,  88,  89,  90,  91,  92,  93, 194, 195, 196, 197, 198,
+    199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214,
+    215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230,
+    231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242,  94,  95,  96,  97,
+     98,  99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113,
+    114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129,
+    130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145,
+    146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161,
+    162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177,
+    178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193
+};
+
+#endif /* AVCODEC_ATRAC3PLUS_DATA_H */

omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/atrac3plusdec.c Added

@@ -0,0 +1,396 @@
+/*
+ * ATRAC3+ compatible decoder
+ *
+ * Copyright (c) 2010-2013 Maxim Poliakovski
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * Sony ATRAC3+ compatible decoder.
+ *
+ * Container formats used to store its data:
+ * RIFF WAV (.at3) and Sony OpenMG (.oma, .aa3).
+ *
+ * Technical description of this codec can be found here:
+ * http://wiki.multimedia.cx/index.php?title=ATRAC3plus
+ *
+ * Kudos to Benjamin Larsson and Michael Karcher
+ * for their precious technical help!
+ */
+
+#include <stdint.h>
+#include <string.h>
+
+#include "libavutil/channel_layout.h"
+#include "libavutil/float_dsp.h"
+#include "avcodec.h"
+#include "get_bits.h"
+#include "internal.h"
+#include "atrac.h"
+#include "atrac3plus.h"
+
+typedef struct ATRAC3PContext {
+    GetBitContext gb;
+    AVFloatDSPContext fdsp;
+
+    DECLARE_ALIGNED(32, float, samples)[2][ATRAC3P_FRAME_SAMPLES];  ///< quantized MDCT spectrum
+    DECLARE_ALIGNED(32, float, mdct_buf)[2][ATRAC3P_FRAME_SAMPLES]; ///< output of the IMDCT
+    DECLARE_ALIGNED(32, float, time_buf)[2][ATRAC3P_FRAME_SAMPLES]; ///< output of the gain compensation
+    DECLARE_ALIGNED(32, float, outp_buf)[2][ATRAC3P_FRAME_SAMPLES];
+
+    AtracGCContext gainc_ctx;   ///< gain compensation context
+    FFTContext mdct_ctx;
+    FFTContext ipqf_dct_ctx;    ///< IDCT context used by IPQF
+
+    Atrac3pChanUnitCtx *ch_units;   ///< global channel units
+
+    int num_channel_blocks;     ///< number of channel blocks
+    uint8_t channel_blocks[5];  ///< channel configuration descriptor
+    uint64_t my_channel_layout; ///< current channel layout
+} ATRAC3PContext;
+
+static av_cold int atrac3p_decode_close(AVCodecContext *avctx)
+{
+    av_free(((ATRAC3PContext *)(avctx->priv_data))->ch_units);
+
+    return 0;
+}
+
+static av_cold int set_channel_params(ATRAC3PContext *ctx,
+                                      AVCodecContext *avctx)
+{
+    memset(ctx->channel_blocks, 0, sizeof(ctx->channel_blocks));
+
+    switch (avctx->channels) {
+    case 1:
+        if (avctx->channel_layout != AV_CH_FRONT_LEFT)
+            avctx->channel_layout = AV_CH_LAYOUT_MONO;
+
+        ctx->num_channel_blocks = 1;
+        ctx->channel_blocks[0]  = CH_UNIT_MONO;
+        break;
+    case 2:
+        avctx->channel_layout   = AV_CH_LAYOUT_STEREO;
+        ctx->num_channel_blocks = 1;
+        ctx->channel_blocks[0]  = CH_UNIT_STEREO;
+        break;
+    case 3:
+        avctx->channel_layout   = AV_CH_LAYOUT_SURROUND;
+        ctx->num_channel_blocks = 2;
+        ctx->channel_blocks[0]  = CH_UNIT_STEREO;
+        ctx->channel_blocks[1]  = CH_UNIT_MONO;
+        break;
+    case 4:
+        avctx->channel_layout   = AV_CH_LAYOUT_4POINT0;
+        ctx->num_channel_blocks = 3;
+        ctx->channel_blocks[0]  = CH_UNIT_STEREO;
+        ctx->channel_blocks[1]  = CH_UNIT_MONO;
+        ctx->channel_blocks[2]  = CH_UNIT_MONO;
+        break;
+    case 6:
+        avctx->channel_layout   = AV_CH_LAYOUT_5POINT1_BACK;
+        ctx->num_channel_blocks = 4;
+        ctx->channel_blocks[0]  = CH_UNIT_STEREO;
+        ctx->channel_blocks[1]  = CH_UNIT_MONO;
+        ctx->channel_blocks[2]  = CH_UNIT_STEREO;
+        ctx->channel_blocks[3]  = CH_UNIT_MONO;
+        break;
+    case 7:
+        avctx->channel_layout   = AV_CH_LAYOUT_6POINT1_BACK;
+        ctx->num_channel_blocks = 5;
+        ctx->channel_blocks[0]  = CH_UNIT_STEREO;
+        ctx->channel_blocks[1]  = CH_UNIT_MONO;
+        ctx->channel_blocks[2]  = CH_UNIT_STEREO;
+        ctx->channel_blocks[3]  = CH_UNIT_MONO;
+        ctx->channel_blocks[4]  = CH_UNIT_MONO;
+        break;
+    case 8:
+        avctx->channel_layout   = AV_CH_LAYOUT_7POINT1;
+        ctx->num_channel_blocks = 5;
+        ctx->channel_blocks[0]  = CH_UNIT_STEREO;
+        ctx->channel_blocks[1]  = CH_UNIT_MONO;
+        ctx->channel_blocks[2]  = CH_UNIT_STEREO;
+        ctx->channel_blocks[3]  = CH_UNIT_STEREO;
+        ctx->channel_blocks[4]  = CH_UNIT_MONO;
+        break;
+    default:
+        av_log(avctx, AV_LOG_ERROR,
+               "Unsupported channel count: %d!\n", avctx->channels);
+        return AVERROR_INVALIDDATA;
+    }
+
+    return 0;
+}
+
+static av_cold int atrac3p_decode_init(AVCodecContext *avctx)
+{
+    ATRAC3PContext *ctx = avctx->priv_data;
+    int i, ch, ret;
+
+    if (!avctx->block_align) {
+        av_log(avctx, AV_LOG_ERROR, "block_align is not set\n");
+        return AVERROR(EINVAL);
+    }
+
+    ff_atrac3p_init_vlcs();
+
+    avpriv_float_dsp_init(&ctx->fdsp, avctx->flags & CODEC_FLAG_BITEXACT);
+
+    /* initialize IPQF */
+    ff_mdct_init(&ctx->ipqf_dct_ctx, 5, 1, 32.0 / 32768.0);
+
+    ff_atrac3p_init_imdct(avctx, &ctx->mdct_ctx);
+
+    ff_atrac_init_gain_compensation(&ctx->gainc_ctx, 6, 2);
+
+    ff_atrac3p_init_wave_synth();
+
+    if ((ret = set_channel_params(ctx, avctx)) < 0)
+        return ret;
+
+    ctx->my_channel_layout = avctx->channel_layout;
+
+    ctx->ch_units = av_mallocz(sizeof(*ctx->ch_units) *
+                               ctx->num_channel_blocks);
+    if (!ctx->ch_units) {
+        atrac3p_decode_close(avctx);
+        return AVERROR(ENOMEM);
+    }
+
+    for (i = 0; i < ctx->num_channel_blocks; i++) {
+        for (ch = 0; ch < 2; ch++) {
+            ctx->ch_units[i].channels[ch].ch_num          = ch;
+            ctx->ch_units[i].channels[ch].wnd_shape       = &ctx->ch_units[i].channels[ch].wnd_shape_hist[0][0];
+            ctx->ch_units[i].channels[ch].wnd_shape_prev  = &ctx->ch_units[i].channels[ch].wnd_shape_hist[1][0];
+            ctx->ch_units[i].channels[ch].gain_data       = &ctx->ch_units[i].channels[ch].gain_data_hist[0][0];
+            ctx->ch_units[i].channels[ch].gain_data_prev  = &ctx->ch_units[i].channels[ch].gain_data_hist[1][0];
+            ctx->ch_units[i].channels[ch].tones_info      = &ctx->ch_units[i].channels[ch].tones_info_hist[0][0];
+            ctx->ch_units[i].channels[ch].tones_info_prev = &ctx->ch_units[i].channels[ch].tones_info_hist[1][0];
+        }
+
+        ctx->ch_units[i].waves_info      = &ctx->ch_units[i].wave_synth_hist[0];
+        ctx->ch_units[i].waves_info_prev = &ctx->ch_units[i].wave_synth_hist[1];
+    }
+
+    avctx->sample_fmt = AV_SAMPLE_FMT_FLTP;
+
+    return 0;
+}
+
+static void decode_residual_spectrum(Atrac3pChanUnitCtx *ctx,
+                                     float out[2][ATRAC3P_FRAME_SAMPLES],
+                                     int num_channels,
+                                     AVCodecContext *avctx)
+{
+    int i, sb, ch, qu, nspeclines, RNG_index;
+    float *dst, q;
+    int16_t *src;
+    /* calculate RNG table index for each subband */
+    int sb_RNG_index[ATRAC3P_SUBBANDS] = { 0 };
+
+    if (ctx->mute_flag) {
+        for (ch = 0; ch < num_channels; ch++)
+            memset(out[ch], 0, ATRAC3P_FRAME_SAMPLES * sizeof(*out[ch]));
+        return;
+    }
+
+    for (qu = 0, RNG_index = 0; qu < ctx->used_quant_units; qu++)
+        RNG_index += ctx->channels[0].qu_sf_idx[qu] +
+                     ctx->channels[1].qu_sf_idx[qu];
+
+    for (sb = 0; sb < ctx->num_coded_subbands; sb++, RNG_index += 128)
+        sb_RNG_index[sb] = RNG_index & 0x3FC;
+
+    /* inverse quant and power compensation */
+    for (ch = 0; ch < num_channels; ch++) {
+        /* clear channel's residual spectrum */
+        memset(out[ch], 0, ATRAC3P_FRAME_SAMPLES * sizeof(*out[ch]));
+
+        for (qu = 0; qu < ctx->used_quant_units; qu++) {
+            src        = &ctx->channels[ch].spectrum[ff_atrac3p_qu_to_spec_pos[qu]];
+            dst        = &out[ch][ff_atrac3p_qu_to_spec_pos[qu]];
+            nspeclines = ff_atrac3p_qu_to_spec_pos[qu + 1] -
+                         ff_atrac3p_qu_to_spec_pos[qu];
+
+            if (ctx->channels[ch].qu_wordlen[qu] > 0) {
+                q = ff_atrac3p_sf_tab[ctx->channels[ch].qu_sf_idx[qu]] *
+                    ff_atrac3p_mant_tab[ctx->channels[ch].qu_wordlen[qu]];
+                for (i = 0; i < nspeclines; i++)
+                    dst[i] = src[i] * q;
+            }
+        }
+
+        for (sb = 0; sb < ctx->num_coded_subbands; sb++)
+            ff_atrac3p_power_compensation(ctx, ch, &out[ch][0],
+                                          sb_RNG_index[sb], sb);
+    }
+
+    if (ctx->unit_type == CH_UNIT_STEREO) {
+        for (sb = 0; sb < ctx->num_coded_subbands; sb++) {
+            if (ctx->swap_channels[sb]) {
+                for (i = 0; i < ATRAC3P_SUBBAND_SAMPLES; i++)
+                    FFSWAP(float, out[0][sb * ATRAC3P_SUBBAND_SAMPLES + i],
+                                  out[1][sb * ATRAC3P_SUBBAND_SAMPLES + i]);
+            }
+
+            /* flip coefficients' sign if requested */
+            if (ctx->negate_coeffs[sb])
+                for (i = 0; i < ATRAC3P_SUBBAND_SAMPLES; i++)
+                    out[1][sb * ATRAC3P_SUBBAND_SAMPLES + i] = -(out[1][sb * ATRAC3P_SUBBAND_SAMPLES + i]);
+        }
+    }
+}
+
+static void reconstruct_frame(ATRAC3PContext *ctx, Atrac3pChanUnitCtx *ch_unit,
+                              int num_channels, AVCodecContext *avctx)
+{
+    int ch, sb;
+
+    for (ch = 0; ch < num_channels; ch++) {
+        for (sb = 0; sb < ch_unit->num_subbands; sb++) {
+            /* inverse transform and windowing */
+            ff_atrac3p_imdct(&ctx->fdsp, &ctx->mdct_ctx,
+                             &ctx->samples[ch][sb * ATRAC3P_SUBBAND_SAMPLES],
+                             &ctx->mdct_buf[ch][sb * ATRAC3P_SUBBAND_SAMPLES],
+                             (ch_unit->channels[ch].wnd_shape_prev[sb] << 1) +
+                             ch_unit->channels[ch].wnd_shape[sb], sb);
+
+            /* gain compensation and overlapping */
+            ff_atrac_gain_compensation(&ctx->gainc_ctx,
+                                       &ctx->mdct_buf[ch][sb * ATRAC3P_SUBBAND_SAMPLES],
+                                       &ch_unit->prev_buf[ch][sb * ATRAC3P_SUBBAND_SAMPLES],
+                                       &ch_unit->channels[ch].gain_data_prev[sb],
+                                       &ch_unit->channels[ch].gain_data[sb],
+                                       ATRAC3P_SUBBAND_SAMPLES,
+                                       &ctx->time_buf[ch][sb * ATRAC3P_SUBBAND_SAMPLES]);
+        }
+
+        /* zero unused subbands in both output and overlapping buffers */
+        memset(&ch_unit->prev_buf[ch][ch_unit->num_subbands * ATRAC3P_SUBBAND_SAMPLES],
+               0,
+               (ATRAC3P_SUBBANDS - ch_unit->num_subbands) *
+               ATRAC3P_SUBBAND_SAMPLES *
+               sizeof(ch_unit->prev_buf[ch][ch_unit->num_subbands * ATRAC3P_SUBBAND_SAMPLES]));
+        memset(&ctx->time_buf[ch][ch_unit->num_subbands * ATRAC3P_SUBBAND_SAMPLES],
+               0,
+               (ATRAC3P_SUBBANDS - ch_unit->num_subbands) *
+               ATRAC3P_SUBBAND_SAMPLES *
+               sizeof(ctx->time_buf[ch][ch_unit->num_subbands * ATRAC3P_SUBBAND_SAMPLES]));
+
+        /* resynthesize and add tonal signal */
+        if (ch_unit->waves_info->tones_present ||
+            ch_unit->waves_info_prev->tones_present) {
+            for (sb = 0; sb < ch_unit->num_subbands; sb++)
+                if (ch_unit->channels[ch].tones_info[sb].num_wavs ||
+                    ch_unit->channels[ch].tones_info_prev[sb].num_wavs) {
+                    ff_atrac3p_generate_tones(ch_unit, &ctx->fdsp, ch, sb,
+                                              &ctx->time_buf[ch][sb * 128]);
+                }
+        }
+
+        /* subband synthesis and acoustic signal output */
+        ff_atrac3p_ipqf(&ctx->ipqf_dct_ctx, &ch_unit->ipqf_ctx[ch],
+                        &ctx->time_buf[ch][0], &ctx->outp_buf[ch][0]);
+    }
+
+    /* swap window shape and gain control buffers. */
+    for (ch = 0; ch < num_channels; ch++) {
+        FFSWAP(uint8_t *, ch_unit->channels[ch].wnd_shape,
+               ch_unit->channels[ch].wnd_shape_prev);
+        FFSWAP(AtracGainInfo *, ch_unit->channels[ch].gain_data,
+               ch_unit->channels[ch].gain_data_prev);
+        FFSWAP(Atrac3pWavesData *, ch_unit->channels[ch].tones_info,
+               ch_unit->channels[ch].tones_info_prev);
+    }
+
+    FFSWAP(Atrac3pWaveSynthParams *, ch_unit->waves_info, ch_unit->waves_info_prev);
+}
+
+static int atrac3p_decode_frame(AVCodecContext *avctx, void *data,
+                                int *got_frame_ptr, AVPacket *avpkt)
+{
+    ATRAC3PContext *ctx = avctx->priv_data;
+    AVFrame *frame      = data;
+    int i, ret, ch_unit_id, ch_block = 0, out_ch_index = 0, channels_to_process;
+    float **samples_p = (float **)frame->extended_data;
+
+    frame->nb_samples = ATRAC3P_FRAME_SAMPLES;
+    if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) {
+        av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
+        return ret;
+    }
+
+    if ((ret = init_get_bits8(&ctx->gb, avpkt->data, avpkt->size)) < 0)
+        return ret;
+
+    if (get_bits1(&ctx->gb)) {
+        av_log(avctx, AV_LOG_ERROR, "Invalid start bit!\n");
+        return AVERROR_INVALIDDATA;
+    }
+
+    while (get_bits_left(&ctx->gb) >= 2 &&
+           (ch_unit_id = get_bits(&ctx->gb, 2)) != CH_UNIT_TERMINATOR) {
+        if (ch_unit_id == CH_UNIT_EXTENSION) {
+            avpriv_report_missing_feature(avctx, "Channel unit extension");
+            return AVERROR_PATCHWELCOME;
+        }
+        if (ch_block >= ctx->num_channel_blocks ||
+            ctx->channel_blocks[ch_block] != ch_unit_id) {
+            av_log(avctx, AV_LOG_ERROR,
+                   "Frame data doesn't match channel configuration!\n");
+            return AVERROR_INVALIDDATA;
+        }
+
+        ctx->ch_units[ch_block].unit_type = ch_unit_id;
+        channels_to_process               = ch_unit_id + 1;
+
+        if ((ret = ff_atrac3p_decode_channel_unit(&ctx->gb,
+                                                  &ctx->ch_units[ch_block],
+                                                  channels_to_process,
+                                                  avctx)) < 0)
+            return ret;
+
+        decode_residual_spectrum(&ctx->ch_units[ch_block], ctx->samples,
+                                 channels_to_process, avctx);
+        reconstruct_frame(ctx, &ctx->ch_units[ch_block],
+                          channels_to_process, avctx);
+
+        for (i = 0; i < channels_to_process; i++)
+            memcpy(samples_p[out_ch_index + i], ctx->outp_buf[i],
+                   ATRAC3P_FRAME_SAMPLES * sizeof(**samples_p));
+
+        ch_block++;
+        out_ch_index += channels_to_process;
+    }
+
+    *got_frame_ptr = 1;
+
+    return avctx->block_align;
+}
+
+AVCodec ff_atrac3p_decoder = {
+    .name           = "atrac3plus",
+    .long_name      = NULL_IF_CONFIG_SMALL("ATRAC3+ (Adaptive TRansform Acoustic Coding 3+)"),
+    .type           = AVMEDIA_TYPE_AUDIO,
+    .id             = AV_CODEC_ID_ATRAC3P,
+    .priv_data_size = sizeof(ATRAC3PContext),
+    .init           = atrac3p_decode_init,
+    .close          = atrac3p_decode_close,
+    .decode         = atrac3p_decode_frame,
+};

omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/atrac3plusdsp.c Added

@@ -0,0 +1,638 @@
+/*
+ * ATRAC3+ compatible decoder
+ *
+ * Copyright (c) 2010-2013 Maxim Poliakovski
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ *  @file
+ *  DSP functions for ATRAC3+ decoder.
+ */
+
+#include <math.h>
+
+#include "libavutil/float_dsp.h"
+#include "avcodec.h"
+#include "sinewin.h"
+#include "fft.h"
+#include "atrac3plus.h"
+
+/**
+ *  Map quant unit number to its position in the spectrum.
+ *  To get the number of spectral lines in each quant unit do the following:
+ *  num_specs = qu_to_spec_pos[i+1] - qu_to_spec_pos[i]
+ */
+const uint16_t ff_atrac3p_qu_to_spec_pos[33] = {
+      0,    16,   32,   48,   64,   80,   96,  112,
+    128,   160,  192,  224,  256,  288,  320,  352,
+    384,   448,  512,  576,  640,  704,  768,  896,
+    1024, 1152, 1280, 1408, 1536, 1664, 1792, 1920,
+    2048
+};
+
+/* Scalefactors table. */
+/* Approx. Equ: pow(2.0, (i - 16.0 + 0.501783948) / 3.0) */
+const float ff_atrac3p_sf_tab[64] = {
+    0.027852058,  0.0350914, 0.044212341, 0.055704117,  0.0701828,
+    0.088424683, 0.11140823,   0.1403656,  0.17684937, 0.22281647, 0.2807312, 0.35369873,
+    0.44563293,   0.5614624,  0.70739746,  0.89126587,  1.1229248, 1.4147949,  1.7825317,
+    2.2458496,    2.8295898,   3.5650635,   4.4916992,  5.6591797,  7.130127,  8.9833984,
+    11.318359,    14.260254,   17.966797,   22.636719,  28.520508, 35.933594,  45.273438,
+    57.041016,    71.867188,   90.546875,   114.08203,  143.73438, 181.09375,  228.16406,
+    287.46875,     362.1875,   456.32812,    574.9375,    724.375, 912.65625,   1149.875,
+    1448.75,      1825.3125,     2299.75,      2897.5,   3650.625,    4599.5,     5795.0,
+    7301.25,         9199.0,     11590.0,     14602.5,    18398.0,   23180.0,    29205.0,
+    36796.0,        46360.0,     58410.0
+};
+
+/* Mantissa table. */
+/* pow(10, x * log10(2) + 0.05) / 2 / ([1,2,3,5,7,15,31] + 0.5) */
+const float ff_atrac3p_mant_tab[8] = {
+    0.0,
+    0.74801636,
+    0.44882202,
+    0.32058716,
+    0.20400238,
+    0.1496048,
+    0.07239151,
+    0.035619736
+};
+
+#define ATRAC3P_MDCT_SIZE (ATRAC3P_SUBBAND_SAMPLES * 2)
+
+av_cold void ff_atrac3p_init_imdct(AVCodecContext *avctx, FFTContext *mdct_ctx)
+{
+    ff_init_ff_sine_windows(7);
+    ff_init_ff_sine_windows(6);
+
+    /* Initialize the MDCT transform. */
+    ff_mdct_init(mdct_ctx, 8, 1, -1.0);
+}
+
+#define TWOPI (2 * M_PI)
+
+#define DEQUANT_PHASE(ph) (((ph) & 0x1F) << 6)
+
+static DECLARE_ALIGNED(32, float, sine_table)[2048]; ///< wave table
+static DECLARE_ALIGNED(32, float, hann_window)[256]; ///< Hann windowing function
+static float amp_sf_tab[64];   ///< scalefactors for quantized amplitudes
+
+av_cold void ff_atrac3p_init_wave_synth(void)
+{
+    int i;
+
+    /* generate sine wave table */
+    for (i = 0; i < 2048; i++)
+        sine_table[i] = sin(TWOPI * i / 2048);
+
+    /* generate Hann window */
+    for (i = 0; i < 256; i++)
+        hann_window[i] = (1.0f - cos(TWOPI * i / 256.0f)) * 0.5f;
+
+    /* generate amplitude scalefactors table */
+    for (i = 0; i < 64; i++)
+        amp_sf_tab[i] = pow(2.0f, ((double)i - 3) / 4.0f);
+}
+
+/**
+ *  Synthesize sine waves according to given parameters.
+ *
+ *  @param[in]    synth_param   ptr to common synthesis parameters
+ *  @param[in]    waves_info    parameters for each sine wave
+ *  @param[in]    envelope      envelope data for all waves in a group
+ *  @param[in]    phase_shift   flag indicates 180° phase shift
+ *  @param[in]    reg_offset    region offset for trimming envelope data
+ *  @param[out]   out           receives sythesized data
+ */
+static void waves_synth(Atrac3pWaveSynthParams *synth_param,
+                        Atrac3pWavesData *waves_info,
+                        Atrac3pWaveEnvelope *envelope,
+                        int phase_shift, int reg_offset, float *out)
+{
+    int i, wn, inc, pos;
+    double amp;
+    Atrac3pWaveParam *wave_param = &synth_param->waves[waves_info->start_index];
+
+    for (wn = 0; wn < waves_info->num_wavs; wn++, wave_param++) {
+        /* amplitude dequantization */
+        amp = amp_sf_tab[wave_param->amp_sf] *
+              (!synth_param->amplitude_mode
+               ? (wave_param->amp_index + 1) / 15.13f
+               : 1.0f);
+
+        inc = wave_param->freq_index;
+        pos = DEQUANT_PHASE(wave_param->phase_index) - (reg_offset ^ 128) * inc & 2047;
+
+        /* waveform generation */
+        for (i = 0; i < 128; i++) {
+            out[i] += sine_table[pos] * amp;
+            pos     = (pos + inc) & 2047;
+        }
+    }
+
+    /* fade in with steep Hann window if requested */
+    if (envelope->has_start_point) {
+        pos = (envelope->start_pos << 2) - reg_offset;
+        if (pos > 0 && pos <= 128) {
+            memset(out, 0, pos * sizeof(*out));
+            if (!envelope->has_stop_point ||
+                envelope->start_pos != envelope->stop_pos) {
+                out[pos + 0] *= hann_window[0];
+                out[pos + 1] *= hann_window[32];
+                out[pos + 2] *= hann_window[64];
+                out[pos + 3] *= hann_window[96];
+            }
+        }
+    }
+
+    /* fade out with steep Hann window if requested */
+    if (envelope->has_stop_point) {
+        pos = (envelope->stop_pos + 1 << 2) - reg_offset;
+        if (pos > 0 && pos <= 128) {
+            out[pos - 4] *= hann_window[96];
+            out[pos - 3] *= hann_window[64];
+            out[pos - 2] *= hann_window[32];
+            out[pos - 1] *= hann_window[0];
+            memset(&out[pos], 0, (128 - pos) * sizeof(out[pos]));
+        }
+    }
+}
+
+void ff_atrac3p_generate_tones(Atrac3pChanUnitCtx *ch_unit, AVFloatDSPContext *fdsp,
+                               int ch_num, int sb, float *out)
+{
+    DECLARE_ALIGNED(32, float, wavreg1)[128] = { 0 };
+    DECLARE_ALIGNED(32, float, wavreg2)[128] = { 0 };
+    int i, reg1_env_nonzero, reg2_env_nonzero;
+    Atrac3pWavesData *tones_now  = &ch_unit->channels[ch_num].tones_info_prev[sb];
+    Atrac3pWavesData *tones_next = &ch_unit->channels[ch_num].tones_info[sb];
+
+    /* reconstruct full envelopes for both overlapping regions
+     * from truncated bitstream data */
+    if (tones_next->pend_env.has_start_point &&
+        tones_next->pend_env.start_pos < tones_next->pend_env.stop_pos) {
+        tones_next->curr_env.has_start_point = 1;
+        tones_next->curr_env.start_pos       = tones_next->pend_env.start_pos + 32;
+    } else if (tones_now->pend_env.has_start_point) {
+        tones_next->curr_env.has_start_point = 1;
+        tones_next->curr_env.start_pos       = tones_now->pend_env.start_pos;
+    } else {
+        tones_next->curr_env.has_start_point = 0;
+        tones_next->curr_env.start_pos       = 0;
+    }
+
+    if (tones_now->pend_env.has_stop_point &&
+        tones_now->pend_env.stop_pos >= tones_next->curr_env.start_pos) {
+        tones_next->curr_env.has_stop_point = 1;
+        tones_next->curr_env.stop_pos       = tones_now->pend_env.stop_pos;
+    } else if (tones_next->pend_env.has_stop_point) {
+        tones_next->curr_env.has_stop_point = 1;
+        tones_next->curr_env.stop_pos       = tones_next->pend_env.stop_pos + 32;
+    } else {
+        tones_next->curr_env.has_stop_point = 0;
+        tones_next->curr_env.stop_pos       = 64;
+    }
+
+    /* is the visible part of the envelope non-zero? */
+    reg1_env_nonzero = (tones_now->curr_env.stop_pos    < 32) ? 0 : 1;
+    reg2_env_nonzero = (tones_next->curr_env.start_pos >= 32) ? 0 : 1;
+
+    /* synthesize waves for both overlapping regions */
+    if (tones_now->num_wavs && reg1_env_nonzero)
+        waves_synth(ch_unit->waves_info_prev, tones_now, &tones_now->curr_env,
+                    ch_unit->waves_info_prev->phase_shift[sb] & ch_num,
+                    128, wavreg1);
+
+    if (tones_next->num_wavs && reg2_env_nonzero)
+        waves_synth(ch_unit->waves_info, tones_next, &tones_next->curr_env,
+                    ch_unit->waves_info->phase_shift[sb] & ch_num, 0, wavreg2);
+
+    /* Hann windowing for non-faded wave signals */
+    if (tones_now->num_wavs && tones_next->num_wavs &&
+        reg1_env_nonzero && reg2_env_nonzero) {
+        fdsp->vector_fmul(wavreg1, wavreg1, &hann_window[128], 128);
+        fdsp->vector_fmul(wavreg2, wavreg2,  hann_window,      128);
+    } else {
+        if (tones_now->num_wavs && !tones_now->curr_env.has_stop_point)
+            fdsp->vector_fmul(wavreg1, wavreg1, &hann_window[128], 128);
+
+        if (tones_next->num_wavs && !tones_next->curr_env.has_start_point)
+            fdsp->vector_fmul(wavreg2, wavreg2, hann_window, 128);
+    }
+
+    /* Overlap and add to residual */
+    for (i = 0; i < 128; i++)
+        out[i] += wavreg1[i] + wavreg2[i];
+}
+
+static const int subband_to_powgrp[ATRAC3P_SUBBANDS] = {
+    0, 1, 1, 2, 2, 2, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4
+};
+
+/* noise table for power compensation */
+static const float noise_tab[1024] = {
+    -0.01358032,  -0.05593872,   0.01696777,  -0.14871216,  -0.26412964,  -0.09893799,   0.25723267,
+     0.02008057,  -0.72235107,  -0.44351196,  -0.22985840,   0.16833496,   0.46902466,   0.05917358,
+    -0.15179443,   0.41299438,  -0.01287842,   0.13360596,   0.43557739,  -0.09530640,  -0.58422852,
+     0.39266968,  -0.08343506,  -0.25604248,   0.22848511,   0.26013184,  -0.65588379,   0.17288208,
+    -0.08673096,  -0.05203247,   0.07299805,  -0.28665161,  -0.35806274,   0.06552124,  -0.09387207,
+     0.21099854,  -0.28347778,  -0.72402954,   0.05050659,  -0.10635376,  -0.18853760,   0.29724121,
+     0.20703125,  -0.29791260,  -0.37634277,   0.47970581,  -0.09976196,   0.32641602,  -0.29248047,
+    -0.28237915,   0.26028442,  -0.36157227,   0.22042847,  -0.03222656,  -0.37268066,  -0.03759766,
+     0.09909058,   0.23284912,   0.19320679,   0.14453125,  -0.02139282,  -0.19702148,   0.31533813,
+    -0.16741943,   0.35031128,  -0.35656738,  -0.66128540,  -0.00701904,   0.20898438,   0.26837158,
+    -0.33706665,  -0.04568481,   0.12600708,   0.10284424,   0.07321167,  -0.18280029,   0.38101196,
+     0.21301270,   0.04541016,   0.01156616,  -0.26391602,  -0.02346802,  -0.22125244,   0.29760742,
+    -0.36233521,  -0.31314087,  -0.13967896,  -0.11276245,  -0.19433594,   0.34490967,   0.02343750,
+     0.21963501,  -0.02777100,  -0.67678833,  -0.08999634,   0.14233398,  -0.27697754,   0.51422119,
+    -0.05047607,   0.48327637,   0.37167358,  -0.60806274,   0.18728638,  -0.15191650,   0.00637817,
+     0.02832031,  -0.15618896,   0.60644531,   0.21826172,   0.06384277,  -0.31863403,   0.08816528,
+     0.15447998,  -0.07015991,  -0.08154297,  -0.40966797,  -0.39785767,  -0.11709595,   0.22052002,
+     0.18466187,  -0.17257690,   0.03759766,  -0.06195068,   0.00433350,   0.12176514,   0.34011841,
+     0.25610352,  -0.05294800,   0.41033936,   0.16854858,  -0.76187134,   0.13845825,  -0.19418335,
+    -0.21524048,  -0.44412231,  -0.08160400,  -0.28195190,  -0.01873779,   0.15524292,  -0.37438965,
+    -0.44860840,   0.43096924,  -0.24746704,   0.49856567,   0.14859009,   0.38159180,   0.20541382,
+    -0.39175415,  -0.65850830,  -0.43716431,   0.13037109,  -0.05111694,   0.39956665,   0.21447754,
+    -0.04861450,   0.33654785,   0.10589600,  -0.88085938,  -0.30822754,   0.38577271,   0.30047607,
+     0.38836670,   0.09118652,  -0.36477661,  -0.01641846,  -0.23031616,   0.26058960,   0.18859863,
+    -0.21868896,  -0.17861938,  -0.29754639,   0.09777832,   0.10806274,  -0.51605225,   0.00076294,
+     0.13259888,   0.11090088,  -0.24084473,   0.24957275,   0.01379395,  -0.04141235,  -0.04937744,
+     0.57394409,   0.27410889,   0.27587891,   0.45013428,  -0.32592773,   0.11160278,  -0.00970459,
+     0.29092407,   0.03356934,  -0.70925903,   0.04882812,   0.43499756,   0.07720947,  -0.27554321,
+    -0.01742554,  -0.08413696,  -0.04028320,  -0.52850342,  -0.07330322,   0.05181885,   0.21362305,
+    -0.18765259,   0.07058716,  -0.03009033,   0.32662964,   0.27023315,  -0.28002930,   0.17568970,
+     0.03338623,   0.30242920,  -0.03921509,   0.32174683,  -0.23733521,   0.08575439,  -0.38269043,
+     0.09194946,  -0.07238770,   0.17941284,  -0.51278687,  -0.25146484,   0.19790649,  -0.19195557,
+     0.16549683,   0.42456055,   0.39129639,  -0.02868652,   0.17980957,   0.24902344,  -0.76583862,
+    -0.20959473,   0.61013794,   0.37011719,   0.36859131,  -0.04486084,   0.10678101,  -0.15994263,
+    -0.05328369,   0.28463745,  -0.06420898,  -0.36987305,  -0.28009033,  -0.11764526,   0.04312134,
+    -0.08038330,   0.04885864,  -0.03067017,  -0.00042725,   0.34289551,  -0.00988770,   0.34838867,
+     0.32516479,  -0.16271973,   0.38269043,   0.03240967,   0.12417603,  -0.14331055,  -0.34902954,
+    -0.18325806,   0.29421997,   0.44284058,   0.75170898,  -0.67245483,  -0.12176514,   0.27914429,
+    -0.29806519,   0.19863892,   0.30087280,   0.22680664,  -0.36633301,  -0.32534790,  -0.57553101,
+    -0.16641235,   0.43811035,   0.08331299,   0.15942383,   0.26516724,  -0.24240112,  -0.11761475,
+    -0.16827393,  -0.14260864,   0.46343994,   0.11804199,  -0.55514526,  -0.02520752,  -0.14309692,
+     0.00448608,   0.02749634,  -0.30545044,   0.70965576,   0.45108032,   0.66439819,  -0.68255615,
+    -0.12496948,   0.09146118,  -0.21109009,  -0.23791504,   0.79943848,  -0.35205078,  -0.24963379,
+     0.18719482,  -0.19079590,   0.07458496,   0.07623291,  -0.28781128,  -0.37121582,  -0.19580078,
+    -0.01773071,  -0.16717529,   0.13040161,   0.14672852,   0.42379761,   0.03582764,   0.11431885,
+     0.05145264,   0.44702148,   0.08963013,   0.01367188,  -0.54519653,  -0.12692261,   0.21176147,
+     0.04925537,   0.30670166,  -0.11029053,   0.19555664,  -0.27740479,   0.23043823,   0.15554810,
+    -0.19299316,  -0.25729370,   0.17800903,  -0.03579712,  -0.05065918,  -0.06933594,  -0.09500122,
+    -0.07821655,   0.23889160,  -0.31900024,   0.03073120,  -0.00415039,   0.61315918,   0.37176514,
+    -0.13442993,  -0.15536499,  -0.19216919,  -0.37899780,   0.19992065,   0.02630615,  -0.12573242,
+     0.25927734,  -0.02447510,   0.29629517,  -0.40731812,  -0.17333984,   0.24310303,  -0.10607910,
+     0.14828491,   0.08792114,  -0.18743896,  -0.05572510,  -0.04833984,   0.10473633,  -0.29028320,
+    -0.67687988,  -0.28170776,  -0.41687012,   0.05413818,  -0.23284912,   0.09555054,  -0.08969116,
+    -0.15112305,   0.12738037,   0.35986328,   0.28948975,   0.30691528,   0.23956299,   0.06973267,
+    -0.31198120,  -0.18450928,   0.22280884,  -0.21600342,   0.23522949,  -0.61840820,  -0.13012695,
+     0.26412964,   0.47320557,  -0.26440430,   0.38757324,   0.17352295,  -0.26104736,  -0.25866699,
+    -0.12274170,  -0.29733276,   0.07687378,   0.18588257,  -0.08880615,   0.31185913,   0.05313110,
+    -0.10885620,  -0.14901733,  -0.22323608,  -0.08538818,   0.19812012,   0.19732666,  -0.18927002,
+     0.29058838,   0.25555420,  -0.48599243,   0.18768311,   0.01345825,   0.34887695,   0.21530151,
+     0.19857788,   0.18661499,  -0.01394653,  -0.09063721,  -0.38781738,   0.27160645,  -0.20379639,
+    -0.32119751,  -0.23889160,   0.27096558,   0.24951172,   0.07922363,   0.07479858,  -0.50946045,
+     0.10220337,   0.58364868,  -0.19503784,  -0.18560791,  -0.01165771,   0.47195435,   0.22430420,
+    -0.38635254,  -0.03732300,  -0.09179688,   0.06991577,   0.15106201,   0.20605469,  -0.05969238,
+    -0.41821289,   0.12231445,  -0.04672241,  -0.05117798,  -0.11523438,  -0.51849365,  -0.04077148,
+     0.44284058,  -0.64086914,   0.17019653,   0.02236938,   0.22848511,  -0.23214722,  -0.32354736,
+    -0.14068604,  -0.29690552,  -0.19891357,   0.02774048,  -0.20965576,  -0.52191162,  -0.19299316,
+    -0.07290649,   0.49053955,  -0.22302246,   0.05642700,   0.13122559,  -0.20819092,  -0.83590698,
+    -0.08181763,   0.26797485,  -0.00091553,  -0.09457397,   0.17089844,  -0.27020264,   0.30270386,
+     0.05496216,   0.09564209,  -0.08590698,   0.02130127,   0.35931396,   0.21728516,  -0.15396118,
+    -0.05053711,   0.02719116,   0.16302490,   0.43212891,   0.10229492,  -0.40820312,   0.21646118,
+     0.08435059,  -0.11145020,  -0.39962769,  -0.05618286,  -0.10223389,  -0.60839844,   0.33724976,
+    -0.06341553,  -0.47369385,  -0.32852173,   0.05242920,   0.19635010,  -0.19137573,  -0.67901611,
+     0.16180420,   0.05133057,  -0.22283936,   0.09646606,   0.24288940,  -0.45007324,   0.08804321,
+     0.14053345,   0.22619629,  -0.01000977,   0.36355591,  -0.19863892,  -0.30364990,  -0.24118042,
+    -0.57461548,   0.26498413,   0.04345703,  -0.09796143,  -0.47714233,  -0.23739624,   0.18737793,
+     0.08926392,  -0.02795410,   0.00305176,  -0.08700562,  -0.38711548,   0.03222656,   0.10940552,
+    -0.41906738,  -0.01620483,  -0.47061157,   0.37985229,  -0.21624756,   0.47976685,  -0.20046997,
+    -0.62533569,  -0.26907349,  -0.02877808,   0.00671387,  -0.29071045,  -0.24685669,  -0.15722656,
+    -0.26055908,   0.29968262,   0.28225708,  -0.08990479,  -0.16748047,  -0.46759033,  -0.25067139,
+    -0.25183105,  -0.45932007,   0.05828857,   0.29006958,   0.23840332,  -0.17974854,   0.26931763,
+     0.10696411,  -0.06848145,  -0.17126465,  -0.10522461,  -0.55386353,  -0.42306519,  -0.07608032,
+     0.24380493,   0.38586426,   0.16882324,   0.26751709,   0.17303467,   0.35809326,  -0.22094727,
+    -0.30703735,  -0.28497314,  -0.04321289,   0.15219116,  -0.17071533,  -0.39334106,   0.03439331,
+    -0.10809326,  -0.30590820,   0.26449585,  -0.07412720,   0.13638306,  -0.01062012,   0.27996826,
+     0.04397583,  -0.05557251,  -0.56933594,   0.03363037,  -0.00949097,   0.52642822,  -0.44329834,
+     0.28308105,  -0.05499268,  -0.23312378,  -0.29870605,  -0.05123901,   0.26831055,  -0.35238647,
+    -0.30993652,   0.34646606,  -0.19775391,   0.44595337,   0.13769531,   0.45358276,   0.19961548,
+     0.42681885,   0.15722656,   0.00128174,   0.23757935,   0.40988159,   0.25164795,  -0.00732422,
+    -0.12405396,  -0.43420410,  -0.00402832,   0.34243774,   0.36264038,   0.18807983,  -0.09301758,
+    -0.10296631,   0.05532837,  -0.31652832,   0.14337158,   0.35040283,   0.32540894,   0.05728149,
+    -0.12030029,  -0.25942993,  -0.20312500,  -0.16491699,  -0.46051025,  -0.08004761,   0.50772095,
+     0.16168213,   0.28439331,   0.08105469,  -0.19104004,   0.38589478,  -0.16400146,  -0.25454712,
+     0.20281982,  -0.20730591,  -0.06311035,   0.32937622,   0.15032959,  -0.05340576,   0.30487061,
+    -0.11648560,   0.38009644,  -0.20062256,   0.43466187,   0.01150513,   0.35754395,  -0.13146973,
+     0.67489624,   0.05212402,   0.27914429,  -0.39431763,   0.75308228,  -0.13366699,   0.24453735,
+     0.42248535,  -0.65905762,  -0.00546265,  -0.03491211,  -0.13659668,  -0.08294678,  -0.45666504,
+     0.27188110,   0.12731934,   0.61148071,   0.10449219,  -0.28836060,   0.00091553,   0.24618530,
+     0.13119507,   0.05685425,   0.17355347,   0.42034912,   0.08514404,   0.24536133,   0.18951416,
+    -0.19107056,  -0.15036011,   0.02334595,   0.54986572,   0.32321167,  -0.16104126,  -0.03054810,
+     0.43594360,   0.17309570,   0.61053467,   0.24731445,   0.33334351,   0.15240479,   0.15588379,
+     0.36425781,  -0.30407715,  -0.13302612,   0.00427246,   0.04171753,  -0.33178711,   0.34216309,
+    -0.12463379,  -0.02764893,   0.05905151,  -0.31436157,   0.16531372,   0.34542847,  -0.03292847,
+     0.12527466,  -0.12313843,  -0.13171387,   0.04757690,  -0.45095825,  -0.19085693,   0.35342407,
+    -0.23239136,  -0.34387207,   0.11264038,  -0.15740967,   0.05273438,   0.74942017,   0.21505737,
+     0.08514404,  -0.42391968,  -0.19531250,   0.35293579,   0.25305176,   0.15731812,  -0.70324707,
+    -0.21591187,   0.35604858,   0.14132690,   0.11724854,   0.15853882,  -0.24597168,   0.07019043,
+     0.02127075,   0.12658691,   0.06390381,  -0.12292480,   0.15441895,  -0.47640991,   0.06195068,
+     0.58981323,  -0.15151978,  -0.03604126,  -0.45059204,  -0.01672363,  -0.46997070,   0.25750732,
+     0.18084717,   0.06661987,   0.13253784,   0.67828369,   0.11370850,   0.11325073,  -0.04611206,
+    -0.07791138,  -0.36544800,  -0.06747437,  -0.31594849,   0.16131592,   0.41983032,   0.11071777,
+    -0.36889648,   0.30963135,  -0.37875366,   0.58508301,   0.00393677,   0.12338257,   0.03424072,
+    -0.21728516,  -0.12838745,  -0.46981812,   0.05868530,  -0.25015259,   0.27407837,   0.65240479,
+    -0.34429932,  -0.15179443,   0.14056396,   0.33505249,   0.28826904,   0.09921265,   0.34390259,
+     0.13656616,  -0.23608398,   0.00863647,   0.02627563,  -0.19119263,   0.19775391,  -0.07214355,
+     0.07809448,   0.03454590,  -0.03417969,   0.00033569,  -0.23095703,   0.18673706,   0.05798340,
+     0.03814697,  -0.04318237,   0.05487061,   0.08633423,   0.55950928,  -0.06347656,   0.10333252,
+     0.25305176,   0.05853271,   0.12246704,  -0.25543213,  -0.34262085,  -0.36437988,  -0.21304321,
+    -0.05093384,   0.02777100,   0.07620239,  -0.21215820,  -0.09326172,   0.19021606,  -0.40579224,
+    -0.01193237,   0.19845581,  -0.35336304,  -0.07397461,   0.20104980,   0.08615112,  -0.44375610,
+     0.11419678,   0.24453735,  -0.16555786,  -0.05081177,  -0.01406860,   0.27893066,  -0.18692017,
+     0.07473755,   0.03451538,  -0.39733887,   0.21548462,  -0.22534180,  -0.39651489,  -0.04989624,
+    -0.57662964,   0.06390381,   0.62020874,  -0.13470459,   0.04345703,  -0.21862793,  -0.02789307,
+     0.51696777,  -0.27587891,   0.39004517,   0.09857178,  -0.00738525,   0.31317139,   0.00048828,
+    -0.46572876,   0.29531860,  -0.10009766,  -0.27856445,   0.03594971,   0.25048828,  -0.74584961,
+    -0.25350952,  -0.03302002,   0.31188965,   0.01571655,   0.46710205,   0.21591187,   0.07260132,
+    -0.42132568,  -0.53900146,  -0.13674927,  -0.16571045,  -0.34454346,   0.12359619,  -0.11184692,
+     0.00967407,   0.34576416,  -0.05761719,   0.34848022,   0.17645264,  -0.39395142,   0.10339355,
+     0.18215942,   0.20697021,   0.59109497,  -0.11560059,  -0.07385254,   0.10397339,   0.35437012,
+    -0.22863770,   0.01794434,   0.17559814,  -0.17495728,   0.12142944,   0.10928345,  -1.00000000,
+    -0.01379395,   0.21237183,  -0.27035522,   0.27319336,  -0.37066650,   0.41354370,  -0.40054321,
+     0.00689697,   0.26321411,   0.39266968,   0.65298462,   0.41625977,  -0.13909912,   0.78375244,
+    -0.30941772,   0.20169067,  -0.39367676,   0.94021606,  -0.24066162,   0.05557251,  -0.24533081,
+    -0.05444336,  -0.76754761,  -0.19375610,  -0.11041260,  -0.17532349,   0.16006470,   0.02188110,
+     0.17465210,  -0.04342651,  -0.56777954,  -0.40988159,   0.26687622,   0.11700439,  -0.00344849,
+    -0.05395508,   0.37426758,  -0.40719604,  -0.15032959,  -0.01660156,   0.04196167,  -0.04559326,
+    -0.12969971,   0.12011719,   0.08419800,  -0.11199951,   0.35174561,   0.10275269,  -0.25686646,
+     0.48446655,   0.03225708,   0.28408813,  -0.18701172,   0.36282349,  -0.03280640,   0.32302856,
+     0.17233276,   0.48269653,   0.31112671,  -0.04946899,   0.12774658,   0.52685547,   0.10211182,
+     0.05953979,   0.05999756,   0.20144653,   0.00744629,   0.27316284,   0.24377441,   0.39672852,
+     0.01702881,  -0.35513306,   0.11364746,  -0.13555908,   0.48880005,  -0.15417480,  -0.09149170,
+    -0.02615356,   0.46246338,  -0.72250366,   0.22332764,   0.23849487,  -0.25686646,  -0.08514404,
+    -0.02062988,  -0.34494019,  -0.02297974,  -0.80386353,  -0.08074951,  -0.12689209,  -0.06896973,
+     0.24099731,  -0.35650635,  -0.09558105,   0.29254150,   0.23132324,  -0.16726685,   0.00000000,
+    -0.24237061,   0.30899048,   0.29504395,  -0.20898438,   0.17059326,  -0.07672119,  -0.14395142,
+     0.05572510,   0.20602417,  -0.51550293,  -0.03167725,  -0.48840332,  -0.20425415,   0.14144897,
+     0.07275391,  -0.76669312,  -0.22488403,   0.20651245,   0.03259277,   0.00085449,   0.03039551,
+     0.47555542,   0.38351440
+};
+
+/** Noise level table for power compensation.
+ *  Equ: pow(2.0f, (double)(6 - i) / 3.0f) where i = 0...15 */
+static const float pwc_levs[16] = {
+    3.96875, 3.15625,     2.5,    2.0, 1.59375,   1.25,     1.0, 0.78125,
+    0.625,       0.5, 0.40625, 0.3125,    0.25, 0.1875, 0.15625, 0.0
+};
+
+/** Map subband number to quant unit number. */
+static const int subband_to_qu[17] = {
+    0, 8, 12, 16, 18, 20, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32
+};
+
+void ff_atrac3p_power_compensation(Atrac3pChanUnitCtx *ctx, int ch_index,
+                                   float *sp, int rng_index, int sb)
+{
+    AtracGainInfo *g1, *g2;
+    float pwcsp[ATRAC3P_SUBBAND_SAMPLES], *dst, grp_lev, qu_lev;
+    int i, gain_lev, gcv = 0, qu, nsp;
+    int swap_ch = (ctx->unit_type == CH_UNIT_STEREO && ctx->swap_channels[sb]) ? 1 : 0;
+
+    if (ctx->channels[ch_index ^ swap_ch].power_levs[subband_to_powgrp[sb]] == ATRAC3P_POWER_COMP_OFF)
+        return;
+
+    /* generate initial noise spectrum */
+    for (i = 0; i < ATRAC3P_SUBBAND_SAMPLES; i++, rng_index++)
+        pwcsp[i] = noise_tab[rng_index & 0x3FF];
+
+    /* check gain control information */
+    g1 = &ctx->channels[ch_index ^ swap_ch].gain_data[sb];
+    g2 = &ctx->channels[ch_index ^ swap_ch].gain_data_prev[sb];
+
+    gain_lev = (g1->num_points > 0) ? (6 - g1->lev_code[0]) : 0;
+
+    for (i = 0; i < g2->num_points; i++)
+        gcv = FFMAX(gcv, gain_lev - (g2->lev_code[i] - 6));
+
+    for (i = 0; i < g1->num_points; i++)
+        gcv = FFMAX(gcv, 6 - g1->lev_code[i]);
+
+    grp_lev = pwc_levs[ctx->channels[ch_index ^ swap_ch].power_levs[subband_to_powgrp[sb]]] / (1 << gcv);
+
+    /* skip the lowest two quant units (frequencies 0...351 Hz) for subband 0 */
+    for (qu = subband_to_qu[sb] + (!sb ? 2 : 0); qu < subband_to_qu[sb + 1]; qu++) {
+        if (ctx->channels[ch_index].qu_wordlen[qu] <= 0)
+            continue;
+
+        qu_lev = ff_atrac3p_sf_tab[ctx->channels[ch_index].qu_sf_idx[qu]] *
+                 ff_atrac3p_mant_tab[ctx->channels[ch_index].qu_wordlen[qu]] /
+                 (1 << ctx->channels[ch_index].qu_wordlen[qu]) * grp_lev;
+
+        dst = &sp[ff_atrac3p_qu_to_spec_pos[qu]];
+        nsp = ff_atrac3p_qu_to_spec_pos[qu + 1] - ff_atrac3p_qu_to_spec_pos[qu];
+
+        for (i = 0; i < nsp; i++)
+            dst[i] += pwcsp[i] * qu_lev;
+    }
+}
+
+void ff_atrac3p_imdct(AVFloatDSPContext *fdsp, FFTContext *mdct_ctx, float *pIn,
+                      float *pOut, int wind_id, int sb)
+{
+    int i;
+
+    if (sb & 1)
+        for (i = 0; i < ATRAC3P_SUBBAND_SAMPLES / 2; i++)
+            FFSWAP(float, pIn[i], pIn[ATRAC3P_SUBBAND_SAMPLES - 1 - i]);
+
+    mdct_ctx->imdct_calc(mdct_ctx, pOut, pIn);
+
+    /* Perform windowing on the output.
+     * ATRAC3+ uses two different MDCT windows:
+     * - The first one is just the plain sine window of size 256
+     * - The 2nd one is the plain sine window of size 128
+     *   wrapped into zero (at the start) and one (at the end) regions.
+     *   Both regions are 32 samples long. */
+    if (wind_id & 2) { /* 1st half: steep window */
+        memset(pOut, 0, sizeof(float) * 32);
+        fdsp->vector_fmul(&pOut[32], &pOut[32], ff_sine_64, 64);
+    } else /* 1st half: simple sine window */
+        fdsp->vector_fmul(pOut, pOut, ff_sine_128, ATRAC3P_MDCT_SIZE / 2);
+
+    if (wind_id & 1) { /* 2nd half: steep window */
+        fdsp->vector_fmul_reverse(&pOut[160], &pOut[160], ff_sine_64, 64);
+        memset(&pOut[224], 0, sizeof(float) * 32);
+    } else /* 2nd half: simple sine window */
+        fdsp->vector_fmul_reverse(&pOut[128], &pOut[128], ff_sine_128,
+                                  ATRAC3P_MDCT_SIZE / 2);
+}
+
+/* lookup table for fast modulo 23 op required for cyclic buffers of the IPQF */
+static const int mod23_lut[26] = {
+    23,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11,
+    12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 0
+};
+
+/* First half of the 384-tap IPQF filtering coefficients. */
+static const float ipqf_coeffs1[ATRAC3P_PQF_FIR_LEN][16] = {
+    { -5.8336207e-7,    -8.0604229e-7,    -4.2005411e-7,    -4.4400572e-8,
+       3.226247e-8,      3.530856e-8,      1.2660377e-8,     0.000010516783,
+      -0.000011838618,   6.005389e-7,      0.0000014333754,  0.0000023108685,
+       0.0000032569742,  0.0000046192422,  0.0000063894258,  0.0000070302972 },
+    { -0.0000091622824, -0.000010502935,  -0.0000079212787, -0.0000041712024,
+      -0.0000026336629, -0.0000015432918, -5.7168614e-7,     0.0000018111954,
+       0.000023530851,   0.00002780562,    0.000032302323,   0.000036968919,
+       0.000041575615,   0.000045337845,   0.000046043948,   0.000048585582 },
+    { -0.000064464548,  -0.000068306952,  -0.000073081472,  -0.00007612785,
+      -0.000074850752,  -0.000070208509,  -0.000062285151,  -0.000058270442,
+      -0.000056296329,  -0.000049888811,  -0.000035615325,  -0.000018532943,
+       0.0000016657353,  0.00002610587,    0.000053397067,   0.00008079566 },
+    { -0.00054488552,   -0.00052537228,   -0.00049731287,   -0.00045778,
+      -0.00040612387,   -0.00034301577,   -0.00026866337,   -0.00018248901,
+      -0.000084307925,   0.000025081157,   0.00014135583,    0.00026649953,
+       0.00039945057,    0.00053928449,    0.00068422867,    0.00083093712 },
+    { -0.0014771431,    -0.001283227,     -0.0010566821,    -0.00079780724,
+      -0.00050782406,   -0.00018855913,    0.00015771533,    0.00052769453,
+       0.00091862219,    0.001326357,      0.0017469483,     0.0021754825,
+       0.0026067684,     0.0030352892,     0.0034549395,     0.0038591374 },
+    { -0.0022995141,    -0.001443546,     -0.00049266568,    0.00055068987,
+       0.001682895,      0.0028992873,     0.0041943151,     0.0055614738,
+       0.0069935122,     0.0084823566,     0.010018963,      0.011593862,
+       0.013196872,      0.014817309,      0.016444042,      0.018065533 },
+    { -0.034426283,     -0.034281436,     -0.033992987,     -0.033563249,
+      -0.032995768,     -0.032295227,     -0.031467363,     -0.030518902,
+      -0.02945766,      -0.028291954,     -0.027031265,     -0.025685543,
+      -0.024265358,     -0.022781773,     -0.021246184,     -0.019670162 },
+    { -0.0030586775,    -0.0037203205,    -0.0042847847,    -0.0047529764,
+      -0.0051268316,    -0.0054091476,    -0.0056034233,    -0.005714261,
+      -0.0057445862,    -0.0057025906,    -0.0055920109,    -0.0054194843,
+      -0.0051914565,    -0.0049146507,    -0.0045959447,    -0.0042418269 },
+    { -0.0016376863,    -0.0017651899,    -0.0018608454,    -0.0019252141,
+      -0.0019593791,    -0.0019653172,    -0.0019450618,    -0.0018990048,
+      -0.00183808,      -0.0017501717,    -0.0016481078,    -0.0015320742,
+      -0.0014046903,    -0.0012685474,    -0.001125814,     -0.00097943726 },
+    { -0.00055432378,   -0.00055472925,   -0.00054783461,   -0.00053276919,
+      -0.00051135791,   -0.00048466062,   -0.00045358928,   -0.00042499689,
+      -0.00036942671,   -0.0003392619,    -0.00030001783,   -0.00025986304,
+      -0.0002197204,    -0.00018116167,   -0.00014691355,   -0.00011279432 },
+    { -0.000064147389,  -0.00006174868,   -0.000054267788,  -0.000047133824,
+      -0.000042927582,  -0.000039477309,  -0.000036340745,  -0.000029687517,
+      -0.000049787737,  -0.000041577889,  -0.000033864744,  -0.000026534748,
+      -0.000019841305,  -0.000014789486,  -0.000013131184,  -0.0000099198869 },
+    { -0.0000062990207, -0.0000072701259, -0.000011984052,  -0.000017348082,
+      -0.000019907106,  -0.000021348773,  -0.000021961965,  -0.000012203576,
+      -0.000010840992,   4.6299544e-7,     5.2588763e-7,     2.7792686e-7,
+      -2.3649704e-7,    -0.0000010897784, -9.171448e-7,     -5.22682e-7 }
+};
+
+/* Second half of the 384-tap IPQF filtering coefficients. */
+static const float ipqf_coeffs2[ATRAC3P_PQF_FIR_LEN][16] = {
+    {  5.22682e-7,       9.171448e-7,      0.0000010897784,  2.3649704e-7,
+      -2.7792686e-7,    -5.2588763e-7,    -4.6299544e-7,     0.000010840992,
+      -0.000012203576,  -0.000021961965,  -0.000021348773,  -0.000019907106,
+      -0.000017348082,  -0.000011984052,  -0.0000072701259, -0.0000062990207 },
+    {  0.0000099198869,  0.000013131184,   0.000014789486,   0.000019841305,
+       0.000026534748,   0.000033864744,   0.000041577889,   0.000049787737,
+      -0.000029687517,  -0.000036340745,  -0.000039477309,  -0.000042927582,
+      -0.000047133824,  -0.000054267788,  -0.00006174868,   -0.000064147389 },
+    {  0.00011279432,    0.00014691355,    0.00018116167,    0.0002197204,
+       0.00025986304,    0.00030001783,    0.0003392619,     0.00036942671,
+      -0.00042499689,   -0.00045358928,   -0.00048466062,   -0.00051135791,
+      -0.00053276919,   -0.00054783461,   -0.00055472925,   -0.00055432378 },
+    {  0.00097943726,    0.001125814,      0.0012685474,     0.0014046903,
+       0.0015320742,     0.0016481078,     0.0017501717,     0.00183808,
+      -0.0018990048,    -0.0019450618,    -0.0019653172,    -0.0019593791,
+      -0.0019252141,    -0.0018608454,    -0.0017651899,    -0.0016376863 },
+    {  0.0042418269,     0.0045959447,     0.0049146507,     0.0051914565,
+       0.0054194843,     0.0055920109,     0.0057025906,     0.0057445862,
+      -0.005714261,     -0.0056034233,    -0.0054091476,    -0.0051268316,
+      -0.0047529764,    -0.0042847847,    -0.0037203205,    -0.0030586775 },
+    {  0.019670162,      0.021246184,      0.022781773,      0.024265358,
+       0.025685543,      0.027031265,      0.028291954,      0.02945766,
+      -0.030518902,     -0.031467363,     -0.032295227,     -0.032995768,
+      -0.033563249,     -0.033992987,     -0.034281436,     -0.034426283 },
+    { -0.018065533,     -0.016444042,     -0.014817309,     -0.013196872,
+      -0.011593862,     -0.010018963,     -0.0084823566,    -0.0069935122,
+       0.0055614738,     0.0041943151,     0.0028992873,     0.001682895,
+       0.00055068987,   -0.00049266568,   -0.001443546,     -0.0022995141 },
+    { -0.0038591374,    -0.0034549395,    -0.0030352892,    -0.0026067684,
+      -0.0021754825,    -0.0017469483,    -0.001326357,     -0.00091862219,
+       0.00052769453,    0.00015771533,   -0.00018855913,   -0.00050782406,
+      -0.00079780724,   -0.0010566821,    -0.001283227,     -0.0014771431 },
+    { -0.00083093712,   -0.00068422867,   -0.00053928449,   -0.00039945057,
+      -0.00026649953,   -0.00014135583,   -0.000025081157,   0.000084307925,
+      -0.00018248901,   -0.00026866337,   -0.00034301577,   -0.00040612387,
+      -0.00045778,      -0.00049731287,   -0.00052537228,   -0.00054488552 },
+    { -0.00008079566,   -0.000053397067,  -0.00002610587,   -0.0000016657353,
+       0.000018532943,   0.000035615325,   0.000049888811,   0.000056296329,
+      -0.000058270442,  -0.000062285151,  -0.000070208509,  -0.000074850752,
+      -0.00007612785,   -0.000073081472,  -0.000068306952,  -0.000064464548 },
+    { -0.000048585582,  -0.000046043948,  -0.000045337845,  -0.000041575615,
+      -0.000036968919,  -0.000032302323,  -0.00002780562,   -0.000023530851,
+       0.0000018111954, -5.7168614e-7,    -0.0000015432918, -0.0000026336629,
+      -0.0000041712024, -0.0000079212787, -0.000010502935,  -0.0000091622824 },
+    { -0.0000070302972, -0.0000063894258, -0.0000046192422, -0.0000032569742,
+      -0.0000023108685, -0.0000014333754, -6.005389e-7,      0.000011838618,
+       0.000010516783,   1.2660377e-8,     3.530856e-8,      3.226247e-8,
+      -4.4400572e-8,    -4.2005411e-7,    -8.0604229e-7,    -5.8336207e-7 }
+};
+
+void ff_atrac3p_ipqf(FFTContext *dct_ctx, Atrac3pIPQFChannelCtx *hist,
+                     const float *in, float *out)
+{
+    int i, s, sb, t, pos_now, pos_next;
+    DECLARE_ALIGNED(32, float, idct_in)[ATRAC3P_SUBBANDS];
+    DECLARE_ALIGNED(32, float, idct_out)[ATRAC3P_SUBBANDS];
+
+    memset(out, 0, ATRAC3P_FRAME_SAMPLES * sizeof(*out));
+
+    for (s = 0; s < ATRAC3P_SUBBAND_SAMPLES; s++) {
+        /* pick up one sample from each subband */
+        for (sb = 0; sb < ATRAC3P_SUBBANDS; sb++)
+            idct_in[sb] = in[sb * ATRAC3P_SUBBAND_SAMPLES + s];
+
+        /* Calculate the sine and cosine part of the PQF using IDCT-IV */
+        dct_ctx->imdct_half(dct_ctx, idct_out, idct_in);
+
+        /* append the result to the history */
+        for (i = 0; i < 8; i++) {
+            hist->buf1[hist->pos][i] = idct_out[i + 8];
+            hist->buf2[hist->pos][i] = idct_out[7 - i];
+        }
+
+        pos_now  = hist->pos;
+        pos_next = mod23_lut[pos_now + 2]; // pos_next = (pos_now + 1) % 23;
+
+        for (t = 0; t < ATRAC3P_PQF_FIR_LEN; t++) {
+            for (i = 0; i < 8; i++) {
+                out[s * 16 + i + 0] += hist->buf1[pos_now][i]  * ipqf_coeffs1[t][i] +
+                                       hist->buf2[pos_next][i] * ipqf_coeffs2[t][i];
+                out[s * 16 + i + 8] += hist->buf1[pos_now][7 - i]  * ipqf_coeffs1[t][i + 8] +
+                                       hist->buf2[pos_next][7 - i] * ipqf_coeffs2[t][i + 8];
+            }
+
+            pos_now  = mod23_lut[pos_next + 2]; // pos_now  = (pos_now  + 2) % 23;
+            pos_next = mod23_lut[pos_now + 2];  // pos_next = (pos_next + 2) % 23;
+        }
+
+        hist->pos = mod23_lut[hist->pos]; // hist->pos = (hist->pos - 1) % 23;
+    }
+}

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/audioconvert.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/audioconvert.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/audioconvert.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/audioconvert.h Changed

@@ -26,8 +26,11 @@
 /**
  * @file
  * Audio format conversion routines
+ * This interface is deprecated and will be dropped in a future
+ * version. You should use the libswresample library instead.
  */
 
+#if FF_API_AUDIO_CONVERT
 
 #include "libavutil/cpu.h"
 #include "avcodec.h"
@@ -45,14 +48,20 @@
  * @param[in] matrix Channel mixing matrix (of dimension in_channel*out_channels). Set to NULL to ignore.
  * @param flags See AV_CPU_FLAG_xx
  * @return NULL on error
+ * @deprecated See libswresample
  */
+
+attribute_deprecated
 AVAudioConvert *av_audio_convert_alloc(enum AVSampleFormat out_fmt, int out_channels,
                                        enum AVSampleFormat in_fmt, int in_channels,
                                        const float *matrix, int flags);
 
 /**
  * Free audio sample format converter context
+ * @deprecated See libswresample
  */
+
+attribute_deprecated
 void av_audio_convert_free(AVAudioConvert *ctx);
 
 /**
@@ -62,9 +71,14 @@
  * @param[in] in array of input buffers for each channel
  * @param[in] in_stride distance between consecutive input samples (measured in bytes)
  * @param len length of audio frame size (measured in samples)
+ * @deprecated See libswresample
  */
+
+attribute_deprecated
 int av_audio_convert(AVAudioConvert *ctx,
                            void * const out[6], const int out_stride[6],
                      const void * const  in[6], const int  in_stride[6], int len);
 
+#endif /* FF_API_AUDIO_CONVERT */
+
 #endif /* AVCODEC_AUDIOCONVERT_H */

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/avcodec.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/avcodec.h Changed

@@ -42,6 +42,11 @@
 
 #include "version.h"
 
+#if FF_API_FAST_MALLOC
+// to provide fast_*alloc
+#include "libavutil/mem.h"
+#endif
+
 /**
  * @defgroup libavc Encoding/Decoding Library
  * @{
@@ -105,7 +110,9 @@
     /* video codecs */
     AV_CODEC_ID_MPEG1VIDEO,
     AV_CODEC_ID_MPEG2VIDEO, ///< preferred ID for MPEG-1/2 video decoding
+#if FF_API_XVMC
     AV_CODEC_ID_MPEG2VIDEO_XVMC,
+#endif /* FF_API_XVMC */
     AV_CODEC_ID_H261,
     AV_CODEC_ID_H263,
     AV_CODEC_ID_RV10,
@@ -276,6 +283,9 @@
     AV_CODEC_ID_ESCAPE130_DEPRECATED,
     AV_CODEC_ID_G2M_DEPRECATED,
     AV_CODEC_ID_WEBP_DEPRECATED,
+    AV_CODEC_ID_HNM4_VIDEO,
+    AV_CODEC_ID_HEVC_DEPRECATED,
+    AV_CODEC_ID_FIC,
 
     AV_CODEC_ID_BRENDER_PIX= MKBETAG('B','P','I','X'),
     AV_CODEC_ID_Y41P       = MKBETAG('Y','4','1','P'),
@@ -504,6 +514,7 @@
     AV_CODEC_ID_OTF        = MKBETAG( 0 ,'O','T','F'),
     AV_CODEC_ID_SMPTE_KLV  = MKBETAG('K','L','V','A'),
     AV_CODEC_ID_DVD_NAV    = MKBETAG('D','N','A','V'),
+    AV_CODEC_ID_TIMED_ID3  = MKBETAG('T','I','D','3'),
 
 
     AV_CODEC_ID_PROBE = 0x19000, ///< codec_id is not known (like AV_CODEC_ID_NONE) but lavf should attempt to identify it
@@ -626,16 +637,26 @@
     AVCOL_PRI_SMPTE170M   = 6, ///< also ITU-R BT601-6 525 / ITU-R BT1358 525 / ITU-R BT1700 NTSC
     AVCOL_PRI_SMPTE240M   = 7, ///< functionally identical to above
     AVCOL_PRI_FILM        = 8,
+    AVCOL_PRI_BT2020      = 9, ///< ITU-R BT2020
     AVCOL_PRI_NB             , ///< Not part of ABI
 };
 
 enum AVColorTransferCharacteristic{
-    AVCOL_TRC_BT709       = 1, ///< also ITU-R BT1361
-    AVCOL_TRC_UNSPECIFIED = 2,
-    AVCOL_TRC_GAMMA22     = 4, ///< also ITU-R BT470M / ITU-R BT1700 625 PAL & SECAM
-    AVCOL_TRC_GAMMA28     = 5, ///< also ITU-R BT470BG
-    AVCOL_TRC_SMPTE240M   = 7,
-    AVCOL_TRC_NB             , ///< Not part of ABI
+    AVCOL_TRC_BT709        =  1, ///< also ITU-R BT1361
+    AVCOL_TRC_UNSPECIFIED  =  2,
+    AVCOL_TRC_GAMMA22      =  4, ///< also ITU-R BT470M / ITU-R BT1700 625 PAL & SECAM
+    AVCOL_TRC_GAMMA28      =  5, ///< also ITU-R BT470BG
+    AVCOL_TRC_SMPTE170M    =  6, ///< also ITU-R BT601-6 525 or 625 / ITU-R BT1358 525 or 625 / ITU-R BT1700 NTSC
+    AVCOL_TRC_SMPTE240M    =  7,
+    AVCOL_TRC_LINEAR       =  8, ///< "Linear transfer characteristics"
+    AVCOL_TRC_LOG          =  9, ///< "Logarithmic transfer characteristic (100:1 range)"
+    AVCOL_TRC_LOG_SQRT     = 10, ///< "Logarithmic transfer characteristic (100 * Sqrt( 10 ) : 1 range)"
+    AVCOL_TRC_IEC61966_2_4 = 11, ///< IEC 61966-2-4
+    AVCOL_TRC_BT1361_ECG   = 12, ///< ITU-R BT1361 Extended Colour Gamut
+    AVCOL_TRC_IEC61966_2_1 = 13, ///< IEC 61966-2-1 (sRGB or sYCC)
+    AVCOL_TRC_BT2020_10    = 14, ///< ITU-R BT2020 for 10 bit system
+    AVCOL_TRC_BT2020_12    = 15, ///< ITU-R BT2020 for 12 bit system
+    AVCOL_TRC_NB               , ///< Not part of ABI
 };
 
 /**
@@ -677,7 +698,12 @@
     float quality_factor;
 } RcOverride;
 
+#if FF_API_MAX_BFRAMES
+/**
+ * @deprecated there is no libavcodec-wide limit on the number of B-frames
+ */
 #define FF_MAX_B_FRAMES 16
+#endif
 
 /* encoding support
    These flags can be passed in AVCodecContext.flags before initialization.
@@ -691,6 +717,7 @@
 #define CODEC_FLAG_UNALIGNED 0x0001
 #define CODEC_FLAG_QSCALE 0x0002  ///< Use fixed qscale.
 #define CODEC_FLAG_4MV    0x0004  ///< 4 MV per MB allowed / advanced prediction for H.263.
+#define CODEC_FLAG_OUTPUT_CORRUPT 0x0008 ///< Output even those frames that might be corrupted
 #define CODEC_FLAG_QPEL   0x0010  ///< Use qpel MC.
 #define CODEC_FLAG_GMC    0x0020  ///< Use GMC.
 #define CODEC_FLAG_MV0    0x0040  ///< Always try a MB with MV=<0,0>.
@@ -703,7 +730,13 @@
 #define CODEC_FLAG_PASS1           0x0200   ///< Use internal 2pass ratecontrol in first pass mode.
 #define CODEC_FLAG_PASS2           0x0400   ///< Use internal 2pass ratecontrol in second pass mode.
 #define CODEC_FLAG_GRAY            0x2000   ///< Only decode/encode grayscale.
-#define CODEC_FLAG_EMU_EDGE        0x4000   ///< Don't draw edges.
+#if FF_API_EMU_EDGE
+/**
+ * @deprecated edges are not used/required anymore. I.e. this flag is now always
+ * set.
+ */
+#define CODEC_FLAG_EMU_EDGE        0x4000
+#endif
 #define CODEC_FLAG_PSNR            0x8000   ///< error[?] variables will be set during encoding.
 #define CODEC_FLAG_TRUNCATED       0x00010000 /** Input bitstream might be truncated at a random
                                                   location instead of only at frame boundaries. */
@@ -741,8 +774,16 @@
  */
 #define CODEC_CAP_DR1             0x0002
 #define CODEC_CAP_TRUNCATED       0x0008
-/* Codec can export data for HW decoding (XvMC). */
+#if FF_API_XVMC
+/* Codec can export data for HW decoding. This flag indicates that
+ * the codec would call get_format() with list that might contain HW accelerated
+ * pixel formats (XvMC, VDPAU, VAAPI, etc). The application can pick any of them
+ * including raw image format.
+ * The application can use the passed context to determine bitstream version,
+ * chroma format, resolution etc.
+ */
 #define CODEC_CAP_HWACCEL         0x0010
+#endif /* FF_API_XVMC */
 /**
  * Encoder or decoder requires flushing with NULL input at the end in order to
  * give the complete and correct output.
@@ -799,12 +840,12 @@
  * Codec should fill in channel configuration and samplerate instead of container
  */
 #define CODEC_CAP_CHANNEL_CONF     0x0400
-
+#if FF_API_NEG_LINESIZES
 /**
- * Codec is able to deal with negative linesizes
+ * @deprecated no codecs use this capability
  */
 #define CODEC_CAP_NEG_LINESIZES    0x0800
-
+#endif
 /**
  * Codec supports frame-level multithreading.
  */
@@ -834,6 +875,7 @@
  */
 #define CODEC_CAP_LOSSLESS         0x80000000
 
+#if FF_API_MB_TYPE
 //The following defines may change, don't expect compatibility if you use them.
 #define MB_TYPE_INTRA4x4   0x0001
 #define MB_TYPE_INTRA16x16 0x0002 //FIXME H.264-specific
@@ -857,6 +899,7 @@
 #define MB_TYPE_QUANT      0x00010000
 #define MB_TYPE_CBP        0x00020000
 //Note bits 24-31 are reserved for codec specific use (h264 ref0, mpeg1 0mv, ...)
+#endif
 
 /**
  * Pan Scan area.
@@ -887,10 +930,12 @@
     int16_t position[3][2];
 }AVPanScan;
 
+#if FF_API_QSCALE_TYPE
 #define FF_QSCALE_TYPE_MPEG1 0
 #define FF_QSCALE_TYPE_MPEG2 1
 #define FF_QSCALE_TYPE_H264  2
 #define FF_QSCALE_TYPE_VP56  3
+#endif
 
 #if FF_API_GET_BUFFER
 #define FF_BUFFER_TYPE_INTERNAL 1
@@ -1013,6 +1058,13 @@
      * follow the timestamp specifier of a WebVTT cue.
      */
     AV_PKT_DATA_WEBVTT_SETTINGS,
+
+    /**
+     * A list of zero terminated key/value strings. There is no end marker for
+     * the list, so it is required to rely on the side data size to stop. This
+     * side data includes updated metadata which appeared in the stream.
+     */
+    AV_PKT_DATA_METADATA_UPDATE,
 };
 
 /**
@@ -1323,7 +1375,9 @@
      */
     int coded_width, coded_height;
 
+#if FF_API_ASPECT_EXTENDED
 #define FF_ASPECT_EXTENDED 15
+#endif
 
     /**
      * the number of pictures in a group of pictures, or 0 for intra_only
@@ -1650,12 +1704,15 @@
 #define SLICE_FLAG_ALLOW_FIELD    0x0002 ///< allow draw_horiz_band() with field slices (MPEG2 field pics)
 #define SLICE_FLAG_ALLOW_PLANE    0x0004 ///< allow draw_horiz_band() with 1 component at a time (SVQ1)
 
+#if FF_API_XVMC
     /**
      * XVideo Motion Acceleration
      * - encoding: forbidden
      * - decoding: set by decoder
+     * @deprecated XvMC doesn't need it anymore.
      */
-    int xvmc_acceleration;
+    attribute_deprecated int xvmc_acceleration;
+#endif /* FF_API_XVMC */
 
     /**
      * macroblock decision mode
@@ -2102,12 +2159,11 @@
      * If AV_GET_BUFFER_FLAG_REF is set in flags then the frame may be reused
      * (read and/or written to if it is writable) later by libavcodec.
      *
-     * If CODEC_FLAG_EMU_EDGE is not set in s->flags, the buffer must contain an
-     * edge of the size returned by avcodec_get_edge_width() on all sides.
-     *
      * avcodec_align_dimensions2() should be used to find the required width and
      * height, as they normally need to be rounded up to the next multiple of 16.
      *
+     * Some decoders do not support linesizes changing between frames.
+     *
      * If frame multithreading is used and thread_safe_callbacks is set,
      * this callback may be called from a different thread, but not from more
      * than one at once. Does not need to be reentrant.
@@ -2390,12 +2446,16 @@
      */
     int workaround_bugs;
 #define FF_BUG_AUTODETECT       1  ///< autodetection
+#if FF_API_OLD_MSMPEG4
 #define FF_BUG_OLD_MSMPEG4      2
+#endif
 #define FF_BUG_XVID_ILACE       4
 #define FF_BUG_UMP4             8
 #define FF_BUG_NO_PADDING       16
 #define FF_BUG_AMV              32
+#if FF_API_AC_VLC
 #define FF_BUG_AC_VLC           0  ///< Will be removed, libavcodec can now handle these non-compliant files by default.
+#endif
 #define FF_BUG_QPEL_CHROMA      64
 #define FF_BUG_STD_QPEL         128
 #define FF_BUG_QPEL_CHROMA2     256
@@ -2445,7 +2505,12 @@
 #define FF_DEBUG_BITSTREAM   4
 #define FF_DEBUG_MB_TYPE     8
 #define FF_DEBUG_QP          16
+#if FF_API_DEBUG_MV
+/**
+ * @deprecated this option does nothing
+ */
 #define FF_DEBUG_MV          32
+#endif
 #define FF_DEBUG_DCT_COEFF   0x00000040
 #define FF_DEBUG_SKIP        0x00000080
 #define FF_DEBUG_STARTCODE   0x00000100
@@ -2453,13 +2518,17 @@
 #define FF_DEBUG_ER          0x00000400
 #define FF_DEBUG_MMCO        0x00000800
 #define FF_DEBUG_BUGS        0x00001000
-#define FF_DEBUG_VIS_QP      0x00002000
-#define FF_DEBUG_VIS_MB_TYPE 0x00004000
+#if FF_API_DEBUG_MV
+#define FF_DEBUG_VIS_QP      0x00002000 ///< only access through AVOptions from outside libavcodec
+#define FF_DEBUG_VIS_MB_TYPE 0x00004000 ///< only access through AVOptions from outside libavcodec
+#endif
 #define FF_DEBUG_BUFFERS     0x00008000
 #define FF_DEBUG_THREADS     0x00010000
 
+#if FF_API_DEBUG_MV
     /**
      * debug
+     * Code outside libavcodec should access this field using AVOptions
      * - encoding: Set by user.
      * - decoding: Set by user.
      */
@@ -2467,6 +2536,7 @@
 #define FF_DEBUG_VIS_MV_P_FOR  0x00000001 //visualize forward predicted MVs of P frames
 #define FF_DEBUG_VIS_MV_B_FOR  0x00000002 //visualize forward predicted MVs of B frames
 #define FF_DEBUG_VIS_MV_B_BACK 0x00000004 //visualize backward predicted MVs of B frames
+#endif
 
     /**
      * Error recognition; may misdetect some more or less valid parts as errors.
@@ -2474,7 +2544,14 @@
      * - decoding: Set by user.
      */
     int err_recognition;
-#define AV_EF_CRCCHECK  (1<<0)          ///< verify embedded CRCs
+
+/**
+ * Verify checksums embedded in the bitstream (could be of either encoded or
+ * decoded data, depending on the codec) and print an error message on mismatch.
+ * If AV_EF_EXPLODE is also set, a mismatching checksum will result in the
+ * decoder returning an error.
+ */
+#define AV_EF_CRCCHECK  (1<<0)
 #define AV_EF_BITSTREAM (1<<1)          ///< detect bitstream specification deviations
 #define AV_EF_BUFFER    (1<<2)          ///< detect improper bitstream length
 #define AV_EF_EXPLODE   (1<<3)          ///< abort decoding on minor error detection
@@ -2553,7 +2630,9 @@
 #define FF_IDCT_SIMPLEVIS     18
 #define FF_IDCT_FAAN          20
 #define FF_IDCT_SIMPLENEON    22
+#if FF_API_ARCH_ALPHA
 #define FF_IDCT_SIMPLEALPHA   23
+#endif
 
     /**
      * bits per sample/pixel from the demuxer (needed for huffyuv).
@@ -2583,7 +2662,7 @@
     /**
      * the picture in the bitstream
      * - encoding: Set by libavcodec.
-     * - decoding: Set by libavcodec.
+     * - decoding: unused
      */
     AVFrame *coded_frame;
 
@@ -2655,13 +2734,13 @@
      */
     int (*execute2)(struct AVCodecContext *c, int (*func)(struct AVCodecContext *c2, void *arg, int jobnr, int threadnr), void *arg2, int *ret, int count);
 
+#if FF_API_THREAD_OPAQUE
     /**
-     * thread opaque
-     * Can be used by execute() to store some per AVCodecContext stuff.
-     * - encoding: set by execute()
-     * - decoding: set by execute()
+     * @deprecated this field should not be used from outside of lavc
      */
+    attribute_deprecated
     void *thread_opaque;
+#endif
 
     /**
      * noise vs. sse weight for the nsse comparsion function
@@ -2748,6 +2827,11 @@
 #define FF_PROFILE_JPEG2000_DCINEMA_2K              3
 #define FF_PROFILE_JPEG2000_DCINEMA_4K              4
 
+
+#define FF_PROFILE_HEVC_MAIN                        1
+#define FF_PROFILE_HEVC_MAIN_10                     2
+#define FF_PROFILE_HEVC_MAIN_STILL_PICTURE          3
+
     /**
      * level
      * - encoding: Set by user.
@@ -2788,21 +2872,22 @@
     uint8_t *subtitle_header;
     int subtitle_header_size;
 
+#if FF_API_ERROR_RATE
     /**
-     * Simulates errors in the bitstream to test error concealment.
-     * - encoding: Set by user.
-     * - decoding: unused
+     * @deprecated use the 'error_rate' private AVOption of the mpegvideo
+     * encoders
      */
+    attribute_deprecated
     int error_rate;
+#endif
 
+#if FF_API_CODEC_PKT
     /**
-     * Current packet as passed into the decoder, to avoid having
-     * to pass the packet into every function. Currently only valid
-     * inside lavc and get/release_buffer callbacks.
-     * - decoding: set by avcodec_decode_*, read by get_buffer() for setting pkt_pts
-     * - encoding: unused
+     * @deprecated this field is not supposed to be accessed from outside lavc
      */
+    attribute_deprecated
     AVPacket *pkt;
+#endif
 
     /**
      * VBV delay coded in the last frame (in periods of a 27 MHz clock).
@@ -2890,6 +2975,27 @@
      * - encoding: set by libavcodec
      */
     int seek_preroll;
+
+#if !FF_API_DEBUG_MV
+    /**
+     * debug motion vectors
+     * Code outside libavcodec should access this field using AVOptions
+     * - encoding: Set by user.
+     * - decoding: Set by user.
+     */
+    int debug_mv;
+#define FF_DEBUG_VIS_MV_P_FOR  0x00000001 //visualize forward predicted MVs of P frames
+#define FF_DEBUG_VIS_MV_B_FOR  0x00000002 //visualize forward predicted MVs of B frames
+#define FF_DEBUG_VIS_MV_B_BACK 0x00000004 //visualize backward predicted MVs of B frames
+#endif
+
+    /**
+     * custom intra quantization matrix
+     * Code outside libavcodec should access this field using av_codec_g/set_chroma_intra_matrix()
+     * - encoding: Set by user, can be NULL.
+     * - decoding: unused.
+     */
+    uint16_t *chroma_intra_matrix;
 } AVCodecContext;
 
 AVRational av_codec_get_pkt_timebase         (const AVCodecContext *avctx);
@@ -2904,6 +3010,9 @@
 int  av_codec_get_seek_preroll(const AVCodecContext *avctx);
 void av_codec_set_seek_preroll(AVCodecContext *avctx, int val);
 
+uint16_t *av_codec_get_chroma_intra_matrix(const AVCodecContext *avctx);
+void av_codec_set_chroma_intra_matrix(AVCodecContext *avctx, uint16_t *val);
+
 /**
  * AVProfile.
  */
@@ -3015,6 +3124,8 @@
 
 int av_codec_get_max_lowres(const AVCodec *codec);
 
+struct MpegEncContext;
+
 /**
  * AVHWAccel.
  */
@@ -3076,6 +3187,7 @@
      *
      * Meaningful slice information (codec specific) is guaranteed to
      * be parsed at this point. This function is mandatory.
+     * The only exception is XvMC, that works on MB level.
      *
      * @param avctx the codec context
      * @param buf the slice data buffer base
@@ -3103,6 +3215,17 @@
      * AVCodecContext.release_buffer().
      */
     int priv_data_size;
+
+    /**
+     * Called for every Macroblock in a slice.
+     *
+     * XvMC uses it to replace the ff_MPV_decode_mb().
+     * Instead of decoding to raw picture, MB parameters are
+     * stored in an array provided by the video driver.
+     *
+     * @param s the mpeg context
+     */
+    void (*decode_mb)(struct MpegEncContext *s);
 } AVHWAccel;
 
 /**
@@ -3226,40 +3349,6 @@
  */
 void avcodec_register_all(void);
 
-
-#if FF_API_ALLOC_CONTEXT
-/**
- * Allocate an AVCodecContext and set its fields to default values.  The
- * resulting struct can be deallocated by simply calling av_free().
- *
- * @return An AVCodecContext filled with default values or NULL on failure.
- * @see avcodec_get_context_defaults
- *
- * @deprecated use avcodec_alloc_context3()
- */
-attribute_deprecated
-AVCodecContext *avcodec_alloc_context(void);
-
-/** THIS FUNCTION IS NOT YET PART OF THE PUBLIC API!
- *  we WILL change its arguments and name a few times! */
-attribute_deprecated
-AVCodecContext *avcodec_alloc_context2(enum AVMediaType);
-
-/**
- * Set the fields of the given AVCodecContext to default values.
- *
- * @param s The AVCodecContext of which the fields should be set to default values.
- * @deprecated use avcodec_get_context_defaults3
- */
-attribute_deprecated
-void avcodec_get_context_defaults(AVCodecContext *s);
-
-/** THIS FUNCTION IS NOT YET PART OF THE PUBLIC API!
- *  we WILL change its arguments and name a few times! */
-attribute_deprecated
-void avcodec_get_context_defaults2(AVCodecContext *s, enum AVMediaType);
-#endif
-
 /**
  * Allocate an AVCodecContext and set its fields to default values.  The
  * resulting struct can be deallocated by calling avcodec_close() on it followed
@@ -3325,20 +3414,21 @@
  */
 int avcodec_copy_context(AVCodecContext *dest, const AVCodecContext *src);
 
+#if FF_API_AVFRAME_LAVC
 /**
- * Allocate an AVFrame and set its fields to default values.  The resulting
- * struct must be freed using avcodec_free_frame().
- *
- * @return An AVFrame filled with default values or NULL on failure.
- * @see avcodec_get_frame_defaults
+ * @deprecated use av_frame_alloc()
  */
+attribute_deprecated
 AVFrame *avcodec_alloc_frame(void);
 
 /**
  * Set the fields of the given AVFrame to default values.
  *
  * @param frame The AVFrame of which the fields should be set to default values.
+ *
+ * @deprecated use av_frame_unref()
  */
+attribute_deprecated
 void avcodec_get_frame_defaults(AVFrame *frame);
 
 /**
@@ -3350,41 +3440,11 @@
  * @warning this function does NOT free the data buffers themselves
  * (it does not know how, since they might have been allocated with
  *  a custom get_buffer()).
- */
-void avcodec_free_frame(AVFrame **frame);
-
-#if FF_API_AVCODEC_OPEN
-/**
- * Initialize the AVCodecContext to use the given AVCodec. Prior to using this
- * function the context has to be allocated.
  *
- * The functions avcodec_find_decoder_by_name(), avcodec_find_encoder_by_name(),
- * avcodec_find_decoder() and avcodec_find_encoder() provide an easy way for
- * retrieving a codec.
- *
- * @warning This function is not thread safe!
- *
- * @code
- * avcodec_register_all();
- * codec = avcodec_find_decoder(AV_CODEC_ID_H264);
- * if (!codec)
- *     exit(1);
- *
- * context = avcodec_alloc_context3(codec);
- *
- * if (avcodec_open(context, codec) < 0)
- *     exit(1);
- * @endcode
- *
- * @param avctx The context which will be set up to use the given codec.
- * @param codec The codec to use within the context.
- * @return zero on success, a negative value on error
- * @see avcodec_alloc_context3, avcodec_find_decoder, avcodec_find_encoder, avcodec_close
- *
- * @deprecated use avcodec_open2
+ * @deprecated use av_frame_free()
  */
 attribute_deprecated
-int avcodec_open(AVCodecContext *avctx, AVCodec *codec);
+void avcodec_free_frame(AVFrame **frame);
 #endif
 
 /**
@@ -3576,6 +3636,24 @@
 
 int av_packet_split_side_data(AVPacket *pkt);
 
+/**
+ * Pack a dictionary for use in side_data.
+ *
+ * @param dict The dictionary to pack.
+ * @param size pointer to store the size of the returned data
+ * @return pointer to data if successful, NULL otherwise
+ */
+uint8_t *av_packet_pack_dictionary(AVDictionary *dict, int *size);
+/**
+ * Unpack a dictionary from side_data.
+ *
+ * @param data data from side_data
+ * @param size size of the data
+ * @param dict the metadata storage dictionary
+ * @return 0 on success, < 0 on failure
+ */
+int av_packet_unpack_dictionary(const uint8_t *data, int size, AVDictionary **dict);
+
 
 /**
  * Convenience function to free all the side data stored.
@@ -3675,14 +3753,20 @@
  */
 int avcodec_default_get_buffer2(AVCodecContext *s, AVFrame *frame, int flags);
 
+#if FF_API_EMU_EDGE
 /**
  * Return the amount of padding in pixels which the get_buffer callback must
  * provide around the edge of the image for codecs which do not have the
  * CODEC_FLAG_EMU_EDGE flag.
  *
  * @return Required padding in pixels.
+ *
+ * @deprecated CODEC_FLAG_EMU_EDGE is deprecated, so this function is no longer
+ * needed
  */
+attribute_deprecated
 unsigned avcodec_get_edge_width(void);
+#endif
 
 /**
  * Modify width and height values so that they will result in a memory
@@ -3690,8 +3774,6 @@
  * padding.
  *
  * May only be used if a codec with CODEC_CAP_DR1 has been opened.
- * If CODEC_FLAG_EMU_EDGE is not set, the dimensions must have been increased
- * according to avcodec_get_edge_width() before.
  */
 void avcodec_align_dimensions(AVCodecContext *s, int *width, int *height);
 
@@ -3701,8 +3783,6 @@
  * line sizes are a multiple of the respective linesize_align[i].
  *
  * May only be used if a codec with CODEC_CAP_DR1 has been opened.
- * If CODEC_FLAG_EMU_EDGE is not set, the dimensions must have been increased
- * according to avcodec_get_edge_width() before.
  */
 void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height,
                                int linesize_align[AV_NUM_DATA_POINTERS]);
@@ -4666,12 +4746,20 @@
  * @}
  */
 
+#if FF_API_SET_DIMENSIONS
+/**
+ * @deprecated this function is not supposed to be used from outside of lavc
+ */
+attribute_deprecated
 void avcodec_set_dimensions(AVCodecContext *s, int width, int height);
+#endif
 
 /**
  * Put a string representing the codec tag codec_tag in buf.
  *
+ * @param buf       buffer to place codec tag in
  * @param buf_size size in bytes of buf
+ * @param codec_tag codec tag to assign
  * @return the length of the string that would have been generated if
  * enough space had been available, excluding the trailing null
  */
@@ -4863,27 +4951,6 @@
 /* memory */
 
 /**
- * Reallocate the given block if it is not large enough, otherwise do nothing.
- *
- * @see av_realloc
- */
-void *av_fast_realloc(void *ptr, unsigned int *size, size_t min_size);
-
-/**
- * Allocate a buffer, reusing the given one if large enough.
- *
- * Contrary to av_fast_realloc the current buffer contents might not be
- * preserved and on error the old buffer is freed, thus no special
- * handling to avoid memleaks is necessary.
- *
- * @param ptr pointer to pointer to already allocated buffer, overwritten with pointer to new buffer
- * @param size size of the buffer *ptr points to
- * @param min_size minimum size of *ptr buffer after returning, *ptr will be NULL and
- *                 *size 0 if an error occurred.
- */
-void av_fast_malloc(void *ptr, unsigned int *size, size_t min_size);
-
-/**
  * Same behaviour av_fast_malloc but the buffer has additional
  * FF_INPUT_BUFFER_PADDING_SIZE at the end which will always be 0.
  *

omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/avcodecres.rc Added

@@ -0,0 +1,55 @@
+/*
+ * Windows resource file for libavcodec
+ *
+ * Copyright (C) 2012 James Almer
+ * Copyright (C) 2013 Tiancheng "Timothy" Gu
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <windows.h>
+#include "libavcodec/version.h"
+#include "libavutil/ffversion.h"
+#include "config.h"
+
+1 VERSIONINFO
+FILEVERSION     LIBAVCODEC_VERSION_MAJOR, LIBAVCODEC_VERSION_MINOR, LIBAVCODEC_VERSION_MICRO, 0
+PRODUCTVERSION  LIBAVCODEC_VERSION_MAJOR, LIBAVCODEC_VERSION_MINOR, LIBAVCODEC_VERSION_MICRO, 0
+FILEFLAGSMASK   VS_FFI_FILEFLAGSMASK
+FILEOS          VOS_NT_WINDOWS32
+FILETYPE        VFT_DLL
+{
+    BLOCK "StringFileInfo"
+    {
+        BLOCK "040904B0"
+        {
+            VALUE "CompanyName",      "FFmpeg Project"
+            VALUE "FileDescription",  "FFmpeg codec library"
+            VALUE "FileVersion",      AV_STRINGIFY(LIBAVCODEC_VERSION)
+            VALUE "InternalName",     "libavcodec"
+            VALUE "LegalCopyright",   "Copyright (C) 2000-" AV_STRINGIFY(CONFIG_THIS_YEAR) " FFmpeg Project"
+            VALUE "OriginalFilename", "avcodec" BUILDSUF "-" AV_STRINGIFY(LIBAVCODEC_VERSION_MAJOR) SLIBSUF
+            VALUE "ProductName",      "FFmpeg"
+            VALUE "ProductVersion",   FFMPEG_VERSION
+        }
+    }
+
+    BLOCK "VarFileInfo"
+    {
+        VALUE "Translation", 0x0409, 0x04B0
+    }
+}

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/avfft.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/avfft.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/avpacket.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/avpacket.c Changed

@@ -237,6 +237,7 @@
             pkt->side_data[i].type = src->side_data[i].type;
         }
     }
+    pkt->side_data_elems = src->side_data_elems;
     return 0;
 
 failed_alloc:
@@ -380,7 +381,7 @@
 int av_packet_split_side_data(AVPacket *pkt){
     if (!pkt->side_data_elems && pkt->size >12 && AV_RB64(pkt->data + pkt->size - 8) == FF_MERGE_MARKER){
         int i;
-        unsigned int size, orig_pktsize = pkt->size;
+        unsigned int size;
         uint8_t *p;
 
         p = pkt->data + pkt->size - 8 - 5;
@@ -413,19 +414,72 @@
             p-= size+5;
         }
         pkt->size -= 8;
-        /* FFMIN() prevents overflow in case the packet wasn't allocated with
-         * proper padding.
-         * If the side data is smaller than the buffer padding size, the
-         * remaining bytes should have already been filled with zeros by the
-         * original packet allocation anyway. */
-        memset(pkt->data + pkt->size, 0,
-               FFMIN(orig_pktsize - pkt->size, FF_INPUT_BUFFER_PADDING_SIZE));
         pkt->side_data_elems = i+1;
         return 1;
     }
     return 0;
 }
 
+uint8_t *av_packet_pack_dictionary(AVDictionary *dict, int *size)
+{
+    AVDictionaryEntry *t = NULL;
+    uint8_t *data = NULL;
+    *size = 0;
+
+    if (!dict)
+        return NULL;
+
+    while ((t = av_dict_get(dict, "", t, AV_DICT_IGNORE_SUFFIX))) {
+        const size_t keylen   = strlen(t->key);
+        const size_t valuelen = strlen(t->value);
+        const size_t new_size = *size + keylen + 1 + valuelen + 1;
+        uint8_t *const new_data = av_realloc(data, new_size);
+
+        if (!new_data)
+            goto fail;
+        data = new_data;
+        if (new_size > INT_MAX)
+            goto fail;
+
+        memcpy(data + *size, t->key, keylen + 1);
+        memcpy(data + *size + keylen + 1, t->value, valuelen + 1);
+
+        *size = new_size;
+    }
+
+    return data;
+
+fail:
+    av_freep(&data);
+    *size = 0;
+    return NULL;
+}
+
+int av_packet_unpack_dictionary(const uint8_t *data, int size, AVDictionary **dict)
+{
+    const uint8_t *end = data + size;
+    int ret = 0;
+
+    if (!dict || !data || !size)
+        return ret;
+    if (size && end[-1])
+        return AVERROR_INVALIDDATA;
+    while (data < end) {
+        const uint8_t *key = data;
+        const uint8_t *val = data + strlen(key) + 1;
+
+        if (val >= end)
+            return AVERROR_INVALIDDATA;
+
+        ret = av_dict_set(dict, key, val, 0);
+        if (ret < 0)
+            break;
+        data = val + strlen(val) + 1;
+    }
+
+    return ret;
+}
+
 int av_packet_shrink_side_data(AVPacket *pkt, enum AVPacketSideDataType type,
                                int size)
 {

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/avs.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/avs.c Changed

@@ -25,7 +25,7 @@
 
 
 typedef struct {
-    AVFrame picture;
+    AVFrame *frame;
 } AvsContext;
 
 typedef enum {
@@ -52,7 +52,7 @@
     int buf_size = avpkt->size;
     AvsContext *const avs = avctx->priv_data;
     AVFrame *picture = data;
-    AVFrame *const p =  &avs->picture;
+    AVFrame *const p =  avs->frame;
     const uint8_t *table, *vect;
     uint8_t *out;
     int i, j, x, y, stride, ret, vect_w = 3, vect_h = 3;
@@ -65,8 +65,8 @@
     p->pict_type = AV_PICTURE_TYPE_P;
     p->key_frame = 0;
 
-    out = avs->picture.data[0];
-    stride = avs->picture.linesize[0];
+    out    = p->data[0];
+    stride = p->linesize[0];
 
     if (buf_end - buf < 4)
         return AVERROR_INVALIDDATA;
@@ -76,7 +76,7 @@
 
     if (type == AVS_PALETTE) {
         int first, last;
-        uint32_t *pal = (uint32_t *) avs->picture.data[1];
+        uint32_t *pal = (uint32_t *) p->data[1];
 
         first = AV_RL16(buf);
         last = first + AV_RL16(buf + 2);
@@ -149,7 +149,7 @@
             align_get_bits(&change_map);
     }
 
-    if ((ret = av_frame_ref(picture, &avs->picture)) < 0)
+    if ((ret = av_frame_ref(picture, p)) < 0)
         return ret;
     *got_frame = 1;
 
@@ -159,16 +159,21 @@
 static av_cold int avs_decode_init(AVCodecContext * avctx)
 {
     AvsContext *s = avctx->priv_data;
+
+    s->frame = av_frame_alloc();
+    if (!s->frame)
+        return AVERROR(ENOMEM);
+
     avctx->pix_fmt = AV_PIX_FMT_PAL8;
-    avcodec_set_dimensions(avctx, 318, 198);
-    avcodec_get_frame_defaults(&s->picture);
+    ff_set_dimensions(avctx, 318, 198);
+
     return 0;
 }
 
 static av_cold int avs_decode_end(AVCodecContext *avctx)
 {
     AvsContext *s = avctx->priv_data;
-    av_frame_unref(&s->picture);
+    av_frame_free(&s->frame);
     return 0;
 }

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/avuienc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/avuienc.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/bethsoftvideo.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/bethsoftvideo.c Changed

@@ -34,21 +34,25 @@
 #include "internal.h"
 
 typedef struct BethsoftvidContext {
-    AVFrame frame;
+    AVFrame *frame;
     GetByteContext g;
 } BethsoftvidContext;
 
 static av_cold int bethsoftvid_decode_init(AVCodecContext *avctx)
 {
     BethsoftvidContext *vid = avctx->priv_data;
-    avcodec_get_frame_defaults(&vid->frame);
     avctx->pix_fmt = AV_PIX_FMT_PAL8;
+
+    vid->frame = av_frame_alloc();
+    if (!vid->frame)
+        return AVERROR(ENOMEM);
+
     return 0;
 }
 
 static int set_palette(BethsoftvidContext *ctx)
 {
-    uint32_t *palette = (uint32_t *)ctx->frame.data[1];
+    uint32_t *palette = (uint32_t *)ctx->frame->data[1];
     int a;
 
     if (bytestream2_get_bytes_left(&ctx->g) < 256*3)
@@ -58,7 +62,7 @@
         palette[a] = 0xFFU << 24 | bytestream2_get_be24u(&ctx->g) * 4;
         palette[a] |= palette[a] >> 6 & 0x30303;
     }
-    ctx->frame.palette_has_changed = 1;
+    ctx->frame->palette_has_changed = 1;
     return 0;
 }
 
@@ -75,9 +79,9 @@
     int code, ret;
     int yoffset;
 
-    if ((ret = ff_reget_buffer(avctx, &vid->frame)) < 0)
+    if ((ret = ff_reget_buffer(avctx, vid->frame)) < 0)
         return ret;
-    wrap_to_next_line = vid->frame.linesize[0] - avctx->width;
+    wrap_to_next_line = vid->frame->linesize[0] - avctx->width;
 
     if (avpkt->side_data_elems > 0 &&
         avpkt->side_data[0].type == AV_PKT_DATA_PALETTE) {
@@ -88,8 +92,8 @@
     }
 
     bytestream2_init(&vid->g, avpkt->data, avpkt->size);
-    dst = vid->frame.data[0];
-    frame_end = vid->frame.data[0] + vid->frame.linesize[0] * avctx->height;
+    dst = vid->frame->data[0];
+    frame_end = vid->frame->data[0] + vid->frame->linesize[0] * avctx->height;
 
     switch(block_type = bytestream2_get_byte(&vid->g)){
         case PALETTE_BLOCK: {
@@ -104,7 +108,7 @@
             yoffset = bytestream2_get_le16(&vid->g);
             if(yoffset >= avctx->height)
                 return AVERROR_INVALIDDATA;
-            dst += vid->frame.linesize[0] * yoffset;
+            dst += vid->frame->linesize[0] * yoffset;
     }
 
     // main code
@@ -134,7 +138,7 @@
     }
     end:
 
-    if ((ret = av_frame_ref(data, &vid->frame)) < 0)
+    if ((ret = av_frame_ref(data, vid->frame)) < 0)
         return ret;
 
     *got_frame = 1;
@@ -145,7 +149,7 @@
 static av_cold int bethsoftvid_decode_end(AVCodecContext *avctx)
 {
     BethsoftvidContext * vid = avctx->priv_data;
-    av_frame_unref(&vid->frame);
+    av_frame_free(&vid->frame);
     return 0;
 }

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/bfin/Makefile -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/bfin/Makefile Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/bfin/vp3_idct_bfin.S -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/bfin/vp3_idct_bfin.S Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/bink.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/bink.c Changed

@@ -120,6 +120,7 @@
     int            version;              ///< internal Bink file version
     int            has_alpha;
     int            swap_planes;
+    unsigned       frame_num;
 
     Bundle         bundle[BINKB_NB_SRC]; ///< bundles for decoding all data types
     Tree           col_high[16];         ///< trees for decoding high nibble in "colours" data type
@@ -184,7 +185,7 @@
     blocks = bw * bh;
 
     for (i = 0; i < BINKB_NB_SRC; i++) {
-        c->bundle[i].data = av_malloc(blocks * 64);
+        c->bundle[i].data = av_mallocz(blocks * 64);
         if (!c->bundle[i].data)
             return AVERROR(ENOMEM);
         c->bundle[i].data_end = c->bundle[i].data + blocks * 64;
@@ -1206,6 +1207,8 @@
     if (c->version >= 'i')
         skip_bits_long(&gb, 32);
 
+    c->frame_num++;
+
     for (plane = 0; plane < 3; plane++) {
         plane_idx = (!plane || !c->swap_planes) ? plane : (plane ^ 3);
 
@@ -1214,7 +1217,7 @@
                 return ret;
         } else {
             if ((ret = binkb_decode_plane(c, frame, &gb, plane_idx,
-                                          !avctx->frame_number, !!plane)) < 0)
+                                          c->frame_num == 1, !!plane)) < 0)
                 return ret;
         }
         if (get_bits_count(&gb) >= bits_count)
@@ -1332,6 +1335,13 @@
     return 0;
 }
 
+static void flush(AVCodecContext *avctx)
+{
+    BinkContext * const c = avctx->priv_data;
+
+    c->frame_num = 0;
+}
+
 AVCodec ff_bink_decoder = {
     .name           = "binkvideo",
     .long_name      = NULL_IF_CONFIG_SMALL("Bink video"),
@@ -1341,5 +1351,6 @@
     .init           = decode_init,
     .close          = decode_end,
     .decode         = decode_frame,
+    .flush          = flush,
     .capabilities   = CODEC_CAP_DR1,
 };

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/binkaudio.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/binkaudio.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/bit_depth_template.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/bit_depth_template.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/bitstream.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/bitstream.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/bmpenc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/bmpenc.c Changed

@@ -60,22 +60,26 @@
         return AVERROR(EINVAL);
     }
 
+    avctx->coded_frame = av_frame_alloc();
+    if (!avctx->coded_frame)
+        return AVERROR(ENOMEM);
+
     return 0;
 }
 
 static int bmp_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
                             const AVFrame *pict, int *got_packet)
 {
+    const AVFrame * const p = pict;
     int n_bytes_image, n_bytes_per_row, n_bytes, i, n, hsize, ret;
     const uint32_t *pal = NULL;
     uint32_t palette256[256];
     int pad_bytes_per_row, pal_entries = 0, compression = BMP_RGB;
     int bit_count = avctx->bits_per_coded_sample;
     uint8_t *ptr, *buf;
-    AVFrame * const p = (AVFrame *)pict;
 
-    p->pict_type= AV_PICTURE_TYPE_I;
-    p->key_frame= 1;
+    avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I;
+    avctx->coded_frame->key_frame = 1;
     switch (avctx->pix_fmt) {
     case AV_PIX_FMT_RGB444:
         compression = BMP_BITFIELDS;
@@ -159,6 +163,12 @@
     return 0;
 }
 
+static av_cold int bmp_encode_close(AVCodecContext *avctx)
+{
+    av_frame_free(&avctx->coded_frame);
+    return 0;
+}
+
 AVCodec ff_bmp_encoder = {
     .name           = "bmp",
     .long_name      = NULL_IF_CONFIG_SMALL("BMP (Windows and OS/2 bitmap)"),
@@ -166,6 +176,7 @@
     .id             = AV_CODEC_ID_BMP,
     .init           = bmp_encode_init,
     .encode2        = bmp_encode_frame,
+    .close          = bmp_encode_close,
     .pix_fmts       = (const enum AVPixelFormat[]){
         AV_PIX_FMT_BGRA, AV_PIX_FMT_BGR24,
         AV_PIX_FMT_RGB565, AV_PIX_FMT_RGB555, AV_PIX_FMT_RGB444,

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/brender_pix.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/brender_pix.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/c93.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/c93.c Changed

@@ -24,7 +24,7 @@
 #include "internal.h"
 
 typedef struct {
-    AVFrame pictures[2];
+    AVFrame *pictures[2];
     int currentpic;
 } C93DecoderContext;
 
@@ -46,21 +46,27 @@
 #define C93_HAS_PALETTE 0x01
 #define C93_FIRST_FRAME 0x02
 
-static av_cold int decode_init(AVCodecContext *avctx)
+static av_cold int decode_end(AVCodecContext *avctx)
 {
-    C93DecoderContext *s = avctx->priv_data;
-    avctx->pix_fmt = AV_PIX_FMT_PAL8;
-    avcodec_get_frame_defaults(&s->pictures[0]);
-    avcodec_get_frame_defaults(&s->pictures[1]);
+    C93DecoderContext * const c93 = avctx->priv_data;
+
+    av_frame_free(&c93->pictures[0]);
+    av_frame_free(&c93->pictures[1]);
+
     return 0;
 }
 
-static av_cold int decode_end(AVCodecContext *avctx)
+static av_cold int decode_init(AVCodecContext *avctx)
 {
-    C93DecoderContext * const c93 = avctx->priv_data;
+    C93DecoderContext *s = avctx->priv_data;
+    avctx->pix_fmt = AV_PIX_FMT_PAL8;
 
-    av_frame_unref(&c93->pictures[0]);
-    av_frame_unref(&c93->pictures[1]);
+    s->pictures[0] = av_frame_alloc();
+    s->pictures[1] = av_frame_alloc();
+    if (!s->pictures[0] || !s->pictures[1]) {
+        decode_end(avctx);
+        return AVERROR(ENOMEM);
+    }
 
     return 0;
 }
@@ -121,13 +127,14 @@
     const uint8_t *buf = avpkt->data;
     int buf_size = avpkt->size;
     C93DecoderContext * const c93 = avctx->priv_data;
-    AVFrame * const newpic = &c93->pictures[c93->currentpic];
-    AVFrame * const oldpic = &c93->pictures[c93->currentpic^1];
+    AVFrame * const newpic = c93->pictures[c93->currentpic];
+    AVFrame * const oldpic = c93->pictures[c93->currentpic^1];
     GetByteContext gb;
     uint8_t *out;
     int stride, ret, i, x, y, b, bt = 0;
 
-    avcodec_set_dimensions(avctx, WIDTH, HEIGHT);
+    if ((ret = ff_set_dimensions(avctx, WIDTH, HEIGHT)) < 0)
+        return ret;
 
     c93->currentpic ^= 1;

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/cabac.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/cabac.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/cabac_functions.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/cabac_functions.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/cavs.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/cavs.c Changed

@@ -407,8 +407,9 @@
         full_my < 0 - extra_height ||
         full_mx + 16 /* FIXME */ > pic_width + extra_width ||
         full_my + 16 /* FIXME */ > pic_height + extra_height) {
-        h->vdsp.emulated_edge_mc(h->edge_emu_buffer, h->l_stride,
-                                 src_y - 2 - 2 * h->l_stride, h->l_stride,
+        h->vdsp.emulated_edge_mc(h->edge_emu_buffer,
+                                 src_y - 2 - 2 * h->l_stride,
+                                 h->l_stride, h->l_stride,
                                  16 + 5, 16 + 5 /* FIXME */,
                                  full_mx - 2, full_my - 2,
                                  pic_width, pic_height);
@@ -420,8 +421,8 @@
     qpix_op[luma_xy](dest_y, src_y, h->l_stride);
 
     if (emu) {
-        h->vdsp.emulated_edge_mc(h->edge_emu_buffer, h->c_stride, src_cb,
-                                 h->c_stride,
+        h->vdsp.emulated_edge_mc(h->edge_emu_buffer, src_cb,
+                                 h->c_stride, h->c_stride,
                                  9, 9 /* FIXME */,
                                  mx >> 3, my >> 3,
                                  pic_width >> 1, pic_height >> 1);
@@ -430,8 +431,8 @@
     chroma_op(dest_cb, src_cb, h->c_stride, chroma_height, mx & 7, my & 7);
 
     if (emu) {
-        h->vdsp.emulated_edge_mc(h->edge_emu_buffer, h->c_stride, src_cr,
-                                 h->c_stride,
+        h->vdsp.emulated_edge_mc(h->edge_emu_buffer, src_cr,
+                                 h->c_stride, h->c_stride,
                                  9, 9 /* FIXME */,
                                  mx >> 3, my >> 3,
                                  pic_width >> 1, pic_height >> 1);

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/cavsdec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/cavsdec.c Changed

@@ -565,8 +565,10 @@
         level_code = get_ue_code(gb, r->golomb_order);
         if (level_code >= ESCAPE_CODE) {
             run      = ((level_code - ESCAPE_CODE) >> 1) + 1;
-            if(run > 64)
-                return -1;
+            if(run > 64) {
+                av_log(h->avctx, AV_LOG_ERROR, "run %d is too large\n", run);
+                return AVERROR_INVALIDDATA;
+            }
             esc_code = get_ue_code(gb, esc_golomb_order);
             level    = esc_code + (run > r->max_run ? 1 : r->level_add[run]);
             while (level > r->inc_limit)
@@ -892,8 +894,10 @@
     if (h->stc > 0xAF)
         av_log(h->avctx, AV_LOG_ERROR, "unexpected start code 0x%02x\n", h->stc);
 
-    if (h->stc >= h->mb_height)
-        return -1;
+    if (h->stc >= h->mb_height) {
+        av_log(h->avctx, AV_LOG_ERROR, "stc 0x%02x is too large\n", h->stc);
+        return AVERROR_INVALIDDATA;
+    }
 
     h->mby   = h->stc;
     h->mbidx = h->mby * h->mb_width;
@@ -944,8 +948,8 @@
 
 static int decode_pic(AVSContext *h)
 {
-    int skip_count    = -1;
     int ret;
+    int skip_count    = -1;
     enum cavs_mb mb_type;
 
     if (!h->top_qp) {
@@ -981,9 +985,9 @@
             skip_bits(&h->gb, 1); //marker_bit
     }
 
-    if ((ret = ff_get_buffer(h->avctx, h->cur.f,
-                             h->cur.f->pict_type == AV_PICTURE_TYPE_B ?
-                             0 : AV_GET_BUFFER_FLAG_REF)) < 0)
+    ret = ff_get_buffer(h->avctx, h->cur.f, h->cur.f->pict_type == AV_PICTURE_TYPE_B ?
+                        0 : AV_GET_BUFFER_FLAG_REF);
+    if (ret < 0)
         return ret;
 
     if (!h->edge_emu_buffer) {
@@ -1161,12 +1165,17 @@
         return 0;
     }
 
+    h->stc = 0;
+
     buf_ptr = buf;
     buf_end = buf + buf_size;
     for(;;) {
         buf_ptr = avpriv_find_start_code(buf_ptr, buf_end, &stc);
-        if ((stc & 0xFFFFFE00) || buf_ptr == buf_end)
+        if ((stc & 0xFFFFFE00) || buf_ptr == buf_end) {
+            if (!h->stc)
+                av_log(h->avctx, AV_LOG_WARNING, "no frame decoded\n");
             return FFMAX(0, buf_ptr - buf);
+        }
         input_size = (buf_end - buf_ptr) * 8;
         switch (stc) {
         case CAVS_START_CODE:

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/cdxl.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/cdxl.c Changed

omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/cinepakenc.c Added

@@ -0,0 +1,1335 @@
+/*
+ * Cinepak encoder (c) 2011 Tomas Härdin
+ * http://titan.codemill.se/~tomhar/cinepakenc.patch
+ *
+ * Fixes and improvements, vintage decoders compatibility
+ *  (c) 2013, 2014 Rl, Aetey Global Technologies AB
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+ * TODO:
+ * - optimize: color space conversion, ...
+ * - implement options to set the min/max number of strips?
+ * MAYBE:
+ * - "optimally" split the frame into several non-regular areas
+ *   using a separate codebook pair for each area and approximating
+ *   the area by several rectangular strips (generally not full width ones)
+ *   (use quadtree splitting? a simple fixed-granularity grid?)
+ *
+ *
+ * version 2014-01-23 Rl
+ * - added option handling for flexibility
+ *
+ * version 2014-01-21 Rl
+ * - believe it or not, now we get even smaller files, with better quality
+ *   (which means I missed an optimization earlier :)
+ *
+ * version 2014-01-20 Rl
+ * - made the encoder compatible with vintage decoders
+ *   and added some yet unused code for possible future
+ *   incremental codebook updates
+ * - fixed a small memory leak
+ *
+ * version 2013-04-28 Rl
+ * - bugfixed codebook optimization logic
+ *
+ * version 2013-02-14 Rl
+ * "Valentine's Day" version:
+ * - made strip division more robust
+ * - minimized bruteforcing the number of strips,
+ *   (costs some R/D but speeds up compession a lot), the heuristic
+ *   assumption is that score as a function of the number of strips has
+ *   one wide minimum which moves slowly, of course not fully true
+ * - simplified codebook generation,
+ *   the old code was meant for other optimizations than we actually do
+ * - optimized the codebook generation / error estimation for MODE_MC
+ *
+ * version 2013-02-12 Rl
+ * - separated codebook training sets, avoided the transfer of wasted bytes,
+ *   which yields both better quality and smaller files
+ * - now using the correct colorspace (TODO: move conversion to libswscale)
+ *
+ * version 2013-02-08 Rl
+ * - fixes/optimization in multistrip encoding and codebook size choice,
+ *   quality/bitrate is now better than that of the binary proprietary encoder
+ */
+
+#include "libavutil/intreadwrite.h"
+#include "avcodec.h"
+#include "libavutil/lfg.h"
+#include "elbg.h"
+#include "internal.h"
+
+#include "libavutil/avassert.h"
+#include "libavutil/opt.h"
+
+#define CVID_HEADER_SIZE 10
+#define STRIP_HEADER_SIZE 12
+#define CHUNK_HEADER_SIZE 4
+
+#define MB_SIZE 4           //4x4 MBs
+#define MB_AREA (MB_SIZE*MB_SIZE)
+
+#define VECTOR_MAX 6        //six or four entries per vector depending on format
+#define CODEBOOK_MAX 256    //size of a codebook
+
+#define MAX_STRIPS  32      //Note: having fewer choices regarding the number of strips speeds up encoding (obviously)
+#define MIN_STRIPS  1       //Note: having more strips speeds up encoding the frame (this is less obvious)
+// MAX_STRIPS limits the maximum quality you can reach
+//            when you want hight quality on high resolutions,
+// MIN_STRIPS limits the minimum efficiently encodable bit rate
+//            on low resolutions
+// the numbers are only used for brute force optimization for the first frame,
+// for the following frames they are adaptively readjusted
+// NOTE the decoder in ffmpeg has its own arbitrary limitation on the number
+// of strips, currently 32
+
+typedef enum {
+    MODE_V1_ONLY = 0,
+    MODE_V1_V4,
+    MODE_MC,
+
+    MODE_COUNT,
+} CinepakMode;
+
+typedef enum {
+    ENC_V1,
+    ENC_V4,
+    ENC_SKIP,
+
+    ENC_UNCERTAIN
+} mb_encoding;
+
+typedef struct {
+    int v1_vector;                  //index into v1 codebook
+    int v1_error;                   //error when using V1 encoding
+    int v4_vector[4];               //indices into v4 codebooks
+    int v4_error;                   //error when using V4 encoding
+    int skip_error;                 //error when block is skipped (aka copied from last frame)
+    mb_encoding best_encoding;      //last result from calculate_mode_score()
+} mb_info;
+
+typedef struct {
+    int v1_codebook[CODEBOOK_MAX*VECTOR_MAX];
+    int v4_codebook[CODEBOOK_MAX*VECTOR_MAX];
+    int v1_size;
+    int v4_size;
+    CinepakMode mode;
+} strip_info;
+
+typedef struct {
+    const AVClass *class;
+    AVCodecContext *avctx;
+    unsigned char *pict_bufs[4], *strip_buf, *frame_buf;
+    AVFrame *last_frame;
+    AVFrame *best_frame;
+    AVFrame *scratch_frame;
+    AVFrame *input_frame;
+    enum AVPixelFormat pix_fmt;
+    int w, h;
+    int frame_buf_size;
+    int curframe, keyint;
+    AVLFG randctx;
+    uint64_t lambda;
+    int *codebook_input;
+    int *codebook_closest;
+    mb_info *mb;                                //MB RD state
+    int min_strips;          //the current limit
+    int max_strips;          //the current limit
+#ifdef CINEPAKENC_DEBUG
+    mb_info *best_mb;                           //TODO: remove. only used for printing stats
+    int num_v1_mode, num_v4_mode, num_mc_mode;
+    int num_v1_encs, num_v4_encs, num_skips;
+#endif
+// options
+    int max_extra_cb_iterations;
+    int skip_empty_cb;
+    int min_min_strips;
+    int max_max_strips;
+    int strip_number_delta_range;
+} CinepakEncContext;
+
+#define OFFSET(x) offsetof(CinepakEncContext, x)
+#define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM
+static const AVOption options[] = {
+    { "max_extra_cb_iterations", "Max extra codebook recalculation passes, more is better and slower", OFFSET(max_extra_cb_iterations), AV_OPT_TYPE_INT, { .i64 = 2 }, 0, INT_MAX, VE },
+    { "skip_empty_cb", "Avoid wasting bytes, ignore vintage MacOS decoder", OFFSET(skip_empty_cb), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, VE },
+    { "max_strips", "Limit strips/frame, vintage compatible is 1..3, otherwise the more the better", OFFSET(max_max_strips), AV_OPT_TYPE_INT, { .i64 = 3 }, MIN_STRIPS, MAX_STRIPS, VE },
+    { "min_strips", "Enforce min strips/frame, more is worse and faster, must be <= max_strips", OFFSET(min_min_strips), AV_OPT_TYPE_INT, { .i64 = MIN_STRIPS }, MIN_STRIPS, MAX_STRIPS, VE },
+    { "strip_number_adaptivity", "How fast the strip number adapts, more is slightly better, much slower", OFFSET(strip_number_delta_range), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, MAX_STRIPS-MIN_STRIPS, VE },
+    { NULL },
+};
+
+static const AVClass cinepak_class = {
+    .class_name = "cinepak",
+    .item_name  = av_default_item_name,
+    .option     = options,
+    .version    = LIBAVUTIL_VERSION_INT,
+};
+
+static av_cold int cinepak_encode_init(AVCodecContext *avctx)
+{
+    CinepakEncContext *s = avctx->priv_data;
+    int x, mb_count, strip_buf_size, frame_buf_size;
+
+    if (avctx->width & 3 || avctx->height & 3) {
+        av_log(avctx, AV_LOG_ERROR, "width and height must be multiples of four (got %ix%i)\n",
+                avctx->width, avctx->height);
+        return AVERROR(EINVAL);
+    }
+
+    if (s->min_min_strips > s->max_max_strips) {
+        av_log(avctx, AV_LOG_ERROR, "minimal number of strips can not exceed maximal (got %i and %i)\n",
+                s->min_min_strips, s->max_max_strips);
+        return AVERROR(EINVAL);
+    }
+
+    if (!(s->last_frame = av_frame_alloc()))
+        return AVERROR(ENOMEM);
+    if (!(s->best_frame = av_frame_alloc()))
+        goto enomem;
+    if (!(s->scratch_frame = av_frame_alloc()))
+        goto enomem;
+    if (avctx->pix_fmt == AV_PIX_FMT_RGB24)
+        if (!(s->input_frame = av_frame_alloc()))
+            goto enomem;
+
+    if (!(s->codebook_input = av_malloc(sizeof(int) * (avctx->pix_fmt == AV_PIX_FMT_RGB24 ? 6 : 4) * (avctx->width * avctx->height) >> 2)))
+        goto enomem;
+
+    if (!(s->codebook_closest = av_malloc(sizeof(int) * (avctx->width * avctx->height) >> 2)))
+        goto enomem;
+
+    for(x = 0; x < (avctx->pix_fmt == AV_PIX_FMT_RGB24 ? 4 : 3); x++)
+        if(!(s->pict_bufs[x] = av_malloc((avctx->pix_fmt == AV_PIX_FMT_RGB24 ? 6 : 4) * (avctx->width * avctx->height) >> 2)))
+            goto enomem;
+
+    mb_count = avctx->width * avctx->height / MB_AREA;
+
+    //the largest possible chunk is 0x31 with all MBs encoded in V4 mode
+    //and full codebooks being replaced in INTER mode,
+    // which is 34 bits per MB
+    //and 2*256 extra flag bits per strip
+    strip_buf_size = STRIP_HEADER_SIZE + 3 * CHUNK_HEADER_SIZE + 2 * VECTOR_MAX * CODEBOOK_MAX + 4 * (mb_count + (mb_count + 15) / 16) + (2 * CODEBOOK_MAX)/8;
+
+    frame_buf_size = CVID_HEADER_SIZE + s->max_max_strips * strip_buf_size;
+
+    if (!(s->strip_buf = av_malloc(strip_buf_size)))
+        goto enomem;
+
+    if (!(s->frame_buf = av_malloc(frame_buf_size)))
+        goto enomem;
+
+    if (!(s->mb = av_malloc(mb_count*sizeof(mb_info))))
+        goto enomem;
+
+#ifdef CINEPAKENC_DEBUG
+    if (!(s->best_mb = av_malloc(mb_count*sizeof(mb_info))))
+        goto enomem;
+#endif
+
+    av_lfg_init(&s->randctx, 1);
+    s->avctx = avctx;
+    s->w = avctx->width;
+    s->h = avctx->height;
+    s->frame_buf_size = frame_buf_size;
+    s->curframe = 0;
+    s->keyint = avctx->keyint_min;
+    s->pix_fmt = avctx->pix_fmt;
+
+    //set up AVFrames
+    s->last_frame->data[0]        = s->pict_bufs[0];
+    s->last_frame->linesize[0]    = s->w;
+    s->best_frame->data[0]        = s->pict_bufs[1];
+    s->best_frame->linesize[0]    = s->w;
+    s->scratch_frame->data[0]     = s->pict_bufs[2];
+    s->scratch_frame->linesize[0] = s->w;
+
+    if (s->pix_fmt == AV_PIX_FMT_RGB24) {
+        s->last_frame->data[1]        = s->last_frame->data[0] + s->w * s->h;
+        s->last_frame->data[2]        = s->last_frame->data[1] + ((s->w * s->h) >> 2);
+        s->last_frame->linesize[1]    = s->last_frame->linesize[2] = s->w >> 1;
+
+        s->best_frame->data[1]        = s->best_frame->data[0] + s->w * s->h;
+        s->best_frame->data[2]        = s->best_frame->data[1] + ((s->w * s->h) >> 2);
+        s->best_frame->linesize[1]    = s->best_frame->linesize[2] = s->w >> 1;
+
+        s->scratch_frame->data[1]     = s->scratch_frame->data[0] + s->w * s->h;
+        s->scratch_frame->data[2]     = s->scratch_frame->data[1] + ((s->w * s->h) >> 2);
+        s->scratch_frame->linesize[1] = s->scratch_frame->linesize[2] = s->w >> 1;
+
+        s->input_frame->data[0]       = s->pict_bufs[3];
+        s->input_frame->linesize[0]   = s->w;
+        s->input_frame->data[1]       = s->input_frame->data[0] + s->w * s->h;
+        s->input_frame->data[2]       = s->input_frame->data[1] + ((s->w * s->h) >> 2);
+        s->input_frame->linesize[1]   = s->input_frame->linesize[2] = s->w >> 1;
+    }
+
+    s->min_strips = s->min_min_strips;
+    s->max_strips = s->max_max_strips;
+
+#ifdef CINEPAKENC_DEBUG
+    s->num_v1_mode = s->num_v4_mode = s->num_mc_mode = s->num_v1_encs = s->num_v4_encs = s->num_skips = 0;
+#endif
+
+    return 0;
+
+enomem:
+    av_frame_free(&s->last_frame);
+    av_frame_free(&s->best_frame);
+    av_frame_free(&s->scratch_frame);
+    if (avctx->pix_fmt == AV_PIX_FMT_RGB24)
+        av_frame_free(&s->input_frame);
+    av_freep(&s->codebook_input);
+    av_freep(&s->codebook_closest);
+    av_freep(&s->strip_buf);
+    av_freep(&s->frame_buf);
+    av_freep(&s->mb);
+#ifdef CINEPAKENC_DEBUG
+    av_freep(&s->best_mb);
+#endif
+
+    for(x = 0; x < (avctx->pix_fmt == AV_PIX_FMT_RGB24 ? 4 : 3); x++)
+        av_freep(&s->pict_bufs[x]);
+
+    return AVERROR(ENOMEM);
+}
+
+static int64_t calculate_mode_score(CinepakEncContext *s, int h, strip_info *info, int report, int *training_set_v1_shrunk, int *training_set_v4_shrunk
+#ifdef CINEPAK_REPORT_SERR
+, int64_t *serr
+#endif
+)
+{
+    //score = FF_LAMBDA_SCALE * error + lambda * bits
+    int x;
+    int entry_size = s->pix_fmt == AV_PIX_FMT_RGB24 ? 6 : 4;
+    int mb_count = s->w * h / MB_AREA;
+    mb_info *mb;
+    int64_t score1, score2, score3;
+    int64_t ret = s->lambda * ((info->v1_size ? CHUNK_HEADER_SIZE + info->v1_size * entry_size : 0) +
+                   (info->v4_size ? CHUNK_HEADER_SIZE + info->v4_size * entry_size : 0) +
+                   CHUNK_HEADER_SIZE) << 3;
+
+    //av_log(s->avctx, AV_LOG_INFO, "sizes %3i %3i -> %9lli score mb_count %i", info->v1_size, info->v4_size, (long long int)ret, mb_count);
+
+#ifdef CINEPAK_REPORT_SERR
+    *serr = 0;
+#endif
+
+    switch(info->mode) {
+    case MODE_V1_ONLY:
+        //one byte per MB
+        ret += s->lambda * 8 * mb_count;
+
+// while calculating we assume all blocks are ENC_V1
+        for(x = 0; x < mb_count; x++) {
+            mb = &s->mb[x];
+            ret += FF_LAMBDA_SCALE * mb->v1_error;
+#ifdef CINEPAK_REPORT_SERR
+            *serr += mb->v1_error;
+#endif
+// this function is never called for report in MODE_V1_ONLY
+//            if(!report)
+            mb->best_encoding = ENC_V1;
+        }
+
+        break;
+    case MODE_V1_V4:
+        //9 or 33 bits per MB
+        if(report) {
+// no moves between the corresponding training sets are allowed
+            *training_set_v1_shrunk = *training_set_v4_shrunk = 0;
+            for(x = 0; x < mb_count; x++) {
+                int mberr;
+                mb = &s->mb[x];
+                if(mb->best_encoding == ENC_V1)
+                    score1 = s->lambda * 9  + FF_LAMBDA_SCALE * (mberr=mb->v1_error);
+                else
+                    score1 = s->lambda * 33 + FF_LAMBDA_SCALE * (mberr=mb->v4_error);
+                ret += score1;
+#ifdef CINEPAK_REPORT_SERR
+                *serr += mberr;
+#endif
+            }
+        } else { // find best mode per block
+            for(x = 0; x < mb_count; x++) {
+                mb = &s->mb[x];
+                score1 = s->lambda * 9  + FF_LAMBDA_SCALE * mb->v1_error;
+                score2 = s->lambda * 33 + FF_LAMBDA_SCALE * mb->v4_error;
+
+                if(score1 <= score2) {
+                    ret += score1;
+#ifdef CINEPAK_REPORT_SERR
+                    *serr += mb->v1_error;
+#endif
+                    mb->best_encoding = ENC_V1;
+                } else {
+                    ret += score2;
+#ifdef CINEPAK_REPORT_SERR
+                    *serr += mb->v4_error;
+#endif
+                    mb->best_encoding = ENC_V4;
+                }
+            }
+        }
+
+        break;
+    case MODE_MC:
+        //1, 10 or 34 bits per MB
+        if(report) {
+            int v1_shrunk = 0, v4_shrunk = 0;
+            for(x = 0; x < mb_count; x++) {
+                mb = &s->mb[x];
+// it is OK to move blocks to ENC_SKIP here
+// but not to any codebook encoding!
+                score1 = s->lambda * 1  + FF_LAMBDA_SCALE * mb->skip_error;
+                if(mb->best_encoding == ENC_SKIP) {
+                    ret += score1;
+#ifdef CINEPAK_REPORT_SERR
+                    *serr += mb->skip_error;
+#endif
+                } else if(mb->best_encoding == ENC_V1) {
+                    if((score2=s->lambda * 10 + FF_LAMBDA_SCALE * mb->v1_error) >= score1) {
+                        mb->best_encoding = ENC_SKIP;
+                        ++v1_shrunk;
+                        ret += score1;
+#ifdef CINEPAK_REPORT_SERR
+                        *serr += mb->skip_error;
+#endif
+                    } else {
+                        ret += score2;
+#ifdef CINEPAK_REPORT_SERR
+                        *serr += mb->v1_error;
+#endif
+                    }
+                } else {
+                    if((score3=s->lambda * 34 + FF_LAMBDA_SCALE * mb->v4_error) >= score1) {
+                        mb->best_encoding = ENC_SKIP;
+                        ++v4_shrunk;
+                        ret += score1;
+#ifdef CINEPAK_REPORT_SERR
+                        *serr += mb->skip_error;
+#endif
+                    } else {
+                        ret += score3;
+#ifdef CINEPAK_REPORT_SERR
+                        *serr += mb->v4_error;
+#endif
+                    }
+                }
+            }
+            *training_set_v1_shrunk = v1_shrunk;
+            *training_set_v4_shrunk = v4_shrunk;
+        } else { // find best mode per block
+            for(x = 0; x < mb_count; x++) {
+                mb = &s->mb[x];
+                score1 = s->lambda * 1  + FF_LAMBDA_SCALE * mb->skip_error;
+                score2 = s->lambda * 10 + FF_LAMBDA_SCALE * mb->v1_error;
+                score3 = s->lambda * 34 + FF_LAMBDA_SCALE * mb->v4_error;
+
+                if(score1 <= score2 && score1 <= score3) {
+                    ret += score1;
+#ifdef CINEPAK_REPORT_SERR
+                    *serr += mb->skip_error;
+#endif
+                    mb->best_encoding = ENC_SKIP;
+                } else if(score2 <= score3) {
+                    ret += score2;
+#ifdef CINEPAK_REPORT_SERR
+                    *serr += mb->v1_error;
+#endif
+                    mb->best_encoding = ENC_V1;
+                } else {
+                    ret += score3;
+#ifdef CINEPAK_REPORT_SERR
+                    *serr += mb->v4_error;
+#endif
+                    mb->best_encoding = ENC_V4;
+                }
+            }
+        }
+
+        break;
+    }
+
+    return ret;
+}
+
+static int write_chunk_header(unsigned char *buf, int chunk_type, int chunk_size)
+{
+    buf[0] = chunk_type;
+    AV_WB24(&buf[1], chunk_size + CHUNK_HEADER_SIZE);
+    return CHUNK_HEADER_SIZE;
+}
+
+static int encode_codebook(CinepakEncContext *s, int *codebook, int size, int chunk_type_yuv, int chunk_type_gray, unsigned char *buf)
+{
+    int x, y, ret, entry_size = s->pix_fmt == AV_PIX_FMT_RGB24 ? 6 : 4;
+    int incremental_codebook_replacement_mode = 0; // hardcoded here,
+                // the compiler should notice that this is a constant -- rl
+
+    ret = write_chunk_header(buf,
+          s->pix_fmt == AV_PIX_FMT_RGB24 ?
+           chunk_type_yuv+(incremental_codebook_replacement_mode?1:0) :
+           chunk_type_gray+(incremental_codebook_replacement_mode?1:0),
+          entry_size * size
+           + (incremental_codebook_replacement_mode?(size+31)/32*4:0) );
+
+// we do codebook encoding according to the "intra" mode
+// but we keep the "dead" code for reference in case we will want
+// to use incremental codebook updates (which actually would give us
+// "kind of" motion compensation, especially in 1 strip/frame case) -- rl
+// (of course, the code will be not useful as-is)
+    if(incremental_codebook_replacement_mode) {
+        int flags = 0;
+        int flagsind;
+        for(x = 0; x < size; x++) {
+            if(flags == 0) {
+                flagsind = ret;
+                ret += 4;
+                flags = 0x80000000;
+            } else
+                flags = ((flags>>1) | 0x80000000);
+            for(y = 0; y < entry_size; y++)
+                buf[ret++] = codebook[y + x*entry_size] ^ (y >= 4 ? 0x80 : 0);
+            if((flags&0xffffffff) == 0xffffffff) {
+                AV_WB32(&buf[flagsind], flags);
+                flags = 0;
+            }
+        }
+        if(flags)
+            AV_WB32(&buf[flagsind], flags);
+    } else
+        for(x = 0; x < size; x++)
+            for(y = 0; y < entry_size; y++)
+                buf[ret++] = codebook[y + x*entry_size] ^ (y >= 4 ? 0x80 : 0);
+
+    return ret;
+}
+
+//sets out to the sub picture starting at (x,y) in in
+static void get_sub_picture(CinepakEncContext *s, int x, int y, AVPicture *in, AVPicture *out)
+{
+    out->data[0] = in->data[0] + x + y * in->linesize[0];
+    out->linesize[0] = in->linesize[0];
+
+    if(s->pix_fmt == AV_PIX_FMT_RGB24) {
+        out->data[1] = in->data[1] + (x >> 1) + (y >> 1) * in->linesize[1];
+        out->linesize[1] = in->linesize[1];
+
+        out->data[2] = in->data[2] + (x >> 1) + (y >> 1) * in->linesize[2];
+        out->linesize[2] = in->linesize[2];
+    }
+}
+
+//decodes the V1 vector in mb into the 4x4 MB pointed to by sub_pict
+static void decode_v1_vector(CinepakEncContext *s, AVPicture *sub_pict, int v1_vector, strip_info *info)
+{
+    int entry_size = s->pix_fmt == AV_PIX_FMT_RGB24 ? 6 : 4;
+
+    sub_pict->data[0][0] =
+            sub_pict->data[0][1] =
+            sub_pict->data[0][    sub_pict->linesize[0]] =
+            sub_pict->data[0][1+  sub_pict->linesize[0]] = info->v1_codebook[v1_vector*entry_size];
+
+    sub_pict->data[0][2] =
+            sub_pict->data[0][3] =
+            sub_pict->data[0][2+  sub_pict->linesize[0]] =
+            sub_pict->data[0][3+  sub_pict->linesize[0]] = info->v1_codebook[v1_vector*entry_size+1];
+
+    sub_pict->data[0][2*sub_pict->linesize[0]] =
+            sub_pict->data[0][1+2*sub_pict->linesize[0]] =
+            sub_pict->data[0][  3*sub_pict->linesize[0]] =
+            sub_pict->data[0][1+3*sub_pict->linesize[0]] = info->v1_codebook[v1_vector*entry_size+2];
+
+    sub_pict->data[0][2+2*sub_pict->linesize[0]] =
+            sub_pict->data[0][3+2*sub_pict->linesize[0]] =
+            sub_pict->data[0][2+3*sub_pict->linesize[0]] =
+            sub_pict->data[0][3+3*sub_pict->linesize[0]] = info->v1_codebook[v1_vector*entry_size+3];
+
+    if(s->pix_fmt == AV_PIX_FMT_RGB24) {
+        sub_pict->data[1][0] =
+            sub_pict->data[1][1] =
+            sub_pict->data[1][    sub_pict->linesize[1]] =
+            sub_pict->data[1][1+  sub_pict->linesize[1]] = info->v1_codebook[v1_vector*entry_size+4];
+
+        sub_pict->data[2][0] =
+            sub_pict->data[2][1] =
+            sub_pict->data[2][    sub_pict->linesize[2]] =
+            sub_pict->data[2][1+  sub_pict->linesize[2]] = info->v1_codebook[v1_vector*entry_size+5];
+    }
+}
+
+//decodes the V4 vectors in mb into the 4x4 MB pointed to by sub_pict
+static void decode_v4_vector(CinepakEncContext *s, AVPicture *sub_pict, int *v4_vector, strip_info *info)
+{
+    int i, x, y, entry_size = s->pix_fmt == AV_PIX_FMT_RGB24 ? 6 : 4;
+
+    for(i = y = 0; y < 4; y += 2) {
+        for(x = 0; x < 4; x += 2, i++) {
+            sub_pict->data[0][x   +     y*sub_pict->linesize[0]] = info->v4_codebook[v4_vector[i]*entry_size];
+            sub_pict->data[0][x+1 +     y*sub_pict->linesize[0]] = info->v4_codebook[v4_vector[i]*entry_size+1];
+            sub_pict->data[0][x   + (y+1)*sub_pict->linesize[0]] = info->v4_codebook[v4_vector[i]*entry_size+2];
+            sub_pict->data[0][x+1 + (y+1)*sub_pict->linesize[0]] = info->v4_codebook[v4_vector[i]*entry_size+3];
+
+            if(s->pix_fmt == AV_PIX_FMT_RGB24) {
+                sub_pict->data[1][(x>>1) + (y>>1)*sub_pict->linesize[1]] = info->v4_codebook[v4_vector[i]*entry_size+4];
+                sub_pict->data[2][(x>>1) + (y>>1)*sub_pict->linesize[2]] = info->v4_codebook[v4_vector[i]*entry_size+5];
+            }
+        }
+    }
+}
+
+static void copy_mb(CinepakEncContext *s, AVPicture *a, AVPicture *b)
+{
+    int y, p;
+
+    for(y = 0; y < MB_SIZE; y++) {
+        memcpy(a->data[0]+y*a->linesize[0], b->data[0]+y*b->linesize[0],
+               MB_SIZE);
+    }
+
+    if(s->pix_fmt == AV_PIX_FMT_RGB24) {
+        for(p = 1; p <= 2; p++) {
+            for(y = 0; y < MB_SIZE/2; y++) {
+                memcpy(a->data[p] + y*a->linesize[p],
+                       b->data[p] + y*b->linesize[p],
+                       MB_SIZE/2);
+            }
+        }
+    }
+}
+
+static int encode_mode(CinepakEncContext *s, int h, AVPicture *scratch_pict, AVPicture *last_pict, strip_info *info, unsigned char *buf)
+{
+    int x, y, z, flags, bits, temp_size, header_ofs, ret = 0, mb_count = s->w * h / MB_AREA;
+    int needs_extra_bit, should_write_temp;
+    unsigned char temp[64]; //32/2 = 16 V4 blocks at 4 B each -> 64 B
+    mb_info *mb;
+    AVPicture sub_scratch, sub_last;
+
+    //encode codebooks
+////// MacOS vintage decoder compatibility dictates the presence of
+////// the codebook chunk even when the codebook is empty - pretty dumb...
+////// and also the certain order of the codebook chunks -- rl
+    if(info->v4_size || !s->skip_empty_cb)
+        ret += encode_codebook(s, info->v4_codebook, info->v4_size, 0x20, 0x24, buf + ret);
+
+    if(info->v1_size || !s->skip_empty_cb)
+        ret += encode_codebook(s, info->v1_codebook, info->v1_size, 0x22, 0x26, buf + ret);
+
+    //update scratch picture
+    for(z = y = 0; y < h; y += MB_SIZE) {
+        for(x = 0; x < s->w; x += MB_SIZE, z++) {
+            mb = &s->mb[z];
+
+            get_sub_picture(s, x, y, scratch_pict, &sub_scratch);
+
+            if(info->mode == MODE_MC && mb->best_encoding == ENC_SKIP) {
+                get_sub_picture(s, x, y, last_pict, &sub_last);
+                copy_mb(s, &sub_scratch, &sub_last);
+            } else if(info->mode == MODE_V1_ONLY || mb->best_encoding == ENC_V1)
+                decode_v1_vector(s, &sub_scratch, mb->v1_vector, info);
+            else
+                decode_v4_vector(s, &sub_scratch, mb->v4_vector, info);
+        }
+    }
+
+    switch(info->mode) {
+    case MODE_V1_ONLY:
+        //av_log(s->avctx, AV_LOG_INFO, "mb_count = %i\n", mb_count);
+        ret += write_chunk_header(buf + ret, 0x32, mb_count);
+
+        for(x = 0; x < mb_count; x++)
+            buf[ret++] = s->mb[x].v1_vector;
+
+        break;
+    case MODE_V1_V4:
+        //remember header position
+        header_ofs = ret;
+        ret += CHUNK_HEADER_SIZE;
+
+        for(x = 0; x < mb_count; x += 32) {
+            flags = 0;
+            for(y = x; y < FFMIN(x+32, mb_count); y++)
+                if(s->mb[y].best_encoding == ENC_V4)
+                    flags |= 1 << (31 - y + x);
+
+            AV_WB32(&buf[ret], flags);
+            ret += 4;
+
+            for(y = x; y < FFMIN(x+32, mb_count); y++) {
+                mb = &s->mb[y];
+
+                if(mb->best_encoding == ENC_V1)
+                    buf[ret++] = mb->v1_vector;
+                else
+                    for(z = 0; z < 4; z++)
+                        buf[ret++] = mb->v4_vector[z];
+            }
+        }
+
+        write_chunk_header(buf + header_ofs, 0x30, ret - header_ofs - CHUNK_HEADER_SIZE);
+
+        break;
+    case MODE_MC:
+        //remember header position
+        header_ofs = ret;
+        ret += CHUNK_HEADER_SIZE;
+        flags = bits = temp_size = 0;
+
+        for(x = 0; x < mb_count; x++) {
+            mb = &s->mb[x];
+            flags |= (mb->best_encoding != ENC_SKIP) << (31 - bits++);
+            needs_extra_bit = 0;
+            should_write_temp = 0;
+
+            if(mb->best_encoding != ENC_SKIP) {
+                if(bits < 32)
+                    flags |= (mb->best_encoding == ENC_V4) << (31 - bits++);
+                else
+                    needs_extra_bit = 1;
+            }
+
+            if(bits == 32) {
+                AV_WB32(&buf[ret], flags);
+                ret += 4;
+                flags = bits = 0;
+
+                if(mb->best_encoding == ENC_SKIP || needs_extra_bit) {
+                    memcpy(&buf[ret], temp, temp_size);
+                    ret += temp_size;
+                    temp_size = 0;
+                } else
+                    should_write_temp = 1;
+            }
+
+            if(needs_extra_bit) {
+                flags = (mb->best_encoding == ENC_V4) << 31;
+                bits = 1;
+            }
+
+            if(mb->best_encoding == ENC_V1)
+                temp[temp_size++] = mb->v1_vector;
+            else if(mb->best_encoding == ENC_V4)
+                for(z = 0; z < 4; z++)
+                    temp[temp_size++] = mb->v4_vector[z];
+
+            if(should_write_temp) {
+                memcpy(&buf[ret], temp, temp_size);
+                ret += temp_size;
+                temp_size = 0;
+            }
+        }
+
+        if(bits > 0) {
+            AV_WB32(&buf[ret], flags);
+            ret += 4;
+            memcpy(&buf[ret], temp, temp_size);
+            ret += temp_size;
+        }
+
+        write_chunk_header(buf + header_ofs, 0x31, ret - header_ofs - CHUNK_HEADER_SIZE);
+
+        break;
+    }
+
+    return ret;
+}
+
+//computes distortion of 4x4 MB in b compared to a
+static int compute_mb_distortion(CinepakEncContext *s, AVPicture *a, AVPicture *b)
+{
+    int x, y, p, d, ret = 0;
+
+    for(y = 0; y < MB_SIZE; y++) {
+        for(x = 0; x < MB_SIZE; x++) {
+            d = a->data[0][x + y*a->linesize[0]] - b->data[0][x + y*b->linesize[0]];
+            ret += d*d;
+        }
+    }
+
+    if(s->pix_fmt == AV_PIX_FMT_RGB24) {
+        for(p = 1; p <= 2; p++) {
+            for(y = 0; y < MB_SIZE/2; y++) {
+                for(x = 0; x < MB_SIZE/2; x++) {
+                    d = a->data[p][x + y*a->linesize[p]] - b->data[p][x + y*b->linesize[p]];
+                    ret += d*d;
+                }
+            }
+        }
+    }
+
+    return ret;
+}
+
+// return the possibly adjusted size of the codebook
+#define CERTAIN(x) ((x)!=ENC_UNCERTAIN)
+static int quantize(CinepakEncContext *s, int h, AVPicture *pict,
+                    int v1mode, strip_info *info,
+                    mb_encoding encoding)
+{
+    int x, y, i, j, k, x2, y2, x3, y3, plane, shift, mbn;
+    int entry_size = s->pix_fmt == AV_PIX_FMT_RGB24 ? 6 : 4;
+    int *codebook = v1mode ? info->v1_codebook : info->v4_codebook;
+    int size = v1mode ? info->v1_size : info->v4_size;
+    int64_t total_error = 0;
+    uint8_t vq_pict_buf[(MB_AREA*3)/2];
+    AVPicture sub_pict, vq_pict;
+
+    for(mbn = i = y = 0; y < h; y += MB_SIZE) {
+        for(x = 0; x < s->w; x += MB_SIZE, ++mbn) {
+            int *base;
+
+            if(CERTAIN(encoding)) {
+// use for the training only the blocks known to be to be encoded [sic:-]
+               if(s->mb[mbn].best_encoding != encoding) continue;
+            }
+
+            base = s->codebook_input + i*entry_size;
+            if(v1mode) {
+                //subsample
+                for(j = y2 = 0; y2 < entry_size; y2 += 2) {
+                    for(x2 = 0; x2 < 4; x2 += 2, j++) {
+                        plane = y2 < 4 ? 0 : 1 + (x2 >> 1);
+                        shift = y2 < 4 ? 0 : 1;
+                        x3 = shift ? 0 : x2;
+                        y3 = shift ? 0 : y2;
+                        base[j] = (pict->data[plane][((x+x3) >> shift) +      ((y+y3) >> shift)      * pict->linesize[plane]] +
+                                   pict->data[plane][((x+x3) >> shift) + 1 +  ((y+y3) >> shift)      * pict->linesize[plane]] +
+                                   pict->data[plane][((x+x3) >> shift) +     (((y+y3) >> shift) + 1) * pict->linesize[plane]] +
+                                   pict->data[plane][((x+x3) >> shift) + 1 + (((y+y3) >> shift) + 1) * pict->linesize[plane]]) >> 2;
+                    }
+                }
+            } else {
+                //copy
+                for(j = y2 = 0; y2 < MB_SIZE; y2 += 2) {
+                    for(x2 = 0; x2 < MB_SIZE; x2 += 2) {
+                        for(k = 0; k < entry_size; k++, j++) {
+                            plane = k >= 4 ? k - 3 : 0;
+
+                            if(k >= 4) {
+                                x3 = (x+x2) >> 1;
+                                y3 = (y+y2) >> 1;
+                            } else {
+                                x3 = x + x2 + (k & 1);
+                                y3 = y + y2 + (k >> 1);
+                            }
+
+                            base[j] = pict->data[plane][x3 + y3*pict->linesize[plane]];
+                        }
+                    }
+                }
+            }
+            i += v1mode ? 1 : 4;
+        }
+    }
+//    if(i < mbn*(v1mode ? 1 : 4)) {
+//        av_log(s->avctx, AV_LOG_INFO, "reducing training set for %s from %i to %i (encoding %i)\n", v1mode?"v1":"v4", mbn*(v1mode ? 1 : 4), i, encoding);
+//    }
+
+    if(i == 0) // empty training set, nothing to do
+        return 0;
+    if(i < size) {
+        //av_log(s->avctx, (CERTAIN(encoding) ? AV_LOG_ERROR : AV_LOG_INFO), "WOULD WASTE: %s cbsize %i bigger than training set size %i (encoding %i)\n", v1mode?"v1":"v4", size, i, encoding);
+        size = i;
+    }
+
+    avpriv_init_elbg(s->codebook_input, entry_size, i, codebook, size, 1, s->codebook_closest, &s->randctx);
+    avpriv_do_elbg(s->codebook_input, entry_size, i, codebook, size, 1, s->codebook_closest, &s->randctx);
+
+    //setup vq_pict, which contains a single MB
+    vq_pict.data[0] = vq_pict_buf;
+    vq_pict.linesize[0] = MB_SIZE;
+    vq_pict.data[1] = &vq_pict_buf[MB_AREA];
+    vq_pict.data[2] = vq_pict.data[1] + (MB_AREA >> 2);
+    vq_pict.linesize[1] = vq_pict.linesize[2] = MB_SIZE >> 1;
+
+    //copy indices
+    for(i = j = y = 0; y < h; y += MB_SIZE) {
+        for(x = 0; x < s->w; x += MB_SIZE, j++) {
+            mb_info *mb = &s->mb[j];
+// skip uninteresting blocks if we know their preferred encoding
+            if(CERTAIN(encoding) && mb->best_encoding != encoding)
+                continue;
+
+            //point sub_pict to current MB
+            get_sub_picture(s, x, y, pict, &sub_pict);
+
+            if(v1mode) {
+                mb->v1_vector = s->codebook_closest[i];
+
+                //fill in vq_pict with V1 data
+                decode_v1_vector(s, &vq_pict, mb->v1_vector, info);
+
+                mb->v1_error = compute_mb_distortion(s, &sub_pict, &vq_pict);
+                total_error += mb->v1_error;
+            } else {
+                for(k = 0; k < 4; k++)
+                    mb->v4_vector[k] = s->codebook_closest[i+k];
+
+                //fill in vq_pict with V4 data
+                decode_v4_vector(s, &vq_pict, mb->v4_vector, info);
+
+                mb->v4_error = compute_mb_distortion(s, &sub_pict, &vq_pict);
+                total_error += mb->v4_error;
+            }
+            i += v1mode ? 1 : 4;
+        }
+    }
+// check that we did it right in the beginning of the function
+    av_assert0(i >= size); // training set is no smaller than the codebook
+
+    //av_log(s->avctx, AV_LOG_INFO, "isv1 %i size= %i i= %i error %lli\n", v1mode, size, i, (long long int)total_error);
+
+    return size;
+}
+
+static void calculate_skip_errors(CinepakEncContext *s, int h, AVPicture *last_pict, AVPicture *pict, strip_info *info)
+{
+    int x, y, i;
+    AVPicture sub_last, sub_pict;
+
+    for(i = y = 0; y < h; y += MB_SIZE) {
+        for(x = 0; x < s->w; x += MB_SIZE, i++) {
+            get_sub_picture(s, x, y, last_pict, &sub_last);
+            get_sub_picture(s, x, y, pict,      &sub_pict);
+
+            s->mb[i].skip_error = compute_mb_distortion(s, &sub_last, &sub_pict);
+        }
+    }
+}
+
+static void write_strip_header(CinepakEncContext *s, int y, int h, int keyframe, unsigned char *buf, int strip_size)
+{
+// actually we are exclusively using intra strip coding (how much can we win
+// otherwise? how to choose which part of a codebook to update?),
+// keyframes are different only because we disallow ENC_SKIP on them -- rl
+// (besides, the logic here used to be inverted: )
+//    buf[0] = keyframe ? 0x11: 0x10;
+    buf[0] = keyframe ? 0x10: 0x11;
+    AV_WB24(&buf[1], strip_size + STRIP_HEADER_SIZE);
+//    AV_WB16(&buf[4], y); /* using absolute y values works -- rl */
+    AV_WB16(&buf[4], 0); /* using relative values works as well -- rl */
+    AV_WB16(&buf[6], 0);
+//    AV_WB16(&buf[8], y+h); /* using absolute y values works -- rl */
+    AV_WB16(&buf[8], h); /* using relative values works as well -- rl */
+    AV_WB16(&buf[10], s->w);
+    //av_log(s->avctx, AV_LOG_INFO, "write_strip_header() %x keyframe=%d\n", buf[0], keyframe);
+}
+
+static int rd_strip(CinepakEncContext *s, int y, int h, int keyframe, AVPicture *last_pict, AVPicture *pict, AVPicture *scratch_pict, unsigned char *buf, int64_t *best_score
+#ifdef CINEPAK_REPORT_SERR
+, int64_t *best_serr
+#endif
+)
+{
+    int64_t score = 0;
+#ifdef CINEPAK_REPORT_SERR
+    int64_t serr;
+#endif
+    int best_size = 0;
+    strip_info info;
+// for codebook optimization:
+    int v1enough, v1_size, v4enough, v4_size;
+    int new_v1_size, new_v4_size;
+    int v1shrunk, v4shrunk;
+
+    if(!keyframe)
+        calculate_skip_errors(s, h, last_pict, pict, &info);
+
+    //try some powers of 4 for the size of the codebooks
+    //constraint the v4 codebook to be no bigger than v1 one,
+    //(and no less than v1_size/4)
+    //thus making v1 preferable and possibly losing small details? should be ok
+#define SMALLEST_CODEBOOK 1
+    for(v1enough = 0, v1_size = SMALLEST_CODEBOOK; v1_size <= CODEBOOK_MAX && !v1enough; v1_size <<= 2) {
+        for(v4enough = 0, v4_size = 0; v4_size <= v1_size && !v4enough; v4_size = v4_size ? v4_size << 2 : v1_size >= SMALLEST_CODEBOOK << 2 ? v1_size >> 2 : SMALLEST_CODEBOOK) {
+            //try all modes
+            for(CinepakMode mode = 0; mode < MODE_COUNT; mode++) {
+                //don't allow MODE_MC in intra frames
+                if(keyframe && mode == MODE_MC)
+                    continue;
+
+                if(mode == MODE_V1_ONLY) {
+                    info.v1_size = v1_size;
+// the size may shrink even before optimizations if the input is short:
+                    info.v1_size = quantize(s, h, pict, 1, &info, ENC_UNCERTAIN);
+                    if(info.v1_size < v1_size)
+// too few eligible blocks, no sense in trying bigger sizes
+                        v1enough = 1;
+
+                    info.v4_size = 0;
+                } else { // mode != MODE_V1_ONLY
+                    // if v4 codebook is empty then only allow V1-only mode
+                    if(!v4_size)
+                        continue;
+
+                    if(mode == MODE_V1_V4) {
+                        info.v4_size = v4_size;
+                        info.v4_size = quantize(s, h, pict, 0, &info, ENC_UNCERTAIN);
+                        if(info.v4_size < v4_size)
+// too few eligible blocks, no sense in trying bigger sizes
+                            v4enough = 1;
+                    }
+                }
+
+                info.mode = mode;
+// choose the best encoding per block, based on current experience
+                score = calculate_mode_score(s, h, &info, 0,
+                                             &v1shrunk, &v4shrunk
+#ifdef CINEPAK_REPORT_SERR
+, &serr
+#endif
+);
+
+                if(mode != MODE_V1_ONLY){
+                    int extra_iterations_limit = s->max_extra_cb_iterations;
+// recompute the codebooks, omitting the extra blocks
+// we assume we _may_ come here with more blocks to encode than before
+                    info.v1_size = v1_size;
+                    new_v1_size = quantize(s, h, pict, 1, &info, ENC_V1);
+                    if(new_v1_size < info.v1_size){
+                        //av_log(s->avctx, AV_LOG_INFO, "mode %i, %3i, %3i: cut v1 codebook to %i entries\n", mode, v1_size, v4_size, new_v1_size);
+                        info.v1_size = new_v1_size;
+                    }
+// we assume we _may_ come here with more blocks to encode than before
+                    info.v4_size = v4_size;
+                    new_v4_size = quantize(s, h, pict, 0, &info, ENC_V4);
+                    if(new_v4_size < info.v4_size) {
+                        //av_log(s->avctx, AV_LOG_INFO, "mode %i, %3i, %3i: cut v4 codebook to %i entries at first iteration\n", mode, v1_size, v4_size, new_v4_size);
+                        info.v4_size = new_v4_size;
+                    }
+// calculate the resulting score
+// (do not move blocks to codebook encodings now, as some blocks may have
+// got bigger errors despite a smaller training set - but we do not
+// ever grow the training sets back)
+                    for(;;) {
+                        score = calculate_mode_score(s, h, &info, 1,
+                                                     &v1shrunk, &v4shrunk
+#ifdef CINEPAK_REPORT_SERR
+, &serr
+#endif
+);
+// do we have a reason to reiterate? if so, have we reached the limit?
+                        if((!v1shrunk && !v4shrunk) || !extra_iterations_limit--) break;
+// recompute the codebooks, omitting the extra blocks
+                        if(v1shrunk) {
+                            info.v1_size = v1_size;
+                            new_v1_size = quantize(s, h, pict, 1, &info, ENC_V1);
+                            if(new_v1_size < info.v1_size){
+                                //av_log(s->avctx, AV_LOG_INFO, "mode %i, %3i, %3i: cut v1 codebook to %i entries\n", mode, v1_size, v4_size, new_v1_size);
+                                info.v1_size = new_v1_size;
+                            }
+                        }
+                        if(v4shrunk) {
+                            info.v4_size = v4_size;
+                            new_v4_size = quantize(s, h, pict, 0, &info, ENC_V4);
+                            if(new_v4_size < info.v4_size) {
+                                //av_log(s->avctx, AV_LOG_INFO, "mode %i, %3i, %3i: cut v4 codebook to %i entries\n", mode, v1_size, v4_size, new_v4_size);
+                                info.v4_size = new_v4_size;
+                            }
+                        }
+                    }
+                }
+
+                //av_log(s->avctx, AV_LOG_INFO, "%3i %3i score = %lli\n", v1_size, v4_size, (long long int)score);
+
+                if(best_size == 0 || score < *best_score) {
+
+                    *best_score = score;
+#ifdef CINEPAK_REPORT_SERR
+                    *best_serr = serr;
+#endif
+                    best_size = encode_mode(s, h, scratch_pict, last_pict, &info, s->strip_buf + STRIP_HEADER_SIZE);
+
+                    //av_log(s->avctx, AV_LOG_INFO, "mode %i, %3i, %3i: %18lli %i B", mode, info.v1_size, info.v4_size, (long long int)score, best_size);
+                    //av_log(s->avctx, AV_LOG_INFO, "\n");
+#ifdef CINEPAK_REPORT_SERR
+                    av_log(s->avctx, AV_LOG_INFO, "mode %i, %3i, %3i: %18lli %i B\n", mode, v1_size, v4_size, (long long int)serr, best_size);
+#endif
+
+#ifdef CINEPAKENC_DEBUG
+                    //save MB encoding choices
+                    memcpy(s->best_mb, s->mb, mb_count*sizeof(mb_info));
+#endif
+
+                    //memcpy(strip_temp + STRIP_HEADER_SIZE, strip_temp, best_size);
+                    write_strip_header(s, y, h, keyframe, s->strip_buf, best_size);
+
+                }
+            }
+        }
+    }
+
+#ifdef CINEPAKENC_DEBUG
+    //gather stats. this will only work properly of MAX_STRIPS == 1
+    if(best_info.mode == MODE_V1_ONLY) {
+        s->num_v1_mode++;
+        s->num_v1_encs += s->w*h/MB_AREA;
+    } else {
+        if(best_info.mode == MODE_V1_V4)
+            s->num_v4_mode++;
+        else
+            s->num_mc_mode++;
+
+        int x;
+        for(x = 0; x < s->w*h/MB_AREA; x++)
+            if(s->best_mb[x].best_encoding == ENC_V1)
+                s->num_v1_encs++;
+            else if(s->best_mb[x].best_encoding == ENC_V4)
+                s->num_v4_encs++;
+            else
+                s->num_skips++;
+    }
+#endif
+
+    best_size += STRIP_HEADER_SIZE;
+    memcpy(buf, s->strip_buf, best_size);
+
+    return best_size;
+}
+
+static int write_cvid_header(CinepakEncContext *s, unsigned char *buf, int num_strips, int data_size, int isakeyframe)
+{
+    buf[0] = isakeyframe ? 0 : 1;
+    AV_WB24(&buf[1], data_size + CVID_HEADER_SIZE);
+    AV_WB16(&buf[4], s->w);
+    AV_WB16(&buf[6], s->h);
+    AV_WB16(&buf[8], num_strips);
+
+    return CVID_HEADER_SIZE;
+}
+
+static int rd_frame(CinepakEncContext *s, const AVFrame *frame, int isakeyframe, unsigned char *buf, int buf_size)
+{
+    int num_strips, strip, i, y, nexty, size, temp_size, best_size;
+    AVPicture last_pict, pict, scratch_pict;
+    int64_t best_score = 0, score, score_temp;
+#ifdef CINEPAK_REPORT_SERR
+    int64_t best_serr = 0, serr, serr_temp;
+#endif
+
+    int best_nstrips;
+
+    if(s->pix_fmt == AV_PIX_FMT_RGB24) {
+        int x;
+// build a copy of the given frame in the correct colorspace
+        for(y = 0; y < s->h; y += 2) {
+            for(x = 0; x < s->w; x += 2) {
+                uint8_t *ir[2]; int32_t r, g, b, rr, gg, bb;
+                ir[0] = ((AVPicture*)frame)->data[0] + x*3 + y*((AVPicture*)frame)->linesize[0];
+                ir[1] = ir[0] + ((AVPicture*)frame)->linesize[0];
+                get_sub_picture(s, x, y, (AVPicture*)s->input_frame, &scratch_pict);
+                r = g = b = 0;
+                for(i=0; i<4; ++i) {
+                    int i1, i2;
+                    i1 = (i&1); i2 = (i>=2);
+                    rr = ir[i2][i1*3+0];
+                    gg = ir[i2][i1*3+1];
+                    bb = ir[i2][i1*3+2];
+                    r += rr; g += gg; b += bb;
+// using fixed point arithmetic for portable repeatability, scaling by 2^23
+// "Y"
+//                    rr = 0.2857*rr + 0.5714*gg + 0.1429*bb;
+                    rr = (2396625*rr + 4793251*gg + 1198732*bb) >> 23;
+                    if(      rr <   0) rr =   0;
+                    else if (rr > 255) rr = 255;
+                    scratch_pict.data[0][i1 + i2*scratch_pict.linesize[0]] = rr;
+                }
+// let us scale down as late as possible
+//                r /= 4; g /= 4; b /= 4;
+// "U"
+//                rr = -0.1429*r - 0.2857*g + 0.4286*b;
+                rr = (-299683*r - 599156*g + 898839*b) >> 23;
+                if(      rr < -128) rr = -128;
+                else if (rr >  127) rr =  127;
+                scratch_pict.data[1][0] = rr + 128; // quantize needs unsigned
+// "V"
+//                rr = 0.3571*r - 0.2857*g - 0.0714*b;
+                rr = (748893*r - 599156*g - 149737*b) >> 23;
+                if(      rr < -128) rr = -128;
+                else if (rr >  127) rr =  127;
+                scratch_pict.data[2][0] = rr + 128; // quantize needs unsigned
+            }
+        }
+    }
+
+    //would be nice but quite certainly incompatible with vintage players:
+    // support encoding zero strips (meaning skip the whole frame)
+    for(num_strips = s->min_strips; num_strips <= s->max_strips && num_strips <= s->h / MB_SIZE; num_strips++) {
+        score = 0;
+        size = 0;
+#ifdef CINEPAK_REPORT_SERR
+        serr = 0;
+#endif
+
+        for(y = 0, strip = 1; y < s->h; strip++, y = nexty) {
+            int strip_height;
+
+            nexty = strip * s->h / num_strips; // <= s->h
+            //make nexty the next multiple of 4 if not already there
+            if(nexty & 3)
+                nexty += 4 - (nexty & 3);
+
+            strip_height = nexty - y;
+            if(strip_height <= 0) { // can this ever happen?
+                av_log(s->avctx, AV_LOG_INFO, "skipping zero height strip %i of %i\n", strip, num_strips);
+                continue;
+            }
+
+            if(s->pix_fmt == AV_PIX_FMT_RGB24)
+                get_sub_picture(s, 0, y, (AVPicture*)s->input_frame,    &pict);
+            else
+                get_sub_picture(s, 0, y, (AVPicture*)frame,              &pict);
+            get_sub_picture(s, 0, y, (AVPicture*)s->last_frame,    &last_pict);
+            get_sub_picture(s, 0, y, (AVPicture*)s->scratch_frame, &scratch_pict);
+
+            if((temp_size = rd_strip(s, y, strip_height, isakeyframe, &last_pict, &pict, &scratch_pict, s->frame_buf + size + CVID_HEADER_SIZE, &score_temp
+#ifdef CINEPAK_REPORT_SERR
+, &serr_temp
+#endif
+)) < 0)
+                return temp_size;
+
+            score += score_temp;
+#ifdef CINEPAK_REPORT_SERR
+            serr += serr_temp;
+#endif
+            size += temp_size;
+            //av_log(s->avctx, AV_LOG_INFO, "strip %d, isakeyframe=%d", strip, isakeyframe);
+            //av_log(s->avctx, AV_LOG_INFO, "\n");
+        }
+
+        if(best_score == 0 || score < best_score) {
+            best_score = score;
+#ifdef CINEPAK_REPORT_SERR
+            best_serr = serr;
+#endif
+            best_size = size + write_cvid_header(s, s->frame_buf, num_strips, size, isakeyframe);
+            //av_log(s->avctx, AV_LOG_INFO, "best number of strips so far: %2i, %12lli, %i B\n", num_strips, (long long int)score, best_size);
+#ifdef CINEPAK_REPORT_SERR
+            av_log(s->avctx, AV_LOG_INFO, "best number of strips so far: %2i, %12lli, %i B\n", num_strips, (long long int)serr, best_size);
+#endif
+
+            FFSWAP(AVFrame *, s->best_frame, s->scratch_frame);
+            memcpy(buf, s->frame_buf, best_size);
+            best_nstrips = num_strips;
+        }
+// avoid trying too many strip numbers without a real reason
+// (this makes the processing of the very first frame faster)
+        if(num_strips - best_nstrips > 4)
+            break;
+    }
+
+// let the number of strips slowly adapt to the changes in the contents,
+// compared to full bruteforcing every time this will occasionally lead
+// to some r/d performance loss but makes encoding up to several times faster
+    if(!s->strip_number_delta_range) {
+        if(best_nstrips == s->max_strips) { // let us try to step up
+            s->max_strips = best_nstrips + 1;
+            if(s->max_strips >= s->max_max_strips)
+                s->max_strips = s->max_max_strips;
+        } else { // try to step down
+            s->max_strips = best_nstrips;
+        }
+        s->min_strips = s->max_strips - 1;
+        if(s->min_strips < s->min_min_strips)
+            s->min_strips = s->min_min_strips;
+    } else {
+        s->max_strips = best_nstrips + s->strip_number_delta_range;
+        if(s->max_strips >= s->max_max_strips)
+            s->max_strips = s->max_max_strips;
+        s->min_strips = best_nstrips - s->strip_number_delta_range;
+        if(s->min_strips < s->min_min_strips)
+            s->min_strips = s->min_min_strips;
+    }
+
+    return best_size;
+}
+
+static int cinepak_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
+                                const AVFrame *frame, int *got_packet)
+{
+    CinepakEncContext *s = avctx->priv_data;
+    int ret;
+
+    s->lambda = frame->quality ? frame->quality - 1 : 2 * FF_LAMBDA_SCALE;
+
+    if ((ret = ff_alloc_packet2(avctx, pkt, s->frame_buf_size)) < 0)
+        return ret;
+    ret = rd_frame(s, frame, (s->curframe == 0), pkt->data, s->frame_buf_size);
+    pkt->size = ret;
+    if (s->curframe == 0)
+        pkt->flags |= AV_PKT_FLAG_KEY;
+    *got_packet = 1;
+
+    avctx->coded_frame = frame;
+
+    FFSWAP(AVFrame *, s->last_frame, s->best_frame);
+
+    if (++s->curframe >= s->keyint)
+        s->curframe = 0;
+
+    return 0;
+}
+
+static av_cold int cinepak_encode_end(AVCodecContext *avctx)
+{
+    CinepakEncContext *s = avctx->priv_data;
+    int x;
+
+    av_frame_free(&s->last_frame);
+    av_frame_free(&s->best_frame);
+    av_frame_free(&s->scratch_frame);
+    if (avctx->pix_fmt == AV_PIX_FMT_RGB24)
+        av_frame_free(&s->input_frame);
+    av_freep(&s->codebook_input);
+    av_freep(&s->codebook_closest);
+    av_freep(&s->strip_buf);
+    av_freep(&s->frame_buf);
+    av_freep(&s->mb);
+#ifdef CINEPAKENC_DEBUG
+    av_freep(&s->best_mb);
+#endif
+
+    for(x = 0; x < (avctx->pix_fmt == AV_PIX_FMT_RGB24 ? 4 : 3); x++)
+        av_freep(&s->pict_bufs[x]);
+
+#ifdef CINEPAKENC_DEBUG
+    av_log(avctx, AV_LOG_INFO, "strip coding stats: %i V1 mode, %i V4 mode, %i MC mode (%i V1 encs, %i V4 encs, %i skips)\n",
+        s->num_v1_mode, s->num_v4_mode, s->num_mc_mode, s->num_v1_encs, s->num_v4_encs, s->num_skips);
+#endif
+
+    return 0;
+}
+
+AVCodec ff_cinepak_encoder = {
+    .name           = "cinepak",
+    .type           = AVMEDIA_TYPE_VIDEO,
+    .id             = AV_CODEC_ID_CINEPAK,
+    .priv_data_size = sizeof(CinepakEncContext),
+    .init           = cinepak_encode_init,
+    .encode2        = cinepak_encode_frame,
+    .close          = cinepak_encode_end,
+    .pix_fmts       = (const enum AVPixelFormat[]){AV_PIX_FMT_RGB24, AV_PIX_FMT_GRAY8, AV_PIX_FMT_NONE},
+    .long_name      = NULL_IF_CONFIG_SMALL("Cinepak / CVID"),
+    .priv_class     = &cinepak_class,
+};

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/cljr.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/cljr.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/codec_desc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/codec_desc.c Changed

@@ -21,10 +21,10 @@
 
 #include <string.h>
 
-#include "avcodec.h"
-
 #include "libavutil/common.h"
 #include "libavutil/internal.h"
+#include "avcodec.h"
+#include "version.h"
 
 static const AVCodecDescriptor codec_descriptors[] = {
     /* video codecs */
@@ -42,6 +42,7 @@
         .long_name = NULL_IF_CONFIG_SMALL("MPEG-2 video"),
         .props     = AV_CODEC_PROP_LOSSY,
     },
+#if FF_API_XVMC
     {
         .id        = AV_CODEC_ID_MPEG2VIDEO_XVMC,
         .type      = AVMEDIA_TYPE_VIDEO,
@@ -49,6 +50,7 @@
         .long_name = NULL_IF_CONFIG_SMALL("MPEG-1/2 video XvMC (X-Video Motion Compensation)"),
         .props     = AV_CODEC_PROP_LOSSY,
     },
+#endif /* FF_API_XVMC */
     {
         .id        = AV_CODEC_ID_H261,
         .type      = AVMEDIA_TYPE_VIDEO,
@@ -226,13 +228,6 @@
         .props     = AV_CODEC_PROP_LOSSY | AV_CODEC_PROP_LOSSLESS,
     },
     {
-        .id        = AV_CODEC_ID_HEVC,
-        .type      = AVMEDIA_TYPE_VIDEO,
-        .name      = "hevc",
-        .long_name = NULL_IF_CONFIG_SMALL("H.265 / HEVC"),
-        .props     = AV_CODEC_PROP_LOSSY | AV_CODEC_PROP_LOSSLESS,
-    },
-    {
         .id        = AV_CODEC_ID_INDEO3,
         .type      = AVMEDIA_TYPE_VIDEO,
         .name      = "indeo3",
@@ -1394,6 +1389,27 @@
         .props     = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY |
                      AV_CODEC_PROP_LOSSLESS,
     },
+    {
+        .id        = AV_CODEC_ID_HNM4_VIDEO,
+        .type      = AVMEDIA_TYPE_VIDEO,
+        .name      = "hnm4video",
+        .long_name = NULL_IF_CONFIG_SMALL("HNM 4 video"),
+        .props     = AV_CODEC_PROP_LOSSY,
+    },
+    {
+        .id        = AV_CODEC_ID_HEVC,
+        .type      = AVMEDIA_TYPE_VIDEO,
+        .name      = "hevc",
+        .long_name = NULL_IF_CONFIG_SMALL("H.265 / HEVC (High Efficiency Video Coding)"),
+        .props     = AV_CODEC_PROP_LOSSY,
+    },
+    {
+        .id        = AV_CODEC_ID_FIC,
+        .type      = AVMEDIA_TYPE_VIDEO,
+        .name      = "fic",
+        .long_name = NULL_IF_CONFIG_SMALL("Mirillis FIC"),
+        .props     = AV_CODEC_PROP_LOSSY,
+    },
 
     /* various PCM "codecs" */
     {
@@ -2613,6 +2629,12 @@
         .name      = "dvd_nav_packet",
         .long_name = NULL_IF_CONFIG_SMALL("DVD Nav packet"),
     },
+    {
+        .id        = AV_CODEC_ID_TIMED_ID3,
+        .type      = AVMEDIA_TYPE_DATA,
+        .name      = "timed_id3",
+        .long_name = NULL_IF_CONFIG_SMALL("timed ID3 metadata"),
+    },
 
 };

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/cook.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/cook.c Changed

@@ -51,6 +51,7 @@
 #include "fft.h"
 #include "internal.h"
 #include "sinewin.h"
+#include "unary.h"
 
 #include "cookdata.h"
 
@@ -228,7 +229,7 @@
 
     /* Initialize the MDCT. */
     if ((ret = ff_mdct_init(&q->mdct_ctx, av_log2(mlt_size) + 1, 1, 1.0 / 32768.0))) {
-        av_free(q->mlt_window);
+        av_freep(&q->mlt_window);
         return ret;
     }
     av_log(q->avctx, AV_LOG_DEBUG, "MDCT initialized, order = %d.\n",
@@ -302,8 +303,8 @@
     av_log(avctx, AV_LOG_DEBUG, "Deallocating memory.\n");
 
     /* Free allocated memory buffers. */
-    av_free(q->mlt_window);
-    av_free(q->decoded_bytes_buffer);
+    av_freep(&q->mlt_window);
+    av_freep(&q->decoded_bytes_buffer);
 
     /* Free the transform. */
     ff_mdct_end(&q->mdct_ctx);
@@ -331,11 +332,7 @@
 {
     int i, n;
 
-    while (get_bits1(gb)) {
-        /* NOTHING */
-    }
-
-    n = get_bits_count(gb) - 1;     // amount of elements*2 to update
+    n = get_unary(gb, 0, get_bits_left(gb));     // amount of elements*2 to update
 
     i = 0;
     while (n--) {

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/cook_parser.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/cook_parser.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/cos_tablegen.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/cos_tablegen.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/crystalhd.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/crystalhd.c Changed

@@ -915,8 +915,8 @@
                 H264Context *h = priv->parser->priv_data;
 
                 index = av_parser_parse2(priv->parser, avctx, &pout, &psize,
-                                         in_data, len, avctx->pkt->pts,
-                                         avctx->pkt->dts, 0);
+                                         in_data, len, avctx->internal->pkt->pts,
+                                         avctx->internal->pkt->dts, 0);
                 if (index < 0) {
                     av_log(avctx, AV_LOG_WARNING,
                            "CrystalHD: Failed to parse h.264 packet to "
@@ -950,7 +950,7 @@
              * avoiding mangling so we need to build a mapping to values
              * we know will not be mangled.
              */
-            uint64_t pts = opaque_list_push(priv, avctx->pkt->pts, pic_type);
+            uint64_t pts = opaque_list_push(priv, avctx->internal->pkt->pts, pic_type);
             if (!pts) {
                 if (free_data) {
                     av_freep(&in_data);

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/dcadata.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/dcadata.h Changed

@@ -7305,224 +7305,222 @@
 +1.390191784E-007
 };
 
+/* pre-scale lfe fir coefficients */
+#define SCALE(c) ((c) / (256.0f * 32768.0f))
 DECLARE_ALIGNED(16, static const float, lfe_fir_64)[] =
 {
-    2.658434386830777e-4, 9.029330685734748e-3,
-    7.939263433218002e-2, 2.425158768892288e-1,
-    3.430179357528686e-1, 2.398228943347931e-1,
-    7.746443897485733e-2, 8.622321300208569e-3,
-    8.179365249816328e-5, 9.450953453779220e-3,
-    8.134882897138596e-2, 2.451938837766648e-1,
-    3.429597318172455e-1, 2.371159791946411e-1,
-    7.556436210870743e-2, 8.229630999267101e-3,
-    9.439323912374676e-5, 9.887560270726680e-3,
-    8.333285897970200e-2, 2.478559017181396e-1,
-    3.428434133529663e-1, 2.343961596488952e-1,
-    7.369252294301987e-2, 7.850865833461285e-3,
-    1.082170274457894e-4, 1.033949479460716e-2,
-    8.534456789493561e-2, 2.505008876323700e-1,
-    3.426689505577088e-1, 2.316644787788391e-1,
-    7.184901088476181e-2, 7.485736627131701e-3,
-    1.233371440321207e-4, 1.080708485096693e-2,
-    8.738376945257187e-2, 2.531278133392334e-1,
-    3.424364924430847e-1, 2.289219647645950e-1,
-    7.003392279148102e-2, 7.133882027119398e-3,
-    1.397485757479444e-4, 1.129068247973919e-2,
-    8.945026248693466e-2, 2.557355761528015e-1,
-    3.421461284160614e-1, 2.261696159839630e-1,
-    6.824731826782227e-2, 6.794991903007030e-3,
-    1.575958012836054e-4, 1.179065089672804e-2,
-    9.154383838176728e-2, 2.583232223987580e-1,
-    3.417979776859284e-1, 2.234084606170654e-1,
-    6.648923456668854e-2, 6.468691397458315e-3,
-    1.769922382663936e-4, 1.230732165277004e-2,
-    9.366425126791000e-2, 2.608896791934967e-1,
-    3.413922190666198e-1, 2.206395119428635e-1,
-    6.475970894098282e-2, 6.154712289571762e-3,
-    1.981738605536520e-4, 1.284105982631445e-2,
-    9.581124037504196e-2, 2.634339034557342e-1,
-    3.409290313720703e-1, 2.178637981414795e-1,
-    6.305878609418869e-2, 5.852684378623962e-3,
-    2.211847313446924e-4, 1.339218579232693e-2,
-    9.798453748226166e-2, 2.659549415111542e-1,
-    3.404086530208588e-1, 2.150822728872299e-1,
-    6.138643622398376e-2, 5.562345497310162e-3,
-    2.460231189616024e-4, 1.396108977496624e-2,
-    1.001838669180870e-1, 2.684516608715058e-1,
-    3.398312926292420e-1, 2.122959494590759e-1,
-    5.974265560507774e-2, 5.283284001052380e-3,
-    2.726115926634520e-4, 1.454808749258518e-2,
-    1.024089083075523e-1, 2.709231376647949e-1,
-    3.391972482204438e-1, 2.095058411359787e-1,
-    5.812742188572884e-2, 5.015311297029257e-3,
-    3.013863170053810e-4, 1.515355054289102e-2,
-    1.046593263745308e-1, 2.733682692050934e-1,
-    3.385068178176880e-1, 2.067128717899322e-1,
-    5.654069408774376e-2, 4.758012015372515e-3,
-    3.328395541757345e-4, 1.577781140804291e-2,
-    1.069347932934761e-1, 2.757860720157624e-1,
-    3.377602994441986e-1, 2.039180546998978e-1,
-    5.498242005705833e-2, 4.511159844696522e-3,
-    3.658991190604866e-4, 1.642123050987720e-2,
-    1.092349365353584e-1, 2.781755328178406e-1,
-    3.369580209255218e-1, 2.011223286390304e-1,
-    5.345252528786659e-2, 4.274417180567980e-3,
-    4.018281470052898e-4, 1.708412915468216e-2,
-    1.115593686699867e-1, 2.805356979370117e-1,
-    3.361004292964936e-1, 1.983266174793244e-1,
-    5.195093154907227e-2, 4.047499038279056e-3,
-    4.401875485200435e-4, 1.776690222322941e-2,
-    1.139076948165894e-1, 2.828655838966370e-1,
-    3.351879119873047e-1, 1.955319195985794e-1,
-    5.047753453254700e-2, 3.830091329291463e-3,
-    4.812776169274002e-4, 1.846982724964619e-2,
-    1.162794977426529e-1, 2.851640880107880e-1,
-    3.342207968235016e-1, 1.927391141653061e-1,
-    4.903224110603333e-2, 3.621967276558280e-3,
-    5.252459668554366e-4, 1.919330470263958e-2,
-    1.186743453145027e-1, 2.874303460121155e-1,
-    3.331996202468872e-1, 1.899491697549820e-1,
-    4.761491715908051e-2, 3.422776935622096e-3,
-    5.721592460758984e-4, 1.993762329220772e-2,
-    1.210917681455612e-1, 2.896633744239807e-1,
-    3.321248590946198e-1, 1.871629506349564e-1,
-    4.622544348239899e-2, 3.232272574678064e-3,
-    6.222130032256246e-4, 2.070316113531590e-2,
-    1.235313042998314e-1, 2.918621897697448e-1,
-    3.309969604015350e-1, 1.843813359737396e-1,
-    4.486365616321564e-2, 3.050152910873294e-3,
-    6.755515350960195e-4, 2.149021252989769e-2,
-    1.259924471378326e-1, 2.940258979797364e-1,
-    3.298164308071136e-1, 1.816052496433258e-1,
-    4.352942481637001e-2, 2.876190468668938e-3,
-    7.324148900806904e-4, 2.229913882911205e-2,
-    1.284746825695038e-1, 2.961534857749939e-1,
-    3.285838961601258e-1, 1.788355410099030e-1,
-    4.222255200147629e-2, 2.710093278437853e-3,
-    7.928516715764999e-4, 2.313023805618286e-2,
-    1.309774816036224e-1, 2.982441186904907e-1,
-    3.272998929023742e-1, 1.760730892419815e-1,
-    4.094288870692253e-2, 2.551567042246461e-3,
-    8.570110658183694e-4, 2.398385666310787e-2,
-    1.335003077983856e-1, 3.002967536449432e-1,
-    3.259649574756622e-1, 1.733186990022659e-1,
-    3.969023004174232e-2, 2.400433411821723e-3,
-    9.251192095689476e-4, 2.486028522253036e-2,
-    1.360425949096680e-1, 3.023106753826142e-1,
-    3.245797157287598e-1, 1.705732345581055e-1,
-    3.846437484025955e-2, 2.256359672173858e-3,
-    9.974770946428180e-4, 2.575986087322235e-2,
-    1.386037617921829e-1, 3.042849004268646e-1,
-    3.231448531150818e-1, 1.678375005722046e-1,
-    3.726511076092720e-2, 2.119151875376701e-3,
-    1.073930296115577e-3, 2.668286114931106e-2,
-    1.411831974983215e-1, 3.062185347080230e-1,
-    3.216609656810760e-1, 1.651122719049454e-1,
-    3.609224036335945e-2, 1.988604199141264e-3,
-    1.155023579485714e-3, 2.762960828840732e-2,
-    1.437802612781525e-1, 3.081108033657074e-1,
-    3.201287388801574e-1, 1.623983532190323e-1,
-    3.494550660252571e-2, 1.864377525635064e-3,
-    1.240676851011813e-3, 2.860039286315441e-2,
-    1.463943719863892e-1, 3.099608123302460e-1,
-    3.185488879680634e-1, 1.596965193748474e-1,
-    3.382468968629837e-2, 1.746327499859035e-3,
-    1.331258914433420e-3, 2.959549613296986e-2,
-    1.490248143672943e-1, 3.117676973342896e-1,
-    3.169221282005310e-1, 1.570075154304504e-1,
-    3.272953629493714e-2, 1.634211512282491e-3,
-    1.426893868483603e-3, 3.061520494520664e-2,
-    1.516709625720978e-1, 3.135308027267456e-1,
-    3.152491748332978e-1, 1.543320864439010e-1,
-    3.165979683399200e-2, 1.527829794213176e-3,
+    SCALE(2.658434386830777e-4), SCALE(9.029330685734748e-3),
+    SCALE(7.939263433218002e-2), SCALE(2.425158768892288e-1),
+    SCALE(3.430179357528686e-1), SCALE(2.398228943347931e-1),
+    SCALE(7.746443897485733e-2), SCALE(8.622321300208569e-3),
+    SCALE(8.179365249816328e-5), SCALE(9.450953453779220e-3),
+    SCALE(8.134882897138596e-2), SCALE(2.451938837766648e-1),
+    SCALE(3.429597318172455e-1), SCALE(2.371159791946411e-1),
+    SCALE(7.556436210870743e-2), SCALE(8.229630999267101e-3),
+    SCALE(9.439323912374676e-5), SCALE(9.887560270726680e-3),
+    SCALE(8.333285897970200e-2), SCALE(2.478559017181396e-1),
+    SCALE(3.428434133529663e-1), SCALE(2.343961596488952e-1),
+    SCALE(7.369252294301987e-2), SCALE(7.850865833461285e-3),
+    SCALE(1.082170274457894e-4), SCALE(1.033949479460716e-2),
+    SCALE(8.534456789493561e-2), SCALE(2.505008876323700e-1),
+    SCALE(3.426689505577088e-1), SCALE(2.316644787788391e-1),
+    SCALE(7.184901088476181e-2), SCALE(7.485736627131701e-3),
+    SCALE(1.233371440321207e-4), SCALE(1.080708485096693e-2),
+    SCALE(8.738376945257187e-2), SCALE(2.531278133392334e-1),
+    SCALE(3.424364924430847e-1), SCALE(2.289219647645950e-1),
+    SCALE(7.003392279148102e-2), SCALE(7.133882027119398e-3),
+    SCALE(1.397485757479444e-4), SCALE(1.129068247973919e-2),
+    SCALE(8.945026248693466e-2), SCALE(2.557355761528015e-1),
+    SCALE(3.421461284160614e-1), SCALE(2.261696159839630e-1),
+    SCALE(6.824731826782227e-2), SCALE(6.794991903007030e-3),
+    SCALE(1.575958012836054e-4), SCALE(1.179065089672804e-2),
+    SCALE(9.154383838176728e-2), SCALE(2.583232223987580e-1),
+    SCALE(3.417979776859284e-1), SCALE(2.234084606170654e-1),
+    SCALE(6.648923456668854e-2), SCALE(6.468691397458315e-3),
+    SCALE(1.769922382663936e-4), SCALE(1.230732165277004e-2),
+    SCALE(9.366425126791000e-2), SCALE(2.608896791934967e-1),
+    SCALE(3.413922190666198e-1), SCALE(2.206395119428635e-1),
+    SCALE(6.475970894098282e-2), SCALE(6.154712289571762e-3),
+    SCALE(1.981738605536520e-4), SCALE(1.284105982631445e-2),
+    SCALE(9.581124037504196e-2), SCALE(2.634339034557342e-1),
+    SCALE(3.409290313720703e-1), SCALE(2.178637981414795e-1),
+    SCALE(6.305878609418869e-2), SCALE(5.852684378623962e-3),
+    SCALE(2.211847313446924e-4), SCALE(1.339218579232693e-2),
+    SCALE(9.798453748226166e-2), SCALE(2.659549415111542e-1),
+    SCALE(3.404086530208588e-1), SCALE(2.150822728872299e-1),
+    SCALE(6.138643622398376e-2), SCALE(5.562345497310162e-3),
+    SCALE(2.460231189616024e-4), SCALE(1.396108977496624e-2),
+    SCALE(1.001838669180870e-1), SCALE(2.684516608715058e-1),
+    SCALE(3.398312926292420e-1), SCALE(2.122959494590759e-1),
+    SCALE(5.974265560507774e-2), SCALE(5.283284001052380e-3),
+    SCALE(2.726115926634520e-4), SCALE(1.454808749258518e-2),
+    SCALE(1.024089083075523e-1), SCALE(2.709231376647949e-1),
+    SCALE(3.391972482204438e-1), SCALE(2.095058411359787e-1),
+    SCALE(5.812742188572884e-2), SCALE(5.015311297029257e-3),
+    SCALE(3.013863170053810e-4), SCALE(1.515355054289102e-2),
+    SCALE(1.046593263745308e-1), SCALE(2.733682692050934e-1),
+    SCALE(3.385068178176880e-1), SCALE(2.067128717899322e-1),
+    SCALE(5.654069408774376e-2), SCALE(4.758012015372515e-3),
+    SCALE(3.328395541757345e-4), SCALE(1.577781140804291e-2),
+    SCALE(1.069347932934761e-1), SCALE(2.757860720157624e-1),
+    SCALE(3.377602994441986e-1), SCALE(2.039180546998978e-1),
+    SCALE(5.498242005705833e-2), SCALE(4.511159844696522e-3),
+    SCALE(3.658991190604866e-4), SCALE(1.642123050987720e-2),
+    SCALE(1.092349365353584e-1), SCALE(2.781755328178406e-1),
+    SCALE(3.369580209255218e-1), SCALE(2.011223286390304e-1),
+    SCALE(5.345252528786659e-2), SCALE(4.274417180567980e-3),
+    SCALE(4.018281470052898e-4), SCALE(1.708412915468216e-2),
+    SCALE(1.115593686699867e-1), SCALE(2.805356979370117e-1),
+    SCALE(3.361004292964936e-1), SCALE(1.983266174793244e-1),
+    SCALE(5.195093154907227e-2), SCALE(4.047499038279056e-3),
+    SCALE(4.401875485200435e-4), SCALE(1.776690222322941e-2),
+    SCALE(1.139076948165894e-1), SCALE(2.828655838966370e-1),
+    SCALE(3.351879119873047e-1), SCALE(1.955319195985794e-1),
+    SCALE(5.047753453254700e-2), SCALE(3.830091329291463e-3),
+    SCALE(4.812776169274002e-4), SCALE(1.846982724964619e-2),
+    SCALE(1.162794977426529e-1), SCALE(2.851640880107880e-1),
+    SCALE(3.342207968235016e-1), SCALE(1.927391141653061e-1),
+    SCALE(4.903224110603333e-2), SCALE(3.621967276558280e-3),
+    SCALE(5.252459668554366e-4), SCALE(1.919330470263958e-2),
+    SCALE(1.186743453145027e-1), SCALE(2.874303460121155e-1),
+    SCALE(3.331996202468872e-1), SCALE(1.899491697549820e-1),
+    SCALE(4.761491715908051e-2), SCALE(3.422776935622096e-3),
+    SCALE(5.721592460758984e-4), SCALE(1.993762329220772e-2),
+    SCALE(1.210917681455612e-1), SCALE(2.896633744239807e-1),
+    SCALE(3.321248590946198e-1), SCALE(1.871629506349564e-1),
+    SCALE(4.622544348239899e-2), SCALE(3.232272574678064e-3),
+    SCALE(6.222130032256246e-4), SCALE(2.070316113531590e-2),
+    SCALE(1.235313042998314e-1), SCALE(2.918621897697448e-1),
+    SCALE(3.309969604015350e-1), SCALE(1.843813359737396e-1),
+    SCALE(4.486365616321564e-2), SCALE(3.050152910873294e-3),
+    SCALE(6.755515350960195e-4), SCALE(2.149021252989769e-2),
+    SCALE(1.259924471378326e-1), SCALE(2.940258979797364e-1),
+    SCALE(3.298164308071136e-1), SCALE(1.816052496433258e-1),
+    SCALE(4.352942481637001e-2), SCALE(2.876190468668938e-3),
+    SCALE(7.324148900806904e-4), SCALE(2.229913882911205e-2),
+    SCALE(1.284746825695038e-1), SCALE(2.961534857749939e-1),
+    SCALE(3.285838961601258e-1), SCALE(1.788355410099030e-1),
+    SCALE(4.222255200147629e-2), SCALE(2.710093278437853e-3),
+    SCALE(7.928516715764999e-4), SCALE(2.313023805618286e-2),
+    SCALE(1.309774816036224e-1), SCALE(2.982441186904907e-1),
+    SCALE(3.272998929023742e-1), SCALE(1.760730892419815e-1),
+    SCALE(4.094288870692253e-2), SCALE(2.551567042246461e-3),
+    SCALE(8.570110658183694e-4), SCALE(2.398385666310787e-2),
+    SCALE(1.335003077983856e-1), SCALE(3.002967536449432e-1),
+    SCALE(3.259649574756622e-1), SCALE(1.733186990022659e-1),
+    SCALE(3.969023004174232e-2), SCALE(2.400433411821723e-3),
+    SCALE(9.251192095689476e-4), SCALE(2.486028522253036e-2),
+    SCALE(1.360425949096680e-1), SCALE(3.023106753826142e-1),
+    SCALE(3.245797157287598e-1), SCALE(1.705732345581055e-1),
+    SCALE(3.846437484025955e-2), SCALE(2.256359672173858e-3),
+    SCALE(9.974770946428180e-4), SCALE(2.575986087322235e-2),
+    SCALE(1.386037617921829e-1), SCALE(3.042849004268646e-1),
+    SCALE(3.231448531150818e-1), SCALE(1.678375005722046e-1),
+    SCALE(3.726511076092720e-2), SCALE(2.119151875376701e-3),
+    SCALE(1.073930296115577e-3), SCALE(2.668286114931106e-2),
+    SCALE(1.411831974983215e-1), SCALE(3.062185347080230e-1),
+    SCALE(3.216609656810760e-1), SCALE(1.651122719049454e-1),
+    SCALE(3.609224036335945e-2), SCALE(1.988604199141264e-3),
+    SCALE(1.155023579485714e-3), SCALE(2.762960828840732e-2),
+    SCALE(1.437802612781525e-1), SCALE(3.081108033657074e-1),
+    SCALE(3.201287388801574e-1), SCALE(1.623983532190323e-1),
+    SCALE(3.494550660252571e-2), SCALE(1.864377525635064e-3),
+    SCALE(1.240676851011813e-3), SCALE(2.860039286315441e-2),
+    SCALE(1.463943719863892e-1), SCALE(3.099608123302460e-1),
+    SCALE(3.185488879680634e-1), SCALE(1.596965193748474e-1),
+    SCALE(3.382468968629837e-2), SCALE(1.746327499859035e-3),
+    SCALE(1.331258914433420e-3), SCALE(2.959549613296986e-2),
+    SCALE(1.490248143672943e-1), SCALE(3.117676973342896e-1),
+    SCALE(3.169221282005310e-1), SCALE(1.570075154304504e-1),
+    SCALE(3.272953629493714e-2), SCALE(1.634211512282491e-3),
+    SCALE(1.426893868483603e-3), SCALE(3.061520494520664e-2),
+    SCALE(1.516709625720978e-1), SCALE(3.135308027267456e-1),
+    SCALE(3.152491748332978e-1), SCALE(1.543320864439010e-1),
+    SCALE(3.165979683399200e-2), SCALE(1.527829794213176e-3),
 };
 
 DECLARE_ALIGNED(16, static const float, lfe_fir_128)[] =
 {
-    0.00053168571, 0.15878495574, 0.68603444099, 0.15492856503,
-    0.00016358691, 0.16269733012, 0.68591803312, 0.15112841129,
-    0.00018878609, 0.16666537523, 0.68568539619, 0.14738474786,
-    0.00021643363, 0.17068879306, 0.68533653021, 0.14369773865,
-    0.00024667382, 0.17476719618, 0.68487155437, 0.14006754756,
-    0.00027949660, 0.17890018225, 0.68429082632, 0.13649433851,
-    0.00031519096, 0.18308731914, 0.68359452486, 0.13297818601,
-    0.00035398375, 0.18732811511, 0.68278300762, 0.12951917946,
-    0.00039634691, 0.19162209332, 0.68185669184, 0.12611730397,
-    0.00044236859, 0.19596865773, 0.68081587553, 0.12277261168,
-    0.00049204525, 0.20036731660, 0.67966115475, 0.11948505789,
-    0.00054522208, 0.20481738448, 0.67839306593, 0.11625462025,
-    0.00060277141, 0.20931822062, 0.67701220512, 0.11308115721,
-    0.00066567765, 0.21386915445, 0.67551922798, 0.10996460915,
-    0.00073179678, 0.21846942604, 0.67391467094, 0.10690483451,
-    0.00080365466, 0.22311829031, 0.67219948769, 0.10390164703,
-    0.00088037323, 0.22781492770, 0.67037439346, 0.10095486045,
-    0.00096255314, 0.23255851865, 0.66844022274, 0.09806428105,
-    0.00105048984, 0.23734821379, 0.66639786959, 0.09522963315,
-    0.00114431616, 0.24218304455, 0.66424828768, 0.09245070815,
-    0.00124442333, 0.24706205726, 0.66199249029, 0.08972713351,
-    0.00135110028, 0.25198432803, 0.65963155031, 0.08705867827,
-    0.00146482687, 0.25694879889, 0.65716648102, 0.08444493264,
-    0.00158570008, 0.26195442677, 0.65459835529, 0.08188561350,
-    0.00171401864, 0.26700007915, 0.65192854404, 0.07938029617,
-    0.00185023469, 0.27208462358, 0.64915806055, 0.07692859322,
-    0.00199495023, 0.27720692754, 0.64628833532, 0.07453006506,
-    0.00214785640, 0.28236576915, 0.64332056046, 0.07218432426,
-    0.00231004250, 0.28755992651, 0.64025616646, 0.06989086419,
-    0.00248134881, 0.29278811812, 0.63709646463, 0.06764923781,
-    0.00266251224, 0.29804900289, 0.63384294510, 0.06545893103,
-    0.00285378192, 0.30334126949, 0.63049703836, 0.06331945211,
-    0.00305565330, 0.30866351724, 0.62706029415, 0.06123027951,
-    0.00326841651, 0.31401440501, 0.62353414297, 0.05919086933,
-    0.00349264755, 0.31939238310, 0.61992025375, 0.05720067024,
-    0.00372874714, 0.32479602098, 0.61622029543, 0.05525910854,
-    0.00397720048, 0.33022382855, 0.61243581772, 0.05336561054,
-    0.00423829490, 0.33567428589, 0.60856848955, 0.05151961371,
-    0.00451271003, 0.34114575386, 0.60462015867, 0.04972046614,
-    0.00480085658, 0.34663668275, 0.60059231520, 0.04796761274,
-    0.00510312291, 0.35214546323, 0.59648692608, 0.04626038298,
-    0.00542017492, 0.35767036676, 0.59230577946, 0.04459818453,
-    0.00575236930, 0.36320972443, 0.58805054426, 0.04298033938,
-    0.00610029325, 0.36876192689, 0.58372318745, 0.04140623659,
-    0.00646453211, 0.37432509661, 0.57932555676, 0.03987516090,
-    0.00684553990, 0.37989753485, 0.57485944033, 0.03838652745,
-    0.00724391919, 0.38547745347, 0.57032698393, 0.03693958372,
-    0.00766016589, 0.39106300473, 0.56572991610, 0.03553372994,
-    0.00809498038, 0.39665243030, 0.56107026339, 0.03416819125,
-    0.00854881573, 0.40224379301, 0.55634999275, 0.03284239396,
-    0.00902230106, 0.40783521533, 0.55157101154, 0.03155555204,
-    0.00951600447, 0.41342487931, 0.54673534632, 0.03030703776,
-    0.01003060210, 0.41901078820, 0.54184508324, 0.02909611352,
-    0.01056654565, 0.42459106445, 0.53690224886, 0.02792212367,
-    0.01112466771, 0.43016362190, 0.53190881014, 0.02678431384,
-    0.01170534454, 0.43572667241, 0.52686679363, 0.02568206564,
-    0.01230939943, 0.44127810001, 0.52177828550, 0.02461459488,
-    0.01293735672, 0.44681602716, 0.51664537191, 0.02358125709,
-    0.01358995494, 0.45233830810, 0.51147013903, 0.02258131653,
-    0.01426773332, 0.45784294605, 0.50625455379, 0.02161412500,
-    0.01497144438, 0.46332800388, 0.50100076199, 0.02067894675,
-    0.01570170000, 0.46879136562, 0.49571081996, 0.01977507770,
-    0.01645922661, 0.47423094511, 0.49038675427, 0.01890186779,
-    0.01724460535, 0.47964480519, 0.48503074050, 0.01805862412,
+    SCALE(0.00053168571), SCALE(0.15878495574), SCALE(0.68603444099), SCALE(0.15492856503),
+    SCALE(0.00016358691), SCALE(0.16269733012), SCALE(0.68591803312), SCALE(0.15112841129),
+    SCALE(0.00018878609), SCALE(0.16666537523), SCALE(0.68568539619), SCALE(0.14738474786),
+    SCALE(0.00021643363), SCALE(0.17068879306), SCALE(0.68533653021), SCALE(0.14369773865),
+    SCALE(0.00024667382), SCALE(0.17476719618), SCALE(0.68487155437), SCALE(0.14006754756),
+    SCALE(0.00027949660), SCALE(0.17890018225), SCALE(0.68429082632), SCALE(0.13649433851),
+    SCALE(0.00031519096), SCALE(0.18308731914), SCALE(0.68359452486), SCALE(0.13297818601),
+    SCALE(0.00035398375), SCALE(0.18732811511), SCALE(0.68278300762), SCALE(0.12951917946),
+    SCALE(0.00039634691), SCALE(0.19162209332), SCALE(0.68185669184), SCALE(0.12611730397),
+    SCALE(0.00044236859), SCALE(0.19596865773), SCALE(0.68081587553), SCALE(0.12277261168),
+    SCALE(0.00049204525), SCALE(0.20036731660), SCALE(0.67966115475), SCALE(0.11948505789),
+    SCALE(0.00054522208), SCALE(0.20481738448), SCALE(0.67839306593), SCALE(0.11625462025),
+    SCALE(0.00060277141), SCALE(0.20931822062), SCALE(0.67701220512), SCALE(0.11308115721),
+    SCALE(0.00066567765), SCALE(0.21386915445), SCALE(0.67551922798), SCALE(0.10996460915),
+    SCALE(0.00073179678), SCALE(0.21846942604), SCALE(0.67391467094), SCALE(0.10690483451),
+    SCALE(0.00080365466), SCALE(0.22311829031), SCALE(0.67219948769), SCALE(0.10390164703),
+    SCALE(0.00088037323), SCALE(0.22781492770), SCALE(0.67037439346), SCALE(0.10095486045),
+    SCALE(0.00096255314), SCALE(0.23255851865), SCALE(0.66844022274), SCALE(0.09806428105),
+    SCALE(0.00105048984), SCALE(0.23734821379), SCALE(0.66639786959), SCALE(0.09522963315),
+    SCALE(0.00114431616), SCALE(0.24218304455), SCALE(0.66424828768), SCALE(0.09245070815),
+    SCALE(0.00124442333), SCALE(0.24706205726), SCALE(0.66199249029), SCALE(0.08972713351),
+    SCALE(0.00135110028), SCALE(0.25198432803), SCALE(0.65963155031), SCALE(0.08705867827),
+    SCALE(0.00146482687), SCALE(0.25694879889), SCALE(0.65716648102), SCALE(0.08444493264),
+    SCALE(0.00158570008), SCALE(0.26195442677), SCALE(0.65459835529), SCALE(0.08188561350),
+    SCALE(0.00171401864), SCALE(0.26700007915), SCALE(0.65192854404), SCALE(0.07938029617),
+    SCALE(0.00185023469), SCALE(0.27208462358), SCALE(0.64915806055), SCALE(0.07692859322),
+    SCALE(0.00199495023), SCALE(0.27720692754), SCALE(0.64628833532), SCALE(0.07453006506),
+    SCALE(0.00214785640), SCALE(0.28236576915), SCALE(0.64332056046), SCALE(0.07218432426),
+    SCALE(0.00231004250), SCALE(0.28755992651), SCALE(0.64025616646), SCALE(0.06989086419),
+    SCALE(0.00248134881), SCALE(0.29278811812), SCALE(0.63709646463), SCALE(0.06764923781),
+    SCALE(0.00266251224), SCALE(0.29804900289), SCALE(0.63384294510), SCALE(0.06545893103),
+    SCALE(0.00285378192), SCALE(0.30334126949), SCALE(0.63049703836), SCALE(0.06331945211),
+    SCALE(0.00305565330), SCALE(0.30866351724), SCALE(0.62706029415), SCALE(0.06123027951),
+    SCALE(0.00326841651), SCALE(0.31401440501), SCALE(0.62353414297), SCALE(0.05919086933),
+    SCALE(0.00349264755), SCALE(0.31939238310), SCALE(0.61992025375), SCALE(0.05720067024),
+    SCALE(0.00372874714), SCALE(0.32479602098), SCALE(0.61622029543), SCALE(0.05525910854),
+    SCALE(0.00397720048), SCALE(0.33022382855), SCALE(0.61243581772), SCALE(0.05336561054),
+    SCALE(0.00423829490), SCALE(0.33567428589), SCALE(0.60856848955), SCALE(0.05151961371),
+    SCALE(0.00451271003), SCALE(0.34114575386), SCALE(0.60462015867), SCALE(0.04972046614),
+    SCALE(0.00480085658), SCALE(0.34663668275), SCALE(0.60059231520), SCALE(0.04796761274),
+    SCALE(0.00510312291), SCALE(0.35214546323), SCALE(0.59648692608), SCALE(0.04626038298),
+    SCALE(0.00542017492), SCALE(0.35767036676), SCALE(0.59230577946), SCALE(0.04459818453),
+    SCALE(0.00575236930), SCALE(0.36320972443), SCALE(0.58805054426), SCALE(0.04298033938),
+    SCALE(0.00610029325), SCALE(0.36876192689), SCALE(0.58372318745), SCALE(0.04140623659),
+    SCALE(0.00646453211), SCALE(0.37432509661), SCALE(0.57932555676), SCALE(0.03987516090),
+    SCALE(0.00684553990), SCALE(0.37989753485), SCALE(0.57485944033), SCALE(0.03838652745),
+    SCALE(0.00724391919), SCALE(0.38547745347), SCALE(0.57032698393), SCALE(0.03693958372),
+    SCALE(0.00766016589), SCALE(0.39106300473), SCALE(0.56572991610), SCALE(0.03553372994),
+    SCALE(0.00809498038), SCALE(0.39665243030), SCALE(0.56107026339), SCALE(0.03416819125),
+    SCALE(0.00854881573), SCALE(0.40224379301), SCALE(0.55634999275), SCALE(0.03284239396),
+    SCALE(0.00902230106), SCALE(0.40783521533), SCALE(0.55157101154), SCALE(0.03155555204),
+    SCALE(0.00951600447), SCALE(0.41342487931), SCALE(0.54673534632), SCALE(0.03030703776),
+    SCALE(0.01003060210), SCALE(0.41901078820), SCALE(0.54184508324), SCALE(0.02909611352),
+    SCALE(0.01056654565), SCALE(0.42459106445), SCALE(0.53690224886), SCALE(0.02792212367),
+    SCALE(0.01112466771), SCALE(0.43016362190), SCALE(0.53190881014), SCALE(0.02678431384),
+    SCALE(0.01170534454), SCALE(0.43572667241), SCALE(0.52686679363), SCALE(0.02568206564),
+    SCALE(0.01230939943), SCALE(0.44127810001), SCALE(0.52177828550), SCALE(0.02461459488),
+    SCALE(0.01293735672), SCALE(0.44681602716), SCALE(0.51664537191), SCALE(0.02358125709),
+    SCALE(0.01358995494), SCALE(0.45233830810), SCALE(0.51147013903), SCALE(0.02258131653),
+    SCALE(0.01426773332), SCALE(0.45784294605), SCALE(0.50625455379), SCALE(0.02161412500),
+    SCALE(0.01497144438), SCALE(0.46332800388), SCALE(0.50100076199), SCALE(0.02067894675),
+    SCALE(0.01570170000), SCALE(0.46879136562), SCALE(0.49571081996), SCALE(0.01977507770),
+    SCALE(0.01645922661), SCALE(0.47423094511), SCALE(0.49038675427), SCALE(0.01890186779),
+    SCALE(0.01724460535), SCALE(0.47964480519), SCALE(0.48503074050), SCALE(0.01805862412),
 };
+#undef SCALE
 
-/* 10^-(dB/20), with dB being a list of dB values ranging from 0 to -72 */
-/* do a 20*log10(dca_downmix_coeffs) to reconvert the values */
-
-static const float dca_downmix_coeffs[65] = {
-  1.000000000000000, 0.988553094656939, 0.971627951577106, 0.944060876285923, 0.917275935389780, 0.891250938133746,
-  0.865964323360065, 0.841395141645195, 0.817523037943650, 0.794328234724281, 0.771791515585012, 0.749894209332456,
-  0.728618174513228, 0.707945784384138, 0.687859912308808, 0.668343917568615, 0.649381631576211, 0.630957344480193,
-  0.613055792149821, 0.595662143529010, 0.578761988349121, 0.562341325190349, 0.546386549881854, 0.530884444230988,
-  0.515822165072306, 0.501187233627272, 0.446683592150963, 0.398107170553497, 0.354813389233575, 0.316227766016838,
-  0.281838293126445, 0.251188643150958, 0.223872113856834, 0.199526231496888, 0.177827941003892, 0.158489319246111,
-  0.141253754462275, 0.125892541179417, 0.112201845430196, 0.100000000000000, 0.089125093813374, 0.079432823472428,
-  0.070794578438414, 0.063095734448019, 0.053088444423099, 0.044668359215096, 0.037583740428844, 0.031622776601684,
-  0.026607250597988, 0.022387211385683, 0.018836490894898, 0.015848931924611, 0.013335214321633, 0.011220184543020,
-  0.009440608762859, 0.007943282347243, 0.005623413251903, 0.003981071705535, 0.002818382931264, 0.001995262314969,
-  0.001412537544623, 0.001000000000000, 0.000501187233627, 0.000251188643151, 0.000000000000000,
-};
-
-static const float dca_downmix_scale_factors[241] = {
+/*
+ * D.11 Look-up Table for Downmix Scale Factors
+ *
+ * Note that the range of the entries in DmixTable[] is between -60 dB and 0 dB
+ * with addition of -inf (|DMixCoeff| = 0), which is coded with a DmixCode = 0.
+ * Furthermore, the range [-60 to 0] is subdivided into 3 regions, each with a
+ * different grid resolution:
+ *
+ * 1) [-60.000 to -30] with resolution of 0.500 dB
+ * 2) [-29.750 to -15] with resolution of 0.250 dB
+ * 3) [-14.875 to   0] with resolution of 0.125 dB
+ */
+static const float dca_dmixtable[241] = {
     0.001000, 0.001059, 0.001122, 0.001189, 0.001259, 0.001334, 0.001413, 0.001496,
     0.001585, 0.001679, 0.001778, 0.001884, 0.001995, 0.002113, 0.002239, 0.002371,
     0.002512, 0.002661, 0.002818, 0.002985, 0.003162, 0.003350, 0.003548, 0.003758,
@@ -7553,20 +7551,20 @@
     0.707107, 0.718208, 0.728618, 0.739180, 0.749894, 0.760764, 0.771792, 0.782979,
     0.794328, 0.805842, 0.817523, 0.829373, 0.841395, 0.853591, 0.865964, 0.878517,
     0.891251, 0.904170, 0.917276, 0.930572, 0.944061, 0.957745, 0.971628, 0.985712,
-    1.000000
+    1.000000,
 };
 
-static const uint8_t dca_default_coeffs[10][5][2] = {
-    { { 13, 13 },                                                 },
-    { {  0, 64 }, { 64,  0 },                                     },
-    { {  0, 64 }, { 64,  0 },                                     },
-    { {  0, 64 }, { 64,  0 },                                     },
-    { {  0, 64 }, { 64,  0 },                                     },
-    { {  6,  6 }, {  0, 25 }, { 25,  0 },                         },
-    { {  0, 25 }, { 25,  0 }, { 13, 13 },                         },
-    { {  6,  6 }, {  0, 25 }, { 25,  0 }, { 13, 13 },             },
-    { {  0, 25 }, { 25,  0 }, {  0, 13 }, { 13,  0 },             },
-    { {  6,  6 }, {  0, 25 }, { 25,  0 }, {  0, 13 }, { 13,  0 }, },
+static const float dca_default_coeffs[10][6][2] = {
+    { { 0.707107, 0.707107 }, { 0.000000, 0.000000 },                                                                                                 }, // A [LFE]
+    { { 1.000000, 0.000000 }, { 0.000000, 1.000000 }, { 0.000000, 0.000000 },                                                                         }, // A + B (dual mono) [LFE]
+    { { 1.000000, 0.000000 }, { 0.000000, 1.000000 }, { 0.000000, 0.000000 },                                                                         }, // L + R (stereo) [LFE]
+    { { 1.000000, 0.000000 }, { 0.000000, 1.000000 }, { 0.000000, 0.000000 },                                                                         }, // (L+R) + (L-R) (sum-difference) [LFE]
+    { { 1.000000, 0.000000 }, { 0.000000, 1.000000 }, { 0.000000, 0.000000 },                                                                         }, // LT + RT (left and right total) [LFE]
+    { { 0.501187, 0.501187 }, { 0.707107, 0.000000 }, { 0.000000, 0.707107 }, { 0.000000, 0.000000 },                                                 }, // C + L + R [LFE]
+    { { 0.707107, 0.000000 }, { 0.000000, 0.707107 }, { 0.501187, 0.501187 }, { 0.000000, 0.000000 },                                                 }, // L + R + S [LFE]
+    { { 0.501187, 0.501187 }, { 0.707107, 0.000000 }, { 0.000000, 0.707107 }, { 0.501187, 0.501187 }, { 0.000000, 0.000000 },                         }, // C + L + R + S [LFE]
+    { { 0.707107, 0.000000 }, { 0.000000, 0.707107 }, { 0.501187, 0.000000 }, { 0.000000, 0.501187 }, { 0.000000, 0.000000 },                         }, // L + R + SL + SR [LFE]
+    { { 0.501187, 0.501187 }, { 0.707107, 0.000000 }, { 0.000000, 0.707107 }, { 0.501187, 0.000000 }, { 0.000000, 0.501187 }, { 0.000000, 0.000000 }, }, // C + L + R + SL + SR [LFE]
 };
 
 /* downmix coeffs

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/dcadec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/dcadec.c Changed

@@ -32,6 +32,7 @@
 #include "libavutil/internal.h"
 #include "libavutil/intreadwrite.h"
 #include "libavutil/mathematics.h"
+#include "libavutil/opt.h"
 #include "libavutil/samplefmt.h"
 #include "avcodec.h"
 #include "fft.h"
@@ -52,7 +53,6 @@
 //#define TRACE
 
 #define DCA_PRIM_CHANNELS_MAX  (7)
-#define DCA_SUBBANDS          (64)
 #define DCA_ABITS_MAX         (32)      /* Should be 28 */
 #define DCA_SUBSUBFRAMES_MAX   (4)
 #define DCA_SUBFRAMES_MAX     (16)
@@ -325,6 +325,8 @@
 
 #define DCA_BUFFER_PADDING_SIZE   1024
 
+#define DCA_NSYNCAUX        0x9A1105A0
+
 /** Bit allocation */
 typedef struct {
     int offset;                 ///< code values offset
@@ -346,6 +348,7 @@
 }
 
 typedef struct {
+    const AVClass *class;       ///< class for AVOptions
     AVCodecContext *avctx;
     /* Frame header */
     int frame_type;             ///< type of the current frame
@@ -358,7 +361,6 @@
     int bit_rate;               ///< transmission bit rate
     int bit_rate_index;         ///< transmission bit rate index
 
-    int downmix;                ///< embedded downmix enabled
     int dynrange;               ///< embedded dynamic range flag
     int timestamp;              ///< embedded time stamp flag
     int aux_data;               ///< auxiliary data flag
@@ -397,13 +399,20 @@
     int prediction_vq[DCA_PRIM_CHANNELS_MAX][DCA_SUBBANDS];      ///< prediction VQ coefs
     int bitalloc[DCA_PRIM_CHANNELS_MAX][DCA_SUBBANDS];           ///< bit allocation index
     int transition_mode[DCA_PRIM_CHANNELS_MAX][DCA_SUBBANDS];    ///< transition mode (transients)
-    int scale_factor[DCA_PRIM_CHANNELS_MAX][DCA_SUBBANDS][2];    ///< scale factors (2 if transient)
+    int32_t scale_factor[DCA_PRIM_CHANNELS_MAX][DCA_SUBBANDS][2];///< scale factors (2 if transient)
     int joint_huff[DCA_PRIM_CHANNELS_MAX];                       ///< joint subband scale factors codebook
     int joint_scale_factor[DCA_PRIM_CHANNELS_MAX][DCA_SUBBANDS]; ///< joint subband scale factors
-    int downmix_coef[DCA_PRIM_CHANNELS_MAX][2];                  ///< stereo downmix coefficients
+    float downmix_coef[DCA_PRIM_CHANNELS_MAX + 1][2];            ///< stereo downmix coefficients
     int dynrange_coef;                                           ///< dynamic range coefficient
 
-    int high_freq_vq[DCA_PRIM_CHANNELS_MAX][DCA_SUBBANDS];       ///< VQ encoded high frequency subbands
+    /* Core substream's embedded downmix coefficients (cf. ETSI TS 102 114 V1.4.1)
+     * Input:  primary audio channels (incl. LFE if present)
+     * Output: downmix audio channels (up to 4, no LFE) */
+    uint8_t  core_downmix;                                       ///< embedded downmix coefficients available
+    uint8_t  core_downmix_amode;                                 ///< audio channel arrangement of embedded downmix
+    uint16_t core_downmix_codes[DCA_PRIM_CHANNELS_MAX + 1][4];   ///< embedded downmix coefficients (9-bit codes)
+
+    int32_t  high_freq_vq[DCA_PRIM_CHANNELS_MAX][DCA_SUBBANDS];  ///< VQ encoded high frequency subbands
 
     float lfe_data[2 * DCA_LFE_MAX * (DCA_BLOCKS_MAX + 4)];      ///< Low frequency effect data
     int lfe_scale_factor;
@@ -437,6 +446,7 @@
     /* XCh extension information */
     int xch_present;            ///< XCh extension present and valid
     int xch_base_channel;       ///< index of first (only) channel containing XCH data
+    int xch_disable;            ///< whether the XCh extension should be decoded or not
 
     /* XXCH extension information */
     int xxch_chset;
@@ -589,7 +599,7 @@
         if (get_bits1(&s->gb)) {
             embedded_downmix = get_bits1(&s->gb);
             scale_factor     =
-               1.0f / dca_downmix_scale_factors[(get_bits(&s->gb, 6) - 1) << 2];
+               1.0f / dca_dmixtable[(get_bits(&s->gb, 6) - 1) << 2];
 
             s->xxch_dmix_sf[s->xxch_chset] = scale_factor;
 
@@ -610,7 +620,7 @@
 
                         coeff = get_bits(&s->gb, 7);
                         sign  = (coeff & 64) ? 1.0 : -1.0;
-                        mag   = dca_downmix_scale_factors[((coeff & 63) - 1) << 2];
+                        mag   = dca_dmixtable[((coeff & 63) - 1) << 2];
                         ichan = dca_xxch2index(s, 1 << i);
                         s->xxch_dmix_coeff[j][ichan] = sign * mag;
                     }
@@ -724,7 +734,7 @@
     if (!s->bit_rate)
         return AVERROR_INVALIDDATA;
 
-    s->downmix           = get_bits(&s->gb, 1); /* note: this is FixedBit == 0 */
+    skip_bits1(&s->gb); // always 0 (reserved, cf. ETSI TS 102 114 V1.4.1)
     s->dynrange          = get_bits(&s->gb, 1);
     s->timestamp         = get_bits(&s->gb, 1);
     s->aux_data          = get_bits(&s->gb, 1);
@@ -771,7 +781,6 @@
            s->sample_rate);
     av_log(s->avctx, AV_LOG_DEBUG, "bit rate: %i bits/s\n",
            s->bit_rate);
-    av_log(s->avctx, AV_LOG_DEBUG, "downmix: %i\n", s->downmix);
     av_log(s->avctx, AV_LOG_DEBUG, "dynrange: %i\n", s->dynrange);
     av_log(s->avctx, AV_LOG_DEBUG, "timestamp: %i\n", s->timestamp);
     av_log(s->avctx, AV_LOG_DEBUG, "aux_data: %i\n", s->aux_data);
@@ -954,33 +963,6 @@
         }
     }
 
-    /* Stereo downmix coefficients */
-    if (!base_channel && s->prim_channels > 2) {
-        if (s->downmix) {
-            for (j = base_channel; j < s->prim_channels; j++) {
-                s->downmix_coef[j][0] = get_bits(&s->gb, 7);
-                s->downmix_coef[j][1] = get_bits(&s->gb, 7);
-            }
-        } else {
-            int am = s->amode & DCA_CHANNEL_MASK;
-            if (am >= FF_ARRAY_ELEMS(dca_default_coeffs)) {
-                av_log(s->avctx, AV_LOG_ERROR,
-                       "Invalid channel mode %d\n", am);
-                return AVERROR_INVALIDDATA;
-            }
-            if (s->prim_channels > FF_ARRAY_ELEMS(dca_default_coeffs[0])) {
-                avpriv_request_sample(s->avctx, "Downmixing %d channels",
-                                      s->prim_channels);
-                return AVERROR_PATCHWELCOME;
-            }
-
-            for (j = base_channel; j < s->prim_channels; j++) {
-                s->downmix_coef[j][0] = dca_default_coeffs[am][j][0];
-                s->downmix_coef[j][1] = dca_default_coeffs[am][j][1];
-            }
-        }
-    }
-
     /* Dynamic range coefficient */
     if (!base_channel && s->dynrange)
         s->dynrange_coef = get_bits(&s->gb, 8);
@@ -1080,16 +1062,6 @@
             av_log(s->avctx, AV_LOG_DEBUG, "\n");
         }
     }
-    if (!base_channel && s->prim_channels > 2 && s->downmix) {
-        av_log(s->avctx, AV_LOG_DEBUG, "Downmix coeffs:\n");
-        for (j = 0; j < s->prim_channels; j++) {
-            av_log(s->avctx, AV_LOG_DEBUG, "Channel 0, %d = %f\n", j,
-                   dca_downmix_coeffs[s->downmix_coef[j][0]]);
-            av_log(s->avctx, AV_LOG_DEBUG, "Channel 1, %d = %f\n", j,
-                   dca_downmix_coeffs[s->downmix_coef[j][1]]);
-        }
-        av_log(s->avctx, AV_LOG_DEBUG, "\n");
-    }
     for (j = base_channel; j < s->prim_channels; j++)
         for (k = s->vq_start_subband[j]; k < s->subband_activity[j]; k++)
             av_log(s->avctx, AV_LOG_DEBUG, "VQ index: %i\n", s->high_freq_vq[j][k]);
@@ -1132,7 +1104,7 @@
 
 static void lfe_interpolation_fir(DCAContext *s, int decimation_select,
                                   int num_deci_sample, float *samples_in,
-                                  float *samples_out, float scale)
+                                  float *samples_out)
 {
     /* samples_in: An array holding decimated samples.
      *   Samples in current subframe starts from samples_in[0],
@@ -1142,23 +1114,23 @@
      * samples_out: An array holding interpolated samples
      */
 
-    int decifactor;
+    int idx;
     const float *prCoeff;
     int deciindex;
 
     /* Select decimation filter */
     if (decimation_select == 1) {
-        decifactor = 64;
+        idx = 1;
         prCoeff = lfe_fir_128;
     } else {
-        decifactor = 32;
+        idx = 0;
         prCoeff = lfe_fir_64;
     }
     /* Interpolation */
     for (deciindex = 0; deciindex < num_deci_sample; deciindex++) {
-        s->dcadsp.lfe_fir(samples_out, samples_in, prCoeff, decifactor, scale);
+        s->dcadsp.lfe_fir[idx](samples_out, samples_in, prCoeff);
         samples_in++;
-        samples_out += 2 * decifactor;
+        samples_out += 2 * 32 * (1 + idx);
     }
 }
 
@@ -1184,29 +1156,23 @@
         op2                                     \
     }
 
-static void dca_downmix(float **samples, int srcfmt,
-                        int downmix_coef[DCA_PRIM_CHANNELS_MAX][2],
+static void dca_downmix(float **samples, int srcfmt, int lfe_present,
+                        float coef[DCA_PRIM_CHANNELS_MAX + 1][2],
                         const int8_t *channel_mapping)
 {
     int c, l, r, sl, sr, s;
     int i;
     float t, u, v;
-    float coef[DCA_PRIM_CHANNELS_MAX][2];
-
-    for (i = 0; i < DCA_PRIM_CHANNELS_MAX; i++) {
-        coef[i][0] = dca_downmix_coeffs[downmix_coef[i][0]];
-        coef[i][1] = dca_downmix_coeffs[downmix_coef[i][1]];
-    }
 
     switch (srcfmt) {
     case DCA_MONO:
-    case DCA_CHANNEL:
-    case DCA_STEREO_TOTAL:
-    case DCA_STEREO_SUMDIFF:
     case DCA_4F2R:
         av_log(NULL, AV_LOG_ERROR, "Not implemented!\n");
         break;
+    case DCA_CHANNEL:
     case DCA_STEREO:
+    case DCA_STEREO_TOTAL:
+    case DCA_STEREO_SUMDIFF:
         break;
     case DCA_3F:
         c = channel_mapping[0];
@@ -1241,6 +1207,14 @@
                           MIX_REAR2(samples, sl, sr, 3, coef));
         break;
     }
+    if (lfe_present) {
+        int lf_buf = dca_lfe_index[srcfmt];
+        int lf_idx = dca_channels [srcfmt];
+        for (i = 0; i < 256; i++) {
+            samples[0][i] += samples[lf_buf][i] * coef[lf_idx][0];
+            samples[1][i] += samples[lf_buf][i] * coef[lf_idx][1];
+        }
+    }
 }
 
 
@@ -1271,16 +1245,6 @@
 static const uint8_t abits_sizes[7]  = { 7, 10, 12, 13, 15, 17, 19 };
 static const uint8_t abits_levels[7] = { 3,  5,  7,  9, 13, 17, 25 };
 
-#ifndef int8x8_fmul_int32
-static inline void int8x8_fmul_int32(float *dst, const int8_t *src, int scale)
-{
-    float fscale = scale / 16.0;
-    int i;
-    for (i = 0; i < 8; i++)
-        dst[i] = src[i] * fscale;
-}
-#endif
-
 static int dca_subsubframe(DCAContext *s, int base_channel, int block_index)
 {
     int k, l;
@@ -1377,16 +1341,27 @@
              */
             if (s->prediction_mode[k][l]) {
                 int n;
-                for (m = 0; m < 8; m++) {
-                    for (n = 1; n <= 4; n++)
+                if (s->predictor_history)
+                    subband_samples[k][l][0] += (adpcm_vb[s->prediction_vq[k][l]][0] *
+                                                 s->subband_samples_hist[k][l][3] +
+                                                 adpcm_vb[s->prediction_vq[k][l]][1] *
+                                                 s->subband_samples_hist[k][l][2] +
+                                                 adpcm_vb[s->prediction_vq[k][l]][2] *
+                                                 s->subband_samples_hist[k][l][1] +
+                                                 adpcm_vb[s->prediction_vq[k][l]][3] *
+                                                 s->subband_samples_hist[k][l][0]) *
+                                                (1.0f / 8192);
+                for (m = 1; m < 8; m++) {
+                    float sum = adpcm_vb[s->prediction_vq[k][l]][0] *
+                                subband_samples[k][l][m - 1];
+                    for (n = 2; n <= 4; n++)
                         if (m >= n)
-                            subband_samples[k][l][m] +=
-                                (adpcm_vb[s->prediction_vq[k][l]][n - 1] *
-                                 subband_samples[k][l][m - n] / 8192);
+                            sum += adpcm_vb[s->prediction_vq[k][l]][n - 1] *
+                                   subband_samples[k][l][m - n];
                         else if (s->predictor_history)
-                            subband_samples[k][l][m] +=
-                                (adpcm_vb[s->prediction_vq[k][l]][n - 1] *
-                                 s->subband_samples_hist[k][l][m - n + 4] / 8192);
+                            sum += adpcm_vb[s->prediction_vq[k][l]][n - 1] *
+                                   s->subband_samples_hist[k][l][m - n + 4];
+                    subband_samples[k][l][m] += sum * (1.0f / 8192);
                 }
             }
         }
@@ -1394,20 +1369,16 @@
         /*
          * Decode VQ encoded high frequencies
          */
-        for (l = s->vq_start_subband[k]; l < s->subband_activity[k]; l++) {
-            /* 1 vector -> 32 samples but we only need the 8 samples
-             * for this subsubframe. */
-            int hfvq = s->high_freq_vq[k][l];
-
+        if (s->subband_activity[k] > s->vq_start_subband[k]) {
             if (!s->debug_flag & 0x01) {
                 av_log(s->avctx, AV_LOG_DEBUG,
                        "Stream with high frequencies VQ coding\n");
                 s->debug_flag |= 0x01;
             }
-
-            int8x8_fmul_int32(subband_samples[k][l],
-                              &high_freq_vq[hfvq][subsubframe * 8],
-                              s->scale_factor[k][l][0]);
+            s->dcadsp.decode_hf(subband_samples[k], s->high_freq_vq[k],
+                                high_freq_vq, subsubframe * 8,
+                                s->scale_factor[k], s->vq_start_subband[k],
+                                s->subband_activity[k]);
         }
     }
 
@@ -1426,9 +1397,7 @@
     /* Backup predictor history for adpcm */
     for (k = base_channel; k < s->prim_channels; k++)
         for (l = 0; l < s->vq_start_subband[k]; l++)
-            memcpy(s->subband_samples_hist[k][l],
-                   &subband_samples[k][l][4],
-                   4 * sizeof(subband_samples[0][0][0]));
+            AV_COPY128(s->subband_samples_hist[k][l], &subband_samples[k][l][4]);
 
     return 0;
 }
@@ -1448,27 +1417,29 @@
                             M_SQRT1_2 / 32768.0 /* pcm_to_double[s->source_pcm_res] */);
     }
 
-    /* Down mixing */
-    if (s->avctx->request_channels == 2 && s->prim_channels > 2) {
-        dca_downmix(s->samples_chanptr, s->amode, s->downmix_coef, s->channel_order_tab);
-    }
-
     /* Generate LFE samples for this subsubframe FIXME!!! */
-    if (s->output & DCA_LFE) {
+    if (s->lfe) {
         lfe_interpolation_fir(s, s->lfe, 2 * s->lfe,
                               s->lfe_data + 2 * s->lfe * (block_index + 4),
-                              s->samples_chanptr[s->lfe_index],
-                              1.0 / (256.0 * 32768.0));
+                              s->samples_chanptr[s->lfe_index]);
         /* Outputs 20bits pcm samples */
     }
 
+    /* Downmixing to Stereo */
+    if (s->prim_channels + !!s->lfe > 2 &&
+        s->avctx->request_channel_layout == AV_CH_LAYOUT_STEREO) {
+        dca_downmix(s->samples_chanptr, s->amode, !!s->lfe, s->downmix_coef,
+                    s->channel_order_tab);
+    }
+
     return 0;
 }
 
 
 static int dca_subframe_footer(DCAContext *s, int base_channel)
 {
-    int aux_data_count = 0, i;
+    int in, out, aux_data_count, aux_data_end, reserved;
+    uint32_t nsyncaux;
 
     /*
      * Unpack optional information
@@ -1479,13 +1450,89 @@
         if (s->timestamp)
             skip_bits_long(&s->gb, 32);
 
-        if (s->aux_data)
+        if (s->aux_data) {
             aux_data_count = get_bits(&s->gb, 6);
 
-        for (i = 0; i < aux_data_count; i++)
-            get_bits(&s->gb, 8);
+            // align (32-bit)
+            skip_bits_long(&s->gb, (-get_bits_count(&s->gb)) & 31);
+
+            aux_data_end = 8 * aux_data_count + get_bits_count(&s->gb);
+
+            if ((nsyncaux = get_bits_long(&s->gb, 32)) != DCA_NSYNCAUX) {
+                av_log(s->avctx, AV_LOG_ERROR, "nSYNCAUX mismatch %#"PRIx32"\n",
+                       nsyncaux);
+                return AVERROR_INVALIDDATA;
+            }
+
+            if (get_bits1(&s->gb)) { // bAUXTimeStampFlag
+                avpriv_request_sample(s->avctx,
+                                      "Auxiliary Decode Time Stamp Flag");
+                // align (4-bit)
+                skip_bits(&s->gb, (-get_bits_count(&s->gb)) & 4);
+                // 44 bits: nMSByte (8), nMarker (4), nLSByte (28), nMarker (4)
+                skip_bits_long(&s->gb, 44);
+            }
+
+            if ((s->core_downmix = get_bits1(&s->gb))) {
+                int am = get_bits(&s->gb, 3);
+                switch (am) {
+                case 0:
+                    s->core_downmix_amode = DCA_MONO;
+                    break;
+                case 1:
+                    s->core_downmix_amode = DCA_STEREO;
+                    break;
+                case 2:
+                    s->core_downmix_amode = DCA_STEREO_TOTAL;
+                    break;
+                case 3:
+                    s->core_downmix_amode = DCA_3F;
+                    break;
+                case 4:
+                    s->core_downmix_amode = DCA_2F1R;
+                    break;
+                case 5:
+                    s->core_downmix_amode = DCA_2F2R;
+                    break;
+                case 6:
+                    s->core_downmix_amode = DCA_3F1R;
+                    break;
+                default:
+                    av_log(s->avctx, AV_LOG_ERROR,
+                           "Invalid mode %d for embedded downmix coefficients\n",
+                           am);
+                    return AVERROR_INVALIDDATA;
+                }
+                for (out = 0; out < dca_channels[s->core_downmix_amode]; out++) {
+                    for (in = 0; in < s->prim_channels + !!s->lfe; in++) {
+                        uint16_t tmp = get_bits(&s->gb, 9);
+                        if ((tmp & 0xFF) > 241) {
+                            av_log(s->avctx, AV_LOG_ERROR,
+                                   "Invalid downmix coefficient code %"PRIu16"\n",
+                                   tmp);
+                            return AVERROR_INVALIDDATA;
+                        }
+                        s->core_downmix_codes[in][out] = tmp;
+                    }
+                }
+            }
+
+            align_get_bits(&s->gb); // byte align
+            skip_bits(&s->gb, 16);  // nAUXCRC16
+
+            // additional data (reserved, cf. ETSI TS 102 114 V1.4.1)
+            if ((reserved = (aux_data_end - get_bits_count(&s->gb))) < 0) {
+                 av_log(s->avctx, AV_LOG_ERROR,
+                        "Overread auxiliary data by %d bits\n", -reserved);
+                return AVERROR_INVALIDDATA;
+            } else if (reserved) {
+                avpriv_request_sample(s->avctx,
+                                      "Core auxiliary data reserved content");
+                skip_bits_long(&s->gb, reserved);
+            }
+        }
 
-        if (s->crc_present && (s->downmix || s->dynrange))
+        if (s->crc_present && s->dynrange)
             get_bits(&s->gb, 16);
     }
 
@@ -2116,6 +2163,55 @@
     /* record number of core channels incase less than max channels are requested */
     num_core_channels = s->prim_channels;
 
+    if (s->prim_channels + !!s->lfe > 2 &&
+        avctx->request_channel_layout == AV_CH_LAYOUT_STEREO) {
+            /* Stereo downmix coefficients
+             *
+             * The decoder can only downmix to 2-channel, so we need to ensure
+             * embedded downmix coefficients are actually targeting 2-channel.
+             */
+            if (s->core_downmix && (s->core_downmix_amode == DCA_STEREO ||
+                                    s->core_downmix_amode == DCA_STEREO_TOTAL)) {
+                int sign, code;
+                for (i = 0; i < s->prim_channels + !!s->lfe; i++) {
+                    sign = s->core_downmix_codes[i][0] & 0x100 ? 1 : -1;
+                    code = s->core_downmix_codes[i][0] & 0x0FF;
+                    s->downmix_coef[i][0] = (!code ? 0.0f :
+                                             sign * dca_dmixtable[code - 1]);
+                    sign = s->core_downmix_codes[i][1] & 0x100 ? 1 : -1;
+                    code = s->core_downmix_codes[i][1] & 0x0FF;
+                    s->downmix_coef[i][1] = (!code ? 0.0f :
+                                             sign * dca_dmixtable[code - 1]);
+                }
+                s->output = s->core_downmix_amode;
+            } else {
+                int am = s->amode & DCA_CHANNEL_MASK;
+                if (am >= FF_ARRAY_ELEMS(dca_default_coeffs)) {
+                    av_log(s->avctx, AV_LOG_ERROR,
+                           "Invalid channel mode %d\n", am);
+                    return AVERROR_INVALIDDATA;
+                }
+                if (s->prim_channels + !!s->lfe >
+                    FF_ARRAY_ELEMS(dca_default_coeffs[0])) {
+                    avpriv_request_sample(s->avctx, "Downmixing %d channels",
+                                          s->prim_channels + !!s->lfe);
+                    return AVERROR_PATCHWELCOME;
+                }
+                for (i = 0; i < s->prim_channels + !!s->lfe; i++) {
+                    s->downmix_coef[i][0] = dca_default_coeffs[am][i][0];
+                    s->downmix_coef[i][1] = dca_default_coeffs[am][i][1];
+                }
+            }
+            av_dlog(s->avctx, "Stereo downmix coeffs:\n");
+            for (i = 0; i < s->prim_channels + !!s->lfe; i++) {
+                av_dlog(s->avctx, "L, input channel %d = %f\n", i,
+                        s->downmix_coef[i][0]);
+                av_dlog(s->avctx, "R, input channel %d = %f\n", i,
+                        s->downmix_coef[i][1]);
+            }
+            av_dlog(s->avctx, "\n");
+    }
+
     if (s->ext_coding)
         s->core_ext_mask = dca_ext_audio_descr_mask[s->ext_descr];
     else
@@ -2233,10 +2329,15 @@
     { /* xxx should also do MA extensions */
         if (s->amode < 16) {
             avctx->channel_layout = dca_core_channel_layout[s->amode];
-
-            if (s->xch_present && (!avctx->request_channels ||
-                                   avctx->request_channels
-                                   > num_core_channels + !!s->lfe)) {
+#if FF_API_REQUEST_CHANNELS
+FF_DISABLE_DEPRECATION_WARNINGS
+            if (s->xch_present && !s->xch_disable &&
+                (!avctx->request_channels ||
+                 avctx->request_channels > num_core_channels + !!s->lfe)) {
+FF_ENABLE_DEPRECATION_WARNINGS
+#else
+            if (s->xch_present && !s->xch_disable) {
+#endif
                 avctx->channel_layout |= AV_CH_BACK_CENTER;
                 if (s->lfe) {
                     avctx->channel_layout |= AV_CH_LOW_FREQUENCY;
@@ -2265,9 +2366,10 @@
                 return AVERROR_INVALIDDATA;
             }
 
-            if (avctx->request_channels == 2 && s->prim_channels > 2) {
+            if (s->prim_channels + !!s->lfe > 2 &&
+                avctx->request_channel_layout == AV_CH_LAYOUT_STEREO) {
                 channels = 2;
-                s->output = DCA_STEREO;
+                s->output = s->prim_channels == 2 ? s->amode : DCA_STEREO;
                 avctx->channel_layout = AV_CH_LAYOUT_STEREO;
             }
             else if (avctx->request_channel_layout & AV_CH_LAYOUT_NATIVE) {
@@ -2451,6 +2553,15 @@
     for (i = 0; i < 2 * s->lfe * 4; i++)
         s->lfe_data[i] = s->lfe_data[i + lfe_samples];
 
+    /* AVMatrixEncoding
+     *
+     * DCA_STEREO_TOTAL (Lt/Rt) is equivalent to Dolby Surround */
+    ret = ff_side_data_update_matrix_encoding(frame,
+                                              (s->output & ~DCA_LFE) == DCA_STEREO_TOTAL ?
+                                              AV_MATRIX_ENCODING_DOLBY : AV_MATRIX_ENCODING_NONE);
+    if (ret < 0)
+        return ret;
+
     *got_frame_ptr = 1;
 
     return buf_size;
@@ -2480,10 +2591,15 @@
     avctx->sample_fmt = AV_SAMPLE_FMT_FLTP;
 
     /* allow downmixing to stereo */
-    if (avctx->channels > 0 && avctx->request_channels < avctx->channels &&
-        avctx->request_channels == 2) {
-        avctx->channels = avctx->request_channels;
-    }
+#if FF_API_REQUEST_CHANNELS
+FF_DISABLE_DEPRECATION_WARNINGS
+    if (avctx->request_channels == 2)
+        avctx->request_channel_layout = AV_CH_LAYOUT_STEREO;
+FF_ENABLE_DEPRECATION_WARNINGS
+#endif
+    if (avctx->channels > 2 &&
+        avctx->request_channel_layout == AV_CH_LAYOUT_STEREO)
+        avctx->channels = 2;
 
     return 0;
 }
@@ -2505,6 +2621,19 @@
     { FF_PROFILE_UNKNOWN },
 };
 
+static const AVOption options[] = {
+    { "disable_xch", "disable decoding of the XCh extension", offsetof(DCAContext, xch_disable), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, AV_OPT_FLAG_DECODING_PARAM|AV_OPT_FLAG_AUDIO_PARAM },
+    { NULL },
+};
+
+static const AVClass dca_decoder_class = {
+    .class_name = "DCA decoder",
+    .item_name  = av_default_item_name,
+    .option     = options,
+    .version    = LIBAVUTIL_VERSION_INT,
+    .category   = AV_CLASS_CATEGORY_DECODER,
+};
+
 AVCodec ff_dca_decoder = {
     .name            = "dca",
     .long_name       = NULL_IF_CONFIG_SMALL("DCA (DTS Coherent Acoustics)"),
@@ -2518,4 +2647,5 @@
     .sample_fmts     = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP,
                                                        AV_SAMPLE_FMT_NONE },
     .profiles        = NULL_IF_CONFIG_SMALL(profiles),
+    .priv_class      = &dca_decoder_class,
 };

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/dcadsp.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/dcadsp.c Changed

@@ -24,25 +24,42 @@
 #include "libavutil/intreadwrite.h"
 #include "dcadsp.h"
 
-static void dca_lfe_fir_c(float *out, const float *in, const float *coefs,
-                          int decifactor, float scale)
+static void decode_hf_c(float dst[DCA_SUBBANDS][8],
+                        const int32_t vq_num[DCA_SUBBANDS],
+                        const int8_t hf_vq[1024][32], intptr_t vq_offset,
+                        int32_t scale[DCA_SUBBANDS][2],
+                        intptr_t start, intptr_t end)
 {
-    float *out2 = out + decifactor;
-    const float *cf0 = coefs;
-    const float *cf1 = coefs + 256;
+    int i, l;
+
+    for (l = start; l < end; l++) {
+        /* 1 vector -> 32 samples but we only need the 8 samples
+         * for this subsubframe. */
+        const int8_t *ptr = &hf_vq[vq_num[l]][vq_offset];
+        float fscale = scale[l][0] * (1 / 16.0);
+        for (i = 0; i < 8; i++)
+            dst[l][i] = ptr[i] * fscale;
+    }
+}
+
+static inline void
+dca_lfe_fir(float *out, const float *in, const float *coefs,
+            int decifactor)
+{
+    float *out2    = out + 2 * decifactor - 1;
+    int num_coeffs = 256 / decifactor;
     int j, k;
 
     /* One decimated sample generates 2*decifactor interpolated ones */
     for (k = 0; k < decifactor; k++) {
         float v0 = 0.0;
         float v1 = 0.0;
-        for (j = 0; j < 256 / decifactor; j++) {
-            float s = in[-j];
-            v0 += s * *cf0++;
-            v1 += s * *--cf1;
+        for (j = 0; j < num_coeffs; j++, coefs++) {
+            v0 += in[-j] * *coefs;
+            v1 += in[j + 1 - num_coeffs] * *coefs;
         }
-        *out++  = v0 * scale;
-        *out2++ = v1 * scale;
+        *out++  = v0;
+        *out2-- = v1;
     }
 }
 
@@ -74,9 +91,22 @@
     }
 }
 
+static void dca_lfe_fir0_c(float *out, const float *in, const float *coefs)
+{
+    dca_lfe_fir(out, in, coefs, 32);
+}
+
+static void dca_lfe_fir1_c(float *out, const float *in, const float *coefs)
+{
+    dca_lfe_fir(out, in, coefs, 64);
+}
+
 av_cold void ff_dcadsp_init(DCADSPContext *s)
 {
-    s->lfe_fir = dca_lfe_fir_c;
+    s->lfe_fir[0] = dca_lfe_fir0_c;
+    s->lfe_fir[1] = dca_lfe_fir1_c;
     s->qmf_32_subbands = dca_qmf_32_subbands;
+    s->decode_hf = decode_hf_c;
     if (ARCH_ARM) ff_dcadsp_init_arm(s);
+    if (ARCH_X86) ff_dcadsp_init_x86(s);
 }

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/dcadsp.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/dcadsp.h Changed

@@ -22,18 +22,25 @@
 #include "avfft.h"
 #include "synth_filter.h"
 
+#define DCA_SUBBANDS 64
+
 typedef struct DCADSPContext {
-    void (*lfe_fir)(float *out, const float *in, const float *coefs,
-                    int decifactor, float scale);
+    void (*lfe_fir[2])(float *out, const float *in, const float *coefs);
     void (*qmf_32_subbands)(float samples_in[32][8], int sb_act,
                             SynthFilterContext *synth, FFTContext *imdct,
                             float synth_buf_ptr[512],
                             int *synth_buf_offset, float synth_buf2[32],
                             const float window[512], float *samples_out,
                             float raXin[32], float scale);
+    void (*decode_hf)(float dst[DCA_SUBBANDS][8],
+                      const int32_t vq_num[DCA_SUBBANDS],
+                      const int8_t hf_vq[1024][32], intptr_t vq_offset,
+                      int32_t scale[DCA_SUBBANDS][2],
+                      intptr_t start, intptr_t end);
 } DCADSPContext;
 
 void ff_dcadsp_init(DCADSPContext *s);
 void ff_dcadsp_init_arm(DCADSPContext *s);
+void ff_dcadsp_init_x86(DCADSPContext *s);
 
 #endif /* AVCODEC_DCADSP_H */

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/dct-test.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/dct-test.c Changed

@@ -47,8 +47,6 @@
 #include "x86/idct_xvid.h"
 #include "dctref.h"
 
-#undef printf
-
 // BFIN
 void ff_bfin_idct(int16_t *block);
 void ff_bfin_fdct(int16_t *block);
@@ -63,8 +61,6 @@
 void ff_simple_idct_armv6(int16_t *data);
 void ff_simple_idct_neon(int16_t *data);
 
-void ff_simple_idct_axp(int16_t *data);
-
 struct algo {
     const char *name;
     void (*func)(int16_t *block);
@@ -103,6 +99,18 @@
     { 0 }
 };
 
+static void ff_prores_idct_wrap(int16_t *dst){
+    DECLARE_ALIGNED(16, static int16_t, qmat)[64];
+    int i;
+
+    for(i=0; i<64; i++){
+        qmat[i]=4;
+    }
+    ff_prores_idct(dst, qmat);
+    for(i=0; i<64; i++) {
+         dst[i] -= 512;
+    }
+}
 #if ARCH_X86_64 && HAVE_MMX && HAVE_YASM
 void ff_prores_idct_put_10_sse2(uint16_t *dst, int linesize,
                                 int16_t *block, int16_t *qmat);
@@ -117,6 +125,10 @@
         tmp[i]= dst[i];
     }
     ff_prores_idct_put_10_sse2(dst, 16, tmp, qmat);
+
+    for(i=0; i<64; i++) {
+         dst[i] -= 512;
+    }
 }
 #endif
 
@@ -125,6 +137,7 @@
     { "REF-DBL",        ff_ref_idct,           NO_PERM  },
     { "INT",            ff_j_rev_dct,          MMX_PERM },
     { "SIMPLE-C",       ff_simple_idct_8,      NO_PERM  },
+    { "PR-C",           ff_prores_idct_wrap,   NO_PERM, 0, 1 },
 
 #if HAVE_MMX_INLINE
     { "SIMPLE-MMX",     ff_simple_idct_mmx,  MMX_SIMPLE_PERM, AV_CPU_FLAG_MMX },
@@ -154,14 +167,10 @@
 #if HAVE_ARMV6
     { "SIMPLE-ARMV6",   ff_simple_idct_armv6,  MMX_PERM,  AV_CPU_FLAG_ARMV6   },
 #endif
-#if HAVE_NEON
+#if HAVE_NEON && ARCH_ARM
     { "SIMPLE-NEON",    ff_simple_idct_neon, PARTTRANS_PERM, AV_CPU_FLAG_NEON },
 #endif
 
-#if ARCH_ALPHA
-    { "SIMPLE-ALPHA",   ff_simple_idct_axp,    NO_PERM },
-#endif
-
     { 0 }
 };
 
@@ -288,6 +297,9 @@
         }
 
         ref(block1);
+        if (!strcmp(dct->name, "PR-SSE2"))
+            for (i = 0; i < 64; i++)
+                block1[i] = av_clip(block1[i], 4-512, 1019-512);
 
         blockSumErr = 0;
         for (i = 0; i < 64; i++) {

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/dct32_fixed.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/dct32_fixed.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/dct32_float.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/dct32_float.c Changed

omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/dct32_template.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/dirac.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/dirac.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/dirac_dwt.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/dirac_dwt.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/diracdec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/diracdec.c Changed

@@ -80,7 +80,7 @@
 #define DIVRNDUP(a, b) (((a) + (b) - 1) / (b))
 
 typedef struct {
-    AVFrame avframe;
+    AVFrame *avframe;
     int interpolated[3];    /* 1 if hpel[] is valid */
     uint8_t *hpel[3][4];
     uint8_t *hpel_base[3][4];
@@ -291,7 +291,7 @@
     int i, remove_idx = -1;
 
     for (i = 0; framelist[i]; i++)
-        if (framelist[i]->avframe.display_picture_number == picnum) {
+        if (framelist[i]->avframe->display_picture_number == picnum) {
             remove_pic = framelist[i];
             remove_idx = i;
         }
@@ -364,8 +364,8 @@
     int i, j, k;
 
     for (i = 0; i < MAX_FRAMES; i++) {
-        if (s->all_frames[i].avframe.data[0]) {
-            av_frame_unref(&s->all_frames[i].avframe);
+        if (s->all_frames[i].avframe->data[0]) {
+            av_frame_unref(s->all_frames[i].avframe);
             memset(s->all_frames[i].interpolated, 0, sizeof(s->all_frames[i].interpolated));
         }
 
@@ -393,17 +393,23 @@
 static av_cold int dirac_decode_init(AVCodecContext *avctx)
 {
     DiracContext *s = avctx->priv_data;
+    int i;
+
     s->avctx = avctx;
     s->frame_number = -1;
 
-    if (avctx->flags&CODEC_FLAG_EMU_EDGE) {
-        av_log(avctx, AV_LOG_ERROR, "Edge emulation not supported!\n");
-        return AVERROR_PATCHWELCOME;
-    }
-
     ff_dsputil_init(&s->dsp, avctx);
     ff_diracdsp_init(&s->diracdsp);
 
+    for (i = 0; i < MAX_FRAMES; i++) {
+        s->all_frames[i].avframe = av_frame_alloc();
+        if (!s->all_frames[i].avframe) {
+            while (i > 0)
+                av_frame_free(&s->all_frames[--i].avframe);
+            return AVERROR(ENOMEM);
+        }
+    }
+
     return 0;
 }
 
@@ -417,7 +423,13 @@
 
 static av_cold int dirac_decode_end(AVCodecContext *avctx)
 {
+    DiracContext *s = avctx->priv_data;
+    int i;
+
     dirac_decode_flush(avctx);
+    for (i = 0; i < MAX_FRAMES; i++)
+        av_frame_free(&s->all_frames[i].avframe);
+
     return 0;
 }
 
@@ -1414,8 +1426,8 @@
         y + p->yblen > p->height+EDGE_WIDTH/2 ||
         x < 0 || y < 0) {
         for (i = 0; i < nplanes; i++) {
-            ff_emulated_edge_mc(s->edge_emu_buffer[i], p->stride,
-                                src[i], p->stride,
+            ff_emulated_edge_mc(s->edge_emu_buffer[i], src[i],
+                                p->stride, p->stride,
                                 p->xblen, p->yblen, x, y,
                                 p->width+EDGE_WIDTH/2, p->height+EDGE_WIDTH/2);
             src[i] = s->edge_emu_buffer[i];
@@ -1519,8 +1531,8 @@
        just use 8 for everything for the moment */
     int i, edge = EDGE_WIDTH/2;
 
-    ref->hpel[plane][0] = ref->avframe.data[plane];
-    s->dsp.draw_edges(ref->hpel[plane][0], ref->avframe.linesize[plane], width, height, edge, edge, EDGE_TOP | EDGE_BOTTOM); /* EDGE_TOP | EDGE_BOTTOM values just copied to make it build, this needs to be ensured */
+    ref->hpel[plane][0] = ref->avframe->data[plane];
+    s->dsp.draw_edges(ref->hpel[plane][0], ref->avframe->linesize[plane], width, height, edge, edge, EDGE_TOP | EDGE_BOTTOM); /* EDGE_TOP | EDGE_BOTTOM values just copied to make it build, this needs to be ensured */
 
     /* no need for hpel if we only have fpel vectors */
     if (!s->mv_precision)
@@ -1528,18 +1540,18 @@
 
     for (i = 1; i < 4; i++) {
         if (!ref->hpel_base[plane][i])
-            ref->hpel_base[plane][i] = av_malloc((height+2*edge) * ref->avframe.linesize[plane] + 32);
+            ref->hpel_base[plane][i] = av_malloc((height+2*edge) * ref->avframe->linesize[plane] + 32);
         /* we need to be 16-byte aligned even for chroma */
-        ref->hpel[plane][i] = ref->hpel_base[plane][i] + edge*ref->avframe.linesize[plane] + 16;
+        ref->hpel[plane][i] = ref->hpel_base[plane][i] + edge*ref->avframe->linesize[plane] + 16;
     }
 
     if (!ref->interpolated[plane]) {
         s->diracdsp.dirac_hpel_filter(ref->hpel[plane][1], ref->hpel[plane][2],
                                       ref->hpel[plane][3], ref->hpel[plane][0],
-                                      ref->avframe.linesize[plane], width, height);
-        s->dsp.draw_edges(ref->hpel[plane][1], ref->avframe.linesize[plane], width, height, edge, edge, EDGE_TOP | EDGE_BOTTOM);
-        s->dsp.draw_edges(ref->hpel[plane][2], ref->avframe.linesize[plane], width, height, edge, edge, EDGE_TOP | EDGE_BOTTOM);
-        s->dsp.draw_edges(ref->hpel[plane][3], ref->avframe.linesize[plane], width, height, edge, edge, EDGE_TOP | EDGE_BOTTOM);
+                                      ref->avframe->linesize[plane], width, height);
+        s->dsp.draw_edges(ref->hpel[plane][1], ref->avframe->linesize[plane], width, height, edge, edge, EDGE_TOP | EDGE_BOTTOM);
+        s->dsp.draw_edges(ref->hpel[plane][2], ref->avframe->linesize[plane], width, height, edge, edge, EDGE_TOP | EDGE_BOTTOM);
+        s->dsp.draw_edges(ref->hpel[plane][3], ref->avframe->linesize[plane], width, height, edge, edge, EDGE_TOP | EDGE_BOTTOM);
     }
     ref->interpolated[plane] = 1;
 }
@@ -1565,7 +1577,7 @@
 
     for (comp = 0; comp < 3; comp++) {
         Plane *p       = &s->plane[comp];
-        uint8_t *frame = s->current_picture->avframe.data[comp];
+        uint8_t *frame = s->current_picture->avframe->data[comp];
 
         /* FIXME: small resolutions */
         for (i = 0; i < 4; i++)
@@ -1629,6 +1641,29 @@
     return 0;
 }
 
+static int get_buffer_with_edge(AVCodecContext *avctx, AVFrame *f, int flags)
+{
+    int ret, i;
+    int chroma_x_shift, chroma_y_shift;
+    avcodec_get_chroma_sub_sample(avctx->pix_fmt, &chroma_x_shift, &chroma_y_shift);
+
+    f->width  = avctx->width  + 2 * EDGE_WIDTH;
+    f->height = avctx->height + 2 * EDGE_WIDTH + 2;
+    ret = ff_get_buffer(avctx, f, flags);
+    if (ret < 0)
+        return ret;
+
+    for (i = 0; f->data[i]; i++) {
+        int offset = (EDGE_WIDTH >> (i && i<3 ? chroma_y_shift : 0)) *
+                     f->linesize[i] + 32;
+        f->data[i] += offset;
+    }
+    f->width  = avctx->width;
+    f->height = avctx->height;
+
+    return 0;
+}
+
 /**
  * Dirac Specification ->
  * 11.1.1 Picture Header. picture_header()
@@ -1640,7 +1675,7 @@
     GetBitContext *gb = &s->gb;
 
     /* [DIRAC_STD] 11.1.1 Picture Header. picture_header() PICTURE_NUM */
-    picnum = s->current_picture->avframe.display_picture_number = get_bits_long(gb, 32);
+    picnum = s->current_picture->avframe->display_picture_number = get_bits_long(gb, 32);
 
 
     av_log(s->avctx,AV_LOG_DEBUG,"PICTURE_NUM: %d\n",picnum);
@@ -1659,9 +1694,9 @@
         /* Jordi: this is needed if the referenced picture hasn't yet arrived */
         for (j = 0; j < MAX_REFERENCE_FRAMES && refdist; j++)
             if (s->ref_frames[j]
-                && FFABS(s->ref_frames[j]->avframe.display_picture_number - refnum) < refdist) {
+                && FFABS(s->ref_frames[j]->avframe->display_picture_number - refnum) < refdist) {
                 s->ref_pics[i] = s->ref_frames[j];
-                refdist = FFABS(s->ref_frames[j]->avframe.display_picture_number - refnum);
+                refdist = FFABS(s->ref_frames[j]->avframe->display_picture_number - refnum);
             }
 
         if (!s->ref_pics[i] || refdist)
@@ -1670,21 +1705,21 @@
         /* if there were no references at all, allocate one */
         if (!s->ref_pics[i])
             for (j = 0; j < MAX_FRAMES; j++)
-                if (!s->all_frames[j].avframe.data[0]) {
+                if (!s->all_frames[j].avframe->data[0]) {
                     s->ref_pics[i] = &s->all_frames[j];
-                    ff_get_buffer(s->avctx, &s->ref_pics[i]->avframe, AV_GET_BUFFER_FLAG_REF);
+                    get_buffer_with_edge(s->avctx, s->ref_pics[i]->avframe, AV_GET_BUFFER_FLAG_REF);
                     break;
                 }
     }
 
     /* retire the reference frames that are not used anymore */
-    if (s->current_picture->avframe.reference) {
+    if (s->current_picture->avframe->reference) {
         retire = picnum + dirac_get_se_golomb(gb);
         if (retire != picnum) {
             DiracFrame *retire_pic = remove_frame(s->ref_frames, retire);
 
             if (retire_pic)
-                retire_pic->avframe.reference &= DELAYED_PIC_REF;
+                retire_pic->avframe->reference &= DELAYED_PIC_REF;
             else
                 av_log(s->avctx, AV_LOG_DEBUG, "Frame to retire not found\n");
         }
@@ -1692,7 +1727,7 @@
         /* if reference array is full, remove the oldest as per the spec */
         while (add_frame(s->ref_frames, MAX_REFERENCE_FRAMES, s->current_picture)) {
             av_log(s->avctx, AV_LOG_ERROR, "Reference frame overflow\n");
-            remove_frame(s->ref_frames, s->ref_frames[0]->avframe.display_picture_number)->avframe.reference &= DELAYED_PIC_REF;
+            remove_frame(s->ref_frames, s->ref_frames[0]->avframe->display_picture_number)->avframe->reference &= DELAYED_PIC_REF;
         }
     }
 
@@ -1717,7 +1752,7 @@
 
     /* find frame with lowest picture number */
     for (i = 1; s->delay_frames[i]; i++)
-        if (s->delay_frames[i]->avframe.display_picture_number < out->avframe.display_picture_number) {
+        if (s->delay_frames[i]->avframe->display_picture_number < out->avframe->display_picture_number) {
             out     = s->delay_frames[i];
             out_idx = i;
         }
@@ -1726,9 +1761,9 @@
         s->delay_frames[i] = s->delay_frames[i+1];
 
     if (out) {
-        out->avframe.reference ^= DELAYED_PIC_REF;
+        out->avframe->reference ^= DELAYED_PIC_REF;
         *got_frame = 1;
-        if((ret = av_frame_ref(picture, &out->avframe)) < 0)
+        if((ret = av_frame_ref(picture, out->avframe)) < 0)
             return ret;
     }
 
@@ -1790,14 +1825,14 @@
 
         /* find an unused frame */
         for (i = 0; i < MAX_FRAMES; i++)
-            if (s->all_frames[i].avframe.data[0] == NULL)
+            if (s->all_frames[i].avframe->data[0] == NULL)
                 pic = &s->all_frames[i];
         if (!pic) {
             av_log(avctx, AV_LOG_ERROR, "framelist full\n");
             return -1;
         }
 
-        avcodec_get_frame_defaults(&pic->avframe);
+        av_frame_unref(pic->avframe);
 
         /* [DIRAC_STD] Defined in 9.6.1 ... */
         tmp            =  parse_code & 0x03;                   /* [DIRAC_STD] num_refs()      */
@@ -1808,16 +1843,16 @@
         s->num_refs    = tmp;
         s->is_arith    = (parse_code & 0x48) == 0x08;          /* [DIRAC_STD] using_ac()      */
         s->low_delay   = (parse_code & 0x88) == 0x88;          /* [DIRAC_STD] is_low_delay()  */
-        pic->avframe.reference = (parse_code & 0x0C) == 0x0C;  /* [DIRAC_STD]  is_reference() */
-        pic->avframe.key_frame = s->num_refs == 0;             /* [DIRAC_STD] is_intra()      */
-        pic->avframe.pict_type = s->num_refs + 1;              /* Definition of AVPictureType in avutil.h */
+        pic->avframe->reference = (parse_code & 0x0C) == 0x0C;  /* [DIRAC_STD]  is_reference() */
+        pic->avframe->key_frame = s->num_refs == 0;             /* [DIRAC_STD] is_intra()      */
+        pic->avframe->pict_type = s->num_refs + 1;              /* Definition of AVPictureType in avutil.h */
 
-        if ((ret = ff_get_buffer(avctx, &pic->avframe, (parse_code & 0x0C) == 0x0C ? AV_GET_BUFFER_FLAG_REF : 0)) < 0)
+        if ((ret = get_buffer_with_edge(avctx, pic->avframe, (parse_code & 0x0C) == 0x0C ? AV_GET_BUFFER_FLAG_REF : 0)) < 0)
             return ret;
         s->current_picture = pic;
-        s->plane[0].stride = pic->avframe.linesize[0];
-        s->plane[1].stride = pic->avframe.linesize[1];
-        s->plane[2].stride = pic->avframe.linesize[2];
+        s->plane[0].stride = pic->avframe->linesize[0];
+        s->plane[1].stride = pic->avframe->linesize[1];
+        s->plane[2].stride = pic->avframe->linesize[2];
 
         /* [DIRAC_STD] 11.1 Picture parse. picture_parse() */
         if (dirac_decode_picture_header(s))
@@ -1833,7 +1868,7 @@
 static int dirac_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPacket *pkt)
 {
     DiracContext *s     = avctx->priv_data;
-    DiracFrame *picture = data;
+    AVFrame *picture    = data;
     uint8_t *buf        = pkt->data;
     int buf_size        = pkt->size;
     int i, data_unit_size, buf_idx = 0;
@@ -1841,8 +1876,8 @@
 
     /* release unused frames */
     for (i = 0; i < MAX_FRAMES; i++)
-        if (s->all_frames[i].avframe.data[0] && !s->all_frames[i].avframe.reference) {
-            av_frame_unref(&s->all_frames[i].avframe);
+        if (s->all_frames[i].avframe->data[0] && !s->all_frames[i].avframe->reference) {
+            av_frame_unref(s->all_frames[i].avframe);
             memset(s->all_frames[i].interpolated, 0, sizeof(s->all_frames[i].interpolated));
         }
 
@@ -1887,40 +1922,40 @@
     if (!s->current_picture)
         return buf_size;
 
-    if (s->current_picture->avframe.display_picture_number > s->frame_number) {
+    if (s->current_picture->avframe->display_picture_number > s->frame_number) {
         DiracFrame *delayed_frame = remove_frame(s->delay_frames, s->frame_number);
 
-        s->current_picture->avframe.reference |= DELAYED_PIC_REF;
+        s->current_picture->avframe->reference |= DELAYED_PIC_REF;
 
         if (add_frame(s->delay_frames, MAX_DELAY, s->current_picture)) {
-            int min_num = s->delay_frames[0]->avframe.display_picture_number;
+            int min_num = s->delay_frames[0]->avframe->display_picture_number;
             /* Too many delayed frames, so we display the frame with the lowest pts */
             av_log(avctx, AV_LOG_ERROR, "Delay frame overflow\n");
             delayed_frame = s->delay_frames[0];
 
             for (i = 1; s->delay_frames[i]; i++)
-                if (s->delay_frames[i]->avframe.display_picture_number < min_num)
-                    min_num = s->delay_frames[i]->avframe.display_picture_number;
+                if (s->delay_frames[i]->avframe->display_picture_number < min_num)
+                    min_num = s->delay_frames[i]->avframe->display_picture_number;
 
             delayed_frame = remove_frame(s->delay_frames, min_num);
             add_frame(s->delay_frames, MAX_DELAY, s->current_picture);
         }
 
         if (delayed_frame) {
-            delayed_frame->avframe.reference ^= DELAYED_PIC_REF;
-            if((ret=av_frame_ref(data, &delayed_frame->avframe)) < 0)
+            delayed_frame->avframe->reference ^= DELAYED_PIC_REF;
+            if((ret=av_frame_ref(data, delayed_frame->avframe)) < 0)
                 return ret;
             *got_frame = 1;
         }
-    } else if (s->current_picture->avframe.display_picture_number == s->frame_number) {
+    } else if (s->current_picture->avframe->display_picture_number == s->frame_number) {
         /* The right frame at the right time :-) */
-        if((ret=av_frame_ref(data, &s->current_picture->avframe)) < 0)
+        if((ret=av_frame_ref(data, s->current_picture->avframe)) < 0)
             return ret;
         *got_frame = 1;
     }
 
     if (*got_frame)
-        s->frame_number = picture->avframe.display_picture_number + 1;
+        s->frame_number = picture->display_picture_number + 1;
 
     return buf_idx;
 }

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/dnxhddata.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/dnxhddata.c Changed

@@ -222,6 +222,17 @@
     114, 128, 125, 129, 134, 125, 116, 116,
 };
 
+static const uint8_t dnxhd_1256_chroma_weight[] = {
+     0, 32, 32, 32, 32, 32, 32, 33,
+    32, 32, 32, 32, 32, 32, 32, 34,
+    32, 32, 32, 32, 32, 32, 33, 37,
+    32, 32, 32, 32, 32, 32, 36, 39,
+    32, 32, 32, 32, 32, 34, 39, 44,
+    32, 37, 32, 32, 35, 40, 43, 49,
+    32, 33, 36, 36, 40, 43, 50, 60,
+    34, 37, 39, 44, 51, 56, 61, 70,
+};
+
 static const uint8_t dnxhd_1237_dc_codes[12] = {
     0, 12, 13, 1, 2, 3, 4, 5, 14, 30, 62, 63,
 };
@@ -1026,6 +1037,14 @@
       dnxhd_1237_run_codes, dnxhd_1237_run_bits, dnxhd_1237_run,
       { 36, 36, 45, 75, 90 },
       { { 24000, 1001 }, { 25, 1 }, { 30000, 1001 }, { 50, 1 }, { 60000, 1001 } } },
+    { 1256, 1920, 1080, 0, 1835008, 1835008, 6, 10, 4,
+      dnxhd_1235_luma_weight, dnxhd_1256_chroma_weight,
+      dnxhd_1235_1241_dc_codes, dnxhd_1235_1241_dc_bits,
+      dnxhd_1235_1241_ac_codes, dnxhd_1235_1241_ac_bits, dnxhd_1235_1241_ac_level,
+      dnxhd_1235_1241_ac_flags,
+      dnxhd_1235_1238_1241_run_codes, dnxhd_1235_1238_1241_run_bits, dnxhd_1235_1241_run,
+      { 350, 390, 440, 730, 880 },
+      { { 24000, 1001 }, { 25, 1 }, { 30000, 1001 }, { 50, 1 }, { 60000, 1001 } } },
 };
 
 int ff_dnxhd_get_cid_table(int cid)

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/dnxhddec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/dnxhddec.c Changed

@@ -23,6 +23,7 @@
  */
 
 #include "libavutil/imgutils.h"
+#include "libavutil/timer.h"
 #include "avcodec.h"
 #include "get_bits.h"
 #include "dnxhddata.h"
@@ -41,10 +42,11 @@
     VLC ac_vlc, dc_vlc, run_vlc;
     int last_dc[3];
     DSPContext dsp;
-    DECLARE_ALIGNED(16, int16_t, blocks)[8][64];
+    DECLARE_ALIGNED(16, int16_t, blocks)[12][64];
     ScanTable scantable;
     const CIDEntry *cid_table;
     int bit_depth; // 8, 10 or 0 if not initialized at all.
+    int is_444;
     void (*decode_dct_block)(struct DNXHDContext *ctx, int16_t *block,
                              int n, int qscale);
     int last_qscale;
@@ -57,6 +59,7 @@
 
 static void dnxhd_decode_dct_block_8(DNXHDContext *ctx, int16_t *block, int n, int qscale);
 static void dnxhd_decode_dct_block_10(DNXHDContext *ctx, int16_t *block, int n, int qscale);
+static void dnxhd_decode_dct_block_10_444(DNXHDContext *ctx, int16_t *block, int n, int qscale);
 
 static av_cold int dnxhd_decode_init(AVCodecContext *avctx)
 {
@@ -74,7 +77,7 @@
 
         if ((index = ff_dnxhd_get_cid_table(cid)) < 0) {
             av_log(ctx->avctx, AV_LOG_ERROR, "unsupported cid %d\n", cid);
-            return -1;
+            return AVERROR(ENOSYS);
         }
         if (ff_dnxhd_cid_table[index].bit_depth != ctx->bit_depth) {
             av_log(ctx->avctx, AV_LOG_ERROR, "bit depth mismatches %d %d\n", ff_dnxhd_cid_table[index].bit_depth, ctx->bit_depth);
@@ -105,15 +108,16 @@
 static int dnxhd_decode_header(DNXHDContext *ctx, AVFrame *frame,
                                const uint8_t *buf, int buf_size, int first_field)
 {
-    static const uint8_t header_prefix[] = { 0x00, 0x00, 0x02, 0x80, 0x01 };
-    int i, cid;
+    static const uint8_t header_prefix[]    = { 0x00, 0x00, 0x02, 0x80, 0x01 };
+    static const uint8_t header_prefix444[] = { 0x00, 0x00, 0x02, 0x80, 0x02 };
+    int i, cid, ret;
 
     if (buf_size < 0x280)
-        return -1;
+        return AVERROR_INVALIDDATA;
 
-    if (memcmp(buf, header_prefix, 5)) {
+    if (memcmp(buf, header_prefix, 5) && memcmp(buf, header_prefix444, 5)) {
         av_log(ctx->avctx, AV_LOG_ERROR, "error in header\n");
-        return -1;
+        return AVERROR_INVALIDDATA;
     }
     if (buf[5] & 2) { /* interlaced */
         ctx->cur_field = buf[5] & 1;
@@ -127,7 +131,17 @@
 
     av_dlog(ctx->avctx, "width %d, height %d\n", ctx->width, ctx->height);
 
-    if (buf[0x21] & 0x40) {
+    ctx->is_444 = 0;
+    if (buf[0x4] == 0x2) {
+        ctx->avctx->pix_fmt = AV_PIX_FMT_YUV444P10;
+        ctx->avctx->bits_per_raw_sample = 10;
+        if (ctx->bit_depth != 10) {
+            ff_dsputil_init(&ctx->dsp, ctx->avctx);
+            ctx->bit_depth = 10;
+            ctx->decode_dct_block = dnxhd_decode_dct_block_10_444;
+        }
+        ctx->is_444 = 1;
+    } else if (buf[0x21] & 0x40) {
         ctx->avctx->pix_fmt = AV_PIX_FMT_YUV422P10;
         ctx->avctx->bits_per_raw_sample = 10;
         if (ctx->bit_depth != 10) {
@@ -148,12 +162,12 @@
     cid = AV_RB32(buf + 0x28);
     av_dlog(ctx->avctx, "compression id %d\n", cid);
 
-    if (dnxhd_init_vlc(ctx, cid) < 0)
-        return -1;
+    if ((ret = dnxhd_init_vlc(ctx, cid)) < 0)
+        return ret;
 
     if (buf_size < ctx->cid_table->coding_unit_size) {
         av_log(ctx->avctx, AV_LOG_ERROR, "incorrect frame size\n");
-        return -1;
+        return AVERROR_INVALIDDATA;
     }
 
     ctx->mb_width = ctx->width>>4;
@@ -167,7 +181,7 @@
     if (ctx->mb_height > 68 ||
         (ctx->mb_height << frame->interlaced_frame) > (ctx->height+15)>>4) {
         av_log(ctx->avctx, AV_LOG_ERROR, "mb height too big: %d\n", ctx->mb_height);
-        return -1;
+        return AVERROR_INVALIDDATA;
     }
 
     for (i = 0; i < ctx->mb_height; i++) {
@@ -175,7 +189,7 @@
         av_dlog(ctx->avctx, "mb scan index %d\n", ctx->mb_scan_index[i]);
         if (buf_size < ctx->mb_scan_index[i] + 0x280LL) {
             av_log(ctx->avctx, AV_LOG_ERROR, "invalid mb scan index\n");
-            return -1;
+            return AVERROR_INVALIDDATA;
         }
     }
 
@@ -198,14 +212,25 @@
     const int eob_index     = ctx->cid_table->eob_index;
     OPEN_READER(bs, &ctx->gb);
 
-    if (n&2) {
-        component = 1 + (n&1);
-        scale = ctx->chroma_scale;
-        weight_matrix = ctx->cid_table->chroma_weight;
+    if (!ctx->is_444) {
+        if (n&2) {
+            component = 1 + (n&1);
+            scale = ctx->chroma_scale;
+            weight_matrix = ctx->cid_table->chroma_weight;
+        } else {
+            component = 0;
+            scale = ctx->luma_scale;
+            weight_matrix = ctx->cid_table->luma_weight;
+        }
     } else {
-        component = 0;
-        scale = ctx->luma_scale;
-        weight_matrix = ctx->cid_table->luma_weight;
+        component = (n >> 1) % 3;
+        if (component) {
+            scale = ctx->chroma_scale;
+            weight_matrix = ctx->cid_table->chroma_weight;
+        } else {
+            scale = ctx->luma_scale;
+            weight_matrix = ctx->cid_table->luma_weight;
+        }
     }
 
     UPDATE_CACHE(bs, &ctx->gb);
@@ -277,6 +302,12 @@
     dnxhd_decode_dct_block(ctx, block, n, qscale, 6, 8, 4);
 }
 
+static void dnxhd_decode_dct_block_10_444(DNXHDContext *ctx, int16_t *block,
+                                          int n, int qscale)
+{
+    dnxhd_decode_dct_block(ctx, block, n, qscale, 6, 32, 6);
+}
+
 static int dnxhd_decode_macroblock(DNXHDContext *ctx, AVFrame *frame, int x, int y)
 {
     int shift1 = ctx->bit_depth == 10;
@@ -301,6 +332,12 @@
         ctx->dsp.clear_block(ctx->blocks[i]);
         ctx->decode_dct_block(ctx, ctx->blocks[i], i, qscale);
     }
+    if (ctx->is_444) {
+        for (; i < 12; i++) {
+            ctx->dsp.clear_block(ctx->blocks[i]);
+            ctx->decode_dct_block(ctx, ctx->blocks[i], i, qscale);
+        }
+    }
 
     if (frame->interlaced_frame) {
         dct_linesize_luma   <<= 1;
@@ -308,8 +345,8 @@
     }
 
     dest_y = frame->data[0] + ((y * dct_linesize_luma)   << 4) + (x << (4 + shift1));
-    dest_u = frame->data[1] + ((y * dct_linesize_chroma) << 4) + (x << (3 + shift1));
-    dest_v = frame->data[2] + ((y * dct_linesize_chroma) << 4) + (x << (3 + shift1));
+    dest_u = frame->data[1] + ((y * dct_linesize_chroma) << 4) + (x << (3 + shift1 + ctx->is_444));
+    dest_v = frame->data[2] + ((y * dct_linesize_chroma) << 4) + (x << (3 + shift1 + ctx->is_444));
 
     if (ctx->cur_field) {
         dest_y += frame->linesize[0];
@@ -319,17 +356,36 @@
 
     dct_y_offset = dct_linesize_luma << 3;
     dct_x_offset = 8 << shift1;
-    ctx->dsp.idct_put(dest_y,                               dct_linesize_luma, ctx->blocks[0]);
-    ctx->dsp.idct_put(dest_y + dct_x_offset,                dct_linesize_luma, ctx->blocks[1]);
-    ctx->dsp.idct_put(dest_y + dct_y_offset,                dct_linesize_luma, ctx->blocks[4]);
-    ctx->dsp.idct_put(dest_y + dct_y_offset + dct_x_offset, dct_linesize_luma, ctx->blocks[5]);
-
-    if (!(ctx->avctx->flags & CODEC_FLAG_GRAY)) {
-        dct_y_offset = dct_linesize_chroma << 3;
-        ctx->dsp.idct_put(dest_u,                dct_linesize_chroma, ctx->blocks[2]);
-        ctx->dsp.idct_put(dest_v,                dct_linesize_chroma, ctx->blocks[3]);
-        ctx->dsp.idct_put(dest_u + dct_y_offset, dct_linesize_chroma, ctx->blocks[6]);
-        ctx->dsp.idct_put(dest_v + dct_y_offset, dct_linesize_chroma, ctx->blocks[7]);
+    if (!ctx->is_444) {
+        ctx->dsp.idct_put(dest_y,                               dct_linesize_luma, ctx->blocks[0]);
+        ctx->dsp.idct_put(dest_y + dct_x_offset,                dct_linesize_luma, ctx->blocks[1]);
+        ctx->dsp.idct_put(dest_y + dct_y_offset,                dct_linesize_luma, ctx->blocks[4]);
+        ctx->dsp.idct_put(dest_y + dct_y_offset + dct_x_offset, dct_linesize_luma, ctx->blocks[5]);
+
+        if (!(ctx->avctx->flags & CODEC_FLAG_GRAY)) {
+            dct_y_offset = dct_linesize_chroma << 3;
+            ctx->dsp.idct_put(dest_u,                dct_linesize_chroma, ctx->blocks[2]);
+            ctx->dsp.idct_put(dest_v,                dct_linesize_chroma, ctx->blocks[3]);
+            ctx->dsp.idct_put(dest_u + dct_y_offset, dct_linesize_chroma, ctx->blocks[6]);
+            ctx->dsp.idct_put(dest_v + dct_y_offset, dct_linesize_chroma, ctx->blocks[7]);
+        }
+    } else {
+        ctx->dsp.idct_put(dest_y,                               dct_linesize_luma, ctx->blocks[0]);
+        ctx->dsp.idct_put(dest_y + dct_x_offset,                dct_linesize_luma, ctx->blocks[1]);
+        ctx->dsp.idct_put(dest_y + dct_y_offset,                dct_linesize_luma, ctx->blocks[6]);
+        ctx->dsp.idct_put(dest_y + dct_y_offset + dct_x_offset, dct_linesize_luma, ctx->blocks[7]);
+
+        if (!(ctx->avctx->flags & CODEC_FLAG_GRAY)) {
+            dct_y_offset = dct_linesize_chroma << 3;
+            ctx->dsp.idct_put(dest_u,                               dct_linesize_chroma, ctx->blocks[2]);
+            ctx->dsp.idct_put(dest_u + dct_x_offset,                dct_linesize_chroma, ctx->blocks[3]);
+            ctx->dsp.idct_put(dest_u + dct_y_offset,                dct_linesize_chroma, ctx->blocks[8]);
+            ctx->dsp.idct_put(dest_u + dct_y_offset + dct_x_offset, dct_linesize_chroma, ctx->blocks[9]);
+            ctx->dsp.idct_put(dest_v,                               dct_linesize_chroma, ctx->blocks[4]);
+            ctx->dsp.idct_put(dest_v + dct_x_offset,                dct_linesize_chroma, ctx->blocks[5]);
+            ctx->dsp.idct_put(dest_v + dct_y_offset,                dct_linesize_chroma, ctx->blocks[10]);
+            ctx->dsp.idct_put(dest_v + dct_y_offset + dct_x_offset, dct_linesize_chroma, ctx->blocks[11]);
+        }
     }
 
     return 0;
@@ -367,8 +423,8 @@
     av_dlog(avctx, "frame size %d\n", buf_size);
 
  decode_coding_unit:
-    if (dnxhd_decode_header(ctx, picture, buf, buf_size, first_field) < 0)
-        return -1;
+    if ((ret = dnxhd_decode_header(ctx, picture, buf, buf_size, first_field)) < 0)
+        return ret;
 
     if ((avctx->width || avctx->height) &&
         (ctx->width != avctx->width || ctx->height != avctx->height)) {
@@ -377,9 +433,9 @@
         first_field = 1;
     }
 
-    if (av_image_check_size(ctx->width, ctx->height, 0, avctx))
-        return -1;
-    avcodec_set_dimensions(avctx, ctx->width, ctx->height);
+    ret = ff_set_dimensions(avctx, ctx->width, ctx->height);
+    if (ret < 0)
+        return ret;
 
     if (first_field) {
         if ((ret = ff_thread_get_buffer(avctx, &frame, 0)) < 0)

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/dnxhdenc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/dnxhdenc.c Changed

@@ -28,6 +28,7 @@
 #include "libavutil/attributes.h"
 #include "libavutil/internal.h"
 #include "libavutil/opt.h"
+#include "libavutil/timer.h"
 #include "avcodec.h"
 #include "dsputil.h"
 #include "internal.h"
@@ -166,7 +167,7 @@
     }
     return 0;
  fail:
-    return -1;
+    return AVERROR(ENOMEM);
 }
 
 static av_cold int dnxhd_init_qmat(DNXHDEncContext *ctx, int lbias, int cbias)
@@ -230,12 +231,12 @@
 
     return 0;
  fail:
-    return -1;
+    return AVERROR(ENOMEM);
 }
 
 static av_cold int dnxhd_init_rc(DNXHDEncContext *ctx)
 {
-    FF_ALLOCZ_OR_GOTO(ctx->m.avctx, ctx->mb_rc, 8160*ctx->m.avctx->qmax*sizeof(RCEntry), fail);
+    FF_ALLOCZ_OR_GOTO(ctx->m.avctx, ctx->mb_rc, 8160*(ctx->m.avctx->qmax + 1)*sizeof(RCEntry), fail);
     if (ctx->m.avctx->mb_decision != FF_MB_DECISION_RD)
         FF_ALLOCZ_OR_GOTO(ctx->m.avctx, ctx->mb_cmp, ctx->m.mb_num*sizeof(RCCMPEntry), fail);
 
@@ -244,13 +245,13 @@
     ctx->lambda = 2<<LAMBDA_FRAC_BITS; // qscale 2
     return 0;
  fail:
-    return -1;
+    return AVERROR(ENOMEM);
 }
 
 static av_cold int dnxhd_encode_init(AVCodecContext *avctx)
 {
     DNXHDEncContext *ctx = avctx->priv_data;
-    int i, index, bit_depth;
+    int i, index, bit_depth, ret;
 
     switch (avctx->pix_fmt) {
     case AV_PIX_FMT_YUV422P:
@@ -261,14 +262,14 @@
         break;
     default:
         av_log(avctx, AV_LOG_ERROR, "pixel format is incompatible with DNxHD\n");
-        return -1;
+        return AVERROR(EINVAL);
     }
 
     ctx->cid = ff_dnxhd_find_cid(avctx, bit_depth);
     if (!ctx->cid) {
         av_log(avctx, AV_LOG_ERROR, "video parameters incompatible with DNxHD. Valid DNxHD profiles:\n");
         ff_dnxhd_print_profiles(avctx, AV_LOG_ERROR);
-        return -1;
+        return AVERROR(EINVAL);
     }
     av_log(avctx, AV_LOG_DEBUG, "cid %d\n", ctx->cid);
 
@@ -312,30 +313,38 @@
 
     if (avctx->intra_quant_bias != FF_DEFAULT_QUANT_BIAS)
         ctx->m.intra_quant_bias = avctx->intra_quant_bias;
-    if (dnxhd_init_qmat(ctx, ctx->m.intra_quant_bias, 0) < 0) // XXX tune lbias/cbias
-        return -1;
+    if ((ret = dnxhd_init_qmat(ctx, ctx->m.intra_quant_bias, 0)) < 0) // XXX tune lbias/cbias
+        return ret;
 
     // Avid Nitris hardware decoder requires a minimum amount of padding in the coding unit payload
     if (ctx->nitris_compat)
         ctx->min_padding = 1600;
 
-    if (dnxhd_init_vlc(ctx) < 0)
-        return -1;
-    if (dnxhd_init_rc(ctx) < 0)
-        return -1;
+    if ((ret = dnxhd_init_vlc(ctx)) < 0)
+        return ret;
+    if ((ret = dnxhd_init_rc(ctx)) < 0)
+        return ret;
 
     FF_ALLOCZ_OR_GOTO(ctx->m.avctx, ctx->slice_size, ctx->m.mb_height*sizeof(uint32_t), fail);
     FF_ALLOCZ_OR_GOTO(ctx->m.avctx, ctx->slice_offs, ctx->m.mb_height*sizeof(uint32_t), fail);
     FF_ALLOCZ_OR_GOTO(ctx->m.avctx, ctx->mb_bits,    ctx->m.mb_num   *sizeof(uint16_t), fail);
     FF_ALLOCZ_OR_GOTO(ctx->m.avctx, ctx->mb_qscale,  ctx->m.mb_num   *sizeof(uint8_t),  fail);
 
-    ctx->frame.key_frame = 1;
-    ctx->frame.pict_type = AV_PICTURE_TYPE_I;
-    ctx->m.avctx->coded_frame = &ctx->frame;
+    avctx->coded_frame = av_frame_alloc();
+    if (!avctx->coded_frame)
+        return AVERROR(ENOMEM);
+
+    avctx->coded_frame->key_frame = 1;
+    avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I;
 
     if (avctx->thread_count > MAX_THREADS) {
         av_log(avctx, AV_LOG_ERROR, "too many threads\n");
-        return -1;
+        return AVERROR(EINVAL);
+    }
+
+    if (avctx->qmax <= 1) {
+        av_log(avctx, AV_LOG_ERROR, "qmax must be at least 2\n");
+        return AVERROR(EINVAL);
     }
 
     ctx->thread[0] = ctx;
@@ -346,7 +355,7 @@
 
     return 0;
  fail: //for FF_ALLOCZ_OR_GOTO
-    return -1;
+    return AVERROR(ENOMEM);
 }
 
 static int dnxhd_write_header(AVCodecContext *avctx, uint8_t *buf)
@@ -736,7 +745,7 @@
         //        lambda, last_higher, last_lower, bits, ctx->frame_bits);
         if (end) {
             if (bits > ctx->frame_bits)
-                return -1;
+                return AVERROR(EINVAL);
             break;
         }
         if (bits < ctx->frame_bits) {
@@ -755,7 +764,7 @@
             if (last_lower != INT_MAX)
                 lambda = (lambda+last_lower)>>1;
             else if ((int64_t)lambda + up_step > INT_MAX)
-                return -1;
+                return AVERROR(EINVAL);
             else
                 lambda += up_step;
             up_step = FFMIN((int64_t)up_step*5, INT_MAX);
@@ -817,7 +826,7 @@
                 qscale += up_step++;
             down_step = 1;
             if (qscale >= ctx->m.avctx->qmax)
-                return -1;
+                return AVERROR(EINVAL);
         }
     }
     //av_dlog(ctx->m.avctx, "out qscale %d\n", qscale);
@@ -886,7 +895,7 @@
     int max_bits = 0;
     int ret, x, y;
     if ((ret = dnxhd_find_qscale(ctx)) < 0)
-        return -1;
+        return ret;
     for (y = 0; y < ctx->m.mb_height; y++) {
         for (x = 0; x < ctx->m.mb_width; x++) {
             int mb = y*ctx->m.mb_width+x;
@@ -922,19 +931,14 @@
 {
     int i;
 
-    for (i = 0; i < 3; i++) {
-        ctx->frame.data[i]     = frame->data[i];
-        ctx->frame.linesize[i] = frame->linesize[i];
-    }
-
     for (i = 0; i < ctx->m.avctx->thread_count; i++) {
-        ctx->thread[i]->m.linesize    = ctx->frame.linesize[0]<<ctx->interlaced;
-        ctx->thread[i]->m.uvlinesize  = ctx->frame.linesize[1]<<ctx->interlaced;
+        ctx->thread[i]->m.linesize    = frame->linesize[0] << ctx->interlaced;
+        ctx->thread[i]->m.uvlinesize  = frame->linesize[1] << ctx->interlaced;
         ctx->thread[i]->dct_y_offset  = ctx->m.linesize  *8;
         ctx->thread[i]->dct_uv_offset = ctx->m.uvlinesize*8;
     }
 
-    ctx->frame.interlaced_frame = frame->interlaced_frame;
+    ctx->m.avctx->coded_frame->interlaced_frame = frame->interlaced_frame;
     ctx->cur_field = frame->interlaced_frame && !frame->top_field_first;
 }
 
@@ -954,9 +958,9 @@
 
  encode_coding_unit:
     for (i = 0; i < 3; i++) {
-        ctx->src[i] = ctx->frame.data[i];
+        ctx->src[i] = frame->data[i];
         if (ctx->interlaced && ctx->cur_field)
-            ctx->src[i] += ctx->frame.linesize[i];
+            ctx->src[i] += frame->linesize[i];
     }
 
     dnxhd_write_header(avctx, buf);
@@ -968,7 +972,7 @@
     if (ret < 0) {
         av_log(avctx, AV_LOG_ERROR,
                "picture could not fit ratecontrol constraints, increase qmax\n");
-        return -1;
+        return ret;
     }
 
     dnxhd_setup_threads_slices(ctx);
@@ -994,7 +998,7 @@
         goto encode_coding_unit;
     }
 
-    ctx->frame.quality = ctx->qscale*FF_QP2LAMBDA;
+    avctx->coded_frame->quality = ctx->qscale * FF_QP2LAMBDA;
 
     pkt->flags |= AV_PKT_FLAG_KEY;
     *got_packet = 1;
@@ -1027,6 +1031,8 @@
     for (i = 1; i < avctx->thread_count; i++)
         av_freep(&ctx->thread[i]);
 
+    av_frame_free(&avctx->coded_frame);
+
     return 0;
 }

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/dnxhdenc.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/dnxhdenc.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/dpx.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/dpx.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/dsicinav.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/dsicinav.c Changed

@@ -39,7 +39,7 @@
 
 typedef struct CinVideoContext {
     AVCodecContext *avctx;
-    AVFrame frame;
+    AVFrame *frame;
     unsigned int bitmap_size;
     uint32_t palette[256];
     uint8_t *bitmap_table[3];
@@ -118,7 +118,9 @@
     cin->avctx = avctx;
     avctx->pix_fmt = AV_PIX_FMT_PAL8;
 
-    avcodec_get_frame_defaults(&cin->frame);
+    cin->frame = av_frame_alloc();
+    if (!cin->frame)
+        return AVERROR(ENOMEM);
 
     cin->bitmap_size = avctx->width * avctx->height;
     if (allocate_buffers(cin))
@@ -315,20 +317,20 @@
         break;
     }
 
-    if ((res = ff_reget_buffer(avctx, &cin->frame)) < 0)
+    if ((res = ff_reget_buffer(avctx, cin->frame)) < 0)
         return res;
 
-    memcpy(cin->frame.data[1], cin->palette, sizeof(cin->palette));
-    cin->frame.palette_has_changed = 1;
+    memcpy(cin->frame->data[1], cin->palette, sizeof(cin->palette));
+    cin->frame->palette_has_changed = 1;
     for (y = 0; y < cin->avctx->height; ++y)
-        memcpy(cin->frame.data[0] + (cin->avctx->height - 1 - y) * cin->frame.linesize[0],
+        memcpy(cin->frame->data[0] + (cin->avctx->height - 1 - y) * cin->frame->linesize[0],
                cin->bitmap_table[CIN_CUR_BMP] + y * cin->avctx->width,
                cin->avctx->width);
 
     FFSWAP(uint8_t *, cin->bitmap_table[CIN_CUR_BMP],
                       cin->bitmap_table[CIN_PRE_BMP]);
 
-    if ((res = av_frame_ref(data, &cin->frame)) < 0)
+    if ((res = av_frame_ref(data, cin->frame)) < 0)
         return res;
 
     *got_frame = 1;
@@ -340,7 +342,7 @@
 {
     CinVideoContext *cin = avctx->priv_data;
 
-    av_frame_unref(&cin->frame);
+    av_frame_free(&cin->frame);
 
     destroy_buffers(cin);

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/dsputil.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/dsputil.c Changed

@@ -69,9 +69,6 @@
     53, 61, 54, 62, 39, 47, 55, 63,
 };
 
-/* not permutated inverse zigzag_direct + 1 for MMX quantizer */
-DECLARE_ALIGNED(16, uint16_t, ff_inv_zigzag_direct16)[64];
-
 const uint8_t ff_alternate_horizontal_scan[64] = {
     0,  1,   2,  3,  8,  9, 16, 17,
     10, 11,  4,  5,  6,  7, 15, 14,
@@ -1516,80 +1513,6 @@
     wmv2_mspel8_v_lowpass(dst, halfH+8, stride, 8, 8);
 }
 
-static void h263_v_loop_filter_c(uint8_t *src, int stride, int qscale){
-    if(CONFIG_H263_DECODER || CONFIG_H263_ENCODER) {
-    int x;
-    const int strength= ff_h263_loop_filter_strength[qscale];
-
-    for(x=0; x<8; x++){
-        int d1, d2, ad1;
-        int p0= src[x-2*stride];
-        int p1= src[x-1*stride];
-        int p2= src[x+0*stride];
-        int p3= src[x+1*stride];
-        int d = (p0 - p3 + 4*(p2 - p1)) / 8;
-
-        if     (d<-2*strength) d1= 0;
-        else if(d<-  strength) d1=-2*strength - d;
-        else if(d<   strength) d1= d;
-        else if(d< 2*strength) d1= 2*strength - d;
-        else                   d1= 0;
-
-        p1 += d1;
-        p2 -= d1;
-        if(p1&256) p1= ~(p1>>31);
-        if(p2&256) p2= ~(p2>>31);
-
-        src[x-1*stride] = p1;
-        src[x+0*stride] = p2;
-
-        ad1= FFABS(d1)>>1;
-
-        d2= av_clip((p0-p3)/4, -ad1, ad1);
-
-        src[x-2*stride] = p0 - d2;
-        src[x+  stride] = p3 + d2;
-    }
-    }
-}
-
-static void h263_h_loop_filter_c(uint8_t *src, int stride, int qscale){
-    if(CONFIG_H263_DECODER || CONFIG_H263_ENCODER) {
-    int y;
-    const int strength= ff_h263_loop_filter_strength[qscale];
-
-    for(y=0; y<8; y++){
-        int d1, d2, ad1;
-        int p0= src[y*stride-2];
-        int p1= src[y*stride-1];
-        int p2= src[y*stride+0];
-        int p3= src[y*stride+1];
-        int d = (p0 - p3 + 4*(p2 - p1)) / 8;
-
-        if     (d<-2*strength) d1= 0;
-        else if(d<-  strength) d1=-2*strength - d;
-        else if(d<   strength) d1= d;
-        else if(d< 2*strength) d1= 2*strength - d;
-        else                   d1= 0;
-
-        p1 += d1;
-        p2 -= d1;
-        if(p1&256) p1= ~(p1>>31);
-        if(p2&256) p2= ~(p2>>31);
-
-        src[y*stride-1] = p1;
-        src[y*stride+0] = p2;
-
-        ad1= FFABS(d1)>>1;
-
-        d2= av_clip((p0-p3)/4, -ad1, ad1);
-
-        src[y*stride-2] = p0 - d2;
-        src[y*stride+1] = p3 + d2;
-    }
-    }
-}
-
 static inline int pix_abs16_c(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h)
 {
     int s, i;
@@ -1931,7 +1854,7 @@
 
 static void add_bytes_c(uint8_t *dst, uint8_t *src, int w){
     long i;
-    for(i=0; i<=w-(int)sizeof(long); i+=sizeof(long)){
+    for (i = 0; i <= w - (int)sizeof(long); i += sizeof(long)) {
         long a = *(long*)(src+i);
         long b = *(long*)(dst+i);
         *(long*)(dst+i) = ((a&pb_7f) + (b&pb_7f)) ^ ((a^b)&pb_80);
@@ -1956,7 +1879,7 @@
         }
     }else
 #endif
-    for(i=0; i<=w-(int)sizeof(long); i+=sizeof(long)){
+    for (i = 0; i <= w - (int)sizeof(long); i += sizeof(long)) {
         long a = *(long*)(src1+i);
         long b = *(long*)(src2+i);
         *(long*)(dst+i) = ((a|pb_80) - (b&pb_7f)) ^ ((a^b^pb_80)&pb_80);
@@ -2572,19 +2495,6 @@
     return res;
 }
 
-static void apply_window_int16_c(int16_t *output, const int16_t *input,
-                                 const int16_t *window, unsigned int len)
-{
-    int i;
-    int len2 = len >> 1;
-
-    for (i = 0; i < len2; i++) {
-        int16_t w       = window[i];
-        output[i]       = (MUL16(input[i],       w) + (1 << 14)) >> 15;
-        output[len-i-1] = (MUL16(input[len-i-1], w) + (1 << 14)) >> 15;
-    }
-}
-
 static void vector_clip_int32_c(int32_t *dst, const int32_t *src, int32_t min,
                                 int32_t max, unsigned int len)
 {
@@ -2651,8 +2561,6 @@
     for(i=0;i<512;i++) {
         ff_squareTbl[i] = (i - 256) * (i - 256);
     }
-
-    for(i=0; i<64; i++) ff_inv_zigzag_direct16[ff_zigzag_direct[i]]= i+1;
 }
 
 int ff_check_alignment(void){
@@ -2872,18 +2780,12 @@
     c->bswap_buf= bswap_buf;
     c->bswap16_buf = bswap16_buf;
 
-    if (CONFIG_H263_DECODER || CONFIG_H263_ENCODER) {
-        c->h263_h_loop_filter= h263_h_loop_filter_c;
-        c->h263_v_loop_filter= h263_v_loop_filter_c;
-    }
-
     c->try_8x8basis= try_8x8basis_c;
     c->add_8x8basis= add_8x8basis_c;
 
     c->vector_clipf = vector_clipf_c;
     c->scalarproduct_int16 = scalarproduct_int16_c;
     c->scalarproduct_and_madd_int16 = scalarproduct_and_madd_int16_c;
-    c->apply_window_int16 = apply_window_int16_c;
     c->vector_clip_int32 = vector_clip_int32_c;
 
     c->shrink[0]= av_image_copy_plane;

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/dsputil.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/dsputil.h Changed

@@ -205,9 +205,6 @@
     void (*bswap_buf)(uint32_t *dst, const uint32_t *src, int w);
     void (*bswap16_buf)(uint16_t *dst, const uint16_t *src, int len);
 
-    void (*h263_v_loop_filter)(uint8_t *src, int stride, int qscale);
-    void (*h263_h_loop_filter)(uint8_t *src, int stride, int qscale);
-
     /* assume len is a multiple of 8, and arrays are 16-byte aligned */
     void (*vector_clipf)(float *dst /* align 16 */, const float *src /* align 16 */, float min, float max, int len /* align 16 */);
 
@@ -278,20 +275,6 @@
     int32_t (*scalarproduct_and_madd_int16)(int16_t *v1/*align 16*/, const int16_t *v2, const int16_t *v3, int len, int mul);
 
     /**
-     * Apply symmetric window in 16-bit fixed-point.
-     * @param output destination array
-     *               constraints: 16-byte aligned
-     * @param input  source array
-     *               constraints: 16-byte aligned
-     * @param window window array
-     *               constraints: 16-byte aligned, at least len/2 elements
-     * @param len    full window length
-     *               constraints: multiple of ? greater than zero
-     */
-    void (*apply_window_int16)(int16_t *output, const int16_t *input,
-                               const int16_t *window, unsigned int len);
-
-    /**
      * Clip each element in an array of int32_t to a given minimum and maximum value.
      * @param dst  destination array
      *             constraints: 16-byte aligned

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/dv.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/dv.c Changed

@@ -46,7 +46,7 @@
 #include "put_bits.h"
 #include "simple_idct.h"
 #include "dvdata.h"
-#include "dv_tablegen.h"
+#include "dv.h"
 
 /* XXX: also include quantization */
 RL_VLC_ELEM ff_dv_rl_vlc[1184];
@@ -254,20 +254,20 @@
 
         /* it's faster to include sign bit in a generic VLC parsing scheme */
         for (i = 0, j = 0; i < NB_DV_VLC; i++, j++) {
-            new_dv_vlc_bits[j]  = dv_vlc_bits[i];
-            new_dv_vlc_len[j]   = dv_vlc_len[i];
-            new_dv_vlc_run[j]   = dv_vlc_run[i];
-            new_dv_vlc_level[j] = dv_vlc_level[i];
+            new_dv_vlc_bits[j]  = ff_dv_vlc_bits[i];
+            new_dv_vlc_len[j]   = ff_dv_vlc_len[i];
+            new_dv_vlc_run[j]   = ff_dv_vlc_run[i];
+            new_dv_vlc_level[j] = ff_dv_vlc_level[i];
 
-            if (dv_vlc_level[i]) {
+            if (ff_dv_vlc_level[i]) {
                 new_dv_vlc_bits[j] <<= 1;
                 new_dv_vlc_len[j]++;
 
                 j++;
-                new_dv_vlc_bits[j]  = (dv_vlc_bits[i] << 1) | 1;
-                new_dv_vlc_len[j]   =  dv_vlc_len[i] + 1;
-                new_dv_vlc_run[j]   =  dv_vlc_run[i];
-                new_dv_vlc_level[j] = -dv_vlc_level[i];
+                new_dv_vlc_bits[j]  = (ff_dv_vlc_bits[i] << 1) | 1;
+                new_dv_vlc_len[j]   =  ff_dv_vlc_len[i] + 1;
+                new_dv_vlc_run[j]   =  ff_dv_vlc_run[i];
+                new_dv_vlc_level[j] = -ff_dv_vlc_level[i];
             }
         }
 
@@ -320,679 +320,9 @@
     }else
         memcpy(s->dv_zigzag[1], ff_zigzag248_direct, 64);
 
-    avcodec_get_frame_defaults(&s->picture);
-    avctx->coded_frame = &s->picture;
     s->avctx = avctx;
     avctx->chroma_sample_location = AVCHROMA_LOC_TOPLEFT;
 
     return 0;
 }
 
-static av_cold int dvvideo_init_encoder(AVCodecContext *avctx)
-{
-    if (!avpriv_dv_codec_profile(avctx)) {
-        av_log(avctx, AV_LOG_ERROR, "Found no DV profile for %ix%i %s video. "
-               "Valid DV profiles are:\n",
-               avctx->width, avctx->height, av_get_pix_fmt_name(avctx->pix_fmt));
-        ff_dv_print_profiles(avctx, AV_LOG_ERROR);
-        return AVERROR(EINVAL);
-    }
-    if (avctx->height > 576) {
-        av_log(avctx, AV_LOG_ERROR, "DVCPRO HD encoding is not supported.\n");
-        return AVERROR_PATCHWELCOME;
-    }
-
-    dv_vlc_map_tableinit();
-
-    return ff_dvvideo_init(avctx);
-}
-
-/* bit budget for AC only in 5 MBs */
-static const int vs_total_ac_bits = (100 * 4 + 68*2) * 5;
-static const int mb_area_start[5] = { 1, 6, 21, 43, 64 };
-
-#if CONFIG_SMALL
-/* Converts run and level (where level != 0) pair into VLC, returning bit size */
-static av_always_inline int dv_rl2vlc(int run, int level, int sign, uint32_t* vlc)
-{
-    int size;
-    if (run < DV_VLC_MAP_RUN_SIZE && level < DV_VLC_MAP_LEV_SIZE) {
-        *vlc = dv_vlc_map[run][level].vlc | sign;
-        size = dv_vlc_map[run][level].size;
-    }
-    else {
-        if (level < DV_VLC_MAP_LEV_SIZE) {
-            *vlc = dv_vlc_map[0][level].vlc | sign;
-            size = dv_vlc_map[0][level].size;
-        } else {
-            *vlc = 0xfe00 | (level << 1) | sign;
-            size = 16;
-        }
-        if (run) {
-            *vlc |= ((run < 16) ? dv_vlc_map[run-1][0].vlc :
-                                  (0x1f80 | (run - 1))) << size;
-            size +=  (run < 16) ? dv_vlc_map[run-1][0].size : 13;
-        }
-    }
-
-    return size;
-}
-
-static av_always_inline int dv_rl2vlc_size(int run, int level)
-{
-    int size;
-
-    if (run < DV_VLC_MAP_RUN_SIZE && level < DV_VLC_MAP_LEV_SIZE) {
-        size = dv_vlc_map[run][level].size;
-    }
-    else {
-        size = (level < DV_VLC_MAP_LEV_SIZE) ? dv_vlc_map[0][level].size : 16;
-        if (run) {
-            size += (run < 16) ? dv_vlc_map[run-1][0].size : 13;
-        }
-    }
-    return size;
-}
-#else
-static av_always_inline int dv_rl2vlc(int run, int l, int sign, uint32_t* vlc)
-{
-    *vlc = dv_vlc_map[run][l].vlc | sign;
-    return dv_vlc_map[run][l].size;
-}
-
-static av_always_inline int dv_rl2vlc_size(int run, int l)
-{
-    return dv_vlc_map[run][l].size;
-}
-#endif
-
-typedef struct EncBlockInfo {
-    int      area_q[4];
-    int      bit_size[4];
-    int      prev[5];
-    int      cur_ac;
-    int      cno;
-    int      dct_mode;
-    int16_t  mb[64];
-    uint8_t  next[64];
-    uint8_t  sign[64];
-    uint8_t  partial_bit_count;
-    uint32_t partial_bit_buffer; /* we can't use uint16_t here */
-} EncBlockInfo;
-
-static av_always_inline PutBitContext* dv_encode_ac(EncBlockInfo* bi,
-                                                    PutBitContext* pb_pool,
-                                                    PutBitContext* pb_end)
-{
-    int prev, bits_left;
-    PutBitContext* pb = pb_pool;
-    int size = bi->partial_bit_count;
-    uint32_t vlc = bi->partial_bit_buffer;
-
-    bi->partial_bit_count = bi->partial_bit_buffer = 0;
-    for (;;){
-       /* Find suitable storage space */
-       for (; size > (bits_left = put_bits_left(pb)); pb++) {
-          if (bits_left) {
-              size -= bits_left;
-              put_bits(pb, bits_left, vlc >> size);
-              vlc = vlc & ((1 << size) - 1);
-          }
-          if (pb + 1 >= pb_end) {
-              bi->partial_bit_count  = size;
-              bi->partial_bit_buffer = vlc;
-              return pb;
-          }
-       }
-
-       /* Store VLC */
-       put_bits(pb, size, vlc);
-
-       if (bi->cur_ac >= 64)
-           break;
-
-       /* Construct the next VLC */
-       prev       = bi->cur_ac;
-       bi->cur_ac = bi->next[prev];
-       if (bi->cur_ac < 64){
-           size = dv_rl2vlc(bi->cur_ac - prev - 1, bi->mb[bi->cur_ac], bi->sign[bi->cur_ac], &vlc);
-       } else {
-           size = 4; vlc = 6; /* End Of Block stamp */
-       }
-    }
-    return pb;
-}
-
-static av_always_inline int dv_guess_dct_mode(DVVideoContext *s, uint8_t *data, int linesize) {
-    if (s->avctx->flags & CODEC_FLAG_INTERLACED_DCT) {
-        int ps = s->ildct_cmp(NULL, data, NULL, linesize, 8) - 400;
-        if (ps > 0) {
-            int is = s->ildct_cmp(NULL, data           , NULL, linesize<<1, 4) +
-                     s->ildct_cmp(NULL, data + linesize, NULL, linesize<<1, 4);
-            return ps > is;
-        }
-    }
-
-    return 0;
-}
-
-static const int dv_weight_bits = 18;
-static const int dv_weight_88[64] = {
- 131072, 257107, 257107, 242189, 252167, 242189, 235923, 237536,
- 237536, 235923, 229376, 231390, 223754, 231390, 229376, 222935,
- 224969, 217965, 217965, 224969, 222935, 200636, 218652, 211916,
- 212325, 211916, 218652, 200636, 188995, 196781, 205965, 206433,
- 206433, 205965, 196781, 188995, 185364, 185364, 200636, 200704,
- 200636, 185364, 185364, 174609, 180568, 195068, 195068, 180568,
- 174609, 170091, 175557, 189591, 175557, 170091, 165371, 170627,
- 170627, 165371, 160727, 153560, 160727, 144651, 144651, 136258,
-};
-static const int dv_weight_248[64] = {
- 131072, 242189, 257107, 237536, 229376, 200636, 242189, 223754,
- 224969, 196781, 262144, 242189, 229376, 200636, 257107, 237536,
- 211916, 185364, 235923, 217965, 229376, 211916, 206433, 180568,
- 242189, 223754, 224969, 196781, 211916, 185364, 235923, 217965,
- 200704, 175557, 222935, 205965, 200636, 185364, 195068, 170627,
- 229376, 211916, 206433, 180568, 200704, 175557, 222935, 205965,
- 175557, 153560, 188995, 174609, 165371, 144651, 200636, 185364,
- 195068, 170627, 175557, 153560, 188995, 174609, 165371, 144651,
-};
-
-static av_always_inline int dv_init_enc_block(EncBlockInfo* bi, uint8_t *data, int linesize, DVVideoContext *s, int bias)
-{
-    const int *weight;
-    const uint8_t* zigzag_scan;
-    LOCAL_ALIGNED_16(int16_t, blk, [64]);
-    int i, area;
-    /* We offer two different methods for class number assignment: the
-       method suggested in SMPTE 314M Table 22, and an improved
-       method. The SMPTE method is very conservative; it assigns class
-       3 (i.e. severe quantization) to any block where the largest AC
-       component is greater than 36. FFmpeg's DV encoder tracks AC bit
-       consumption precisely, so there is no need to bias most blocks
-       towards strongly lossy compression. Instead, we assign class 2
-       to most blocks, and use class 3 only when strictly necessary
-       (for blocks whose largest AC component exceeds 255). */
-
-#if 0 /* SMPTE spec method */
-    static const int classes[] = {12, 24, 36, 0xffff};
-#else /* improved FFmpeg method */
-    static const int classes[] = {-1, -1, 255, 0xffff};
-#endif
-    int max  = classes[0];
-    int prev = 0;
-
-    av_assert2((((int)blk) & 15) == 0);
-
-    bi->area_q[0] = bi->area_q[1] = bi->area_q[2] = bi->area_q[3] = 0;
-    bi->partial_bit_count = 0;
-    bi->partial_bit_buffer = 0;
-    bi->cur_ac = 0;
-    if (data) {
-        bi->dct_mode = dv_guess_dct_mode(s, data, linesize);
-        s->get_pixels(blk, data, linesize);
-        s->fdct[bi->dct_mode](blk);
-    } else {
-        /* We rely on the fact that encoding all zeros leads to an immediate EOB,
-           which is precisely what the spec calls for in the "dummy" blocks. */
-        memset(blk, 0, 64*sizeof(*blk));
-        bi->dct_mode = 0;
-    }
-    bi->mb[0] = blk[0];
-
-    zigzag_scan = bi->dct_mode ? ff_zigzag248_direct : ff_zigzag_direct;
-    weight = bi->dct_mode ? dv_weight_248 : dv_weight_88;
-
-    for (area = 0; area < 4; area++) {
-       bi->prev[area]     = prev;
-       bi->bit_size[area] = 1; // 4 areas 4 bits for EOB :)
-       for (i = mb_area_start[area]; i < mb_area_start[area+1]; i++) {
-          int level = blk[zigzag_scan[i]];
-
-          if (level + 15 > 30U) {
-              bi->sign[i] = (level >> 31) & 1;
-              /* weight it and shift down into range, adding for rounding */
-              /* the extra division by a factor of 2^4 reverses the 8x expansion of the DCT
-                 AND the 2x doubling of the weights */
-              level = (FFABS(level) * weight[i] + (1 << (dv_weight_bits+3))) >> (dv_weight_bits+4);
-              bi->mb[i] = level;
-              if (level > max)
-                  max = level;
-              bi->bit_size[area] += dv_rl2vlc_size(i - prev  - 1, level);
-              bi->next[prev]= i;
-              prev = i;
-          }
-       }
-    }
-    bi->next[prev]= i;
-    for (bi->cno = 0; max > classes[bi->cno]; bi->cno++);
-
-    bi->cno += bias;
-
-    if (bi->cno >= 3) {
-        bi->cno = 3;
-        prev    = 0;
-        i       = bi->next[prev];
-        for (area = 0; area < 4; area++) {
-            bi->prev[area]     = prev;
-            bi->bit_size[area] = 1; // 4 areas 4 bits for EOB :)
-            for (; i < mb_area_start[area+1]; i = bi->next[i]) {
-                bi->mb[i] >>= 1;
-
-                if (bi->mb[i]) {
-                    bi->bit_size[area] += dv_rl2vlc_size(i - prev - 1, bi->mb[i]);
-                    bi->next[prev]= i;
-                    prev = i;
-                }
-            }
-        }
-        bi->next[prev]= i;
-    }
-
-    return bi->bit_size[0] + bi->bit_size[1] + bi->bit_size[2] + bi->bit_size[3];
-}
-
-static inline void dv_guess_qnos(EncBlockInfo* blks, int* qnos)
-{
-    int size[5];
-    int i, j, k, a, prev, a2;
-    EncBlockInfo* b;
-
-    size[0] = size[1] = size[2] = size[3] = size[4] = 1 << 24;
-    do {
-       b = blks;
-       for (i = 0; i < 5; i++) {
-          if (!qnos[i])
-              continue;
-
-          qnos[i]--;
-          size[i] = 0;
-          for (j = 0; j < 6; j++, b++) {
-             for (a = 0; a < 4; a++) {
-                if (b->area_q[a] != ff_dv_quant_shifts[qnos[i] + ff_dv_quant_offset[b->cno]][a]) {
-                    b->bit_size[a] = 1; // 4 areas 4 bits for EOB :)
-                    b->area_q[a]++;
-                    prev = b->prev[a];
-                    av_assert2(b->next[prev] >= mb_area_start[a+1] || b->mb[prev]);
-                    for (k = b->next[prev] ; k < mb_area_start[a+1]; k = b->next[k]) {
-                       b->mb[k] >>= 1;
-                       if (b->mb[k]) {
-                           b->bit_size[a] += dv_rl2vlc_size(k - prev - 1, b->mb[k]);
-                           prev = k;
-                       } else {
-                           if (b->next[k] >= mb_area_start[a+1] && b->next[k]<64){
-                                for (a2 = a + 1; b->next[k] >= mb_area_start[a2+1]; a2++)
-                                    b->prev[a2] = prev;
-                                av_assert2(a2 < 4);
-                                av_assert2(b->mb[b->next[k]]);
-                                b->bit_size[a2] += dv_rl2vlc_size(b->next[k] - prev - 1, b->mb[b->next[k]])
-                                                  -dv_rl2vlc_size(b->next[k] -    k - 1, b->mb[b->next[k]]);
-                                av_assert2(b->prev[a2] == k && (a2 + 1 >= 4 || b->prev[a2+1] != k));
-                                b->prev[a2] = prev;
-                           }
-                           b->next[prev] = b->next[k];
-                       }
-                    }
-                    b->prev[a+1]= prev;
-                }
-                size[i] += b->bit_size[a];
-             }
-          }
-          if (vs_total_ac_bits >= size[0] + size[1] + size[2] + size[3] + size[4])
-                return;
-       }
-    } while (qnos[0]|qnos[1]|qnos[2]|qnos[3]|qnos[4]);
-
-
-    for (a = 2; a == 2 || vs_total_ac_bits < size[0]; a += a){
-        b = blks;
-        size[0] = 5 * 6 * 4; //EOB
-        for (j = 0; j < 6 *5; j++, b++) {
-            prev = b->prev[0];
-            for (k = b->next[prev]; k < 64; k = b->next[k]) {
-                if (b->mb[k] < a && b->mb[k] > -a){
-                    b->next[prev] = b->next[k];
-                }else{
-                    size[0] += dv_rl2vlc_size(k - prev - 1, b->mb[k]);
-                    prev = k;
-                }
-            }
-        }
-    }
-}
-
-static int dv_encode_video_segment(AVCodecContext *avctx, void *arg)
-{
-    DVVideoContext *s = avctx->priv_data;
-    DVwork_chunk *work_chunk = arg;
-    int mb_index, i, j;
-    int mb_x, mb_y, c_offset, linesize, y_stride;
-    uint8_t*  y_ptr;
-    uint8_t*  dif;
-    LOCAL_ALIGNED_8(uint8_t, scratch, [128]);
-    EncBlockInfo  enc_blks[5*DV_MAX_BPM];
-    PutBitContext pbs[5*DV_MAX_BPM];
-    PutBitContext* pb;
-    EncBlockInfo* enc_blk;
-    int       vs_bit_size = 0;
-    int       qnos[5] = {15, 15, 15, 15, 15}; /* No quantization */
-    int*      qnosp = &qnos[0];
-
-    dif = &s->buf[work_chunk->buf_offset*80];
-    enc_blk = &enc_blks[0];
-    for (mb_index = 0; mb_index < 5; mb_index++) {
-        dv_calculate_mb_xy(s, work_chunk, mb_index, &mb_x, &mb_y);
-
-        /* initializing luminance blocks */
-        if ((s->sys->pix_fmt == AV_PIX_FMT_YUV420P) ||
-            (s->sys->pix_fmt == AV_PIX_FMT_YUV411P && mb_x >= (704 / 8)) ||
-            (s->sys->height >= 720 && mb_y != 134)) {
-            y_stride = s->picture.linesize[0] << 3;
-        } else {
-            y_stride = 16;
-        }
-        y_ptr    = s->picture.data[0] + ((mb_y * s->picture.linesize[0] + mb_x) << 3);
-        linesize = s->picture.linesize[0];
-
-        if (s->sys->video_stype == 4) { /* SD 422 */
-            vs_bit_size +=
-            dv_init_enc_block(enc_blk+0, y_ptr               , linesize, s, 0) +
-            dv_init_enc_block(enc_blk+1, NULL                , linesize, s, 0) +
-            dv_init_enc_block(enc_blk+2, y_ptr + 8           , linesize, s, 0) +
-            dv_init_enc_block(enc_blk+3, NULL                , linesize, s, 0);
-        } else {
-            vs_bit_size +=
-            dv_init_enc_block(enc_blk+0, y_ptr               , linesize, s, 0) +
-            dv_init_enc_block(enc_blk+1, y_ptr + 8           , linesize, s, 0) +
-            dv_init_enc_block(enc_blk+2, y_ptr     + y_stride, linesize, s, 0) +
-            dv_init_enc_block(enc_blk+3, y_ptr + 8 + y_stride, linesize, s, 0);
-        }
-        enc_blk += 4;
-
-        /* initializing chrominance blocks */
-        c_offset = (((mb_y >>  (s->sys->pix_fmt == AV_PIX_FMT_YUV420P)) * s->picture.linesize[1] +
-                     (mb_x >> ((s->sys->pix_fmt == AV_PIX_FMT_YUV411P) ? 2 : 1))) << 3);
-        for (j = 2; j; j--) {
-            uint8_t *c_ptr = s->picture.data[j] + c_offset;
-            linesize = s->picture.linesize[j];
-            y_stride = (mb_y == 134) ? 8 : (s->picture.linesize[j] << 3);
-            if (s->sys->pix_fmt == AV_PIX_FMT_YUV411P && mb_x >= (704 / 8)) {
-                uint8_t* d;
-                uint8_t* b = scratch;
-                for (i = 0; i < 8; i++) {
-                    d = c_ptr + (linesize << 3);
-                    b[0] = c_ptr[0]; b[1] = c_ptr[1]; b[2] = c_ptr[2]; b[3] = c_ptr[3];
-                    b[4] =     d[0]; b[5] =     d[1]; b[6] =     d[2]; b[7] =     d[3];
-                    c_ptr += linesize;
-                    b += 16;
-                }
-                c_ptr = scratch;
-                linesize = 16;
-            }
-
-            vs_bit_size += dv_init_enc_block(    enc_blk++, c_ptr           , linesize, s, 1);
-            if (s->sys->bpm == 8) {
-                vs_bit_size += dv_init_enc_block(enc_blk++, c_ptr + y_stride, linesize, s, 1);
-            }
-        }
-    }
-
-    if (vs_total_ac_bits < vs_bit_size)
-        dv_guess_qnos(&enc_blks[0], qnosp);
-
-    /* DIF encoding process */
-    for (j=0; j<5*s->sys->bpm;) {
-        int start_mb = j;
-
-        dif[3] = *qnosp++;
-        dif += 4;
-
-        /* First pass over individual cells only */
-        for (i=0; i<s->sys->bpm; i++, j++) {
-            int sz = s->sys->block_sizes[i]>>3;
-
-            init_put_bits(&pbs[j], dif, sz);
-            put_sbits(&pbs[j], 9, ((enc_blks[j].mb[0] >> 3) - 1024 + 2) >> 2);
-            put_bits(&pbs[j], 1, enc_blks[j].dct_mode);
-            put_bits(&pbs[j], 2, enc_blks[j].cno);
-
-            dv_encode_ac(&enc_blks[j], &pbs[j], &pbs[j+1]);
-            dif += sz;
-        }
-
-        /* Second pass over each MB space */
-        pb = &pbs[start_mb];
-        for (i=0; i<s->sys->bpm; i++) {
-            if (enc_blks[start_mb+i].partial_bit_count)
-                pb = dv_encode_ac(&enc_blks[start_mb+i], pb, &pbs[start_mb+s->sys->bpm]);
-        }
-    }
-
-    /* Third and final pass over the whole video segment space */
-    pb = &pbs[0];
-    for (j=0; j<5*s->sys->bpm; j++) {
-       if (enc_blks[j].partial_bit_count)
-           pb = dv_encode_ac(&enc_blks[j], pb, &pbs[s->sys->bpm*5]);
-       if (enc_blks[j].partial_bit_count)
-            av_log(avctx, AV_LOG_ERROR, "ac bitstream overflow\n");
-    }
-
-    for (j=0; j<5*s->sys->bpm; j++) {
-       int pos;
-       int size = pbs[j].size_in_bits >> 3;
-       flush_put_bits(&pbs[j]);
-       pos = put_bits_count(&pbs[j]) >> 3;
-       if (pos > size) {
-           av_log(avctx, AV_LOG_ERROR, "bitstream written beyond buffer size\n");
-           return -1;
-       }
-       memset(pbs[j].buf + pos, 0xff, size - pos);
-    }
-
-    return 0;
-}
-
-static inline int dv_write_pack(enum dv_pack_type pack_id, DVVideoContext *c,
-                                uint8_t* buf)
-{
-    /*
-     * Here's what SMPTE314M says about these two:
-     *    (page 6) APTn, AP1n, AP2n, AP3n: These data shall be identical
-     *             as track application IDs (APTn = 001, AP1n =
-     *             001, AP2n = 001, AP3n = 001), if the source signal
-     *             comes from a digital VCR. If the signal source is
-     *             unknown, all bits for these data shall be set to 1.
-     *    (page 12) STYPE: STYPE defines a signal type of video signal
-     *                     00000b = 4:1:1 compression
-     *                     00100b = 4:2:2 compression
-     *                     XXXXXX = Reserved
-     * Now, I've got two problems with these statements:
-     *   1. it looks like APT == 111b should be a safe bet, but it isn't.
-     *      It seems that for PAL as defined in IEC 61834 we have to set
-     *      APT to 000 and for SMPTE314M to 001.
-     *   2. It is not at all clear what STYPE is used for 4:2:0 PAL
-     *      compression scheme (if any).
-     */
-    int apt   = (c->sys->pix_fmt == AV_PIX_FMT_YUV420P ? 0 : 1);
-    int fs    = c->picture.top_field_first ? 0x00 : 0x40;
-
-    uint8_t aspect = 0;
-    if ((int)(av_q2d(c->avctx->sample_aspect_ratio) * c->avctx->width / c->avctx->height * 10) >= 17) /* 16:9 */
-        aspect = 0x02;
-
-    buf[0] = (uint8_t)pack_id;
-    switch (pack_id) {
-    case dv_header525: /* I can't imagine why these two weren't defined as real */
-    case dv_header625: /* packs in SMPTE314M -- they definitely look like ones */
-          buf[1] = 0xf8 |        /* reserved -- always 1 */
-                   (apt & 0x07); /* APT: Track application ID */
-          buf[2] = (0    << 7) | /* TF1: audio data is 0 - valid; 1 - invalid */
-                   (0x0f << 3) | /* reserved -- always 1 */
-                   (apt & 0x07); /* AP1: Audio application ID */
-          buf[3] = (0    << 7) | /* TF2: video data is 0 - valid; 1 - invalid */
-                   (0x0f << 3) | /* reserved -- always 1 */
-                   (apt & 0x07); /* AP2: Video application ID */
-          buf[4] = (0    << 7) | /* TF3: subcode(SSYB) is 0 - valid; 1 - invalid */
-                   (0x0f << 3) | /* reserved -- always 1 */
-                   (apt & 0x07); /* AP3: Subcode application ID */
-          break;
-    case dv_video_source:
-          buf[1] = 0xff;      /* reserved -- always 1 */
-          buf[2] = (1 << 7) | /* B/W: 0 - b/w, 1 - color */
-                   (1 << 6) | /* following CLF is valid - 0, invalid - 1 */
-                   (3 << 4) | /* CLF: color frames ID (see ITU-R BT.470-4) */
-                   0xf;       /* reserved -- always 1 */
-          buf[3] = (3 << 6) | /* reserved -- always 1 */
-                   (c->sys->dsf << 5) | /*  system: 60fields/50fields */
-                   c->sys->video_stype; /* signal type video compression */
-          buf[4] = 0xff;      /* VISC: 0xff -- no information */
-          break;
-    case dv_video_control:
-          buf[1] = (0 << 6) | /* Copy generation management (CGMS) 0 -- free */
-                   0x3f;      /* reserved -- always 1 */
-          buf[2] = 0xc8 |     /* reserved -- always b11001xxx */
-                   aspect;
-          buf[3] = (1 << 7) | /* frame/field flag 1 -- frame, 0 -- field */
-                   fs       | /* first/second field flag 0 -- field 2, 1 -- field 1 */
-                   (1 << 5) | /* frame change flag 0 -- same picture as before, 1 -- different */
-                   (1 << 4) | /* 1 - interlaced, 0 - noninterlaced */
-                   0xc;       /* reserved -- always b1100 */
-          buf[4] = 0xff;      /* reserved -- always 1 */
-          break;
-    default:
-          buf[1] = buf[2] = buf[3] = buf[4] = 0xff;
-    }
-    return 5;
-}
-
-#if CONFIG_DVVIDEO_ENCODER
-static inline int dv_write_dif_id(enum dv_section_type t, uint8_t chan_num,
-                                  uint8_t seq_num, uint8_t dif_num,
-                                  uint8_t* buf)
-{
-    buf[0] = (uint8_t)t;       /* Section type */
-    buf[1] = (seq_num  << 4) | /* DIF seq number 0-9 for 525/60; 0-11 for 625/50 */
-             (chan_num << 3) | /* FSC: for 50Mb/s 0 - first channel; 1 - second */
-             7;                /* reserved -- always 1 */
-    buf[2] = dif_num;          /* DIF block number Video: 0-134, Audio: 0-8 */
-    return 3;
-}
-
-
-static inline int dv_write_ssyb_id(uint8_t syb_num, uint8_t fr, uint8_t* buf)
-{
-    if (syb_num == 0 || syb_num == 6) {
-        buf[0] = (fr << 7) | /* FR ID 1 - first half of each channel; 0 - second */
-                 (0  << 4) | /* AP3 (Subcode application ID) */
-                 0x0f;       /* reserved -- always 1 */
-    }
-    else if (syb_num == 11) {
-        buf[0] = (fr << 7) | /* FR ID 1 - first half of each channel; 0 - second */
-                 0x7f;       /* reserved -- always 1 */
-    }
-    else {
-        buf[0] = (fr << 7) | /* FR ID 1 - first half of each channel; 0 - second */
-                 (0  << 4) | /* APT (Track application ID) */
-                 0x0f;       /* reserved -- always 1 */
-    }
-    buf[1] = 0xf0 |            /* reserved -- always 1 */
-             (syb_num & 0x0f); /* SSYB number 0 - 11   */
-    buf[2] = 0xff;             /* reserved -- always 1 */
-    return 3;
-}
-
-static void dv_format_frame(DVVideoContext* c, uint8_t* buf)
-{
-    int chan, i, j, k;
-
-    for (chan = 0; chan < c->sys->n_difchan; chan++) {
-        for (i = 0; i < c->sys->difseg_size; i++) {
-            memset(buf, 0xff, 80 * 6); /* first 6 DIF blocks are for control data */
-
-            /* DV header: 1DIF */
-            buf += dv_write_dif_id(dv_sect_header, chan, i, 0, buf);
-            buf += dv_write_pack((c->sys->dsf ? dv_header625 : dv_header525), c, buf);
-            buf += 72; /* unused bytes */
-
-            /* DV subcode: 2DIFs */
-            for (j = 0; j < 2; j++) {
-                buf += dv_write_dif_id(dv_sect_subcode, chan, i, j, buf);
-                for (k = 0; k < 6; k++)
-                     buf += dv_write_ssyb_id(k, (i < c->sys->difseg_size/2), buf) + 5;
-                buf += 29; /* unused bytes */
-            }
-
-            /* DV VAUX: 3DIFS */
-            for (j = 0; j < 3; j++) {
-                buf += dv_write_dif_id(dv_sect_vaux, chan, i, j, buf);
-                buf += dv_write_pack(dv_video_source,  c, buf);
-                buf += dv_write_pack(dv_video_control, c, buf);
-                buf += 7*5;
-                buf += dv_write_pack(dv_video_source,  c, buf);
-                buf += dv_write_pack(dv_video_control, c, buf);
-                buf += 4*5 + 2; /* unused bytes */
-            }
-
-            /* DV Audio/Video: 135 Video DIFs + 9 Audio DIFs */
-            for (j = 0; j < 135; j++) {
-                if (j%15 == 0) {
-                    memset(buf, 0xff, 80);
-                    buf += dv_write_dif_id(dv_sect_audio, chan, i, j/15, buf);
-                    buf += 77; /* audio control & shuffled PCM audio */
-                }
-                buf += dv_write_dif_id(dv_sect_video, chan, i, j, buf);
-                buf += 77; /* 1 video macroblock: 1 bytes control
-                              4 * 14 bytes Y 8x8 data
-                              10 bytes Cr 8x8 data
-                              10 bytes Cb 8x8 data */
-            }
-        }
-    }
-}
-
-
-static int dvvideo_encode_frame(AVCodecContext *c, AVPacket *pkt,
-                                const AVFrame *frame, int *got_packet)
-{
-    DVVideoContext *s = c->priv_data;
-    int ret;
-
-    s->sys = avpriv_dv_codec_profile(c);
-    if (!s->sys || ff_dv_init_dynamic_tables(s->sys))
-        return -1;
-    if ((ret = ff_alloc_packet2(c, pkt, s->sys->frame_size)) < 0)
-        return ret;
-
-    c->pix_fmt           = s->sys->pix_fmt;
-    s->picture           = *frame;
-    s->picture.key_frame = 1;
-    s->picture.pict_type = AV_PICTURE_TYPE_I;
-
-    s->buf = pkt->data;
-    c->execute(c, dv_encode_video_segment, s->sys->work_chunks, NULL,
-               dv_work_pool_size(s->sys), sizeof(DVwork_chunk));
-
-    emms_c();
-
-    dv_format_frame(s, pkt->data);
-
-    pkt->flags |= AV_PKT_FLAG_KEY;
-    *got_packet = 1;
-
-    return 0;
-}
-
-AVCodec ff_dvvideo_encoder = {
-    .name           = "dvvideo",
-    .long_name      = NULL_IF_CONFIG_SMALL("DV (Digital Video)"),
-    .type           = AVMEDIA_TYPE_VIDEO,
-    .id             = AV_CODEC_ID_DVVIDEO,
-    .priv_data_size = sizeof(DVVideoContext),
-    .init           = dvvideo_init_encoder,
-    .encode2        = dvvideo_encode_frame,
-    .capabilities   = CODEC_CAP_SLICE_THREADS,
-    .pix_fmts       = (const enum AVPixelFormat[]) {
-        AV_PIX_FMT_YUV411P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE
-    },
-};
-#endif // CONFIG_DVVIDEO_ENCODER

omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/dv.h Added

@@ -0,0 +1,115 @@
+/*
+ * Constants for DV codec
+ * Copyright (c) 2002 Fabrice Bellard
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * Constants for DV codec.
+ */
+
+#ifndef AVCODEC_DV_H
+#define AVCODEC_DV_H
+
+#include "avcodec.h"
+#include "dsputil.h"
+#include "get_bits.h"
+#include "dv_profile.h"
+
+typedef struct DVVideoContext {
+    const DVprofile *sys;
+    AVFrame         *frame;
+    AVCodecContext  *avctx;
+    uint8_t         *buf;
+
+    uint8_t  dv_zigzag[2][64];
+
+    void (*get_pixels)(int16_t *block, const uint8_t *pixels, int line_size);
+    void (*fdct[2])(int16_t *block);
+    void (*idct_put[2])(uint8_t *dest, int line_size, int16_t *block);
+    me_cmp_func ildct_cmp;
+} DVVideoContext;
+
+enum dv_section_type {
+     dv_sect_header  = 0x1f,
+     dv_sect_subcode = 0x3f,
+     dv_sect_vaux    = 0x56,
+     dv_sect_audio   = 0x76,
+     dv_sect_video   = 0x96,
+};
+
+enum dv_pack_type {
+     dv_header525     = 0x3f, /* see dv_write_pack for important details on */
+     dv_header625     = 0xbf, /* these two packs */
+     dv_timecode      = 0x13,
+     dv_audio_source  = 0x50,
+     dv_audio_control = 0x51,
+     dv_audio_recdate = 0x52,
+     dv_audio_rectime = 0x53,
+     dv_video_source  = 0x60,
+     dv_video_control = 0x61,
+     dv_video_recdate = 0x62,
+     dv_video_rectime = 0x63,
+     dv_unknown_pack  = 0xff,
+};
+
+#define DV_PROFILE_IS_HD(p) ((p)->video_stype & 0x10)
+#define DV_PROFILE_IS_1080i50(p) (((p)->video_stype == 0x14) && ((p)->dsf == 1))
+#define DV_PROFILE_IS_720p50(p)  (((p)->video_stype == 0x18) && ((p)->dsf == 1))
+
+
+/**
+ * largest possible DV frame, in bytes (1080i50)
+ */
+#define DV_MAX_FRAME_SIZE 576000
+
+/**
+ * maximum number of blocks per macroblock in any DV format
+ */
+#define DV_MAX_BPM 8
+
+#define TEX_VLC_BITS 9
+
+extern RL_VLC_ELEM ff_dv_rl_vlc[1184];
+
+int ff_dv_init_dynamic_tables(const DVprofile *d);
+int ff_dvvideo_init(AVCodecContext *avctx);
+
+static inline int dv_work_pool_size(const DVprofile *d)
+{
+    int size = d->n_difchan*d->difseg_size*27;
+    if (DV_PROFILE_IS_1080i50(d))
+        size -= 3*27;
+    if (DV_PROFILE_IS_720p50(d))
+        size -= 4*27;
+    return size;
+}
+
+static inline void dv_calculate_mb_xy(DVVideoContext *s, DVwork_chunk *work_chunk, int m, int *mb_x, int *mb_y)
+{
+     *mb_x = work_chunk->mb_coordinates[m] & 0xff;
+     *mb_y = work_chunk->mb_coordinates[m] >> 8;
+
+     /* We work with 720p frames split in half. The odd half-frame (chan==2,3) is displaced :-( */
+     if (s->sys->height == 720 && !(s->buf[1]&0x0C)) {
+         *mb_y -= (*mb_y>17)?18:-72; /* shifting the Y coordinate down by 72/2 macro blocks */
+     }
+}
+
+#endif /* AVCODEC_DV_H */

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/dv_tablegen.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/dv_tablegen.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/dv_tablegen.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/dv_tablegen.h Changed

@@ -25,7 +25,7 @@
 
 #include <stdint.h>
 
-#include "dv_vlc_data.h"
+#include "dvdata.h"
 
 #if CONFIG_SMALL
 #define DV_VLC_MAP_RUN_SIZE 15
@@ -51,20 +51,20 @@
 {
     int i, j;
     for (i = 0; i < NB_DV_VLC - 1; i++) {
-       if (dv_vlc_run[i] >= DV_VLC_MAP_RUN_SIZE)
+       if (ff_dv_vlc_run[i] >= DV_VLC_MAP_RUN_SIZE)
            continue;
 #if CONFIG_SMALL
-       if (dv_vlc_level[i] >= DV_VLC_MAP_LEV_SIZE)
+       if (ff_dv_vlc_level[i] >= DV_VLC_MAP_LEV_SIZE)
            continue;
 #endif
 
-       if (dv_vlc_map[dv_vlc_run[i]][dv_vlc_level[i]].size != 0)
+       if (dv_vlc_map[ff_dv_vlc_run[i]][ff_dv_vlc_level[i]].size != 0)
            continue;
 
-       dv_vlc_map[dv_vlc_run[i]][dv_vlc_level[i]].vlc  =
-           dv_vlc_bits[i] << (!!dv_vlc_level[i]);
-       dv_vlc_map[dv_vlc_run[i]][dv_vlc_level[i]].size =
-           dv_vlc_len[i] + (!!dv_vlc_level[i]);
+       dv_vlc_map[ff_dv_vlc_run[i]][ff_dv_vlc_level[i]].vlc  =
+           ff_dv_vlc_bits[i] << (!!ff_dv_vlc_level[i]);
+       dv_vlc_map[ff_dv_vlc_run[i]][ff_dv_vlc_level[i]].size =
+           ff_dv_vlc_len[i] + (!!ff_dv_vlc_level[i]);
     }
     for (i = 0; i < DV_VLC_MAP_RUN_SIZE; i++) {
 #if CONFIG_SMALL

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/dvbsub.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/dvbsub.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/dvbsubdec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/dvbsubdec.c Changed

@@ -34,8 +34,6 @@
 #define cm (ff_cropTbl + MAX_NEG_CROP)
 
 #ifdef DEBUG
-#undef fprintf
-#undef perror
 #if 0
 static void png_save(const char *filename, uint8_t *bitmap, int w, int h,
                      uint32_t *rgba_palette)
@@ -238,7 +236,6 @@
     DVBSubCLUT   *clut_list;
     DVBSubObject *object_list;
 
-    int display_list_size;
     DVBSubRegionDisplay *display_list;
     DVBSubDisplayDefinition *display_definition;
 } DVBSubContext;
@@ -370,11 +367,15 @@
     int i, r, g, b, a = 0;
     DVBSubContext *ctx = avctx->priv_data;
 
-    if (!avctx->extradata || avctx->extradata_size != 4) {
-        av_log(avctx, AV_LOG_WARNING, "Invalid extradata, subtitle streams may be combined!\n");
+    if (!avctx->extradata || (avctx->extradata_size < 4) || ((avctx->extradata_size % 5 != 0) && (avctx->extradata_size != 4))) {
+        av_log(avctx, AV_LOG_WARNING, "Invalid DVB subtitles stream extradata!\n");
         ctx->composition_id = -1;
         ctx->ancillary_id   = -1;
     } else {
+        if (avctx->extradata_size > 5) {
+            av_log(avctx, AV_LOG_WARNING, "Decoding first DVB subtitles sub-stream\n");
+        }
+
         ctx->composition_id = AV_RB16(avctx->extradata);
         ctx->ancillary_id   = AV_RB16(avctx->extradata + 2);
     }
@@ -1181,7 +1182,6 @@
 
     tmp_display_list = ctx->display_list;
     ctx->display_list = NULL;
-    ctx->display_list_size = 0;
 
     while (buf + 5 < buf_end) {
         region_id = *buf++;
@@ -1209,7 +1209,6 @@
 
         display->next = ctx->display_list;
         ctx->display_list = display;
-        ctx->display_list_size++;
 
         av_dlog(avctx, "Region %d, (%d,%d)\n", region_id, display->x_pos, display->y_pos);
     }
@@ -1359,8 +1358,8 @@
 
     if (info_byte & 1<<3) { // display_window_flag
         display_def->x = bytestream_get_be16(&buf);
-        display_def->y = bytestream_get_be16(&buf);
         display_def->width  = bytestream_get_be16(&buf) - display_def->x + 1;
+        display_def->y = bytestream_get_be16(&buf);
         display_def->height = bytestream_get_be16(&buf) - display_def->y + 1;
     }
 }
@@ -1386,7 +1385,13 @@
         offset_y = display_def->y;
     }
 
-    sub->num_rects = ctx->display_list_size;
+    sub->num_rects = 0;
+    for (display = ctx->display_list; display; display = display->next)
+    {
+        region = get_region(ctx, display->region_id);
+        if (region && region->dirty)
+            sub->num_rects++;
+    }
 
     if (sub->num_rects > 0){
         sub->rects = av_mallocz(sizeof(*sub->rects) * sub->num_rects);
@@ -1439,8 +1444,6 @@
 
         i++;
     }
-
-    sub->num_rects = i;
     }
 #ifdef DEBUG
     save_display_set(ctx);

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/dvdata.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/dvdata.c Changed

@@ -24,7 +24,8 @@
  * Constants for DV codec.
  */
 
-#include "avcodec.h"
+#include <stdint.h>
+
 #include "dvdata.h"
 
 /* unquant tables (not used directly) */
@@ -120,3 +121,227 @@
     394, 406, 418, 438, 418, 464, 464, 492,
 };
 
+/*
+ * There's a catch about the following three tables: the mapping they establish
+ * between (run, level) and vlc is not 1-1. So you have to watch out for that
+ * when building misc. tables. E.g. (1, 0) can be either 0x7cf or 0x1f82.
+ */
+const uint16_t ff_dv_vlc_bits[NB_DV_VLC] = {
+ 0x0000, 0x0002, 0x0007, 0x0008, 0x0009, 0x0014, 0x0015, 0x0016,
+ 0x0017, 0x0030, 0x0031, 0x0032, 0x0033, 0x0068, 0x0069, 0x006a,
+ 0x006b, 0x006c, 0x006d, 0x006e, 0x006f, 0x00e0, 0x00e1, 0x00e2,
+ 0x00e3, 0x00e4, 0x00e5, 0x00e6, 0x00e7, 0x00e8, 0x00e9, 0x00ea,
+ 0x00eb, 0x00ec, 0x00ed, 0x00ee, 0x00ef, 0x01e0, 0x01e1, 0x01e2,
+ 0x01e3, 0x01e4, 0x01e5, 0x01e6, 0x01e7, 0x01e8, 0x01e9, 0x01ea,
+ 0x01eb, 0x01ec, 0x01ed, 0x01ee, 0x01ef, 0x03e0, 0x03e1, 0x03e2,
+ 0x03e3, 0x03e4, 0x03e5, 0x03e6, 0x07ce, 0x07cf, 0x07d0, 0x07d1,
+ 0x07d2, 0x07d3, 0x07d4, 0x07d5, 0x0fac, 0x0fad, 0x0fae, 0x0faf,
+ 0x0fb0, 0x0fb1, 0x0fb2, 0x0fb3, 0x0fb4, 0x0fb5, 0x0fb6, 0x0fb7,
+ 0x0fb8, 0x0fb9, 0x0fba, 0x0fbb, 0x0fbc, 0x0fbd, 0x0fbe, 0x0fbf,
+ 0x1f80, 0x1f81, 0x1f82, 0x1f83, 0x1f84, 0x1f85, 0x1f86, 0x1f87,
+ 0x1f88, 0x1f89, 0x1f8a, 0x1f8b, 0x1f8c, 0x1f8d, 0x1f8e, 0x1f8f,
+ 0x1f90, 0x1f91, 0x1f92, 0x1f93, 0x1f94, 0x1f95, 0x1f96, 0x1f97,
+ 0x1f98, 0x1f99, 0x1f9a, 0x1f9b, 0x1f9c, 0x1f9d, 0x1f9e, 0x1f9f,
+ 0x1fa0, 0x1fa1, 0x1fa2, 0x1fa3, 0x1fa4, 0x1fa5, 0x1fa6, 0x1fa7,
+ 0x1fa8, 0x1fa9, 0x1faa, 0x1fab, 0x1fac, 0x1fad, 0x1fae, 0x1faf,
+ 0x1fb0, 0x1fb1, 0x1fb2, 0x1fb3, 0x1fb4, 0x1fb5, 0x1fb6, 0x1fb7,
+ 0x1fb8, 0x1fb9, 0x1fba, 0x1fbb, 0x1fbc, 0x1fbd, 0x1fbe, 0x1fbf,
+ 0x7f00, 0x7f01, 0x7f02, 0x7f03, 0x7f04, 0x7f05, 0x7f06, 0x7f07,
+ 0x7f08, 0x7f09, 0x7f0a, 0x7f0b, 0x7f0c, 0x7f0d, 0x7f0e, 0x7f0f,
+ 0x7f10, 0x7f11, 0x7f12, 0x7f13, 0x7f14, 0x7f15, 0x7f16, 0x7f17,
+ 0x7f18, 0x7f19, 0x7f1a, 0x7f1b, 0x7f1c, 0x7f1d, 0x7f1e, 0x7f1f,
+ 0x7f20, 0x7f21, 0x7f22, 0x7f23, 0x7f24, 0x7f25, 0x7f26, 0x7f27,
+ 0x7f28, 0x7f29, 0x7f2a, 0x7f2b, 0x7f2c, 0x7f2d, 0x7f2e, 0x7f2f,
+ 0x7f30, 0x7f31, 0x7f32, 0x7f33, 0x7f34, 0x7f35, 0x7f36, 0x7f37,
+ 0x7f38, 0x7f39, 0x7f3a, 0x7f3b, 0x7f3c, 0x7f3d, 0x7f3e, 0x7f3f,
+ 0x7f40, 0x7f41, 0x7f42, 0x7f43, 0x7f44, 0x7f45, 0x7f46, 0x7f47,
+ 0x7f48, 0x7f49, 0x7f4a, 0x7f4b, 0x7f4c, 0x7f4d, 0x7f4e, 0x7f4f,
+ 0x7f50, 0x7f51, 0x7f52, 0x7f53, 0x7f54, 0x7f55, 0x7f56, 0x7f57,
+ 0x7f58, 0x7f59, 0x7f5a, 0x7f5b, 0x7f5c, 0x7f5d, 0x7f5e, 0x7f5f,
+ 0x7f60, 0x7f61, 0x7f62, 0x7f63, 0x7f64, 0x7f65, 0x7f66, 0x7f67,
+ 0x7f68, 0x7f69, 0x7f6a, 0x7f6b, 0x7f6c, 0x7f6d, 0x7f6e, 0x7f6f,
+ 0x7f70, 0x7f71, 0x7f72, 0x7f73, 0x7f74, 0x7f75, 0x7f76, 0x7f77,
+ 0x7f78, 0x7f79, 0x7f7a, 0x7f7b, 0x7f7c, 0x7f7d, 0x7f7e, 0x7f7f,
+ 0x7f80, 0x7f81, 0x7f82, 0x7f83, 0x7f84, 0x7f85, 0x7f86, 0x7f87,
+ 0x7f88, 0x7f89, 0x7f8a, 0x7f8b, 0x7f8c, 0x7f8d, 0x7f8e, 0x7f8f,
+ 0x7f90, 0x7f91, 0x7f92, 0x7f93, 0x7f94, 0x7f95, 0x7f96, 0x7f97,
+ 0x7f98, 0x7f99, 0x7f9a, 0x7f9b, 0x7f9c, 0x7f9d, 0x7f9e, 0x7f9f,
+ 0x7fa0, 0x7fa1, 0x7fa2, 0x7fa3, 0x7fa4, 0x7fa5, 0x7fa6, 0x7fa7,
+ 0x7fa8, 0x7fa9, 0x7faa, 0x7fab, 0x7fac, 0x7fad, 0x7fae, 0x7faf,
+ 0x7fb0, 0x7fb1, 0x7fb2, 0x7fb3, 0x7fb4, 0x7fb5, 0x7fb6, 0x7fb7,
+ 0x7fb8, 0x7fb9, 0x7fba, 0x7fbb, 0x7fbc, 0x7fbd, 0x7fbe, 0x7fbf,
+ 0x7fc0, 0x7fc1, 0x7fc2, 0x7fc3, 0x7fc4, 0x7fc5, 0x7fc6, 0x7fc7,
+ 0x7fc8, 0x7fc9, 0x7fca, 0x7fcb, 0x7fcc, 0x7fcd, 0x7fce, 0x7fcf,
+ 0x7fd0, 0x7fd1, 0x7fd2, 0x7fd3, 0x7fd4, 0x7fd5, 0x7fd6, 0x7fd7,
+ 0x7fd8, 0x7fd9, 0x7fda, 0x7fdb, 0x7fdc, 0x7fdd, 0x7fde, 0x7fdf,
+ 0x7fe0, 0x7fe1, 0x7fe2, 0x7fe3, 0x7fe4, 0x7fe5, 0x7fe6, 0x7fe7,
+ 0x7fe8, 0x7fe9, 0x7fea, 0x7feb, 0x7fec, 0x7fed, 0x7fee, 0x7fef,
+ 0x7ff0, 0x7ff1, 0x7ff2, 0x7ff3, 0x7ff4, 0x7ff5, 0x7ff6, 0x7ff7,
+ 0x7ff8, 0x7ff9, 0x7ffa, 0x7ffb, 0x7ffc, 0x7ffd, 0x7ffe, 0x7fff,
+ 0x0006,
+};
+
+const uint8_t ff_dv_vlc_len[NB_DV_VLC] = {
+  2,  3,  4,  4,  4,  5,  5,  5,
+  5,  6,  6,  6,  6,  7,  7,  7,
+  7,  7,  7,  7,  7,  8,  8,  8,
+  8,  8,  8,  8,  8,  8,  8,  8,
+  8,  8,  8,  8,  8,  9,  9,  9,
+  9,  9,  9,  9,  9,  9,  9,  9,
+  9,  9,  9,  9,  9, 10, 10, 10,
+ 10, 10, 10, 10, 11, 11, 11, 11,
+ 11, 11, 11, 11, 12, 12, 12, 12,
+ 12, 12, 12, 12, 12, 12, 12, 12,
+ 12, 12, 12, 12, 12, 12, 12, 12,
+ 13, 13, 13, 13, 13, 13, 13, 13,
+ 13, 13, 13, 13, 13, 13, 13, 13,
+ 13, 13, 13, 13, 13, 13, 13, 13,
+ 13, 13, 13, 13, 13, 13, 13, 13,
+ 13, 13, 13, 13, 13, 13, 13, 13,
+ 13, 13, 13, 13, 13, 13, 13, 13,
+ 13, 13, 13, 13, 13, 13, 13, 13,
+ 13, 13, 13, 13, 13, 13, 13, 13,
+ 15, 15, 15, 15, 15, 15, 15, 15,
+ 15, 15, 15, 15, 15, 15, 15, 15,
+ 15, 15, 15, 15, 15, 15, 15, 15,
+ 15, 15, 15, 15, 15, 15, 15, 15,
+ 15, 15, 15, 15, 15, 15, 15, 15,
+ 15, 15, 15, 15, 15, 15, 15, 15,
+ 15, 15, 15, 15, 15, 15, 15, 15,
+ 15, 15, 15, 15, 15, 15, 15, 15,
+ 15, 15, 15, 15, 15, 15, 15, 15,
+ 15, 15, 15, 15, 15, 15, 15, 15,
+ 15, 15, 15, 15, 15, 15, 15, 15,
+ 15, 15, 15, 15, 15, 15, 15, 15,
+ 15, 15, 15, 15, 15, 15, 15, 15,
+ 15, 15, 15, 15, 15, 15, 15, 15,
+ 15, 15, 15, 15, 15, 15, 15, 15,
+ 15, 15, 15, 15, 15, 15, 15, 15,
+ 15, 15, 15, 15, 15, 15, 15, 15,
+ 15, 15, 15, 15, 15, 15, 15, 15,
+ 15, 15, 15, 15, 15, 15, 15, 15,
+ 15, 15, 15, 15, 15, 15, 15, 15,
+ 15, 15, 15, 15, 15, 15, 15, 15,
+ 15, 15, 15, 15, 15, 15, 15, 15,
+ 15, 15, 15, 15, 15, 15, 15, 15,
+ 15, 15, 15, 15, 15, 15, 15, 15,
+ 15, 15, 15, 15, 15, 15, 15, 15,
+ 15, 15, 15, 15, 15, 15, 15, 15,
+ 15, 15, 15, 15, 15, 15, 15, 15,
+ 15, 15, 15, 15, 15, 15, 15, 15,
+ 15, 15, 15, 15, 15, 15, 15, 15,
+ 15, 15, 15, 15, 15, 15, 15, 15,
+ 15, 15, 15, 15, 15, 15, 15, 15,
+ 15, 15, 15, 15, 15, 15, 15, 15,
+  4,
+};
+
+const uint8_t ff_dv_vlc_run[NB_DV_VLC] = {
+  0,  0,  1,  0,  0,  2,  1,  0,
+  0,  3,  4,  0,  0,  5,  6,  2,
+  1,  1,  0,  0,  0,  7,  8,  9,
+ 10,  3,  4,  2,  1,  1,  1,  0,
+  0,  0,  0,  0,  0, 11, 12, 13,
+ 14,  5,  6,  3,  4,  2,  2,  1,
+  0,  0,  0,  0,  0,  5,  3,  3,
+  2,  1,  1,  1,  0,  1,  6,  4,
+  3,  1,  1,  1,  2,  3,  4,  5,
+  7,  8,  9, 10,  7,  8,  4,  3,
+  2,  2,  2,  2,  2,  1,  1,  1,
+  0,  1,  2,  3,  4,  5,  6,  7,
+  8,  9, 10, 11, 12, 13, 14, 15,
+ 16, 17, 18, 19, 20, 21, 22, 23,
+ 24, 25, 26, 27, 28, 29, 30, 31,
+ 32, 33, 34, 35, 36, 37, 38, 39,
+ 40, 41, 42, 43, 44, 45, 46, 47,
+ 48, 49, 50, 51, 52, 53, 54, 55,
+ 56, 57, 58, 59, 60, 61, 62, 63,
+  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,
+127,
+};
+
+const uint8_t ff_dv_vlc_level[NB_DV_VLC] = {
+   1,   2,   1,   3,   4,   1,   2,   5,
+   6,   1,   1,   7,   8,   1,   1,   2,
+   3,   4,   9,  10,  11,   1,   1,   1,
+   1,   2,   2,   3,   5,   6,   7,  12,
+  13,  14,  15,  16,  17,   1,   1,   1,
+   1,   2,   2,   3,   3,   4,   5,   8,
+  18,  19,  20,  21,  22,   3,   4,   5,
+   6,   9,  10,  11,   0,   0,   3,   4,
+   6,  12,  13,  14,   0,   0,   0,   0,
+   2,   2,   2,   2,   3,   3,   5,   7,
+   7,   8,   9,  10,  11,  15,  16,  17,
+   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   0,   0,   0,   0,   0,   0,   0,
+   0,   1,   2,   3,   4,   5,   6,   7,
+   8,   9,  10,  11,  12,  13,  14,  15,
+  16,  17,  18,  19,  20,  21,  22,  23,
+  24,  25,  26,  27,  28,  29,  30,  31,
+  32,  33,  34,  35,  36,  37,  38,  39,
+  40,  41,  42,  43,  44,  45,  46,  47,
+  48,  49,  50,  51,  52,  53,  54,  55,
+  56,  57,  58,  59,  60,  61,  62,  63,
+  64,  65,  66,  67,  68,  69,  70,  71,
+  72,  73,  74,  75,  76,  77,  78,  79,
+  80,  81,  82,  83,  84,  85,  86,  87,
+  88,  89,  90,  91,  92,  93,  94,  95,
+  96,  97,  98,  99, 100, 101, 102, 103,
+ 104, 105, 106, 107, 108, 109, 110, 111,
+ 112, 113, 114, 115, 116, 117, 118, 119,
+ 120, 121, 122, 123, 124, 125, 126, 127,
+ 128, 129, 130, 131, 132, 133, 134, 135,
+ 136, 137, 138, 139, 140, 141, 142, 143,
+ 144, 145, 146, 147, 148, 149, 150, 151,
+ 152, 153, 154, 155, 156, 157, 158, 159,
+ 160, 161, 162, 163, 164, 165, 166, 167,
+ 168, 169, 170, 171, 172, 173, 174, 175,
+ 176, 177, 178, 179, 180, 181, 182, 183,
+ 184, 185, 186, 187, 188, 189, 190, 191,
+ 192, 193, 194, 195, 196, 197, 198, 199,
+ 200, 201, 202, 203, 204, 205, 206, 207,
+ 208, 209, 210, 211, 212, 213, 214, 215,
+ 216, 217, 218, 219, 220, 221, 222, 223,
+ 224, 225, 226, 227, 228, 229, 230, 231,
+ 232, 233, 234, 235, 236, 237, 238, 239,
+ 240, 241, 242, 243, 244, 245, 246, 247,
+ 248, 249, 250, 251, 252, 253, 254, 255,
+   0,
+};

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/dvdata.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/dvdata.h Changed

@@ -1,7 +1,4 @@
 /*
- * Constants for DV codec
- * Copyright (c) 2002 Fabrice Bellard
- *
  * This file is part of FFmpeg.
  *
  * FFmpeg is free software; you can redistribute it and/or
@@ -19,55 +16,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-/**
- * @file
- * Constants for DV codec.
- */
-
 #ifndef AVCODEC_DVDATA_H
 #define AVCODEC_DVDATA_H
 
-#include "avcodec.h"
-#include "dsputil.h"
-#include "get_bits.h"
-#include "dv_profile.h"
-
-typedef struct DVVideoContext {
-    const DVprofile *sys;
-    AVFrame          picture;
-    AVCodecContext  *avctx;
-    uint8_t         *buf;
-
-    uint8_t  dv_zigzag[2][64];
-
-    void (*get_pixels)(int16_t *block, const uint8_t *pixels, int line_size);
-    void (*fdct[2])(int16_t *block);
-    void (*idct_put[2])(uint8_t *dest, int line_size, int16_t *block);
-    me_cmp_func ildct_cmp;
-} DVVideoContext;
-
-enum dv_section_type {
-     dv_sect_header  = 0x1f,
-     dv_sect_subcode = 0x3f,
-     dv_sect_vaux    = 0x56,
-     dv_sect_audio   = 0x76,
-     dv_sect_video   = 0x96,
-};
-
-enum dv_pack_type {
-     dv_header525     = 0x3f, /* see dv_write_pack for important details on */
-     dv_header625     = 0xbf, /* these two packs */
-     dv_timecode      = 0x13,
-     dv_audio_source  = 0x50,
-     dv_audio_control = 0x51,
-     dv_audio_recdate = 0x52,
-     dv_audio_rectime = 0x53,
-     dv_video_source  = 0x60,
-     dv_video_control = 0x61,
-     dv_video_recdate = 0x62,
-     dv_video_rectime = 0x63,
-     dv_unknown_pack  = 0xff,
-};
+#include <stdint.h>
 
 extern const uint8_t ff_dv_quant_shifts[22][4];
 extern const uint8_t ff_dv_quant_offset[4];
@@ -79,46 +31,11 @@
 extern const int ff_dv_iweight_720_y[64];
 extern const int ff_dv_iweight_720_c[64];
 
-#define DV_PROFILE_IS_HD(p) ((p)->video_stype & 0x10)
-#define DV_PROFILE_IS_1080i50(p) (((p)->video_stype == 0x14) && ((p)->dsf == 1))
-#define DV_PROFILE_IS_720p50(p)  (((p)->video_stype == 0x18) && ((p)->dsf == 1))
-
-/**
- * largest possible DV frame, in bytes (1080i50)
- */
-#define DV_MAX_FRAME_SIZE 576000
-
-/**
- * maximum number of blocks per macroblock in any DV format
- */
-#define DV_MAX_BPM 8
-
-#define TEX_VLC_BITS 9
-
-extern RL_VLC_ELEM ff_dv_rl_vlc[1184];
-
-int ff_dv_init_dynamic_tables(const DVprofile *d);
-int ff_dvvideo_init(AVCodecContext *avctx);
-
-static inline int dv_work_pool_size(const DVprofile *d)
-{
-    int size = d->n_difchan*d->difseg_size*27;
-    if (DV_PROFILE_IS_1080i50(d))
-        size -= 3*27;
-    if (DV_PROFILE_IS_720p50(d))
-        size -= 4*27;
-    return size;
-}
-
-static inline void dv_calculate_mb_xy(DVVideoContext *s, DVwork_chunk *work_chunk, int m, int *mb_x, int *mb_y)
-{
-     *mb_x = work_chunk->mb_coordinates[m] & 0xff;
-     *mb_y = work_chunk->mb_coordinates[m] >> 8;
+#define NB_DV_VLC 409
 
-     /* We work with 720p frames split in half. The odd half-frame (chan==2,3) is displaced :-( */
-     if (s->sys->height == 720 && !(s->buf[1]&0x0C)) {
-         *mb_y -= (*mb_y>17)?18:-72; /* shifting the Y coordinate down by 72/2 macro blocks */
-     }
-}
+extern const uint16_t ff_dv_vlc_bits[NB_DV_VLC];
+extern const uint8_t ff_dv_vlc_len[NB_DV_VLC];
+extern const uint8_t ff_dv_vlc_run[NB_DV_VLC];
+extern const uint8_t ff_dv_vlc_level[NB_DV_VLC];
 
 #endif /* AVCODEC_DVDATA_H */

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/dvdec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/dvdec.c Changed

@@ -44,6 +44,7 @@
 #include "put_bits.h"
 #include "simple_idct.h"
 #include "dvdata.h"
+#include "dv.h"
 
 typedef struct BlockInfo {
     const uint32_t *factor_table;
@@ -237,7 +238,7 @@
     flush_put_bits(&vs_pb);
     for (mb_index = 0; mb_index < 5; mb_index++) {
         for (j = 0; j < s->sys->bpm; j++) {
-            if (mb->pos < 64) {
+            if (mb->pos < 64 && get_bits_left(&gb) > 0) {
                 av_dlog(avctx, "start %d:%d\n", mb_index, j);
                 dv_decode_ac(&gb, mb, block);
             }
@@ -258,12 +259,12 @@
         if ((s->sys->pix_fmt == AV_PIX_FMT_YUV420P) ||
             (s->sys->pix_fmt == AV_PIX_FMT_YUV411P && mb_x >= (704 / 8)) ||
             (s->sys->height >= 720 && mb_y != 134)) {
-            y_stride = (s->picture.linesize[0] << ((!is_field_mode[mb_index]) * log2_blocksize));
+            y_stride = (s->frame->linesize[0] << ((!is_field_mode[mb_index]) * log2_blocksize));
         } else {
             y_stride = (2 << log2_blocksize);
         }
-        y_ptr = s->picture.data[0] + ((mb_y * s->picture.linesize[0] + mb_x) << log2_blocksize);
-        linesize = s->picture.linesize[0] << is_field_mode[mb_index];
+        y_ptr = s->frame->data[0] + ((mb_y * s->frame->linesize[0] + mb_x) << log2_blocksize);
+        linesize = s->frame->linesize[0] << is_field_mode[mb_index];
         mb[0]    .idct_put(y_ptr                                   , linesize, block + 0*64);
         if (s->sys->video_stype == 4) { /* SD 422 */
             mb[2].idct_put(y_ptr + (1 << log2_blocksize)           , linesize, block + 2*64);
@@ -276,19 +277,19 @@
         block += 4*64;
 
         /* idct_put'ting chrominance */
-        c_offset = (((mb_y >>  (s->sys->pix_fmt == AV_PIX_FMT_YUV420P)) * s->picture.linesize[1] +
+        c_offset = (((mb_y >>  (s->sys->pix_fmt == AV_PIX_FMT_YUV420P)) * s->frame->linesize[1] +
                      (mb_x >> ((s->sys->pix_fmt == AV_PIX_FMT_YUV411P) ? 2 : 1))) << log2_blocksize);
         for (j = 2; j; j--) {
-            uint8_t *c_ptr = s->picture.data[j] + c_offset;
+            uint8_t *c_ptr = s->frame->data[j] + c_offset;
             if (s->sys->pix_fmt == AV_PIX_FMT_YUV411P && mb_x >= (704 / 8)) {
                   uint64_t aligned_pixels[64/8];
                   uint8_t *pixels = (uint8_t*)aligned_pixels;
                   uint8_t *c_ptr1, *ptr1;
                   int x, y;
                   mb->idct_put(pixels, 8, block);
-                  for (y = 0; y < (1 << log2_blocksize); y++, c_ptr += s->picture.linesize[j], pixels += 8) {
+                  for (y = 0; y < (1 << log2_blocksize); y++, c_ptr += s->frame->linesize[j], pixels += 8) {
                       ptr1   = pixels + ((1 << (log2_blocksize))>>1);
-                      c_ptr1 = c_ptr + (s->picture.linesize[j] << log2_blocksize);
+                      c_ptr1 = c_ptr + (s->frame->linesize[j] << log2_blocksize);
                       for (x = 0; x < (1 << FFMAX(log2_blocksize - 1, 0)); x++) {
                           c_ptr[x]  = pixels[x];
                           c_ptr1[x] = ptr1[x];
@@ -297,8 +298,8 @@
                   block += 64; mb++;
             } else {
                   y_stride = (mb_y == 134) ? (1 << log2_blocksize) :
-                                             s->picture.linesize[j] << ((!is_field_mode[mb_index]) * log2_blocksize);
-                  linesize = s->picture.linesize[j] << is_field_mode[mb_index];
+                                             s->frame->linesize[j] << ((!is_field_mode[mb_index]) * log2_blocksize);
+                  linesize = s->frame->linesize[j] << is_field_mode[mb_index];
                   (mb++)->    idct_put(c_ptr           , linesize, block); block += 64;
                   if (s->sys->bpm == 8) {
                       (mb++)->idct_put(c_ptr + y_stride, linesize, block); block += 64;
@@ -319,7 +320,7 @@
     int buf_size = avpkt->size;
     DVVideoContext *s = avctx->priv_data;
     const uint8_t* vsc_pack;
-    int ret, apt, is16_9;
+    int apt, is16_9, ret;
 
     s->sys = avpriv_dv_frame_profile2(avctx, s->sys, buf, buf_size);
     if (!s->sys || buf_size < s->sys->frame_size || ff_dv_init_dynamic_tables(s->sys)) {
@@ -327,15 +328,20 @@
         return -1; /* NOTE: we only accept several full frames */
     }
 
-    s->picture.key_frame = 1;
-    s->picture.pict_type = AV_PICTURE_TYPE_I;
+    s->frame            = data;
+    s->frame->key_frame = 1;
+    s->frame->pict_type = AV_PICTURE_TYPE_I;
     avctx->pix_fmt   = s->sys->pix_fmt;
     avctx->time_base = s->sys->time_base;
-    avcodec_set_dimensions(avctx, s->sys->width, s->sys->height);
-    if ((ret = ff_get_buffer(avctx, &s->picture, 0)) < 0)
+
+    ret = ff_set_dimensions(avctx, s->sys->width, s->sys->height);
+    if (ret < 0)
         return ret;
-    s->picture.interlaced_frame = 1;
-    s->picture.top_field_first  = 0;
+
+    if ((ret = ff_get_buffer(avctx, s->frame, 0)) < 0)
+        return ret;
+    s->frame->interlaced_frame = 1;
+    s->frame->top_field_first  = 0;
 
     /* Determine the codec's sample_aspect ratio and field order from the packet */
     vsc_pack = buf + 80*5 + 48 + 5;
@@ -343,7 +349,7 @@
         apt = buf[4] & 0x07;
         is16_9 = (vsc_pack[2] & 0x07) == 0x02 || (!apt && (vsc_pack[2] & 0x07) == 0x07);
         avctx->sample_aspect_ratio = s->sys->sar[is16_9];
-        s->picture.top_field_first = !(vsc_pack[3] & 0x40);
+        s->frame->top_field_first = !(vsc_pack[3] & 0x40);
     }
 
     s->buf = buf;
@@ -354,20 +360,10 @@
 
     /* return image */
     *got_frame = 1;
-    av_frame_move_ref(data, &s->picture);
 
     return s->sys->frame_size;
 }
 
-static int dvvideo_close(AVCodecContext *c)
-{
-    DVVideoContext *s = c->priv_data;
-
-    av_frame_unref(&s->picture);
-
-    return 0;
-}
-
 AVCodec ff_dvvideo_decoder = {
     .name           = "dvvideo",
     .long_name      = NULL_IF_CONFIG_SMALL("DV (Digital Video)"),
@@ -375,7 +371,6 @@
     .id             = AV_CODEC_ID_DVVIDEO,
     .priv_data_size = sizeof(DVVideoContext),
     .init           = ff_dvvideo_init,
-    .close          = dvvideo_close,
     .decode         = dvvideo_decode_frame,
     .capabilities   = CODEC_CAP_DR1 | CODEC_CAP_SLICE_THREADS,
     .max_lowres     = 3,

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/dvdsubdec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/dvdsubdec.c Changed

@@ -21,6 +21,8 @@
 #include "avcodec.h"
 #include "get_bits.h"
 #include "dsputil.h"
+#include "internal.h"
+
 #include "libavutil/attributes.h"
 #include "libavutil/colorspace.h"
 #include "libavutil/opt.h"
@@ -460,9 +462,6 @@
 }
 
 #ifdef DEBUG
-#undef fprintf
-#undef perror
-#undef exit
 static void ppm_save(const char *filename, uint8_t *bitmap, int w, int h,
                      uint32_t *rgba_palette)
 {
@@ -472,7 +471,7 @@
     f = fopen(filename, "w");
     if (!f) {
         perror(filename);
-        exit(1);
+        return;
     }
     fprintf(f, "P6\n"
             "%d %d\n"
@@ -598,9 +597,13 @@
             parse_palette(ctx, data + 8);
         } else if (strncmp("size:", data, 5) == 0) {
             int w, h;
-            if (sscanf(data + 5, "%dx%d", &w, &h) == 2 &&
-                av_image_check_size(w, h, 0, avctx) >= 0)
-                avcodec_set_dimensions(avctx, w, h);
+            if (sscanf(data + 5, "%dx%d", &w, &h) == 2) {
+               int ret = ff_set_dimensions(avctx, w, h);
+               if (ret < 0) {
+                   av_free(dataorig);
+                   return ret;
+               }
+            }
         }
 
         data += pos;

omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/dvenc.c Added

@@ -0,0 +1,712 @@
+/*
+ * DV encoder
+ * Copyright (c) 2003 Roman Shaposhnik
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * DV encoder
+ */
+
+#include "libavutil/attributes.h"
+#include "libavutil/pixdesc.h"
+#include "config.h"
+#include "avcodec.h"
+#include "internal.h"
+#include "put_bits.h"
+#include "dv.h"
+#include "dv_tablegen.h"
+
+static av_cold int dvvideo_encode_init(AVCodecContext *avctx)
+{
+    if (!avpriv_dv_codec_profile(avctx)) {
+        av_log(avctx, AV_LOG_ERROR, "Found no DV profile for %ix%i %s video. "
+               "Valid DV profiles are:\n",
+               avctx->width, avctx->height, av_get_pix_fmt_name(avctx->pix_fmt));
+        ff_dv_print_profiles(avctx, AV_LOG_ERROR);
+        return AVERROR(EINVAL);
+    }
+    if (avctx->height > 576) {
+        av_log(avctx, AV_LOG_ERROR, "DVCPRO HD encoding is not supported.\n");
+        return AVERROR_PATCHWELCOME;
+    }
+
+    avctx->coded_frame = av_frame_alloc();
+    if (!avctx->coded_frame)
+        return AVERROR(ENOMEM);
+
+    dv_vlc_map_tableinit();
+
+    return ff_dvvideo_init(avctx);
+}
+
+/* bit budget for AC only in 5 MBs */
+static const int vs_total_ac_bits = (100 * 4 + 68*2) * 5;
+static const int mb_area_start[5] = { 1, 6, 21, 43, 64 };
+
+#if CONFIG_SMALL
+/* Converts run and level (where level != 0) pair into VLC, returning bit size */
+static av_always_inline int dv_rl2vlc(int run, int level, int sign, uint32_t* vlc)
+{
+    int size;
+    if (run < DV_VLC_MAP_RUN_SIZE && level < DV_VLC_MAP_LEV_SIZE) {
+        *vlc = dv_vlc_map[run][level].vlc | sign;
+        size = dv_vlc_map[run][level].size;
+    }
+    else {
+        if (level < DV_VLC_MAP_LEV_SIZE) {
+            *vlc = dv_vlc_map[0][level].vlc | sign;
+            size = dv_vlc_map[0][level].size;
+        } else {
+            *vlc = 0xfe00 | (level << 1) | sign;
+            size = 16;
+        }
+        if (run) {
+            *vlc |= ((run < 16) ? dv_vlc_map[run-1][0].vlc :
+                                  (0x1f80 | (run - 1))) << size;
+            size +=  (run < 16) ? dv_vlc_map[run-1][0].size : 13;
+        }
+    }
+
+    return size;
+}
+
+static av_always_inline int dv_rl2vlc_size(int run, int level)
+{
+    int size;
+
+    if (run < DV_VLC_MAP_RUN_SIZE && level < DV_VLC_MAP_LEV_SIZE) {
+        size = dv_vlc_map[run][level].size;
+    }
+    else {
+        size = (level < DV_VLC_MAP_LEV_SIZE) ? dv_vlc_map[0][level].size : 16;
+        if (run) {
+            size += (run < 16) ? dv_vlc_map[run-1][0].size : 13;
+        }
+    }
+    return size;
+}
+#else
+static av_always_inline int dv_rl2vlc(int run, int l, int sign, uint32_t* vlc)
+{
+    *vlc = dv_vlc_map[run][l].vlc | sign;
+    return dv_vlc_map[run][l].size;
+}
+
+static av_always_inline int dv_rl2vlc_size(int run, int l)
+{
+    return dv_vlc_map[run][l].size;
+}
+#endif
+
+typedef struct EncBlockInfo {
+    int      area_q[4];
+    int      bit_size[4];
+    int      prev[5];
+    int      cur_ac;
+    int      cno;
+    int      dct_mode;
+    int16_t  mb[64];
+    uint8_t  next[64];
+    uint8_t  sign[64];
+    uint8_t  partial_bit_count;
+    uint32_t partial_bit_buffer; /* we can't use uint16_t here */
+} EncBlockInfo;
+
+static av_always_inline PutBitContext* dv_encode_ac(EncBlockInfo* bi,
+                                                    PutBitContext* pb_pool,
+                                                    PutBitContext* pb_end)
+{
+    int prev, bits_left;
+    PutBitContext* pb = pb_pool;
+    int size = bi->partial_bit_count;
+    uint32_t vlc = bi->partial_bit_buffer;
+
+    bi->partial_bit_count = bi->partial_bit_buffer = 0;
+    for (;;){
+       /* Find suitable storage space */
+       for (; size > (bits_left = put_bits_left(pb)); pb++) {
+          if (bits_left) {
+              size -= bits_left;
+              put_bits(pb, bits_left, vlc >> size);
+              vlc = vlc & ((1 << size) - 1);
+          }
+          if (pb + 1 >= pb_end) {
+              bi->partial_bit_count  = size;
+              bi->partial_bit_buffer = vlc;
+              return pb;
+          }
+       }
+
+       /* Store VLC */
+       put_bits(pb, size, vlc);
+
+       if (bi->cur_ac >= 64)
+           break;
+
+       /* Construct the next VLC */
+       prev       = bi->cur_ac;
+       bi->cur_ac = bi->next[prev];
+       if (bi->cur_ac < 64){
+           size = dv_rl2vlc(bi->cur_ac - prev - 1, bi->mb[bi->cur_ac], bi->sign[bi->cur_ac], &vlc);
+       } else {
+           size = 4; vlc = 6; /* End Of Block stamp */
+       }
+    }
+    return pb;
+}
+
+static av_always_inline int dv_guess_dct_mode(DVVideoContext *s, uint8_t *data, int linesize) {
+    if (s->avctx->flags & CODEC_FLAG_INTERLACED_DCT) {
+        int ps = s->ildct_cmp(NULL, data, NULL, linesize, 8) - 400;
+        if (ps > 0) {
+            int is = s->ildct_cmp(NULL, data           , NULL, linesize<<1, 4) +
+                     s->ildct_cmp(NULL, data + linesize, NULL, linesize<<1, 4);
+            return ps > is;
+        }
+    }
+
+    return 0;
+}
+
+static const int dv_weight_bits = 18;
+static const int dv_weight_88[64] = {
+ 131072, 257107, 257107, 242189, 252167, 242189, 235923, 237536,
+ 237536, 235923, 229376, 231390, 223754, 231390, 229376, 222935,
+ 224969, 217965, 217965, 224969, 222935, 200636, 218652, 211916,
+ 212325, 211916, 218652, 200636, 188995, 196781, 205965, 206433,
+ 206433, 205965, 196781, 188995, 185364, 185364, 200636, 200704,
+ 200636, 185364, 185364, 174609, 180568, 195068, 195068, 180568,
+ 174609, 170091, 175557, 189591, 175557, 170091, 165371, 170627,
+ 170627, 165371, 160727, 153560, 160727, 144651, 144651, 136258,
+};
+static const int dv_weight_248[64] = {
+ 131072, 242189, 257107, 237536, 229376, 200636, 242189, 223754,
+ 224969, 196781, 262144, 242189, 229376, 200636, 257107, 237536,
+ 211916, 185364, 235923, 217965, 229376, 211916, 206433, 180568,
+ 242189, 223754, 224969, 196781, 211916, 185364, 235923, 217965,
+ 200704, 175557, 222935, 205965, 200636, 185364, 195068, 170627,
+ 229376, 211916, 206433, 180568, 200704, 175557, 222935, 205965,
+ 175557, 153560, 188995, 174609, 165371, 144651, 200636, 185364,
+ 195068, 170627, 175557, 153560, 188995, 174609, 165371, 144651,
+};
+
+static av_always_inline int dv_init_enc_block(EncBlockInfo* bi, uint8_t *data, int linesize, DVVideoContext *s, int bias)
+{
+    const int *weight;
+    const uint8_t* zigzag_scan;
+    LOCAL_ALIGNED_16(int16_t, blk, [64]);
+    int i, area;
+    /* We offer two different methods for class number assignment: the
+       method suggested in SMPTE 314M Table 22, and an improved
+       method. The SMPTE method is very conservative; it assigns class
+       3 (i.e. severe quantization) to any block where the largest AC
+       component is greater than 36. FFmpeg's DV encoder tracks AC bit
+       consumption precisely, so there is no need to bias most blocks
+       towards strongly lossy compression. Instead, we assign class 2
+       to most blocks, and use class 3 only when strictly necessary
+       (for blocks whose largest AC component exceeds 255). */
+
+#if 0 /* SMPTE spec method */
+    static const int classes[] = {12, 24, 36, 0xffff};
+#else /* improved FFmpeg method */
+    static const int classes[] = {-1, -1, 255, 0xffff};
+#endif
+    int max  = classes[0];
+    int prev = 0;
+
+    av_assert2((((int)blk) & 15) == 0);
+
+    bi->area_q[0] = bi->area_q[1] = bi->area_q[2] = bi->area_q[3] = 0;
+    bi->partial_bit_count = 0;
+    bi->partial_bit_buffer = 0;
+    bi->cur_ac = 0;
+    if (data) {
+        bi->dct_mode = dv_guess_dct_mode(s, data, linesize);
+        s->get_pixels(blk, data, linesize);
+        s->fdct[bi->dct_mode](blk);
+    } else {
+        /* We rely on the fact that encoding all zeros leads to an immediate EOB,
+           which is precisely what the spec calls for in the "dummy" blocks. */
+        memset(blk, 0, 64*sizeof(*blk));
+        bi->dct_mode = 0;
+    }
+    bi->mb[0] = blk[0];
+
+    zigzag_scan = bi->dct_mode ? ff_zigzag248_direct : ff_zigzag_direct;
+    weight = bi->dct_mode ? dv_weight_248 : dv_weight_88;
+
+    for (area = 0; area < 4; area++) {
+       bi->prev[area]     = prev;
+       bi->bit_size[area] = 1; // 4 areas 4 bits for EOB :)
+       for (i = mb_area_start[area]; i < mb_area_start[area+1]; i++) {
+          int level = blk[zigzag_scan[i]];
+
+          if (level + 15 > 30U) {
+              bi->sign[i] = (level >> 31) & 1;
+              /* weight it and shift down into range, adding for rounding */
+              /* the extra division by a factor of 2^4 reverses the 8x expansion of the DCT
+                 AND the 2x doubling of the weights */
+              level = (FFABS(level) * weight[i] + (1 << (dv_weight_bits+3))) >> (dv_weight_bits+4);
+              bi->mb[i] = level;
+              if (level > max)
+                  max = level;
+              bi->bit_size[area] += dv_rl2vlc_size(i - prev  - 1, level);
+              bi->next[prev]= i;
+              prev = i;
+          }
+       }
+    }
+    bi->next[prev]= i;
+    for (bi->cno = 0; max > classes[bi->cno]; bi->cno++);
+
+    bi->cno += bias;
+
+    if (bi->cno >= 3) {
+        bi->cno = 3;
+        prev    = 0;
+        i       = bi->next[prev];
+        for (area = 0; area < 4; area++) {
+            bi->prev[area]     = prev;
+            bi->bit_size[area] = 1; // 4 areas 4 bits for EOB :)
+            for (; i < mb_area_start[area+1]; i = bi->next[i]) {
+                bi->mb[i] >>= 1;
+
+                if (bi->mb[i]) {
+                    bi->bit_size[area] += dv_rl2vlc_size(i - prev - 1, bi->mb[i]);
+                    bi->next[prev]= i;
+                    prev = i;
+                }
+            }
+        }
+        bi->next[prev]= i;
+    }
+
+    return bi->bit_size[0] + bi->bit_size[1] + bi->bit_size[2] + bi->bit_size[3];
+}
+
+static inline void dv_guess_qnos(EncBlockInfo* blks, int* qnos)
+{
+    int size[5];
+    int i, j, k, a, prev, a2;
+    EncBlockInfo* b;
+
+    size[0] = size[1] = size[2] = size[3] = size[4] = 1 << 24;
+    do {
+       b = blks;
+       for (i = 0; i < 5; i++) {
+          if (!qnos[i])
+              continue;
+
+          qnos[i]--;
+          size[i] = 0;
+          for (j = 0; j < 6; j++, b++) {
+             for (a = 0; a < 4; a++) {
+                if (b->area_q[a] != ff_dv_quant_shifts[qnos[i] + ff_dv_quant_offset[b->cno]][a]) {
+                    b->bit_size[a] = 1; // 4 areas 4 bits for EOB :)
+                    b->area_q[a]++;
+                    prev = b->prev[a];
+                    av_assert2(b->next[prev] >= mb_area_start[a+1] || b->mb[prev]);
+                    for (k = b->next[prev] ; k < mb_area_start[a+1]; k = b->next[k]) {
+                       b->mb[k] >>= 1;
+                       if (b->mb[k]) {
+                           b->bit_size[a] += dv_rl2vlc_size(k - prev - 1, b->mb[k]);
+                           prev = k;
+                       } else {
+                           if (b->next[k] >= mb_area_start[a+1] && b->next[k]<64){
+                                for (a2 = a + 1; b->next[k] >= mb_area_start[a2+1]; a2++)
+                                    b->prev[a2] = prev;
+                                av_assert2(a2 < 4);
+                                av_assert2(b->mb[b->next[k]]);
+                                b->bit_size[a2] += dv_rl2vlc_size(b->next[k] - prev - 1, b->mb[b->next[k]])
+                                                  -dv_rl2vlc_size(b->next[k] -    k - 1, b->mb[b->next[k]]);
+                                av_assert2(b->prev[a2] == k && (a2 + 1 >= 4 || b->prev[a2+1] != k));
+                                b->prev[a2] = prev;
+                           }
+                           b->next[prev] = b->next[k];
+                       }
+                    }
+                    b->prev[a+1]= prev;
+                }
+                size[i] += b->bit_size[a];
+             }
+          }
+          if (vs_total_ac_bits >= size[0] + size[1] + size[2] + size[3] + size[4])
+                return;
+       }
+    } while (qnos[0]|qnos[1]|qnos[2]|qnos[3]|qnos[4]);
+
+
+    for (a = 2; a == 2 || vs_total_ac_bits < size[0]; a += a){
+        b = blks;
+        size[0] = 5 * 6 * 4; //EOB
+        for (j = 0; j < 6 *5; j++, b++) {
+            prev = b->prev[0];
+            for (k = b->next[prev]; k < 64; k = b->next[k]) {
+                if (b->mb[k] < a && b->mb[k] > -a){
+                    b->next[prev] = b->next[k];
+                }else{
+                    size[0] += dv_rl2vlc_size(k - prev - 1, b->mb[k]);
+                    prev = k;
+                }
+            }
+        }
+    }
+}
+
+static int dv_encode_video_segment(AVCodecContext *avctx, void *arg)
+{
+    DVVideoContext *s = avctx->priv_data;
+    DVwork_chunk *work_chunk = arg;
+    int mb_index, i, j;
+    int mb_x, mb_y, c_offset, linesize, y_stride;
+    uint8_t*  y_ptr;
+    uint8_t*  dif;
+    LOCAL_ALIGNED_8(uint8_t, scratch, [128]);
+    EncBlockInfo  enc_blks[5*DV_MAX_BPM];
+    PutBitContext pbs[5*DV_MAX_BPM];
+    PutBitContext* pb;
+    EncBlockInfo* enc_blk;
+    int       vs_bit_size = 0;
+    int       qnos[5] = {15, 15, 15, 15, 15}; /* No quantization */
+    int*      qnosp = &qnos[0];
+
+    dif = &s->buf[work_chunk->buf_offset*80];
+    enc_blk = &enc_blks[0];
+    for (mb_index = 0; mb_index < 5; mb_index++) {
+        dv_calculate_mb_xy(s, work_chunk, mb_index, &mb_x, &mb_y);
+
+        /* initializing luminance blocks */
+        if ((s->sys->pix_fmt == AV_PIX_FMT_YUV420P) ||
+            (s->sys->pix_fmt == AV_PIX_FMT_YUV411P && mb_x >= (704 / 8)) ||
+            (s->sys->height >= 720 && mb_y != 134)) {
+            y_stride = s->frame->linesize[0] << 3;
+        } else {
+            y_stride = 16;
+        }
+        y_ptr    = s->frame->data[0] + ((mb_y * s->frame->linesize[0] + mb_x) << 3);
+        linesize = s->frame->linesize[0];
+
+        if (s->sys->video_stype == 4) { /* SD 422 */
+            vs_bit_size +=
+            dv_init_enc_block(enc_blk+0, y_ptr               , linesize, s, 0) +
+            dv_init_enc_block(enc_blk+1, NULL                , linesize, s, 0) +
+            dv_init_enc_block(enc_blk+2, y_ptr + 8           , linesize, s, 0) +
+            dv_init_enc_block(enc_blk+3, NULL                , linesize, s, 0);
+        } else {
+            vs_bit_size +=
+            dv_init_enc_block(enc_blk+0, y_ptr               , linesize, s, 0) +
+            dv_init_enc_block(enc_blk+1, y_ptr + 8           , linesize, s, 0) +
+            dv_init_enc_block(enc_blk+2, y_ptr     + y_stride, linesize, s, 0) +
+            dv_init_enc_block(enc_blk+3, y_ptr + 8 + y_stride, linesize, s, 0);
+        }
+        enc_blk += 4;
+
+        /* initializing chrominance blocks */
+        c_offset = (((mb_y >>  (s->sys->pix_fmt == AV_PIX_FMT_YUV420P)) * s->frame->linesize[1] +
+                     (mb_x >> ((s->sys->pix_fmt == AV_PIX_FMT_YUV411P) ? 2 : 1))) << 3);
+        for (j = 2; j; j--) {
+            uint8_t *c_ptr = s->frame->data[j] + c_offset;
+            linesize = s->frame->linesize[j];
+            y_stride = (mb_y == 134) ? 8 : (s->frame->linesize[j] << 3);
+            if (s->sys->pix_fmt == AV_PIX_FMT_YUV411P && mb_x >= (704 / 8)) {
+                uint8_t* d;
+                uint8_t* b = scratch;
+                for (i = 0; i < 8; i++) {
+                    d = c_ptr + (linesize << 3);
+                    b[0] = c_ptr[0]; b[1] = c_ptr[1]; b[2] = c_ptr[2]; b[3] = c_ptr[3];
+                    b[4] =     d[0]; b[5] =     d[1]; b[6] =     d[2]; b[7] =     d[3];
+                    c_ptr += linesize;
+                    b += 16;
+                }
+                c_ptr = scratch;
+                linesize = 16;
+            }
+
+            vs_bit_size += dv_init_enc_block(    enc_blk++, c_ptr           , linesize, s, 1);
+            if (s->sys->bpm == 8) {
+                vs_bit_size += dv_init_enc_block(enc_blk++, c_ptr + y_stride, linesize, s, 1);
+            }
+        }
+    }
+
+    if (vs_total_ac_bits < vs_bit_size)
+        dv_guess_qnos(&enc_blks[0], qnosp);
+
+    /* DIF encoding process */
+    for (j=0; j<5*s->sys->bpm;) {
+        int start_mb = j;
+
+        dif[3] = *qnosp++;
+        dif += 4;
+
+        /* First pass over individual cells only */
+        for (i=0; i<s->sys->bpm; i++, j++) {
+            int sz = s->sys->block_sizes[i]>>3;
+
+            init_put_bits(&pbs[j], dif, sz);
+            put_sbits(&pbs[j], 9, ((enc_blks[j].mb[0] >> 3) - 1024 + 2) >> 2);
+            put_bits(&pbs[j], 1, enc_blks[j].dct_mode);
+            put_bits(&pbs[j], 2, enc_blks[j].cno);
+
+            dv_encode_ac(&enc_blks[j], &pbs[j], &pbs[j+1]);
+            dif += sz;
+        }
+
+        /* Second pass over each MB space */
+        pb = &pbs[start_mb];
+        for (i=0; i<s->sys->bpm; i++) {
+            if (enc_blks[start_mb+i].partial_bit_count)
+                pb = dv_encode_ac(&enc_blks[start_mb+i], pb, &pbs[start_mb+s->sys->bpm]);
+        }
+    }
+
+    /* Third and final pass over the whole video segment space */
+    pb = &pbs[0];
+    for (j=0; j<5*s->sys->bpm; j++) {
+       if (enc_blks[j].partial_bit_count)
+           pb = dv_encode_ac(&enc_blks[j], pb, &pbs[s->sys->bpm*5]);
+       if (enc_blks[j].partial_bit_count)
+            av_log(avctx, AV_LOG_ERROR, "ac bitstream overflow\n");
+    }
+
+    for (j=0; j<5*s->sys->bpm; j++) {
+       int pos;
+       int size = pbs[j].size_in_bits >> 3;
+       flush_put_bits(&pbs[j]);
+       pos = put_bits_count(&pbs[j]) >> 3;
+       if (pos > size) {
+           av_log(avctx, AV_LOG_ERROR, "bitstream written beyond buffer size\n");
+           return -1;
+       }
+       memset(pbs[j].buf + pos, 0xff, size - pos);
+    }
+
+    return 0;
+}
+
+static inline int dv_write_pack(enum dv_pack_type pack_id, DVVideoContext *c,
+                                uint8_t* buf)
+{
+    /*
+     * Here's what SMPTE314M says about these two:
+     *    (page 6) APTn, AP1n, AP2n, AP3n: These data shall be identical
+     *             as track application IDs (APTn = 001, AP1n =
+     *             001, AP2n = 001, AP3n = 001), if the source signal
+     *             comes from a digital VCR. If the signal source is
+     *             unknown, all bits for these data shall be set to 1.
+     *    (page 12) STYPE: STYPE defines a signal type of video signal
+     *                     00000b = 4:1:1 compression
+     *                     00100b = 4:2:2 compression
+     *                     XXXXXX = Reserved
+     * Now, I've got two problems with these statements:
+     *   1. it looks like APT == 111b should be a safe bet, but it isn't.
+     *      It seems that for PAL as defined in IEC 61834 we have to set
+     *      APT to 000 and for SMPTE314M to 001.
+     *   2. It is not at all clear what STYPE is used for 4:2:0 PAL
+     *      compression scheme (if any).
+     */
+    int apt   = (c->sys->pix_fmt == AV_PIX_FMT_YUV420P ? 0 : 1);
+    int fs    = c->frame->top_field_first ? 0x00 : 0x40;
+
+    uint8_t aspect = 0;
+    if ((int)(av_q2d(c->avctx->sample_aspect_ratio) * c->avctx->width / c->avctx->height * 10) >= 17) /* 16:9 */
+        aspect = 0x02;
+
+    buf[0] = (uint8_t)pack_id;
+    switch (pack_id) {
+    case dv_header525: /* I can't imagine why these two weren't defined as real */
+    case dv_header625: /* packs in SMPTE314M -- they definitely look like ones */
+          buf[1] = 0xf8 |        /* reserved -- always 1 */
+                   (apt & 0x07); /* APT: Track application ID */
+          buf[2] = (0    << 7) | /* TF1: audio data is 0 - valid; 1 - invalid */
+                   (0x0f << 3) | /* reserved -- always 1 */
+                   (apt & 0x07); /* AP1: Audio application ID */
+          buf[3] = (0    << 7) | /* TF2: video data is 0 - valid; 1 - invalid */
+                   (0x0f << 3) | /* reserved -- always 1 */
+                   (apt & 0x07); /* AP2: Video application ID */
+          buf[4] = (0    << 7) | /* TF3: subcode(SSYB) is 0 - valid; 1 - invalid */
+                   (0x0f << 3) | /* reserved -- always 1 */
+                   (apt & 0x07); /* AP3: Subcode application ID */
+          break;
+    case dv_video_source:
+          buf[1] = 0xff;      /* reserved -- always 1 */
+          buf[2] = (1 << 7) | /* B/W: 0 - b/w, 1 - color */
+                   (1 << 6) | /* following CLF is valid - 0, invalid - 1 */
+                   (3 << 4) | /* CLF: color frames ID (see ITU-R BT.470-4) */
+                   0xf;       /* reserved -- always 1 */
+          buf[3] = (3 << 6) | /* reserved -- always 1 */
+                   (c->sys->dsf << 5) | /*  system: 60fields/50fields */
+                   c->sys->video_stype; /* signal type video compression */
+          buf[4] = 0xff;      /* VISC: 0xff -- no information */
+          break;
+    case dv_video_control:
+          buf[1] = (0 << 6) | /* Copy generation management (CGMS) 0 -- free */
+                   0x3f;      /* reserved -- always 1 */
+          buf[2] = 0xc8 |     /* reserved -- always b11001xxx */
+                   aspect;
+          buf[3] = (1 << 7) | /* frame/field flag 1 -- frame, 0 -- field */
+                   fs       | /* first/second field flag 0 -- field 2, 1 -- field 1 */
+                   (1 << 5) | /* frame change flag 0 -- same picture as before, 1 -- different */
+                   (1 << 4) | /* 1 - interlaced, 0 - noninterlaced */
+                   0xc;       /* reserved -- always b1100 */
+          buf[4] = 0xff;      /* reserved -- always 1 */
+          break;
+    default:
+          buf[1] = buf[2] = buf[3] = buf[4] = 0xff;
+    }
+    return 5;
+}
+
+static inline int dv_write_dif_id(enum dv_section_type t, uint8_t chan_num,
+                                  uint8_t seq_num, uint8_t dif_num,
+                                  uint8_t* buf)
+{
+    buf[0] = (uint8_t)t;       /* Section type */
+    buf[1] = (seq_num  << 4) | /* DIF seq number 0-9 for 525/60; 0-11 for 625/50 */
+             (chan_num << 3) | /* FSC: for 50Mb/s 0 - first channel; 1 - second */
+             7;                /* reserved -- always 1 */
+    buf[2] = dif_num;          /* DIF block number Video: 0-134, Audio: 0-8 */
+    return 3;
+}
+
+
+static inline int dv_write_ssyb_id(uint8_t syb_num, uint8_t fr, uint8_t* buf)
+{
+    if (syb_num == 0 || syb_num == 6) {
+        buf[0] = (fr << 7) | /* FR ID 1 - first half of each channel; 0 - second */
+                 (0  << 4) | /* AP3 (Subcode application ID) */
+                 0x0f;       /* reserved -- always 1 */
+    }
+    else if (syb_num == 11) {
+        buf[0] = (fr << 7) | /* FR ID 1 - first half of each channel; 0 - second */
+                 0x7f;       /* reserved -- always 1 */
+    }
+    else {
+        buf[0] = (fr << 7) | /* FR ID 1 - first half of each channel; 0 - second */
+                 (0  << 4) | /* APT (Track application ID) */
+                 0x0f;       /* reserved -- always 1 */
+    }
+    buf[1] = 0xf0 |            /* reserved -- always 1 */
+             (syb_num & 0x0f); /* SSYB number 0 - 11   */
+    buf[2] = 0xff;             /* reserved -- always 1 */
+    return 3;
+}
+
+static void dv_format_frame(DVVideoContext* c, uint8_t* buf)
+{
+    int chan, i, j, k;
+
+    for (chan = 0; chan < c->sys->n_difchan; chan++) {
+        for (i = 0; i < c->sys->difseg_size; i++) {
+            memset(buf, 0xff, 80 * 6); /* first 6 DIF blocks are for control data */
+
+            /* DV header: 1DIF */
+            buf += dv_write_dif_id(dv_sect_header, chan, i, 0, buf);
+            buf += dv_write_pack((c->sys->dsf ? dv_header625 : dv_header525), c, buf);
+            buf += 72; /* unused bytes */
+
+            /* DV subcode: 2DIFs */
+            for (j = 0; j < 2; j++) {
+                buf += dv_write_dif_id(dv_sect_subcode, chan, i, j, buf);
+                for (k = 0; k < 6; k++)
+                     buf += dv_write_ssyb_id(k, (i < c->sys->difseg_size/2), buf) + 5;
+                buf += 29; /* unused bytes */
+            }
+
+            /* DV VAUX: 3DIFS */
+            for (j = 0; j < 3; j++) {
+                buf += dv_write_dif_id(dv_sect_vaux, chan, i, j, buf);
+                buf += dv_write_pack(dv_video_source,  c, buf);
+                buf += dv_write_pack(dv_video_control, c, buf);
+                buf += 7*5;
+                buf += dv_write_pack(dv_video_source,  c, buf);
+                buf += dv_write_pack(dv_video_control, c, buf);
+                buf += 4*5 + 2; /* unused bytes */
+            }
+
+            /* DV Audio/Video: 135 Video DIFs + 9 Audio DIFs */
+            for (j = 0; j < 135; j++) {
+                if (j%15 == 0) {
+                    memset(buf, 0xff, 80);
+                    buf += dv_write_dif_id(dv_sect_audio, chan, i, j/15, buf);
+                    buf += 77; /* audio control & shuffled PCM audio */
+                }
+                buf += dv_write_dif_id(dv_sect_video, chan, i, j, buf);
+                buf += 77; /* 1 video macroblock: 1 bytes control
+                              4 * 14 bytes Y 8x8 data
+                              10 bytes Cr 8x8 data
+                              10 bytes Cb 8x8 data */
+            }
+        }
+    }
+}
+
+
+static int dvvideo_encode_frame(AVCodecContext *c, AVPacket *pkt,
+                                const AVFrame *frame, int *got_packet)
+{
+    DVVideoContext *s = c->priv_data;
+    int ret;
+
+    s->sys = avpriv_dv_codec_profile(c);
+    if (!s->sys || ff_dv_init_dynamic_tables(s->sys))
+        return -1;
+    if ((ret = ff_alloc_packet2(c, pkt, s->sys->frame_size)) < 0)
+        return ret;
+
+    c->pix_fmt                = s->sys->pix_fmt;
+    s->frame                  = frame;
+    c->coded_frame->key_frame = 1;
+    c->coded_frame->pict_type = AV_PICTURE_TYPE_I;
+
+    s->buf = pkt->data;
+    c->execute(c, dv_encode_video_segment, s->sys->work_chunks, NULL,
+               dv_work_pool_size(s->sys), sizeof(DVwork_chunk));
+
+    emms_c();
+
+    dv_format_frame(s, pkt->data);
+
+    pkt->flags |= AV_PKT_FLAG_KEY;
+    *got_packet = 1;
+
+    return 0;
+}
+
+static int dvvideo_encode_close(AVCodecContext *avctx)
+{
+    av_frame_free(&avctx->coded_frame);
+    return 0;
+}
+
+AVCodec ff_dvvideo_encoder = {
+    .name           = "dvvideo",
+    .long_name      = NULL_IF_CONFIG_SMALL("DV (Digital Video)"),
+    .type           = AVMEDIA_TYPE_VIDEO,
+    .id             = AV_CODEC_ID_DVVIDEO,
+    .priv_data_size = sizeof(DVVideoContext),
+    .init           = dvvideo_encode_init,
+    .encode2        = dvvideo_encode_frame,
+    .close          = dvvideo_encode_close,
+    .capabilities   = CODEC_CAP_SLICE_THREADS,
+    .pix_fmts       = (const enum AVPixelFormat[]) {
+        AV_PIX_FMT_YUV411P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE
+    },
+};

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/dxa.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/dxa.c Changed

@@ -42,6 +42,7 @@
     AVFrame *prev;
 
     int dsize;
+#define DECOMP_BUF_PADDING 16
     uint8_t *decomp_buf;
     uint32_t pal[256];
 } DxaDecContext;
@@ -50,13 +51,17 @@
 static const int shift2[6] = { 0, 0, 8, 4, 0, 4 };
 
 static int decode_13(AVCodecContext *avctx, DxaDecContext *c, uint8_t* dst,
-                     int stride, uint8_t *src, uint8_t *ref)
+                     int stride, uint8_t *src, int srcsize, uint8_t *ref)
 {
     uint8_t *code, *data, *mv, *msk, *tmp, *tmp2;
+    uint8_t *src_end = src + srcsize;
     int i, j, k;
     int type, x, y, d, d2;
     uint32_t mask;
 
+    if (12ULL  + ((avctx->width * avctx->height) >> 4) + AV_RB32(src + 0) + AV_RB32(src + 4) > srcsize)
+        return AVERROR_INVALIDDATA;
+
     code = src  + 12;
     data = code + ((avctx->width * avctx->height) >> 4);
     mv   = data + AV_RB32(src + 0);
@@ -64,6 +69,8 @@
 
     for(j = 0; j < avctx->height; j += 4){
         for(i = 0; i < avctx->width; i += 4){
+            if (data > src_end || mv > src_end || msk > src_end)
+                return AVERROR_INVALIDDATA;
             tmp  = dst + i;
             tmp2 = ref + i;
             type = *code++;
@@ -245,6 +252,7 @@
             av_log(avctx, AV_LOG_ERROR, "Uncompress failed!\n");
             return AVERROR_UNKNOWN;
         }
+        memset(c->decomp_buf + dsize, 0, DECOMP_BUF_PADDING);
     }
 
     if (avctx->debug & FF_DEBUG_PICT_INFO)
@@ -300,7 +308,7 @@
             av_log(avctx, AV_LOG_ERROR, "Missing reference frame\n");
             return AVERROR_INVALIDDATA;
         }
-        decode_13(avctx, c, frame->data[0], frame->linesize[0], srcptr, c->prev->data[0]);
+        decode_13(avctx, c, frame->data[0], frame->linesize[0], srcptr, dsize, c->prev->data[0]);
         break;
     default:
         av_log(avctx, AV_LOG_ERROR, "Unknown/unsupported compression type %d\n", compr);
@@ -321,14 +329,14 @@
 {
     DxaDecContext * const c = avctx->priv_data;
 
-    avctx->pix_fmt = AV_PIX_FMT_PAL8;
-
     c->prev = av_frame_alloc();
     if (!c->prev)
         return AVERROR(ENOMEM);
 
+    avctx->pix_fmt = AV_PIX_FMT_PAL8;
+
     c->dsize = avctx->width * avctx->height * 2;
-    c->decomp_buf = av_malloc(c->dsize);
+    c->decomp_buf = av_malloc(c->dsize + DECOMP_BUF_PADDING);
     if (!c->decomp_buf) {
         av_frame_free(&c->prev);
         av_log(avctx, AV_LOG_ERROR, "Can't allocate decompression buffer.\n");

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/dxtory.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/dxtory.c Changed

@@ -29,14 +29,84 @@
 #include "libavutil/common.h"
 #include "libavutil/intreadwrite.h"
 
-static int dxtory_decode_v1(AVCodecContext *avctx, AVFrame *pic,
-                            const uint8_t *src, int src_size)
+static int dxtory_decode_v1_rgb(AVCodecContext *avctx, AVFrame *pic,
+                                const uint8_t *src, int src_size,
+                                int id, int bpp)
+{
+    int h;
+    uint8_t *dst;
+    int ret;
+
+    if (src_size < avctx->width * avctx->height * (int64_t)bpp) {
+        av_log(avctx, AV_LOG_ERROR, "packet too small\n");
+        return AVERROR_INVALIDDATA;
+    }
+
+    avctx->pix_fmt = id;
+    if ((ret = ff_get_buffer(avctx, pic, 0)) < 0)
+        return ret;
+
+    dst = pic->data[0];
+    for (h = 0; h < avctx->height; h++) {
+        memcpy(dst, src, avctx->width * bpp);
+        src += avctx->width * bpp;
+        dst += pic->linesize[0];
+    }
+
+    return 0;
+}
+
+static int dxtory_decode_v1_410(AVCodecContext *avctx, AVFrame *pic,
+                                const uint8_t *src, int src_size)
+{
+    int h, w;
+    uint8_t *Y1, *Y2, *Y3, *Y4, *U, *V;
+    int ret;
+
+    if (src_size < avctx->width * avctx->height * 9L / 8) {
+        av_log(avctx, AV_LOG_ERROR, "packet too small\n");
+        return AVERROR_INVALIDDATA;
+    }
+
+    avctx->pix_fmt = AV_PIX_FMT_YUV410P;
+    if ((ret = ff_get_buffer(avctx, pic, 0)) < 0)
+        return ret;
+
+    Y1 = pic->data[0];
+    Y2 = pic->data[0] + pic->linesize[0];
+    Y3 = pic->data[0] + pic->linesize[0] * 2;
+    Y4 = pic->data[0] + pic->linesize[0] * 3;
+    U  = pic->data[1];
+    V  = pic->data[2];
+    for (h = 0; h < avctx->height; h += 4) {
+        for (w = 0; w < avctx->width; w += 4) {
+            AV_COPY32(Y1 + w, src);
+            AV_COPY32(Y2 + w, src + 4);
+            AV_COPY32(Y3 + w, src + 8);
+            AV_COPY32(Y4 + w, src + 12);
+            U[w >> 2] = src[16] + 0x80;
+            V[w >> 2] = src[17] + 0x80;
+            src += 18;
+        }
+        Y1 += pic->linesize[0] << 2;
+        Y2 += pic->linesize[0] << 2;
+        Y3 += pic->linesize[0] << 2;
+        Y4 += pic->linesize[0] << 2;
+        U  += pic->linesize[1];
+        V  += pic->linesize[2];
+    }
+
+    return 0;
+}
+
+static int dxtory_decode_v1_420(AVCodecContext *avctx, AVFrame *pic,
+                                const uint8_t *src, int src_size)
 {
     int h, w;
     uint8_t *Y1, *Y2, *U, *V;
     int ret;
 
-    if (src_size < avctx->width * avctx->height * 3 / 2) {
+    if (src_size < avctx->width * avctx->height * 3L / 2) {
         av_log(avctx, AV_LOG_ERROR, "packet too small\n");
         return AVERROR_INVALIDDATA;
     }
@@ -66,7 +136,42 @@
     return 0;
 }
 
+static int dxtory_decode_v1_444(AVCodecContext *avctx, AVFrame *pic,
+                                const uint8_t *src, int src_size)
+{
+    int h, w;
+    uint8_t *Y, *U, *V;
+    int ret;
+
+    if (src_size < avctx->width * avctx->height * 3L) {
+        av_log(avctx, AV_LOG_ERROR, "packet too small\n");
+        return AVERROR_INVALIDDATA;
+    }
+
+    avctx->pix_fmt = AV_PIX_FMT_YUV444P;
+    if ((ret = ff_get_buffer(avctx, pic, 0)) < 0)
+        return ret;
+
+    Y = pic->data[0];
+    U = pic->data[1];
+    V = pic->data[2];
+    for (h = 0; h < avctx->height; h++) {
+        for (w = 0; w < avctx->width; w++) {
+            Y[w] = *src++;
+            U[w] = *src++ ^ 0x80;
+            V[w] = *src++ ^ 0x80;
+        }
+        Y += pic->linesize[0];
+        U += pic->linesize[1];
+        V += pic->linesize[2];
+    }
+
+    return 0;
+}
+
 static const uint8_t def_lru[8] = { 0x00, 0x20, 0x40, 0x60, 0x80, 0xA0, 0xC0, 0xFF };
+static const uint8_t def_lru_555[8] = { 0x00, 0x08, 0x10, 0x18, 0x1F };
+static const uint8_t def_lru_565[8] = { 0x00, 0x08, 0x10, 0x20, 0x30, 0x3F };
 
 static inline uint8_t decode_sym(GetBitContext *gb, uint8_t lru[8])
 {
@@ -85,9 +190,297 @@
     return val;
 }
 
-static int dx2_decode_slice(GetBitContext *gb, int width, int height,
-                            uint8_t *Y, uint8_t *U, uint8_t *V,
-                            int ystride, int ustride, int vstride)
+static inline uint8_t decode_sym_565(GetBitContext *gb, uint8_t lru[8],
+                                     int bits)
+{
+    uint8_t c, val;
+
+    c = get_unary(gb, 0, bits);
+    if (!c) {
+        val = get_bits(gb, bits);
+        memmove(lru + 1, lru, sizeof(*lru) * (6 - 1));
+    } else {
+        val = lru[c - 1];
+        memmove(lru + 1, lru, sizeof(*lru) * (c - 1));
+    }
+    lru[0] = val;
+
+    return val;
+}
+
+static int dx2_decode_slice_565(GetBitContext *gb, int width, int height,
+                                uint8_t *dst, int stride, int is_565)
+{
+    int x, y;
+    int r, g, b;
+    uint8_t lru[3][8];
+
+    memcpy(lru[0], def_lru_555, 8 * sizeof(*def_lru));
+    memcpy(lru[1], is_565 ? def_lru_565 : def_lru_555, 8 * sizeof(*def_lru));
+    memcpy(lru[2], def_lru_555, 8 * sizeof(*def_lru));
+
+    for (y = 0; y < height; y++) {
+        for (x = 0; x < width; x++) {
+            b = decode_sym_565(gb, lru[0], 5);
+            g = decode_sym_565(gb, lru[1], is_565 ? 6 : 5);
+            r = decode_sym_565(gb, lru[2], 5);
+            dst[x * 3 + 0] = (r << 3) | (r >> 2);
+            dst[x * 3 + 1] = is_565 ? (g << 2) | (g >> 4) : (g << 3) | (g >> 2);
+            dst[x * 3 + 2] = (b << 3) | (b >> 2);
+        }
+
+        dst += stride;
+    }
+
+    return 0;
+}
+
+static int dxtory_decode_v2_565(AVCodecContext *avctx, AVFrame *pic,
+                                const uint8_t *src, int src_size, int is_565)
+{
+    GetByteContext gb;
+    GetBitContext  gb2;
+    int nslices, slice, slice_height;
+    uint32_t off, slice_size;
+    uint8_t *dst;
+    int ret;
+
+    bytestream2_init(&gb, src, src_size);
+    nslices = bytestream2_get_le16(&gb);
+    off = FFALIGN(nslices * 4 + 2, 16);
+    if (src_size < off) {
+        av_log(avctx, AV_LOG_ERROR, "no slice data\n");
+        return AVERROR_INVALIDDATA;
+    }
+
+    if (!nslices || avctx->height % nslices) {
+        avpriv_request_sample(avctx, "%d slices for %dx%d", nslices,
+                              avctx->width, avctx->height);
+        return AVERROR_PATCHWELCOME;
+    }
+
+    slice_height = avctx->height / nslices;
+    avctx->pix_fmt = AV_PIX_FMT_RGB24;
+    if ((ret = ff_get_buffer(avctx, pic, 0)) < 0)
+        return ret;
+
+    dst = pic->data[0];
+    for (slice = 0; slice < nslices; slice++) {
+        slice_size = bytestream2_get_le32(&gb);
+        if (slice_size > src_size - off) {
+            av_log(avctx, AV_LOG_ERROR,
+                   "invalid slice size %d (only %d bytes left)\n",
+                   slice_size, src_size - off);
+            return AVERROR_INVALIDDATA;
+        }
+        if (slice_size <= 16) {
+            av_log(avctx, AV_LOG_ERROR, "invalid slice size %d\n", slice_size);
+            return AVERROR_INVALIDDATA;
+        }
+
+        if (AV_RL32(src + off) != slice_size - 16) {
+            av_log(avctx, AV_LOG_ERROR,
+                   "Slice sizes mismatch: got %d instead of %d\n",
+                   AV_RL32(src + off), slice_size - 16);
+        }
+        init_get_bits(&gb2, src + off + 16, (slice_size - 16) * 8);
+        dx2_decode_slice_565(&gb2, avctx->width, slice_height, dst,
+                             pic->linesize[0], is_565);
+
+        dst += pic->linesize[0] * slice_height;
+        off += slice_size;
+    }
+
+    return 0;
+}
+
+static int dx2_decode_slice_rgb(GetBitContext *gb, int width, int height,
+                                uint8_t *dst, int stride)
+{
+    int x, y, i;
+    uint8_t lru[3][8];
+
+    for (i = 0; i < 3; i++)
+        memcpy(lru[i], def_lru, 8 * sizeof(*def_lru));
+
+    for (y = 0; y < height; y++) {
+        for (x = 0; x < width; x++) {
+            dst[x * 3 + 0] = decode_sym(gb, lru[0]);
+            dst[x * 3 + 1] = decode_sym(gb, lru[1]);
+            dst[x * 3 + 2] = decode_sym(gb, lru[2]);
+        }
+
+        dst += stride;
+    }
+
+    return 0;
+}
+
+static int dxtory_decode_v2_rgb(AVCodecContext *avctx, AVFrame *pic,
+                                const uint8_t *src, int src_size)
+{
+    GetByteContext gb;
+    GetBitContext  gb2;
+    int nslices, slice, slice_height;
+    uint32_t off, slice_size;
+    uint8_t *dst;
+    int ret;
+
+    bytestream2_init(&gb, src, src_size);
+    nslices = bytestream2_get_le16(&gb);
+    off = FFALIGN(nslices * 4 + 2, 16);
+    if (src_size < off) {
+        av_log(avctx, AV_LOG_ERROR, "no slice data\n");
+        return AVERROR_INVALIDDATA;
+    }
+
+    if (!nslices || avctx->height % nslices) {
+        avpriv_request_sample(avctx, "%d slices for %dx%d", nslices,
+                              avctx->width, avctx->height);
+        return AVERROR_PATCHWELCOME;
+    }
+
+    slice_height = avctx->height / nslices;
+    avctx->pix_fmt = AV_PIX_FMT_BGR24;
+    if ((ret = ff_get_buffer(avctx, pic, 0)) < 0)
+        return ret;
+
+    dst = pic->data[0];
+    for (slice = 0; slice < nslices; slice++) {
+        slice_size = bytestream2_get_le32(&gb);
+        if (slice_size > src_size - off) {
+            av_log(avctx, AV_LOG_ERROR,
+                   "invalid slice size %d (only %d bytes left)\n",
+                   slice_size, src_size - off);
+            return AVERROR_INVALIDDATA;
+        }
+        if (slice_size <= 16) {
+            av_log(avctx, AV_LOG_ERROR, "invalid slice size %d\n", slice_size);
+            return AVERROR_INVALIDDATA;
+        }
+
+        if (AV_RL32(src + off) != slice_size - 16) {
+            av_log(avctx, AV_LOG_ERROR,
+                   "Slice sizes mismatch: got %d instead of %d\n",
+                   AV_RL32(src + off), slice_size - 16);
+        }
+        init_get_bits(&gb2, src + off + 16, (slice_size - 16) * 8);
+        dx2_decode_slice_rgb(&gb2, avctx->width, slice_height, dst,
+                             pic->linesize[0]);
+
+        dst += pic->linesize[0] * slice_height;
+        off += slice_size;
+    }
+
+    return 0;
+}
+
+static int dx2_decode_slice_410(GetBitContext *gb, int width, int height,
+                                uint8_t *Y, uint8_t *U, uint8_t *V,
+                                int ystride, int ustride, int vstride)
+{
+    int x, y, i, j;
+    uint8_t lru[3][8];
+
+    for (i = 0; i < 3; i++)
+        memcpy(lru[i], def_lru, 8 * sizeof(*def_lru));
+
+    for (y = 0; y < height; y += 4) {
+        for (x = 0; x < width; x += 4) {
+            for (j = 0; j < 4; j++)
+                for (i = 0; i < 4; i++)
+                    Y[x + i + j * ystride] = decode_sym(gb, lru[0]);
+            U[x >> 2] = decode_sym(gb, lru[1]) ^ 0x80;
+            V[x >> 2] = decode_sym(gb, lru[2]) ^ 0x80;
+        }
+
+        Y += ystride << 2;
+        U += ustride;
+        V += vstride;
+    }
+
+    return 0;
+}
+
+static int dxtory_decode_v2_410(AVCodecContext *avctx, AVFrame *pic,
+                                const uint8_t *src, int src_size)
+{
+    GetByteContext gb;
+    GetBitContext  gb2;
+    int nslices, slice, slice_height, ref_slice_height;
+    int cur_y, next_y;
+    uint32_t off, slice_size;
+    uint8_t *Y, *U, *V;
+    int ret;
+
+    bytestream2_init(&gb, src, src_size);
+    nslices = bytestream2_get_le16(&gb);
+    off = FFALIGN(nslices * 4 + 2, 16);
+    if (src_size < off) {
+        av_log(avctx, AV_LOG_ERROR, "no slice data\n");
+        return AVERROR_INVALIDDATA;
+    }
+
+    if (!nslices || avctx->height % nslices) {
+        avpriv_request_sample(avctx, "%d slices for %dx%d", nslices,
+                              avctx->width, avctx->height);
+        return AVERROR_PATCHWELCOME;
+    }
+
+    ref_slice_height = avctx->height / nslices;
+    if ((avctx->width & 3) || (avctx->height & 3)) {
+        avpriv_request_sample(avctx, "Frame dimensions %dx%d",
+                              avctx->width, avctx->height);
+    }
+
+    avctx->pix_fmt = AV_PIX_FMT_YUV410P;
+    if ((ret = ff_get_buffer(avctx, pic, 0)) < 0)
+        return ret;
+
+    Y = pic->data[0];
+    U = pic->data[1];
+    V = pic->data[2];
+
+    cur_y  = 0;
+    next_y = ref_slice_height;
+    for (slice = 0; slice < nslices; slice++) {
+        slice_size   = bytestream2_get_le32(&gb);
+        slice_height = (next_y & ~3) - (cur_y & ~3);
+        if (slice_size > src_size - off) {
+            av_log(avctx, AV_LOG_ERROR,
+                   "invalid slice size %d (only %d bytes left)\n",
+                   slice_size, src_size - off);
+            return AVERROR_INVALIDDATA;
+        }
+        if (slice_size <= 16) {
+            av_log(avctx, AV_LOG_ERROR, "invalid slice size %d\n", slice_size);
+            return AVERROR_INVALIDDATA;
+        }
+
+        if (AV_RL32(src + off) != slice_size - 16) {
+            av_log(avctx, AV_LOG_ERROR,
+                   "Slice sizes mismatch: got %d instead of %d\n",
+                   AV_RL32(src + off), slice_size - 16);
+        }
+        init_get_bits(&gb2, src + off + 16, (slice_size - 16) * 8);
+        dx2_decode_slice_410(&gb2, avctx->width, slice_height, Y, U, V,
+                             pic->linesize[0], pic->linesize[1],
+                             pic->linesize[2]);
+
+        Y += pic->linesize[0] *  slice_height;
+        U += pic->linesize[1] * (slice_height >> 2);
+        V += pic->linesize[2] * (slice_height >> 2);
+        off += slice_size;
+        cur_y   = next_y;
+        next_y += ref_slice_height;
+    }
+
+    return 0;
+}
+
+static int dx2_decode_slice_420(GetBitContext *gb, int width, int height,
+                                uint8_t *Y, uint8_t *U, uint8_t *V,
+                                int ystride, int ustride, int vstride)
 {
     int x, y, i;
     uint8_t lru[3][8];
@@ -113,12 +506,13 @@
     return 0;
 }
 
-static int dxtory_decode_v2(AVCodecContext *avctx, AVFrame *pic,
-                            const uint8_t *src, int src_size)
+static int dxtory_decode_v2_420(AVCodecContext *avctx, AVFrame *pic,
+                                const uint8_t *src, int src_size)
 {
     GetByteContext gb;
     GetBitContext  gb2;
-    int nslices, slice, slice_height;
+    int nslices, slice, slice_height, ref_slice_height;
+    int cur_y, next_y;
     uint32_t off, slice_size;
     uint8_t *Y, *U, *V;
     int ret;
@@ -134,13 +528,13 @@
     if (!nslices || avctx->height % nslices) {
         avpriv_request_sample(avctx, "%d slices for %dx%d", nslices,
                               avctx->width, avctx->height);
-        return AVERROR(ENOSYS);
+        return AVERROR_PATCHWELCOME;
     }
 
-    slice_height = avctx->height / nslices;
-    if ((avctx->width & 1) || (slice_height & 1)) {
-        avpriv_request_sample(avctx, "slice dimensions %dx%d",
-                              avctx->width, slice_height);
+    ref_slice_height = avctx->height / nslices;
+    if ((avctx->width & 1) || (avctx->height & 1)) {
+        avpriv_request_sample(avctx, "Frame dimensions %dx%d",
+                              avctx->width, avctx->height);
     }
 
     avctx->pix_fmt = AV_PIX_FMT_YUV420P;
@@ -151,8 +545,11 @@
     U = pic->data[1];
     V = pic->data[2];
 
+    cur_y  = 0;
+    next_y = ref_slice_height;
     for (slice = 0; slice < nslices; slice++) {
-        slice_size = bytestream2_get_le32(&gb);
+        slice_size   = bytestream2_get_le32(&gb);
+        slice_height = (next_y & ~1) - (cur_y & ~1);
         if (slice_size > src_size - off) {
             av_log(avctx, AV_LOG_ERROR,
                    "invalid slice size %d (only %d bytes left)\n",
@@ -170,13 +567,107 @@
                    AV_RL32(src + off), slice_size - 16);
         }
         init_get_bits(&gb2, src + off + 16, (slice_size - 16) * 8);
-        dx2_decode_slice(&gb2, avctx->width, slice_height, Y, U, V,
-                         pic->linesize[0], pic->linesize[1], pic->linesize[2]);
+        dx2_decode_slice_420(&gb2, avctx->width, slice_height, Y, U, V,
+                             pic->linesize[0], pic->linesize[1],
+                             pic->linesize[2]);
 
         Y += pic->linesize[0] *  slice_height;
         U += pic->linesize[1] * (slice_height >> 1);
         V += pic->linesize[2] * (slice_height >> 1);
         off += slice_size;
+        cur_y   = next_y;
+        next_y += ref_slice_height;
+    }
+
+    return 0;
+}
+
+static int dx2_decode_slice_444(GetBitContext *gb, int width, int height,
+                                uint8_t *Y, uint8_t *U, uint8_t *V,
+                                int ystride, int ustride, int vstride)
+{
+    int x, y, i;
+    uint8_t lru[3][8];
+
+    for (i = 0; i < 3; i++)
+        memcpy(lru[i], def_lru, 8 * sizeof(*def_lru));
+
+    for (y = 0; y < height; y++) {
+        for (x = 0; x < width; x++) {
+            Y[x] = decode_sym(gb, lru[0]);
+            U[x] = decode_sym(gb, lru[1]) ^ 0x80;
+            V[x] = decode_sym(gb, lru[2]) ^ 0x80;
+        }
+
+        Y += ystride;
+        U += ustride;
+        V += vstride;
+    }
+
+    return 0;
+}
+
+static int dxtory_decode_v2_444(AVCodecContext *avctx, AVFrame *pic,
+                                const uint8_t *src, int src_size)
+{
+    GetByteContext gb;
+    GetBitContext  gb2;
+    int nslices, slice, slice_height;
+    uint32_t off, slice_size;
+    uint8_t *Y, *U, *V;
+    int ret;
+
+    bytestream2_init(&gb, src, src_size);
+    nslices = bytestream2_get_le16(&gb);
+    off = FFALIGN(nslices * 4 + 2, 16);
+    if (src_size < off) {
+        av_log(avctx, AV_LOG_ERROR, "no slice data\n");
+        return AVERROR_INVALIDDATA;
+    }
+
+    if (!nslices || avctx->height % nslices) {
+        avpriv_request_sample(avctx, "%d slices for %dx%d", nslices,
+                              avctx->width, avctx->height);
+        return AVERROR_PATCHWELCOME;
+    }
+
+    slice_height = avctx->height / nslices;
+
+    avctx->pix_fmt = AV_PIX_FMT_YUV444P;
+    if ((ret = ff_get_buffer(avctx, pic, 0)) < 0)
+        return ret;
+
+    Y = pic->data[0];
+    U = pic->data[1];
+    V = pic->data[2];
+
+    for (slice = 0; slice < nslices; slice++) {
+        slice_size = bytestream2_get_le32(&gb);
+        if (slice_size > src_size - off) {
+            av_log(avctx, AV_LOG_ERROR,
+                   "invalid slice size %d (only %d bytes left)\n",
+                   slice_size, src_size - off);
+            return AVERROR_INVALIDDATA;
+        }
+        if (slice_size <= 16) {
+            av_log(avctx, AV_LOG_ERROR, "invalid slice size %d\n", slice_size);
+            return AVERROR_INVALIDDATA;
+        }
+
+        if (AV_RL32(src + off) != slice_size - 16) {
+            av_log(avctx, AV_LOG_ERROR,
+                   "Slice sizes mismatch: got %d instead of %d\n",
+                   AV_RL32(src + off), slice_size - 16);
+        }
+        init_get_bits(&gb2, src + off + 16, (slice_size - 16) * 8);
+        dx2_decode_slice_444(&gb2, avctx->width, slice_height, Y, U, V,
+                             pic->linesize[0], pic->linesize[1],
+                             pic->linesize[2]);
+
+        Y += pic->linesize[0] * slice_height;
+        U += pic->linesize[1] * slice_height;
+        V += pic->linesize[2] * slice_height;
+        off += slice_size;
     }
 
     return 0;
@@ -195,11 +686,46 @@
     }
 
     switch (AV_RB32(src)) {
+    case 0x01000001:
+        ret = dxtory_decode_v1_rgb(avctx, pic, src + 16, avpkt->size - 16,
+                                   AV_PIX_FMT_BGR24, 3);
+        break;
+    case 0x01000009:
+        ret = dxtory_decode_v2_rgb(avctx, pic, src + 16, avpkt->size - 16);
+        break;
     case 0x02000001:
-        ret = dxtory_decode_v1(avctx, pic, src + 16, avpkt->size - 16);
+        ret = dxtory_decode_v1_420(avctx, pic, src + 16, avpkt->size - 16);
         break;
     case 0x02000009:
-        ret = dxtory_decode_v2(avctx, pic, src + 16, avpkt->size - 16);
+        ret = dxtory_decode_v2_420(avctx, pic, src + 16, avpkt->size - 16);
+        break;
+    case 0x03000001:
+        ret = dxtory_decode_v1_410(avctx, pic, src + 16, avpkt->size - 16);
+        break;
+    case 0x03000009:
+        ret = dxtory_decode_v2_410(avctx, pic, src + 16, avpkt->size - 16);
+        break;
+    case 0x04000001:
+        ret = dxtory_decode_v1_444(avctx, pic, src + 16, avpkt->size - 16);
+        break;
+    case 0x04000009:
+        ret = dxtory_decode_v2_444(avctx, pic, src + 16, avpkt->size - 16);
+        break;
+    case 0x17000001:
+        ret = dxtory_decode_v1_rgb(avctx, pic, src + 16, avpkt->size - 16,
+                                   AV_PIX_FMT_RGB565LE, 2);
+        break;
+    case 0x17000009:
+        ret = dxtory_decode_v2_565(avctx, pic, src + 16, avpkt->size - 16, 1);
+        break;
+    case 0x18000001:
+    case 0x19000001:
+        ret = dxtory_decode_v1_rgb(avctx, pic, src + 16, avpkt->size - 16,
+                                   AV_PIX_FMT_RGB555LE, 2);
+        break;
+    case 0x18000009:
+    case 0x19000009:
+        ret = dxtory_decode_v2_565(avctx, pic, src + 16, avpkt->size - 16, 0);
         break;
     default:
         avpriv_request_sample(avctx, "Frame header %X", AV_RB32(src));

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/dxva2.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/dxva2.c Changed

@@ -20,6 +20,14 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <assert.h>
+#include <string.h>
+
+#include "libavutil/log.h"
+#include "libavutil/time.h"
+
+#include "avcodec.h"
+#include "mpegvideo.h"
 #include "dxva2_internal.h"
 
 void *ff_dxva2_get_surface(const Picture *picture)
@@ -50,10 +58,13 @@
     void     *dxva_data;
     unsigned dxva_size;
     int      result;
+    HRESULT hr;
 
-    if (FAILED(IDirectXVideoDecoder_GetBuffer(ctx->decoder, type,
-                                              &dxva_data, &dxva_size))) {
-        av_log(avctx, AV_LOG_ERROR, "Failed to get a buffer for %d\n", type);
+    hr = IDirectXVideoDecoder_GetBuffer(ctx->decoder, type,
+                                        &dxva_data, &dxva_size);
+    if (FAILED(hr)) {
+        av_log(avctx, AV_LOG_ERROR, "Failed to get a buffer for %u: 0x%lx\n",
+               type, hr);
         return -1;
     }
     if (size <= dxva_size) {
@@ -66,11 +77,15 @@
 
         result = 0;
     } else {
-        av_log(avctx, AV_LOG_ERROR, "Buffer for type %d was too small\n", type);
+        av_log(avctx, AV_LOG_ERROR, "Buffer for type %u was too small\n", type);
         result = -1;
     }
-    if (FAILED(IDirectXVideoDecoder_ReleaseBuffer(ctx->decoder, type))) {
-        av_log(avctx, AV_LOG_ERROR, "Failed to release buffer type %d\n", type);
+
+    hr = IDirectXVideoDecoder_ReleaseBuffer(ctx->decoder, type);
+    if (FAILED(hr)) {
+        av_log(avctx, AV_LOG_ERROR,
+               "Failed to release buffer type %u: 0x%lx\n",
+               type, hr);
         result = -1;
     }
     return result;
@@ -87,12 +102,19 @@
     unsigned               buffer_count = 0;
     DXVA2_DecodeBufferDesc buffer[4];
     DXVA2_DecodeExecuteParams exec = { 0 };
-    int      result;
-
-    if (FAILED(IDirectXVideoDecoder_BeginFrame(ctx->decoder,
-                                               ff_dxva2_get_surface(pic),
-                                               NULL))) {
-        av_log(avctx, AV_LOG_ERROR, "Failed to begin frame\n");
+    int result, runs = 0;
+    HRESULT hr;
+
+    do {
+        hr = IDirectXVideoDecoder_BeginFrame(ctx->decoder,
+                                             ff_dxva2_get_surface(pic),
+                                             NULL);
+        if (hr == E_PENDING)
+            av_usleep(2000);
+    } while (hr == E_PENDING && ++runs < 50);
+
+    if (FAILED(hr)) {
+        av_log(avctx, AV_LOG_ERROR, "Failed to begin frame: 0x%lx\n", hr);
         return -1;
     }
 
@@ -135,14 +157,16 @@
     exec.NumCompBuffers      = buffer_count;
     exec.pCompressedBuffers  = buffer;
     exec.pExtensionData      = NULL;
-    if (FAILED(IDirectXVideoDecoder_Execute(ctx->decoder, &exec))) {
-        av_log(avctx, AV_LOG_ERROR, "Failed to execute\n");
+    hr = IDirectXVideoDecoder_Execute(ctx->decoder, &exec);
+    if (FAILED(hr)) {
+        av_log(avctx, AV_LOG_ERROR, "Failed to execute: 0x%lx\n", hr);
         result = -1;
     }
 
 end:
-    if (FAILED(IDirectXVideoDecoder_EndFrame(ctx->decoder, NULL))) {
-        av_log(avctx, AV_LOG_ERROR, "Failed to end frame\n");
+    hr = IDirectXVideoDecoder_EndFrame(ctx->decoder, NULL);
+    if (FAILED(hr)) {
+        av_log(avctx, AV_LOG_ERROR, "Failed to end frame: 0x%lx\n", hr);
         result = -1;
     }

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/dxva2_h264.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/dxva2_h264.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/dxva2_mpeg2.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/dxva2_mpeg2.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/dxva2_vc1.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/dxva2_vc1.c Changed

@@ -38,6 +38,15 @@
 {
     const MpegEncContext *s = &v->s;
     const Picture *current_picture = s->current_picture_ptr;
+    int intcomp = 0;
+
+    // determine if intensity compensation is needed
+    if (s->pict_type == AV_PICTURE_TYPE_P) {
+      if ((v->fcm == ILACE_FRAME && v->intcomp) || (v->fcm != ILACE_FRAME && v->mv_mode == MV_PMODE_INTENSITY_COMP)) {
+        if (v->lumscale != 32 || v->lumshift != 0 || (s->picture_structure != PICT_FRAME && (v->lumscale2 != 32 && v->lumshift2 != 0)))
+          intcomp = 1;
+      }
+    }
 
     memset(pp, 0, sizeof(*pp));
     pp->wDecodedPictureIndex    =
@@ -74,7 +83,7 @@
     pp->bBidirectionalAveragingMode = (1                                           << 7) |
                                       ((ctx->cfg->ConfigIntraResidUnsigned != 0)   << 6) |
                                       ((ctx->cfg->ConfigResidDiffAccelerator != 0) << 5) |
-                                      ((v->lumscale != 32 || v->lumshift != 0)     << 4) |
+                                      (intcomp                                     << 4) |
                                       ((v->profile == PROFILE_ADVANCED)            << 3);
     pp->bMVprecisionAndChromaRelation = ((v->mv_mode == MV_PMODE_1MV_HPEL_BILIN) << 3) |
                                         (1                                       << 2) |
@@ -97,7 +106,7 @@
                                   (v->vstransform      );
     pp->bPicOverflowBlocks      = (v->quantizer_mode << 6) |
                                   (v->multires       << 5) |
-                                  (s->resync_marker  << 4) |
+                                  (v->resync_marker  << 4) |
                                   (v->rangered       << 3) |
                                   (s->max_b_frames       );
     pp->bPicExtrapolation       = (!v->interlace || v->fcm == PROGRESSIVE) ? 1 : 2;
@@ -122,15 +131,25 @@
                                   (v->range_mapuv_flag << 3) |
                                   (v->range_mapuv          );
     pp->bPicBinPB               = 0;
-    pp->bMV_RPS                 = 0;
-    pp->bReservedBits           = 0;
+    pp->bMV_RPS                 = (v->fcm == ILACE_FIELD && pp->bPicBackwardPrediction) ? v->refdist + 9 : 0;
+    pp->bReservedBits           = v->pq;
     if (s->picture_structure == PICT_FRAME) {
-        pp->wBitstreamFcodes        = v->lumscale;
-        pp->wBitstreamPCEelements   = v->lumshift;
+        if (intcomp) {
+            pp->wBitstreamFcodes      = v->lumscale;
+            pp->wBitstreamPCEelements = v->lumshift;
+        } else {
+            pp->wBitstreamFcodes      = 32;
+            pp->wBitstreamPCEelements = 0;
+        }
     } else {
         /* Syntax: (top_field_param << 8) | bottom_field_param */
-        pp->wBitstreamFcodes        = (v->lumscale << 8) | v->lumscale;
-        pp->wBitstreamPCEelements   = (v->lumshift << 8) | v->lumshift;
+        if (intcomp) {
+            pp->wBitstreamFcodes      = (v->lumscale << 8) | v->lumscale2;
+            pp->wBitstreamPCEelements = (v->lumshift << 8) | v->lumshift2;
+        } else {
+            pp->wBitstreamFcodes      = (32 << 8) | 32;
+            pp->wBitstreamPCEelements = 0;
+        }
     }
     pp->bBitstreamConcealmentNeed   = 0;
     pp->bBitstreamConcealmentMethod = 0;
@@ -148,8 +167,8 @@
     slice->dwSliceBitsInBuffer = 8 * size;
     slice->dwSliceDataLocation = position;
     slice->bStartCodeBitOffset = 0;
-    slice->bReservedBits       = 0;
-    slice->wMBbitOffset        = get_bits_count(&s->gb);
+    slice->bReservedBits       = (s->pict_type == AV_PICTURE_TYPE_B && !v->bi_type) ? v->bfraction_lut_index + 9 : 0;
+    slice->wMBbitOffset        = v->p_frame_skipped ? 0xffff : get_bits_count(&s->gb);
     slice->wNumberMBsInSlice   = s->mb_width * s->mb_height; /* XXX We assume 1 slice */
     slice->wQuantizerScaleCode = v->pq;
     slice->wBadSliceChopping   = 0;

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/eac3dec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/eac3dec.c Changed

@@ -345,23 +345,22 @@
     if (get_bits1(gbc)) {
         /* center and surround mix levels */
         if (s->channel_mode > AC3_CHMODE_STEREO) {
-            skip_bits(gbc, 2);  // skip preferred stereo downmix mode
+            s->preferred_downmix = get_bits(gbc, 2);
             if (s->channel_mode & 1) {
                 /* if three front channels exist */
-                skip_bits(gbc, 3); //skip Lt/Rt center mix level
-                s->center_mix_level = get_bits(gbc, 3);
+                s->center_mix_level_ltrt = get_bits(gbc, 3);
+                s->center_mix_level      = get_bits(gbc, 3);
             }
             if (s->channel_mode & 4) {
                 /* if a surround channel exists */
-                skip_bits(gbc, 3); //skip Lt/Rt surround mix level
-                s->surround_mix_level = get_bits(gbc, 3);
+                s->surround_mix_level_ltrt = av_clip(get_bits(gbc, 3), 3, 7);
+                s->surround_mix_level      = av_clip(get_bits(gbc, 3), 3, 7);
             }
         }
 
         /* lfe mix level */
-        if (s->lfe_on && get_bits1(gbc)) {
-            // TODO: use LFE mix level
-            skip_bits(gbc, 5); // skip LFE mix level code
+        if (s->lfe_on && (s->lfe_mix_level_exists = get_bits1(gbc))) {
+            s->lfe_mix_level = get_bits(gbc, 5);
         }
 
         /* info for mixing with other streams and substreams */
@@ -413,10 +412,11 @@
         s->bitstream_mode = get_bits(gbc, 3);
         skip_bits(gbc, 2); // skip copyright bit and original bitstream bit
         if (s->channel_mode == AC3_CHMODE_STEREO) {
-            skip_bits(gbc, 4); // skip Dolby surround and headphone mode
+            s->dolby_surround_mode  = get_bits(gbc, 2);
+            s->dolby_headphone_mode = get_bits(gbc, 2);
         }
         if (s->channel_mode >= AC3_CHMODE_2F2R) {
-            skip_bits(gbc, 2); // skip Dolby surround EX mode
+            s->dolby_surround_ex_mode = get_bits(gbc, 2);
         }
         for (i = 0; i < (s->channel_mode ? 1 : 2); i++) {
             if (get_bits1(gbc)) {

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/eacmv.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/eacmv.c Changed

@@ -130,25 +130,31 @@
     }
 }
 
-static void cmv_process_header(CmvContext *s, const uint8_t *buf, const uint8_t *buf_end)
+static int cmv_process_header(CmvContext *s, const uint8_t *buf, const uint8_t *buf_end)
 {
-    int pal_start, pal_count, i;
+    int pal_start, pal_count, i, ret, fps;
 
     if(buf_end - buf < 16) {
         av_log(s->avctx, AV_LOG_WARNING, "truncated header\n");
-        return;
+        return AVERROR_INVALIDDATA;
     }
 
     s->width  = AV_RL16(&buf[4]);
     s->height = AV_RL16(&buf[6]);
-    if (s->avctx->width!=s->width || s->avctx->height!=s->height) {
-        avcodec_set_dimensions(s->avctx, s->width, s->height);
+
+    if (s->width  != s->avctx->width ||
+        s->height != s->avctx->height) {
         av_frame_unref(s->last_frame);
         av_frame_unref(s->last2_frame);
     }
 
-    s->avctx->time_base.num = 1;
-    s->avctx->time_base.den = AV_RL16(&buf[10]);
+    ret = ff_set_dimensions(s->avctx, s->width, s->height);
+    if (ret < 0)
+        return ret;
+
+    fps = AV_RL16(&buf[10]);
+    if (fps > 0)
+        s->avctx->time_base = (AVRational){ 1, fps };
 
     pal_start = AV_RL16(&buf[12]);
     pal_count = AV_RL16(&buf[14]);
@@ -158,6 +164,8 @@
         s->palette[i] = 0xFFU << 24 | AV_RB24(buf);
         buf += 3;
     }
+
+    return 0;
 }
 
 #define EA_PREAMBLE_SIZE 8
@@ -179,7 +187,9 @@
 
     if (AV_RL32(buf)==MVIh_TAG||AV_RB32(buf)==MVIh_TAG) {
         unsigned size = AV_RL32(buf + 4);
-        cmv_process_header(s, buf+EA_PREAMBLE_SIZE, buf_end);
+        ret = cmv_process_header(s, buf+EA_PREAMBLE_SIZE, buf_end);
+        if (ret < 0)
+            return ret;
         if (size > buf_end - buf - EA_PREAMBLE_SIZE)
             return -1;
         buf += size;

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/eamad.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/eamad.c Changed

@@ -45,7 +45,7 @@
 typedef struct MadContext {
     AVCodecContext *avctx;
     DSPContext dsp;
-    AVFrame last_frame;
+    AVFrame *last_frame;
     GetBitContext gb;
     void *bitstream_buf;
     unsigned int bitstream_buf_size;
@@ -65,6 +65,11 @@
     ff_init_scantable_permutation(s->dsp.idct_permutation, FF_NO_IDCT_PERM);
     ff_init_scantable(s->dsp.idct_permutation, &s->scantable, ff_zigzag_direct);
     ff_mpeg12_init_vlcs();
+
+    s->last_frame = av_frame_alloc();
+    if (!s->last_frame)
+        return AVERROR(ENOMEM);
+
     return 0;
 }
 
@@ -82,22 +87,22 @@
                               int j, int mv_x, int mv_y, int add)
 {
     if (j < 4) {
-        unsigned offset = (mb_y*16 + ((j&2)<<2) + mv_y)*t->last_frame.linesize[0] + mb_x*16 + ((j&1)<<3) + mv_x;
-        if (offset >= (t->avctx->height - 7) * t->last_frame.linesize[0] - 7)
+        unsigned offset = (mb_y*16 + ((j&2)<<2) + mv_y)*t->last_frame->linesize[0] + mb_x*16 + ((j&1)<<3) + mv_x;
+        if (offset >= (t->avctx->height - 7) * t->last_frame->linesize[0] - 7)
             return;
         comp(frame->data[0] + (mb_y*16 + ((j&2)<<2))*frame->linesize[0] + mb_x*16 + ((j&1)<<3),
              frame->linesize[0],
-             t->last_frame.data[0] + offset,
-             t->last_frame.linesize[0], add);
+             t->last_frame->data[0] + offset,
+             t->last_frame->linesize[0], add);
     } else if (!(t->avctx->flags & CODEC_FLAG_GRAY)) {
         int index = j - 3;
-        unsigned offset = (mb_y * 8 + (mv_y/2))*t->last_frame.linesize[index] + mb_x * 8 + (mv_x/2);
-        if (offset >= (t->avctx->height/2 - 7) * t->last_frame.linesize[index] - 7)
+        unsigned offset = (mb_y * 8 + (mv_y/2))*t->last_frame->linesize[index] + mb_x * 8 + (mv_x/2);
+        if (offset >= (t->avctx->height/2 - 7) * t->last_frame->linesize[index] - 7)
             return;
         comp(frame->data[index] + (mb_y*8)*frame->linesize[index] + mb_x * 8,
              frame->linesize[index],
-             t->last_frame.data[index] + offset,
-             t->last_frame.linesize[index], add);
+             t->last_frame->data[index] + offset,
+             t->last_frame->linesize[index], add);
     }
 }
 
@@ -205,7 +210,7 @@
     for (j=0; j<6; j++) {
         if (mv_map & (1<<j)) {  // mv_x and mv_y are guarded by mv_map
             int add = 2*decode_motion(&s->gb);
-            if (s->last_frame.data[0])
+            if (s->last_frame->data[0])
                 comp_block(s, frame, s->mb_x, s->mb_y, j, mv_x, mv_y, add);
         } else {
             s->dsp.clear_block(s->block);
@@ -263,28 +268,27 @@
     }
 
     if (avctx->width != width || avctx->height != height) {
+        av_frame_unref(s->last_frame);
         if((width * height)/2048*7 > buf_end-buf)
             return AVERROR_INVALIDDATA;
-        if ((ret = av_image_check_size(width, height, 0, avctx)) < 0)
+        if ((ret = ff_set_dimensions(avctx, width, height)) < 0)
             return ret;
-        avcodec_set_dimensions(avctx, width, height);
-        av_frame_unref(&s->last_frame);
     }
 
     if ((ret = ff_get_buffer(avctx, frame, AV_GET_BUFFER_FLAG_REF)) < 0)
         return ret;
 
-    if (inter && !s->last_frame.data[0]) {
+    if (inter && !s->last_frame->data[0]) {
         av_log(avctx, AV_LOG_WARNING, "Missing reference frame.\n");
-        ret = ff_get_buffer(avctx, &s->last_frame, AV_GET_BUFFER_FLAG_REF);
+        ret = ff_get_buffer(avctx, s->last_frame, AV_GET_BUFFER_FLAG_REF);
         if (ret < 0)
             return ret;
-        memset(s->last_frame.data[0], 0, s->last_frame.height *
-               s->last_frame.linesize[0]);
-        memset(s->last_frame.data[1], 0x80, s->last_frame.height / 2 *
-               s->last_frame.linesize[1]);
-        memset(s->last_frame.data[2], 0x80, s->last_frame.height / 2 *
-               s->last_frame.linesize[2]);
+        memset(s->last_frame->data[0], 0, s->last_frame->height *
+               s->last_frame->linesize[0]);
+        memset(s->last_frame->data[1], 0x80, s->last_frame->height / 2 *
+               s->last_frame->linesize[1]);
+        memset(s->last_frame->data[2], 0x80, s->last_frame->height / 2 *
+               s->last_frame->linesize[2]);
     }
 
     av_fast_padded_malloc(&s->bitstream_buf, &s->bitstream_buf_size,
@@ -303,8 +307,8 @@
     *got_frame = 1;
 
     if (chunk_type != MADe_TAG) {
-        av_frame_unref(&s->last_frame);
-        if ((ret = av_frame_ref(&s->last_frame, frame)) < 0)
+        av_frame_unref(s->last_frame);
+        if ((ret = av_frame_ref(s->last_frame, frame)) < 0)
             return ret;
     }
 
@@ -314,7 +318,7 @@
 static av_cold int decode_end(AVCodecContext *avctx)
 {
     MadContext *t = avctx->priv_data;
-    av_frame_unref(&t->last_frame);
+    av_frame_free(&t->last_frame);
     av_free(t->bitstream_buf);
     return 0;
 }

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/eatgq.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/eatgq.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/eatgv.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/eatgv.c Changed

@@ -40,7 +40,7 @@
 
 typedef struct TgvContext {
     AVCodecContext *avctx;
-    AVFrame last_frame;
+    AVFrame *last_frame;
     uint8_t *frame_buffer;
     int width,height;
     uint32_t palette[AVPALETTE_COUNT];
@@ -57,7 +57,11 @@
     s->avctx         = avctx;
     avctx->time_base = (AVRational){1, 15};
     avctx->pix_fmt   = AV_PIX_FMT_PAL8;
-    avcodec_get_frame_defaults(&s->last_frame);
+
+    s->last_frame = av_frame_alloc();
+    if (!s->last_frame)
+        return AVERROR(ENOMEM);
+
     return 0;
 }
 
@@ -177,9 +181,10 @@
     }
 
     if (num_blocks_packed > s->num_blocks_packed) {
-        if (av_reallocp_array(&s->block_codebook, num_blocks_packed, sizeof(*s->block_codebook))) {
+        int err;
+        if ((err = av_reallocp(&s->block_codebook, num_blocks_packed * 16)) < 0) {
             s->num_blocks_packed = 0;
-            return AVERROR(ENOMEM);
+            return err;
         }
         s->num_blocks_packed = num_blocks_packed;
     }
@@ -232,8 +237,8 @@
                     continue;
                 }
 
-                src = s->last_frame.data[0] + mx + my * s->last_frame.linesize[0];
-                src_stride = s->last_frame.linesize[0];
+                src = s->last_frame->data[0] + mx + my * s->last_frame->linesize[0];
+                src_stride = s->last_frame->linesize[0];
             } else {
                 int offset = vector - num_mvs;
                 if (offset < num_blocks_raw)
@@ -281,9 +286,10 @@
         s->width  = AV_RL16(&buf[0]);
         s->height = AV_RL16(&buf[2]);
         if (s->avctx->width != s->width || s->avctx->height != s->height) {
-            avcodec_set_dimensions(s->avctx, s->width, s->height);
             av_freep(&s->frame_buffer);
-            av_frame_unref(&s->last_frame);
+            av_frame_unref(s->last_frame);
+            if ((ret = ff_set_dimensions(s->avctx, s->width, s->height)) < 0)
+                return ret;
         }
 
         pal_count = AV_RL16(&buf[6]);
@@ -294,9 +300,6 @@
         }
     }
 
-    if ((ret = av_image_check_size(s->width, s->height, 0, avctx)) < 0)
-        return ret;
-
     if ((ret = ff_get_buffer(avctx, frame, AV_GET_BUFFER_FLAG_REF)) < 0)
         return ret;
 
@@ -308,7 +311,7 @@
         frame->pict_type = AV_PICTURE_TYPE_I;
 
         if (!s->frame_buffer &&
-            !(s->frame_buffer = av_malloc(s->width * s->height)))
+            !(s->frame_buffer = av_mallocz(s->width * s->height)))
             return AVERROR(ENOMEM);
 
         if (unpack(buf, buf_end, s->frame_buffer, s->avctx->width, s->avctx->height) < 0) {
@@ -320,7 +323,7 @@
                    s->frame_buffer + y * s->width,
                    s->width);
     } else {
-        if (!s->last_frame.data[0]) {
+        if (!s->last_frame->data[0]) {
             av_log(avctx, AV_LOG_WARNING, "inter frame without corresponding intra frame\n");
             return buf_size;
         }
@@ -332,8 +335,8 @@
         }
     }
 
-    av_frame_unref(&s->last_frame);
-    if ((ret = av_frame_ref(&s->last_frame, frame)) < 0)
+    av_frame_unref(s->last_frame);
+    if ((ret = av_frame_ref(s->last_frame, frame)) < 0)
         return ret;
 
     *got_frame = 1;
@@ -344,7 +347,7 @@
 static av_cold int tgv_decode_end(AVCodecContext *avctx)
 {
     TgvContext *s = avctx->priv_data;
-    av_frame_unref(&s->last_frame);
+    av_frame_free(&s->last_frame);
     av_freep(&s->frame_buffer);
     av_free(s->mv_codebook);
     av_free(s->block_codebook);

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/eatqi.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/eatqi.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/elbg.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/elbg.c Changed

@@ -324,7 +324,7 @@
 
 #define BIG_PRIME 433494437LL
 
-void ff_init_elbg(int *points, int dim, int numpoints, int *codebook,
+void avpriv_init_elbg(int *points, int dim, int numpoints, int *codebook,
                   int numCB, int max_steps, int *closest_cb,
                   AVLFG *rand_state)
 {
@@ -339,8 +339,8 @@
             memcpy(temp_points + i*dim, points + k*dim, dim*sizeof(int));
         }
 
-        ff_init_elbg(temp_points, dim, numpoints/8, codebook, numCB, 2*max_steps, closest_cb, rand_state);
-        ff_do_elbg(temp_points, dim, numpoints/8, codebook, numCB, 2*max_steps, closest_cb, rand_state);
+        avpriv_init_elbg(temp_points, dim, numpoints/8, codebook, numCB, 2*max_steps, closest_cb, rand_state);
+        avpriv_do_elbg(temp_points, dim, numpoints/8, codebook, numCB, 2*max_steps, closest_cb, rand_state);
 
         av_free(temp_points);
 
@@ -351,7 +351,7 @@
 
 }
 
-void ff_do_elbg(int *points, int dim, int numpoints, int *codebook,
+void avpriv_do_elbg(int *points, int dim, int numpoints, int *codebook,
                 int numCB, int max_steps, int *closest_cb,
                 AVLFG *rand_state)
 {

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/elbg.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/elbg.h Changed

@@ -37,7 +37,7 @@
  * @param closest_cb Return the closest codebook to each point. Must be allocated.
  * @param rand_state A random number generator state. Should be already initialized by av_lfg_init().
  */
-void ff_do_elbg(int *points, int dim, int numpoints, int *codebook,
+void avpriv_do_elbg(int *points, int dim, int numpoints, int *codebook,
                 int numCB, int num_steps, int *closest_cb,
                 AVLFG *rand_state);
 
@@ -45,10 +45,10 @@
  * Initialize the **codebook vector for the elbg algorithm. If you have already
  * a codebook and you want to refine it, you shouldn't call this function.
  * If numpoints < 8*numCB this function fills **codebook with random numbers.
- * If not, it calls ff_do_elbg for a (smaller) random sample of the points in
- * **points. Get the same parameters as ff_do_elbg.
+ * If not, it calls avpriv_do_elbg for a (smaller) random sample of the points in
+ * **points. Get the same parameters as avpriv_do_elbg.
  */
-void ff_init_elbg(int *points, int dim, int numpoints, int *codebook,
+void avpriv_init_elbg(int *points, int dim, int numpoints, int *codebook,
                   int numCB, int num_steps, int *closest_cb,
                   AVLFG *rand_state);

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/error_resilience.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/error_resilience.c Changed

@@ -27,11 +27,13 @@
 
 #include <limits.h>
 
+#include "libavutil/internal.h"
 #include "avcodec.h"
 #include "error_resilience.h"
 #include "mpegvideo.h"
 #include "rectangle.h"
 #include "thread.h"
+#include "version.h"
 
 /**
  * @param stride the number of MVs to get to the next row
@@ -698,8 +700,8 @@
         return 0; // almost all MBs damaged -> use temporal prediction
 
     // prevent dsp.sad() check, that requires access to the image
-    if (CONFIG_MPEG_XVMC_DECODER    &&
-        s->avctx->xvmc_acceleration &&
+    if (CONFIG_XVMC    &&
+        s->avctx->hwaccel && s->avctx->hwaccel->decode_mb &&
         s->cur_pic->f.pict_type == AV_PICTURE_TYPE_I)
         return 1;
 
@@ -762,6 +764,17 @@
     s->error_occurred = 0;
 }
 
+static int er_supported(ERContext *s)
+{
+    if(s->avctx->hwaccel && s->avctx->hwaccel->decode_slice           ||
+       s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU          ||
+       !s->cur_pic                                                    ||
+       s->cur_pic->field_picture
+    )
+        return 0;
+    return 1;
+}
+
 /**
  * Add a slice.
  * @param endx   x component of the last macroblock, can be -1
@@ -778,7 +791,7 @@
     const int end_xy   = s->mb_index2xy[end_i];
     int mask           = -1;
 
-    if (s->avctx->hwaccel)
+    if (s->avctx->hwaccel && s->avctx->hwaccel->decode_slice)
         return;
 
     if (start_i > end_i || start_xy > end_xy) {
@@ -828,7 +841,7 @@
     s->error_status_table[start_xy] |= VP_START;
 
     if (start_xy > 0 && !(s->avctx->active_thread_type & FF_THREAD_SLICE) &&
-        s->avctx->skip_top * s->mb_width < start_i) {
+        er_supported(s) && s->avctx->skip_top * s->mb_width < start_i) {
         int prev_status = s->error_status_table[s->mb_index2xy[start_i - 1]];
 
         prev_status &= ~ VP_START;
@@ -853,9 +866,7 @@
      * though it should not crash if enabled. */
     if (!s->avctx->error_concealment || s->error_count == 0            ||
         s->avctx->lowres                                               ||
-        s->avctx->hwaccel                                              ||
-        s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU          ||
-        !s->cur_pic || s->cur_pic->field_picture                               ||
+        !er_supported(s)                                               ||
         s->error_count == 3 * s->mb_width *
                           (s->avctx->skip_top + s->avctx->skip_bottom)) {
         return;
@@ -1173,8 +1184,8 @@
     } else
         guess_mv(s);
 
-    /* the filters below are not XvMC compatible, skip them */
-    if (CONFIG_MPEG_XVMC_DECODER && s->avctx->xvmc_acceleration)
+    /* the filters below manipulate raw image, skip them */
+    if (CONFIG_XVMC && s->avctx->hwaccel && s->avctx->hwaccel->decode_mb)
         goto ec_clean;
     /* fill DC for inter blocks */
     for (mb_y = 0; mb_y < s->mb_height; mb_y++) {

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/escape124.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/escape124.c Changed

@@ -42,7 +42,7 @@
 } CodeBook;
 
 typedef struct Escape124Context {
-    AVFrame frame;
+    AVFrame *frame;
 
     unsigned num_superblocks;
 
@@ -58,12 +58,15 @@
 {
     Escape124Context *s = avctx->priv_data;
 
-    avcodec_get_frame_defaults(&s->frame);
     avctx->pix_fmt = AV_PIX_FMT_RGB555;
 
     s->num_superblocks = ((unsigned)avctx->width / 8) *
                          ((unsigned)avctx->height / 8);
 
+    s->frame = av_frame_alloc();
+    if (!s->frame)
+        return AVERROR(ENOMEM);
+
     return 0;
 }
 
@@ -75,7 +78,7 @@
     for (i = 0; i < 3; i++)
         av_free(s->codebooks[i].blocks);
 
-    av_frame_unref(&s->frame);
+    av_frame_free(&s->frame);
 
     return 0;
 }
@@ -227,13 +230,13 @@
     // Leave last frame unchanged
     // FIXME: Is this necessary?  I haven't seen it in any real samples
     if (!(frame_flags & 0x114) || !(frame_flags & 0x7800000)) {
-        if (!s->frame.data[0])
+        if (!s->frame->data[0])
             return AVERROR_INVALIDDATA;
 
         av_log(avctx, AV_LOG_DEBUG, "Skipping frame\n");
 
         *got_frame = 1;
-        if ((ret = av_frame_ref(frame, &s->frame)) < 0)
+        if ((ret = av_frame_ref(frame, s->frame)) < 0)
             return ret;
 
         return frame_size;
@@ -272,8 +275,8 @@
 
     new_frame_data = (uint16_t*)frame->data[0];
     new_stride = frame->linesize[0] / 2;
-    old_frame_data = (uint16_t*)s->frame.data[0];
-    old_stride = s->frame.linesize[0] / 2;
+    old_frame_data = (uint16_t*)s->frame->data[0];
+    old_stride = s->frame->linesize[0] / 2;
 
     for (superblock_index = 0; superblock_index < s->num_superblocks;
          superblock_index++) {
@@ -350,8 +353,8 @@
            "Escape sizes: %i, %i, %i\n",
            frame_size, buf_size, get_bits_count(&gb) / 8);
 
-    av_frame_unref(&s->frame);
-    if ((ret = av_frame_ref(&s->frame, frame)) < 0)
+    av_frame_unref(s->frame);
+    if ((ret = av_frame_ref(s->frame, frame)) < 0)
         return ret;
 
     *got_frame = 1;

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/evrcdata.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/evrcdata.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/evrcdec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/evrcdec.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/exr.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/exr.c Changed

@@ -35,10 +35,12 @@
 #include "get_bits.h"
 #include "avcodec.h"
 #include "bytestream.h"
+#include "internal.h"
 #include "mathops.h"
 #include "thread.h"
 #include "libavutil/imgutils.h"
 #include "libavutil/avassert.h"
+#include "libavutil/opt.h"
 
 enum ExrCompr {
     EXR_RAW   = 0,
@@ -74,6 +76,7 @@
 } EXRThreadData;
 
 typedef struct EXRContext {
+    AVClass        *class;
     AVFrame *picture;
     int compr;
     enum ExrPixelType pixel_type;
@@ -97,8 +100,24 @@
 
     EXRThreadData *thread_data;
     int thread_data_size;
+
+    const char* layer;
 } EXRContext;
 
+#define OFFSET(x) offsetof(EXRContext, x)
+#define VD AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_DECODING_PARAM
+static const AVOption options[] = {
+    { "layer", "Set the decoding layer",   OFFSET(layer),        AV_OPT_TYPE_STRING, { .str = "" }, 0, 0, VD},
+    { NULL },
+};
+
+static const AVClass exr_class = {
+    .class_name = "EXR",
+    .item_name  = av_default_item_name,
+    .option     = options,
+    .version    = LIBAVUTIL_VERSION_INT,
+};
+
 /**
  * Converts from 32-bit float as uint32_t to uint16_t
  *
@@ -989,13 +1008,25 @@
                 int channel_index = -1;
                 int xsub, ysub;
 
-                if (!strcmp(buf, "R"))
+                const char* b = buf;
+
+                if ( strcmp( s->layer, "" ) != 0 ) {
+                    if ( strncmp( b, s->layer, strlen(s->layer) ) == 0 ) {
+                        b += strlen(s->layer);
+                        if ( *b == '.' ) ++b;   /* skip dot if not given */
+                        av_log( avctx, AV_LOG_INFO, "Layer %s.%s matched\n",
+                               s->layer, b );
+                    }
+                }
+
+
+                if (!strcmp(b, "R")||!strcmp(b, "X")||!strcmp(b,"U"))
                     channel_index = 0;
-                else if (!strcmp(buf, "G"))
+                else if (!strcmp(b, "G")||!strcmp(b, "Y")||!strcmp(b,"V"))
                     channel_index = 1;
-                else if (!strcmp(buf, "B"))
+                else if (!strcmp(b, "B")||!strcmp(b, "Z")||!strcmp(b,"W"))
                     channel_index = 2;
-                else if (!strcmp(buf, "A"))
+                else if (!strcmp(b, "A"))
                     channel_index = 3;
                 else
                     av_log(avctx, AV_LOG_WARNING, "Unsupported channel %.256s\n", buf);
@@ -1184,9 +1215,6 @@
         return AVERROR_PATCHWELCOME;
     }
 
-    if (av_image_check_size(w, h, 0, avctx))
-        return AVERROR_INVALIDDATA;
-
     // Verify the xmin, xmax, ymin, ymax and xdelta before setting the actual image size
     if (s->xmin > s->xmax ||
         s->ymin > s->ymax ||
@@ -1196,9 +1224,8 @@
         return AVERROR_INVALIDDATA;
     }
 
-    if (w != avctx->width || h != avctx->height) {
-        avcodec_set_dimensions(avctx, w, h);
-    }
+    if ((ret = ff_set_dimensions(avctx, w, h)) < 0)
+        return ret;
 
     s->desc = av_pix_fmt_desc_get(avctx->pix_fmt);
     out_line_size = avctx->width * 2 * s->desc->nb_components;
@@ -1278,4 +1305,5 @@
     .close              = decode_end,
     .decode             = decode_frame,
     .capabilities       = CODEC_CAP_DR1 | CODEC_CAP_FRAME_THREADS | CODEC_CAP_SLICE_THREADS,
+    .priv_class         = &exr_class,
 };

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/fft-fixed-test.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/fft-fixed-test.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/fft-fixed32-test.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/fft-fixed32-test.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/fft-internal.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/fft-internal.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/fft-test.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/fft-test.c Changed

@@ -29,7 +29,7 @@
 #include "libavutil/log.h"
 #include "libavutil/time.h"
 #include "fft.h"
-#if CONFIG_FFT_FLOAT
+#if FFT_FLOAT
 #include "dct.h"
 #include "rdft.h"
 #endif
@@ -51,11 +51,11 @@
    pim += (MUL16(are, bim) + MUL16(bre, aim));\
 }
 
-#if CONFIG_FFT_FLOAT
+#if FFT_FLOAT
 #   define RANGE 1.0
 #   define REF_SCALE(x, bits)  (x)
 #   define FMT "%10.6f"
-#elif CONFIG_FFT_FIXED_32
+#elif FFT_FIXED_32
 #   define RANGE 8388608
 #   define REF_SCALE(x, bits) (x)
 #   define FMT "%6d"
@@ -152,7 +152,7 @@
     }
 }
 
-#if CONFIG_FFT_FLOAT
+#if FFT_FLOAT
 static void idct_ref(FFTSample *output, FFTSample *input, int nbits)
 {
     int n = 1<<nbits;
@@ -252,7 +252,7 @@
     int do_inverse = 0;
     FFTContext s1, *s = &s1;
     FFTContext m1, *m = &m1;
-#if CONFIG_FFT_FLOAT
+#if FFT_FLOAT
     RDFTContext r1, *r = &r1;
     DCTContext d1, *d = &d1;
     int fft_size_2;
@@ -326,7 +326,7 @@
         ff_fft_init(s, fft_nbits, do_inverse);
         fft_ref_init(fft_nbits, do_inverse);
         break;
-#if CONFIG_FFT_FLOAT
+#if FFT_FLOAT
     case TRANSFORM_RDFT:
         if (do_inverse)
             av_log(NULL, AV_LOG_INFO,"IDFT_C2R");
@@ -383,7 +383,7 @@
         fft_ref(tab_ref, tab1, fft_nbits);
         err = check_diff((FFTSample *)tab_ref, (FFTSample *)tab, fft_size * 2, 1.0);
         break;
-#if CONFIG_FFT_FLOAT
+#if FFT_FLOAT
     case TRANSFORM_RDFT:
         fft_size_2 = fft_size >> 1;
         if (do_inverse) {
@@ -452,7 +452,7 @@
                     memcpy(tab, tab1, fft_size * sizeof(FFTComplex));
                     s->fft_calc(s, tab);
                     break;
-#if CONFIG_FFT_FLOAT
+#if FFT_FLOAT
                 case TRANSFORM_RDFT:
                     memcpy(tab2, tab1, fft_size * sizeof(FFTSample));
                     r->rdft_calc(r, tab2);
@@ -482,7 +482,7 @@
     case TRANSFORM_FFT:
         ff_fft_end(s);
         break;
-#if CONFIG_FFT_FLOAT
+#if FFT_FLOAT
     case TRANSFORM_RDFT:
         ff_rdft_end(r);
         break;

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/fft.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/fft.h Changed

@@ -22,19 +22,19 @@
 #ifndef AVCODEC_FFT_H
 #define AVCODEC_FFT_H
 
-#ifndef CONFIG_FFT_FLOAT
-#define CONFIG_FFT_FLOAT 1
+#ifndef FFT_FLOAT
+#define FFT_FLOAT 1
 #endif
 
-#ifndef CONFIG_FFT_FIXED_32
-#define CONFIG_FFT_FIXED_32 0
+#ifndef FFT_FIXED_32
+#define FFT_FIXED_32 0
 #endif
 
 #include <stdint.h>
 #include "config.h"
 #include "libavutil/mem.h"
 
-#if CONFIG_FFT_FLOAT
+#if FFT_FLOAT
 
 #include "avfft.h"
 
@@ -44,20 +44,20 @@
 
 #else
 
-#if CONFIG_FFT_FIXED_32
+#if FFT_FIXED_32
 
 #define Q31(x) (int)((x)*2147483648.0 + 0.5)
 #define FFT_NAME(x) x ## _fixed_32
 
 typedef int32_t FFTSample;
 
-#else /* CONFIG_FFT_FIXED_32 */
+#else /* FFT_FIXED_32 */
 
 #define FFT_NAME(x) x ## _fixed
 
 typedef int16_t FFTSample;
 
-#endif /* CONFIG_FFT_FIXED_32 */
+#endif /* FFT_FIXED_32 */
 
 typedef struct FFTComplex {
     FFTSample re, im;
@@ -66,7 +66,7 @@
 typedef int    FFTDouble;
 typedef struct FFTContext FFTContext;
 
-#endif /* CONFIG_FFT_FLOAT */
+#endif /* FFT_FLOAT */
 
 typedef struct FFTDComplex {
     FFTDouble re, im;

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/fft_fixed.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/fft_fixed.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/fft_fixed_32.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/fft_fixed_32.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/fft_float.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/fft_float.c Changed

omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/fft_template.c Added

@@ -0,0 +1,530 @@
+/*
+ * FFT/IFFT transforms
+ * Copyright (c) 2008 Loren Merritt
+ * Copyright (c) 2002 Fabrice Bellard
+ * Partly based on libdjbfft by D. J. Bernstein
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * FFT/IFFT transforms.
+ */
+
+#include <stdlib.h>
+#include <string.h>
+#include "libavutil/mathematics.h"
+#include "fft.h"
+#include "fft-internal.h"
+
+#if FFT_FIXED_32
+#include "fft_table.h"
+#else /* FFT_FIXED_32 */
+
+/* cos(2*pi*x/n) for 0<=x<=n/4, followed by its reverse */
+#if !CONFIG_HARDCODED_TABLES
+COSTABLE(16);
+COSTABLE(32);
+COSTABLE(64);
+COSTABLE(128);
+COSTABLE(256);
+COSTABLE(512);
+COSTABLE(1024);
+COSTABLE(2048);
+COSTABLE(4096);
+COSTABLE(8192);
+COSTABLE(16384);
+COSTABLE(32768);
+COSTABLE(65536);
+#endif
+COSTABLE_CONST FFTSample * const FFT_NAME(ff_cos_tabs)[] = {
+    NULL, NULL, NULL, NULL,
+    FFT_NAME(ff_cos_16),
+    FFT_NAME(ff_cos_32),
+    FFT_NAME(ff_cos_64),
+    FFT_NAME(ff_cos_128),
+    FFT_NAME(ff_cos_256),
+    FFT_NAME(ff_cos_512),
+    FFT_NAME(ff_cos_1024),
+    FFT_NAME(ff_cos_2048),
+    FFT_NAME(ff_cos_4096),
+    FFT_NAME(ff_cos_8192),
+    FFT_NAME(ff_cos_16384),
+    FFT_NAME(ff_cos_32768),
+    FFT_NAME(ff_cos_65536),
+};
+
+#endif /* FFT_FIXED_32 */
+
+static void fft_permute_c(FFTContext *s, FFTComplex *z);
+static void fft_calc_c(FFTContext *s, FFTComplex *z);
+
+static int split_radix_permutation(int i, int n, int inverse)
+{
+    int m;
+    if(n <= 2) return i&1;
+    m = n >> 1;
+    if(!(i&m))            return split_radix_permutation(i, m, inverse)*2;
+    m >>= 1;
+    if(inverse == !(i&m)) return split_radix_permutation(i, m, inverse)*4 + 1;
+    else                  return split_radix_permutation(i, m, inverse)*4 - 1;
+}
+
+av_cold void ff_init_ff_cos_tabs(int index)
+{
+#if (!CONFIG_HARDCODED_TABLES) && (!FFT_FIXED_32)
+    int i;
+    int m = 1<<index;
+    double freq = 2*M_PI/m;
+    FFTSample *tab = FFT_NAME(ff_cos_tabs)[index];
+    for(i=0; i<=m/4; i++)
+        tab[i] = FIX15(cos(i*freq));
+    for(i=1; i<m/4; i++)
+        tab[m/2-i] = tab[i];
+#endif
+}
+
+static const int avx_tab[] = {
+    0, 4, 1, 5, 8, 12, 9, 13, 2, 6, 3, 7, 10, 14, 11, 15
+};
+
+static int is_second_half_of_fft32(int i, int n)
+{
+    if (n <= 32)
+        return i >= 16;
+    else if (i < n/2)
+        return is_second_half_of_fft32(i, n/2);
+    else if (i < 3*n/4)
+        return is_second_half_of_fft32(i - n/2, n/4);
+    else
+        return is_second_half_of_fft32(i - 3*n/4, n/4);
+}
+
+static av_cold void fft_perm_avx(FFTContext *s)
+{
+    int i;
+    int n = 1 << s->nbits;
+
+    for (i = 0; i < n; i += 16) {
+        int k;
+        if (is_second_half_of_fft32(i, n)) {
+            for (k = 0; k < 16; k++)
+                s->revtab[-split_radix_permutation(i + k, n, s->inverse) & (n - 1)] =
+                    i + avx_tab[k];
+
+        } else {
+            for (k = 0; k < 16; k++) {
+                int j = i + k;
+                j = (j & ~7) | ((j >> 1) & 3) | ((j << 2) & 4);
+                s->revtab[-split_radix_permutation(i + k, n, s->inverse) & (n - 1)] = j;
+            }
+        }
+    }
+}
+
+av_cold int ff_fft_init(FFTContext *s, int nbits, int inverse)
+{
+    int i, j, n;
+
+    if (nbits < 2 || nbits > 16)
+        goto fail;
+    s->nbits = nbits;
+    n = 1 << nbits;
+
+    s->revtab = av_malloc(n * sizeof(uint16_t));
+    if (!s->revtab)
+        goto fail;
+    s->tmp_buf = av_malloc(n * sizeof(FFTComplex));
+    if (!s->tmp_buf)
+        goto fail;
+    s->inverse = inverse;
+    s->fft_permutation = FF_FFT_PERM_DEFAULT;
+
+    s->fft_permute = fft_permute_c;
+    s->fft_calc    = fft_calc_c;
+#if CONFIG_MDCT
+    s->imdct_calc  = ff_imdct_calc_c;
+    s->imdct_half  = ff_imdct_half_c;
+    s->mdct_calc   = ff_mdct_calc_c;
+#endif
+
+#if FFT_FIXED_32
+    {
+        int n=0;
+        ff_fft_lut_init(fft_offsets_lut, 0, 1 << 16, &n);
+    }
+#else /* FFT_FIXED_32 */
+#if FFT_FLOAT
+    if (ARCH_ARM)     ff_fft_init_arm(s);
+    if (ARCH_PPC)     ff_fft_init_ppc(s);
+    if (ARCH_X86)     ff_fft_init_x86(s);
+    if (CONFIG_MDCT)  s->mdct_calcw = s->mdct_calc;
+    if (HAVE_MIPSFPU) ff_fft_init_mips(s);
+#else
+    if (CONFIG_MDCT)  s->mdct_calcw = ff_mdct_calcw_c;
+    if (ARCH_ARM)     ff_fft_fixed_init_arm(s);
+#endif
+    for(j=4; j<=nbits; j++) {
+        ff_init_ff_cos_tabs(j);
+    }
+#endif /* FFT_FIXED_32 */
+
+
+    if (s->fft_permutation == FF_FFT_PERM_AVX) {
+        fft_perm_avx(s);
+    } else {
+        for(i=0; i<n; i++) {
+            j = i;
+            if (s->fft_permutation == FF_FFT_PERM_SWAP_LSBS)
+                j = (j&~3) | ((j>>1)&1) | ((j<<1)&2);
+            s->revtab[-split_radix_permutation(i, n, s->inverse) & (n-1)] = j;
+        }
+    }
+
+    return 0;
+ fail:
+    av_freep(&s->revtab);
+    av_freep(&s->tmp_buf);
+    return -1;
+}
+
+static void fft_permute_c(FFTContext *s, FFTComplex *z)
+{
+    int j, np;
+    const uint16_t *revtab = s->revtab;
+    np = 1 << s->nbits;
+    /* TODO: handle split-radix permute in a more optimal way, probably in-place */
+    for(j=0;j<np;j++) s->tmp_buf[revtab[j]] = z[j];
+    memcpy(z, s->tmp_buf, np * sizeof(FFTComplex));
+}
+
+av_cold void ff_fft_end(FFTContext *s)
+{
+    av_freep(&s->revtab);
+    av_freep(&s->tmp_buf);
+}
+
+#if FFT_FIXED_32
+
+static void fft_calc_c(FFTContext *s, FFTComplex *z) {
+
+    int nbits, i, n, num_transforms, offset, step;
+    int n4, n2, n34;
+    FFTSample tmp1, tmp2, tmp3, tmp4, tmp5, tmp6, tmp7, tmp8;
+    FFTComplex *tmpz;
+    FFTSample w_re, w_im;
+    FFTSample *w_re_ptr, *w_im_ptr;
+    const int fft_size = (1 << s->nbits);
+    int64_t accu;
+
+    num_transforms = (0x2aab >> (16 - s->nbits)) | 1;
+
+    for (n=0; n<num_transforms; n++){
+        offset = fft_offsets_lut[n] << 2;
+        tmpz = z + offset;
+
+        tmp1 = tmpz[0].re + tmpz[1].re;
+        tmp5 = tmpz[2].re + tmpz[3].re;
+        tmp2 = tmpz[0].im + tmpz[1].im;
+        tmp6 = tmpz[2].im + tmpz[3].im;
+        tmp3 = tmpz[0].re - tmpz[1].re;
+        tmp8 = tmpz[2].im - tmpz[3].im;
+        tmp4 = tmpz[0].im - tmpz[1].im;
+        tmp7 = tmpz[2].re - tmpz[3].re;
+
+        tmpz[0].re = tmp1 + tmp5;
+        tmpz[2].re = tmp1 - tmp5;
+        tmpz[0].im = tmp2 + tmp6;
+        tmpz[2].im = tmp2 - tmp6;
+        tmpz[1].re = tmp3 + tmp8;
+        tmpz[3].re = tmp3 - tmp8;
+        tmpz[1].im = tmp4 - tmp7;
+        tmpz[3].im = tmp4 + tmp7;
+    }
+
+    if (fft_size < 8)
+        return;
+
+    num_transforms = (num_transforms >> 1) | 1;
+
+    for (n=0; n<num_transforms; n++){
+        offset = fft_offsets_lut[n] << 3;
+        tmpz = z + offset;
+
+        tmp1 = tmpz[4].re + tmpz[5].re;
+        tmp3 = tmpz[6].re + tmpz[7].re;
+        tmp2 = tmpz[4].im + tmpz[5].im;
+        tmp4 = tmpz[6].im + tmpz[7].im;
+        tmp5 = tmp1 + tmp3;
+        tmp7 = tmp1 - tmp3;
+        tmp6 = tmp2 + tmp4;
+        tmp8 = tmp2 - tmp4;
+
+        tmp1 = tmpz[4].re - tmpz[5].re;
+        tmp2 = tmpz[4].im - tmpz[5].im;
+        tmp3 = tmpz[6].re - tmpz[7].re;
+        tmp4 = tmpz[6].im - tmpz[7].im;
+
+        tmpz[4].re = tmpz[0].re - tmp5;
+        tmpz[0].re = tmpz[0].re + tmp5;
+        tmpz[4].im = tmpz[0].im - tmp6;
+        tmpz[0].im = tmpz[0].im + tmp6;
+        tmpz[6].re = tmpz[2].re - tmp8;
+        tmpz[2].re = tmpz[2].re + tmp8;
+        tmpz[6].im = tmpz[2].im + tmp7;
+        tmpz[2].im = tmpz[2].im - tmp7;
+
+        accu = (int64_t)Q31(M_SQRT1_2)*(tmp1 + tmp2);
+        tmp5 = (int32_t)((accu + 0x40000000) >> 31);
+        accu = (int64_t)Q31(M_SQRT1_2)*(tmp3 - tmp4);
+        tmp7 = (int32_t)((accu + 0x40000000) >> 31);
+        accu = (int64_t)Q31(M_SQRT1_2)*(tmp2 - tmp1);
+        tmp6 = (int32_t)((accu + 0x40000000) >> 31);
+        accu = (int64_t)Q31(M_SQRT1_2)*(tmp3 + tmp4);
+        tmp8 = (int32_t)((accu + 0x40000000) >> 31);
+        tmp1 = tmp5 + tmp7;
+        tmp3 = tmp5 - tmp7;
+        tmp2 = tmp6 + tmp8;
+        tmp4 = tmp6 - tmp8;
+
+        tmpz[5].re = tmpz[1].re - tmp1;
+        tmpz[1].re = tmpz[1].re + tmp1;
+        tmpz[5].im = tmpz[1].im - tmp2;
+        tmpz[1].im = tmpz[1].im + tmp2;
+        tmpz[7].re = tmpz[3].re - tmp4;
+        tmpz[3].re = tmpz[3].re + tmp4;
+        tmpz[7].im = tmpz[3].im + tmp3;
+        tmpz[3].im = tmpz[3].im - tmp3;
+    }
+
+    step = 1 << ((MAX_LOG2_NFFT-4) - 4);
+    n4 = 4;
+
+    for (nbits=4; nbits<=s->nbits; nbits++){
+        n2  = 2*n4;
+        n34 = 3*n4;
+        num_transforms = (num_transforms >> 1) | 1;
+
+        for (n=0; n<num_transforms; n++){
+            offset = fft_offsets_lut[n] << nbits;
+            tmpz = z + offset;
+
+            tmp5 = tmpz[ n2].re + tmpz[n34].re;
+            tmp1 = tmpz[ n2].re - tmpz[n34].re;
+            tmp6 = tmpz[ n2].im + tmpz[n34].im;
+            tmp2 = tmpz[ n2].im - tmpz[n34].im;
+
+            tmpz[ n2].re = tmpz[ 0].re - tmp5;
+            tmpz[  0].re = tmpz[ 0].re + tmp5;
+            tmpz[ n2].im = tmpz[ 0].im - tmp6;
+            tmpz[  0].im = tmpz[ 0].im + tmp6;
+            tmpz[n34].re = tmpz[n4].re - tmp2;
+            tmpz[ n4].re = tmpz[n4].re + tmp2;
+            tmpz[n34].im = tmpz[n4].im + tmp1;
+            tmpz[ n4].im = tmpz[n4].im - tmp1;
+
+            w_re_ptr = w_tab_sr + step;
+            w_im_ptr = w_tab_sr + MAX_FFT_SIZE/(4*16) - step;
+
+            for (i=1; i<n4; i++){
+                w_re = w_re_ptr[0];
+                w_im = w_im_ptr[0];
+                accu  = (int64_t)w_re*tmpz[ n2+i].re;
+                accu += (int64_t)w_im*tmpz[ n2+i].im;
+                tmp1 = (int32_t)((accu + 0x40000000) >> 31);
+                accu  = (int64_t)w_re*tmpz[ n2+i].im;
+                accu -= (int64_t)w_im*tmpz[ n2+i].re;
+                tmp2 = (int32_t)((accu + 0x40000000) >> 31);
+                accu  = (int64_t)w_re*tmpz[n34+i].re;
+                accu -= (int64_t)w_im*tmpz[n34+i].im;
+                tmp3 = (int32_t)((accu + 0x40000000) >> 31);
+                accu  = (int64_t)w_re*tmpz[n34+i].im;
+                accu += (int64_t)w_im*tmpz[n34+i].re;
+                tmp4 = (int32_t)((accu + 0x40000000) >> 31);
+
+                tmp5 = tmp1 + tmp3;
+                tmp1 = tmp1 - tmp3;
+                tmp6 = tmp2 + tmp4;
+                tmp2 = tmp2 - tmp4;
+
+                tmpz[ n2+i].re = tmpz[   i].re - tmp5;
+                tmpz[    i].re = tmpz[   i].re + tmp5;
+                tmpz[ n2+i].im = tmpz[   i].im - tmp6;
+                tmpz[    i].im = tmpz[   i].im + tmp6;
+                tmpz[n34+i].re = tmpz[n4+i].re - tmp2;
+                tmpz[ n4+i].re = tmpz[n4+i].re + tmp2;
+                tmpz[n34+i].im = tmpz[n4+i].im + tmp1;
+                tmpz[ n4+i].im = tmpz[n4+i].im - tmp1;
+
+                w_re_ptr += step;
+                w_im_ptr -= step;
+            }
+        }
+        step >>= 1;
+        n4   <<= 1;
+    }
+}
+
+#else /* FFT_FIXED_32 */
+
+#define BUTTERFLIES(a0,a1,a2,a3) {\
+    BF(t3, t5, t5, t1);\
+    BF(a2.re, a0.re, a0.re, t5);\
+    BF(a3.im, a1.im, a1.im, t3);\
+    BF(t4, t6, t2, t6);\
+    BF(a3.re, a1.re, a1.re, t4);\
+    BF(a2.im, a0.im, a0.im, t6);\
+}
+
+// force loading all the inputs before storing any.
+// this is slightly slower for small data, but avoids store->load aliasing
+// for addresses separated by large powers of 2.
+#define BUTTERFLIES_BIG(a0,a1,a2,a3) {\
+    FFTSample r0=a0.re, i0=a0.im, r1=a1.re, i1=a1.im;\
+    BF(t3, t5, t5, t1);\
+    BF(a2.re, a0.re, r0, t5);\
+    BF(a3.im, a1.im, i1, t3);\
+    BF(t4, t6, t2, t6);\
+    BF(a3.re, a1.re, r1, t4);\
+    BF(a2.im, a0.im, i0, t6);\
+}
+
+#define TRANSFORM(a0,a1,a2,a3,wre,wim) {\
+    CMUL(t1, t2, a2.re, a2.im, wre, -wim);\
+    CMUL(t5, t6, a3.re, a3.im, wre,  wim);\
+    BUTTERFLIES(a0,a1,a2,a3)\
+}
+
+#define TRANSFORM_ZERO(a0,a1,a2,a3) {\
+    t1 = a2.re;\
+    t2 = a2.im;\
+    t5 = a3.re;\
+    t6 = a3.im;\
+    BUTTERFLIES(a0,a1,a2,a3)\
+}
+
+/* z[0...8n-1], w[1...2n-1] */
+#define PASS(name)\
+static void name(FFTComplex *z, const FFTSample *wre, unsigned int n)\
+{\
+    FFTDouble t1, t2, t3, t4, t5, t6;\
+    int o1 = 2*n;\
+    int o2 = 4*n;\
+    int o3 = 6*n;\
+    const FFTSample *wim = wre+o1;\
+    n--;\
+\
+    TRANSFORM_ZERO(z[0],z[o1],z[o2],z[o3]);\
+    TRANSFORM(z[1],z[o1+1],z[o2+1],z[o3+1],wre[1],wim[-1]);\
+    do {\
+        z += 2;\
+        wre += 2;\
+        wim -= 2;\
+        TRANSFORM(z[0],z[o1],z[o2],z[o3],wre[0],wim[0]);\
+        TRANSFORM(z[1],z[o1+1],z[o2+1],z[o3+1],wre[1],wim[-1]);\
+    } while(--n);\
+}
+
+PASS(pass)
+#undef BUTTERFLIES
+#define BUTTERFLIES BUTTERFLIES_BIG
+PASS(pass_big)
+
+#define DECL_FFT(n,n2,n4)\
+static void fft##n(FFTComplex *z)\
+{\
+    fft##n2(z);\
+    fft##n4(z+n4*2);\
+    fft##n4(z+n4*3);\
+    pass(z,FFT_NAME(ff_cos_##n),n4/2);\
+}
+
+static void fft4(FFTComplex *z)
+{
+    FFTDouble t1, t2, t3, t4, t5, t6, t7, t8;
+
+    BF(t3, t1, z[0].re, z[1].re);
+    BF(t8, t6, z[3].re, z[2].re);
+    BF(z[2].re, z[0].re, t1, t6);
+    BF(t4, t2, z[0].im, z[1].im);
+    BF(t7, t5, z[2].im, z[3].im);
+    BF(z[3].im, z[1].im, t4, t8);
+    BF(z[3].re, z[1].re, t3, t7);
+    BF(z[2].im, z[0].im, t2, t5);
+}
+
+static void fft8(FFTComplex *z)
+{
+    FFTDouble t1, t2, t3, t4, t5, t6;
+
+    fft4(z);
+
+    BF(t1, z[5].re, z[4].re, -z[5].re);
+    BF(t2, z[5].im, z[4].im, -z[5].im);
+    BF(t5, z[7].re, z[6].re, -z[7].re);
+    BF(t6, z[7].im, z[6].im, -z[7].im);
+
+    BUTTERFLIES(z[0],z[2],z[4],z[6]);
+    TRANSFORM(z[1],z[3],z[5],z[7],sqrthalf,sqrthalf);
+}
+
+#if !CONFIG_SMALL
+static void fft16(FFTComplex *z)
+{
+    FFTDouble t1, t2, t3, t4, t5, t6;
+    FFTSample cos_16_1 = FFT_NAME(ff_cos_16)[1];
+    FFTSample cos_16_3 = FFT_NAME(ff_cos_16)[3];
+
+    fft8(z);
+    fft4(z+8);
+    fft4(z+12);
+
+    TRANSFORM_ZERO(z[0],z[4],z[8],z[12]);
+    TRANSFORM(z[2],z[6],z[10],z[14],sqrthalf,sqrthalf);
+    TRANSFORM(z[1],z[5],z[9],z[13],cos_16_1,cos_16_3);
+    TRANSFORM(z[3],z[7],z[11],z[15],cos_16_3,cos_16_1);
+}
+#else
+DECL_FFT(16,8,4)
+#endif
+DECL_FFT(32,16,8)
+DECL_FFT(64,32,16)
+DECL_FFT(128,64,32)
+DECL_FFT(256,128,64)
+DECL_FFT(512,256,128)
+#if !CONFIG_SMALL
+#define pass pass_big
+#endif
+DECL_FFT(1024,512,256)
+DECL_FFT(2048,1024,512)
+DECL_FFT(4096,2048,1024)
+DECL_FFT(8192,4096,2048)
+DECL_FFT(16384,8192,4096)
+DECL_FFT(32768,16384,8192)
+DECL_FFT(65536,32768,16384)
+
+static void (* const fft_dispatch[])(FFTComplex*) = {
+    fft4, fft8, fft16, fft32, fft64, fft128, fft256, fft512, fft1024,
+    fft2048, fft4096, fft8192, fft16384, fft32768, fft65536,
+};
+
+static void fft_calc_c(FFTContext *s, FFTComplex *z)
+{
+    fft_dispatch[s->nbits-2](z);
+}
+#endif /* FFT_FIXED_32 */

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/ffv1.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/ffv1.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/ffv1.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/ffv1.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/ffv1dec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/ffv1dec.c Changed

@@ -260,7 +260,7 @@
             if (s->slice_coding_mode != 1) {
                 b -= offset;
                 r -= offset;
-                g -= (b + r) >> 2;
+                g -= (b * s->slice_rct_by_coef + r * s->slice_rct_ry_coef) >> 2;
                 b += g;
                 r += g;
             }
@@ -333,6 +333,14 @@
     if (fs->version > 3) {
         fs->slice_reset_contexts = get_rac(c, state);
         fs->slice_coding_mode = get_symbol(c, state, 0);
+        if (fs->slice_coding_mode != 1) {
+            fs->slice_rct_by_coef = get_symbol(c, state, 0);
+            fs->slice_rct_ry_coef = get_symbol(c, state, 0);
+            if ((uint64_t)fs->slice_rct_by_coef + (uint64_t)fs->slice_rct_ry_coef > 4) {
+                av_log(f->avctx, AV_LOG_ERROR, "slice_rct_y_coef out of range\n");
+                return AVERROR_INVALIDDATA;
+            }
+        }
     }
     return 0;
 }
@@ -381,6 +389,9 @@
         }
     }
 
+    fs->slice_rct_by_coef = 1;
+    fs->slice_rct_ry_coef = 1;
+
     if (f->version > 2) {
         if (ffv1_init_slice_state(f, fs) < 0)
             return AVERROR(ENOMEM);
@@ -938,12 +949,12 @@
             uint8_t *dst[4];
             ff_thread_await_progress(&f->last_picture, INT_MAX, 0);
             for (j = 0; j < 4; j++) {
-                int sh = (j==1 || j==2) ? f->chroma_h_shift : 0;
-                int sv = (j==1 || j==2) ? f->chroma_v_shift : 0;
-                dst[j] = p->data[j] + p->linesize[j]*
-                         (fs->slice_y>>sv) + (fs->slice_x>>sh);
-                src[j] = f->last_picture.f->data[j] + f->last_picture.f->linesize[j]*
-                         (fs->slice_y>>sv) + (fs->slice_x>>sh);
+                int sh = (j == 1 || j == 2) ? f->chroma_h_shift : 0;
+                int sv = (j == 1 || j == 2) ? f->chroma_v_shift : 0;
+                dst[j] = p->data[j] + p->linesize[j] *
+                         (fs->slice_y >> sv) + (fs->slice_x >> sh);
+                src[j] = f->last_picture.f->data[j] + f->last_picture.f->linesize[j] *
+                         (fs->slice_y >> sv) + (fs->slice_x >> sh);
             }
             av_image_copy(dst, p->linesize, (const uint8_t **)src,
                           f->last_picture.f->linesize,

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/ffv1enc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/ffv1enc.c Changed

@@ -405,7 +405,7 @@
     return 0;
 }
 
-static int encode_rgb_frame(FFV1Context *s, uint8_t *src[3], int w, int h, int stride[3])
+static int encode_rgb_frame(FFV1Context *s, uint8_t *src[3], int w, int h, const int stride[3])
 {
     int x, y, p, i;
     const int ring_size = s->avctx->context_model ? 3 : 2;
@@ -441,7 +441,7 @@
             if (s->slice_coding_mode != 1) {
                 b -= g;
                 r -= g;
-                g += (b + r) >> 2;
+                g += (b * s->slice_rct_by_coef + r * s->slice_rct_ry_coef) >> 2;
                 b += offset;
                 r += offset;
             }
@@ -557,8 +557,10 @@
 
     put_symbol(c, state, f->version, 0);
     if (f->version > 2) {
-        if (f->version == 3)
+        if (f->version == 3) {
             f->micro_version = 4;
+        } else if (f->version == 4)
+            f->micro_version = 2;
         put_symbol(c, state, f->micro_version, 0);
     }
 
@@ -672,9 +674,15 @@
     if ((avctx->flags & (CODEC_FLAG_PASS1|CODEC_FLAG_PASS2)) || avctx->slices>1)
         s->version = FFMAX(s->version, 2);
 
-    if (avctx->level == 3 || (avctx->level <= 0 && s->version == 2)) {
+    // Unspecified level & slices, we choose version 1.2+ to ensure multithreaded decodability
+    if (avctx->slices == 0 && avctx->level < 0 && avctx->width * avctx->height > 720*576)
+        s->version = FFMAX(s->version, 2);
+
+    if (avctx->level <= 0 && s->version == 2) {
         s->version = 3;
     }
+    if (avctx->level >= 0 && avctx->level <= 4)
+        s->version = FFMAX(s->version, avctx->level);
 
     if (s->ec < 0) {
         s->ec = (s->version >= 3);
@@ -771,6 +779,10 @@
         s->colorspace = 1;
         s->chroma_planes = 1;
         s->version = FFMAX(s->version, 1);
+        if (!s->ac) {
+            av_log(avctx, AV_LOG_ERROR, "bits_per_raw_sample of more than 8 needs -coder 1 currently\n");
+            return AVERROR(ENOSYS);
+        }
         break;
     default:
         av_log(avctx, AV_LOG_ERROR, "format not supported\n");
@@ -826,6 +838,12 @@
     if ((ret = ffv1_allocate_initial_states(s)) < 0)
         return ret;
 
+    avctx->coded_frame = av_frame_alloc();
+    if (!avctx->coded_frame)
+        return AVERROR(ENOMEM);
+
+    avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I;
+
     if (!s->transparency)
         s->plane_count = 2;
     if (!s->chroma_planes && s->version > 3)
@@ -985,7 +1003,93 @@
         if (fs->slice_coding_mode == 1)
             ffv1_clear_slice_state(f, fs);
         put_symbol(c, state, fs->slice_coding_mode, 0);
+        if (fs->slice_coding_mode != 1) {
+            put_symbol(c, state, fs->slice_rct_by_coef, 0);
+            put_symbol(c, state, fs->slice_rct_ry_coef, 0);
+        }
+    }
+}
+
+static void choose_rct_params(FFV1Context *fs, uint8_t *src[3], const int stride[3], int w, int h)
+{
+#define NB_Y_COEFF 15
+    static const int rct_y_coeff[15][2] = {
+        {0, 0}, //      4G
+        {1, 1}, //  R + 2G + B
+        {2, 2}, // 2R      + 2B
+        {0, 2}, //      2G + 2B
+        {2, 0}, // 2R + 2G
+        {4, 0}, // 4R
+        {0, 4}, //           4B
+
+        {0, 3}, //      1G + 3B
+        {3, 0}, // 3R + 1G
+        {3, 1}, // 3R      +  B
+        {1, 3}, //  R      + 3B
+        {1, 2}, //  R +  G + 2B
+        {2, 1}, // 2R +  G +  B
+        {0, 1}, //      3G +  B
+        {1, 0}, //  R + 3G
+    };
+
+    int stat[NB_Y_COEFF] = {0};
+    int x, y, i, p, best;
+    int16_t *sample[3];
+    int lbd = fs->bits_per_raw_sample <= 8;
+
+    for (y = 0; y < h; y++) {
+        int lastr=0, lastg=0, lastb=0;
+        for (p = 0; p < 3; p++)
+            sample[p] = fs->sample_buffer + p*w;
+
+        for (x = 0; x < w; x++) {
+            int b, g, r;
+            int ab, ag, ar;
+            if (lbd) {
+                unsigned v = *((uint32_t*)(src[0] + x*4 + stride[0]*y));
+                b =  v        & 0xFF;
+                g = (v >>  8) & 0xFF;
+                r = (v >> 16) & 0xFF;
+            } else {
+                b = *((uint16_t*)(src[0] + x*2 + stride[0]*y));
+                g = *((uint16_t*)(src[1] + x*2 + stride[1]*y));
+                r = *((uint16_t*)(src[2] + x*2 + stride[2]*y));
+            }
+
+            ar = r - lastr;
+            ag = g - lastg;
+            ab = b - lastb;
+            if (x && y) {
+                int bg = ag - sample[0][x];
+                int bb = ab - sample[1][x];
+                int br = ar - sample[2][x];
+
+                br -= bg;
+                bb -= bg;
+
+                for (i = 0; i<NB_Y_COEFF; i++) {
+                    stat[i] += FFABS(bg + ((br*rct_y_coeff[i][0] + bb*rct_y_coeff[i][1])>>2));
+                }
+
+            }
+            sample[0][x] = ag;
+            sample[1][x] = ab;
+            sample[2][x] = ar;
+
+            lastr = r;
+            lastg = g;
+            lastb = b;
+        }
+    }
+
+    best = 0;
+    for (i=1; i<NB_Y_COEFF; i++) {
+        if (stat[i] < stat[best])
+            best = i;
     }
+
+    fs->slice_rct_by_coef = rct_y_coeff[best][1];
+    fs->slice_rct_ry_coef = rct_y_coeff[best][0];
 }
 
 static int encode_slice(AVCodecContext *c, void *arg)
@@ -996,15 +1100,24 @@
     int height       = fs->slice_height;
     int x            = fs->slice_x;
     int y            = fs->slice_y;
-    AVFrame *const p = f->picture.f;
+    const AVFrame *const p = f->picture.f;
     const int ps     = av_pix_fmt_desc_get(c->pix_fmt)->comp[0].step_minus1 + 1;
     int ret;
     RangeCoder c_bak = fs->c;
+    uint8_t *planes[3] = {p->data[0] + ps*x + y*p->linesize[0],
+                          p->data[1] + ps*x + y*p->linesize[1],
+                          p->data[2] + ps*x + y*p->linesize[2]};
 
     fs->slice_coding_mode = 0;
+    if (f->version > 3) {
+        choose_rct_params(fs, planes, p->linesize, width, height);
+    } else {
+        fs->slice_rct_by_coef = 1;
+        fs->slice_rct_ry_coef = 1;
+    }
 
 retry:
-    if (p->key_frame)
+    if (c->coded_frame->key_frame)
         ffv1_clear_slice_state(f, fs);
     if (f->version > 2) {
         encode_slice_header(f, fs);
@@ -1033,9 +1146,6 @@
         if (fs->transparency)
             ret |= encode_plane(fs, p->data[3] + ps*x + y*p->linesize[3], width, height, p->linesize[3], 2);
     } else {
-        uint8_t *planes[3] = {p->data[0] + ps*x + y*p->linesize[0],
-                              p->data[1] + ps*x + y*p->linesize[1],
-                              p->data[2] + ps*x + y*p->linesize[2]};
         ret = encode_rgb_frame(fs, planes, width, height, p->linesize);
     }
     emms_c();
@@ -1068,6 +1178,51 @@
     int64_t maxsize =   FF_MIN_BUFFER_SIZE
                       + avctx->width*avctx->height*35LL*4;
 
+    if(!pict) {
+        if (avctx->flags & CODEC_FLAG_PASS1) {
+            int j, k, m;
+            char *p   = avctx->stats_out;
+            char *end = p + STATS_OUT_SIZE;
+
+            memset(f->rc_stat, 0, sizeof(f->rc_stat));
+            for (i = 0; i < f->quant_table_count; i++)
+                memset(f->rc_stat2[i], 0, f->context_count[i] * sizeof(*f->rc_stat2[i]));
+
+            for (j = 0; j < f->slice_count; j++) {
+                FFV1Context *fs = f->slice_context[j];
+                for (i = 0; i < 256; i++) {
+                    f->rc_stat[i][0] += fs->rc_stat[i][0];
+                    f->rc_stat[i][1] += fs->rc_stat[i][1];
+                }
+                for (i = 0; i < f->quant_table_count; i++) {
+                    for (k = 0; k < f->context_count[i]; k++)
+                        for (m = 0; m < 32; m++) {
+                            f->rc_stat2[i][k][m][0] += fs->rc_stat2[i][k][m][0];
+                            f->rc_stat2[i][k][m][1] += fs->rc_stat2[i][k][m][1];
+                        }
+                }
+            }
+
+            for (j = 0; j < 256; j++) {
+                snprintf(p, end - p, "%" PRIu64 " %" PRIu64 " ",
+                        f->rc_stat[j][0], f->rc_stat[j][1]);
+                p += strlen(p);
+            }
+            snprintf(p, end - p, "\n");
+
+            for (i = 0; i < f->quant_table_count; i++) {
+                for (j = 0; j < f->context_count[i]; j++)
+                    for (m = 0; m < 32; m++) {
+                        snprintf(p, end - p, "%" PRIu64 " %" PRIu64 " ",
+                                f->rc_stat2[i][j][m][0], f->rc_stat2[i][j][m][1]);
+                        p += strlen(p);
+                    }
+            }
+            snprintf(p, end - p, "%d\n", f->gob_count);
+        }
+        return 0;
+    }
+
     if (f->version > 3)
         maxsize = FF_MIN_BUFFER_SIZE + avctx->width*avctx->height*3LL*4;
 
@@ -1080,16 +1235,16 @@
     av_frame_unref(p);
     if ((ret = av_frame_ref(p, pict)) < 0)
         return ret;
-    p->pict_type = AV_PICTURE_TYPE_I;
+    avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I;
 
     if (avctx->gop_size == 0 || f->picture_number % avctx->gop_size == 0) {
         put_rac(c, &keystate, 1);
-        p->key_frame = 1;
+        avctx->coded_frame->key_frame = 1;
         f->gob_count++;
         write_header(f);
     } else {
         put_rac(c, &keystate, 0);
-        p->key_frame = 0;
+        avctx->coded_frame->key_frame = 0;
     }
 
     if (f->ac > 1) {
@@ -1139,57 +1294,26 @@
         buf_p += bytes;
     }
 
-    if ((avctx->flags & CODEC_FLAG_PASS1) && (f->picture_number & 31) == 0) {
-        int j, k, m;
-        char *p   = avctx->stats_out;
-        char *end = p + STATS_OUT_SIZE;
-
-        memset(f->rc_stat, 0, sizeof(f->rc_stat));
-        for (i = 0; i < f->quant_table_count; i++)
-            memset(f->rc_stat2[i], 0, f->context_count[i] * sizeof(*f->rc_stat2[i]));
-
-        for (j = 0; j < f->slice_count; j++) {
-            FFV1Context *fs = f->slice_context[j];
-            for (i = 0; i < 256; i++) {
-                f->rc_stat[i][0] += fs->rc_stat[i][0];
-                f->rc_stat[i][1] += fs->rc_stat[i][1];
-            }
-            for (i = 0; i < f->quant_table_count; i++) {
-                for (k = 0; k < f->context_count[i]; k++)
-                    for (m = 0; m < 32; m++) {
-                        f->rc_stat2[i][k][m][0] += fs->rc_stat2[i][k][m][0];
-                        f->rc_stat2[i][k][m][1] += fs->rc_stat2[i][k][m][1];
-                    }
-            }
-        }
-
-        for (j = 0; j < 256; j++) {
-            snprintf(p, end - p, "%" PRIu64 " %" PRIu64 " ",
-                     f->rc_stat[j][0], f->rc_stat[j][1]);
-            p += strlen(p);
-        }
-        snprintf(p, end - p, "\n");
-
-        for (i = 0; i < f->quant_table_count; i++) {
-            for (j = 0; j < f->context_count[i]; j++)
-                for (m = 0; m < 32; m++) {
-                    snprintf(p, end - p, "%" PRIu64 " %" PRIu64 " ",
-                             f->rc_stat2[i][j][m][0], f->rc_stat2[i][j][m][1]);
-                    p += strlen(p);
-                }
-        }
-        snprintf(p, end - p, "%d\n", f->gob_count);
-    } else if (avctx->flags & CODEC_FLAG_PASS1)
+    if (avctx->flags & CODEC_FLAG_PASS1)
         avctx->stats_out[0] = '\0';
 
     f->picture_number++;
     pkt->size   = buf_p - pkt->data;
-    pkt->flags |= AV_PKT_FLAG_KEY * p->key_frame;
+    pkt->pts    =
+    pkt->dts    = pict->pts;
+    pkt->flags |= AV_PKT_FLAG_KEY * avctx->coded_frame->key_frame;
     *got_packet = 1;
 
     return 0;
 }
 
+static av_cold int encode_close(AVCodecContext *avctx)
+{
+    av_frame_free(&avctx->coded_frame);
+    ffv1_close(avctx);
+    return 0;
+}
+
 #define OFFSET(x) offsetof(FFV1Context, x)
 #define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM
 static const AVOption options[] = {
@@ -1217,8 +1341,8 @@
     .priv_data_size = sizeof(FFV1Context),
     .init           = encode_init,
     .encode2        = encode_frame,
-    .close          = ffv1_close,
-    .capabilities   = CODEC_CAP_SLICE_THREADS,
+    .close          = encode_close,
+    .capabilities   = CODEC_CAP_SLICE_THREADS | CODEC_CAP_DELAY,
     .pix_fmts       = (const enum AVPixelFormat[]) {
         AV_PIX_FMT_YUV420P,   AV_PIX_FMT_YUVA420P,  AV_PIX_FMT_YUVA422P,  AV_PIX_FMT_YUV444P,
         AV_PIX_FMT_YUVA444P,  AV_PIX_FMT_YUV440P,   AV_PIX_FMT_YUV422P,   AV_PIX_FMT_YUV411P,

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/ffwavesynth.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/ffwavesynth.c Changed

@@ -93,7 +93,6 @@
     int64_t cur_ts;
     int64_t next_ts;
     int32_t *sin;
-    AVFrame frame;
     struct ws_interval *inter;
     uint32_t dither_state;
     uint32_t pink_state;
@@ -341,8 +340,6 @@
         ws->pink_need += ws->inter[i].type == WS_NOISE;
     ws->pink_state = MKTAG('P','I','N','K');
     ws->pink_pos = PINK_UNIT;
-    avcodec_get_frame_defaults(&ws->frame);
-    avc->coded_frame = &ws->frame;
     wavesynth_seek(ws, 0);
     avc->sample_fmt = AV_SAMPLE_FMT_S16;
     return 0;
@@ -428,6 +425,7 @@
                             AVPacket *packet)
 {
     struct wavesynth_context *ws = avc->priv_data;
+    AVFrame *frame = rframe;
     int64_t ts;
     int duration;
     int s, c, r;
@@ -443,11 +441,11 @@
     duration = AV_RL32(packet->data + 8);
     if (duration <= 0)
         return AVERROR(EINVAL);
-    ws->frame.nb_samples = duration;
-    r = ff_get_buffer(avc, &ws->frame, 0);
+    frame->nb_samples = duration;
+    r = ff_get_buffer(avc, frame, 0);
     if (r < 0)
         return r;
-    pcm = (int16_t *)ws->frame.data[0];
+    pcm = (int16_t *)frame->data[0];
     for (s = 0; s < duration; s++, ts++) {
         memset(channels, 0, avc->channels * sizeof(*channels));
         if (ts >= ws->next_ts)
@@ -458,7 +456,6 @@
     }
     ws->cur_ts += duration;
     *rgot_frame = 1;
-    *(AVFrame *)rframe = ws->frame;
     return packet->size;
 }

omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/fic.c Added

@@ -0,0 +1,304 @@
+/*
+ * Mirillis FIC decoder
+ *
+ * Copyright (c) 2014 Konstantin Shishkov
+ * Copyright (c) 2014 Derek Buitenhuis
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "libavutil/common.h"
+#include "avcodec.h"
+#include "internal.h"
+#include "dsputil.h"
+#include "get_bits.h"
+#include "golomb.h"
+
+typedef struct FICThreadContext {
+    DECLARE_ALIGNED(16, int16_t, block)[64];
+    uint8_t *src;
+    int slice_h;
+    int src_size;
+    int y_off;
+} FICThreadContext;
+
+typedef struct FICContext {
+    AVCodecContext *avctx;
+    AVFrame *frame;
+
+    DSPContext dsp;
+    ScanTable scantable;
+
+    FICThreadContext *slice_data;
+    int slice_data_size;
+
+    const uint8_t *qmat;
+
+    enum AVPictureType cur_frame_type;
+
+    int aligned_width, aligned_height;
+    int num_slices, slice_h;
+} FICContext;
+
+static const uint8_t fic_qmat_hq[64] = {
+    1, 2, 2, 2, 3, 3, 3, 4,
+    2, 2, 2, 3, 3, 3, 4, 4,
+    2, 2, 3, 3, 3, 4, 4, 4,
+    2, 2, 3, 3, 3, 4, 4, 5,
+    2, 3, 3, 3, 4, 4, 5, 6,
+    3, 3, 3, 4, 4, 5, 6, 7,
+    3, 3, 3, 4, 4, 5, 7, 7,
+    3, 3, 4, 4, 5, 7, 7, 7,
+};
+
+static const uint8_t fic_qmat_lq[64] = {
+    1,  5,  6,  7,  8,  9,  9, 11,
+    5,  5,  7,  8,  9,  9, 11, 12,
+    6,  7,  8,  9,  9, 11, 11, 12,
+    7,  7,  8,  9,  9, 11, 12, 13,
+    7,  8,  9,  9, 10, 11, 13, 16,
+    8,  9,  9, 10, 11, 13, 16, 19,
+    8,  9,  9, 11, 12, 15, 18, 23,
+    9,  9, 11, 12, 15, 18, 23, 27
+};
+
+static const uint8_t fic_header[7] = { 0, 0, 1, 'F', 'I', 'C', 'V' };
+
+#define FIC_HEADER_SIZE 27
+
+static int fic_decode_block(FICContext *ctx, GetBitContext *gb,
+                            uint8_t *dst, int stride, int16_t *block)
+{
+    int i, num_coeff;
+
+    /* Is it a skip block? */
+    if (get_bits1(gb)) {
+        /* This is a P-frame. */
+        ctx->frame->key_frame = 0;
+        ctx->frame->pict_type = AV_PICTURE_TYPE_P;
+
+        return 0;
+    }
+
+    ctx->dsp.clear_block(block);
+
+    num_coeff = get_bits(gb, 7);
+    if (num_coeff > 64)
+        return AVERROR_INVALIDDATA;
+
+    for (i = 0; i < num_coeff; i++)
+        block[ctx->scantable.permutated[i]] = get_se_golomb(gb) * ctx->qmat[i];
+
+    ctx->dsp.idct_put(dst, stride, block);
+
+    return 0;
+}
+
+static int fic_decode_slice(AVCodecContext *avctx, void *tdata)
+{
+    FICContext *ctx        = avctx->priv_data;
+    FICThreadContext *tctx = tdata;
+    GetBitContext gb;
+    uint8_t *src = tctx->src;
+    int slice_h  = tctx->slice_h;
+    int src_size = tctx->src_size;
+    int y_off    = tctx->y_off;
+    int x, y, p;
+
+    init_get_bits(&gb, src, src_size * 8);
+
+    for (p = 0; p < 3; p++) {
+        int stride   = ctx->frame->linesize[p];
+        uint8_t* dst = ctx->frame->data[p] + (y_off >> !!p) * stride;
+
+        for (y = 0; y < (slice_h >> !!p); y += 8) {
+            for (x = 0; x < (ctx->aligned_width >> !!p); x += 8) {
+                int ret;
+
+                if ((ret = fic_decode_block(ctx, &gb, dst + x, stride, tctx->block)) != 0)
+                    return ret;
+            }
+
+            dst += 8 * stride;
+        }
+    }
+
+    return 0;
+}
+
+static int fic_decode_frame(AVCodecContext *avctx, void *data,
+                            int *got_frame, AVPacket *avpkt)
+{
+    FICContext *ctx = avctx->priv_data;
+    uint8_t *src = avpkt->data;
+    int ret;
+    int slice, nslices;
+    int msize;
+    int tsize;
+    uint8_t *sdata;
+
+    if ((ret = ff_reget_buffer(avctx, ctx->frame)) < 0) {
+        av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n");
+        return ret;
+    }
+
+    /* Header + at least one slice (4) */
+    if (avpkt->size < FIC_HEADER_SIZE + 4) {
+        av_log(avctx, AV_LOG_ERROR, "Frame data is too small.\n");
+        return AVERROR_INVALIDDATA;
+    }
+
+    /* Check for header. */
+    if (memcmp(src, fic_header, 7))
+        av_log(avctx, AV_LOG_WARNING, "Invalid FIC Header.\n");
+
+    /* Is it a skip frame? */
+    if (src[17])
+        goto skip;
+
+    nslices = src[13];
+    if (!nslices) {
+        av_log(avctx, AV_LOG_ERROR, "Zero slices found.\n");
+        return AVERROR_INVALIDDATA;
+    }
+
+    /* High or Low Quality Matrix? */
+    ctx->qmat = src[23] ? fic_qmat_hq : fic_qmat_lq;
+
+    /* Skip cursor data. */
+    tsize = AV_RB24(src + 24);
+    if (tsize > avpkt->size - FIC_HEADER_SIZE) {
+        av_log(avctx, AV_LOG_ERROR, "Invalid cursor data size.\n");
+        return AVERROR_INVALIDDATA;
+    }
+
+    /* Slice height for all but the last slice. */
+    ctx->slice_h = 16 * (ctx->aligned_height >> 4) / nslices;
+    if (ctx->slice_h % 16)
+        ctx->slice_h = FFALIGN(ctx->slice_h - 16, 16);
+
+    /* First slice offset and remaining data. */
+    sdata = src + tsize + FIC_HEADER_SIZE + 4 * nslices;
+    msize = avpkt->size - nslices * 4 - tsize - FIC_HEADER_SIZE;
+
+    if (msize <= 0) {
+        av_log(avctx, AV_LOG_ERROR, "Not enough frame data to decode.\n");
+        return AVERROR_INVALIDDATA;
+    }
+
+    /*
+     * Set the frametype to I initially. It will be set to P if the frame
+     * has any dependencies (skip blocks). There will be a race condition
+     * inside the slice decode function to set these, but we do not care.
+     * since they will only ever be set to 0/P.
+     */
+    ctx->frame->key_frame = 1;
+    ctx->frame->pict_type = AV_PICTURE_TYPE_I;
+
+    /* Allocate slice data. */
+    av_fast_malloc(&ctx->slice_data, &ctx->slice_data_size,
+                   nslices * sizeof(ctx->slice_data[0]));
+    if (!ctx->slice_data_size) {
+        av_log(avctx, AV_LOG_ERROR, "Could not allocate slice data.\n");
+        return AVERROR(ENOMEM);
+    }
+    memset(ctx->slice_data, 0, nslices * sizeof(ctx->slice_data[0]));
+
+    for (slice = 0; slice < nslices; slice++) {
+        unsigned slice_off = AV_RB32(src + tsize + FIC_HEADER_SIZE + slice * 4);
+        unsigned slice_size;
+        int y_off   = ctx->slice_h * slice;
+        int slice_h = ctx->slice_h;
+
+        /*
+         * Either read the slice size, or consume all data left.
+         * Also, special case the last slight height.
+         */
+        if (slice == nslices - 1) {
+            slice_size   = msize;
+            slice_h      = FFALIGN(avctx->height - ctx->slice_h * (nslices - 1), 16);
+        } else {
+            slice_size = AV_RB32(src + tsize + FIC_HEADER_SIZE + slice * 4 + 4);
+        }
+
+        if (slice_size < slice_off || slice_size > msize)
+            continue;
+
+        slice_size -= slice_off;
+
+        ctx->slice_data[slice].src      = sdata + slice_off;
+        ctx->slice_data[slice].src_size = slice_size;
+        ctx->slice_data[slice].slice_h  = slice_h;
+        ctx->slice_data[slice].y_off    = y_off;
+    }
+
+    if (ret = avctx->execute(avctx, fic_decode_slice, ctx->slice_data,
+                             NULL, nslices, sizeof(ctx->slice_data[0])) < 0)
+        return ret;
+
+skip:
+    *got_frame = 1;
+    if ((ret = av_frame_ref(data, ctx->frame)) < 0)
+        return ret;
+
+    return avpkt->size;
+}
+
+static av_cold int fic_decode_close(AVCodecContext *avctx)
+{
+    FICContext *ctx = avctx->priv_data;
+
+    av_freep(&ctx->slice_data);
+    av_frame_free(&ctx->frame);
+
+    return 0;
+}
+
+static av_cold int fic_decode_init(AVCodecContext *avctx)
+{
+    FICContext *ctx = avctx->priv_data;
+
+    /* Initialize various context values */
+    ctx->avctx            = avctx;
+    ctx->aligned_width    = FFALIGN(avctx->width,  16);
+    ctx->aligned_height   = FFALIGN(avctx->height, 16);
+
+    avctx->pix_fmt             = AV_PIX_FMT_YUV420P;
+    avctx->bits_per_raw_sample = 8;
+
+    ctx->frame = av_frame_alloc();
+    if (!ctx->frame)
+        return AVERROR(ENOMEM);
+
+    ff_dsputil_init(&ctx->dsp, avctx);
+
+    ff_init_scantable(ctx->dsp.idct_permutation, &ctx->scantable, ff_zigzag_direct);
+
+    return 0;
+}
+
+AVCodec ff_fic_decoder = {
+    .name           = "fic",
+    .long_name      = NULL_IF_CONFIG_SMALL("Mirillis FIC"),
+    .type           = AVMEDIA_TYPE_VIDEO,
+    .id             = AV_CODEC_ID_FIC,
+    .priv_data_size = sizeof(FICContext),
+    .init           = fic_decode_init,
+    .decode         = fic_decode_frame,
+    .close          = fic_decode_close,
+    .capabilities   = CODEC_CAP_DR1 | CODEC_CAP_SLICE_THREADS,
+};

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/flacdec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/flacdec.c Changed

@@ -45,6 +45,8 @@
 #include "flacdata.h"
 #include "flacdsp.h"
 #include "thread.h"
+#include "unary.h"
+
 
 typedef struct FLACContext {
     FLACSTREAMINFO
@@ -219,6 +221,12 @@
     rice_order = get_bits(&s->gb, 4);
 
     samples= s->blocksize >> rice_order;
+    if (samples << rice_order != s->blocksize) {
+        av_log(s->avctx, AV_LOG_ERROR, "invalid rice order: %i blocksize %i\n",
+               rice_order, s->blocksize);
+        return AVERROR_INVALIDDATA;
+    }
+
     if (pred_order > samples) {
         av_log(s->avctx, AV_LOG_ERROR, "invalid predictor order: %i > %i\n",
                pred_order, samples);
@@ -357,7 +365,6 @@
 
     if (get_bits1(&s->gb)) {
         int left = get_bits_left(&s->gb);
-        wasted = 1;
         if ( left < 0 ||
             (left < bps && !show_bits_long(&s->gb, left)) ||
                            !show_bits_long(&s->gb, bps)) {
@@ -366,8 +373,7 @@
                    bps, left);
             return AVERROR_INVALIDDATA;
         }
-        while (!get_bits1(&s->gb))
-            wasted++;
+        wasted = 1 + get_unary(&s->gb, 1, get_bits_left(&s->gb));
         bps -= wasted;
     }
     if (bps > 32) {

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/flacdsp.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/flacdsp.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/flacdsp.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/flacdsp.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/flacdsp_lpc_template.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/flacdsp_lpc_template.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/flashsv.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/flashsv.c Changed

@@ -50,7 +50,7 @@
 
 typedef struct FlashSVContext {
     AVCodecContext *avctx;
-    AVFrame         frame;
+    AVFrame        *frame;
     int             image_width, image_height;
     int             block_width, block_height;
     uint8_t        *tmpblock;
@@ -69,16 +69,17 @@
     int             diff_start, diff_height;
 } FlashSVContext;
 
-
-static int decode_hybrid(const uint8_t *sptr, uint8_t *dptr, int dx, int dy,
+static int decode_hybrid(const uint8_t *sptr, const uint8_t *sptr_end, uint8_t *dptr, int dx, int dy,
                          int h, int w, int stride, const uint32_t *pal)
 {
     int x, y;
     const uint8_t *orig_src = sptr;
 
-    for (y = dx+h; y > dx; y--) {
+    for (y = dx + h; y > dx; y--) {
         uint8_t *dst = dptr + (y * stride) + dy * 3;
         for (x = 0; x < w; x++) {
+            if (sptr >= sptr_end)
+                return AVERROR_INVALIDDATA;
             if (*sptr & 0x80) {
                 /* 15-bit color */
                 unsigned c = AV_RB16(sptr) & ~0x8000;
@@ -100,6 +101,19 @@
     return sptr - orig_src;
 }
 
+static av_cold int flashsv_decode_end(AVCodecContext *avctx)
+{
+    FlashSVContext *s = avctx->priv_data;
+    inflateEnd(&s->zstream);
+    /* release the frame if needed */
+    av_frame_free(&s->frame);
+
+    /* free the tmpblock */
+    av_freep(&s->tmpblock);
+
+    return 0;
+}
+
 static av_cold int flashsv_decode_init(AVCodecContext *avctx)
 {
     FlashSVContext *s = avctx->priv_data;
@@ -115,12 +129,16 @@
         return 1;
     }
     avctx->pix_fmt = AV_PIX_FMT_BGR24;
-    avcodec_get_frame_defaults(&s->frame);
+
+    s->frame = av_frame_alloc();
+    if (!s->frame) {
+        flashsv_decode_end(avctx);
+        return AVERROR(ENOMEM);
+    }
 
     return 0;
 }
 
-
 static int flashsv2_prime(FlashSVContext *s, uint8_t *src, int size)
 {
     z_stream zs;
@@ -198,25 +216,33 @@
     }
 
     if (s->is_keyframe) {
-        s->blocks[blk_idx].pos      = s->keyframedata + (get_bits_count(gb) / 8);
-        s->blocks[blk_idx].size     = block_size;
+        s->blocks[blk_idx].pos  = s->keyframedata + (get_bits_count(gb) / 8);
+        s->blocks[blk_idx].size = block_size;
     }
+
+    y_pos += s->diff_start;
+
     if (!s->color_depth) {
         /* Flash Screen Video stores the image upside down, so copy
          * lines to destination in reverse order. */
         for (k = 1; k <= s->diff_height; k++) {
-            memcpy(s->frame.data[0] + x_pos * 3 +
-                   (s->image_height - y_pos - s->diff_start - k) * s->frame.linesize[0],
+            memcpy(s->frame->data[0] + x_pos * 3 +
+                   (s->image_height - y_pos - k) * s->frame->linesize[0],
                    line, width * 3);
             /* advance source pointer to next line */
             line += width * 3;
         }
     } else {
         /* hybrid 15-bit/palette mode */
-        decode_hybrid(s->tmpblock, s->frame.data[0],
-                      s->image_height - (y_pos + 1 + s->diff_start + s->diff_height),
+        ret = decode_hybrid(s->tmpblock, s->zstream.next_out,
+                      s->frame->data[0],
+                      s->image_height - (y_pos + 1 + s->diff_height),
                       x_pos, s->diff_height, width,
-                      s->frame.linesize[0], s->pal);
+                      s->frame->linesize[0], s->pal);
+        if (ret < 0) {
+            av_log(avctx, AV_LOG_ERROR, "decode_hybrid failed\n");
+            return ret;
+        }
     }
     skip_bits_long(gb, 8 * block_size); /* skip the consumed bits */
     return 0;
@@ -241,8 +267,8 @@
 static int flashsv_decode_frame(AVCodecContext *avctx, void *data,
                                 int *got_frame, AVPacket *avpkt)
 {
-    int buf_size       = avpkt->size;
-    FlashSVContext *s  = avctx->priv_data;
+    int buf_size = avpkt->size;
+    FlashSVContext *s = avctx->priv_data;
     int h_blocks, v_blocks, h_part, v_part, i, j, ret;
     GetBitContext gb;
     int last_blockwidth = s->block_width;
@@ -254,13 +280,14 @@
     if (buf_size < 4)
         return -1;
 
-    init_get_bits(&gb, avpkt->data, buf_size * 8);
+    if ((ret = init_get_bits8(&gb, avpkt->data, buf_size)) < 0)
+        return ret;
 
     /* start to parse the bitstream */
-    s->block_width  = 16 * (get_bits(&gb,  4) + 1);
-    s->image_width  =       get_bits(&gb, 12);
-    s->block_height = 16 * (get_bits(&gb,  4) + 1);
-    s->image_height =       get_bits(&gb, 12);
+    s->block_width  = 16 * (get_bits(&gb, 4) + 1);
+    s->image_width  = get_bits(&gb, 12);
+    s->block_height = 16 * (get_bits(&gb, 4) + 1);
+    s->image_height = get_bits(&gb, 12);
 
     if (   last_blockwidth != s->block_width
         || last_blockheight!= s->block_height)
@@ -287,23 +314,25 @@
     /* the block size could change between frames, make sure the buffer
      * is large enough, if not, get a larger one */
     if (s->block_size < s->block_width * s->block_height) {
-        int tmpblock_size = 3 * s->block_width * s->block_height;
+        int tmpblock_size = 3 * s->block_width * s->block_height, err;
 
-        s->tmpblock = av_realloc(s->tmpblock, tmpblock_size);
-        if (!s->tmpblock) {
-            av_log(avctx, AV_LOG_ERROR, "Can't allocate decompression buffer.\n");
-            return AVERROR(ENOMEM);
+        if ((err = av_reallocp(&s->tmpblock, tmpblock_size)) < 0) {
+            s->block_size = 0;
+            av_log(avctx, AV_LOG_ERROR,
+                   "Cannot allocate decompression buffer.\n");
+            return err;
         }
         if (s->ver == 2) {
             s->deflate_block_size = calc_deflate_block_size(tmpblock_size);
             if (s->deflate_block_size <= 0) {
-                av_log(avctx, AV_LOG_ERROR, "Can't determine deflate buffer size.\n");
+                av_log(avctx, AV_LOG_ERROR,
+                       "Cannot determine deflate buffer size.\n");
                 return -1;
             }
-            s->deflate_block = av_realloc(s->deflate_block, s->deflate_block_size);
-            if (!s->deflate_block) {
-                av_log(avctx, AV_LOG_ERROR, "Can't allocate deflate buffer.\n");
-                return AVERROR(ENOMEM);
+            if ((err = av_reallocp(&s->deflate_block, s->deflate_block_size)) < 0) {
+                s->block_size = 0;
+                av_log(avctx, AV_LOG_ERROR, "Cannot allocate deflate buffer.\n");
+                return err;
             }
         }
     }
@@ -311,7 +340,8 @@
 
     /* initialize the image size once */
     if (avctx->width == 0 && avctx->height == 0) {
-        avcodec_set_dimensions(avctx, s->image_width, s->image_height);
+        if ((ret = ff_set_dimensions(avctx, s->image_width, s->image_height)) < 0)
+            return ret;
     }
 
     /* check for changes of image width and image height */
@@ -326,18 +356,20 @@
     /* we care for keyframes only in Screen Video v2 */
     s->is_keyframe = (avpkt->flags & AV_PKT_FLAG_KEY) && (s->ver == 2);
     if (s->is_keyframe) {
-        s->keyframedata = av_realloc(s->keyframedata, avpkt->size);
+        int err;
+        if ((err = av_reallocp(&s->keyframedata, avpkt->size)) < 0)
+            return err;
         memcpy(s->keyframedata, avpkt->data, avpkt->size);
     }
     if(s->ver == 2 && !s->blocks)
-        s->blocks = av_mallocz((v_blocks + !!v_part) * (h_blocks + !!h_part)
-                                * sizeof(s->blocks[0]));
+        s->blocks = av_mallocz((v_blocks + !!v_part) * (h_blocks + !!h_part) *
+                               sizeof(s->blocks[0]));
 
     av_dlog(avctx, "image: %dx%d block: %dx%d num: %dx%d part: %dx%d\n",
             s->image_width, s->image_height, s->block_width, s->block_height,
             h_blocks, v_blocks, h_part, v_part);
 
-    if ((ret = ff_reget_buffer(avctx, &s->frame)) < 0)
+    if ((ret = ff_reget_buffer(avctx, s->frame)) < 0)
         return ret;
 
     /* loop over all block columns */
@@ -362,7 +394,7 @@
             s->diff_height    = cur_blk_height;
 
             if (8 * size > get_bits_left(&gb)) {
-                av_frame_unref(&s->frame);
+                av_frame_unref(s->frame);
                 return AVERROR_INVALIDDATA;
             }
 
@@ -375,20 +407,23 @@
 
                 if (s->color_depth != 0 && s->color_depth != 2) {
                     av_log(avctx, AV_LOG_ERROR,
-                           "%dx%d invalid color depth %d\n", i, j, s->color_depth);
+                           "%dx%d invalid color depth %d\n",
+                           i, j, s->color_depth);
                     return AVERROR_INVALIDDATA;
                 }
 
                 if (has_diff) {
                     if (!s->keyframe) {
                         av_log(avctx, AV_LOG_ERROR,
-                               "inter frame without keyframe\n");
+                               "Inter frame without keyframe\n");
                         return AVERROR_INVALIDDATA;
                     }
                     s->diff_start  = get_bits(&gb, 8);
                     s->diff_height = get_bits(&gb, 8);
                     if (s->diff_start + s->diff_height > cur_blk_height) {
-                        av_log(avctx, AV_LOG_ERROR, "Block parameters invalid\n");
+                        av_log(avctx, AV_LOG_ERROR,
+                               "Block parameters invalid: %d + %d > %d\n",
+                               s->diff_start, s->diff_height, cur_blk_height);
                         return AVERROR_INVALIDDATA;
                     }
                     av_log(avctx, AV_LOG_DEBUG,
@@ -403,14 +438,15 @@
                 if (s->zlibprime_curr) {
                     int col = get_bits(&gb, 8);
                     int row = get_bits(&gb, 8);
-                    av_log(avctx, AV_LOG_DEBUG, "%dx%d zlibprime_curr %dx%d\n", i, j, col, row);
+                    av_log(avctx, AV_LOG_DEBUG, "%dx%d zlibprime_curr %dx%d\n",
+                           i, j, col, row);
                     size -= 2;
                     avpriv_request_sample(avctx, "zlibprime_curr");
                     return AVERROR_PATCHWELCOME;
                 }
                 if (!s->blocks && (s->zlibprime_curr || s->zlibprime_prev)) {
-                    av_log(avctx, AV_LOG_ERROR, "no data available for zlib "
-                           "priming\n");
+                    av_log(avctx, AV_LOG_ERROR,
+                           "no data available for zlib priming\n");
                     return AVERROR_INVALIDDATA;
                 }
                 size--; // account for flags byte
@@ -418,12 +454,13 @@
 
             if (has_diff) {
                 int k;
-                int off = (s->image_height - y_pos - 1) * s->frame.linesize[0];
+                int off = (s->image_height - y_pos - 1) * s->frame->linesize[0];
 
-                for (k = 0; k < cur_blk_height; k++)
-                    memcpy(s->frame.data[0] + off - k*s->frame.linesize[0] + x_pos*3,
-                           s->keyframe + off - k*s->frame.linesize[0] + x_pos*3,
+                for (k = 0; k < cur_blk_height; k++) {
+                    int x = off - k * s->frame->linesize[0] + x_pos * 3;
+                    memcpy(s->frame->data[0] + x, s->keyframe + x,
                            cur_blk_width * 3);
+                }
             }
 
             /* skip unchanged blocks, which have size 0 */
@@ -439,16 +476,17 @@
     }
     if (s->is_keyframe && s->ver == 2) {
         if (!s->keyframe) {
-            s->keyframe = av_malloc(s->frame.linesize[0] * avctx->height);
+            s->keyframe = av_malloc(s->frame->linesize[0] * avctx->height);
             if (!s->keyframe) {
                 av_log(avctx, AV_LOG_ERROR, "Cannot allocate image data\n");
                 return AVERROR(ENOMEM);
             }
         }
-        memcpy(s->keyframe, s->frame.data[0], s->frame.linesize[0] * avctx->height);
+        memcpy(s->keyframe, s->frame->data[0],
+               s->frame->linesize[0] * avctx->height);
     }
 
-    if ((ret = av_frame_ref(data, &s->frame)) < 0)
+    if ((ret = av_frame_ref(data, s->frame)) < 0)
         return ret;
 
     *got_frame = 1;
@@ -461,21 +499,6 @@
     return buf_size;
 }
 
-
-static av_cold int flashsv_decode_end(AVCodecContext *avctx)
-{
-    FlashSVContext *s = avctx->priv_data;
-    inflateEnd(&s->zstream);
-    /* release the frame if needed */
-    av_frame_unref(&s->frame);
-
-    /* free the tmpblock */
-    av_free(s->tmpblock);
-
-    return 0;
-}
-
-
 #if CONFIG_FLASHSV_DECODER
 AVCodec ff_flashsv_decoder = {
     .name           = "flashsv",
@@ -487,7 +510,7 @@
     .close          = flashsv_decode_end,
     .decode         = flashsv_decode_frame,
     .capabilities   = CODEC_CAP_DR1,
-    .pix_fmts       = (const enum AVPixelFormat[]){ AV_PIX_FMT_BGR24, AV_PIX_FMT_NONE },
+    .pix_fmts       = (const enum AVPixelFormat[]) { AV_PIX_FMT_BGR24, AV_PIX_FMT_NONE },
 };
 #endif /* CONFIG_FLASHSV_DECODER */
 
@@ -550,6 +573,6 @@
     .close          = flashsv2_decode_end,
     .decode         = flashsv_decode_frame,
     .capabilities   = CODEC_CAP_DR1,
-    .pix_fmts       = (const enum AVPixelFormat[]){ AV_PIX_FMT_BGR24, AV_PIX_FMT_NONE },
+    .pix_fmts       = (const enum AVPixelFormat[]) { AV_PIX_FMT_BGR24, AV_PIX_FMT_NONE },
 };
 #endif /* CONFIG_FLASHSV2_DECODER */

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/flashsv2enc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/flashsv2enc.c Changed

@@ -87,7 +87,6 @@
     AVCodecContext *avctx;
     uint8_t *current_frame;
     uint8_t *key_frame;
-    AVFrame frame;
     uint8_t *encbuffer;
     uint8_t *keybuffer;
     uint8_t *databuffer;
@@ -849,15 +848,12 @@
 }
 
 static int flashsv2_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
-                                 const AVFrame *pict, int *got_packet)
+                                 const AVFrame *p, int *got_packet)
 {
     FlashSV2Context *const s = avctx->priv_data;
-    AVFrame *const p = &s->frame;
     int res;
     int keyframe = 0;
 
-    *p = *pict;
-
     if ((res = ff_alloc_packet2(avctx, pkt, s->frame_size + FF_MIN_BUFFER_SIZE)) < 0)
         return res;
 
@@ -891,18 +887,11 @@
 
     if (keyframe) {
         new_key_frame(s);
-        p->pict_type = AV_PICTURE_TYPE_I;
-        p->key_frame = 1;
         s->last_key_frame = avctx->frame_number;
         pkt->flags |= AV_PKT_FLAG_KEY;
         av_log(avctx, AV_LOG_DEBUG, "Inserting key frame at frame %d\n", avctx->frame_number);
-    } else {
-        p->pict_type = AV_PICTURE_TYPE_P;
-        p->key_frame = 0;
     }
 
-    avctx->coded_frame = p;
-
     pkt->size = res;
     *got_packet = 1;

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/flashsvenc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/flashsvenc.c Changed

@@ -57,7 +57,6 @@
 typedef struct FlashSVContext {
     AVCodecContext *avctx;
     uint8_t        *previous_frame;
-    AVFrame         frame;
     int             image_width, image_height;
     int             block_width, block_height;
     uint8_t        *tmpblock;
@@ -89,6 +88,21 @@
     return 0;
 }
 
+static av_cold int flashsv_encode_end(AVCodecContext *avctx)
+{
+    FlashSVContext *s = avctx->priv_data;
+
+    deflateEnd(&s->zstream);
+
+    av_free(s->encbuffer);
+    av_free(s->previous_frame);
+    av_free(s->tmpblock);
+
+    av_frame_free(&avctx->coded_frame);
+
+    return 0;
+}
+
 static av_cold int flashsv_encode_init(AVCodecContext *avctx)
 {
     FlashSVContext *s = avctx->priv_data;
@@ -117,11 +131,17 @@
         return AVERROR(ENOMEM);
     }
 
+    avctx->coded_frame = av_frame_alloc();
+    if (!avctx->coded_frame) {
+        flashsv_encode_end(avctx);
+        return AVERROR(ENOMEM);
+    }
+
     return 0;
 }
 
 
-static int encode_bitstream(FlashSVContext *s, AVFrame *p, uint8_t *buf,
+static int encode_bitstream(FlashSVContext *s, const AVFrame *p, uint8_t *buf,
                             int buf_size, int block_width, int block_height,
                             uint8_t *previous_frame, int *I_frame)
 {
@@ -199,14 +219,12 @@
                                 const AVFrame *pict, int *got_packet)
 {
     FlashSVContext * const s = avctx->priv_data;
-    AVFrame * const p = &s->frame;
+    const AVFrame * const p = pict;
     uint8_t *pfptr;
     int res;
     int I_frame = 0;
     int opt_w = 4, opt_h = 4;
 
-    *p = *pict;
-
     /* First frame needs to be a keyframe */
     if (avctx->frame_number == 0) {
         s->previous_frame = av_mallocz(FFABS(p->linesize[0]) * s->image_height);
@@ -244,37 +262,22 @@
 
     //mark the frame type so the muxer can mux it correctly
     if (I_frame) {
-        p->pict_type      = AV_PICTURE_TYPE_I;
-        p->key_frame      = 1;
+        avctx->coded_frame->pict_type      = AV_PICTURE_TYPE_I;
+        avctx->coded_frame->key_frame      = 1;
         s->last_key_frame = avctx->frame_number;
         av_dlog(avctx, "Inserting keyframe at frame %d\n", avctx->frame_number);
     } else {
-        p->pict_type = AV_PICTURE_TYPE_P;
-        p->key_frame = 0;
+        avctx->coded_frame->pict_type = AV_PICTURE_TYPE_P;
+        avctx->coded_frame->key_frame = 0;
     }
 
-    avctx->coded_frame = p;
-
-    if (p->key_frame)
+    if (avctx->coded_frame->key_frame)
         pkt->flags |= AV_PKT_FLAG_KEY;
     *got_packet = 1;
 
     return 0;
 }
 
-static av_cold int flashsv_encode_end(AVCodecContext *avctx)
-{
-    FlashSVContext *s = avctx->priv_data;
-
-    deflateEnd(&s->zstream);
-
-    av_free(s->encbuffer);
-    av_free(s->previous_frame);
-    av_free(s->tmpblock);
-
-    return 0;
-}
-
 AVCodec ff_flashsv_encoder = {
     .name           = "flashsv",
     .long_name      = NULL_IF_CONFIG_SMALL("Flash Screen Video"),

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/flicvideo.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/flicvideo.c Changed

@@ -71,7 +71,7 @@
 
 typedef struct FlicDecodeContext {
     AVCodecContext *avctx;
-    AVFrame frame;
+    AVFrame *frame;
 
     unsigned int palette[256];
     int new_palette;
@@ -141,7 +141,10 @@
                   return AVERROR_INVALIDDATA;
     }
 
-    avcodec_get_frame_defaults(&s->frame);
+    s->frame = av_frame_alloc();
+    if (!s->frame)
+        return AVERROR(ENOMEM);
+
     s->new_palette = 0;
 
     return 0;
@@ -185,11 +188,11 @@
 
     bytestream2_init(&g2, buf, buf_size);
 
-    if ((ret = ff_reget_buffer(avctx, &s->frame)) < 0)
+    if ((ret = ff_reget_buffer(avctx, s->frame)) < 0)
         return ret;
 
-    pixels = s->frame.data[0];
-    pixel_limit = s->avctx->height * s->frame.linesize[0];
+    pixels = s->frame->data[0];
+    pixel_limit = s->avctx->height * s->frame->linesize[0];
     if (buf_size < 16 || buf_size > INT_MAX - (3 * 256 + FF_INPUT_BUFFER_PADDING_SIZE))
         return AVERROR_INVALIDDATA;
     frame_size = bytestream2_get_le32(&g2);
@@ -273,12 +276,12 @@
                 if ((line_packets & 0xC000) == 0xC000) {
                     // line skip opcode
                     line_packets = -line_packets;
-                    y_ptr += line_packets * s->frame.linesize[0];
+                    y_ptr += line_packets * s->frame->linesize[0];
                 } else if ((line_packets & 0xC000) == 0x4000) {
                     av_log(avctx, AV_LOG_ERROR, "Undefined opcode (%x) in DELTA_FLI\n", line_packets);
                 } else if ((line_packets & 0xC000) == 0x8000) {
                     // "last byte" opcode
-                    pixel_ptr= y_ptr + s->frame.linesize[0] - 1;
+                    pixel_ptr= y_ptr + s->frame->linesize[0] - 1;
                     CHECK_PIXEL_PTR(0);
                     pixels[pixel_ptr] = line_packets & 0xff;
                 } else {
@@ -313,7 +316,7 @@
                         }
                     }
 
-                    y_ptr += s->frame.linesize[0];
+                    y_ptr += s->frame->linesize[0];
                 }
             }
             break;
@@ -322,7 +325,7 @@
             /* line compressed */
             starting_line = bytestream2_get_le16(&g2);
             y_ptr = 0;
-            y_ptr += starting_line * s->frame.linesize[0];
+            y_ptr += starting_line * s->frame->linesize[0];
 
             compressed_lines = bytestream2_get_le16(&g2);
             while (compressed_lines > 0) {
@@ -359,7 +362,7 @@
                     }
                 }
 
-                y_ptr += s->frame.linesize[0];
+                y_ptr += s->frame->linesize[0];
                 compressed_lines--;
             }
             break;
@@ -367,7 +370,7 @@
         case FLI_BLACK:
             /* set the whole frame to color 0 (which is usually black) */
             memset(pixels, 0,
-                s->frame.linesize[0] * s->avctx->height);
+                s->frame->linesize[0] * s->avctx->height);
             break;
 
         case FLI_BRUN:
@@ -414,7 +417,7 @@
                     }
                 }
 
-                y_ptr += s->frame.linesize[0];
+                y_ptr += s->frame->linesize[0];
             }
             break;
 
@@ -425,8 +428,8 @@
                        "has incorrect size, skipping chunk\n", chunk_size - 6);
                 bytestream2_skip(&g2, chunk_size - 6);
             } else {
-                for (y_ptr = 0; y_ptr < s->frame.linesize[0] * s->avctx->height;
-                     y_ptr += s->frame.linesize[0]) {
+                for (y_ptr = 0; y_ptr < s->frame->linesize[0] * s->avctx->height;
+                     y_ptr += s->frame->linesize[0]) {
                     bytestream2_get_buffer(&g2, &pixels[y_ptr],
                                            s->avctx->width);
                 }
@@ -457,13 +460,13 @@
                buf_size - bytestream2_get_bytes_left(&g2));
 
     /* make the palette available on the way out */
-    memcpy(s->frame.data[1], s->palette, AVPALETTE_SIZE);
+    memcpy(s->frame->data[1], s->palette, AVPALETTE_SIZE);
     if (s->new_palette) {
-        s->frame.palette_has_changed = 1;
+        s->frame->palette_has_changed = 1;
         s->new_palette = 0;
     }
 
-    if ((ret = av_frame_ref(data, &s->frame)) < 0)
+    if ((ret = av_frame_ref(data, s->frame)) < 0)
         return ret;
 
     *got_frame = 1;
@@ -504,11 +507,11 @@
 
     bytestream2_init(&g2, buf, buf_size);
 
-    if ((ret = ff_reget_buffer(avctx, &s->frame)) < 0)
+    if ((ret = ff_reget_buffer(avctx, s->frame)) < 0)
         return ret;
 
-    pixels = s->frame.data[0];
-    pixel_limit = s->avctx->height * s->frame.linesize[0];
+    pixels = s->frame->data[0];
+    pixel_limit = s->avctx->height * s->frame->linesize[0];
 
     frame_size = bytestream2_get_le32(&g2);
     bytestream2_skip(&g2, 2);  /* skip the magic number */
@@ -556,7 +559,7 @@
                 line_packets = bytestream2_get_le16(&g2);
                 if (line_packets < 0) {
                     line_packets = -line_packets;
-                    y_ptr += line_packets * s->frame.linesize[0];
+                    y_ptr += line_packets * s->frame->linesize[0];
                 } else {
                     compressed_lines--;
                     pixel_ptr = y_ptr;
@@ -589,7 +592,7 @@
                         }
                     }
 
-                    y_ptr += s->frame.linesize[0];
+                    y_ptr += s->frame->linesize[0];
                 }
             }
             break;
@@ -602,7 +605,7 @@
         case FLI_BLACK:
             /* set the whole frame to 0x0000 which is black in both 15Bpp and 16Bpp modes. */
             memset(pixels, 0x0000,
-                   s->frame.linesize[0] * s->avctx->height);
+                   s->frame->linesize[0] * s->avctx->height);
             break;
 
         case FLI_BRUN:
@@ -657,7 +660,7 @@
                     pixel_ptr += 2;
                 }
 #endif
-                y_ptr += s->frame.linesize[0];
+                y_ptr += s->frame->linesize[0];
             }
             break;
 
@@ -701,7 +704,7 @@
                     }
                 }
 
-                y_ptr += s->frame.linesize[0];
+                y_ptr += s->frame->linesize[0];
             }
             break;
 
@@ -714,8 +717,8 @@
                 bytestream2_skip(&g2, chunk_size - 6);
             } else {
 
-                for (y_ptr = 0; y_ptr < s->frame.linesize[0] * s->avctx->height;
-                     y_ptr += s->frame.linesize[0]) {
+                for (y_ptr = 0; y_ptr < s->frame->linesize[0] * s->avctx->height;
+                     y_ptr += s->frame->linesize[0]) {
 
                     pixel_countdown = s->avctx->width;
                     pixel_ptr = 0;
@@ -748,7 +751,7 @@
         av_log(avctx, AV_LOG_ERROR, "Processed FLI chunk where chunk size = %d " \
                "and final chunk ptr = %d\n", buf_size, bytestream2_tell(&g2));
 
-    if ((ret = av_frame_ref(data, &s->frame)) < 0)
+    if ((ret = av_frame_ref(data, s->frame)) < 0)
         return ret;
 
     *got_frame = 1;
@@ -797,7 +800,7 @@
 {
     FlicDecodeContext *s = avctx->priv_data;
 
-    av_frame_unref(&s->frame);
+    av_frame_free(&s->frame);
 
     return 0;
 }

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/flvdec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/flvdec.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/frame_thread_encoder.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/frame_thread_encoder.c Changed

@@ -125,6 +125,31 @@
        || !(avctx->codec->capabilities & CODEC_CAP_INTRA_ONLY))
         return 0;
 
+    if(   !avctx->thread_count
+       && avctx->codec_id == AV_CODEC_ID_MJPEG
+       && !(avctx->flags & CODEC_FLAG_QSCALE)) {
+        av_log(avctx, AV_LOG_DEBUG,
+               "Forcing thread count to 1 for MJPEG encoding, use -thread_type slice "
+               "or a constant quantizer if you want to use multiple cpu cores\n");
+        avctx->thread_count = 1;
+    }
+    if(   avctx->thread_count > 1
+       && avctx->codec_id == AV_CODEC_ID_MJPEG
+       && !(avctx->flags & CODEC_FLAG_QSCALE))
+        av_log(avctx, AV_LOG_WARNING,
+               "MJPEG CBR encoding works badly with frame multi-threading, consider "
+               "using -threads 1, -thread_type slice or a constant quantizer.\n");
+
+    if (avctx->codec_id == AV_CODEC_ID_HUFFYUV ||
+        avctx->codec_id == AV_CODEC_ID_FFVHUFF) {
+        // huffyuv doesnt support these with multiple frame threads currently
+        if (avctx->context_model > 0 || (avctx->flags & CODEC_FLAG_PASS1)) {
+            av_log(avctx, AV_LOG_WARNING,
+               "Forcing thread count to 1 for huffyuv encoding with first pass or context 1\n");
+            avctx->thread_count = 1;
+        }
+    }
+
     if(!avctx->thread_count) {
         avctx->thread_count = av_cpu_count();
         avctx->thread_count = FFMIN(avctx->thread_count, MAX_THREADS);

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/g2meet.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/g2meet.c Changed

@@ -35,7 +35,7 @@
 #include "mjpeg.h"
 
 enum ChunkType {
-    FRAME_INFO = 0xC8,
+    DISPLAY_INFO = 0xC8,
     TILE_DATA,
     CURSOR_POS,
     CURSOR_SHAPE,
@@ -236,16 +236,14 @@
                            int swapuv)
 {
     GetBitContext gb;
-    uint8_t *tmp;
     int mb_w, mb_h, mb_x, mb_y, i, j;
     int bx, by;
     int unesc_size;
     int ret;
 
-    tmp = av_realloc(c->buf, src_size + FF_INPUT_BUFFER_PADDING_SIZE);
-    if (!tmp)
-        return AVERROR(ENOMEM);
-    c->buf = tmp;
+    if ((ret = av_reallocp(&c->buf,
+                           src_size + FF_INPUT_BUFFER_PADDING_SIZE)) < 0)
+        return ret;
     jpg_unescape(src, src_size, c->buf, &unesc_size);
     memset(c->buf + unesc_size, 0, FF_INPUT_BUFFER_PADDING_SIZE);
     init_get_bits(&gb, c->buf, unesc_size * 8);
@@ -255,19 +253,25 @@
     mb_h  = (height + 15) >> 4;
 
     if (!num_mbs)
-        num_mbs = mb_w * mb_h;
+        num_mbs = mb_w * mb_h * 4;
 
     for (i = 0; i < 3; i++)
         c->prev_dc[i] = 1024;
     bx = by = 0;
+    c->dsp.clear_blocks(c->block[0]);
     for (mb_y = 0; mb_y < mb_h; mb_y++) {
         for (mb_x = 0; mb_x < mb_w; mb_x++) {
-            if (mask && !mask[mb_x]) {
+            if (mask && !mask[mb_x * 2] && !mask[mb_x * 2 + 1] &&
+                !mask[mb_x * 2 +     mask_stride] &&
+                !mask[mb_x * 2 + 1 + mask_stride]) {
                 bx += 16;
                 continue;
             }
             for (j = 0; j < 2; j++) {
                 for (i = 0; i < 2; i++) {
+                    if (mask && !mask[mb_x * 2 + i + j * mask_stride])
+                        continue;
+                    num_mbs--;
                     if ((ret = jpg_decode_block(c, &gb, 0,
                                                 c->block[i + j * 2])) != 0)
                         return ret;
@@ -292,14 +296,14 @@
                 }
             }
 
-            if (!--num_mbs)
+            if (!num_mbs)
                 return 0;
             bx += 16;
         }
         bx  = 0;
         by += 16;
         if (mask)
-            mask += mask_stride;
+            mask += mask_stride * 2;
     }
 
     return 0;
@@ -375,6 +379,8 @@
         src += 3;
     }
     npal = *src++ + 1;
+    if (src_end - src < npal * 3)
+        return AVERROR_INVALIDDATA;
     memcpy(pal, src, npal * 3); src += npal * 3;
     if (sub_type != 2) {
         for (i = 0; i < npal; i++) {
@@ -405,7 +411,7 @@
 
     nblocks = *src++ + 1;
     cblocks = 0;
-    bstride = FFALIGN(width, 16) >> 4;
+    bstride = FFALIGN(width, 16) >> 3;
     // blocks are coded LSB and we need normal bitreader for JPEG data
     bits = 0;
     for (i = 0; i < (FFALIGN(height, 16) >> 4); i++) {
@@ -422,14 +428,17 @@
             cblocks += coded;
             if (cblocks > nblocks)
                 return AVERROR_INVALIDDATA;
-            c->kempf_flags[j + i * bstride] = coded;
+            c->kempf_flags[j * 2 +      i * 2      * bstride] =
+            c->kempf_flags[j * 2 + 1 +  i * 2      * bstride] =
+            c->kempf_flags[j * 2 +     (i * 2 + 1) * bstride] =
+            c->kempf_flags[j * 2 + 1 + (i * 2 + 1) * bstride] = coded;
         }
     }
 
     memset(c->jpeg_tile, 0, c->tile_stride * height);
     jpg_decode_data(&c->jc, width, height, src, src_end - src,
                     c->jpeg_tile, c->tile_stride,
-                    c->kempf_flags, bstride, nblocks, 0);
+                    c->kempf_flags, bstride, nblocks * 4, 0);
 
     kempf_restore_buf(c->kempf_buf, dlen, dst, c->framebuf_stride,
                       c->jpeg_tile, c->tile_stride,
@@ -480,8 +489,7 @@
     uint32_t bits;
     uint32_t cur_size, cursor_w, cursor_h, cursor_stride;
     uint32_t cursor_hot_x, cursor_hot_y;
-    int cursor_fmt;
-    uint8_t *tmp;
+    int cursor_fmt, err;
 
     cur_size      = bytestream2_get_be32(gb);
     cursor_w      = bytestream2_get_byte(gb);
@@ -490,7 +498,7 @@
     cursor_hot_y  = bytestream2_get_byte(gb);
     cursor_fmt    = bytestream2_get_byte(gb);
 
-    cursor_stride = FFALIGN(cursor_w, c->cursor_fmt==1 ? 32 : 1) * 4;
+    cursor_stride = FFALIGN(cursor_w, cursor_fmt==1 ? 32 : 1) * 4;
 
     if (cursor_w < 1 || cursor_w > 256 ||
         cursor_h < 1 || cursor_h > 256) {
@@ -516,13 +524,11 @@
         return AVERROR_PATCHWELCOME;
     }
 
-    tmp = av_realloc(c->cursor, cursor_stride * cursor_h);
-    if (!tmp) {
+    if ((err = av_reallocp(&c->cursor, cursor_stride * cursor_h)) < 0) {
         av_log(avctx, AV_LOG_ERROR, "Cannot allocate cursor buffer\n");
-        return AVERROR(ENOMEM);
+        return err;
     }
 
-    c->cursor        = tmp;
     c->cursor_w      = cursor_w;
     c->cursor_h      = cursor_h;
     c->cursor_hot_x  = cursor_hot_x;
@@ -648,8 +654,8 @@
     GetByteContext bc, tbc;
     int magic;
     int got_header = 0;
-    uint32_t chunk_size;
-    int chunk_type;
+    uint32_t chunk_size, r_mask, g_mask, b_mask;
+    int chunk_type, chunk_start;
     int i;
     int ret;
 
@@ -675,18 +681,20 @@
     }
 
     while (bytestream2_get_bytes_left(&bc) > 5) {
-        chunk_size = bytestream2_get_le32(&bc) - 1;
-        chunk_type = bytestream2_get_byte(&bc);
+        chunk_size  = bytestream2_get_le32(&bc) - 1;
+        chunk_type  = bytestream2_get_byte(&bc);
+        chunk_start = bytestream2_tell(&bc);
         if (chunk_size > bytestream2_get_bytes_left(&bc)) {
             av_log(avctx, AV_LOG_ERROR, "Invalid chunk size %d type %02X\n",
                    chunk_size, chunk_type);
             break;
         }
         switch (chunk_type) {
-        case FRAME_INFO:
+        case DISPLAY_INFO:
+            got_header =
             c->got_header = 0;
             if (chunk_size < 21) {
-                av_log(avctx, AV_LOG_ERROR, "Invalid frame info size %d\n",
+                av_log(avctx, AV_LOG_ERROR, "Invalid display info size %d\n",
                        chunk_size);
                 break;
             }
@@ -700,18 +708,23 @@
                 ret = AVERROR_INVALIDDATA;
                 goto header_fail;
             }
-            if (c->width != avctx->width || c->height != avctx->height)
-                avcodec_set_dimensions(avctx, c->width, c->height);
+            if (c->width != avctx->width || c->height != avctx->height) {
+                ret = ff_set_dimensions(avctx, c->width, c->height);
+                if (ret < 0)
+                    goto header_fail;
+            }
             c->compression = bytestream2_get_be32(&bc);
             if (c->compression != 2 && c->compression != 3) {
                 av_log(avctx, AV_LOG_ERROR,
                        "Unknown compression method %d\n",
                        c->compression);
-                return AVERROR_PATCHWELCOME;
+                ret = AVERROR_PATCHWELCOME;
+                goto header_fail;
             }
             c->tile_width  = bytestream2_get_be32(&bc);
             c->tile_height = bytestream2_get_be32(&bc);
-            if (!c->tile_width || !c->tile_height) {
+            if (!c->tile_width || !c->tile_height ||
+                ((c->tile_width | c->tile_height) & 0xF)) {
                 av_log(avctx, AV_LOG_ERROR,
                        "Invalid tile dimensions %dx%d\n",
                        c->tile_width, c->tile_height);
@@ -721,8 +734,29 @@
             c->tiles_x = (c->width  + c->tile_width  - 1) / c->tile_width;
             c->tiles_y = (c->height + c->tile_height - 1) / c->tile_height;
             c->bpp = bytestream2_get_byte(&bc);
-            chunk_size -= 21;
-            bytestream2_skip(&bc, chunk_size);
+            if (c->bpp == 32) {
+                if (bytestream2_get_bytes_left(&bc) < 16 ||
+                    (chunk_size - 21) < 16 ) {
+                    av_log(avctx, AV_LOG_ERROR,
+                           "Display info: missing bitmasks!\n");
+                    ret = AVERROR_INVALIDDATA;
+                    goto header_fail;
+                }
+                r_mask = bytestream2_get_be32(&bc);
+                g_mask = bytestream2_get_be32(&bc);
+                b_mask = bytestream2_get_be32(&bc);
+                if (r_mask != 0xFF0000 || g_mask != 0xFF00 || b_mask != 0xFF) {
+                    av_log(avctx, AV_LOG_ERROR,
+                           "Invalid or unsupported bitmasks: R=%X, G=%X, B=%X\n",
+                           r_mask, g_mask, b_mask);
+                    ret = AVERROR_PATCHWELCOME;
+                    goto header_fail;
+                }
+            } else {
+                avpriv_request_sample(avctx, "bpp=%d", c->bpp);
+                ret = AVERROR_PATCHWELCOME;
+                goto header_fail;
+            }
             if (g2m_init_buffers(c)) {
                 ret = AVERROR(ENOMEM);
                 goto header_fail;
@@ -732,8 +766,7 @@
         case TILE_DATA:
             if (!c->tiles_x || !c->tiles_y) {
                 av_log(avctx, AV_LOG_WARNING,
-                       "No frame header - skipping tile\n");
-                bytestream2_skip(&bc, bytestream2_get_bytes_left(&bc));
+                       "No display info - skipping tile\n");
                 break;
             }
             if (chunk_size < 2) {
@@ -749,7 +782,6 @@
                        c->tile_x, c->tile_y, c->tiles_x, c->tiles_y);
                 break;
             }
-            chunk_size -= 2;
             ret = 0;
             switch (c->compression) {
             case COMPR_EPIC_J_B:
@@ -759,13 +791,12 @@
             case COMPR_KEMPF_J_B:
                 ret = kempf_decode_tile(c, c->tile_x, c->tile_y,
                                         buf + bytestream2_tell(&bc),
-                                        chunk_size);
+                                        chunk_size - 2);
                 break;
             }
             if (ret && c->framebuf)
                 av_log(avctx, AV_LOG_ERROR, "Error decoding tile %d,%d\n",
                        c->tile_x, c->tile_y);
-            bytestream2_skip(&bc, chunk_size);
             break;
         case CURSOR_POS:
             if (chunk_size < 5) {
@@ -775,7 +806,6 @@
             }
             c->cursor_x = bytestream2_get_be16(&bc);
             c->cursor_y = bytestream2_get_be16(&bc);
-            bytestream2_skip(&bc, chunk_size - 4);
             break;
         case CURSOR_SHAPE:
             if (chunk_size < 8) {
@@ -786,17 +816,17 @@
             bytestream2_init(&tbc, buf + bytestream2_tell(&bc),
                              chunk_size - 4);
             g2m_load_cursor(avctx, c, &tbc);
-            bytestream2_skip(&bc, chunk_size);
             break;
         case CHUNK_CC:
         case CHUNK_CD:
-            bytestream2_skip(&bc, chunk_size);
             break;
         default:
             av_log(avctx, AV_LOG_WARNING, "Skipping chunk type %02X\n",
                    chunk_type);
-            bytestream2_skip(&bc, chunk_size);
         }
+
+        /* navigate to next chunk */
+        bytestream2_skip(&bc, chunk_start + chunk_size - bytestream2_tell(&bc));
     }
     if (got_header)
         c->got_header = 1;

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/g722dec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/g722dec.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/get_bits.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/get_bits.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/gif.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/gif.c Changed

@@ -216,6 +216,13 @@
         return AVERROR(EINVAL);
     }
 
+    avctx->coded_frame = av_frame_alloc();
+    if (!avctx->coded_frame)
+        return AVERROR(ENOMEM);
+
+    avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I;
+    avctx->coded_frame->key_frame = 1;
+
     s->lzw = av_mallocz(ff_lzw_encode_state_size);
     s->buf = av_malloc(avctx->width*avctx->height*2);
     s->tmpl = av_malloc(avctx->width);
@@ -232,7 +239,6 @@
                             const AVFrame *pict, int *got_packet)
 {
     GIFContext *s = avctx->priv_data;
-    AVFrame *const p = (AVFrame *)pict;
     uint8_t *outbuf_ptr, *end;
     const uint32_t *palette = NULL;
     int ret;
@@ -242,15 +248,12 @@
     outbuf_ptr = pkt->data;
     end        = pkt->data + pkt->size;
 
-    p->pict_type = AV_PICTURE_TYPE_I;
-    p->key_frame = 1;
-
     if (avctx->pix_fmt == AV_PIX_FMT_PAL8) {
         uint8_t *pal_exdata = av_packet_new_side_data(pkt, AV_PKT_DATA_PALETTE, AVPALETTE_SIZE);
         if (!pal_exdata)
             return AVERROR(ENOMEM);
-        memcpy(pal_exdata, p->data[1], AVPALETTE_SIZE);
-        palette = (uint32_t*)p->data[1];
+        memcpy(pal_exdata, pict->data[1], AVPALETTE_SIZE);
+        palette = (uint32_t*)pict->data[1];
     }
 
     gif_image_write_image(avctx, &outbuf_ptr, end, palette,
@@ -276,6 +279,8 @@
 {
     GIFContext *s = avctx->priv_data;
 
+    av_frame_free(&avctx->coded_frame);
+
     av_freep(&s->lzw);
     av_freep(&s->buf);
     av_frame_free(&s->last_frame);

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/gifdec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/gifdec.c Changed

@@ -64,7 +64,6 @@
     int stored_bg_color;
 
     GetByteContext gb;
-    /* LZW compatible decoder */
     LZWState *lzw;
 
     /* aux buffers */
@@ -140,11 +139,11 @@
     if (bytestream2_get_bytes_left(&s->gb) < 9)
         return AVERROR_INVALIDDATA;
 
-    left = bytestream2_get_le16u(&s->gb);
-    top = bytestream2_get_le16u(&s->gb);
-    width = bytestream2_get_le16u(&s->gb);
+    left   = bytestream2_get_le16u(&s->gb);
+    top    = bytestream2_get_le16u(&s->gb);
+    width  = bytestream2_get_le16u(&s->gb);
     height = bytestream2_get_le16u(&s->gb);
-    flags = bytestream2_get_byteu(&s->gb);
+    flags  = bytestream2_get_byteu(&s->gb);
     is_interleaved = flags & 0x40;
     has_local_palette = flags & 0x80;
     bits_per_pixel = (flags & 0x07) + 1;
@@ -181,10 +180,14 @@
 
     /* verify that all the image is inside the screen dimensions */
     if (left + width > s->screen_width ||
-        top + height > s->screen_height)
+        top + height > s->screen_height) {
+        av_log(s->avctx, AV_LOG_ERROR, "image is outside the screen dimensions.\n");
         return AVERROR_INVALIDDATA;
-    if (width <= 0 || height <= 0)
+    }
+    if (width <= 0 || height <= 0) {
+        av_log(s->avctx, AV_LOG_ERROR, "Invalid image dimensions.\n");
         return AVERROR_INVALIDDATA;
+    }
 
     /* process disposal method */
     if (s->gce_prev_disposal == GCE_DISPOSAL_BACKGROUND) {
@@ -234,8 +237,12 @@
     pass = 0;
     y1 = 0;
     for (y = 0; y < height; y++) {
-        if (ff_lzw_decode(s->lzw, s->idx_line, width) == 0)
+        int count = ff_lzw_decode(s->lzw, s->idx_line, width);
+        if (count != width) {
+            if (count)
+                av_log(s->avctx, AV_LOG_ERROR, "LZW decode failed\n");
             goto decode_tail;
+        }
 
         pr = ptr + width;
 
@@ -298,7 +305,7 @@
         return AVERROR_INVALIDDATA;
 
     ext_code = bytestream2_get_byteu(&s->gb);
-    ext_len = bytestream2_get_byteu(&s->gb);
+    ext_len  = bytestream2_get_byteu(&s->gb);
 
     av_dlog(s->avctx, "ext_code=0x%x len=%d\n", ext_code, ext_len);
 
@@ -312,7 +319,7 @@
         if (bytestream2_get_bytes_left(&s->gb) < 5)
             return AVERROR_INVALIDDATA;
 
-        gce_flags = bytestream2_get_byteu(&s->gb);
+        gce_flags    = bytestream2_get_byteu(&s->gb);
         bytestream2_skipu(&s->gb, 2);    // delay during which the frame is shown
         gce_transparent_index = bytestream2_get_byteu(&s->gb);
         if (gce_flags & 0x01)
@@ -366,7 +373,7 @@
 
     /* read screen header */
     s->transparent_color_index = -1;
-    s->screen_width = bytestream2_get_le16u(&s->gb);
+    s->screen_width  = bytestream2_get_le16u(&s->gb);
     s->screen_height = bytestream2_get_le16u(&s->gb);
 
     v = bytestream2_get_byteu(&s->gb);
@@ -400,7 +407,7 @@
 
 static int gif_parse_next_image(GifState *s, AVFrame *frame)
 {
-    while (bytestream2_get_bytes_left(&s->gb)) {
+    while (bytestream2_get_bytes_left(&s->gb) > 0) {
         int code = bytestream2_get_byte(&s->gb);
         int ret;
 
@@ -463,9 +470,8 @@
         if ((ret = gif_read_header1(s)) < 0)
             return ret;
 
-        if ((ret = av_image_check_size(s->screen_width, s->screen_height, 0, avctx)) < 0)
+        if ((ret = ff_set_dimensions(avctx, s->screen_width, s->screen_height)) < 0)
             return ret;
-        avcodec_set_dimensions(avctx, s->screen_width, s->screen_height);
 
         av_frame_unref(s->frame);
         if ((ret = ff_get_buffer(avctx, s->frame, 0)) < 0)
@@ -499,7 +505,7 @@
         return ret;
     *got_frame = 1;
 
-    return avpkt->size;
+    return bytestream2_tell(&s->gb);
 }
 
 static av_cold int gif_decode_close(AVCodecContext *avctx)

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/golomb.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/golomb.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/gsm.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/gsm.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/gsm_parser.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/gsm_parser.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/gsmdec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/gsmdec.c Changed

@@ -34,14 +34,6 @@
 
 static av_cold int gsm_init(AVCodecContext *avctx)
 {
-    if (avctx->codec_tag == 0x0032 &&
-        avctx->bit_rate != 13000 &&
-        avctx->bit_rate != 17912 &&
-        avctx->bit_rate != 35824 &&
-        avctx->bit_rate != 71656) {
-        av_log(avctx, AV_LOG_ERROR, "Unsupported audio mode\n");
-        return AVERROR_PATCHWELCOME;
-    }
     avctx->channels       = 1;
     avctx->channel_layout = AV_CH_LAYOUT_MONO;
     if (!avctx->sample_rate)
@@ -55,7 +47,16 @@
         break;
     case AV_CODEC_ID_GSM_MS:
         avctx->frame_size  = 2 * GSM_FRAME_SIZE;
-        avctx->block_align = GSM_MS_BLOCK_SIZE;
+        if (!avctx->block_align)
+            avctx->block_align = GSM_MS_BLOCK_SIZE;
+        else
+            if (avctx->block_align < MSN_MIN_BLOCK_SIZE ||
+                avctx->block_align > GSM_MS_BLOCK_SIZE  ||
+                (avctx->block_align - MSN_MIN_BLOCK_SIZE) % 3) {
+                av_log(avctx, AV_LOG_ERROR, "Invalid block alignment %d\n",
+                       avctx->block_align);
+                return AVERROR_INVALIDDATA;
+            }
     }
 
     return 0;
@@ -87,12 +88,13 @@
         init_get_bits(&gb, buf, buf_size * 8);
         if (get_bits(&gb, 4) != 0xd)
             av_log(avctx, AV_LOG_WARNING, "Missing GSM magic!\n");
-        res = gsm_decode_block(avctx, samples, &gb);
+        res = gsm_decode_block(avctx, samples, &gb, GSM_13000);
         if (res < 0)
             return res;
         break;
     case AV_CODEC_ID_GSM_MS:
-        res = ff_msgsm_decode_block(avctx, samples, buf);
+        res = ff_msgsm_decode_block(avctx, samples, buf,
+                                    (GSM_MS_BLOCK_SIZE - avctx->block_align) / 3);
         if (res < 0)
             return res;
     }

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/gsmdec_data.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/gsmdec_data.c Changed

@@ -92,3 +92,29 @@
     {-26879, -19199, -11520,  -3840,   3840,  11520,  19199,  26879},
     {-28671, -20479, -12288,  -4096,   4096,  12288,  20479,  28671}
 };
+
+static const int apcm_bits[11][13] = {
+    { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 },
+    { 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1 },
+    { 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1 },
+    { 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1 },
+    { 2, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1 },
+    { 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2 },
+    { 3, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2 },
+    { 3, 3, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2 },
+    { 3, 3, 3, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2 },
+    { 3, 3, 3, 3, 2, 2, 2, 2, 2, 2, 2, 2, 2 },
+    { 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3 }
+};
+
+const int* const ff_gsm_apcm_bits[][4] = {
+    { apcm_bits[10], apcm_bits[10], apcm_bits[10], apcm_bits[10] }, // 13000
+    { apcm_bits[10], apcm_bits[10], apcm_bits[10], apcm_bits[ 6] }, // 12400
+    { apcm_bits[10], apcm_bits[10], apcm_bits[ 7], apcm_bits[ 5] }, // 11800
+    { apcm_bits[10], apcm_bits[ 8], apcm_bits[ 5], apcm_bits[ 5] }, // 11200
+    { apcm_bits[ 9], apcm_bits[ 5], apcm_bits[ 5], apcm_bits[ 5] }, // 10600
+    { apcm_bits[ 5], apcm_bits[ 5], apcm_bits[ 5], apcm_bits[ 1] }, // 10000
+    { apcm_bits[ 5], apcm_bits[ 5], apcm_bits[ 2], apcm_bits[ 0] }, //  9400
+    { apcm_bits[ 5], apcm_bits[ 3], apcm_bits[ 0], apcm_bits[ 0] }, //  8800
+    { apcm_bits[ 4], apcm_bits[ 0], apcm_bits[ 0], apcm_bits[ 0] }, //  8200
+};

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/gsmdec_data.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/gsmdec_data.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/gsmdec_template.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/gsmdec_template.c Changed

@@ -28,13 +28,22 @@
 #include "gsm.h"
 #include "gsmdec_data.h"
 
-static void apcm_dequant_add(GetBitContext *gb, int16_t *dst)
+static const int requant_tab[4][8] = {
+    { 0 },
+    { 0, 7 },
+    { 0, 2, 5, 7 },
+    { 0, 1, 2, 3, 4, 5, 6, 7 }
+};
+
+static void apcm_dequant_add(GetBitContext *gb, int16_t *dst, const int *frame_bits)
 {
-    int i;
+    int i, val;
     int maxidx = get_bits(gb, 6);
     const int16_t *tab = ff_gsm_dequant_tab[maxidx];
-    for (i = 0; i < 13; i++)
-        dst[3*i] += tab[get_bits(gb, 3)];
+    for (i = 0; i < 13; i++) {
+        val = get_bits(gb, frame_bits[i]);
+        dst[3*i] += tab[requant_tab[frame_bits[i]][val]];
+    }
 }
 
 static inline int gsm_mult(int a, int b)
@@ -118,7 +127,7 @@
 }
 
 static int gsm_decode_block(AVCodecContext *avctx, int16_t *samples,
-                            GetBitContext *gb)
+                            GetBitContext *gb, int mode)
 {
     GSMContext *ctx = avctx->priv_data;
     int i;
@@ -139,7 +148,7 @@
         int offset   = get_bits(gb, 2);
         lag = av_clip(lag, 40, 120);
         long_term_synth(ref_dst, lag, gain_idx);
-        apcm_dequant_add(gb, ref_dst + offset);
+        apcm_dequant_add(gb, ref_dst + offset, ff_gsm_apcm_bits[mode][i]);
         ref_dst += 40;
     }
     memcpy(ctx->ref_buf, ctx->ref_buf + 160, 120 * sizeof(*ctx->ref_buf));

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/h261.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/h261.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/h261dec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/h261dec.c Changed

@@ -30,6 +30,7 @@
 #include "mpegvideo.h"
 #include "h263.h"
 #include "h261.h"
+#include "internal.h"
 
 #define H261_MBA_VLC_BITS 9
 #define H261_MTYPE_VLC_BITS 6
@@ -125,8 +126,8 @@
     }
 
     /* GEI */
-    while (get_bits1(&s->gb) != 0)
-        skip_bits(&s->gb, 8);
+    if (skip_1stop_8data_bits(&s->gb) < 0)
+        return AVERROR_INVALIDDATA;
 
     if (s->qscale == 0) {
         av_log(s->avctx, AV_LOG_ERROR, "qscale has forbidden 0 value\n");
@@ -478,7 +479,6 @@
     s->picture_number = (s->picture_number & ~31) + i;
 
     s->avctx->time_base      = (AVRational) { 1001, 30000 };
-    s->current_picture.f.pts = s->picture_number;
 
     /* PTYPE starts here */
     skip_bits1(&s->gb); /* split screen off */
@@ -506,8 +506,8 @@
     skip_bits1(&s->gb); /* Reserved */
 
     /* PEI */
-    while (get_bits1(&s->gb) != 0)
-        skip_bits(&s->gb, 8);
+    if (skip_1stop_8data_bits(&s->gb) < 0)
+        return AVERROR_INVALIDDATA;
 
     /* H.261 has no I-frames, but if we pass AV_PICTURE_TYPE_I for the first
      * frame, the codec crashes if it does not contain all I-blocks
@@ -586,15 +586,6 @@
         if (ff_MPV_common_init(s) < 0)
             return -1;
 
-    /* We need to set current_picture_ptr before reading the header,
-     * otherwise we cannot store anything in there. */
-    if (s->current_picture_ptr == NULL || s->current_picture_ptr->f.data[0]) {
-        int i = ff_find_unused_picture(s, 0);
-        if (i < 0)
-            return i;
-        s->current_picture_ptr = &s->picture[i];
-    }
-
     ret = h261_decode_picture_header(h);
 
     /* skip if the header was thrashed */
@@ -610,7 +601,9 @@
         s->parse_context = pc;
     }
     if (!s->context_initialized) {
-        avcodec_set_dimensions(avctx, s->width, s->height);
+        ret = ff_set_dimensions(avctx, s->width, s->height);
+        if (ret < 0)
+            return ret;
 
         goto retry;
     }

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/h261enc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/h261enc.c Changed

@@ -32,6 +32,9 @@
 #include "h263.h"
 #include "h261.h"
 
+static uint8_t uni_h261_rl_len [64*64*2*2];
+#define UNI_ENC_INDEX(last,run,level) ((last)*128*64 + (run)*128 + (level))
+
 int ff_h261_get_picture_format(int width, int height)
 {
     // QCIF
@@ -77,7 +80,7 @@
         h->gob_number = -1;
     else
         h->gob_number = 0;
-    h->current_mba = 0;
+    s->mb_skip_run = 0;
 }
 
 /**
@@ -95,18 +98,21 @@
     put_bits(&s->pb, 4, h->gob_number); /* GN */
     put_bits(&s->pb, 5, s->qscale);     /* GQUANT */
     put_bits(&s->pb, 1, 0);             /* no GEI */
-    h->current_mba  = 0;
-    h->previous_mba = 0;
-    h->current_mv_x = 0;
-    h->current_mv_y = 0;
+    s->mb_skip_run = 0;
+    s->last_mv[0][0][0] = 0;
+    s->last_mv[0][0][1] = 0;
 }
 
 void ff_h261_reorder_mb_index(MpegEncContext *s)
 {
     int index = s->mb_x + s->mb_y * s->mb_width;
 
-    if (index % 33 == 0)
-        h261_encode_gob_header(s, 0);
+    if (index % 11 == 0) {
+        if (index % 33 == 0)
+            h261_encode_gob_header(s, 0);
+        s->last_mv[0][0][0] = 0;
+        s->last_mv[0][0][1] = 0;
+    }
 
     /* for CIF the GOB's are fragmented in the middle of a scanline
      * that's why we need to adjust the x and y index of the macroblocks */
@@ -234,7 +240,6 @@
     cbp = 63; // avoid warning
     mvd = 0;
 
-    h->current_mba++;
     h->mtype = 0;
 
     if (!s->mb_intra) {
@@ -247,16 +252,18 @@
         if ((cbp | mvd | s->dquant) == 0) {
             /* skip macroblock */
             s->skip_count++;
-            h->current_mv_x = 0;
-            h->current_mv_y = 0;
+            s->mb_skip_run++;
+            s->last_mv[0][0][0] = 0;
+            s->last_mv[0][0][1] = 0;
             return;
         }
     }
 
     /* MB is not skipped, encode MBA */
     put_bits(&s->pb,
-             ff_h261_mba_bits[(h->current_mba - h->previous_mba) - 1],
-             ff_h261_mba_code[(h->current_mba - h->previous_mba) - 1]);
+             ff_h261_mba_bits[s->mb_skip_run],
+             ff_h261_mba_code[s->mb_skip_run]);
+    s->mb_skip_run = 0;
 
     /* calculate MTYPE */
     if (!s->mb_intra) {
@@ -286,16 +293,14 @@
     }
 
     if (IS_16X16(h->mtype)) {
-        mv_diff_x       = (motion_x >> 1) - h->current_mv_x;
-        mv_diff_y       = (motion_y >> 1) - h->current_mv_y;
-        h->current_mv_x = (motion_x >> 1);
-        h->current_mv_y = (motion_y >> 1);
+        mv_diff_x       = (motion_x >> 1) - s->last_mv[0][0][0];
+        mv_diff_y       = (motion_y >> 1) - s->last_mv[0][0][1];
+        s->last_mv[0][0][0] = (motion_x >> 1);
+        s->last_mv[0][0][1] = (motion_y >> 1);
         h261_encode_motion(h, mv_diff_x);
         h261_encode_motion(h, mv_diff_y);
     }
 
-    h->previous_mba = h->current_mba;
-
     if (HAS_CBP(h->mtype)) {
         av_assert1(cbp > 0);
         put_bits(&s->pb,
@@ -306,10 +311,49 @@
         /* encode each block */
         h261_encode_block(h, block[i], i);
 
-    if ((h->current_mba == 11) || (h->current_mba == 22) ||
-        (h->current_mba == 33) || (!IS_16X16(h->mtype))) {
-        h->current_mv_x = 0;
-        h->current_mv_y = 0;
+    if (!IS_16X16(h->mtype)) {
+        s->last_mv[0][0][0] = 0;
+        s->last_mv[0][0][1] = 0;
+    }
+}
+
+static av_cold void init_uni_h261_rl_tab(RLTable *rl, uint32_t *bits_tab,
+                                         uint8_t *len_tab)
+{
+    int slevel, run, last;
+
+    av_assert0(MAX_LEVEL >= 64);
+    av_assert0(MAX_RUN   >= 63);
+
+    for(slevel=-64; slevel<64; slevel++){
+        if(slevel==0) continue;
+        for(run=0; run<64; run++){
+            for(last=0; last<=1; last++){
+                const int index= UNI_ENC_INDEX(last, run, slevel+64);
+                int level= slevel < 0 ? -slevel : slevel;
+                int len, code;
+
+                len_tab[index]= 100;
+
+                /* ESC0 */
+                code= get_rl_index(rl, 0, run, level);
+                len=  rl->table_vlc[code][1] + 1;
+                if(last)
+                    len += 2;
+
+                if(code!=rl->n && len < len_tab[index]){
+                    len_tab [index]= len;
+                }
+                /* ESC */
+                len = rl->table_vlc[rl->n][1];
+                if(last)
+                    len += 2;
+
+                if(len < len_tab[index]){
+                    len_tab [index]= len;
+                }
+            }
+        }
     }
 }
 
@@ -321,6 +365,12 @@
     s->max_qcoeff       = 127;
     s->y_dc_scale_table =
     s->c_dc_scale_table = ff_mpeg1_dc_scale_table;
+    s->ac_esc_length    = 6+6+8;
+
+    init_uni_h261_rl_tab(&ff_h261_rl_tcoeff, NULL, uni_h261_rl_len);
+
+    s->intra_ac_vlc_length      = s->inter_ac_vlc_length      = uni_h261_rl_len;
+    s->intra_ac_vlc_last_length = s->inter_ac_vlc_last_length = uni_h261_rl_len + 128*64;
 }
 
 FF_MPV_GENERIC_CLASS(h261)

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/h263.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/h263.c Changed

@@ -152,8 +152,8 @@
     */
     if (!IS_SKIP(s->current_picture.mb_type[xy])) {
         qp_c= s->qscale;
-        s->dsp.h263_v_loop_filter(dest_y+8*linesize  , linesize, qp_c);
-        s->dsp.h263_v_loop_filter(dest_y+8*linesize+8, linesize, qp_c);
+        s->h263dsp.h263_v_loop_filter(dest_y + 8 * linesize,     linesize, qp_c);
+        s->h263dsp.h263_v_loop_filter(dest_y + 8 * linesize + 8, linesize, qp_c);
     }else
         qp_c= 0;
 
@@ -172,15 +172,15 @@
 
         if(qp_tc){
             const int chroma_qp= s->chroma_qscale_table[qp_tc];
-            s->dsp.h263_v_loop_filter(dest_y  ,   linesize, qp_tc);
-            s->dsp.h263_v_loop_filter(dest_y+8,   linesize, qp_tc);
+            s->h263dsp.h263_v_loop_filter(dest_y,     linesize, qp_tc);
+            s->h263dsp.h263_v_loop_filter(dest_y + 8, linesize, qp_tc);
 
-            s->dsp.h263_v_loop_filter(dest_cb , uvlinesize, chroma_qp);
-            s->dsp.h263_v_loop_filter(dest_cr , uvlinesize, chroma_qp);
+            s->h263dsp.h263_v_loop_filter(dest_cb, uvlinesize, chroma_qp);
+            s->h263dsp.h263_v_loop_filter(dest_cr, uvlinesize, chroma_qp);
         }
 
         if(qp_tt)
-            s->dsp.h263_h_loop_filter(dest_y-8*linesize+8  ,   linesize, qp_tt);
+            s->h263dsp.h263_h_loop_filter(dest_y - 8 * linesize + 8, linesize, qp_tt);
 
         if(s->mb_x){
             if (qp_tt || IS_SKIP(s->current_picture.mb_type[xy - 1 - s->mb_stride]))
@@ -190,17 +190,17 @@
 
             if(qp_dt){
                 const int chroma_qp= s->chroma_qscale_table[qp_dt];
-                s->dsp.h263_h_loop_filter(dest_y -8*linesize  ,   linesize, qp_dt);
-                s->dsp.h263_h_loop_filter(dest_cb-8*uvlinesize, uvlinesize, chroma_qp);
-                s->dsp.h263_h_loop_filter(dest_cr-8*uvlinesize, uvlinesize, chroma_qp);
+                s->h263dsp.h263_h_loop_filter(dest_y  - 8 * linesize,   linesize,   qp_dt);
+                s->h263dsp.h263_h_loop_filter(dest_cb - 8 * uvlinesize, uvlinesize, chroma_qp);
+                s->h263dsp.h263_h_loop_filter(dest_cr - 8 * uvlinesize, uvlinesize, chroma_qp);
             }
         }
     }
 
     if(qp_c){
-        s->dsp.h263_h_loop_filter(dest_y +8,   linesize, qp_c);
+        s->h263dsp.h263_h_loop_filter(dest_y + 8, linesize, qp_c);
         if(s->mb_y + 1 == s->mb_height)
-            s->dsp.h263_h_loop_filter(dest_y+8*linesize+8,   linesize, qp_c);
+            s->h263dsp.h263_h_loop_filter(dest_y + 8 * linesize + 8, linesize, qp_c);
     }
 
     if(s->mb_x){
@@ -211,12 +211,12 @@
             qp_lc = s->current_picture.qscale_table[xy - 1];
 
         if(qp_lc){
-            s->dsp.h263_h_loop_filter(dest_y,   linesize, qp_lc);
+            s->h263dsp.h263_h_loop_filter(dest_y, linesize, qp_lc);
             if(s->mb_y + 1 == s->mb_height){
                 const int chroma_qp= s->chroma_qscale_table[qp_lc];
-                s->dsp.h263_h_loop_filter(dest_y +8*  linesize,   linesize, qp_lc);
-                s->dsp.h263_h_loop_filter(dest_cb             , uvlinesize, chroma_qp);
-                s->dsp.h263_h_loop_filter(dest_cr             , uvlinesize, chroma_qp);
+                s->h263dsp.h263_h_loop_filter(dest_y + 8 * linesize, linesize, qp_lc);
+                s->h263dsp.h263_h_loop_filter(dest_cb, uvlinesize, chroma_qp);
+                s->h263dsp.h263_h_loop_filter(dest_cr, uvlinesize, chroma_qp);
             }
         }
     }

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/h263.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/h263.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/h263data.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/h263data.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/h263dec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/h263dec.c Changed

@@ -107,10 +107,12 @@
         s->h263_flv = 1;
         break;
     default:
-        return AVERROR(EINVAL);
+        av_log(avctx, AV_LOG_ERROR, "Unsupported codec %d\n",
+               avctx->codec->id);
+        return AVERROR(ENOSYS);
     }
     s->codec_id    = avctx->codec->id;
-    avctx->hwaccel = ff_find_hwaccel(avctx->codec->id, avctx->pix_fmt);
+    avctx->hwaccel = ff_find_hwaccel(avctx);
 
     if (avctx->stream_codec_tag == AV_RL32("l263") && avctx->extradata_size == 56 && avctx->extradata[0] == 1)
         s->ehc_mode = 1;
@@ -122,6 +124,7 @@
         if ((ret = ff_MPV_common_init(s)) < 0)
             return ret;
 
+    ff_h263dsp_init(&s->h263dsp);
     ff_h263_decode_init_vlc();
 
     return 0;
@@ -166,7 +169,8 @@
 
 static int decode_slice(MpegEncContext *s)
 {
-    const int part_mask = s->partitioned_frame ? (ER_AC_END | ER_AC_ERROR) : 0x7F;
+    const int part_mask = s->partitioned_frame
+                          ? (ER_AC_END | ER_AC_ERROR) : 0x7F;
     const int mb_size   = 16 >> s->avctx->lowres;
     int ret;
 
@@ -189,7 +193,7 @@
         const int qscale = s->qscale;
 
         if (CONFIG_MPEG4_DECODER && s->codec_id == AV_CODEC_ID_MPEG4)
-            if ((ret = ff_mpeg4_decode_partitions(s)) < 0)
+            if ((ret = ff_mpeg4_decode_partitions(s->avctx->priv_data)) < 0)
                 return ret;
 
         /* restore variables which were modified */
@@ -229,7 +233,6 @@
 
             s->mv_dir  = MV_DIR_FORWARD;
             s->mv_type = MV_TYPE_16X16;
-//            s->mb_skipped = 0;
             av_dlog(s, "%d %d %06X\n",
                     ret, get_bits_count(&s->gb), show_bits(&s->gb, 24));
             ret = s->decode_mb(s, s->block);
@@ -296,7 +299,6 @@
         (s->workaround_bugs & FF_BUG_AUTODETECT) &&
         get_bits_left(&s->gb) >= 0               &&
         get_bits_left(&s->gb) < 137              &&
-        // !s->resync_marker                     &&
         !s->data_partitioning) {
         const int bits_count = get_bits_count(&s->gb);
         const int bits_left  = s->gb.size_in_bits - bits_count;
@@ -318,8 +320,7 @@
     }
 
     if (s->workaround_bugs & FF_BUG_AUTODETECT) {
-        if (s->padding_bug_score > -2 && !s->data_partitioning
-            /* && (s->divx_version >= 0 || !s->resync_marker) */)
+        if (s->padding_bug_score > -2 && !s->data_partitioning)
             s->workaround_bugs |= FF_BUG_NO_PADDING;
         else
             s->workaround_bugs &= ~FF_BUG_NO_PADDING;
@@ -372,6 +373,7 @@
     int buf_size       = avpkt->size;
     MpegEncContext *s  = avctx->priv_data;
     int ret;
+    int slice_ret = 0;
     AVFrame *pict = data;
 
     s->flags  = avctx->flags;
@@ -403,7 +405,7 @@
         } else {
             av_log(s->avctx, AV_LOG_ERROR,
                    "this codec does not support truncated bitstreams\n");
-            return AVERROR(EINVAL);
+            return AVERROR(ENOSYS);
         }
 
         if (ff_combine_frame(&s->parse_context, next, (const uint8_t **)&buf,
@@ -426,7 +428,8 @@
     }
 
     if (s->bitstream_buffer_size && (s->divx_packed || buf_size < 20)) // divx 5.01+/xvid frame reorder
-        ret = init_get_bits8(&s->gb, s->bitstream_buffer, s->bitstream_buffer_size);
+        ret = init_get_bits8(&s->gb, s->bitstream_buffer,
+                             s->bitstream_buffer_size);
     else
         ret = init_get_bits8(&s->gb, buf, buf_size);
 
@@ -435,7 +438,8 @@
         return ret;
 
     if (!s->context_initialized)
-        if ((ret = ff_MPV_common_init(s)) < 0) // we need the idct permutaton for reading a custom matrix
+        // we need the idct permutaton for reading a custom matrix
+        if ((ret = ff_MPV_common_init(s)) < 0)
             return ret;
 
     /* We need to set current_picture_ptr before reading the header,
@@ -452,14 +456,14 @@
         ret = ff_wmv2_decode_picture_header(s);
     } else if (CONFIG_MSMPEG4_DECODER && s->msmpeg4_version) {
         ret = ff_msmpeg4_decode_picture_header(s);
-    } else if (CONFIG_MPEG4_DECODER && s->h263_pred) {
+    } else if (CONFIG_MPEG4_DECODER && avctx->codec_id == AV_CODEC_ID_MPEG4) {
         if (s->avctx->extradata_size && s->picture_number == 0) {
             GetBitContext gb;
 
             if (init_get_bits8(&gb, s->avctx->extradata, s->avctx->extradata_size) >= 0 )
-                ret = ff_mpeg4_decode_picture_header(s, &gb);
+                ff_mpeg4_decode_picture_header(avctx->priv_data, &gb);
         }
-        ret = ff_mpeg4_decode_picture_header(s, &s->gb);
+        ret = ff_mpeg4_decode_picture_header(avctx->priv_data, &s->gb);
     } else if (CONFIG_H263I_DECODER && s->codec_id == AV_CODEC_ID_H263I) {
         ret = ff_intel_h263_decode_picture_header(s);
     } else if (CONFIG_FLV_DECODER && s->h263_flv) {
@@ -487,133 +491,11 @@
 
     avctx->has_b_frames = !s->low_delay;
 
-    if (s->xvid_build == -1 && s->divx_version == -1 && s->lavc_build == -1) {
-        if (s->stream_codec_tag == AV_RL32("XVID") ||
-            s->codec_tag        == AV_RL32("XVID") ||
-            s->codec_tag        == AV_RL32("XVIX") ||
-            s->codec_tag        == AV_RL32("RMP4") ||
-            s->codec_tag        == AV_RL32("ZMP4") ||
-            s->codec_tag        == AV_RL32("SIPP"))
-            s->xvid_build = 0;
-#if 0
-        if (s->codec_tag == AV_RL32("DIVX") && s->vo_type == 0 &&
-            s->vol_control_parameters == 1 &&
-            s->padding_bug_score > 0 && s->low_delay) // XVID with modified fourcc
-            s->xvid_build = 0;
-#endif
-    }
-
-    if (s->xvid_build == -1 && s->divx_version == -1 && s->lavc_build == -1)
-        if (s->codec_tag == AV_RL32("DIVX") && s->vo_type == 0 &&
-            s->vol_control_parameters == 0)
-            s->divx_version = 400;  // divx 4
-
-    if (s->xvid_build >= 0 && s->divx_version >= 0) {
-        s->divx_version =
-        s->divx_build   = -1;
+    if (CONFIG_MPEG4_DECODER && avctx->codec_id == AV_CODEC_ID_MPEG4) {
+        if (ff_mpeg4_workaround_bugs(avctx) == 1)
+            goto retry;
     }
 
-    if (s->workaround_bugs & FF_BUG_AUTODETECT) {
-        if (s->codec_tag == AV_RL32("XVIX"))
-            s->workaround_bugs |= FF_BUG_XVID_ILACE;
-
-        if (s->codec_tag == AV_RL32("UMP4"))
-            s->workaround_bugs |= FF_BUG_UMP4;
-
-        if (s->divx_version >= 500 && s->divx_build < 1814)
-            s->workaround_bugs |= FF_BUG_QPEL_CHROMA;
-
-        if (s->divx_version > 502 && s->divx_build < 1814)
-            s->workaround_bugs |= FF_BUG_QPEL_CHROMA2;
-
-        if (s->xvid_build <= 3U)
-            s->padding_bug_score = 256 * 256 * 256 * 64;
-
-        if (s->xvid_build <= 1U)
-            s->workaround_bugs |= FF_BUG_QPEL_CHROMA;
-
-        if (s->xvid_build <= 12U)
-            s->workaround_bugs |= FF_BUG_EDGE;
-
-        if (s->xvid_build <= 32U)
-            s->workaround_bugs |= FF_BUG_DC_CLIP;
-
-#define SET_QPEL_FUNC(postfix1, postfix2)                           \
-    s->dsp.put_        ## postfix1 = ff_put_        ## postfix2;    \
-    s->dsp.put_no_rnd_ ## postfix1 = ff_put_no_rnd_ ## postfix2;    \
-    s->dsp.avg_        ## postfix1 = ff_avg_        ## postfix2;
-
-        if (s->lavc_build < 4653U)
-            s->workaround_bugs |= FF_BUG_STD_QPEL;
-
-        if (s->lavc_build < 4655U)
-            s->workaround_bugs |= FF_BUG_DIRECT_BLOCKSIZE;
-
-        if (s->lavc_build < 4670U)
-            s->workaround_bugs |= FF_BUG_EDGE;
-
-        if (s->lavc_build <= 4712U)
-            s->workaround_bugs |= FF_BUG_DC_CLIP;
-
-        if (s->divx_version >= 0)
-            s->workaround_bugs |= FF_BUG_DIRECT_BLOCKSIZE;
-        if (s->divx_version == 501 && s->divx_build == 20020416)
-            s->padding_bug_score = 256 * 256 * 256 * 64;
-
-        if (s->divx_version < 500U)
-            s->workaround_bugs |= FF_BUG_EDGE;
-
-        if (s->divx_version >= 0)
-            s->workaround_bugs |= FF_BUG_HPEL_CHROMA;
-#if 0
-        if (s->divx_version == 500)
-            s->padding_bug_score = 256 * 256 * 256 * 64;
-
-        /* very ugly XVID padding bug detection FIXME/XXX solve this differently
-         * Let us hope this at least works. */
-        if (s->resync_marker == 0 && s->data_partitioning == 0        &&
-            s->divx_version == -1 && s->codec_id == AV_CODEC_ID_MPEG4 &&
-            s->vo_type == 0)
-            s->workaround_bugs |= FF_BUG_NO_PADDING;
-
-        // FIXME not sure about the version num but a 4609 file seems ok
-        if (s->lavc_build < 4609U)
-            s->workaround_bugs |= FF_BUG_NO_PADDING;
-#endif
-    }
-
-    if (s->workaround_bugs & FF_BUG_STD_QPEL) {
-        SET_QPEL_FUNC(qpel_pixels_tab[0][5], qpel16_mc11_old_c)
-        SET_QPEL_FUNC(qpel_pixels_tab[0][7], qpel16_mc31_old_c)
-        SET_QPEL_FUNC(qpel_pixels_tab[0][9], qpel16_mc12_old_c)
-        SET_QPEL_FUNC(qpel_pixels_tab[0][11], qpel16_mc32_old_c)
-        SET_QPEL_FUNC(qpel_pixels_tab[0][13], qpel16_mc13_old_c)
-        SET_QPEL_FUNC(qpel_pixels_tab[0][15], qpel16_mc33_old_c)
-
-        SET_QPEL_FUNC(qpel_pixels_tab[1][5], qpel8_mc11_old_c)
-        SET_QPEL_FUNC(qpel_pixels_tab[1][7], qpel8_mc31_old_c)
-        SET_QPEL_FUNC(qpel_pixels_tab[1][9], qpel8_mc12_old_c)
-        SET_QPEL_FUNC(qpel_pixels_tab[1][11], qpel8_mc32_old_c)
-        SET_QPEL_FUNC(qpel_pixels_tab[1][13], qpel8_mc13_old_c)
-        SET_QPEL_FUNC(qpel_pixels_tab[1][15], qpel8_mc33_old_c)
-    }
-
-    if (avctx->debug & FF_DEBUG_BUGS)
-        av_log(s->avctx, AV_LOG_DEBUG,
-               "bugs: %X lavc_build:%d xvid_build:%d divx_version:%d divx_build:%d %s\n",
-               s->workaround_bugs, s->lavc_build, s->xvid_build,
-               s->divx_version, s->divx_build, s->divx_packed ? "p" : "");
-
-#if HAVE_MMX
-    if (s->codec_id == AV_CODEC_ID_MPEG4 && s->xvid_build >= 0 &&
-        avctx->idct_algo == FF_IDCT_AUTO &&
-        (av_get_cpu_flags() & AV_CPU_FLAG_MMX)) {
-        avctx->idct_algo = FF_IDCT_XVIDMMX;
-        ff_dct_common_init(s);
-        goto retry;
-    }
-#endif
-
     /* After H263 & mpeg4 header decode we have the height, width,
      * and other parameters. So then we could init the picture.
      * FIXME: By the way H263 decoder is evolving it should have
@@ -624,7 +506,9 @@
         /* H.263 could change picture size any time */
         s->context_reinit = 0;
 
-        avcodec_set_dimensions(avctx, s->width, s->height);
+        ret = ff_set_dimensions(avctx, s->width, s->height);
+        if (ret < 0)
+            return ret;
 
         if ((ret = ff_MPV_common_frame_size_change(s)))
             return ret;
@@ -676,10 +560,12 @@
         goto frame_end;
     }
 
-    if (avctx->hwaccel)
-        if ((ret = avctx->hwaccel->start_frame(avctx, s->gb.buffer,
-                                               s->gb.buffer_end - s->gb.buffer)) < 0)
+    if (avctx->hwaccel) {
+        ret = avctx->hwaccel->start_frame(avctx, s->gb.buffer,
+                                          s->gb.buffer_end - s->gb.buffer);
+        if (ret < 0 )
             return ret;
+    }
 
     ff_mpeg_er_frame_start(s);
 
@@ -698,7 +584,7 @@
     s->mb_x = 0;
     s->mb_y = 0;
 
-    ret = decode_slice(s);
+    slice_ret = decode_slice(s);
     while (s->mb_y < s->mb_height) {
         if (s->msmpeg4_version) {
             if (s->slice_height == 0 || s->mb_x != 0 ||
@@ -716,7 +602,7 @@
             ff_mpeg4_clean_buffers(s);
 
         if (decode_slice(s) < 0)
-            ret = AVERROR_INVALIDDATA;
+            slice_ret = AVERROR_INVALIDDATA;
     }
 
     if (s->msmpeg4_version && s->msmpeg4_version < 4 &&
@@ -729,43 +615,16 @@
 frame_end:
     ff_er_frame_end(&s->er);
 
-    if (avctx->hwaccel)
-        if ((ret = avctx->hwaccel->end_frame(avctx)) < 0)
+    if (avctx->hwaccel) {
+        ret = avctx->hwaccel->end_frame(avctx);
+        if (ret < 0)
             return ret;
+    }
 
     ff_MPV_frame_end(s);
 
-    /* divx 5.01+ bitstream reorder stuff */
-    /* Since this clobbers the input buffer and hwaccel codecs still need the
-     * data during hwaccel->end_frame we should not do this any earlier */
-    if (s->codec_id == AV_CODEC_ID_MPEG4 && s->divx_packed) {
-        int current_pos     = s->gb.buffer == s->bitstream_buffer ? 0 : (get_bits_count(&s->gb) >> 3);
-        int startcode_found = 0;
-
-        if (buf_size - current_pos > 7) {
-            int i;
-            for (i = current_pos; i < buf_size - 4; i++)
-                if (buf[i]     == 0 &&
-                    buf[i + 1] == 0 &&
-                    buf[i + 2] == 1 &&
-                    buf[i + 3] == 0xB6) {
-                    startcode_found = !(buf[i + 4] & 0x40);
-                    break;
-                }
-        }
-
-        if (startcode_found) {
-            av_fast_malloc(&s->bitstream_buffer,
-                           &s->allocated_bitstream_buffer_size,
-                           buf_size - current_pos +
-                           FF_INPUT_BUFFER_PADDING_SIZE);
-            if (!s->bitstream_buffer)
-                return AVERROR(ENOMEM);
-            memcpy(s->bitstream_buffer, buf + current_pos,
-                   buf_size - current_pos);
-            s->bitstream_buffer_size = buf_size - current_pos;
-        }
-    }
+    if (CONFIG_MPEG4_DECODER && avctx->codec_id == AV_CODEC_ID_MPEG4)
+        ff_mpeg4_frame_end(avctx, buf, buf_size);
 
     if (!s->divx_packed && avctx->hwaccel)
         ff_thread_finish_setup(avctx);
@@ -803,7 +662,7 @@
         *got_frame = 1;
     }
 
-    if (ret && (avctx->err_recognition & AV_EF_EXPLODE))
+    if (slice_ret < 0 && (avctx->err_recognition & AV_EF_EXPLODE))
         return ret;
     else
         return get_consumed_bytes(s, buf_size);

omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/h263dsp.c Added

@@ -0,0 +1,124 @@
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <stdint.h>
+
+#include "libavutil/attributes.h"
+#include "libavutil/common.h"
+#include "config.h"
+#include "h263dsp.h"
+
+const uint8_t ff_h263_loop_filter_strength[32] = {
+    0, 1, 1, 2, 2, 3, 3,  4,  4,  4,  5,  5,  6,  6,  7, 7,
+    7, 8, 8, 8, 9, 9, 9, 10, 10, 10, 11, 11, 11, 12, 12, 12
+};
+
+static void h263_h_loop_filter_c(uint8_t *src, int stride, int qscale)
+{
+    int y;
+    const int strength = ff_h263_loop_filter_strength[qscale];
+
+    for (y = 0; y < 8; y++) {
+        int d1, d2, ad1;
+        int p0 = src[y * stride - 2];
+        int p1 = src[y * stride - 1];
+        int p2 = src[y * stride + 0];
+        int p3 = src[y * stride + 1];
+        int d  = (p0 - p3 + 4 * (p2 - p1)) / 8;
+
+        if (d < -2 * strength)
+            d1 = 0;
+        else if (d < -strength)
+            d1 = -2 * strength - d;
+        else if (d < strength)
+            d1 = d;
+        else if (d < 2 * strength)
+            d1 = 2 * strength - d;
+        else
+            d1 = 0;
+
+        p1 += d1;
+        p2 -= d1;
+        if (p1 & 256)
+            p1 = ~(p1 >> 31);
+        if (p2 & 256)
+            p2 = ~(p2 >> 31);
+
+        src[y * stride - 1] = p1;
+        src[y * stride + 0] = p2;
+
+        ad1 = FFABS(d1) >> 1;
+
+        d2 = av_clip((p0 - p3) / 4, -ad1, ad1);
+
+        src[y * stride - 2] = p0 - d2;
+        src[y * stride + 1] = p3 + d2;
+    }
+}
+
+static void h263_v_loop_filter_c(uint8_t *src, int stride, int qscale)
+{
+    int x;
+    const int strength = ff_h263_loop_filter_strength[qscale];
+
+    for (x = 0; x < 8; x++) {
+        int d1, d2, ad1;
+        int p0 = src[x - 2 * stride];
+        int p1 = src[x - 1 * stride];
+        int p2 = src[x + 0 * stride];
+        int p3 = src[x + 1 * stride];
+        int d  = (p0 - p3 + 4 * (p2 - p1)) / 8;
+
+        if (d < -2 * strength)
+            d1 = 0;
+        else if (d < -strength)
+            d1 = -2 * strength - d;
+        else if (d < strength)
+            d1 = d;
+        else if (d < 2 * strength)
+            d1 = 2 * strength - d;
+        else
+            d1 = 0;
+
+        p1 += d1;
+        p2 -= d1;
+        if (p1 & 256)
+            p1 = ~(p1 >> 31);
+        if (p2 & 256)
+            p2 = ~(p2 >> 31);
+
+        src[x - 1 * stride] = p1;
+        src[x + 0 * stride] = p2;
+
+        ad1 = FFABS(d1) >> 1;
+
+        d2 = av_clip((p0 - p3) / 4, -ad1, ad1);
+
+        src[x - 2 * stride] = p0 - d2;
+        src[x + stride]     = p3 + d2;
+    }
+}
+
+av_cold void ff_h263dsp_init(H263DSPContext *ctx)
+{
+    ctx->h263_h_loop_filter = h263_h_loop_filter_c;
+    ctx->h263_v_loop_filter = h263_v_loop_filter_c;
+
+    if (ARCH_X86)
+        ff_h263dsp_init_x86(ctx);
+}

omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/h263dsp.h Added

@@ -0,0 +1,34 @@
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_H263DSP_H
+#define AVCODEC_H263DSP_H
+
+#include <stdint.h>
+
+extern const uint8_t ff_h263_loop_filter_strength[32];
+
+typedef struct H263DSPContext {
+    void (*h263_h_loop_filter)(uint8_t *src, int stride, int qscale);
+    void (*h263_v_loop_filter)(uint8_t *src, int stride, int qscale);
+} H263DSPContext;
+
+void ff_h263dsp_init(H263DSPContext *ctx);
+void ff_h263dsp_init_x86(H263DSPContext *ctx);
+
+#endif /* AVCODEC_H263DSP_H */

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/h264.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/h264.c Changed

@@ -30,6 +30,8 @@
 #include "libavutil/avassert.h"
 #include "libavutil/imgutils.h"
 #include "libavutil/opt.h"
+#include "libavutil/stereo3d.h"
+#include "libavutil/timer.h"
 #include "internal.h"
 #include "cabac.h"
 #include "cabac_functions.h"
@@ -281,7 +283,7 @@
     int off = offsetof(Picture, tf) + sizeof(pic->tf);
     int i;
 
-    if (!pic->f.data[0])
+    if (!pic->f.buf[0])
         return;
 
     ff_thread_release_buffer(h->avctx, &pic->tf);
@@ -303,7 +305,7 @@
 
     /* release non reference frames */
     for (i = 0; i < MAX_PICTURE_COUNT; i++) {
-        if (h->DPB[i].f.data[0] && !h->DPB[i].reference &&
+        if (h->DPB[i].f.buf[0] && !h->DPB[i].reference &&
             (remove_current || &h->DPB[i] != h->cur_pic_ptr)) {
             unref_picture(h, &h->DPB[i]);
         }
@@ -361,10 +363,11 @@
     dst->field_picture = src->field_picture;
     dst->needs_realloc = src->needs_realloc;
     dst->reference     = src->reference;
-    dst->sync          = src->sync;
     dst->crop          = src->crop;
     dst->crop_left     = src->crop_left;
     dst->crop_top      = src->crop_top;
+    dst->recovered     = src->recovered;
+    dst->invalid_gap   = src->invalid_gap;
 
     return 0;
 fail:
@@ -452,6 +455,18 @@
             pic->hwaccel_picture_private = pic->hwaccel_priv_buf->data;
         }
     }
+    if (!h->avctx->hwaccel && CONFIG_GRAY && h->flags & CODEC_FLAG_GRAY && pic->f.data[2]) {
+        int h_chroma_shift, v_chroma_shift;
+        av_pix_fmt_get_chroma_sub_sample(pic->f.format,
+                                         &h_chroma_shift, &v_chroma_shift);
+
+        for(i=0; i<FF_CEIL_RSHIFT(h->avctx->height, v_chroma_shift); i++) {
+            memset(pic->f.data[1] + pic->f.linesize[1]*i,
+                   0x80, FF_CEIL_RSHIFT(h->avctx->width, h_chroma_shift));
+            memset(pic->f.data[2] + pic->f.linesize[2]*i,
+                   0x80, FF_CEIL_RSHIFT(h->avctx->width, h_chroma_shift));
+        }
+    }
 
     if (!h->qscale_table_pool) {
         ret = init_table_pools(h);
@@ -485,7 +500,7 @@
 
 static inline int pic_is_unused(H264Context *h, Picture *pic)
 {
-    if (pic->f.data[0] == NULL)
+    if (!pic->f.buf[0])
         return 1;
     if (pic->needs_realloc && !(pic->reference & DELAYED_PIC_REF))
         return 1;
@@ -565,7 +580,7 @@
 int ff_h264_check_intra_pred_mode(H264Context *h, int mode, int is_chroma)
 {
     static const int8_t top[4]  = { LEFT_DC_PRED8x8, 1, -1, -1 };
-    static const int8_t left[5] = { TOP_DC_PRED8x8, -1, 2, -1, DC_128_PRED8x8 };
+    static const int8_t left[5] = { TOP_DC_PRED8x8, -1,  2, -1, DC_128_PRED8x8 };
 
     if (mode > 3U) {
         av_log(h->avctx, AV_LOG_ERROR,
@@ -934,9 +949,9 @@
         full_my                <          0 - extra_height ||
         full_mx + 16 /*FIXME*/ > pic_width  + extra_width  ||
         full_my + 16 /*FIXME*/ > pic_height + extra_height) {
-        h->vdsp.emulated_edge_mc(h->edge_emu_buffer, h->mb_linesize,
+        h->vdsp.emulated_edge_mc(h->edge_emu_buffer,
                                  src_y - (2 << pixel_shift) - 2 * h->mb_linesize,
-                                 h->mb_linesize,
+                                 h->mb_linesize, h->mb_linesize,
                                  16 + 5, 16 + 5 /*FIXME*/, full_mx - 2,
                                  full_my - 2, pic_width, pic_height);
         src_y = h->edge_emu_buffer + (2 << pixel_shift) + 2 * h->mb_linesize;
@@ -953,9 +968,9 @@
     if (chroma_idc == 3 /* yuv444 */) {
         src_cb = pic->f.data[1] + offset;
         if (emu) {
-            h->vdsp.emulated_edge_mc(h->edge_emu_buffer, h->mb_linesize,
+            h->vdsp.emulated_edge_mc(h->edge_emu_buffer,
                                      src_cb - (2 << pixel_shift) - 2 * h->mb_linesize,
-                                     h->mb_linesize,
+                                     h->mb_linesize, h->mb_linesize,
                                      16 + 5, 16 + 5 /*FIXME*/,
                                      full_mx - 2, full_my - 2,
                                      pic_width, pic_height);
@@ -967,9 +982,9 @@
 
         src_cr = pic->f.data[2] + offset;
         if (emu) {
-            h->vdsp.emulated_edge_mc(h->edge_emu_buffer, h->mb_linesize,
+            h->vdsp.emulated_edge_mc(h->edge_emu_buffer,
                                      src_cr - (2 << pixel_shift) - 2 * h->mb_linesize,
-                                     h->mb_linesize,
+                                     h->mb_linesize, h->mb_linesize,
                                      16 + 5, 16 + 5 /*FIXME*/,
                                      full_mx - 2, full_my - 2,
                                      pic_width, pic_height);
@@ -994,7 +1009,8 @@
              (my >> ysh) * h->mb_uvlinesize;
 
     if (emu) {
-        h->vdsp.emulated_edge_mc(h->edge_emu_buffer, h->mb_uvlinesize, src_cb, h->mb_uvlinesize,
+        h->vdsp.emulated_edge_mc(h->edge_emu_buffer, src_cb,
+                                 h->mb_uvlinesize, h->mb_uvlinesize,
                                  9, 8 * chroma_idc + 1, (mx >> 3), (my >> ysh),
                                  pic_width >> 1, pic_height >> (chroma_idc == 1 /* yuv420 */));
         src_cb = h->edge_emu_buffer;
@@ -1004,7 +1020,8 @@
               mx & 7, (my << (chroma_idc == 2 /* yuv422 */)) & 7);
 
     if (emu) {
-        h->vdsp.emulated_edge_mc(h->edge_emu_buffer, h->mb_uvlinesize, src_cr, h->mb_uvlinesize,
+        h->vdsp.emulated_edge_mc(h->edge_emu_buffer, src_cr,
+                                 h->mb_uvlinesize, h->mb_uvlinesize,
                                  9, 8 * chroma_idc + 1, (mx >> 3), (my >> ysh),
                                  pic_width >> 1, pic_height >> (chroma_idc == 1 /* yuv420 */));
         src_cr = h->edge_emu_buffer;
@@ -1210,9 +1227,6 @@
     av_freep(&h->mb2b_xy);
     av_freep(&h->mb2br_xy);
 
-    for (i = 0; i < 3; i++)
-        av_freep(&h->visualization_buffer[i]);
-
     av_buffer_pool_uninit(&h->qscale_table_pool);
     av_buffer_pool_uninit(&h->mb_type_pool);
     av_buffer_pool_uninit(&h->motion_val_pool);
@@ -1313,6 +1327,8 @@
 {
     int i, x;
     init_dequant4_coeff_table(h);
+    memset(h->dequant8_coeff, 0, sizeof(h->dequant8_coeff));
+
     if (h->pps.transform_8x8_mode)
         init_dequant8_coeff_table(h);
     if (h->sps.transform_bypass) {
@@ -1376,8 +1392,8 @@
         if (!h->DPB)
             return AVERROR(ENOMEM);
         for (i = 0; i < MAX_PICTURE_COUNT; i++)
-            avcodec_get_frame_defaults(&h->DPB[i].f);
-        avcodec_get_frame_defaults(&h->cur_pic.f);
+            av_frame_unref(&h->DPB[i].f);
+        av_frame_unref(&h->cur_pic.f);
     }
 
     return 0;
@@ -1504,7 +1520,8 @@
         h->is_avc = 1;
 
         if (size < 7) {
-            av_log(avctx, AV_LOG_ERROR, "avcC too short\n");
+            av_log(avctx, AV_LOG_ERROR,
+                   "avcC %d too short\n", size);
             return AVERROR_INVALIDDATA;
         }
         /* sps and pps in the avcC always have length coded with 2 bytes,
@@ -1662,19 +1679,24 @@
     }
 }
 
-static void copy_parameter_set(void **to, void **from, int count, int size)
+static int copy_parameter_set(void **to, void **from, int count, int size)
 {
     int i;
 
     for (i = 0; i < count; i++) {
-        if (to[i] && !from[i])
+        if (to[i] && !from[i]) {
             av_freep(&to[i]);
-        else if (from[i] && !to[i])
+        } else if (from[i] && !to[i]) {
             to[i] = av_malloc(size);
+            if (!to[i])
+                return AVERROR(ENOMEM);
+        }
 
         if (from[i])
             memcpy(to[i], from[i], size);
     }
+
+    return 0;
 }
 
 static int decode_init_thread_copy(AVCodecContext *avctx)
@@ -1738,11 +1760,15 @@
         h->mb_stride = h1->mb_stride;
         h->b_stride  = h1->b_stride;
         // SPS/PPS
-        copy_parameter_set((void **)h->sps_buffers, (void **)h1->sps_buffers,
-                        MAX_SPS_COUNT, sizeof(SPS));
+        if ((ret = copy_parameter_set((void **)h->sps_buffers,
+                                      (void **)h1->sps_buffers,
+                                      MAX_SPS_COUNT, sizeof(SPS))) < 0)
+            return ret;
         h->sps = h1->sps;
-        copy_parameter_set((void **)h->pps_buffers, (void **)h1->pps_buffers,
-                        MAX_PPS_COUNT, sizeof(PPS));
+        if ((ret = copy_parameter_set((void **)h->pps_buffers,
+                                      (void **)h1->pps_buffers,
+                                      MAX_PPS_COUNT, sizeof(PPS))) < 0)
+            return ret;
         h->pps = h1->pps;
 
         if ((err = h264_slice_header_init(h, 1)) < 0) {
@@ -1803,12 +1829,12 @@
         h->context_initialized = 0;
 
         memset(&h->cur_pic, 0, sizeof(h->cur_pic));
-        avcodec_get_frame_defaults(&h->cur_pic.f);
+        av_frame_unref(&h->cur_pic.f);
         h->cur_pic.tf.f = &h->cur_pic.f;
 
         ret = ff_h264_alloc_tables(h);
         if (ret < 0) {
-            av_log(dst, AV_LOG_ERROR, "Could not allocate memory for h264\n");
+            av_log(dst, AV_LOG_ERROR, "Could not allocate memory\n");
             return ret;
         }
         ret = context_init(h);
@@ -1834,12 +1860,11 @@
     h->picture_structure    = h1->picture_structure;
     h->qscale               = h1->qscale;
     h->droppable            = h1->droppable;
-    h->data_partitioning    = h1->data_partitioning;
     h->low_delay            = h1->low_delay;
 
     for (i = 0; h->DPB && i < MAX_PICTURE_COUNT; i++) {
         unref_picture(h, &h->DPB[i]);
-        if (h1->DPB[i].f.data[0] &&
+        if (h1->DPB && h1->DPB[i].f.buf[0] &&
             (ret = ref_picture(h, &h->DPB[i], &h1->DPB[i])) < 0)
             return ret;
     }
@@ -1857,11 +1882,15 @@
     h->is_avc = h1->is_avc;
 
     // SPS/PPS
-    copy_parameter_set((void **)h->sps_buffers, (void **)h1->sps_buffers,
-                       MAX_SPS_COUNT, sizeof(SPS));
+    if ((ret = copy_parameter_set((void **)h->sps_buffers,
+                                  (void **)h1->sps_buffers,
+                                  MAX_SPS_COUNT, sizeof(SPS))) < 0)
+        return ret;
     h->sps = h1->sps;
-    copy_parameter_set((void **)h->pps_buffers, (void **)h1->pps_buffers,
-                       MAX_PPS_COUNT, sizeof(PPS));
+    if ((ret = copy_parameter_set((void **)h->pps_buffers,
+                                  (void **)h1->pps_buffers,
+                                  MAX_PPS_COUNT, sizeof(PPS))) < 0)
+        return ret;
     h->pps = h1->pps;
 
     // Dequantization matrices
@@ -1889,7 +1918,7 @@
     copy_picture_range(h->delayed_pic, h1->delayed_pic,
                        MAX_DELAYED_PIC_COUNT + 2, h, h1);
 
-    h->sync            = h1->sync;
+    h->frame_recovered       = h1->frame_recovered;
 
     if (context_reinitialized)
         h264_set_parameter_from_sps(h);
@@ -1906,6 +1935,8 @@
     h->prev_frame_num        = h->frame_num;
     h->outputed_poc          = h->next_outputed_poc;
 
+    h->recovery_frame        = h1->recovery_frame;
+
     return err;
 }
 
@@ -1946,17 +1977,22 @@
      * See decode_nal_units().
      */
     pic->f.key_frame = 0;
-    pic->sync        = 0;
     pic->mmco_reset  = 0;
+    pic->recovered   = 0;
+    pic->invalid_gap = 0;
 
     if ((ret = alloc_picture(h, pic)) < 0)
         return ret;
-    if(!h->sync && !h->avctx->hwaccel &&
+    if(!h->frame_recovered && !h->avctx->hwaccel &&
        !(h->avctx->codec->capabilities & CODEC_CAP_HWACCEL_VDPAU))
         avpriv_color_frame(&pic->f, c);
 
     h->cur_pic_ptr = pic;
     unref_picture(h, &h->cur_pic);
+    if (CONFIG_ERROR_RESILIENCE) {
+        h->er.cur_pic = NULL;
+    }
+
     if ((ret = ref_picture(h, &h->cur_pic, h->cur_pic_ptr)) < 0)
         return ret;
 
@@ -2091,8 +2127,49 @@
         }
     }
 
+    if (h->sei_frame_packing_present &&
+        h->frame_packing_arrangement_type >= 0 &&
+        h->frame_packing_arrangement_type <= 6 &&
+        h->content_interpretation_type > 0 &&
+        h->content_interpretation_type < 3) {
+        AVStereo3D *stereo = av_stereo3d_create_side_data(&cur->f);
+        if (!stereo)
+            return;
+
+        switch (h->frame_packing_arrangement_type) {
+        case 0:
+            stereo->type = AV_STEREO3D_CHECKERBOARD;
+            break;
+        case 1:
+            stereo->type = AV_STEREO3D_LINES;
+            break;
+        case 2:
+            stereo->type = AV_STEREO3D_COLUMNS;
+            break;
+        case 3:
+            if (h->quincunx_subsampling)
+                stereo->type = AV_STEREO3D_SIDEBYSIDE_QUINCUNX;
+            else
+                stereo->type = AV_STEREO3D_SIDEBYSIDE;
+            break;
+        case 4:
+            stereo->type = AV_STEREO3D_TOPBOTTOM;
+            break;
+        case 5:
+            stereo->type = AV_STEREO3D_FRAMESEQUENCE;
+            break;
+        case 6:
+            stereo->type = AV_STEREO3D_2D;
+            break;
+        }
+
+        if (h->content_interpretation_type == 2)
+            stereo->flags = AV_STEREO3D_FLAG_INVERT;
+    }
+
     cur->mmco_reset = h->mmco_reset;
     h->mmco_reset = 0;
+
     // FIXME do something with unavailable reference frames
 
     /* Sort B-frames into display order */
@@ -2144,7 +2221,7 @@
     if (cur->reference == 0)
         cur->reference = DELAYED_PIC_REF;
 
-    out = h->delayed_pic[0];
+    out     = h->delayed_pic[0];
     out_idx = 0;
     for (i = 1; h->delayed_pic[i] &&
                 !h->delayed_pic[i]->f.key_frame &&
@@ -2176,8 +2253,13 @@
         av_log(h->avctx, AV_LOG_DEBUG, "no picture %s\n", out_of_order ? "ooo" : "");
     }
 
-    if (h->next_output_pic && h->next_output_pic->sync) {
-        h->sync |= 2;
+    if (h->next_output_pic) {
+        if (h->next_output_pic->recovered) {
+            // We have reached an recovery point and all frames after it in
+            // display order are "recovered".
+            h->frame_recovered |= FRAME_RECOVERED_SEI;
+        }
+        h->next_output_pic->recovered |= !!(h->frame_recovered & FRAME_RECOVERED_SEI);
     }
 
     if (setup_finished && !h->avctx->hwaccel)
@@ -2768,8 +2850,8 @@
     memset(h->default_ref_list[0], 0, sizeof(h->default_ref_list[0]));
     memset(h->default_ref_list[1], 0, sizeof(h->default_ref_list[1]));
     ff_h264_reset_sei(h);
-    h->recovery_frame= -1;
-    h->sync= 0;
+    h->recovery_frame = -1;
+    h->frame_recovered = 0;
     h->list_count = 0;
     h->current_slice = 0;
     h->mmco_reset = 1;
@@ -2803,6 +2885,9 @@
     h->parse_context.overread_index    = 0;
     h->parse_context.index             = 0;
     h->parse_context.last_index        = 0;
+
+    free_tables(h, 1);
+    h->context_initialized = 0;
 }
 
 int ff_init_poc(H264Context *h, int pic_field_poc[2], int *pic_poc)
@@ -2890,18 +2975,18 @@
 {
     int i;
     for (i = 0; i < 16; i++) {
-#define T(x) (x >> 2) | ((x << 2) & 0xF)
-        h->zigzag_scan[i] = T(zigzag_scan[i]);
-        h->field_scan[i]  = T(field_scan[i]);
-#undef T
+#define TRANSPOSE(x) (x >> 2) | ((x << 2) & 0xF)
+        h->zigzag_scan[i] = TRANSPOSE(zigzag_scan[i]);
+        h->field_scan[i]  = TRANSPOSE(field_scan[i]);
+#undef TRANSPOSE
     }
     for (i = 0; i < 64; i++) {
-#define T(x) (x >> 3) | ((x & 7) << 3)
-        h->zigzag_scan8x8[i]       = T(ff_zigzag_direct[i]);
-        h->zigzag_scan8x8_cavlc[i] = T(zigzag_scan8x8_cavlc[i]);
-        h->field_scan8x8[i]        = T(field_scan8x8[i]);
-        h->field_scan8x8_cavlc[i]  = T(field_scan8x8_cavlc[i]);
-#undef T
+#define TRANSPOSE(x) (x >> 3) | ((x & 7) << 3)
+        h->zigzag_scan8x8[i]       = TRANSPOSE(ff_zigzag_direct[i]);
+        h->zigzag_scan8x8_cavlc[i] = TRANSPOSE(zigzag_scan8x8_cavlc[i]);
+        h->field_scan8x8[i]        = TRANSPOSE(field_scan8x8[i]);
+        h->field_scan8x8_cavlc[i]  = TRANSPOSE(field_scan8x8_cavlc[i]);
+#undef TRANSPOSE
     }
     if (h->sps.transform_bypass) { // FIXME same ugly
         memcpy(h->zigzag_scan_q0          , zigzag_scan             , sizeof(h->zigzag_scan_q0         ));
@@ -2963,8 +3048,7 @@
      * past end by one (callers fault) and resync_mb_y != 0
      * causes problems for the first MB line, too.
      */
-    if (CONFIG_ERROR_RESILIENCE &&
-        !FIELD_PICTURE(h) && h->current_slice && !h->sps.new) {
+    if (CONFIG_ERROR_RESILIENCE && !FIELD_PICTURE(h) && h->current_slice && !h->sps.new) {
         h->er.cur_pic  = h->cur_pic_ptr;
         ff_er_frame_end(&h->er);
     }
@@ -3048,12 +3132,6 @@
     if (h->avctx->has_b_frames < 2)
         h->avctx->has_b_frames = !h->low_delay;
 
-    if (h->sps.bit_depth_luma != h->sps.bit_depth_chroma) {
-        avpriv_request_sample(h->avctx,
-                              "Different chroma and luma bit depth");
-        return AVERROR_PATCHWELCOME;
-    }
-
     if (h->avctx->bits_per_raw_sample != h->sps.bit_depth_luma ||
         h->cur_chroma_format_idc      != h->sps.chroma_format_idc) {
         if (h->avctx->codec &&
@@ -3080,7 +3158,7 @@
                 ff_dsputil_init(&h->dsp, h->avctx);
             ff_videodsp_init(&h->vdsp, h->sps.bit_depth_luma);
         } else {
-            av_log(h->avctx, AV_LOG_ERROR, "Unsupported bit depth: %d\n",
+            av_log(h->avctx, AV_LOG_ERROR, "Unsupported bit depth %d\n",
                    h->sps.bit_depth_luma);
             return AVERROR_INVALIDDATA;
         }
@@ -3164,7 +3242,7 @@
         break;
     default:
         av_log(h->avctx, AV_LOG_ERROR,
-               "Unsupported bit depth: %d\n", h->sps.bit_depth_luma);
+               "Unsupported bit depth %d\n", h->sps.bit_depth_luma);
         return AVERROR_INVALIDDATA;
     }
 }
@@ -3227,7 +3305,7 @@
                   h->sps.num_units_in_tick, den, 1 << 30);
     }
 
-    h->avctx->hwaccel = ff_find_hwaccel(h->avctx->codec->id, h->avctx->pix_fmt);
+    h->avctx->hwaccel = ff_find_hwaccel(h->avctx);
 
     if (reinit)
         free_tables(h, 0);
@@ -3237,8 +3315,7 @@
     init_scan_tables(h);
     ret = ff_h264_alloc_tables(h);
     if (ret < 0) {
-        av_log(h->avctx, AV_LOG_ERROR,
-               "Could not allocate memory for h264\n");
+        av_log(h->avctx, AV_LOG_ERROR, "Could not allocate memory\n");
         return ret;
     }
 
@@ -3248,7 +3325,7 @@
             max_slices = FFMIN(MAX_THREADS, h->mb_height);
         else
             max_slices = MAX_THREADS;
-        av_log(h->avctx, AV_LOG_WARNING, "too many threads/slices (%d),"
+        av_log(h->avctx, AV_LOG_WARNING, "too many threads/slices %d,"
                " reducing to %d\n", nb_slices, max_slices);
         nb_slices = max_slices;
     }
@@ -3264,6 +3341,8 @@
         for (i = 1; i < h->slice_context_count; i++) {
             H264Context *c;
             c                    = h->thread_context[i] = av_mallocz(sizeof(H264Context));
+            if (!c)
+                return AVERROR(ENOMEM);
             c->avctx             = h->avctx;
             if (CONFIG_ERROR_RESILIENCE) {
                 c->dsp               = h->dsp;
@@ -3280,8 +3359,8 @@
             c->height            = h->height;
             c->linesize          = h->linesize;
             c->uvlinesize        = h->uvlinesize;
-            c->chroma_x_shift = h->chroma_x_shift;
-            c->chroma_y_shift = h->chroma_y_shift;
+            c->chroma_x_shift    = h->chroma_x_shift;
+            c->chroma_y_shift    = h->chroma_y_shift;
             c->qscale            = h->qscale;
             c->droppable         = h->droppable;
             c->data_partitioning = h->data_partitioning;
@@ -3313,11 +3392,12 @@
 
 int ff_set_ref_count(H264Context *h)
 {
+    int ref_count[2], list_count;
     int num_ref_idx_active_override_flag;
 
     // set defaults, might be overridden a few lines later
-    h->ref_count[0] = h->pps.ref_count[0];
-    h->ref_count[1] = h->pps.ref_count[1];
+    ref_count[0] = h->pps.ref_count[0];
+    ref_count[1] = h->pps.ref_count[1];
 
     if (h->slice_type_nos != AV_PICTURE_TYPE_I) {
         unsigned max[2];
@@ -3328,35 +3408,56 @@
         num_ref_idx_active_override_flag = get_bits1(&h->gb);
 
         if (num_ref_idx_active_override_flag) {
-            h->ref_count[0] = get_ue_golomb(&h->gb) + 1;
+            ref_count[0] = get_ue_golomb(&h->gb) + 1;
             if (h->slice_type_nos == AV_PICTURE_TYPE_B) {
-                h->ref_count[1] = get_ue_golomb(&h->gb) + 1;
+                ref_count[1] = get_ue_golomb(&h->gb) + 1;
             } else
                 // full range is spec-ok in this case, even for frames
-                h->ref_count[1] = 1;
+                ref_count[1] = 1;
         }
 
-        if (h->ref_count[0]-1 > max[0] || h->ref_count[1]-1 > max[1]){
-            av_log(h->avctx, AV_LOG_ERROR, "reference overflow %u > %u or %u > %u\n", h->ref_count[0]-1, max[0], h->ref_count[1]-1, max[1]);
+        if (ref_count[0]-1 > max[0] || ref_count[1]-1 > max[1]){
+            av_log(h->avctx, AV_LOG_ERROR, "reference overflow %u > %u or %u > %u\n", ref_count[0]-1, max[0], ref_count[1]-1, max[1]);
             h->ref_count[0] = h->ref_count[1] = 0;
+            h->list_count   = 0;
             return AVERROR_INVALIDDATA;
         }
 
         if (h->slice_type_nos == AV_PICTURE_TYPE_B)
-            h->list_count = 2;
+            list_count = 2;
         else
-            h->list_count = 1;
+            list_count = 1;
     } else {
-        h->list_count   = 0;
-        h->ref_count[0] = h->ref_count[1] = 0;
+        list_count   = 0;
+        ref_count[0] = ref_count[1] = 0;
+    }
+
+    if (list_count != h->list_count ||
+        ref_count[0] != h->ref_count[0] ||
+        ref_count[1] != h->ref_count[1]) {
+        h->ref_count[0] = ref_count[0];
+        h->ref_count[1] = ref_count[1];
+        h->list_count   = list_count;
+        return 1;
     }
 
     return 0;
 }
 
+static enum AVPixelFormat non_j_pixfmt(enum AVPixelFormat a)
+{
+    switch (a) {
+    case AV_PIX_FMT_YUVJ420P: return AV_PIX_FMT_YUV420P;
+    case AV_PIX_FMT_YUVJ422P: return AV_PIX_FMT_YUV422P;
+    case AV_PIX_FMT_YUVJ444P: return AV_PIX_FMT_YUV444P;
+    default:
+        return a;
+    }
+}
+
 /**
  * Decode a slice header.
- * This will also call ff_MPV_common_init() and frame_start() as needed.
+ * This will (re)intialize the decoder and call h264_frame_start() as needed.
  *
  * @param h h264context
  * @param h0 h264 master context (differs from 'h' when doing sliced based
@@ -3381,7 +3482,7 @@
     first_mb_in_slice = get_ue_golomb_long(&h->gb);
 
     if (first_mb_in_slice == 0) { // FIXME better field boundary detection
-        if (h0->current_slice && FIELD_PICTURE(h)) {
+        if (h0->current_slice && h->cur_pic_ptr && FIELD_PICTURE(h)) {
             field_end(h, 1);
         }
 
@@ -3398,7 +3499,7 @@
     slice_type = get_ue_golomb_31(&h->gb);
     if (slice_type > 9) {
         av_log(h->avctx, AV_LOG_ERROR,
-               "slice type too large (%d) at %d %d\n",
+               "slice type %d too large at %d %d\n",
                slice_type, h->mb_x, h->mb_y);
         return AVERROR_INVALIDDATA;
     }
@@ -3412,12 +3513,18 @@
     h->slice_type     = slice_type;
     h->slice_type_nos = slice_type & 3;
 
+    if (h->nal_unit_type  == NAL_IDR_SLICE &&
+        h->slice_type_nos != AV_PICTURE_TYPE_I) {
+        av_log(h->avctx, AV_LOG_ERROR, "A non-intra slice in an IDR NAL unit.\n");
+        return AVERROR_INVALIDDATA;
+    }
+
     // to make a few old functions happy, it's wrong though
     h->pict_type = h->slice_type;
 
     pps_id = get_ue_golomb(&h->gb);
     if (pps_id >= MAX_PPS_COUNT) {
-        av_log(h->avctx, AV_LOG_ERROR, "pps_id %d out of range\n", pps_id);
+        av_log(h->avctx, AV_LOG_ERROR, "pps_id %u out of range\n", pps_id);
         return AVERROR_INVALIDDATA;
     }
     if (!h0->pps_buffers[pps_id]) {
@@ -3426,6 +3533,12 @@
                pps_id);
         return AVERROR_INVALIDDATA;
     }
+    if (h0->au_pps_id >= 0 && pps_id != h0->au_pps_id) {
+        av_log(h->avctx, AV_LOG_ERROR,
+               "PPS change from %d to %d forbidden\n",
+               h0->au_pps_id, pps_id);
+        return AVERROR_INVALIDDATA;
+    }
     h->pps = *h0->pps_buffers[pps_id];
 
     if (!h0->sps_buffers[h->pps.sps_id]) {
@@ -3435,12 +3548,11 @@
         return AVERROR_INVALIDDATA;
     }
 
-    if (h->pps.sps_id != h->current_sps_id ||
+    if (h->pps.sps_id != h->sps.sps_id ||
+        h->pps.sps_id != h->current_sps_id ||
         h0->sps_buffers[h->pps.sps_id]->new) {
-        h0->sps_buffers[h->pps.sps_id]->new = 0;
 
-        h->current_sps_id = h->pps.sps_id;
-        h->sps            = *h0->sps_buffers[h->pps.sps_id];
+        h->sps = *h0->sps_buffers[h->pps.sps_id];
 
         if (h->mb_width  != h->sps.mb_width ||
             h->mb_height != h->sps.mb_height * (2 - h->sps.frame_mbs_only_flag) ||
@@ -3472,7 +3584,7 @@
                      || h->mb_width  != h->sps.mb_width
                      || h->mb_height != h->sps.mb_height * (2 - h->sps.frame_mbs_only_flag)
                     ));
-    if (h0->avctx->pix_fmt != get_pixel_format(h0, 0))
+    if (non_j_pixfmt(h0->avctx->pix_fmt) != non_j_pixfmt(get_pixel_format(h0, 0)))
         must_reinit = 1;
 
     h->mb_width  = h->sps.mb_width;
@@ -3509,8 +3621,12 @@
          must_reinit ||
          needs_reinit)) {
         if (h != h0) {
-            av_log(h->avctx, AV_LOG_ERROR, "changing width/height on "
-                   "slice %d\n", h0->current_slice + 1);
+            av_log(h->avctx, AV_LOG_ERROR,
+                   "changing width %d -> %d / height %d -> %d on "
+                   "slice %d\n",
+                   h->width, h->avctx->coded_width,
+                   h->height, h->avctx->coded_height,
+                   h0->current_slice + 1);
             return AVERROR_INVALIDDATA;
         }
 
@@ -3588,14 +3704,14 @@
             return AVERROR_INVALIDDATA;
         } else if (!h0->cur_pic_ptr) {
             av_log(h->avctx, AV_LOG_ERROR,
-                   "unset cur_pic_ptr on %d. slice\n",
+                   "unset cur_pic_ptr on slice %d\n",
                    h0->current_slice + 1);
             return AVERROR_INVALIDDATA;
         }
     } else {
         /* Shorten frame num gaps so we don't have to allocate reference
          * frames just to throw them away */
-        if (h->frame_num != h->prev_frame_num && h->prev_frame_num >= 0) {
+        if (h->frame_num != h->prev_frame_num) {
             int unwrap_prev_frame_num = h->prev_frame_num;
             int max_frame_num         = 1 << h->sps.log2_max_frame_num;
 
@@ -3618,7 +3734,7 @@
          * since that can modify h->cur_pic_ptr. */
         if (h0->first_field) {
             assert(h0->cur_pic_ptr);
-            assert(h0->cur_pic_ptr->f.data[0]);
+            assert(h0->cur_pic_ptr->f.buf[0]);
             assert(h0->cur_pic_ptr->reference != DELAYED_PIC_REF);
 
             /* Mark old field/frame as completed */
@@ -3668,7 +3784,7 @@
             }
         }
 
-        while (h->frame_num != h->prev_frame_num && h->prev_frame_num >= 0 && !h0->first_field &&
+        while (h->frame_num != h->prev_frame_num && !h0->first_field &&
                h->frame_num != (h->prev_frame_num + 1) % (1 << h->sps.log2_max_frame_num)) {
             Picture *prev = h->short_ref_count ? h->short_ref[0] : NULL;
             av_log(h->avctx, AV_LOG_DEBUG, "Frame num gap %d %d\n",
@@ -3677,11 +3793,15 @@
                 for(i=0; i<FF_ARRAY_ELEMS(h->last_pocs); i++)
                     h->last_pocs[i] = INT_MIN;
             ret = h264_frame_start(h);
-            if (ret < 0)
+            if (ret < 0) {
+                h0->first_field = 0;
                 return ret;
+            }
+
             h->prev_frame_num++;
             h->prev_frame_num        %= 1 << h->sps.log2_max_frame_num;
             h->cur_pic_ptr->frame_num = h->prev_frame_num;
+            h->cur_pic_ptr->invalid_gap = !h->sps.gaps_in_frame_num_allowed_flag;
             ff_thread_report_progress(&h->cur_pic_ptr->tf, INT_MAX, 0);
             ff_thread_report_progress(&h->cur_pic_ptr->tf, INT_MAX, 1);
             ret = ff_generate_sliding_window_mmcos(h, 1);
@@ -3717,7 +3837,7 @@
          * frame, or to allocate a new one. */
         if (h0->first_field) {
             assert(h0->cur_pic_ptr);
-            assert(h0->cur_pic_ptr->f.data[0]);
+            assert(h0->cur_pic_ptr->f.buf[0]);
             assert(h0->cur_pic_ptr->reference != DELAYED_PIC_REF);
 
             /* figure out if we have a complementary field pair */
@@ -3885,7 +4005,7 @@
     if (h->slice_type_nos != AV_PICTURE_TYPE_I && h->pps.cabac) {
         tmp = get_ue_golomb_31(&h->gb);
         if (tmp > 2) {
-            av_log(h->avctx, AV_LOG_ERROR, "cabac_init_idc overflow\n");
+            av_log(h->avctx, AV_LOG_ERROR, "cabac_init_idc %u overflow\n", tmp);
             return AVERROR_INVALIDDATA;
         }
         h->cabac_init_idc = tmp;
@@ -3908,8 +4028,8 @@
         get_se_golomb(&h->gb); /* slice_qs_delta */
 
     h->deblocking_filter     = 1;
-    h->slice_alpha_c0_offset = 52;
-    h->slice_beta_offset     = 52;
+    h->slice_alpha_c0_offset = 0;
+    h->slice_beta_offset     = 0;
     if (h->pps.deblocking_filter_parameters_present) {
         tmp = get_ue_golomb_31(&h->gb);
         if (tmp > 2) {
@@ -3922,10 +4042,12 @@
             h->deblocking_filter ^= 1;  // 1<->0
 
         if (h->deblocking_filter) {
-            h->slice_alpha_c0_offset += get_se_golomb(&h->gb) << 1;
-            h->slice_beta_offset     += get_se_golomb(&h->gb) << 1;
-            if (h->slice_alpha_c0_offset > 104U ||
-                h->slice_beta_offset     > 104U) {
+            h->slice_alpha_c0_offset = get_se_golomb(&h->gb) * 2;
+            h->slice_beta_offset     = get_se_golomb(&h->gb) * 2;
+            if (h->slice_alpha_c0_offset >  12 ||
+                h->slice_alpha_c0_offset < -12 ||
+                h->slice_beta_offset >  12     ||
+                h->slice_beta_offset < -12) {
                 av_log(h->avctx, AV_LOG_ERROR,
                        "deblocking filter parameters %d %d out of range\n",
                        h->slice_alpha_c0_offset, h->slice_beta_offset);
@@ -3962,7 +4084,7 @@
             }
         }
     }
-    h->qp_thresh = 15 + 52 -
+    h->qp_thresh = 15 -
                    FFMIN(h->slice_alpha_c0_offset, h->slice_beta_offset) -
                    FFMAX3(0,
                           h->pps.chroma_qp_index_offset[0],
@@ -4018,6 +4140,10 @@
     if (h->ref_count[0]) h->er.last_pic = &h->ref_list[0][0];
     if (h->ref_count[1]) h->er.next_pic = &h->ref_list[1][0];
     h->er.ref_count = h->ref_count[0];
+    h0->au_pps_id = pps_id;
+    h->sps.new =
+    h0->sps_buffers[h->pps.sps_id]->new = 0;
+    h->current_sps_id = h->pps.sps_id;
 
     if (h->avctx->debug & FF_DEBUG_PICT_INFO) {
         av_log(h->avctx, AV_LOG_DEBUG,
@@ -4034,7 +4160,7 @@
                h->ref_count[0], h->ref_count[1],
                h->qscale,
                h->deblocking_filter,
-               h->slice_alpha_c0_offset / 2 - 26, h->slice_beta_offset / 2 - 26,
+               h->slice_alpha_c0_offset, h->slice_beta_offset,
                h->use_weight,
                h->use_weight == 1 && h->use_weight_chroma ? "c" : "",
                h->slice_type == AV_PICTURE_TYPE_B ? (h->direct_spatial_mv_pred ? "SPAT" : "TEMP") : "");
@@ -4480,7 +4606,7 @@
                 av_log(h->avctx, AV_LOG_DEBUG, "bytestream overread %td\n", h->cabac.bytestream_end - h->cabac.bytestream);
             if (ret < 0 || h->cabac.bytestream > h->cabac.bytestream_end + 4) {
                 av_log(h->avctx, AV_LOG_ERROR,
-                       "error while decoding MB %d %d, bytestream (%td)\n",
+                       "error while decoding MB %d %d, bytestream %td\n",
                        h->mb_x, h->mb_y,
                        h->cabac.bytestream_end - h->cabac.bytestream);
                 er_add_slice(h, h->resync_mb_x, h->resync_mb_y, h->mb_x,
@@ -4595,12 +4721,14 @@
  * @param h h264 master context
  * @param context_count number of contexts to execute
  */
-static int execute_decode_slices(H264Context *h, int context_count)
+static int execute_decode_slices(H264Context *h, unsigned context_count)
 {
     AVCodecContext *const avctx = h->avctx;
     H264Context *hx;
     int i;
 
+    av_assert0(h->mb_y < h->mb_height);
+
     if (h->avctx->hwaccel ||
         h->avctx->codec->capabilities & CODEC_CAP_HWACCEL_VDPAU)
         return 0;
@@ -4642,7 +4770,7 @@
     AVCodecContext *const avctx = h->avctx;
     H264Context *hx; ///< thread context
     int buf_index;
-    int context_count;
+    unsigned context_count;
     int next_avc;
     int pass = !(avctx->active_thread_type & FF_THREAD_FRAME);
     int nals_needed = 0; ///< number of NALs that need decoding before the next frame thread starts
@@ -4729,14 +4857,16 @@
                 h->workaround_bugs |= FF_BUG_TRUNCATED;
 
             if (!(h->workaround_bugs & FF_BUG_TRUNCATED))
-                while(dst_length > 0 && ptr[dst_length - 1] == 0)
+                while (dst_length > 0 && ptr[dst_length - 1] == 0)
                     dst_length--;
             bit_length = !dst_length ? 0
                                      : (8 * dst_length -
                                         decode_rbsp_trailing(h, ptr + dst_length - 1));
 
             if (h->avctx->debug & FF_DEBUG_STARTCODE)
-                av_log(h->avctx, AV_LOG_DEBUG, "NAL %d/%d at %d/%d length %d pass %d\n", hx->nal_unit_type, hx->nal_ref_idc, buf_index, buf_size, dst_length, pass);
+                av_log(h->avctx, AV_LOG_DEBUG,
+                       "NAL %d/%d at %d/%d length %d pass %d\n",
+                       hx->nal_unit_type, hx->nal_ref_idc, buf_index, buf_size, dst_length, pass);
 
             if (h->is_avc && (nalsize != consumed) && nalsize)
                 av_log(h->avctx, AV_LOG_DEBUG,
@@ -4760,7 +4890,9 @@
                 case NAL_IDR_SLICE:
                 case NAL_SLICE:
                     init_get_bits(&hx->gb, ptr, bit_length);
-                    if (!get_ue_golomb(&hx->gb) || !first_slice)
+                    if (!get_ue_golomb(&hx->gb) ||
+                        !first_slice ||
+                        first_slice != hx->nal_unit_type)
                         nals_needed = nal_index;
                     if (!first_slice)
                         first_slice = hx->nal_unit_type;
@@ -4782,6 +4914,9 @@
                 continue;
 
 again:
+            if (   !(avctx->active_thread_type & FF_THREAD_FRAME)
+                || nals_needed >= nal_index)
+                h->au_pps_id = -1;
             /* Ignore per frame NAL unit type during extradata
              * parsing. Decoding slices is not possible in codec init
              * with frame-mt */
@@ -4805,7 +4940,7 @@
 
             switch (hx->nal_unit_type) {
             case NAL_IDR_SLICE:
-                if (first_slice != NAL_IDR_SLICE) {
+                if (h->nal_unit_type != NAL_IDR_SLICE) {
                     av_log(h->avctx, AV_LOG_ERROR,
                            "Invalid mix of idr and non-idr slices\n");
                     ret = -1;
@@ -4823,30 +4958,39 @@
                 if ((err = decode_slice_header(hx, h)))
                     break;
 
-                if (h->sei_recovery_frame_cnt >= 0 && (h->frame_num != h->sei_recovery_frame_cnt || hx->slice_type_nos != AV_PICTURE_TYPE_I))
-                    h->valid_recovery_point = 1;
-
-                if (   h->sei_recovery_frame_cnt >= 0
-                    && (   h->recovery_frame<0
-                        || ((h->recovery_frame - h->frame_num) & ((1 << h->sps.log2_max_frame_num)-1)) > h->sei_recovery_frame_cnt)) {
-                    h->recovery_frame = (h->frame_num + h->sei_recovery_frame_cnt) %
-                                        (1 << h->sps.log2_max_frame_num);
+                if (h->sei_recovery_frame_cnt >= 0) {
+                    if (h->frame_num != h->sei_recovery_frame_cnt || hx->slice_type_nos != AV_PICTURE_TYPE_I)
+                        h->valid_recovery_point = 1;
+
+                    if (   h->recovery_frame < 0
+                        || ((h->recovery_frame - h->frame_num) & ((1 << h->sps.log2_max_frame_num)-1)) > h->sei_recovery_frame_cnt) {
+                        h->recovery_frame = (h->frame_num + h->sei_recovery_frame_cnt) &
+                                            ((1 << h->sps.log2_max_frame_num) - 1);
 
-                    if (!h->valid_recovery_point)
-                        h->recovery_frame = h->frame_num;
+                        if (!h->valid_recovery_point)
+                            h->recovery_frame = h->frame_num;
+                    }
                 }
 
                 h->cur_pic_ptr->f.key_frame |=
-                        (hx->nal_unit_type == NAL_IDR_SLICE);
+                    (hx->nal_unit_type == NAL_IDR_SLICE);
 
-                if (h->recovery_frame == h->frame_num) {
-                    h->cur_pic_ptr->sync |= 1;
-                    h->recovery_frame = -1;
+                if (hx->nal_unit_type == NAL_IDR_SLICE ||
+                    h->recovery_frame == h->frame_num) {
+                    h->recovery_frame         = -1;
+                    h->cur_pic_ptr->recovered = 1;
                 }
-
-                h->sync |= !!h->cur_pic_ptr->f.key_frame;
-                h->sync |= 3*!!(avctx->flags2 & CODEC_FLAG2_SHOW_ALL);
-                h->cur_pic_ptr->sync |= h->sync;
+                // If we have an IDR, all frames after it in decoded order are
+                // "recovered".
+                if (hx->nal_unit_type == NAL_IDR_SLICE)
+                    h->frame_recovered |= FRAME_RECOVERED_IDR;
+                h->frame_recovered |= 3*!!(avctx->flags2 & CODEC_FLAG2_SHOW_ALL);
+                h->frame_recovered |= 3*!!(avctx->flags & CODEC_FLAG_OUTPUT_CORRUPT);
+#if 1
+                h->cur_pic_ptr->recovered |= h->frame_recovered;
+#else
+                h->cur_pic_ptr->recovered |= !!(h->frame_recovered & FRAME_RECOVERED_IDR);
+#endif
 
                 if (h->current_slice == 1) {
                     if (!(avctx->flags2 & CODEC_FLAG2_CHUNKS))
@@ -4887,12 +5031,24 @@
                 }
                 break;
             case NAL_DPA:
+                if (h->avctx->flags & CODEC_FLAG2_CHUNKS) {
+                    av_log(h->avctx, AV_LOG_ERROR,
+                           "Decoding in chunks is not supported for "
+                           "partitioned slices.\n");
+                    return AVERROR(ENOSYS);
+                }
+
                 init_get_bits(&hx->gb, ptr, bit_length);
                 hx->intra_gb_ptr =
                 hx->inter_gb_ptr = NULL;
 
-                if ((err = decode_slice_header(hx, h)) < 0)
+                if ((err = decode_slice_header(hx, h)) < 0) {
+                    /* make sure data_partitioning is cleared if it was set
+                     * before, so we don't try decoding a slice without a valid
+                     * slice header later */
+                    h->data_partitioning = 0;
                     break;
+                }
 
                 hx->data_partitioning = 1;
                 break;
@@ -4961,9 +5117,10 @@
                 context_count = 0;
             }
 
-            if (err < 0)
+            if (err < 0) {
                 av_log(h->avctx, AV_LOG_ERROR, "decode_slice_header error\n");
-            else if (err == 1) {
+                h->ref_count[0] = h->ref_count[1] = h->list_count = 0;
+            } else if (err == 1) {
                 /* Slice could not be decoded in parallel mode, copy down
                  * NAL unit stuff to context 0 and restart. Note that
                  * rbsp_buffer is not transferred, but since we no longer
@@ -5004,6 +5161,7 @@
 static int output_frame(H264Context *h, AVFrame *dst, Picture *srcp)
 {
     AVFrame *src = &srcp->f;
+    const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(src->format);
     int i;
     int ret = av_frame_ref(dst, src);
     if (ret < 0)
@@ -5014,9 +5172,9 @@
     if (!srcp->crop)
         return 0;
 
-    for (i = 0; i < 3; i++) {
-        int hshift = (i > 0) ? h->chroma_x_shift : 0;
-        int vshift = (i > 0) ? h->chroma_y_shift : 0;
+    for (i = 0; i < desc->nb_components; i++) {
+        int hshift = (i > 0) ? desc->log2_chroma_w : 0;
+        int vshift = (i > 0) ? desc->log2_chroma_h : 0;
         int off    = ((srcp->crop_left >> hshift) << h->pixel_shift) +
                       (srcp->crop_top  >> vshift) * dst->linesize[i];
         dst->data[i] += off;
@@ -5024,8 +5182,8 @@
     return 0;
 }
 
-static int decode_frame(AVCodecContext *avctx, void *data,
-                        int *got_frame, AVPacket *avpkt)
+static int h264_decode_frame(AVCodecContext *avctx, void *data,
+                             int *got_frame, AVPacket *avpkt)
 {
     const uint8_t *buf = avpkt->data;
     int buf_size       = avpkt->size;
@@ -5037,6 +5195,9 @@
     int ret;
 
     h->flags = avctx->flags;
+    /* reset data partitioning here, to ensure GetBitContexts from previous
+     * packets do not get used. */
+    h->data_partitioning = 0;
 
     /* end of stream, output what is still in the buffers */
     if (buf_size == 0) {
@@ -5120,7 +5281,11 @@
 
         /* Wait for second field. */
         *got_frame = 0;
-        if (h->next_output_pic && (h->next_output_pic->sync || h->sync>1)) {
+        if (h->next_output_pic && (
+                                   h->next_output_pic->recovered)) {
+            if (!h->next_output_pic->recovered)
+                h->next_output_pic->f.flags |= AV_FRAME_FLAG_CORRUPT;
+
             ret = output_frame(h, pict, h->next_output_pic);
             if (ret < 0)
                 return ret;
@@ -5133,7 +5298,7 @@
         }
     }
 
-    assert(pict->data[0] || !*got_frame);
+    assert(pict->buf[0] || !*got_frame);
 
     return get_consumed_bytes(buf_index, buf_size);
 }
@@ -5208,7 +5373,7 @@
     .priv_data_size        = sizeof(H264Context),
     .init                  = ff_h264_decode_init,
     .close                 = h264_decode_end,
-    .decode                = decode_frame,
+    .decode                = h264_decode_frame,
     .capabilities          = /*CODEC_CAP_DRAW_HORIZ_BAND |*/ CODEC_CAP_DR1 |
                              CODEC_CAP_DELAY | CODEC_CAP_SLICE_THREADS |
                              CODEC_CAP_FRAME_THREADS,
@@ -5228,7 +5393,7 @@
     .priv_data_size = sizeof(H264Context),
     .init           = ff_h264_decode_init,
     .close          = h264_decode_end,
-    .decode         = decode_frame,
+    .decode         = h264_decode_frame,
     .capabilities   = CODEC_CAP_DR1 | CODEC_CAP_DELAY | CODEC_CAP_HWACCEL_VDPAU,
     .flush          = flush_dpb,
     .pix_fmts       = (const enum AVPixelFormat[]) { AV_PIX_FMT_VDPAU_H264,

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/h264.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/h264.h Changed

@@ -102,19 +102,19 @@
 
 /* NAL unit types */
 enum {
-    NAL_SLICE = 1,
-    NAL_DPA,
-    NAL_DPB,
-    NAL_DPC,
-    NAL_IDR_SLICE,
-    NAL_SEI,
-    NAL_SPS,
-    NAL_PPS,
-    NAL_AUD,
-    NAL_END_SEQUENCE,
-    NAL_END_STREAM,
-    NAL_FILLER_DATA,
-    NAL_SPS_EXT,
+    NAL_SLICE           = 1,
+    NAL_DPA             = 2,
+    NAL_DPB             = 3,
+    NAL_DPC             = 4,
+    NAL_IDR_SLICE       = 5,
+    NAL_SEI             = 6,
+    NAL_SPS             = 7,
+    NAL_PPS             = 8,
+    NAL_AUD             = 9,
+    NAL_END_SEQUENCE    = 10,
+    NAL_END_STREAM      = 11,
+    NAL_FILLER_DATA     = 12,
+    NAL_SPS_EXT         = 13,
     NAL_AUXILIARY_SLICE = 19,
     NAL_FF_IGNORE       = 0xff0f001,
 };
@@ -123,7 +123,7 @@
  * SEI message types
  */
 typedef enum {
-    SEI_BUFFERING_PERIOD            = 0,   ///< buffering period (H.264, D.1.1)
+    SEI_TYPE_BUFFERING_PERIOD       = 0,   ///< buffering period (H.264, D.1.1)
     SEI_TYPE_PIC_TIMING             = 1,   ///< picture timing
     SEI_TYPE_USER_DATA_ITU_T_T35    = 4,   ///< user data registered by ITU-T Recommendation T.35
     SEI_TYPE_USER_DATA_UNREGISTERED = 5,   ///< unregistered user data
@@ -163,6 +163,7 @@
  * Sequence parameter set
  */
 typedef struct SPS {
+    unsigned int sps_id;
     int profile_idc;
     int level_idc;
     int chroma_format_idc;
@@ -384,11 +385,9 @@
 
     unsigned current_sps_id; ///< id of the current SPS
     SPS sps; ///< current sps
+    PPS pps; ///< current pps
 
-    /**
-     * current pps
-     */
-    PPS pps; // FIXME move to Picture perhaps? (->no) do we need that?
+    int au_pps_id; ///< pps_id of current access unit
 
     uint32_t dequant4_buffer[6][QP_MAX_NUM + 1][16]; // FIXME should these be moved down?
     uint32_t dequant8_buffer[6][QP_MAX_NUM + 1][64];
@@ -617,6 +616,14 @@
     int prev_interlaced_frame;
 
     /**
+     * frame_packing_arrangment SEI message
+     */
+    int sei_frame_packing_present;
+    int frame_packing_arrangement_type;
+    int content_interpretation_type;
+    int quincunx_subsampling;
+
+    /**
      * Bit set of clock types for fields/frames in picture timing SEI message.
      * For each found ct_type, appropriate bit is set (e.g., bit 1 for
      * interlaced).
@@ -641,6 +648,14 @@
      * frames.
      */
     int sei_recovery_frame_cnt;
+
+    /**
+     * Are the SEI recovery points looking valid.
+     */
+    int valid_recovery_point;
+
+    FPA sei_fpa;
+
     /**
      * recovery_frame is the frame_num at which the next frame should
      * be fully constructed.
@@ -649,12 +664,18 @@
      */
     int recovery_frame;
 
-    /**
-     * Are the SEI recovery points looking valid.
-     */
-    int valid_recovery_point;
+/**
+ * We have seen an IDR, so all the following frames in coded order are correctly
+ * decodable.
+ */
+#define FRAME_RECOVERED_IDR  (1 << 0)
+/**
+ * Sufficient number of frames have been decoded since a SEI recovery point,
+ * so all the following frames in presentation order are correct.
+ */
+#define FRAME_RECOVERED_SEI  (1 << 1)
 
-    FPA sei_fpa;
+    int frame_recovered;    ///< Initial frame has been completely recovered
 
     int luma_weight_flag[2];    ///< 7.4.3.2 luma_weight_lX_flag
     int chroma_weight_flag[2];  ///< 7.4.3.2 chroma_weight_lX_flag
@@ -668,16 +689,12 @@
 
     int16_t slice_row[MAX_SLICES]; ///< to detect when MAX_SLICES is too low
 
-    int sync;                      ///< did we had a keyframe or recovery point
-
     uint8_t parse_history[4];
     int parse_history_count;
     int parse_last_mb;
     uint8_t *edge_emu_buffer;
     int16_t *dc_val_base;
 
-    uint8_t *visualization_buffer[3]; ///< temporary buffer vor MV visualization
-
     AVBufferPool *qscale_table_pool;
     AVBufferPool *mb_type_pool;
     AVBufferPool *motion_val_pool;

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/h264_cabac.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/h264_cabac.c Changed

@@ -29,6 +29,7 @@
 #define UNCHECKED_BITSTREAM_READER 1
 
 #include "libavutil/attributes.h"
+#include "libavutil/timer.h"
 #include "config.h"
 #include "cabac.h"
 #include "cabac_functions.h"
@@ -1619,6 +1620,9 @@
     cc.range     = h->cabac.range;
     cc.low       = h->cabac.low;
     cc.bytestream= h->cabac.bytestream;
+#if !UNCHECKED_BITSTREAM_READER
+    cc.bytestream_end = h->cabac.bytestream_end;
+#endif
 #else
 #define CC &h->cabac
 #endif
@@ -1684,7 +1688,6 @@
         }
     }
 
-
 #define STORE_BLOCK(type) \
     do { \
         uint8_t *ctx = coeff_abs_level1_ctx[node_ctx] + abs_level_m1_ctx_base; \
@@ -1728,11 +1731,11 @@
         } \
     } while ( coeff_count );
 
-        if (h->pixel_shift) {
-            STORE_BLOCK(int32_t)
-        } else {
-            STORE_BLOCK(int16_t)
-        }
+    if (h->pixel_shift) {
+        STORE_BLOCK(int32_t)
+    } else {
+        STORE_BLOCK(int16_t)
+    }
 #ifdef CABAC_ON_STACK
             h->cabac.range     = cc.range     ;
             h->cabac.low       = cc.low       ;

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/h264_cavlc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/h264_cavlc.c Changed

@@ -773,6 +773,10 @@
 
         // We assume these blocks are very rare so we do not optimize it.
         h->intra_pcm_ptr = align_get_bits(&h->gb);
+        if (get_bits_left(&h->gb) < mb_size) {
+            av_log(h->avctx, AV_LOG_ERROR, "Not enough data for an intra PCM block.\n");
+            return AVERROR_INVALIDDATA;
+        }
         skip_bits_long(&h->gb, mb_size);
 
         // In deblocking, the quantizer is 0
@@ -866,7 +870,7 @@
         }
 
         for(list=0; list<h->list_count; list++){
-            int ref_count= IS_REF0(mb_type) ? 1 : local_ref_count[list];
+            int ref_count = IS_REF0(mb_type) ? 1 : local_ref_count[list];
             for(i=0; i<4; i++){
                 if(IS_DIRECT(h->sub_mb_type[i])) continue;
                 if(IS_DIR(h->sub_mb_type[i], 0, list)){
@@ -948,11 +952,11 @@
                     if(IS_DIR(mb_type, 0, list)){
                         if(local_ref_count[list]==1){
                             val= 0;
-                        }else if(local_ref_count[list]==2){
+                        } else if(local_ref_count[list]==2){
                             val= get_bits1(&h->gb)^1;
                         }else{
                             val= get_ue_golomb_31(&h->gb);
-                            if(val >= local_ref_count[list]){
+                            if (val >= local_ref_count[list]){
                                 av_log(h->avctx, AV_LOG_ERROR, "ref %u overflow\n", val);
                                 return -1;
                             }
@@ -976,13 +980,13 @@
                     for(i=0; i<2; i++){
                         unsigned int val;
                         if(IS_DIR(mb_type, i, list)){
-                            if(local_ref_count[list] == 1){
+                            if(local_ref_count[list] == 1) {
                                 val= 0;
-                            }else if(local_ref_count[list] == 2){
+                            } else if(local_ref_count[list] == 2) {
                                 val= get_bits1(&h->gb)^1;
                             }else{
                                 val= get_ue_golomb_31(&h->gb);
-                                if(val >= local_ref_count[list]){
+                                if (val >= local_ref_count[list]){
                                     av_log(h->avctx, AV_LOG_ERROR, "ref %u overflow\n", val);
                                     return -1;
                                 }
@@ -1015,11 +1019,11 @@
                         if(IS_DIR(mb_type, i, list)){ //FIXME optimize
                             if(local_ref_count[list]==1){
                                 val= 0;
-                            }else if(local_ref_count[list]==2){
+                            } else if(local_ref_count[list]==2){
                                 val= get_bits1(&h->gb)^1;
                             }else{
                                 val= get_ue_golomb_31(&h->gb);
-                                if(val >= local_ref_count[list]){
+                                if (val >= local_ref_count[list]){
                                     av_log(h->avctx, AV_LOG_ERROR, "ref %u overflow\n", val);
                                     return -1;
                                 }
@@ -1142,12 +1146,12 @@
                 for(chroma_idx=0; chroma_idx<2; chroma_idx++){
                     const uint32_t *qmul = h->dequant4_coeff[chroma_idx+1+(IS_INTRA( mb_type ) ? 0:3)][h->chroma_qp[chroma_idx]];
                     int16_t *mb = h->mb + (16*(16 + 16*chroma_idx) << pixel_shift);
-                    for (i8x8=0; i8x8<num_c8x8; i8x8++) {
-                        for (i4x4=0; i4x4<4; i4x4++) {
-                            const int index= 16 + 16*chroma_idx + 8*i8x8 + i4x4;
+                    for (i8x8 = 0; i8x8<num_c8x8; i8x8++) {
+                        for (i4x4 = 0; i4x4 < 4; i4x4++) {
+                            const int index = 16 + 16*chroma_idx + 8*i8x8 + i4x4;
                             if (decode_residual(h, gb, mb, index, scan + 1, qmul, 15) < 0)
                                 return -1;
-                            mb += 16<<pixel_shift;
+                            mb += 16 << pixel_shift;
                         }
                     }
                 }

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/h264_loopfilter.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/h264_loopfilter.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/h264_mb_template.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/h264_mb_template.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/h264_mp4toannexb_bsf.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/h264_mp4toannexb_bsf.c Changed

@@ -37,13 +37,14 @@
 {
     uint32_t offset         = *poutbuf_size;
     uint8_t nal_header_size = offset ? 3 : 4;
-    void *tmp;
+    int err;
 
     *poutbuf_size += sps_pps_size + in_size + nal_header_size;
-    tmp = av_realloc(*poutbuf, *poutbuf_size + FF_INPUT_BUFFER_PADDING_SIZE);
-    if (!tmp)
-        return AVERROR(ENOMEM);
-    *poutbuf = tmp;
+    if ((err = av_reallocp(poutbuf,
+                           *poutbuf_size + FF_INPUT_BUFFER_PADDING_SIZE)) < 0) {
+        *poutbuf_size = 0;
+        return err;
+    }
     if (sps_pps)
         memcpy(*poutbuf + offset, sps_pps, sps_pps_size);
     memcpy(*poutbuf + sps_pps_size + nal_header_size + offset, in, in_size);
@@ -77,7 +78,7 @@
     }
 
     while (unit_nb--) {
-        void *tmp;
+        int err;
 
         unit_size   = AV_RB16(extradata);
         total_size += unit_size + 4;
@@ -93,12 +94,8 @@
             av_free(out);
             return AVERROR(EINVAL);
         }
-        tmp = av_realloc(out, total_size + padding);
-        if (!tmp) {
-            av_free(out);
-            return AVERROR(ENOMEM);
-        }
-        out = tmp;
+        if ((err = av_reallocp(&out, total_size + padding)) < 0)
+            return err;
         memcpy(out + total_size - unit_size - 4, nalu_header, 4);
         memcpy(out + total_size - unit_size, extradata + 2, unit_size);
         extradata += 2 + unit_size;

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/h264_mvpred.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/h264_mvpred.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/h264_parser.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/h264_parser.c Changed

@@ -76,13 +76,15 @@
             else
                 state >>= 1;           // 2->1, 1->0, 0->0
         } else if (state <= 5) {
-            int v = buf[i] & 0x1F;
-            if (v == 6 || v == 7 || v == 8 || v == 9) {
+            int nalu_type = buf[i] & 0x1F;
+            if (nalu_type == NAL_SEI || nalu_type == NAL_SPS ||
+                nalu_type == NAL_PPS || nalu_type == NAL_AUD) {
                 if (pc->frame_start_found) {
                     i++;
                     goto found;
                 }
-            } else if (v == 1 || v == 2 || v == 5) {
+            } else if (nalu_type == NAL_SLICE || nalu_type == NAL_DPA ||
+                       nalu_type == NAL_IDR_SLICE) {
                 state += 8;
                 continue;
             }
@@ -151,7 +153,8 @@
                         break;
 
                     if (index >= h->ref_count[list]) {
-                        av_log(h->avctx, AV_LOG_ERROR, "reference count overflow\n");
+                        av_log(h->avctx, AV_LOG_ERROR,
+                               "reference count %d overflow\n", index);
                         return AVERROR_INVALIDDATA;
                     }
                 }
@@ -292,18 +295,18 @@
             pps_id = get_ue_golomb(&h->gb);
             if (pps_id >= MAX_PPS_COUNT) {
                 av_log(h->avctx, AV_LOG_ERROR,
-                       "pps_id out of range\n");
+                       "pps_id %u out of range\n", pps_id);
                 return -1;
             }
             if (!h->pps_buffers[pps_id]) {
                 av_log(h->avctx, AV_LOG_ERROR,
-                       "non-existing PPS referenced\n");
+                       "non-existing PPS %u referenced\n", pps_id);
                 return -1;
             }
             h->pps = *h->pps_buffers[pps_id];
             if (!h->sps_buffers[h->pps.sps_id]) {
                 av_log(h->avctx, AV_LOG_ERROR,
-                       "non-existing SPS referenced\n");
+                       "non-existing SPS %u referenced\n", h->pps.sps_id);
                 return -1;
             }
             h->sps       = *h->sps_buffers[h->pps.sps_id];

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/h264_ps.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/h264_ps.c Changed

@@ -252,7 +252,9 @@
         if (sps->num_reorder_frames > 16U
             /* max_dec_frame_buffering || max_dec_frame_buffering > 16 */) {
             av_log(h->avctx, AV_LOG_ERROR,
-                   "illegal num_reorder_frames %d\n", sps->num_reorder_frames);
+                   "Clipping illegal num_reorder_frames %d\n",
+                   sps->num_reorder_frames);
+            sps->num_reorder_frames = 16;
             return AVERROR_INVALIDDATA;
         }
     }
@@ -338,13 +340,14 @@
     sps_id    = get_ue_golomb_31(&h->gb);
 
     if (sps_id >= MAX_SPS_COUNT) {
-        av_log(h->avctx, AV_LOG_ERROR, "sps_id (%d) out of range\n", sps_id);
+        av_log(h->avctx, AV_LOG_ERROR, "sps_id %u out of range\n", sps_id);
         return AVERROR_INVALIDDATA;
     }
     sps = av_mallocz(sizeof(SPS));
     if (!sps)
         return AVERROR(ENOMEM);
 
+    sps->sps_id               = sps_id;
     sps->time_offset_length   = 24;
     sps->profile_idc          = profile_idc;
     sps->constraint_set_flags = constraint_set_flags;
@@ -363,9 +366,8 @@
         sps->profile_idc == 128 || sps->profile_idc == 144) {
         sps->chroma_format_idc = get_ue_golomb_31(&h->gb);
         if (sps->chroma_format_idc > 3U) {
-            av_log(h->avctx, AV_LOG_ERROR,
-                   "chroma_format_idc %d is illegal\n",
-                   sps->chroma_format_idc);
+            avpriv_request_sample(h->avctx, "chroma_format_idc %u",
+                                  sps->chroma_format_idc);
             goto fail;
         } else if (sps->chroma_format_idc == 3) {
             sps->residual_color_transform_flag = get_bits1(&h->gb);
@@ -376,7 +378,12 @@
         }
         sps->bit_depth_luma   = get_ue_golomb(&h->gb) + 8;
         sps->bit_depth_chroma = get_ue_golomb(&h->gb) + 8;
-        if (sps->bit_depth_luma > 14U || sps->bit_depth_chroma > 14U || sps->bit_depth_luma != sps->bit_depth_chroma) {
+        if (sps->bit_depth_chroma != sps->bit_depth_luma) {
+            avpriv_request_sample(h->avctx,
+                                  "Different chroma and luma bit depth");
+            goto fail;
+        }
+        if (sps->bit_depth_luma > 14U || sps->bit_depth_chroma > 14U) {
             av_log(h->avctx, AV_LOG_ERROR, "illegal bit depth value (%d, %d)\n",
                    sps->bit_depth_luma, sps->bit_depth_chroma);
             goto fail;
@@ -434,7 +441,8 @@
         sps->ref_frame_count = FFMAX(2, sps->ref_frame_count);
     if (sps->ref_frame_count > MAX_PICTURE_COUNT - 2 ||
         sps->ref_frame_count > 16U) {
-        av_log(h->avctx, AV_LOG_ERROR, "too many reference frames\n");
+        av_log(h->avctx, AV_LOG_ERROR,
+               "too many reference frames %d\n", sps->ref_frame_count);
         goto fail;
     }
     sps->gaps_in_frame_num_allowed_flag = get_bits1(&h->gb);
@@ -520,9 +528,11 @@
     }
 
     sps->vui_parameters_present_flag = get_bits1(&h->gb);
-    if (sps->vui_parameters_present_flag)
-        if (decode_vui_parameters(h, sps) < 0)
+    if (sps->vui_parameters_present_flag) {
+        int ret = decode_vui_parameters(h, sps);
+        if (ret < 0)
             goto fail;
+    }
 
     if (!sps->sar.den)
         sps->sar.den = 1;
@@ -544,7 +554,7 @@
                sps->timing_info_present_flag ? sps->num_units_in_tick : 0,
                sps->timing_info_present_flag ? sps->time_scale : 0,
                sps->bit_depth_luma,
-               h->sps.bitstream_restriction_flag ? sps->num_reorder_frames : -1
+               sps->bitstream_restriction_flag ? sps->num_reorder_frames : -1
                );
     }
     sps->new = 1;
@@ -592,7 +602,7 @@
     int bits_left;
 
     if (pps_id >= MAX_PPS_COUNT) {
-        av_log(h->avctx, AV_LOG_ERROR, "pps_id (%d) out of range\n", pps_id);
+        av_log(h->avctx, AV_LOG_ERROR, "pps_id %u out of range\n", pps_id);
         return AVERROR_INVALIDDATA;
     }
 
@@ -602,7 +612,7 @@
     pps->sps_id = get_ue_golomb_31(&h->gb);
     if ((unsigned)pps->sps_id >= MAX_SPS_COUNT ||
         h->sps_buffers[pps->sps_id] == NULL) {
-        av_log(h->avctx, AV_LOG_ERROR, "sps_id out of range\n");
+        av_log(h->avctx, AV_LOG_ERROR, "sps_id %u out of range\n", pps->sps_id);
         goto fail;
     }
     sps = h->sps_buffers[pps->sps_id];

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/h264_refs.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/h264_refs.c Changed

@@ -68,7 +68,8 @@
     return match;
 }
 
-static int build_def_list(Picture *def, Picture **in, int len, int is_long, int sel)
+static int build_def_list(Picture *def, int def_len,
+                          Picture **in, int len, int is_long, int sel)
 {
     int  i[2] = { 0 };
     int index = 0;
@@ -79,10 +80,12 @@
         while (i[1] < len && !(in[i[1]] && (in[i[1]]->reference & (sel ^ 3))))
             i[1]++;
         if (i[0] < len) {
+            av_assert0(index < def_len);
             in[i[0]]->pic_id = is_long ? i[0] : in[i[0]]->frame_num;
             split_field_copy(&def[index++], in[i[0]++], sel, 1);
         }
         if (i[1] < len) {
+            av_assert0(index < def_len);
             in[i[1]]->pic_id = is_long ? i[1] : in[i[1]]->frame_num;
             split_field_copy(&def[index++], in[i[1]++], sel ^ 3, 0);
         }
@@ -131,8 +134,12 @@
             len  = add_sorted(sorted,       h->short_ref, h->short_ref_count, cur_poc, 1 ^ list);
             len += add_sorted(sorted + len, h->short_ref, h->short_ref_count, cur_poc, 0 ^ list);
             av_assert0(len <= 32);
-            len  = build_def_list(h->default_ref_list[list],       sorted,      len, 0, h->picture_structure);
-            len += build_def_list(h->default_ref_list[list] + len, h->long_ref, 16,  1, h->picture_structure);
+
+            len  = build_def_list(h->default_ref_list[list], FF_ARRAY_ELEMS(h->default_ref_list[0]),
+                                  sorted, len, 0, h->picture_structure);
+            len += build_def_list(h->default_ref_list[list] + len,
+                                  FF_ARRAY_ELEMS(h->default_ref_list[0]) - len,
+                                  h->long_ref, 16, 1, h->picture_structure);
             av_assert0(len <= 32);
 
             if (len < h->ref_count[list])
@@ -141,7 +148,9 @@
         }
 
         if (lens[0] == lens[1] && lens[1] > 1) {
-            for (i = 0; h->default_ref_list[0][i].f.data[0] == h->default_ref_list[1][i].f.data[0] && i < lens[0]; i++);
+            for (i = 0; i < lens[0] &&
+                        h->default_ref_list[0][i].f.buf[0]->buffer ==
+                        h->default_ref_list[1][i].f.buf[0]->buffer; i++);
             if (i == lens[0]) {
                 Picture tmp;
                 COPY_PICTURE(&tmp, &h->default_ref_list[1][0]);
@@ -150,9 +159,13 @@
             }
         }
     } else {
-        len  = build_def_list(h->default_ref_list[0],       h->short_ref, h->short_ref_count, 0, h->picture_structure);
-        len += build_def_list(h->default_ref_list[0] + len, h-> long_ref, 16,                 1, h->picture_structure);
+        len  = build_def_list(h->default_ref_list[0], FF_ARRAY_ELEMS(h->default_ref_list[0]),
+                              h->short_ref, h->short_ref_count, 0, h->picture_structure);
+        len += build_def_list(h->default_ref_list[0] + len,
+                              FF_ARRAY_ELEMS(h->default_ref_list[0]) - len,
+                              h-> long_ref, 16, 1, h->picture_structure);
         av_assert0(len <= 32);
+
         if (len < h->ref_count[0])
             memset(&h->default_ref_list[0][len], 0, sizeof(Picture) * (h->ref_count[0] - len));
     }
@@ -229,88 +242,96 @@
                     return -1;
                 }
 
-                if (reordering_of_pic_nums_idc < 3) {
-                    if (reordering_of_pic_nums_idc < 2) {
-                        const unsigned int abs_diff_pic_num = get_ue_golomb(&h->gb) + 1;
-                        int frame_num;
+                switch (reordering_of_pic_nums_idc) {
+                case 0:
+                case 1: {
+                    const unsigned int abs_diff_pic_num = get_ue_golomb(&h->gb) + 1;
+                    int frame_num;
 
-                        if (abs_diff_pic_num > h->max_pic_num) {
-                            av_log(h->avctx, AV_LOG_ERROR, "abs_diff_pic_num overflow\n");
-                            return -1;
-                        }
+                    if (abs_diff_pic_num > h->max_pic_num) {
+                        av_log(h->avctx, AV_LOG_ERROR,
+                               "abs_diff_pic_num overflow\n");
+                        return AVERROR_INVALIDDATA;
+                    }
 
-                        if (reordering_of_pic_nums_idc == 0)
-                            pred -= abs_diff_pic_num;
-                        else
-                            pred += abs_diff_pic_num;
-                        pred &= h->max_pic_num - 1;
-
-                        frame_num = pic_num_extract(h, pred, &pic_structure);
-
-                        for (i = h->short_ref_count - 1; i >= 0; i--) {
-                            ref = h->short_ref[i];
-                            assert(ref->reference);
-                            assert(!ref->long_ref);
-                            if (ref->frame_num == frame_num &&
-                                (ref->reference & pic_structure))
-                                break;
-                        }
-                        if (i >= 0)
-                            ref->pic_id = pred;
-                    } else {
-                        int long_idx;
-                        pic_id = get_ue_golomb(&h->gb); //long_term_pic_idx
+                    if (reordering_of_pic_nums_idc == 0)
+                        pred -= abs_diff_pic_num;
+                    else
+                        pred += abs_diff_pic_num;
+                    pred &= h->max_pic_num - 1;
+
+                    frame_num = pic_num_extract(h, pred, &pic_structure);
+
+                    for (i = h->short_ref_count - 1; i >= 0; i--) {
+                        ref = h->short_ref[i];
+                        assert(ref->reference);
+                        assert(!ref->long_ref);
+                        if (ref->frame_num == frame_num &&
+                            (ref->reference & pic_structure))
+                            break;
+                    }
+                    if (i >= 0)
+                        ref->pic_id = pred;
+                    break;
+                }
+                case 2: {
+                    int long_idx;
+                    pic_id = get_ue_golomb(&h->gb); // long_term_pic_idx
 
-                        long_idx = pic_num_extract(h, pic_id, &pic_structure);
+                    long_idx = pic_num_extract(h, pic_id, &pic_structure);
 
-                        if (long_idx > 31) {
-                            av_log(h->avctx, AV_LOG_ERROR, "long_term_pic_idx overflow\n");
-                            return -1;
-                        }
-                        ref = h->long_ref[long_idx];
-                        assert(!(ref && !ref->reference));
-                        if (ref && (ref->reference & pic_structure)) {
-                            ref->pic_id = pic_id;
-                            assert(ref->long_ref);
-                            i = 0;
-                        } else {
-                            i = -1;
-                        }
+                    if (long_idx > 31) {
+                        av_log(h->avctx, AV_LOG_ERROR,
+                               "long_term_pic_idx overflow\n");
+                        return AVERROR_INVALIDDATA;
                     }
-
-                    if (i < 0) {
-                        av_log(h->avctx, AV_LOG_ERROR, "reference picture missing during reorder\n");
-                        memset(&h->ref_list[list][index], 0, sizeof(Picture)); //FIXME
+                    ref = h->long_ref[long_idx];
+                    assert(!(ref && !ref->reference));
+                    if (ref && (ref->reference & pic_structure)) {
+                        ref->pic_id = pic_id;
+                        assert(ref->long_ref);
+                        i = 0;
                     } else {
-                        for (i = index; i + 1 < h->ref_count[list]; i++) {
-                            if (ref->long_ref == h->ref_list[list][i].long_ref &&
-                                ref->pic_id   == h->ref_list[list][i].pic_id)
-                                break;
-                        }
-                        for (; i > index; i--) {
-                            COPY_PICTURE(&h->ref_list[list][i], &h->ref_list[list][i - 1]);
-                        }
-                        COPY_PICTURE(&h->ref_list[list][index], ref);
-                        if (FIELD_PICTURE(h)) {
-                            pic_as_field(&h->ref_list[list][index], pic_structure);
-                        }
+                        i = -1;
                     }
+                    break;
+                }
+                default:
+                    av_log(h->avctx, AV_LOG_ERROR,
+                           "illegal reordering_of_pic_nums_idc\n");
+                    return AVERROR_INVALIDDATA;
+                }
+
+                if (i < 0) {
+                    av_log(h->avctx, AV_LOG_ERROR,
+                           "reference picture missing during reorder\n");
+                    memset(&h->ref_list[list][index], 0, sizeof(Picture)); // FIXME
                 } else {
-                    av_log(h->avctx, AV_LOG_ERROR, "illegal reordering_of_pic_nums_idc\n");
-                    return -1;
+                    for (i = index; i + 1 < h->ref_count[list]; i++) {
+                        if (ref->long_ref == h->ref_list[list][i].long_ref &&
+                            ref->pic_id   == h->ref_list[list][i].pic_id)
+                            break;
+                    }
+                    for (; i > index; i--) {
+                        COPY_PICTURE(&h->ref_list[list][i], &h->ref_list[list][i - 1]);
+                    }
+                    COPY_PICTURE(&h->ref_list[list][index], ref);
+                    if (FIELD_PICTURE(h)) {
+                        pic_as_field(&h->ref_list[list][index], pic_structure);
+                    }
                 }
             }
         }
     }
     for (list = 0; list < h->list_count; list++) {
         for (index = 0; index < h->ref_count[list]; index++) {
-            if (   !h->ref_list[list][index].f.data[0]
+            if (   !h->ref_list[list][index].f.buf[0]
                 || (!FIELD_PICTURE(h) && (h->ref_list[list][index].reference&3) != 3)) {
                 int i;
                 av_log(h->avctx, AV_LOG_ERROR, "Missing reference picture, default is %d\n", h->default_ref_list[list][0].poc);
                 for (i = 0; i < FF_ARRAY_ELEMS(h->last_pocs); i++)
                     h->last_pocs[i] = INT_MIN;
-                if (h->default_ref_list[list][0].f.data[0]
+                if (h->default_ref_list[list][0].f.buf[0]
                     && !(!FIELD_PICTURE(h) && (h->default_ref_list[list][0].reference&3) != 3))
                     COPY_PICTURE(&h->ref_list[list][index], &h->default_ref_list[list][0]);
                 else
@@ -562,6 +583,7 @@
 int ff_h264_execute_ref_pic_marking(H264Context *h, MMCO *mmco, int mmco_count)
 {
     int i, av_uninit(j);
+    int pps_count;
     int current_ref_assigned = 0, err = 0;
     Picture *av_uninit(pic);
 
@@ -623,6 +645,10 @@
                      * Report the problem and keep the pair where it is,
                      * and mark this field valid.
                      */
+            if (h->short_ref[0] == h->cur_pic_ptr) {
+                av_log(h->avctx, AV_LOG_ERROR, "mmco: cannot assign current picture to short and long at the same time\n");
+                remove_short_at_index(h, 0);
+            }
 
             if (h->long_ref[mmco[i].long_arg] != h->cur_pic_ptr) {
                 if (h->cur_pic_ptr->long_ref) {
@@ -635,9 +661,6 @@
                 }
                 av_assert0(!h->cur_pic_ptr->long_ref);
                 remove_long(h, mmco[i].long_arg, 0);
-                if (remove_short(h, h->cur_pic_ptr->frame_num, 0)) {
-                    av_log(h->avctx, AV_LOG_ERROR, "mmco: cannot assign current picture to short and long at the same time\n");
-                }
 
                 h->long_ref[mmco[i].long_arg]           = h->cur_pic_ptr;
                 h->long_ref[mmco[i].long_arg]->long_ref = 1;
@@ -729,13 +752,30 @@
         }
     }
 
+    for (i = 0; i<h->short_ref_count; i++) {
+        pic = h->short_ref[i];
+        if (pic->invalid_gap) {
+            int d = (h->cur_pic_ptr->frame_num - pic->frame_num) & ((1 << h->sps.log2_max_frame_num)-1);
+            if (d > h->sps.ref_frame_count)
+                remove_short(h, pic->frame_num, 0);
+        }
+    }
+
     print_short_term(h);
     print_long_term(h);
 
-    if(err >= 0 && h->long_ref_count==0 && h->short_ref_count<=2 && h->pps.ref_count[0]<=2 + (h->picture_structure != PICT_FRAME) && h->cur_pic_ptr->f.pict_type == AV_PICTURE_TYPE_I){
-        h->cur_pic_ptr->sync |= 1;
+    pps_count = 0;
+    for (i = 0; i < FF_ARRAY_ELEMS(h->pps_buffers); i++)
+        pps_count += !!h->pps_buffers[i];
+
+    if (   err >= 0
+        && h->long_ref_count==0
+        && (h->short_ref_count<=2 || h->pps.ref_count[0] <= 1 && h->pps.ref_count[1] <= 1 && pps_count == 1)
+        && h->pps.ref_count[0]<=2 + (h->picture_structure != PICT_FRAME)
+        && h->cur_pic_ptr->f.pict_type == AV_PICTURE_TYPE_I){
+        h->cur_pic_ptr->recovered |= 1;
         if(!h->avctx->has_b_frames)
-            h->sync = 2;
+            h->frame_recovered |= FRAME_RECOVERED_SEI;
     }
 
     return (h->avctx->err_recognition & AV_EF_EXPLODE) ? err : 0;

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/h264_sei.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/h264_sei.c Changed

@@ -25,12 +25,10 @@
  * @author Michael Niedermayer <michaelni@gmx.at>
  */
 
-#include "internal.h"
 #include "avcodec.h"
-#include "h264.h"
 #include "golomb.h"
-
-#include <assert.h>
+#include "h264.h"
+#include "internal.h"
 
 static const uint8_t sei_num_clock_ts_table[9] = {
     1, 1, 1, 2, 2, 3, 3, 2, 3
@@ -42,6 +40,7 @@
     h->sei_dpb_output_delay         =  0;
     h->sei_cpb_removal_delay        = -1;
     h->sei_buffering_period_present =  0;
+    h->sei_frame_packing_present    =  0;
 }
 
 static int decode_picture_timing(H264Context *h)
@@ -223,31 +222,31 @@
     return 0;
 }
 
-static int decode_frame_packing(H264Context *h, int size) {
-    int bits = get_bits_left(&h->gb);
-
+static int decode_frame_packing_arrangement(H264Context *h)
+{
     h->sei_fpa.frame_packing_arrangement_id          = get_ue_golomb(&h->gb);
-    h->sei_fpa.frame_packing_arrangement_cancel_flag = get_bits(&h->gb, 1);
-    if (!h->sei_fpa.frame_packing_arrangement_cancel_flag) {
-        h->sei_fpa.frame_packing_arrangement_type  = get_bits(&h->gb, 7);
-        h->sei_fpa.quincunx_sampling_flag          = get_bits(&h->gb, 1);
-        h->sei_fpa.content_interpretation_type     = get_bits(&h->gb, 6);
-        skip_bits(&h->gb, 1); /* spatial_flipping_flag */
-        skip_bits(&h->gb, 1); /* frame0_flipped_flag */
-        skip_bits(&h->gb, 1); /* field_views_flag */
-        skip_bits(&h->gb, 1); /* current_frame_is_frame0_flag */
-        skip_bits(&h->gb, 1); /* frame0_self_contained_flag */
-        skip_bits(&h->gb, 1); /* frame1_self_contained_flag */
-        if (!h->sei_fpa.quincunx_sampling_flag && h->sei_fpa.frame_packing_arrangement_type != 5) {
-            skip_bits(&h->gb, 4); /* frame0_grid_position_x */
-            skip_bits(&h->gb, 4); /* frame0_grid_position_y */
-            skip_bits(&h->gb, 4); /* frame1_grid_position_x */
-            skip_bits(&h->gb, 4); /* frame1_grid_position_y */
-        }
-        skip_bits(&h->gb, 8); /* frame_packing_arrangement_reserved_byte */
+    h->sei_fpa.frame_packing_arrangement_cancel_flag = get_bits1(&h->gb);
+    h->sei_frame_packing_present = !h->sei_fpa.frame_packing_arrangement_cancel_flag;
+
+    if (h->sei_frame_packing_present) {
+        h->sei_fpa.frame_packing_arrangement_type =
+        h->frame_packing_arrangement_type = get_bits(&h->gb, 7);
+        h->sei_fpa.quincunx_sampling_flag         =
+        h->quincunx_subsampling           = get_bits1(&h->gb);
+        h->sei_fpa.content_interpretation_type    =
+        h->content_interpretation_type    = get_bits(&h->gb, 6);
+
+        // the following skips: spatial_flipping_flag, frame0_flipped_flag,
+        // field_views_flag, current_frame_is_frame0_flag,
+        // frame0_self_contained_flag, frame1_self_contained_flag
+        skip_bits(&h->gb, 6);
+
+        if (!h->quincunx_subsampling && h->frame_packing_arrangement_type != 5)
+            skip_bits(&h->gb, 16);      // frame[01]_grid_position_[xy]
+        skip_bits(&h->gb, 8);           // frame_packing_arrangement_reserved_byte
         h->sei_fpa.frame_packing_arrangement_repetition_period = get_ue_golomb(&h->gb) /* frame_packing_arrangement_repetition_period */;
     }
-    skip_bits(&h->gb, 1); /* frame_packing_arrangement_extension_flag */
+    skip_bits1(&h->gb);                 // frame_packing_arrangement_extension_flag
 
     if (h->avctx->debug & FF_DEBUG_PICT_INFO)
         av_log(h->avctx, AV_LOG_DEBUG, "SEI FPA %d %d %d %d %d %d\n",
@@ -257,7 +256,7 @@
                                        h->sei_fpa.quincunx_sampling_flag,
                                        h->sei_fpa.content_interpretation_type,
                                        h->sei_fpa.frame_packing_arrangement_repetition_period);
-    skip_bits_long(&h->gb, 8 * size - (bits - get_bits_left(&h->gb)));
+
     return 0;
 }
 
@@ -311,14 +310,15 @@
             if (ret < 0)
                 return ret;
             break;
-        case SEI_BUFFERING_PERIOD:
+        case SEI_TYPE_BUFFERING_PERIOD:
             ret = decode_buffering_period(h);
             if (ret < 0)
                 return ret;
             break;
         case SEI_TYPE_FRAME_PACKING:
-            if (decode_frame_packing(h, size) < 0)
-                return -1;
+            ret = decode_frame_packing_arrangement(h);
+            if (ret < 0)
+                return ret;
             break;
         default:
             av_log(h->avctx, AV_LOG_DEBUG, "unknown SEI type %d\n", type);

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/h264chroma.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/h264chroma.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/h264chroma.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/h264chroma.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/h264chroma_template.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/h264chroma_template.c Changed

@@ -42,7 +42,7 @@
             dst+= stride;\
             src+= stride;\
         }\
-    }else{\
+    } else if (B + C) {\
         const int E= B+C;\
         const int step= C ? stride : 1;\
         for(i=0; i<h; i++){\
@@ -50,6 +50,12 @@
             dst+= stride;\
             src+= stride;\
         }\
+    } else {\
+        for(i=0; i<h; i++){\
+            OP(dst[0], (A*src[0]));\
+            dst+= stride;\
+            src+= stride;\
+        }\
     }\
 }\
 static void FUNCC(OPNAME ## h264_chroma_mc2)(uint8_t *_dst/*align 8*/, uint8_t *_src/*align 1*/, int stride, int h, int x, int y){\
@@ -71,7 +77,7 @@
             dst+= stride;\
             src+= stride;\
         }\
-    }else{\
+    } else if (B + C) {\
         const int E= B+C;\
         const int step= C ? stride : 1;\
         for(i=0; i<h; i++){\
@@ -80,6 +86,13 @@
             dst+= stride;\
             src+= stride;\
         }\
+    } else {\
+        for ( i = 0; i < h; i++){\
+            OP(dst[0], A * src[0]);\
+            OP(dst[1], A * src[1]);\
+            dst += stride;\
+            src += stride;\
+        }\
     }\
 }\
 \
@@ -104,7 +117,7 @@
             dst+= stride;\
             src+= stride;\
         }\
-    }else{\
+    } else if (B + C) {\
         const int E= B+C;\
         const int step= C ? stride : 1;\
         for(i=0; i<h; i++){\
@@ -115,6 +128,15 @@
             dst+= stride;\
             src+= stride;\
         }\
+    } else {\
+        for ( i = 0; i < h; i++){\
+            OP(dst[0], A * src[0]);\
+            OP(dst[1], A * src[1]);\
+            OP(dst[2], A * src[2]);\
+            OP(dst[3], A * src[3]);\
+            dst += stride;\
+            src += stride;\
+        }\
     }\
 }\
 \
@@ -143,7 +165,7 @@
             dst+= stride;\
             src+= stride;\
         }\
-    }else{\
+    } else if (B + C) {\
         const int E= B+C;\
         const int step= C ? stride : 1;\
         for(i=0; i<h; i++){\
@@ -158,6 +180,19 @@
             dst+= stride;\
             src+= stride;\
         }\
+    } else {\
+        for ( i = 0; i < h; i++){\
+            OP(dst[0], A * src[0]);\
+            OP(dst[1], A * src[1]);\
+            OP(dst[2], A * src[2]);\
+            OP(dst[3], A * src[3]);\
+            OP(dst[4], A * src[4]);\
+            OP(dst[5], A * src[5]);\
+            OP(dst[6], A * src[6]);\
+            OP(dst[7], A * src[7]);\
+            dst += stride;\
+            src += stride;\
+        }\
     }\
 }

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/h264dsp.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/h264dsp.c Changed

@@ -26,6 +26,7 @@
  */
 
 #include <stdint.h>
+
 #include "libavutil/attributes.h"
 #include "libavutil/avassert.h"
 
@@ -113,13 +114,13 @@
     c->h264_idct8_dc_add= FUNC(ff_h264_idct8_dc_add, depth);\
     c->h264_idct_add16     = FUNC(ff_h264_idct_add16, depth);\
     c->h264_idct8_add4     = FUNC(ff_h264_idct8_add4, depth);\
-    if (chroma_format_idc == 1)\
+    if (chroma_format_idc <= 1)\
         c->h264_idct_add8  = FUNC(ff_h264_idct_add8, depth);\
     else\
         c->h264_idct_add8  = FUNC(ff_h264_idct_add8_422, depth);\
     c->h264_idct_add16intra= FUNC(ff_h264_idct_add16intra, depth);\
     c->h264_luma_dc_dequant_idct= FUNC(ff_h264_luma_dc_dequant_idct, depth);\
-    if (chroma_format_idc == 1)\
+    if (chroma_format_idc <= 1)\
         c->h264_chroma_dc_dequant_idct= FUNC(ff_h264_chroma_dc_dequant_idct, depth);\
     else\
         c->h264_chroma_dc_dequant_idct= FUNC(ff_h264_chroma422_dc_dequant_idct, depth);\
@@ -140,20 +141,20 @@
     c->h264_h_loop_filter_luma_intra= FUNC(h264_h_loop_filter_luma_intra, depth);\
     c->h264_h_loop_filter_luma_mbaff_intra= FUNC(h264_h_loop_filter_luma_mbaff_intra, depth);\
     c->h264_v_loop_filter_chroma= FUNC(h264_v_loop_filter_chroma, depth);\
-    if (chroma_format_idc == 1)\
+    if (chroma_format_idc <= 1)\
         c->h264_h_loop_filter_chroma= FUNC(h264_h_loop_filter_chroma, depth);\
     else\
         c->h264_h_loop_filter_chroma= FUNC(h264_h_loop_filter_chroma422, depth);\
-    if (chroma_format_idc == 1)\
+    if (chroma_format_idc <= 1)\
         c->h264_h_loop_filter_chroma_mbaff= FUNC(h264_h_loop_filter_chroma_mbaff, depth);\
     else\
         c->h264_h_loop_filter_chroma_mbaff= FUNC(h264_h_loop_filter_chroma422_mbaff, depth);\
     c->h264_v_loop_filter_chroma_intra= FUNC(h264_v_loop_filter_chroma_intra, depth);\
-    if (chroma_format_idc == 1)\
+    if (chroma_format_idc <= 1)\
         c->h264_h_loop_filter_chroma_intra= FUNC(h264_h_loop_filter_chroma_intra, depth);\
     else\
         c->h264_h_loop_filter_chroma_intra= FUNC(h264_h_loop_filter_chroma422_intra, depth);\
-    if (chroma_format_idc == 1)\
+    if (chroma_format_idc <= 1)\
         c->h264_h_loop_filter_chroma_mbaff_intra= FUNC(h264_h_loop_filter_chroma_mbaff_intra, depth);\
     else\
         c->h264_h_loop_filter_chroma_mbaff_intra= FUNC(h264_h_loop_filter_chroma422_mbaff_intra, depth);\
@@ -179,6 +180,7 @@
     }
     c->h264_find_start_code_candidate = h264_find_start_code_candidate_c;
 
+    if (ARCH_AARCH64) ff_h264dsp_init_aarch64(c, bit_depth, chroma_format_idc);
     if (ARCH_ARM) ff_h264dsp_init_arm(c, bit_depth, chroma_format_idc);
     if (ARCH_PPC) ff_h264dsp_init_ppc(c, bit_depth, chroma_format_idc);
     if (ARCH_X86) ff_h264dsp_init_x86(c, bit_depth, chroma_format_idc);

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/h264dsp.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/h264dsp.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/h264pred.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/h264pred.c Changed

@@ -482,7 +482,7 @@
     h->pred8x8l[TOP_DC_PRED         ]= FUNCC(pred8x8l_top_dc              , depth);\
     h->pred8x8l[DC_128_PRED         ]= FUNCC(pred8x8l_128_dc              , depth);\
 \
-    if (chroma_format_idc == 1) {\
+    if (chroma_format_idc <= 1) {\
         h->pred8x8[VERT_PRED8x8   ]= FUNCC(pred8x8_vertical               , depth);\
         h->pred8x8[HOR_PRED8x8    ]= FUNCC(pred8x8_horizontal             , depth);\
     } else {\
@@ -490,7 +490,7 @@
         h->pred8x8[HOR_PRED8x8    ]= FUNCC(pred8x16_horizontal            , depth);\
     }\
     if (codec_id != AV_CODEC_ID_VP8) {\
-        if (chroma_format_idc == 1) {\
+        if (chroma_format_idc <= 1) {\
             h->pred8x8[PLANE_PRED8x8]= FUNCC(pred8x8_plane                , depth);\
         } else {\
             h->pred8x8[PLANE_PRED8x8]= FUNCC(pred8x16_plane               , depth);\
@@ -498,7 +498,7 @@
     } else\
         h->pred8x8[PLANE_PRED8x8]= FUNCD(pred8x8_tm_vp8);\
     if(codec_id != AV_CODEC_ID_RV40 && codec_id != AV_CODEC_ID_VP8){\
-        if (chroma_format_idc == 1) {\
+        if (chroma_format_idc <= 1) {\
             h->pred8x8[DC_PRED8x8     ]= FUNCC(pred8x8_dc                     , depth);\
             h->pred8x8[LEFT_DC_PRED8x8]= FUNCC(pred8x8_left_dc                , depth);\
             h->pred8x8[TOP_DC_PRED8x8 ]= FUNCC(pred8x8_top_dc                 , depth);\
@@ -524,7 +524,7 @@
             h->pred8x8[DC_129_PRED8x8]= FUNCC(pred8x8_129_dc              , depth);\
         }\
     }\
-    if (chroma_format_idc == 1) {\
+    if (chroma_format_idc <= 1) {\
         h->pred8x8[DC_128_PRED8x8 ]= FUNCC(pred8x8_128_dc                 , depth);\
     } else {\
         h->pred8x8[DC_128_PRED8x8 ]= FUNCC(pred8x16_128_dc                , depth);\
@@ -558,7 +558,7 @@
     h->pred4x4_add  [ HOR_PRED   ]= FUNCC(pred4x4_horizontal_add          , depth);\
     h->pred8x8l_add [VERT_PRED   ]= FUNCC(pred8x8l_vertical_add           , depth);\
     h->pred8x8l_add [ HOR_PRED   ]= FUNCC(pred8x8l_horizontal_add         , depth);\
-    if (chroma_format_idc == 1) {\
+    if (chroma_format_idc <= 1) {\
     h->pred8x8_add  [VERT_PRED8x8]= FUNCC(pred8x8_vertical_add            , depth);\
     h->pred8x8_add  [ HOR_PRED8x8]= FUNCC(pred8x8_horizontal_add          , depth);\
     } else {\
@@ -568,9 +568,6 @@
     h->pred16x16_add[VERT_PRED8x8]= FUNCC(pred16x16_vertical_add          , depth);\
     h->pred16x16_add[ HOR_PRED8x8]= FUNCC(pred16x16_horizontal_add        , depth);\
 
-    if(!chroma_format_idc)
-        chroma_format_idc = 1;
-
     switch (bit_depth) {
         case 9:
             H264_PRED(9)

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/h264pred.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/h264pred.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/h264qpel.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/h264qpel.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/h264qpel.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/h264qpel.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/hevc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/hevc.c Changed

@@ -30,6 +30,7 @@
 #include "libavutil/md5.h"
 #include "libavutil/opt.h"
 #include "libavutil/pixdesc.h"
+#include "libavutil/stereo3d.h"
 
 #include "bytestream.h"
 #include "cabac_functions.h"
@@ -80,20 +81,16 @@
 }
 
 /* allocate arrays that depend on frame dimensions */
-static int pic_arrays_init(HEVCContext *s)
+static int pic_arrays_init(HEVCContext *s, const HEVCSPS *sps)
 {
-    int log2_min_cb_size     = s->sps->log2_min_cb_size;
-    int width                = s->sps->width;
-    int height               = s->sps->height;
-    int pic_size             = width * height;
-    int pic_size_in_ctb      = ((width  >> log2_min_cb_size) + 1) *
-                               ((height >> log2_min_cb_size) + 1);
-    int ctb_count            = s->sps->ctb_width * s->sps->ctb_height;
-    int min_pu_width  = width  >> s->sps->log2_min_pu_size;
-    int pic_height_in_min_pu = height >> s->sps->log2_min_pu_size;
-    int pic_size_in_min_pu   = min_pu_width * pic_height_in_min_pu;
-    int pic_width_in_min_tu  = width  >> s->sps->log2_min_tb_size;
-    int pic_height_in_min_tu = height >> s->sps->log2_min_tb_size;
+    int log2_min_cb_size = sps->log2_min_cb_size;
+    int width            = sps->width;
+    int height           = sps->height;
+    int pic_size         = width * height;
+    int pic_size_in_ctb  = ((width  >> log2_min_cb_size) + 1) *
+                           ((height >> log2_min_cb_size) + 1);
+    int ctb_count        = sps->ctb_width * sps->ctb_height;
+    int min_pu_size      = sps->min_pu_width * sps->min_pu_height;
 
     s->bs_width  = width  >> 3;
     s->bs_height = height >> 3;
@@ -105,19 +102,21 @@
         goto fail;
 
     s->skip_flag    = av_malloc(pic_size_in_ctb);
-    s->tab_ct_depth = av_malloc(s->sps->min_cb_height * s->sps->min_cb_width);
+    s->tab_ct_depth = av_malloc(sps->min_cb_height * sps->min_cb_width);
     if (!s->skip_flag || !s->tab_ct_depth)
         goto fail;
 
-    s->tab_ipm  = av_malloc(pic_size_in_min_pu);
-    s->cbf_luma = av_malloc(pic_width_in_min_tu * pic_height_in_min_tu);
-    s->is_pcm   = av_malloc(pic_size_in_min_pu);
+    s->cbf_luma = av_malloc(sps->min_tb_width * sps->min_tb_height);
+    s->tab_ipm  = av_mallocz(min_pu_size);
+    s->is_pcm   = av_malloc(min_pu_size);
     if (!s->tab_ipm || !s->cbf_luma || !s->is_pcm)
         goto fail;
 
     s->filter_slice_edges = av_malloc(ctb_count);
-    s->tab_slice_address  = av_malloc(pic_size_in_ctb * sizeof(*s->tab_slice_address));
-    s->qp_y_tab           = av_malloc(pic_size_in_ctb * sizeof(*s->qp_y_tab));
+    s->tab_slice_address  = av_malloc(pic_size_in_ctb *
+                                      sizeof(*s->tab_slice_address));
+    s->qp_y_tab           = av_malloc(pic_size_in_ctb *
+                                      sizeof(*s->qp_y_tab));
     if (!s->qp_y_tab || !s->filter_slice_edges || !s->tab_slice_address)
         goto fail;
 
@@ -126,7 +125,7 @@
     if (!s->horizontal_bs || !s->vertical_bs)
         goto fail;
 
-    s->tab_mvf_pool = av_buffer_pool_init(pic_size_in_min_pu * sizeof(MvField),
+    s->tab_mvf_pool = av_buffer_pool_init(min_pu_size * sizeof(MvField),
                                           av_buffer_alloc);
     s->rpl_tab_pool = av_buffer_pool_init(ctb_count * sizeof(RefPicListTab),
                                           av_buffer_allocz);
@@ -134,6 +133,7 @@
         goto fail;
 
     return 0;
+
 fail:
     pic_arrays_free(s);
     return AVERROR(ENOMEM);
@@ -233,7 +233,7 @@
     const HEVCSPS *sps = s->sps;
     int max_poc_lsb    = 1 << sps->log2_max_poc_lsb;
     int prev_delta_msb = 0;
-    int nb_sps = 0, nb_sh;
+    unsigned int nb_sps = 0, nb_sh;
     int i;
 
     rps->nb_refs = 0;
@@ -280,10 +280,79 @@
     return 0;
 }
 
+static int set_sps(HEVCContext *s, const HEVCSPS *sps)
+{
+    int ret;
+    unsigned int num = 0, den = 0;
+
+    pic_arrays_free(s);
+    ret = pic_arrays_init(s, sps);
+    if (ret < 0)
+        goto fail;
+
+    s->avctx->coded_width         = sps->width;
+    s->avctx->coded_height        = sps->height;
+    s->avctx->width               = sps->output_width;
+    s->avctx->height              = sps->output_height;
+    s->avctx->pix_fmt             = sps->pix_fmt;
+    s->avctx->sample_aspect_ratio = sps->vui.sar;
+    s->avctx->has_b_frames        = sps->temporal_layer[sps->max_sub_layers - 1].num_reorder_pics;
+
+    if (sps->vui.video_signal_type_present_flag)
+        s->avctx->color_range = sps->vui.video_full_range_flag ? AVCOL_RANGE_JPEG
+                                                               : AVCOL_RANGE_MPEG;
+    else
+        s->avctx->color_range = AVCOL_RANGE_MPEG;
+
+    if (sps->vui.colour_description_present_flag) {
+        s->avctx->color_primaries = sps->vui.colour_primaries;
+        s->avctx->color_trc       = sps->vui.transfer_characteristic;
+        s->avctx->colorspace      = sps->vui.matrix_coeffs;
+    } else {
+        s->avctx->color_primaries = AVCOL_PRI_UNSPECIFIED;
+        s->avctx->color_trc       = AVCOL_TRC_UNSPECIFIED;
+        s->avctx->colorspace      = AVCOL_SPC_UNSPECIFIED;
+    }
+
+    ff_hevc_pred_init(&s->hpc,     sps->bit_depth);
+    ff_hevc_dsp_init (&s->hevcdsp, sps->bit_depth);
+    ff_videodsp_init (&s->vdsp,    sps->bit_depth);
+
+    if (sps->sao_enabled) {
+        av_frame_unref(s->tmp_frame);
+        ret = ff_get_buffer(s->avctx, s->tmp_frame, AV_GET_BUFFER_FLAG_REF);
+        if (ret < 0)
+            goto fail;
+        s->frame = s->tmp_frame;
+    }
+
+    s->sps = sps;
+    s->vps = (HEVCVPS*) s->vps_list[s->sps->vps_id]->data;
+
+    if (s->vps->vps_timing_info_present_flag) {
+        num = s->vps->vps_num_units_in_tick;
+        den = s->vps->vps_time_scale;
+    } else if (sps->vui.vui_timing_info_present_flag) {
+        num = sps->vui.vui_num_units_in_tick;
+        den = sps->vui.vui_time_scale;
+    }
+
+    if (num != 0 && den != 0)
+        av_reduce(&s->avctx->time_base.num, &s->avctx->time_base.den,
+                  num, den, 1 << 30);
+
+    return 0;
+
+fail:
+    pic_arrays_free(s);
+    s->sps = NULL;
+    return ret;
+}
+
 static int hls_slice_header(HEVCContext *s)
 {
     GetBitContext *gb = &s->HEVClc->gb;
-    SliceHeader   *sh = &s->sh;
+    SliceHeader *sh   = &s->sh;
     int i, j, ret;
 
     // Coded parameters
@@ -302,50 +371,27 @@
         av_log(s->avctx, AV_LOG_ERROR, "PPS id out of range: %d\n", sh->pps_id);
         return AVERROR_INVALIDDATA;
     }
+    if (!sh->first_slice_in_pic_flag &&
+        s->pps != (HEVCPPS*)s->pps_list[sh->pps_id]->data) {
+        av_log(s->avctx, AV_LOG_ERROR, "PPS changed between slices.\n");
+        return AVERROR_INVALIDDATA;
+    }
     s->pps = (HEVCPPS*)s->pps_list[sh->pps_id]->data;
 
     if (s->sps != (HEVCSPS*)s->sps_list[s->pps->sps_id]->data) {
         s->sps = (HEVCSPS*)s->sps_list[s->pps->sps_id]->data;
-        s->vps = s->vps_list[s->sps->vps_id];
-
-        pic_arrays_free(s);
-        ret = pic_arrays_init(s);
-        if (ret < 0) {
-            s->sps = NULL;
-            return AVERROR(ENOMEM);
-        }
-
-        s->width  = s->sps->width;
-        s->height = s->sps->height;
-
-        s->avctx->coded_width  = s->sps->width;
-        s->avctx->coded_height = s->sps->height;
-        s->avctx->width        = s->sps->output_width;
-        s->avctx->height       = s->sps->output_height;
-        s->avctx->pix_fmt      = s->sps->pix_fmt;
-        s->avctx->sample_aspect_ratio = s->sps->vui.sar;
-        s->avctx->has_b_frames = s->sps->temporal_layer[s->sps->max_sub_layers - 1].num_reorder_pics;
-
-        if (s->sps->chroma_format_idc == 0 || s->sps->separate_colour_plane_flag) {
-            av_log(s->avctx, AV_LOG_ERROR,
-                   "TODO: s->sps->chroma_format_idc == 0 || "
-                   "s->sps->separate_colour_plane_flag\n");
-            return AVERROR_PATCHWELCOME;
-        }
-
-        ff_hevc_pred_init(&s->hpc,     s->sps->bit_depth);
-        ff_hevc_dsp_init (&s->hevcdsp, s->sps->bit_depth);
-        ff_videodsp_init (&s->vdsp,    s->sps->bit_depth);
+        ff_hevc_clear_refs(s);
+        ret = set_sps(s, s->sps);
+        if (ret < 0)
+            return ret;
 
-        if (s->sps->sao_enabled) {
-            av_frame_unref(s->tmp_frame);
-            ret = ff_get_buffer(s->avctx, s->tmp_frame, 0);
-            if (ret < 0)
-                return ret;
-            s->frame = s->tmp_frame;
-        }
+        s->seq_decode = (s->seq_decode + 1) & 0xff;
+        s->max_ra     = INT_MAX;
     }
 
+    s->avctx->profile = s->sps->ptl.general_ptl.profile_idc;
+    s->avctx->level   = s->sps->ptl.general_ptl.level_idc;
+
     sh->dependent_slice_segment_flag = 0;
     if (!sh->first_slice_in_pic_flag) {
         int slice_address_length;
@@ -357,7 +403,8 @@
                                             s->sps->ctb_height);
         sh->slice_segment_addr = get_bits(gb, slice_address_length);
         if (sh->slice_segment_addr >= s->sps->ctb_width * s->sps->ctb_height) {
-            av_log(s->avctx, AV_LOG_ERROR, "Invalid slice segment address: %u.\n",
+            av_log(s->avctx, AV_LOG_ERROR,
+                   "Invalid slice segment address: %u.\n",
                    sh->slice_segment_addr);
             return AVERROR_INVALIDDATA;
         }
@@ -376,15 +423,20 @@
         s->slice_initialized = 0;
 
         for (i = 0; i < s->pps->num_extra_slice_header_bits; i++)
-            skip_bits(gb, 1); // slice_reserved_undetermined_flag[]
+            skip_bits(gb, 1);  // slice_reserved_undetermined_flag[]
 
         sh->slice_type = get_ue_golomb_long(gb);
-        if (!(sh->slice_type == I_SLICE || sh->slice_type == P_SLICE ||
+        if (!(sh->slice_type == I_SLICE ||
+              sh->slice_type == P_SLICE ||
               sh->slice_type == B_SLICE)) {
             av_log(s->avctx, AV_LOG_ERROR, "Unknown slice type: %d.\n",
                    sh->slice_type);
             return AVERROR_INVALIDDATA;
         }
+        if (IS_IRAP(s) && sh->slice_type != I_SLICE) {
+            av_log(s->avctx, AV_LOG_ERROR, "Inter slices in an IRAP frame.\n");
+            return AVERROR_INVALIDDATA;
+        }
 
         if (s->pps->output_flag_present_flag)
             sh->pic_output_flag = get_bits1(gb);
@@ -393,8 +445,7 @@
             sh->colour_plane_id = get_bits(gb, 2);
 
         if (!IS_IDR(s)) {
-            int short_term_ref_pic_set_sps_flag;
-            int poc;
+            int short_term_ref_pic_set_sps_flag, poc;
 
             sh->pic_order_cnt_lsb = get_bits(gb, s->sps->log2_max_poc_lsb);
             poc = ff_hevc_compute_poc(s, sh->pic_order_cnt_lsb);
@@ -423,7 +474,7 @@
                 }
 
                 numbits = av_ceil_log2(s->sps->nb_st_rps);
-                rps_idx = (numbits > 0) ? get_bits(gb, numbits) : 0;
+                rps_idx = numbits > 0 ? get_bits(gb, numbits) : 0;
                 sh->short_term_rps = &s->sps->st_rps[rps_idx];
             }
 
@@ -440,17 +491,17 @@
                 sh->slice_temporal_mvp_enabled_flag = 0;
         } else {
             s->sh.short_term_rps = NULL;
-            s->poc = 0;
+            s->poc               = 0;
         }
 
         /* 8.3.1 */
         if (s->temporal_id == 0 &&
             s->nal_unit_type != NAL_TRAIL_N &&
-            s->nal_unit_type != NAL_TSA_N &&
-            s->nal_unit_type != NAL_STSA_N &&
-            s->nal_unit_type != NAL_TRAIL_N &&
-            s->nal_unit_type != NAL_RADL_N &&
-            s->nal_unit_type != NAL_RADL_R &&
+            s->nal_unit_type != NAL_TSA_N   &&
+            s->nal_unit_type != NAL_STSA_N  &&
+            s->nal_unit_type != NAL_RADL_N  &&
+            s->nal_unit_type != NAL_RADL_R  &&
+            s->nal_unit_type != NAL_RASL_N  &&
             s->nal_unit_type != NAL_RASL_R)
             s->pocTid0 = s->poc;
 
@@ -524,7 +575,8 @@
                     sh->collocated_ref_idx = get_ue_golomb_long(gb);
                     if (sh->collocated_ref_idx >= sh->nb_refs[sh->collocated_list]) {
                         av_log(s->avctx, AV_LOG_ERROR,
-                               "Invalid collocated_ref_idx: %d.\n", sh->collocated_ref_idx);
+                               "Invalid collocated_ref_idx: %d.\n",
+                               sh->collocated_ref_idx);
                         return AVERROR_INVALIDDATA;
                     }
                 }
@@ -545,6 +597,7 @@
         }
 
         sh->slice_qp_delta = get_se_golomb(gb);
+
         if (s->pps->pic_slice_level_chroma_qp_offsets_present_flag) {
             sh->slice_cb_qp_offset = get_se_golomb(gb);
             sh->slice_cr_qp_offset = get_se_golomb(gb);
@@ -567,13 +620,13 @@
                 }
             } else {
                 sh->disable_deblocking_filter_flag = s->pps->disable_dbf;
-                sh->beta_offset = s->pps->beta_offset;
-                sh->tc_offset   = s->pps->tc_offset;
+                sh->beta_offset                    = s->pps->beta_offset;
+                sh->tc_offset                      = s->pps->tc_offset;
             }
         } else {
             sh->disable_deblocking_filter_flag = 0;
-            sh->beta_offset = 0;
-            sh->tc_offset   = 0;
+            sh->beta_offset                    = 0;
+            sh->tc_offset                      = 0;
         }
 
         if (s->pps->seq_loop_filter_across_slices_enabled_flag &&
@@ -602,6 +655,11 @@
             sh->entry_point_offset = av_malloc(sh->num_entry_point_offsets * sizeof(int));
             sh->offset = av_malloc(sh->num_entry_point_offsets * sizeof(int));
             sh->size = av_malloc(sh->num_entry_point_offsets * sizeof(int));
+            if (!sh->entry_point_offset || !sh->offset || !sh->size) {
+                sh->num_entry_point_offsets = 0;
+                av_log(s->avctx, AV_LOG_ERROR, "Failed to allocate memory\n");
+                return AVERROR(ENOMEM);
+            }
             for (i = 0; i < sh->num_entry_point_offsets; i++) {
                 int val = 0;
                 for (j = 0; j < segments; j++) {
@@ -624,20 +682,34 @@
     }
 
     if (s->pps->slice_header_extension_present_flag) {
-        int length = get_ue_golomb_long(gb);
+        unsigned int length = get_ue_golomb_long(gb);
         for (i = 0; i < length; i++)
             skip_bits(gb, 8);  // slice_header_extension_data_byte
     }
 
     // Inferred parameters
-    sh->slice_qp          = 26 + s->pps->pic_init_qp_minus26 + sh->slice_qp_delta;
+    sh->slice_qp = 26U + s->pps->pic_init_qp_minus26 + sh->slice_qp_delta;
+    if (sh->slice_qp > 51 ||
+        sh->slice_qp < -s->sps->qp_bd_offset) {
+        av_log(s->avctx, AV_LOG_ERROR,
+               "The slice_qp %d is outside the valid range "
+               "[%d, 51].\n",
+               sh->slice_qp,
+               -s->sps->qp_bd_offset);
+        return AVERROR_INVALIDDATA;
+    }
+
     sh->slice_ctb_addr_rs = sh->slice_segment_addr;
 
+    if (!s->sh.slice_ctb_addr_rs && s->sh.dependent_slice_segment_flag) {
+        av_log(s->avctx, AV_LOG_ERROR, "Impossible slice segment.\n");
+        return AVERROR_INVALIDDATA;
+    }
+
     s->HEVClc->first_qp_group = !s->sh.dependent_slice_segment_flag;
 
     if (!s->pps->cu_qp_delta_enabled_flag)
-        s->HEVClc->qp_y = ((s->sh.slice_qp + 52 + 2 * s->sps->qp_bd_offset) %
-                          (52 + s->sps->qp_bd_offset)) - s->sps->qp_bd_offset;
+        s->HEVClc->qp_y = s->sh.slice_qp;
 
     s->slice_initialized = 1;
 
@@ -701,7 +773,8 @@
         if (sao->type_idx[c_idx] == SAO_BAND) {
             for (i = 0; i < 4; i++) {
                 if (sao->offset_abs[c_idx][i]) {
-                    SET_SAO(offset_sign[c_idx][i], ff_hevc_sao_offset_sign_decode(s));
+                    SET_SAO(offset_sign[c_idx][i],
+                            ff_hevc_sao_offset_sign_decode(s));
                 } else {
                     sao->offset_sign[c_idx][i] = 0;
                 }
@@ -728,11 +801,10 @@
 #undef SET_SAO
 #undef CTB
 
-
-static void hls_transform_unit(HEVCContext *s, int x0, int y0,
-                               int xBase, int yBase, int cb_xBase, int cb_yBase,
-                               int log2_cb_size, int log2_trafo_size,
-                               int trafo_depth, int blk_idx)
+static int hls_transform_unit(HEVCContext *s, int x0, int y0,
+                              int xBase, int yBase, int cb_xBase, int cb_yBase,
+                              int log2_cb_size, int log2_trafo_size,
+                              int trafo_depth, int blk_idx)
 {
     HEVCLocalContext *lc = s->HEVClc;
 
@@ -747,8 +819,9 @@
             s->hpc.intra_pred(s, x0, y0, log2_trafo_size - 1, 1);
             s->hpc.intra_pred(s, x0, y0, log2_trafo_size - 1, 2);
         } else if (blk_idx == 3) {
-            trafo_size = trafo_size << (s->sps->hshift[1]);
-            ff_hevc_set_neighbour_available(s, xBase, yBase, trafo_size, trafo_size);
+            trafo_size = trafo_size << s->sps->hshift[1];
+            ff_hevc_set_neighbour_available(s, xBase, yBase,
+                                            trafo_size, trafo_size);
             s->hpc.intra_pred(s, xBase, yBase, log2_trafo_size, 1);
             s->hpc.intra_pred(s, xBase, yBase, log2_trafo_size, 2);
         }
@@ -766,6 +839,18 @@
                 if (ff_hevc_cu_qp_delta_sign_flag(s) == 1)
                     lc->tu.cu_qp_delta = -lc->tu.cu_qp_delta;
             lc->tu.is_cu_qp_delta_coded = 1;
+
+            if (lc->tu.cu_qp_delta < -(26 + s->sps->qp_bd_offset / 2) ||
+                lc->tu.cu_qp_delta >  (25 + s->sps->qp_bd_offset / 2)) {
+                av_log(s->avctx, AV_LOG_ERROR,
+                       "The cu_qp_delta %d is outside the valid range "
+                       "[%d, %d].\n",
+                       lc->tu.cu_qp_delta,
+                       -(26 + s->sps->qp_bd_offset / 2),
+                        (25 + s->sps->qp_bd_offset / 2));
+                return AVERROR_INVALIDDATA;
+            }
+
             ff_hevc_set_qPy(s, x0, y0, cb_xBase, cb_yBase, log2_cb_size);
         }
 
@@ -778,7 +863,7 @@
                 scan_idx = SCAN_HORIZ;
             }
 
-            if (lc->pu.intra_pred_mode_c >= 6 &&
+            if (lc->pu.intra_pred_mode_c >=  6 &&
                 lc->pu.intra_pred_mode_c <= 14) {
                 scan_idx_c = SCAN_VERT;
             } else if (lc->pu.intra_pred_mode_c >= 22 &&
@@ -801,6 +886,7 @@
                 ff_hevc_hls_residual_coding(s, xBase, yBase, log2_trafo_size, scan_idx_c, 2);
         }
     }
+    return 0;
 }
 
 static void set_deblocking_bypass(HEVCContext *s, int x0, int y0, int log2_cb_size)
@@ -808,7 +894,7 @@
     int cb_size          = 1 << log2_cb_size;
     int log2_min_pu_size = s->sps->log2_min_pu_size;
 
-    int min_pu_width = s->sps->min_pu_width;
+    int min_pu_width     = s->sps->min_pu_width;
     int x_end = FFMIN(x0 + cb_size, s->sps->width);
     int y_end = FFMIN(y0 + cb_size, s->sps->height);
     int i, j;
@@ -818,13 +904,14 @@
             s->is_pcm[i + j * min_pu_width] = 2;
 }
 
-static void hls_transform_tree(HEVCContext *s, int x0, int y0,
-                               int xBase, int yBase, int cb_xBase, int cb_yBase,
-                               int log2_cb_size, int log2_trafo_size,
-                               int trafo_depth, int blk_idx)
+static int hls_transform_tree(HEVCContext *s, int x0, int y0,
+                              int xBase, int yBase, int cb_xBase, int cb_yBase,
+                              int log2_cb_size, int log2_trafo_size,
+                              int trafo_depth, int blk_idx)
 {
     HEVCLocalContext *lc = s->HEVClc;
     uint8_t split_transform_flag;
+    int ret;
 
     if (trafo_depth > 0 && log2_trafo_size == 2) {
         SAMPLE_CBF(lc->tt.cbf_cb[trafo_depth], x0, y0) =
@@ -845,19 +932,20 @@
 
     lc->tt.cbf_luma = 1;
 
-    lc->tt.inter_split_flag = (s->sps->max_transform_hierarchy_depth_inter == 0 &&
-                               lc->cu.pred_mode == MODE_INTER &&
-                               lc->cu.part_mode != PART_2Nx2N && trafo_depth == 0);
+    lc->tt.inter_split_flag = s->sps->max_transform_hierarchy_depth_inter == 0 &&
+                              lc->cu.pred_mode == MODE_INTER &&
+                              lc->cu.part_mode != PART_2Nx2N &&
+                              trafo_depth == 0;
 
     if (log2_trafo_size <= s->sps->log2_max_trafo_size &&
-        log2_trafo_size > s->sps->log2_min_tb_size &&
-        trafo_depth < lc->cu.max_trafo_depth &&
+        log2_trafo_size >  s->sps->log2_min_tb_size    &&
+        trafo_depth     < lc->cu.max_trafo_depth       &&
         !(lc->cu.intra_split_flag && trafo_depth == 0)) {
         split_transform_flag = ff_hevc_split_transform_flag_decode(s, log2_trafo_size);
     } else {
-        split_transform_flag = (log2_trafo_size > s->sps->log2_max_trafo_size ||
-                                (lc->cu.intra_split_flag && (trafo_depth == 0)) ||
-                                lc->tt.inter_split_flag);
+        split_transform_flag = log2_trafo_size > s->sps->log2_max_trafo_size ||
+                               (lc->cu.intra_split_flag && trafo_depth == 0) ||
+                               lc->tt.inter_split_flag;
     }
 
     if (log2_trafo_size > 2) {
@@ -867,7 +955,8 @@
                 ff_hevc_cbf_cb_cr_decode(s, trafo_depth);
         }
 
-        if (trafo_depth == 0 || SAMPLE_CBF(lc->tt.cbf_cr[trafo_depth - 1], xBase, yBase)) {
+        if (trafo_depth == 0 ||
+            SAMPLE_CBF(lc->tt.cbf_cr[trafo_depth - 1], xBase, yBase)) {
             SAMPLE_CBF(lc->tt.cbf_cr[trafo_depth], x0, y0) =
                 ff_hevc_cbf_cb_cr_decode(s, trafo_depth);
         }
@@ -877,14 +966,26 @@
         int x1 = x0 + ((1 << log2_trafo_size) >> 1);
         int y1 = y0 + ((1 << log2_trafo_size) >> 1);
 
-        hls_transform_tree(s, x0, y0, x0, y0, cb_xBase, cb_yBase, log2_cb_size,
-                           log2_trafo_size - 1, trafo_depth + 1, 0);
-        hls_transform_tree(s, x1, y0, x0, y0, cb_xBase, cb_yBase, log2_cb_size,
-                           log2_trafo_size - 1, trafo_depth + 1, 1);
-        hls_transform_tree(s, x0, y1, x0, y0, cb_xBase, cb_yBase, log2_cb_size,
-                           log2_trafo_size - 1, trafo_depth + 1, 2);
-        hls_transform_tree(s, x1, y1, x0, y0, cb_xBase, cb_yBase, log2_cb_size,
-                           log2_trafo_size - 1, trafo_depth + 1, 3);
+        ret = hls_transform_tree(s, x0, y0, x0, y0, cb_xBase, cb_yBase,
+                                 log2_cb_size, log2_trafo_size - 1,
+                                 trafo_depth + 1, 0);
+        if (ret < 0)
+            return ret;
+        ret = hls_transform_tree(s, x1, y0, x0, y0, cb_xBase, cb_yBase,
+                                 log2_cb_size, log2_trafo_size - 1,
+                                 trafo_depth + 1, 1);
+        if (ret < 0)
+            return ret;
+        ret = hls_transform_tree(s, x0, y1, x0, y0, cb_xBase, cb_yBase,
+                                 log2_cb_size, log2_trafo_size - 1,
+                                 trafo_depth + 1, 2);
+        if (ret < 0)
+            return ret;
+        ret = hls_transform_tree(s, x1, y1, x0, y0, cb_xBase, cb_yBase,
+                                 log2_cb_size, log2_trafo_size - 1,
+                                 trafo_depth + 1, 3);
+        if (ret < 0)
+            return ret;
     } else {
         int min_tu_size      = 1 << s->sps->log2_min_tb_size;
         int log2_min_tu_size = s->sps->log2_min_tb_size;
@@ -896,9 +997,11 @@
             lc->tt.cbf_luma = ff_hevc_cbf_luma_decode(s, trafo_depth);
         }
 
-        hls_transform_unit(s, x0, y0, xBase, yBase, cb_xBase, cb_yBase,
-                           log2_cb_size, log2_trafo_size, trafo_depth, blk_idx);
-
+        ret = hls_transform_unit(s, x0, y0, xBase, yBase, cb_xBase, cb_yBase,
+                                 log2_cb_size, log2_trafo_size, trafo_depth,
+                                 blk_idx);
+        if (ret < 0)
+            return ret;
         // TODO: store cbf_luma somewhere else
         if (lc->tt.cbf_luma) {
             int i, j;
@@ -913,10 +1016,12 @@
             ff_hevc_deblocking_boundary_strengths(s, x0, y0, log2_trafo_size,
                                                   lc->slice_or_tiles_up_boundary,
                                                   lc->slice_or_tiles_left_boundary);
-            if (s->pps->transquant_bypass_enable_flag && lc->cu.cu_transquant_bypass_flag)
+            if (s->pps->transquant_bypass_enable_flag &&
+                lc->cu.cu_transquant_bypass_flag)
                 set_deblocking_bypass(s, x0, y0, log2_trafo_size);
         }
     }
+    return 0;
 }
 
 static int hls_pcm_sample(HEVCContext *s, int x0, int y0, int log2_cb_size)
@@ -932,7 +1037,7 @@
     int   stride2 = s->frame->linesize[2];
     uint8_t *dst2 = &s->frame->data[2][(y0 >> s->sps->vshift[2]) * stride2 + ((x0 >> s->sps->hshift[2]) << s->sps->pixel_shift)];
 
-    int length         = cb_size * cb_size * s->sps->pcm.bit_depth + ((cb_size * cb_size) >> 1) * s->sps->pcm.bit_depth;
+    int length         = cb_size * cb_size * s->sps->pcm.bit_depth + ((cb_size * cb_size) >> 1) * s->sps->pcm.bit_depth_chroma;
     const uint8_t *pcm = skip_bytes(&s->HEVClc->cc, (length + 7) >> 3);
     int ret;
 
@@ -944,7 +1049,7 @@
     if (ret < 0)
         return ret;
 
-    s->hevcdsp.put_pcm(dst0, stride0, cb_size, &gb, s->sps->pcm.bit_depth);
+    s->hevcdsp.put_pcm(dst0, stride0, cb_size,     &gb, s->sps->pcm.bit_depth);
     s->hevcdsp.put_pcm(dst1, stride1, cb_size / 2, &gb, s->sps->pcm.bit_depth_chroma);
     s->hevcdsp.put_pcm(dst2, stride2, cb_size / 2, &gb, s->sps->pcm.bit_depth_chroma);
     return 0;
@@ -985,13 +1090,19 @@
     if (x_off < extra_left || y_off < extra_top ||
         x_off >= pic_width - block_w - ff_hevc_qpel_extra_after[mx] ||
         y_off >= pic_height - block_h - ff_hevc_qpel_extra_after[my]) {
+        const int edge_emu_stride = EDGE_EMU_BUFFER_STRIDE << s->sps->pixel_shift;
         int offset = extra_top * srcstride + (extra_left << s->sps->pixel_shift);
+        int buf_offset = extra_top *
+                         edge_emu_stride + (extra_left << s->sps->pixel_shift);
 
-        s->vdsp.emulated_edge_mc(lc->edge_emu_buffer, srcstride, src - offset, srcstride,
-                                 block_w + ff_hevc_qpel_extra[mx], block_h + ff_hevc_qpel_extra[my],
+        s->vdsp.emulated_edge_mc(lc->edge_emu_buffer, src - offset,
+                                 edge_emu_stride, srcstride,
+                                 block_w + ff_hevc_qpel_extra[mx],
+                                 block_h + ff_hevc_qpel_extra[my],
                                  x_off - extra_left, y_off - extra_top,
                                  pic_width, pic_height);
-        src = lc->edge_emu_buffer + offset;
+        src = lc->edge_emu_buffer + buf_offset;
+        srcstride = edge_emu_stride;
     }
     s->hevcdsp.put_hevc_qpel[my][mx](dst, dststride, src, srcstride, block_w,
                                      block_h, lc->mc_buffer);
@@ -1011,8 +1122,9 @@
  * @param block_w width of block
  * @param block_h height of block
  */
-static void chroma_mc(HEVCContext *s, int16_t *dst1, int16_t *dst2, ptrdiff_t dststride, AVFrame *ref,
-                      const Mv *mv, int x_off, int y_off, int block_w, int block_h)
+static void chroma_mc(HEVCContext *s, int16_t *dst1, int16_t *dst2,
+                      ptrdiff_t dststride, AVFrame *ref, const Mv *mv,
+                      int x_off, int y_off, int block_w, int block_h)
 {
     HEVCLocalContext *lc = s->HEVClc;
     uint8_t *src1        = ref->data[1];
@@ -1033,25 +1145,35 @@
     if (x_off < EPEL_EXTRA_BEFORE || y_off < EPEL_EXTRA_AFTER ||
         x_off >= pic_width - block_w - EPEL_EXTRA_AFTER ||
         y_off >= pic_height - block_h - EPEL_EXTRA_AFTER) {
+        const int edge_emu_stride = EDGE_EMU_BUFFER_STRIDE << s->sps->pixel_shift;
         int offset1 = EPEL_EXTRA_BEFORE * (src1stride + (1 << s->sps->pixel_shift));
+        int buf_offset1 = EPEL_EXTRA_BEFORE *
+                          (edge_emu_stride + (1 << s->sps->pixel_shift));
         int offset2 = EPEL_EXTRA_BEFORE * (src2stride + (1 << s->sps->pixel_shift));
+        int buf_offset2 = EPEL_EXTRA_BEFORE *
+                          (edge_emu_stride + (1 << s->sps->pixel_shift));
 
-        s->vdsp.emulated_edge_mc(lc->edge_emu_buffer, src1stride, src1 - offset1, src1stride,
+        s->vdsp.emulated_edge_mc(lc->edge_emu_buffer, src1 - offset1,
+                                 edge_emu_stride, src1stride,
                                  block_w + EPEL_EXTRA, block_h + EPEL_EXTRA,
                                  x_off - EPEL_EXTRA_BEFORE,
                                  y_off - EPEL_EXTRA_BEFORE,
                                  pic_width, pic_height);
 
-        src1 = lc->edge_emu_buffer + offset1;
+        src1 = lc->edge_emu_buffer + buf_offset1;
+        src1stride = edge_emu_stride;
         s->hevcdsp.put_hevc_epel[!!my][!!mx](dst1, dststride, src1, src1stride,
                                              block_w, block_h, mx, my, lc->mc_buffer);
 
-        s->vdsp.emulated_edge_mc(lc->edge_emu_buffer, src2stride, src2 - offset2, src2stride,
+        s->vdsp.emulated_edge_mc(lc->edge_emu_buffer, src2 - offset2,
+                                 edge_emu_stride, src2stride,
                                  block_w + EPEL_EXTRA, block_h + EPEL_EXTRA,
                                  x_off - EPEL_EXTRA_BEFORE,
                                  y_off - EPEL_EXTRA_BEFORE,
                                  pic_width, pic_height);
-        src2 = lc->edge_emu_buffer + offset2;
+        src2 = lc->edge_emu_buffer + buf_offset2;
+        src2stride = edge_emu_stride;
+
         s->hevcdsp.put_hevc_epel[!!my][!!mx](dst2, dststride, src2, src2stride,
                                              block_w, block_h, mx, my,
                                              lc->mc_buffer);
@@ -1111,8 +1233,11 @@
         else
             merge_idx = 0;
 
-        ff_hevc_luma_mv_merge_mode(s, x0, y0, 1 << log2_cb_size, 1 << log2_cb_size,
-                                   log2_cb_size, partIdx, merge_idx, &current_mv);
+        ff_hevc_luma_mv_merge_mode(s, x0, y0,
+                                   1 << log2_cb_size,
+                                   1 << log2_cb_size,
+                                   log2_cb_size, partIdx,
+                                   merge_idx, &current_mv);
         x_pu = x0 >> s->sps->log2_min_pu_size;
         y_pu = y0 >> s->sps->log2_min_pu_size;
 
@@ -1150,7 +1275,8 @@
                 ff_hevc_hls_mvd_coding(s, x0, y0, 0);
                 mvp_flag[0] = ff_hevc_mvp_lx_flag_decode(s);
                 ff_hevc_luma_mv_mvp_mode(s, x0, y0, nPbW, nPbH, log2_cb_size,
-                                         partIdx, merge_idx, &current_mv, mvp_flag[0], 0);
+                                         partIdx, merge_idx, &current_mv,
+                                         mvp_flag[0], 0);
                 current_mv.mv[0].x += lc->pu.mvd.x;
                 current_mv.mv[0].y += lc->pu.mvd.y;
             }
@@ -1171,7 +1297,8 @@
                 current_mv.pred_flag[1] = 1;
                 mvp_flag[1] = ff_hevc_mvp_lx_flag_decode(s);
                 ff_hevc_luma_mv_mvp_mode(s, x0, y0, nPbW, nPbH, log2_cb_size,
-                                         partIdx, merge_idx, &current_mv, mvp_flag[1], 1);
+                                         partIdx, merge_idx, &current_mv,
+                                         mvp_flag[1], 1);
                 current_mv.mv[1].x += lc->pu.mvd.x;
                 current_mv.mv[1].y += lc->pu.mvd.y;
             }
@@ -1199,7 +1326,7 @@
     }
 
     if (current_mv.pred_flag[0] && !current_mv.pred_flag[1]) {
-        DECLARE_ALIGNED(16, int16_t, tmp [MAX_PB_SIZE * MAX_PB_SIZE]);
+        DECLARE_ALIGNED(16, int16_t,  tmp[MAX_PB_SIZE * MAX_PB_SIZE]);
         DECLARE_ALIGNED(16, int16_t, tmp2[MAX_PB_SIZE * MAX_PB_SIZE]);
 
         luma_mc(s, tmp, tmpstride, ref0->frame,
@@ -1505,16 +1632,17 @@
     int min_cb_width     = s->sps->min_cb_width;
     int x_cb             = x0 >> log2_min_cb_size;
     int y_cb             = y0 >> log2_min_cb_size;
-    int x, y;
+    int x, y, ret;
+    int qp_block_mask = (1<<(s->sps->log2_ctb_size - s->pps->diff_cu_qp_delta_depth)) - 1;
+
+    lc->cu.x                = x0;
+    lc->cu.y                = y0;
+    lc->cu.rqt_root_cbf     = 1;
+    lc->cu.pred_mode        = MODE_INTRA;
+    lc->cu.part_mode        = PART_2Nx2N;
+    lc->cu.intra_split_flag = 0;
+    lc->cu.pcm_flag         = 0;
 
-    lc->cu.x            = x0;
-    lc->cu.y            = y0;
-    lc->cu.rqt_root_cbf = 1;
-
-    lc->cu.pred_mode                     = MODE_INTRA;
-    lc->cu.part_mode                     = PART_2Nx2N;
-    lc->cu.intra_split_flag              = 0;
-    lc->cu.pcm_flag                      = 0;
     SAMPLE_CTB(s->skip_flag, x_cb, y_cb) = 0;
     for (x = 0; x < 4; x++)
         lc->pu.intra_pred_mode[x] = 1;
@@ -1562,7 +1690,6 @@
                 lc->cu.pcm_flag = ff_hevc_pcm_flag_decode(s);
             }
             if (lc->cu.pcm_flag) {
-                int ret;
                 intra_prediction_unit_default_value(s, x0, y0, log2_cb_size);
                 ret = hls_pcm_sample(s, x0, y0, log2_cb_size);
                 if (s->sps->pcm.loop_filter_disable_flag)
@@ -1580,33 +1707,33 @@
                 hls_prediction_unit(s, x0, y0, cb_size, cb_size, log2_cb_size, 0);
                 break;
             case PART_2NxN:
-                hls_prediction_unit(s, x0, y0, cb_size, cb_size / 2, log2_cb_size, 0);
-                hls_prediction_unit(s, x0, y0 + cb_size / 2, cb_size, cb_size/2, log2_cb_size, 1);
+                hls_prediction_unit(s, x0, y0,               cb_size, cb_size / 2, log2_cb_size, 0);
+                hls_prediction_unit(s, x0, y0 + cb_size / 2, cb_size, cb_size / 2, log2_cb_size, 1);
                 break;
             case PART_Nx2N:
-                hls_prediction_unit(s, x0, y0, cb_size / 2, cb_size, log2_cb_size, 0);
+                hls_prediction_unit(s, x0,               y0, cb_size / 2, cb_size, log2_cb_size, 0);
                 hls_prediction_unit(s, x0 + cb_size / 2, y0, cb_size / 2, cb_size, log2_cb_size, 1);
                 break;
             case PART_2NxnU:
-                hls_prediction_unit(s, x0, y0, cb_size, cb_size / 4, log2_cb_size, 0);
+                hls_prediction_unit(s, x0, y0,               cb_size, cb_size     / 4, log2_cb_size, 0);
                 hls_prediction_unit(s, x0, y0 + cb_size / 4, cb_size, cb_size * 3 / 4, log2_cb_size, 1);
                 break;
             case PART_2NxnD:
-                hls_prediction_unit(s, x0, y0, cb_size, cb_size * 3 / 4, log2_cb_size, 0);
-                hls_prediction_unit(s, x0, y0 + cb_size * 3 / 4, cb_size, cb_size / 4, log2_cb_size, 1);
+                hls_prediction_unit(s, x0, y0,                   cb_size, cb_size * 3 / 4, log2_cb_size, 0);
+                hls_prediction_unit(s, x0, y0 + cb_size * 3 / 4, cb_size, cb_size     / 4, log2_cb_size, 1);
                 break;
             case PART_nLx2N:
-                hls_prediction_unit(s, x0, y0, cb_size / 4, cb_size, log2_cb_size,0);
+                hls_prediction_unit(s, x0,               y0, cb_size     / 4, cb_size, log2_cb_size, 0);
                 hls_prediction_unit(s, x0 + cb_size / 4, y0, cb_size * 3 / 4, cb_size, log2_cb_size, 1);
                 break;
             case PART_nRx2N:
-                hls_prediction_unit(s, x0, y0, cb_size * 3 / 4, cb_size, log2_cb_size,0);
-                hls_prediction_unit(s, x0 + cb_size * 3 / 4, y0, cb_size/4, cb_size, log2_cb_size, 1);
+                hls_prediction_unit(s, x0,                   y0, cb_size * 3 / 4, cb_size, log2_cb_size, 0);
+                hls_prediction_unit(s, x0 + cb_size * 3 / 4, y0, cb_size     / 4, cb_size, log2_cb_size, 1);
                 break;
             case PART_NxN:
-                hls_prediction_unit(s, x0, y0, cb_size / 2, cb_size / 2, log2_cb_size, 0);
-                hls_prediction_unit(s, x0 + cb_size / 2, y0, cb_size / 2, cb_size / 2, log2_cb_size, 1);
-                hls_prediction_unit(s, x0, y0 + cb_size / 2, cb_size / 2, cb_size / 2, log2_cb_size, 2);
+                hls_prediction_unit(s, x0,               y0,               cb_size / 2, cb_size / 2, log2_cb_size, 0);
+                hls_prediction_unit(s, x0 + cb_size / 2, y0,               cb_size / 2, cb_size / 2, log2_cb_size, 1);
+                hls_prediction_unit(s, x0,               y0 + cb_size / 2, cb_size / 2, cb_size / 2, log2_cb_size, 2);
                 hls_prediction_unit(s, x0 + cb_size / 2, y0 + cb_size / 2, cb_size / 2, cb_size / 2, log2_cb_size, 3);
                 break;
             }
@@ -1621,8 +1748,11 @@
                 lc->cu.max_trafo_depth = lc->cu.pred_mode == MODE_INTRA ?
                                          s->sps->max_transform_hierarchy_depth_intra + lc->cu.intra_split_flag :
                                          s->sps->max_transform_hierarchy_depth_inter;
-                hls_transform_tree(s, x0, y0, x0, y0, x0, y0, log2_cb_size,
-                                   log2_cb_size, 0, 0);
+                ret = hls_transform_tree(s, x0, y0, x0, y0, x0, y0,
+                                         log2_cb_size,
+                                         log2_cb_size, 0, 0);
+                if (ret < 0)
+                    return ret;
             } else {
                 if (!s->sh.disable_deblocking_filter_flag)
                     ff_hevc_deblocking_boundary_strengths(s, x0, y0, log2_cb_size,
@@ -1641,6 +1771,11 @@
         x += min_cb_width;
     }
 
+    if(((x0 + (1<<log2_cb_size)) & qp_block_mask) == 0 &&
+       ((y0 + (1<<log2_cb_size)) & qp_block_mask) == 0) {
+        lc->qPy_pred = lc->qp_y;
+    }
+
     set_ct_depth(s, x0, y0, log2_cb_size, lc->ct.depth);
 
     return 0;
@@ -1652,10 +1787,11 @@
     HEVCLocalContext *lc = s->HEVClc;
     const int cb_size    = 1 << log2_cb_size;
     int ret;
+    int qp_block_mask = (1<<(s->sps->log2_ctb_size - s->pps->diff_cu_qp_delta_depth)) - 1;
 
     lc->ct.depth = cb_depth;
-    if ((x0 + cb_size <= s->sps->width) &&
-        (y0 + cb_size <= s->sps->height) &&
+    if (x0 + cb_size <= s->sps->width  &&
+        y0 + cb_size <= s->sps->height &&
         log2_cb_size > s->sps->log2_min_cb_size) {
         SAMPLE(s->split_cu_flag, x0, y0) =
             ff_hevc_split_coding_unit_flag_decode(s, cb_depth, x0, y0);
@@ -1673,20 +1809,34 @@
         const int cb_size_split = cb_size >> 1;
         const int x1 = x0 + cb_size_split;
         const int y1 = y0 + cb_size_split;
+
         int more_data = 0;
 
         more_data = hls_coding_quadtree(s, x0, y0, log2_cb_size - 1, cb_depth + 1);
         if (more_data < 0)
             return more_data;
 
-        if (more_data && x1 < s->sps->width)
+        if (more_data && x1 < s->sps->width) {
             more_data = hls_coding_quadtree(s, x1, y0, log2_cb_size - 1, cb_depth + 1);
-        if (more_data && y1 < s->sps->height)
+            if (more_data < 0)
+                return more_data;
+        }
+        if (more_data && y1 < s->sps->height) {
             more_data = hls_coding_quadtree(s, x0, y1, log2_cb_size - 1, cb_depth + 1);
+            if (more_data < 0)
+                return more_data;
+        }
         if (more_data && x1 < s->sps->width &&
             y1 < s->sps->height) {
-            return hls_coding_quadtree(s, x1, y1, log2_cb_size - 1, cb_depth + 1);
+            more_data = hls_coding_quadtree(s, x1, y1, log2_cb_size - 1, cb_depth + 1);
+            if (more_data < 0)
+                return more_data;
         }
+
+        if(((x0 + (1<<log2_cb_size)) & qp_block_mask) == 0 &&
+            ((y0 + (1<<log2_cb_size)) & qp_block_mask) == 0)
+            lc->qPy_pred = lc->qp_y;
+
         if (more_data)
             return ((x1 + cb_size_split) < s->sps->width ||
                     (y1 + cb_size_split) < s->sps->height);
@@ -1712,17 +1862,16 @@
     return 0;
 }
 
-static void hls_decode_neighbour(HEVCContext *s, int x_ctb, int y_ctb, int ctb_addr_ts)
+static void hls_decode_neighbour(HEVCContext *s, int x_ctb, int y_ctb,
+                                 int ctb_addr_ts)
 {
     HEVCLocalContext *lc  = s->HEVClc;
     int ctb_size          = 1 << s->sps->log2_ctb_size;
     int ctb_addr_rs       = s->pps->ctb_addr_ts_to_rs[ctb_addr_ts];
     int ctb_addr_in_slice = ctb_addr_rs - s->sh.slice_addr;
 
-    int tile_left_boundary;
-    int tile_up_boundary;
-    int slice_left_boundary;
-    int slice_up_boundary;
+    int tile_left_boundary, tile_up_boundary;
+    int slice_left_boundary, slice_up_boundary;
 
     s->tab_slice_address[ctb_addr_rs] = s->sh.slice_addr;
 
@@ -1733,7 +1882,6 @@
     } else if (s->pps->tiles_enabled_flag) {
         if (ctb_addr_ts && s->pps->tile_id[ctb_addr_ts] != s->pps->tile_id[ctb_addr_ts - 1]) {
             int idxX = s->pps->col_idxX[x_ctb >> s->sps->log2_ctb_size];
-            lc->start_of_tiles_x = x_ctb;
             lc->end_of_tiles_x   = x_ctb + (s->pps->column_width[idxX] << s->sps->log2_ctb_size);
             lc->first_qp_group   = 1;
         }
@@ -1744,26 +1892,26 @@
     lc->end_of_tiles_y = FFMIN(y_ctb + ctb_size, s->sps->height);
 
     if (s->pps->tiles_enabled_flag) {
-        tile_left_boundary  = ((x_ctb > 0) &&
-                               (s->pps->tile_id[ctb_addr_ts] == s->pps->tile_id[s->pps->ctb_addr_rs_to_ts[ctb_addr_rs - 1]]));
-        slice_left_boundary = ((x_ctb > 0) &&
-                               (s->tab_slice_address[ctb_addr_rs] == s->tab_slice_address[ctb_addr_rs - 1]));
-        tile_up_boundary  = ((y_ctb > 0) &&
-                             (s->pps->tile_id[ctb_addr_ts] == s->pps->tile_id[s->pps->ctb_addr_rs_to_ts[ctb_addr_rs - s->sps->ctb_width]]));
-        slice_up_boundary = ((y_ctb > 0) &&
-                             (s->tab_slice_address[ctb_addr_rs] == s->tab_slice_address[ctb_addr_rs - s->sps->ctb_width]));
+        tile_left_boundary = x_ctb > 0 &&
+                             s->pps->tile_id[ctb_addr_ts] != s->pps->tile_id[s->pps->ctb_addr_rs_to_ts[ctb_addr_rs-1]];
+        slice_left_boundary = x_ctb > 0 &&
+                              s->tab_slice_address[ctb_addr_rs] != s->tab_slice_address[ctb_addr_rs - 1];
+        tile_up_boundary  = y_ctb > 0 &&
+                            s->pps->tile_id[ctb_addr_ts] != s->pps->tile_id[s->pps->ctb_addr_rs_to_ts[ctb_addr_rs - s->sps->ctb_width]];
+        slice_up_boundary = y_ctb > 0 &&
+                            s->tab_slice_address[ctb_addr_rs] != s->tab_slice_address[ctb_addr_rs - s->sps->ctb_width];
     } else {
-        tile_left_boundary  =
-        tile_up_boundary    = 1;
-        slice_left_boundary = ctb_addr_in_slice > 0;
-        slice_up_boundary   = ctb_addr_in_slice >= s->sps->ctb_width;
-    }
-    lc->slice_or_tiles_left_boundary = (!slice_left_boundary) + (!tile_left_boundary << 1);
-    lc->slice_or_tiles_up_boundary   = (!slice_up_boundary + (!tile_up_boundary << 1));
-    lc->ctb_left_flag = ((x_ctb > 0) && (ctb_addr_in_slice > 0) && tile_left_boundary);
-    lc->ctb_up_flag   = ((y_ctb > 0) && (ctb_addr_in_slice >= s->sps->ctb_width) && tile_up_boundary);
-    lc->ctb_up_right_flag = ((y_ctb > 0)  && (ctb_addr_in_slice+1 >= s->sps->ctb_width) && (s->pps->tile_id[ctb_addr_ts] == s->pps->tile_id[s->pps->ctb_addr_rs_to_ts[ctb_addr_rs+1 - s->sps->ctb_width]]));
-    lc->ctb_up_left_flag = ((x_ctb > 0) && (y_ctb > 0)  && (ctb_addr_in_slice-1 >= s->sps->ctb_width) && (s->pps->tile_id[ctb_addr_ts] == s->pps->tile_id[s->pps->ctb_addr_rs_to_ts[ctb_addr_rs-1 - s->sps->ctb_width]]));
+        tile_left_boundary =
+        tile_up_boundary   = 0;
+        slice_left_boundary = ctb_addr_in_slice <= 0;
+        slice_up_boundary   = ctb_addr_in_slice < s->sps->ctb_width;
+    }
+    lc->slice_or_tiles_left_boundary = slice_left_boundary + (tile_left_boundary << 1);
+    lc->slice_or_tiles_up_boundary   = slice_up_boundary   + (tile_up_boundary   << 1);
+    lc->ctb_left_flag = ((x_ctb > 0) && (ctb_addr_in_slice > 0)                  && !tile_left_boundary);
+    lc->ctb_up_flag   = ((y_ctb > 0) && (ctb_addr_in_slice >= s->sps->ctb_width) && !tile_up_boundary);
+    lc->ctb_up_right_flag = ((y_ctb > 0)                 && (ctb_addr_in_slice+1 >= s->sps->ctb_width) && (s->pps->tile_id[ctb_addr_ts] == s->pps->tile_id[s->pps->ctb_addr_rs_to_ts[ctb_addr_rs+1 - s->sps->ctb_width]]));
+    lc->ctb_up_left_flag  = ((x_ctb > 0) && (y_ctb > 0)  && (ctb_addr_in_slice-1 >= s->sps->ctb_width) && (s->pps->tile_id[ctb_addr_ts] == s->pps->tile_id[s->pps->ctb_addr_rs_to_ts[ctb_addr_rs-1 - s->sps->ctb_width]]));
 }
 
 static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread)
@@ -1775,11 +1923,24 @@
     int y_ctb       = 0;
     int ctb_addr_ts = s->pps->ctb_addr_rs_to_ts[s->sh.slice_ctb_addr_rs];
 
+    if (!ctb_addr_ts && s->sh.dependent_slice_segment_flag) {
+        av_log(s->avctx, AV_LOG_ERROR, "Impossible initial tile.\n");
+        return AVERROR_INVALIDDATA;
+    }
+
+    if (s->sh.dependent_slice_segment_flag) {
+        int prev_rs = s->pps->ctb_addr_ts_to_rs[ctb_addr_ts - 1];
+        if (s->tab_slice_address[prev_rs] != s->sh.slice_addr) {
+            av_log(s->avctx, AV_LOG_ERROR, "Previous slice segment missing\n");
+            return AVERROR_INVALIDDATA;
+        }
+    }
+
     while (more_data && ctb_addr_ts < s->sps->ctb_size) {
         int ctb_addr_rs = s->pps->ctb_addr_ts_to_rs[ctb_addr_ts];
 
-        x_ctb = (ctb_addr_rs % ((s->sps->width + (ctb_size - 1)) >> s->sps->log2_ctb_size)) << s->sps->log2_ctb_size;
-        y_ctb = (ctb_addr_rs / ((s->sps->width + (ctb_size - 1)) >> s->sps->log2_ctb_size)) << s->sps->log2_ctb_size;
+        x_ctb = (ctb_addr_rs % ((s->sps->width + ctb_size - 1) >> s->sps->log2_ctb_size)) << s->sps->log2_ctb_size;
+        y_ctb = (ctb_addr_rs / ((s->sps->width + ctb_size - 1) >> s->sps->log2_ctb_size)) << s->sps->log2_ctb_size;
         hls_decode_neighbour(s, x_ctb, y_ctb, ctb_addr_ts);
 
         ff_hevc_cabac_init(s, ctb_addr_ts);
@@ -1791,8 +1952,11 @@
         s->filter_slice_edges[ctb_addr_rs]  = s->sh.slice_loop_filter_across_slices_enabled_flag;
 
         more_data = hls_coding_quadtree(s, x_ctb, y_ctb, s->sps->log2_ctb_size, 0);
-        if (more_data < 0)
+        if (more_data < 0) {
+            s->tab_slice_address[ctb_addr_rs] = -1;
             return more_data;
+        }
+
 
         ctb_addr_ts++;
         ff_hevc_save_states(s, ctb_addr_ts);
@@ -1858,8 +2022,10 @@
         hls_sao_param(s, x_ctb >> s->sps->log2_ctb_size, y_ctb >> s->sps->log2_ctb_size);
         more_data = hls_coding_quadtree(s, x_ctb, y_ctb, s->sps->log2_ctb_size, 0);
 
-        if (more_data < 0)
+        if (more_data < 0) {
+            s->tab_slice_address[ctb_addr_rs] = -1;
             return more_data;
+        }
 
         ctb_addr_ts++;
 
@@ -1908,7 +2074,6 @@
             s->sList[i] = av_malloc(sizeof(HEVCContext));
             memcpy(s->sList[i], s, sizeof(HEVCContext));
             s->HEVClcList[i] = av_malloc(sizeof(HEVCLocalContext));
-            s->HEVClcList[i]->edge_emu_buffer = av_malloc((MAX_PB_SIZE + 7) * s->frame->linesize[0]);
             s->sList[i]->HEVClc = s->HEVClcList[i];
         }
     }
@@ -1996,7 +2161,7 @@
 
 static void restore_tqb_pixels(HEVCContext *s)
 {
-    int min_pu_size          = 1 << s->sps->log2_min_pu_size;
+    int min_pu_size = 1 << s->sps->log2_min_pu_size;
     int x, y, c_idx;
 
     for (c_idx = 0; c_idx < 3; c_idx++) {
@@ -2021,18 +2186,56 @@
     }
 }
 
+static int set_side_data(HEVCContext *s)
+{
+    AVFrame *out = s->ref->frame;
+
+    if (s->sei_frame_packing_present &&
+        s->frame_packing_arrangement_type >= 3 &&
+        s->frame_packing_arrangement_type <= 5 &&
+        s->content_interpretation_type > 0 &&
+        s->content_interpretation_type < 3) {
+        AVStereo3D *stereo = av_stereo3d_create_side_data(out);
+        if (!stereo)
+            return AVERROR(ENOMEM);
+
+        switch (s->frame_packing_arrangement_type) {
+        case 3:
+            if (s->quincunx_subsampling)
+                stereo->type = AV_STEREO3D_SIDEBYSIDE_QUINCUNX;
+            else
+                stereo->type = AV_STEREO3D_SIDEBYSIDE;
+            break;
+        case 4:
+            stereo->type = AV_STEREO3D_TOPBOTTOM;
+            break;
+        case 5:
+            stereo->type = AV_STEREO3D_FRAMESEQUENCE;
+            break;
+        }
+
+        if (s->content_interpretation_type == 2)
+            stereo->flags = AV_STEREO3D_FLAG_INVERT;
+    }
+
+    return 0;
+}
+
 static int hevc_frame_start(HEVCContext *s)
 {
-    HEVCLocalContext *lc     = s->HEVClc;
+    HEVCLocalContext *lc = s->HEVClc;
+    int pic_size_in_ctb  = ((s->sps->width  >> s->sps->log2_min_cb_size) + 1) *
+                           ((s->sps->height >> s->sps->log2_min_cb_size) + 1);
     int ret;
 
     memset(s->horizontal_bs, 0, 2 * s->bs_width * (s->bs_height + 1));
     memset(s->vertical_bs,   0, 2 * s->bs_width * (s->bs_height + 1));
     memset(s->cbf_luma,      0, s->sps->min_tb_width * s->sps->min_tb_height);
     memset(s->is_pcm,        0, s->sps->min_pu_width * s->sps->min_pu_height);
+    memset(s->tab_slice_address, -1, pic_size_in_ctb * sizeof(*s->tab_slice_address));
 
-    lc->start_of_tiles_x = 0;
     s->is_decoded        = 0;
+    s->first_nal_type    = s->nal_unit_type;
 
     if (s->pps->tiles_enabled_flag)
         lc->end_of_tiles_x = s->pps->column_width[0] << s->sps->log2_ctb_size;
@@ -2042,19 +2245,16 @@
     if (ret < 0)
         goto fail;
 
-    av_fast_malloc(&lc->edge_emu_buffer, &lc->edge_emu_buffer_size,
-                   (MAX_PB_SIZE + 7) * s->ref->frame->linesize[0]);
-    if (!lc->edge_emu_buffer) {
-        ret = AVERROR(ENOMEM);
-        goto fail;
-    }
-
     ret = ff_hevc_frame_rps(s);
     if (ret < 0) {
         av_log(s->avctx, AV_LOG_ERROR, "Error constructing the frame RPS.\n");
         goto fail;
     }
 
+    ret = set_side_data(s);
+    if (ret < 0)
+        goto fail;
+
     av_frame_unref(s->output_frame);
     ret = ff_hevc_output_frame(s, s->output_frame, 0);
     if (ret < 0)
@@ -2063,6 +2263,7 @@
     ff_thread_finish_setup(s->avctx);
 
     return 0;
+
 fail:
     if (s->ref && s->threads_type == FF_THREAD_FRAME)
         ff_thread_report_progress(&s->ref->tf, INT_MAX, 0);
@@ -2074,8 +2275,7 @@
 {
     HEVCLocalContext *lc = s->HEVClc;
     GetBitContext *gb    = &lc->gb;
-    int ctb_addr_ts;
-    int ret;
+    int ctb_addr_ts, ret;
 
     ret = init_get_bits8(gb, nal, length);
     if (ret < 0)
@@ -2085,9 +2285,7 @@
     if (ret < 0) {
         av_log(s->avctx, AV_LOG_ERROR, "Invalid NAL unit %d, skipping.\n",
                s->nal_unit_type);
-        if (s->avctx->err_recognition & AV_EF_EXPLODE)
-            return ret;
-        return 0;
+        goto fail;
     } else if (!ret)
         return 0;
 
@@ -2095,23 +2293,23 @@
     case NAL_VPS:
         ret = ff_hevc_decode_nal_vps(s);
         if (ret < 0)
-            return ret;
+            goto fail;
         break;
     case NAL_SPS:
         ret = ff_hevc_decode_nal_sps(s);
         if (ret < 0)
-            return ret;
+            goto fail;
         break;
     case NAL_PPS:
         ret = ff_hevc_decode_nal_pps(s);
         if (ret < 0)
-            return ret;
+            goto fail;
         break;
     case NAL_SEI_PREFIX:
     case NAL_SEI_SUFFIX:
         ret = ff_hevc_decode_nal_sei(s);
         if (ret < 0)
-            return ret;
+            goto fail;
         break;
     case NAL_TRAIL_R:
     case NAL_TRAIL_N:
@@ -2157,6 +2355,13 @@
                 return ret;
         } else if (!s->ref) {
             av_log(s->avctx, AV_LOG_ERROR, "First slice in a frame missing.\n");
+            goto fail;
+        }
+
+        if (s->nal_unit_type != s->first_nal_type) {
+            av_log(s->avctx, AV_LOG_ERROR,
+                   "Non-matching NAL types of the VCL NALUs: %d %d\n",
+                   s->first_nal_type, s->nal_unit_type);
             return AVERROR_INVALIDDATA;
         }
 
@@ -2166,8 +2371,7 @@
             if (ret < 0) {
                 av_log(s->avctx, AV_LOG_WARNING,
                        "Error constructing the reference lists for the current slice.\n");
-                if (s->avctx->err_recognition & AV_EF_EXPLODE)
-                    return ret;
+                goto fail;
             }
         }
 
@@ -2175,7 +2379,6 @@
             ctb_addr_ts = hls_slice_data_wpp(s, nal, length);
         else
             ctb_addr_ts = hls_slice_data(s);
-
         if (ctb_addr_ts >= (s->sps->ctb_width * s->sps->ctb_height)) {
             s->is_decoded = 1;
             if ((s->pps->transquant_bypass_enable_flag ||
@@ -2184,8 +2387,10 @@
                 restore_tqb_pixels(s);
         }
 
-        if (ctb_addr_ts < 0)
-            return ctb_addr_ts;
+        if (ctb_addr_ts < 0) {
+            ret = ctb_addr_ts;
+            goto fail;
+        }
         break;
     case NAL_EOS_NUT:
     case NAL_EOB_NUT:
@@ -2201,10 +2406,14 @@
     }
 
     return 0;
+fail:
+    if (s->avctx->err_recognition & AV_EF_EXPLODE)
+        return ret;
+    return 0;
 }
 
 /* FIXME: This is adapted from ff_h264_decode_nal, avoiding duplication
-   between these functions would be nice. */
+ * between these functions would be nice. */
 int ff_hevc_extract_rbsp(HEVCContext *s, const uint8_t *src, int length,
                          HEVCNAL *nal)
 {
@@ -2246,7 +2455,7 @@
         STARTCODE_TEST;
         i -= 3;
     }
-#endif
+#endif /* HAVE_FAST_64BIT */
 #else
     for (i = 0; i + 1 < length; i += 2) {
         if (src[i])
@@ -2255,7 +2464,7 @@
             i--;
         STARTCODE_TEST;
     }
-#endif
+#endif /* HAVE_FAST_UNALIGNED */
 
     if (i >= length - 1) { // no escaped 0
         nal->data = src;
@@ -2303,8 +2512,8 @@
     }
     while (si < length)
         dst[di++] = src[si++];
-nsc:
 
+nsc:
     memset(dst + di, 0, FF_INPUT_BUFFER_PADDING_SIZE);
 
     nal->data = dst;
@@ -2350,8 +2559,8 @@
                 }
             }
 
-            buf    += 3;
-            length -= 3;
+            buf           += 3;
+            length        -= 3;
         }
 
         if (!s->is_nalff)
@@ -2365,7 +2574,8 @@
                 goto fail;
             }
             s->nals = tmp;
-            memset(s->nals + s->nals_allocated, 0, (new_size - s->nals_allocated) * sizeof(*tmp));
+            memset(s->nals + s->nals_allocated, 0,
+                   (new_size - s->nals_allocated) * sizeof(*tmp));
             av_reallocp_array(&s->skipped_bytes_nal, new_size, sizeof(*s->skipped_bytes_nal));
             av_reallocp_array(&s->skipped_bytes_pos_size_nal, new_size, sizeof(*s->skipped_bytes_pos_size_nal));
             av_reallocp_array(&s->skipped_bytes_pos_nal, new_size, sizeof(*s->skipped_bytes_pos_nal));
@@ -2394,8 +2604,8 @@
             goto fail;
         hls_nal_unit(s);
 
-        if (s->nal_unit_type == NAL_EOS_NUT ||
-            s->nal_unit_type == NAL_EOB_NUT)
+        if (s->nal_unit_type == NAL_EOB_NUT ||
+            s->nal_unit_type == NAL_EOS_NUT)
             s->eos = 1;
 
         buf    += consumed;
@@ -2412,8 +2622,7 @@
         if (ret < 0) {
             av_log(s->avctx, AV_LOG_WARNING,
                    "Error parsing NAL unit #%d.\n", i);
-            if (s->avctx->err_recognition & AV_EF_EXPLODE)
-                goto fail;
+            goto fail;
         }
     }
 
@@ -2424,7 +2633,7 @@
     return ret;
 }
 
-static void print_md5(void *log_ctx, int level,  uint8_t md5[16])
+static void print_md5(void *log_ctx, int level, uint8_t md5[16])
 {
     int i;
     for (i = 0; i < 16; i++)
@@ -2513,16 +2722,15 @@
     }
 
     s->ref = NULL;
-    ret = decode_nal_units(s, avpkt->data, avpkt->size);
+    ret    = decode_nal_units(s, avpkt->data, avpkt->size);
     if (ret < 0)
         return ret;
 
     /* verify the SEI checksum */
     if (avctx->err_recognition & AV_EF_CRCCHECK && s->is_decoded &&
-        avctx->err_recognition & AV_EF_EXPLODE &&
         s->is_md5) {
         ret = verify_md5(s, s->ref->frame);
-        if (ret < 0) {
+        if (ret < 0 && avctx->err_recognition & AV_EF_EXPLODE) {
             ff_hevc_unref_frame(s, s->ref, ~0);
             return ret;
         }
@@ -2584,7 +2792,6 @@
 
     pic_arrays_free(s);
 
-    av_freep(&lc->edge_emu_buffer);
     av_freep(&s->md5_ctx);
 
     for(i=0; i < s->nals_allocated; i++) {
@@ -2605,7 +2812,7 @@
     }
 
     for (i = 0; i < FF_ARRAY_ELEMS(s->vps_list); i++)
-        av_freep(&s->vps_list[i]);
+        av_buffer_unref(&s->vps_list[i]);
     for (i = 0; i < FF_ARRAY_ELEMS(s->sps_list); i++)
         av_buffer_unref(&s->sps_list[i]);
     for (i = 0; i < FF_ARRAY_ELEMS(s->pps_list); i++)
@@ -2618,12 +2825,12 @@
     for (i = 1; i < s->threads_number; i++) {
         lc = s->HEVClcList[i];
         if (lc) {
-            av_freep(&lc->edge_emu_buffer);
-
             av_freep(&s->HEVClcList[i]);
             av_freep(&s->sList[i]);
         }
     }
+    if (s->HEVClc == s->HEVClcList[0])
+        s->HEVClc = NULL;
     av_freep(&s->HEVClcList[0]);
 
     for (i = 0; i < s->nals_allocated; i++)
@@ -2677,6 +2884,7 @@
     s->context_initialized = 1;
 
     return 0;
+
 fail:
     hevc_decode_free(avctx);
     return AVERROR(ENOMEM);
@@ -2704,6 +2912,15 @@
         }
     }
 
+    for (i = 0; i < FF_ARRAY_ELEMS(s->vps_list); i++) {
+        av_buffer_unref(&s->vps_list[i]);
+        if (s0->vps_list[i]) {
+            s->vps_list[i] = av_buffer_ref(s0->vps_list[i]);
+            if (!s->vps_list[i])
+                return AVERROR(ENOMEM);
+        }
+    }
+
     for (i = 0; i < FF_ARRAY_ELEMS(s->sps_list); i++) {
         av_buffer_unref(&s->sps_list[i]);
         if (s0->sps_list[i]) {
@@ -2722,6 +2939,9 @@
         }
     }
 
+    if (s->sps != s0->sps)
+        ret = set_sps(s, s0->sps);
+
     s->seq_decode = s0->seq_decode;
     s->seq_output = s0->seq_output;
     s->pocTid0    = s0->pocTid0;
@@ -2753,11 +2973,10 @@
         (avctx->extradata[0] || avctx->extradata[1] ||
          avctx->extradata[2] > 1)) {
         /* It seems the extradata is encoded as hvcC format.
-         * Temporarily, we support configurationVersion==0 until 14496-15 3rd finalized.
-         * When finalized, configurationVersion will be 1 and we can recognize hvcC by
-         * checking if avctx->extradata[0]==1 or not. */
-        int i, j, num_arrays;
-        int nal_len_size;
+         * Temporarily, we support configurationVersion==0 until 14496-15 3rd
+         * is finalized. When finalized, configurationVersion will be 1 and we
+         * can recognize hvcC by checking if avctx->extradata[0]==1 or not. */
+        int i, j, num_arrays, nal_len_size;
 
         s->is_nalff = 1;
 
@@ -2786,14 +3005,16 @@
                 ret = decode_nal_units(s, gb.buffer, nalsize);
                 if (ret < 0) {
                     av_log(avctx, AV_LOG_ERROR,
-                           "Decoding nal unit %d %d from hvcC failed\n", type, i);
+                           "Decoding nal unit %d %d from hvcC failed\n",
+                           type, i);
                     return ret;
                 }
                 bytestream2_skip(&gb, nalsize);
             }
         }
 
-        /* Now store right nal length size, that will be used to parse all other nals */
+        /* Now store right nal length size, that will be used to parse
+         * all other nals */
         s->nal_length_size = nal_len_size;
     } else {
         s->is_nalff = 0;
@@ -2818,6 +3039,7 @@
         return ret;
 
     s->enable_parallel_tiles = 0;
+    s->picture_struct = 0;
 
     if(avctx->active_thread_type & FF_THREAD_SLICE)
         s->threads_number = avctx->thread_count;
@@ -2863,8 +3085,18 @@
 
 #define OFFSET(x) offsetof(HEVCContext, x)
 #define PAR (AV_OPT_FLAG_DECODING_PARAM | AV_OPT_FLAG_VIDEO_PARAM)
+
+static const AVProfile profiles[] = {
+    { FF_PROFILE_HEVC_MAIN,                 "Main"                },
+    { FF_PROFILE_HEVC_MAIN_10,              "Main 10"             },
+    { FF_PROFILE_HEVC_MAIN_STILL_PICTURE,   "Main Still Picture"  },
+    { FF_PROFILE_UNKNOWN },
+};
+
 static const AVOption options[] = {
-    { "strict-displaywin", "stricly apply default display window size", OFFSET(strict_def_disp_win),
+    { "apply_defdispwin", "Apply default display window from VUI", OFFSET(apply_defdispwin),
+        AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, PAR },
+    { "strict-displaywin", "stricly apply default display window size", OFFSET(apply_defdispwin),
         AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, PAR },
     { NULL },
 };
@@ -2889,5 +3121,7 @@
     .flush                 = hevc_decode_flush,
     .update_thread_context = hevc_update_thread_context,
     .init_thread_copy      = hevc_init_thread_copy,
-    .capabilities   = CODEC_CAP_DR1 | CODEC_CAP_DELAY | CODEC_CAP_SLICE_THREADS | CODEC_CAP_FRAME_THREADS,
+    .capabilities          = CODEC_CAP_DR1 | CODEC_CAP_DELAY |
+                             CODEC_CAP_SLICE_THREADS | CODEC_CAP_FRAME_THREADS,
+    .profiles              = NULL_IF_CONFIG_SMALL(profiles),
 };

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/hevc.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/hevc.h Changed

@@ -1,5 +1,5 @@
 /*
- * HEVC video Decoder
+ * HEVC video decoder
  *
  * Copyright (C) 2012 - 2013 Guillaume Martres
  *
@@ -72,6 +72,8 @@
 #define EPEL_EXTRA_AFTER  2
 #define EPEL_EXTRA        3
 
+#define EDGE_EMU_BUFFER_STRIDE 80
+
 /**
  * Value of the luma sample at position (x, y) in the 2D array tab.
  */
@@ -82,36 +84,37 @@
 #define IS_IDR(s) (s->nal_unit_type == NAL_IDR_W_RADL || s->nal_unit_type == NAL_IDR_N_LP)
 #define IS_BLA(s) (s->nal_unit_type == NAL_BLA_W_RADL || s->nal_unit_type == NAL_BLA_W_LP || \
                    s->nal_unit_type == NAL_BLA_N_LP)
+#define IS_IRAP(s) (s->nal_unit_type >= 16 && s->nal_unit_type <= 23)
 
 /**
  * Table 7-3: NAL unit type codes
  */
 enum NALUnitType {
-    NAL_TRAIL_N     =  0,
-    NAL_TRAIL_R     =  1,
-    NAL_TSA_N       =  2,
-    NAL_TSA_R       =  3,
-    NAL_STSA_N      =  4,
-    NAL_STSA_R      =  5,
-    NAL_RADL_N      =  6,
-    NAL_RADL_R      =  7,
-    NAL_RASL_N      =  8,
-    NAL_RASL_R      =  9,
-    NAL_BLA_W_LP    = 16,
-    NAL_BLA_W_RADL  = 17,
-    NAL_BLA_N_LP    = 18,
-    NAL_IDR_W_RADL  = 19,
-    NAL_IDR_N_LP    = 20,
-    NAL_CRA_NUT     = 21,
-    NAL_VPS         = 32,
-    NAL_SPS         = 33,
-    NAL_PPS         = 34,
-    NAL_AUD         = 35,
-    NAL_EOS_NUT     = 36,
-    NAL_EOB_NUT     = 37,
-    NAL_FD_NUT      = 38,
-    NAL_SEI_PREFIX  = 39,
-    NAL_SEI_SUFFIX  = 40,
+    NAL_TRAIL_N    = 0,
+    NAL_TRAIL_R    = 1,
+    NAL_TSA_N      = 2,
+    NAL_TSA_R      = 3,
+    NAL_STSA_N     = 4,
+    NAL_STSA_R     = 5,
+    NAL_RADL_N     = 6,
+    NAL_RADL_R     = 7,
+    NAL_RASL_N     = 8,
+    NAL_RASL_R     = 9,
+    NAL_BLA_W_LP   = 16,
+    NAL_BLA_W_RADL = 17,
+    NAL_BLA_N_LP   = 18,
+    NAL_IDR_W_RADL = 19,
+    NAL_IDR_N_LP   = 20,
+    NAL_CRA_NUT    = 21,
+    NAL_VPS        = 32,
+    NAL_SPS        = 33,
+    NAL_PPS        = 34,
+    NAL_AUD        = 35,
+    NAL_EOS_NUT    = 36,
+    NAL_EOB_NUT    = 37,
+    NAL_FD_NUT     = 38,
+    NAL_SEI_PREFIX = 39,
+    NAL_SEI_SUFFIX = 40,
 };
 
 enum RPSType {
@@ -256,7 +259,7 @@
 };
 
 typedef struct ShortTermRPS {
-    int num_negative_pics;
+    unsigned int num_negative_pics;
     int num_delta_pocs;
     int32_t delta_poc[32];
     uint8_t used[32];
@@ -329,24 +332,27 @@
     int log2_max_mv_length_vertical;
 } VUI;
 
+typedef struct PTLCommon {
+    uint8_t profile_space;
+    uint8_t tier_flag;
+    uint8_t profile_idc;
+    uint8_t profile_compatibility_flag[32];
+    uint8_t level_idc;
+    uint8_t progressive_source_flag;
+    uint8_t interlaced_source_flag;
+    uint8_t non_packed_constraint_flag;
+    uint8_t frame_only_constraint_flag;
+} PTLCommon;
+
 typedef struct PTL {
-    int general_profile_space;
-    uint8_t general_tier_flag;
-    int general_profile_idc;
-    int general_profile_compatibility_flag[32];
-    int general_level_idc;
+    PTLCommon general_ptl;
+    PTLCommon sub_layer_ptl[MAX_SUB_LAYERS];
 
     uint8_t sub_layer_profile_present_flag[MAX_SUB_LAYERS];
     uint8_t sub_layer_level_present_flag[MAX_SUB_LAYERS];
-
-    int sub_layer_profile_space[MAX_SUB_LAYERS];
-    uint8_t sub_layer_tier_flag[MAX_SUB_LAYERS];
-    int sub_layer_profile_idc[MAX_SUB_LAYERS];
-    uint8_t sub_layer_profile_compatibility_flags[MAX_SUB_LAYERS][32];
-    int sub_layer_level_idc[MAX_SUB_LAYERS];
 } PTL;
 
-typedef struct VPS {
+typedef struct HEVCVPS {
     uint8_t vps_temporal_id_nesting_flag;
     int vps_max_layers;
     int vps_max_sub_layers; ///< vps_max_temporal_layers_minus1 + 1
@@ -364,16 +370,17 @@
     uint8_t vps_poc_proportional_to_timing_flag;
     int vps_num_ticks_poc_diff_one; ///< vps_num_ticks_poc_diff_one_minus1 + 1
     int vps_num_hrd_parameters;
-} VPS;
+} HEVCVPS;
 
 typedef struct ScalingList {
-    // This is a little wasteful, since sizeID 0 only needs 8 coeffs, and size ID 3 only has 2 arrays, not 6.
+    /* This is a little wasteful, since sizeID 0 only needs 8 coeffs,
+     * and size ID 3 only has 2 arrays, not 6. */
     uint8_t sl[4][6][64];
     uint8_t sl_dc[2][6];
 } ScalingList;
 
 typedef struct HEVCSPS {
-    int vps_id;
+    unsigned vps_id;
     int chroma_format_idc;
     uint8_t separate_colour_plane_flag;
 
@@ -454,7 +461,7 @@
 } HEVCSPS;
 
 typedef struct HEVCPPS {
-    int sps_id; ///< seq_parameter_set_id
+    unsigned int sps_id; ///< seq_parameter_set_id
 
     uint8_t sign_data_hiding_flag;
 
@@ -482,8 +489,8 @@
     uint8_t tiles_enabled_flag;
     uint8_t entropy_coding_sync_enabled_flag;
 
-    int num_tile_columns; ///< num_tile_columns_minus1 + 1
-    int num_tile_rows; ///< num_tile_rows_minus1 + 1
+    int num_tile_columns;   ///< num_tile_columns_minus1 + 1
+    int num_tile_rows;      ///< num_tile_rows_minus1 + 1
     uint8_t uniform_spacing_flag;
     uint8_t loop_filter_across_tiles_enabled_flag;
 
@@ -492,10 +499,10 @@
     uint8_t deblocking_filter_control_present_flag;
     uint8_t deblocking_filter_override_enabled_flag;
     uint8_t disable_dbf;
-    int beta_offset; ///< beta_offset_div2 * 2
-    int tc_offset; ///< tc_offset_div2 * 2
+    int beta_offset;    ///< beta_offset_div2 * 2
+    int tc_offset;      ///< tc_offset_div2 * 2
 
-    int pps_scaling_list_data_present_flag;
+    uint8_t scaling_list_data_present_flag;
     ScalingList scaling_list;
 
     uint8_t lists_modification_present_flag;
@@ -503,26 +510,23 @@
     int num_extra_slice_header_bits;
     uint8_t slice_header_extension_present_flag;
 
-    uint8_t pps_extension_flag;
-    uint8_t pps_extension_data_flag;
-
     // Inferred parameters
-    int *column_width; ///< ColumnWidth
-    int *row_height; ///< RowHeight
-    int *col_bd; ///< ColBd
-    int *row_bd; ///< RowBd
+    unsigned int *column_width;  ///< ColumnWidth
+    unsigned int *row_height;    ///< RowHeight
+    unsigned int *col_bd;        ///< ColBd
+    unsigned int *row_bd;        ///< RowBd
     int *col_idxX;
 
     int *ctb_addr_rs_to_ts; ///< CtbAddrRSToTS
     int *ctb_addr_ts_to_rs; ///< CtbAddrTSToRS
-    int *tile_id; ///< TileId
-    int *tile_pos_rs; ///< TilePosRS
-    int *min_cb_addr_zs; ///< MinCbAddrZS
-    int *min_tb_addr_zs; ///< MinTbAddrZS
+    int *tile_id;           ///< TileId
+    int *tile_pos_rs;       ///< TilePosRS
+    int *min_cb_addr_zs;    ///< MinCbAddrZS
+    int *min_tb_addr_zs;    ///< MinTbAddrZS
 } HEVCPPS;
 
 typedef struct SliceHeader {
-    int pps_id;
+    unsigned int pps_id;
 
     ///< address (in raster order) of the first block in the current slice segment
     unsigned int   slice_segment_addr;
@@ -564,11 +568,10 @@
     int slice_cb_qp_offset;
     int slice_cr_qp_offset;
 
-    int beta_offset; ///< beta_offset_div2 * 2
-    int tc_offset; ///< tc_offset_div2 * 2
-
-    int max_num_merge_cand; ///< 5 - 5_minus_max_num_merge_cand
+    int beta_offset;    ///< beta_offset_div2 * 2
+    int tc_offset;      ///< tc_offset_div2 * 2
 
+    unsigned int max_num_merge_cand; ///< 5 - 5_minus_max_num_merge_cand
 
     int *entry_point_offset;
     int * offset;
@@ -591,7 +594,7 @@
     int16_t luma_offset_l1[16];
     int16_t chroma_offset_l1[16][2];
 
-    int    slice_ctb_addr_rs;
+    int slice_ctb_addr_rs;
 } SliceHeader;
 
 typedef struct CodingTree {
@@ -602,26 +605,26 @@
     int x;
     int y;
 
-    enum PredMode pred_mode; ///< PredMode
-    enum PartMode part_mode; ///< PartMode
+    enum PredMode pred_mode;    ///< PredMode
+    enum PartMode part_mode;    ///< PartMode
 
     uint8_t rqt_root_cbf;
 
     uint8_t pcm_flag;
 
     // Inferred parameters
-    uint8_t intra_split_flag; ///< IntraSplitFlag
-    uint8_t max_trafo_depth; ///< MaxTrafoDepth
+    uint8_t intra_split_flag;   ///< IntraSplitFlag
+    uint8_t max_trafo_depth;    ///< MaxTrafoDepth
     uint8_t cu_transquant_bypass_flag;
 } CodingUnit;
 
 typedef struct Mv {
-    int16_t x;     ///< horizontal component of motion vector
-    int16_t y;     ///< vertical component of motion vector
+    int16_t x;  ///< horizontal component of motion vector
+    int16_t y;  ///< vertical component of motion vector
 } Mv;
 
 typedef struct MvField {
-    Mv  mv[2];
+    Mv mv[2];
     int8_t ref_idx[2];
     int8_t pred_flag[2];
     uint8_t is_intra;
@@ -662,19 +665,6 @@
     uint8_t is_cu_qp_delta_coded;
 } TransformUnit;
 
-typedef struct SAOParams {
-    int offset_abs[3][4]; ///< sao_offset_abs
-    int offset_sign[3][4]; ///< sao_offset_sign
-
-    int band_position[3]; ///< sao_band_position
-
-    int eo_class[3]; ///< sao_eo_class
-
-    int offset_val[3][5]; ///<SaoOffsetVal
-
-    uint8_t type_idx[3]; ///< sao_type_idx
-} SAOParams;
-
 typedef struct DBParams {
     int beta_offset;
     int tc_offset;
@@ -733,17 +723,18 @@
     int8_t qp_y;
     int8_t curr_qp_y;
 
+    int qPy_pred;
+
     TransformUnit tu;
 
     uint8_t ctb_left_flag;
     uint8_t ctb_up_flag;
     uint8_t ctb_up_right_flag;
     uint8_t ctb_up_left_flag;
-    int     start_of_tiles_x;
     int     end_of_tiles_x;
     int     end_of_tiles_y;
-    uint8_t *edge_emu_buffer;
-    int      edge_emu_buffer_size;
+    /* +7 is for subpixel interpolation, *2 for high bit depths */
+    DECLARE_ALIGNED(32, uint8_t, edge_emu_buffer)[(MAX_PB_SIZE + 7) * EDGE_EMU_BUFFER_STRIDE * 2];
     CodingTree ct;
     CodingUnit cu;
     PredictionUnit pu;
@@ -755,7 +746,7 @@
 
 typedef struct HEVCContext {
     const AVClass *c;  // needed by private avoptions
-    AVCodecContext      *avctx;
+    AVCodecContext *avctx;
 
     struct HEVCContext  *sList[MAX_NB_THREADS];
 
@@ -777,10 +768,11 @@
     AVFrame *sao_frame;
     AVFrame *tmp_frame;
     AVFrame *output_frame;
-    VPS *vps;
+
+    const HEVCVPS *vps;
     const HEVCSPS *sps;
-    HEVCPPS *pps;
-    VPS *vps_list[MAX_VPS_COUNT];
+    const HEVCPPS *pps;
+    AVBufferRef *vps_list[MAX_VPS_COUNT];
     AVBufferRef *sps_list[MAX_SPS_COUNT];
     AVBufferRef *pps_list[MAX_PPS_COUNT];
 
@@ -824,7 +816,6 @@
     // PU
     uint8_t *tab_ipm;
 
-
     uint8_t *cbf_luma; // cbf_luma of colocated TU
     uint8_t *is_pcm;
 
@@ -857,20 +848,31 @@
     HEVCNAL *nals;
     int nb_nals;
     int nals_allocated;
+    // type of the first VCL NAL of the current frame
+    enum NALUnitType first_nal_type;
 
     // for checking the frame checksums
     struct AVMD5 *md5_ctx;
     uint8_t       md5[3][16];
     uint8_t is_md5;
 
-    int context_initialized;
-    int is_nalff;         ///< this flag is != 0 if bitstream is encapsulated
-                          ///< as a format defined in 14496-15
-    int strict_def_disp_win;
+    uint8_t context_initialized;
+    uint8_t is_nalff;       ///< this flag is != 0 if bitstream is encapsulated
+                            ///< as a format defined in 14496-15
+    int apply_defdispwin;
+
+    int active_seq_parameter_set_id;
 
-    int nal_length_size;  ///< Number of bytes used for nal length (1, 2 or 4)
+    int nal_length_size;    ///< Number of bytes used for nal length (1, 2 or 4)
     int nuh_layer_id;
 
+    /** frame packing arrangement variables */
+    int sei_frame_packing_present;
+    int frame_packing_arrangement_type;
+    int content_interpretation_type;
+    int quincunx_subsampling;
+
+    int picture_struct;
 } HEVCContext;
 
 int ff_hevc_decode_short_term_rps(HEVCContext *s, ShortTermRPS *rps,
@@ -898,7 +900,8 @@
  */
 int ff_hevc_compute_poc(HEVCContext *s, int poc_lsb);
 
-RefPicList* ff_hevc_get_ref_list(HEVCContext *s, HEVCFrame *frame, int x0, int y0);
+RefPicList *ff_hevc_get_ref_list(HEVCContext *s, HEVCFrame *frame,
+                                 int x0, int y0);
 
 /**
  * Construct the reference picture sets for the current frame.
@@ -920,9 +923,11 @@
 int ff_hevc_sao_eo_class_decode(HEVCContext *s);
 int ff_hevc_end_of_slice_flag_decode(HEVCContext *s);
 int ff_hevc_cu_transquant_bypass_flag_decode(HEVCContext *s);
-int ff_hevc_skip_flag_decode(HEVCContext *s, int x0, int y0, int x_cb, int y_cb);
+int ff_hevc_skip_flag_decode(HEVCContext *s, int x0, int y0,
+                             int x_cb, int y_cb);
 int ff_hevc_pred_mode_decode(HEVCContext *s);
-int ff_hevc_split_coding_unit_flag_decode(HEVCContext *s, int ct_depth, int x0, int y0);
+int ff_hevc_split_coding_unit_flag_decode(HEVCContext *s, int ct_depth,
+                                          int x0, int y0);
 int ff_hevc_part_mode_decode(HEVCContext *s, int log2_cb_size);
 int ff_hevc_pcm_flag_decode(HEVCContext *s);
 int ff_hevc_prev_intra_luma_pred_flag_decode(HEVCContext *s);
@@ -955,12 +960,21 @@
 
 void ff_hevc_unref_frame(HEVCContext *s, HEVCFrame *frame, int flags);
 
-void ff_hevc_set_neighbour_available(HEVCContext *s, int x0, int y0, int nPbW, int nPbH);
-void ff_hevc_luma_mv_merge_mode(HEVCContext *s, int x0, int y0, int nPbW, int nPbH, int log2_cb_size, int part_idx, int merge_idx, MvField *mv);
-void ff_hevc_luma_mv_mvp_mode(HEVCContext *s, int x0, int y0, int nPbW, int nPbH, int log2_cb_size, int part_idx, int merge_idx, MvField *mv , int mvp_lx_flag, int LX);
-void ff_hevc_set_qPy(HEVCContext *s, int xC, int yC, int xBase, int yBase, int log2_cb_size);
-void ff_hevc_deblocking_boundary_strengths(HEVCContext *s, int x0, int y0, int log2_trafo_size,
-                                           int slice_or_tiles_up_boundary, int slice_or_tiles_left_boundary);
+void ff_hevc_set_neighbour_available(HEVCContext *s, int x0, int y0,
+                                     int nPbW, int nPbH);
+void ff_hevc_luma_mv_merge_mode(HEVCContext *s, int x0, int y0,
+                                int nPbW, int nPbH, int log2_cb_size,
+                                int part_idx, int merge_idx, MvField *mv);
+void ff_hevc_luma_mv_mvp_mode(HEVCContext *s, int x0, int y0,
+                              int nPbW, int nPbH, int log2_cb_size,
+                              int part_idx, int merge_idx,
+                              MvField *mv, int mvp_lx_flag, int LX);
+void ff_hevc_set_qPy(HEVCContext *s, int xC, int yC, int xBase, int yBase,
+                     int log2_cb_size);
+void ff_hevc_deblocking_boundary_strengths(HEVCContext *s, int x0, int y0,
+                                           int log2_trafo_size,
+                                           int slice_or_tiles_up_boundary,
+                                           int slice_or_tiles_left_boundary);
 int ff_hevc_cu_qp_delta_sign_flag(HEVCContext *s);
 int ff_hevc_cu_qp_delta_abs(HEVCContext *s);
 void ff_hevc_hls_filter(HEVCContext *s, int x, int y);
@@ -971,7 +985,6 @@
 
 void ff_hevc_hls_mvd_coding(HEVCContext *s, int x0, int y0, int log2_cb_size);
 
-void ff_hevc_pps_free(HEVCPPS **ppps);
 
 extern const uint8_t ff_hevc_qpel_extra_before[4];
 extern const uint8_t ff_hevc_qpel_extra_after[4];
@@ -982,4 +995,4 @@
 extern const uint8_t ff_hevc_diag_scan8x8_x[64];
 extern const uint8_t ff_hevc_diag_scan8x8_y[64];
 
-#endif // AVCODEC_HEVC_H
+#endif /* AVCODEC_HEVC_H */

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/hevc_cabac.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/hevc_cabac.c Changed

@@ -33,94 +33,94 @@
  * number of bin by SyntaxElement.
  */
 static const int8_t num_bins_in_se[] = {
-     1,  // sao_merge_flag
-     1,  // sao_type_idx
-     0,  // sao_eo_class
-     0,  // sao_band_position
-     0,  // sao_offset_abs
-     0,  // sao_offset_sign
-     0,  // end_of_slice_flag
-     3,  // split_coding_unit_flag
-     1,  // cu_transquant_bypass_flag
-     3,  // skip_flag
-     3,  // cu_qp_delta
-     1,  // pred_mode
-     4,  // part_mode
-     0,  // pcm_flag
-     1,  // prev_intra_luma_pred_mode
-     0,  // mpm_idx
-     0,  // rem_intra_luma_pred_mode
-     2,  // intra_chroma_pred_mode
-     1,  // merge_flag
-     1,  // merge_idx
-     5,  // inter_pred_idc
-     2,  // ref_idx_l0
-     2,  // ref_idx_l1
-     2,  // abs_mvd_greater0_flag
-     2,  // abs_mvd_greater1_flag
-     0,  // abs_mvd_minus2
-     0,  // mvd_sign_flag
-     1,  // mvp_lx_flag
-     1,  // no_residual_data_flag
-     3,  // split_transform_flag
-     2,  // cbf_luma
-     4,  // cbf_cb, cbf_cr
-     2,  // transform_skip_flag[][]
-    18,  // last_significant_coeff_x_prefix
-    18,  // last_significant_coeff_y_prefix
-     0,  // last_significant_coeff_x_suffix
-     0,  // last_significant_coeff_y_suffix
-     4,  // significant_coeff_group_flag
-    42,  // significant_coeff_flag
-    24,  // coeff_abs_level_greater1_flag
-     6,  // coeff_abs_level_greater2_flag
-     0,  // coeff_abs_level_remaining
-     0,  // coeff_sign_flag
+     1, // sao_merge_flag
+     1, // sao_type_idx
+     0, // sao_eo_class
+     0, // sao_band_position
+     0, // sao_offset_abs
+     0, // sao_offset_sign
+     0, // end_of_slice_flag
+     3, // split_coding_unit_flag
+     1, // cu_transquant_bypass_flag
+     3, // skip_flag
+     3, // cu_qp_delta
+     1, // pred_mode
+     4, // part_mode
+     0, // pcm_flag
+     1, // prev_intra_luma_pred_mode
+     0, // mpm_idx
+     0, // rem_intra_luma_pred_mode
+     2, // intra_chroma_pred_mode
+     1, // merge_flag
+     1, // merge_idx
+     5, // inter_pred_idc
+     2, // ref_idx_l0
+     2, // ref_idx_l1
+     2, // abs_mvd_greater0_flag
+     2, // abs_mvd_greater1_flag
+     0, // abs_mvd_minus2
+     0, // mvd_sign_flag
+     1, // mvp_lx_flag
+     1, // no_residual_data_flag
+     3, // split_transform_flag
+     2, // cbf_luma
+     4, // cbf_cb, cbf_cr
+     2, // transform_skip_flag[][]
+    18, // last_significant_coeff_x_prefix
+    18, // last_significant_coeff_y_prefix
+     0, // last_significant_coeff_x_suffix
+     0, // last_significant_coeff_y_suffix
+     4, // significant_coeff_group_flag
+    42, // significant_coeff_flag
+    24, // coeff_abs_level_greater1_flag
+     6, // coeff_abs_level_greater2_flag
+     0, // coeff_abs_level_remaining
+     0, // coeff_sign_flag
 };
 
 /**
  * Offset to ctxIdx 0 in init_values and states, indexed by SyntaxElement.
  */
 static const int elem_offset[sizeof(num_bins_in_se)] = {
-    0,
-    1,
-    2,
-    2,
-    2,
-    2,
-    2,
-    2,
-    5,
-    6,
-    9,
-    12,
-    13,
-    17,
-    17,
-    18,
-    18,
-    18,
-    20,
-    21,
-    22,
-    27,
-    29,
-    31,
-    33,
-    35,
-    35,
-    35,
-    36,
-    37,
-    40,
-    42,
-    46,
-    48,
-    66,
-    84,
-    84,
-    84,
-    88,
+      0,
+      1,
+      2,
+      2,
+      2,
+      2,
+      2,
+      2,
+      5,
+      6,
+      9,
+     12,
+     13,
+     17,
+     17,
+     18,
+     18,
+     18,
+     20,
+     21,
+     22,
+     27,
+     29,
+     31,
+     33,
+     35,
+     35,
+     35,
+     36,
+     37,
+     40,
+     42,
+     46,
+     48,
+     66,
+     84,
+     84,
+     84,
+     88,
     130,
     154,
     160,
@@ -132,201 +132,195 @@
  * Indexed by init_type
  */
 static const uint8_t init_values[3][HEVC_CONTEXTS] = {
-    {
-        // sao_merge_flag
-        153,
-        // sao_type_idx
-        200,
-        // split_coding_unit_flag
-        139, 141, 157,
-        // cu_transquant_bypass_flag
-        154,
-        // skip_flag
-        CNU, CNU, CNU,
-        // cu_qp_delta
-        154, 154, 154,
-        // pred_mode
-        CNU,
-        // part_mode
-        184, CNU, CNU, CNU,
-        // prev_intra_luma_pred_mode
-        184,
-        // intra_chroma_pred_mode
-        63, 139,
-        // merge_flag
-        CNU,
-        // merge_idx
-        CNU,
-        // inter_pred_idc
-        CNU, CNU, CNU, CNU, CNU,
-        // ref_idx_l0
-        CNU, CNU,
-        // ref_idx_l1
-        CNU, CNU,
-        // abs_mvd_greater1_flag
-        CNU, CNU,
-        // abs_mvd_greater1_flag
-        CNU, CNU,
-        // mvp_lx_flag
-        CNU,
-        // no_residual_data_flag
-        CNU,
-        // split_transform_flag
-        153, 138, 138,
-        // cbf_luma
-        111, 141,
-        // cbf_cb, cbf_cr
-        94, 138, 182, 154,
-        // transform_skip_flag
-        139, 139,
-        // last_significant_coeff_x_prefix
-        110, 110, 124, 125, 140, 153, 125, 127, 140, 109, 111, 143, 127, 111,
-         79, 108, 123,  63,
-        // last_significant_coeff_y_prefix
-        110, 110, 124, 125, 140, 153, 125, 127, 140, 109, 111, 143, 127, 111,
-         79, 108, 123,  63,
-        // significant_coeff_group_flag
-        91, 171, 134, 141,
-        // significant_coeff_flag
-        111, 111, 125, 110, 110,  94, 124, 108, 124, 107, 125, 141, 179, 153,
-        125, 107, 125, 141, 179, 153, 125, 107, 125, 141, 179, 153, 125, 140,
-        139, 182, 182, 152, 136, 152, 136, 153, 136, 139, 111, 136, 139, 111,
-        // coeff_abs_level_greater1_flag
-        140,  92, 137, 138, 140, 152, 138, 139, 153,  74, 149,  92, 139, 107,
-        122, 152, 140, 179, 166, 182, 140, 227, 122, 197,
-        // coeff_abs_level_greater2_flag
-        138, 153, 136, 167, 152, 152,
-    },
-    {
-        // sao_merge_flag
-        153,
-        // sao_type_idx
-        185,
-        // split_coding_unit_flag
-        107, 139, 126,
-        // cu_transquant_bypass_flag
-        154,
-        // skip_flag
-        197, 185, 201,
-        // cu_qp_delta
-        154, 154, 154,
-        // pred_mode
-        149,
-        // part_mode
-        154, 139, 154, 154,
-        // prev_intra_luma_pred_mode
-        154,
-        // intra_chroma_pred_mode
-        152, 139,
-        // merge_flag
-        110,
-        // merge_idx
-        122,
-        // inter_pred_idc
-        95, 79, 63, 31, 31,
-        // ref_idx_l0
-        153, 153,
-        // ref_idx_l1
-        153, 153,
-        // abs_mvd_greater1_flag
-        140, 198,
-        // abs_mvd_greater1_flag
-        140, 198,
-        // mvp_lx_flag
-        168,
-        // no_residual_data_flag
-        79,
-        // split_transform_flag
-        124, 138, 94,
-        // cbf_luma
-        153, 111,
-        // cbf_cb, cbf_cr
-        149, 107, 167, 154,
-        // transform_skip_flag
-        139, 139,
-        // last_significant_coeff_x_prefix
-        125, 110,  94, 110,  95,  79, 125, 111, 110,  78, 110, 111, 111,  95,
-         94, 108, 123, 108,
-        // last_significant_coeff_y_prefix
-        125, 110,  94, 110,  95,  79, 125, 111, 110,  78, 110, 111, 111,  95,
-         94, 108, 123, 108,
-        // significant_coeff_group_flag
-        121, 140, 61, 154,
-        // significant_coeff_flag
-        155, 154, 139, 153, 139, 123, 123,  63, 153, 166, 183, 140, 136, 153,
-        154, 166, 183, 140, 136, 153, 154, 166, 183, 140, 136, 153, 154, 170,
-        153, 123, 123, 107, 121, 107, 121, 167, 151, 183, 140, 151, 183, 140,
-        // coeff_abs_level_greater1_flag
-        154, 196, 196, 167, 154, 152, 167, 182, 182, 134, 149, 136, 153, 121,
-        136, 137, 169, 194, 166, 167, 154, 167, 137, 182,
-        // coeff_abs_level_greater2_flag
-        107, 167, 91, 122, 107, 167,
-    },
-    {
-        // sao_merge_flag
-        153,
-        // sao_type_idx
-        160,
-        // split_coding_unit_flag
-        107, 139, 126,
-        // cu_transquant_bypass_flag
-        154,
-        // skip_flag
-        197, 185, 201,
-        // cu_qp_delta
-        154, 154, 154,
-        // pred_mode
-        134,
-        // part_mode
-        154, 139, 154, 154,
-        // prev_intra_luma_pred_mode
-        183,
-        // intra_chroma_pred_mode
-        152, 139,
-        // merge_flag
-        154,
-        // merge_idx
-        137,
-        // inter_pred_idc
-        95, 79, 63, 31, 31,
-        // ref_idx_l0
-        153, 153,
-        // ref_idx_l1
-        153, 153,
-        // abs_mvd_greater1_flag
-        169, 198,
-        // abs_mvd_greater1_flag
-        169, 198,
-        // mvp_lx_flag
-        168,
-        // no_residual_data_flag
-        79,
-        // split_transform_flag
-        224, 167, 122,
-        // cbf_luma
-        153, 111,
-        // cbf_cb, cbf_cr
-        149, 92, 167, 154,
-        // transform_skip_flag
-        139, 139,
-        // last_significant_coeff_x_prefix
-        125, 110, 124, 110,  95,  94, 125, 111, 111,  79, 125, 126, 111, 111,
-         79, 108, 123,  93,
-        // last_significant_coeff_y_prefix
-        125, 110, 124, 110,  95,  94, 125, 111, 111,  79, 125, 126, 111, 111,
-         79, 108, 123,  93,
-        // significant_coeff_group_flag
-        121, 140, 61, 154,
-        // significant_coeff_flag
-        170, 154, 139, 153, 139, 123, 123,  63, 124, 166, 183, 140, 136, 153,
-        154, 166, 183, 140, 136, 153, 154, 166, 183, 140, 136, 153, 154, 170,
-        153, 138, 138, 122, 121, 122, 121, 167, 151, 183, 140, 151, 183, 140,
-        // coeff_abs_level_greater1_flag
-        154, 196, 167, 167, 154, 152, 167, 182, 182, 134, 149, 136, 153, 121,
-        136, 122, 169, 208, 166, 167, 154, 152, 167, 182,
-        // coeff_abs_level_greater2_flag
-        107, 167, 91, 107, 107, 167,
-    },
+    { // sao_merge_flag
+      153,
+      // sao_type_idx
+      200,
+      // split_coding_unit_flag
+      139, 141, 157,
+      // cu_transquant_bypass_flag
+      154,
+      // skip_flag
+      CNU, CNU, CNU,
+      // cu_qp_delta
+      154, 154, 154,
+      // pred_mode
+      CNU,
+      // part_mode
+      184, CNU, CNU, CNU,
+      // prev_intra_luma_pred_mode
+      184,
+      // intra_chroma_pred_mode
+      63, 139,
+      // merge_flag
+      CNU,
+      // merge_idx
+      CNU,
+      // inter_pred_idc
+      CNU, CNU, CNU, CNU, CNU,
+      // ref_idx_l0
+      CNU, CNU,
+      // ref_idx_l1
+      CNU, CNU,
+      // abs_mvd_greater1_flag
+      CNU, CNU,
+      // abs_mvd_greater1_flag
+      CNU, CNU,
+      // mvp_lx_flag
+      CNU,
+      // no_residual_data_flag
+      CNU,
+      // split_transform_flag
+      153, 138, 138,
+      // cbf_luma
+      111, 141,
+      // cbf_cb, cbf_cr
+      94, 138, 182, 154,
+      // transform_skip_flag
+      139, 139,
+      // last_significant_coeff_x_prefix
+      110, 110, 124, 125, 140, 153, 125, 127, 140, 109, 111, 143, 127, 111,
+       79, 108, 123,  63,
+      // last_significant_coeff_y_prefix
+      110, 110, 124, 125, 140, 153, 125, 127, 140, 109, 111, 143, 127, 111,
+       79, 108, 123,  63,
+      // significant_coeff_group_flag
+      91, 171, 134, 141,
+      // significant_coeff_flag
+      111, 111, 125, 110, 110,  94, 124, 108, 124, 107, 125, 141, 179, 153,
+      125, 107, 125, 141, 179, 153, 125, 107, 125, 141, 179, 153, 125, 140,
+      139, 182, 182, 152, 136, 152, 136, 153, 136, 139, 111, 136, 139, 111,
+      // coeff_abs_level_greater1_flag
+      140,  92, 137, 138, 140, 152, 138, 139, 153,  74, 149,  92, 139, 107,
+      122, 152, 140, 179, 166, 182, 140, 227, 122, 197,
+      // coeff_abs_level_greater2_flag
+      138, 153, 136, 167, 152, 152, },
+    { // sao_merge_flag
+      153,
+      // sao_type_idx
+      185,
+      // split_coding_unit_flag
+      107, 139, 126,
+      // cu_transquant_bypass_flag
+      154,
+      // skip_flag
+      197, 185, 201,
+      // cu_qp_delta
+      154, 154, 154,
+      // pred_mode
+      149,
+      // part_mode
+      154, 139, 154, 154,
+      // prev_intra_luma_pred_mode
+      154,
+      // intra_chroma_pred_mode
+      152, 139,
+      // merge_flag
+      110,
+      // merge_idx
+      122,
+      // inter_pred_idc
+      95, 79, 63, 31, 31,
+      // ref_idx_l0
+      153, 153,
+      // ref_idx_l1
+      153, 153,
+      // abs_mvd_greater1_flag
+      140, 198,
+      // abs_mvd_greater1_flag
+      140, 198,
+      // mvp_lx_flag
+      168,
+      // no_residual_data_flag
+      79,
+      // split_transform_flag
+      124, 138, 94,
+      // cbf_luma
+      153, 111,
+      // cbf_cb, cbf_cr
+      149, 107, 167, 154,
+      // transform_skip_flag
+      139, 139,
+      // last_significant_coeff_x_prefix
+      125, 110,  94, 110,  95,  79, 125, 111, 110,  78, 110, 111, 111,  95,
+       94, 108, 123, 108,
+      // last_significant_coeff_y_prefix
+      125, 110,  94, 110,  95,  79, 125, 111, 110,  78, 110, 111, 111,  95,
+       94, 108, 123, 108,
+      // significant_coeff_group_flag
+      121, 140, 61, 154,
+      // significant_coeff_flag
+      155, 154, 139, 153, 139, 123, 123,  63, 153, 166, 183, 140, 136, 153,
+      154, 166, 183, 140, 136, 153, 154, 166, 183, 140, 136, 153, 154, 170,
+      153, 123, 123, 107, 121, 107, 121, 167, 151, 183, 140, 151, 183, 140,
+      // coeff_abs_level_greater1_flag
+      154, 196, 196, 167, 154, 152, 167, 182, 182, 134, 149, 136, 153, 121,
+      136, 137, 169, 194, 166, 167, 154, 167, 137, 182,
+      // coeff_abs_level_greater2_flag
+      107, 167, 91, 122, 107, 167, },
+    { // sao_merge_flag
+      153,
+      // sao_type_idx
+      160,
+      // split_coding_unit_flag
+      107, 139, 126,
+      // cu_transquant_bypass_flag
+      154,
+      // skip_flag
+      197, 185, 201,
+      // cu_qp_delta
+      154, 154, 154,
+      // pred_mode
+      134,
+      // part_mode
+      154, 139, 154, 154,
+      // prev_intra_luma_pred_mode
+      183,
+      // intra_chroma_pred_mode
+      152, 139,
+      // merge_flag
+      154,
+      // merge_idx
+      137,
+      // inter_pred_idc
+      95, 79, 63, 31, 31,
+      // ref_idx_l0
+      153, 153,
+      // ref_idx_l1
+      153, 153,
+      // abs_mvd_greater1_flag
+      169, 198,
+      // abs_mvd_greater1_flag
+      169, 198,
+      // mvp_lx_flag
+      168,
+      // no_residual_data_flag
+      79,
+      // split_transform_flag
+      224, 167, 122,
+      // cbf_luma
+      153, 111,
+      // cbf_cb, cbf_cr
+      149, 92, 167, 154,
+      // transform_skip_flag
+      139, 139,
+      // last_significant_coeff_x_prefix
+      125, 110, 124, 110,  95,  94, 125, 111, 111,  79, 125, 126, 111, 111,
+       79, 108, 123,  93,
+      // last_significant_coeff_y_prefix
+      125, 110, 124, 110,  95,  94, 125, 111, 111,  79, 125, 126, 111, 111,
+       79, 108, 123,  93,
+      // significant_coeff_group_flag
+      121, 140, 61, 154,
+      // significant_coeff_flag
+      170, 154, 139, 153, 139, 123, 123,  63, 124, 166, 183, 140, 136, 153,
+      154, 166, 183, 140, 136, 153, 154, 166, 183, 140, 136, 153, 154, 170,
+      153, 138, 138, 122, 121, 122, 121, 167, 151, 183, 140, 151, 183, 140,
+      // coeff_abs_level_greater1_flag
+      154, 196, 167, 167, 154, 152, 167, 182, 182, 134, 149, 136, 153, 121,
+      136, 122, 169, 208, 166, 167, 154, 152, 167, 182,
+      // coeff_abs_level_greater2_flag
+      107, 167, 91, 107, 107, 167, },
 };
 
 static const uint8_t scan_1x1[1] = {
@@ -504,9 +498,9 @@
 void ff_hevc_save_states(HEVCContext *s, int ctb_addr_ts)
 {
     if (s->pps->entropy_coding_sync_enabled_flag &&
-        ((ctb_addr_ts % s->sps->ctb_width) == 2 ||
+        (ctb_addr_ts % s->sps->ctb_width == 2 ||
          (s->sps->ctb_width == 2 &&
-          (ctb_addr_ts % s->sps->ctb_width) == 0))) {
+          ctb_addr_ts % s->sps->ctb_width == 0))) {
         memcpy(s->cabac_state, s->HEVClc->cabac_state, HEVC_CONTEXTS);
     }
 }
@@ -548,7 +542,7 @@
         pre ^= pre >> 31;
         if (pre > 124)
             pre = 124 + (pre & 1);
-        s->HEVClc->cabac_state[i] =  pre;
+        s->HEVClc->cabac_state[i] = pre;
     }
 }
 
@@ -556,13 +550,14 @@
 {
     if (ctb_addr_ts == s->pps->ctb_addr_rs_to_ts[s->sh.slice_ctb_addr_rs]) {
         cabac_init_decoder(s);
-        if ((s->sh.dependent_slice_segment_flag == 0) ||
+        if (s->sh.dependent_slice_segment_flag == 0 ||
             (s->pps->tiles_enabled_flag &&
-             (s->pps->tile_id[ctb_addr_ts] != s->pps->tile_id[ctb_addr_ts - 1])))
+             s->pps->tile_id[ctb_addr_ts] != s->pps->tile_id[ctb_addr_ts - 1]))
             cabac_init_state(s);
 
-        if (!s->sh.first_slice_in_pic_flag && s->pps->entropy_coding_sync_enabled_flag) {
-            if ((ctb_addr_ts % s->sps->ctb_width) == 0) {
+        if (!s->sh.first_slice_in_pic_flag &&
+            s->pps->entropy_coding_sync_enabled_flag) {
+            if (ctb_addr_ts % s->sps->ctb_width == 0) {
                 if (s->sps->ctb_width == 1)
                     cabac_init_state(s);
                 else if (s->sh.dependent_slice_segment_flag == 1)
@@ -571,7 +566,7 @@
         }
     } else {
         if (s->pps->tiles_enabled_flag &&
-            (s->pps->tile_id[ctb_addr_ts] != s->pps->tile_id[ctb_addr_ts - 1])) {
+            s->pps->tile_id[ctb_addr_ts] != s->pps->tile_id[ctb_addr_ts - 1]) {
             if (s->threads_number == 1)
                 cabac_reinit(s->HEVClc);
             else
@@ -579,7 +574,7 @@
             cabac_init_state(s);
         }
         if (s->pps->entropy_coding_sync_enabled_flag) {
-            if ((ctb_addr_ts % s->sps->ctb_width) == 0) {
+            if (ctb_addr_ts % s->sps->ctb_width == 0) {
                 get_cabac_terminate(&s->HEVClc->cc);
                 if (s->threads_number == 1)
                     cabac_reinit(s->HEVClc);
@@ -639,8 +634,8 @@
 
 int ff_hevc_sao_eo_class_decode(HEVCContext *s)
 {
-    int ret = (get_cabac_bypass(&s->HEVClc->cc) << 1);
-    ret    |=  get_cabac_bypass(&s->HEVClc->cc);
+    int ret = get_cabac_bypass(&s->HEVClc->cc) << 1;
+    ret    |= get_cabac_bypass(&s->HEVClc->cc);
     return ret;
 }
 
@@ -662,9 +657,9 @@
     int y0b = y0 & ((1 << s->sps->log2_ctb_size) - 1);
 
     if (s->HEVClc->ctb_left_flag || x0b)
-        inc = !!SAMPLE_CTB(s->skip_flag, x_cb-1, y_cb);
+        inc = !!SAMPLE_CTB(s->skip_flag, x_cb - 1, y_cb);
     if (s->HEVClc->ctb_up_flag || y0b)
-        inc += !!SAMPLE_CTB(s->skip_flag, x_cb, y_cb-1);
+        inc += !!SAMPLE_CTB(s->skip_flag, x_cb, y_cb - 1);
 
     return GET_CABAC(elem_offset[SKIP_FLAG] + inc);
 }
@@ -707,18 +702,19 @@
 int ff_hevc_split_coding_unit_flag_decode(HEVCContext *s, int ct_depth, int x0, int y0)
 {
     int inc = 0, depth_left = 0, depth_top = 0;
-    int x0b = x0 & ((1 << s->sps->log2_ctb_size) - 1);
-    int y0b = y0 & ((1 << s->sps->log2_ctb_size) - 1);
+    int x0b  = x0 & ((1 << s->sps->log2_ctb_size) - 1);
+    int y0b  = y0 & ((1 << s->sps->log2_ctb_size) - 1);
     int x_cb = x0 >> s->sps->log2_min_cb_size;
     int y_cb = y0 >> s->sps->log2_min_cb_size;
 
     if (s->HEVClc->ctb_left_flag || x0b)
-        depth_left = s->tab_ct_depth[(y_cb)*s->sps->min_cb_width + x_cb-1];
+        depth_left = s->tab_ct_depth[(y_cb) * s->sps->min_cb_width + x_cb - 1];
     if (s->HEVClc->ctb_up_flag || y0b)
-        depth_top = s->tab_ct_depth[(y_cb-1)*s->sps->min_cb_width + x_cb];
+        depth_top = s->tab_ct_depth[(y_cb - 1) * s->sps->min_cb_width + x_cb];
 
     inc += (depth_left > ct_depth);
-    inc += (depth_top > ct_depth);
+    inc += (depth_top  > ct_depth);
+
     return GET_CABAC(elem_offset[SPLIT_CODING_UNIT_FLAG] + inc);
 }
 
@@ -756,7 +752,7 @@
         return PART_Nx2N;
     if (get_cabac_bypass(&s->HEVClc->cc)) // 0001
         return PART_nRx2N;
-    return  PART_nLx2N; // 0000
+    return PART_nLx2N;  // 0000
 }
 
 int ff_hevc_pcm_flag_decode(HEVCContext *s)
@@ -793,8 +789,8 @@
     if (!GET_CABAC(elem_offset[INTRA_CHROMA_PRED_MODE]))
         return 4;
 
-    ret  = (get_cabac_bypass(&s->HEVClc->cc) << 1);
-    ret |=  get_cabac_bypass(&s->HEVClc->cc);
+    ret  = get_cabac_bypass(&s->HEVClc->cc) << 1;
+    ret |= get_cabac_bypass(&s->HEVClc->cc);
     return ret;
 }
 
@@ -994,11 +990,10 @@
         }
     }
 
-    if (c_idx == 0) {
+    if (c_idx == 0)
         inc = sig_ctx;
-    } else {
+    else
         inc = sig_ctx + 27;
-    }
 
     return GET_CABAC(elem_offset[SIGNIFICANT_COEFF_FLAG] + inc);
 }
@@ -1137,7 +1132,7 @@
         dc_scale = 16;
 
         if (s->sps->scaling_list_enable_flag) {
-            const ScalingList *sl = s->pps->pps_scaling_list_data_present_flag ?
+            const ScalingList *sl = s->pps->scaling_list_data_present_flag ?
             &s->pps->scaling_list : &s->sps->scaling_list;
             int matrix_id = lc->cu.pred_mode != MODE_INTRA;

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/hevc_filter.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/hevc_filter.c Changed

@@ -1,5 +1,5 @@
 /*
- * HEVC video Decoder
+ * HEVC video decoder
  *
  * Copyright (C) 2012 - 2013 Guillaume Martres
  * Copyright (C) 2013 Seppo Tomperi
@@ -28,6 +28,7 @@
 #include "cabac_functions.h"
 #include "golomb.h"
 #include "hevc.h"
+
 #include "bit_depth_template.c"
 
 #define LUMA 0
@@ -35,23 +36,23 @@
 #define CR 2
 
 static const uint8_t tctable[54] = {
-     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, // QP  0...18
-     1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, // QP 19...37
-     5, 5, 6, 6, 7, 8, 9,10,11,13,14,16,18,20,22,24           // QP 38...53
+    0, 0, 0, 0, 0, 0, 0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 0, 0, 1, // QP  0...18
+    1, 1, 1, 1, 1, 1, 1,  1,  2,  2,  2,  2,  3,  3,  3,  3, 4, 4, 4, // QP 19...37
+    5, 5, 6, 6, 7, 8, 9, 10, 11, 13, 14, 16, 18, 20, 22, 24           // QP 38...53
 };
 
 static const uint8_t betatable[52] = {
-     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 7, 8, // QP 0...18
-     9,10,11,12,13,14,15,16,17,18,20,22,24,26,28,30,32,34,36, // QP 19...37
-    38,40,42,44,46,48,50,52,54,56,58,60,62,64                 // QP 38...51
+     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  6,  7,  8, // QP 0...18
+     9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 20, 22, 24, 26, 28, 30, 32, 34, 36, // QP 19...37
+    38, 40, 42, 44, 46, 48, 50, 52, 54, 56, 58, 60, 62, 64                      // QP 38...51
 };
 
 static int chroma_tc(HEVCContext *s, int qp_y, int c_idx, int tc_offset)
 {
-    static const int qp_c[] = { 29, 30, 31, 32, 33, 33, 34, 34, 35, 35, 36, 36, 37, 37 };
-    int qp_i, offset;
-    int qp;
-    int idxt;
+    static const int qp_c[] = {
+        29, 30, 31, 32, 33, 33, 34, 34, 35, 35, 36, 36, 37, 37
+    };
+    int qp, qp_i, offset, idxt;
 
     // slice qp offset is not used for deblocking
     if (c_idx == 1)
@@ -71,67 +72,30 @@
     return tctable[idxt];
 }
 
-static int get_qPy_pred(HEVCContext *s, int xC, int yC, int xBase, int yBase, int log2_cb_size)
+static int get_qPy_pred(HEVCContext *s, int xC, int yC,
+                        int xBase, int yBase, int log2_cb_size)
 {
     HEVCLocalContext *lc     = s->HEVClc;
     int ctb_size_mask        = (1 << s->sps->log2_ctb_size) - 1;
-    int MinCuQpDeltaSizeMask = (1 << (s->sps->log2_ctb_size - s->pps->diff_cu_qp_delta_depth)) - 1;
-    int xQgBase              = xBase - ( xBase & MinCuQpDeltaSizeMask );
-    int yQgBase              = yBase - ( yBase & MinCuQpDeltaSizeMask );
+    int MinCuQpDeltaSizeMask = (1 << (s->sps->log2_ctb_size -
+                                      s->pps->diff_cu_qp_delta_depth)) - 1;
+    int xQgBase              = xBase - (xBase & MinCuQpDeltaSizeMask);
+    int yQgBase              = yBase - (yBase & MinCuQpDeltaSizeMask);
     int min_cb_width         = s->sps->min_cb_width;
-    int min_cb_height        = s->sps->min_cb_height;
     int x_cb                 = xQgBase >> s->sps->log2_min_cb_size;
     int y_cb                 = yQgBase >> s->sps->log2_min_cb_size;
-    int availableA           = (xBase & ctb_size_mask) && (xQgBase & ctb_size_mask);
-    int availableB           = (yBase & ctb_size_mask) && (yQgBase & ctb_size_mask);
-    int qPy_pred;
-    int qPy_a;
-    int qPy_b;
+    int availableA           = (xBase   & ctb_size_mask) &&
+                               (xQgBase & ctb_size_mask);
+    int availableB           = (yBase   & ctb_size_mask) &&
+                               (yQgBase & ctb_size_mask);
+    int qPy_pred, qPy_a, qPy_b;
 
     // qPy_pred
-    if (lc->first_qp_group) {
+    if (lc->first_qp_group || (!xQgBase && !yQgBase)) {
         lc->first_qp_group = !lc->tu.is_cu_qp_delta_coded;
         qPy_pred = s->sh.slice_qp;
     } else {
-        qPy_pred = lc->qp_y;
-        if (log2_cb_size < s->sps->log2_ctb_size - s->pps->diff_cu_qp_delta_depth) {
-            static const int offsetX[8][8] = {
-                    {-1, 1, 3, 1, 7, 1, 3, 1},
-                    { 0, 0, 0, 0, 0, 0, 0, 0},
-                    { 1, 3, 1, 3, 1, 3, 1, 3},
-                    { 2, 2, 2, 2, 2, 2, 2, 2},
-                    { 3, 5, 7, 5, 3, 5, 7, 5},
-                    { 4, 4, 4, 4, 4, 4, 4, 4},
-                    { 5, 7, 5, 7, 5, 7, 5, 7},
-                    { 6, 6, 6, 6, 6, 6, 6, 6}
-            };
-            static const int offsetY[8][8] = {
-                    { 7, 0, 1, 2, 3, 4, 5, 6},
-                    { 0, 1, 2, 3, 4, 5, 6, 7},
-                    { 1, 0, 3, 2, 5, 4, 7, 6},
-                    { 0, 1, 2, 3, 4, 5, 6, 7},
-                    { 3, 0, 1, 2, 7, 4, 5, 6},
-                    { 0, 1, 2, 3, 4, 5, 6, 7},
-                    { 1, 0, 3, 2, 5, 4, 7, 6},
-                    { 0, 1, 2, 3, 4, 5, 6, 7}
-            };
-            int xC0b = (xC - (xC & ctb_size_mask)) >> s->sps->log2_min_cb_size;
-            int yC0b = (yC - (yC & ctb_size_mask)) >> s->sps->log2_min_cb_size;
-            int idxX = (xQgBase & ctb_size_mask)   >> s->sps->log2_min_cb_size;
-            int idxY = (yQgBase & ctb_size_mask)   >> s->sps->log2_min_cb_size;
-            int idx_mask = ctb_size_mask >> s->sps->log2_min_cb_size;
-            int x, y;
-
-            x = FFMIN(xC0b +  offsetX[idxX][idxY],             min_cb_width  - 1);
-            y = FFMIN(yC0b + (offsetY[idxX][idxY] & idx_mask), min_cb_height - 1);
-
-            if (xC0b == (lc->start_of_tiles_x >> s->sps->log2_min_cb_size) &&
-                offsetX[idxX][idxY] == -1) {
-                x = (lc->end_of_tiles_x >> s->sps->log2_min_cb_size) - 1;
-                y = yC0b - 1;
-            }
-            qPy_pred = s->qp_y_tab[y * min_cb_width + x];
-        }
+        qPy_pred = lc->qPy_pred;
     }
 
     // qPy_a
@@ -146,16 +110,21 @@
     else
         qPy_b = s->qp_y_tab[x_cb + (y_cb - 1) * min_cb_width];
 
+    av_assert2(qPy_a >= -s->sps->qp_bd_offset && qPy_a < 52);
+    av_assert2(qPy_b >= -s->sps->qp_bd_offset && qPy_b < 52);
+
     return (qPy_a + qPy_b + 1) >> 1;
 }
 
-void ff_hevc_set_qPy(HEVCContext *s, int xC, int yC, int xBase, int yBase, int log2_cb_size)
+void ff_hevc_set_qPy(HEVCContext *s, int xC, int yC,
+                     int xBase, int yBase, int log2_cb_size)
 {
     int qp_y = get_qPy_pred(s, xC, yC, xBase, yBase, log2_cb_size);
 
     if (s->HEVClc->tu.cu_qp_delta != 0) {
         int off = s->sps->qp_bd_offset;
-        s->HEVClc->qp_y = ((qp_y + s->HEVClc->tu.cu_qp_delta + 52 + 2 * off) % (52 + off)) - off;
+        s->HEVClc->qp_y = FFUMOD(qp_y + s->HEVClc->tu.cu_qp_delta + 52 + 2 * off,
+                                 52 + off) - off;
     } else
         s->HEVClc->qp_y = qp_y;
 }
@@ -168,11 +137,12 @@
     return s->qp_y_tab[x + y * s->sps->min_cb_width];
 }
 
-static void copy_CTB(uint8_t *dst, uint8_t *src, int width, int height, int stride)
+static void copy_CTB(uint8_t *dst, uint8_t *src,
+                     int width, int height, int stride)
 {
     int i;
 
-    for(i=0; i< height; i++){
+    for (i = 0; i < height; i++) {
         memcpy(dst, src, width);
         dst += stride;
         src += stride;
@@ -187,29 +157,30 @@
     //  TODO: skip CBs when (cu_transquant_bypass_flag || (pcm_loop_filter_disable_flag && pcm_flag))
     int c_idx = 0;
     int class = 1, class_index;
-    int  edges[4]; // 0 left 1 top 2 right 3 bottom
+    int edges[4];  // 0 left 1 top 2 right 3 bottom
     SAOParams *sao[4];
     int classes[4];
     int x_shift = 0, y_shift = 0;
-    int x_ctb = x>>s->sps->log2_ctb_size;
-    int y_ctb = y>>s->sps->log2_ctb_size;
+    int x_ctb = x >> s->sps->log2_ctb_size;
+    int y_ctb = y >> s->sps->log2_ctb_size;
     int ctb_addr_rs = y_ctb * s->sps->ctb_width + x_ctb;
     int ctb_addr_ts = s->pps->ctb_addr_rs_to_ts[ctb_addr_rs];
 
     // flags indicating unfilterable edges
-    uint8_t vert_edge[] = {0,0,0,0};
-    uint8_t horiz_edge[] = {0,0,0,0};
-    uint8_t diag_edge[] = {0,0,0,0};
+    uint8_t vert_edge[]  = { 0, 0, 0, 0 };
+    uint8_t horiz_edge[] = { 0, 0, 0, 0 };
+    uint8_t diag_edge[]  = { 0, 0, 0, 0 };
     uint8_t lfase[3]; // current, above, left
-    uint8_t no_tile_filter = s->pps->tiles_enabled_flag && !s->pps->loop_filter_across_tiles_enabled_flag;
+    uint8_t no_tile_filter = s->pps->tiles_enabled_flag &&
+                             !s->pps->loop_filter_across_tiles_enabled_flag;
     uint8_t left_tile_edge = 0;
     uint8_t up_tile_edge = 0;
 
     sao[0]     = &CTB(s->sao, x_ctb, y_ctb);
     edges[0]   = x_ctb == 0;
     edges[1]   = y_ctb == 0;
-    edges[2]   = x_ctb == (s->sps->ctb_width - 1);
-    edges[3]   = y_ctb == (s->sps->ctb_height - 1);
+    edges[2]   = x_ctb == s->sps->ctb_width  - 1;
+    edges[3]   = y_ctb == s->sps->ctb_height - 1;
     lfase[0]   = CTB(s->filter_slice_edges, x_ctb, y_ctb);
     classes[0] = 0;
 
@@ -249,10 +220,12 @@
             diag_edge[3] = diag_edge[0];
 
             // Does left CTB comes after above CTB?
-            if(CTB(s->tab_slice_address, x_ctb - 1, y_ctb) > CTB(s->tab_slice_address, x_ctb, y_ctb - 1)) {
+            if (CTB(s->tab_slice_address, x_ctb - 1, y_ctb) >
+                CTB(s->tab_slice_address, x_ctb, y_ctb - 1)) {
                 diag_edge[2] = !lfase[2] || left_tile_edge || up_tile_edge;
                 diag_edge[1] = diag_edge[2];
-            } else if(CTB(s->tab_slice_address, x_ctb - 1, y_ctb) < CTB(s->tab_slice_address, x_ctb, y_ctb - 1)) {
+            } else if (CTB(s->tab_slice_address, x_ctb - 1, y_ctb) <
+                       CTB(s->tab_slice_address, x_ctb, y_ctb - 1)) {
                 diag_edge[1] = !lfase[1] || left_tile_edge || up_tile_edge;
                 diag_edge[2] = diag_edge[1];
             } else {
@@ -286,10 +259,21 @@
 
             switch (sao[class_index]->type_idx[c_idx]) {
             case SAO_BAND:
-                s->hevcdsp.sao_band_filter[classes[class_index]](dst, src, stride, sao[class_index], edges, width, height, c_idx);
-                    break;
+                s->hevcdsp.sao_band_filter[classes[class_index]](dst, src,
+                                                                 stride,
+                                                                 sao[class_index],
+                                                                 edges, width,
+                                                                 height, c_idx);
+                break;
             case SAO_EDGE:
-                s->hevcdsp.sao_edge_filter[classes[class_index]](dst, src, stride, sao[class_index],  edges, width, height, c_idx, vert_edge[classes[class_index]], horiz_edge[classes[class_index]], diag_edge[classes[class_index]]);
+                s->hevcdsp.sao_edge_filter[classes[class_index]](dst, src,
+                                                                 stride,
+                                                                 sao[class_index],
+                                                                 edges, width,
+                                                                 height, c_idx,
+                                                                 vert_edge[classes[class_index]],
+                                                                 horiz_edge[classes[class_index]],
+                                                                 diag_edge[classes[class_index]]);
                 break;
             }
         }
@@ -299,52 +283,59 @@
 static int get_pcm(HEVCContext *s, int x, int y)
 {
     int log2_min_pu_size = s->sps->log2_min_pu_size;
-    int x_pu             = x >> log2_min_pu_size;
-    int y_pu             = y >> log2_min_pu_size;
+    int x_pu, y_pu;
+
+    if (x < 0 || y < 0)
+        return 2;
 
-    if (x < 0 || x_pu >= s->sps->min_pu_width ||
-        y < 0 || y_pu >= s->sps->min_pu_height)
+    x_pu = x >> log2_min_pu_size;
+    y_pu = y >> log2_min_pu_size;
+
+    if (x_pu >= s->sps->min_pu_width || y_pu >= s->sps->min_pu_height)
         return 2;
     return s->is_pcm[y_pu * s->sps->min_pu_width + x_pu];
 }
 
-#define TC_CALC(qp, bs) tctable[av_clip((qp) + DEFAULT_INTRA_TC_OFFSET * ((bs) - 1) + ((tc_offset >> 1) << 1), 0, MAX_QP + DEFAULT_INTRA_TC_OFFSET)]
+#define TC_CALC(qp, bs)                                                 \
+    tctable[av_clip((qp) + DEFAULT_INTRA_TC_OFFSET * ((bs) - 1) +       \
+                    (tc_offset >> 1 << 1),                              \
+                    0, MAX_QP + DEFAULT_INTRA_TC_OFFSET)]
 
 static void deblocking_filter_CTB(HEVCContext *s, int x0, int y0)
 {
     uint8_t *src;
     int x, y;
     int chroma;
-    int c_tc[2];
-    int beta[2];
-    int tc[2];
-    uint8_t no_p[2] = {0};
-    uint8_t no_q[2] = {0};
+    int c_tc[2], beta[2], tc[2];
+    uint8_t no_p[2] = { 0 };
+    uint8_t no_q[2] = { 0 };
 
-    int log2_ctb_size =  s->sps->log2_ctb_size;
+    int log2_ctb_size = s->sps->log2_ctb_size;
     int x_end, y_end;
-    int ctb_size    = 1<<log2_ctb_size;
-    int ctb         = (x0 >> log2_ctb_size) + (y0 >> log2_ctb_size) * s->sps->ctb_width;
+    int ctb_size        = 1 << log2_ctb_size;
+    int ctb             = (x0 >> log2_ctb_size) +
+                          (y0 >> log2_ctb_size) * s->sps->ctb_width;
     int cur_tc_offset   = s->deblock[ctb].tc_offset;
     int cur_beta_offset = s->deblock[ctb].beta_offset;
     int left_tc_offset, left_beta_offset;
     int tc_offset, beta_offset;
-    int pcmf        = (s->sps->pcm_enabled_flag && s->sps->pcm.loop_filter_disable_flag) ||
-                      s->pps->transquant_bypass_enable_flag;
+    int pcmf = (s->sps->pcm_enabled_flag &&
+                s->sps->pcm.loop_filter_disable_flag) ||
+               s->pps->transquant_bypass_enable_flag;
 
     if (x0) {
-        left_tc_offset   = s->deblock[ctb-1].tc_offset;
-        left_beta_offset = s->deblock[ctb-1].beta_offset;
+        left_tc_offset   = s->deblock[ctb - 1].tc_offset;
+        left_beta_offset = s->deblock[ctb - 1].beta_offset;
     }
 
-    x_end = x0+ctb_size;
+    x_end = x0 + ctb_size;
     if (x_end > s->sps->width)
         x_end = s->sps->width;
-    y_end = y0+ctb_size;
+    y_end = y0 + ctb_size;
     if (y_end > s->sps->height)
         y_end = s->sps->height;
 
-    tc_offset = cur_tc_offset;
+    tc_offset   = cur_tc_offset;
     beta_offset = cur_beta_offset;
 
     // vertical filtering luma
@@ -353,22 +344,26 @@
             const int bs0 = s->vertical_bs[(x >> 3) + (y       >> 2) * s->bs_width];
             const int bs1 = s->vertical_bs[(x >> 3) + ((y + 4) >> 2) * s->bs_width];
             if (bs0 || bs1) {
-                const int qp0 = (get_qPy(s, x - 1, y) + get_qPy(s, x, y) + 1) >> 1;
+                const int qp0 = (get_qPy(s, x - 1, y)     + get_qPy(s, x, y)     + 1) >> 1;
                 const int qp1 = (get_qPy(s, x - 1, y + 4) + get_qPy(s, x, y + 4) + 1) >> 1;
 
-                beta[0] = betatable[av_clip(qp0 + ((beta_offset >> 1) << 1), 0, MAX_QP)];
-                beta[1] = betatable[av_clip(qp1 + ((beta_offset >> 1) << 1), 0, MAX_QP)];
-                tc[0] = bs0 ? TC_CALC(qp0, bs0) : 0;
-                tc[1] = bs1 ? TC_CALC(qp1, bs1) : 0;
-                src = &s->frame->data[LUMA][y * s->frame->linesize[LUMA] + (x << s->sps->pixel_shift)];
+                beta[0] = betatable[av_clip(qp0 + beta_offset, 0, MAX_QP)];
+                beta[1] = betatable[av_clip(qp1 + beta_offset, 0, MAX_QP)];
+                tc[0]   = bs0 ? TC_CALC(qp0, bs0) : 0;
+                tc[1]   = bs1 ? TC_CALC(qp1, bs1) : 0;
+                src     = &s->frame->data[LUMA][y * s->frame->linesize[LUMA] + (x << s->sps->pixel_shift)];
                 if (pcmf) {
                     no_p[0] = get_pcm(s, x - 1, y);
                     no_p[1] = get_pcm(s, x - 1, y + 4);
                     no_q[0] = get_pcm(s, x, y);
                     no_q[1] = get_pcm(s, x, y + 4);
-                    s->hevcdsp.hevc_v_loop_filter_luma_c(src, s->frame->linesize[LUMA], beta, tc, no_p, no_q);
+                    s->hevcdsp.hevc_v_loop_filter_luma_c(src,
+                                                         s->frame->linesize[LUMA],
+                                                         beta, tc, no_p, no_q);
                 } else
-                    s->hevcdsp.hevc_v_loop_filter_luma(src, s->frame->linesize[LUMA], beta, tc, no_p, no_q);
+                    s->hevcdsp.hevc_v_loop_filter_luma(src,
+                                                       s->frame->linesize[LUMA],
+                                                       beta, tc, no_p, no_q);
             }
         }
     }
@@ -376,24 +371,28 @@
     // vertical filtering chroma
     for (chroma = 1; chroma <= 2; chroma++) {
         for (y = y0; y < y_end; y += 16) {
-            for (x = x0 ? x0:16; x < x_end; x += 16) {
-                const int bs0 = s->vertical_bs[(x >> 3) + (y >> 2) * s->bs_width];
+            for (x = x0 ? x0 : 16; x < x_end; x += 16) {
+                const int bs0 = s->vertical_bs[(x >> 3) + (y       >> 2) * s->bs_width];
                 const int bs1 = s->vertical_bs[(x >> 3) + ((y + 8) >> 2) * s->bs_width];
                 if ((bs0 == 2) || (bs1 == 2)) {
-                    const int qp0 = (get_qPy(s, x - 1, y) + get_qPy(s, x, y) + 1) >> 1;
+                    const int qp0 = (get_qPy(s, x - 1, y)     + get_qPy(s, x, y)     + 1) >> 1;
                     const int qp1 = (get_qPy(s, x - 1, y + 8) + get_qPy(s, x, y + 8) + 1) >> 1;
 
                     c_tc[0] = (bs0 == 2) ? chroma_tc(s, qp0, chroma, tc_offset) : 0;
                     c_tc[1] = (bs1 == 2) ? chroma_tc(s, qp1, chroma, tc_offset) : 0;
-                    src = &s->frame->data[chroma][(y / 2) * s->frame->linesize[chroma] + ((x / 2) << s->sps->pixel_shift)];
+                    src     = &s->frame->data[chroma][y / 2 * s->frame->linesize[chroma] + ((x / 2) << s->sps->pixel_shift)];
                     if (pcmf) {
                         no_p[0] = get_pcm(s, x - 1, y);
                         no_p[1] = get_pcm(s, x - 1, y + 8);
                         no_q[0] = get_pcm(s, x, y);
                         no_q[1] = get_pcm(s, x, y + 8);
-                        s->hevcdsp.hevc_v_loop_filter_chroma_c(src, s->frame->linesize[chroma], c_tc, no_p, no_q);
+                        s->hevcdsp.hevc_v_loop_filter_chroma_c(src,
+                                                               s->frame->linesize[chroma],
+                                                               c_tc, no_p, no_q);
                     } else
-                        s->hevcdsp.hevc_v_loop_filter_chroma(src, s->frame->linesize[chroma], c_tc, no_p, no_q);
+                        s->hevcdsp.hevc_v_loop_filter_chroma(src,
+                                                             s->frame->linesize[chroma],
+                                                             c_tc, no_p, no_q);
                 }
             }
         }
@@ -410,22 +409,26 @@
                 const int qp0 = (get_qPy(s, x, y - 1)     + get_qPy(s, x, y)     + 1) >> 1;
                 const int qp1 = (get_qPy(s, x + 4, y - 1) + get_qPy(s, x + 4, y) + 1) >> 1;
 
-                tc_offset = x >= x0 ? cur_tc_offset : left_tc_offset;
+                tc_offset   = x >= x0 ? cur_tc_offset : left_tc_offset;
                 beta_offset = x >= x0 ? cur_beta_offset : left_beta_offset;
 
-                beta[0]  = betatable[av_clip(qp0 + ((beta_offset >> 1) << 1), 0, MAX_QP)];
-                beta[1]  = betatable[av_clip(qp1 + ((beta_offset >> 1) << 1), 0, MAX_QP)];
-                tc[0] = bs0 ? TC_CALC(qp0, bs0) : 0;
-                tc[1] = bs1 ? TC_CALC(qp1, bs1) : 0;
-                src = &s->frame->data[LUMA][y * s->frame->linesize[LUMA] + (x << s->sps->pixel_shift)];
+                beta[0] = betatable[av_clip(qp0 + beta_offset, 0, MAX_QP)];
+                beta[1] = betatable[av_clip(qp1 + beta_offset, 0, MAX_QP)];
+                tc[0]   = bs0 ? TC_CALC(qp0, bs0) : 0;
+                tc[1]   = bs1 ? TC_CALC(qp1, bs1) : 0;
+                src     = &s->frame->data[LUMA][y * s->frame->linesize[LUMA] + (x << s->sps->pixel_shift)];
                 if (pcmf) {
                     no_p[0] = get_pcm(s, x, y - 1);
                     no_p[1] = get_pcm(s, x + 4, y - 1);
                     no_q[0] = get_pcm(s, x, y);
                     no_q[1] = get_pcm(s, x + 4, y);
-                    s->hevcdsp.hevc_h_loop_filter_luma_c(src, s->frame->linesize[LUMA], beta, tc, no_p, no_q);
+                    s->hevcdsp.hevc_h_loop_filter_luma_c(src,
+                                                         s->frame->linesize[LUMA],
+                                                         beta, tc, no_p, no_q);
                 } else
-                    s->hevcdsp.hevc_h_loop_filter_luma(src, s->frame->linesize[LUMA], beta, tc, no_p, no_q);
+                    s->hevcdsp.hevc_h_loop_filter_luma(src,
+                                                       s->frame->linesize[LUMA],
+                                                       beta, tc, no_p, no_q);
             }
         }
     }
@@ -441,29 +444,33 @@
                     bs0 = 0;
                     bs1 = s->horizontal_bs[(x + 8 + y * s->bs_width) >> 2];
                 } else if (x >= x_end - 8) {
-                    bs0 = s->horizontal_bs[(x + y * s->bs_width) >> 2];
+                    bs0 = s->horizontal_bs[(x +     y * s->bs_width) >> 2];
                     bs1 = 0;
                 } else {
-                    bs0 = s->horizontal_bs[(x + y * s->bs_width) >> 2];
+                    bs0 = s->horizontal_bs[(x + y     * s->bs_width) >> 2];
                     bs1 = s->horizontal_bs[(x + 8 + y * s->bs_width) >> 2];
                 }
 
                 if ((bs0 == 2) || (bs1 == 2)) {
-                    const int qp0 = (bs0 == 2) ? ((get_qPy(s, x, y - 1)     + get_qPy(s, x, y)     + 1) >> 1) : 0;
-                    const int qp1 = (bs1 == 2) ? ((get_qPy(s, x + 8, y - 1) + get_qPy(s, x + 8, y) + 1) >> 1) : 0;
+                    const int qp0 = bs0 == 2 ? (get_qPy(s, x,     y - 1) + get_qPy(s, x,     y) + 1) >> 1 : 0;
+                    const int qp1 = bs1 == 2 ? (get_qPy(s, x + 8, y - 1) + get_qPy(s, x + 8, y) + 1) >> 1 : 0;
 
                     tc_offset = x >= x0 ? cur_tc_offset : left_tc_offset;
-                    c_tc[0] = (bs0 == 2) ? chroma_tc(s, qp0, chroma, tc_offset) : 0;
-                    c_tc[1] = (bs1 == 2) ? chroma_tc(s, qp1, chroma, cur_tc_offset) : 0;
-                    src = &s->frame->data[chroma][(y / 2) * s->frame->linesize[chroma] + ((x / 2) << s->sps->pixel_shift)];
+                    c_tc[0]   = bs0 == 2 ? chroma_tc(s, qp0, chroma, tc_offset)     : 0;
+                    c_tc[1]   = bs1 == 2 ? chroma_tc(s, qp1, chroma, cur_tc_offset) : 0;
+                    src       = &s->frame->data[chroma][y / 2 * s->frame->linesize[chroma] + ((x / 2) << s->sps->pixel_shift)];
                     if (pcmf) {
                         no_p[0] = get_pcm(s, x, y - 1);
                         no_p[1] = get_pcm(s, x + 8, y - 1);
                         no_q[0] = get_pcm(s, x, y);
                         no_q[1] = get_pcm(s, x + 8, y);
-                        s->hevcdsp.hevc_h_loop_filter_chroma_c(src, s->frame->linesize[chroma], c_tc, no_p, no_q);
+                        s->hevcdsp.hevc_h_loop_filter_chroma_c(src,
+                                                               s->frame->linesize[chroma],
+                                                               c_tc, no_p, no_q);
                     } else
-                        s->hevcdsp.hevc_h_loop_filter_chroma(src, s->frame->linesize[chroma], c_tc, no_p, no_q);
+                        s->hevcdsp.hevc_h_loop_filter_chroma(src,
+                                                             s->frame->linesize[chroma],
+                                                             c_tc, no_p, no_q);
                 }
             }
         }
@@ -472,7 +479,8 @@
 
 static int boundary_strength(HEVCContext *s, MvField *curr,
                              uint8_t curr_cbf_luma, MvField *neigh,
-                             uint8_t neigh_cbf_luma, RefPicList *neigh_refPicList,
+                             uint8_t neigh_cbf_luma,
+                             RefPicList *neigh_refPicList,
                              int tu_border)
 {
     int mvs = curr->pred_flag[0] + curr->pred_flag[1];
@@ -487,7 +495,7 @@
     if (mvs == neigh->pred_flag[0] + neigh->pred_flag[1]) {
         if (mvs == 2) {
             // same L0 and L1
-            if (s->ref->refPicList[0].list[curr->ref_idx[0]] == neigh_refPicList[0].list[neigh->ref_idx[0]]   &&
+            if (s->ref->refPicList[0].list[curr->ref_idx[0]] == neigh_refPicList[0].list[neigh->ref_idx[0]]  &&
                 s->ref->refPicList[0].list[curr->ref_idx[0]] == s->ref->refPicList[1].list[curr->ref_idx[1]] &&
                 neigh_refPicList[0].list[neigh->ref_idx[0]] == neigh_refPicList[1].list[neigh->ref_idx[1]]) {
                 if ((abs(neigh->mv[0].x - curr->mv[0].x) >= 4 || abs(neigh->mv[0].y - curr->mv[0].y) >= 4 ||
@@ -516,22 +524,21 @@
             }
         } else { // 1 MV
             Mv A, B;
-            int ref_A;
-            int ref_B;
+            int ref_A, ref_B;
 
             if (curr->pred_flag[0]) {
-                A = curr->mv[0];
+                A     = curr->mv[0];
                 ref_A = s->ref->refPicList[0].list[curr->ref_idx[0]];
             } else {
-                A = curr->mv[1];
+                A     = curr->mv[1];
                 ref_A = s->ref->refPicList[1].list[curr->ref_idx[1]];
             }
 
             if (neigh->pred_flag[0]) {
-                B = neigh->mv[0];
+                B     = neigh->mv[0];
                 ref_B = neigh_refPicList[0].list[neigh->ref_idx[0]];
             } else {
-                B = neigh->mv[1];
+                B     = neigh->mv[1];
                 ref_B = neigh_refPicList[1].list[neigh->ref_idx[1]];
             }
 
@@ -548,24 +555,25 @@
     return 1;
 }
 
-void ff_hevc_deblocking_boundary_strengths(HEVCContext *s, int x0, int y0, int log2_trafo_size,
-                                           int slice_or_tiles_up_boundary, int slice_or_tiles_left_boundary)
+void ff_hevc_deblocking_boundary_strengths(HEVCContext *s, int x0, int y0,
+                                           int log2_trafo_size,
+                                           int slice_or_tiles_up_boundary,
+                                           int slice_or_tiles_left_boundary)
 {
     MvField *tab_mvf     = s->ref->tab_mvf;
     int log2_min_pu_size = s->sps->log2_min_pu_size;
     int log2_min_tu_size = s->sps->log2_min_tb_size;
     int min_pu_width     = s->sps->min_pu_width;
     int min_tu_width     = s->sps->min_tb_width;
-    int is_intra         = tab_mvf[(y0 >> log2_min_pu_size) * min_pu_width + (x0 >> log2_min_pu_size)].is_intra;
-
-    int i, j;
-    int bs;
+    int is_intra = tab_mvf[(y0 >> log2_min_pu_size) * min_pu_width +
+                           (x0 >> log2_min_pu_size)].is_intra;
+    int i, j, bs;
 
     if (y0 > 0 && (y0 & 7) == 0) {
         int yp_pu = (y0 - 1) >> log2_min_pu_size;
-        int yq_pu = y0 >> log2_min_pu_size;
+        int yq_pu =  y0      >> log2_min_pu_size;
         int yp_tu = (y0 - 1) >> log2_min_tu_size;
-        int yq_tu = y0 >> log2_min_tu_size;
+        int yq_tu =  y0      >> log2_min_tu_size;
 
         for (i = 0; i < (1 << log2_trafo_size); i += 4) {
             int x_pu = (x0 + i) >> log2_min_pu_size;
@@ -574,12 +582,18 @@
             MvField *curr = &tab_mvf[yq_pu * min_pu_width + x_pu];
             uint8_t top_cbf_luma  = s->cbf_luma[yp_tu * min_tu_width + x_tu];
             uint8_t curr_cbf_luma = s->cbf_luma[yq_tu * min_tu_width + x_tu];
-            RefPicList* top_refPicList = ff_hevc_get_ref_list(s, s->ref, x0 + i, y0 - 1);
-
-            bs = boundary_strength(s, curr, curr_cbf_luma, top, top_cbf_luma, top_refPicList, 1);
-            if (!s->sh.slice_loop_filter_across_slices_enabled_flag && (slice_or_tiles_up_boundary & 1) && (y0 % (1 << s->sps->log2_ctb_size)) == 0)
+            RefPicList *top_refPicList = ff_hevc_get_ref_list(s, s->ref,
+                                                              x0 + i, y0 - 1);
+
+            bs = boundary_strength(s, curr, curr_cbf_luma,
+                                   top, top_cbf_luma, top_refPicList, 1);
+            if (!s->sh.slice_loop_filter_across_slices_enabled_flag &&
+                (slice_or_tiles_up_boundary & 1) &&
+                (y0 % (1 << s->sps->log2_ctb_size)) == 0)
                 bs = 0;
-            else if (!s->pps->loop_filter_across_tiles_enabled_flag && (slice_or_tiles_up_boundary & 2)  && (y0 % (1 << s->sps->log2_ctb_size)) == 0)
+            else if (!s->pps->loop_filter_across_tiles_enabled_flag &&
+                     (slice_or_tiles_up_boundary & 2) &&
+                     (y0 % (1 << s->sps->log2_ctb_size)) == 0)
                 bs = 0;
             if (y0 == 0 || s->sh.disable_deblocking_filter_flag == 1)
                 bs = 0;
@@ -596,17 +610,19 @@
             int yp_tu = (y0 + j - 1) >> log2_min_tu_size;
             int yq_tu = (y0 + j)     >> log2_min_tu_size;
 
-
-            for (i = 0; i < (1<<log2_trafo_size); i += 4) {
+            for (i = 0; i < (1 << log2_trafo_size); i += 4) {
                 int x_pu = (x0 + i) >> log2_min_pu_size;
                 int x_tu = (x0 + i) >> log2_min_tu_size;
                 MvField *top  = &tab_mvf[yp_pu * min_pu_width + x_pu];
                 MvField *curr = &tab_mvf[yq_pu * min_pu_width + x_pu];
                 uint8_t top_cbf_luma  = s->cbf_luma[yp_tu * min_tu_width + x_tu];
                 uint8_t curr_cbf_luma = s->cbf_luma[yq_tu * min_tu_width + x_tu];
-                RefPicList* top_refPicList = ff_hevc_get_ref_list(s, s->ref, x0 + i, y0 + j - 1);
+                RefPicList *top_refPicList = ff_hevc_get_ref_list(s, s->ref,
+                                                                  x0 + i,
+                                                                  y0 + j - 1);
 
-                bs = boundary_strength(s, curr, curr_cbf_luma, top, top_cbf_luma, top_refPicList, 0);
+                bs = boundary_strength(s, curr, curr_cbf_luma,
+                                       top, top_cbf_luma, top_refPicList, 0);
                 if (s->sh.disable_deblocking_filter_flag == 1)
                     bs = 0;
                 if (bs)
@@ -622,19 +638,25 @@
         int xq_tu =  x0      >> log2_min_tu_size;
 
         for (i = 0; i < (1 << log2_trafo_size); i += 4) {
-            int y_pu = (y0 + i) >> log2_min_pu_size;
-            int y_tu = (y0 + i) >> log2_min_tu_size;
+            int y_pu      = (y0 + i) >> log2_min_pu_size;
+            int y_tu      = (y0 + i) >> log2_min_tu_size;
             MvField *left = &tab_mvf[y_pu * min_pu_width + xp_pu];
             MvField *curr = &tab_mvf[y_pu * min_pu_width + xq_pu];
 
             uint8_t left_cbf_luma = s->cbf_luma[y_tu * min_tu_width + xp_tu];
             uint8_t curr_cbf_luma = s->cbf_luma[y_tu * min_tu_width + xq_tu];
-            RefPicList* left_refPicList = ff_hevc_get_ref_list(s, s->ref, x0 - 1, y0 + i);
-
-            bs = boundary_strength(s, curr, curr_cbf_luma, left, left_cbf_luma, left_refPicList, 1);
-            if (!s->sh.slice_loop_filter_across_slices_enabled_flag && (slice_or_tiles_left_boundary & 1) && (x0 % (1 << s->sps->log2_ctb_size)) == 0)
+            RefPicList *left_refPicList = ff_hevc_get_ref_list(s, s->ref,
+                                                               x0 - 1, y0 + i);
+
+            bs = boundary_strength(s, curr, curr_cbf_luma,
+                                   left, left_cbf_luma, left_refPicList, 1);
+            if (!s->sh.slice_loop_filter_across_slices_enabled_flag &&
+                (slice_or_tiles_left_boundary & 1) &&
+                (x0 % (1 << s->sps->log2_ctb_size)) == 0)
                 bs = 0;
-            else if (!s->pps->loop_filter_across_tiles_enabled_flag && (slice_or_tiles_left_boundary & 2) && (x0 % (1 << s->sps->log2_ctb_size)) == 0)
+            else if (!s->pps->loop_filter_across_tiles_enabled_flag &&
+                     (slice_or_tiles_left_boundary & 2) &&
+                     (x0 % (1 << s->sps->log2_ctb_size)) == 0)
                 bs = 0;
             if (x0 == 0 || s->sh.disable_deblocking_filter_flag == 1)
                 bs = 0;
@@ -651,16 +673,19 @@
 
             for (i = 8; i < (1 << log2_trafo_size); i += 8) {
                 int xp_pu = (x0 + i - 1) >> log2_min_pu_size;
-                int xq_pu = (x0 + i) >> log2_min_pu_size;
+                int xq_pu = (x0 + i)     >> log2_min_pu_size;
                 int xp_tu = (x0 + i - 1) >> log2_min_tu_size;
-                int xq_tu = (x0 + i) >> log2_min_tu_size;
+                int xq_tu = (x0 + i)     >> log2_min_tu_size;
                 MvField *left = &tab_mvf[y_pu * min_pu_width + xp_pu];
                 MvField *curr = &tab_mvf[y_pu * min_pu_width + xq_pu];
                 uint8_t left_cbf_luma = s->cbf_luma[y_tu * min_tu_width + xp_tu];
                 uint8_t curr_cbf_luma = s->cbf_luma[y_tu * min_tu_width + xq_tu];
-                RefPicList* left_refPicList = ff_hevc_get_ref_list(s, s->ref, x0 + i - 1, y0 + j);
+                RefPicList *left_refPicList = ff_hevc_get_ref_list(s, s->ref,
+                                                                   x0 + i - 1,
+                                                                   y0 + j);
 
-                bs = boundary_strength(s, curr, curr_cbf_luma, left, left_cbf_luma, left_refPicList, 0);
+                bs = boundary_strength(s, curr, curr_cbf_luma,
+                                       left, left_cbf_luma, left_refPicList, 0);
                 if (s->sh.disable_deblocking_filter_flag == 1)
                     bs = 0;
                 if (bs)
@@ -668,6 +693,7 @@
             }
         }
 }
+
 #undef LUMA
 #undef CB
 #undef CR

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/hevc_mvs.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/hevc_mvs.c Changed

@@ -1,5 +1,5 @@
 /*
- * HEVC video Decoder
+ * HEVC video decoder
  *
  * Copyright (C) 2012 - 2013 Guillaume Martres
  * Copyright (C) 2013 Anand Meher Kotra
@@ -38,7 +38,8 @@
     { 3, 2, },
 };
 
-void ff_hevc_set_neighbour_available(HEVCContext *s, int x0, int y0, int nPbW, int nPbH)
+void ff_hevc_set_neighbour_available(HEVCContext *s, int x0, int y0,
+                                     int nPbW, int nPbH)
 {
     HEVCLocalContext *lc = s->HEVClc;
     int x0b = x0 & ((1 << s->sps->log2_ctb_size) - 1);
@@ -65,13 +66,13 @@
 {
 #define MIN_TB_ADDR_ZS(x, y)                                            \
     s->pps->min_tb_addr_zs[(y) * s->sps->min_tb_width + (x)]
-    int Curr =  MIN_TB_ADDR_ZS(xCurr >> s->sps->log2_min_tb_size,
-                               yCurr >> s->sps->log2_min_tb_size);
+    int Curr = MIN_TB_ADDR_ZS(xCurr >> s->sps->log2_min_tb_size,
+                              yCurr >> s->sps->log2_min_tb_size);
     int N;
 
-    if ((xN < 0) || (yN < 0) ||
-        (xN >= s->sps->width) ||
-        (yN >= s->sps->height))
+    if (xN < 0 || yN < 0 ||
+        xN >= s->sps->width ||
+        yN >= s->sps->height)
         return 0;
 
     N = MIN_TB_ADDR_ZS(xN >> s->sps->log2_min_tb_size,
@@ -80,7 +81,6 @@
     return N <= Curr;
 }
 
-
 static int same_prediction_block(HEVCLocalContext *lc, int log2_cb_size,
                                  int x0, int y0, int nPbW, int nPbH,
                                  int xA1, int yA1, int partIdx)
@@ -169,7 +169,7 @@
     cur_poc_diff = poc    - refPicList[X].list[refIdxLx];
 
     if (!col_poc_diff)
-        col_poc_diff = 1; // error resilience
+        col_poc_diff = 1;  // error resilience
 
     if (cur_lt || col_poc_diff == cur_poc_diff) {
         mvLXCol->x = mvCol->x;
@@ -180,16 +180,16 @@
     return 1;
 }
 
-#define CHECK_MVSET(l) \
-    check_mvset(mvLXCol, temp_col.mv + l, \
-                colPic, s->poc, \
-                refPicList, X, refIdxLx, \
-                refPicList_col, L##l, temp_col.ref_idx[l])
+#define CHECK_MVSET(l)                                          \
+    check_mvset(mvLXCol, temp_col.mv + l,                       \
+                colPic, s->poc,                                 \
+                refPicList, X, refIdxLx,                        \
+                refPicList_col, L ## l, temp_col.ref_idx[l])
 
 // derive the motion vectors section 8.5.3.1.8
 static int derive_temporal_colocated_mvs(HEVCContext *s, MvField temp_col,
-                                         int refIdxLx, Mv* mvLXCol, int X,
-                                         int colPic, RefPicList* refPicList_col)
+                                         int refIdxLx, Mv *mvLXCol, int X,
+                                         int colPic, RefPicList *refPicList_col)
 {
     RefPicList *refPicList = s->ref->refPicList;
 
@@ -229,15 +229,15 @@
     return 0;
 }
 
-#define TAB_MVF(x, y) \
+#define TAB_MVF(x, y)                                                   \
     tab_mvf[(y) * min_pu_width + x]
 
-#define TAB_MVF_PU(v) \
-    TAB_MVF(x##v##_pu, y##v##_pu)
+#define TAB_MVF_PU(v)                                                   \
+    TAB_MVF(x ## v ## _pu, y ## v ## _pu)
 
-#define DERIVE_TEMPORAL_COLOCATED_MVS \
-    derive_temporal_colocated_mvs(s, temp_col, \
-                                  refIdxLx, mvLXCol, X, colPic, \
+#define DERIVE_TEMPORAL_COLOCATED_MVS                                   \
+    derive_temporal_colocated_mvs(s, temp_col,                          \
+                                  refIdxLx, mvLXCol, X, colPic,         \
                                   ff_hevc_get_ref_list(s, ref, x, y))
 
 /*
@@ -245,12 +245,11 @@
  */
 static int temporal_luma_motion_vector(HEVCContext *s, int x0, int y0,
                                        int nPbW, int nPbH, int refIdxLx,
-                                       Mv* mvLXCol, int X)
+                                       Mv *mvLXCol, int X)
 {
     MvField *tab_mvf;
     MvField temp_col;
-    int x, y;
-    int x_pu, y_pu;
+    int x, y, x_pu, y_pu;
     int min_pu_width = s->sps->min_pu_width;
     int availableFlagLXCol = 0;
     int colPic;
@@ -273,44 +272,45 @@
         (y0 >> s->sps->log2_ctb_size) == (y >> s->sps->log2_ctb_size) &&
         y < s->sps->height &&
         x < s->sps->width) {
-        x = ((x >> 4) << 4);
-        y = ((y >> 4) << 4);
-        x_pu = x >> s->sps->log2_min_pu_size;
-        y_pu = y >> s->sps->log2_min_pu_size;
-        temp_col = TAB_MVF(x_pu, y_pu);
+        x                  = ((x >> 4) << 4);
+        y                  = ((y >> 4) << 4);
+        x_pu               = x >> s->sps->log2_min_pu_size;
+        y_pu               = y >> s->sps->log2_min_pu_size;
+        temp_col           = TAB_MVF(x_pu, y_pu);
         availableFlagLXCol = DERIVE_TEMPORAL_COLOCATED_MVS;
     }
 
     // derive center collocated motion vector
     if (tab_mvf && !availableFlagLXCol) {
-        x = x0 + (nPbW >> 1);
-        y = y0 + (nPbH >> 1);
-        x = ((x >> 4) << 4);
-        y = ((y >> 4) << 4);
-        x_pu = x >> s->sps->log2_min_pu_size;
-        y_pu = y >> s->sps->log2_min_pu_size;
-        temp_col = TAB_MVF(x_pu, y_pu);
+        x                  = x0 + (nPbW >> 1);
+        y                  = y0 + (nPbH >> 1);
+        x                  = ((x >> 4) << 4);
+        y                  = ((y >> 4) << 4);
+        x_pu               = x >> s->sps->log2_min_pu_size;
+        y_pu               = y >> s->sps->log2_min_pu_size;
+        temp_col           = TAB_MVF(x_pu, y_pu);
         availableFlagLXCol = DERIVE_TEMPORAL_COLOCATED_MVS;
     }
     return availableFlagLXCol;
 }
 
-#define AVAILABLE(cand, v) \
+#define AVAILABLE(cand, v)                                      \
     (cand && !TAB_MVF_PU(v).is_intra)
 
-#define PRED_BLOCK_AVAILABLE(v) \
-    check_prediction_block_available(s, log2_cb_size, \
-                                     x0, y0, nPbW, nPbH, \
-                                     x##v, y##v, part_idx)
+#define PRED_BLOCK_AVAILABLE(v)                                 \
+    check_prediction_block_available(s, log2_cb_size,           \
+                                     x0, y0, nPbW, nPbH,        \
+                                     x ## v, y ## v, part_idx)
 
-#define COMPARE_MV_REFIDX(a, b) \
+#define COMPARE_MV_REFIDX(a, b)                                 \
     compareMVrefidx(TAB_MVF_PU(a), TAB_MVF_PU(b))
 
 /*
  * 8.5.3.1.2  Derivation process for spatial merging candidates
  */
 static void derive_spatial_merge_candidates(HEVCContext *s, int x0, int y0,
-                                            int nPbW, int nPbH, int log2_cb_size,
+                                            int nPbW, int nPbH,
+                                            int log2_cb_size,
                                             int singleMCLFlag, int part_idx,
                                             struct MvField mergecandlist[])
 {
@@ -318,7 +318,7 @@
     RefPicList *refPicList = s->ref->refPicList;
     MvField *tab_mvf       = s->ref->tab_mvf;
 
-    const int min_pu_width     = s->sps->min_pu_width;
+    const int min_pu_width = s->sps->min_pu_width;
 
     const int cand_bottom_left = lc->na.cand_bottom_left;
     const int cand_left        = lc->na.cand_left;
@@ -402,7 +402,7 @@
 
     // above right spatial merge candidate
     check_MER = 1;
-    check_B0 = PRED_BLOCK_AVAILABLE(B0);
+    check_B0  = PRED_BLOCK_AVAILABLE(B0);
 
     is_available_b0 = check_B0 && AVAILABLE(cand_up_right, B0);
 
@@ -417,7 +417,7 @@
 
     // left bottom spatial merge candidate
     check_MER = 1;
-    check_A0 = PRED_BLOCK_AVAILABLE(A0);
+    check_A0  = PRED_BLOCK_AVAILABLE(A0);
 
     is_available_a0 = check_A0 && AVAILABLE(cand_bottom_left, A0);
 
@@ -515,8 +515,8 @@
         mergecandlist[nb_merge_cand].mv[1].x      = 0;
         mergecandlist[nb_merge_cand].mv[1].y      = 0;
         mergecandlist[nb_merge_cand].is_intra     = 0;
-        mergecandlist[nb_merge_cand].ref_idx[0]   = (zero_idx < nb_refs) ? zero_idx : 0;
-        mergecandlist[nb_merge_cand].ref_idx[1]   = (zero_idx < nb_refs) ? zero_idx : 0;
+        mergecandlist[nb_merge_cand].ref_idx[0]   = zero_idx < nb_refs ? zero_idx : 0;
+        mergecandlist[nb_merge_cand].ref_idx[1]   = zero_idx < nb_refs ? zero_idx : 0;
 
         nb_merge_cand++;
         zero_idx++;
@@ -539,11 +539,11 @@
 
     if (s->pps->log2_parallel_merge_level > 2 && nCS == 8) {
         singleMCLFlag = 1;
-        x0 = lc->cu.x;
-        y0 = lc->cu.y;
-        nPbW = nCS;
-        nPbH = nCS;
-        part_idx = 0;
+        x0            = lc->cu.x;
+        y0            = lc->cu.y;
+        nPbW          = nCS;
+        nPbH          = nCS;
+        part_idx      = 0;
     }
 
     ff_hevc_set_neighbour_available(s, x0, y0, nPbW, nPbH);
@@ -553,24 +553,28 @@
     if (mergecand_list[merge_idx].pred_flag[0] == 1 &&
         mergecand_list[merge_idx].pred_flag[1] == 1 &&
         (nPbW2 + nPbH2) == 12) {
-        mergecand_list[merge_idx].ref_idx[1] = -1;
+        mergecand_list[merge_idx].ref_idx[1]   = -1;
         mergecand_list[merge_idx].pred_flag[1] = 0;
     }
 
     *mv = mergecand_list[merge_idx];
 }
 
-static av_always_inline void dist_scale(HEVCContext *s, Mv * mv,
+static av_always_inline void dist_scale(HEVCContext *s, Mv *mv,
                                         int min_pu_width, int x, int y,
                                         int elist, int ref_idx_curr, int ref_idx)
 {
     RefPicList *refPicList = s->ref->refPicList;
-    MvField *tab_mvf = s->ref->tab_mvf;
-    int ref_pic_elist = refPicList[elist].list[TAB_MVF(x, y).ref_idx[elist]];
-    int ref_pic_curr  = refPicList[ref_idx_curr].list[ref_idx];
-
-    if (ref_pic_elist != ref_pic_curr)
-        mv_scale(mv, mv, s->poc - ref_pic_elist, s->poc - ref_pic_curr);
+    MvField *tab_mvf       = s->ref->tab_mvf;
+    int ref_pic_elist      = refPicList[elist].list[TAB_MVF(x, y).ref_idx[elist]];
+    int ref_pic_curr       = refPicList[ref_idx_curr].list[ref_idx];
+
+    if (ref_pic_elist != ref_pic_curr) {
+        int poc_diff = s->poc - ref_pic_elist;
+        if (!poc_diff)
+            poc_diff = 1;
+        mv_scale(mv, mv, poc_diff, s->poc - ref_pic_curr);
+    }
 }
 
 static int mv_mp_mode_mx(HEVCContext *s, int x, int y, int pred_flag_index,
@@ -589,7 +593,6 @@
     return 0;
 }
 
-
 static int mv_mp_mode_mx_lt(HEVCContext *s, int x, int y, int pred_flag_index,
                             Mv *mv, int ref_idx_curr, int ref_idx)
 {
@@ -597,25 +600,29 @@
     int min_pu_width = s->sps->min_pu_width;
 
     RefPicList *refPicList = s->ref->refPicList;
-    int currIsLongTerm = refPicList[ref_idx_curr].isLongTerm[ref_idx];
+    int currIsLongTerm     = refPicList[ref_idx_curr].isLongTerm[ref_idx];
 
     int colIsLongTerm =
         refPicList[pred_flag_index].isLongTerm[(TAB_MVF(x, y).ref_idx[pred_flag_index])];
 
-    if (TAB_MVF(x, y).pred_flag[pred_flag_index] && colIsLongTerm == currIsLongTerm) {
+    if (TAB_MVF(x, y).pred_flag[pred_flag_index] &&
+        colIsLongTerm == currIsLongTerm) {
         *mv = TAB_MVF(x, y).mv[pred_flag_index];
         if (!currIsLongTerm)
-            dist_scale(s, mv, min_pu_width, x, y, pred_flag_index, ref_idx_curr, ref_idx);
+            dist_scale(s, mv, min_pu_width, x, y,
+                       pred_flag_index, ref_idx_curr, ref_idx);
         return 1;
     }
     return 0;
 }
 
-#define MP_MX(v, pred, mx) \
-    mv_mp_mode_mx(s, x##v##_pu, y##v##_pu, pred, &mx, ref_idx_curr, ref_idx)
+#define MP_MX(v, pred, mx)                                      \
+    mv_mp_mode_mx(s, x ## v ## _pu, y ## v ## _pu, pred,        \
+                  &mx, ref_idx_curr, ref_idx)
 
-#define MP_MX_LT(v, pred, mx) \
-    mv_mp_mode_mx_lt(s, x##v##_pu, y##v##_pu, pred, &mx, ref_idx_curr, ref_idx)
+#define MP_MX_LT(v, pred, mx)                                   \
+    mv_mp_mode_mx_lt(s, x ## v ## _pu, y ## v ## _pu, pred,     \
+                     &mx, ref_idx_curr, ref_idx)
 
 void ff_hevc_luma_mv_mvp_mode(HEVCContext *s, int x0, int y0, int nPbW,
                               int nPbH, int log2_cb_size, int part_idx,
@@ -683,15 +690,14 @@
     is_available_a0 = PRED_BLOCK_AVAILABLE(A0) && AVAILABLE(cand_bottom_left, A0);
 
     //left spatial merge candidate
-    xA1 = x0 - 1;
-    yA1 = y0 + nPbH - 1;
+    xA1    = x0 - 1;
+    yA1    = y0 + nPbH - 1;
     xA1_pu = xA1 >> s->sps->log2_min_pu_size;
     yA1_pu = yA1 >> s->sps->log2_min_pu_size;
 
     is_available_a1 = AVAILABLE(cand_left, A1);
-    if (is_available_a0 || is_available_a1) {
+    if (is_available_a0 || is_available_a1)
         isScaledFlag_L0 = 1;
-    }
 
     if (is_available_a0) {
         availableFlagLXA0 = MP_MX(A0, pred_flag_index_l0, mxA);
@@ -719,8 +725,8 @@
 
     // B candidates
     // above right spatial merge candidate
-    xB0 = x0 + nPbW;
-    yB0 = y0 - 1;
+    xB0    = x0 + nPbW;
+    yB0    = y0 - 1;
     xB0_pu = xB0 >> s->sps->log2_min_pu_size;
     yB0_pu = yB0 >> s->sps->log2_min_pu_size;
 
@@ -734,8 +740,8 @@
 
     if (!availableFlagLXB0) {
         // above spatial merge candidate
-        xB1 = x0 + nPbW - 1;
-        yB1 = y0 - 1;
+        xB1    = x0 + nPbW - 1;
+        yB1    = y0 - 1;
         xB1_pu = xB1 >> s->sps->log2_min_pu_size;
         yB1_pu = yB1 >> s->sps->log2_min_pu_size;
 
@@ -800,7 +806,8 @@
     if (numMVPCandLX < 2 && s->sh.slice_temporal_mvp_enabled_flag) {
         Mv mv_col;
         int available_col = temporal_luma_motion_vector(s, x0, y0, nPbW,
-                                                        nPbH, ref_idx, &mv_col, LX);
+                                                        nPbH, ref_idx,
+                                                        &mv_col, LX);
         if (available_col)
             mvpcand_list[numMVPCandLX++] = mv_col;
     }

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/hevc_parser.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/hevc_parser.c Changed

@@ -21,6 +21,7 @@
  */
 
 #include "libavutil/common.h"
+
 #include "parser.h"
 #include "hevc.h"
 #include "golomb.h"
@@ -36,7 +37,8 @@
  * Find the end of the current frame in the bitstream.
  * @return the position of the first byte of the next frame, or END_NOT_FOUND
  */
-static int hevc_find_frame_end(AVCodecParserContext *s, const uint8_t *buf, int buf_size)
+static int hevc_find_frame_end(AVCodecParserContext *s, const uint8_t *buf,
+                               int buf_size)
 {
     int i;
     ParseContext *pc = &((HEVCParseContext *)s->priv_data)->pc;
@@ -82,9 +84,8 @@
  * @param buf buffer with field/frame data.
  * @param buf_size size of the buffer.
  */
-static inline int parse_nal_units(AVCodecParserContext *s,
-                                  AVCodecContext *avctx,
-                                  const uint8_t *buf, int buf_size)
+static inline int parse_nal_units(AVCodecParserContext *s, AVCodecContext *avctx,
+                      const uint8_t *buf, int buf_size)
 {
     HEVCContext   *h  = &((HEVCParseContext *)s->priv_data)->h;
     GetBitContext *gb = &h->HEVClc->gb;
@@ -165,6 +166,8 @@
         case NAL_IDR_N_LP:
         case NAL_CRA_NUT:
             sh->first_slice_in_pic_flag = get_bits1(gb);
+            s->picture_structure = h->picture_struct;
+            s->field_order = h->picture_struct;
 
             if (h->nal_unit_type >= 16 && h->nal_unit_type <= 23) {
                 s->key_frame = 1;
@@ -184,7 +187,7 @@
             }
             if (h->sps != (HEVCSPS*)h->sps_list[h->pps->sps_id]->data) {
                 h->sps = (HEVCSPS*)h->sps_list[h->pps->sps_id]->data;
-                h->vps = h->vps_list[h->sps->vps_id];
+                h->vps = (HEVCVPS*)h->vps_list[h->sps->vps_id]->data;
             }
 
             if (!sh->first_slice_in_pic_flag) {
@@ -267,7 +270,7 @@
     } else {
         next = hevc_find_frame_end(s, buf, buf_size);
         if (ff_combine_frame(pc, next, &buf, &buf_size) < 0) {
-            *poutbuf = NULL;
+            *poutbuf      = NULL;
             *poutbuf_size = 0;
             return buf_size;
         }
@@ -275,7 +278,7 @@
 
     parse_nal_units(s, avctx, buf, buf_size);
 
-    *poutbuf = buf;
+    *poutbuf      = buf;
     *poutbuf_size = buf_size;
     return next;
 }
@@ -291,13 +294,12 @@
         state = (state << 8) | buf[i];
         if (((state >> 8) & 0xFFFFFF) == START_CODE) {
             int nut = (state >> 1) & 0x3F;
-            if (nut >= NAL_VPS && nut <= NAL_PPS) {
+            if (nut >= NAL_VPS && nut <= NAL_PPS)
                 has_ps = 1;
-            } else if (has_ps) {
+            else if (has_ps)
                 return i - 3;
-            } else { // no parameter set at the beginning of the stream
+            else // no parameter set at the beginning of the stream
                 return 0;
-            }
         }
     }
     return 0;
@@ -323,7 +325,7 @@
     av_freep(&pc->buffer);
 
     for (i = 0; i < FF_ARRAY_ELEMS(h->vps_list); i++)
-        av_freep(&h->vps_list[i]);
+        av_buffer_unref(&h->vps_list[i]);
     for (i = 0; i < FF_ARRAY_ELEMS(h->sps_list); i++)
         av_buffer_unref(&h->sps_list[i]);
     for (i = 0; i < FF_ARRAY_ELEMS(h->pps_list); i++)

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/hevc_ps.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/hevc_ps.c Changed

@@ -1,5 +1,5 @@
 /*
- * HEVC Parameter Set Decoding
+ * HEVC Parameter Set decoding
  *
  * Copyright (C) 2012 - 2103 Guillaume Martres
  * Copyright (C) 2012 - 2103 Mickael Raulet
@@ -23,8 +23,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "golomb.h"
 #include "libavutil/imgutils.h"
+#include "golomb.h"
 #include "hevc.h"
 
 static const uint8_t default_scaling_list_intra[] = {
@@ -35,7 +35,7 @@
     17, 17, 20, 24, 30, 35, 41, 47,
     18, 19, 22, 27, 35, 44, 54, 65,
     21, 22, 25, 31, 41, 54, 70, 88,
-    24, 25, 29,36, 47, 65, 88, 115
+    24, 25, 29, 36, 47, 65, 88, 115
 };
 
 static const uint8_t default_scaling_list_inter[] = {
@@ -50,8 +50,8 @@
 };
 
 static const AVRational vui_sar[] = {
-    { 0,   1  },
-    { 1,   1  },
+    {  0,   1 },
+    {  1,   1 },
     { 12,  11 },
     { 10,  11 },
     { 16,  11 },
@@ -64,9 +64,9 @@
     { 15,  11 },
     { 64,  33 },
     { 160, 99 },
-    { 4,   3  },
-    { 3,   2  },
-    { 2,   1  },
+    {  4,   3 },
+    {  3,   2 },
+    {  2,   1 },
 };
 
 int ff_hevc_decode_short_term_rps(HEVCContext *s, ShortTermRPS *rps,
@@ -83,7 +83,7 @@
     GetBitContext *gb = &lc->gb;
 
     if (rps != sps->st_rps && sps->nb_st_rps)
-        rps_predict  = get_bits1(gb);
+        rps_predict = get_bits1(gb);
 
     if (rps_predict) {
         const ShortTermRPS *rps_ridx;
@@ -92,11 +92,11 @@
         uint8_t delta_rps_sign;
 
         if (is_slice_header) {
-            int delta_idx = get_ue_golomb_long(gb) + 1;
+            unsigned int delta_idx = get_ue_golomb_long(gb) + 1;
             if (delta_idx > sps->nb_st_rps) {
-                av_log(s->avctx, AV_LOG_ERROR, "Invalid value of delta_idx "
-                       "in slice header RPS: %d > %d.\n", delta_idx,
-                       sps->nb_st_rps);
+                av_log(s->avctx, AV_LOG_ERROR,
+                       "Invalid value of delta_idx in slice header RPS: %d > %d.\n",
+                       delta_idx, sps->nb_st_rps);
                 return AVERROR_INVALIDDATA;
             }
             rps_ridx = &sps->st_rps[sps->nb_st_rps - delta_idx];
@@ -134,13 +134,13 @@
             for (i = 1; i < rps->num_delta_pocs; i++) {
                 delta_poc = rps->delta_poc[i];
                 used      = rps->used[i];
-                for (k = i-1 ; k >= 0;  k--) {
+                for (k = i - 1; k >= 0; k--) {
                     tmp = rps->delta_poc[k];
-                    if (delta_poc < tmp ) {
-                        rps->delta_poc[k+1] = tmp;
-                        rps->used[k+1]      = rps->used[k];
-                        rps->delta_poc[k]   = delta_poc;
-                        rps->used[k]        = used;
+                    if (delta_poc < tmp) {
+                        rps->delta_poc[k + 1] = tmp;
+                        rps->used[k + 1]      = rps->used[k];
+                        rps->delta_poc[k]     = delta_poc;
+                        rps->used[k]          = used;
                     }
                 }
             }
@@ -149,13 +149,13 @@
             int used;
             k = rps->num_negative_pics - 1;
             // flip the negative values to largest first
-            for (i = 0; i < rps->num_negative_pics>>1; i++) {
-                delta_poc          = rps->delta_poc[i];
-                used               = rps->used[i];
-                rps->delta_poc[i]  = rps->delta_poc[k];
-                rps->used[i]       = rps->used[k];
-                rps->delta_poc[k]  = delta_poc;
-                rps->used[k]       = used;
+            for (i = 0; i < rps->num_negative_pics >> 1; i++) {
+                delta_poc         = rps->delta_poc[i];
+                used              = rps->used[i];
+                rps->delta_poc[i] = rps->delta_poc[k];
+                rps->used[i]      = rps->used[k];
+                rps->delta_poc[k] = delta_poc;
+                rps->used[k]      = used;
                 k--;
             }
         }
@@ -177,75 +177,76 @@
                 delta_poc = get_ue_golomb_long(gb) + 1;
                 prev -= delta_poc;
                 rps->delta_poc[i] = prev;
-                rps->used[i] = get_bits1(gb);
+                rps->used[i]      = get_bits1(gb);
             }
             prev = 0;
             for (i = 0; i < nb_positive_pics; i++) {
                 delta_poc = get_ue_golomb_long(gb) + 1;
                 prev += delta_poc;
                 rps->delta_poc[rps->num_negative_pics + i] = prev;
-                rps->used[rps->num_negative_pics + i] = get_bits1(gb);
+                rps->used[rps->num_negative_pics + i]      = get_bits1(gb);
             }
         }
     }
     return 0;
 }
 
-static int decode_profile_tier_level(HEVCLocalContext *lc, PTL *ptl, int max_num_sub_layers)
+
+static void decode_profile_tier_level(HEVCContext *s, PTLCommon *ptl)
 {
-    int i, j;
+    int i;
+    HEVCLocalContext *lc = s->HEVClc;
     GetBitContext *gb = &lc->gb;
 
-    ptl->general_profile_space = get_bits(gb, 2);
-    ptl->general_tier_flag = get_bits1(gb);
-    ptl->general_profile_idc = get_bits(gb, 5);
+    ptl->profile_space = get_bits(gb, 2);
+    ptl->tier_flag     = get_bits1(gb);
+    ptl->profile_idc   = get_bits(gb, 5);
+    if (ptl->profile_idc == FF_PROFILE_HEVC_MAIN)
+        av_log(s->avctx, AV_LOG_DEBUG, "Main profile bitstream\n");
+    else if (ptl->profile_idc == FF_PROFILE_HEVC_MAIN_10)
+        av_log(s->avctx, AV_LOG_DEBUG, "Main 10 profile bitstream\n");
+    else if (ptl->profile_idc == FF_PROFILE_HEVC_MAIN_STILL_PICTURE)
+        av_log(s->avctx, AV_LOG_DEBUG, "Main Still Picture profile bitstream\n");
+    else
+        av_log(s->avctx, AV_LOG_WARNING, "Unknown HEVC profile: %d\n", ptl->profile_idc);
+
     for (i = 0; i < 32; i++)
-        ptl->general_profile_compatibility_flag[i] = get_bits1(gb);
-    skip_bits1(gb);// general_progressive_source_flag
-    skip_bits1(gb);// general_interlaced_source_flag
-    skip_bits1(gb);// general_non_packed_constraint_flag
-    skip_bits1(gb);// general_frame_only_constraint_flag
-    if (get_bits(gb, 16) != 0) // XXX_reserved_zero_44bits[0..15]
-        return -1;
-    if (get_bits(gb, 16) != 0) // XXX_reserved_zero_44bits[16..31]
-        return -1;
-    if (get_bits(gb, 12) != 0) // XXX_reserved_zero_44bits[32..43]
-        return -1;
-
-    ptl->general_level_idc = get_bits(gb, 8);
+        ptl->profile_compatibility_flag[i] = get_bits1(gb);
+    ptl->progressive_source_flag    = get_bits1(gb);
+    ptl->interlaced_source_flag     = get_bits1(gb);
+    ptl->non_packed_constraint_flag = get_bits1(gb);
+    ptl->frame_only_constraint_flag = get_bits1(gb);
+
+    skip_bits(gb, 16); // XXX_reserved_zero_44bits[0..15]
+    skip_bits(gb, 16); // XXX_reserved_zero_44bits[16..31]
+    skip_bits(gb, 12); // XXX_reserved_zero_44bits[32..43]
+}
+
+static void parse_ptl(HEVCContext *s, PTL *ptl, int max_num_sub_layers)
+{
+    int i;
+    HEVCLocalContext *lc = s->HEVClc;
+    GetBitContext *gb = &lc->gb;
+    decode_profile_tier_level(s, &ptl->general_ptl);
+    ptl->general_ptl.level_idc = get_bits(gb, 8);
+
     for (i = 0; i < max_num_sub_layers - 1; i++) {
         ptl->sub_layer_profile_present_flag[i] = get_bits1(gb);
-        ptl->sub_layer_level_present_flag[i] = get_bits1(gb);
+        ptl->sub_layer_level_present_flag[i]   = get_bits1(gb);
     }
-    if (max_num_sub_layers - 1 > 0)
+    if (max_num_sub_layers - 1> 0)
         for (i = max_num_sub_layers - 1; i < 8; i++)
             skip_bits(gb, 2); // reserved_zero_2bits[i]
     for (i = 0; i < max_num_sub_layers - 1; i++) {
-        if (ptl->sub_layer_profile_present_flag[i]) {
-            ptl->sub_layer_profile_space[i] = get_bits(gb, 2);
-            ptl->sub_layer_tier_flag[i] = get_bits(gb, 1);
-            ptl->sub_layer_profile_idc[i] = get_bits(gb, 5);
-            for (j = 0; j < 32; j++)
-                ptl->sub_layer_profile_compatibility_flags[i][j] = get_bits1(gb);
-            skip_bits1(gb);// sub_layer_progressive_source_flag
-            skip_bits1(gb);// sub_layer_interlaced_source_flag
-            skip_bits1(gb);// sub_layer_non_packed_constraint_flag
-            skip_bits1(gb);// sub_layer_frame_only_constraint_flag
-
-            if (get_bits(gb, 16) != 0) // sub_layer_reserved_zero_44bits[0..15]
-                return -1;
-            if (get_bits(gb, 16) != 0) // sub_layer_reserved_zero_44bits[16..31]
-                return -1;
-            if (get_bits(gb, 12) != 0) // sub_layer_reserved_zero_44bits[32..43]
-                return -1;
-        }
+        if (ptl->sub_layer_profile_present_flag[i])
+            decode_profile_tier_level(s, &ptl->sub_layer_ptl[i]);
         if (ptl->sub_layer_level_present_flag[i])
-            ptl->sub_layer_level_idc[i] = get_bits(gb, 8);
+            ptl->sub_layer_ptl[i].level_idc = get_bits(gb, 8);
     }
-    return 0;
 }
 
-static void decode_sublayer_hrd(HEVCContext *s, int nb_cpb, int subpic_params_present)
+static void decode_sublayer_hrd(HEVCContext *s, unsigned int nb_cpb,
+                                int subpic_params_present)
 {
     GetBitContext *gb = &s->HEVClc->gb;
     int i;
@@ -262,7 +263,8 @@
     }
 }
 
-static void decode_hrd(HEVCContext *s, int common_inf_present, int max_sublayers)
+static void decode_hrd(HEVCContext *s, int common_inf_present,
+                       int max_sublayers)
 {
     GetBitContext *gb = &s->HEVClc->gb;
     int nal_params_present = 0, vcl_params_present = 0;
@@ -287,7 +289,7 @@
             skip_bits(gb, 4); // cpb_size_scale
 
             if (subpic_params_present)
-                skip_bits(gb, 4); // cpb_size_du_scale
+                skip_bits(gb, 4);  // cpb_size_du_scale
 
             skip_bits(gb, 5); // initial_cpb_removal_delay_length_minus1
             skip_bits(gb, 5); // au_cpb_removal_delay_length_minus1
@@ -297,14 +299,14 @@
 
     for (i = 0; i < max_sublayers; i++) {
         int low_delay = 0;
-        int nb_cpb = 1;
+        unsigned int nb_cpb = 1;
         int fixed_rate = get_bits1(gb);
 
         if (!fixed_rate)
             fixed_rate = get_bits1(gb);
 
         if (fixed_rate)
-            get_ue_golomb_long(gb); // elemental_duration_in_tc_minus1
+            get_ue_golomb_long(gb);  // elemental_duration_in_tc_minus1
         else
             low_delay = get_bits1(gb);
 
@@ -323,13 +325,14 @@
     int i,j;
     GetBitContext *gb = &s->HEVClc->gb;
     int vps_id = 0;
-    VPS *vps;
+    HEVCVPS *vps;
+    AVBufferRef *vps_buf = av_buffer_allocz(sizeof(*vps));
 
-    av_log(s->avctx, AV_LOG_DEBUG, "Decoding VPS\n");
-
-    vps = av_mallocz(sizeof(*vps));
-    if (!vps)
+    if (!vps_buf)
         return AVERROR(ENOMEM);
+    vps = (HEVCVPS*)vps_buf->data;
+
+    av_log(s->avctx, AV_LOG_DEBUG, "Decoding VPS\n");
 
     vps_id = get_bits(gb, 4);
     if (vps_id >= MAX_VPS_COUNT) {
@@ -357,10 +360,8 @@
         goto err;
     }
 
-    if (decode_profile_tier_level(s->HEVClc, &vps->ptl, vps->vps_max_sub_layers) < 0) {
-        av_log(s->avctx, AV_LOG_ERROR, "Error decoding profile tier level.\n");
-        goto err;
-    }
+    parse_ptl(s, &vps->ptl, vps->vps_max_sub_layers);
+
     vps->vps_sub_layer_ordering_info_present_flag = get_bits1(gb);
 
     i = vps->vps_sub_layer_ordering_info_present_flag ? 0 : vps->vps_max_sub_layers - 1;
@@ -385,7 +386,7 @@
     vps->vps_num_layer_sets = get_ue_golomb_long(gb) + 1;
     for (i = 1; i < vps->vps_num_layer_sets; i++)
         for (j = 0; j <= vps->vps_max_layer_id; j++)
-            skip_bits(gb, 1); // layer_id_included_flag[i][j]
+            skip_bits(gb, 1);  // layer_id_included_flag[i][j]
 
     vps->vps_timing_info_present_flag = get_bits1(gb);
     if (vps->vps_timing_info_present_flag) {
@@ -406,18 +407,18 @@
     }
     get_bits1(gb); /* vps_extension_flag */
 
-    av_free(s->vps_list[vps_id]);
-    s->vps_list[vps_id] = vps;
+    av_buffer_unref(&s->vps_list[vps_id]);
+    s->vps_list[vps_id] = vps_buf;
     return 0;
 
 err:
-    av_free(vps);
+    av_buffer_unref(&vps_buf);
     return AVERROR_INVALIDDATA;
 }
 
 static void decode_vui(HEVCContext *s, HEVCSPS *sps)
 {
-    VUI *vui = &sps->vui;
+    VUI *vui          = &sps->vui;
     GetBitContext *gb = &s->HEVClc->gb;
     int sar_present;
 
@@ -432,8 +433,8 @@
             vui->sar.num = get_bits(gb, 16);
             vui->sar.den = get_bits(gb, 16);
         } else
-            av_log(s->avctx, AV_LOG_WARNING, "Unknown SAR index: %u.\n",
-                   sar_idx);
+            av_log(s->avctx, AV_LOG_WARNING,
+                   "Unknown SAR index: %u.\n", sar_idx);
     }
 
     vui->overscan_info_present_flag = get_bits1(gb);
@@ -445,10 +446,20 @@
         vui->video_format                    = get_bits(gb, 3);
         vui->video_full_range_flag           = get_bits1(gb);
         vui->colour_description_present_flag = get_bits1(gb);
+        if (vui->video_full_range_flag && sps->pix_fmt == AV_PIX_FMT_YUV420P)
+            sps->pix_fmt = AV_PIX_FMT_YUVJ420P;
         if (vui->colour_description_present_flag) {
             vui->colour_primaries        = get_bits(gb, 8);
             vui->transfer_characteristic = get_bits(gb, 8);
             vui->matrix_coeffs           = get_bits(gb, 8);
+
+            // Set invalid values to "unspecified"
+            if (vui->colour_primaries >= AVCOL_PRI_NB)
+                vui->colour_primaries = AVCOL_PRI_UNSPECIFIED;
+            if (vui->transfer_characteristic >= AVCOL_TRC_NB)
+                vui->transfer_characteristic = AVCOL_TRC_UNSPECIFIED;
+            if (vui->matrix_coeffs >= AVCOL_SPC_NB)
+                vui->matrix_coeffs = AVCOL_SPC_UNSPECIFIED;
         }
     }
 
@@ -470,7 +481,7 @@
         vui->def_disp_win.top_offset    = get_ue_golomb_long(gb) * 2;
         vui->def_disp_win.bottom_offset = get_ue_golomb_long(gb) * 2;
 
-        if (s->strict_def_disp_win &&
+        if (s->apply_defdispwin &&
             s->avctx->flags2 & CODEC_FLAG2_IGNORE_CROP) {
             av_log(s->avctx, AV_LOG_DEBUG,
                    "discarding vui default display window, "
@@ -488,9 +499,10 @@
     }
 
     vui->vui_timing_info_present_flag = get_bits1(gb);
+
     if (vui->vui_timing_info_present_flag) {
-        vui->vui_num_units_in_tick               = get_bits(gb, 32);
-        vui->vui_time_scale                      = get_bits(gb, 32);
+        vui->vui_num_units_in_tick               = get_bits_long(gb, 32);
+        vui->vui_time_scale                      = get_bits_long(gb, 32);
         vui->vui_poc_proportional_to_timing_flag = get_bits1(gb);
         if (vui->vui_poc_proportional_to_timing_flag)
             vui->vui_num_ticks_poc_diff_one_minus1 = get_ue_golomb_long(gb);
@@ -543,17 +555,18 @@
     GetBitContext *gb = &s->HEVClc->gb;
     uint8_t scaling_list_pred_mode_flag[4][6];
     int32_t scaling_list_dc_coef[2][6];
+    int size_id, matrix_id, i, pos;
 
-    int size_id, matrix_id, i, pos, delta;
     for (size_id = 0; size_id < 4; size_id++)
-        for (matrix_id = 0; matrix_id < ((size_id == 3) ? 2 : 6); matrix_id++) {
+        for (matrix_id = 0; matrix_id < (size_id == 3 ? 2 : 6); matrix_id++) {
             scaling_list_pred_mode_flag[size_id][matrix_id] = get_bits1(gb);
             if (!scaling_list_pred_mode_flag[size_id][matrix_id]) {
-                delta = get_ue_golomb_long(gb);
-                // Only need to handle non-zero delta. Zero means default, which should already be in the arrays.
+                unsigned int delta = get_ue_golomb_long(gb);
+                /* Only need to handle non-zero delta. Zero means default,
+                 * which should already be in the arrays. */
                 if (delta) {
                     // Copy from previous array.
-                    if (matrix_id - delta < 0) {
+                    if (matrix_id < delta) {
                         av_log(s->avctx, AV_LOG_ERROR,
                                "Invalid delta in scaling list data: %d.\n", delta);
                         return AVERROR_INVALIDDATA;
@@ -566,12 +579,11 @@
                         sl->sl_dc[size_id - 2][matrix_id] = sl->sl_dc[size_id - 2][matrix_id - delta];
                 }
             } else {
-                int next_coef;
-                int coef_num;
+                int next_coef, coef_num;
                 int32_t scaling_list_delta_coef;
 
                 next_coef = 8;
-                coef_num = FFMIN(64, (1  <<  (4 + (size_id  <<  1))));
+                coef_num  = FFMIN(64, 1 << (4 + (size_id << 1)));
                 if (size_id > 1) {
                     scaling_list_dc_coef[size_id - 2][matrix_id] = get_se_golomb(gb) + 8;
                     next_coef = scaling_list_dc_coef[size_id - 2][matrix_id];
@@ -579,12 +591,14 @@
                 }
                 for (i = 0; i < coef_num; i++) {
                     if (size_id == 0)
-                        pos = 4 * ff_hevc_diag_scan4x4_y[i] + ff_hevc_diag_scan4x4_x[i];
+                        pos = 4 * ff_hevc_diag_scan4x4_y[i] +
+                                  ff_hevc_diag_scan4x4_x[i];
                     else
-                        pos = 8 * ff_hevc_diag_scan8x8_y[i] + ff_hevc_diag_scan8x8_x[i];
+                        pos = 8 * ff_hevc_diag_scan8x8_y[i] +
+                                  ff_hevc_diag_scan8x8_x[i];
 
                     scaling_list_delta_coef = get_se_golomb(gb);
-                    next_coef = (next_coef + scaling_list_delta_coef + 256 ) % 256;
+                    next_coef = (next_coef + scaling_list_delta_coef + 256) % 256;
                     sl->sl[size_id][matrix_id][pos] = next_coef;
                 }
             }
@@ -597,8 +611,8 @@
 {
     const AVPixFmtDescriptor *desc;
     GetBitContext *gb = &s->HEVClc->gb;
-    int ret    = 0;
-    int sps_id = 0;
+    int ret = 0;
+    unsigned int sps_id = 0;
     int log2_diff_max_min_transform_block_size;
     int bit_depth_chroma, start, vui_present, sublayer_ordering_info;
     int i;
@@ -621,6 +635,13 @@
         goto err;
     }
 
+    if (!s->vps_list[sps->vps_id]) {
+        av_log(s->avctx, AV_LOG_ERROR, "VPS %d does not exist\n",
+               sps->vps_id);
+        ret = AVERROR_INVALIDDATA;
+        goto err;
+    }
+
     sps->max_sub_layers = get_bits(gb, 3) + 1;
     if (sps->max_sub_layers > MAX_SUB_LAYERS) {
         av_log(s->avctx, AV_LOG_ERROR, "sps_max_sub_layers out of range: %d\n",
@@ -630,11 +651,9 @@
     }
 
     skip_bits1(gb); // temporal_id_nesting_flag
-    if (decode_profile_tier_level(s->HEVClc, &sps->ptl, sps->max_sub_layers) < 0) {
-        av_log(s->avctx, AV_LOG_ERROR, "error decoding profile tier level\n");
-        ret = AVERROR_INVALIDDATA;
-        goto err;
-    }
+
+    parse_ptl(s, &sps->ptl, sps->max_sub_layers);
+
     sps_id = get_ue_golomb_long(gb);
     if (sps_id >= MAX_SPS_COUNT) {
         av_log(s->avctx, AV_LOG_ERROR, "SPS id out of range: %d\n", sps_id);
@@ -645,7 +664,7 @@
     sps->chroma_format_idc = get_ue_golomb_long(gb);
     if (sps->chroma_format_idc != 1) {
         avpriv_report_missing_feature(s->avctx, "chroma_format_idc != 1\n");
-        ret = AVERROR_INVALIDDATA;
+        ret = AVERROR_PATCHWELCOME;
         goto err;
     }
 
@@ -686,7 +705,8 @@
     bit_depth_chroma = get_ue_golomb_long(gb) + 8;
     if (bit_depth_chroma != sps->bit_depth) {
         av_log(s->avctx, AV_LOG_ERROR,
-               "Luma bit depth (%d) is different from chroma bit depth (%d), this is unsupported.\n",
+               "Luma bit depth (%d) is different from chroma bit depth (%d), "
+               "this is unsupported.\n",
                sps->bit_depth, bit_depth_chroma);
         ret = AVERROR_INVALIDDATA;
         goto err;
@@ -704,7 +724,8 @@
             goto err;
         }
     } else {
-        av_log(s->avctx, AV_LOG_ERROR, "non-4:2:0 support is currently unspecified.\n");
+        av_log(s->avctx, AV_LOG_ERROR,
+               "non-4:2:0 support is currently unspecified.\n");
         return AVERROR_PATCHWELCOME;
     }
 
@@ -743,24 +764,28 @@
         if (sps->temporal_layer[i].num_reorder_pics > sps->temporal_layer[i].max_dec_pic_buffering - 1) {
             av_log(s->avctx, AV_LOG_ERROR, "sps_max_num_reorder_pics out of range: %d\n",
                    sps->temporal_layer[i].num_reorder_pics);
-            ret = AVERROR_INVALIDDATA;
-            goto err;
+            if (sps->temporal_layer[i].num_reorder_pics > MAX_DPB_SIZE - 1) {
+                ret = AVERROR_INVALIDDATA;
+                goto err;
+            }
+            sps->temporal_layer[i].max_dec_pic_buffering = sps->temporal_layer[i].num_reorder_pics + 1;
         }
     }
 
     if (!sublayer_ordering_info) {
-        for (i = 0; i < start; i++){
+        for (i = 0; i < start; i++) {
             sps->temporal_layer[i].max_dec_pic_buffering = sps->temporal_layer[start].max_dec_pic_buffering;
             sps->temporal_layer[i].num_reorder_pics      = sps->temporal_layer[start].num_reorder_pics;
             sps->temporal_layer[i].max_latency_increase  = sps->temporal_layer[start].max_latency_increase;
         }
     }
 
-    sps->log2_min_cb_size             = get_ue_golomb_long(gb) + 3;
-    sps->log2_diff_max_min_coding_block_size    = get_ue_golomb_long(gb);
-    sps->log2_min_tb_size                       = get_ue_golomb_long(gb) + 2;
-    log2_diff_max_min_transform_block_size      = get_ue_golomb_long(gb);
-    sps->log2_max_trafo_size                    = log2_diff_max_min_transform_block_size + sps->log2_min_tb_size;
+    sps->log2_min_cb_size                    = get_ue_golomb_long(gb) + 3;
+    sps->log2_diff_max_min_coding_block_size = get_ue_golomb_long(gb);
+    sps->log2_min_tb_size                    = get_ue_golomb_long(gb) + 2;
+    log2_diff_max_min_transform_block_size   = get_ue_golomb_long(gb);
+    sps->log2_max_trafo_size                 = log2_diff_max_min_transform_block_size +
+                                               sps->log2_min_tb_size;
 
     if (sps->log2_min_tb_size >= sps->log2_min_cb_size) {
         av_log(s->avctx, AV_LOG_ERROR, "Invalid value for log2_min_tb_size");
@@ -832,7 +857,7 @@
         decode_vui(s, sps);
     skip_bits1(gb); // sps_extension_flag
 
-    if (s->strict_def_disp_win) {
+    if (s->apply_defdispwin) {
         sps->output_window.left_offset   += sps->vui.def_disp_win.left_offset;
         sps->output_window.right_offset  += sps->vui.def_disp_win.right_offset;
         sps->output_window.top_offset    += sps->vui.def_disp_win.top_offset;
@@ -856,32 +881,33 @@
             ret = AVERROR_INVALIDDATA;
             goto err;
         }
-        av_log(s->avctx, AV_LOG_WARNING, "Displaying the whole video surface.\n");
+        av_log(s->avctx, AV_LOG_WARNING,
+               "Displaying the whole video surface.\n");
         sps->pic_conf_win.left_offset   =
         sps->pic_conf_win.right_offset  =
         sps->pic_conf_win.top_offset    =
         sps->pic_conf_win.bottom_offset = 0;
-        sps->output_width  = sps->width;
-        sps->output_height = sps->height;
+        sps->output_width               = sps->width;
+        sps->output_height              = sps->height;
     }
 
     // Inferred parameters
-    sps->log2_ctb_size     = sps->log2_min_cb_size
-                             + sps->log2_diff_max_min_coding_block_size;
-    sps->log2_min_pu_size  = sps->log2_min_cb_size - 1;
+    sps->log2_ctb_size = sps->log2_min_cb_size +
+                         sps->log2_diff_max_min_coding_block_size;
+    sps->log2_min_pu_size = sps->log2_min_cb_size - 1;
 
-    sps->ctb_width         = (sps->width  + (1 << sps->log2_ctb_size) - 1) >> sps->log2_ctb_size;
-    sps->ctb_height        = (sps->height + (1 << sps->log2_ctb_size) - 1) >> sps->log2_ctb_size;
-    sps->ctb_size          = sps->ctb_width * sps->ctb_height;
+    sps->ctb_width  = (sps->width  + (1 << sps->log2_ctb_size) - 1) >> sps->log2_ctb_size;
+    sps->ctb_height = (sps->height + (1 << sps->log2_ctb_size) - 1) >> sps->log2_ctb_size;
+    sps->ctb_size   = sps->ctb_width * sps->ctb_height;
 
-    sps->min_cb_width      = sps->width  >> sps->log2_min_cb_size;
-    sps->min_cb_height     = sps->height >> sps->log2_min_cb_size;
-    sps->min_tb_width      = sps->width  >> sps->log2_min_tb_size;
-    sps->min_tb_height     = sps->height >> sps->log2_min_tb_size;
-    sps->min_pu_width      = sps->width  >> sps->log2_min_pu_size;
-    sps->min_pu_height     = sps->height >> sps->log2_min_pu_size;
+    sps->min_cb_width  = sps->width  >> sps->log2_min_cb_size;
+    sps->min_cb_height = sps->height >> sps->log2_min_cb_size;
+    sps->min_tb_width  = sps->width  >> sps->log2_min_tb_size;
+    sps->min_tb_height = sps->height >> sps->log2_min_tb_size;
+    sps->min_pu_width  = sps->width  >> sps->log2_min_pu_size;
+    sps->min_pu_height = sps->height >> sps->log2_min_pu_size;
 
-    sps->qp_bd_offset      = 6 * (sps->bit_depth - 8);
+    sps->qp_bd_offset = 6 * (sps->bit_depth - 8);
 
     if (sps->width  & ((1 << sps->log2_min_cb_size) - 1) ||
         sps->height & ((1 << sps->log2_min_cb_size) - 1)) {
@@ -904,13 +930,15 @@
         goto err;
     }
     if (sps->log2_max_trafo_size > FFMIN(sps->log2_ctb_size, 5)) {
-        av_log(s->avctx, AV_LOG_ERROR, "max transform block size out of range: %d\n",
+        av_log(s->avctx, AV_LOG_ERROR,
+               "max transform block size out of range: %d\n",
                sps->log2_max_trafo_size);
         goto err;
     }
 
     if (s->avctx->debug & FF_DEBUG_BITSTREAM) {
-        av_log(s->avctx, AV_LOG_DEBUG, "Parsed SPS: id %d; coded wxh: %dx%d; "
+        av_log(s->avctx, AV_LOG_DEBUG,
+               "Parsed SPS: id %d; coded wxh: %dx%d; "
                "cropped wxh: %dx%d; pix_fmt: %s.\n",
                sps_id, sps->width, sps->height,
                sps->output_width, sps->output_height,
@@ -933,8 +961,8 @@
     }
 
     return 0;
-err:
 
+err:
     av_buffer_unref(&sps_buf);
     return ret;
 }
@@ -965,8 +993,8 @@
     int pic_area_in_ctbs, pic_area_in_min_cbs, pic_area_in_min_tbs;
     int log2_diff_ctb_min_tb_size;
     int i, j, x, y, ctb_addr_rs, tile_id;
-    int ret    = 0;
-    int pps_id = 0;
+    int ret = 0;
+    unsigned int pps_id = 0;
 
     AVBufferRef *pps_buf;
     HEVCPPS *pps = av_mallocz(sizeof(*pps));
@@ -974,7 +1002,8 @@
     if (!pps)
         return AVERROR(ENOMEM);
 
-    pps_buf = av_buffer_create((uint8_t*)pps, sizeof(*pps), hevc_pps_free, NULL, 0);
+    pps_buf = av_buffer_create((uint8_t *)pps, sizeof(*pps),
+                               hevc_pps_free, NULL, 0);
     if (!pps_buf) {
         av_freep(&pps);
         return AVERROR(ENOMEM);
@@ -1005,11 +1034,11 @@
         goto err;
     }
     if (!s->sps_list[pps->sps_id]) {
-        av_log(s->avctx, AV_LOG_ERROR, "SPS does not exist \n");
+        av_log(s->avctx, AV_LOG_ERROR, "SPS %u does not exist.\n", pps->sps_id);
         ret = AVERROR_INVALIDDATA;
         goto err;
     }
-    sps = (HEVCSPS*)s->sps_list[pps->sps_id]->data;
+    sps = (HEVCSPS *)s->sps_list[pps->sps_id]->data;
 
     pps->dependent_slice_segments_enabled_flag = get_bits1(gb);
     pps->output_flag_present_flag              = get_bits1(gb);
@@ -1056,8 +1085,8 @@
     pps->entropy_coding_sync_enabled_flag = get_bits1(gb);
 
     if (pps->tiles_enabled_flag) {
-        pps->num_tile_columns     = get_ue_golomb_long(gb) + 1;
-        pps->num_tile_rows        = get_ue_golomb_long(gb) + 1;
+        pps->num_tile_columns = get_ue_golomb_long(gb) + 1;
+        pps->num_tile_rows    = get_ue_golomb_long(gb) + 1;
         if (pps->num_tile_columns == 0 ||
             pps->num_tile_columns >= sps->width) {
             av_log(s->avctx, AV_LOG_ERROR, "num_tile_columns_minus1 out of range: %d\n",
@@ -1082,10 +1111,10 @@
 
         pps->uniform_spacing_flag = get_bits1(gb);
         if (!pps->uniform_spacing_flag) {
-            int sum = 0;
+            uint64_t sum = 0;
             for (i = 0; i < pps->num_tile_columns - 1; i++) {
                 pps->column_width[i] = get_ue_golomb_long(gb) + 1;
-                sum += pps->column_width[i];
+                sum                 += pps->column_width[i];
             }
             if (sum >= sps->ctb_width) {
                 av_log(s->avctx, AV_LOG_ERROR, "Invalid tile widths.\n");
@@ -1097,7 +1126,7 @@
             sum = 0;
             for (i = 0; i < pps->num_tile_rows - 1; i++) {
                 pps->row_height[i] = get_ue_golomb_long(gb) + 1;
-                sum += pps->row_height[i];
+                sum               += pps->row_height[i];
             }
             if (sum >= sps->ctb_height) {
                 av_log(s->avctx, AV_LOG_ERROR, "Invalid tile heights.\n");
@@ -1114,7 +1143,7 @@
     pps->deblocking_filter_control_present_flag = get_bits1(gb);
     if (pps->deblocking_filter_control_present_flag) {
         pps->deblocking_filter_override_enabled_flag = get_bits1(gb);
-        pps->disable_dbf = get_bits1(gb);
+        pps->disable_dbf                             = get_bits1(gb);
         if (!pps->disable_dbf) {
             pps->beta_offset = get_se_golomb(gb) * 2;
             pps->tc_offset = get_se_golomb(gb) * 2;
@@ -1133,8 +1162,8 @@
         }
     }
 
-    pps->pps_scaling_list_data_present_flag = get_bits1(gb);
-    if (pps->pps_scaling_list_data_present_flag) {
+    pps->scaling_list_data_present_flag = get_bits1(gb);
+    if (pps->scaling_list_data_present_flag) {
         set_default_scaling_list_data(&pps->scaling_list);
         ret = scaling_list_data(s, &pps->scaling_list);
         if (ret < 0)
@@ -1150,7 +1179,7 @@
     }
 
     pps->slice_header_extension_present_flag = get_bits1(gb);
-    pps->pps_extension_flag                  = get_bits1(gb);
+    skip_bits1(gb);     // pps_extension_flag
 
     // Inferred parameters
     pps->col_bd   = av_malloc_array(pps->num_tile_columns + 1, sizeof(*pps->col_bd));
@@ -1191,9 +1220,9 @@
         pps->row_bd[i + 1] = pps->row_bd[i] + pps->row_height[i];
 
     for (i = 0, j = 0; i < sps->ctb_width; i++) {
-         if (i > pps->col_bd[j])
-             j++;
-         pps->col_idxX[i] = j;
+        if (i > pps->col_bd[j])
+            j++;
+        pps->col_idxX[i] = j;
     }
 
     /**
@@ -1235,16 +1264,16 @@
             }
         }
 
-        for (i = 0; i < tile_x; i++ )
+        for (i = 0; i < tile_x; i++)
             val += pps->row_height[tile_y] * pps->column_width[i];
-        for (i = 0; i < tile_y; i++ )
+        for (i = 0; i < tile_y; i++)
             val += sps->ctb_width * pps->row_height[i];
 
         val += (tb_y - pps->row_bd[tile_y]) * pps->column_width[tile_x] +
                tb_x - pps->col_bd[tile_x];
 
         pps->ctb_addr_rs_to_ts[ctb_addr_rs] = val;
-        pps->ctb_addr_ts_to_rs[val] = ctb_addr_rs;
+        pps->ctb_addr_ts_to_rs[val]         = ctb_addr_rs;
     }
 
     for (j = 0, tile_id = 0; j < pps->num_tile_rows; j++)
@@ -1265,11 +1294,11 @@
 
     for (y = 0; y < sps->min_cb_height; y++) {
         for (x = 0; x < sps->min_cb_width; x++) {
-            int tb_x = x >> sps->log2_diff_max_min_coding_block_size;
-            int tb_y = y >> sps->log2_diff_max_min_coding_block_size;
+            int tb_x        = x >> sps->log2_diff_max_min_coding_block_size;
+            int tb_y        = y >> sps->log2_diff_max_min_coding_block_size;
             int ctb_addr_rs = sps->ctb_width * tb_y + tb_x;
-            int val = pps->ctb_addr_rs_to_ts[ctb_addr_rs] <<
-                      (sps->log2_diff_max_min_coding_block_size * 2);
+            int val         = pps->ctb_addr_rs_to_ts[ctb_addr_rs] <<
+                              (sps->log2_diff_max_min_coding_block_size * 2);
             for (i = 0; i < sps->log2_diff_max_min_coding_block_size; i++) {
                 int m = 1 << i;
                 val += (m & x ? m * m : 0) + (m & y ? 2 * m * m : 0);
@@ -1281,11 +1310,11 @@
     log2_diff_ctb_min_tb_size = sps->log2_ctb_size - sps->log2_min_tb_size;
     for (y = 0; y < sps->min_tb_height; y++) {
         for (x = 0; x < sps->min_tb_width; x++) {
-            int tb_x = x >> log2_diff_ctb_min_tb_size;
-            int tb_y = y >> log2_diff_ctb_min_tb_size;
+            int tb_x        = x >> log2_diff_ctb_min_tb_size;
+            int tb_y        = y >> log2_diff_ctb_min_tb_size;
             int ctb_addr_rs = sps->ctb_width * tb_y + tb_x;
-            int val = pps->ctb_addr_rs_to_ts[ctb_addr_rs] <<
-                      (log2_diff_ctb_min_tb_size * 2);
+            int val         = pps->ctb_addr_rs_to_ts[ctb_addr_rs] <<
+                              (log2_diff_ctb_min_tb_size * 2);
             for (i = 0; i < log2_diff_ctb_min_tb_size; i++) {
                 int m = 1 << i;
                 val += (m & x ? m * m : 0) + (m & y ? 2 * m * m : 0);

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/hevc_refs.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/hevc_refs.c Changed

@@ -1,5 +1,5 @@
 /*
- * HEVC video Decoder
+ * HEVC video decoder
  *
  * Copyright (C) 2012 - 2013 Guillaume Martres
  * Copyright (C) 2012 - 2013 Gildas Cocherel
@@ -23,9 +23,9 @@
 
 #include "libavutil/pixdesc.h"
 
-#include "hevc.h"
 #include "internal.h"
 #include "thread.h"
+#include "hevc.h"
 
 void ff_hevc_unref_frame(HEVCContext *s, HEVCFrame *frame, int flags)
 {
@@ -49,16 +49,17 @@
     }
 }
 
-RefPicList* ff_hevc_get_ref_list(HEVCContext *s, HEVCFrame *ref, int x0, int y0)
+RefPicList *ff_hevc_get_ref_list(HEVCContext *s, HEVCFrame *ref, int x0, int y0)
 {
     if (x0 < 0 || y0 < 0) {
         return s->ref->refPicList;
     } else {
         int x_cb         = x0 >> s->sps->log2_ctb_size;
         int y_cb         = y0 >> s->sps->log2_ctb_size;
-        int pic_width_cb = (s->sps->width + (1<<s->sps->log2_ctb_size)-1 ) >> s->sps->log2_ctb_size;
+        int pic_width_cb = (s->sps->width + (1 << s->sps->log2_ctb_size) - 1) >>
+                           s->sps->log2_ctb_size;
         int ctb_addr_ts  = s->pps->ctb_addr_rs_to_ts[y_cb * pic_width_cb + x_cb];
-        return (RefPicList*) ref->rpl_tab[ctb_addr_ts];
+        return (RefPicList *)ref->rpl_tab[ctb_addr_ts];
     }
 }
 
@@ -67,7 +68,8 @@
     int i;
     for (i = 0; i < FF_ARRAY_ELEMS(s->DPB); i++)
         ff_hevc_unref_frame(s, &s->DPB[i],
-                            HEVC_FRAME_FLAG_SHORT_REF | HEVC_FRAME_FLAG_LONG_REF);
+                            HEVC_FRAME_FLAG_SHORT_REF |
+                            HEVC_FRAME_FLAG_LONG_REF);
 }
 
 void ff_hevc_flush_dpb(HEVCContext *s)
@@ -85,7 +87,8 @@
         if (frame->frame->buf[0])
             continue;
 
-        ret = ff_thread_get_buffer(s->avctx, &frame->tf, AV_GET_BUFFER_FLAG_REF);
+        ret = ff_thread_get_buffer(s->avctx, &frame->tf,
+                                   AV_GET_BUFFER_FLAG_REF);
         if (ret < 0)
             return NULL;
 
@@ -96,16 +99,18 @@
         frame->tab_mvf_buf = av_buffer_pool_get(s->tab_mvf_pool);
         if (!frame->tab_mvf_buf)
             goto fail;
-        frame->tab_mvf = (MvField*)frame->tab_mvf_buf->data;
+        frame->tab_mvf = (MvField *)frame->tab_mvf_buf->data;
 
         frame->rpl_tab_buf = av_buffer_pool_get(s->rpl_tab_pool);
         if (!frame->rpl_tab_buf)
             goto fail;
-        frame->rpl_tab   = (RefPicListTab**)frame->rpl_tab_buf->data;
+        frame->rpl_tab   = (RefPicListTab **)frame->rpl_tab_buf->data;
         frame->ctb_count = s->sps->ctb_width * s->sps->ctb_height;
         for (j = 0; j < frame->ctb_count; j++)
-            frame->rpl_tab[j] = (RefPicListTab*)frame->rpl_buf->data;
+            frame->rpl_tab[j] = (RefPicListTab *)frame->rpl_buf->data;
 
+        frame->frame->top_field_first  = s->picture_struct == AV_PICTURE_STRUCTURE_TOP_FIELD;
+        frame->frame->interlaced_frame = (s->picture_struct == AV_PICTURE_STRUCTURE_TOP_FIELD) || (s->picture_struct == AV_PICTURE_STRUCTURE_BOTTOM_FIELD);
         return frame;
 fail:
         ff_hevc_unref_frame(s, frame, ~0);
@@ -136,13 +141,13 @@
     if (!ref)
         return AVERROR(ENOMEM);
 
-    *frame              = ref->frame;
-    s->ref              = ref;
-    ref->poc            = poc;
+    *frame = ref->frame;
+    s->ref = ref;
 
-    ref->flags          = HEVC_FRAME_FLAG_OUTPUT | HEVC_FRAME_FLAG_SHORT_REF;
-    ref->sequence       = s->seq_decode;
-    ref->window         = s->sps->output_window;
+    ref->poc      = poc;
+    ref->flags    = HEVC_FRAME_FLAG_OUTPUT | HEVC_FRAME_FLAG_SHORT_REF;
+    ref->sequence = s->seq_decode;
+    ref->window   = s->sps->output_window;
 
     return 0;
 }
@@ -152,7 +157,7 @@
     do {
         int nb_output = 0;
         int min_poc   = INT_MAX;
-        int i, j, min_idx, ret;
+        int i, min_idx, ret;
 
         for (i = 0; i < FF_ARRAY_ELEMS(s->DPB); i++) {
             HEVCFrame *frame = &s->DPB[i];
@@ -183,14 +188,15 @@
             if (ret < 0)
                 return ret;
 
-            for (j = 0; j < 3; j++) {
-                int hshift = (j > 0) ? desc->log2_chroma_w : 0;
-                int vshift = (j > 0) ? desc->log2_chroma_h : 0;
+            for (i = 0; i < 3; i++) {
+                int hshift = (i > 0) ? desc->log2_chroma_w : 0;
+                int vshift = (i > 0) ? desc->log2_chroma_h : 0;
                 int off = ((frame->window.left_offset >> hshift) << pixel_shift) +
-                          (frame->window.top_offset   >> vshift) * dst->linesize[j];
-                dst->data[j] += off;
+                          (frame->window.top_offset   >> vshift) * dst->linesize[i];
+                dst->data[i] += off;
             }
-            av_log(s->avctx, AV_LOG_DEBUG, "Output frame with POC %d.\n", frame->poc);
+            av_log(s->avctx, AV_LOG_DEBUG,
+                   "Output frame with POC %d.\n", frame->poc);
             return 1;
         }
 
@@ -206,17 +212,17 @@
 static int init_slice_rpl(HEVCContext *s)
 {
     HEVCFrame *frame = s->ref;
-    int ctb_count   = frame->ctb_count;
-    int ctb_addr_ts = s->pps->ctb_addr_rs_to_ts[s->sh.slice_segment_addr];
+    int ctb_count    = frame->ctb_count;
+    int ctb_addr_ts  = s->pps->ctb_addr_rs_to_ts[s->sh.slice_segment_addr];
     int i;
 
     if (s->slice_idx >= frame->rpl_buf->size / sizeof(RefPicListTab))
         return AVERROR_INVALIDDATA;
 
     for (i = ctb_addr_ts; i < ctb_count; i++)
-        frame->rpl_tab[i] = (RefPicListTab*)frame->rpl_buf->data + s->slice_idx;
+        frame->rpl_tab[i] = (RefPicListTab *)frame->rpl_buf->data + s->slice_idx;
 
-    frame->refPicList = (RefPicList*)frame->rpl_tab[ctb_addr_ts];
+    frame->refPicList = (RefPicList *)frame->rpl_tab[ctb_addr_ts];
 
     return 0;
 }
@@ -245,8 +251,7 @@
 
         /* The order of the elements is
          * ST_CURR_BEF - ST_CURR_AFT - LT_CURR for the L0 and
-         * ST_CURR_AFT - ST_CURR_BEF - LT_CURR for the L1
-         */
+         * ST_CURR_AFT - ST_CURR_BEF - LT_CURR for the L1 */
         int cand_lists[3] = { list_idx ? ST_CURR_AFT : ST_CURR_BEF,
                               list_idx ? ST_CURR_BEF : ST_CURR_AFT,
                               LT_CURR };
@@ -256,9 +261,9 @@
             for (i = 0; i < FF_ARRAY_ELEMS(cand_lists); i++) {
                 RefPicList *rps = &s->rps[cand_lists[i]];
                 for (j = 0; j < rps->nb_refs && rpl_tmp.nb_refs < MAX_REFS; j++) {
-                    rpl_tmp.list[rpl_tmp.nb_refs] = rps->list[j];
-                    rpl_tmp.ref[rpl_tmp.nb_refs]  = rps->ref[j];
-                    rpl_tmp.isLongTerm[rpl_tmp.nb_refs] = (i == 2);
+                    rpl_tmp.list[rpl_tmp.nb_refs]       = rps->list[j];
+                    rpl_tmp.ref[rpl_tmp.nb_refs]        = rps->ref[j];
+                    rpl_tmp.isLongTerm[rpl_tmp.nb_refs] = i == 2;
                     rpl_tmp.nb_refs++;
                 }
             }
@@ -307,7 +312,7 @@
 
     for (i = 0; i < FF_ARRAY_ELEMS(s->DPB); i++) {
         HEVCFrame *ref = &s->DPB[i];
-        if (ref->frame->buf[0] && (ref->sequence == s->seq_decode)) {
+        if (ref->frame->buf[0] && ref->sequence == s->seq_decode) {
             if (ref->poc == poc || (ref->poc & LtMask) == poc)
                 return ref;
         }
@@ -329,15 +334,14 @@
     HEVCFrame *frame;
     int i, x, y;
 
-
     frame = alloc_frame(s);
     if (!frame)
         return NULL;
 
     if (!s->sps->pixel_shift) {
         for (i = 0; frame->frame->buf[i]; i++)
-             memset(frame->frame->buf[i]->data, 1 << (s->sps->bit_depth - 1),
-                    frame->frame->buf[i]->size);
+            memset(frame->frame->buf[i]->data, 1 << (s->sps->bit_depth - 1),
+                   frame->frame->buf[i]->size);
     } else {
         for (i = 0; frame->frame->data[i]; i++)
             for (y = 0; y < (s->sps->height >> s->sps->vshift[i]); y++)
@@ -446,15 +450,15 @@
     int prev_poc_msb = s->pocTid0 - prev_poc_lsb;
     int poc_msb;
 
-    if ((poc_lsb < prev_poc_lsb) && ((prev_poc_lsb - poc_lsb) >= max_poc_lsb / 2))
+    if (poc_lsb < prev_poc_lsb && prev_poc_lsb - poc_lsb >= max_poc_lsb / 2)
         poc_msb = prev_poc_msb + max_poc_lsb;
-    else if ((poc_lsb > prev_poc_lsb) && ((poc_lsb - prev_poc_lsb) > (max_poc_lsb / 2)))
+    else if (poc_lsb > prev_poc_lsb && poc_lsb - prev_poc_lsb > max_poc_lsb / 2)
         poc_msb = prev_poc_msb - max_poc_lsb;
     else
         poc_msb = prev_poc_msb;
 
     // For BLA picture types, POCmsb is set to 0.
-    if (s->nal_unit_type == NAL_BLA_W_LP ||
+    if (s->nal_unit_type == NAL_BLA_W_LP   ||
         s->nal_unit_type == NAL_BLA_W_RADL ||
         s->nal_unit_type == NAL_BLA_N_LP)
         poc_msb = 0;

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/hevc_sei.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/hevc_sei.c Changed

@@ -22,10 +22,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "hevc.h"
 #include "golomb.h"
+#include "hevc.h"
 
-static void decode_nal_sei_decoded_picture_hash(HEVCContext *s, int payload_size)
+static void decode_nal_sei_decoded_picture_hash(HEVCContext *s)
 {
     int cIdx, i;
     uint8_t hash_type;
@@ -34,47 +34,94 @@
     GetBitContext *gb = &s->HEVClc->gb;
     hash_type = get_bits(gb, 8);
 
-
-    for( cIdx = 0; cIdx < 3/*((s->sps->chroma_format_idc == 0) ? 1 : 3)*/; cIdx++ ) {
-        if ( hash_type == 0 ) {
+    for (cIdx = 0; cIdx < 3/*((s->sps->chroma_format_idc == 0) ? 1 : 3)*/; cIdx++) {
+        if (hash_type == 0) {
             s->is_md5 = 1;
-            for( i = 0; i < 16; i++) {
+            for (i = 0; i < 16; i++)
                 s->md5[cIdx][i] = get_bits(gb, 8);
-            }
-        } else if( hash_type == 1 ) {
+        } else if (hash_type == 1) {
             // picture_crc = get_bits(gb, 16);
             skip_bits(gb, 16);
-        } else if( hash_type == 2 ) {
+        } else if (hash_type == 2) {
             // picture_checksum = get_bits(gb, 32);
             skip_bits(gb, 32);
         }
     }
 }
 
-static void decode_nal_sei_frame_packing_arrangement(HEVCLocalContext *lc)
+static void decode_nal_sei_frame_packing_arrangement(HEVCContext *s)
 {
-    GetBitContext *gb = &lc->gb;
-    int cancel, type, quincunx;
+    GetBitContext *gb = &s->HEVClc->gb;
 
-    get_ue_golomb(gb);                      // frame_packing_arrangement_id
-    cancel = get_bits1(gb);                 // frame_packing_cancel_flag
-    if ( cancel == 0 )
-    {
-        type = get_bits(gb, 7);             // frame_packing_arrangement_type
-        quincunx = get_bits1(gb);           // quincunx_sampling_flag
-        skip_bits(gb, 6);                   // content_interpretation_type
+    get_ue_golomb(gb);                  // frame_packing_arrangement_id
+    s->sei_frame_packing_present = !get_bits1(gb);
+
+    if (s->sei_frame_packing_present) {
+        s->frame_packing_arrangement_type = get_bits(gb, 7);
+        s->quincunx_subsampling           = get_bits1(gb);
+        s->content_interpretation_type    = get_bits(gb, 6);
 
         // the following skips spatial_flipping_flag frame0_flipped_flag
         // field_views_flag current_frame_is_frame0_flag
         // frame0_self_contained_flag frame1_self_contained_flag
         skip_bits(gb, 6);
 
-        if ( quincunx == 0 && type != 5 )
-            skip_bits(gb, 16);              // frame[01]_grid_position_[xy]
-        skip_bits(gb, 8);                   // frame_packing_arrangement_reserved_byte
-        skip_bits1(gb);                     // frame_packing_arrangement_persistance_flag
+        if (!s->quincunx_subsampling && s->frame_packing_arrangement_type != 5)
+            skip_bits(gb, 16);  // frame[01]_grid_position_[xy]
+        skip_bits(gb, 8);       // frame_packing_arrangement_reserved_byte
+        skip_bits1(gb);         // frame_packing_arrangement_persistance_flag
+    }
+    skip_bits1(gb);             // upsampled_aspect_ratio_flag
+}
+
+static int decode_pic_timing(HEVCContext *s)
+{
+    GetBitContext *gb = &s->HEVClc->gb;
+    HEVCSPS *sps;
+
+    if (!s->sps_list[s->active_seq_parameter_set_id])
+        return(AVERROR(ENOMEM));
+    sps = (HEVCSPS*)s->sps_list[s->active_seq_parameter_set_id]->data;
+
+    if (sps->vui.frame_field_info_present_flag) {
+        int pic_struct = get_bits(gb, 4);
+        s->picture_struct = AV_PICTURE_STRUCTURE_UNKNOWN;
+        if (pic_struct == 2) {
+            av_log(s->avctx, AV_LOG_DEBUG, "BOTTOM Field\n");
+            s->picture_struct = AV_PICTURE_STRUCTURE_BOTTOM_FIELD;
+        } else if (pic_struct == 1) {
+            av_log(s->avctx, AV_LOG_DEBUG, "TOP Field\n");
+            s->picture_struct = AV_PICTURE_STRUCTURE_TOP_FIELD;
+        }
+        get_bits(gb, 2);                   // source_scan_type
+        get_bits(gb, 1);                   // duplicate_flag
+    }
+    return 1;
+}
+
+static int active_parameter_sets(HEVCContext *s)
+{
+    GetBitContext *gb = &s->HEVClc->gb;
+    int num_sps_ids_minus1;
+    int i;
+    unsigned active_seq_parameter_set_id;
+
+    get_bits(gb, 4); // active_video_parameter_set_id
+    get_bits(gb, 1); // self_contained_cvs_flag
+    get_bits(gb, 1); // num_sps_ids_minus1
+    num_sps_ids_minus1 = get_ue_golomb_long(gb); // num_sps_ids_minus1
+
+    active_seq_parameter_set_id = get_ue_golomb_long(gb);
+    if (active_seq_parameter_set_id >= MAX_SPS_COUNT) {
+        av_log(s->avctx, AV_LOG_ERROR, "active_parameter_set_id %d invalid\n", active_seq_parameter_set_id);
+        return AVERROR_INVALIDDATA;
     }
-    skip_bits1(gb);                         // upsampled_aspect_ratio_flag
+    s->active_seq_parameter_set_id = active_seq_parameter_set_id;
+
+    for (i = 1; i <= num_sps_ids_minus1; i++)
+        get_ue_golomb_long(gb); // active_seq_parameter_set_id[i]
+
+    return 0;
 }
 
 static int decode_nal_sei_message(HEVCContext *s)
@@ -87,32 +134,44 @@
     av_log(s->avctx, AV_LOG_DEBUG, "Decoding SEI\n");
 
     while (byte == 0xFF) {
-        byte = get_bits(gb, 8);
+        byte          = get_bits(gb, 8);
         payload_type += byte;
     }
     byte = 0xFF;
     while (byte == 0xFF) {
-        byte = get_bits(gb, 8);
+        byte          = get_bits(gb, 8);
         payload_size += byte;
     }
     if (s->nal_unit_type == NAL_SEI_PREFIX) {
-        if (payload_type == 256 /*&& s->decode_checksum_sei*/)
-            decode_nal_sei_decoded_picture_hash(s, payload_size);
-        else if (payload_type == 45)
-            decode_nal_sei_frame_packing_arrangement(s->HEVClc);
-        else {
+        if (payload_type == 256 /*&& s->decode_checksum_sei*/) {
+            decode_nal_sei_decoded_picture_hash(s);
+            return 1;
+        } else if (payload_type == 45) {
+            decode_nal_sei_frame_packing_arrangement(s);
+            return 1;
+        } else if (payload_type == 1){
+            int ret = decode_pic_timing(s);
+            av_log(s->avctx, AV_LOG_DEBUG, "Skipped PREFIX SEI %d\n", payload_type);
+            skip_bits(gb, 8 * payload_size);
+            return ret;
+        } else if (payload_type == 129){
+            active_parameter_sets(s);
+            av_log(s->avctx, AV_LOG_DEBUG, "Skipped PREFIX SEI %d\n", payload_type);
+            return 1;
+        } else {
             av_log(s->avctx, AV_LOG_DEBUG, "Skipped PREFIX SEI %d\n", payload_type);
             skip_bits(gb, 8*payload_size);
+            return 1;
         }
     } else { /* nal_unit_type == NAL_SEI_SUFFIX */
         if (payload_type == 132 /* && s->decode_checksum_sei */)
-            decode_nal_sei_decoded_picture_hash(s, payload_size);
+            decode_nal_sei_decoded_picture_hash(s);
         else {
             av_log(s->avctx, AV_LOG_DEBUG, "Skipped SUFFIX SEI %d\n", payload_type);
-            skip_bits(gb, 8*payload_size);
+            skip_bits(gb, 8 * payload_size);
         }
+        return 1;
     }
-    return 0;
 }
 
 static int more_rbsp_data(GetBitContext *gb)
@@ -122,8 +181,12 @@
 
 int ff_hevc_decode_nal_sei(HEVCContext *s)
 {
+    int ret;
+
     do {
-        decode_nal_sei_message(s);
+        ret = decode_nal_sei_message(s);
+        if (ret < 0)
+            return(AVERROR(ENOMEM));
     } while (more_rbsp_data(&s->HEVClc->gb));
-    return 0;
+    return 1;
 }

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/hevcdsp.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/hevcdsp.c Changed

@@ -1,5 +1,5 @@
 /*
- * HEVC video Decoder
+ * HEVC video decoder
  *
  * Copyright (C) 2012 - 2013 Guillaume Martres
  *
@@ -20,84 +20,83 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "hevc.h"
 #include "hevcdsp.h"
 
 static const int8_t transform[32][32] = {
-    { 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
-     64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64 },
-    { 90, 90, 88, 85, 82, 78, 73, 67, 61, 54, 46, 38, 31, 22, 13, 4,
-     -4, -13, -22, -31, -38, -46, -54, -61, -67, -73, -78, -82, -85, -88, -90, -90 },
-    { 90, 87, 80, 70, 57, 43, 25, 9, -9, -25, -43, -57, -70, -80, -87, -90,
-     -90, -87, -80, -70, -57, -43, -25, -9, 9, 25, 43, 57, 70, 80, 87, 90 },
-    { 90, 82, 67, 46, 22, -4, -31, -54, -73, -85, -90, -88, -78, -61, -38, -13,
-     13, 38, 61, 78, 88, 90, 85, 73, 54, 31, 4, -22, -46, -67, -82, -90 },
-    { 89, 75, 50, 18, -18, -50, -75, -89, -89, -75, -50, -18, 18, 50, 75, 89,
-     89, 75, 50, 18, -18, -50, -75, -89, -89, -75, -50, -18, 18, 50, 75, 89 },
-    { 88, 67, 31, -13, -54, -82, -90, -78, -46, -4, 38, 73, 90, 85, 61, 22,
-     -22, -61, -85, -90, -73, -38, 4, 46, 78, 90, 82, 54, 13, -31, -67, -88 },
-    { 87, 57, 9, -43, -80, -90, -70, -25, 25, 70, 90, 80, 43, -9, -57, -87,
-     -87, -57, -9, 43, 80, 90, 70, 25, -25, -70, -90, -80, -43, 9, 57, 87 },
-    { 85, 46, -13, -67, -90, -73, -22, 38, 82, 88, 54, -4, -61, -90, -78, -31,
-     31, 78, 90, 61, 4, -54, -88, -82, -38, 22, 73, 90, 67, 13, -46, -85 },
-    { 83, 36, -36, -83, -83, -36, 36, 83, 83, 36, -36, -83, -83, -36, 36, 83,
-     83, 36, -36, -83, -83, -36, 36, 83, 83, 36, -36, -83, -83, -36, 36, 83 },
-    { 82, 22, -54, -90, -61, 13, 78, 85, 31, -46, -90, -67, 4, 73, 88, 38,
-     -38, -88, -73, -4, 67, 90, 46, -31, -85, -78, -13, 61, 90, 54, -22, -82 },
-    { 80, 9, -70, -87, -25, 57, 90, 43, -43, -90, -57, 25, 87, 70, -9, -80,
-     -80, -9, 70, 87, 25, -57, -90, -43, 43, 90, 57, -25, -87, -70, 9, 80 },
-    { 78, -4, -82, -73, 13, 85, 67, -22, -88, -61, 31, 90, 54, -38, -90, -46,
-     46, 90, 38, -54, -90, -31, 61, 88, 22, -67, -85, -13, 73, 82, 4, -78 },
-    { 75, -18, -89, -50, 50, 89, 18, -75, -75, 18, 89, 50, -50, -89, -18, 75,
-     75, -18, -89, -50, 50, 89, 18, -75, -75, 18, 89, 50, -50, -89, -18, 75 },
-    { 73, -31, -90, -22, 78, 67, -38, -90, -13, 82, 61, -46, -88, -4, 85, 54,
-     -54, -85, 4, 88, 46, -61, -82, 13, 90, 38, -67, -78, 22, 90, 31, -73 },
-    { 70, -43, -87, 9, 90, 25, -80, -57, 57, 80, -25, -90, -9, 87, 43, -70,
-     -70, 43, 87, -9, -90, -25, 80, 57, -57, -80, 25, 90, 9, -87, -43, 70 },
-    { 67, -54, -78, 38, 85, -22, -90, 4, 90, 13, -88, -31, 82, 46, -73, -61,
-     61, 73, -46, -82, 31, 88, -13, -90, -4, 90, 22, -85, -38, 78, 54, -67 },
-    { 64, -64, -64, 64, 64, -64, -64, 64, 64, -64, -64, 64, 64, -64, -64, 64,
-     64, -64, -64, 64, 64, -64, -64, 64, 64, -64, -64, 64, 64, -64, -64, 64 },
-    { 61, -73, -46, 82, 31, -88, -13, 90, -4, -90, 22, 85, -38, -78, 54, 67,
-     -67, -54, 78, 38, -85, -22, 90, 4, -90, 13, 88, -31, -82, 46, 73, -61 },
-    { 57, -80, -25, 90, -9, -87, 43, 70, -70, -43, 87, 9, -90, 25, 80, -57,
-     -57, 80, 25, -90, 9, 87, -43, -70, 70, 43, -87, -9, 90, -25, -80, 57 },
-    { 54, -85, -4, 88, -46, -61, 82, 13, -90, 38, 67, -78, -22, 90, -31, -73,
-     73, 31, -90, 22, 78, -67, -38, 90, -13, -82, 61, 46, -88, 4, 85, -54 },
-    { 50, -89, 18, 75, -75, -18, 89, -50, -50, 89, -18, -75, 75, 18, -89, 50,
-     50, -89, 18, 75, -75, -18, 89, -50, -50, 89, -18, -75, 75, 18, -89, 50 },
-    { 46, -90, 38, 54, -90, 31, 61, -88, 22, 67, -85, 13, 73, -82, 4, 78,
-     -78, -4, 82, -73, -13, 85, -67, -22, 88, -61, -31, 90, -54, -38, 90, -46 },
-    { 43, -90, 57, 25, -87, 70, 9, -80, 80, -9, -70, 87, -25, -57, 90, -43,
-     -43, 90, -57, -25, 87, -70, -9, 80, -80, 9, 70, -87, 25, 57, -90, 43 },
-    { 38, -88, 73, -4, -67, 90, -46, -31, 85, -78, 13, 61, -90, 54, 22, -82,
-     82, -22, -54, 90, -61, -13, 78, -85, 31, 46, -90, 67, 4, -73, 88, -38 },
-    { 36, -83, 83, -36, -36, 83, -83, 36, 36, -83, 83, -36, -36, 83, -83, 36,
-     36, -83, 83, -36, -36, 83, -83, 36, 36, -83, 83, -36, -36, 83, -83, 36 },
-    { 31, -78, 90, -61, 4, 54, -88, 82, -38, -22, 73, -90, 67, -13, -46, 85,
-     -85, 46, 13, -67, 90, -73, 22, 38, -82, 88, -54, -4, 61, -90, 78, -31 },
-    { 25, -70, 90, -80, 43, 9, -57, 87, -87, 57, -9, -43, 80, -90, 70, -25,
-     -25, 70, -90, 80, -43, -9, 57, -87, 87, -57, 9, 43, -80, 90, -70, 25 },
-    { 22, -61, 85, -90, 73, -38, -4, 46, -78, 90, -82, 54, -13, -31, 67, -88,
-     88, -67, 31, 13, -54, 82, -90, 78, -46, 4, 38, -73, 90, -85, 61, -22 },
-    { 18, -50, 75, -89, 89, -75, 50, -18, -18, 50, -75, 89, -89, 75, -50, 18,
-     18, -50, 75, -89, 89, -75, 50, -18, -18, 50, -75, 89, -89, 75, -50, 18 },
-    { 13, -38, 61, -78, 88, -90, 85, -73, 54, -31, 4, 22, -46, 67, -82, 90,
-     -90, 82, -67, 46, -22, -4, 31, -54, 73, -85, 90, -88, 78, -61, 38, -13 },
-    { 9, -25, 43, -57, 70, -80, 87, -90, 90, -87, 80, -70, 57, -43, 25, -9,
-     -9, 25, -43, 57, -70, 80, -87, 90, -90, 87, -80, 70, -57, 43, -25, 9 },
-    { 4, -13, 22, -31, 38, -46, 54, -61, 67, -73, 78, -82, 85, -88, 90, -90,
-     90, -90, 88, -85, 82, -78, 73, -67, 61, -54, 46, -38, 31, -22, 13, -4 },
+    { 64,  64,  64,  64,  64,  64,  64,  64,  64,  64,  64,  64,  64,  64,  64,  64,
+      64,  64,  64,  64,  64,  64,  64,  64,  64,  64,  64,  64,  64,  64,  64,  64 },
+    { 90,  90,  88,  85,  82,  78,  73,  67,  61,  54,  46,  38,  31,  22,  13,   4,
+      -4, -13, -22, -31, -38, -46, -54, -61, -67, -73, -78, -82, -85, -88, -90, -90 },
+    { 90,  87,  80,  70,  57,  43,  25,   9,  -9, -25, -43, -57, -70, -80, -87, -90,
+     -90, -87, -80, -70, -57, -43, -25,  -9,   9,  25,  43,  57,  70,  80,  87,  90 },
+    { 90,  82,  67,  46,  22,  -4, -31, -54, -73, -85, -90, -88, -78, -61, -38, -13,
+      13,  38,  61,  78,  88,  90,  85,  73,  54,  31,   4, -22, -46, -67, -82, -90 },
+    { 89,  75,  50,  18, -18, -50, -75, -89, -89, -75, -50, -18,  18,  50,  75,  89,
+      89,  75,  50,  18, -18, -50, -75, -89, -89, -75, -50, -18,  18,  50,  75,  89 },
+    { 88,  67,  31, -13, -54, -82, -90, -78, -46, -4,   38,  73,  90,  85,  61,  22,
+     -22, -61, -85, -90, -73, -38,   4,  46,  78,  90,  82,  54,  13, -31, -67, -88 },
+    { 87,  57,   9, -43, -80, -90, -70, -25,  25,  70,  90,  80,  43,  -9, -57, -87,
+     -87, -57,  -9,  43,  80,  90,  70,  25, -25, -70, -90, -80, -43,   9,  57,  87 },
+    { 85,  46, -13, -67, -90, -73, -22,  38,  82,  88,  54,  -4, -61, -90, -78, -31,
+      31,  78,  90,  61,   4, -54, -88, -82, -38,  22,  73,  90,  67,  13, -46, -85 },
+    { 83,  36, -36, -83, -83, -36,  36,  83,  83,  36, -36, -83, -83, -36,  36,  83,
+      83,  36, -36, -83, -83, -36,  36,  83,  83,  36, -36, -83, -83, -36,  36,  83 },
+    { 82,  22, -54, -90, -61,  13,  78,  85,  31, -46, -90, -67,   4,  73,  88,  38,
+     -38, -88, -73,  -4,  67,  90,  46, -31, -85, -78, -13,  61,  90,  54, -22, -82 },
+    { 80,   9, -70, -87, -25,  57,  90,  43, -43, -90, -57,  25,  87,  70,  -9, -80,
+     -80,  -9,  70,  87,  25, -57, -90, -43,  43,  90,  57, -25, -87, -70,   9,  80 },
+    { 78,  -4, -82, -73,  13,  85,  67, -22, -88, -61,  31,  90,  54, -38, -90, -46,
+      46,  90,  38, -54, -90, -31,  61,  88,  22, -67, -85, -13,  73,  82,   4, -78 },
+    { 75, -18, -89, -50,  50,  89,  18, -75, -75,  18,  89,  50, -50, -89, -18,  75,
+      75, -18, -89, -50,  50,  89,  18, -75, -75,  18,  89,  50, -50, -89, -18,  75 },
+    { 73, -31, -90, -22,  78,  67, -38, -90, -13,  82,  61, -46, -88,  -4,  85,  54,
+     -54, -85,   4,  88,  46, -61, -82,  13,  90,  38, -67, -78,  22,  90,  31, -73 },
+    { 70, -43, -87,   9,  90,  25, -80, -57,  57,  80, -25, -90,  -9,  87,  43, -70,
+     -70,  43,  87,  -9, -90, -25,  80,  57, -57, -80,  25,  90,   9, -87, -43,  70 },
+    { 67, -54, -78,  38,  85, -22, -90,   4,  90,  13, -88, -31,  82,  46, -73, -61,
+      61,  73, -46, -82,  31,  88, -13, -90,  -4,  90,  22, -85, -38,  78,  54, -67 },
+    { 64, -64, -64,  64,  64, -64, -64,  64,  64, -64, -64,  64,  64, -64, -64,  64,
+      64, -64, -64,  64,  64, -64, -64,  64,  64, -64, -64,  64,  64, -64, -64,  64 },
+    { 61, -73, -46,  82,  31, -88, -13,  90,  -4, -90,  22,  85, -38, -78,  54,  67,
+     -67, -54,  78,  38, -85, -22,  90,   4, -90,  13,  88, -31, -82,  46,  73, -61 },
+    { 57, -80, -25,  90,  -9, -87,  43,  70, -70, -43,  87,   9, -90,  25,  80, -57,
+     -57,  80,  25, -90,   9,  87, -43, -70,  70,  43, -87,  -9,  90, -25, -80,  57 },
+    { 54, -85,  -4,  88, -46, -61,  82,  13, -90,  38,  67, -78, -22,  90, -31, -73,
+      73,  31, -90,  22,  78, -67, -38,  90, -13, -82,  61,  46, -88,   4,  85, -54 },
+    { 50, -89,  18,  75, -75, -18,  89, -50, -50,  89, -18, -75,  75,  18, -89,  50,
+      50, -89,  18,  75, -75, -18,  89, -50, -50,  89, -18, -75,  75,  18, -89,  50 },
+    { 46, -90,  38,  54, -90,  31,  61, -88,  22,  67, -85,  13,  73, -82,   4,  78,
+     -78,  -4,  82, -73, -13,  85, -67, -22,  88, -61, -31,  90, -54, -38,  90, -46 },
+    { 43, -90,  57,  25, -87,  70,   9, -80,  80,  -9, -70,  87, -25, -57,  90, -43,
+     -43,  90, -57, -25,  87, -70,  -9,  80, -80,   9,  70, -87,  25,  57, -90,  43 },
+    { 38, -88,  73,  -4, -67,  90, -46, -31,  85, -78,  13,  61, -90,  54,  22, -82,
+      82, -22, -54,  90, -61, -13,  78, -85,  31,  46, -90,  67,   4, -73,  88, -38 },
+    { 36, -83,  83, -36, -36,  83, -83,  36,  36, -83,  83, -36, -36,  83, -83,  36,
+      36, -83,  83, -36, -36,  83, -83,  36,  36, -83,  83, -36, -36,  83, -83,  36 },
+    { 31, -78,  90, -61,   4,  54, -88,  82, -38, -22,  73, -90,  67, -13, -46,  85,
+     -85,  46,  13, -67,  90, -73,  22,  38, -82,  88, -54,  -4,  61, -90,  78, -31 },
+    { 25, -70,  90, -80,  43,   9, -57,  87, -87,  57,  -9, -43,  80, -90,  70, -25,
+     -25,  70, -90,  80, -43,  -9,  57, -87,  87, -57,   9,  43, -80,  90, -70,  25 },
+    { 22, -61,  85, -90,  73, -38,  -4,  46, -78,  90, -82,  54, -13, -31,  67, -88,
+      88, -67,  31,  13, -54,  82, -90,  78, -46,   4,  38, -73,  90, -85,  61, -22 },
+    { 18, -50,  75, -89,  89, -75,  50, -18, -18,  50, -75,  89, -89,  75, -50,  18,
+      18, -50,  75, -89,  89, -75,  50, -18, -18,  50, -75,  89, -89,  75, -50,  18 },
+    { 13, -38,  61, -78,  88, -90,  85, -73,  54, -31,   4,  22, -46,  67, -82,  90,
+     -90,  82, -67,  46, -22,  -4,  31, -54,  73, -85,  90, -88,  78, -61,  38, -13 },
+    {  9, -25,  43, -57,  70, -80,  87, -90,  90, -87,  80, -70,  57, -43,  25, -9,
+      -9,  25, -43,  57, -70,  80, -87,  90, -90,  87, -80,  70, -57,  43, -25,   9 },
+    {  4, -13,  22, -31,  38, -46,  54, -61,  67, -73,  78, -82,  85, -88,  90, -90,
+      90, -90,  88, -85,  82, -78,  73, -67,  61, -54,  46, -38,  31, -22,  13,  -4 },
 };
 
 DECLARE_ALIGNED(16, const int8_t, ff_hevc_epel_filters[7][16]) = {
-    { -2,  58,  10,  -2,-2,  58,  10,  -2,-2,  58,  10,  -2,-2,  58,  10,  -2 },
-    { -4,  54,  16,  -2,-4,  54,  16,  -2,-4,  54,  16,  -2,-4,  54,  16,  -2 },
-    { -6,  46,  28,  -4,-6,  46,  28,  -4,-6,  46,  28,  -4,-6,  46,  28,  -4 },
-    { -4,  36,  36,  -4,-4,  36,  36,  -4,-4,  36,  36,  -4,-4,  36,  36,  -4 },
-    { -4,  28,  46,  -6,-4,  28,  46,  -6,-4,  28,  46,  -6,-4,  28,  46,  -6 },
-    { -2,  16,  54,  -4,-2,  16,  54,  -4,-2,  16,  54,  -4,-2,  16,  54,  -4 },
-    { -2,  10,  58,  -2,-2,  10,  58,  -2,-2,  10,  58,  -2,-2,  10,  58,  -2 },
+    { -2, 58, 10, -2, -2, 58, 10, -2, -2, 58, 10, -2, -2, 58, 10, -2 },
+    { -4, 54, 16, -2, -4, 54, 16, -2, -4, 54, 16, -2, -4, 54, 16, -2 },
+    { -6, 46, 28, -4, -6, 46, 28, -4, -6, 46, 28, -4, -6, 46, 28, -4 },
+    { -4, 36, 36, -4, -4, 36, 36, -4, -4, 36, 36, -4, -4, 36, 36, -4 },
+    { -4, 28, 46, -6, -4, 28, 46, -6, -4, 28, 46, -6, -4, 28, 46, -6 },
+    { -2, 16, 54, -4, -2, 16, 54, -4, -2, 16, 54, -4, -2, 16, 54, -4 },
+    { -2, 10, 58, -2, -2, 10, 58, -2, -2, 10, 58, -2, -2, 10, 58, -2 },
 };
 
 #define BIT_DEPTH 8
@@ -117,67 +116,66 @@
 #undef FUNC
 #define FUNC(a, depth) a ## _ ## depth
 
-#define HEVC_DSP(depth)                                                            \
-    hevcdsp->put_pcm = FUNC(put_pcm, depth);                                       \
-    hevcdsp->transquant_bypass[0] = FUNC(transquant_bypass4x4, depth);             \
-    hevcdsp->transquant_bypass[1] = FUNC(transquant_bypass8x8, depth);             \
-    hevcdsp->transquant_bypass[2] = FUNC(transquant_bypass16x16, depth);           \
-    hevcdsp->transquant_bypass[3] = FUNC(transquant_bypass32x32, depth);           \
-    hevcdsp->transform_skip = FUNC(transform_skip, depth);                         \
-    hevcdsp->transform_4x4_luma_add = FUNC(transform_4x4_luma_add, depth);         \
-    hevcdsp->transform_add[0] = FUNC(transform_4x4_add, depth);                    \
-    hevcdsp->transform_add[1] = FUNC(transform_8x8_add, depth);                    \
-    hevcdsp->transform_add[2] = FUNC(transform_16x16_add, depth);                  \
-    hevcdsp->transform_add[3] = FUNC(transform_32x32_add, depth);                  \
-                                                                                   \
-    hevcdsp->sao_band_filter[0]  = FUNC(sao_band_filter_0, depth);                 \
-    hevcdsp->sao_band_filter[1]  = FUNC(sao_band_filter_1, depth);                 \
-    hevcdsp->sao_band_filter[2]  = FUNC(sao_band_filter_2, depth);                 \
-    hevcdsp->sao_band_filter[3]  = FUNC(sao_band_filter_3, depth);                 \
-                                                                                   \
-    hevcdsp->sao_edge_filter[0]  = FUNC(sao_edge_filter_0, depth);                 \
-    hevcdsp->sao_edge_filter[1]  = FUNC(sao_edge_filter_1, depth);                 \
-    hevcdsp->sao_edge_filter[2]  = FUNC(sao_edge_filter_2, depth);                 \
-    hevcdsp->sao_edge_filter[3]  = FUNC(sao_edge_filter_3, depth);                 \
-                                                                                   \
-    hevcdsp->put_hevc_qpel[0][0] = FUNC(put_hevc_qpel_pixels, depth);              \
-    hevcdsp->put_hevc_qpel[0][1] = FUNC(put_hevc_qpel_h1, depth);                  \
-    hevcdsp->put_hevc_qpel[0][2] = FUNC(put_hevc_qpel_h2, depth);                  \
-    hevcdsp->put_hevc_qpel[0][3] = FUNC(put_hevc_qpel_h3, depth);                  \
-    hevcdsp->put_hevc_qpel[1][0] = FUNC(put_hevc_qpel_v1, depth);                  \
-    hevcdsp->put_hevc_qpel[1][1] = FUNC(put_hevc_qpel_h1v1, depth);                \
-    hevcdsp->put_hevc_qpel[1][2] = FUNC(put_hevc_qpel_h2v1, depth);                \
-    hevcdsp->put_hevc_qpel[1][3] = FUNC(put_hevc_qpel_h3v1, depth);                \
-    hevcdsp->put_hevc_qpel[2][0] = FUNC(put_hevc_qpel_v2, depth);                  \
-    hevcdsp->put_hevc_qpel[2][1] = FUNC(put_hevc_qpel_h1v2, depth);                \
-    hevcdsp->put_hevc_qpel[2][2] = FUNC(put_hevc_qpel_h2v2, depth);                \
-    hevcdsp->put_hevc_qpel[2][3] = FUNC(put_hevc_qpel_h3v2, depth);                \
-    hevcdsp->put_hevc_qpel[3][0] = FUNC(put_hevc_qpel_v3, depth);                  \
-    hevcdsp->put_hevc_qpel[3][1] = FUNC(put_hevc_qpel_h1v3, depth);                \
-    hevcdsp->put_hevc_qpel[3][2] = FUNC(put_hevc_qpel_h2v3, depth);                \
-    hevcdsp->put_hevc_qpel[3][3] = FUNC(put_hevc_qpel_h3v3, depth);                \
-                                                                                   \
-    hevcdsp->put_hevc_epel[0][0] = FUNC(put_hevc_epel_pixels, depth);              \
-    hevcdsp->put_hevc_epel[0][1] = FUNC(put_hevc_epel_h, depth);                   \
-    hevcdsp->put_hevc_epel[1][0] = FUNC(put_hevc_epel_v, depth);                   \
-    hevcdsp->put_hevc_epel[1][1] = FUNC(put_hevc_epel_hv, depth);                  \
-                                                                                   \
-                                                                                   \
-    hevcdsp->put_unweighted_pred = FUNC(put_unweighted_pred, depth);               \
-    hevcdsp->put_weighted_pred_avg = FUNC(put_weighted_pred_avg, depth);           \
-                                                                                   \
-    hevcdsp->weighted_pred = FUNC(weighted_pred, depth);                           \
-    hevcdsp->weighted_pred_avg = FUNC(weighted_pred_avg, depth);                   \
-    hevcdsp->hevc_h_loop_filter_luma = FUNC(hevc_h_loop_filter_luma, depth);       \
-    hevcdsp->hevc_v_loop_filter_luma = FUNC(hevc_v_loop_filter_luma, depth);       \
-    hevcdsp->hevc_h_loop_filter_chroma = FUNC(hevc_h_loop_filter_chroma, depth);   \
-    hevcdsp->hevc_v_loop_filter_chroma = FUNC(hevc_v_loop_filter_chroma, depth);   \
-    hevcdsp->hevc_h_loop_filter_luma_c = FUNC(hevc_h_loop_filter_luma, depth);     \
-    hevcdsp->hevc_v_loop_filter_luma_c = FUNC(hevc_v_loop_filter_luma, depth);     \
+#define HEVC_DSP(depth)                                                     \
+    hevcdsp->put_pcm                = FUNC(put_pcm, depth);                 \
+    hevcdsp->transquant_bypass[0]   = FUNC(transquant_bypass4x4, depth);    \
+    hevcdsp->transquant_bypass[1]   = FUNC(transquant_bypass8x8, depth);    \
+    hevcdsp->transquant_bypass[2]   = FUNC(transquant_bypass16x16, depth);  \
+    hevcdsp->transquant_bypass[3]   = FUNC(transquant_bypass32x32, depth);  \
+    hevcdsp->transform_skip         = FUNC(transform_skip, depth);          \
+    hevcdsp->transform_4x4_luma_add = FUNC(transform_4x4_luma_add, depth);  \
+    hevcdsp->transform_add[0]       = FUNC(transform_4x4_add, depth);       \
+    hevcdsp->transform_add[1]       = FUNC(transform_8x8_add, depth);       \
+    hevcdsp->transform_add[2]       = FUNC(transform_16x16_add, depth);     \
+    hevcdsp->transform_add[3]       = FUNC(transform_32x32_add, depth);     \
+                                                                            \
+    hevcdsp->sao_band_filter[0] = FUNC(sao_band_filter_0, depth);           \
+    hevcdsp->sao_band_filter[1] = FUNC(sao_band_filter_1, depth);           \
+    hevcdsp->sao_band_filter[2] = FUNC(sao_band_filter_2, depth);           \
+    hevcdsp->sao_band_filter[3] = FUNC(sao_band_filter_3, depth);           \
+                                                                            \
+    hevcdsp->sao_edge_filter[0] = FUNC(sao_edge_filter_0, depth);           \
+    hevcdsp->sao_edge_filter[1] = FUNC(sao_edge_filter_1, depth);           \
+    hevcdsp->sao_edge_filter[2] = FUNC(sao_edge_filter_2, depth);           \
+    hevcdsp->sao_edge_filter[3] = FUNC(sao_edge_filter_3, depth);           \
+                                                                            \
+    hevcdsp->put_hevc_qpel[0][0] = FUNC(put_hevc_qpel_pixels, depth);       \
+    hevcdsp->put_hevc_qpel[0][1] = FUNC(put_hevc_qpel_h1, depth);           \
+    hevcdsp->put_hevc_qpel[0][2] = FUNC(put_hevc_qpel_h2, depth);           \
+    hevcdsp->put_hevc_qpel[0][3] = FUNC(put_hevc_qpel_h3, depth);           \
+    hevcdsp->put_hevc_qpel[1][0] = FUNC(put_hevc_qpel_v1, depth);           \
+    hevcdsp->put_hevc_qpel[1][1] = FUNC(put_hevc_qpel_h1v1, depth);         \
+    hevcdsp->put_hevc_qpel[1][2] = FUNC(put_hevc_qpel_h2v1, depth);         \
+    hevcdsp->put_hevc_qpel[1][3] = FUNC(put_hevc_qpel_h3v1, depth);         \
+    hevcdsp->put_hevc_qpel[2][0] = FUNC(put_hevc_qpel_v2, depth);           \
+    hevcdsp->put_hevc_qpel[2][1] = FUNC(put_hevc_qpel_h1v2, depth);         \
+    hevcdsp->put_hevc_qpel[2][2] = FUNC(put_hevc_qpel_h2v2, depth);         \
+    hevcdsp->put_hevc_qpel[2][3] = FUNC(put_hevc_qpel_h3v2, depth);         \
+    hevcdsp->put_hevc_qpel[3][0] = FUNC(put_hevc_qpel_v3, depth);           \
+    hevcdsp->put_hevc_qpel[3][1] = FUNC(put_hevc_qpel_h1v3, depth);         \
+    hevcdsp->put_hevc_qpel[3][2] = FUNC(put_hevc_qpel_h2v3, depth);         \
+    hevcdsp->put_hevc_qpel[3][3] = FUNC(put_hevc_qpel_h3v3, depth);         \
+                                                                            \
+    hevcdsp->put_hevc_epel[0][0] = FUNC(put_hevc_epel_pixels, depth);       \
+    hevcdsp->put_hevc_epel[0][1] = FUNC(put_hevc_epel_h, depth);            \
+    hevcdsp->put_hevc_epel[1][0] = FUNC(put_hevc_epel_v, depth);            \
+    hevcdsp->put_hevc_epel[1][1] = FUNC(put_hevc_epel_hv, depth);           \
+                                                                            \
+    hevcdsp->put_unweighted_pred   = FUNC(put_unweighted_pred, depth);      \
+    hevcdsp->put_weighted_pred_avg = FUNC(put_weighted_pred_avg, depth);    \
+                                                                            \
+    hevcdsp->weighted_pred         = FUNC(weighted_pred, depth);            \
+    hevcdsp->weighted_pred_avg     = FUNC(weighted_pred_avg, depth);        \
+                                                                            \
+    hevcdsp->hevc_h_loop_filter_luma     = FUNC(hevc_h_loop_filter_luma, depth);   \
+    hevcdsp->hevc_v_loop_filter_luma     = FUNC(hevc_v_loop_filter_luma, depth);   \
+    hevcdsp->hevc_h_loop_filter_chroma   = FUNC(hevc_h_loop_filter_chroma, depth); \
+    hevcdsp->hevc_v_loop_filter_chroma   = FUNC(hevc_v_loop_filter_chroma, depth); \
+    hevcdsp->hevc_h_loop_filter_luma_c   = FUNC(hevc_h_loop_filter_luma, depth);   \
+    hevcdsp->hevc_v_loop_filter_luma_c   = FUNC(hevc_v_loop_filter_luma, depth);   \
     hevcdsp->hevc_h_loop_filter_chroma_c = FUNC(hevc_h_loop_filter_chroma, depth); \
     hevcdsp->hevc_v_loop_filter_chroma_c = FUNC(hevc_v_loop_filter_chroma, depth);
 
-
     switch (bit_depth) {
     case 9:
         HEVC_DSP(9);

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/hevcdsp.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/hevcdsp.h Changed

@@ -1,5 +1,5 @@
 /*
- * HEVC video Decoder
+ * HEVC video decoder
  *
  * Copyright (C) 2012 - 2013 Guillaume Martres
  *
@@ -25,49 +25,81 @@
 
 #include "get_bits.h"
 
-struct SAOParams;
+typedef struct SAOParams {
+    int offset_abs[3][4];   ///< sao_offset_abs
+    int offset_sign[3][4];  ///< sao_offset_sign
 
-typedef struct HEVCDSPContext {
-    void (*put_pcm)(uint8_t *_dst, ptrdiff_t _stride, int size,
-                    GetBitContext *gb, int pcm_bit_depth);
-
-    void (*transquant_bypass[4])(uint8_t *_dst, int16_t *coeffs, ptrdiff_t _stride);
-
-    void (*transform_skip)(uint8_t *dst, int16_t *coeffs, ptrdiff_t stride);
-
-    void (*transform_4x4_luma_add)(uint8_t *dst, int16_t *coeffs, ptrdiff_t stride);
+    int band_position[3];   ///< sao_band_position
 
-    void (*transform_add[4])(uint8_t *dst, int16_t *coeffs, ptrdiff_t _stride);
+    int eo_class[3];        ///< sao_eo_class
 
-    void (*sao_band_filter[4])( uint8_t *_dst, uint8_t *_src, ptrdiff_t _stride, struct SAOParams *sao, int *borders, int width, int height, int c_idx);
+    int offset_val[3][5];   ///<SaoOffsetVal
 
-    void (*sao_edge_filter[4])(uint8_t *_dst, uint8_t *_src, ptrdiff_t _stride,  struct SAOParams *sao, int *borders, int _width, int _height, int c_idx, uint8_t vert_edge, uint8_t horiz_edge, uint8_t diag_edge);
+    uint8_t type_idx[3];    ///< sao_type_idx
+} SAOParams;
 
+typedef struct HEVCDSPContext {
+    void (*put_pcm)(uint8_t *dst, ptrdiff_t stride, int size,
+                    GetBitContext *gb, int pcm_bit_depth);
 
-    void (*put_hevc_qpel[4][4])(int16_t *dst, ptrdiff_t dststride, uint8_t *src, ptrdiff_t srcstride,
-                                int width, int height, int16_t* mcbuffer);
-
-    void (*put_hevc_epel[2][2])(int16_t *dst, ptrdiff_t dststride, uint8_t *src, ptrdiff_t srcstride,
-                             int width, int height, int mx, int my, int16_t* mcbuffer);
-
-    void (*put_unweighted_pred)(uint8_t *dst, ptrdiff_t dststride, int16_t *src, ptrdiff_t srcstride,
-                                int width, int height);
+    void (*transquant_bypass[4])(uint8_t *dst, int16_t *coeffs,
+                                 ptrdiff_t stride);
 
-    void (*put_weighted_pred_avg)(uint8_t *dst, ptrdiff_t dststride, int16_t *src1, int16_t *src2,
-                                  ptrdiff_t srcstride, int width, int height);
-    void (*weighted_pred)(uint8_t denom, int16_t wlxFlag, int16_t olxFlag, uint8_t *dst, ptrdiff_t dststride, int16_t *src,
+    void (*transform_skip)(uint8_t *dst, int16_t *coeffs, ptrdiff_t stride);
+    void (*transform_4x4_luma_add)(uint8_t *dst, int16_t *coeffs,
+                                   ptrdiff_t stride);
+    void (*transform_add[4])(uint8_t *dst, int16_t *coeffs, ptrdiff_t stride);
+
+    void (*sao_band_filter[4])(uint8_t *dst, uint8_t *src, ptrdiff_t stride,
+                               struct SAOParams *sao, int *borders,
+                               int width, int height, int c_idx);
+    void (*sao_edge_filter[4])(uint8_t *dst, uint8_t *src, ptrdiff_t stride,
+                               struct SAOParams *sao, int *borders, int width,
+                               int height, int c_idx, uint8_t vert_edge,
+                               uint8_t horiz_edge, uint8_t diag_edge);
+
+    void (*put_hevc_qpel[4][4])(int16_t *dst, ptrdiff_t dststride, uint8_t *src,
+                                ptrdiff_t srcstride, int width, int height,
+                                int16_t *mcbuffer);
+    void (*put_hevc_epel[2][2])(int16_t *dst, ptrdiff_t dststride, uint8_t *src,
+                                ptrdiff_t srcstride, int width, int height,
+                                int mx, int my, int16_t *mcbuffer);
+
+    void (*put_unweighted_pred)(uint8_t *dst, ptrdiff_t dststride, int16_t *src,
+                                ptrdiff_t srcstride, int width, int height);
+    void (*put_weighted_pred_avg)(uint8_t *dst, ptrdiff_t dststride,
+                                  int16_t *src1, int16_t *src2,
                                   ptrdiff_t srcstride, int width, int height);
-    void (*weighted_pred_avg)(uint8_t denom, int16_t wl0Flag, int16_t wl1Flag, int16_t ol0Flag, int16_t ol1Flag,
-                                   uint8_t *dst, ptrdiff_t dststride, int16_t *src1, int16_t *src2,
-                                   ptrdiff_t srcstride, int width, int height);
-    void (*hevc_h_loop_filter_luma)(uint8_t *_pix, ptrdiff_t _stride, int *_beta, int *_tc, uint8_t *_no_p, uint8_t *_no_q);
-    void (*hevc_v_loop_filter_luma)(uint8_t *_pix, ptrdiff_t _stride, int *_beta, int *_tc, uint8_t *_no_p, uint8_t *_no_q);
-    void (*hevc_h_loop_filter_chroma)(uint8_t *_pix, ptrdiff_t _stride, int *_tc, uint8_t *_no_p, uint8_t *_no_q);
-    void (*hevc_v_loop_filter_chroma)(uint8_t *_pix, ptrdiff_t _stride, int *_tc, uint8_t *_no_p, uint8_t *_no_q);
-    void (*hevc_h_loop_filter_luma_c)(uint8_t *_pix, ptrdiff_t _stride, int *_beta, int *_tc, uint8_t *_no_p, uint8_t *_no_q);
-    void (*hevc_v_loop_filter_luma_c)(uint8_t *_pix, ptrdiff_t _stride, int *_beta, int *_tc, uint8_t *_no_p, uint8_t *_no_q);
-    void (*hevc_h_loop_filter_chroma_c)(uint8_t *_pix, ptrdiff_t _stride, int *_tc, uint8_t *_no_p, uint8_t *_no_q);
-    void (*hevc_v_loop_filter_chroma_c)(uint8_t *_pix, ptrdiff_t _stride, int *_tc, uint8_t *_no_p, uint8_t *_no_q);
+    void (*weighted_pred)(uint8_t denom, int16_t wlxFlag, int16_t olxFlag,
+                          uint8_t *dst, ptrdiff_t dststride, int16_t *src,
+                          ptrdiff_t srcstride, int width, int height);
+    void (*weighted_pred_avg)(uint8_t denom, int16_t wl0Flag, int16_t wl1Flag,
+                              int16_t ol0Flag, int16_t ol1Flag, uint8_t *dst,
+                              ptrdiff_t dststride, int16_t *src1, int16_t *src2,
+                              ptrdiff_t srcstride, int width, int height);
+
+    void (*hevc_h_loop_filter_luma)(uint8_t *pix, ptrdiff_t stride,
+                                    int *beta, int *tc,
+                                    uint8_t *no_p, uint8_t *no_q);
+    void (*hevc_v_loop_filter_luma)(uint8_t *pix, ptrdiff_t stride,
+                                    int *beta, int *tc,
+                                    uint8_t *no_p, uint8_t *no_q);
+    void (*hevc_h_loop_filter_chroma)(uint8_t *pix, ptrdiff_t stride,
+                                      int *tc, uint8_t *no_p, uint8_t *no_q);
+    void (*hevc_v_loop_filter_chroma)(uint8_t *pix, ptrdiff_t stride,
+                                      int *tc, uint8_t *no_p, uint8_t *no_q);
+    void (*hevc_h_loop_filter_luma_c)(uint8_t *pix, ptrdiff_t stride,
+                                      int *beta, int *tc,
+                                      uint8_t *no_p, uint8_t *no_q);
+    void (*hevc_v_loop_filter_luma_c)(uint8_t *pix, ptrdiff_t stride,
+                                      int *beta, int *tc,
+                                      uint8_t *no_p, uint8_t *no_q);
+    void (*hevc_h_loop_filter_chroma_c)(uint8_t *pix, ptrdiff_t stride,
+                                        int *tc, uint8_t *no_p,
+                                        uint8_t *no_q);
+    void (*hevc_v_loop_filter_chroma_c)(uint8_t *pix, ptrdiff_t stride,
+                                        int *tc, uint8_t *no_p,
+                                        uint8_t *no_q);
 } HEVCDSPContext;
 
 void ff_hevc_dsp_init(HEVCDSPContext *hpc, int bit_depth);

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/hevcdsp_template.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/hevcdsp_template.c Changed

@@ -1,5 +1,5 @@
 /*
- * HEVC video Decoder
+ * HEVC video decoder
  *
  * Copyright (C) 2012 - 2013 Guillaume Martres
  *
@@ -21,20 +21,19 @@
  */
 
 #include "get_bits.h"
+#include "hevc.h"
+
 #include "bit_depth_template.c"
 #include "hevcdsp.h"
-#include "hevc.h"
 
-#define SET(dst, x) (dst) = (x)
-#define SCALE(dst, x) (dst) = av_clip_int16(((x) + add) >> shift)
-#define ADD_AND_SCALE(dst, x) (dst) = av_clip_pixel((dst) + av_clip_int16(((x) + add) >> shift))
 
-static void FUNC(put_pcm)(uint8_t *_dst, ptrdiff_t _stride, int size,
+static void FUNC(put_pcm)(uint8_t *_dst, ptrdiff_t stride, int size,
                           GetBitContext *gb, int pcm_bit_depth)
 {
     int x, y;
-    pixel *dst = (pixel*)_dst;
-    ptrdiff_t stride = _stride / sizeof(pixel);
+    pixel *dst = (pixel *)_dst;
+
+    stride /= sizeof(pixel);
 
     for (y = 0; y < size; y++) {
         for (x = 0; x < size; x++)
@@ -43,73 +42,79 @@
     }
 }
 
-static void FUNC(transquant_bypass4x4)(uint8_t *_dst, int16_t *coeffs, ptrdiff_t _stride)
+static void FUNC(transquant_bypass4x4)(uint8_t *_dst, int16_t *coeffs,
+                                       ptrdiff_t stride)
 {
     int x, y;
-    pixel *dst = (pixel*)_dst;
-    ptrdiff_t stride = _stride / sizeof(pixel);
+    pixel *dst = (pixel *)_dst;
+
+    stride /= sizeof(pixel);
 
     for (y = 0; y < 4; y++) {
         for (x = 0; x < 4; x++) {
-            dst[x] += *coeffs;
+            dst[x] = av_clip_pixel(dst[x] + *coeffs);
             coeffs++;
         }
         dst += stride;
     }
-
 }
 
-static void FUNC(transquant_bypass8x8)(uint8_t *_dst, int16_t *coeffs, ptrdiff_t _stride)
+static void FUNC(transquant_bypass8x8)(uint8_t *_dst, int16_t *coeffs,
+                                       ptrdiff_t stride)
 {
     int x, y;
-    pixel *dst = (pixel*)_dst;
-    ptrdiff_t stride = _stride / sizeof(pixel);
+    pixel *dst = (pixel *)_dst;
+
+    stride /= sizeof(pixel);
 
     for (y = 0; y < 8; y++) {
         for (x = 0; x < 8; x++) {
-            dst[x] += *coeffs;
+            dst[x] = av_clip_pixel(dst[x] + *coeffs);
             coeffs++;
         }
         dst += stride;
     }
 }
 
-static void FUNC(transquant_bypass16x16)(uint8_t *_dst, int16_t *coeffs, ptrdiff_t _stride)
+static void FUNC(transquant_bypass16x16)(uint8_t *_dst, int16_t *coeffs,
+                                         ptrdiff_t stride)
 {
     int x, y;
-    pixel *dst = (pixel*)_dst;
-    ptrdiff_t stride = _stride / sizeof(pixel);
+    pixel *dst = (pixel *)_dst;
+
+    stride /= sizeof(pixel);
 
     for (y = 0; y < 16; y++) {
         for (x = 0; x < 16; x++) {
-            dst[x] += *coeffs;
+            dst[x] = av_clip_pixel(dst[x] + *coeffs);
             coeffs++;
         }
         dst += stride;
     }
-
 }
 
-static void FUNC(transquant_bypass32x32)(uint8_t *_dst, int16_t *coeffs, ptrdiff_t _stride)
+static void FUNC(transquant_bypass32x32)(uint8_t *_dst, int16_t *coeffs,
+                                         ptrdiff_t stride)
 {
     int x, y;
-    pixel *dst = (pixel*)_dst;
-    ptrdiff_t stride = _stride / sizeof(pixel);
+    pixel *dst = (pixel *)_dst;
+
+    stride /= sizeof(pixel);
 
     for (y = 0; y < 32; y++) {
         for (x = 0; x < 32; x++) {
-            dst[x] += *coeffs;
+            dst[x] = av_clip_pixel(dst[x] + *coeffs);
             coeffs++;
         }
         dst += stride;
     }
 }
 
-static void FUNC(transform_skip)(uint8_t *_dst, int16_t *coeffs, ptrdiff_t _stride)
+static void FUNC(transform_skip)(uint8_t *_dst, int16_t *coeffs,
+                                 ptrdiff_t stride)
 {
-    pixel *dst = (pixel*)_dst;
-    ptrdiff_t stride = _stride / sizeof(pixel);
-    int shift = 13 - BIT_DEPTH;
+    pixel *dst = (pixel *)_dst;
+    int shift  = 13 - BIT_DEPTH;
 #if BIT_DEPTH <= 13
     int offset = 1 << (shift - 1);
 #else
@@ -117,265 +122,264 @@
 #endif
     int x, y;
 
-    for (y = 0; y < 4*4; y+=4) {
-        for (x = 0; x < 4; x++) {
+    stride /= sizeof(pixel);
+
+    for (y = 0; y < 4 * 4; y += 4) {
+        for (x = 0; x < 4; x++)
             dst[x] = av_clip_pixel(dst[x] + ((coeffs[y + x] + offset) >> shift));
-        }
         dst += stride;
     }
 }
 
-static void FUNC(transform_4x4_luma_add)(uint8_t *_dst, int16_t *coeffs, ptrdiff_t _stride)
-{
-#define TR_4x4_LUMA(dst, src, step, assign)                                     \
-    do {                                                                        \
-        int c0 = src[0*step] + src[2*step];                                     \
-        int c1 = src[2*step] + src[3*step];                                     \
-        int c2 = src[0*step] - src[3*step];                                     \
-        int c3 = 74 * src[1*step];                                              \
-                                                                                \
-        assign(dst[2*step], 74 * (src[0*step] - src[2*step] + src[3*step]));    \
-        assign(dst[0*step], 29 * c0 + 55 * c1 + c3);                            \
-        assign(dst[1*step], 55 * c2 - 29 * c1 + c3);                            \
-        assign(dst[3*step], 55 * c0 + 29 * c2 - c3);                            \
+#define SET(dst, x)   (dst) = (x)
+#define SCALE(dst, x) (dst) = av_clip_int16(((x) + add) >> shift)
+#define ADD_AND_SCALE(dst, x)                                           \
+    (dst) = av_clip_pixel((dst) + av_clip_int16(((x) + add) >> shift))
+
+#define TR_4x4_LUMA(dst, src, step, assign)                             \
+    do {                                                                \
+        int c0 = src[0 * step] + src[2 * step];                         \
+        int c1 = src[2 * step] + src[3 * step];                         \
+        int c2 = src[0 * step] - src[3 * step];                         \
+        int c3 = 74 * src[1 * step];                                    \
+                                                                        \
+        assign(dst[2 * step], 74 * (src[0 * step] -                     \
+                                    src[2 * step] +                     \
+                                    src[3 * step]));                    \
+        assign(dst[0 * step], 29 * c0 + 55 * c1 + c3);                  \
+        assign(dst[1 * step], 55 * c2 - 29 * c1 + c3);                  \
+        assign(dst[3 * step], 55 * c0 + 29 * c2 - c3);                  \
     } while (0)
 
+static void FUNC(transform_4x4_luma_add)(uint8_t *_dst, int16_t *coeffs,
+                                         ptrdiff_t stride)
+{
     int i;
-    pixel *dst = (pixel*)_dst;
-    ptrdiff_t stride = _stride / sizeof(pixel);
-    int shift = 7;
-    int add = 1 << (shift - 1);
+    pixel *dst   = (pixel *)_dst;
+    int shift    = 7;
+    int add      = 1 << (shift - 1);
     int16_t *src = coeffs;
 
+    stride /= sizeof(pixel);
+
     for (i = 0; i < 4; i++) {
         TR_4x4_LUMA(src, src, 4, SCALE);
         src++;
     }
 
     shift = 20 - BIT_DEPTH;
-    add = 1 << (shift - 1);
+    add   = 1 << (shift - 1);
     for (i = 0; i < 4; i++) {
         TR_4x4_LUMA(dst, coeffs, 1, ADD_AND_SCALE);
         coeffs += 4;
-        dst += stride;
+        dst    += stride;
     }
+}
 
 #undef TR_4x4_LUMA
-}
 
-#define TR_4(dst, src, dstep, sstep, assign)                                    \
-    do {                                                                        \
-        const int e0 = transform[8*0][0] * src[0*sstep] +                       \
-                       transform[8*2][0] * src[2*sstep];                        \
-        const int e1 = transform[8*0][1] * src[0*sstep] +                       \
-                       transform[8*2][1] * src[2*sstep];                        \
-        const int o0 = transform[8*1][0] * src[1*sstep] +                       \
-                       transform[8*3][0] * src[3*sstep];                        \
-        const int o1 = transform[8*1][1] * src[1*sstep] +                       \
-                       transform[8*3][1] * src[3*sstep];                        \
-                                                                                \
-        assign(dst[0*dstep], e0 + o0);                                          \
-        assign(dst[1*dstep], e1 + o1);                                          \
-        assign(dst[2*dstep], e1 - o1);                                          \
-        assign(dst[3*dstep], e0 - o0);                                          \
+#define TR_4(dst, src, dstep, sstep, assign)                            \
+    do {                                                                \
+        const int e0 = transform[8 * 0][0] * src[0 * sstep] +           \
+                       transform[8 * 2][0] * src[2 * sstep];            \
+        const int e1 = transform[8 * 0][1] * src[0 * sstep] +           \
+                       transform[8 * 2][1] * src[2 * sstep];            \
+        const int o0 = transform[8 * 1][0] * src[1 * sstep] +           \
+                       transform[8 * 3][0] * src[3 * sstep];            \
+        const int o1 = transform[8 * 1][1] * src[1 * sstep] +           \
+                       transform[8 * 3][1] * src[3 * sstep];            \
+                                                                        \
+        assign(dst[0 * dstep], e0 + o0);                                \
+        assign(dst[1 * dstep], e1 + o1);                                \
+        assign(dst[2 * dstep], e1 - o1);                                \
+        assign(dst[3 * dstep], e0 - o0);                                \
     } while (0)
-#define TR_4_1(dst, src) TR_4(dst, src, 4, 4, SCALE)
-#define TR_4_2(dst, src) TR_4(dst, src, 1, 1, ADD_AND_SCALE)
 
-static void FUNC(transform_4x4_add)(uint8_t *_dst, int16_t *coeffs, ptrdiff_t _stride)
+static void FUNC(transform_4x4_add)(uint8_t *_dst, int16_t *coeffs,
+                                    ptrdiff_t stride)
 {
     int i;
-    pixel *dst = (pixel*)_dst;
-    ptrdiff_t stride = _stride / sizeof(pixel);
-    int shift = 7;
-    int add = 1 << (shift - 1);
+    pixel *dst   = (pixel *)_dst;
+    int shift    = 7;
+    int add      = 1 << (shift - 1);
     int16_t *src = coeffs;
 
+    stride /= sizeof(pixel);
+
     for (i = 0; i < 4; i++) {
-        TR_4_1(src, src);
+        TR_4(src, src, 4, 4, SCALE);
         src++;
     }
 
     shift = 20 - BIT_DEPTH;
-    add = 1 << (shift - 1);
+    add   = 1 << (shift - 1);
     for (i = 0; i < 4; i++) {
-        TR_4_2(dst, coeffs);
+        TR_4(dst, coeffs, 1, 1, ADD_AND_SCALE);
         coeffs += 4;
-        dst += stride;
+        dst    += stride;
     }
 }
 
-#define TR_8(dst, src, dstep, sstep, assign)                \
-    do {                                                    \
-        int i, j;                                           \
-        int e_8[4];                                         \
-        int o_8[4] = { 0 };                                 \
-        for (i = 0; i < 4; i++)                             \
-            for (j = 1; j < 8; j += 2)                      \
-                o_8[i] += transform[4*j][i] * src[j*sstep]; \
-        TR_4(e_8, src, 1, 2*sstep, SET);                    \
-                                                            \
-        for (i = 0; i < 4; i++) {                           \
-            assign(dst[i*dstep], e_8[i] + o_8[i]);          \
-            assign(dst[(7-i)*dstep], e_8[i] - o_8[i]);      \
-        }                                                   \
+#define TR_8(dst, src, dstep, sstep, assign)                      \
+    do {                                                          \
+        int i, j;                                                 \
+        int e_8[4];                                               \
+        int o_8[4] = { 0 };                                       \
+        for (i = 0; i < 4; i++)                                   \
+            for (j = 1; j < 8; j += 2)                            \
+                o_8[i] += transform[4 * j][i] * src[j * sstep];   \
+        TR_4(e_8, src, 1, 2 * sstep, SET);                        \
+                                                                  \
+        for (i = 0; i < 4; i++) {                                 \
+            assign(dst[i * dstep], e_8[i] + o_8[i]);              \
+            assign(dst[(7 - i) * dstep], e_8[i] - o_8[i]);        \
+        }                                                         \
     } while (0)
-#define TR_16(dst, src, dstep, sstep, assign)                   \
-    do {                                                        \
-        int i, j;                                               \
-        int e_16[8];                                            \
-        int o_16[8] = { 0 };                                    \
-        for (i = 0; i < 8; i++)                                 \
-            for (j = 1; j < 16; j += 2)                         \
-                o_16[i] += transform[2*j][i] * src[j*sstep];    \
-        TR_8(e_16, src, 1, 2*sstep, SET);                       \
-                                                                \
-        for (i = 0; i < 8; i++) {                               \
-            assign(dst[i*dstep], e_16[i] + o_16[i]);            \
-            assign(dst[(15-i)*dstep], e_16[i] - o_16[i]);       \
-        }                                                       \
+
+#define TR_16(dst, src, dstep, sstep, assign)                     \
+    do {                                                          \
+        int i, j;                                                 \
+        int e_16[8];                                              \
+        int o_16[8] = { 0 };                                      \
+        for (i = 0; i < 8; i++)                                   \
+            for (j = 1; j < 16; j += 2)                           \
+                o_16[i] += transform[2 * j][i] * src[j * sstep];  \
+        TR_8(e_16, src, 1, 2 * sstep, SET);                       \
+                                                                  \
+        for (i = 0; i < 8; i++) {                                 \
+            assign(dst[i * dstep], e_16[i] + o_16[i]);            \
+            assign(dst[(15 - i) * dstep], e_16[i] - o_16[i]);     \
+        }                                                         \
     } while (0)
-#define TR_32(dst, src, dstep, sstep, assign)               \
-    do {                                                    \
-        int i, j;                                           \
-        int e_32[16];                                       \
-        int o_32[16] = { 0 };                               \
-        for (i = 0; i < 16; i++)                            \
-            for (j = 1; j < 32; j += 2)                     \
-                o_32[i] += transform[j][i] * src[j*sstep];  \
-        TR_16(e_32, src, 1, 2*sstep, SET);                \
-                                                            \
-        for (i = 0; i < 16; i++) {                          \
-            assign(dst[i*dstep], e_32[i] + o_32[i]);        \
-            assign(dst[(31-i)*dstep], e_32[i] - o_32[i]);   \
-        }                                                   \
+
+#define TR_32(dst, src, dstep, sstep, assign)                     \
+    do {                                                          \
+        int i, j;                                                 \
+        int e_32[16];                                             \
+        int o_32[16] = { 0 };                                     \
+        for (i = 0; i < 16; i++)                                  \
+            for (j = 1; j < 32; j += 2)                           \
+                o_32[i] += transform[j][i] * src[j * sstep];      \
+        TR_16(e_32, src, 1, 2 * sstep, SET);                      \
+                                                                  \
+        for (i = 0; i < 16; i++) {                                \
+            assign(dst[i * dstep], e_32[i] + o_32[i]);            \
+            assign(dst[(31 - i) * dstep], e_32[i] - o_32[i]);     \
+        }                                                         \
     } while (0)
 
-#define TR_8_1(dst, src) TR_8(dst, src, 8, 8, SCALE)
-#define TR_16_1(dst, src) TR_16(dst, src, 16, 16, SCALE)
-#define TR_32_1(dst, src) TR_32(dst, src, 32, 32, SCALE)
 
-#define TR_8_2(dst, src) TR_8(dst, src, 1, 1, ADD_AND_SCALE)
-#define TR_16_2(dst, src) TR_16(dst, src, 1, 1, ADD_AND_SCALE)
-#define TR_32_2(dst, src) TR_32(dst, src, 1, 1, ADD_AND_SCALE)
 
-static void FUNC(transform_8x8_add)(uint8_t *_dst, int16_t *coeffs, ptrdiff_t _stride)
+static void FUNC(transform_8x8_add)(uint8_t *_dst, int16_t *coeffs,
+                                    ptrdiff_t stride)
 {
     int i;
-    pixel *dst = (pixel*)_dst;
-    ptrdiff_t stride = _stride / sizeof(pixel);
-    int shift = 7;
-    int add = 1 << (shift - 1);
+    pixel *dst   = (pixel *)_dst;
+    int shift    = 7;
+    int add      = 1 << (shift - 1);
     int16_t *src = coeffs;
 
+    stride /= sizeof(pixel);
+
     for (i = 0; i < 8; i++) {
-        TR_8_1(src, src);
+        TR_8(src, src, 8, 8, SCALE);
         src++;
     }
 
     shift = 20 - BIT_DEPTH;
-    add = 1 << (shift - 1);
+    add   = 1 << (shift - 1);
     for (i = 0; i < 8; i++) {
-        TR_8_2(dst, coeffs);
+        TR_8(dst, coeffs, 1, 1, ADD_AND_SCALE);
         coeffs += 8;
-        dst += stride;
+        dst    += stride;
     }
 }
 
-static void FUNC(transform_16x16_add)(uint8_t *_dst, int16_t *coeffs, ptrdiff_t _stride)
+static void FUNC(transform_16x16_add)(uint8_t *_dst, int16_t *coeffs,
+                                      ptrdiff_t stride)
 {
     int i;
-    pixel *dst = (pixel*)_dst;
-    ptrdiff_t stride = _stride / sizeof(pixel);
-    int shift = 7;
-    int add = 1 << (shift - 1);
+    pixel *dst   = (pixel *)_dst;
+    int shift    = 7;
+    int add      = 1 << (shift - 1);
     int16_t *src = coeffs;
 
+    stride /= sizeof(pixel);
+
     for (i = 0; i < 16; i++) {
-        TR_16_1(src, src);
+        TR_16(src, src, 16, 16, SCALE);
         src++;
     }
 
     shift = 20 - BIT_DEPTH;
-    add = 1 << (shift - 1);
+    add   = 1 << (shift - 1);
     for (i = 0; i < 16; i++) {
-        TR_16_2(dst, coeffs);
+        TR_16(dst, coeffs, 1, 1, ADD_AND_SCALE);
         coeffs += 16;
-        dst += stride;
+        dst    += stride;
     }
 }
 
-static void FUNC(transform_32x32_add)(uint8_t *_dst, int16_t *coeffs, ptrdiff_t _stride)
+static void FUNC(transform_32x32_add)(uint8_t *_dst, int16_t *coeffs,
+                                      ptrdiff_t stride)
 {
-#define IT32x32_even(i,w) ( src[ 0*w] * transform[ 0][i] ) + ( src[16*w] * transform[16][i] )
-#define IT32x32_odd(i,w)  ( src[ 8*w] * transform[ 8][i] ) + ( src[24*w] * transform[24][i] )
-#define IT16x16(i,w)      ( src[ 4*w] * transform[ 4][i] ) + ( src[12*w] * transform[12][i] ) + ( src[20*w] * transform[20][i] ) + ( src[28*w] * transform[28][i] )
-#define IT8x8(i,w)        ( src[ 2*w] * transform[ 2][i] ) + ( src[ 6*w] * transform[ 6][i] ) + ( src[10*w] * transform[10][i] ) + ( src[14*w] * transform[14][i] ) + \
-                          ( src[18*w] * transform[18][i] ) + ( src[22*w] * transform[22][i] ) + ( src[26*w] * transform[26][i] ) + ( src[30*w] * transform[30][i] )
-#define IT4x4(i,w)        ( src[ 1*w] * transform[ 1][i] ) + ( src[ 3*w] * transform[ 3][i] ) + ( src[ 5*w] * transform[ 5][i] ) + ( src[ 7*w] * transform[ 7][i] ) + \
-                          ( src[ 9*w] * transform[ 9][i] ) + ( src[11*w] * transform[11][i] ) + ( src[13*w] * transform[13][i] ) + ( src[15*w] * transform[15][i] ) + \
-                          ( src[17*w] * transform[17][i] ) + ( src[19*w] * transform[19][i] ) + ( src[21*w] * transform[21][i] ) + ( src[23*w] * transform[23][i] ) + \
-                          ( src[25*w] * transform[25][i] ) + ( src[27*w] * transform[27][i] ) + ( src[29*w] * transform[29][i] ) + ( src[31*w] * transform[31][i] )
     int i;
-    pixel *dst = (pixel*)_dst;
-    ptrdiff_t stride = _stride / sizeof(pixel);
-    int shift = 7;
-    int add = 1 << (shift - 1);
+    pixel *dst   = (pixel *)_dst;
+    int shift    = 7;
+    int add      = 1 << (shift - 1);
     int16_t *src = coeffs;
 
+    stride /= sizeof(pixel);
+
     for (i = 0; i < 32; i++) {
-        TR_32_1(src, src);
+        TR_32(src, src, 32, 32, SCALE);
         src++;
     }
     src   = coeffs;
     shift = 20 - BIT_DEPTH;
     add   = 1 << (shift - 1);
     for (i = 0; i < 32; i++) {
-        TR_32_2(dst, coeffs);
+        TR_32(dst, coeffs, 1, 1, ADD_AND_SCALE);
         coeffs += 32;
-        dst += stride;
+        dst    += stride;
     }
-#undef IT32x32_even
-#undef IT32x32_odd
-#undef IT16x16
-#undef IT8x8
-#undef IT4x4
 }
 
 static void FUNC(sao_band_filter)(uint8_t *_dst, uint8_t *_src,
-                                  ptrdiff_t _stride, SAOParams *sao,
+                                  ptrdiff_t stride, SAOParams *sao,
                                   int *borders, int width, int height,
                                   int c_idx, int class)
 {
-    pixel *dst = (pixel*)_dst;
-    pixel *src = (pixel*)_src;
-    ptrdiff_t stride = _stride / sizeof(pixel);
+    pixel *dst = (pixel *)_dst;
+    pixel *src = (pixel *)_src;
     int offset_table[32] = { 0 };
     int k, y, x;
     int chroma = !!c_idx;
-    int shift = BIT_DEPTH - 5;
+    int shift  = BIT_DEPTH - 5;
     int *sao_offset_val = sao->offset_val[c_idx];
     int sao_left_class  = sao->band_position[c_idx];
     int init_y = 0, init_x = 0;
 
+    stride /= sizeof(pixel);
+
     switch (class) {
     case 0:
         if (!borders[2])
-            width -= ((8 >> chroma) + 2);
+            width -= (8 >> chroma) + 2;
         if (!borders[3])
-            height -= ((4 >> chroma) + 2);
+            height -= (4 >> chroma) + 2;
         break;
     case 1:
         init_y = -(4 >> chroma) - 2;
         if (!borders[2])
-            width -= ((8 >> chroma) + 2);
+            width -= (8 >> chroma) + 2;
         height = (4 >> chroma) + 2;
         break;
     case 2:
         init_x = -(8 >> chroma) - 2;
         width  =  (8 >> chroma) + 2;
         if (!borders[3])
-            height -= ((4 >> chroma) + 2);
+            height -= (4 >> chroma) + 2;
         break;
     case 3:
         init_y = -(4 >> chroma) - 2;
@@ -391,7 +395,7 @@
         offset_table[(k + sao_left_class) & 31] = sao_offset_val[k + 1];
     for (y = 0; y < height; y++) {
         for (x = 0; x < width; x++)
-            dst[x] = av_clip_pixel(src[x] + offset_table[av_clip_pixel(src[x] >> shift)]);
+            dst[x] = av_clip_pixel(src[x] + offset_table[src[x] >> shift]);
         dst += stride;
         src += stride;
     }
@@ -402,7 +406,8 @@
                                     int *borders, int width, int height,
                                     int c_idx)
 {
-    FUNC(sao_band_filter)(dst, src, stride, sao, borders, width, height, c_idx, 0);
+    FUNC(sao_band_filter)(dst, src, stride, sao, borders,
+                          width, height, c_idx, 0);
 }
 
 static void FUNC(sao_band_filter_1)(uint8_t *dst, uint8_t *src,
@@ -410,7 +415,8 @@
                                     int *borders, int width, int height,
                                     int c_idx)
 {
-    FUNC(sao_band_filter)(dst, src, stride, sao, borders, width, height, c_idx, 1);
+    FUNC(sao_band_filter)(dst, src, stride, sao, borders,
+                          width, height, c_idx, 1);
 }
 
 static void FUNC(sao_band_filter_2)(uint8_t *dst, uint8_t *src,
@@ -418,43 +424,45 @@
                                     int *borders, int width, int height,
                                     int c_idx)
 {
-    FUNC(sao_band_filter)(dst, src, stride, sao, borders, width, height, c_idx, 2);
+    FUNC(sao_band_filter)(dst, src, stride, sao, borders,
+                          width, height, c_idx, 2);
 }
 
 static void FUNC(sao_band_filter_3)(uint8_t *_dst, uint8_t *_src,
-                                    ptrdiff_t _stride, SAOParams *sao,
+                                    ptrdiff_t stride, SAOParams *sao,
                                     int *borders, int width, int height,
                                     int c_idx)
 {
-    FUNC(sao_band_filter)(_dst, _src, _stride, sao, borders, width, height, c_idx, 3);
+    FUNC(sao_band_filter)(_dst, _src, stride, sao, borders,
+                          width, height, c_idx, 3);
 }
 
 static void FUNC(sao_edge_filter_0)(uint8_t *_dst, uint8_t *_src,
-                                    ptrdiff_t _stride, SAOParams *sao,
+                                    ptrdiff_t stride, SAOParams *sao,
                                     int *borders, int _width, int _height,
-                                    int c_idx,
-                                    uint8_t vert_edge, uint8_t horiz_edge, uint8_t diag_edge)
+                                    int c_idx, uint8_t vert_edge,
+                                    uint8_t horiz_edge, uint8_t diag_edge)
 {
     int x, y;
-    pixel *dst = (pixel*)_dst;
-    pixel *src = (pixel*)_src;
-    ptrdiff_t stride = _stride / sizeof(pixel);
+    pixel *dst = (pixel *)_dst;
+    pixel *src = (pixel *)_src;
     int chroma = !!c_idx;
     int *sao_offset_val = sao->offset_val[c_idx];
-    int sao_eo_class = sao->eo_class[c_idx];
+    int sao_eo_class    = sao->eo_class[c_idx];
+    int init_x = 0, init_y = 0, width = _width, height = _height;
 
     static const int8_t pos[4][2][2] = {
-        {{ -1,  0}, { 1, 0}}, // horizontal
-        {{  0, -1}, { 0, 1}}, // vertical
-        {{ -1, -1}, { 1, 1}}, // 45 degree
-        {{  1, -1}, {-1, 1}}, // 135 degree
+        { { -1,  0 }, {  1, 0 } }, // horizontal
+        { {  0, -1 }, {  0, 1 } }, // vertical
+        { { -1, -1 }, {  1, 1 } }, // 45 degree
+        { {  1, -1 }, { -1, 1 } }, // 135 degree
     };
     static const uint8_t edge_idx[] = { 1, 2, 0, 3, 4 };
 
-    int init_x = 0, init_y = 0, width = _width, height = _height;
-
 #define CMP(a, b) ((a) > (b) ? 1 : ((a) == (b) ? 0 : -1))
 
+    stride /= sizeof(pixel);
+
     if (!borders[2])
         width -= (8 >> chroma) + 2;
     if (!borders[3])
@@ -469,7 +477,7 @@
             int y_stride   = 0;
             for (y = 0; y < height; y++) {
                 dst[y_stride] = av_clip_pixel(src[y_stride] + offset_val);
-                y_stride += stride;
+                y_stride     += stride;
             }
             init_x = 1;
         }
@@ -478,35 +486,32 @@
             int x_stride   = width - 1;
             for (x = 0; x < height; x++) {
                 dst[x_stride] = av_clip_pixel(src[x_stride] + offset_val);
-                x_stride += stride;
+                x_stride     += stride;
             }
-            width --;
+            width--;
         }
-
     }
-    if (sao_eo_class != SAO_EO_HORIZ ) {
-        if (borders[1]){
+    if (sao_eo_class != SAO_EO_HORIZ) {
+        if (borders[1]) {
             int offset_val = sao_offset_val[0];
-            for (x = init_x; x < width; x++) {
+            for (x = init_x; x < width; x++)
                 dst[x] = av_clip_pixel(src[x] + offset_val);
-            }
             init_y = 1;
         }
-        if (borders[3]){
+        if (borders[3]) {
             int offset_val = sao_offset_val[0];
             int y_stride   = stride * (height - 1);
-            for (x = init_x; x < width; x++) {
+            for (x = init_x; x < width; x++)
                 dst[x + y_stride] = av_clip_pixel(src[x + y_stride] + offset_val);
-            }
             height--;
         }
     }
     {
-        int y_stride     = init_y * stride;
-        int pos_0_0      = pos[sao_eo_class][0][0];
-        int pos_0_1      = pos[sao_eo_class][0][1];
-        int pos_1_0      = pos[sao_eo_class][1][0];
-        int pos_1_1      = pos[sao_eo_class][1][1];
+        int y_stride = init_y * stride;
+        int pos_0_0  = pos[sao_eo_class][0][0];
+        int pos_0_1  = pos[sao_eo_class][0][1];
+        int pos_1_0  = pos[sao_eo_class][1][0];
+        int pos_1_1  = pos[sao_eo_class][1][1];
 
         int y_stride_0_1 = (init_y + pos_0_1) * stride;
         int y_stride_1_1 = (init_y + pos_1_1) * stride;
@@ -540,31 +545,31 @@
 }
 
 static void FUNC(sao_edge_filter_1)(uint8_t *_dst, uint8_t *_src,
-                                    ptrdiff_t _stride, SAOParams *sao,
+                                    ptrdiff_t stride, SAOParams *sao,
                                     int *borders, int _width, int _height,
-                                    int c_idx,
-                                    uint8_t vert_edge, uint8_t horiz_edge, uint8_t diag_edge)
+                                    int c_idx, uint8_t vert_edge,
+                                    uint8_t horiz_edge, uint8_t diag_edge)
 {
     int x, y;
-    pixel *dst = (pixel*)_dst;
-    pixel *src = (pixel*)_src;
-    ptrdiff_t stride = _stride / sizeof(pixel);
+    pixel *dst = (pixel *)_dst;
+    pixel *src = (pixel *)_src;
     int chroma = !!c_idx;
     int *sao_offset_val = sao->offset_val[c_idx];
-    int sao_eo_class = sao->eo_class[c_idx];
+    int sao_eo_class    = sao->eo_class[c_idx];
+    int init_x = 0, init_y = 0, width = _width, height = _height;
 
     static const int8_t pos[4][2][2] = {
-        {{ -1,  0}, { 1, 0 }}, // horizontal
-        {{  0, -1}, { 0, 1 }}, // vertical
-        {{ -1, -1}, { 1, 1 }}, // 45 degree
-        {{  1, -1}, {-1, 1 }}, // 135 degree
+        { { -1, 0  }, { 1,  0 } }, // horizontal
+        { { 0,  -1 }, { 0,  1 } }, // vertical
+        { { -1, -1 }, { 1,  1 } }, // 45 degree
+        { { 1,  -1 }, { -1, 1 } }, // 135 degree
     };
     static const uint8_t edge_idx[] = { 1, 2, 0, 3, 4 };
 
-    int init_x = 0, init_y = 0, width = _width, height = _height;
-
 #define CMP(a, b) ((a) > (b) ? 1 : ((a) == (b) ? 0 : -1))
 
+    stride /= sizeof(pixel);
+
     init_y = -(4 >> chroma) - 2;
     if (!borders[2])
         width -= (8 >> chroma) + 2;
@@ -579,7 +584,7 @@
             int y_stride   = 0;
             for (y = 0; y < height; y++) {
                 dst[y_stride] = av_clip_pixel(src[y_stride] + offset_val);
-                y_stride += stride;
+                y_stride     += stride;
             }
             init_x = 1;
         }
@@ -588,18 +593,17 @@
             int x_stride   = width - 1;
             for (x = 0; x < height; x++) {
                 dst[x_stride] = av_clip_pixel(src[x_stride] + offset_val);
-                x_stride += stride;
+                x_stride     += stride;
             }
             width--;
         }
-
     }
     {
-        int y_stride     = init_y * stride;
-        int pos_0_0      = pos[sao_eo_class][0][0];
-        int pos_0_1      = pos[sao_eo_class][0][1];
-        int pos_1_0      = pos[sao_eo_class][1][0];
-        int pos_1_1      = pos[sao_eo_class][1][1];
+        int y_stride = init_y * stride;
+        int pos_0_0  = pos[sao_eo_class][0][0];
+        int pos_0_1  = pos[sao_eo_class][0][1];
+        int pos_1_0  = pos[sao_eo_class][1][0];
+        int pos_1_1  = pos[sao_eo_class][1][1];
 
         int y_stride_0_1 = (init_y + pos_0_1) * stride;
         int y_stride_1_1 = (init_y + pos_1_1) * stride;
@@ -633,31 +637,31 @@
 }
 
 static void FUNC(sao_edge_filter_2)(uint8_t *_dst, uint8_t *_src,
-                                    ptrdiff_t _stride, SAOParams *sao,
+                                    ptrdiff_t stride, SAOParams *sao,
                                     int *borders, int _width, int _height,
-                                    int c_idx,
-                                    uint8_t vert_edge, uint8_t horiz_edge, uint8_t diag_edge)
+                                    int c_idx, uint8_t vert_edge,
+                                    uint8_t horiz_edge, uint8_t diag_edge)
 {
     int x, y;
-    pixel *dst = (pixel*)_dst;
-    pixel *src = (pixel*)_src;
-    ptrdiff_t stride = _stride / sizeof(pixel);
+    pixel *dst = (pixel *)_dst;
+    pixel *src = (pixel *)_src;
     int chroma = !!c_idx;
     int *sao_offset_val = sao->offset_val[c_idx];
-    int sao_eo_class = sao->eo_class[c_idx];
+    int sao_eo_class    = sao->eo_class[c_idx];
+    int init_x = 0, init_y = 0, width = _width, height = _height;
 
     static const int8_t pos[4][2][2] = {
-        {{ -1,  0}, { 1, 0}}, // horizontal
-        {{  0, -1}, { 0, 1}}, // vertical
-        {{ -1, -1}, { 1, 1}}, // 45 degree
-        {{  1, -1}, {-1, 1}}, // 135 degree
+        { { -1,  0 }, {  1, 0 } }, // horizontal
+        { {  0, -1 }, {  0, 1 } }, // vertical
+        { { -1, -1 }, {  1, 1 } }, // 45 degree
+        { {  1, -1 }, { -1, 1 } }, // 135 degree
     };
     static const uint8_t edge_idx[] = { 1, 2, 0, 3, 4 };
 
-    int init_x = 0, init_y = 0, width = _width, height = _height;
-
 #define CMP(a, b) ((a) > (b) ? 1 : ((a) == (b) ? 0 : -1))
 
+    stride /= sizeof(pixel);
+
     init_x = -(8 >> chroma) - 2;
     width  =  (8 >> chroma) + 2;
     if (!borders[3])
@@ -667,28 +671,26 @@
     src = src + (init_y * stride + init_x);
     init_y = init_x = 0;
     if (sao_eo_class != SAO_EO_HORIZ) {
-        if (borders[1]){
+        if (borders[1]) {
             int offset_val = sao_offset_val[0];
-            for (x = init_x; x < width; x++) {
+            for (x = init_x; x < width; x++)
                 dst[x] = av_clip_pixel(src[x] + offset_val);
-            }
             init_y = 1;
         }
-        if (borders[3]){
+        if (borders[3]) {
             int offset_val = sao_offset_val[0];
             int y_stride   = stride * (height - 1);
-            for (x = init_x; x < width; x++) {
+            for (x = init_x; x < width; x++)
                 dst[x + y_stride] = av_clip_pixel(src[x + y_stride] + offset_val);
-            }
             height--;
         }
     }
     {
-        int y_stride     = init_y * stride;
-        int pos_0_0      = pos[sao_eo_class][0][0];
-        int pos_0_1      = pos[sao_eo_class][0][1];
-        int pos_1_0      = pos[sao_eo_class][1][0];
-        int pos_1_1      = pos[sao_eo_class][1][1];
+        int y_stride = init_y * stride;
+        int pos_0_0  = pos[sao_eo_class][0][0];
+        int pos_0_1  = pos[sao_eo_class][0][1];
+        int pos_1_0  = pos[sao_eo_class][1][0];
+        int pos_1_1  = pos[sao_eo_class][1][1];
 
         int y_stride_0_1 = (init_y + pos_0_1) * stride;
         int y_stride_1_1 = (init_y + pos_1_1) * stride;
@@ -721,47 +723,47 @@
 }
 
 static void FUNC(sao_edge_filter_3)(uint8_t *_dst, uint8_t *_src,
-                                    ptrdiff_t _stride, SAOParams *sao,
+                                    ptrdiff_t stride, SAOParams *sao,
                                     int *borders, int _width, int _height,
-                                    int c_idx,
-                                    uint8_t vert_edge, uint8_t horiz_edge, uint8_t diag_edge)
+                                    int c_idx, uint8_t vert_edge,
+                                    uint8_t horiz_edge, uint8_t diag_edge)
 {
     int x, y;
-    pixel *dst = (pixel*)_dst;
-    pixel *src = (pixel*)_src;
-    ptrdiff_t stride = _stride / sizeof(pixel);
+    pixel *dst = (pixel *)_dst;
+    pixel *src = (pixel *)_src;
     int chroma = !!c_idx;
     int *sao_offset_val = sao->offset_val[c_idx];
     int sao_eo_class    = sao->eo_class[c_idx];
+    int init_x = 0, init_y = 0, width = _width, height = _height;
 
     static const int8_t pos[4][2][2] = {
-        {{ -1,  0}, { 1, 0}}, // horizontal
-        {{  0, -1}, { 0, 1}}, // vertical
-        {{ -1, -1}, { 1, 1}}, // 45 degree
-        {{  1, -1}, {-1, 1}}, // 135 degree
+        { { -1,  0 }, {  1, 0 } }, // horizontal
+        { {  0, -1 }, {  0, 1 } }, // vertical
+        { { -1, -1 }, {  1, 1 } }, // 45 degree
+        { {  1, -1 }, { -1, 1 } }, // 135 degree
     };
     static const uint8_t edge_idx[] = { 1, 2, 0, 3, 4 };
 
-    int init_x = 0, init_y = 0, width = _width, height = _height;
-
 #define CMP(a, b) ((a) > (b) ? 1 : ((a) == (b) ? 0 : -1))
 
+    stride /= sizeof(pixel);
+
     init_y = -(4 >> chroma) - 2;
     init_x = -(8 >> chroma) - 2;
     width  =  (8 >> chroma) + 2;
     height =  (4 >> chroma) + 2;
 
 
-    dst = dst + (init_y * stride + init_x);
-    src = src + (init_y * stride + init_x);
+    dst    = dst + (init_y * stride + init_x);
+    src    = src + (init_y * stride + init_x);
     init_y = init_x = 0;
 
     {
-        int y_stride     = init_y * stride;
-        int pos_0_0      = pos[sao_eo_class][0][0];
-        int pos_0_1      = pos[sao_eo_class][0][1];
-        int pos_1_0      = pos[sao_eo_class][1][0];
-        int pos_1_1      = pos[sao_eo_class][1][1];
+        int y_stride = init_y * stride;
+        int pos_0_0  = pos[sao_eo_class][0][0];
+        int pos_0_1  = pos[sao_eo_class][0][1];
+        int pos_1_0  = pos[sao_eo_class][1][0];
+        int pos_1_1  = pos[sao_eo_class][1][1];
 
         int y_stride_0_1 = (init_y + pos_0_1) * stride;
         int y_stride_1_1 = (init_y + pos_1_1) * stride;
@@ -798,24 +800,16 @@
 #undef SCALE
 #undef ADD_AND_SCALE
 #undef TR_4
-#undef TR_4_1
-#undef TR_4_2
 #undef TR_8
-#undef TR_8_1
-#undef TR_8_2
 #undef TR_16
-#undef TR_16_1
-#undef TR_16_2
 #undef TR_32
-#undef TR_32_1
-#undef TR_32_2
 
 static void FUNC(put_hevc_qpel_pixels)(int16_t *dst, ptrdiff_t dststride,
                                        uint8_t *_src, ptrdiff_t _srcstride,
                                        int width, int height, int16_t* mcbuffer)
 {
     int x, y;
-    pixel *src = (pixel*)_src;
+    pixel *src          = (pixel *)_src;
     ptrdiff_t srcstride = _srcstride / sizeof(pixel);
 
     for (y = 0; y < height; y++) {
@@ -826,15 +820,33 @@
     }
 }
 
-#define QPEL_FILTER_1(src, stride)                                              \
-    (-src[x-3*stride] + 4*src[x-2*stride] - 10*src[x-stride] + 58*src[x] +      \
-     17*src[x+stride] - 5*src[x+2*stride] + 1*src[x+3*stride])
-#define QPEL_FILTER_2(src, stride)                                              \
-    (-src[x-3*stride] + 4*src[x-2*stride] - 11*src[x-stride] + 40*src[x] +      \
-     40*src[x+stride] - 11*src[x+2*stride] + 4*src[x+3*stride] - src[x+4*stride])
-#define QPEL_FILTER_3(src, stride)                                              \
-    (src[x-2*stride] - 5*src[x-stride] + 17*src[x] + 58*src[x+stride]           \
-     - 10*src[x+2*stride] + 4*src[x+3*stride] - src[x+4*stride])
+#define QPEL_FILTER_1(src, stride)      \
+    (1 * -src[x - 3 * stride] +         \
+     4 *  src[x - 2 * stride] -         \
+    10 *  src[x -     stride] +         \
+    58 *  src[x]              +         \
+    17 *  src[x +     stride] -         \
+     5 *  src[x + 2 * stride] +         \
+     1 *  src[x + 3 * stride])
+
+#define QPEL_FILTER_2(src, stride)      \
+    (1  * -src[x - 3 * stride] +        \
+     4  *  src[x - 2 * stride] -        \
+    11  *  src[x -     stride] +        \
+    40  *  src[x]              +        \
+    40  *  src[x +     stride] -        \
+    11  *  src[x + 2 * stride] +        \
+     4  *  src[x + 3 * stride] -        \
+     1  *  src[x + 4 * stride])
+
+#define QPEL_FILTER_3(src, stride)      \
+    (1  * src[x - 2 * stride] -         \
+     5  * src[x -     stride] +         \
+    17  * src[x]              +         \
+    58  * src[x + stride]     -         \
+    10  * src[x + 2 * stride] +         \
+     4  * src[x + 3 * stride] -         \
+     1  * src[x + 4 * stride])
 
 
 #define PUT_HEVC_QPEL_H(H)                                                     \
@@ -849,7 +861,7 @@
                                                                                \
     for (y = 0; y < height; y++) {                                             \
         for (x = 0; x < width; x++)                                            \
-            dst[x] = QPEL_FILTER_ ## H (src, 1) >> (BIT_DEPTH - 8);            \
+            dst[x] = QPEL_FILTER_ ## H(src, 1) >> (BIT_DEPTH - 8);             \
         src += srcstride;                                                      \
         dst += dststride;                                                      \
     }                                                                          \
@@ -867,42 +879,44 @@
                                                                                \
     for (y = 0; y < height; y++)  {                                            \
         for (x = 0; x < width; x++)                                            \
-            dst[x] = QPEL_FILTER_ ## V (src, srcstride) >> (BIT_DEPTH - 8);    \
+            dst[x] = QPEL_FILTER_ ## V(src, srcstride) >> (BIT_DEPTH - 8);     \
         src += srcstride;                                                      \
         dst += dststride;                                                      \
     }                                                                          \
 }
 
-#define PUT_HEVC_QPEL_HV(H, V)                                                       \
-static void FUNC(put_hevc_qpel_h ## H ## v ## V)(int16_t *dst,  ptrdiff_t dststride, \
-                                                 uint8_t *_src, ptrdiff_t _srcstride,\
-                                                 int width, int height,              \
-                                                 int16_t* mcbuffer)                  \
-{                                                                                    \
-    int x, y;                                                                        \
-    pixel *src = (pixel*)_src;                                                       \
-    ptrdiff_t srcstride = _srcstride / sizeof(pixel);                                \
-                                                                                     \
-    int16_t tmp_array[(MAX_PB_SIZE + 7)*MAX_PB_SIZE];                                \
-    int16_t *tmp = tmp_array;                                                        \
-                                                                                     \
-    src -= ff_hevc_qpel_extra_before[V] * srcstride;                                 \
-                                                                                     \
-    for (y = 0; y < height + ff_hevc_qpel_extra[V]; y++) {                           \
-        for (x = 0; x < width; x++)                                                  \
-            tmp[x] = QPEL_FILTER_ ## H (src, 1) >> (BIT_DEPTH - 8);                  \
-        src += srcstride;                                                            \
-        tmp += MAX_PB_SIZE;                                                          \
-    }                                                                                \
-                                                                                     \
-    tmp = tmp_array + ff_hevc_qpel_extra_before[V] * MAX_PB_SIZE;                    \
-                                                                                     \
-    for (y = 0; y < height; y++) {                                                   \
-        for (x = 0; x < width; x++)                                                  \
-            dst[x] = QPEL_FILTER_ ## V (tmp, MAX_PB_SIZE) >> 6;                      \
-        tmp += MAX_PB_SIZE;                                                          \
-        dst += dststride;                                                            \
-    }                                                                                \
+#define PUT_HEVC_QPEL_HV(H, V)                                                 \
+static void FUNC(put_hevc_qpel_h ## H ## v ## V)(int16_t *dst,                 \
+                                                 ptrdiff_t dststride,          \
+                                                 uint8_t *_src,                \
+                                                 ptrdiff_t _srcstride,         \
+                                                 int width, int height,        \
+                                                 int16_t* mcbuffer)            \
+{                                                                              \
+    int x, y;                                                                  \
+    pixel *src = (pixel*)_src;                                                 \
+    ptrdiff_t srcstride = _srcstride / sizeof(pixel);                          \
+                                                                               \
+    int16_t tmp_array[(MAX_PB_SIZE + 7) * MAX_PB_SIZE];                        \
+    int16_t *tmp = tmp_array;                                                  \
+                                                                               \
+    src -= ff_hevc_qpel_extra_before[V] * srcstride;                           \
+                                                                               \
+    for (y = 0; y < height + ff_hevc_qpel_extra[V]; y++) {                     \
+        for (x = 0; x < width; x++)                                            \
+            tmp[x] = QPEL_FILTER_ ## H(src, 1) >> (BIT_DEPTH - 8);             \
+        src += srcstride;                                                      \
+        tmp += MAX_PB_SIZE;                                                    \
+    }                                                                          \
+                                                                               \
+    tmp = tmp_array + ff_hevc_qpel_extra_before[V] * MAX_PB_SIZE;              \
+                                                                               \
+    for (y = 0; y < height; y++) {                                             \
+        for (x = 0; x < width; x++)                                            \
+            dst[x] = QPEL_FILTER_ ## V(tmp, MAX_PB_SIZE) >> 6;                 \
+        tmp += MAX_PB_SIZE;                                                    \
+        dst += dststride;                                                      \
+    }                                                                          \
 }
 
 PUT_HEVC_QPEL_H(1)
@@ -927,20 +941,22 @@
                                        int16_t* mcbuffer)
 {
     int x, y;
-    pixel *src = (pixel*)_src;
+    pixel *src          = (pixel *)_src;
     ptrdiff_t srcstride = _srcstride / sizeof(pixel);
 
     for (y = 0; y < height; y++) {
-        for (x = 0; x < width; x++) {
+        for (x = 0; x < width; x++)
             dst[x] = src[x] << (14 - BIT_DEPTH);
-        }
         src += srcstride;
         dst += dststride;
     }
 }
 
-#define EPEL_FILTER(src, stride) \
-    (filter_0*src[x-stride] + filter_1*src[x] + filter_2*src[x+stride] + filter_3*src[x+2*stride])
+#define EPEL_FILTER(src, stride)                \
+    (filter_0 * src[x - stride] +               \
+     filter_1 * src[x]          +               \
+     filter_2 * src[x + stride] +               \
+     filter_3 * src[x + 2 * stride])
 
 static void FUNC(put_hevc_epel_h)(int16_t *dst, ptrdiff_t dststride,
                                   uint8_t *_src, ptrdiff_t _srcstride,
@@ -948,17 +964,16 @@
                                   int16_t* mcbuffer)
 {
     int x, y;
-    pixel *src = (pixel*)_src;
-    ptrdiff_t srcstride = _srcstride / sizeof(pixel);
+    pixel *src = (pixel *)_src;
+    ptrdiff_t srcstride  = _srcstride / sizeof(pixel);
     const int8_t *filter = ff_hevc_epel_filters[mx - 1];
     int8_t filter_0 = filter[0];
     int8_t filter_1 = filter[1];
     int8_t filter_2 = filter[2];
     int8_t filter_3 = filter[3];
     for (y = 0; y < height; y++) {
-        for (x = 0; x < width; x++) {
+        for (x = 0; x < width; x++)
             dst[x] = EPEL_FILTER(src, 1) >> (BIT_DEPTH - 8);
-        }
         src += srcstride;
         dst += dststride;
     }
@@ -970,18 +985,17 @@
                                   int16_t* mcbuffer)
 {
     int x, y;
-    pixel *src = (pixel*)_src;
+    pixel *src = (pixel *)_src;
     ptrdiff_t srcstride = _srcstride / sizeof(pixel);
-    const int8_t *filter = ff_hevc_epel_filters[my-1];
+    const int8_t *filter = ff_hevc_epel_filters[my - 1];
     int8_t filter_0 = filter[0];
     int8_t filter_1 = filter[1];
     int8_t filter_2 = filter[2];
     int8_t filter_3 = filter[3];
 
     for (y = 0; y < height; y++) {
-        for (x = 0; x < width; x++) {
+        for (x = 0; x < width; x++)
             dst[x] = EPEL_FILTER(src, srcstride) >> (BIT_DEPTH - 8);
-        }
         src += srcstride;
         dst += dststride;
     }
@@ -993,36 +1007,34 @@
                                    int16_t* mcbuffer)
 {
     int x, y;
-    pixel *src = (pixel*)_src;
+    pixel *src = (pixel *)_src;
     ptrdiff_t srcstride = _srcstride / sizeof(pixel);
-    const int8_t *filter_h = ff_hevc_epel_filters[mx-1];
-    const int8_t *filter_v = ff_hevc_epel_filters[my-1];
+    const int8_t *filter_h = ff_hevc_epel_filters[mx - 1];
+    const int8_t *filter_v = ff_hevc_epel_filters[my - 1];
     int8_t filter_0 = filter_h[0];
     int8_t filter_1 = filter_h[1];
     int8_t filter_2 = filter_h[2];
     int8_t filter_3 = filter_h[3];
-    int16_t tmp_array[(MAX_PB_SIZE + 3)*MAX_PB_SIZE];
+    int16_t tmp_array[(MAX_PB_SIZE + 3) * MAX_PB_SIZE];
     int16_t *tmp = tmp_array;
 
     src -= EPEL_EXTRA_BEFORE * srcstride;
 
     for (y = 0; y < height + EPEL_EXTRA; y++) {
-        for (x = 0; x < width; x++) {
+        for (x = 0; x < width; x++)
             tmp[x] = EPEL_FILTER(src, 1) >> (BIT_DEPTH - 8);
-        }
         src += srcstride;
         tmp += MAX_PB_SIZE;
     }
 
-    tmp = tmp_array + EPEL_EXTRA_BEFORE * MAX_PB_SIZE;
+    tmp      = tmp_array + EPEL_EXTRA_BEFORE * MAX_PB_SIZE;
     filter_0 = filter_v[0];
     filter_1 = filter_v[1];
     filter_2 = filter_v[2];
     filter_3 = filter_v[3];
     for (y = 0; y < height; y++) {
-        for (x = 0; x < width; x++) {
+        for (x = 0; x < width; x++)
             dst[x] = EPEL_FILTER(tmp, MAX_PB_SIZE) >> 6;
-        }
         tmp += MAX_PB_SIZE;
         dst += dststride;
     }
@@ -1033,7 +1045,7 @@
                                       int width, int height)
 {
     int x, y;
-    pixel *dst = (pixel*)_dst;
+    pixel *dst          = (pixel *)_dst;
     ptrdiff_t dststride = _dststride / sizeof(pixel);
 
     int shift = 14 - BIT_DEPTH;
@@ -1043,9 +1055,8 @@
     int offset = 0;
 #endif
     for (y = 0; y < height; y++) {
-        for (x = 0; x < width; x++) {
+        for (x = 0; x < width; x++)
             dst[x] = av_clip_pixel((src[x] + offset) >> shift);
-        }
         dst += dststride;
         src += srcstride;
     }
@@ -1057,7 +1068,7 @@
                                         int width, int height)
 {
     int x, y;
-    pixel *dst = (pixel*)_dst;
+    pixel *dst          = (pixel *)_dst;
     ptrdiff_t dststride = _dststride / sizeof(pixel);
 
     int shift = 14 + 1 - BIT_DEPTH;
@@ -1068,9 +1079,8 @@
 #endif
 
     for (y = 0; y < height; y++) {
-        for (x = 0; x < width; x++) {
+        for (x = 0; x < width; x++)
             dst[x] = av_clip_pixel((src1[x] + src2[x] + offset) >> shift);
-        }
         dst  += dststride;
         src1 += srcstride;
         src2 += srcstride;
@@ -1082,20 +1092,15 @@
                                 int16_t *src, ptrdiff_t srcstride,
                                 int width, int height)
 {
-    int shift;
-    int log2Wd;
-    int wx;
-    int ox;
-    int x , y;
-    int offset;
-    pixel *dst = (pixel*)_dst;
+    int shift, log2Wd, wx, ox, x, y, offset;
+    pixel *dst          = (pixel *)_dst;
     ptrdiff_t dststride = _dststride / sizeof(pixel);
 
     shift  = 14 - BIT_DEPTH;
     log2Wd = denom + shift;
     offset = 1 << (log2Wd - 1);
-    wx = wlxFlag;
-    ox = olxFlag * (1 << (BIT_DEPTH - 8));
+    wx     = wlxFlag;
+    ox     = olxFlag * (1 << (BIT_DEPTH - 8));
 
     for (y = 0; y < height; y++) {
         for (x = 0; x < width; x++) {
@@ -1105,39 +1110,34 @@
                 dst[x] = av_clip_pixel(src[x] * wx + ox);
             }
         }
-        dst  += dststride;
-        src  += srcstride;
+        dst += dststride;
+        src += srcstride;
     }
 }
 
-static void FUNC(weighted_pred_avg)(uint8_t denom, int16_t wl0Flag, int16_t wl1Flag,
+static void FUNC(weighted_pred_avg)(uint8_t denom,
+                                    int16_t wl0Flag, int16_t wl1Flag,
                                     int16_t ol0Flag, int16_t ol1Flag,
                                     uint8_t *_dst, ptrdiff_t _dststride,
-                                    int16_t *src1, int16_t *src2, ptrdiff_t srcstride,
+                                    int16_t *src1, int16_t *src2,
+                                    ptrdiff_t srcstride,
                                     int width, int height)
 {
-    int shift;
-    int log2Wd;
-    int w0;
-    int w1;
-    int o0;
-    int o1;
-    int x , y;
-    pixel *dst = (pixel*)_dst;
+    int shift, log2Wd, w0, w1, o0, o1, x, y;
+    pixel *dst = (pixel *)_dst;
     ptrdiff_t dststride = _dststride / sizeof(pixel);
 
     shift  = 14 - BIT_DEPTH;
     log2Wd = denom + shift;
-    w0 = wl0Flag;
-    w1 = wl1Flag;
-    o0 = (ol0Flag) * (1 << (BIT_DEPTH - 8));
-    o1 = (ol1Flag) * (1 << (BIT_DEPTH - 8));
+    w0     = wl0Flag;
+    w1     = wl1Flag;
+    o0     = ol0Flag * (1 << (BIT_DEPTH - 8));
+    o1     = ol1Flag * (1 << (BIT_DEPTH - 8));
 
     for (y = 0; y < height; y++) {
-        for (x = 0; x < width; x++) {
+        for (x = 0; x < width; x++)
             dst[x] = av_clip_pixel((src1[x] * w0 + src2[x] * w1 +
                                     ((o0 + o1 + 1) << log2Wd)) >> (log2Wd + 1));
-        }
         dst  += dststride;
         src1 += srcstride;
         src2 += srcstride;
@@ -1145,55 +1145,56 @@
 }
 
 // line zero
-#define P3 pix[-4*xstride]
-#define P2 pix[-3*xstride]
-#define P1 pix[-2*xstride]
-#define P0 pix[-xstride]
-#define Q0 pix[0]
-#define Q1 pix[xstride]
-#define Q2 pix[2*xstride]
-#define Q3 pix[3*xstride]
+#define P3 pix[-4 * xstride]
+#define P2 pix[-3 * xstride]
+#define P1 pix[-2 * xstride]
+#define P0 pix[-1 * xstride]
+#define Q0 pix[0 * xstride]
+#define Q1 pix[1 * xstride]
+#define Q2 pix[2 * xstride]
+#define Q3 pix[3 * xstride]
 
 // line three. used only for deblocking decision
-#define TP3 pix[-4*xstride+3*ystride]
-#define TP2 pix[-3*xstride+3*ystride]
-#define TP1 pix[-2*xstride+3*ystride]
-#define TP0 pix[-xstride+3*ystride]
-#define TQ0 pix[3*ystride]
-#define TQ1 pix[xstride+3*ystride]
-#define TQ2 pix[2*xstride+3*ystride]
-#define TQ3 pix[3*xstride+3*ystride]
-
-static void FUNC(hevc_loop_filter_luma)(uint8_t *_pix, ptrdiff_t _xstride,
-                                        ptrdiff_t _ystride, int *_beta, int *_tc,
+#define TP3 pix[-4 * xstride + 3 * ystride]
+#define TP2 pix[-3 * xstride + 3 * ystride]
+#define TP1 pix[-2 * xstride + 3 * ystride]
+#define TP0 pix[-1 * xstride + 3 * ystride]
+#define TQ0 pix[0  * xstride + 3 * ystride]
+#define TQ1 pix[1  * xstride + 3 * ystride]
+#define TQ2 pix[2  * xstride + 3 * ystride]
+#define TQ3 pix[3  * xstride + 3 * ystride]
+
+static void FUNC(hevc_loop_filter_luma)(uint8_t *_pix,
+                                        ptrdiff_t _xstride, ptrdiff_t _ystride,
+                                        int *_beta, int *_tc,
                                         uint8_t *_no_p, uint8_t *_no_q)
 {
     int d, j;
-    pixel *pix = (pixel*)_pix;
+    pixel *pix        = (pixel *)_pix;
     ptrdiff_t xstride = _xstride / sizeof(pixel);
     ptrdiff_t ystride = _ystride / sizeof(pixel);
 
     for (j = 0; j < 2; j++) {
-        const int dp0  = abs(P2 - 2 * P1 +  P0);
-        const int dq0  = abs(Q2 - 2 * Q1 +  Q0);
+        const int dp0  = abs(P2  - 2 * P1  + P0);
+        const int dq0  = abs(Q2  - 2 * Q1  + Q0);
         const int dp3  = abs(TP2 - 2 * TP1 + TP0);
         const int dq3  = abs(TQ2 - 2 * TQ1 + TQ0);
         const int d0   = dp0 + dq0;
         const int d3   = dp3 + dq3;
-        int       beta = _beta[j] << (BIT_DEPTH - 8);
-        const int tc   = _tc[j] << (BIT_DEPTH - 8);
+        const int beta = _beta[j] << (BIT_DEPTH - 8);
+        const int tc   = _tc[j]   << (BIT_DEPTH - 8);
         const int no_p = _no_p[j];
         const int no_q = _no_q[j];
 
-        if (d0 + d3 >= beta /*|| tc <= 0*/) {
+        if (d0 + d3 >= beta) {
             pix += 4 * ystride;
             continue;
         } else {
             const int beta_3 = beta >> 3;
             const int beta_2 = beta >> 2;
-            const int tc25 = ((tc * 5 + 1) >> 1);
+            const int tc25   = ((tc * 5 + 1) >> 1);
 
-            if (abs( P3 -  P0) + abs( Q3 -  Q0) < beta_3 && abs( P0 -  Q0) < tc25 &&
+            if (abs(P3  -  P0) + abs(Q3  -  Q0) < beta_3 && abs(P0  -  Q0) < tc25 &&
                 abs(TP3 - TP0) + abs(TQ3 - TQ0) < beta_3 && abs(TP0 - TQ0) < tc25 &&
                                       (d0 << 1) < beta_2 &&      (d3 << 1) < beta_2) {
                 // strong filtering
@@ -1208,14 +1209,14 @@
                     const int q2 = Q2;
                     const int q3 = Q3;
                     if (!no_p) {
-                        P0 = p0 + av_clip((( p2 + 2*p1 + 2*p0 + 2*q0 + q1 + 4 ) >> 3) - p0, -tc2, tc2);
-                        P1 = p1 + av_clip((( p2 + p1 + p0 + q0 + 2 ) >> 2) - p1, -tc2, tc2);
-                        P2 = p2 + av_clip((( 2*p3 + 3*p2 + p1 + p0 + q0 + 4 ) >> 3) - p2, -tc2, tc2);
+                        P0 = p0 + av_clip(((p2 + 2 * p1 + 2 * p0 + 2 * q0 + q1 + 4) >> 3) - p0, -tc2, tc2);
+                        P1 = p1 + av_clip(((p2 + p1 + p0 + q0 + 2) >> 2) - p1, -tc2, tc2);
+                        P2 = p2 + av_clip(((2 * p3 + 3 * p2 + p1 + p0 + q0 + 4) >> 3) - p2, -tc2, tc2);
                     }
                     if (!no_q) {
-                        Q0 = q0 + av_clip((( p1 + 2*p0 + 2*q0 + 2*q1 + q2 + 4 ) >> 3) - q0, -tc2, tc2);
-                        Q1 = q1 + av_clip((( p0 + q0 + q1 + q2 + 2 ) >> 2) - q1, -tc2, tc2);
-                        Q2 = q2 + av_clip((( 2*q3 + 3*q2 + q1 + q0 + p0 + 4 ) >> 3) - q2, -tc2, tc2);
+                        Q0 = q0 + av_clip(((p1 + 2 * p0 + 2 * q0 + 2 * q1 + q2 + 4) >> 3) - q0, -tc2, tc2);
+                        Q1 = q1 + av_clip(((p0 + q0 + q1 + q2 + 2) >> 2) - q1, -tc2, tc2);
+                        Q2 = q2 + av_clip(((2 * q3 + 3 * q2 + q1 + q0 + p0 + 4) >> 3) - q2, -tc2, tc2);
                     }
                     pix += ystride;
                 }
@@ -1235,7 +1236,7 @@
                     const int q0 = Q0;
                     const int q1 = Q1;
                     const int q2 = Q2;
-                    int delta0 = (9 * (q0 - p0) - 3 * (q1 - p1) + 8) >> 4;
+                    int delta0   = (9 * (q0 - p0) - 3 * (q1 - p1) + 8) >> 4;
                     if (abs(delta0) < 10 * tc) {
                         delta0 = av_clip(delta0, -tc, tc);
                         if (!no_p)
@@ -1262,9 +1263,8 @@
                                           ptrdiff_t _ystride, int *_tc,
                                           uint8_t *_no_p, uint8_t *_no_q)
 {
-    int d, j;
-    int no_p, no_q;
-    pixel *pix = (pixel*)_pix;
+    int d, j, no_p, no_q;
+    pixel *pix        = (pixel *)_pix;
     ptrdiff_t xstride = _xstride / sizeof(pixel);
     ptrdiff_t ystride = _ystride / sizeof(pixel);
 
@@ -1283,7 +1283,7 @@
             const int p0 = P0;
             const int q0 = Q0;
             const int q1 = Q1;
-            delta0 = av_clip((((q0 - p0) << 2) + p1 - q1 + 4) >> 3, -tc, tc);
+            delta0 = av_clip((((q0 - p0) * 4) + p1 - q1 + 4) >> 3, -tc, tc);
             if (!no_p)
                 P0 = av_clip_pixel(p0 + delta0);
             if (!no_q)
@@ -1294,13 +1294,15 @@
 }
 
 static void FUNC(hevc_h_loop_filter_chroma)(uint8_t *pix, ptrdiff_t stride,
-                                            int *tc, uint8_t *no_p, uint8_t *no_q)
+                                            int *tc, uint8_t *no_p,
+                                            uint8_t *no_q)
 {
     FUNC(hevc_loop_filter_chroma)(pix, stride, sizeof(pixel), tc, no_p, no_q);
 }
 
 static void FUNC(hevc_v_loop_filter_chroma)(uint8_t *pix, ptrdiff_t stride,
-                                            int *tc, uint8_t *no_p, uint8_t *no_q)
+                                            int *tc, uint8_t *no_p,
+                                            uint8_t *no_q)
 {
     FUNC(hevc_loop_filter_chroma)(pix, sizeof(pixel), stride, tc, no_p, no_q);
 }
@@ -1309,14 +1311,16 @@
                                           int *beta, int *tc, uint8_t *no_p,
                                           uint8_t *no_q)
 {
-    FUNC(hevc_loop_filter_luma)(pix, stride, sizeof(pixel), beta, tc, no_p, no_q);
+    FUNC(hevc_loop_filter_luma)(pix, stride, sizeof(pixel),
+                                beta, tc, no_p, no_q);
 }
 
 static void FUNC(hevc_v_loop_filter_luma)(uint8_t *pix, ptrdiff_t stride,
                                           int *beta, int *tc, uint8_t *no_p,
                                           uint8_t *no_q)
 {
-    FUNC(hevc_loop_filter_luma)(pix, sizeof(pixel), stride, beta, tc, no_p, no_q);
+    FUNC(hevc_loop_filter_luma)(pix, sizeof(pixel), stride,
+                                beta, tc, no_p, no_q);
 }
 
 #undef P3

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/hevcpred.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/hevcpred.c Changed

@@ -21,6 +21,7 @@
  */
 
 #include "hevc.h"
+
 #include "hevcpred.h"
 
 #define BIT_DEPTH 8
@@ -40,16 +41,16 @@
 #undef FUNC
 #define FUNC(a, depth) a ## _ ## depth
 
-#define HEVC_PRED(depth)                            \
-    hpc->intra_pred   = FUNC(intra_pred, depth);   \
+#define HEVC_PRED(depth)                                \
+    hpc->intra_pred      = FUNC(intra_pred, depth);     \
     hpc->pred_planar[0]  = FUNC(pred_planar_0, depth);  \
     hpc->pred_planar[1]  = FUNC(pred_planar_1, depth);  \
     hpc->pred_planar[2]  = FUNC(pred_planar_2, depth);  \
     hpc->pred_planar[3]  = FUNC(pred_planar_3, depth);  \
-    hpc->pred_dc      = FUNC(pred_dc, depth);      \
-    hpc->pred_angular[0] = FUNC(pred_angular_0, depth);\
-    hpc->pred_angular[1] = FUNC(pred_angular_1, depth);\
-    hpc->pred_angular[2] = FUNC(pred_angular_2, depth);\
+    hpc->pred_dc         = FUNC(pred_dc, depth);        \
+    hpc->pred_angular[0] = FUNC(pred_angular_0, depth); \
+    hpc->pred_angular[1] = FUNC(pred_angular_1, depth); \
+    hpc->pred_angular[2] = FUNC(pred_angular_2, depth); \
     hpc->pred_angular[3] = FUNC(pred_angular_3, depth);
 
     switch (bit_depth) {

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/hevcpred_template.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/hevcpred_template.c Changed

@@ -1,5 +1,5 @@
 /*
- * HEVC video Decoder
+ * HEVC video decoder
  *
  * Copyright (C) 2012 - 2013 Guillaume Martres
  *
@@ -21,6 +21,7 @@
  */
 
 #include "libavutil/pixdesc.h"
+
 #include "bit_depth_template.c"
 #include "hevcpred.h"
 
@@ -92,9 +93,9 @@
     pixel filtered_top_array[2 * MAX_TB_SIZE + 1];
 
     pixel *left          = left_array + 1;
-    pixel *top           = top_array + 1;
+    pixel *top           = top_array  + 1;
     pixel *filtered_left = filtered_left_array + 1;
-    pixel *filtered_top  = filtered_top_array + 1;
+    pixel *filtered_top  = filtered_top_array  + 1;
 
     int cand_bottom_left = lc->na.cand_bottom_left && cur_tb_addr > MIN_TB_ADDR_ZS(x_tb - 1, y_tb + size_in_tbs);
     int cand_left        = lc->na.cand_left;
@@ -109,9 +110,9 @@
 
     if (s->pps->constrained_intra_pred_flag == 1) {
         int size_in_luma_pu = PU(size_in_luma);
-        int on_pu_edge_x = !(x0 & ((1 << s->sps->log2_min_pu_size) - 1));
-        int on_pu_edge_y = !(y0 & ((1 << s->sps->log2_min_pu_size) - 1));
-        if(!size_in_luma_pu)
+        int on_pu_edge_x    = !(x0 & ((1 << s->sps->log2_min_pu_size) - 1));
+        int on_pu_edge_y    = !(y0 & ((1 << s->sps->log2_min_pu_size) - 1));
+        if (!size_in_luma_pu)
             size_in_luma_pu++;
         if (cand_bottom_left == 1 && on_pu_edge_x) {
             int x_left_pu   = PU(x0 - 1);
@@ -157,7 +158,8 @@
     }
     if (cand_bottom_left) {
         for (i = size + bottom_left_size; i < (size << 1); i++)
-            if (IS_INTRA(-1, size + bottom_left_size - 1) || !s->pps->constrained_intra_pred_flag)
+            if (IS_INTRA(-1, size + bottom_left_size - 1) ||
+                !s->pps->constrained_intra_pred_flag)
                 left[i] = POS(-1, size + bottom_left_size - 1);
         for (i = size + bottom_left_size - 1; i >= size; i--)
             if (IS_INTRA(-1, i) || !s->pps->constrained_intra_pred_flag)
@@ -178,7 +180,8 @@
                 top[i] = POS(i, -1);
     if (cand_up_right) {
         for (i = size + top_right_size; i < (size << 1); i++)
-            if (IS_INTRA(size + top_right_size - 1, -1) || !s->pps->constrained_intra_pred_flag)
+            if (IS_INTRA(size + top_right_size - 1, -1) ||
+                !s->pps->constrained_intra_pred_flag)
                 top[i] = POS(size + top_right_size - 1, -1);
         for (i = size + top_right_size - 1; i >= size; i--)
             if (IS_INTRA(i, -1) || !s->pps->constrained_intra_pred_flag)
@@ -201,29 +204,32 @@
                                                      size : (s->sps->height - y0) >> vshift;
             }
             if (cand_bottom_left || cand_left || cand_up_left) {
-                while (j>-1 && !IS_INTRA(-1, j)) j--;
+                while (j > -1 && !IS_INTRA(-1, j))
+                    j--;
                 if (!IS_INTRA(-1, j)) {
                     j = 0;
-                    while(j < size_max_x && !IS_INTRA(j, -1)) j++;
-                    EXTEND_LEFT_CIP(top, j, j+1);
+                    while (j < size_max_x && !IS_INTRA(j, -1))
+                        j++;
+                    EXTEND_LEFT_CIP(top, j, j + 1);
                     left[-1] = top[-1];
-                    j = 0;
+                    j        = 0;
                 }
             } else {
                 j = 0;
-                while (j < size_max_x && !IS_INTRA(j, -1)) j++;
+                while (j < size_max_x && !IS_INTRA(j, -1))
+                    j++;
                 if (j > 0)
                     if (x0 > 0) {
-                        EXTEND_LEFT_CIP(top, j, j+1);
+                        EXTEND_LEFT_CIP(top, j, j + 1);
                     } else {
                         EXTEND_LEFT_CIP(top, j, j);
                         top[-1] = top[0];
                     }
                 left[-1] = top[-1];
-                j = 0;
+                j        = 0;
             }
             if (cand_bottom_left || cand_left) {
-                EXTEND_DOWN_CIP(left, j, size_max_y-j);
+                EXTEND_DOWN_CIP(left, j, size_max_y - j);
             }
             if (!cand_left) {
                 EXTEND_DOWN(left, 0, size);
@@ -233,10 +239,10 @@
             }
             if (x0 != 0 && y0 != 0) {
                 EXTEND_UP_CIP(left, size_max_y - 1, size_max_y);
-            } else if( x0 == 0) {
+            } else if (x0 == 0) {
                 EXTEND_UP_CIP_0(left, size_max_y - 1, size_max_y);
-            } else{
-                EXTEND_UP_CIP(left, size_max_y - 1, size_max_y-1);
+            } else {
+                EXTEND_UP_CIP(left, size_max_y - 1, size_max_y - 1);
             }
             top[-1] = left[-1];
             if (y0 != 0) {
@@ -255,14 +261,14 @@
             left[-1] = top[0];
             EXTEND_DOWN(left, 0, 2 * size);
             cand_up_left = 1;
-            cand_left = 1;
+            cand_left    = 1;
         } else if (cand_up_right) {
             EXTEND_LEFT(top, size, size);
             left[-1] = top[0];
-            EXTEND_DOWN(left ,0 , 2 * size);
-            cand_up = 1;
+            EXTEND_DOWN(left, 0, 2 * size);
+            cand_up      = 1;
             cand_up_left = 1;
-            cand_left = 1;
+            cand_left    = 1;
         } else { // No samples available
             top[0] = left[-1] = (1 << (BIT_DEPTH - 1));
             EXTEND_RIGHT(top, 1, 2 * size - 1);
@@ -278,7 +284,7 @@
     }
     if (!cand_up) {
         top[0] = left[-1];
-        EXTEND_RIGHT(top, 1, size-1);
+        EXTEND_RIGHT(top, 1, size - 1);
     }
     if (!cand_up_right) {
         EXTEND_RIGHT(top, size, size);
@@ -286,30 +292,16 @@
 
     top[-1] = left[-1];
 
-#undef EXTEND_LEFT_CIP
-#undef EXTEND_RIGHT_CIP
-#undef EXTEND_UP_CIP
-#undef EXTEND_DOWN_CIP
-#undef IS_INTRA
-#undef MVF_PU
-#undef MVF
-#undef PU
-#undef EXTEND_LEFT
-#undef EXTEND_RIGHT
-#undef EXTEND_UP
-#undef EXTEND_DOWN
-#undef MIN_TB_ADDR_ZS
-
     // Filtering process
     if (c_idx == 0 && mode != INTRA_DC && size != 4) {
         int intra_hor_ver_dist_thresh[] = { 7, 1, 0 };
-        int min_dist_vert_hor           = FFMIN(FFABS((int)(mode - 26U)),
-                                                FFABS((int)(mode - 10U)));
+        int min_dist_vert_hor = FFMIN(FFABS((int)(mode - 26U)),
+                                      FFABS((int)(mode - 10U)));
         if (min_dist_vert_hor > intra_hor_ver_dist_thresh[log2_size - 3]) {
             int threshold = 1 << (BIT_DEPTH - 5);
             if (s->sps->sps_strong_intra_smoothing_enable_flag &&
                 log2_size == 5 &&
-                FFABS(top[-1] + top[63] - 2 * top[31]) < threshold &&
+                FFABS(top[-1]  + top[63]  - 2 * top[31])  < threshold &&
                 FFABS(left[-1] + left[63] - 2 * left[31]) < threshold) {
                 // We can't just overwrite values in top because it could be
                 // a pointer into src
@@ -328,9 +320,8 @@
                 for (i = 2 * size - 2; i >= 0; i--)
                     filtered_left[i] = (left[i + 1] + 2 * left[i] +
                                         left[i - 1] + 2) >> 2;
-                filtered_top[-1] =
-                filtered_left[-1] = (left[0] + 2 * left[-1] +
-                                     top[0]  + 2) >> 2;
+                filtered_top[-1]  =
+                filtered_left[-1] = (left[0] + 2 * left[-1] + top[0] + 2) >> 2;
                 for (i = 2 * size - 2; i >= 0; i--)
                     filtered_top[i] = (top[i + 1] + 2 * top[i] +
                                        top[i - 1] + 2) >> 2;
@@ -342,16 +333,17 @@
 
     switch (mode) {
     case INTRA_PLANAR:
-        s->hpc.pred_planar[log2_size - 2]((uint8_t*)src, (uint8_t*)top,
-                                          (uint8_t*)left, stride);
+        s->hpc.pred_planar[log2_size - 2]((uint8_t *)src, (uint8_t *)top,
+                                          (uint8_t *)left, stride);
         break;
     case INTRA_DC:
-        s->hpc.pred_dc((uint8_t*)src, (uint8_t*)top,
-                       (uint8_t*)left, stride, log2_size, c_idx);
+        s->hpc.pred_dc((uint8_t *)src, (uint8_t *)top,
+                       (uint8_t *)left, stride, log2_size, c_idx);
         break;
     default:
-        s->hpc.pred_angular[log2_size - 2]((uint8_t*)src, (uint8_t*)top,
-                                           (uint8_t*)left, stride, c_idx, mode);
+        s->hpc.pred_angular[log2_size - 2]((uint8_t *)src, (uint8_t *)top,
+                                           (uint8_t *)left, stride, c_idx,
+                                           mode);
         break;
     }
 }
@@ -361,52 +353,52 @@
                                 ptrdiff_t stride)
 {
     int x, y;
-    pixel *src = (pixel*)_src;
-    const pixel *top  = (const pixel*)_top;
-    const pixel *left = (const pixel*)_left;
+    pixel *src        = (pixel *)_src;
+    const pixel *top  = (const pixel *)_top;
+    const pixel *left = (const pixel *)_left;
     for (y = 0; y < 4; y++)
         for (x = 0; x < 4; x++)
-            POS(x, y) = ((3 - x) * left[y]  + (x + 1) * top[4] +
-                         (3 - y) * top[x]   + (y + 1) * left[4] + 4) >> 3;
+            POS(x, y) = ((3 - x) * left[y] + (x + 1) * top[4]  +
+                         (3 - y) * top[x]  + (y + 1) * left[4] + 4) >> 3;
 }
 
 static void FUNC(pred_planar_1)(uint8_t *_src, const uint8_t *_top,
                                 const uint8_t *_left, ptrdiff_t stride)
 {
     int x, y;
-    pixel *src = (pixel*)_src;
-    const pixel *top  = (const pixel*)_top;
-    const pixel *left = (const pixel*)_left;
+    pixel *src        = (pixel *)_src;
+    const pixel *top  = (const pixel *)_top;
+    const pixel *left = (const pixel *)_left;
     for (y = 0; y < 8; y++)
         for (x = 0; x < 8; x++)
-            POS(x, y) = ((7 - x) * left[y]  + (x + 1) * top[8] +
-                         (7 - y) * top[x]   + (y + 1) * left[8] + 8) >> 4;
+            POS(x, y) = ((7 - x) * left[y] + (x + 1) * top[8]  +
+                         (7 - y) * top[x]  + (y + 1) * left[8] + 8) >> 4;
 }
 
 static void FUNC(pred_planar_2)(uint8_t *_src, const uint8_t *_top,
                                 const uint8_t *_left, ptrdiff_t stride)
 {
     int x, y;
-    pixel *src = (pixel*)_src;
-    const pixel *top  = (const pixel*)_top;
-    const pixel *left = (const pixel*)_left;
+    pixel *src        = (pixel *)_src;
+    const pixel *top  = (const pixel *)_top;
+    const pixel *left = (const pixel *)_left;
     for (y = 0; y < 16; y++)
         for (x = 0; x < 16; x++)
-            POS(x, y) = ((15 - x) * left[y]  + (x + 1) * top[16] +
-                         (15 - y) * top[x]   + (y + 1) * left[16] + 16) >> 5;
+            POS(x, y) = ((15 - x) * left[y] + (x + 1) * top[16]  +
+                         (15 - y) * top[x]  + (y + 1) * left[16] + 16) >> 5;
 }
 
 static void FUNC(pred_planar_3)(uint8_t *_src, const uint8_t *_top,
                                 const uint8_t *_left, ptrdiff_t stride)
 {
     int x, y;
-    pixel *src = (pixel*)_src;
-    const pixel *top  = (const pixel*)_top;
-    const pixel *left = (const pixel*)_left;
+    pixel *src        = (pixel *)_src;
+    const pixel *top  = (const pixel *)_top;
+    const pixel *left = (const pixel *)_left;
     for (y = 0; y < 32; y++)
         for (x = 0; x < 32; x++)
-            POS(x, y) = ((31 - x) * left[y]  + (x + 1) * top[32] +
-                         (31 - y) * top[x]   + (y + 1) * left[32] + 32) >> 6;
+            POS(x, y) = ((31 - x) * left[y] + (x + 1) * top[32]  +
+                         (31 - y) * top[x]  + (y + 1) * left[32] + 32) >> 6;
 }
 
 static void FUNC(pred_dc)(uint8_t *_src, const uint8_t *_top,
@@ -414,11 +406,11 @@
                           ptrdiff_t stride, int log2_size, int c_idx)
 {
     int i, j, x, y;
-    int size = (1 << log2_size);
-    pixel *src        = (pixel*)_src;
-    const pixel *top  = (const pixel*)_top;
-    const pixel *left = (const pixel*)_left;
-    int dc = size;
+    int size          = (1 << log2_size);
+    pixel *src        = (pixel *)_src;
+    const pixel *top  = (const pixel *)_top;
+    const pixel *left = (const pixel *)_left;
+    int dc            = size;
     pixel4 a;
     for (i = 0; i < size; i++)
         dc += left[i] + top[i];
@@ -432,7 +424,7 @@
             AV_WN4PA(&POS(j * 4, i), a);
 
     if (c_idx == 0 && size < 32) {
-        POS(0, 0) = (left[0] + 2 * dc  + top[0] + 2) >> 2;
+        POS(0, 0) = (left[0] + 2 * dc + top[0] + 2) >> 2;
         for (x = 1; x < size; x++)
             POS(x, 0) = (top[x] + 3 * dc + 2) >> 2;
         for (y = 1; y < size; y++)
@@ -447,13 +439,13 @@
                                                 int mode, int size)
 {
     int x, y;
-    pixel *src = (pixel*)_src;
-    const pixel *top  = (const pixel*)_top;
-    const pixel *left = (const pixel*)_left;
+    pixel *src        = (pixel *)_src;
+    const pixel *top  = (const pixel *)_top;
+    const pixel *left = (const pixel *)_left;
 
     static const int intra_pred_angle[] = {
-        32, 26, 21, 17, 13, 9, 5, 2, 0, -2, -5, -9, -13, -17, -21, -26, -32,
-        -26, -21, -17, -13, -9, -5, -2, 0, 2, 5, 9, 13, 17, 21, 26, 32
+         32,  26,  21,  17, 13,  9,  5, 2, 0, -2, -5, -9, -13, -17, -21, -26, -32,
+        -26, -21, -17, -13, -9, -5, -2, 0, 2,  5,  9, 13,  17,  21,  26,  32
     };
     static const int inv_angle[] = {
         -4096, -1638, -910, -630, -482, -390, -315, -256, -315, -390, -482,
@@ -472,7 +464,7 @@
             for (x = 0; x <= size; x++)
                 ref_tmp[x] = top[x - 1];
             for (x = last; x <= -1; x++)
-                ref_tmp[x] = left[-1 + ((x * inv_angle[mode-11] + 128) >> 8)];
+                ref_tmp[x] = left[-1 + ((x * inv_angle[mode - 11] + 128) >> 8)];
             ref = ref_tmp;
         }
 
@@ -485,9 +477,8 @@
                                        fact  * ref[x + idx + 2] + 16) >> 5;
                 }
             } else {
-                for (x = 0; x < size; x++) {
+                for (x = 0; x < size; x++)
                     POS(x, y) = ref[x + idx + 1];
-                }
             }
         }
         if (mode == 26 && c_idx == 0 && size < 32) {
@@ -500,7 +491,7 @@
             for (x = 0; x <= size; x++)
                 ref_tmp[x] = left[x - 1];
             for (x = last; x <= -1; x++)
-                ref_tmp[x] = top[-1 + ((x * inv_angle[mode-11] + 128) >> 8)];
+                ref_tmp[x] = top[-1 + ((x * inv_angle[mode - 11] + 128) >> 8)];
             ref = ref_tmp;
         }
 
@@ -513,9 +504,8 @@
                                        fact  * ref[y + idx + 2] + 16) >> 5;
                 }
             } else {
-                for (y = 0; y < size; y++) {
+                for (y = 0; y < size; y++)
                     POS(x, y) = ref[y + idx + 1];
-                }
             }
         }
         if (mode == 10 && c_idx == 0 && size < 32) {
@@ -552,4 +542,18 @@
 {
     FUNC(pred_angular)(src, top, left, stride, c_idx, mode, 1 << 5);
 }
+
+#undef EXTEND_LEFT_CIP
+#undef EXTEND_RIGHT_CIP
+#undef EXTEND_UP_CIP
+#undef EXTEND_DOWN_CIP
+#undef IS_INTRA
+#undef MVF_PU
+#undef MVF
+#undef PU
+#undef EXTEND_LEFT
+#undef EXTEND_RIGHT
+#undef EXTEND_UP
+#undef EXTEND_DOWN
+#undef MIN_TB_ADDR_ZS
 #undef POS

omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/hnm4video.c Added

@@ -0,0 +1,508 @@
+/*
+ * Cryo Interactive Entertainment HNM4 video decoder
+ *
+ * Copyright (c) 2012 David Kment
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <string.h>
+
+#include "libavutil/internal.h"
+#include "libavutil/intreadwrite.h"
+#include "libavutil/mem.h"
+#include "avcodec.h"
+#include "bytestream.h"
+#include "internal.h"
+
+#define HNM4_CHUNK_ID_PL 19536
+#define HNM4_CHUNK_ID_IZ 23113
+#define HNM4_CHUNK_ID_IU 21833
+#define HNM4_CHUNK_ID_SD 17491
+
+typedef struct Hnm4VideoContext {
+    uint8_t version;
+    int width;
+    int height;
+    uint8_t *current;
+    uint8_t *previous;
+    uint8_t *buffer1;
+    uint8_t *buffer2;
+    uint8_t *processed;
+    uint32_t palette[256];
+} Hnm4VideoContext;
+
+static int getbit(GetByteContext *gb, uint32_t *bitbuf, int *bits)
+{
+    int ret;
+
+    if (!*bits) {
+        *bitbuf = bytestream2_get_le32(gb);
+        *bits = 32;
+    }
+
+    ret = *bitbuf >> 31;
+    *bitbuf <<= 1;
+    (*bits)--;
+
+    return ret;
+}
+
+static void unpack_intraframe(AVCodecContext *avctx, uint8_t *src,
+                              uint32_t size)
+{
+    Hnm4VideoContext *hnm = avctx->priv_data;
+    GetByteContext gb;
+    uint32_t bitbuf = 0, writeoffset = 0, count = 0;
+    uint16_t word;
+    int32_t offset;
+    int bits = 0;
+
+    bytestream2_init(&gb, src, size);
+
+    while (bytestream2_tell(&gb) < size) {
+        if (getbit(&gb, &bitbuf, &bits)) {
+            if (writeoffset >= hnm->width * hnm->height) {
+                av_log(avctx, AV_LOG_ERROR,
+                       "Attempting to write out of bounds\n");
+                break;
+            }
+            hnm->current[writeoffset++] = bytestream2_get_byte(&gb);
+        } else {
+            if (getbit(&gb, &bitbuf, &bits)) {
+                word   = bytestream2_get_le16(&gb);
+                count  = word & 0x07;
+                offset = (word >> 3) - 0x2000;
+                if (!count)
+                    count = bytestream2_get_byte(&gb);
+                if (!count)
+                    return;
+            } else {
+                count  = getbit(&gb, &bitbuf, &bits) * 2;
+                count += getbit(&gb, &bitbuf, &bits);
+                offset = bytestream2_get_byte(&gb) - 0x0100;
+            }
+            count  += 2;
+            offset += writeoffset;
+            if (offset < 0 || offset + count >= hnm->width * hnm->height) {
+                av_log(avctx, AV_LOG_ERROR, "Attempting to read out of bounds\n");
+                break;
+            } else if (writeoffset + count >= hnm->width * hnm->height) {
+                av_log(avctx, AV_LOG_ERROR,
+                       "Attempting to write out of bounds\n");
+                break;
+            }
+            while (count--) {
+                hnm->current[writeoffset++] = hnm->current[offset++];
+            }
+        }
+    }
+}
+
+static void postprocess_current_frame(AVCodecContext *avctx)
+{
+    Hnm4VideoContext *hnm = avctx->priv_data;
+    uint32_t x, y, src_x, src_y;
+
+    for (y = 0; y < hnm->height; y++) {
+        src_y = y - (y % 2);
+        src_x = src_y * hnm->width + (y % 2);
+        for (x = 0; x < hnm->width; x++) {
+            hnm->processed[(y * hnm->width) + x] = hnm->current[src_x];
+            src_x += 2;
+        }
+    }
+}
+
+static void copy_processed_frame(AVCodecContext *avctx, AVFrame *frame)
+{
+    Hnm4VideoContext *hnm = avctx->priv_data;
+    uint8_t *src = hnm->processed;
+    uint8_t *dst = frame->data[0];
+    int y;
+
+    for (y = 0; y < hnm->height; y++) {
+        memcpy(dst, src, hnm->width);
+        src += hnm->width;
+        dst += frame->linesize[0];
+    }
+}
+
+static void decode_interframe_v4(AVCodecContext *avctx, uint8_t *src, uint32_t size)
+{
+    Hnm4VideoContext *hnm = avctx->priv_data;
+    GetByteContext gb;
+    uint32_t writeoffset = 0;
+    int count, left, offset;
+    uint8_t tag, previous, backline, backward, swap;
+
+    bytestream2_init(&gb, src, size);
+
+    while (bytestream2_tell(&gb) < size) {
+        count = bytestream2_peek_byte(&gb) & 0x1F;
+        if (count == 0) {
+            tag = bytestream2_get_byte(&gb) & 0xE0;
+            tag = tag >> 5;
+
+            if (tag == 0) {
+                if (writeoffset + 2 > hnm->width * hnm->height) {
+                    av_log(avctx, AV_LOG_ERROR, "writeoffset out of bounds\n");
+                    break;
+                }
+                hnm->current[writeoffset++] = bytestream2_get_byte(&gb);
+                hnm->current[writeoffset++] = bytestream2_get_byte(&gb);
+            } else if (tag == 1) {
+                writeoffset += bytestream2_get_byte(&gb) * 2;
+            } else if (tag == 2) {
+                count = bytestream2_get_le16(&gb);
+                count *= 2;
+                writeoffset += count;
+            } else if (tag == 3) {
+                count = bytestream2_get_byte(&gb) * 2;
+                if (writeoffset + count > hnm->width * hnm->height) {
+                    av_log(avctx, AV_LOG_ERROR, "writeoffset out of bounds\n");
+                    break;
+                }
+                while (count > 0) {
+                    hnm->current[writeoffset++] = bytestream2_peek_byte(&gb);
+                    count--;
+                }
+                bytestream2_skip(&gb, 1);
+            } else {
+                break;
+            }
+            if (writeoffset > hnm->width * hnm->height) {
+                av_log(avctx, AV_LOG_ERROR, "writeoffset out of bounds\n");
+                break;
+            }
+        } else {
+            previous = bytestream2_peek_byte(&gb) & 0x20;
+            backline = bytestream2_peek_byte(&gb) & 0x40;
+            backward = bytestream2_peek_byte(&gb) & 0x80;
+            bytestream2_skip(&gb, 1);
+            swap   = bytestream2_peek_byte(&gb) & 0x01;
+            offset = bytestream2_get_le16(&gb);
+            offset = (offset >> 1) & 0x7FFF;
+            offset = writeoffset + (offset * 2) - 0x8000;
+
+            left = count;
+
+            if (!backward && offset + 2*count > hnm->width * hnm->height) {
+                av_log(avctx, AV_LOG_ERROR, "Attempting to read out of bounds\n");
+                break;
+            } else if (backward && offset + 1 >= hnm->width * hnm->height) {
+                av_log(avctx, AV_LOG_ERROR, "Attempting to read out of bounds\n");
+                break;
+            } else if (writeoffset + 2*count > hnm->width * hnm->height) {
+                av_log(avctx, AV_LOG_ERROR,
+                       "Attempting to write out of bounds\n");
+                break;
+            }
+            if(backward) {
+                if (offset < (!!backline)*(2 * hnm->width - 1) + 2*(left-1)) {
+                    av_log(avctx, AV_LOG_ERROR, "Attempting to read out of bounds\n");
+                    break;
+                }
+            } else {
+                if (offset < (!!backline)*(2 * hnm->width - 1)) {
+                    av_log(avctx, AV_LOG_ERROR, "Attempting to read out of bounds\n");
+                    break;
+                }
+            }
+
+            if (previous) {
+                while (left > 0) {
+                    if (backline) {
+                        hnm->current[writeoffset++] = hnm->previous[offset - (2 * hnm->width) + 1];
+                        hnm->current[writeoffset++] = hnm->previous[offset++];
+                        offset++;
+                    } else {
+                        hnm->current[writeoffset++] = hnm->previous[offset++];
+                        hnm->current[writeoffset++] = hnm->previous[offset++];
+                    }
+                    if (backward)
+                        offset -= 4;
+                    left--;
+                }
+            } else {
+                while (left > 0) {
+                    if (backline) {
+                        hnm->current[writeoffset++] = hnm->current[offset - (2 * hnm->width) + 1];
+                        hnm->current[writeoffset++] = hnm->current[offset++];
+                        offset++;
+                    } else {
+                        hnm->current[writeoffset++] = hnm->current[offset++];
+                        hnm->current[writeoffset++] = hnm->current[offset++];
+                    }
+                    if (backward)
+                        offset -= 4;
+                    left--;
+                }
+            }
+
+            if (swap) {
+                left         = count;
+                writeoffset -= count * 2;
+                while (left > 0) {
+                    swap = hnm->current[writeoffset];
+                    hnm->current[writeoffset] = hnm->current[writeoffset + 1];
+                    hnm->current[writeoffset + 1] = swap;
+                    left--;
+                    writeoffset += 2;
+                }
+            }
+        }
+    }
+}
+
+static void decode_interframe_v4a(AVCodecContext *avctx, uint8_t *src,
+                                  uint32_t size)
+{
+    Hnm4VideoContext *hnm = avctx->priv_data;
+    GetByteContext gb;
+    uint32_t writeoffset = 0, offset;
+    uint8_t tag, count, previous, delta;
+
+    bytestream2_init(&gb, src, size);
+
+    while (bytestream2_tell(&gb) < size) {
+        count = bytestream2_peek_byte(&gb) & 0x3F;
+        if (count == 0) {
+            tag = bytestream2_get_byte(&gb) & 0xC0;
+            tag = tag >> 6;
+            if (tag == 0) {
+                writeoffset += bytestream2_get_byte(&gb);
+            } else if (tag == 1) {
+                if (writeoffset + hnm->width >= hnm->width * hnm->height) {
+                    av_log(avctx, AV_LOG_ERROR, "writeoffset out of bounds\n");
+                    break;
+                }
+                hnm->current[writeoffset]              = bytestream2_get_byte(&gb);
+                hnm->current[writeoffset + hnm->width] = bytestream2_get_byte(&gb);
+                writeoffset++;
+            } else if (tag == 2) {
+                writeoffset += hnm->width;
+            } else if (tag == 3) {
+                break;
+            }
+            if (writeoffset > hnm->width * hnm->height) {
+                av_log(avctx, AV_LOG_ERROR, "writeoffset out of bounds\n");
+                break;
+            }
+        } else {
+            delta    = bytestream2_peek_byte(&gb) & 0x80;
+            previous = bytestream2_peek_byte(&gb) & 0x40;
+            bytestream2_skip(&gb, 1);
+
+            offset  = writeoffset;
+            offset += bytestream2_get_le16(&gb);
+
+            if (delta) {
+                if (offset < 0x10000) {
+                    av_log(avctx, AV_LOG_ERROR, "Attempting to read out of bounds\n");
+                    break;
+                }
+                offset -= 0x10000;
+            }
+
+            if (offset + hnm->width + count >= hnm->width * hnm->height) {
+                av_log(avctx, AV_LOG_ERROR, "Attempting to read out of bounds\n");
+                break;
+            } else if (writeoffset + hnm->width + count >= hnm->width * hnm->height) {
+                av_log(avctx, AV_LOG_ERROR, "Attempting to write out of bounds\n");
+                break;
+            }
+
+            if (previous) {
+                while (count > 0) {
+                    hnm->current[writeoffset]              = hnm->previous[offset];
+                    hnm->current[writeoffset + hnm->width] = hnm->previous[offset + hnm->width];
+                    writeoffset++;
+                    offset++;
+                    count--;
+                }
+            } else {
+                while (count > 0) {
+                    hnm->current[writeoffset]              = hnm->current[offset];
+                    hnm->current[writeoffset + hnm->width] = hnm->current[offset + hnm->width];
+                    writeoffset++;
+                    offset++;
+                    count--;
+                }
+            }
+        }
+    }
+}
+
+static void hnm_update_palette(AVCodecContext *avctx, uint8_t *src,
+                               uint32_t size)
+{
+    Hnm4VideoContext *hnm = avctx->priv_data;
+    GetByteContext gb;
+    uint8_t start, writeoffset;
+    uint16_t count;
+    int eight_bit_colors;
+
+    eight_bit_colors = src[7] & 0x80 && hnm->version == 0x4a;
+
+    // skip first 8 bytes
+    bytestream2_init(&gb, src + 8, size - 8);
+
+    while (bytestream2_tell(&gb) < size - 8) {
+        start = bytestream2_get_byte(&gb);
+        count = bytestream2_get_byte(&gb);
+        if (start == 255 && count == 255)
+            break;
+        if (count == 0)
+            count = 256;
+        writeoffset = start;
+        while (count > 0) {
+            hnm->palette[writeoffset] = bytestream2_get_be24(&gb);
+            if (!eight_bit_colors)
+                hnm->palette[writeoffset] <<= 2;
+            count--;
+            writeoffset++;
+        }
+    }
+}
+
+static void hnm_flip_buffers(Hnm4VideoContext *hnm)
+{
+    uint8_t *temp;
+
+    temp          = hnm->current;
+    hnm->current  = hnm->previous;
+    hnm->previous = temp;
+}
+
+static int hnm_decode_frame(AVCodecContext *avctx, void *data,
+                            int *got_frame, AVPacket *avpkt)
+{
+    AVFrame *frame = data;
+    Hnm4VideoContext *hnm = avctx->priv_data;
+    int ret;
+    uint16_t chunk_id;
+
+    if (avpkt->size < 8) {
+        av_log(avctx, AV_LOG_ERROR, "packet too small\n");
+        return AVERROR_INVALIDDATA;
+    }
+
+    chunk_id = AV_RL16(avpkt->data + 4);
+
+    if (chunk_id == HNM4_CHUNK_ID_PL) {
+        hnm_update_palette(avctx, avpkt->data, avpkt->size);
+    } else if (chunk_id == HNM4_CHUNK_ID_IZ) {
+        if (avpkt->size < 12) {
+            av_log(avctx, AV_LOG_ERROR, "packet too small\n");
+            return AVERROR_INVALIDDATA;
+        }
+        if ((ret = ff_get_buffer(avctx, frame, 0)) < 0)
+            return ret;
+
+        unpack_intraframe(avctx, avpkt->data + 12, avpkt->size - 12);
+        memcpy(hnm->previous, hnm->current, hnm->width * hnm->height);
+        if (hnm->version == 0x4a)
+            memcpy(hnm->processed, hnm->current, hnm->width * hnm->height);
+        else
+            postprocess_current_frame(avctx);
+        copy_processed_frame(avctx, frame);
+        frame->pict_type = AV_PICTURE_TYPE_I;
+        frame->key_frame = 1;
+        memcpy(frame->data[1], hnm->palette, 256 * 4);
+        *got_frame = 1;
+    } else if (chunk_id == HNM4_CHUNK_ID_IU) {
+        if ((ret = ff_get_buffer(avctx, frame, 0)) < 0)
+            return ret;
+
+        if (hnm->version == 0x4a) {
+            decode_interframe_v4a(avctx, avpkt->data + 8, avpkt->size - 8);
+            memcpy(hnm->processed, hnm->current, hnm->width * hnm->height);
+        } else {
+            decode_interframe_v4(avctx, avpkt->data + 8, avpkt->size - 8);
+            postprocess_current_frame(avctx);
+        }
+        copy_processed_frame(avctx, frame);
+        frame->pict_type = AV_PICTURE_TYPE_P;
+        frame->key_frame = 0;
+        memcpy(frame->data[1], hnm->palette, 256 * 4);
+        *got_frame = 1;
+        hnm_flip_buffers(hnm);
+    } else {
+        av_log(avctx, AV_LOG_ERROR, "invalid chunk id: %d\n", chunk_id);
+        return AVERROR_INVALIDDATA;
+    }
+
+    return avpkt->size;
+}
+
+static av_cold int hnm_decode_init(AVCodecContext *avctx)
+{
+    Hnm4VideoContext *hnm = avctx->priv_data;
+
+    if (avctx->extradata_size < 1) {
+        av_log(avctx, AV_LOG_ERROR,
+               "Extradata missing, decoder requires version number\n");
+        return AVERROR_INVALIDDATA;
+    }
+
+    hnm->version   = avctx->extradata[0];
+    avctx->pix_fmt = AV_PIX_FMT_PAL8;
+    hnm->width     = avctx->width;
+    hnm->height    = avctx->height;
+    hnm->buffer1   = av_mallocz(avctx->width * avctx->height);
+    hnm->buffer2   = av_mallocz(avctx->width * avctx->height);
+    hnm->processed = av_mallocz(avctx->width * avctx->height);
+
+    if (   !hnm->buffer1 || !hnm->buffer2 || !hnm->processed
+        || avctx->width * avctx->height == 0
+        || avctx->height % 2) {
+        av_log(avctx, AV_LOG_ERROR, "av_mallocz() failed\n");
+        av_freep(&hnm->buffer1);
+        av_freep(&hnm->buffer2);
+        av_freep(&hnm->processed);
+        return AVERROR(ENOMEM);
+    }
+
+    hnm->current  = hnm->buffer1;
+    hnm->previous = hnm->buffer2;
+
+    return 0;
+}
+
+static av_cold int hnm_decode_end(AVCodecContext *avctx)
+{
+    Hnm4VideoContext *hnm = avctx->priv_data;
+
+    av_freep(&hnm->buffer1);
+    av_freep(&hnm->buffer2);
+    av_freep(&hnm->processed);
+
+    return 0;
+}
+
+AVCodec ff_hnm4_video_decoder = {
+    .name           = "hnm4video",
+    .long_name      = NULL_IF_CONFIG_SMALL("HNM 4 video"),
+    .type           = AVMEDIA_TYPE_VIDEO,
+    .id             = AV_CODEC_ID_HNM4_VIDEO,
+    .priv_data_size = sizeof(Hnm4VideoContext),
+    .init           = hnm_decode_init,
+    .close          = hnm_decode_end,
+    .decode         = hnm_decode_frame,
+    .capabilities   = CODEC_CAP_DR1,
+};

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/hpeldsp.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/hpeldsp.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/hpeldsp.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/hpeldsp.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/huffman.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/huffman.c Changed

@@ -24,6 +24,8 @@
  * huffman tree builder and VLC generator
  */
 
+#include <stdint.h>
+
 #include "avcodec.h"
 #include "get_bits.h"
 #include "huffman.h"
@@ -50,18 +52,23 @@
     }
 }
 
-void ff_huff_gen_len_table(uint8_t *dst, const uint64_t *stats)
+int ff_huff_gen_len_table(uint8_t *dst, const uint64_t *stats, int size)
 {
-    HeapElem h[256];
-    int up[2*256];
-    int len[2*256];
+    HeapElem *h  = av_malloc(sizeof(*h) * size);
+    int *up      = av_malloc(sizeof(*up) * 2 * size);
+    uint8_t *len = av_malloc(sizeof(*len) * 2 * size);
     int offset, i, next;
-    int size = 256;
+    int ret = 0;
+
+    if (!h || !up || !len) {
+        ret = AVERROR(ENOMEM);
+        goto end;
+    }
 
     for (offset = 1; ; offset <<= 1) {
         for (i=0; i < size; i++) {
             h[i].name = i;
-            h[i].val = (stats[i] << 8) + offset;
+            h[i].val = (stats[i] << 14) + offset;
         }
         for (i = size / 2 - 1; i >= 0; i--)
             heap_sift(h, i, size);
@@ -87,6 +94,11 @@
         }
         if (i==size) break;
     }
+end:
+    av_free(h);
+    av_free(up);
+    av_free(len);
+    return ret;
 }
 
 static void get_tree_codes(uint32_t *bits, int16_t *lens, uint8_t *xlat,

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/huffman.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/huffman.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/huffyuv.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/huffyuv.c Changed

@@ -1,7 +1,7 @@
 /*
  * huffyuv codec for libavcodec
  *
- * Copyright (c) 2002-2003 Michael Niedermayer <michaelni@gmx.at>
+ * Copyright (c) 2002-2014 Michael Niedermayer <michaelni@gmx.at>
  *
  * see http://www.pcisys.net/~melanson/codecs/huffyuv.txt for a description of
  * the algorithm used
@@ -35,13 +35,13 @@
 #include "avcodec.h"
 #include "huffyuv.h"
 
-int ff_huffyuv_generate_bits_table(uint32_t *dst, const uint8_t *len_table)
+int ff_huffyuv_generate_bits_table(uint32_t *dst, const uint8_t *len_table, int n)
 {
     int len, index;
     uint32_t bits = 0;
 
     for (len = 32; len > 0; len--) {
-        for (index = 0; index < 256; index++) {
+        for (index = 0; index < n; index++) {
             if (len_table[index] == len)
                 dst[index] = bits++;
         }
@@ -58,16 +58,11 @@
 {
     int i;
 
-    if (s->bitstream_bpp<24) {
-        for (i=0; i<3; i++) {
-            s->temp[i]= av_malloc(s->width + 16);
-            if (!s->temp[i])
-                return AVERROR(ENOMEM);
-        }
-    } else {
-        s->temp[0]= av_mallocz(4*s->width + 16);
-        if (!s->temp[0])
+    for (i=0; i<3; i++) {
+        s->temp[i]= av_malloc(4*s->width + 16);
+        if (!s->temp[i])
             return AVERROR(ENOMEM);
+        s->temp16[i] = (uint16_t*)s->temp[i];
     }
     return 0;
 }
@@ -80,6 +75,7 @@
     s->flags = avctx->flags;
 
     ff_dsputil_init(&s->dsp, avctx);
+    ff_llviddsp_init(&s->llviddsp, avctx);
 
     s->width = avctx->width;
     s->height = avctx->height;
@@ -93,5 +89,6 @@
 
     for(i = 0; i < 3; i++) {
         av_freep(&s->temp[i]);
+        s->temp16[i] = NULL;
     }
 }

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/huffyuv.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/huffyuv.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/huffyuvdec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/huffyuvdec.c Changed

@@ -1,7 +1,7 @@
 /*
  * huffyuv decoder
  *
- * Copyright (c) 2002-2003 Michael Niedermayer <michaelni@gmx.at>
+ * Copyright (c) 2002-2014 Michael Niedermayer <michaelni@gmx.at>
  *
  * see http://www.pcisys.net/~melanson/codecs/huffyuv.txt for a description of
  * the algorithm used
@@ -21,6 +21,8 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * yuva, gray, 4:4:4, 4:1:1, 4:1:0 and >8 bit per sample support sponsored by NOA
  */
 
 /**
@@ -32,6 +34,7 @@
 #include "get_bits.h"
 #include "huffyuv.h"
 #include "thread.h"
+#include "libavutil/pixdesc.h"
 
 #define classic_shift_luma_table_size 42
 static const unsigned char classic_shift_luma[classic_shift_luma_table_size + FF_INPUT_BUFFER_PADDING_SIZE] = {
@@ -87,16 +90,16 @@
     6, 12,  8, 10,  7,  9,  6,  4,  6,  2,  2,  3,  3,  3,  3,  2,
 };
 
-static int read_len_table(uint8_t *dst, GetBitContext *gb)
+static int read_len_table(uint8_t *dst, GetBitContext *gb, int n)
 {
     int i, val, repeat;
 
-    for (i = 0; i < 256;) {
+    for (i = 0; i < n;) {
         repeat = get_bits(gb, 3);
         val    = get_bits(gb, 5);
         if (repeat == 0)
             repeat = get_bits(gb, 8);
-        if (i + repeat > 256 || get_bits_left(gb) < 0) {
+        if (i + repeat > n || get_bits_left(gb) < 0) {
             av_log(NULL, AV_LOG_ERROR, "Error reading huffman table\n");
             return -1;
         }
@@ -113,28 +116,33 @@
     uint8_t len[1 << VLC_BITS];
     int ret;
 
-    if (s->bitstream_bpp < 24) {
+    if (s->bitstream_bpp < 24 || s->version > 2) {
         int p, i, y, u;
-        for (p = 0; p < 3; p++) {
-            for (i = y = 0; y < 256; y++) {
-                int len0 = s->len[0][y];
+        for (p = 0; p < 4; p++) {
+            int p0 = s->version > 2 ? p : 0;
+            for (i = y = 0; y < s->vlc_n; y++) {
+                int len0 = s->len[p0][y];
                 int limit = VLC_BITS - len0;
                 if(limit <= 0 || !len0)
                     continue;
-                for (u = 0; u < 256; u++) {
+                if((sign_extend(y, 8) & (s->vlc_n-1)) != y)
+                    continue;
+                for (u = 0; u < s->vlc_n; u++) {
                     int len1 = s->len[p][u];
                     if (len1 > limit || !len1)
                         continue;
+                    if((sign_extend(u, 8) & (s->vlc_n-1)) != u)
+                        continue;
                     av_assert0(i < (1 << VLC_BITS));
                     len[i] = len0 + len1;
-                    bits[i] = (s->bits[0][y] << len1) + s->bits[p][u];
-                    symbols[i] = (y << 8) + u;
+                    bits[i] = (s->bits[p0][y] << len1) + s->bits[p][u];
+                    symbols[i] = (y << 8) + (u & 0xFF);
                     if(symbols[i] != 0xffff) // reserved to mean "invalid"
                         i++;
                 }
             }
-            ff_free_vlc(&s->vlc[3 + p]);
-            if ((ret = ff_init_vlc_sparse(&s->vlc[3 + p], VLC_BITS, i, len, 1, 1,
+            ff_free_vlc(&s->vlc[4 + p]);
+            if ((ret = ff_init_vlc_sparse(&s->vlc[4 + p], VLC_BITS, i, len, 1, 1,
                                           bits, 2, 2, symbols, 2, 2, 0)) < 0)
                 return ret;
         }
@@ -177,8 +185,8 @@
                 }
             }
         }
-        ff_free_vlc(&s->vlc[3]);
-        if ((ret = init_vlc(&s->vlc[3], VLC_BITS, i, len, 1, 1, bits, 2, 2, 0)) < 0)
+        ff_free_vlc(&s->vlc[4]);
+        if ((ret = init_vlc(&s->vlc[4], VLC_BITS, i, len, 1, 1, bits, 2, 2, 0)) < 0)
             return ret;
     }
     return 0;
@@ -189,17 +197,21 @@
     GetBitContext gb;
     int i;
     int ret;
+    int count = 3;
 
     init_get_bits(&gb, src, length * 8);
 
-    for (i = 0; i < 3; i++) {
-        if (read_len_table(s->len[i], &gb) < 0)
+    if (s->version > 2)
+        count = 1 + s->alpha + 2*s->chroma;
+
+    for (i = 0; i < count; i++) {
+        if (read_len_table(s->len[i], &gb, s->vlc_n) < 0)
             return -1;
-        if (ff_huffyuv_generate_bits_table(s->bits[i], s->len[i]) < 0) {
+        if (ff_huffyuv_generate_bits_table(s->bits[i], s->len[i], s->vlc_n) < 0) {
             return -1;
         }
         ff_free_vlc(&s->vlc[i]);
-        if ((ret = init_vlc(&s->vlc[i], VLC_BITS, 256, s->len[i], 1, 1,
+        if ((ret = init_vlc(&s->vlc[i], VLC_BITS, s->vlc_n, s->len[i], 1, 1,
                            s->bits[i], 4, 4, 0)) < 0)
             return ret;
     }
@@ -218,12 +230,12 @@
 
     init_get_bits(&gb, classic_shift_luma,
                   classic_shift_luma_table_size * 8);
-    if (read_len_table(s->len[0], &gb) < 0)
+    if (read_len_table(s->len[0], &gb, 256) < 0)
         return -1;
 
     init_get_bits(&gb, classic_shift_chroma,
                   classic_shift_chroma_table_size * 8);
-    if (read_len_table(s->len[1], &gb) < 0)
+    if (read_len_table(s->len[1], &gb, 256) < 0)
         return -1;
 
     for(i=0; i<256; i++) s->bits[0][i] = classic_add_luma  [i];
@@ -236,7 +248,7 @@
     memcpy(s->bits[2], s->bits[1], 256 * sizeof(uint32_t));
     memcpy(s->len[2] , s->len [1], 256 * sizeof(uint8_t));
 
-    for (i = 0; i < 3; i++) {
+    for (i = 0; i < 4; i++) {
         ff_free_vlc(&s->vlc[i]);
         if ((ret = init_vlc(&s->vlc[i], VLC_BITS, 256, s->len[i], 1, 1,
                             s->bits[i], 4, 4, 0)) < 0)
@@ -253,11 +265,9 @@
 {
     HYuvContext *s = avctx->priv_data;
 
-    ff_huffyuv_common_init(avctx);
-    memset(s->vlc, 0, 3 * sizeof(VLC));
+    memset(s->vlc, 0, 4 * sizeof(VLC));
 
-    avcodec_get_frame_defaults(&s->picture);
-    s->interlaced = s->height > 288;
+    s->interlaced = avctx->height > 288;
 
     s->bgr32 = 1;
 
@@ -265,12 +275,18 @@
         if ((avctx->bits_per_coded_sample & 7) &&
             avctx->bits_per_coded_sample != 12)
             s->version = 1; // do such files exist at all?
-        else
+        else if (avctx->extradata_size > 3 && avctx->extradata[3] == 0)
             s->version = 2;
+        else
+            s->version = 3;
     } else
         s->version = 0;
 
-    if (s->version == 2) {
+    s->bps = 8;
+    s->n = 1<<s->bps;
+    s->vlc_n = FFMIN(s->n, MAX_VLC_N);
+    s->chroma = 1;
+    if (s->version >= 2) {
         int method, interlace;
 
         if (avctx->extradata_size < 4)
@@ -279,9 +295,20 @@
         method = ((uint8_t*)avctx->extradata)[0];
         s->decorrelate = method & 64 ? 1 : 0;
         s->predictor = method & 63;
-        s->bitstream_bpp = ((uint8_t*)avctx->extradata)[1];
-        if (s->bitstream_bpp == 0)
-            s->bitstream_bpp = avctx->bits_per_coded_sample & ~7;
+        if (s->version == 2) {
+            s->bitstream_bpp = ((uint8_t*)avctx->extradata)[1];
+            if (s->bitstream_bpp == 0)
+                s->bitstream_bpp = avctx->bits_per_coded_sample & ~7;
+        } else {
+            s->bps = (avctx->extradata[1] >> 4) + 1;
+            s->n = 1<<s->bps;
+            s->vlc_n = FFMIN(s->n, MAX_VLC_N);
+            s->chroma_h_shift = avctx->extradata[1] & 3;
+            s->chroma_v_shift = (avctx->extradata[1] >> 2) & 3;
+            s->yuv   = !!(((uint8_t*)avctx->extradata)[2] & 1);
+            s->chroma= !!(((uint8_t*)avctx->extradata)[2] & 3);
+            s->alpha = !!(((uint8_t*)avctx->extradata)[2] & 4);
+        }
         interlace = (((uint8_t*)avctx->extradata)[2] & 0x30) >> 4;
         s->interlaced = (interlace == 1) ? 1 : (interlace == 2) ? 0 : s->interlaced;
         s->context = ((uint8_t*)avctx->extradata)[2] & 0x40 ? 1 : 0;
@@ -319,29 +346,176 @@
             return AVERROR_INVALIDDATA;
     }
 
-    switch (s->bitstream_bpp) {
-    case 12:
-        avctx->pix_fmt = AV_PIX_FMT_YUV420P;
-        break;
-    case 16:
-        if (s->yuy2) {
-            avctx->pix_fmt = AV_PIX_FMT_YUYV422;
-        } else {
-            avctx->pix_fmt = AV_PIX_FMT_YUV422P;
-        }
-        break;
-    case 24:
-    case 32:
-        if (s->bgr32) {
+    if (s->version <= 2) {
+        switch (s->bitstream_bpp) {
+        case 12:
+            avctx->pix_fmt = AV_PIX_FMT_YUV420P;
+            s->yuv = 1;
+            break;
+        case 16:
+            if (s->yuy2) {
+                avctx->pix_fmt = AV_PIX_FMT_YUYV422;
+            } else {
+                avctx->pix_fmt = AV_PIX_FMT_YUV422P;
+            }
+            s->yuv = 1;
+            break;
+        case 24:
+            if (s->bgr32) {
+                avctx->pix_fmt = AV_PIX_FMT_0RGB32;
+            } else {
+                avctx->pix_fmt = AV_PIX_FMT_BGR24;
+            }
+            break;
+        case 32:
+            av_assert0(s->bgr32);
             avctx->pix_fmt = AV_PIX_FMT_RGB32;
-        } else {
-            avctx->pix_fmt = AV_PIX_FMT_BGR24;
+            s->alpha = 1;
+            break;
+        default:
+            return AVERROR_INVALIDDATA;
+        }
+        av_pix_fmt_get_chroma_sub_sample(avctx->pix_fmt,
+                                         &s->chroma_h_shift,
+                                         &s->chroma_v_shift);
+    } else {
+        switch ( (s->chroma<<10) | (s->yuv<<9) | (s->alpha<<8) | ((s->bps-1)<<4) | s->chroma_h_shift | (s->chroma_v_shift<<2)) {
+        case 0x070:
+            avctx->pix_fmt = AV_PIX_FMT_GRAY8;
+            break;
+        case 0x0F0:
+            avctx->pix_fmt = AV_PIX_FMT_GRAY16;
+            break;
+        case 0x170:
+            avctx->pix_fmt = AV_PIX_FMT_GRAY8A;
+            break;
+        case 0x470:
+            avctx->pix_fmt = AV_PIX_FMT_GBRP;
+            break;
+        case 0x480:
+            avctx->pix_fmt = AV_PIX_FMT_GBRP9;
+            break;
+        case 0x490:
+            avctx->pix_fmt = AV_PIX_FMT_GBRP10;
+            break;
+        case 0x4B0:
+            avctx->pix_fmt = AV_PIX_FMT_GBRP12;
+            break;
+        case 0x4D0:
+            avctx->pix_fmt = AV_PIX_FMT_GBRP14;
+            break;
+        case 0x4F0:
+            avctx->pix_fmt = AV_PIX_FMT_GBRP16;
+            break;
+        case 0x570:
+            avctx->pix_fmt = AV_PIX_FMT_GBRAP;
+            break;
+        case 0x670:
+            avctx->pix_fmt = AV_PIX_FMT_YUV444P;
+            break;
+        case 0x680:
+            avctx->pix_fmt = AV_PIX_FMT_YUV444P9;
+            break;
+        case 0x690:
+            avctx->pix_fmt = AV_PIX_FMT_YUV444P10;
+            break;
+        case 0x6B0:
+            avctx->pix_fmt = AV_PIX_FMT_YUV444P12;
+            break;
+        case 0x6D0:
+            avctx->pix_fmt = AV_PIX_FMT_YUV444P14;
+            break;
+        case 0x6F0:
+            avctx->pix_fmt = AV_PIX_FMT_YUV444P16;
+            break;
+        case 0x671:
+            avctx->pix_fmt = AV_PIX_FMT_YUV422P;
+            break;
+        case 0x681:
+            avctx->pix_fmt = AV_PIX_FMT_YUV422P9;
+            break;
+        case 0x691:
+            avctx->pix_fmt = AV_PIX_FMT_YUV422P10;
+            break;
+        case 0x6B1:
+            avctx->pix_fmt = AV_PIX_FMT_YUV422P12;
+            break;
+        case 0x6D1:
+            avctx->pix_fmt = AV_PIX_FMT_YUV422P14;
+            break;
+        case 0x6F1:
+            avctx->pix_fmt = AV_PIX_FMT_YUV422P16;
+            break;
+        case 0x672:
+            avctx->pix_fmt = AV_PIX_FMT_YUV411P;
+            break;
+        case 0x674:
+            avctx->pix_fmt = AV_PIX_FMT_YUV440P;
+            break;
+        case 0x675:
+            avctx->pix_fmt = AV_PIX_FMT_YUV420P;
+            break;
+        case 0x685:
+            avctx->pix_fmt = AV_PIX_FMT_YUV420P9;
+            break;
+        case 0x695:
+            avctx->pix_fmt = AV_PIX_FMT_YUV420P10;
+            break;
+        case 0x6B5:
+            avctx->pix_fmt = AV_PIX_FMT_YUV420P12;
+            break;
+        case 0x6D5:
+            avctx->pix_fmt = AV_PIX_FMT_YUV420P14;
+            break;
+        case 0x6F5:
+            avctx->pix_fmt = AV_PIX_FMT_YUV420P16;
+            break;
+        case 0x67A:
+            avctx->pix_fmt = AV_PIX_FMT_YUV410P;
+            break;
+        case 0x770:
+            avctx->pix_fmt = AV_PIX_FMT_YUVA444P;
+            break;
+        case 0x780:
+            avctx->pix_fmt = AV_PIX_FMT_YUVA444P9;
+            break;
+        case 0x790:
+            avctx->pix_fmt = AV_PIX_FMT_YUVA444P10;
+            break;
+        case 0x7F0:
+            avctx->pix_fmt = AV_PIX_FMT_YUVA444P16;
+            break;
+        case 0x771:
+            avctx->pix_fmt = AV_PIX_FMT_YUVA422P;
+            break;
+        case 0x781:
+            avctx->pix_fmt = AV_PIX_FMT_YUVA422P9;
+            break;
+        case 0x791:
+            avctx->pix_fmt = AV_PIX_FMT_YUVA422P10;
+            break;
+        case 0x7F1:
+            avctx->pix_fmt = AV_PIX_FMT_YUVA422P16;
+            break;
+        case 0x775:
+            avctx->pix_fmt = AV_PIX_FMT_YUVA420P;
+            break;
+        case 0x785:
+            avctx->pix_fmt = AV_PIX_FMT_YUVA420P9;
+            break;
+        case 0x795:
+            avctx->pix_fmt = AV_PIX_FMT_YUVA420P10;
+            break;
+        case 0x7F5:
+            avctx->pix_fmt = AV_PIX_FMT_YUVA420P16;
+            break;
+        default:
+            return AVERROR_INVALIDDATA;
         }
-        break;
-    default:
-        return AVERROR_INVALIDDATA;
     }
 
+    ff_huffyuv_common_init(avctx);
+
     if ((avctx->pix_fmt == AV_PIX_FMT_YUV422P || avctx->pix_fmt == AV_PIX_FMT_YUV420P) && avctx->width & 1) {
         av_log(avctx, AV_LOG_ERROR, "width must be even for this colorspace\n");
         return AVERROR_INVALIDDATA;
@@ -368,10 +542,10 @@
         return AVERROR(ENOMEM);
     }
 
-    for (i = 0; i < 6; i++)
+    for (i = 0; i < 8; i++)
         s->vlc[i].table = NULL;
 
-    if (s->version == 2) {
+    if (s->version >= 2) {
         if (read_huffman_tables(s, ((uint8_t*)avctx->extradata) + 4,
                                 avctx->extradata_size) < 0)
             return AVERROR_INVALIDDATA;
@@ -386,7 +560,7 @@
 /* TODO instead of restarting the read when the code isn't in the first level
  * of the joint table, jump into the 2nd level of the individual table. */
 #define READ_2PIX(dst0, dst1, plane1){\
-    uint16_t code = get_vlc2(&s->gb, s->vlc[3+plane1].table, VLC_BITS, 1);\
+    uint16_t code = get_vlc2(&s->gb, s->vlc[4+plane1].table, VLC_BITS, 1);\
     if(code != 0xffff){\
         dst0 = code>>8;\
         dst1 = code;\
@@ -407,6 +581,9 @@
             READ_2PIX(s->temp[0][2 * i    ], s->temp[1][i], 1);
             READ_2PIX(s->temp[0][2 * i + 1], s->temp[2][i], 2);
         }
+        for (; i < count; i++)
+            s->temp[0][2 * i    ] = s->temp[1][i] =
+            s->temp[0][2 * i + 1] = s->temp[2][i] = 128;
     } else {
         for (i = 0; i < count; i++) {
             READ_2PIX(s->temp[0][2 * i    ], s->temp[1][i], 1);
@@ -415,6 +592,72 @@
     }
 }
 
+#define READ_2PIX_PLANE(dst0, dst1, plane){\
+    uint16_t code = get_vlc2(&s->gb, s->vlc[4+plane].table, VLC_BITS, 1);\
+    if(code != 0xffff){\
+        dst0 = code>>8;\
+        dst1 = code;\
+    }else{\
+        dst0 = get_vlc2(&s->gb, s->vlc[plane].table, VLC_BITS, 3);\
+        dst1 = get_vlc2(&s->gb, s->vlc[plane].table, VLC_BITS, 3);\
+    }\
+}
+#define READ_2PIX_PLANE14(dst0, dst1, plane){\
+    int16_t code = get_vlc2(&s->gb, s->vlc[4+plane].table, VLC_BITS, 1);\
+    if(code != (int16_t)0xffff){\
+        dst0 = code>>8;\
+        dst1 = sign_extend(code, 8);\
+    }else{\
+        dst0 = get_vlc2(&s->gb, s->vlc[plane].table, VLC_BITS, 3);\
+        dst1 = get_vlc2(&s->gb, s->vlc[plane].table, VLC_BITS, 3);\
+    }\
+}
+
+#define READ_2PIX_PLANE16(dst0, dst1, plane){\
+    dst0 = get_vlc2(&s->gb, s->vlc[plane].table, VLC_BITS, 3)<<2;\
+    dst0 += get_bits(&s->gb, 2);\
+    dst1 = get_vlc2(&s->gb, s->vlc[plane].table, VLC_BITS, 3)<<2;\
+    dst1 += get_bits(&s->gb, 2);\
+}
+static void decode_plane_bitstream(HYuvContext *s, int count, int plane)
+{
+    int i;
+
+    count/=2;
+
+    if (s->bps <= 8) {
+        if (count >= (get_bits_left(&s->gb)) / (31 * 2)) {
+            for (i = 0; i < count && get_bits_left(&s->gb) > 0; i++) {
+                READ_2PIX_PLANE(s->temp[0][2 * i], s->temp[0][2 * i + 1], plane);
+            }
+        } else {
+            for(i=0; i<count; i++){
+                READ_2PIX_PLANE(s->temp[0][2 * i], s->temp[0][2 * i + 1], plane);
+            }
+        }
+    } else if (s->bps <= 14) {
+        if (count >= (get_bits_left(&s->gb)) / (31 * 2)) {
+            for (i = 0; i < count && get_bits_left(&s->gb) > 0; i++) {
+                READ_2PIX_PLANE14(s->temp16[0][2 * i], s->temp16[0][2 * i + 1], plane);
+            }
+        } else {
+            for(i=0; i<count; i++){
+                READ_2PIX_PLANE14(s->temp16[0][2 * i], s->temp16[0][2 * i + 1], plane);
+            }
+        }
+    } else {
+        if (count >= (get_bits_left(&s->gb)) / (31 * 2)) {
+            for (i = 0; i < count && get_bits_left(&s->gb) > 0; i++) {
+                READ_2PIX_PLANE16(s->temp16[0][2 * i], s->temp16[0][2 * i + 1], plane);
+            }
+        } else {
+            for(i=0; i<count; i++){
+                READ_2PIX_PLANE16(s->temp16[0][2 * i], s->temp16[0][2 * i + 1], plane);
+            }
+        }
+    }
+}
+
 static void decode_gray_bitstream(HYuvContext *s, int count)
 {
     int i;
@@ -437,7 +680,7 @@
 {
     int i;
     for (i = 0; i < count; i++) {
-        int code = get_vlc2(&s->gb, s->vlc[3].table, VLC_BITS, 1);
+        int code = get_vlc2(&s->gb, s->vlc[4].table, VLC_BITS, 1);
         if (code != -1) {
             *(uint32_t*)&s->temp[0][4 * i] = s->pix_bgr_map[code];
         } else if(decorrelate) {
@@ -500,6 +743,32 @@
     s->last_slice_end = y + h;
 }
 
+static int left_prediction(HYuvContext *s, uint8_t *dst, const uint8_t *src, int w, int acc)
+{
+    if (s->bps <= 8) {
+        return s->dsp.add_hfyu_left_prediction(dst, src, w, acc);
+    } else {
+        return s->llviddsp.add_hfyu_left_prediction_int16((      uint16_t *)dst, (const uint16_t *)src, s->n-1, w, acc);
+    }
+}
+
+static void add_bytes(HYuvContext *s, uint8_t *dst, uint8_t *src, int w)
+{
+    if (s->bps <= 8) {
+        s->dsp.add_bytes(dst, src, w);
+    } else {
+        s->llviddsp.add_int16((uint16_t*)dst, (const uint16_t*)src, s->n - 1, w);
+    }
+}
+
+static void add_median_prediction(HYuvContext *s, uint8_t *dst, const uint8_t *src, const uint8_t *diff, int w, int *left, int *left_top)
+{
+    if (s->bps <= 8) {
+        s->dsp.add_hfyu_median_prediction(dst, src, diff, w, left, left_top);
+    } else {
+        s->llviddsp.add_hfyu_median_prediction_int16((uint16_t *)dst, (const uint16_t *)src, (const uint16_t *)diff, s->n-1, w, left, left_top);
+    }
+}
 static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
                         AVPacket *avpkt)
 {
@@ -544,7 +813,72 @@
 
     s->last_slice_end = 0;
 
-    if (s->bitstream_bpp < 24) {
+    if (s->version > 2) {
+        int plane;
+        for(plane = 0; plane < 1 + 2*s->chroma + s->alpha; plane++) {
+            int left, lefttop, y;
+            int w = width;
+            int h = height;
+            int fake_stride = fake_ystride;
+
+            if (s->chroma && (plane == 1 || plane == 2)) {
+                w >>= s->chroma_h_shift;
+                h >>= s->chroma_v_shift;
+                fake_stride = plane == 1 ? fake_ustride : fake_vstride;
+            }
+
+            switch (s->predictor) {
+            case LEFT:
+            case PLANE:
+                decode_plane_bitstream(s, w, plane);
+                left = left_prediction(s, p->data[plane], s->temp[0], w, 0);
+
+                for (y = 1; y < h; y++) {
+                    uint8_t *dst = p->data[plane] + p->linesize[plane]*y;
+
+                    decode_plane_bitstream(s, w, plane);
+                    left = left_prediction(s, dst, s->temp[0], w, left);
+                    if (s->predictor == PLANE) {
+                        if (y > s->interlaced) {
+                            add_bytes(s, dst, dst - fake_stride, w);
+                        }
+                    }
+                }
+
+                break;
+            case MEDIAN:
+                decode_plane_bitstream(s, w, plane);
+                left= left_prediction(s, p->data[plane], s->temp[0], w, 0);
+
+                y = 1;
+
+                /* second line is left predicted for interlaced case */
+                if (s->interlaced) {
+                    decode_plane_bitstream(s, w, plane);
+                    left = left_prediction(s, p->data[plane] + p->linesize[plane], s->temp[0], w, left);
+                    y++;
+                }
+
+                lefttop = p->data[plane][0];
+                decode_plane_bitstream(s, w, plane);
+                add_median_prediction(s, p->data[plane] + fake_stride, p->data[plane], s->temp[0], w, &left, &lefttop);
+                y++;
+
+                for (; y<h; y++) {
+                    uint8_t *dst;
+
+                    decode_plane_bitstream(s, w, plane);
+
+                    dst = p->data[plane] + p->linesize[plane] * y;
+
+                    add_median_prediction(s, dst, dst - fake_stride, s->temp[0], w, &left, &lefttop);
+                }
+
+                break;
+            }
+        }
+        draw_slice(s, p, height);
+    } else if (s->bitstream_bpp < 24) {
         int y, cy;
         int lefty, leftu, leftv;
         int lefttopy, lefttopu, lefttopv;
@@ -757,7 +1091,7 @@
     ff_huffyuv_common_end(s);
     av_freep(&s->bitstream_buffer);
 
-    for (i = 0; i < 6; i++) {
+    for (i = 0; i < 8; i++) {
         ff_free_vlc(&s->vlc[i]);
     }

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/huffyuvenc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/huffyuvenc.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2003 Michael Niedermayer <michaelni@gmx.at>
+ * Copyright (c) 2002-2014 Michael Niedermayer <michaelni@gmx.at>
  *
  * see http://www.pcisys.net/~melanson/codecs/huffyuv.txt for a description of
  * the algorithm used
@@ -19,6 +19,8 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * yuva, gray, 4:4:4, 4:1:1, 4:1:0 and >8 bit per sample support sponsored by NOA
  */
 
 /**
@@ -31,26 +33,58 @@
 #include "huffman.h"
 #include "internal.h"
 #include "put_bits.h"
+#include "libavutil/pixdesc.h"
+
+static inline void diff_bytes(HYuvContext *s, uint8_t *dst,
+                              const uint8_t *src0, const uint8_t *src1, int w)
+{
+    if (s->bps <= 8) {
+        s->dsp.diff_bytes(dst, src0, src1, w);
+    } else {
+        s->llviddsp.diff_int16((uint16_t *)dst, (const uint16_t *)src0, (const uint16_t *)src1, s->n - 1, w);
+    }
+}
 
 static inline int sub_left_prediction(HYuvContext *s, uint8_t *dst,
                                       const uint8_t *src, int w, int left)
 {
     int i;
-    if (w < 32) {
-        for (i = 0; i < w; i++) {
-            const int temp = src[i];
-            dst[i] = temp - left;
-            left   = temp;
+    if (s->bps <= 8) {
+        if (w < 32) {
+            for (i = 0; i < w; i++) {
+                const int temp = src[i];
+                dst[i] = temp - left;
+                left   = temp;
+            }
+            return left;
+        } else {
+            for (i = 0; i < 16; i++) {
+                const int temp = src[i];
+                dst[i] = temp - left;
+                left   = temp;
+            }
+            s->dsp.diff_bytes(dst + 16, src + 16, src + 15, w - 16);
+            return src[w-1];
         }
-        return left;
     } else {
-        for (i = 0; i < 16; i++) {
-            const int temp = src[i];
-            dst[i] = temp - left;
-            left   = temp;
+        const uint16_t *src16 = (const uint16_t *)src;
+        uint16_t       *dst16 = (      uint16_t *)dst;
+        if (w < 32) {
+            for (i = 0; i < w; i++) {
+                const int temp = src16[i];
+                dst16[i] = temp - left;
+                left   = temp;
+            }
+            return left;
+        } else {
+            for (i = 0; i < 16; i++) {
+                const int temp = src16[i];
+                dst16[i] = temp - left;
+                left   = temp;
+            }
+            s->llviddsp.diff_int16(dst16 + 16, src16 + 16, src16 + 15, s->n - 1, w - 16);
+            return src16[w-1];
         }
-        s->dsp.diff_bytes(dst + 16, src + 16, src + 15, w - 16);
-        return src[w-1];
     }
 }
 
@@ -117,19 +151,29 @@
     *blue  = src[(w - 1) * 3 + 2];
 }
 
+static void sub_median_prediction(HYuvContext *s, uint8_t *dst, const uint8_t *src1, const uint8_t *src2, int w, int *left, int *left_top)
+{
+    if (s->bps <= 8) {
+        s->dsp.sub_hfyu_median_prediction(dst, src1, src2, w , left, left_top);
+    } else {
+        s->llviddsp.sub_hfyu_median_prediction_int16((uint16_t *)dst, (const uint16_t *)src1, (const uint16_t *)src2, s->n - 1, w , left, left_top);
+    }
+}
+
 static int store_table(HYuvContext *s, const uint8_t *len, uint8_t *buf)
 {
     int i;
     int index = 0;
+    int n = s->vlc_n;
 
-    for (i = 0; i < 256;) {
+    for (i = 0; i < n;) {
         int val = len[i];
         int repeat = 0;
 
-        for (; i < 256 && len[i] == val && repeat < 255; i++)
+        for (; i < n && len[i] == val && repeat < 255; i++)
             repeat++;
 
-        av_assert0(val < 32 && val >0 && repeat<256 && repeat>0);
+        av_assert0(val < 32 && val >0 && repeat < 256 && repeat>0);
         if (repeat > 7) {
             buf[index++] = val;
             buf[index++] = repeat;
@@ -141,22 +185,62 @@
     return index;
 }
 
+static int store_huffman_tables(HYuvContext *s, uint8_t *buf)
+{
+    int i, ret;
+    int size = 0;
+    int count = 3;
+
+    if (s->version > 2)
+        count = 1 + s->alpha + 2*s->chroma;
+
+    for (i = 0; i < count; i++) {
+        if ((ret = ff_huff_gen_len_table(s->len[i], s->stats[i], s->vlc_n)) < 0)
+            return ret;
+
+        if (ff_huffyuv_generate_bits_table(s->bits[i], s->len[i], s->vlc_n) < 0) {
+            return -1;
+        }
+
+        size += store_table(s, s->len[i], buf + size);
+    }
+    return size;
+}
+
 static av_cold int encode_init(AVCodecContext *avctx)
 {
     HYuvContext *s = avctx->priv_data;
     int i, j;
+    int ret;
+    const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(avctx->pix_fmt);
 
     ff_huffyuv_common_init(avctx);
 
-    avctx->extradata = av_mallocz(1024*30); // 256*3+4 == 772
-    avctx->stats_out = av_mallocz(1024*30); // 21*256*3(%llu ) + 3(\n) + 1(0) = 16132
-    if (!avctx->extradata || !avctx->stats_out) {
-        av_freep(&avctx->stats_out);
+    avctx->extradata = av_mallocz(3*MAX_N + 4);
+    if (!avctx->extradata)
         return AVERROR(ENOMEM);
+    if (s->flags&CODEC_FLAG_PASS1) {
+#define STATS_OUT_SIZE 21*MAX_N*3 + 4
+        avctx->stats_out = av_mallocz(STATS_OUT_SIZE); // 21*256*3(%llu ) + 3(\n) + 1(0) = 16132
+        if (!avctx->stats_out)
+            return AVERROR(ENOMEM);
     }
     s->version = 2;
 
-    avctx->coded_frame = &s->picture;
+    avctx->coded_frame = av_frame_alloc();
+    if (!avctx->coded_frame)
+        return AVERROR(ENOMEM);
+
+    avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I;
+    avctx->coded_frame->key_frame = 1;
+
+    s->bps = desc->comp[0].depth_minus1 + 1;
+    s->yuv = !(desc->flags & AV_PIX_FMT_FLAG_RGB) && desc->nb_components >= 2;
+    s->chroma = desc->nb_components > 2;
+    s->alpha = !!(desc->flags & AV_PIX_FMT_FLAG_ALPHA);
+    av_pix_fmt_get_chroma_sub_sample(avctx->pix_fmt,
+                                     &s->chroma_h_shift,
+                                     &s->chroma_v_shift);
 
     switch (avctx->pix_fmt) {
     case AV_PIX_FMT_YUV420P:
@@ -167,6 +251,49 @@
         }
         s->bitstream_bpp = avctx->pix_fmt == AV_PIX_FMT_YUV420P ? 12 : 16;
         break;
+    case AV_PIX_FMT_YUV444P:
+    case AV_PIX_FMT_YUV410P:
+    case AV_PIX_FMT_YUV411P:
+    case AV_PIX_FMT_YUV440P:
+    case AV_PIX_FMT_GBRP:
+    case AV_PIX_FMT_GBRP9:
+    case AV_PIX_FMT_GBRP10:
+    case AV_PIX_FMT_GBRP12:
+    case AV_PIX_FMT_GBRP14:
+    case AV_PIX_FMT_GBRP16:
+    case AV_PIX_FMT_GRAY8:
+    case AV_PIX_FMT_GRAY16:
+    case AV_PIX_FMT_YUVA444P:
+    case AV_PIX_FMT_YUVA420P:
+    case AV_PIX_FMT_YUVA422P:
+    case AV_PIX_FMT_GBRAP:
+    case AV_PIX_FMT_GRAY8A:
+    case AV_PIX_FMT_YUV420P9:
+    case AV_PIX_FMT_YUV420P10:
+    case AV_PIX_FMT_YUV420P12:
+    case AV_PIX_FMT_YUV420P14:
+    case AV_PIX_FMT_YUV420P16:
+    case AV_PIX_FMT_YUV422P9:
+    case AV_PIX_FMT_YUV422P10:
+    case AV_PIX_FMT_YUV422P12:
+    case AV_PIX_FMT_YUV422P14:
+    case AV_PIX_FMT_YUV422P16:
+    case AV_PIX_FMT_YUV444P9:
+    case AV_PIX_FMT_YUV444P10:
+    case AV_PIX_FMT_YUV444P12:
+    case AV_PIX_FMT_YUV444P14:
+    case AV_PIX_FMT_YUV444P16:
+    case AV_PIX_FMT_YUVA420P9:
+    case AV_PIX_FMT_YUVA420P10:
+    case AV_PIX_FMT_YUVA420P16:
+    case AV_PIX_FMT_YUVA422P9:
+    case AV_PIX_FMT_YUVA422P10:
+    case AV_PIX_FMT_YUVA422P16:
+    case AV_PIX_FMT_YUVA444P9:
+    case AV_PIX_FMT_YUVA444P10:
+    case AV_PIX_FMT_YUVA444P16:
+        s->version = 3;
+        break;
     case AV_PIX_FMT_RGB32:
         s->bitstream_bpp = 32;
         break;
@@ -177,8 +304,11 @@
         av_log(avctx, AV_LOG_ERROR, "format not supported\n");
         return AVERROR(EINVAL);
     }
+    s->n = 1<<s->bps;
+    s->vlc_n = FFMIN(s->n, MAX_VLC_N);
+
     avctx->bits_per_coded_sample = s->bitstream_bpp;
-    s->decorrelate = s->bitstream_bpp >= 24;
+    s->decorrelate = s->bitstream_bpp >= 24 && !s->yuv && !(desc->flags & AV_PIX_FMT_FLAG_PLANAR);
     s->predictor = avctx->prediction_method;
     s->interlaced = avctx->flags&CODEC_FLAG_INTERLACED_ME ? 1 : 0;
     if (avctx->context_model == 1) {
@@ -204,37 +334,58 @@
                    "by huffyuv; use vcodec=ffvhuff\n");
             return AVERROR(EINVAL);
         }
+        if (s->version > 2) {
+            av_log(avctx, AV_LOG_ERROR,
+                   "Error: ver>2 is not supported "
+                   "by huffyuv; use vcodec=ffvhuff\n");
+            return AVERROR(EINVAL);
+        }
         if (s->interlaced != ( s->height > 288 ))
             av_log(avctx, AV_LOG_INFO,
                    "using huffyuv 2.2.0 or newer interlacing flag\n");
     }
 
-    if (s->bitstream_bpp >= 24 && s->predictor == MEDIAN) {
+    if (s->version > 2 && avctx->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL) {
+        av_log(avctx, AV_LOG_ERROR, "Ver > 2 is under development, files encoded with it may not be decodable with future versions!!!\n"
+               "Use vstrict=-2 / -strict -2 to use it anyway.\n");
+        return AVERROR(EINVAL);
+    }
+
+    if (s->bitstream_bpp >= 24 && s->predictor == MEDIAN && s->version <= 2) {
         av_log(avctx, AV_LOG_ERROR,
                "Error: RGB is incompatible with median predictor\n");
         return AVERROR(EINVAL);
     }
 
     ((uint8_t*)avctx->extradata)[0] = s->predictor | (s->decorrelate << 6);
-    ((uint8_t*)avctx->extradata)[1] = s->bitstream_bpp;
     ((uint8_t*)avctx->extradata)[2] = s->interlaced ? 0x10 : 0x20;
     if (s->context)
         ((uint8_t*)avctx->extradata)[2] |= 0x40;
-    ((uint8_t*)avctx->extradata)[3] = 0;
+    if (s->version < 3) {
+        ((uint8_t*)avctx->extradata)[1] = s->bitstream_bpp;
+        ((uint8_t*)avctx->extradata)[3] = 0;
+    } else {
+        ((uint8_t*)avctx->extradata)[1] = ((s->bps-1)<<4) | s->chroma_h_shift | (s->chroma_v_shift<<2);
+        if (s->chroma)
+            ((uint8_t*)avctx->extradata)[2] |= s->yuv ? 1 : 2;
+        if (s->alpha)
+            ((uint8_t*)avctx->extradata)[2] |= 4;
+        ((uint8_t*)avctx->extradata)[3] = 1;
+    }
     s->avctx->extradata_size = 4;
 
     if (avctx->stats_in) {
         char *p = avctx->stats_in;
 
-        for (i = 0; i < 3; i++)
-            for (j = 0; j < 256; j++)
+        for (i = 0; i < 4; i++)
+            for (j = 0; j < s->vlc_n; j++)
                 s->stats[i][j] = 1;
 
         for (;;) {
-            for (i = 0; i < 3; i++) {
+            for (i = 0; i < 4; i++) {
                 char *next;
 
-                for (j = 0; j < 256; j++) {
+                for (j = 0; j < s->vlc_n; j++) {
                     s->stats[i][j] += strtol(p, &next, 0);
                     if (next == p) return -1;
                     p = next;
@@ -243,36 +394,30 @@
             if (p[0] == 0 || p[1] == 0 || p[2] == 0) break;
         }
     } else {
-        for (i = 0; i < 3; i++)
-            for (j = 0; j < 256; j++) {
-                int d = FFMIN(j, 256 - j);
+        for (i = 0; i < 4; i++)
+            for (j = 0; j < s->vlc_n; j++) {
+                int d = FFMIN(j, s->vlc_n - j);
 
                 s->stats[i][j] = 100000000 / (d + 1);
             }
     }
 
-    for (i = 0; i < 3; i++) {
-        ff_huff_gen_len_table(s->len[i], s->stats[i]);
-
-        if (ff_huffyuv_generate_bits_table(s->bits[i], s->len[i]) < 0) {
-            return -1;
-        }
-
-        s->avctx->extradata_size +=
-            store_table(s, s->len[i], &((uint8_t*)s->avctx->extradata)[s->avctx->extradata_size]);
-    }
+    ret = store_huffman_tables(s, s->avctx->extradata + s->avctx->extradata_size);
+    if (ret < 0)
+        return ret;
+    s->avctx->extradata_size += ret;
 
     if (s->context) {
-        for (i = 0; i < 3; i++) {
+        for (i = 0; i < 4; i++) {
             int pels = s->width * s->height / (i ? 40 : 10);
-            for (j = 0; j < 256; j++) {
-                int d = FFMIN(j, 256 - j);
+            for (j = 0; j < s->vlc_n; j++) {
+                int d = FFMIN(j, s->vlc_n - j);
                 s->stats[i][j] = pels/(d + 1);
             }
         }
     } else {
-        for (i = 0; i < 3; i++)
-            for (j = 0; j < 256; j++)
+        for (i = 0; i < 4; i++)
+            for (j = 0; j < s->vlc_n; j++)
                 s->stats[i][j]= 0;
     }
 
@@ -340,6 +485,115 @@
     return 0;
 }
 
+static int encode_plane_bitstream(HYuvContext *s, int count, int plane)
+{
+    int i;
+
+    if (s->pb.buf_end - s->pb.buf - (put_bits_count(&s->pb) >> 3) < count * s->bps / 2) {
+        av_log(s->avctx, AV_LOG_ERROR, "encoded frame too large\n");
+        return -1;
+    }
+
+#define LOAD2\
+            int y0 = s->temp[0][2 * i];\
+            int y1 = s->temp[0][2 * i + 1];
+#define LOAD2_14\
+            int y0 = s->temp16[0][2 * i] & mask;\
+            int y1 = s->temp16[0][2 * i + 1] & mask;
+#define LOAD2_16\
+            int y0 = s->temp16[0][2 * i];\
+            int y1 = s->temp16[0][2 * i + 1];
+#define STAT2\
+            s->stats[plane][y0]++;\
+            s->stats[plane][y1]++;
+#define STAT2_16\
+            s->stats[plane][y0>>2]++;\
+            s->stats[plane][y1>>2]++;
+#define WRITE2\
+            put_bits(&s->pb, s->len[plane][y0], s->bits[plane][y0]);\
+            put_bits(&s->pb, s->len[plane][y1], s->bits[plane][y1]);
+#define WRITE2_16\
+            put_bits(&s->pb, s->len[plane][y0>>2], s->bits[plane][y0>>2]);\
+            put_bits(&s->pb, 2, y0&3);\
+            put_bits(&s->pb, s->len[plane][y1>>2], s->bits[plane][y1>>2]);\
+            put_bits(&s->pb, 2, y1&3);
+
+    count /= 2;
+
+    if (s->bps <= 8) {
+    if (s->flags & CODEC_FLAG_PASS1) {
+        for (i = 0; i < count; i++) {
+            LOAD2;
+            STAT2;
+        }
+    }
+    if (s->avctx->flags2 & CODEC_FLAG2_NO_OUTPUT)
+        return 0;
+
+    if (s->context) {
+        for (i = 0; i < count; i++) {
+            LOAD2;
+            STAT2;
+            WRITE2;
+        }
+    } else {
+        for (i = 0; i < count; i++) {
+            LOAD2;
+            WRITE2;
+        }
+    }
+    } else if (s->bps <= 14) {
+        int mask = s->n - 1;
+        if (s->flags & CODEC_FLAG_PASS1) {
+            for (i = 0; i < count; i++) {
+                LOAD2_14;
+                STAT2;
+            }
+        }
+        if (s->avctx->flags2 & CODEC_FLAG2_NO_OUTPUT)
+            return 0;
+
+        if (s->context) {
+            for (i = 0; i < count; i++) {
+                LOAD2_14;
+                STAT2;
+                WRITE2;
+            }
+        } else {
+            for (i = 0; i < count; i++) {
+                LOAD2_14;
+                WRITE2;
+            }
+        }
+    } else {
+        if (s->flags & CODEC_FLAG_PASS1) {
+            for (i = 0; i < count; i++) {
+                LOAD2_16;
+                STAT2_16;
+            }
+        }
+        if (s->avctx->flags2 & CODEC_FLAG2_NO_OUTPUT)
+            return 0;
+
+        if (s->context) {
+            for (i = 0; i < count; i++) {
+                LOAD2_16;
+                STAT2_16;
+                WRITE2_16;
+            }
+        } else {
+            for (i = 0; i < count; i++) {
+                LOAD2_16;
+                WRITE2_16;
+            }
+        }
+    }
+#undef LOAD2
+#undef STAT2
+#undef WRITE2
+    return 0;
+}
+
 static int encode_gray_bitstream(HYuvContext *s, int count)
 {
     int i;
@@ -446,26 +700,19 @@
     const int fake_ystride = s->interlaced ? pict->linesize[0]*2  : pict->linesize[0];
     const int fake_ustride = s->interlaced ? pict->linesize[1]*2  : pict->linesize[1];
     const int fake_vstride = s->interlaced ? pict->linesize[2]*2  : pict->linesize[2];
-    AVFrame * const p = &s->picture;
+    const AVFrame * const p = pict;
     int i, j, size = 0, ret;
 
     if ((ret = ff_alloc_packet2(avctx, pkt, width * height * 3 * 4 + FF_MIN_BUFFER_SIZE)) < 0)
         return ret;
 
-    *p = *pict;
-    p->pict_type = AV_PICTURE_TYPE_I;
-    p->key_frame = 1;
-
     if (s->context) {
-        for (i = 0; i < 3; i++) {
-            ff_huff_gen_len_table(s->len[i], s->stats[i]);
-            if (ff_huffyuv_generate_bits_table(s->bits[i], s->len[i]) < 0)
-                return -1;
-            size += store_table(s, s->len[i], &pkt->data[size]);
-        }
+        size = store_huffman_tables(s, pkt->data);
+        if (size < 0)
+            return size;
 
-        for (i = 0; i < 3; i++)
-            for (j = 0; j < 256; j++)
+        for (i = 0; i < 4; i++)
+            for (j = 0; j < s->vlc_n; j++)
                 s->stats[i][j] >>= 1;
     }
 
@@ -633,6 +880,59 @@
             }
             encode_bgra_bitstream(s, width, 3);
         }
+    } else if (s->version > 2) {
+        int plane;
+        for (plane = 0; plane < 1 + 2*s->chroma + s->alpha; plane++) {
+            int left, y;
+            int w = width;
+            int h = height;
+            int fake_stride = fake_ystride;
+
+            if (s->chroma && (plane == 1 || plane == 2)) {
+                w >>= s->chroma_h_shift;
+                h >>= s->chroma_v_shift;
+                fake_stride = plane == 1 ? fake_ustride : fake_vstride;
+            }
+
+            left = sub_left_prediction(s, s->temp[0], p->data[plane], w , 0);
+
+            encode_plane_bitstream(s, w, plane);
+
+            if (s->predictor==MEDIAN) {
+                int lefttop;
+                y = 1;
+                if (s->interlaced) {
+                    left = sub_left_prediction(s, s->temp[0], p->data[plane] + p->linesize[plane], w , left);
+
+                    encode_plane_bitstream(s, w, plane);
+                    y++;
+                }
+
+                lefttop = p->data[plane][0];
+
+                for (; y < h; y++) {
+                    uint8_t *dst = p->data[plane] + p->linesize[plane] * y;
+
+                    sub_median_prediction(s, s->temp[0], dst - fake_stride, dst, w , &left, &lefttop);
+
+                    encode_plane_bitstream(s, w, plane);
+                }
+            } else {
+                for (y = 1; y < h; y++) {
+                    uint8_t *dst = p->data[plane] + p->linesize[plane] * y;
+
+                    if (s->predictor == PLANE && s->interlaced < y) {
+                        diff_bytes(s, s->temp[1], dst, dst - fake_stride, w);
+
+                        left = sub_left_prediction(s, s->temp[0], s->temp[1], w , left);
+                    } else {
+                        left = sub_left_prediction(s, s->temp[0], dst, w , left);
+                    }
+
+                    encode_plane_bitstream(s, w, plane);
+                }
+            }
+        }
     } else {
         av_log(avctx, AV_LOG_ERROR, "Format not supported!\n");
     }
@@ -646,17 +946,19 @@
     if ((s->flags&CODEC_FLAG_PASS1) && (s->picture_number & 31) == 0) {
         int j;
         char *p = avctx->stats_out;
-        char *end = p + 1024*30;
-        for (i = 0; i < 3; i++) {
-            for (j = 0; j < 256; j++) {
+        char *end = p + STATS_OUT_SIZE;
+        for (i = 0; i < 4; i++) {
+            for (j = 0; j < s->vlc_n; j++) {
                 snprintf(p, end-p, "%"PRIu64" ", s->stats[i][j]);
                 p += strlen(p);
                 s->stats[i][j]= 0;
             }
             snprintf(p, end-p, "\n");
             p++;
+            if (end <= p)
+                return AVERROR(ENOMEM);
         }
-    } else
+    } else if (avctx->stats_out)
         avctx->stats_out[0] = '\0';
     if (!(s->avctx->flags2 & CODEC_FLAG2_NO_OUTPUT)) {
         flush_put_bits(&s->pb);
@@ -681,6 +983,8 @@
     av_freep(&avctx->extradata);
     av_freep(&avctx->stats_out);
 
+    av_frame_free(&avctx->coded_frame);
+
     return 0;
 }
 
@@ -694,6 +998,7 @@
     .init           = encode_init,
     .encode2        = encode_frame,
     .close          = encode_end,
+    .capabilities   = CODEC_CAP_FRAME_THREADS | CODEC_CAP_INTRA_ONLY,
     .pix_fmts       = (const enum AVPixelFormat[]){
         AV_PIX_FMT_YUV422P, AV_PIX_FMT_RGB24,
         AV_PIX_FMT_RGB32, AV_PIX_FMT_NONE
@@ -711,8 +1016,23 @@
     .init           = encode_init,
     .encode2        = encode_frame,
     .close          = encode_end,
+    .capabilities   = CODEC_CAP_FRAME_THREADS | CODEC_CAP_INTRA_ONLY,
     .pix_fmts       = (const enum AVPixelFormat[]){
-        AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_RGB24,
+        AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV411P,
+        AV_PIX_FMT_YUV410P, AV_PIX_FMT_YUV440P,
+        AV_PIX_FMT_GBRP,
+        AV_PIX_FMT_GBRP9, AV_PIX_FMT_GBRP10, AV_PIX_FMT_GBRP12, AV_PIX_FMT_GBRP14,
+        AV_PIX_FMT_GRAY8, AV_PIX_FMT_GRAY16,
+        AV_PIX_FMT_YUVA420P, AV_PIX_FMT_YUVA422P, AV_PIX_FMT_YUVA444P,
+        AV_PIX_FMT_GBRAP,
+        AV_PIX_FMT_GRAY8A,
+        AV_PIX_FMT_YUV420P9, AV_PIX_FMT_YUV420P10, AV_PIX_FMT_YUV420P12, AV_PIX_FMT_YUV420P14, AV_PIX_FMT_YUV420P16,
+        AV_PIX_FMT_YUV422P9, AV_PIX_FMT_YUV422P10, AV_PIX_FMT_YUV422P12, AV_PIX_FMT_YUV422P14, AV_PIX_FMT_YUV422P16,
+        AV_PIX_FMT_YUV444P9, AV_PIX_FMT_YUV444P10, AV_PIX_FMT_YUV444P12, AV_PIX_FMT_YUV444P14, AV_PIX_FMT_YUV444P16,
+        AV_PIX_FMT_YUVA420P9, AV_PIX_FMT_YUVA420P10, AV_PIX_FMT_YUVA420P16,
+        AV_PIX_FMT_YUVA422P9, AV_PIX_FMT_YUVA422P10, AV_PIX_FMT_YUVA422P16,
+        AV_PIX_FMT_YUVA444P9, AV_PIX_FMT_YUVA444P10, AV_PIX_FMT_YUVA444P16,
+        AV_PIX_FMT_RGB24,
         AV_PIX_FMT_RGB32, AV_PIX_FMT_NONE
     },
 };

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/iff.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/iff.c Changed

@@ -25,6 +25,8 @@
  * IFF ACBM/DEEP/ILBM/PBM bitmap decoder
  */
 
+#include <stdint.h>
+
 #include "libavutil/imgutils.h"
 #include "bytestream.h"
 #include "avcodec.h"
@@ -318,6 +320,16 @@
     return 0;
 }
 
+static av_cold int decode_end(AVCodecContext *avctx)
+{
+    IffContext *s = avctx->priv_data;
+    av_frame_free(&s->frame);
+    av_freep(&s->planebuf);
+    av_freep(&s->ham_buf);
+    av_freep(&s->ham_palbuf);
+    return 0;
+}
+
 static av_cold int decode_init(AVCodecContext *avctx)
 {
     IffContext *s = avctx->priv_data;
@@ -360,8 +372,10 @@
 
     s->bpp = avctx->bits_per_coded_sample;
     s->frame = av_frame_alloc();
-    if (!s->frame)
+    if (!s->frame) {
+        decode_end(avctx);
         return AVERROR(ENOMEM);
+    }
 
     if ((err = extract_header(avctx, NULL)) < 0)
         return err;
@@ -474,17 +488,21 @@
         unsigned length;
         const int8_t value = *buf++;
         if (value >= 0) {
-            length = value + 1;
-            memcpy(dst + x, buf, FFMIN3(length, dst_size - x, buf_end - buf));
+            length = FFMIN3(value + 1, dst_size - x, buf_end - buf);
+            memcpy(dst + x, buf, length);
             buf += length;
         } else if (value > -128) {
-            length = -value + 1;
-            memset(dst + x, *buf++, FFMIN(length, dst_size - x));
+            length = FFMIN(-value + 1, dst_size - x);
+            memset(dst + x, *buf++, length);
         } else { // noop
             continue;
         }
         x += length;
     }
+    if (x < dst_size) {
+        av_log(NULL, AV_LOG_WARNING, "decode_byterun ended before plane size\n");
+        memset(dst+x, 0, dst_size - x);
+    }
     return buf - buf_start;
 }
 
@@ -858,16 +876,6 @@
     return buf_size;
 }
 
-static av_cold int decode_end(AVCodecContext *avctx)
-{
-    IffContext *s = avctx->priv_data;
-    av_frame_free(&s->frame);
-    av_freep(&s->planebuf);
-    av_freep(&s->ham_buf);
-    av_freep(&s->ham_palbuf);
-    return 0;
-}
-
 #if CONFIG_IFF_ILBM_DECODER
 AVCodec ff_iff_ilbm_decoder = {
     .name           = "iff",

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/indeo2.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/indeo2.c Changed

@@ -171,36 +171,36 @@
 
     if (s->decode_delta) { /* intraframe */
         if ((ret = ir2_decode_plane(s, avctx->width, avctx->height,
-                                    s->picture->data[0], s->picture->linesize[0],
+                                    p->data[0], p->linesize[0],
                                     ir2_luma_table)) < 0)
             return ret;
 
         /* swapped U and V */
         if ((ret = ir2_decode_plane(s, avctx->width >> 2, avctx->height >> 2,
-                                    s->picture->data[2], s->picture->linesize[2],
+                                    p->data[2], p->linesize[2],
                                     ir2_luma_table)) < 0)
             return ret;
         if ((ret = ir2_decode_plane(s, avctx->width >> 2, avctx->height >> 2,
-                                    s->picture->data[1], s->picture->linesize[1],
+                                    p->data[1], p->linesize[1],
                                     ir2_luma_table)) < 0)
             return ret;
     } else { /* interframe */
         if ((ret = ir2_decode_plane_inter(s, avctx->width, avctx->height,
-                                          s->picture->data[0], s->picture->linesize[0],
+                                          p->data[0], p->linesize[0],
                                           ir2_luma_table)) < 0)
             return ret;
         /* swapped U and V */
         if ((ret = ir2_decode_plane_inter(s, avctx->width >> 2, avctx->height >> 2,
-                                          s->picture->data[2], s->picture->linesize[2],
+                                          p->data[2], p->linesize[2],
                                           ir2_luma_table)) < 0)
             return ret;
         if ((ret = ir2_decode_plane_inter(s, avctx->width >> 2, avctx->height >> 2,
-                                          s->picture->data[1], s->picture->linesize[1],
+                                          p->data[1], p->linesize[1],
                                           ir2_luma_table)) < 0)
             return ret;
     }
 
-    if ((ret = av_frame_ref(picture, s->picture)) < 0)
+    if ((ret = av_frame_ref(picture, p)) < 0)
         return ret;
 
     *got_frame = 1;

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/indeo3.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/indeo3.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/indeo4.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/indeo4.c Changed

@@ -284,6 +284,7 @@
 {
     int plane, band_num, indx, transform_id, scan_indx;
     int i;
+    int quant_mat;
 
     plane    = get_bits(&ctx->gb, 2);
     band_num = get_bits(&ctx->gb, 4);
@@ -382,18 +383,17 @@
             band->scan = scan_index_to_tab[scan_indx];
             band->scan_size = band->blk_size;
 
-            band->quant_mat = get_bits(&ctx->gb, 5);
-            if (band->quant_mat >= FF_ARRAY_ELEMS(quant_index_to_tab)) {
-
-                if (band->quant_mat == 31)
-                    av_log(avctx, AV_LOG_ERROR,
-                           "Custom quant matrix encountered!\n");
-                else
-                    avpriv_request_sample(avctx, "Quantization matrix %d",
-                                          band->quant_mat);
-                band->quant_mat = -1;
+            quant_mat = get_bits(&ctx->gb, 5);
+            if (quant_mat == 31) {
+                av_log(avctx, AV_LOG_ERROR, "Custom quant matrix encountered!\n");
+                return AVERROR_INVALIDDATA;
+            }
+            if (quant_mat >= FF_ARRAY_ELEMS(quant_index_to_tab)) {
+                avpriv_request_sample(avctx, "Quantization matrix %d",
+                                      quant_mat);
                 return AVERROR_INVALIDDATA;
             }
+            band->quant_mat = quant_mat;
         } else {
             if (old_blk_size != band->blk_size) {
                 av_log(avctx, AV_LOG_ERROR,
@@ -401,10 +401,6 @@
                        "inherited\n");
                 return AVERROR_INVALIDDATA;
             }
-            if (band->quant_mat < 0) {
-                av_log(avctx, AV_LOG_ERROR, "Invalid quant_mat inherited\n");
-                return AVERROR_INVALIDDATA;
-            }
         }
         if (quant_index_to_tab[band->quant_mat] > 4 && band->blk_size == 4) {
             av_log(avctx, AV_LOG_ERROR, "Invalid quant matrix for 4x4 block encountered!\n");

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/intelh263dec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/intelh263dec.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/internal.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/internal.h Changed

@@ -27,6 +27,7 @@
 #include <stdint.h>
 
 #include "libavutil/buffer.h"
+#include "libavutil/channel_layout.h"
 #include "libavutil/mathematics.h"
 #include "libavutil/pixfmt.h"
 #include "avcodec.h"
@@ -34,6 +35,12 @@
 
 #define FF_SANE_NB_CHANNELS 63U
 
+#if HAVE_NEON || ARCH_PPC || HAVE_MMX
+#   define STRIDE_ALIGN 16
+#else
+#   define STRIDE_ALIGN 8
+#endif
+
 typedef struct FramePool {
     /**
      * Pools for each data plane. For audio all the planes have the same size,
@@ -91,10 +98,18 @@
      */
     int last_audio_frame;
 
-    AVFrame to_free;
+    AVFrame *to_free;
 
     FramePool *pool;
 
+    void *thread_ctx;
+
+    /**
+     * Current packet as passed into the decoder, to avoid having to pass the
+     * packet into every function.
+     */
+    AVPacket *pkt;
+
     /**
      * temporary buffer used for encoders to store their bitstream
      */
@@ -118,11 +133,10 @@
  * Return the hardware accelerated codec for codec codec_id and
  * pixel format pix_fmt.
  *
- * @param codec_id the codec to match
- * @param pix_fmt the pixel format to match
+ * @param avctx The codec context containing the codec_id and pixel format.
  * @return the hardware accelerated codec, or NULL if none was found.
  */
-AVHWAccel *ff_find_hwaccel(enum AVCodecID codec_id, enum AVPixelFormat pix_fmt);
+AVHWAccel *ff_find_hwaccel(AVCodecContext *avctx);
 
 /**
  * Return the index into tab at which {a,b} match elements {[0],[1]} of tab.
@@ -225,4 +239,16 @@
                                       const uint8_t *end,
                                       uint32_t *state);
 
+/**
+ * Check that the provided frame dimensions are valid and set them on the codec
+ * context.
+ */
+int ff_set_dimensions(AVCodecContext *s, int width, int height);
+
+/**
+ * Add or update AV_FRAME_DATA_MATRIXENCODING side data.
+ */
+int ff_side_data_update_matrix_encoding(AVFrame *frame,
+                                        enum AVMatrixEncoding matrix_encoding);
+
 #endif /* AVCODEC_INTERNAL_H */

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/interplayvideo.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/interplayvideo.c Changed

@@ -197,6 +197,11 @@
     unsigned char P[2];
     unsigned int flags;
 
+    if (bytestream2_get_bytes_left(&s->stream_ptr) < 4) {
+        av_log(s->avctx, AV_LOG_ERROR, "too little data for opcode 0x7\n");
+        return AVERROR_INVALIDDATA;
+    }
+
     /* 2-color encoding */
     P[0] = bytestream2_get_byte(&s->stream_ptr);
     P[1] = bytestream2_get_byte(&s->stream_ptr);
@@ -236,6 +241,11 @@
     unsigned char P[4];
     unsigned int flags = 0;
 
+    if (bytestream2_get_bytes_left(&s->stream_ptr) < 12) {
+        av_log(s->avctx, AV_LOG_ERROR, "too little data for opcode 0x8\n");
+        return AVERROR_INVALIDDATA;
+    }
+
     /* 2-color encoding for each 4x4 quadrant, or 2-color encoding on
      * either top and bottom or left and right halves */
     P[0] = bytestream2_get_byte(&s->stream_ptr);
@@ -308,6 +318,11 @@
     int x, y;
     unsigned char P[4];
 
+    if (bytestream2_get_bytes_left(&s->stream_ptr) < 8) {
+        av_log(s->avctx, AV_LOG_ERROR, "too little data for opcode 0x9\n");
+        return AVERROR_INVALIDDATA;
+    }
+
     /* 4-color encoding */
     bytestream2_get_buffer(&s->stream_ptr, P, 4);
 
@@ -374,6 +389,11 @@
     unsigned char P[8];
     int flags = 0;
 
+    if (bytestream2_get_bytes_left(&s->stream_ptr) < 16) {
+        av_log(s->avctx, AV_LOG_ERROR, "too little data for opcode 0xA\n");
+        return AVERROR_INVALIDDATA;
+    }
+
     bytestream2_get_buffer(&s->stream_ptr, P, 4);
 
     /* 4-color encoding for each 4x4 quadrant, or 4-color encoding on
@@ -467,6 +487,11 @@
     int y;
     unsigned char P[2];
 
+    if (bytestream2_get_bytes_left(&s->stream_ptr) < 4) {
+        av_log(s->avctx, AV_LOG_ERROR, "too little data for opcode 0xD\n");
+        return AVERROR_INVALIDDATA;
+    }
+
     /* 4-color block encoding: each 4x4 block is a different color */
     for (y = 0; y < 8; y++) {
         if (!(y & 3)) {

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/ituh263dec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/ituh263dec.c Changed

@@ -200,30 +200,6 @@
 }
 
 /**
- * Find the next resync_marker.
- * @param p pointer to buffer to scan
- * @param end pointer to the end of the buffer
- * @return pointer to the next resync_marker, or end if none was found
- */
-const uint8_t *ff_h263_find_resync_marker(MpegEncContext *s, const uint8_t *av_restrict p, const uint8_t *av_restrict end)
-{
-    av_assert2(p < end);
-
-    end-=2;
-    p++;
-    if(s->resync_marker){
-        int prefix_len = ff_mpeg4_get_video_packet_prefix_length(s);
-        for(;p<end; p+=2){
-            if(!*p){
-                if      (!p[-1] && ((p[1] >> (23-prefix_len)) == 1)) return p - 1;
-                else if (!p[ 1] && ((p[2] >> (23-prefix_len)) == 1)) return p;
-            }
-        }
-    }
-    return end+2;
-}
-
-/**
  * Decode the group of blocks / video packet header.
  * @return bit position of the resync_marker, or <0 if none was found
  */
@@ -238,7 +214,7 @@
     if(show_bits(&s->gb, 16)==0){
         pos= get_bits_count(&s->gb);
         if(CONFIG_MPEG4_DECODER && s->codec_id==AV_CODEC_ID_MPEG4)
-            ret= ff_mpeg4_decode_video_packet_header(s);
+            ret= ff_mpeg4_decode_video_packet_header(s->avctx->priv_data);
         else
             ret= h263_decode_gob_header(s);
         if(ret>=0)
@@ -255,7 +231,7 @@
 
             pos= get_bits_count(&s->gb);
             if(CONFIG_MPEG4_DECODER && s->codec_id==AV_CODEC_ID_MPEG4)
-                ret= ff_mpeg4_decode_video_packet_header(s);
+                ret= ff_mpeg4_decode_video_packet_header(s->avctx->priv_data);
             else
                 ret= h263_decode_gob_header(s);
             if(ret>=0)
@@ -895,7 +871,6 @@
     i = get_bits(&s->gb, 8); /* picture timestamp */
     if( (s->picture_number&~0xFF)+i < s->picture_number)
         i+= 256;
-    s->current_picture_ptr->f.pts =
     s->picture_number= (s->picture_number&~0xFF) + i;
 
     /* PTYPE starts here */
@@ -1114,9 +1089,8 @@
     }
 
     /* PEI */
-    while (get_bits1(&s->gb) != 0) {
-        skip_bits(&s->gb, 8);
-    }
+    if (skip_1stop_8data_bits(&s->gb) < 0)
+        return AVERROR_INVALIDDATA;
 
     if(s->h263_slice_structured){
         if (get_bits1(&s->gb) != 1) {

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/ivi_common.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/ivi_common.c Changed

@@ -28,6 +28,7 @@
 
 #define BITSTREAM_READER_LE
 #include "libavutil/attributes.h"
+#include "libavutil/timer.h"
 #include "avcodec.h"
 #include "get_bits.h"
 #include "internal.h"
@@ -363,7 +364,7 @@
                                               band->mb_size);
 
             av_freep(&tile->mbs);
-            tile->mbs = av_malloc(tile->num_MBs * sizeof(IVIMbInfo));
+            tile->mbs = av_mallocz(tile->num_MBs * sizeof(IVIMbInfo));
             if (!tile->mbs)
                 return AVERROR(ENOMEM);
 
@@ -1042,7 +1043,12 @@
      */
     if (avctx->codec_id == AV_CODEC_ID_INDEO4 &&
         ctx->frame_type == 0/*FRAMETYPE_INTRA*/) {
-        while (get_bits(&ctx->gb, 8)); // skip version string
+            // skip version string
+        while (get_bits(&ctx->gb, 8)) {
+            if (get_bits_left(&ctx->gb) < 8)
+                return AVERROR_INVALIDDATA;
+        }
+
         skip_bits_long(&ctx->gb, 64);  // skip padding, TODO: implement correct 8-bytes alignment
         if (get_bits_left(&ctx->gb) > 18 && show_bits(&ctx->gb, 18) == 0x3FFF8)
             av_log(avctx, AV_LOG_ERROR, "Buffer contains IP frames!\n");
@@ -1051,7 +1057,10 @@
     if (!ctx->is_nonnull_frame(ctx))
         return buf_size;
 
-    avcodec_set_dimensions(avctx, ctx->planes[0].width, ctx->planes[0].height);
+    result = ff_set_dimensions(avctx, ctx->planes[0].width, ctx->planes[0].height);
+    if (result < 0)
+        return result;
+
     if ((result = ff_get_buffer(avctx, frame, 0)) < 0)
         return result;

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/j2kenc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/j2kenc.c Changed

@@ -60,7 +60,7 @@
 
 typedef struct {
     AVCodecContext *avctx;
-    AVFrame picture;
+    const AVFrame *picture;
 
     int width, height; ///< image width and height
     uint8_t cbps[4]; ///< bits per sample in particular components
@@ -390,18 +390,18 @@
             for (compno = 0; compno < s->ncomponents; compno++){
                 Jpeg2000Component *comp = tile->comp + compno;
                 int *dst = comp->i_data;
-                line = s->picture.data[compno]
-                       + comp->coord[1][0] * s->picture.linesize[compno]
+                line = s->picture->data[compno]
+                       + comp->coord[1][0] * s->picture->linesize[compno]
                        + comp->coord[0][0];
                 for (y = comp->coord[1][0]; y < comp->coord[1][1]; y++){
                     uint8_t *ptr = line;
                     for (x = comp->coord[0][0]; x < comp->coord[0][1]; x++)
                         *dst++ = *ptr++ - (1 << 7);
-                    line += s->picture.linesize[compno];
+                    line += s->picture->linesize[compno];
                 }
             }
         } else{
-            line = s->picture.data[0] + tile->comp[0].coord[1][0] * s->picture.linesize[0]
+            line = s->picture->data[0] + tile->comp[0].coord[1][0] * s->picture->linesize[0]
                    + tile->comp[0].coord[0][0] * s->ncomponents;
 
             i = 0;
@@ -412,7 +412,7 @@
                         tile->comp[compno].i_data[i] = *ptr++  - (1 << 7);
                     }
                 }
-                line += s->picture.linesize[0];
+                line += s->picture->linesize[0];
             }
         }
     }
@@ -927,10 +927,9 @@
     s->buf = s->buf_start = pkt->data;
     s->buf_end = pkt->data + pkt->size;
 
-    s->picture = *pict;
-    avctx->coded_frame= &s->picture;
+    s->picture = pict;
 
-    s->lambda = s->picture.quality * LAMBDA_SCALE;
+    s->lambda = s->picture->quality * LAMBDA_SCALE;
 
     copy_frame(s);
     reinit(s);

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/jpeg2000dec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/jpeg2000dec.c Changed

@@ -344,7 +344,7 @@
             break;
         }
     }
-    if (s->avctx->pix_fmt == AV_PIX_FMT_NONE) {
+    if (i == possible_fmts_nb) {
         av_log(s->avctx, AV_LOG_ERROR,
                "Unknown pix_fmt, profile: %d, colour_space: %d, "
                "components: %d, precision: %d, "
@@ -354,6 +354,7 @@
                ncomponents > 2 ? s->cdy[1] : 0,
                ncomponents > 2 ? s->cdx[2] : 0,
                ncomponents > 2 ? s->cdy[2] : 0);
+        return AVERROR_PATCHWELCOME;
     }
     s->avctx->bits_per_raw_sample = s->precision;
     return 0;
@@ -540,6 +541,8 @@
     Jpeg2000QuantStyle tmp;
     int compno, ret;
 
+    memset(&tmp, 0, sizeof(tmp));
+
     if ((ret = get_qcx(s, n, &tmp)) < 0)
         return ret;
     for (compno = 0; compno < s->ncomponents; compno++)
@@ -889,6 +892,10 @@
                         prcx   = ff_jpeg2000_ceildivpow2(x, reducedresno) >> rlevel->log2_prec_width;
                         prcy   = ff_jpeg2000_ceildivpow2(y, reducedresno) >> rlevel->log2_prec_height;
                         precno = prcx + rlevel->num_precincts_x * prcy;
+
+                        if (prcx >= rlevel->num_precincts_x || prcy >= rlevel->num_precincts_y)
+                            return AVERROR_PATCHWELCOME;
+
                         for (layno = 0; layno < tile->codsty[0].nlayers; layno++) {
                             if ((ret = jpeg2000_decode_packet(s, codsty, rlevel,
                                                               precno, layno,
@@ -1206,8 +1213,11 @@
 static int jpeg2000_decode_tile(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile,
                                 AVFrame *picture)
 {
+    const AVPixFmtDescriptor *pixdesc = av_pix_fmt_desc_get(s->avctx->pix_fmt);
     int compno, reslevelno, bandno;
     int x, y;
+    int planar    = !!(pixdesc->flags & AV_PIX_FMT_FLAG_PLANAR);
+    int pixelsize = planar ? 1 : pixdesc->nb_components;
 
     uint8_t *line;
     Jpeg2000T1Context t1;
@@ -1281,8 +1291,6 @@
             int32_t *i_datap = comp->i_data;
             int cbps = s->cbps[compno];
             int w = tile->comp[compno].coord[0][1] - s->image_offset_x;
-            int planar = !!picture->data[2];
-            int pixelsize = planar ? 1 : s->ncomponents;
             int plane = 0;
 
             if (planar)
@@ -1328,8 +1336,6 @@
             uint16_t *linel;
             int cbps = s->cbps[compno];
             int w = tile->comp[compno].coord[0][1] - s->image_offset_x;
-            int planar = !!picture->data[2];
-            int pixelsize = planar ? 1 : s->ncomponents;
             int plane = 0;
 
             if (planar)

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/jpegls.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/jpegls.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/jpeglsdec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/jpeglsdec.c Changed

@@ -148,6 +148,8 @@
         ret = ret >> 1;
     }
 
+    if(FFABS(ret) > 0xFFFF)
+        return -0x10000;
     /* update state */
     state->A[Q] += FFABS(ret) - RItype;
     ret         *= state->twonear;
@@ -279,9 +281,9 @@
     JLSState *state;
     int off = 0, stride = 1, width, shift, ret = 0;
 
-    zero = av_mallocz(s->picture.linesize[0]);
+    zero = av_mallocz(s->picture_ptr->linesize[0]);
     last = zero;
-    cur  = s->picture.data[0];
+    cur  = s->picture_ptr->data[0];
 
     state = av_mallocz(sizeof(JLSState));
     /* initialize JPEG-LS state from JPEG parameters */
@@ -328,7 +330,7 @@
                 t = *((uint16_t *)last);
             }
             last = cur;
-            cur += s->picture.linesize[0];
+            cur += s->picture_ptr->linesize[0];
 
             if (s->restart_interval && !--s->restart_count) {
                 align_get_bits(&s->gb);
@@ -339,7 +341,7 @@
         int j;
         int Rc[3] = { 0, 0, 0 };
         stride = (s->nb_components > 1) ? 3 : 1;
-        memset(cur, 0, s->picture.linesize[0]);
+        memset(cur, 0, s->picture_ptr->linesize[0]);
         width = s->width * stride;
         for (i = 0; i < s->height; i++) {
             for (j = 0; j < stride; j++) {
@@ -353,7 +355,7 @@
                 }
             }
             last = cur;
-            cur += s->picture.linesize[0];
+            cur += s->picture_ptr->linesize[0];
         }
     } else if (ilv == 2) { /* sample interleaving */
         avpriv_report_missing_feature(s->avctx, "Sample interleaved images");
@@ -367,7 +369,7 @@
         w = s->width * s->nb_components;
 
         if (s->bits <= 8) {
-            uint8_t *src = s->picture.data[0];
+            uint8_t *src = s->picture_ptr->data[0];
 
             for (i = 0; i < s->height; i++) {
                 switch(s->xfrm) {
@@ -402,7 +404,7 @@
                     }
                     break;
                 }
-                src += s->picture.linesize[0];
+                src += s->picture_ptr->linesize[0];
             }
         }else
             avpriv_report_missing_feature(s->avctx, "16bit xfrm");
@@ -414,20 +416,20 @@
         w = s->width * s->nb_components;
 
         if (s->bits <= 8) {
-            uint8_t *src = s->picture.data[0];
+            uint8_t *src = s->picture_ptr->data[0];
 
             for (i = 0; i < s->height; i++) {
                 for (x = off; x < w; x += stride)
                     src[x] <<= shift;
-                src += s->picture.linesize[0];
+                src += s->picture_ptr->linesize[0];
             }
         } else {
-            uint16_t *src = (uint16_t *)s->picture.data[0];
+            uint16_t *src = (uint16_t *)s->picture_ptr->data[0];
 
             for (i = 0; i < s->height; i++) {
                 for (x = 0; x < w; x++)
                     src[x] <<= shift;
-                src += s->picture.linesize[0] / 2;
+                src += s->picture_ptr->linesize[0] / 2;
             }
         }
     }

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/jpeglsenc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/jpeglsenc.c Changed

@@ -249,8 +249,7 @@
 static int encode_picture_ls(AVCodecContext *avctx, AVPacket *pkt,
                              const AVFrame *pict, int *got_packet)
 {
-    JpeglsContext *const s = avctx->priv_data;
-    AVFrame *const p       = &s->picture;
+    const AVFrame *const p = pict;
     const int near         = avctx->prediction_method;
     PutBitContext pb, pb2;
     GetBitContext gb;
@@ -259,10 +258,6 @@
     int i, size, ret;
     int comps;
 
-    *p           = *pict;
-    p->pict_type = AV_PICTURE_TYPE_I;
-    p->key_frame = 1;
-
     if (avctx->pix_fmt == AV_PIX_FMT_GRAY8 ||
         avctx->pix_fmt == AV_PIX_FMT_GRAY16)
         comps = 1;
@@ -349,7 +344,7 @@
                 Rc[j] = last[j];
             }
             last = cur;
-            cur += s->picture.linesize[0];
+            cur += p->linesize[0];
         }
     } else if (avctx->pix_fmt == AV_PIX_FMT_BGR24) {
         int j, width;
@@ -363,7 +358,7 @@
                 Rc[j] = last[j];
             }
             last = cur;
-            cur += s->picture.linesize[0];
+            cur += p->linesize[0];
         }
     }
 
@@ -403,12 +398,20 @@
     return 0;
 }
 
+static av_cold int encode_close(AVCodecContext *avctx)
+{
+    av_frame_free(&avctx->coded_frame);
+    return 0;
+}
+
 static av_cold int encode_init_ls(AVCodecContext *ctx)
 {
-    JpeglsContext *c = (JpeglsContext *)ctx->priv_data;
+    ctx->coded_frame = av_frame_alloc();
+    if (!ctx->coded_frame)
+        return AVERROR(ENOMEM);
 
-    c->avctx         = ctx;
-    ctx->coded_frame = &c->picture;
+    ctx->coded_frame->pict_type = AV_PICTURE_TYPE_I;
+    ctx->coded_frame->key_frame = 1;
 
     if (ctx->pix_fmt != AV_PIX_FMT_GRAY8  &&
         ctx->pix_fmt != AV_PIX_FMT_GRAY16 &&
@@ -426,8 +429,8 @@
     .long_name      = NULL_IF_CONFIG_SMALL("JPEG-LS"),
     .type           = AVMEDIA_TYPE_VIDEO,
     .id             = AV_CODEC_ID_JPEGLS,
-    .priv_data_size = sizeof(JpeglsContext),
     .init           = encode_init_ls,
+    .close          = encode_close,
     .encode2        = encode_picture_ls,
     .pix_fmts       = (const enum AVPixelFormat[]) {
         AV_PIX_FMT_BGR24, AV_PIX_FMT_RGB24,

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/jvdec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/jvdec.c Changed

@@ -25,11 +25,12 @@
  * @author Peter Ross <pross@xvid.org>
  */
 
+#include "libavutil/intreadwrite.h"
+
 #include "avcodec.h"
 #include "dsputil.h"
 #include "get_bits.h"
 #include "internal.h"
-#include "libavutil/intreadwrite.h"
 
 typedef struct JvContext {
     DSPContext dsp;
@@ -41,11 +42,13 @@
 static av_cold int decode_init(AVCodecContext *avctx)
 {
     JvContext *s = avctx->priv_data;
-    avctx->pix_fmt = AV_PIX_FMT_PAL8;
-    ff_dsputil_init(&s->dsp, avctx);
+
     s->frame = av_frame_alloc();
     if (!s->frame)
         return AVERROR(ENOMEM);
+
+    avctx->pix_fmt = AV_PIX_FMT_PAL8;
+    ff_dsputil_init(&s->dsp, avctx);
     return 0;
 }
 
@@ -60,19 +63,19 @@
     case 1:
         v[0] = get_bits(gb, 8);
         for (j = 0; j < 2; j++)
-            memset(dst + j*linesize, v[0], 2);
+            memset(dst + j * linesize, v[0], 2);
         break;
     case 2:
         v[0] = get_bits(gb, 8);
         v[1] = get_bits(gb, 8);
         for (j = 0; j < 2; j++)
             for (i = 0; i < 2; i++)
-                dst[j*linesize + i] = v[get_bits1(gb)];
+                dst[j * linesize + i] = v[get_bits1(gb)];
         break;
     case 3:
         for (j = 0; j < 2; j++)
             for (i = 0; i < 2; i++)
-                dst[j*linesize + i] = get_bits(gb, 8);
+                dst[j * linesize + i] = get_bits(gb, 8);
     }
 }
 
@@ -87,29 +90,30 @@
     case 1:
         v[0] = get_bits(gb, 8);
         for (j = 0; j < 4; j++)
-            memset(dst + j*linesize, v[0], 4);
+            memset(dst + j * linesize, v[0], 4);
         break;
     case 2:
         v[0] = get_bits(gb, 8);
         v[1] = get_bits(gb, 8);
         for (j = 2; j >= 0; j -= 2) {
             for (i = 0; i < 4; i++)
-                dst[j*linesize + i]     = v[get_bits1(gb)];
+                dst[j * linesize + i] = v[get_bits1(gb)];
             for (i = 0; i < 4; i++)
-                dst[(j+1)*linesize + i] = v[get_bits1(gb)];
+                dst[(j + 1) * linesize + i] = v[get_bits1(gb)];
         }
         break;
     case 3:
         for (j = 0; j < 4; j += 2)
             for (i = 0; i < 4; i += 2)
-                decode2x2(gb, dst + j*linesize + i, linesize);
+                decode2x2(gb, dst + j * linesize + i, linesize);
     }
 }
 
 /**
  * Decode 8x8 block
  */
-static inline void decode8x8(GetBitContext *gb, uint8_t *dst, int linesize, DSPContext *dsp)
+static inline void decode8x8(GetBitContext *gb, uint8_t *dst, int linesize,
+                             DSPContext *dsp)
 {
     int i, j, v[2];
 
@@ -122,22 +126,21 @@
         v[0] = get_bits(gb, 8);
         v[1] = get_bits(gb, 8);
         for (j = 7; j >= 0; j--)
-            for (i = 0; i <  8; i++)
-                dst[j*linesize + i] = v[get_bits1(gb)];
+            for (i = 0; i < 8; i++)
+                dst[j * linesize + i] = v[get_bits1(gb)];
         break;
     case 3:
         for (j = 0; j < 8; j += 4)
             for (i = 0; i < 8; i += 4)
-                decode4x4(gb, dst + j*linesize + i, linesize);
+                decode4x4(gb, dst + j * linesize + i, linesize);
     }
 }
 
-static int decode_frame(AVCodecContext *avctx,
-                        void *data, int *got_frame,
+static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
                         AVPacket *avpkt)
 {
-    JvContext *s           = avctx->priv_data;
-    const uint8_t *buf     = avpkt->data;
+    JvContext *s = avctx->priv_data;
+    const uint8_t *buf = avpkt->data;
     const uint8_t *buf_end = buf + avpkt->size;
     int video_size, video_type, i, j, ret;
 
@@ -162,16 +165,19 @@
 
             for (j = 0; j < avctx->height; j += 8)
                 for (i = 0; i < avctx->width; i += 8)
-                    decode8x8(&gb, s->frame->data[0] + j * s->frame->linesize[0] + i,
+                    decode8x8(&gb,
+                              s->frame->data[0] + j * s->frame->linesize[0] + i,
                               s->frame->linesize[0], &s->dsp);
 
             buf += video_size;
         } else if (video_type == 2) {
             int v = *buf++;
             for (j = 0; j < avctx->height; j++)
-                memset(s->frame->data[0] + j * s->frame->linesize[0], v, avctx->width);
+                memset(s->frame->data[0] + j * s->frame->linesize[0],
+                       v, avctx->width);
         } else {
-            av_log(avctx, AV_LOG_WARNING, "unsupported frame type %i\n", video_type);
+            av_log(avctx, AV_LOG_WARNING,
+                   "unsupported frame type %i\n", video_type);
             return AVERROR_INVALIDDATA;
         }
     }
@@ -189,7 +195,7 @@
         s->frame->key_frame           = 1;
         s->frame->pict_type           = AV_PICTURE_TYPE_I;
         s->frame->palette_has_changed = s->palette_has_changed;
-        s->palette_has_changed       = 0;
+        s->palette_has_changed        = 0;
         memcpy(s->frame->data[1], s->palette, AVPALETTE_SIZE);
 
         if ((ret = av_frame_ref(data, s->frame)) < 0)

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/kgv1dec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/kgv1dec.c Changed

@@ -31,14 +31,16 @@
 #include "internal.h"
 
 typedef struct {
-    AVFrame *prev;
+    uint16_t *frame_buffer;
+    uint16_t *last_frame_buffer;
 } KgvContext;
 
 static void decode_flush(AVCodecContext *avctx)
 {
     KgvContext * const c = avctx->priv_data;
 
-    av_frame_unref(c->prev);
+    av_freep(&c->frame_buffer);
+    av_freep(&c->last_frame_buffer);
 }
 
 static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
@@ -60,24 +62,28 @@
     h = (buf[1] + 1) * 8;
     buf += 2;
 
-    if ((res = av_image_check_size(w, h, 0, avctx)) < 0)
-        return res;
-
     if (w != avctx->width || h != avctx->height) {
-        av_frame_unref(c->prev);
-        avcodec_set_dimensions(avctx, w, h);
+        av_freep(&c->frame_buffer);
+        av_freep(&c->last_frame_buffer);
+        if ((res = ff_set_dimensions(avctx, w, h)) < 0)
+            return res;
+    }
+
+    if (!c->frame_buffer) {
+        c->frame_buffer      = av_mallocz(avctx->width * avctx->height * 2);
+        c->last_frame_buffer = av_mallocz(avctx->width * avctx->height * 2);
+        if (!c->frame_buffer || !c->last_frame_buffer) {
+            decode_flush(avctx);
+            return AVERROR(ENOMEM);
+        }
     }
 
     maxcnt = w * h;
 
-    if ((res = ff_get_buffer(avctx, frame, AV_GET_BUFFER_FLAG_REF)) < 0)
+    if ((res = ff_get_buffer(avctx, frame, 0)) < 0)
         return res;
-    out  = frame->data[0];
-    if (c->prev->data[0]) {
-        prev = c->prev->data[0];
-    } else {
-        prev = NULL;
-    }
+    out  = c->frame_buffer;
+    prev = c->last_frame_buffer;
 
     for (i = 0; i < 8; i++)
         offsets[i] = -1;
@@ -144,9 +150,10 @@
     if (outcnt - maxcnt)
         av_log(avctx, AV_LOG_DEBUG, "frame finished with %d diff\n", outcnt - maxcnt);
 
-    av_frame_unref(c->prev);
-    if ((res = av_frame_ref(c->prev, frame)) < 0)
-        return res;
+    av_image_copy_plane(frame->data[0], frame->linesize[0],
+                        (const uint8_t*)c->frame_buffer,  avctx->width * 2,
+                        avctx->width * 2, avctx->height);
+    FFSWAP(uint16_t *, c->frame_buffer, c->last_frame_buffer);
 
     *got_frame = 1;
 
@@ -155,22 +162,14 @@
 
 static av_cold int decode_init(AVCodecContext *avctx)
 {
-    KgvContext * const c = avctx->priv_data;
-
     avctx->pix_fmt = AV_PIX_FMT_RGB555;
-    avctx->flags  |= CODEC_FLAG_EMU_EDGE;
-
-    c->prev = av_frame_alloc();
-    if (!c->prev)
-        return AVERROR(ENOMEM);
 
     return 0;
 }
 
 static av_cold int decode_end(AVCodecContext *avctx)
 {
-    KgvContext * const c = avctx->priv_data;
-    av_frame_free(&c->prev);
+    decode_flush(avctx);
     return 0;
 }

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/lagarith.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/lagarith.c Changed

@@ -52,6 +52,7 @@
     int zeros;                  /**< number of consecutive zero bytes encountered */
     int zeros_rem;              /**< number of zero bytes remaining to output */
     uint8_t *rgb_planes;
+    int      rgb_planes_allocated;
     int rgb_stride;
 } LagarithContext;
 
@@ -302,16 +303,16 @@
             L += buf[i];
             buf[i] = L;
         }
-        for (; i<width; i++) {
-            L     = mid_pred(L&0xFF, buf[i-stride], (L + buf[i-stride] - TL)&0xFF) + buf[i];
-            TL    = buf[i-stride];
-            buf[i]= L;
+        for (; i < width; i++) {
+            L      = mid_pred(L & 0xFF, buf[i - stride], (L + buf[i - stride] - TL) & 0xFF) + buf[i];
+            TL     = buf[i - stride];
+            buf[i] = L;
         }
     } else {
         TL = buf[width - (2 * stride) - 1];
         L  = buf[width - stride - 1];
         l->dsp.add_hfyu_median_prediction(buf, buf - stride, buf, width,
-                                        &L, &TL);
+                                          &L, &TL);
     }
 }
 
@@ -369,6 +370,10 @@
     uint8_t mask2 = -(esc_count < 3);
     uint8_t *end = dst + (width - 2);
 
+    avpriv_request_sample(l->avctx, "zero_run_line");
+
+    memset(dst, 0, width);
+
 output_zeros:
     if (l->zeros_rem) {
         count = FFMIN(l->zeros_rem, width - i);
@@ -423,6 +428,7 @@
     GetBitContext gb;
     lag_rac rac;
     const uint8_t *src_end = src + src_size;
+    int ret;
 
     rac.avctx = l->avctx;
     l->zeros = 0;
@@ -440,7 +446,8 @@
             offset += 4;
         }
 
-        init_get_bits(&gb, src + offset, src_size * 8);
+        if ((ret = init_get_bits8(&gb, src + offset, src_size - offset)) < 0)
+            return ret;
 
         if (lag_read_prob_header(&rac, &gb) < 0)
             return -1;
@@ -457,6 +464,8 @@
                    length);
     } else if (esc_count < 8) {
         esc_count -= 4;
+        src ++;
+        src_size --;
         if (esc_count > 0) {
             /* Zero run coding only, no range coding. */
             for (i = 0; i < height; i++) {
@@ -603,13 +612,12 @@
         offs[1] = offset_gu;
         offs[2] = offset_ry;
 
+        l->rgb_stride = FFALIGN(avctx->width, 16);
+        av_fast_malloc(&l->rgb_planes, &l->rgb_planes_allocated,
+                       l->rgb_stride * avctx->height * planes + 1);
         if (!l->rgb_planes) {
-            l->rgb_stride = FFALIGN(avctx->width, 16);
-            l->rgb_planes = av_malloc(l->rgb_stride * avctx->height * 4 + 16);
-            if (!l->rgb_planes) {
-                av_log(avctx, AV_LOG_ERROR, "cannot allocate temporary buffer\n");
-                return AVERROR(ENOMEM);
-            }
+            av_log(avctx, AV_LOG_ERROR, "cannot allocate temporary buffer\n");
+            return AVERROR(ENOMEM);
         }
         for (i = 0; i < planes; i++)
             srcs[i] = l->rgb_planes + (i + 1) * l->rgb_stride * avctx->height - l->rgb_stride;

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/lclenc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/lclenc.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/libfdk-aacdec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/libfdk-aacdec.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/libfdk-aacenc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/libfdk-aacenc.c Changed

@@ -151,6 +151,20 @@
     case 4: mode = MODE_1_2_1;   sce = 2; cpe = 1; break;
     case 5: mode = MODE_1_2_2;   sce = 1; cpe = 2; break;
     case 6: mode = MODE_1_2_2_1; sce = 2; cpe = 2; break;
+/* The version macro is introduced the same time as the 7.1 support, so this
+   should suffice. */
+#ifdef AACENCODER_LIB_VL0
+    case 8:
+        sce = 2;
+        cpe = 3;
+        if (avctx->channel_layout == AV_CH_LAYOUT_7POINT1) {
+            mode = MODE_7_1_REAR_SURROUND;
+        } else {
+            // MODE_1_2_2_2_1 and MODE_7_1_FRONT_CENTER use the same channel layout
+            mode = MODE_7_1_FRONT_CENTER;
+        }
+        break;
+#endif
     default:
         av_log(avctx, AV_LOG_ERROR,
                "Unsupported number of channels %d\n", avctx->channels);
@@ -384,6 +398,10 @@
     AV_CH_LAYOUT_4POINT0,
     AV_CH_LAYOUT_5POINT0_BACK,
     AV_CH_LAYOUT_5POINT1_BACK,
+#ifdef AACENCODER_LIB_VL0
+    AV_CH_LAYOUT_7POINT1_WIDE_BACK,
+    AV_CH_LAYOUT_7POINT1,
+#endif
     0,
 };

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/libmp3lame.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/libmp3lame.c Changed

@@ -49,6 +49,7 @@
     int buffer_size;
     int reservoir;
     int joint_stereo;
+    int abr;
     float *samples_flt[2];
     AudioFrameQueue afq;
     AVFloatDSPContext fdsp;
@@ -58,18 +59,14 @@
 static int realloc_buffer(LAMEContext *s)
 {
     if (!s->buffer || s->buffer_size - s->buffer_index < BUFFER_SIZE) {
-        uint8_t *tmp;
-        int new_size = s->buffer_index + 2 * BUFFER_SIZE;
+        int new_size = s->buffer_index + 2 * BUFFER_SIZE, err;
 
         av_dlog(s->avctx, "resizing output buffer: %d -> %d\n", s->buffer_size,
                 new_size);
-        tmp = av_realloc(s->buffer, new_size);
-        if (!tmp) {
-            av_freep(&s->buffer);
+        if ((err = av_reallocp(&s->buffer, new_size)) < 0) {
             s->buffer_size = s->buffer_index = 0;
-            return AVERROR(ENOMEM);
+            return err;
         }
-        s->buffer      = tmp;
         s->buffer_size = new_size;
     }
     return 0;
@@ -119,8 +116,13 @@
         lame_set_VBR(s->gfp, vbr_default);
         lame_set_VBR_quality(s->gfp, avctx->global_quality / (float)FF_QP2LAMBDA);
     } else {
-        if (avctx->bit_rate)                // CBR
-            lame_set_brate(s->gfp, avctx->bit_rate / 1000);
+        if (avctx->bit_rate) {
+            if (s->abr) {                   // ABR
+                lame_set_VBR(s->gfp, vbr_abr);
+                lame_set_VBR_mean_bitrate_kbps(s->gfp, avctx->bit_rate / 1000);
+            } else                          // CBR
+                lame_set_brate(s->gfp, avctx->bit_rate / 1000);
+        }
     }
 
     /* do not get a Xing VBR header frame from LAME */
@@ -265,6 +267,7 @@
 static const AVOption options[] = {
     { "reservoir",    "use bit reservoir", OFFSET(reservoir),    AV_OPT_TYPE_INT, { .i64 = 1 }, 0, 1, AE },
     { "joint_stereo", "use joint stereo",  OFFSET(joint_stereo), AV_OPT_TYPE_INT, { .i64 = 1 }, 0, 1, AE },
+    { "abr",          "use ABR",           OFFSET(abr),          AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, AE },
     { NULL },
 };

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/libopencore-amr.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/libopencore-amr.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/libopenjpegdec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/libopenjpegdec.c Changed

@@ -32,6 +32,7 @@
 #include "libavutil/pixfmt.h"
 #include "libavutil/opt.h"
 #include "avcodec.h"
+#include "internal.h"
 #include "thread.h"
 
 #if HAVE_OPENJPEG_1_5_OPENJPEG_H
@@ -161,7 +162,7 @@
         img_ptr = picture->data[0] + y*picture->linesize[0];
         for (x = 0; x < picture->width; x++, index++) {
             for (c = 0; c < image->numcomps; c++) {
-                *img_ptr++ = image->comps[c].data[index];
+                *img_ptr++ = 0x80 * image->comps[c].sgnd + image->comps[c].data[index];
             }
         }
     }
@@ -172,14 +173,15 @@
     int index, x, y, c;
     int adjust[4];
     for (x = 0; x < image->numcomps; x++)
-        adjust[x] = FFMAX(FFMIN(16 - image->comps[x].prec, 8), 0);
+        adjust[x] = FFMAX(FFMIN(av_pix_fmt_desc_get(picture->format)->comp[x].depth_minus1 + 1 - image->comps[x].prec, 8), 0);
 
     for (y = 0; y < picture->height; y++) {
         index = y*picture->width;
         img_ptr = (uint16_t*) (picture->data[0] + y*picture->linesize[0]);
         for (x = 0; x < picture->width; x++, index++) {
             for (c = 0; c < image->numcomps; c++) {
-                *img_ptr++ = image->comps[c].data[index] << adjust[c];
+                *img_ptr++ = (1 << image->comps[c].prec - 1) * image->comps[c].sgnd +
+                             (unsigned)image->comps[c].data[index] << adjust[c];
             }
         }
     }
@@ -195,7 +197,7 @@
         for (y = 0; y < image->comps[index].h; y++) {
             img_ptr = picture->data[index] + y * picture->linesize[index];
             for (x = 0; x < image->comps[index].w; x++) {
-                *img_ptr = (uint8_t) *comp_data;
+                *img_ptr = 0x80 * image->comps[index].sgnd + *comp_data;
                 img_ptr++;
                 comp_data++;
             }
@@ -209,14 +211,15 @@
     int index, x, y;
     int adjust[4];
     for (x = 0; x < image->numcomps; x++)
-        adjust[x] = FFMAX(FFMIN(16 - image->comps[x].prec, 8), 0);
+        adjust[x] = FFMAX(FFMIN(av_pix_fmt_desc_get(picture->format)->comp[x].depth_minus1 + 1 - image->comps[x].prec, 8), 0);
 
     for (index = 0; index < image->numcomps; index++) {
         comp_data = image->comps[index].data;
         for (y = 0; y < image->comps[index].h; y++) {
             img_ptr = (uint16_t*) (picture->data[index] + y * picture->linesize[index]);
             for (x = 0; x < image->comps[index].w; x++) {
-                *img_ptr = *comp_data << adjust[index];
+                *img_ptr = (1 << image->comps[index].prec - 1) * image->comps[index].sgnd +
+                           (unsigned)*comp_data << adjust[index];
                 img_ptr++;
                 comp_data++;
             }
@@ -245,7 +248,7 @@
     opj_dinfo_t *dec;
     opj_cio_t *stream;
     opj_image_t *image;
-    int width, height, ret = -1;
+    int width, height, ret;
     int pixel_size = 0;
     int ispacked = 0;
     int i;
@@ -267,7 +270,7 @@
 
     if (!dec) {
         av_log(avctx, AV_LOG_ERROR, "Error initializing decoder.\n");
-        return -1;
+        return AVERROR_UNKNOWN;
     }
     opj_set_event_mgr((opj_common_ptr)dec, NULL, NULL);
     ctx->dec_params.cp_limit_decoding = LIMIT_TO_MAIN_HEADER;
@@ -280,7 +283,7 @@
         av_log(avctx, AV_LOG_ERROR,
                "Codestream could not be opened for reading.\n");
         opj_destroy_decompress(dec);
-        return -1;
+        return AVERROR_UNKNOWN;
     }
 
     // Decode the header only.
@@ -290,19 +293,15 @@
     if (!image) {
         av_log(avctx, AV_LOG_ERROR, "Error decoding codestream.\n");
         opj_destroy_decompress(dec);
-        return -1;
+        return AVERROR_UNKNOWN;
     }
 
     width  = image->x1 - image->x0;
     height = image->y1 - image->y0;
 
-    if (av_image_check_size(width, height, 0, avctx) < 0) {
-        av_log(avctx, AV_LOG_ERROR,
-               "%dx%d dimension invalid.\n", width, height);
+    ret = ff_set_dimensions(avctx, width, height);
+    if (ret < 0)
         goto done;
-    }
-
-    avcodec_set_dimensions(avctx, width, height);
 
     if (avctx->pix_fmt != AV_PIX_FMT_NONE)
         if (!libopenjpeg_matches_pix_fmt(image, avctx->pix_fmt))
@@ -319,7 +318,7 @@
         if (image->comps[i].prec > avctx->bits_per_raw_sample)
             avctx->bits_per_raw_sample = image->comps[i].prec;
 
-    if (ff_thread_get_buffer(avctx, &frame, 0) < 0)
+    if ((ret = ff_thread_get_buffer(avctx, &frame, 0)) < 0)
         goto done;
 
     ctx->dec_params.cp_limit_decoding = NO_LIMITATION;
@@ -330,6 +329,7 @@
     if (!stream) {
         av_log(avctx, AV_LOG_ERROR,
                "Codestream could not be opened for reading.\n");
+        ret = AVERROR_UNKNOWN;
         goto done;
     }
 
@@ -340,6 +340,7 @@
 
     if (!image) {
         av_log(avctx, AV_LOG_ERROR, "Error decoding codestream.\n");
+        ret = AVERROR_UNKNOWN;
         goto done;
     }
 
@@ -376,6 +377,7 @@
         break;
     default:
         av_log(avctx, AV_LOG_ERROR, "unsupported pixel size %d\n", pixel_size);
+        ret = AVERROR_PATCHWELCOME;
         goto done;
     }

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/libopenjpegenc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/libopenjpegenc.c Changed

@@ -242,7 +242,7 @@
         goto fail;
     }
 
-    avctx->coded_frame = avcodec_alloc_frame();
+    avctx->coded_frame = av_frame_alloc();
     if (!avctx->coded_frame) {
         av_log(avctx, AV_LOG_ERROR, "Error allocating coded frame\n");
         goto fail;
@@ -480,7 +480,7 @@
     opj_cio_t *stream     = ctx->stream;
     int cpyresult = 0;
     int ret, len;
-    AVFrame gbrframe;
+    AVFrame *gbrframe;
 
     switch (avctx->pix_fmt) {
     case AV_PIX_FMT_RGB24:
@@ -501,18 +501,21 @@
     case AV_PIX_FMT_GBRP12:
     case AV_PIX_FMT_GBRP14:
     case AV_PIX_FMT_GBRP16:
-        gbrframe = *frame;
-        gbrframe.data[0] = frame->data[2]; // swap to be rgb
-        gbrframe.data[1] = frame->data[0];
-        gbrframe.data[2] = frame->data[1];
-        gbrframe.linesize[0] = frame->linesize[2];
-        gbrframe.linesize[1] = frame->linesize[0];
-        gbrframe.linesize[2] = frame->linesize[1];
+        gbrframe = av_frame_clone(frame);
+        if (!gbrframe)
+            return AVERROR(ENOMEM);
+        gbrframe->data[0] = frame->data[2]; // swap to be rgb
+        gbrframe->data[1] = frame->data[0];
+        gbrframe->data[2] = frame->data[1];
+        gbrframe->linesize[0] = frame->linesize[2];
+        gbrframe->linesize[1] = frame->linesize[0];
+        gbrframe->linesize[2] = frame->linesize[1];
         if (avctx->pix_fmt == AV_PIX_FMT_GBR24P) {
-            cpyresult = libopenjpeg_copy_unpacked8(avctx, &gbrframe, image);
+            cpyresult = libopenjpeg_copy_unpacked8(avctx, gbrframe, image);
         } else {
-            cpyresult = libopenjpeg_copy_unpacked16(avctx, &gbrframe, image);
+            cpyresult = libopenjpeg_copy_unpacked16(avctx, gbrframe, image);
         }
+        av_frame_free(&gbrframe);
         break;
     case AV_PIX_FMT_GRAY8:
     case AV_PIX_FMT_YUV410P:

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/libopusdec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/libopusdec.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/libopusenc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/libopusenc.c Changed

@@ -400,7 +400,7 @@
         { "voip",           "Favor improved speech intelligibility",   0, AV_OPT_TYPE_CONST, { .i64 = OPUS_APPLICATION_VOIP },                0, 0, FLAGS, "application" },
         { "audio",          "Favor faithfulness to the input",         0, AV_OPT_TYPE_CONST, { .i64 = OPUS_APPLICATION_AUDIO },               0, 0, FLAGS, "application" },
         { "lowdelay",       "Restrict to only the lowest delay modes", 0, AV_OPT_TYPE_CONST, { .i64 = OPUS_APPLICATION_RESTRICTED_LOWDELAY }, 0, 0, FLAGS, "application" },
-    { "frame_duration", "Duration of a frame in milliseconds", OFFSET(frame_duration), AV_OPT_TYPE_FLOAT, { .dbl = 10.0 }, 2.5, 60.0, FLAGS },
+    { "frame_duration", "Duration of a frame in milliseconds", OFFSET(frame_duration), AV_OPT_TYPE_FLOAT, { .dbl = 20.0 }, 2.5, 60.0, FLAGS },
     { "packet_loss",    "Expected packet loss percentage",     OFFSET(packet_loss),    AV_OPT_TYPE_INT,   { .i64 = 0 },    0,   100,  FLAGS },
     { "vbr",            "Variable bit rate mode",              OFFSET(vbr),            AV_OPT_TYPE_INT,   { .i64 = 1 },    0,   2,    FLAGS, "vbr" },
         { "off",            "Use constant bit rate", 0, AV_OPT_TYPE_CONST, { .i64 = 0 }, 0, 0, FLAGS, "vbr" },

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/libschroedingerenc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/libschroedingerenc.c Changed

@@ -47,9 +47,6 @@
     /** Schroedinger frame format */
     SchroFrameFormat frame_format;
 
-    /** frame being encoded */
-    AVFrame picture;
-
     /** frame size */
     int frame_size;
 
@@ -162,7 +159,9 @@
                                                     avctx->width,
                                                     avctx->height);
 
-    avctx->coded_frame = &p_schro_params->picture;
+    avctx->coded_frame = av_frame_alloc();
+    if (!avctx->coded_frame)
+        return AVERROR(ENOMEM);
 
     if (!avctx->gop_size) {
         schro_encoder_setting_set_double(p_schro_params->encoder,
@@ -294,21 +293,27 @@
 
     /* Now check to see if we have any output from the encoder. */
     while (go) {
+        int err;
         SchroStateEnum state;
         state = schro_encoder_wait(encoder);
         switch (state) {
         case SCHRO_STATE_HAVE_BUFFER:
         case SCHRO_STATE_END_OF_STREAM:
             enc_buf = schro_encoder_pull(encoder, &presentation_frame);
-            av_assert0(enc_buf->length > 0);
+            if (enc_buf->length <= 0)
+                return AVERROR_BUG;
             parse_code = enc_buf->data[4];
 
             /* All non-frame data is prepended to actual frame data to
              * be able to set the pts correctly. So we don't write data
              * to the frame output queue until we actually have a frame
              */
-            p_schro_params->enc_buf = av_realloc(p_schro_params->enc_buf,
-                                                 p_schro_params->enc_buf_size + enc_buf->length);
+            if ((err = av_reallocp(&p_schro_params->enc_buf,
+                                   p_schro_params->enc_buf_size +
+                                   enc_buf->length)) < 0) {
+                p_schro_params->enc_buf_size = 0;
+                return err;
+            }
 
             memcpy(p_schro_params->enc_buf + p_schro_params->enc_buf_size,
                    enc_buf->data, enc_buf->length);
@@ -427,6 +432,8 @@
     /* Free the video format structure. */
     av_freep(&p_schro_params->format);
 
+    av_frame_free(&avctx->coded_frame);
+
     return 0;
 }

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/libshine.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/libshine.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/libstagefright.cpp -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/libstagefright.cpp Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/libtheoraenc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/libtheoraenc.c Changed

@@ -58,31 +58,26 @@
                               const ogg_packet* packet)
 {
     const char* message = NULL;
-    uint8_t* newdata    = NULL;
     int newsize = avc_context->extradata_size + 2 + packet->bytes;
-    int ret;
+    int err = AVERROR_INVALIDDATA;
 
     if (packet->bytes < 0) {
         message = "ogg_packet has negative size";
-        ret = AVERROR_INVALIDDATA;
     } else if (packet->bytes > 0xffff) {
         message = "ogg_packet is larger than 65535 bytes";
-        ret = AVERROR_INVALIDDATA;
     } else if (newsize < avc_context->extradata_size) {
         message = "extradata_size would overflow";
-        ret = AVERROR_INVALIDDATA;
     } else {
-        newdata = av_realloc(avc_context->extradata, newsize);
-        if (!newdata)
+        if ((err = av_reallocp(&avc_context->extradata, newsize)) < 0) {
+            avc_context->extradata_size = 0;
             message = "av_realloc failed";
-        ret = AVERROR(ENOMEM);
+        }
     }
     if (message) {
         av_log(avc_context, AV_LOG_ERROR, "concatenate_packet failed: %s\n", message);
-        return ret;
+        return err;
     }
 
-    avc_context->extradata      = newdata;
     avc_context->extradata_size = newsize;
     AV_WB16(avc_context->extradata + (*offset), packet->bytes);
     *offset += 2;
@@ -264,7 +259,7 @@
     th_comment_clear(&t_comment);
 
     /* Set up the output AVFrame */
-    avc_context->coded_frame= avcodec_alloc_frame();
+    avc_context->coded_frame = av_frame_alloc();
 
     return 0;
 }

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/libutvideodec.cpp -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/libutvideodec.cpp Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/libutvideoenc.cpp -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/libutvideoenc.cpp Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/libvorbisenc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/libvorbisenc.c Changed

@@ -35,13 +35,12 @@
  * an output packet will always start at the same point as one of the input
  * packets.
  */
-#define OGGVORBIS_FRAME_SIZE 64
+#define LIBVORBIS_FRAME_SIZE 64
 
 #define BUFFER_SIZE (1024 * 64)
 
-typedef struct OggVorbisEncContext {
+typedef struct LibvorbisEncContext {
     AVClass *av_class;                  /**< class for AVOptions            */
-    AVFrame frame;
     vorbis_info vi;                     /**< vorbis_info used during init   */
     vorbis_dsp_state vd;                /**< DSP state used for analysis    */
     vorbis_block vb;                    /**< vorbis_block used for analysis */
@@ -52,10 +51,10 @@
     double iblock;                      /**< impulse block bias option      */
     VorbisParseContext vp;              /**< parse context to get durations */
     AudioFrameQueue afq;                /**< frame queue for timestamps     */
-} OggVorbisEncContext;
+} LibvorbisEncContext;
 
 static const AVOption options[] = {
-    { "iblock", "Sets the impulse block bias", offsetof(OggVorbisEncContext, iblock), AV_OPT_TYPE_DOUBLE, { .dbl = 0 }, -15, 0, AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_ENCODING_PARAM },
+    { "iblock", "Sets the impulse block bias", offsetof(LibvorbisEncContext, iblock), AV_OPT_TYPE_DOUBLE, { .dbl = 0 }, -15, 0, AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_ENCODING_PARAM },
     { NULL }
 };
 
@@ -81,10 +80,9 @@
     }
 }
 
-static av_cold int oggvorbis_init_encoder(vorbis_info *vi,
-                                          AVCodecContext *avctx)
+static av_cold int libvorbis_setup(vorbis_info *vi, AVCodecContext *avctx)
 {
-    OggVorbisEncContext *s = avctx->priv_data;
+    LibvorbisEncContext *s = avctx->priv_data;
     double cfreq;
     int ret;
 
@@ -173,9 +171,9 @@
     return 1 + l / 255 + l;
 }
 
-static av_cold int oggvorbis_encode_close(AVCodecContext *avctx)
+static av_cold int libvorbis_encode_close(AVCodecContext *avctx)
 {
-    OggVorbisEncContext *s = avctx->priv_data;
+    LibvorbisEncContext *s = avctx->priv_data;
 
     /* notify vorbisenc this is EOF */
     if (s->dsp_initialized)
@@ -192,16 +190,16 @@
     return 0;
 }
 
-static av_cold int oggvorbis_encode_init(AVCodecContext *avctx)
+static av_cold int libvorbis_encode_init(AVCodecContext *avctx)
 {
-    OggVorbisEncContext *s = avctx->priv_data;
+    LibvorbisEncContext *s = avctx->priv_data;
     ogg_packet header, header_comm, header_code;
     uint8_t *p;
     unsigned int offset;
     int ret;
 
     vorbis_info_init(&s->vi);
-    if ((ret = oggvorbis_init_encoder(&s->vi, avctx))) {
+    if ((ret = libvorbis_setup(&s->vi, avctx))) {
         av_log(avctx, AV_LOG_ERROR, "encoder setup failed\n");
         goto error;
     }
@@ -255,7 +253,7 @@
 
     vorbis_comment_clear(&s->vc);
 
-    avctx->frame_size = OGGVORBIS_FRAME_SIZE;
+    avctx->frame_size = LIBVORBIS_FRAME_SIZE;
     ff_af_queue_init(avctx, &s->afq);
 
     s->pkt_fifo = av_fifo_alloc(BUFFER_SIZE);
@@ -266,14 +264,14 @@
 
     return 0;
 error:
-    oggvorbis_encode_close(avctx);
+    libvorbis_encode_close(avctx);
     return ret;
 }
 
-static int oggvorbis_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
+static int libvorbis_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
                                   const AVFrame *frame, int *got_packet_ptr)
 {
-    OggVorbisEncContext *s = avctx->priv_data;
+    LibvorbisEncContext *s = avctx->priv_data;
     ogg_packet op;
     int ret, duration;
 
@@ -366,10 +364,10 @@
     .long_name      = NULL_IF_CONFIG_SMALL("libvorbis"),
     .type           = AVMEDIA_TYPE_AUDIO,
     .id             = AV_CODEC_ID_VORBIS,
-    .priv_data_size = sizeof(OggVorbisEncContext),
-    .init           = oggvorbis_encode_init,
-    .encode2        = oggvorbis_encode_frame,
-    .close          = oggvorbis_encode_close,
+    .priv_data_size = sizeof(LibvorbisEncContext),
+    .init           = libvorbis_encode_init,
+    .encode2        = libvorbis_encode_frame,
+    .close          = libvorbis_encode_close,
     .capabilities   = CODEC_CAP_DELAY,
     .sample_fmts    = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP,
                                                       AV_SAMPLE_FMT_NONE },

omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/libvpx.c Added

@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2013 Guillaume Martres <smarter@ubuntu.com>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <vpx/vpx_codec.h>
+
+#include "libvpx.h"
+
+av_cold void ff_vp9_init_static(AVCodec *codec)
+{
+    if (    vpx_codec_version_major() < 1
+        || (vpx_codec_version_major() == 1 && vpx_codec_version_minor() < 3))
+        codec->capabilities |= CODEC_CAP_EXPERIMENTAL;
+}

omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/libvpx.h Added

@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2013 Guillaume Martres <smarter@ubuntu.com>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_LIBVPX_H
+#define AVCODEC_LIBVPX_H
+
+#include "avcodec.h"
+
+void ff_vp9_init_static(AVCodec *codec);
+
+#endif /* AVCODEC_LIBVPX_H */

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/libvpxdec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/libvpxdec.c Changed

@@ -31,6 +31,7 @@
 #include "libavutil/imgutils.h"
 #include "avcodec.h"
 #include "internal.h"
+#include "libvpx.h"
 
 typedef struct VP8DecoderContext {
     struct vpx_codec_ctx decoder;
@@ -90,9 +91,9 @@
         if ((int) img->d_w != avctx->width || (int) img->d_h != avctx->height) {
             av_log(avctx, AV_LOG_INFO, "dimension change! %dx%d -> %dx%d\n",
                    avctx->width, avctx->height, img->d_w, img->d_h);
-            if (av_image_check_size(img->d_w, img->d_h, 0, avctx))
-                return AVERROR_INVALIDDATA;
-            avcodec_set_dimensions(avctx, img->d_w, img->d_h);
+            ret = ff_set_dimensions(avctx, img->d_w, img->d_h);
+            if (ret < 0)
+                return ret;
         }
         if ((ret = ff_get_buffer(avctx, picture, 0)) < 0)
             return ret;
@@ -144,6 +145,7 @@
     .init           = vp9_init,
     .close          = vp8_free,
     .decode         = vp8_decode,
-    .capabilities   = CODEC_CAP_AUTO_THREADS | CODEC_CAP_EXPERIMENTAL,
+    .capabilities   = CODEC_CAP_AUTO_THREADS | CODEC_CAP_DR1,
+    .init_static_data = ff_vp9_init_static,
 };
 #endif /* CONFIG_LIBVPX_VP9_DECODER */

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/libvpxenc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/libvpxenc.c Changed

@@ -31,6 +31,7 @@
 #include "avcodec.h"
 #include "internal.h"
 #include "libavutil/avassert.h"
+#include "libvpx.h"
 #include "libavutil/base64.h"
 #include "libavutil/common.h"
 #include "libavutil/intreadwrite.h"
@@ -89,6 +90,12 @@
     int error_resilient;
     int crf;
     int max_intra_rate;
+
+    // VP9-only
+    int lossless;
+    int tile_columns;
+    int tile_rows;
+    int frame_parallel;
 } VP8Context;
 
 /** String mappings for enum vp8e_enc_control_id */
@@ -111,6 +118,12 @@
     [VP8E_SET_ARNR_TYPE]         = "VP8E_SET_ARNR_TYPE",
     [VP8E_SET_CQ_LEVEL]          = "VP8E_SET_CQ_LEVEL",
     [VP8E_SET_MAX_INTRA_BITRATE_PCT] = "VP8E_SET_MAX_INTRA_BITRATE_PCT",
+#if CONFIG_LIBVPX_VP9_ENCODER
+    [VP9E_SET_LOSSLESS]                = "VP9E_SET_LOSSLESS",
+    [VP9E_SET_TILE_COLUMNS]            = "VP9E_SET_TILE_COLUMNS",
+    [VP9E_SET_TILE_ROWS]               = "VP9E_SET_TILE_ROWS",
+    [VP9E_SET_FRAME_PARALLEL_DECODING] = "VP9E_SET_FRAME_PARALLEL_DECODING",
+#endif
 };
 
 static av_cold void log_encoder_error(AVCodecContext *avctx, const char *desc)
@@ -308,7 +321,7 @@
 
     if (avctx->qmin >= 0)
         enccfg.rc_min_quantizer = avctx->qmin;
-    if (avctx->qmax > 0)
+    if (avctx->qmax >= 0)
         enccfg.rc_max_quantizer = avctx->qmax;
 
     if (enccfg.rc_end_usage == VPX_CQ) {
@@ -415,12 +428,26 @@
     if (ctx->arnr_type >= 0)
         codecctl_int(avctx, VP8E_SET_ARNR_TYPE,        ctx->arnr_type);
     codecctl_int(avctx, VP8E_SET_NOISE_SENSITIVITY, avctx->noise_reduction);
-    codecctl_int(avctx, VP8E_SET_TOKEN_PARTITIONS,  av_log2(avctx->slices));
+    if (avctx->codec_id == AV_CODEC_ID_VP8)
+        codecctl_int(avctx, VP8E_SET_TOKEN_PARTITIONS,  av_log2(avctx->slices));
     codecctl_int(avctx, VP8E_SET_STATIC_THRESHOLD,  avctx->mb_threshold);
     codecctl_int(avctx, VP8E_SET_CQ_LEVEL,          ctx->crf);
     if (ctx->max_intra_rate >= 0)
         codecctl_int(avctx, VP8E_SET_MAX_INTRA_BITRATE_PCT, ctx->max_intra_rate);
 
+#if CONFIG_LIBVPX_VP9_ENCODER
+    if (avctx->codec_id == AV_CODEC_ID_VP9) {
+        if (ctx->lossless >= 0)
+            codecctl_int(avctx, VP9E_SET_LOSSLESS, ctx->lossless);
+        if (ctx->tile_columns >= 0)
+            codecctl_int(avctx, VP9E_SET_TILE_COLUMNS, ctx->tile_columns);
+        if (ctx->tile_rows >= 0)
+            codecctl_int(avctx, VP9E_SET_TILE_ROWS, ctx->tile_rows);
+        if (ctx->frame_parallel >= 0)
+            codecctl_int(avctx, VP9E_SET_FRAME_PARALLEL_DECODING, ctx->frame_parallel);
+    }
+#endif
+
     av_log(avctx, AV_LOG_DEBUG, "Using deadline: %d\n", ctx->deadline);
 
     //provide dummy value to initialize wrapper, values will be updated each _encode()
@@ -431,7 +458,7 @@
         vpx_img_wrap(&ctx->rawimg_alpha, VPX_IMG_FMT_I420, avctx->width, avctx->height, 1,
                      (unsigned char*)1);
 
-    avctx->coded_frame = avcodec_alloc_frame();
+    avctx->coded_frame = av_frame_alloc();
     if (!avctx->coded_frame) {
         av_log(avctx, AV_LOG_ERROR, "Error allocating coded frame\n");
         vp8_free(avctx);
@@ -611,11 +638,13 @@
             break;
         case VPX_CODEC_STATS_PKT: {
             struct vpx_fixed_buf *stats = &ctx->twopass_stats;
-            stats->buf = av_realloc_f(stats->buf, 1,
-                                      stats->sz + pkt->data.twopass_stats.sz);
-            if (!stats->buf) {
+            int err;
+            if ((err = av_reallocp(&stats->buf,
+                                   stats->sz +
+                                   pkt->data.twopass_stats.sz)) < 0) {
+                stats->sz = 0;
                 av_log(avctx, AV_LOG_ERROR, "Stat buffer realloc failed\n");
-                return AVERROR(ENOMEM);
+                return err;
             }
             memcpy((uint8_t*)stats->buf + stats->sz,
                    pkt->data.twopass_stats.buf, pkt->data.twopass_stats.sz);
@@ -718,43 +747,70 @@
 
 #define OFFSET(x) offsetof(VP8Context, x)
 #define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM
-static const AVOption options[] = {
-    { "cpu-used",        "Quality/Speed ratio modifier",           OFFSET(cpu_used),        AV_OPT_TYPE_INT, {.i64 = INT_MIN}, INT_MIN, INT_MAX, VE},
-    { "auto-alt-ref",    "Enable use of alternate reference "
-                         "frames (2-pass only)",                   OFFSET(auto_alt_ref),    AV_OPT_TYPE_INT, {.i64 = -1},      -1,      1,       VE},
-    { "lag-in-frames",   "Number of frames to look ahead for "
-                         "alternate reference frame selection",    OFFSET(lag_in_frames),   AV_OPT_TYPE_INT, {.i64 = -1},      -1,      INT_MAX, VE},
-    { "arnr-maxframes",  "altref noise reduction max frame count", OFFSET(arnr_max_frames), AV_OPT_TYPE_INT, {.i64 = -1},      -1,      INT_MAX, VE},
-    { "arnr-strength",   "altref noise reduction filter strength", OFFSET(arnr_strength),   AV_OPT_TYPE_INT, {.i64 = -1},      -1,      INT_MAX, VE},
-    { "arnr-type",       "altref noise reduction filter type",     OFFSET(arnr_type),       AV_OPT_TYPE_INT, {.i64 = -1},      -1,      INT_MAX, VE, "arnr_type"},
-    { "backward",        NULL, 0, AV_OPT_TYPE_CONST, {.i64 = 1}, 0, 0, VE, "arnr_type" },
-    { "forward",         NULL, 0, AV_OPT_TYPE_CONST, {.i64 = 2}, 0, 0, VE, "arnr_type" },
-    { "centered",        NULL, 0, AV_OPT_TYPE_CONST, {.i64 = 3}, 0, 0, VE, "arnr_type" },
-    { "deadline",        "Time to spend encoding, in microseconds.", OFFSET(deadline),      AV_OPT_TYPE_INT, {.i64 = VPX_DL_GOOD_QUALITY}, INT_MIN, INT_MAX, VE, "quality"},
-    { "best",            NULL, 0, AV_OPT_TYPE_CONST, {.i64 = VPX_DL_BEST_QUALITY}, 0, 0, VE, "quality"},
-    { "good",            NULL, 0, AV_OPT_TYPE_CONST, {.i64 = VPX_DL_GOOD_QUALITY}, 0, 0, VE, "quality"},
-    { "realtime",        NULL, 0, AV_OPT_TYPE_CONST, {.i64 = VPX_DL_REALTIME},     0, 0, VE, "quality"},
-    { "error-resilient", "Error resilience configuration", OFFSET(error_resilient), AV_OPT_TYPE_FLAGS, {.i64 = 0}, INT_MIN, INT_MAX, VE, "er"},
-    { "max-intra-rate",  "Maximum I-frame bitrate (pct) 0=unlimited",  OFFSET(max_intra_rate),  AV_OPT_TYPE_INT,  {.i64 = -1}, -1,      INT_MAX, VE},
-#ifdef VPX_ERROR_RESILIENT_DEFAULT
-    { "default",         "Improve resiliency against losses of whole frames", 0, AV_OPT_TYPE_CONST, {.i64 = VPX_ERROR_RESILIENT_DEFAULT}, 0, 0, VE, "er"},
-    { "partitions",      "The frame partitions are independently decodable "
-                         "by the bool decoder, meaning that partitions can be decoded even "
-                         "though earlier partitions have been lost. Note that intra predicition"
-                         " is still done over the partition boundary.",       0, AV_OPT_TYPE_CONST, {.i64 = VPX_ERROR_RESILIENT_PARTITIONS}, 0, 0, VE, "er"},
+
+#ifndef VPX_ERROR_RESILIENT_DEFAULT
+#define VPX_ERROR_RESILIENT_DEFAULT 1
+#define VPX_ERROR_RESILIENT_PARTITIONS 2
+#endif
+
+#define COMMON_OPTIONS \
+    { "cpu-used",        "Quality/Speed ratio modifier",           OFFSET(cpu_used),        AV_OPT_TYPE_INT, {.i64 = INT_MIN}, INT_MIN, INT_MAX, VE}, \
+    { "auto-alt-ref",    "Enable use of alternate reference " \
+                         "frames (2-pass only)",                   OFFSET(auto_alt_ref),    AV_OPT_TYPE_INT, {.i64 = -1},      -1,      1,       VE}, \
+    { "lag-in-frames",   "Number of frames to look ahead for " \
+                         "alternate reference frame selection",    OFFSET(lag_in_frames),   AV_OPT_TYPE_INT, {.i64 = -1},      -1,      INT_MAX, VE}, \
+    { "arnr-maxframes",  "altref noise reduction max frame count", OFFSET(arnr_max_frames), AV_OPT_TYPE_INT, {.i64 = -1},      -1,      INT_MAX, VE}, \
+    { "arnr-strength",   "altref noise reduction filter strength", OFFSET(arnr_strength),   AV_OPT_TYPE_INT, {.i64 = -1},      -1,      INT_MAX, VE}, \
+    { "arnr-type",       "altref noise reduction filter type",     OFFSET(arnr_type),       AV_OPT_TYPE_INT, {.i64 = -1},      -1,      INT_MAX, VE, "arnr_type"}, \
+    { "backward",        NULL, 0, AV_OPT_TYPE_CONST, {.i64 = 1}, 0, 0, VE, "arnr_type" }, \
+    { "forward",         NULL, 0, AV_OPT_TYPE_CONST, {.i64 = 2}, 0, 0, VE, "arnr_type" }, \
+    { "centered",        NULL, 0, AV_OPT_TYPE_CONST, {.i64 = 3}, 0, 0, VE, "arnr_type" }, \
+    { "deadline",        "Time to spend encoding, in microseconds.", OFFSET(deadline),      AV_OPT_TYPE_INT, {.i64 = VPX_DL_GOOD_QUALITY}, INT_MIN, INT_MAX, VE, "quality"}, \
+    { "best",            NULL, 0, AV_OPT_TYPE_CONST, {.i64 = VPX_DL_BEST_QUALITY}, 0, 0, VE, "quality"}, \
+    { "good",            NULL, 0, AV_OPT_TYPE_CONST, {.i64 = VPX_DL_GOOD_QUALITY}, 0, 0, VE, "quality"}, \
+    { "realtime",        NULL, 0, AV_OPT_TYPE_CONST, {.i64 = VPX_DL_REALTIME},     0, 0, VE, "quality"}, \
+    { "error-resilient", "Error resilience configuration", OFFSET(error_resilient), AV_OPT_TYPE_FLAGS, {.i64 = 0}, INT_MIN, INT_MAX, VE, "er"}, \
+    { "max-intra-rate",  "Maximum I-frame bitrate (pct) 0=unlimited",  OFFSET(max_intra_rate),  AV_OPT_TYPE_INT,  {.i64 = -1}, -1,      INT_MAX, VE}, \
+    { "default",         "Improve resiliency against losses of whole frames", 0, AV_OPT_TYPE_CONST, {.i64 = VPX_ERROR_RESILIENT_DEFAULT}, 0, 0, VE, "er"}, \
+    { "partitions",      "The frame partitions are independently decodable " \
+                         "by the bool decoder, meaning that partitions can be decoded even " \
+                         "though earlier partitions have been lost. Note that intra predicition" \
+                         " is still done over the partition boundary.",       0, AV_OPT_TYPE_CONST, {.i64 = VPX_ERROR_RESILIENT_PARTITIONS}, 0, 0, VE, "er"}, \
+    { "crf",              "Select the quality for constant quality mode", offsetof(VP8Context, crf), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 63, VE }, \
+
+#define LEGACY_OPTIONS \
+    {"speed", "", offsetof(VP8Context, cpu_used), AV_OPT_TYPE_INT, {.i64 = 1}, -16, 16, VE}, \
+    {"quality", "", offsetof(VP8Context, deadline), AV_OPT_TYPE_INT, {.i64 = VPX_DL_GOOD_QUALITY}, INT_MIN, INT_MAX, VE, "quality"}, \
+    {"vp8flags", "", offsetof(VP8Context, flags), FF_OPT_TYPE_FLAGS, {.i64 = 0}, 0, UINT_MAX, VE, "flags"}, \
+    {"error_resilient", "enable error resilience", 0, FF_OPT_TYPE_CONST, {.dbl = VP8F_ERROR_RESILIENT}, INT_MIN, INT_MAX, VE, "flags"}, \
+    {"altref", "enable use of alternate reference frames (VP8/2-pass only)", 0, FF_OPT_TYPE_CONST, {.dbl = VP8F_AUTO_ALT_REF}, INT_MIN, INT_MAX, VE, "flags"}, \
+    {"arnr_max_frames", "altref noise reduction max frame count", offsetof(VP8Context, arnr_max_frames), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 15, VE}, \
+    {"arnr_strength", "altref noise reduction filter strength", offsetof(VP8Context, arnr_strength), AV_OPT_TYPE_INT, {.i64 = 3}, 0, 6, VE}, \
+    {"arnr_type", "altref noise reduction filter type", offsetof(VP8Context, arnr_type), AV_OPT_TYPE_INT, {.i64 = 3}, 1, 3, VE}, \
+    {"rc_lookahead", "Number of frames to look ahead for alternate reference frame selection", offsetof(VP8Context, lag_in_frames), AV_OPT_TYPE_INT, {.i64 = 25}, 0, 25, VE}, \
+
+#if CONFIG_LIBVPX_VP8_ENCODER
+static const AVOption vp8_options[] = {
+    COMMON_OPTIONS
+    LEGACY_OPTIONS
+    { NULL }
+};
 #endif
-{"speed", "", offsetof(VP8Context, cpu_used), AV_OPT_TYPE_INT, {.i64 = 3}, -16, 16, VE},
-{"quality", "", offsetof(VP8Context, deadline), AV_OPT_TYPE_INT, {.i64 = VPX_DL_GOOD_QUALITY}, INT_MIN, INT_MAX, VE, "quality"},
-{"vp8flags", "", offsetof(VP8Context, flags), FF_OPT_TYPE_FLAGS, {.i64 = 0}, 0, UINT_MAX, VE, "flags"},
-{"error_resilient", "enable error resilience", 0, FF_OPT_TYPE_CONST, {.dbl = VP8F_ERROR_RESILIENT}, INT_MIN, INT_MAX, VE, "flags"},
-{"altref", "enable use of alternate reference frames (VP8/2-pass only)", 0, FF_OPT_TYPE_CONST, {.dbl = VP8F_AUTO_ALT_REF}, INT_MIN, INT_MAX, VE, "flags"},
-{"arnr_max_frames", "altref noise reduction max frame count", offsetof(VP8Context, arnr_max_frames), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 15, VE},
-{"arnr_strength", "altref noise reduction filter strength", offsetof(VP8Context, arnr_strength), AV_OPT_TYPE_INT, {.i64 = 3}, 0, 6, VE},
-{"arnr_type", "altref noise reduction filter type", offsetof(VP8Context, arnr_type), AV_OPT_TYPE_INT, {.i64 = 3}, 1, 3, VE},
-{"rc_lookahead", "Number of frames to look ahead for alternate reference frame selection", offsetof(VP8Context, lag_in_frames), AV_OPT_TYPE_INT, {.i64 = 25}, 0, 25, VE},
-    { "crf",              "Select the quality for constant quality mode", offsetof(VP8Context, crf), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 63, VE },
+
+#if CONFIG_LIBVPX_VP9_ENCODER
+static const AVOption vp9_options[] = {
+    COMMON_OPTIONS
+    { "lossless",        "Lossless mode",                               OFFSET(lossless),        AV_OPT_TYPE_INT, {.i64 = -1}, -1, 1, VE},
+    { "tile-columns",    "Number of tile columns to use, log2",         OFFSET(tile_columns),    AV_OPT_TYPE_INT, {.i64 = -1}, -1, 6, VE},
+    { "tile-rows",       "Number of tile rows to use, log2",            OFFSET(tile_rows),       AV_OPT_TYPE_INT, {.i64 = -1}, -1, 2, VE},
+    { "frame-parallel",  "Enable frame parallel decodability features", OFFSET(frame_parallel),  AV_OPT_TYPE_INT, {.i64 = -1}, -1, 1, VE},
+    LEGACY_OPTIONS
     { NULL }
 };
+#endif
+
+#undef COMMON_OPTIONS
+#undef LEGACY_OPTIONS
 
 static const AVCodecDefault defaults[] = {
     { "qmin",             "-1" },
@@ -773,7 +829,7 @@
 static const AVClass class_vp8 = {
     .class_name = "libvpx-vp8 encoder",
     .item_name  = av_default_item_name,
-    .option     = options,
+    .option     = vp8_options,
     .version    = LIBAVUTIL_VERSION_INT,
 };
 
@@ -802,7 +858,7 @@
 static const AVClass class_vp9 = {
     .class_name = "libvpx-vp9 encoder",
     .item_name  = av_default_item_name,
-    .option     = options,
+    .option     = vp9_options,
     .version    = LIBAVUTIL_VERSION_INT,
 };
 
@@ -815,9 +871,10 @@
     .init           = vp9_init,
     .encode2        = vp8_encode,
     .close          = vp8_free,
-    .capabilities   = CODEC_CAP_DELAY | CODEC_CAP_AUTO_THREADS | CODEC_CAP_EXPERIMENTAL,
+    .capabilities   = CODEC_CAP_DELAY | CODEC_CAP_AUTO_THREADS,
     .pix_fmts       = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE },
     .priv_class     = &class_vp9,
     .defaults       = defaults,
+    .init_static_data = ff_vp9_init_static,
 };
 #endif /* CONFIG_LIBVPX_VP9_ENCODER */

omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/libwebpenc.c Added

@@ -0,0 +1,285 @@
+/*
+ * WebP encoding support via libwebp
+ * Copyright (c) 2013 Justin Ruggles <justin.ruggles@gmail.com>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * WebP encoder using libwebp
+ */
+
+#include <webp/encode.h>
+
+#include "libavutil/common.h"
+#include "libavutil/frame.h"
+#include "libavutil/imgutils.h"
+#include "libavutil/opt.h"
+#include "avcodec.h"
+#include "internal.h"
+
+typedef struct LibWebPContext {
+    AVClass *class;         // class for AVOptions
+    float quality;          // lossy quality 0 - 100
+    int lossless;           // use lossless encoding
+    int preset;             // configuration preset
+    int chroma_warning;     // chroma linesize mismatch warning has been printed
+    int conversion_warning; // pixel format conversion warning has been printed
+    WebPConfig config;      // libwebp configuration
+} LibWebPContext;
+
+static int libwebp_error_to_averror(int err)
+{
+    switch (err) {
+    case VP8_ENC_ERROR_OUT_OF_MEMORY:
+    case VP8_ENC_ERROR_BITSTREAM_OUT_OF_MEMORY:
+        return AVERROR(ENOMEM);
+    case VP8_ENC_ERROR_NULL_PARAMETER:
+    case VP8_ENC_ERROR_INVALID_CONFIGURATION:
+    case VP8_ENC_ERROR_BAD_DIMENSION:
+        return AVERROR(EINVAL);
+    }
+    return AVERROR_UNKNOWN;
+}
+
+static av_cold int libwebp_encode_init(AVCodecContext *avctx)
+{
+    LibWebPContext *s = avctx->priv_data;
+    int ret;
+
+    if (avctx->global_quality < 0)
+        avctx->global_quality = 75 * FF_QP2LAMBDA;
+    s->quality = av_clipf(avctx->global_quality / (float)FF_QP2LAMBDA,
+                          0.0f, 100.0f);
+
+    if (avctx->compression_level < 0 || avctx->compression_level > 6) {
+        av_log(avctx, AV_LOG_WARNING, "invalid compression level: %d\n",
+               avctx->compression_level);
+        avctx->compression_level = av_clip(avctx->compression_level, 0, 6);
+    }
+
+    if (s->preset >= WEBP_PRESET_DEFAULT) {
+        ret = WebPConfigPreset(&s->config, s->preset, s->quality);
+        if (!ret)
+            return AVERROR_UNKNOWN;
+        s->lossless              = s->config.lossless;
+        s->quality               = s->config.quality;
+        avctx->compression_level = s->config.method;
+    } else {
+        ret = WebPConfigInit(&s->config);
+        if (!ret)
+            return AVERROR_UNKNOWN;
+
+        s->config.lossless = s->lossless;
+        s->config.quality  = s->quality;
+        s->config.method   = avctx->compression_level;
+
+        ret = WebPValidateConfig(&s->config);
+        if (!ret)
+            return AVERROR(EINVAL);
+    }
+
+    av_log(avctx, AV_LOG_DEBUG, "%s - quality=%.1f method=%d\n",
+           s->lossless ? "Lossless" : "Lossy", s->quality,
+           avctx->compression_level);
+
+    return 0;
+}
+
+static int libwebp_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
+                                const AVFrame *frame, int *got_packet)
+{
+    LibWebPContext *s  = avctx->priv_data;
+    AVFrame *alt_frame = NULL;
+    WebPPicture *pic = NULL;
+    WebPMemoryWriter mw = { 0 };
+    int ret;
+
+    if (avctx->width > WEBP_MAX_DIMENSION || avctx->height > WEBP_MAX_DIMENSION) {
+        av_log(avctx, AV_LOG_ERROR, "Picture size is too large. Max is %dx%d.\n",
+               WEBP_MAX_DIMENSION, WEBP_MAX_DIMENSION);
+        return AVERROR(EINVAL);
+    }
+
+    pic = av_malloc(sizeof(*pic));
+    if (!pic)
+        return AVERROR(ENOMEM);
+
+    ret = WebPPictureInit(pic);
+    if (!ret) {
+        ret = AVERROR_UNKNOWN;
+        goto end;
+    }
+    pic->width  = avctx->width;
+    pic->height = avctx->height;
+
+    if (avctx->pix_fmt == AV_PIX_FMT_RGB32) {
+        if (!s->lossless) {
+            /* libwebp will automatically convert RGB input to YUV when
+               encoding lossy. */
+            if (!s->conversion_warning) {
+                av_log(avctx, AV_LOG_WARNING,
+                       "Using libwebp for RGB-to-YUV conversion. You may want "
+                       "to consider passing in YUV instead for lossy "
+                       "encoding.\n");
+                s->conversion_warning = 1;
+            }
+        }
+        pic->use_argb    = 1;
+        pic->argb        = (uint32_t *)frame->data[0];
+        pic->argb_stride = frame->linesize[0] / 4;
+    } else {
+        if (frame->linesize[1] != frame->linesize[2]) {
+            if (!s->chroma_warning) {
+                av_log(avctx, AV_LOG_WARNING,
+                       "Copying frame due to differing chroma linesizes.\n");
+                s->chroma_warning = 1;
+            }
+            alt_frame = av_frame_alloc();
+            if (!alt_frame) {
+                ret = AVERROR(ENOMEM);
+                goto end;
+            }
+            alt_frame->width  = frame->width;
+            alt_frame->height = frame->height;
+            alt_frame->format = frame->format;
+            ret = av_frame_get_buffer(alt_frame, 32);
+            if (ret < 0)
+                goto end;
+            av_frame_copy(alt_frame, frame);
+            frame = alt_frame;
+        }
+        pic->use_argb  = 0;
+        pic->y         = frame->data[0];
+        pic->u         = frame->data[1];
+        pic->v         = frame->data[2];
+        pic->y_stride  = frame->linesize[0];
+        pic->uv_stride = frame->linesize[1];
+        if (avctx->pix_fmt == AV_PIX_FMT_YUVA420P) {
+            pic->colorspace = WEBP_YUV420A;
+            pic->a          = frame->data[3];
+            pic->a_stride   = frame->linesize[3];
+        } else {
+            pic->colorspace = WEBP_YUV420;
+        }
+
+        if (s->lossless) {
+            /* We do not have a way to automatically prioritize RGB over YUV
+               in automatic pixel format conversion based on whether we're
+               encoding lossless or lossy, so we do conversion with libwebp as
+               a convenience. */
+            if (!s->conversion_warning) {
+                av_log(avctx, AV_LOG_WARNING,
+                       "Using libwebp for YUV-to-RGB conversion. You may want "
+                       "to consider passing in RGB instead for lossless "
+                       "encoding.\n");
+                s->conversion_warning = 1;
+            }
+
+#if (WEBP_ENCODER_ABI_VERSION <= 0x201)
+            /* libwebp should do the conversion automatically, but there is a
+               bug that causes it to return an error instead, so a work-around
+               is required.
+               See https://code.google.com/p/webp/issues/detail?id=178 */
+            pic->memory_ = (void*)1;  /* something non-null */
+            ret = WebPPictureYUVAToARGB(pic);
+            if (!ret) {
+                av_log(avctx, AV_LOG_ERROR,
+                       "WebPPictureYUVAToARGB() failed with error: %d\n",
+                       pic->error_code);
+                ret = libwebp_error_to_averror(pic->error_code);
+                goto end;
+            }
+            pic->memory_ = NULL;  /* restore pointer */
+#endif
+        }
+    }
+
+    WebPMemoryWriterInit(&mw);
+    pic->custom_ptr = &mw;
+    pic->writer     = WebPMemoryWrite;
+
+    ret = WebPEncode(&s->config, pic);
+    if (!ret) {
+        av_log(avctx, AV_LOG_ERROR, "WebPEncode() failed with error: %d\n",
+               pic->error_code);
+        ret = libwebp_error_to_averror(pic->error_code);
+        goto end;
+    }
+
+    ret = ff_alloc_packet(pkt, mw.size);
+    if (ret < 0)
+        goto end;
+    memcpy(pkt->data, mw.mem, mw.size);
+
+    pkt->flags |= AV_PKT_FLAG_KEY;
+    *got_packet = 1;
+
+end:
+    free(mw.mem); /* must use free() according to libwebp documentation */
+    WebPPictureFree(pic);
+    av_freep(&pic);
+    av_frame_free(&alt_frame);
+
+    return ret;
+}
+
+#define OFFSET(x) offsetof(LibWebPContext, x)
+#define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM
+static const AVOption options[] = {
+    { "lossless",   "Use lossless mode",       OFFSET(lossless), AV_OPT_TYPE_INT,   { .i64 =  0 },  0, 1,                           VE           },
+    { "preset",     "Configuration preset",    OFFSET(preset),   AV_OPT_TYPE_INT,   { .i64 = -1 }, -1, WEBP_PRESET_TEXT,            VE, "preset" },
+    { "none",       "do not use a preset",                              0, AV_OPT_TYPE_CONST, { .i64 = -1                  }, 0, 0, VE, "preset" },
+    { "default",    "default preset",                                   0, AV_OPT_TYPE_CONST, { .i64 = WEBP_PRESET_DEFAULT }, 0, 0, VE, "preset" },
+    { "picture",    "digital picture, like portrait, inner shot",       0, AV_OPT_TYPE_CONST, { .i64 = WEBP_PRESET_PICTURE }, 0, 0, VE, "preset" },
+    { "photo",      "outdoor photograph, with natural lighting",        0, AV_OPT_TYPE_CONST, { .i64 = WEBP_PRESET_PHOTO   }, 0, 0, VE, "preset" },
+    { "drawing",    "hand or line drawing, with high-contrast details", 0, AV_OPT_TYPE_CONST, { .i64 = WEBP_PRESET_DRAWING }, 0, 0, VE, "preset" },
+    { "icon",       "small-sized colorful images",                      0, AV_OPT_TYPE_CONST, { .i64 = WEBP_PRESET_ICON    }, 0, 0, VE, "preset" },
+    { "text",       "text-like",                                        0, AV_OPT_TYPE_CONST, { .i64 = WEBP_PRESET_TEXT    }, 0, 0, VE, "preset" },
+    { NULL },
+};
+
+static const AVClass class = {
+    .class_name = "libwebp",
+    .item_name  = av_default_item_name,
+    .option     = options,
+    .version    = LIBAVUTIL_VERSION_INT,
+};
+
+static const AVCodecDefault libwebp_defaults[] = {
+    { "compression_level",  "4"  },
+    { "global_quality",     "-1" },
+    { NULL },
+};
+
+AVCodec ff_libwebp_encoder = {
+    .name           = "libwebp",
+    .long_name      = NULL_IF_CONFIG_SMALL("libwebp WebP image"),
+    .type           = AVMEDIA_TYPE_VIDEO,
+    .id             = AV_CODEC_ID_WEBP,
+    .priv_data_size = sizeof(LibWebPContext),
+    .init           = libwebp_encode_init,
+    .encode2        = libwebp_encode_frame,
+    .pix_fmts       = (const enum AVPixelFormat[]) {
+        AV_PIX_FMT_RGB32,
+        AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUVA420P,
+        AV_PIX_FMT_NONE
+    },
+    .priv_class     = &class,
+    .defaults       = libwebp_defaults,
+};

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/libx264.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/libx264.c Changed

@@ -23,6 +23,7 @@
 #include "libavutil/opt.h"
 #include "libavutil/mem.h"
 #include "libavutil/pixdesc.h"
+#include "libavutil/stereo3d.h"
 #include "avcodec.h"
 #include "internal.h"
 
@@ -44,7 +45,6 @@
     x264_picture_t  pic;
     uint8_t        *sei;
     int             sei_size;
-    AVFrame         out_pic;
     char *preset;
     char *tune;
     char *profile;
@@ -162,6 +162,7 @@
     x264_nal_t *nal;
     int nnal, i, ret;
     x264_picture_t pic_out = {0};
+    AVFrameSideData *side_data;
 
     x264_picture_init( &x4->pic );
     x4->pic.img.i_csp   = x4->params.i_csp;
@@ -191,8 +192,42 @@
             x4->params.vui.i_sar_width  = ctx->sample_aspect_ratio.num;
             x264_encoder_reconfig(x4->enc, &x4->params);
         }
-    }
 
+        side_data = av_frame_get_side_data(frame, AV_FRAME_DATA_STEREO3D);
+        if (side_data) {
+            AVStereo3D *stereo = (AVStereo3D *)side_data->data;
+            int fpa_type;
+
+            switch (stereo->type) {
+            case AV_STEREO3D_CHECKERBOARD:
+                fpa_type = 0;
+                break;
+            case AV_STEREO3D_LINES:
+                fpa_type = 1;
+                break;
+            case AV_STEREO3D_COLUMNS:
+                fpa_type = 2;
+                break;
+            case AV_STEREO3D_SIDEBYSIDE:
+                fpa_type = 3;
+                break;
+            case AV_STEREO3D_TOPBOTTOM:
+                fpa_type = 4;
+                break;
+            case AV_STEREO3D_FRAMESEQUENCE:
+                fpa_type = 5;
+                break;
+            default:
+                fpa_type = -1;
+                break;
+            }
+
+            if (fpa_type != x4->params.i_frame_packing) {
+                x4->params.i_frame_packing = fpa_type;
+                x264_encoder_reconfig(x4->enc, &x4->params);
+            }
+        }
+    }
     do {
         if (x264_encoder_encode(x4->enc, &nal, &nnal, frame? &x4->pic: NULL, &pic_out) < 0)
             return -1;
@@ -208,20 +243,20 @@
     switch (pic_out.i_type) {
     case X264_TYPE_IDR:
     case X264_TYPE_I:
-        x4->out_pic.pict_type = AV_PICTURE_TYPE_I;
+        ctx->coded_frame->pict_type = AV_PICTURE_TYPE_I;
         break;
     case X264_TYPE_P:
-        x4->out_pic.pict_type = AV_PICTURE_TYPE_P;
+        ctx->coded_frame->pict_type = AV_PICTURE_TYPE_P;
         break;
     case X264_TYPE_B:
     case X264_TYPE_BREF:
-        x4->out_pic.pict_type = AV_PICTURE_TYPE_B;
+        ctx->coded_frame->pict_type = AV_PICTURE_TYPE_B;
         break;
     }
 
     pkt->flags |= AV_PKT_FLAG_KEY*pic_out.b_keyframe;
     if (ret)
-        x4->out_pic.quality = (pic_out.i_qpplus1 - 1) * FF_QP2LAMBDA;
+        ctx->coded_frame->quality = (pic_out.i_qpplus1 - 1) * FF_QP2LAMBDA;
 
     *got_packet = ret;
     return 0;
@@ -237,6 +272,8 @@
     if (x4->enc)
         x264_encoder_close(x4->enc);
 
+    av_frame_free(&avctx->coded_frame);
+
     return 0;
 }
 
@@ -520,8 +557,10 @@
     av_reduce(&sw, &sh, avctx->sample_aspect_ratio.num, avctx->sample_aspect_ratio.den, 4096);
     x4->params.vui.i_sar_width  = sw;
     x4->params.vui.i_sar_height = sh;
-    x4->params.i_fps_num = x4->params.i_timebase_den = avctx->time_base.den;
-    x4->params.i_fps_den = x4->params.i_timebase_num = avctx->time_base.num;
+    x4->params.i_timebase_den = avctx->time_base.den;
+    x4->params.i_timebase_num = avctx->time_base.num;
+    x4->params.i_fps_num = avctx->time_base.den;
+    x4->params.i_fps_den = avctx->time_base.num * avctx->ticks_per_frame;
 
     x4->params.analyse.b_psnr = avctx->flags & CODEC_FLAG_PSNR;
 
@@ -537,7 +576,15 @@
 
     x4->params.vui.b_fullrange = avctx->pix_fmt == AV_PIX_FMT_YUVJ420P ||
                                  avctx->pix_fmt == AV_PIX_FMT_YUVJ422P ||
-                                 avctx->pix_fmt == AV_PIX_FMT_YUVJ444P;
+                                 avctx->pix_fmt == AV_PIX_FMT_YUVJ444P ||
+                                 avctx->color_range == AVCOL_RANGE_JPEG;
+
+    if (avctx->colorspace != AVCOL_SPC_UNSPECIFIED)
+        x4->params.vui.i_colmatrix = avctx->colorspace;
+    if (avctx->color_primaries != AVCOL_PRI_UNSPECIFIED)
+        x4->params.vui.i_colorprim = avctx->color_primaries;
+    if (avctx->color_trc != AVCOL_TRC_UNSPECIFIED)
+        x4->params.vui.i_transfer  = avctx->color_trc;
 
     if (avctx->flags & CODEC_FLAG_GLOBAL_HEADER)
         x4->params.b_repeat_headers = 0;
@@ -570,7 +617,9 @@
     if (!x4->enc)
         return -1;
 
-    avctx->coded_frame = &x4->out_pic;
+    avctx->coded_frame = av_frame_alloc();
+    if (!avctx->coded_frame)
+        return AVERROR(ENOMEM);
 
     if (avctx->flags & CODEC_FLAG_GLOBAL_HEADER) {
         x264_nal_t *nal;

omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/libx265.c Added

@@ -0,0 +1,335 @@
+/*
+ * libx265 encoder
+ *
+ * Copyright (c) 2013-2014 Derek Buitenhuis
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <x265.h>
+
+#include "libavutil/internal.h"
+#include "libavutil/common.h"
+#include "libavutil/opt.h"
+#include "libavutil/pixdesc.h"
+#include "avcodec.h"
+#include "internal.h"
+
+#if defined(_MSC_VER)
+#define X265_API_IMPORTS 1
+#endif
+
+typedef struct libx265Context {
+    const AVClass *class;
+
+    x265_encoder *encoder;
+    x265_param   *params;
+    uint8_t      *header;
+    int           header_size;
+
+    char *preset;
+    char *tune;
+    char *x265_opts;
+} libx265Context;
+
+static int is_keyframe(NalUnitType naltype)
+{
+    switch (naltype) {
+    case NAL_UNIT_CODED_SLICE_BLA_W_LP:
+    case NAL_UNIT_CODED_SLICE_BLA_W_RADL:
+    case NAL_UNIT_CODED_SLICE_BLA_N_LP:
+    case NAL_UNIT_CODED_SLICE_IDR_W_RADL:
+    case NAL_UNIT_CODED_SLICE_IDR_N_LP:
+    case NAL_UNIT_CODED_SLICE_CRA:
+        return 1;
+    default:
+        return 0;
+    }
+}
+
+static av_cold int libx265_encode_close(AVCodecContext *avctx)
+{
+    libx265Context *ctx = avctx->priv_data;
+
+    av_frame_free(&avctx->coded_frame);
+    av_freep(&ctx->header);
+
+    x265_param_free(ctx->params);
+
+    if (ctx->encoder)
+        x265_encoder_close(ctx->encoder);
+
+    return 0;
+}
+
+static av_cold int libx265_encode_init(AVCodecContext *avctx)
+{
+    libx265Context *ctx = avctx->priv_data;
+    x265_nal *nal;
+    uint8_t *buf;
+    int sar_num, sar_den;
+    int nnal;
+    int ret;
+    int i;
+
+    if (avctx->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL &&
+        !av_pix_fmt_desc_get(avctx->pix_fmt)->log2_chroma_w &&
+        !av_pix_fmt_desc_get(avctx->pix_fmt)->log2_chroma_h) {
+        av_log(avctx, AV_LOG_ERROR,
+               "4:4:4 support is not fully defined for HEVC yet. "
+               "Set -strict experimental to encode anyway.\n");
+        return AVERROR(ENOSYS);
+    }
+
+    avctx->coded_frame = av_frame_alloc();
+    if (!avctx->coded_frame) {
+        av_log(avctx, AV_LOG_ERROR, "Could not allocate frame.\n");
+        return AVERROR(ENOMEM);
+    }
+
+    ctx->params = x265_param_alloc();
+    if (!ctx->params) {
+        av_log(avctx, AV_LOG_ERROR, "Could not allocate x265 param structure.\n");
+        return AVERROR(ENOMEM);
+    }
+
+    if (x265_param_default_preset(ctx->params, ctx->preset, ctx->tune) < 0) {
+        av_log(avctx, AV_LOG_ERROR, "Invalid preset or tune.\n");
+        return AVERROR(EINVAL);
+    }
+
+    ctx->params->frameNumThreads = avctx->thread_count;
+    ctx->params->fpsNum          = avctx->time_base.den;
+    ctx->params->fpsDenom        = avctx->time_base.num * avctx->ticks_per_frame;
+    ctx->params->sourceWidth     = avctx->width;
+    ctx->params->sourceHeight    = avctx->height;
+
+    av_reduce(&sar_num, &sar_den,
+              avctx->sample_aspect_ratio.num,
+              avctx->sample_aspect_ratio.den, 4096);
+    ctx->params->bEnableVuiParametersPresentFlag = 1;
+    ctx->params->bEnableAspectRatioIdc           = 1;
+    ctx->params->aspectRatioIdc                  = 255;
+    ctx->params->sarWidth                        = sar_num;
+    ctx->params->sarHeight                       = sar_den;
+
+    if (x265_max_bit_depth == 8)
+        ctx->params->internalBitDepth = 8;
+    else if (x265_max_bit_depth == 12)
+        ctx->params->internalBitDepth = 10;
+
+    switch (avctx->pix_fmt) {
+    case AV_PIX_FMT_YUV420P:
+    case AV_PIX_FMT_YUV420P10:
+        ctx->params->internalCsp = X265_CSP_I420;
+        break;
+    case AV_PIX_FMT_YUV444P:
+    case AV_PIX_FMT_YUV444P10:
+        ctx->params->internalCsp = X265_CSP_I444;
+        break;
+    }
+
+    if (avctx->bit_rate > 0) {
+        ctx->params->rc.bitrate         = avctx->bit_rate / 1000;
+        ctx->params->rc.rateControlMode = X265_RC_ABR;
+    }
+
+    if (ctx->x265_opts) {
+        AVDictionary *dict    = NULL;
+        AVDictionaryEntry *en = NULL;
+
+        if (!av_dict_parse_string(&dict, ctx->x265_opts, "=", ":", 0)) {
+            while ((en = av_dict_get(dict, "", en, AV_DICT_IGNORE_SUFFIX))) {
+                int parse_ret = x265_param_parse(ctx->params, en->key, en->value);
+
+                switch (parse_ret) {
+                case X265_PARAM_BAD_NAME:
+                    av_log(avctx, AV_LOG_WARNING,
+                          "Unknown option: %s.\n", en->key);
+                    break;
+                case X265_PARAM_BAD_VALUE:
+                    av_log(avctx, AV_LOG_WARNING,
+                          "Invalid value for %s: %s.\n", en->key, en->value);
+                    break;
+                default:
+                    break;
+                }
+            }
+            av_dict_free(&dict);
+        }
+    }
+
+    ctx->encoder = x265_encoder_open(ctx->params);
+    if (!ctx->encoder) {
+        av_log(avctx, AV_LOG_ERROR, "Cannot open libx265 encoder.\n");
+        libx265_encode_close(avctx);
+        return AVERROR_INVALIDDATA;
+    }
+
+    ret = x265_encoder_headers(ctx->encoder, &nal, &nnal);
+    if (ret < 0) {
+        av_log(avctx, AV_LOG_ERROR, "Cannot encode headers.\n");
+        libx265_encode_close(avctx);
+        return AVERROR_INVALIDDATA;
+    }
+
+    for (i = 0; i < nnal; i++)
+        ctx->header_size += nal[i].sizeBytes;
+
+    ctx->header = av_malloc(ctx->header_size + FF_INPUT_BUFFER_PADDING_SIZE);
+    if (!ctx->header) {
+        av_log(avctx, AV_LOG_ERROR,
+               "Cannot allocate HEVC header of size %d.\n", ctx->header_size);
+        libx265_encode_close(avctx);
+        return AVERROR(ENOMEM);
+    }
+
+    buf = ctx->header;
+    for (i = 0; i < nnal; i++) {
+        memcpy(buf, nal[i].payload, nal[i].sizeBytes);
+        buf += nal[i].sizeBytes;
+    }
+
+    if (avctx->flags & CODEC_FLAG_GLOBAL_HEADER) {
+        avctx->extradata_size = ctx->header_size;
+        avctx->extradata = ctx->header;
+        ctx->header_size = 0;
+        ctx->header = NULL;
+    }
+
+    return 0;
+}
+
+static int libx265_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
+                                const AVFrame *pic, int *got_packet)
+{
+    libx265Context *ctx = avctx->priv_data;
+    x265_picture x265pic;
+    x265_picture x265pic_out = { { 0 } };
+    x265_nal *nal;
+    uint8_t *dst;
+    int payload = 0;
+    int nnal;
+    int ret;
+    int i;
+
+    x265_picture_init(ctx->params, &x265pic);
+
+    if (pic) {
+        for (i = 0; i < 3; i++) {
+           x265pic.planes[i] = pic->data[i];
+           x265pic.stride[i] = pic->linesize[i];
+        }
+
+        x265pic.pts      = pic->pts;
+        x265pic.bitDepth = av_pix_fmt_desc_get(avctx->pix_fmt)->comp[0].depth_minus1 + 1;
+    }
+
+    ret = x265_encoder_encode(ctx->encoder, &nal, &nnal,
+                              pic ? &x265pic : NULL, &x265pic_out);
+    if (ret < 0)
+        return AVERROR_EXTERNAL;
+
+    if (!nnal)
+        return 0;
+
+    for (i = 0; i < nnal; i++)
+        payload += nal[i].sizeBytes;
+
+    payload += ctx->header_size;
+
+    ret = ff_alloc_packet(pkt, payload);
+    if (ret < 0) {
+        av_log(avctx, AV_LOG_ERROR, "Error getting output packet.\n");
+        return ret;
+    }
+    dst = pkt->data;
+
+    if (ctx->header) {
+        memcpy(dst, ctx->header, ctx->header_size);
+        dst += ctx->header_size;
+
+        av_freep(&ctx->header);
+        ctx->header_size = 0;
+    }
+
+    for (i = 0; i < nnal; i++) {
+        memcpy(dst, nal[i].payload, nal[i].sizeBytes);
+        dst += nal[i].sizeBytes;
+
+        if (is_keyframe(nal[i].type))
+            pkt->flags |= AV_PKT_FLAG_KEY;
+    }
+
+    pkt->pts = x265pic_out.pts;
+    pkt->dts = x265pic_out.dts;
+
+    *got_packet = 1;
+    return 0;
+}
+
+static const enum AVPixelFormat x265_csp_eight[] = {
+    AV_PIX_FMT_YUV420P,
+    AV_PIX_FMT_YUV444P,
+    AV_PIX_FMT_NONE
+};
+
+static const enum AVPixelFormat x265_csp_twelve[] = {
+    AV_PIX_FMT_YUV420P,
+    AV_PIX_FMT_YUV444P,
+    AV_PIX_FMT_YUV420P10,
+    AV_PIX_FMT_YUV444P10,
+    AV_PIX_FMT_NONE
+};
+
+static av_cold void libx265_encode_init_csp(AVCodec *codec)
+{
+    if (x265_max_bit_depth == 8)
+        codec->pix_fmts = x265_csp_eight;
+    else if (x265_max_bit_depth == 12)
+        codec->pix_fmts = x265_csp_twelve;
+}
+
+#define OFFSET(x) offsetof(libx265Context, x)
+#define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM
+static const AVOption options[] = {
+    { "preset",      "set the x265 preset",                                                         OFFSET(preset),    AV_OPT_TYPE_STRING, { 0 }, 0, 0, VE },
+    { "tune",        "set the x265 tune parameter",                                                 OFFSET(tune),      AV_OPT_TYPE_STRING, { 0 }, 0, 0, VE },
+    { "x265-params", "set the x265 configuration using a :-separated list of key=value parameters", OFFSET(x265_opts), AV_OPT_TYPE_STRING, { 0 }, 0, 0, VE },
+    { NULL }
+};
+
+static const AVClass class = {
+    .class_name = "libx265",
+    .item_name  = av_default_item_name,
+    .option     = options,
+    .version    = LIBAVUTIL_VERSION_INT,
+};
+
+AVCodec ff_libx265_encoder = {
+    .name             = "libx265",
+    .long_name        = NULL_IF_CONFIG_SMALL("libx265 H.265 / HEVC"),
+    .type             = AVMEDIA_TYPE_VIDEO,
+    .id               = AV_CODEC_ID_HEVC,
+    .init             = libx265_encode_init,
+    .init_static_data = libx265_encode_init_csp,
+    .encode2          = libx265_encode_frame,
+    .close            = libx265_encode_close,
+    .priv_data_size   = sizeof(libx265Context),
+    .priv_class       = &class,
+    .capabilities     = CODEC_CAP_DELAY | CODEC_CAP_AUTO_THREADS,
+};

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/libxavs.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/libxavs.c Changed

@@ -45,7 +45,6 @@
     xavs_picture_t  pic;
     uint8_t        *sei;
     int             sei_size;
-    AVFrame         out_pic;
     int             end_of_stream;
     float crf;
     int cqp;
@@ -111,10 +110,10 @@
     return 1;
 }
 
-static int XAVS_frame(AVCodecContext *ctx, AVPacket *pkt,
+static int XAVS_frame(AVCodecContext *avctx, AVPacket *pkt,
                       const AVFrame *frame, int *got_packet)
 {
-    XavsContext *x4 = ctx->priv_data;
+    XavsContext *x4 = avctx->priv_data;
     xavs_nal_t *nal;
     int nnal, i, ret;
     xavs_picture_t pic_out;
@@ -130,67 +129,67 @@
 
         x4->pic.i_pts  = frame->pts;
         x4->pic.i_type = XAVS_TYPE_AUTO;
-        x4->pts_buffer[ctx->frame_number % (ctx->max_b_frames+1)] = frame->pts;
+        x4->pts_buffer[avctx->frame_number % (avctx->max_b_frames+1)] = frame->pts;
     }
 
     if (xavs_encoder_encode(x4->enc, &nal, &nnal,
                             frame? &x4->pic: NULL, &pic_out) < 0)
     return -1;
 
-    ret = encode_nals(ctx, pkt, nal, nnal);
+    ret = encode_nals(avctx, pkt, nal, nnal);
 
     if (ret < 0)
         return -1;
 
     if (!ret) {
         if (!frame && !(x4->end_of_stream)) {
-            if ((ret = ff_alloc_packet2(ctx, pkt, 4)) < 0)
+            if ((ret = ff_alloc_packet2(avctx, pkt, 4)) < 0)
                 return ret;
 
             pkt->data[0] = 0x0;
             pkt->data[1] = 0x0;
             pkt->data[2] = 0x01;
             pkt->data[3] = 0xb1;
-            pkt->dts = 2*x4->pts_buffer[(x4->out_frame_count-1)%(ctx->max_b_frames+1)] -
-                       x4->pts_buffer[(x4->out_frame_count-2)%(ctx->max_b_frames+1)];
+            pkt->dts = 2*x4->pts_buffer[(x4->out_frame_count-1)%(avctx->max_b_frames+1)] -
+                         x4->pts_buffer[(x4->out_frame_count-2)%(avctx->max_b_frames+1)];
             x4->end_of_stream = END_OF_STREAM;
             *got_packet = 1;
         }
         return 0;
     }
 
-    x4->out_pic.pts = pic_out.i_pts;
+    avctx->coded_frame->pts = pic_out.i_pts;
     pkt->pts = pic_out.i_pts;
-    if (ctx->has_b_frames) {
+    if (avctx->has_b_frames) {
         if (!x4->out_frame_count)
             pkt->dts = pkt->pts - (x4->pts_buffer[1] - x4->pts_buffer[0]);
         else
-            pkt->dts = x4->pts_buffer[(x4->out_frame_count-1)%(ctx->max_b_frames+1)];
+            pkt->dts = x4->pts_buffer[(x4->out_frame_count-1)%(avctx->max_b_frames+1)];
     } else
         pkt->dts = pkt->pts;
 
     switch (pic_out.i_type) {
     case XAVS_TYPE_IDR:
     case XAVS_TYPE_I:
-        x4->out_pic.pict_type = AV_PICTURE_TYPE_I;
+        avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I;
         break;
     case XAVS_TYPE_P:
-        x4->out_pic.pict_type = AV_PICTURE_TYPE_P;
+        avctx->coded_frame->pict_type = AV_PICTURE_TYPE_P;
         break;
     case XAVS_TYPE_B:
     case XAVS_TYPE_BREF:
-        x4->out_pic.pict_type = AV_PICTURE_TYPE_B;
+        avctx->coded_frame->pict_type = AV_PICTURE_TYPE_B;
         break;
     }
 
     /* There is no IDR frame in AVS JiZhun */
     /* Sequence header is used as a flag */
     if (pic_out.i_type == XAVS_TYPE_I) {
-        x4->out_pic.key_frame = 1;
+        avctx->coded_frame->key_frame = 1;
         pkt->flags |= AV_PKT_FLAG_KEY;
     }
 
-    x4->out_pic.quality   = (pic_out.i_qpplus1 - 1) * FF_QP2LAMBDA;
+    avctx->coded_frame->quality = (pic_out.i_qpplus1 - 1) * FF_QP2LAMBDA;
 
     x4->out_frame_count++;
     *got_packet = ret;
@@ -208,6 +207,8 @@
     if (x4->enc)
         xavs_encoder_close(x4->enc);
 
+    av_frame_free(&avctx->coded_frame);
+
     return 0;
 }
 
@@ -355,7 +356,10 @@
     if (!(x4->pts_buffer = av_mallocz((avctx->max_b_frames+1) * sizeof(*x4->pts_buffer))))
         return AVERROR(ENOMEM);
 
-    avctx->coded_frame = &x4->out_pic;
+    avctx->coded_frame = av_frame_alloc();
+    if (!avctx->coded_frame)
+        return AVERROR(ENOMEM);
+
     /* TAG: Do we have GLOBAL HEADER in AVS */
     /* We Have PPS and SPS in AVS */
     if (avctx->flags & CODEC_FLAG_GLOBAL_HEADER) {

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/libxvid.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/libxvid.c Changed

@@ -48,6 +48,7 @@
  * This stores all the private context for the codec.
  */
 struct xvid_context {
+    AVClass *class;
     void *encoder_handle;          /**< Handle for Xvid encoder */
     int xsize;                     /**< Frame x size */
     int ysize;                     /**< Frame y size */
@@ -56,7 +57,6 @@
     int me_flags;                  /**< Motion Estimation flags */
     int qscale;                    /**< Do we use constant scale? */
     int quicktime_format;          /**< Are we in a QT-based format? */
-    AVFrame encoded_picture;       /**< Encoded frame information */
     char *twopassbuffer;           /**< Character buffer for two-pass */
     char *old_twopassbuffer;       /**< Old character buffer (two-pass) */
     char *twopassfile;             /**< second pass temp file name */
@@ -651,7 +651,9 @@
     }
 
     x->encoder_handle = xvid_enc_create.handle;
-    avctx->coded_frame = &x->encoded_picture;
+    avctx->coded_frame = av_frame_alloc();
+    if (!avctx->coded_frame)
+        return AVERROR(ENOMEM);
 
     return 0;
 fail:
@@ -665,7 +667,7 @@
     int xerr, i, ret, user_packet = !!pkt->data;
     char *tmp;
     struct xvid_context *x = avctx->priv_data;
-    AVFrame *p = &x->encoded_picture;
+    AVFrame *p = avctx->coded_frame;
     int mb_width   = (avctx->width  + 15) / 16;
     int mb_height  = (avctx->height + 15) / 16;
 
@@ -678,7 +680,6 @@
     /* Start setting up the frame */
     xvid_enc_frame.version = XVID_VERSION;
     xvid_enc_stats.version = XVID_VERSION;
-    *p = *picture;
 
     /* Let Xvid know where to put the frame. */
     xvid_enc_frame.bitstream = pkt->data;

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/libzvbi-teletextdec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/libzvbi-teletextdec.c Changed

@@ -15,11 +15,13 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include "avcodec.h"
+#include "libavcodec/ass.h"
 #include "libavutil/opt.h"
+#include "libavutil/bprint.h"
 #include "libavutil/intreadwrite.h"
 
 #include <libzvbi.h>
@@ -31,37 +33,45 @@
 #define VBI_G(rgba)   (((rgba) >> 8) & 0xFF)
 #define VBI_B(rgba)   (((rgba) >> 16) & 0xFF)
 #define VBI_A(rgba)   (((rgba) >> 24) & 0xFF)
+#define MAX_BUFFERED_PAGES 25
+#define BITMAP_CHAR_WIDTH  12
+#define BITMAP_CHAR_HEIGHT 10
+
+typedef struct TeletextPage
+{
+    AVSubtitleRect *sub_rect;
+    int pgno;
+    int subno;
+    int64_t pts;
+} TeletextPage;
 
-/* main data structure */
 typedef struct TeletextContext
 {
     AVClass        *class;
     char           *pgno;
     int             x_offset;
     int             y_offset;
-    char           *format;
-    int             format_id; /* 0 = bitmap, 1 = text */
+    int             format_id; /* 0 = bitmap, 1 = text/ass */
     int             chop_top;
     int             sub_duration; /* in msec */
     int             transparent_bg;
     int             chop_spaces;
 
     int             lines_processed;
-    AVSubtitleRect *sub_rect;
+    TeletextPage    *pages;
+    int             nb_pages;
+    int64_t         pts;
+    int             handler_ret;
 
     vbi_decoder *   vbi;
     vbi_dvb_demux * dx;
 #ifdef DEBUG
     vbi_export *    ex;
 #endif
-    /* Don't even _think_ about making sliced stack-local! */
     vbi_sliced      sliced[64];
 } TeletextContext;
 
-/************************************************************************/
-
-static int
-chop_spaces_utf8(const unsigned char* t, int len)
+static int chop_spaces_utf8(const unsigned char* t, int len)
 {
     t += len;
     while (len > 0) {
@@ -72,14 +82,51 @@
     return len;
 }
 
-// draw a page as text
-static int
-gen_sub_text(TeletextContext *ctx, vbi_page *page, int chop_top)
+static void subtitle_rect_free(AVSubtitleRect **sub_rect)
+{
+    av_freep(&(*sub_rect)->pict.data[0]);
+    av_freep(&(*sub_rect)->pict.data[1]);
+    av_freep(&(*sub_rect)->ass);
+    av_freep(sub_rect);
+}
+
+static int create_ass_text(TeletextContext *ctx, const char *text, char **ass)
+{
+    int ret;
+    AVBPrint buf, buf2;
+    const int ts_start    = av_rescale_q(ctx->pts,          AV_TIME_BASE_Q,        (AVRational){1, 100});
+    const int ts_duration = av_rescale_q(ctx->sub_duration, (AVRational){1, 1000}, (AVRational){1, 100});
+
+    /* First we escape the plain text into buf. */
+    av_bprint_init(&buf, 0, AV_BPRINT_SIZE_UNLIMITED);
+    ff_ass_bprint_text_event(&buf, text, strlen(text), "", 0);
+
+    if (!av_bprint_is_complete(&buf)) {
+        av_bprint_finalize(&buf, NULL);
+        return AVERROR(ENOMEM);
+    }
+
+    /* Then we create the ass dialog line in buf2 from the escaped text in buf. */
+    av_bprint_init(&buf2, 0, AV_BPRINT_SIZE_UNLIMITED);
+    ff_ass_bprint_dialog(&buf2, buf.str, ts_start, ts_duration, 0);
+    av_bprint_finalize(&buf, NULL);
+
+    if (!av_bprint_is_complete(&buf2)) {
+        av_bprint_finalize(&buf2, NULL);
+        return AVERROR(ENOMEM);
+    }
+
+    if ((ret = av_bprint_finalize(&buf2, ass)) < 0)
+        return ret;
+
+    return 0;
+}
+
+/* Draw a page as text */
+static int gen_sub_text(TeletextContext *ctx, AVSubtitleRect *sub_rect, vbi_page *page, int chop_top)
 {
-    AVSubtitleRect *sub_rect = ctx->sub_rect;
-    char *text;
     const char *in;
-    char *out;
+    AVBPrint buf;
     char *vbi_text = av_malloc(TEXT_MAXSZ);
     int sz;
 
@@ -97,11 +144,8 @@
     }
     vbi_text[sz] = '\0';
     in  = vbi_text;
-    out = text = av_malloc(TEXT_MAXSZ);
-    if (!text) {
-        av_free(vbi_text);
-        return AVERROR(ENOMEM);
-    }
+    av_bprint_init(&buf, 0, TEXT_MAXSZ);
+
     if (ctx->chop_spaces) {
         for (;;) {
             int nl, sz;
@@ -116,45 +160,50 @@
                 break;
             // skip trailing spaces
             sz = chop_spaces_utf8(in, nl);
-            memcpy(out, in, sz);
-            out += sz;
-            *out++ = '\n';
+            av_bprint_append_data(&buf, in, sz);
+            av_bprintf(&buf, "\n");
             in += nl;
         }
     } else {
-        strcpy(text, vbi_text);
-        out += sz;
-        *out++ = '\n';
+        av_bprintf(&buf, "%s\n", vbi_text);
     }
     av_free(vbi_text);
-    *out = '\0';
-    if (out > text) {
-        sub_rect->type = SUBTITLE_TEXT;
-        sub_rect->text = text;
-        av_log(ctx, AV_LOG_DEBUG, "subtext:%s:txetbus\n", text);
+
+    if (!av_bprint_is_complete(&buf)) {
+        av_bprint_finalize(&buf, NULL);
+        return AVERROR(ENOMEM);
+    }
+
+    if (buf.len) {
+        int ret;
+        sub_rect->type = SUBTITLE_ASS;
+        if ((ret = create_ass_text(ctx, buf.str, &sub_rect->ass)) < 0) {
+            av_bprint_finalize(&buf, NULL);
+            return ret;
+        }
+        av_log(ctx, AV_LOG_DEBUG, "subtext:%s:txetbus\n", sub_rect->ass);
     } else {
         sub_rect->type = SUBTITLE_NONE;
-        av_free(text);
     }
+    av_bprint_finalize(&buf, NULL);
     return 0;
 }
 
-static void
-fix_transparency(TeletextContext *ctx, vbi_page *page, int chop_top, uint8_t transparent_color, int resx, int resy)
+static void fix_transparency(TeletextContext *ctx, AVSubtitleRect *sub_rect, vbi_page *page,
+                             int chop_top, uint8_t transparent_color, int resx, int resy)
 {
-    AVSubtitleRect *sub_rect = ctx->sub_rect;
     int iy;
 
     // Hack for transparency, inspired by VLC code...
     for (iy = 0; iy < resy; iy++) {
         uint8_t *pixel = sub_rect->pict.data[0] + iy * sub_rect->pict.linesize[0];
-        vbi_char *vc = page->text + (iy / 10 + chop_top) * page->columns;
+        vbi_char *vc = page->text + (iy / BITMAP_CHAR_HEIGHT + chop_top) * page->columns;
         vbi_char *vcnext = vc + page->columns;
         for (; vc < vcnext; vc++) {
-            uint8_t *pixelnext = pixel + 12;
+            uint8_t *pixelnext = pixel + BITMAP_CHAR_WIDTH;
             switch (vc->opacity) {
                 case VBI_TRANSPARENT_SPACE:
-                    memset(pixel, transparent_color, 12);
+                    memset(pixel, transparent_color, BITMAP_CHAR_WIDTH);
                     break;
                 case VBI_OPAQUE:
                 case VBI_SEMI_TRANSPARENT:
@@ -171,13 +220,11 @@
     }
 }
 
-// draw a page as bitmap
-static int
-gen_sub_bitmap(TeletextContext *ctx, vbi_page *page, int chop_top)
+/* Draw a page as bitmap */
+static int gen_sub_bitmap(TeletextContext *ctx, AVSubtitleRect *sub_rect, vbi_page *page, int chop_top)
 {
-    AVSubtitleRect *sub_rect = ctx->sub_rect;
-    int resx = page->columns * 12;
-    int resy = (page->rows - chop_top) * 10;
+    int resx = page->columns * BITMAP_CHAR_WIDTH;
+    int resy = (page->rows - chop_top) * BITMAP_CHAR_HEIGHT;
     uint8_t ci, cmax = 0;
     int ret;
     vbi_char *vc = page->text + (chop_top * page->columns);
@@ -206,9 +253,9 @@
                             0, chop_top, page->columns, page->rows - chop_top,
                             /*reveal*/ 1, /*flash*/ 1);
 
-    fix_transparency(ctx, page, chop_top, cmax, resx, resy);
+    fix_transparency(ctx, sub_rect, page, chop_top, cmax, resx, resy);
     sub_rect->x = ctx->x_offset;
-    sub_rect->y = ctx->y_offset;
+    sub_rect->y = ctx->y_offset + chop_top * BITMAP_CHAR_HEIGHT;
     sub_rect->w = resx;
     sub_rect->h = resy;
     sub_rect->nb_colors = (int)cmax + 1;
@@ -235,10 +282,10 @@
     return 0;
 }
 
-static void
-handler(vbi_event *ev, void *user_data)
+static void handler(vbi_event *ev, void *user_data)
 {
     TeletextContext *ctx = user_data;
+    TeletextPage *new_pages;
     vbi_page page;
     int res;
     char pgno_str[12];
@@ -253,8 +300,9 @@
 
     if (strcmp(ctx->pgno, "*") && !strstr(ctx->pgno, pgno_str))
         return;
+    if (ctx->handler_ret < 0)
+        return;
 
-    /* Fetch the page.  */
     res = vbi_fetch_vt_page(ctx->vbi, &page,
                             ev->ev.ttx_page.pgno,
                             ev->ev.ttx_page.subno,
@@ -279,35 +327,49 @@
     av_log(ctx, AV_LOG_DEBUG, "%d x %d page chop:%d\n",
            page.columns, page.rows, chop_top);
 
-    if (!ctx->sub_rect) {
-        ctx->sub_rect = av_mallocz(sizeof(*ctx->sub_rect));
-        if (ctx->sub_rect) {
-            res = (ctx->format_id == 0) ?
-                gen_sub_bitmap(ctx, &page, chop_top) :
-                gen_sub_text  (ctx, &page, chop_top);
-            if (res)
-                av_freep(&ctx->sub_rect);
+    if (ctx->nb_pages < MAX_BUFFERED_PAGES) {
+        if ((new_pages = av_realloc_array(ctx->pages, ctx->nb_pages + 1, sizeof(TeletextPage)))) {
+            TeletextPage *cur_page = new_pages + ctx->nb_pages;
+            ctx->pages = new_pages;
+            cur_page->sub_rect = av_mallocz(sizeof(*cur_page->sub_rect));
+            cur_page->pts = ctx->pts;
+            cur_page->pgno = ev->ev.ttx_page.pgno;
+            cur_page->subno = ev->ev.ttx_page.subno;
+            if (cur_page->sub_rect) {
+                res = (ctx->format_id == 0) ?
+                    gen_sub_bitmap(ctx, cur_page->sub_rect, &page, chop_top) :
+                    gen_sub_text  (ctx, cur_page->sub_rect, &page, chop_top);
+                if (res < 0) {
+                    av_freep(&cur_page->sub_rect);
+                    ctx->handler_ret = res;
+                } else {
+                    ctx->pages[ctx->nb_pages++] = *cur_page;
+                }
+            } else {
+                ctx->handler_ret = AVERROR(ENOMEM);
+            }
+        } else {
+            ctx->handler_ret = AVERROR(ENOMEM);
         }
     } else {
-        // FIXME: Multiple teletext pages in a single packet, some kind of buffering should be done instead of dropping the page...
-        av_log(ctx, AV_LOG_WARNING, "Missed page %s.%02x.\n", pgno_str, ev->ev.ttx_page.subno & 0xFF);
+        //TODO: If multiple packets contain more than one page, pages may got queued up, and this may happen...
+        av_log(ctx, AV_LOG_ERROR, "Buffered too many pages, dropping page %s.\n", pgno_str);
+        ctx->handler_ret = AVERROR(ENOSYS);
     }
 
     vbi_unref_page(&page);
 }
 
-static int
-teletext_decode_frame(AVCodecContext *avctx,
-                      void *data, int *data_size,
-                      AVPacket *pkt)
+static int teletext_decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPacket *pkt)
 {
     TeletextContext *ctx = avctx->priv_data;
     AVSubtitle      *sub = data;
     const uint8_t   *buf = pkt->data;
-    unsigned int    left = pkt->size;
+    int             left = pkt->size;
     uint8_t         pesheader[45] = {0x00, 0x00, 0x01, 0xbd, 0x00, 0x00, 0x85, 0x80, 0x24, 0x21, 0x00, 0x01, 0x00, 0x01};
     int             pesheader_size = sizeof(pesheader);
     const uint8_t   *pesheader_buf = pesheader;
+    int             ret = 0;
 
     if (!ctx->vbi) {
         if (!(ctx->vbi = vbi_decoder_new()))
@@ -321,64 +383,84 @@
     if (!ctx->dx && (!(ctx->dx = vbi_dvb_pes_demux_new (/* callback */ NULL, NULL))))
         return AVERROR(ENOMEM);
 
-    // We allow unreasonably big packets, even if the standard only allows a max size of 1472
-    if ((pesheader_size + left) < 184 || (pesheader_size + left) > 65504 || (pesheader_size + left) % 184 != 0)
-        return AVERROR_INVALIDDATA;
+    if (avctx->pkt_timebase.den && pkt->pts != AV_NOPTS_VALUE)
+        ctx->pts = av_rescale_q(pkt->pts, avctx->pkt_timebase, AV_TIME_BASE_Q);
 
-    memset(pesheader + 14, 0xff, pesheader_size - 14);
-    AV_WB16(pesheader + 4, left + pesheader_size - 6);
+    if (left) {
+        // We allow unreasonably big packets, even if the standard only allows a max size of 1472
+        if ((pesheader_size + left) < 184 || (pesheader_size + left) > 65504 || (pesheader_size + left) % 184 != 0)
+            return AVERROR_INVALIDDATA;
 
-    /* PTS is deliberately left as 0 in the PES header, otherwise libzvbi uses
-     * it to detect dropped frames. Unforunatey the guessed packet PTS values
-     * (see mpegts demuxer) are not accurate enough to pass that test. */
-    vbi_dvb_demux_cor(ctx->dx, ctx->sliced, 64, NULL, &pesheader_buf, &pesheader_size);
+        memset(pesheader + 14, 0xff, pesheader_size - 14);
+        AV_WB16(pesheader + 4, left + pesheader_size - 6);
 
-    while (left > 0) {
-        int64_t pts = 0;
-        unsigned int lines = vbi_dvb_demux_cor(ctx->dx, ctx->sliced, 64, &pts, &buf, &left);
+        /* PTS is deliberately left as 0 in the PES header, otherwise libzvbi uses
+         * it to detect dropped frames. Unforunatey the guessed packet PTS values
+         * (see mpegts demuxer) are not accurate enough to pass that test. */
+        vbi_dvb_demux_cor(ctx->dx, ctx->sliced, 64, NULL, &pesheader_buf, &pesheader_size);
+
+        ctx->handler_ret = pkt->size;
+
+        while (left > 0) {
+            int64_t pts = 0;
+            unsigned int lines = vbi_dvb_demux_cor(ctx->dx, ctx->sliced, 64, &pts, &buf, &left);
 #ifdef DEBUG
-        av_log(avctx, AV_LOG_DEBUG,
-               "ctx=%p buf_size=%d left=%u lines=%u pts=%f pkt_pts=%f\n",
-               ctx, pkt->size, left, lines, (double)pts/90000.0, (double)pkt->pts/90000.0);
+            av_log(avctx, AV_LOG_DEBUG,
+                   "ctx=%p buf_size=%d left=%u lines=%u pts=%f pkt_pts=%f\n",
+                   ctx, pkt->size, left, lines, (double)pts/90000.0, (double)pkt->pts/90000.0);
 #endif
-        if (lines > 0) {
+            if (lines > 0) {
 #ifdef DEBUGx
-            int i;
-            for(i=0; i<lines; ++i)
-                av_log(avctx, AV_LOG_DEBUG,
-                       "lines=%d id=%x\n", i, ctx->sliced[i].id);
+                int i;
+                for(i=0; i<lines; ++i)
+                    av_log(avctx, AV_LOG_DEBUG,
+                           "lines=%d id=%x\n", i, ctx->sliced[i].id);
 #endif
-            vbi_decode(ctx->vbi, ctx->sliced, lines, (double)pts/90000.0);
-            ctx->lines_processed += lines;
+                vbi_decode(ctx->vbi, ctx->sliced, lines, (double)pts/90000.0);
+                ctx->lines_processed += lines;
+            }
         }
+        ctx->pts = AV_NOPTS_VALUE;
+        ret = ctx->handler_ret;
     }
 
+    if (ret < 0)
+        return ret;
+
     // is there a subtitle to pass?
-    if (ctx->sub_rect) {
-        sub->format = (ctx->sub_rect->type == SUBTITLE_TEXT ? 1: 0);
+    if (ctx->nb_pages) {
+        int i;
+        sub->format = ctx->format_id;
         sub->start_display_time = 0;
         sub->end_display_time = ctx->sub_duration;
         sub->num_rects = 0;
+        sub->pts = ctx->pages->pts;
 
-        if (ctx->sub_rect->type != SUBTITLE_NONE) {
+        if (ctx->pages->sub_rect->type != SUBTITLE_NONE) {
             sub->rects = av_malloc(sizeof(*sub->rects) * 1);
             if (sub->rects) {
                 sub->num_rects = 1;
-                sub->rects[0] = ctx->sub_rect;
+                sub->rects[0] = ctx->pages->sub_rect;
+            } else {
+                ret = AVERROR(ENOMEM);
             }
         } else {
             av_log(avctx, AV_LOG_DEBUG, "sending empty sub\n");
             sub->rects = NULL;
         }
         if (!sub->rects) // no rect was passed
-            av_free(ctx->sub_rect);
-        ctx->sub_rect = NULL;
+            subtitle_rect_free(&ctx->pages->sub_rect);
+
+        for (i = 0; i < ctx->nb_pages - 1; i++)
+            ctx->pages[i] = ctx->pages[i + 1];
+        ctx->nb_pages--;
 
-        *data_size = 1;
+        if (ret >= 0)
+            *data_size = 1;
     } else
         *data_size = 0;
 
-    return pkt->size;
+    return ret;
 }
 
 static int teletext_init_decoder(AVCodecContext *avctx)
@@ -392,17 +474,14 @@
         return AVERROR_EXTERNAL;
     }
 
+    if (ctx->format_id == 0) {
+        avctx->width  = 41 * BITMAP_CHAR_WIDTH;
+        avctx->height = 25 * BITMAP_CHAR_HEIGHT;
+    }
+
     ctx->dx = NULL;
     ctx->vbi = NULL;
-    ctx->sub_rect = NULL;
-    if (!strcmp(ctx->format, "bitmap")) {
-        ctx->format_id = 0;
-    } else if (!strcmp(ctx->format, "text")) {
-        ctx->format_id = 1;
-    } else {
-        av_log(avctx, AV_LOG_ERROR, "unkown format %s\n", ctx->format);
-        return AVERROR_OPTION_NOT_FOUND;
-    }
+    ctx->pts = AV_NOPTS_VALUE;
 
 #ifdef DEBUG
     {
@@ -411,7 +490,7 @@
     }
 #endif
     av_log(avctx, AV_LOG_VERBOSE, "page filter: %s\n", ctx->pgno);
-    return 0;
+    return (ctx->format_id == 1) ? ff_ass_subtitle_header_default(avctx) : 0;
 }
 
 static int teletext_close_decoder(AVCodecContext *avctx)
@@ -421,11 +500,15 @@
 #ifdef DEBUG
     av_log(avctx, AV_LOG_DEBUG, "lines_total=%u\n", ctx->lines_processed);
 #endif
+    while (ctx->nb_pages)
+        subtitle_rect_free(&ctx->pages[--ctx->nb_pages].sub_rect);
+    av_freep(&ctx->pages);
 
     vbi_dvb_demux_delete(ctx->dx);
     vbi_decoder_delete(ctx->vbi);
     ctx->dx = NULL;
     ctx->vbi = NULL;
+    ctx->pts = AV_NOPTS_VALUE;
     return 0;
 }
 
@@ -439,7 +522,9 @@
 static const AVOption options[] = {
     {"txt_page",        "list of teletext page numbers to decode, * is all", OFFSET(pgno),           AV_OPT_TYPE_STRING, {.str = "*"},      0, 0,        SD},
     {"txt_chop_top",    "discards the top teletext line",                    OFFSET(chop_top),       AV_OPT_TYPE_INT,    {.i64 = 1},        0, 1,        SD},
-    {"txt_format",      "format of the subtitles (bitmap or text)",          OFFSET(format),         AV_OPT_TYPE_STRING, {.str = "bitmap"}, 0, 0,        SD},
+    {"txt_format",      "format of the subtitles (bitmap or text)",          OFFSET(format_id),      AV_OPT_TYPE_INT,    {.i64 = 0},        0, 1,        SD,  "txt_format"},
+    {"bitmap",          NULL,                                                0,                      AV_OPT_TYPE_CONST,  {.i64 = 0},        0, 0,        SD,  "txt_format"},
+    {"text",            NULL,                                                0,                      AV_OPT_TYPE_CONST,  {.i64 = 1},        0, 0,        SD,  "txt_format"},
     {"txt_left",        "x offset of generated bitmaps",                     OFFSET(x_offset),       AV_OPT_TYPE_INT,    {.i64 = 0},        0, 65535,    SD},
     {"txt_top",         "y offset of generated bitmaps",                     OFFSET(y_offset),       AV_OPT_TYPE_INT,    {.i64 = 0},        0, 65535,    SD},
     {"txt_chop_spaces", "chops leading and trailing spaces from text",       OFFSET(chop_spaces),    AV_OPT_TYPE_INT,    {.i64 = 1},        0, 1,        SD},
@@ -459,11 +544,12 @@
     .name      = "libzvbi_teletextdec",
     .long_name = NULL_IF_CONFIG_SMALL("Libzvbi DVB teletext decoder"),
     .type      = AVMEDIA_TYPE_SUBTITLE,
-    .id        = CODEC_ID_DVB_TELETEXT,
+    .id        = AV_CODEC_ID_DVB_TELETEXT,
     .priv_data_size = sizeof(TeletextContext),
     .init      = teletext_init_decoder,
     .close     = teletext_close_decoder,
     .decode    = teletext_decode_frame,
+    .capabilities = CODEC_CAP_DELAY,
     .flush     = teletext_flush,
     .priv_class= &teletext_class,
 };

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/ljpegenc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/ljpegenc.c Changed

@@ -30,207 +30,297 @@
  * lossless JPEG encoder.
  */
 
+#include "libavutil/frame.h"
+#include "libavutil/mem.h"
+#include "libavutil/pixdesc.h"
+
 #include "avcodec.h"
+#include "dsputil.h"
 #include "internal.h"
 #include "mpegvideo.h"
 #include "mjpeg.h"
 #include "mjpegenc.h"
 
+typedef struct LJpegEncContext {
+    DSPContext dsp;
+    ScanTable scantable;
+    uint16_t matrix[64];
 
-static int encode_picture_lossless(AVCodecContext *avctx, AVPacket *pkt,
-                                   const AVFrame *pict, int *got_packet)
-{
-    MpegEncContext * const s = avctx->priv_data;
-    MJpegContext * const m = s->mjpeg_ctx;
-    const int width= s->width;
-    const int height= s->height;
-    AVFrame * const p = &s->current_picture.f;
-    const int predictor= avctx->prediction_method+1;
-    const int mb_width  = (width  + s->mjpeg_hsample[0] - 1) / s->mjpeg_hsample[0];
-    const int mb_height = (height + s->mjpeg_vsample[0] - 1) / s->mjpeg_vsample[0];
-    int ret, max_pkt_size = FF_MIN_BUFFER_SIZE;
-
-    if (avctx->pix_fmt == AV_PIX_FMT_BGRA)
-        max_pkt_size += width * height * 3 * 4;
-    else {
-        max_pkt_size += mb_width * mb_height * 3 * 4
-                        * s->mjpeg_hsample[0] * s->mjpeg_vsample[0];
-    }
+    int vsample[3];
+    int hsample[3];
 
-    if (!s->edge_emu_buffer &&
-        (ret = ff_mpv_frame_size_alloc(s, pict->linesize[0])) < 0) {
-        av_log(avctx, AV_LOG_ERROR, "failed to allocate context scratch buffers.\n");
-        return ret;
-    }
+    uint16_t huff_code_dc_luminance[12];
+    uint16_t huff_code_dc_chrominance[12];
+    uint8_t  huff_size_dc_luminance[12];
+    uint8_t  huff_size_dc_chrominance[12];
 
-    if ((ret = ff_alloc_packet2(avctx, pkt, max_pkt_size)) < 0)
-        return ret;
+    uint16_t (*scratch)[4];
+} LJpegEncContext;
 
-    init_put_bits(&s->pb, pkt->data, pkt->size);
+static int ljpeg_encode_bgr(AVCodecContext *avctx, PutBitContext *pb,
+                            const AVFrame *frame)
+{
+    LJpegEncContext *s    = avctx->priv_data;
+    const int width       = frame->width;
+    const int height      = frame->height;
+    const int linesize    = frame->linesize[0];
+    uint16_t (*buffer)[4] = s->scratch;
+    const int predictor   = avctx->prediction_method+1;
+    int left[3], top[3], topleft[3];
+    int x, y, i;
+
+    for (i = 0; i < 3; i++)
+        buffer[0][i] = 1 << (9 - 1);
+
+    for (y = 0; y < height; y++) {
+        const int modified_predictor = y ? predictor : 1;
+        uint8_t *ptr = frame->data[0] + (linesize * y);
+
+        if (pb->buf_end - pb->buf - (put_bits_count(pb) >> 3) < width * 3 * 4) {
+            av_log(avctx, AV_LOG_ERROR, "encoded frame too large\n");
+            return -1;
+        }
 
-    av_frame_unref(p);
-    ret = av_frame_ref(p, pict);
-    if (ret < 0)
-        return ret;
-    p->pict_type= AV_PICTURE_TYPE_I;
-    p->key_frame= 1;
+        for (i = 0; i < 3; i++)
+            top[i]= left[i]= topleft[i]= buffer[0][i];
+
+        for (x = 0; x < width; x++) {
+            if(avctx->pix_fmt == AV_PIX_FMT_BGR24){
+                buffer[x][1] =  ptr[3 * x + 0] -     ptr[3 * x + 1] + 0x100;
+                buffer[x][2] =  ptr[3 * x + 2] -     ptr[3 * x + 1] + 0x100;
+                buffer[x][0] = (ptr[3 * x + 0] + 2 * ptr[3 * x + 1] + ptr[3 * x + 2]) >> 2;
+            }else{
+                buffer[x][1] =  ptr[4 * x + 0] -     ptr[4 * x + 1] + 0x100;
+                buffer[x][2] =  ptr[4 * x + 2] -     ptr[4 * x + 1] + 0x100;
+                buffer[x][0] = (ptr[4 * x + 0] + 2 * ptr[4 * x + 1] + ptr[4 * x + 2]) >> 2;
+            }
 
-    ff_mjpeg_encode_picture_header(s);
+            for (i = 0; i < 3; i++) {
+                int pred, diff;
 
-    s->header_bits= put_bits_count(&s->pb);
+                PREDICT(pred, topleft[i], top[i], left[i], modified_predictor);
 
-    if(avctx->pix_fmt == AV_PIX_FMT_BGR0
-        || avctx->pix_fmt == AV_PIX_FMT_BGRA
-        || avctx->pix_fmt == AV_PIX_FMT_BGR24){
-        int x, y, i;
-        const int linesize= p->linesize[0];
-        uint16_t (*buffer)[4]= (void *) s->rd_scratchpad;
-        int left[3], top[3], topleft[3];
-
-        for(i=0; i<3; i++){
-            buffer[0][i]= 1 << (9 - 1);
-        }
+                topleft[i] = top[i];
+                top[i]     = buffer[x+1][i];
 
-        for(y = 0; y < height; y++) {
-            const int modified_predictor= y ? predictor : 1;
-            uint8_t *ptr = p->data[0] + (linesize * y);
+                left[i]    = buffer[x][i];
 
-            if(s->pb.buf_end - s->pb.buf - (put_bits_count(&s->pb)>>3) < width*3*4){
-                av_log(s->avctx, AV_LOG_ERROR, "encoded frame too large\n");
-                return -1;
-            }
+                diff       = ((left[i] - pred + 0x100) & 0x1FF) - 0x100;
 
-            for(i=0; i<3; i++){
-                top[i]= left[i]= topleft[i]= buffer[0][i];
+                if (i == 0)
+                    ff_mjpeg_encode_dc(pb, diff, s->huff_size_dc_luminance, s->huff_code_dc_luminance); //FIXME ugly
+                else
+                    ff_mjpeg_encode_dc(pb, diff, s->huff_size_dc_chrominance, s->huff_code_dc_chrominance);
             }
-            for(x = 0; x < width; x++) {
-                if(avctx->pix_fmt == AV_PIX_FMT_BGR24){
-                    buffer[x][1] = ptr[3*x+0] - ptr[3*x+1] + 0x100;
-                    buffer[x][2] = ptr[3*x+2] - ptr[3*x+1] + 0x100;
-                    buffer[x][0] = (ptr[3*x+0] + 2*ptr[3*x+1] + ptr[3*x+2])>>2;
-                }else{
-                buffer[x][1] = ptr[4*x+0] - ptr[4*x+1] + 0x100;
-                buffer[x][2] = ptr[4*x+2] - ptr[4*x+1] + 0x100;
-                buffer[x][0] = (ptr[4*x+0] + 2*ptr[4*x+1] + ptr[4*x+2])>>2;
-                }
-
-                for(i=0;i<3;i++) {
-                    int pred, diff;
-
-                    PREDICT(pred, topleft[i], top[i], left[i], modified_predictor);
-
-                    topleft[i]= top[i];
-                    top[i]= buffer[x+1][i];
+        }
+    }
 
-                    left[i]= buffer[x][i];
+    return 0;
+}
 
-                    diff= ((left[i] - pred + 0x100)&0x1FF) - 0x100;
+static inline void ljpeg_encode_yuv_mb(LJpegEncContext *s, PutBitContext *pb,
+                                       const AVFrame *frame, int predictor,
+                                       int mb_x, int mb_y)
+{
+    int i;
+
+    if (mb_x == 0 || mb_y == 0) {
+        for (i = 0; i < 3; i++) {
+            uint8_t *ptr;
+            int x, y, h, v, linesize;
+            h = s->hsample[i];
+            v = s->vsample[i];
+            linesize = frame->linesize[i];
+
+            for (y = 0; y < v; y++) {
+                for (x = 0; x < h; x++) {
+                    int pred;
+
+                    ptr = frame->data[i] + (linesize * (v * mb_y + y)) + (h * mb_x + x); //FIXME optimize this crap
+                    if (y == 0 && mb_y == 0) {
+                        if (x == 0 && mb_x == 0)
+                            pred = 128;
+                        else
+                            pred = ptr[-1];
+                    } else {
+                        if (x == 0 && mb_x == 0) {
+                            pred = ptr[-linesize];
+                        } else {
+                            PREDICT(pred, ptr[-linesize - 1], ptr[-linesize],
+                                    ptr[-1], predictor);
+                        }
+                    }
 
-                    if(i==0)
-                        ff_mjpeg_encode_dc(s, diff, m->huff_size_dc_luminance, m->huff_code_dc_luminance); //FIXME ugly
+                    if (i == 0)
+                        ff_mjpeg_encode_dc(pb, *ptr - pred, s->huff_size_dc_luminance, s->huff_code_dc_luminance); //FIXME ugly
                     else
-                        ff_mjpeg_encode_dc(s, diff, m->huff_size_dc_chrominance, m->huff_code_dc_chrominance);
+                        ff_mjpeg_encode_dc(pb, *ptr - pred, s->huff_size_dc_chrominance, s->huff_code_dc_chrominance);
                 }
             }
         }
-    }else{
-        int mb_x, mb_y, i;
-
-        for(mb_y = 0; mb_y < mb_height; mb_y++) {
-            if(s->pb.buf_end - s->pb.buf - (put_bits_count(&s->pb)>>3) < mb_width * 4 * 3 * s->mjpeg_hsample[0] * s->mjpeg_vsample[0]){
-                av_log(s->avctx, AV_LOG_ERROR, "encoded frame too large\n");
-                return -1;
-            }
-            for(mb_x = 0; mb_x < mb_width; mb_x++) {
-                if(mb_x==0 || mb_y==0){
-                    for(i=0;i<3;i++) {
-                        uint8_t *ptr;
-                        int x, y, h, v, linesize;
-                        h = s->mjpeg_hsample[i];
-                        v = s->mjpeg_vsample[i];
-                        linesize= p->linesize[i];
-
-                        for(y=0; y<v; y++){
-                            for(x=0; x<h; x++){
-                                int pred;
-
-                                ptr = p->data[i] + (linesize * (v * mb_y + y)) + (h * mb_x + x); //FIXME optimize this crap
-                                if(y==0 && mb_y==0){
-                                    if(x==0 && mb_x==0){
-                                        pred= 128;
-                                    }else{
-                                        pred= ptr[-1];
-                                    }
-                                }else{
-                                    if(x==0 && mb_x==0){
-                                        pred= ptr[-linesize];
-                                    }else{
-                                        PREDICT(pred, ptr[-linesize-1], ptr[-linesize], ptr[-1], predictor);
-                                    }
-                                }
-
-                                if(i==0)
-                                    ff_mjpeg_encode_dc(s, *ptr - pred, m->huff_size_dc_luminance, m->huff_code_dc_luminance); //FIXME ugly
-                                else
-                                    ff_mjpeg_encode_dc(s, *ptr - pred, m->huff_size_dc_chrominance, m->huff_code_dc_chrominance);
-                            }
-                        }
-                    }
-                }else{
-                    for(i=0;i<3;i++) {
-                        uint8_t *ptr;
-                        int x, y, h, v, linesize;
-                        h = s->mjpeg_hsample[i];
-                        v = s->mjpeg_vsample[i];
-                        linesize= p->linesize[i];
-
-                        for(y=0; y<v; y++){
-                            for(x=0; x<h; x++){
-                                int pred;
-
-                                ptr = p->data[i] + (linesize * (v * mb_y + y)) + (h * mb_x + x); //FIXME optimize this crap
-                                PREDICT(pred, ptr[-linesize-1], ptr[-linesize], ptr[-1], predictor);
-
-                                if(i==0)
-                                    ff_mjpeg_encode_dc(s, *ptr - pred, m->huff_size_dc_luminance, m->huff_code_dc_luminance); //FIXME ugly
-                                else
-                                    ff_mjpeg_encode_dc(s, *ptr - pred, m->huff_size_dc_chrominance, m->huff_code_dc_chrominance);
-                            }
-                        }
-                    }
+    } else {
+        for (i = 0; i < 3; i++) {
+            uint8_t *ptr;
+            int x, y, h, v, linesize;
+            h = s->hsample[i];
+            v = s->vsample[i];
+            linesize = frame->linesize[i];
+
+            for (y = 0; y < v; y++) {
+                for (x = 0; x < h; x++) {
+                    int pred;
+
+                    ptr = frame->data[i] + (linesize * (v * mb_y + y)) + (h * mb_x + x); //FIXME optimize this crap
+                    PREDICT(pred, ptr[-linesize - 1], ptr[-linesize], ptr[-1], predictor);
+
+                    if (i == 0)
+                        ff_mjpeg_encode_dc(pb, *ptr - pred, s->huff_size_dc_luminance, s->huff_code_dc_luminance); //FIXME ugly
+                    else
+                        ff_mjpeg_encode_dc(pb, *ptr - pred, s->huff_size_dc_chrominance, s->huff_code_dc_chrominance);
                 }
             }
         }
     }
+}
+
+static int ljpeg_encode_yuv(AVCodecContext *avctx, PutBitContext *pb,
+                            const AVFrame *frame)
+{
+    const int predictor = avctx->prediction_method + 1;
+    LJpegEncContext *s  = avctx->priv_data;
+    const int mb_width  = (avctx->width  + s->hsample[0] - 1) / s->hsample[0];
+    const int mb_height = (avctx->height + s->vsample[0] - 1) / s->vsample[0];
+    int mb_x, mb_y;
+
+    for (mb_y = 0; mb_y < mb_height; mb_y++) {
+        if (pb->buf_end - pb->buf - (put_bits_count(pb) >> 3) <
+            mb_width * 4 * 3 * s->hsample[0] * s->vsample[0]) {
+            av_log(avctx, AV_LOG_ERROR, "encoded frame too large\n");
+            return -1;
+        }
+
+        for (mb_x = 0; mb_x < mb_width; mb_x++)
+            ljpeg_encode_yuv_mb(s, pb, frame, predictor, mb_x, mb_y);
+    }
+
+    return 0;
+}
+
+static int ljpeg_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
+                              const AVFrame *pict, int *got_packet)
+{
+    LJpegEncContext *s = avctx->priv_data;
+    PutBitContext pb;
+    const int width  = avctx->width;
+    const int height = avctx->height;
+    const int mb_width  = (width  + s->hsample[0] - 1) / s->hsample[0];
+    const int mb_height = (height + s->vsample[0] - 1) / s->vsample[0];
+    int max_pkt_size = FF_MIN_BUFFER_SIZE;
+    int ret, header_bits;
+
+    if(    avctx->pix_fmt == AV_PIX_FMT_BGR0
+        || avctx->pix_fmt == AV_PIX_FMT_BGRA
+        || avctx->pix_fmt == AV_PIX_FMT_BGR24)
+        max_pkt_size += width * height * 3 * 4;
+    else {
+        max_pkt_size += mb_width * mb_height * 3 * 4
+                        * s->hsample[0] * s->vsample[0];
+    }
+
+    if ((ret = ff_alloc_packet2(avctx, pkt, max_pkt_size)) < 0)
+        return ret;
+
+    init_put_bits(&pb, pkt->data, pkt->size);
+
+    ff_mjpeg_encode_picture_header(avctx, &pb, &s->scantable,
+                                   s->matrix, s->matrix);
+
+    header_bits = put_bits_count(&pb);
+
+    if(    avctx->pix_fmt == AV_PIX_FMT_BGR0
+        || avctx->pix_fmt == AV_PIX_FMT_BGRA
+        || avctx->pix_fmt == AV_PIX_FMT_BGR24)
+        ret = ljpeg_encode_bgr(avctx, &pb, pict);
+    else
+        ret = ljpeg_encode_yuv(avctx, &pb, pict);
+    if (ret < 0)
+        return ret;
 
     emms_c();
-    av_assert0(s->esc_pos == s->header_bits >> 3);
-    ff_mjpeg_encode_stuffing(s);
-    ff_mjpeg_encode_picture_trailer(s);
-    s->picture_number++;
 
-    flush_put_bits(&s->pb);
-    pkt->size   = put_bits_ptr(&s->pb) - s->pb.buf;
+    ff_mjpeg_escape_FF(&pb, header_bits >> 3);
+    ff_mjpeg_encode_picture_trailer(&pb, header_bits);
+
+    flush_put_bits(&pb);
+    pkt->size   = put_bits_ptr(&pb) - pb.buf;
     pkt->flags |= AV_PKT_FLAG_KEY;
     *got_packet = 1;
 
     return 0;
-//    return (put_bits_count(&f->pb)+7)/8;
 }
 
+static av_cold int ljpeg_encode_close(AVCodecContext *avctx)
+{
+    LJpegEncContext *s = avctx->priv_data;
+
+    av_frame_free(&avctx->coded_frame);
+    av_freep(&s->scratch);
+
+    return 0;
+}
+
+static av_cold int ljpeg_encode_init(AVCodecContext *avctx)
+{
+    LJpegEncContext *s = avctx->priv_data;
+
+    if ((avctx->pix_fmt == AV_PIX_FMT_YUV420P ||
+         avctx->pix_fmt == AV_PIX_FMT_YUV422P ||
+         avctx->pix_fmt == AV_PIX_FMT_YUV444P) &&
+        avctx->strict_std_compliance > FF_COMPLIANCE_UNOFFICIAL) {
+        av_log(avctx, AV_LOG_ERROR,
+               "Limited range YUV is non-standard, set strict_std_compliance to "
+               "at least unofficial to use it.\n");
+        return AVERROR(EINVAL);
+    }
+
+    avctx->coded_frame = av_frame_alloc();
+    if (!avctx->coded_frame)
+        return AVERROR(ENOMEM);
+
+    avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I;
+    avctx->coded_frame->key_frame = 1;
+
+    s->scratch = av_malloc_array(avctx->width + 1, sizeof(*s->scratch));
+
+    ff_dsputil_init(&s->dsp, avctx);
+    ff_init_scantable(s->dsp.idct_permutation, &s->scantable, ff_zigzag_direct);
+
+    ff_mjpeg_init_hvsample(avctx, s->hsample, s->vsample);
+
+    ff_mjpeg_build_huffman_codes(s->huff_size_dc_luminance,
+                                 s->huff_code_dc_luminance,
+                                 avpriv_mjpeg_bits_dc_luminance,
+                                 avpriv_mjpeg_val_dc);
+    ff_mjpeg_build_huffman_codes(s->huff_size_dc_chrominance,
+                                 s->huff_code_dc_chrominance,
+                                 avpriv_mjpeg_bits_dc_chrominance,
+                                 avpriv_mjpeg_val_dc);
+
+    return 0;
+}
 
-AVCodec ff_ljpeg_encoder = { //FIXME avoid MPV_* lossless JPEG should not need them
+AVCodec ff_ljpeg_encoder = {
     .name           = "ljpeg",
     .long_name      = NULL_IF_CONFIG_SMALL("Lossless JPEG"),
     .type           = AVMEDIA_TYPE_VIDEO,
     .id             = AV_CODEC_ID_LJPEG,
-    .priv_data_size = sizeof(MpegEncContext),
-    .init           = ff_MPV_encode_init,
-    .encode2        = encode_picture_lossless,
-    .close          = ff_MPV_encode_end,
+    .priv_data_size = sizeof(LJpegEncContext),
+    .init           = ljpeg_encode_init,
+    .encode2        = ljpeg_encode_frame,
+    .close          = ljpeg_encode_close,
     .pix_fmts       = (const enum AVPixelFormat[]){
-        AV_PIX_FMT_BGR24, AV_PIX_FMT_BGRA, AV_PIX_FMT_BGR0,
+        AV_PIX_FMT_BGR24   , AV_PIX_FMT_BGRA    , AV_PIX_FMT_BGR0,
         AV_PIX_FMT_YUVJ420P, AV_PIX_FMT_YUVJ444P, AV_PIX_FMT_YUVJ422P,
-        AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV422P,
+        AV_PIX_FMT_YUV420P , AV_PIX_FMT_YUV444P , AV_PIX_FMT_YUV422P,
         AV_PIX_FMT_NONE},
 };

omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/lossless_videodsp.c Added

@@ -0,0 +1,128 @@
+/*
+ * Lossless video DSP utils
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+#include "avcodec.h"
+#include "lossless_videodsp.h"
+#include "libavcodec/mathops.h"
+
+static void add_int16_c(uint16_t *dst, const uint16_t *src, unsigned mask, int w){
+    long i;
+    unsigned long pw_lsb = (mask >> 1) * 0x0001000100010001ULL;
+    unsigned long pw_msb = pw_lsb +  0x0001000100010001ULL;
+    for (i = 0; i <= w - (int)sizeof(long)/2; i += sizeof(long)/2) {
+        long a = *(long*)(src+i);
+        long b = *(long*)(dst+i);
+        *(long*)(dst+i) = ((a&pw_lsb) + (b&pw_lsb)) ^ ((a^b)&pw_msb);
+    }
+    for(; i<w; i++)
+        dst[i] = (dst[i] + src[i]) & mask;
+}
+
+static void diff_int16_c(uint16_t *dst, const uint16_t *src1, const uint16_t *src2, unsigned mask, int w){
+    long i;
+#if !HAVE_FAST_UNALIGNED
+    if((long)src2 & (sizeof(long)-1)){
+        for(i=0; i+3<w; i+=4){
+            dst[i+0] = (src1[i+0]-src2[i+0]) & mask;
+            dst[i+1] = (src1[i+1]-src2[i+1]) & mask;
+            dst[i+2] = (src1[i+2]-src2[i+2]) & mask;
+            dst[i+3] = (src1[i+3]-src2[i+3]) & mask;
+        }
+    }else
+#endif
+    {
+        unsigned long pw_lsb = (mask >> 1) * 0x0001000100010001ULL;
+        unsigned long pw_msb = pw_lsb +  0x0001000100010001ULL;
+
+        for (i = 0; i <= w - (int)sizeof(long)/2; i += sizeof(long)/2) {
+            long a = *(long*)(src1+i);
+            long b = *(long*)(src2+i);
+            *(long*)(dst+i) = ((a|pw_msb) - (b&pw_lsb)) ^ ((a^b^pw_msb)&pw_msb);
+        }
+    }
+    for (; i<w; i++)
+        dst[i] = (src1[i] - src2[i]) & mask;
+}
+
+static void add_hfyu_median_prediction_int16_c(uint16_t *dst, const uint16_t *src, const uint16_t *diff, unsigned mask, int w, int *left, int *left_top){
+    int i;
+    uint16_t l, lt;
+
+    l  = *left;
+    lt = *left_top;
+
+    for(i=0; i<w; i++){
+        l  = (mid_pred(l, src[i], (l + src[i] - lt) & mask) + diff[i]) & mask;
+        lt = src[i];
+        dst[i] = l;
+    }
+
+    *left     = l;
+    *left_top = lt;
+}
+
+static void sub_hfyu_median_prediction_int16_c(uint16_t *dst, const uint16_t *src1, const uint16_t *src2, unsigned mask, int w, int *left, int *left_top){
+    int i;
+    uint16_t l, lt;
+
+    l  = *left;
+    lt = *left_top;
+
+    for(i=0; i<w; i++){
+        const int pred = mid_pred(l, src1[i], (l + src1[i] - lt) & mask);
+        lt = src1[i];
+        l  = src2[i];
+        dst[i] = (l - pred) & mask;
+    }
+
+    *left     = l;
+    *left_top = lt;
+}
+
+static int add_hfyu_left_prediction_int16_c(uint16_t *dst, const uint16_t *src, unsigned mask, int w, unsigned acc){
+    int i;
+
+    for(i=0; i<w-1; i++){
+        acc+= src[i];
+        dst[i]= acc & mask;
+        i++;
+        acc+= src[i];
+        dst[i]= acc & mask;
+    }
+
+    for(; i<w; i++){
+        acc+= src[i];
+        dst[i]= acc & mask;
+    }
+
+    return acc;
+}
+
+
+void ff_llviddsp_init(LLVidDSPContext *c, AVCodecContext *avctx)
+{
+    c->add_int16 = add_int16_c;
+    c->diff_int16= diff_int16_c;
+    c->add_hfyu_left_prediction_int16   = add_hfyu_left_prediction_int16_c;
+    c->add_hfyu_median_prediction_int16 = add_hfyu_median_prediction_int16_c;
+    c->sub_hfyu_median_prediction_int16 = sub_hfyu_median_prediction_int16_c;
+
+    if (ARCH_X86)
+        ff_llviddsp_init_x86(c, avctx);
+}

omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/lossless_videodsp.h Added

@@ -0,0 +1,40 @@
+/*
+ * Lossless video DSP utils
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+
+#ifndef AVCODEC_LOSSLESS_VIDEODSP_H
+#define AVCODEC_LOSSLESS_VIDEODSP_H
+
+#include "avcodec.h"
+#include "libavutil/cpu.h"
+
+typedef struct LLVidDSPContext {
+    void (*add_int16)(uint16_t *dst/*align 16*/, const uint16_t *src/*align 16*/, unsigned mask, int w);
+    void (*diff_int16)(uint16_t *dst/*align 16*/, const uint16_t *src1/*align 16*/, const uint16_t *src2/*align 1*/, unsigned mask, int w);
+
+    void (*sub_hfyu_median_prediction_int16)(uint16_t *dst, const uint16_t *src1, const uint16_t *src2, unsigned mask, int w, int *left, int *left_top);
+    void (*add_hfyu_median_prediction_int16)(uint16_t *dst, const uint16_t *top, const uint16_t *diff, unsigned mask, int w, int *left, int *left_top);
+    int  (*add_hfyu_left_prediction_int16)(uint16_t *dst, const uint16_t *src, unsigned mask, int w, int left);
+} LLVidDSPContext;
+
+void ff_llviddsp_init(LLVidDSPContext *llviddsp, AVCodecContext *avctx);
+void ff_llviddsp_init_x86(LLVidDSPContext *llviddsp, AVCodecContext *avctx);
+
+#endif //AVCODEC_LOSSLESS_VIDEODSP_H

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/lpc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/lpc.c Changed

@@ -20,7 +20,7 @@
  */
 
 #include "libavutil/common.h"
-#include "libavutil/lls.h"
+#include "libavutil/lls2.h"
 
 #define LPC_USE_DOUBLE
 #include "lpc.h"
@@ -208,7 +208,7 @@
     }
 
     if (lpc_type == FF_LPC_TYPE_CHOLESKY) {
-        LLSModel m[2];
+        LLSModel2 m[2];
         LOCAL_ALIGNED(32, double, var, [FFALIGN(MAX_LPC_ORDER+1,4)]);
         double av_uninit(weight);
         memset(var, 0, FFALIGN(MAX_LPC_ORDER+1,4)*sizeof(*var));
@@ -217,7 +217,7 @@
             m[0].coeff[max_order-1][j] = -lpc[max_order-1][j];
 
         for(; pass<lpc_passes; pass++){
-            avpriv_init_lls(&m[pass&1], max_order);
+            avpriv_init_lls2(&m[pass&1], max_order);
 
             weight=0;
             for(i=max_order; i<blocksize; i++){
@@ -238,7 +238,7 @@
 
                 m[pass&1].update_lls(&m[pass&1], var);
             }
-            avpriv_solve_lls(&m[pass&1], 0.001, 0);
+            avpriv_solve_lls2(&m[pass&1], 0.001, 0);
         }
 
         for(i=0; i<max_order; i++){

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/lzw.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/lzw.c Changed

@@ -28,6 +28,7 @@
  */
 
 #include "avcodec.h"
+#include "bytestream.h"
 #include "lzw.h"
 #include "libavutil/mem.h"
 
@@ -43,7 +44,7 @@
 };
 
 struct LZWState {
-    const uint8_t *pbuf, *ebuf;
+    GetByteContext gb;
     int bbits;
     unsigned int bbuf;
 
@@ -73,9 +74,9 @@
     if(s->mode == FF_LZW_GIF) {
         while (s->bbits < s->cursize) {
             if (!s->bs) {
-                s->bs = *s->pbuf++;
+                s->bs = bytestream2_get_byte(&s->gb);
             }
-            s->bbuf |= (*s->pbuf++) << s->bbits;
+            s->bbuf |= bytestream2_get_byte(&s->gb) << s->bbits;
             s->bbits += 8;
             s->bs--;
         }
@@ -83,7 +84,7 @@
         s->bbuf >>= s->cursize;
     } else { // TIFF
         while (s->bbits < s->cursize) {
-            s->bbuf = (s->bbuf << 8) | (*s->pbuf++);
+            s->bbuf = (s->bbuf << 8) | bytestream2_get_byte(&s->gb);
             s->bbits += 8;
         }
         c = s->bbuf >> (s->bbits - s->cursize);
@@ -97,17 +98,12 @@
     struct LZWState *s = (struct LZWState *)p;
 
     if(s->mode == FF_LZW_GIF) {
-        while (s->bs > 0) {
-            if (s->bs >= s->ebuf - s->pbuf) {
-                s->pbuf = s->ebuf;
-                break;
-            } else {
-                s->pbuf += s->bs;
-                s->bs = *s->pbuf++;
-            }
+        while (s->bs > 0 && bytestream2_get_bytes_left(&s->gb)) {
+            bytestream2_skip(&s->gb, s->bs);
+            s->bs = bytestream2_get_byte(&s->gb);
         }
     }else
-        s->pbuf= s->ebuf;
+        bytestream2_skip(&s->gb, bytestream2_get_bytes_left(&s->gb));
 }
 
 av_cold void ff_lzw_decode_open(LZWState **p)
@@ -135,8 +131,7 @@
     if(csize < 1 || csize >= LZW_MAXBITS)
         return -1;
     /* read buffer */
-    s->pbuf = buf;
-    s->ebuf = s->pbuf + buf_size;
+    bytestream2_init(&s->gb, buf, buf_size);
     s->bbuf = 0;
     s->bbits = 0;
     s->bs = 0;
@@ -186,10 +181,6 @@
             if ((--l) == 0)
                 goto the_end;
         }
-        if (s->ebuf < s->pbuf) {
-            av_log(NULL, AV_LOG_ERROR, "lzw overread\n");
-            goto the_end;
-        }
         c = lzw_get_code(s);
         if (c == s->end_code) {
             break;

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/mace.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/mace.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/mdct_fixed.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/mdct_fixed.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/mdct_fixed_32.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/mdct_fixed_32.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/mdct_float.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/mdct_float.c Changed

omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/mdct_template.c Added

@@ -0,0 +1,207 @@
+/*
+ * MDCT/IMDCT transforms
+ * Copyright (c) 2002 Fabrice Bellard
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <stdlib.h>
+#include <string.h>
+#include "libavutil/common.h"
+#include "libavutil/mathematics.h"
+#include "fft.h"
+#include "fft-internal.h"
+
+/**
+ * @file
+ * MDCT/IMDCT transforms.
+ */
+
+#if FFT_FLOAT
+#   define RSCALE(x) (x)
+#else
+#if FFT_FIXED_32
+#   define RSCALE(x) (((x) + 32) >> 6)
+#else /* FFT_FIXED_32 */
+#   define RSCALE(x) ((x) >> 1)
+#endif /* FFT_FIXED_32 */
+#endif
+
+/**
+ * init MDCT or IMDCT computation.
+ */
+av_cold int ff_mdct_init(FFTContext *s, int nbits, int inverse, double scale)
+{
+    int n, n4, i;
+    double alpha, theta;
+    int tstep;
+
+    memset(s, 0, sizeof(*s));
+    n = 1 << nbits;
+    s->mdct_bits = nbits;
+    s->mdct_size = n;
+    n4 = n >> 2;
+    s->mdct_permutation = FF_MDCT_PERM_NONE;
+
+    if (ff_fft_init(s, s->mdct_bits - 2, inverse) < 0)
+        goto fail;
+
+    s->tcos = av_malloc(n/2 * sizeof(FFTSample));
+    if (!s->tcos)
+        goto fail;
+
+    switch (s->mdct_permutation) {
+    case FF_MDCT_PERM_NONE:
+        s->tsin = s->tcos + n4;
+        tstep = 1;
+        break;
+    case FF_MDCT_PERM_INTERLEAVE:
+        s->tsin = s->tcos + 1;
+        tstep = 2;
+        break;
+    default:
+        goto fail;
+    }
+
+    theta = 1.0 / 8.0 + (scale < 0 ? n4 : 0);
+    scale = sqrt(fabs(scale));
+    for(i=0;i<n4;i++) {
+        alpha = 2 * M_PI * (i + theta) / n;
+        s->tcos[i*tstep] = FIX15(-cos(alpha) * scale);
+        s->tsin[i*tstep] = FIX15(-sin(alpha) * scale);
+    }
+    return 0;
+ fail:
+    ff_mdct_end(s);
+    return -1;
+}
+
+/**
+ * Compute the middle half of the inverse MDCT of size N = 2^nbits,
+ * thus excluding the parts that can be derived by symmetry
+ * @param output N/2 samples
+ * @param input N/2 samples
+ */
+void ff_imdct_half_c(FFTContext *s, FFTSample *output, const FFTSample *input)
+{
+    int k, n8, n4, n2, n, j;
+    const uint16_t *revtab = s->revtab;
+    const FFTSample *tcos = s->tcos;
+    const FFTSample *tsin = s->tsin;
+    const FFTSample *in1, *in2;
+    FFTComplex *z = (FFTComplex *)output;
+
+    n = 1 << s->mdct_bits;
+    n2 = n >> 1;
+    n4 = n >> 2;
+    n8 = n >> 3;
+
+    /* pre rotation */
+    in1 = input;
+    in2 = input + n2 - 1;
+    for(k = 0; k < n4; k++) {
+        j=revtab[k];
+        CMUL(z[j].re, z[j].im, *in2, *in1, tcos[k], tsin[k]);
+        in1 += 2;
+        in2 -= 2;
+    }
+    s->fft_calc(s, z);
+
+    /* post rotation + reordering */
+    for(k = 0; k < n8; k++) {
+        FFTSample r0, i0, r1, i1;
+        CMUL(r0, i1, z[n8-k-1].im, z[n8-k-1].re, tsin[n8-k-1], tcos[n8-k-1]);
+        CMUL(r1, i0, z[n8+k  ].im, z[n8+k  ].re, tsin[n8+k  ], tcos[n8+k  ]);
+        z[n8-k-1].re = r0;
+        z[n8-k-1].im = i0;
+        z[n8+k  ].re = r1;
+        z[n8+k  ].im = i1;
+    }
+}
+
+/**
+ * Compute inverse MDCT of size N = 2^nbits
+ * @param output N samples
+ * @param input N/2 samples
+ */
+void ff_imdct_calc_c(FFTContext *s, FFTSample *output, const FFTSample *input)
+{
+    int k;
+    int n = 1 << s->mdct_bits;
+    int n2 = n >> 1;
+    int n4 = n >> 2;
+
+    ff_imdct_half_c(s, output+n4, input);
+
+    for(k = 0; k < n4; k++) {
+        output[k] = -output[n2-k-1];
+        output[n-k-1] = output[n2+k];
+    }
+}
+
+/**
+ * Compute MDCT of size N = 2^nbits
+ * @param input N samples
+ * @param out N/2 samples
+ */
+void ff_mdct_calc_c(FFTContext *s, FFTSample *out, const FFTSample *input)
+{
+    int i, j, n, n8, n4, n2, n3;
+    FFTDouble re, im;
+    const uint16_t *revtab = s->revtab;
+    const FFTSample *tcos = s->tcos;
+    const FFTSample *tsin = s->tsin;
+    FFTComplex *x = (FFTComplex *)out;
+
+    n = 1 << s->mdct_bits;
+    n2 = n >> 1;
+    n4 = n >> 2;
+    n8 = n >> 3;
+    n3 = 3 * n4;
+
+    /* pre rotation */
+    for(i=0;i<n8;i++) {
+        re = RSCALE(-input[2*i+n3] - input[n3-1-2*i]);
+        im = RSCALE(-input[n4+2*i] + input[n4-1-2*i]);
+        j = revtab[i];
+        CMUL(x[j].re, x[j].im, re, im, -tcos[i], tsin[i]);
+
+        re = RSCALE( input[2*i]    - input[n2-1-2*i]);
+        im = RSCALE(-input[n2+2*i] - input[ n-1-2*i]);
+        j = revtab[n8 + i];
+        CMUL(x[j].re, x[j].im, re, im, -tcos[n8 + i], tsin[n8 + i]);
+    }
+
+    s->fft_calc(s, x);
+
+    /* post rotation */
+    for(i=0;i<n8;i++) {
+        FFTSample r0, i0, r1, i1;
+        CMUL(i1, r0, x[n8-i-1].re, x[n8-i-1].im, -tsin[n8-i-1], -tcos[n8-i-1]);
+        CMUL(i0, r1, x[n8+i  ].re, x[n8+i  ].im, -tsin[n8+i  ], -tcos[n8+i  ]);
+        x[n8-i-1].re = r0;
+        x[n8-i-1].im = i0;
+        x[n8+i  ].re = r1;
+        x[n8+i  ].im = i1;
+    }
+}
+
+av_cold void ff_mdct_end(FFTContext *s)
+{
+    av_freep(&s->tcos);
+    ff_fft_end(s);
+}

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/mdec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/mdec.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/metasound.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/metasound.c Changed

@@ -163,7 +163,7 @@
 static int metasound_read_bitstream(AVCodecContext *avctx, TwinVQContext *tctx,
                                     const uint8_t *buf, int buf_size)
 {
-    TwinVQFrameData     *bits = &tctx->bits;
+    TwinVQFrameData     *bits;
     const TwinVQModeTab *mtab = tctx->mtab;
     int channels              = tctx->avctx->channels;
     int sub;
@@ -172,58 +172,67 @@
 
     init_get_bits(&gb, buf, buf_size * 8);
 
-    bits->window_type = get_bits(&gb, TWINVQ_WINDOW_TYPE_BITS);
+    for (tctx->cur_frame = 0; tctx->cur_frame < tctx->frames_per_packet;
+         tctx->cur_frame++) {
+        bits = tctx->bits + tctx->cur_frame;
 
-    if (bits->window_type > 8) {
-        av_log(avctx, AV_LOG_ERROR, "Invalid window type, broken sample?\n");
-        return AVERROR_INVALIDDATA;
-    }
+        bits->window_type = get_bits(&gb, TWINVQ_WINDOW_TYPE_BITS);
 
-    bits->ftype = ff_twinvq_wtype_to_ftype_table[tctx->bits.window_type];
+        if (bits->window_type > 8) {
+            av_log(avctx, AV_LOG_ERROR, "Invalid window type, broken sample?\n");
+            return AVERROR_INVALIDDATA;
+        }
 
-    sub = mtab->fmode[bits->ftype].sub;
+        bits->ftype = ff_twinvq_wtype_to_ftype_table[tctx->bits[tctx->cur_frame].window_type];
 
-    if (bits->ftype != TWINVQ_FT_SHORT)
-        get_bits(&gb, 2);
+        sub = mtab->fmode[bits->ftype].sub;
 
-    read_cb_data(tctx, &gb, bits->main_coeffs, bits->ftype);
+        if (bits->ftype != TWINVQ_FT_SHORT && !tctx->is_6kbps)
+            get_bits(&gb, 2);
 
-    for (i = 0; i < channels; i++)
-        for (j = 0; j < sub; j++)
-            for (k = 0; k < mtab->fmode[bits->ftype].bark_n_coef; k++)
-                bits->bark1[i][j][k] =
-                    get_bits(&gb, mtab->fmode[bits->ftype].bark_n_bit);
+        read_cb_data(tctx, &gb, bits->main_coeffs, bits->ftype);
 
-    for (i = 0; i < channels; i++)
-        for (j = 0; j < sub; j++)
-            bits->bark_use_hist[i][j] = get_bits1(&gb);
+        for (i = 0; i < channels; i++)
+            for (j = 0; j < sub; j++)
+                for (k = 0; k < mtab->fmode[bits->ftype].bark_n_coef; k++)
+                    bits->bark1[i][j][k] =
+                        get_bits(&gb, mtab->fmode[bits->ftype].bark_n_bit);
 
-    if (bits->ftype == TWINVQ_FT_LONG) {
         for (i = 0; i < channels; i++)
-            bits->gain_bits[i] = get_bits(&gb, TWINVQ_GAIN_BITS);
-    } else {
-        for (i = 0; i < channels; i++) {
-            bits->gain_bits[i] = get_bits(&gb, TWINVQ_GAIN_BITS);
             for (j = 0; j < sub; j++)
-                bits->sub_gain_bits[i * sub + j] =
-                    get_bits(&gb, TWINVQ_SUB_GAIN_BITS);
+                bits->bark_use_hist[i][j] = get_bits1(&gb);
+
+        if (bits->ftype == TWINVQ_FT_LONG) {
+            for (i = 0; i < channels; i++)
+                bits->gain_bits[i] = get_bits(&gb, TWINVQ_GAIN_BITS);
+        } else {
+            for (i = 0; i < channels; i++) {
+                bits->gain_bits[i] = get_bits(&gb, TWINVQ_GAIN_BITS);
+                for (j = 0; j < sub; j++)
+                    bits->sub_gain_bits[i * sub + j] =
+                        get_bits(&gb, TWINVQ_SUB_GAIN_BITS);
+            }
         }
-    }
 
-    for (i = 0; i < channels; i++) {
-        bits->lpc_hist_idx[i] = get_bits(&gb, mtab->lsp_bit0);
-        bits->lpc_idx1[i]     = get_bits(&gb, mtab->lsp_bit1);
+        for (i = 0; i < channels; i++) {
+            bits->lpc_hist_idx[i] = get_bits(&gb, mtab->lsp_bit0);
+            bits->lpc_idx1[i]     = get_bits(&gb, mtab->lsp_bit1);
 
-        for (j = 0; j < mtab->lsp_split; j++)
-            bits->lpc_idx2[i][j] = get_bits(&gb, mtab->lsp_bit2);
-    }
+            for (j = 0; j < mtab->lsp_split; j++)
+                bits->lpc_idx2[i][j] = get_bits(&gb, mtab->lsp_bit2);
+        }
 
-    if (bits->ftype == TWINVQ_FT_LONG) {
-        read_cb_data(tctx, &gb, bits->ppc_coeffs, 3);
-        for (i = 0; i < channels; i++) {
-            bits->p_coef[i] = get_bits(&gb, mtab->ppc_period_bit);
-            bits->g_coef[i] = get_bits(&gb, mtab->pgain_bit);
+        if (bits->ftype == TWINVQ_FT_LONG) {
+            read_cb_data(tctx, &gb, bits->ppc_coeffs, 3);
+            for (i = 0; i < channels; i++) {
+                bits->p_coef[i] = get_bits(&gb, mtab->ppc_period_bit);
+                bits->g_coef[i] = get_bits(&gb, mtab->pgain_bit);
+            }
         }
+
+        // subframes are aligned to nibbles
+        if (get_bits_count(&gb) & 3)
+            skip_bits(&gb, 4 - (get_bits_count(&gb) & 3));
     }
 
     return (get_bits_count(&gb) + 7) / 8;
@@ -298,32 +307,68 @@
     ibps = avctx->bit_rate / (1000 * avctx->channels);
 
     switch ((avctx->channels << 16) + (isampf << 8) + ibps) {
+    case (1 << 16) + ( 8 << 8) +  6:
+        tctx->mtab = &ff_metasound_mode0806;
+        break;
+    case (2 << 16) + ( 8 << 8) +  6:
+        tctx->mtab = &ff_metasound_mode0806s;
+        break;
     case (1 << 16) + ( 8 << 8) +  8:
         tctx->mtab = &ff_metasound_mode0808;
         break;
+    case (2 << 16) + ( 8 << 8) +  8:
+        tctx->mtab = &ff_metasound_mode0808s;
+        break;
+    case (1 << 16) + (11 << 8) + 10:
+        tctx->mtab = &ff_metasound_mode1110;
+        break;
+    case (2 << 16) + (11 << 8) + 10:
+        tctx->mtab = &ff_metasound_mode1110s;
+        break;
     case (1 << 16) + (16 << 8) + 16:
         tctx->mtab = &ff_metasound_mode1616;
         break;
+    case (2 << 16) + (16 << 8) + 16:
+        tctx->mtab = &ff_metasound_mode1616s;
+        break;
+    case (1 << 16) + (22 << 8) + 24:
+        tctx->mtab = &ff_metasound_mode2224;
+        break;
+    case (2 << 16) + (22 << 8) + 24:
+        tctx->mtab = &ff_metasound_mode2224s;
+        break;
     case (1 << 16) + (44 << 8) + 32:
         tctx->mtab = &ff_metasound_mode4432;
         break;
+    case (2 << 16) + (44 << 8) + 32:
+        tctx->mtab = &ff_metasound_mode4432s;
+        break;
+    case (1 << 16) + (44 << 8) + 40:
+        tctx->mtab = &ff_metasound_mode4440;
+        break;
+    case (2 << 16) + (44 << 8) + 40:
+        tctx->mtab = &ff_metasound_mode4440s;
+        break;
+    case (1 << 16) + (44 << 8) + 48:
+        tctx->mtab = &ff_metasound_mode4448;
+        break;
     case (2 << 16) + (44 << 8) + 48:
         tctx->mtab = &ff_metasound_mode4448s;
         break;
     default:
         av_log(avctx, AV_LOG_ERROR,
                "This version does not support %d kHz - %d kbit/s/ch mode.\n",
-               isampf, isampf);
+               isampf, ibps);
         return AVERROR(ENOSYS);
     }
 
-    avctx->block_align = (avctx->bit_rate * tctx->mtab->size
-                                          / avctx->sample_rate + 7) / 8;
-
     tctx->codec          = TWINVQ_CODEC_METASOUND;
     tctx->read_bitstream = metasound_read_bitstream;
     tctx->dec_bark_env   = dec_bark_env;
     tctx->decode_ppc     = decode_ppc;
+    tctx->frame_size     = avctx->bit_rate * tctx->mtab->size
+                                           / avctx->sample_rate;
+    tctx->is_6kbps       = ibps == 6;
 
     return ff_twinvq_decode_init(avctx);
 }

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/metasound_data.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/metasound_data.c Changed

@@ -21,6 +21,1192 @@
 
 #include "metasound_data.h"
 
+static const int16_t cb0806sl0[] = {
+      -417,   -225,    -84,     16,   -106,    -34,   -246,   -164,
+       112,     48,    -47,     36,    -65,    -68,   -172,  -1655,
+       -36,    140,     -3,     -2,     -2,      2,      0,      0,
+       178,      7,   -181,   -177,    120,    -64,   -129,     80,
+     -6826,    -38,    -25,    147,    148,    -13,    -25,    110,
+        21,     21,     -1,      0,      0,      0,      0,      0,
+      3319,    632,   -734,   -187,     40,   -249,   -155,     -1,
+      -173,     95,     28,     -2,     20,    -44,     35,    120,
+       -47,   -221,     -5,      2,     -7,      1,      0,      0,
+        63,    268,   -260,   -419,    187,    -75,   -228,    296,
+      -470,    177,   -515,    318,    124,    308,     92,    371,
+      3046,    362,     -1,     -1,    -10,      1,      0,      0,
+      -356,    -16,   -199,    117,    -75,     46,   -108,    -14,
+      -124,   -173,   4914,    -75,   -474,    105,     87,    190,
+      -183,   -208,      0,      0,      1,      1,      0,     -1,
+       162,     89,     49,   -314,  -2788,    265,   -263,     -3,
+     -3156,    316,    112,    128,   -333,   -138,   -114,   -141,
+      -287,   -234,     -1,      0,      0,      0,      0,      1,
+       733,    126,   -424,   -389,    642,    432,    134,   -251,
+       407,    -51,   -151,   -491,   -308,     91,     50,   3836,
+        87,    100,     -5,     -6,      0,      1,      0,      0,
+       304,   1727,     83,     -8,    216,    -81,   -189,    152,
+       -67,     15,    310,    -93,      6,    -37,     54,   -110,
+       -15,     78,      0,      0,      1,     12,      0,     -1,
+       129,   -198,      1,    -48,    -66,   -147,     30,    264,
+       -84,    102,     42,    126,      1,  -6451,    225,    -51,
+         8,    123,      0,     -1,      0,     -1,      0,      0,
+      -374,     66,   -256,    -80,  -1139,    303,   2002,   -199,
+       -98,    -98,    -39,    -76,    180,     15,   -456,    148,
+      -183,    118,     -2,      1,      0,      0,      0,      0,
+       151,     13,   -114,     65,   6156,     76,    -82,    -30,
+       -26,    163,     81,    167,    -83,   -101,     55,    -40,
+       161,   -793,     -8,      0,      0,     -1,     -1,      0,
+      -102,    -33,     55,   -131,    434,    108,     70,     68,
+        62,   1913,   -109,    235,    110,    124,    -25,    -58,
+       -76,     18,     -1,     -1,      0,      0,      0,      0,
+      -105,  -7322,     -9,     82,     53,    -43,     -5,     18,
+        90,     91,     20,    -34,     26,    -93,    -50,    -46,
+       -77,    105,      0,      6,    -12,     -6,      1,      0,
+     -1334,    980,   -163,   -351,   -514,    537,     62,   -300,
+        80,   -318,     14,  -3570,    -52,   -116,   -280,    540,
+       250,   -775,     -7,      0,      0,      0,      0,      0,
+       507,    317,   -417,   -236,  -2438,    -72,   -346,   2507,
+       302,   -185,     30,   1539,    205,     87,   -112,   -482,
+      -296,    132,     -1,      0,     -1,      1,      0,      0,
+       -64,   -208,   -159,      1,    336,    -62,    -14,     13,
+        81,    101,    382,     32,    116,     -5,    -41,     25,
+      -175,  -7829,      1,      0,      1,      0,      0,      0,
+      7551,     -7,     86,   -165,    -57,    -17,    183,   -207,
+        69,     54,    -99,    -25,    167,    -58,    107,    -81,
+       165,    172,      2,     -2,      0,      1,      0,     -9,
+        26,     28,     86,   -183,   -320,    -32,    116,    -53,
+       -49,    -15,    133,   -283,   -152,    576,   6630,    185,
+        44,     25,     20,      1,    -12,      1,     -1,      0,
+      -145,    -51,   -114,    -29,   -228,     78,   -409,    235,
+       147,     45,   -192,    177,    -91,     68,  -2572,    -52,
+        81,    181,     -5,     13,     -1,     -1,    -17,      0,
+       -65,    -23,    -28,      9,    242,     14,    -35,     88,
+        77,    -20,     37,  -7097,    -58,     51,    137,    126,
+       -90,    136,      0,      4,     -1,      0,      0,      0,
+      -266,    -82,   -205,    816,   -309,   3267,   1053,    369,
+      -216,   -302,     18,    168,    395,    273,    343,    243,
+       -98,    -53,      1,      0,      0,      1,      0,      0,
+       -65,    -76,   1850,   -991,   -454,   -535,   2927,   -145,
+       101,     23,     20,    234,    -74,     77,    114,      4,
+      -106,    527,    -11,      4,      0,      1,     -1,      0,
+       573,    -46,    207,   2640,   -956,     47,     26,    -10,
+       317,   -217,     -5,   -867,     -3,    213,     52,     53,
+      -428,   -175,      0,      0,     -1,     -1,      0,     -1,
+      -223,    -55,    135,    184,    313,      0,   2868,    245,
+     -3187,   -721,   -291,      9,   -265,   -120,   -105,    -36,
+       454,     55,     -1,     49,      0,      1,     -1,      0,
+      -291,     41,     84,    557,   -201,  -2300,    429,    283,
+        21,     -2,    132,    286,   -124,    149,    -14,    146,
+       320,   -298,      0,     -1,      1,     -2,      0,      0,
+       -86,  -3493,    131,  -3581,    185,     26,   -197,    -65,
+       -96,    147,    -53,   -150,    -35,    -35,    179,     68,
+      -157,      0,      0,      2,      0,      1,      2,     -1,
+       -22,   -218,     13,  -1447,   -400,    288,  -1295,      0,
+      -119,     69,    -56,   -139,    157,    -26,   -122,    -61,
+       -38,   -108,     -1,      1,      0,      0,      0,      0,
+      -229,   3335,    103,   -108,     10,   3008,   -712,     50,
+        27,    152,   -307,   -106,    148,    -77,   -178,    -46,
+         7,   -114,      0,     -9,      0,      0,      1,      0,
+       932,   -443,    311,    -75,     62,    -80,   -179,    459,
+      -232,   -160,      2,    169,    134,   -260,     41,   -149,
+        23,     92,     -2,      0,     11,      1,      0,      0,
+        16,    -90,   -574,   -171,    163,    261,   -299,   2994,
+        74,  -3818,   -396,   -171,     13,    -29,    -45,   -168,
+      -287,   -390,      1,      0,      0,     -4,      0,     -1,
+        89,   -702,   2223,    101,   -249,   2983,     36,   -333,
+      -382,    410,   -262,    185,   -146,     98,     -8,   -317,
+      -279,   -879,      0,      0,      0,      0,      4,      0,
+       -98,   -325,     75,   -229,    -13,    112,  -5743,    -34,
+       -89,    263,   -155,     80,    140,    -50,     33,    143,
+       -60,    -77,      1,     -2,      0,     -1,      1,      0,
+        52,   -576,   -543,  -1142,   -947,   -184,    449,    -71,
+       -75,   -156,  -3412,    -50,   -487,    307,    663,  -1000,
+      -415,  -2348,     -7,     -1,     -1,      0,      0,      0,
+        64,      3,    -35,     11,     14,   -198,     -2,  -8042,
+       140,    -11,    -93,     29,    -65,    330,     34,    110,
+       -19,   -137,      2,      0,      0,      0,      0,      0,
+      1236,    303,   2681,    234,   -217,   -406,   -395,   -380,
+       247,    349,   -101,    -33,    370,    -39,    139,     59,
+        18,     24,      0,      0,      0,      0,      0,      0,
+       166,    -21,  -5392,   -117,   -296,    114,    230,   -255,
+       131,    -53,     13,    -45,    200,      7,    -56,     87,
+        46,    223,    -59,      0,     -1,      0,      0,     -1,
+       214,   -511,    175,    204,   -123,    -47,   -440,      6,
+        23,     92,   -355,     80,  -4885,   -238,    -37,     78,
+      -218,    175,      0,      2,      0,      0,      0,      0,
+      -146,     74,    -13,     -4,     27,    -45,     51,     81,
+       -80,     53,    -18,    173,   -146,    -64,     -8,   8192,
+        79,     15,      0,     -3,      0,      1,      0,      0,
+        -3,    -16,    -28,    288,    -61,      4,   -187,      6,
+        -5,    -14,     77,    -12,    -53,     16,    -41,     -7,
+       -10,     -2,      7,     -1,     -9,      1,      0,      0,
+      -285,    -35,     -8,    221,    -68,    114,    135,     -8,
+      -203,   -181,    -91,   2043,    -58,    127,    201,    111,
+        46,   -344,    -11,    -49,      0,      1,      0,     -1,
+      -160,   -186,     58,   4761,    289,     51,   -145,     51,
+       -32,     71,     62,    175,    -13,    181,    203,    141,
+      -200,    106,     -1,      4,     -2,      0,      0,      0,
+       803,    -76,    -96,   -940,    300,   3429,    -84,   3037,
+       262,     -9,    -39,    120,   -629,   -309,    233,   -374,
+       398,    894,    -12,      1,      1,      1,      0,      0,
+      -282,   2525,    -31,   -176,  -2473,     53,    102,   -610,
+       180,   -145,     42,    -51,    223,     27,    -69,    727,
+       -14,    -51,      0,      0,      0,     -3,      0,    -40,
+       214,     72,     41,      1,    190,     78,   -228,   -235,
+       105,  -4619,   -140,    -46,     -7,     49,      9,    -19,
+       137,     -2,      9,      1,      0,      0,      0,      0,
+      -142,   -262,     29,   -142,     39,    -39,    -92,     95,
+        50,   -282,      2,   -106,    114,      8,     35,     78,
+      -121,   2589,      1,     -4,    -10,      1,      1,      0,
+      -192,     59,    287,    400,    -67,  -6989,   -301,    446,
+       115,      7,     33,    -60,    111,    102,      8,    206,
+        46,    -31,     -1,     -1,     -2,      0,      0,      0,
+      -104,    332,   -223,   1066,   -188,   1270,   -222,    309,
+      -296,    259,    780,   -460,  -1914,    218,   -556,    210,
+      2962,    130,      1,     -2,      2,      0,      1,      0,
+      -320,   -365,   -266,    822,   -119,    824,   -312,     58,
+     -1857,    235,     48,  -3985,    118,   -307,   -703,   -931,
+      -560,    105,     -2,     -3,      0,      0,      0,      1,
+       156,    -48,    187,    214,   -212,    180,    342,    373,
+      1973,    128,     -5,    146,    -40,    -11,     71,    -60,
+        76,     17,      0,      0,     -1,      2,      0,      7,
+       214,     63,    274,   2876,    -65,    314,    400,    344,
+       140,     39,    193,   -226,    124,  -3177,     68,     46,
+       -60,   -317,      2,      0,     -1,      0,      7,      0,
+      -160,    118,    233,    239,   -465,     96,    253,   3178,
+       -88,    299,    368,   -220,    197,    397,   -353,   -463,
+      -202,   -103,     -4,      0,      0,      0,      0,      0,
+       687,   -448,   -749,     87,    -35,    112,    309,    -33,
+       -16,     88,    141,     63,    -51,    274,   -113,    -76,
+        46,   -273,     -1,      1,      0,      1,      0,      1,
+      -298,   -206,    670,    303,   -451,   -277,   -493,    404,
+      -173,    284,    148,    626,   -322,   -296,    -68,   3044,
+      -442,   1138,     -7,      2,      0,      1,      0,      0,
+     -1338,     18,   2862,    223,    250,    260,    144,    259,
+       -38,   -647,    602,   -160,     75,     -5,     -8,     34,
+       237,     50,      2,      0,      1,     -1,     -1,      0,
+      -412,   2153,    933,    478,    768,    186,   -424,   -657,
+     -3458,   -443,    294,    224,   -468,    -58,   -120,  -1565,
+       211,   -420,      0,      0,      1,     -1,      0,      0,
+       198,    227,   -112,    350,    297,   -303,    108,   -192,
+       153,     32,  -2717,   -111,  -1093,   -200,    476,    326,
+      -271,    627,      0,     -4,      0,      0,      0,     -1,
+       462,   -616,    126,    316,  -2413,    204,   -350,  -3549,
+      -263,   -386,   -112,    483,  -1339,    636,     70,   -531,
+        96,     38,      8,     -1,      0,     -3,      0,      0,
+      -310,  -1128,    616,   -339,   -168,   -124,   -905,   -151,
+      -383,     76,    137,    -44,   3689,   -388,    184,   1799,
+      -102,   -930,      6,     -1,     -1,     -1,      0,      0,
+      -284,    280,     39,   -728,    143,     15,    181,    798,
+       382,     10,   2267,    -12,  -3582,    -27,    357,    514,
+      -565,   -121,      0,     -1,      0,     -9,     -1,      0,
+       429,    -16,   2993,  -2903,     47,   -136,     30,    792,
+      -327,   -347,    -69,    -50,    -93,   -223,   -438,    158,
+       203,   -475,      0,     -4,     -1,      2,      0,      0,
+     -3465,    415,   -963,    252,    397,   -945,   -448,   -231,
+      -130,    673,    504,     55,   -355,    221,     29,    167,
+       -19,    134,     -1,     -1,     -4,      0,    -14,     -2,
+        44,    433,   -535,   -216,   2485,     33,     19,   -100,
+      -185,   -171,     91,    336,   -208,    140,     -3,     46,
+       -67,   -116,     32,      0,      5,      3,      0,      0,
+       220,     91,    -65,    -15,   -169,    217,   -183,   -169,
+       -47,    181,   -272,    138,   -166,    110,     -9,     41,
+     -6957,     33,     -5,     -2,      1,      1,      0,     -1,
+       164,  -4062,   -109,    230,   -220,   1748,  -1338,   -246,
+      -242,    -98,    300,    217,   -202,   -130,    157,     -3,
+       -19,   -453,      0,      2,      0,      0,      0,      0,
+};
+
+static const int16_t cb0806sl1[] = {
+        75,     87,    -31,    607,   -132,   5963,   -262,    494,
+       134,     -4,    141,     19,    225,    229,    239,     93,
+       -20,   -189,      2,      0,     -3,     -1,     -1,      0,
+       214,   -206,    877,     83,   -588,     83,    132,     78,
+         5,    -85,     66,    -24,     47,    -11,     25,     26,
+        -3,     46,      2,     -5,      0,      1,     -1,      0,
+      -113,    295,    -81,     74,    223,    -50,    -93,  -5671,
+       -28,    115,    256,   -228,    -31,   -539,    300,   -278,
+       -59,    426,   -110,     -1,      1,      1,      0,      0,
+       -95,   -116,    266,    176,    761,     -3,     90,    -91,
+        98,   -209,   -414,    -27,    -56,     26,    -76,      6,
+       -32,   4634,      1,      0,     -4,      0,      0,      0,
+       177,    147,   -236,    -93,  -7925,     11,   -111,    -74,
+        36,    176,    352,     88,    112,     16,    144,   -110,
+        91,    329,     -1,      2,      0,      1,      0,      1,
+       119,    304,    -94,   -422,    113,    129,    -70,    155,
+       247,   -116,   -139,    327,   -355,     77,    143,  -5362,
+        27,   -377,     -1,      7,      2,      1,      0,      0,
+       179,    127,   1500,   -324,    -15,    673,    184,  -1382,
+       167,   1833,  -3058,    200,  -1203,    459,  -1905,   1020,
+      -259,   -120,     10,     -4,      0,      1,      0,      0,
+       995,   -112,     37,   -160,    -21,  -4011,    172,    228,
+      -210,     80,   -131,      1,     20,   -128,   -252,   -288,
+      -132,    337,     -1,      0,     -1,      0,      1,     -1,
+       -60,     61,    197,   -185,    -40,  -2951,   -592,    -57,
+       210,  -3248,   -226,    -44,    391,   -167,     -7,    219,
+       -15,    172,      0,     -1,      1,      0,      0,      0,
+       106,    -70,   -291,    192,     45,    162,     37,    143,
+        91,     21,  -7032,     12,   -173,    -30,      1,    259,
+      -286,    387,    -36,      0,      0,      0,      0,      0,
+     -1593,   -210,     83,     47,    194,     61,     85,   -182,
+       -23,     40,    -74,     22,     12,    216,     59,   -165,
+      -163,   -159,     -8,      0,      0,      2,      0,      0,
+        -3,    182,    -80,   2068,    702,    115,   -164,    -85,
+        21,   -124,   -191,   -113,    263,    138,   4235,     37,
+       204,   -436,      0,     24,      1,     -1,      0,      0,
+       147,     83,   -177,   -168,   -609,     -9,    -16,    -46,
+       127,    120,    -25,   3435,     51,     31,     49,    366,
+        31,   -129,      1,    -32,      0,     -1,      0,     -2,
+       295,    158,    116,     11,   -280,    471,    169,     29,
+     -2589,    338,     32,    299,    172,   -187,    -32,    437,
+       -38,    359,     -1,     -1,      1,      0,      0,      0,
+       243,    413,    -29,  -4774,    187,     12,   -117,    168,
+      -114,   -208,    -55,      5,      0,    -31,    436,    545,
+       -45,    272,      0,     -4,      0,      0,      1,      0,
+       127,     38,   6620,    -33,   -103,     34,     84,    -35,
+        30,   -131,     -8,    -79,   -126,    -98,     17,    -75,
+       -31,   -176,     14,     -1,      0,      0,     -1,     -1,
+       273,   -219,    176,    -83,    187,    -36,      1,   2639,
+       158,   3812,    127,   -233,    175,    310,    148,    387,
+       -14,    308,      0,     -3,      0,      0,      0,      0,
+      3321,   -447,    153,   -128,    254,   -275,     79,   -181,
+        17,    146,     61,     46,    -48,    253,     51,    -17,
+         1,      1,      0,      1,     -1,     -2,      0,    -13,
+       791,   -130,     40,     78,    -64,   -179,     42,   -455,
+       422,    112,    -19,  -4499,   -113,   -341,     52,     69,
+        67,    254,     -6,     -1,      4,      0,      0,      1,
+       -98,   -976,     68,   1563,    228,   1018,    458,  -1020,
+       411,    249,   -627,   2321,    738,   -460,  -1469,    362,
+       884,   -261,      0,     -1,      1,      1,      0,      0,
+      -601,    378,    -71,     61,   -160,    800,   -386,   -773,
+       303,    -53,    248,    -22,     59,  -3809,    -61,    102,
+       -45,    395,      0,      0,     28,      0,    -12,      0,
+       717,   -424,    499,    296,    -15,     11,   2732,   -103,
+      -119,   -116,    107,    -50,    462,     73,    -82,     75,
+        41,    131,      0,      3,      1,     -1,      0,      0,
+      -134,    109,     48,  -1847,   -205,     -6,     20,   -203,
+       136,    197,    113,    -77,   -124,    -50,    184,    225,
+      -175,   -295,     -1,     -1,     -6,     -1,     -1,      0,
+       -59,  -2017,   -193,   -237,    226,    630,   1950,     -2,
+       179,  -3666,    -34,    140,     88,    157,     51,     81,
+      -263,   -169,      1,      0,      0,      0,      0,      0,
+       229,    -14,  -1590,   -123,    162,     63,   -224,   -332,
+       119,   2931,     21,    -48,    406,     15,    320,    -51,
+        64,   -228,     -9,     -1,      0,     -1,      0,      0,
+      -453,     84,   -320,   -654,     -4,    -91,    -61,    558,
+       -61,   -233,     31,   -224,   -105,     63,     86,   3771,
+       162,  -1535,      3,     -3,      1,      1,      0,      1,
+     -1992,   -279,    -59,  -3048,  -1696,    102,   -168,    194,
+       172,   -142,     55,    134,    116,   -146,    -29,   -287,
+       102,    265,     -3,      1,      0,      1,      0,      0,
+       -96,     46,    -16,   2474,    -58,   -712,    -25,   -294,
+       187,     22,    -39,   -102,     62,   2666,   -237,     -1,
+        32,    -41,      0,      0,      0,      0,      0,      0,
+      -282,    -25,   -198,   -862,   -127,   -379,   -210,    -20,
+        45,    -79,  -2805,   -364,    575,    106,    215,   -410,
+       -76,    511,     15,    -44,     -1,      1,      0,      0,
+       329,    224,    130,     43,     -1,   -255,    -51,   -297,
+      4529,     52,    186,    757,    -68,    -89,     46,    250,
+        46,    -79,      5,      1,      0,      1,      0,    -19,
+        79,     74,     65,    256,    260,    492,   -106,   -217,
+      -357,     20,    166,    233,    132,    165,     18,     -1,
+      4445,    -22,      5,      3,     -7,      0,      0,     -6,
+      -922,   2156,    269,   1385,    235,   -206,    -94,    130,
+       112,    145,   -126,    166,      1,     45,     83,     36,
+      -153,   -255,      0,     -1,      0,      0,      1,      0,
+       241,   -237,   -117,   -510,     85,      7,  -4418,     30,
+        94,    -92,     99,    -71,    140,   -265,    149,     69,
+       286,    104,      0,     -2,      1,      0,      0,      0,
+      -165,     22,   -245,     29,     50,    145,    -53,   1641,
+       -40,   -128,   -112,   -190,     47,     53,   -247,    -50,
+        88,     39,      1,     -1,      0,      0,      0,      0,
+      -288,    130,     88,   -132,   4055,     -7,     55,   -105,
+       277,     81,     69,    -66,    -53,     52,    -56,     90,
+       160,    386,      1,     -4,      0,     -2,      0,      0,
+       107,    124,    -39,     40,     25,     -6,   -248,    -81,
+        70,    -13,     46,      5,     20,     24,     -5,     -2,
+       -41,    -34,      1,      1,     -8,      0,     -4,      0,
+       -61,      1,    457,    454,    768,     89,    640,     61,
+        66,   -360,  -2727,   -155,   -370,    -44,   -292,    570,
+        34,  -3209,     -5,     -1,      1,      0,     -1,      0,
+        22,    -82,    -20,   -125,    -91,     98,   7843,     25,
+        -2,    -31,      2,    -52,    -73,    -25,     31,    -35,
+        -6,   -114,      1,     -1,      2,      0,      0,      0,
+       217,  -5202,     86,    -76,    -76,    109,    389,    -95,
+      -253,    124,    130,     58,    190,    -44,    -67,   -142,
+        54,      6,     -1,      1,      1,      1,      0,      0,
+      -183,    547,   -200,    348,    372,    437,    425,    547,
+      -457,    388,     87,     38,   -522,   -210,   -556,     41,
+     -2979,    -17,      7,     -4,      6,      0,      0,      0,
+       189,    196,    240,    -75,     46,    -50,    101,   -160,
+       -16,   -223,     92,     71,  -7633,     78,     90,     69,
+       190,    -75,      2,      1,     -2,     -1,      0,      1,
+       205,   -433,   -267,   -175,   3068,   -210,   -514,    330,
+     -3099,   -273,    155,    132,   -306,    361,    316,    -53,
+      -421,   -125,     -3,      0,    -11,      0,      0,      0,
+       179,    -38,    151,    -36,    215,   -102,   -145,    139,
+        50,    200,    383,     37,   3102,    -27,      9,   -157,
+       -68,    367,      1,      1,      0,      0,      1,      0,
+       -50,    177,    -24,     24,    119,      4,     76,     99,
+      -111,  -7367,     26,     51,    -11,   -146,   -125,    -48,
+        54,     50,      1,      0,      0,      0,     -1,      0,
+       -71,    -16,   -184,    -61,    -36,   -151,     79,   -128,
+      -102,    135,   -228,    190,    -79,    -10,   -176,   -113,
+      1008,   -856,    -13,     -4,      8,     28,      0,      1,
+     -4909,    -93,   -167,   -141,     51,   -203,     71,   -199,
+       -49,    106,   -142,    -94,    126,   -225,    158,     36,
+       269,    159,      0,      1,      1,      0,      0,     -5,
+       -61,    -79,    -20,    306,     67,   -621,   1774,    346,
+      -442,    125,    305,   -170,     55,  -2537,   -103,    118,
+        87,    505,     16,     -7,     -2,      0,     20,      0,
+        35,   -154,   -158,    224,    -36,   -344,     79,   4232,
+       234,   -219,    -71,    204,   -484,   -131,   1153,     23,
+       111,    499,      5,      0,    -17,      0,      0,      1,
+      1135,  -3469,   -489,   2572,   -450,   -432,   -358,    -34,
+       -78,    -10,   -775,     17,   -131,   -154,    218,     82,
+      -312,    279,      1,      0,      1,      0,      0,      0,
+        96,    230,     18,     47,     -5,   -102,    646,   -122,
+        35,    -81,    183,    171,  -1479,    201,     84,    -24,
+       143,    302,      1,      5,      0,      0,      0,      0,
+       -34,    -48,     89,   7789,    -85,    -27,    -56,     46,
+        39,     30,     98,    -40,    138,   -147,    104,    -35,
+       -41,   -151,      1,      9,      1,      0,      0,      0,
+      -140,  -1970,   -170,    273,    226,     33,   -324,    -38,
+        11,    188,    603,    188,   -183,     98,    -58,    -67,
+       -63,      7,      0,      0,      0,      0,      1,      0,
+       384,    899,    493,    765,  -1062,    646,    275,  -2699,
+        93,    796,    120,    -25,    177,    -85,    721,   -189,
+      -295,   -436,      0,     -1,      0,      0,     -1,      0,
+      -358,    117,  -2435,    325,  -3137,   -158,     23,     97,
+         6,    204,    288,   -426,    156,     22,   -101,    171,
+       -56,    235,      0,     -1,      0,     -1,      0,      0,
+       656,   3878,   -286,   -383,     75,    -50,    114,   -377,
+      -105,    106,    154,    -30,   -204,   -105,    171,    -56,
+       230,   -587,      0,      1,      0,      8,      1,     -1,
+       -58,    177,     -7,     45,   -159,    405,     45,     84,
+      -206,     77,    277,   -259,    121,   3719,    140,     79,
+      -202,    843,     -8,      0,     -1,      1,     -2,      0,
+      -248,    560,   2651,    -49,   -625,   -147,  -2416,    119,
+       -70,     87,    137,     18,   -401,   -147,   -598,   -150,
+       239,  -1004,      7,      3,     13,      1,      1,      1,
+       276,    342,     97,    600,    230,     95,    213,    159,
+      -259,    -25,   -176,   3360,   -283,   -325,    -37,  -2626,
+      -151,    178,     -1,    -18,      0,      0,      0,      0,
+      -233,    237,    -78,    290,   -284,    141,    -20,    146,
+        58,    -21,     73,    -35,   -101,    -23,  -4068,   -116,
+        49,   -196,     -5,     -2,      0,      1,     -1,      0,
+      -292,   -195,     51,   -714,    172,     44,   -119,    134,
+       168,    107,    -74,  -2379,    308,    173,   -252,  -3470,
+      -135,    641,    -10,      0,      0,      1,      0,      0,
+       146,   2060,    -84,   -164,   -247,     26,  -1724,    216,
+       226,  -2499,    312,    -66,    850,     41,     -1,     20,
+     -1339,    411,      0,      0,     -1,    -12,      0,      0,
+       921,     17,  -3510,   -119,    325,     34,    -97,   -205,
+         3,   -188,    252,     91,      0,   -135,    -76,    208,
+       199,   -202,     -1,      1,      1,      2,      0,     -1,
+       -88,   -461,    319,   -963,    266,   1540,    643,  -3424,
+        76,  -1058,    501,    342,    297,    268,   -158,   -103,
+        26,    -30,      0,     -1,     -1,      0,      0,      0,
+       211,    245,    183,   1579,    106,     26,  -3450,    -22,
+     -1053,   -266,   -736,    113,    475,   -241,    117,    -85,
+      -492,    372,      0,      1,      1,      0,      0,      0,
+};
+
+static const int16_t cb0806ss0[] = {
+      -381,  -1638,  -8192,      5,    983,  -1481,    -20,   -719,
+      -238,    767,    571,   -200,    754,    460,   1678,   1376,
+      -155,  -1998,    294,   -455,     80,      2,     26,      3,
+        10,     25,   -931,  -1098,  -1166,  -3221,  -1995,    702,
+       104,  -2429,  -2270,   1372,   2326,    -37,  -1492,   1692,
+       644,  -1283,    363,    624,   -483,    -15,    346,     -6,
+         2,      0,      1,      3,      2,  -2429,  -8192,   -956,
+      1190,    706,   -955,    367,    959,   -194,   -723,  -1104,
+       375,    554,   -962,   -229,     66,    368,     18,   -150,
+        56,    968,    -15,      0,     -1,     -5,      0,      9,
+      -250,   -720,   1910,    827,    198,   -645,   2021,     32,
+     -1972,   -705,    441,    373,    800,  -2293,   1747,   1504,
+      -537,  -1731,  -1192,   1597,  -4031,     24,      0,     -2,
+         1,      1,      1,   -131,   1594,   -153,   1127,   2732,
+       469,   -558,    -11,   1190,    115,   -933,   1988,   1841,
+     -4530,   1385,    571,   2399,   1709,    -63,  -3663,  -2681,
+        57,     -4,     11,     -4,      0,     -3,    426,  -4257,
+      2755,    -76,  -1667,   2450,   -373,   3375,    -91,   -232,
+       511,    648,    886,   1182,   1667,     65,  -3029,   -579,
+       865,   2186,   2911,    537,      0,      2,     -3,      0,
+         7,    585,   8192,  -2855,   8192,   5527,  -5491,  -1926,
+     -4231,  -1204,   1953,  -1193,    191,   3278,  -1726,    259,
+     -2794,   4205,   4315,  -6121,   -606,  -1922,   3666,   -324,
+      -238,   -313,   -720,  -1447,   -539,   -794,   3151,  -1726,
+      3444,    876,    584,   -671,   -497,    407,    909,  -2183,
+      2575,    246,   -673,    270,    824,   1784,   -201,   7329,
+       589,    -70,     -1,      4,     -5,     -3,     -8,   -417,
+       382,   2786,   -972,    520,   1154,    886,    521,   6032,
+      -687,   3791,   -522,  -1226,    608,    428,    891,  -1524,
+     -1015,   1147,   1278,    559,     -6,      3,      0,      6,
+         2,     -3,    115,   3586,  -2847,     95,    460,   2832,
+      2326,  -1665,   1720,    453,    965,   1154,    452,  -1721,
+     -1375,   -269,   2138,  -2032,     55,   -674,   -870,   -124,
+         0,      5,      0,     -5,     -3,   -283,   1077,   2604,
+      1270,  -1082,  -1753,   6840,  -2502,    988,  -1790,   1378,
+      1231,    438,  -1188,    286,    540,   -138,   1054,   -111,
+     -2321,     74,     56,     -3,     -2,      0,    -32,      5,
+      1539,  -1399,   7413,   -903,  -1698,   1781,   -255,   -466,
+     -1436,   3419,   1916,    852,    590,  -1126,  -1617,  -1309,
+     -5560,   -241,   3363,  -1225,   2682,    620,     -6,     58,
+         2,   -186,    -17,  -2959,    619,   2228,  -2627,  -3119,
+       730,   3716,   -538,   -101,  -1863,   -516,    142,  -2384,
+     -1514,  -5506,   -825,    514,    714,    746,  -2790,    569,
+      -425,      4,    -68,     70,     24,     12,    817,   -276,
+     -3363,  -2942,    103,   -581,   -925,    651,    561,     43,
+       434,    712,   -541,  -2042,  -1291,   -453,   -443,  -4312,
+     -1344,   1277,    605,     -4,      0,     -1,     -1,      1,
+         2,   -930,    276,   3219,   -404,   -944,   -497,    840,
+       278,    -98,  -1432,  -1136,  -1975,  -1863,  -1102,  -1446,
+       938,    693,  -5186,     -1,   1085,  -2275,      1,      1,
+        -1,     -1,     -2,      3,  -1194,   -312,  -1257,   1973,
+      1570,  -1703,  -1637,    639,   -855,   1925,    970,    604,
+      1313,    780,  -5170,   -603,    220,   -731,   2952,   -872,
+       166,     30,      0,     -2,     -1,      3,     -1,   -743,
+       504,   1363,   1436,   1632,   -634,   -709,  -2346,     87,
+      1149,   3468,   2132,   3028,  -1039,    -92,   2087,   -990,
+      -301,    966,   -773,  -1057,     42,      0,     -2,      0,
+         2,      2,    252,    217,   3625,  -2323,    212,   -381,
+     -1121,   1664,   -307,   1680,   2193,  -1854,   -187,  -3100,
+       254,   -673,    595,   1995,    669,   -687,   -509,     13,
+         0,      8,     -3,     11,     -3,   -552,    -87,      6,
+      2933,   -267,  -1392,     40,    644,     32,   2966,  -1386,
+     -2480,   -956,   1160,   1399,   1049,   3902,  -2092,   -525,
+      1724,     69,    -33,      0,     -2,      0,      2,      2,
+      -452,  -4739,  -3237,   -510,   -598,  -1397,    855,   1573,
+      2143,    -79,  -1546,    -17,   -973,  -2400,   1689,    133,
+     -1213,    784,    726,    916,   -388,   -390,      1,     -1,
+        -3,     -1,      0,    170,   -205,  -2905,   8192,   -465,
+      3119,   4407,   -709,   -403,    859,   -373,  -1301,  -1397,
+      -750,    -88,    277,  -2097,   -222,   -134,    -88,  -1189,
+       974,    -56,    -57,    -83,    -21,    102,    626,   -114,
+     -2304,    979,  -1836,   -868,   1261,   2226,   -261,    579,
+       983,    655,  -2578,   1803,    117,  -1128,    365,   3971,
+      3539,    -21,   -790,    -62,      2,      3,     23,     -3,
+        31,   1273,   3212,  -1617,   4116,   -281,    725,   -284,
+      1079,    293,  -3759,   2581,  -1617,   -259,    -19,  -1999,
+      3040,  -3077,  -1522,   1056,    -92,    897,    243,     -1,
+        36,    -19,    -10,    -46,    231,   1129,    363,  -1978,
+      -882,  -1788,    319,   4807,  -1707,  -1379,  -1465,   2327,
+      -827,   -681,    410,  -1816,  -2507,   1036,    740,    730,
+      -687,    100,     -1,     -1,     -1,      1,     -4,   -276,
+       303,  -2331,  -2912,  -1864,  -3694,    412,  -1218,   1642,
+      4448,    658,   -213,    872,   2867,    227,    868,   -590,
+      2293,   1759,  -1666,  -1585,   -140,      1,     -3,     -1,
+        26,    -10,   -287,    898,  -2442,   3997,  -1655,  -1341,
+       -56,    689,  -1869,    572,  -2044,    616,  -2603,   -278,
+      2987,   2397,  -2055,    247,    128,    598,   1732,   -146,
+         0,      3,     -1,     -3,      5,    842,    597,    779,
+     -1529,   -802,   2142,  -1668,   2339,  -3550,  -2651,   1733,
+     -1531,    -46,    600,    618,   -867,   -665,   1524,    392,
+     -1386,  -3279,     45,      0,      9,     -7,     -3,     -8,
+      -224,  -2632,   -147,   -505,   2223,   1773,   1799,  -1696,
+       194,  -1186,   -543,    775,  -1171,   5491,  -2319,  -3193,
+      -313,   -355,   -133,  -1097,    125,    -22,     -2,      2,
+         1,     -3,    -10,   -354,  -1447,   -662,   -313,  -4302,
+      3888,   -121,   -323,   1112,   -801,  -1513,   -814,  -1646,
+      -616,  -1207,    347,    483,    670,    900,    -35,   -885,
+        14,      1,      0,      1,     -2,      7,   -432,   -486,
+     -1539,    785,   4853,    904,    925,    895,  -1223,  -2464,
+      3395,   -506,   -808,    207,    197,    874,   -928,   1347,
+      -107,   1512,   1063,   -182,      1,     -4,     -1,     -6,
+         3,  -1236,  -1047,    774,     26,   -630,    863,   1055,
+     -2632,  -1187,   -534,   -619,  -1079,  -2574,  -2037,    658,
+      1229,   -262,   2702,  -3393,  -2187,   1764,     66,      0,
+         7,      0,      7,     -3,    677,   -444,  -2111,  -5256,
+     -4485,  -1667,   2077,   1613,   1483,  -1520,   1600,   1767,
+      1148,   2054,   1676,   1866,    783,  -2199,    765,    568,
+      2779,   -683,      4,     17,      0,    -32,     15,     45,
+       228,  -2445,    752,   2510,  -1657,  -1039,    113,   1107,
+     -1054,  -1765,  -1245,  -2527,    589,    455,    328,    640,
+      -579,   2370,   1313,   -540,     31,      1,     -1,     -4,
+         2,     -3,   -235,   -560,    455,   3809,    102,    403,
+       -21,   1844,    402,    148,    -32,   5573,  -3765,   -265,
+      -718,   -399,   -349,    366,  -1105,     91,   1881,     34,
+         1,      1,      5,      0,      9,    289,  -1146,    795,
+     -2504,    412,   1156,   -302,   -946,   2063,  -2569,   -273,
+     -1434,    141,    642,   -631,   4856,  -1008,    169,    -40,
+       191,  -2293,    -86,      6,      1,     -2,      0,      1,
+       139,   1955,  -1111,   -944,    140,  -1074,   1071,  -1312,
+      -541,    664,   1801,   -892,   1605,  -1750,   -654,   -680,
+     -8102,    120,    -24,   1014,   -351,   -120,      0,     -2,
+         1,     -1,     -1,   1038,   5199,    779,  -1195,    128,
+       462,    184,   3705,  -1292,  -2247,  -2481,   2610,   4396,
+      4161,   4039,   1111,    838,    188,   -571,   2811,  -1915,
+     -1909,     13,     99,    -20,     -2,     11,    395,    155,
+      2667,   -202,  -2639,   1303,   -912,  -1734,   1097,   -583,
+      3532,   -218,  -1514,  -3881,    378,    -46,  -1189,   -957,
+     -3010,   -743,   -648,     15,      1,      3,      3,      4,
+        -4,    330,    198,   -275,   -677,  -8192,   -629,   1953,
+      -783,    592,    926,   1487,    -39,  -1002,   1134,   1560,
+       -27,   -118,  -1363,   -360,   2163,    442,     92,      1,
+         1,     -2,      5,      1,   -670,    326,   2773,   1346,
+       -26,    327,    184,  -1091,   -121,    576,  -1324,    212,
+      -645,    860,  -2111,   -493,  -2119,    316,   -688,    475,
+      -652,    -33,      0,      1,      2,      0,     -3,     92,
+       170,   6224,   2162,    761,  -1994,   2176,   1692,  -1773,
+       561,   -966,   3406,    -20,   -593,    574,   -681,   1121,
+      -335,   -412,  -2651,  -4712,    -79,      1,      2,     -1,
+         4,     -6,    932,  -2579,    344,  -2614,   1119,   6623,
+      -314,  -1068,    338,   1977,  -1375,  -1338,  -1996,   1310,
+       118,   -500,   -393,    622,  -1798,  -1232,      3,    -75,
+         0,     17,      0,     -2,     -9,    715,   8135,    400,
+      3748,   2156,   1882,    772,   2728,   -403,   -775,   2110,
+      1603,   -766,  -2592,    767,   -618,   4727,    668,   2280,
+     -1157,   1246,   -794,    -14,     -2,      2,      5,     16,
+      -107,    642,  -1806,   -158,  -2447,    309,   -764,   2313,
+      -101,   -766,    209,   -691,   2001,    268,   -273,    615,
+       803,   6062,   -434,   1287,   -543,     -3,      0,      0,
+         1,      1,      0,    503,   -598,  -2043,  -1160,   1074,
+      1255,   3269,   1405,   1182,    197,   3098,   -138,   2326,
+      -244,   -772,    901,   -225,    337,    -65,   -536,   -331,
+        15,      2,     13,      8,     -3,     20,    -32,    -52,
+     -1012,    232,   1502,    -17,  -1574,   -741,    -57,    164,
+       -22,     74,   -181,   1616,    296,  -1483,   1387,   -357,
+     -5380,   -322,  -1346,      6,     -3,      2,     -3,      1,
+         0,   -392,   -811,   -650,   -485,   3038,   2750,   -776,
+      -503,  -1664,   -323,    253,   -280,  -3459,  -1313,    541,
+      2182,   1287,   -782,   1785,   -695,    -49,     72,     -4,
+         0,    -15,      3,    -21,   -211,   1382,   -149,    684,
+      2210,   2654,  -1440,  -1209,    152,   1080,  -3078,   -694,
+      4738,    985,  -1337,    819,   -518,   1799,   -671,   3201,
+      2636,      7,      1,     -6,     14,    -31,      0,    -34,
+      4296,    -23,    194,   1976,   -993,   1353,    709,   -342,
+     -1142,   -140,   -271,   2291,   -709,   1734,    818,  -3571,
+      1125,    912,   -590,    784,   -275,     -2,     -1,     -5,
+        -1,      0,   -381,   2754,   1545,  -2270,   3608,   2308,
+     -1899,    178,    391,   1826,   -127,  -1417,   -822,   -712,
+      1682,   2225,   2247,    446,    994,     56,    734,    196,
+         7,      3,      8,      0,      7,    639,    833,  -3313,
+       675,   -263,   -648,   3016,   -701,    235,  -1304,   -582,
+     -2930,   -210,  -1243,    374,  -3095,  -2013,    354,    599,
+     -1469,    140,    -17,     -1,     -3,      2,      0,     -2,
+      -183,    399,   -603,    796,  -1424,   2685,  -3929,    416,
+     -2291,   1737,   1906,   1667,    810,   -222,   3242,  -3636,
+      5196,  -1542,    940,   -124,   2047,    -67,     -4,      6,
+        -1,     13,      2,   -161,    417,   4132,    492,  -1068,
+      -817,   2732,   -250,  -1457,   1723,   2104,   1121,  -1276,
+      1147,    990,   -523,  -1533,    297,   1219,   3901,  -2549,
+       -22,      0,      0,      0,      0,      2,  -1632,    172,
+       829,   -747,  -1229,  -1990,  -1070,   1134,   1623,    228,
+      3689,    625,   -757,   8192,    -82,    738,    213,   1900,
+     -1200,     91,    892,    -45,     15,     -1,      5,     -4,
+         5,    392,  -3067,  -1903,    139,    661,     43,   2174,
+     -1919,   -270,  -1490,   -569,      2,     85,  -1091,   6740,
+       886,     85,  -1052,   -647,   -563,  -2971,   -145,     -1,
+        39,     -5,     -6,     -7,  -1023,  -1104,  -1774,  -3154,
+     -1058,   3488,  -2551,   3547,   -253,   -204,   -235,  -1544,
+       -73,   -584,   -302,  -3118,  -2314,   -308,   1790,    916,
+       152,   -155,    -11,      6,    -26,     -1,    -31,     21,
+       919,  -1856,   -456,  -1050,    663,   1454,  -1515,  -2606,
+     -4287,   1553,   3564,   1334,   1797,   1540,   -392,   -701,
+      -971,  -3442,    281,   -271,    133,      1,      5,      4,
+        32,      3,   -521,  -1530,  -1368,   1787,   -515,   -913,
+     -2391,     93,   2690,   -578,   -576,  -1656,    554,    649,
+     -1509,   -258,   -605,   1233,  -2258,    640,    837,    -43,
+         1,     -3,      0,      5,      3,    148,  -4761,   1783,
+      3244,   -277,  -1139,   1539,  -2016,   1898,  -1276,   -776,
+     -1725,  -1900,    -51,    559,    311,   1737,   -928,   3687,
+     -1087,   1329,    134,      2,     -2,     -7,      9,      5,
+       -77,  -1116,   4986,   -940,   -905,  -3229,   -773,   3335,
+       -23,    578,  -2376,    386,    122,   1253,    363,  -2748,
+      -512,  -4612,   1690,    848,  -1116,    195,      5,      2,
+        11,      1,     18,    659,  -1282,    562,   1170,   4701,
+       903,    490,  -3508,   3468,    -39,    654,  -1196,   -909,
+      -268,    980,    283,   3221,    348,   1121,   -897,  -1011,
+      -103,    -11,     -2,     -9,     16,     -8,   -274,  -4100,
+     -2312,  -2379,    617,   1629,   2154,   3026,  -1737,   -603,
+      -803,   -366,    977,   1035,  -1835,   -255,   -275,  -1245,
+      1274,   -161,  -4476,   -181,     -4,      0,     -2,      1,
+         2,    156,    551,   -832,   -630,   3740,  -2115,    344,
+       229,   1295,     65,    290,  -1462,  -1794,   3297,  -1049,
+      2451,    322,  -2642,  -2810,  -1246,    613,     90,     -1,
+        -1,      0,      0,      0,   -277,    854,   1259,   1542,
+      -433,   3601,   -453,   1091,   -113,   1438,    994,  -2746,
+      -786,    867,   1422,   1093,  -1723,  -1167,  -1389,  -1062,
+      -436,    -81,      2,      1,     11,      1,     26,   -197,
+};
+
+static const int16_t cb0806ss1[] = {
+      1760,  -4335,   6384,  -2036,   2874,  -2504,  -1529,    102,
+      6995,  -1267,  -3141,   1050,    -59,   1556,  -1002,   1536,
+      1024,   1867,     40,  -1156,  -2627,   -213,  -1034,   -660,
+       291,   -963,   -323,    462,   -804,   2219,   -859,   1709,
+       550,  -3390,    319,     24,    644,   3154,   4503,  -1961,
+       744,    194,   -151,  -1255,  -1318,   3033,   -899,    -18,
+         1,      0,      2,      0,     28,  -1213,  -3725,  -2525,
+      -177,  -1164,    361,   -357,   -649,   -459,   1324,   2463,
+     -3108,  -3323,   -575,  -2744,   -108,   -121,   -508,   -564,
+      -849,   -773,   -288,      0,      8,      0,     -2,      5,
+       691,   -602,   2269,   2373,  -2027,    786,   3011,   3234,
+     -1387,   -310,    659,   -358,   1058,  -1554,   1031,    795,
+      2254,   -549,    334,    325,    599,    -36,     -1,     -1,
+        -2,      3,      4,   -450,   -533,  -1657,  -1928,  -1034,
+      -636,  -1446,   -320,   2695,   1184,    697,   1126,   1159,
+      2970,    449,    -30,  -2058,  -1171,   -684,    -66,    905,
+       -43,      1,      0,      3,      0,      3,    228,    272,
+       -79,   -718,   1978,    667,  -2760,   1507,  -1893,   -796,
+      1164,     35,  -4440,  -4492,  -1667,   4189,   6485,   -495,
+      1721,  -1639,   -526,    458,      0,    385,   -183,    511,
+      -153,  -2025,   -376,   2948,  -2606,   -910,   -741,   -427,
+     -1080,   2128,    565,   -483,   1791,  -2222,    -45,  -1204,
+       799,    512,  -4790,   1462,    511,  -1906,     15,      0,
+         0,      1,      3,      8,   -867,   -685,   -140,   5299,
+       376,   -891,   1657,   1843,  -1465,  -1297,    518,  -4640,
+       303,   -277,   -650,    -97,   2308,   -679,    720,   -171,
+      -475,   -269,      0,     -5,      4,     -1,      9,  -1155,
+     -4954,   1684,  -2045,    939,    819,   -751,   -165,    -93,
+     -2327,    306,    965,   4999,    557,    -55,   -999,     30,
+       -36,    989,  -1680,  -1594,    318,     -3,     -8,     -4,
+         1,     -9,   -402,   8192,    475,   2080,   -418,  -1739,
+      -273,    -55,   -441,    794,    -79,    272,  -2039,    789,
+      2266,    874,   2495,    627,   2203,   1212,  -1052,    389,
+        14,    -24,    -59,     10,    133,   -535,  -1160,  -1139,
+      -146,    180,   1064,   3718,  -1412,   1153,   1873,   -549,
+     -1698,  -1479,    209,    725,   -940,   2152,   1848,    678,
+      2493,   4608,    -11,      0,     -1,     -3,     -3,      2,
+       334,    681,    673,  -8192,   3958,  -3111,   1641,   1500,
+      1184,   -268,  -3147,    571,    958,   -663,  -1031,   -870,
+      -674,  -1098,   -529,     78,   1212,    120,     -8,    -13,
+        -5,    -42,    -37,   -498,   1304,  -2541,   1730,   -355,
+      1462,   2315,   2017,   -403,  -2010,    555,   1391,    887,
+      2039,    366,    135,     85,    371,   1291,   -225,    335,
+       -45,      0,      1,      2,     -1,      2,  -1095,   -261,
+      3249,   3212,  -1877,    934,  -1671,  -1289,   1398,  -2287,
+      -205,   1659,    642,   1105,    751,   2864,   1171,  -1001,
+       318,   -290,     60,    -54,      5,      3,      5,      2,
+         1,   -105,    590,     36,   -194,   1832,   -639,    777,
+      3243,    578,   2820,    428,   2020,    623,  -2104,    -52,
+      -331,  -1015,   3064,   -347,   -303,  -1100,     61,     -1,
+        -1,      0,      2,     -1,    592,    127,    887,  -1094,
+     -2819,   2573,  -2670,  -1693,  -2775,     48,   -266,   -961,
+      1220,   -472,    167,   3201,   1118,   -173,   1304,    -26,
+      -899,     76,      0,      3,      0,      1,     -1,   -718,
+      -746,    947,   -524,    142,    958,  -1609,   -777,  -1362,
+       385,   -578,  -6947,    157,   -290,   1357,  -1703,    484,
+       117,  -2224,  -3736,   -838,    -96,     -1,     11,      5,
+         4,      2,    475,   -426,    500,   -767,  -2304,   1248,
+      2200,  -1829,   -992,   -225,   -573,  -1107,   -832,   2555,
+     -2866,   3453,   4335,    -88,  -1160,  -1666,    -94,    -33,
+         0,      0,      1,     -2,     -7,   -147,  -8192,   1204,
+     -1181,   -702,   -604,   -770,   1032,   -173,    770,    861,
+       611,   -509,    802,   -467,    839,    491,   -785,    523,
+      -669,     73,    -34,      0,      0,     -2,     -3,     -3,
+       286,  -2183,  -1238,   1743,    387,  -2228,  -1404,  -3439,
+     -1701,  -2371,   -451,   2294,   2061,   3062,  -1122,  -1489,
+     -1274,     51,   5649,   -170,   2197,    365,     -1,    -13,
+         4,      3,     -5,    -15,  -4099,    789,   4132,   4982,
+     -1996,    784,    748,   2123,   3535,  -1493,  -1454,   -344,
+      -867,     40,    831,  -1198,     66,    542,   1633,  -2402,
+       117,   -119,    -18,     49,     18,     40,   -500,    808,
+      -726,   1192,   3623,   1526,   -484,   1080,  -2502,   -579,
+      1315,  -1887,     84,   1771,  -2902,   1387,  -1098,   1559,
+     -1126,    652,   -896,     32,     -1,      3,      1,      3,
+        -2,    233,    782,   8192,    566,   -701,   -352,   1047,
+       581,  -1070,   3159,  -1157,  -1585,   1599,   -978,   -663,
+      -931,  -2581,   5074,    781,   -551,   -590,   -247,    -63,
+       -54,    -50,    253,   -138,   -313,    387,  -3004,  -1136,
+       654,  -1283,   1318,    434,     80,  -1486,    694,   -512,
+       393,   -238,   -700,   -232,    706,   1478,  -8192,    377,
+       601,     18,     -1,     -3,      0,     -6,     -3,   2221,
+      3531,   -862,   1792,   -242,  -3686,    420,   1891,    918,
+      1324,    234,   -819,   -601,   2363,  -1097,   2355,    754,
+      -125,    245,   -615,   3285,    204,      0,      6,     -4,
+        -3,     -1,   -637,    673,   1233,   2886,    265,   -195,
+      -226,   2521,    281,   -210,   1809,  -2733,  -3865,  -2287,
+       641,  -2604,  -4235,    107,    789,   1163,  -2600,   -463,
+        -5,     10,      2,    -10,     39,   1380,    754,  -5077,
+      4061,  -1633,  -1738,  -1604,   1937,   1815,   1039,   3696,
+      -593,   2218,  -1061,   1081,  -1217,   2062,   -637,  -1580,
+       149,   -626,   -253,     -3,    -17,      2,     33,      1,
+       118,    525,    158,   1213,    910,   -105,  -1437,  -1311,
+      2255,   -419,  -2394,   1542,  -3830,  -1167,   -998,  -1099,
+      1635,   1678,  -1112,   -275,    122,    -50,      0,      3,
+         0,     -1,     -1,    998,  -4020,  -1913,  -1083,   -159,
+      1853,   -436,   -683,    298,    211,    711,   4128,  -1977,
+      -958,   1048,    642,   -420,    329,  -1150,    459,   2161,
+        29,     -4,      0,     -1,     -6,      1,   1365,   1053,
+      1032,    952,    854,   2405,   5106,   1863,   3049,    981,
+      -863,   -397,    508,  -1283,   -631,     17,    532,  -1453,
+     -1056,     66,    501,    -27,     -1,      3,     -1,    -13,
+        -2,   -273,  -2924,    839,   -433,   -395,   -252,   1945,
+       195,   -307,  -1297,  -1474,   -985,   4412,  -1017,   1074,
+      2711,    996,    919,    183,    -10,   -605,     38,      1,
+        -1,     -1,      2,      1,   2115,   -422,   3655,  -1972,
+      1473,  -2033,   2461,  -1112,  -1267,    179,   -394,   -906,
+     -1273,   -432,   1082,    367,   -720,   1746,   -657,    595,
+       701,     16,     -1,      0,      0,      2,     -3,   -255,
+       443,  -1840,  -2379,    296,    258,   -675,   -221,    406,
+      -216,  -6295,  -1041,   1062,    199,   1705,  -1032,  -1627,
+     -2399,    198,  -1097,   -271,    -99,      0,      1,     -2,
+         2,    -13,    343,   -219,  -1447,   1779,    630,  -1944,
+     -1093,  -1578,    -62,  -1334,   2811,   -815,   1311,  -3102,
+      -300,     67,     24,     98,    764,  -1246,    203,      6,
+         0,     -4,      0,      1,      0,    -18,  -1704,  -1427,
+      -352,  -2665,   -588,    287,    715,   -454,    688,   -424,
+      1736,  -1124,   1028,  -7581,   -752,   -482,   -363,    -75,
+      -720,   -619,    449,      0,      3,      0,     16,     -3,
+     -1211,   2484,   3490,   -547,   -705,   1776,   -286,  -1580,
+      2896,  -2257,   -214,  -1784,  -1266,   -562,  -1170,   -542,
+       785,   1606,    535,     51,  -1405,     -7,     -1,     -1,
+         0,     -1,      2,   -428,   -579,  -1091,  -2627,   2287,
+      -757,   1445,   -411,   -160,    567,    108,  -1305,  -4356,
+      -390,   -917,    345,  -2169,   -896,   3772,   1224,    691,
+       -25,      1,      1,      1,     -2,      1,    281,   1365,
+     -1628,   -585,   3485,    169,    746,   -395,   1072,   1569,
+     -1073,    744,   1274,  -3472,   1035,   -906,  -3394,  -1537,
+      -869,   2841,    401,      4,     -1,     -3,     -3,     -1,
+        -3,    -37,  -1628,   -888,    785,   3328,   1105,   3551,
+      6946,  -1688,   2690,  -2051,  -2212,  -3750,  -1903,   -497,
+      1251,   1187,  -6198,   3930,     85,  -1077,     16,    -23,
+       -80,   -130,     43,     66,   -974,    579,  -2047,  -3607,
+      -666,  -2248,   4619,   6846,     88,   -649,   1129,   -255,
+      3567,   -124,     41,     58,    634,  -1252,    696,   2536,
+     -1590,    209,     12,   -102,   -275,     27,    216,   1110,
+       259,  -2091,   1775,  -3768,    598,    441,  -1809,   -431,
+        22,   -991,   -621,     84,  -1803,   1585,    559,  -1101,
+        42,    456,   -392,   -874,     -4,      0,      0,      1,
+        -1,      0,   -371,   -211,   -339,  -1232,    438,  -2683,
+     -1007,   1250,   5343,    861,  -1305,   -577,   2107,  -2649,
+     -3227,   1020,   -127,    562,   5495,  -3136,   -414,   -529,
+        12,    -53,    -34,    151,    106,  -2946,   -575,  -1796,
+      3095,   -257,   -591,    126,    967,   -547,   -271,    560,
+       974,  -3335,  -2110,  -1403,   5915,  -1108,    388,  -1266,
+      -522,    336,    167,      1,     -3,     -2,      2,     -3,
+      -312,     19,   3356,   1123,   -676,   -247,    697,    548,
+      1768,   1174,   -525,   -253,   -423,    546,  -2373,  -2940,
+     -1055,  -2304,    203,   1309,   -574,     -8,      0,     -3,
+         4,      0,      4,   -215,   8192,   -670,  -1289,  -1547,
+      -304,   1498,   -967,   -529,   -582,  -2205,   1752,    321,
+       573,  -1096,     64,   1152,    -87,    574,   -250,    539,
+        62,      7,      2,     -1,     -3,      3,   -465,    243,
+     -1179,    828,  -2501,   -223,    198,   -883,   -740,   1113,
+     -1821,  -2068,  -3234,   1715,   1989,   1817,    727,   1640,
+      3386,  -1538,   -864,     45,      0,     -4,      0,      0,
+         2,    608,  -1495,   1259,   -132,   1311,    350,    537,
+      2735,   1428,    151,   1324,    547,  -3983,  -1892,    104,
+      2023,   1908,  -1042,   1130,   1252,   -701,      9,      0,
+        -2,     -1,      1,      1,    602,  -8192,  -2776,   -661,
+      1640,    443,   3452,   -738,    829,    637,    292,    232,
+      1352,   4879,   1429,    912,    649,   1593,    308,   -330,
+        68,     63,     -3,      4,    -57,     26,     25,   1250,
+       400,  -4839,    211,  -2748,   -664,    996,    341,  -1053,
+       321,   2458,    764,    743,   -729,     12,   -283,   -346,
+       118,   -249,   -153,  -2329,    -37,      0,     -1,      0,
+         1,      1,    352,   -878,   2336,   -634,  -2690,  -3415,
+     -2949,   -531,   1259,    394,    163,   -994,    845,   1259,
+       890,   1400,    279,   1908,    161,  -2174,   1876,     76,
+         1,     -1,     -1,     10,      0,     47,  -1123,   1611,
+       489,    618,   -816,     -7,   2001,  -1190,   1857,  -2749,
+      -311,   -331,    733,   1412,   1390,  -1525,   1262,  -1393,
+      -263,   3124,    -98,      0,      1,      0,      1,     -2,
+       514,  -3533,  -2394,   3623,    249,  -1056,    515,   1279,
+      2821,    477,    183,    689,   1182,   1378,   1287,   -711,
+      1264,   -713,   -278,    217,   -664,   -225,     -1,      0,
+         6,      2,      9,  -1171,   3119,   1340,  -1229,  -1929,
+      1984,  -1333,   1018,     10,   1205,     63,    358,  -1108,
+      -455,   -413,    854,  -1550,   -423,   -180,   2529,  -8192,
+       -18,      0,     -2,     -1,      0,      0,   -678,   3819,
+     -1316,   1159,    590,   -231,   2203,  -1533,    986,   4289,
+      1114,   1135,  -1162,   -921,    -58,    691,     11,  -1718,
+      -270,   -531,    530,     65,      0,     -1,      1,      4,
+         0,  -1184,  -1359,   7230,   -533,  -2077,  -1188,    113,
+     -1472,    490,   1518,   1476,  -1885,    934,    244,   1840,
+      -696,   -480,  -2476,   3324,  -2433,   1102,    120,      1,
+       -11,     -2,     18,     -3,  -1016,    189,  -3835,  -1659,
+       -46,   -180,  -2659,   1998,  -1437,   1107,  -2248,    165,
+      -657,  -5079,   -224,   1246,    469,    421,   1145,   1148,
+        84,    -18,      3,      0,      0,     -6,      0,    -66,
+      -206,   2279,   -220,   1606,   -421,  -1482,   -413,  -1237,
+       374,   3691,    491,   -774,    410,    791,    380,   3385,
+       615,   -950,   -620,   -197,     65,     -1,      3,     -3,
+         2,     -1,   -484,   1396,    273,  -3591,   1317,  -1013,
+      1563,   -134,    602,  -1069,    733,  -1167,    233,    319,
+      -262,    350,    780,   -407,   -496,  -1285,   1326,    -13,
+         0,      2,     -1,      0,     -1,   -328,   -626,   -848,
+       745,  -1047,   4048,   -380,   -456,  -1894,    869,  -1085,
+      -373,   2829,    622,    473,    394,    237,  -2175,   1167,
+     -4942,    246,    100,     -1,      1,     -6,      1,     -6,
+       -70,     35,   1613,   2597,   1307,   1756,  -1184,   1082,
+       971,  -2004,  -1459,   -494,    -40,    745,   2788,   -830,
+        76,    536,  -2002,    401,    -57,    -20,      0,      0,
+         0,      0,      0,     -8,    244,   1927,   1162,  -2416,
+     -1414,    463,    -89,   1217,   -798,    394,  -1527,   -719,
+      -666,    998,   1518,  -2455,  -3049,  -1174,  -2696,  -3119,
+         2,      0,     -2,      2,      2,      3,   1093,   -623,
+      1660,  -1635,   1457,   2560,    763,  -2750,    931,   1798,
+      2550,   1402,    914,   -919,   1931,   -383,   -435,   -583,
+       439,      9,  -1106,    -12,     -1,      0,      0,      0,
+        -2,   -335,   -730,  -2102,  -1414,   2576,  -3869,   1025,
+     -1657,     -2,    857,   -336,  -3011,    205,   1108,    364,
+      -789,   -179,    171,    331,   2204,    527,    -13,      1,
+        -3,      2,      1,     -4,   -565,   -211,   -139,   1799,
+       195,   -877,   -632,    358,   -244,  -1459,   1398,   2271,
+       550,   1987,   2206,   -337,    199,  -7036,    589,    195,
+      -466,     72,     -1,      2,      1,      0,      0,    -27,
+};
+
+static const int16_t cb0806sm0[] = {
+     -8192,    389,    245,    -67,    -42,     79,    503,   -488,
+      -310,    107,    -13,   -431,   -203,     96,    510,    151,
+       270,      0,      0,      0,      0,      0,   -463,    -23,
+       -72,   -322,     74,   1589,   -152,   -198,     81,   1120,
+      -125,   -434,  -3275,  -2210,   -348,   -344,     91,      0,
+         0,      0,      0,      0,   -254,   -224,     46,   -154,
+      -131,   -465,    -57,   8192,    345,    112,   -725,    -49,
+       183,   -191,    246,    263,    370,      0,      0,      0,
+         0,      0,     39,   -739,  -6603,  -2454,    -95,    312,
+       -53,   -392,     63,   -165,     31,   -505,    111,    484,
+      -535,    179,    143,      0,      0,      0,      0,      0,
+      1279,   -139,  -1769,    244,     59,   -135,   -429,    707,
+       809,  -4355,   -354,    428,   -300,    108,   -799,  -1421,
+       599,      0,      0,      0,      0,      0,      4,     -5,
+         7,     75,     49,   8192,    276,    200,    191,   -167,
+       -14,     82,    222,   -277,   -483,   -216,   -441,      0,
+         0,      0,      0,      0,    171,   -423,    174,    401,
+      -517,   -377,   -234,   -644,   -829,   -350,   -976,   -146,
+      -928,    296,   3003,   3545,    -30,      0,      0,      0,
+         0,      0,    161,  -6753,   1138,   -855,   -132,   -242,
+       559,   -225,   -346,   -168,     10,   -481,     -6,  -1208,
+       252,   -323,   -191,      0,      0,      0,      0,      0,
+      -262,    574,    433,   -145,    622,    329,  -2634,   -439,
+     -1178,    351,   -433,   -842,   4125,    296,    305,    359,
+       -22,      0,      0,      0,      0,      0,    -34,    -56,
+     -1019,   -247,   -163,    305,    574,    -51,   -179,     24,
+     -1097,    248,   -166,    -18,    303,    252,   -555,      0,
+         0,      0,      0,      0,   -400,   -254,   -256,   2783,
+      -296,  -1904,    552,   1284,   -336,  -2371,   3396,  -1092,
+       102,    176,    140,    640,   -359,      0,      0,      0,
+         0,      0,    373,    473,  -2167,   -774,   -388,    405,
+     -1402,  -1391,  -1319,   -155,   1104,   -533,    382,   1561,
+     -2958,    406,    787,      0,      0,      0,      0,      0,
+     -3800,    -58,   2098,   -181,   -570,    385,  -4125,    759,
+     -1584,      9,   -278,    201,   -528,   -527,   -435,    436,
+       681,      0,      0,      0,      0,      0,     30,    -80,
+       -60,  -4031,    -70,  -3367,    316,   -861,     67,   -169,
+      -144,   1598,    966,     32,  -1263,   -434,   -738,      0,
+         0,      0,      0,      0,    181,     12,    115,     91,
+       253,    518,    517,    216,    830,    336,   -568,  -3125,
+      -796,   -847,   1627,     58,   -158,      0,      0,      0,
+         0,      0,     48,   -851,   -286,    393,    390,    707,
+       595,    427,   -235,   -116,    814,   -198,   6145,  -1590,
+       647,     15,   -259,      0,      0,      0,      0,      0,
+      -621,    152,    590,    -16,    215,   -633,   -784,   -140,
+      1087,    723,  -4191,   2701,    951,   -972,    273,   -554,
+       387,      0,      0,      0,      0,      0,   -124,  -2939,
+       -38,    383,    234,    687,  -2873,   -466,     61,   -472,
+       854,   -396,    305,   -233,     82,  -2677,   -206,      0,
+         0,      0,      0,      0,   -120,   -246,   -614,   -394,
+      8192,     75,   -450,    177,   -251,     45,   -142,     65,
+     -1248,    -14,    389,    375,    114,      0,      0,      0,
+         0,      0,   2870,    158,   -473,   -166,    928,   -618,
+     -1909,    224,   -931,   1898,    -16,    427,    447,  -1044,
+        85,   -333,    197,      0,      0,      0,      0,      0,
+        78,    114,   -167,     73,  -1070,    -80,   3512,  -3004,
+     -1553,    769,    213,    851,   -377,    978,   1097,     71,
+        66,      0,      0,      0,      0,      0,   -129,    248,
+       455,   -376,    344,    128,    -60,    546,   -321,  -7898,
+      -719,    -55,   -941,   1242,    207,    215,    323,      0,
+         0,      0,      0,      0,    -24,   -225,    136,    142,
+      -739,   -117,      2,    242,   -152,    -20,  -1775,   -484,
+       -36,   -408,  -2767,   -471,    251,      0,      0,      0,
+         0,      0,     22,    111,   -180,  -7417,    365,    293,
+      -313,   1031,   -191,    154,   -210,   -239,    121,   -333,
+     -1504,    209,    146,      0,      0,      0,      0,      0,
+       898,   -643,   3080,    528,    -91,   -718,   -512,    275,
+     -3564,    396,    160,   -850,    346,   -595,   1558,    684,
+      -310,      0,      0,      0,      0,      0,    234,   -419,
+      -724,   -433,    292,  -1003,    682,   -117,  -1318,   -914,
+     -5137,    128,     53,    291,    408,   1269,   -284,      0,
+         0,      0,      0,      0,   -252,    190,  -2911,    130,
+       255,   -172,  -4331,     26,   -267,    280,   -133,   -613,
+     -1063,  -1135,    759,  -1290,    216,      0,      0,      0,
+         0,      0,    133,   -177,   4069,   -311,   -197,   3260,
+       341,    201,   -117,   -515,    105,   -658,    975,     81,
+      -333,   -333,    262,      0,      0,      0,      0,      0,
+       273,    -87,    321,    190,   1385,    274,    182,  -2553,
+      -150,    164,   -830,     89,   -459,  -5279,   -624,   -336,
+       399,      0,      0,      0,      0,      0,   -172,   -232,
+        11,     45,    121,   -254,   -457,    196,  -3487,   -838,
+       512,   -310,  -2831,    -85,     98,   -145,   -331,      0,
+         0,      0,      0,      0,    -55,   -149,   2068,    -61,
+      3087,   -143,   1574,  -1381,   2853,   1899,   -453,   -580,
+      -137,   1211,  -1413,    171,    125,      0,      0,      0,
+         0,      0,   -228,     30,   -956,   5569,    209,    -89,
+        25,    573,  -1669,    507,    182,   -132,    697,   -132,
+     -2964,   -637,    139,      0,      0,      0,      0,      0,
+     -3078,  -3278,   -771,    928,    -38,   -463,    820,   1141,
+     -1234,    620,    652,  -1710,   -382,  -1618,   -409,    179,
+       483,      0,      0,      0,      0,      0,   -102,   4256,
+       -20,   -162,   2021,    730,   1439,   2776,    459,    498,
+      -152,    482,     35,   -271,    810,  -1345,   -249,      0,
+         0,      0,      0,      0,    131,      5,   -281,    431,
+     -2498,  -1046,    482,    842,    297,   -311,  -1260,    148,
+      -906,  -4217,  -1411,   -102,   -361,      0,      0,      0,
+         0,      0,    116,  -3083,    235,  -1195,    -19,   -646,
+        42,    487,    309,   1654,   1051,  -1643,    689,   -823,
+      2279,   1488,    571,      0,      0,      0,      0,      0,
+        42,    -95,     -3,     36,   -170,   -114,   8104,    217,
+       140,   -217,    599,   -774,    -64,   -675,   -211,    166,
+       204,      0,      0,      0,      0,      0,     99,    594,
+       -48,    224,     52,  -1499,    271,   2224,   -219,   3184,
+      -165,    828,  -1345,   -785,    181,    133,    124,      0,
+         0,      0,      0,      0,   -235,   -286,    254,   -171,
+     -4980,   -453,  -1432,     12,    734,   -391,   -640,    339,
+       537,    313,   -700,   1016,    148,      0,      0,      0,
+         0,      0,    -49,    -19,    803,    935,    520,    -90,
+       641,   1053,   -454,   2338,  -6071,   -478,    616,   -559,
+      -339,    445,  -1464,      0,      0,      0,      0,      0,
+      -175,    111,   -132,     65,   -264,    732,    221,    231,
+     -1972,   -305,    325,   -859,    583,   1272,   -441,   2651,
+       229,      0,      0,      0,      0,      0,   -286,  -4646,
+      -262,    593,    613,    936,    310,   -615,     83,    223,
+      -816,   1910,   2041,    281,   -190,   -434,    114,      0,
+         0,      0,      0,      0,   -123,    684,   -208,    524,
+      -606,  -1223,    264,   -983,   -109,  -1057,    696,    195,
+      -521,    945,  -7503,    193,   -120,      0,      0,      0,
+         0,      0,     98,   -358,  -2165,    244,    277,    393,
+       771,   3360,   -258,  -1218,   -122,  -1253,  -2297,    806,
+      -198,    540,      7,      0,      0,      0,      0,      0,
+        78,   -281,   -368,   2809,    159,   2611,    833,   -120,
+     -3987,    933,    360,    -49,   -515,   -106,   -360,    650,
+      -125,      0,      0,      0,      0,      0,    203,   1369,
+       749,   -502,  -2295,   -326,    448,   -309,    630,    -84,
+       345,   -520,     -4,   -623,   1066,  -3915,    373,      0,
+         0,      0,      0,      0,  -4603,   -794,   -625,   -355,
+      1071,   -601,   -553,    593,   -296,    626,   -328,    621,
+        85,   1348,     92,   -288,    204,      0,      0,      0,
+         0,      0,     -9,    602,   -162,   -749,   -104,    464,
+      -372,  -1375,  -1905,   2200,     61,  -3308,   -897,    634,
+      1036,  -2112,   -182,      0,      0,      0,      0,      0,
+       -76,   2341,   -675,    -72,    -29,    704,   -536,   1656,
+      -541,   -736,  -1420,  -1539,   2458,   -228,    674,  -1258,
+        -3,      0,      0,      0,      0,      0,   -133,   1111,
+        63,    327,    470,   1226,    541,   -276,  -3042,  -1594,
+     -3192,    357,   -617,    658,   -315,   -978,    631,      0,
+         0,      0,      0,      0,    111,   -188,    619,    236,
+       104,     54,    545,    424,   5912,   -332,    711,  -1249,
+      -533,    291,  -1544,   -216,    113,      0,      0,      0,
+         0,      0,   -199,    267,    152,   -301,   -172,   1294,
+      2311,   -482,  -2451,    -82,   1833,    214,    130,  -1183,
+     -2212,    403,   -625,      0,      0,      0,      0,      0,
+      -106,    662,    -48,   -131,    324,   2337,    445,    462,
+      -349,   -189,    669,   4945,  -1797,     16,    268,   -602,
+         2,      0,      0,      0,      0,      0,     55,    154,
+       892,    -35,   -145,    357,    562,     42,     -9,   -284,
+       177,     84,    422,   -181,   -358,   7618,     29,      0,
+         0,      0,      0,      0,   -353,     68,    -41,  -4096,
+       177,    -20,   -267,    782,    954,   -430,   1573,   -696,
+      1785,  -3611,     89,   -243,    683,      0,      0,      0,
+         0,      0,   -220,   1983,   -891,    614,    226,   -202,
+        67,    761,   1904,    179,    226,    416,   -657,  -3409,
+      1026,   2834,   -438,      0,      0,      0,      0,      0,
+      -551,   -229,   -304,   -462,  -2277,   -419,    451,   -122,
+      -108,    258,    784,   1105,    382,    137,   5695,   -241,
+      -491,      0,      0,      0,      0,      0,     34,   -272,
+     -1687,   1769,   -332,    365,     33,  -2594,   3729,    325,
+        85,   -295,   -290,   -152,   2238,   -611,    -41,      0,
+         0,      0,      0,      0,    102,    166,    241,   1098,
+      -107,    775,   -414,   4256,   -277,    935,   -200,    495,
+       255,   1144,    468,   -184,    -59,      0,      0,      0,
+         0,      0,     94,   -282,    -57,     12,   -390,    245,
+      1872,   -620,   1089,   3754,    432,    947,   -509,   -284,
+     -3836,     26,    482,      0,      0,      0,      0,      0,
+         9,    971,   -373,   1111,   -480,   2342,   -182,    528,
+       802,   1196,  -1017,   -879,    499,   2800,   -830,   -230,
+        -4,      0,      0,      0,      0,      0,   -382,   -815,
+     -1669,  -2437,   -593,    193,   -688,    632,    479,   2883,
+       565,    540,      5,   1598,   1618,   -640,   -246,      0,
+         0,      0,      0,      0,   -421,   -103,   1482,  -3026,
+       -65,   -101,      4,   3921,    688,   -941,   -234,     49,
+       202,   1905,    935,  -1155,     -4,      0,      0,      0,
+         0,      0,    210,   -625,   -118,  -3215,    344,    978,
+       -10,    773,   -126,   -804,  -1534,    182,  -1146,   -646,
+      -146,   2011,    463,      0,      0,      0,      0,      0,
+};
+
+static const int16_t cb0806sm1[] = {
+        35,   -237,    547,    705,     -9,   1612,    382,    195,
+      -191,   -250,   -101,   -357,    709,    153,    850,  -5091,
+      -100,      0,      0,      0,      0,      0,  -6406,   -158,
+      -527,    137,   -330,    580,   -484,     63,    541,  -1245,
+      -205,    138,    247,   -489,   -147,   -132,   -863,      0,
+         0,      0,      0,      0,     53,    -38,    283,    -22,
+     -1506,   -467,   -418,    117,    133,  -2152,    -48,   -991,
+       808,  -1047,   2402,    261,    423,      0,      0,      0,
+         0,      0,    -14,    500,   4697,   -174,   -544,     87,
+      -379,   -243,    577,    682,    258,  -1190,  -1984,    599,
+       607,   -123,   -290,      0,      0,      0,      0,      0,
+        60,   4254,    194,    888,    -81,   -395,    422,  -1786,
+       916,    288,   1191,   -658,    502,   2177,   -977,   -301,
+       587,      0,      0,      0,      0,      0,    232,    204,
+      -452,   -853,  -4266,   -219,   1164,     92,     91,   1561,
+       950,   -705,  -1217,   -734,   1617,    120,   -324,      0,
+         0,      0,      0,      0,  -3442,   -456,   -667,    987,
+       -89,   1383,   -704,   -187,   -280,   -583,    341,   -732,
+       649,  -2129,  -3505,   -175,   -215,      0,      0,      0,
+         0,      0,    200,   -635,   -471,  -1221,    215,   2844,
+      1633,    522,   -720,   1722,   -272,    473,    198,   -604,
+       480,    -88,    169,      0,      0,      0,      0,      0,
+      -160,   -268,    130,    284,   -612,     95,     43,     42,
+       641,   -258,  -6884,   -167,   -689,    123,    276,   -592,
+       717,      0,      0,      0,      0,      0,    313,    -90,
+     -4310,   2706,  -1708,    648,   -796,    791,    998,   -468,
+       632,   1893,     43,   1937,  -1279,    -22,    -64,      0,
+         0,      0,      0,      0,   -106,    135,   -287,    335,
+     -7999,     51,   -250,   -388,     16,    285,   -101,    685,
+      -944,    604,   -624,   -792,    209,      0,      0,      0,
+         0,      0,    496,   -205,    422,     49,    274,   -229,
+       220,     73,   -734,    381,   -394,  -8192,   -405,    755,
+        -9,     46,    116,      0,      0,      0,      0,      0,
+       -28,    332,   1152,   -129,    244,     84,  -2193,    632,
+     -1854,   -384,    110,   -302,   -270,    435,  -1689,   -797,
+       686,      0,      0,      0,      0,      0,  -1660,    624,
+      -664,   2611,     30,  -1155,   -419,  -3539,   -568,   1719,
+     -1374,   -676,    -55,  -1934,    863,   1391,    433,      0,
+         0,      0,      0,      0,  -1012,    290,   2302,   -330,
+       -95,  -2355,    -55,   -763,  -1995,   -298,   -680,    715,
+       -85,   1615,   1011,  -1989,  -1028,      0,      0,      0,
+         0,      0,     21,  -5001,    507,    -58,    229,    -37,
+      -113,    632,   1809,    -62,    334,  -1201,   -893,   -344,
+        98,    438,    -65,      0,      0,      0,      0,      0,
+         0,    143,    131,    -18,   -135,   -306,    392,    232,
+       265,    543,    376,   -562,    362,   2458,    785,   3653,
+      -456,      0,      0,      0,      0,      0,    855,  -4009,
+     -1207,    118,    -86,   -223,    266,    154,  -1886,  -1145,
+       241,   -397,    246,    244,   -776,    808,   -132,      0,
+         0,      0,      0,      0,      2,   -633,    113,    -94,
+      -154,   -173,   -162,   -168,    439,  -6548,    778,   -392,
+       -60,     99,  -1901,    171,   -130,      0,      0,      0,
+         0,      0,    -11,   -324,    711,   -903,    560,  -1654,
+      1473,   -300,   1048,    137,  -1140,  -1115,  -1302,  -1008,
+      -792,  -3264,   -540,      0,      0,      0,      0,      0,
+      -347,     78,   -103,     -7,     -3,    437,   6053,    299,
+      -435,    323,    664,    477,   1097,    158,    656,    273,
+       200,      0,      0,      0,      0,      0,   -101,     80,
+      -153,    144,   -235,    492,   -399,     -3,   4958,    699,
+      -586,   -162,    153,   -860,    161,    665,      4,      0,
+         0,      0,      0,      0,    -87,   -189,   1744,   -350,
+     -1840,    325,  -2354,   1193,   1386,  -1589,     80,   1055,
+      -188,    273,    807,   2038,   -419,      0,      0,      0,
+         0,      0,     50,   -185,     68,    -59,     -9,     78,
+      -585,   -121,  -7888,    771,   -908,   -284,    349,    158,
+     -1122,   -139,   -189,      0,      0,      0,      0,      0,
+       310,   -286,    235,   -687,   -919,   -364,   -697,   -253,
+       492,    300,   -238,    272,    518,   -525,  -5863,   -190,
+       -59,      0,      0,      0,      0,      0,    151,    616,
+     -4420,    227,    240,   -252,    516,   -250,     68,    411,
+      -192,    -87,   -607,    671,   1281,   -317,   -305,      0,
+         0,      0,      0,      0,     -9,    817,   -451,  -1079,
+        86,   5060,  -1157,  -1159,   -421,    302,   1636,   -316,
+       -66,   -518,   1010,   1068,     96,      0,      0,      0,
+         0,      0,   -576,   -362,    107,   3516,    303,   -364,
+      -402,    805,    574,    993,   -554,    298,   -925,    410,
+      1898,     13,    138,      0,      0,      0,      0,      0,
+      -340,   -150,    528,    142,   -464,   1034,   -397,   3944,
+      -697,    962,    902,   1393,   2212,  -1021,  -1034,   -961,
+      -319,      0,      0,      0,      0,      0,     58,     38,
+       382,    221,   -212,    826,  -1373,  -4559,   1329,   -123,
+       216,    -23,   -736,     95,   -300,   -418,     -4,      0,
+         0,      0,      0,      0,    -58,   7814,    218,    141,
+       -90,   -124,    455,    -27,     49,   -311,   -364,     80,
+      -136,  -1257,     96,    332,   -287,      0,      0,      0,
+         0,      0,     -8,    624,    127,   1857,   -480,   -869,
+      -575,  -1461,   -493,   -261,     97,     32,   -328,   -467,
+       173,  -2588,    132,      0,      0,      0,      0,      0,
+      5257,  -1037,    191,   -844,    247,    130,   -571,   -548,
+      -496,    216,   -161,    336,     62,    990,    130,    517,
+       -65,      0,      0,      0,      0,      0,    -89,      9,
+      -138,    405,   -701,   -479,   3605,    699,   -629,   -102,
+        27,  -1374,  -1059,    -18,  -2707,   -172,   -557,      0,
+         0,      0,      0,      0,    -67,    209,    571,    -93,
+      -405,   -172,   -260,    -19,     86,     22,    659,   -630,
+       222,  -8192,    106,    -34,     60,      0,      0,      0,
+         0,      0,    -10,  -3386,    336,    651,  -1377,    681,
+       -16,    -45,   -382,   1102,   -280,    169,   -822,    522,
+       434,  -1111,   -299,      0,      0,      0,      0,      0,
+       194,   -445,   -231,   -532,   -438,   -180,   -591,  -1680,
+       179,   5921,   -184,   -685,   -467,    875,   -573,    282,
+       235,      0,      0,      0,      0,      0,    339,    139,
+      -745,    -68,   -201,    467,   -743,    477,    -23,  -1177,
+      1384,   -357,  -1254,  -3760,    454,   1175,    252,      0,
+         0,      0,      0,      0,    109,   -252,   8027,   -765,
+       136,    111,    -86,   -593,    -84,   -750,   -121,    782,
+       739,   -296,    284,    213,  -1196,      0,      0,      0,
+         0,      0,    -40,     69,   1992,    452,    -75,    -84,
+       683,   1678,  -1350,  -1846,   3068,   -749,  -1410,   -271,
+       536,   1120,    117,      0,      0,      0,      0,      0,
+      4053,    340,    108,    -88,    411,    990,    217,   3675,
+       755,    752,   -206,    205,   -297,   -573,    188,    127,
+      -313,      0,      0,      0,      0,      0,     47,  -2870,
+     -3417,    216,   1730,    -83,    189,  -1615,   1016,    -44,
+      -502,   2151,      6,  -1057,    550,    194,   -498,      0,
+         0,      0,      0,      0,   -133,      1,   -387,   -497,
+       586,    173,    923,  -4078,  -1232,    329,  -2086,   -185,
+       592,    681,   3320,   -914,   -327,      0,      0,      0,
+         0,      0,   -132,    493,   -179,    220,    142,  -4345,
+       422,   -173,    357,   1317,    240,   -525,   1613,   -178,
+     -1584,   -734,    549,      0,      0,      0,      0,      0,
+      -337,    111,  -1238,    116,    302,    325,    189,    610,
+     -3180,   -284,   -817,   1383,   1559,   -802,    422,    438,
+       460,      0,      0,      0,      0,      0,    -96,    372,
+       335,   -843,   3967,    221,    380,    227,    309,    447,
+      -199,   -257,    372,   -397,   -534,    736,   -152,      0,
+         0,      0,      0,      0,   -144,    463,    -54,   -288,
+       -83,    115,   -574,   -229,    485,  -2643,     58,   4312,
+     -1155,    642,   -647,   1122,    118,      0,      0,      0,
+         0,      0,    157,      6,  -1017,  -1155,    687,   -288,
+       918,   -212,   -332,  -2486,   -197,  -1025,   -546,   4099,
+       155,   -731,   -333,      0,      0,      0,      0,      0,
+       -43,   -496,   -546,   -541,    283,   -521,    -47,    -18,
+       208,   -552,   1899,   2107,    588,    818,   -911,  -1104,
+       -84,      0,      0,      0,      0,      0,    -71,     40,
+      -326,     92,    216,   -106,   -255,     28,    120,    -58,
+     -2720,   -133,   -288,    -28,  -1157,   1563,    400,      0,
+         0,      0,      0,      0,     40,     -4,    559,   1350,
+        30,   3905,   -675,  -1092,   -587,  -1524,  -1987,  -1031,
+      1892,   -679,   -623,   1051,    -33,      0,      0,      0,
+         0,      0,    -98,    106,    105,  -5887,   -463,    424,
+       -42,   -506,   -589,    376,    840,    140,   -640,    771,
+        23,   -441,     -6,      0,      0,      0,      0,      0,
+        22,    203,  -3452,   -635,   -605,   1668,    422,   2973,
+       394,  -1605,   -968,   -739,    344,  -1438,    820,  -1318,
+       -26,      0,      0,      0,      0,      0,    258,    -32,
+      1061,    643,   -152,     92,   -454,  -1305,   1621,    554,
+       344,     82,   -404,   5222,   -344,    286,    177,      0,
+         0,      0,      0,      0,     63,   -360,   -127,    814,
+      3639,  -3322,    390,     12,   -515,   -493,   1515,   1706,
+      -727,    394,   1164,    357,   -208,      0,      0,      0,
+         0,      0,    -27,    648,   -342,   -125,   -327,    194,
+     -3639,    598,     29,    244,    898,   -493,    372,   -635,
+       567,     31,   -237,      0,      0,      0,      0,      0,
+      -160,   2798,  -1768,  -2186,    493,    517,    -82,   -468,
+      -290,   2890,   -460,    450,    414,   -265,  -1121,    219,
+     -1115,      0,      0,      0,      0,      0,     14,     76,
+     -2806,    338,  -1429,   -402,    253,   -130,   -235,   -799,
+       309,   -525,   3823,    175,     36,    113,    247,      0,
+         0,      0,      0,      0,    352,    521,    213,   -107,
+       -71,   -762,    790,   -856,   -252,   -246,   -729,   -631,
+      1258,  -3276,   1534,   -436,   -635,      0,      0,      0,
+         0,      0,    -54,    118,   -453,   -124,    -32,    539,
+       356,   -169,   -202,   -590,    721,   -444,  -6260,   -275,
+      -239,   -105,    -52,      0,      0,      0,      0,      0,
+      -464,    507,   -796,   1273,   2297,    790,    652,    392,
+      3364,  -1949,   2154,   -701,   -229,     99,     88,    471,
+      -524,      0,      0,      0,      0,      0,     71,   -914,
+      1835,   -156,   -242,   -196,    513,    431,   -481,    -84,
+      -734,   4501,   -510,    115,    461,   -428,     83,      0,
+         0,      0,      0,      0,  -3987,   1063,   -717,  -2640,
+      -963,   -667,   -147,    536,    -68,    422,    341,  -1916,
+      -616,    996,    522,    568,   1174,      0,      0,      0,
+         0,      0,      8,    112,    693,    392,    445,   5309,
+       259,    121,   1670,    343,    176,    472,    197,    419,
+      -240,  -1178,   -107,      0,      0,      0,      0,      0,
+};
+
 static const int16_t cb0808l0[] = {
        164,  -3637,  -3563,   -243,   -123,    -47,    -87,    -32,
         62,    129,     -2,    131,    -36,   -202,   -197,     37,
@@ -855,6 +2041,2748 @@
       -222,    151,    224,   -210,    264,    192,     29,    -84,
 };
 
+static const int16_t cb0808sl0[] = {
+        24,  -3148,  -3111,    106,     45,   -114,    -85,   -211,
+       154,    172,    246,    368,   -130,     58,   -135,     70,
+       102,   -150,    -76,     -7,     13,     -1,    -29,     20,
+        -7,    112,   -234,   -115,   -138,    -40,    106,    178,
+     -7276,   -537,     25,    856,    460,   3107,    146,   -520,
+      -631,   -118,    393,    179,    144,    -86,     47,     82,
+      3031,     28,    164,   -308,   -411,     72,    138,    378,
+       242,    253,     12,    158,    -28,    -60,    -29,    -46,
+        -5,    -11,     84,   2753,   -113,    -65,      3,      5,
+        13,  -5110,    -74,   -126,   -129,    -82,    -58,    116,
+        15,     68,    243,    -32,    126,    -48,     11,     -7,
+        75,     10,    166,   -153,      8,    -43,    -38,     81,
+       -41,     13,    100,     27,     46,   -441,    -56,     35,
+         4,     51,   7528,     52,   -141,   -153,     39,    -36,
+       -86,     80,    -35,     50,    -46,     23,    178,  -3986,
+     -3350,     59,   -278,     37,     -2,     14,   -157,   -208,
+      -317,    218,     15,   -296,    -32,    -51,     36,    -27,
+     -2062,     28,    -37,    322,   2286,    214,   -196,   -171,
+       -64,   -163,    265,    -50,      3,   -177,    -22,     68,
+       124,     37,    -15,  -2202,     60,    133,      4,    371,
+      2753,   -111,    480,   -446,    484,     43,    150,   -331,
+      1410,   -791,    123,   -136,   -192,    267,      0,    -89,
+      -105,    421,     68,   -126,     79,    279,    202,   -132,
+      -208,  -3345,   -105,     59,    118,   -647,    -48,    -12,
+       145,   -403,    200,      7,     -4,  -3192,   -223,     64,
+         0,    415,    366,    136,     49,  -7611,     79,   -105,
+       127,    -69,    -43,    103,    -95,    -93,    -10,    -30,
+        94,    108,   -109,      0,    -87,    -70,    300,    -93,
+       113,     25,    -17,   2263,     41,    192,     18,     73,
+       179,    129,    149,    -81,     -1,      0,    201,    184,
+       651,      8,     18,    114,   2820,    383,    -71,    376,
+     -2281,  -1190,   -143,    121,    -45,  -2157,   -410,     81,
+       -14,   1537,   -833,     29,   1150,   -494,     -8,    -14,
+       210,    188,   3073,  -1775,   -123,     80,   -103,    227,
+       296,    111,   1637,   -197,   1349,    174,   3276,     49,
+       -98,     74,    660,      3,   -252,   -356,     -9,    527,
+       -63,  -7995,    -16,     85,    249,     74,     26,      2,
+         3,     26,   -124,    -61,    -26,   -144,      4,    -52,
+         6,   -517,    -95,   2566,    -26,   -190,   -196,   -509,
+     -2982,      4,   -178,     -9,    -67,    -25,      1,    193,
+       -68,    -46,    -82,  -3734,    -14,   -339,    -44,   -151,
+        55,    230,     -3,    100,    -47,    -69,     35,    107,
+       127,   -175,    -11,    -10,   -158,   -140,   2934,   -132,
+      2571,   -158,   -217,    106,    137,   -222,     74,    -42,
+        64,    559,    122,     73,   -112,  -2964,   2502,     13,
+       301,    -41,    203,   -382,   -151,   -221,   -147,    -24,
+        83,     37,    -45,     56,     89,     71,    109,    -14,
+       -43,   -130,   -108,    -18,     74,    -23,    -34,     79,
+      7662,    -88,     70,     21,   -110,    147,     26,    250,
+        74,    165,     49,     43,     45,    -22,    -14,    293,
+      5275,     57,    -72,     93,     40,    115,   -139,   -332,
+        95,     92,    -26,     26,    169,    -94,    332,     71,
+      -482,    137,    190,    114,     14,    151,   3125,      6,
+       109,      6,      7,   1543,    282,    -24,     24,    142,
+        33,    123,     41,    -72,   -253,    -33,    309,   -107,
+       -64,   -131,     56,  -3528,     82,    -17,    417,    -47,
+      -588,    274,    155,    158,   -245,    186,    147,     -7,
+       -50,   -218,     12,    118,    -62,    652,    145,     64,
+      2473,   -146,    220,  -2973,     97,    284,     29,    268,
+        29,   -208,    -40,   -251,   -175,    -16,    -58,    -65,
+        28,     26,     55,     74,    -12,   1911,     43,    -82,
+      -150,    -13,   -119,      8,    119,    156,   1550,    -88,
+      -102,     46,    226,   -132,     95,    100,     87,      7,
+       -46,      8,    -32,    -16,    -12,    317,    -33,    -27,
+       291,    -88,    169,      1,   -101,    -61,    161,    162,
+       -33,     -1,     11,   5097,    -34,    142,     31,     94,
+      3619,    -94,     67,   3379,    -65,     28,    254,    189,
+       110,    138,    -41,     52,     32,   -104,    154,    172,
+     -2365,   -464,    281,    207,    -66,   -190,    399,   -158,
+        13,   -155,   -223,     92,   -108,    -25,    468,    189,
+     -4359,     42,   -135,    138,     36,  -1403,   -264,   -336,
+      -164,    -49,     54,   -125,    -61,     62,     16,    172,
+       182,   3134,  -1373,     63,   -227,   -106,   -133,   -165,
+       -69,    -57,   -184,    -46,      9,    -57,     50,     -3,
+       -62,    -15,   -123,    108,    111,     91,   -161,     23,
+       -81,      7,    208,  -5385,   -244,     24,     95,     12,
+      -264,     62,    -44,     21,   -240,   -299,    -12,    117,
+       -61,  -2551,    389,   2816,   -179,    203,   -421,    899,
+        -7,    174,   -200,     98,   1036,   -166,     11,   -137,
+        78,     -7,   -121,    245,    -77,    124,    102,     51,
+      3136,     74,   -310,     40,    212,   -239,   -373,   -154,
+       398,   2967,    654,    488,    103,   -230,   -330,    831,
+       -63,   -473,    152,   -556,  -2186,   -371,      4,     86,
+       -12,   -141,   5503,    -87,   -123,    -17,    -15,    154,
+       192,    -86,     97,    165,    352,     56,    154,     43,
+      -331,   1004,    -52,   -131,  -3311,      3,    110,   -153,
+       -70,    137,   -168,    -20,    115,    140,    -25,    -54,
+       -13,   -300,     57,   -131,    214,    261,    -92,    618,
+     -2752,  -3146,     61,    -51,    210,   -230,     87,   -184,
+       330,     22,    -19,   -107,   -477,    -39,      1,    127,
+       178,    -73,    425,     56,    -25,    -41,    135,   2423,
+        59,    -46,    -10,     49,   -116,    -51,  -2239,   -228,
+       -75,     48,      3,    181,    161,   -133,   -355,     81,
+         5,     84,   -222,    -83,     92,     33,  -7558,    -38,
+        -3,    159,     33,    -58,    -37,   -107,     16,    -61,
+       -94,     93,     97,     49,   -275,     29,   -198,     -4,
+       -68,     87,    116,  -7039,     46,     81,    -25,      0,
+        -7,    -46,    152,     64,    -40,   -143,    -56,    147,
+       403,    257,   2380,   -538,   -400,   -132,    -89,    -29,
+     -2878,    457,   -552,    -12,   -189,   -370,   -357,  -3679,
+       422,     63,    200,    116,     -9,   -229,    -72,   -100,
+      3346,     88,    -18,     28,    -47,    159,    108,   -160,
+       253,     58,   2938,     55,    366,    -33,  -3209,     31,
+      -148,    -10,    -40,   -443,    127,    120,    106,      9,
+         4,   -240,    200,    129,    328,   -102,    187,    182,
+       112,   2757,  -3260,    314,   -163,     -3,   -185,    354,
+       -97,    -69,   -199,     41,   -143,     19,    108,    -22,
+       -32,    -18,   -149,     35,     31,     -5,  -5083,     52,
+         9,      5,    -44,    -52,     76,      7,   -100,      7,
+       -79,      0,    -33,    110,   -208,     20,   -159,    -76,
+         2,  -8192,    156,    118,   -306,    -88,    136,   -293,
+      -176,    163,      8,   1871,   -112,    229,    311,    -95,
+       -75,     17,    217,    152,     62,     17,   -246,   3579,
+         5,    -87,    -21,     92,    114,   -185,    118,      8,
+       196,   -124,   -220,    175,    104,     54,    104,    -40,
+       -45,   -152,    392,    216,    -24,    -28,   2024,     -6,
+        42,    -91,   -201,     -9,   -192,     35,    -43,   1661,
+      -356,   1207,  -1322,    340,  -2937,    -16,    163,   -801,
+      -423,    197,   -512,    -70,    229,   -412,    291,    511,
+       -36,   -179,    -98,    -54,     93,     87,    263,    -44,
+       167,     77,     -4,   7278,   -101,   -193,     91,   -251,
+      -131,    269,     15,   -168,    -22,    -26,     44,     24,
+       154,    115,    -11,   -124,     28,     37,    -14,    -46,
+       -67,  -8192,    -51,   -169,     41,   -302,    -81,   1991,
+       -11,    136,   -175,     71,   -104,     89,     60,    137,
+        17,    106,     96,   -238,    -83,    -52,   -113,     53,
+      2903,    -47,      9,   -227,  -2784,   -245,    146,   -196,
+      -216,     41,     -6,   -128,    -53,      1,   -128,   -145,
+       149,     32,     25,    -57,    -14,     72,   -135,     10,
+     -1946,    -67,     74,   -127,    141,   -299,     55,      8,
+       947,  -2239,   -271,     74,   -227,    -81,     31,    291,
+       -86,  -2914,     22,     -7,    293,      2,    -25,      9,
+     -2997,     89,   3158,    192,    -46,   -246,   -140,     46,
+       287,    133,   -110,    308,   -114,    -33,   -106,      9,
+       -89,    105,    364,   -172,    185,    -61,   4464,    -92,
+      -264,    -66,   -161,    102,   -178,   -264,    -21,    114,
+};
+
+static const int16_t cb0808sl1[] = {
+       246,     -6,   -180,     90,    127,   3322,    598,    182,
+        81,     82,     67,    -39,     87,    -60,     -8,    -89,
+       185,     99,    -25,     27,      9,    -59,  -7421,     49,
+       -17,    116,    -85,      6,   -305,     88,   -164,     99,
+        61,   -415,   -114,   -288,      1,   -165,    -12,      5,
+      -143,   -142,   -521,   -245,    -53,     38,    -99,   3709,
+       -52,      0,    -41,   -135,    147,   -217,     62,  -2144,
+       255,    132,    264,     65,    -37,    204,   -338,   -280,
+       192,   -184,   -158,  -3685,    -26,    203,    430,    -29,
+       -16,     77,    230,   -311,    597,   2553,  -1126,    -63,
+       154,   -431,   -161,    315,    286,   -147,    177,     -3,
+        93,    449,    253,    -37,    101,   -244,    -77,     42,
+      -384,     22,     36,    235,  -4973,    243,   -120,   -105,
+      -226,   -114,   -455,   -404,    164,   -505,    476,   -124,
+     -2837,    -82,  -2920,     -3,      0,    134,    -94,    264,
+       -53,    -53,    108,     -3,   -845,  -2813,    228,   -179,
+       -60,     -2,     65,     33,   -153,    -16,   -149,  -2135,
+       209,   -929,   -288,    227,   2656,   -125,    -42,     17,
+        30,   3375,   -367,     53,   -262,   -351,    108,   -270,
+        11,    -57,   -182,    -51,   -149,   -287,   -115,    -24,
+        99,    -76,   6954,    -75,     -4,     38,   -168,    138,
+       109,   -239,    -45,     49,     28,  -1376,     49,     66,
+       -83,   -129,    -61,    -99,    135,     14,    -93,    111,
+        37,    -16,      2,    -76,    360,    -77,     82,    161,
+       149,  -1660,     18,     98,    -34,    -12,    -36,    -65,
+       126,    -57,     28,    519,   2044,    297,     73,   -218,
+        51,     17,     21,    -70,    -32,    -73,    -39,    -38,
+       -11,     60,     38,   -129,   -105,   -173,    200,      7,
+       124,    -74,  -2780,   2608,    -57,   -213,     54,   -200,
+       134,    208,    -34,    236,    143,    101,    327,    558,
+        75,    317,   3090,   -188,    544,   -186,     15,    116,
+       237,     76,   -105,     29,   -300,    -27,   -211,     71,
+      -144,    183,    -77,     38,    -16,     39,     56,  -7308,
+      -113,   -116,    -32,    222,     60,     76,    -21,     59,
+        52,    104,    383,     73,    149,     88,    127,     34,
+     -1819,    -46,     50,     11,   -159,   -223,   -163,   -149,
+        95,   -163,  -2168,    -19,   -937,   -183,     66,   -465,
+      -257,    341,    -70,    111,    228,     52,     83,     63,
+       -52,   -187,     16,  -2539,    -51,   3240,    -81,     87,
+      -116,   -183,   -182,     96,    -22,   -191,   -107,    217,
+       -10,   -215,      9,     -7,    -97,   -331,    -55,    513,
+      -398,   1378,   2627,  -2129,    563,   1462,   -369,    498,
+      1176,   -469,    220,   -953,   -122,   -236,   -306,   -276,
+        31,     35,   -167,    558,   -134,     45,    -54,     16,
+        36,     18,    300,   2438,     62,   -177,     77,   2638,
+      -108,   -115,   3392,    274,   -123,    -66,    201,   -400,
+       170,    142,    151,    332,     53,   -507,     81,   -653,
+       -93,  -3204,     -5,     10,    -43,     79,   3879,     77,
+       191,     24,     23,   -208,      6,   -109,    -97,    126,
+      -306,    629,     26,   -516,     79,     21,    131,     43,
+      -253,  -3463,    840,    653,    -95,    -48,    300,  -1026,
+      -324,   -909,   -383,    195,    342,   -136,   -192,    422,
+       262,    -13,    534,   3125,      8,   1672,    176,   -293,
+       211,  -1213,    537,    637,    -10,   -116,   -149,     44,
+        53,    105,      7,    -97,      3,     17,      8,    -21,
+        -7,    -41,    -38,  -4959,    -81,      1,    165,    196,
+        98,     35,    -35,      8,    -28,    113,    -20,    108,
+      -130,    -65,    172,   2858,     41,  -3295,    138,     10,
+       -95,    -30,   -173,     85,     42,     30,   -119,    161,
+       195,    125,    -32,    136,    319,    -33,   5142,     50,
+       100,    128,    -90,    -53,    -67,   -203,     28,     19,
+        37,   -137,   -124,   -105,    -25,  -3405,   -250,    294,
+       409,    -99,  -1072,   -383,    -12,    212,   -276,   3389,
+      -101,    171,    -41,   -554,   -295,   -437,     86,    158,
+      -242,    167,    135,      7,   -149,     48,     -4,    -84,
+      4911,    283,      5,    -14,    105,   -107,   -384,    102,
+       183,     47,     67,  -5105,     -5,     16,   -155,    181,
+       110,     24,    -77,    -32,    120,      1,     22,    167,
+       -90,   -150,     -5,    163,    -44,    -28,     54,  -3058,
+      -174,     58,    152,    -31,   -179,   -122,    -57,    232,
+      -395,  -4961,     61,   -115,     31,     14,     82,   -109,
+       -39,     59,    -49,   -133,     52,     17,     57,     52,
+       -63,    275,    146,    104,     53,     47,    -55,    311,
+      4871,    -26,     48,    -94,    -11,    -58,     63,    140,
+       -74,    -94,   -269,    -77,   3372,  -3116,     16,    -47,
+       -74,   -161,    115,     58,   -247,   -119,    399,     42,
+      -181,    154,   -218,    -24,   -237,     58,   -275,   2979,
+       187,   -124,    312,    301,   2767,     -8,     40,    -23,
+        -6,    -38,    -52,   -363,   -265,    -78,   -230,    286,
+      -135,   -337,    -81,    170,    -13,    -58,   -117,    519,
+     -4784,    157,   -193,      9,     62,    -21,    180,    128,
+       326,    213,   2440,     62,   -601,    -55,      2,    -18,
+      -342,    142,    358,   -632,   -377,   3590,   -248,   -278,
+      -235,    -28,    242,   -133,    144,     26,   -261,    113,
+        45,    -23,  -1984,    -77,    128,    249,     -8,   -266,
+       -38,     -6,  -1672,    -45,    -84,   -377,    154,     17,
+       -83,    -44,    156,   -137,     43,     91,    253,     17,
+       -71,    -92,    178,     12,     18,     -8,   -105,    101,
+      7068,     71,    -81,     84,    -33,     79,     53,     -7,
+       -85,   -265,    117,    317,    114,     72,   -482,   -418,
+      -185,    -97,    268,  -1543,    -79,   -146,    -48,    -45,
+     -3259,   -212,   1149,   -165,    177,   -158,    -77,    100,
+        86,    -69,    107,    219,   -512,   -253,   -418,    -45,
+        16,   5501,   -184,    207,     67,     46,    109,    -28,
+        -9,     33,     63,    -16,     39,     92,     27,     23,
+       -10,  -8192,      0,     50,    -57,     68,   -444,   1082,
+       247,   -138,    120,    472,   -692,    212,  -1576,     66,
+      3061,    402,   -160,    337,   -685,   -519,    227,   -279,
+        92,  -4135,   -393,    -44,      6,   -129,     59,    239,
+       151,    153,    -39,    116,    134,    -40,    171,    118,
+       207,   2615,     38,   -167,  -1671,     85,   -135,   -182,
+       -88,    246,     53,     29,     -2,     16,    232,    544,
+       -46,   -138,    122,    -52,   1312,      9,     92,     13,
+         4,     66,    -35,   -134,    -56,     85,    -43,    -31,
+        28,  -3187,    100,   -103,     70,     -3,    186,    -43,
+       122,  -3040,    -27,    -46,   -121,      1,     37,      0,
+       -60,      2,   -100,   -152,   -218,    175,   -406,    175,
+      -193,     68,   -208,    -23,   -230,    221,   3397,     45,
+        48,     37,    337,     11,     15,    -69,     -4,    -82,
+        53,     33,    -56,     75,    -98,    -69,    -11,    -19,
+       -12,     81,    -52,   5428,    121,     82,    465,     10,
+      -229,    126,     32,    119,    439,    126,   1996,    -85,
+       -81,    -57,     88,    232,    108,    -22,    -24,     27,
+      -136,     91,    -32,     18,    226,    -33,     15,    117,
+       145,  -7737,      9,     58,   -102,   -113,     26,  -2174,
+        28,   -421,    -11,    -70,    -23,    -70,   -119,    -96,
+      -133,    208,     20,  -3750,    -14,     23,     41,   -180,
+      2097,   -103,   -599,    146,    251,    -77,   -557,    -76,
+       -96,     69,    266,    316,     74,    -17,   -227,    223,
+        33,   -261,    135,   8126,    250,     -5,    -57,     35,
+       382,    -44,    136,     81,     42,    -80,    179,    -73,
+       -75,    -57,    274,    -15,  -3140,   3236,    196,    150,
+       -51,    222,   -190,     13,     83,   -313,   -149,     89,
+      -281,    -12,    -42,    293,    567,     19,    -43,    146,
+       102,    -39,   3666,     95,     76,     -1,     12,     27,
+         7,     -5,    261,    132,   -215,   -295,    -51,    496,
+        77,    100,     16,   -285,    649,    -95,    280,     77,
+       121,  -2676,     25,  -1148,   2912,   -341,    -91,   2380,
+       -80,     -6,    269,    -34,   -686,   -208,     19,    228,
+        24,     -5,   -150,     11,    214,   -316,   1187,    599,
+       -62,  -2274,   -240,     48,    -86,     87,     86,    477,
+      3832,     67,    135,     68,    747,    339,    385,   -255,
+      -224,    184,     70,    171,   -134,   2604,   -231,     72,
+       170,     51,  -2785,   -580,    -86,   -393,    -63,    -79,
+      -151,    334,     78,    329,   -278,    102,    -26,    -55,
+     -3531,   -378,   -247,    176,   -202,    147,    169,     87,
+};
+
+static const int16_t cb0808ss0[] = {
+     -1872,   -332,  -1311,   -512,   -934,    -11,    112,    389,
+      -189,  -1513,   1508,  -1081,    185,    -87,   3092,    529,
+      -166,   -171,  -1648,   2544,   2144,   -259,   -688,  -1113,
+       -71,    387,   1194,   -733,    175,    856,   -976,    268,
+       589,  -1773,   -426,   -109,   1210,   -486,    297,    195,
+      -991,  -1543,   -432,   1190,  -1089,   -531,   -421,     80,
+      -225,    354,   -231,   -670,   -299,  -3694,   -510,   -882,
+        31,   2804,    476,   -478,   1897,    686,  -1066,  -1222,
+      -882,   -374,   -427,  -1464,    957,    549,  -1211,   -204,
+      -218,  -1412,   -545,   -968,    943,   -342,     80,   -281,
+      -249,   -968,   3424,  -2342,   -212,    949,   -167,   -271,
+       607,   -838,   -418,   -891,   -398,   -877,    138,   1653,
+     -1034,  -2515,  -1363,  -1535,   -364,    432,   -324,  -1120,
+      1531,    407,   -698,    396,    325,   1432,    646,   2777,
+       174,   -836,   -605,   2257,   1086,   -888,    348,     36,
+       513,   2229,   1543,   1293,     94,   2444,   -574,  -1030,
+       933,     -9,   -668,    555,    346,    511,    715,  -4033,
+       409,   -299,   -166,    700,   -560,    950,  -1265,   -245,
+      1418,  -1362,    -20,    870,    152,    942,   -331,    -66,
+       227,   -186,    251,  -3632,  -1057,   -989,  -1798,    923,
+       542,   -630,   2889,   -128,   1475,    -97,   -964,   -860,
+       534,   -217,   -746,    181,    321,  -1007,   2595,   -411,
+      1298,    635,    310,   1955,    -17,    846,   -824,    -11,
+      -952,    208,    328,   -547,  -1086,   1481,   -264,  -1574,
+      3579,    500,    242,   1038,  -1030,    353,    -75,  -2100,
+      -347,   2662,  -2378,    261,    210,  -1151,    525,    291,
+       368,   -200,   -702,    105,   -140,    -81,    663,   -716,
+       334,   1220,    239,     21,    114,    301,  -1898,   3647,
+      -302,    550,   -489,   -484,   -853,   -274,   1509,   -419,
+      -330,  -1121,  -2666,   2507,   -621,   -818,   1188,    -69,
+      -885,    231,    316,   1837,   -740,   -187,   -102,   1148,
+      1219,   -123,    852,   1154,     27,    139,   -344,   -404,
+     -1133,    425,    353,    145,   -123,    179,     49,  -5836,
+      -571,     39,    274,    -38,   -457,    172,    -80,    593,
+     -1977,   -331,   -421,   1965,   1768,   -113,     64,   2272,
+       475,   2165,    210,    873,   -819,    757,   -119,   -530,
+     -1431,  -2167,  -1517,   -864,   1060,   -752,  -1366,   2349,
+      -671,   1180,   -179,     10,   -450,    781,   -799,  -1303,
+      -393,    -61,   -113,   2053,   -550,   -843,   1028,  -2044,
+     -2631,  -1388,   1078,    171,    517,    496,   -928,  -1695,
+       298,    708,   -557,    122,   -917,   -197,   -423,   1142,
+       116,   -528,   -585,   -470,    480,    400,   4605,    384,
+      -142,     57,  -2340,  -1507,    -67,    907,   8192,    356,
+       -18,   -704,    528,    -32,   -379,   -611,    418,    703,
+      -396,    531,    155,    642,    678,   -427,     85,    814,
+       212,    845,   -579,   -590,   -456,    103,   -624,  -4541,
+      -306,    638,   -760,     36,   -149,   1929,   1229,   -717,
+      -543,    530,   -694,    169,  -2996,    423,   -346,   -897,
+      1077,    255,  -1054,    -63,  -1773,   -479,    479,   -701,
+      1547,  -1683,   -342,   -926,    112,   -663,   1638,     -9,
+      2587,    311,   -561,   -932,   -539,   -335,    589,    779,
+      2345,   -432,    788,   -967,    319,     -4,    192,   -588,
+      -103,    357,  -3508,   -257,    707,   -473,   1521,     -9,
+       130,   3290,    274,   -296,   -802,   -139,   -814,    -19,
+       971,    849,    253,    486,     40,  -1216,   1179,  -1772,
+      -996,   1400,    838,   1955,  -1432,  -1925,   2324,    767,
+       896,   1314,   3407,  -1003,   -552,   -967,   -166,    -26,
+      1099,  -1965,      9,    239,    -10,   -243,    864,   1251,
+        91,  -2279,   -691,   -542,   -473,  -1908,  -1208,  -1447,
+      -891,   -311,  -1136,   1638,   1150,    586,   1656,    260,
+       538,  -1746,   1460,   -478,   -860,    297,   -605,   -139,
+       822,  -3718,   -194,    307,    609,     30,   3418,    226,
+      -338,    161,   -387,   -344,   -472,    354,   -170,   -421,
+       433,    601,  -1446,    821,    -48,    -31,    493,    916,
+      -347,  -3740,   -899,   1389,   -355,     71,    382,   -644,
+       485,    218,    975,   -542,  -3191,    742,   -102,   -783,
+     -1607,    473,    196,   1692,    -71,    258,   2446,   1507,
+      -968,  -1025,  -1087,    637,   -921,  -1405,   1192,    -88,
+      2044,  -1813,    922,    156,  -1096,   1007,   -695,   -485,
+     -1015,   -468,   -316,   1825,    190,   2132,   -205,   -218,
+     -3556,   -286,  -1350,   -212,   -634,    120,    417,   -311,
+       -90,    219,    870,   -334,  -1304,    523,    999,   -144,
+        98,   2157,    205,     45,   -247,   1401,   2423,    278,
+      -766,    -66,    309,   -121,    316,   -543,  -3418,    932,
+      -803,    637,    436,  -2341,   2016,    928,   -836,  -1212,
+       702,  -1179,   -544,      6,  -1429,   1014,    464,   1166,
+       581,   -291,    136,      0,    983,   -799,    693,   -230,
+      -727,   -186,   -310,    -76,    698,     -6,   -660,    762,
+       814,    451,   -328,   4469,   -454,     14,   -423,   -116,
+      -134,   -568,   1535,   -562,   -629,   -269,    826,    380,
+        68,    282,   -409,    640,   -384,    218,  -5702,   -280,
+      -638,  -2586,   -557,   -877,     49,    648,    434,   1178,
+      3442,    883,    -78,   2024,   -253,   -210,  -1090,    198,
+       -67,    -52,   3226,   -671,  -1606,     49,   1775,   -422,
+      -173,    309,   -720,   -667,   -505,   2073,   -678,  -1152,
+      -231,   -519,   -719,    422,  -2614,   -394,    543,   -993,
+      1449,    437,   -463,  -1286,   1191,  -1274,   -710,   -463,
+       659,   1493,     45,   -832,   -414,    306,     94,   1284,
+      -669,  -1312,   1082,   -917,   2489,   -494,    547,    738,
+     -1696,   -174,    282,  -1442,  -1455,   1633,    912,   -428,
+       964,     12,  -2404,   -485,    631,   -311,   1810,   2912,
+       -16,    576,     50,   -927,   -175,     37,    673,   -201,
+       995,    684,   -244,   -251,  -1444,   3195,   1863,    -88,
+     -1183,   -966,   1769,     36,   -825,    766,    489,    -86,
+      -365,   -106,  -1477,   -330,    125,   -253,   -250,   -523,
+      -731,  -5130,    653,    395,     99,   -845,   -721,    127,
+      -287,    850,    479,     25,    -30,     36,   -782,    611,
+       448,     99,    933,    -20,   -853,   -949,   -286,   -379,
+      -654,   -385,   1298,    547,    235,   1242,   -583,  -4147,
+        81,   -547,  -1142,   1280,   -223,  -1712,  -1501,    458,
+      -142,   2065,    208,    855,  -1115,   -187,    861,   1090,
+      -760,  -2551,   2326,   -378,  -1205,    488,   -241,    893,
+       113,    176,   4060,   -225,    -41,   -717,    -26,   -442,
+      -445,   -312,    813,    494,    314,   -210,    -98,   -788,
+       255,    632,   -506,    166,   -704,   -334,   -214,   -860,
+     -5281,     60,    -34,   -238,   -147,    643,    520,   2038,
+        28,   2433,  -1694,  -1316,   -615,    572,   -150,   -107,
+       349,  -1763,   -307,     78,  -1124,   -631,   1162,   -326,
+      -277,   -591,    558,   1016,  -4668,   -324,   -815,   -251,
+     -1284,     52,    294,  -1283,    598,    630,   -345,    641,
+       -34,   1085,   4247,    637,   1695,   -858,    212,   -243,
+       -64,    327,    557,    426,   -321,    363,   -652,    372,
+       777,   -567,   -749,  -1704,    414,   5299,    389,    242,
+        39,     31,   -315,    179,   -102,     11,     62,    248,
+       557,    706,    359,    -85,    303,   -403,   1531,    409,
+     -2092,    144,  -1354,     54,    -48,     51,  -1787,   1278,
+       942,   1264,  -1495,   1671,     92,   -899,  -1149,   1908,
+      -903,   -596,    342,   1749,   -825,    -13,    509,  -1163,
+      1065,   2405,   -253,   -741,   1099,   -528,   2971,   -412,
+      -235,   -869,   -136,   -352,   -489,   -384,    745,   -398,
+     -4197,     84,   1152,   -497,    955,   -161,    461,    -16,
+      -871,    801,    -93,    -15,   -352,   1826,   -490,   -536,
+     -2853,   -633,    128,  -1537,  -1670,    538,    788,   1276,
+       554,   -340,    565,   1216,  -1758,    384,  -1313,   -628,
+        24,    835,   -862,   -927,   1792,  -1042,    209,   -784,
+       807,   -383,  -1399,   3531,     52,   -537,    205,   -271,
+      3071,   1678,   -694,  -2313,  -1279,  -1656,   -428,  -1063,
+     -1576,   -323,   -342,   -257,   -227,   -716,   -458,   1161,
+      -180,    -71,    -40,  -1276,   1778,  -3123,   -378,  -1363,
+      -827,    880,    275,   -274,   -581,   -186,     -8,    661,
+     -1114,   -199,   -171,    379,    429,  -1551,   1645,   -857,
+      -163,  -2623,   1217,   1458,   -596,    -68,    383,    973,
+      -485,   -354,   -597,  -2875,   -516,    234,    -83,    340,
+      -396,   1365,   -574,   -816,  -2086,  -1059,  -1589,   -593,
+      -779,    334,   -546,     49,  -1065,  -1959,   1736,   1134,
+       187,   1833,     17,    -82,     68,    803,   -456,    -89,
+      1760,    836,   1570,    122,   -985,   2549,   1616,     82,
+      1102,    227,    222,  -1236,   -155,  -1012,    633,    467,
+       163,    445,    166,    766,   -253,   -347,   1041,   5121,
+       -21,    792,     81,   -478,    128,   -158,    316,  -1180,
+      -372,   1692,   -828,    -31,   1122,  -2583,   1346,   2483,
+       195,     72,    549,    424,    947,   -470,   1940,    -75,
+       505,   1377,    550,     58,   1785,    343,   -817,    874,
+      3483,   -307,   -576,    240,     35,    837,   -717,   -247,
+};
+
+static const int16_t cb0808ss1[] = {
+      2328,    183,   1652,   -907,  -3005,   1329,    -61,   -465,
+         0,   -453,  -1621,    223,    232,    -59,    254,   -312,
+      -117,    -59,   -477,  -2648,  -1176,   -227,  -1937,    962,
+       141,  -1489,    849,     93,  -1284,   1000,    295,    192,
+      -139,   -468,   -736,   -436,   2155,    371,   2475,   -348,
+       856,  -1985,     38,     94,    496,    758,    954,   -243,
+       134,  -1759,    491,  -1406,   1114,  -2554,   -447,   -692,
+     -2128,     44,   -923,   1610,    787,    150,   -500,   3442,
+      -698,    276,   -517,  -1555,    379,    -72,    810,  -1373,
+      2897,    936,   -586,   -438,    925,   1881,   -419,    211,
+      1724,    721,    885,    614,    253,    613,  -1440,    509,
+       842,  -2407,   -216,  -1765,    451,   1419,    599,    689,
+      1473,   -175,  -2974,  -1015,   1983,    -68,    640,     21,
+       140,  -1295,   -556,    -89,   -836,    718,   -343,  -1903,
+       443,    502,  -1064,   1328,     86,   2049,   1235,    130,
+       892,   1105,    692,  -2968,   -755,    473,    423,  -1371,
+     -2032,   1885,    -29,   -516,  -1118,    285,    482,    164,
+     -1932,   -685,   -819,    695,    715,  -1520,   1300,  -1188,
+      -121,   -197,  -4233,   -141,   1279,    299,    208,   1071,
+        20,    772,    692,    531,    257,    428,     78,    202,
+      -399,    -27,    793,   1150,   -736,    388,  -1922,    155,
+      -410,     85,   1135,    835,    133,    -88,     65,     62,
+      -534,   -136,  -4590,   -162,   -968,   1378,   -445,  -2825,
+       -93,   -519,    402,     12,  -1110,   -637,   -765,    210,
+     -2305,    654,    447,     26,   -265,    -91,     71,   -886,
+       126,   -109,      7,    346,     19,   -713,   -257,    774,
+      1080,   -579,    185,    200,  -5691,    541,    228,    424,
+        37,    512,    -78,   -201,    848,   -369,   1099,  -1001,
+       214,   -336,    266,   2502,   1583,  -2131,   -654,  -2476,
+       -97,   -787,   -738,   1056,   1385,    124,    944,  -3421,
+      1172,   -547,   -226,   1249,   1552,   1194,   -308,    489,
+     -1152,    751,    -92,   -168,  -3112,  -1451,   2038,     35,
+       371,  -1585,    535,    308,      5,    -53,    523,   -169,
+       591,   -175,  -1028,     91,    743,   -144,    230,   1831,
+      -177,    509,   1291,   1808,  -3322,   -815,   -227,   -475,
+     -1064,   -647,     79,   1223,    174,    -10,   -412,    393,
+      -305,   1224,   1310,     12,   -521,  -1267,   1911,   2245,
+       407,    724,  -1232,  -2017,    566,    506,   -467,    813,
+       660,   -196,  -3643,   2495,    870,   -561,    289,    662,
+       654,   -508,   -734,   -325,    622,    220,   -309,   -307,
+      -181,   -445,    131,  -1655,   -835,   -631,    883,    211,
+       737,    552,   -881,  -3103,   -766,    595,    112,    151,
+     -1177,    601,    479,    -14,     37,   -926,   -505,   1062,
+     -1755,   -799,   -178,   -555,   2509,   -694,   -792,    662,
+       737,    847,   1611,    397,    -67,   -134,    474,  -2251,
+      2698,   -245,   2054,   1603,   1291,   1188,     40,    763,
+      -216,   1554,   -297,  -1769,    410,   1270,   1089,    440,
+      -967,    294,    -37,    270,    471,   1287,   3773,   -108,
+      -610,   -275,   -298,    270,   -384,   2072,   -675,   1002,
+       174,     18,    171,    704,   3311,   -105,  -1774,    108,
+       511,  -3001,    -69,    543,   -227,  -1196,   1431,    -63,
+         6,   1279,     -1,    671,    239,  -2127,  -1924,   -934,
+       168,   -300,   1075,   1071,   3088,   -590,   1439,    329,
+      1073,    127,    762,   -131,    274,    837,   -134,   -610,
+      -399,  -1415,   1047,   -156,    415,    765,    698,    428,
+      -748,    241,  -4226,    152,   -829,   1040,   -937,    145,
+      -852,    -85,  -2957,   -130,   -406,    726,    168,    -37,
+     -1321,  -1069,  -1255,   1159,   1575,    552,    649,  -1953,
+       -17,   1027,   1078,   -385,  -2761,   -553,   -201,     58,
+     -1900,    -24,    283,   1248,    -90,    419,   1122,    902,
+     -1548,    -32,     34,   -360,    707,     45,  -3458,   -246,
+       287,    308,    397,    393,    822,   1323,   -565,    505,
+     -1553,  -1902,   -677,    625,   1079,   -135,  -2132,   -187,
+      -163,  -1001,  -1479,   -932,   1131,  -2588,   -316,     53,
+      1270,   -747,   -966,    980,    242,   -266,  -1575,  -1146,
+      -605,   -523,   -221,    585,   -787,   1365,   -286,   -183,
+       411,    546,   4779,   -286,   -578,   -101,    309,    896,
+        34,    451,  -1022,   -699,    170,    935,    458,   4143,
+       229,   -572,   -912,   -397,    -40,   -132,   -198,     98,
+     -1858,    612,    101,    -98,    -18,   -349,    322,  -1626,
+      1304,    273,   -235,    418,   -509,   3961,   -493,   1040,
+      -416,   1808,    161,   1443,   1052,   -460,     55,    -67,
+        41,    514,   1305,   -836,  -1636,   1353,    379,    147,
+       398,  -3814,   -679,    235,    327,  -2293,   -716,   1234,
+      -728,   -323,    698,   1992,      4,   -275,    944,    895,
+       212,    334,    285,   -710,   -891,  -1325,   3107,      3,
+       367,  -1779,    300,   -868,    -59,   -644,   -326,    111,
+       267,    -43,    421,    976,     57,   1461,   -172,    245,
+      -188,    296,   -215,   5269,    -46,    177,    199,   -539,
+        92,   -542,    251,    951,   -231,    117,   -580,   -898,
+       402,    847,      4,    384,   -215,    161,  -1991,   4422,
+      2461,  -1219,   -751,   1843,   1483,   1072,   2621,    -16,
+     -1157,    243,   -557,    651,    953,    476,   -417,   -533,
+       505,   -590,    713,    153,   1268,   -312,   -217,   -124,
+       870,   -484,   -751,   -161,    897,    755,   -823,   4117,
+     -1311,   -729,    447,   -642,    929,  -2408,   -338,   -967,
+      -104,  -1048,  -2216,  -1722,   -124,   -204,   -196,  -1156,
+      1460,    391,   -543,    120,     70,    204,   1185,  -2490,
+      2950,   -507,   -615,   1243,   -150,   -363,   -475,   -531,
+       783,    671,   -205,   -591,    217,   -523,    263,    -14,
+        71,    958,  -1185,  -1029,   -330,    327,   -705,   1229,
+     -2925,    131,   -495,   1756,   2101,    441,    -11,    133,
+      1274,   1253,   -154,    772,    522,   1725,   -277,  -1012,
+      -726,   1339,  -1200,   -241,   1676,    974,   2256,    347,
+      2743,   1482,   -738,   -241,   -868,  -1294,   -664,    855,
+     -1329,  -4174,  -1647,   -104,    101,    307,   -647,   -823,
+       347,      4,   -120,  -1112,    334,     27,    265,    990,
+       319,  -1414,    313,   -603,     52,  -3138,   1552,   -612,
+      -854,    626,    212,    773,   2334,    662,    614,    560,
+       589,   -533,   1337,    229,    557,    -26,   1458,   -626,
+      1890,   2392,  -1525,   1023,    667,   -431,     72,   1691,
+      1015,    -97,   -515,   1380,    796,   1192,    -39,    162,
+     -2821,   2960,   1558,  -1058,   1327,    793,   1231,   -743,
+     -1190,   -245,     29,    486,   -494,  -1371,   1633,    -66,
+     -1806,    231,   -664,   -147,   2402,   -584,    473,   -527,
+      1272,    464,   1991,  -1007,   -235,    357,    201,  -1176,
+      -341,    223,    -47,  -2089,    815,     49,    192,   -719,
+     -1041,   -248,   3046,    -40,   -501,   -346,  -1347,   -401,
+        57,  -1588,  -1039,    443,    590,  -1089,   -182,  -1365,
+     -1013,  -3917,   -382,    -98,   1025,    -51,    698,   -197,
+       848,    -75,   1596,   -408,  -1796,  -3191,   1155,    234,
+      -100,    698,    571,  -1233,   -315,  -1502,   -647,   -571,
+      -322,    842,  -1048,  -1115,   8192,   -784,   -472,     17,
+      -718,     37,   1190,   -393,    146,   -547,     90,   -433,
+      -321,  -1143,   -501,    468,    235,   -486,    -64,  -2214,
+      -330,   -837,   1214,   -127,    709,     -3,    623,   -384,
+       221,    297,   -783,  -3802,   -408,    -11,   -707,     92,
+      -275,   -268,   -117,   1580,   1466,    710,  -1300,    142,
+      -746,   1647,   2399,  -1231,    114,   1220,  -1112,    882,
+       467,   -973,   -976,   3855,   -647,   -150,  -1244,    973,
+      -364,   -154,    473,   -675,   -817,   -346,   -266,   -769,
+      -613,   -476,   1181,     -8,  -1054,    405,   -768,   1385,
+     -1598,   -892,    672,  -2185,     83,    -27,    582,   -434,
+      -944,     99,   -888,  -1658,  -1516,   2392,    726,   -222,
+       284,    324,   4848,    -67,   -782,    -45,    424,   -203,
+      -194,  -1229,   -114,   -189,   -216,    275,   -935,    -93,
+       117,  -1725,    360,  -2561,  -1555,  -1199,   -769,   -285,
+        74,   1267,   -387,   1368,    179,   -113,    952,   1025,
+       725,   -542,   -186,   1258,  -1396,   -747,    572,    603,
+      1965,   -668,    -12,  -2512,   1337,   -255,    254,   2285,
+      1136,   1397,    557,   -671,  -1149,   -614,   -462,   -913,
+      -452,   1206,  -2922,    485,   -882,    270,  -1309,   -605,
+       -21,   -580,  -1284,   -194,    169,  -2314,   -216,   -229,
+      1124,    103,  -1205,   1500,   1118,   1456,  -1149,    780,
+      -467,   -385,    585,  -1062,    289,  -3356,    198,   -309,
+      -310,     91,     44,   -377,   -632,   -737,   -516,     30,
+      -779,     73,   -482,   4661,   -275,     38,   -632,    479,
+      -345,   -406,     76,   -208,   -230,     80,   -220,   -313,
+       203,     -3,   1740,   -131,    773,    -30,    372,    767,
+      1673,   -770,   3326,   1586,    234,    408,   -257,    474,
+      -584,   -990,   1378,    696,     47,   -612,   -313,    189,
+     -3964,    795,   -289,    202,   -437,  -1648,    373,   -780,
+       -24,   -952,    123,    438,    797,    539,   -481,    191,
+       291,     37,   -790,   -321,   4520,    -49,   -281,    211,
+};
+
+static const int16_t cb0808sm0[] = {
+     -4664,   -115,     59,   -280,   -199,    -25,    213,   -937,
+       344,  -2137,   -841,   -370,    256,    512,   1098,   -130,
+        58,   -121,   -414,   8192,    489,   -296,    -33,     98,
+        49,   -217,    721,    -42,   -418,   -227,     -8,    205,
+      -276,    407,  -1218,   -146,   -292,   -143,    113,    978,
+      2693,     -9,  -1032,   1781,   1777,   -215,   -978,   -824,
+        68,   -162,     55,   2991,   -844,    682,    497,    406,
+      -922,   2471,    599,    774,   -129,   1292,  -1004,    777,
+        42,    314,   -102,   -963,  -2794,  -2620,    510,    355,
+       372,   -248,   -391,   -163,   -298,    561,    117,   1183,
+        38,    182,   1811,     -4,    328,    -13,   -456,    305,
+       368,  -1691,  -2818,  -1074,   1029,    261,  -1446,    343,
+        12,  -2757,   1021,   -375,     -3,   -155,    116,    195,
+      3420,     64,    139,    780,    187,   -464,    261,   -313,
+      -128,    185,   3703,   3160,    960,    706,     41,    405,
+        10,   1191,    353,   -549,    131,    164,    105,      1,
+        23,    386,     73,   -509,   2651,  -1441,   -834,  -1657,
+      -645,   1005,   -777,    695,    212,   1420,     65,    701,
+        25,    335,    136,    359,   -112,   -150,    191,    392,
+      -258,  -1140,    651,  -4551,    411,    251,   -169,    804,
+       -83,   -208,   -363,     81,    152,     75,  -1194,   -203,
+        -9,    157,    413,    -62,   -210,   5393,    -22,   -407,
+       132,   -288,   2360,    131,  -1535,    553,  -2524,   -140,
+       250,   1259,    -30,     -1,   1766,     99,   -529,     91,
+      3948,   -262,  -3752,   -382,   -339,   -701,   -140,   -787,
+        67,    -11,    331,   -828,   -443,    596,     47,   1634,
+        31,   -318,     39,    147,   -670,   -776,    707,   -921,
+       172,    971,   1163,     48,    -81,  -1357,   -181,   2872,
+      -152,    898,   1075,    529,     91,  -2279,   2925,   -848,
+       589,   1910,    549,   1088,    743,   -631,     42,  -1528,
+        23,    380,     -5,    389,  -1147,   -209,  -2041,    224,
+     -1998,    520,   -776,    193,  -2648,    -78,    -34,   -131,
+        22,   -200,    -28,     18,    328,    215,     67,     61,
+        50,    -72,    301,   -207,    413,    720,  -6194,    967,
+     -3275,    149,  -2444,   -521,   -772,   -278,    137,   -159,
+       932,   -111,   1219,    525,     17,   -684,  -1229,  -1776,
+        66,  -2307,   -195,   -527,    272,   -470,   -356,     -7,
+      -338,    146,   1021,   -893,  -2980,    591,    129,   -257,
+       209,    -58,    538,  -3973,    576,   -905,   -642,  -2092,
+       153,    737,   -596,    573,    236,   -887,  -1692,   -370,
+      -189,   -216,    -58,    714,     10,   -582,    517,    -86,
+       450,   -147,   -310,    162,   1747,   -656,   3577,    700,
+       190,   -685,   -170,    241,     91,   -126,   5567,    441,
+       -50,   -688,    -73,    938,    320,   -130,   -839,   1154,
+       149,   -446,    -10,    -11,     12,   -659,   -138,    637,
+      -470,    933,   -431,    235,    -86,     -2,   -407,  -5851,
+      -250,   1414,    525,    110,    421,    255,   -149,     86,
+       378,   -321,   1380,    118,  -2849,  -1138,    180,   1175,
+      1932,     32,   -488,   -121,   -412,   -441,    397,    249,
+      -172,    -95,    420,    375,   -132,   -215,   -167,   -206,
+      8192,   -116,    -61,   -311,    269,    615,   -353,   -115,
+      -383,    366,   -651,   -196,    -98,     85,    861,    543,
+      -231,    237,    493,    380,   -766,   -168,   3227,    659,
+       701,    181,  -3004,     -7,    154,    298,    298,   -257,
+       -32,  -5713,     48,    102,   -776,   -148,   -110,    316,
+      -645,    212,    213,    575,    -69,     31,    553,   -673,
+        -5,    -48,   -148,   -133,     11,    143,     10,    159,
+       319,     43,   7462,    162,    228,    -90,     75,    151,
+       103,  -2542,    -13,   -338,     11,   -442,    123,  -3039,
+      -452,      7,    106,    502,    227,  -2034,     90,    500,
+       -28,   -646,   -262,    -62,    -78,     40,    419,   6761,
+       -11,     40,    209,     61,   -151,    -68,   -245,   -401,
+        26,   -123,    189,    -57,    611,      6,  -1285,    -99,
+      -890,   3609,   -302,   -808,    639,  -3245,   -226,    107,
+        54,   -108,   -316,    -61,    -56,    228,    -16,    195,
+       275,    214,    -60,     77,  -7157,    130,      8,    244,
+     -2160,   -760,    450,   -186,   -378,     32,   -797,    214,
+     -3569,   -450,    307,    -17,   -141,     16,   1024,    404,
+     -2063,   -288,   -160,   4056,    877,   -346,   -970,    -87,
+       336,    961,    666,    585,   -465,  -1329,    350,   -338,
+     -5421,   -173,   -295,     72,   -201,    533,    462,   -133,
+      -937,   1891,    264,     71,   -935,    640,    687,    852,
+      -386,    -85,  -5644,    306,    240,    640,     67,     94,
+      -902,   -351,   -417,     -3,    284,     38,   -156,    359,
+        53,    139,    185,    274,   2613,    213,   1282,   2867,
+        30,   1234,   -911,    343,    -93,  -1671,     57,   -814,
+       -19,    326,   -256,   -113,     72,   3177,   3393,   -125,
+       460,   -261,   -503,  -1019,   -681,   -253,   -957,   -157,
+      -117,   -231,   -212,   1446,    225,  -3009,    313,   -435,
+       387,   -928,    696,   -857,   -452,     66,  -2063,    782,
+        14,    -94,     51,    242,   -422,    236,  -3825,   -666,
+       348,    196,  -2770,    429,   -416,   -266,  -1215,   -586,
+        84,    328,   -302,    219,   -457,   -532,   -764,     85,
+      2008,   -806,   2906,  -1405,    367,    835,    715,   -986,
+      -217,     88,   -328,    569,   -586,   3096,    249,   -615,
+       453,    176,   -540,    792,  -2472,   2189,    876,   -353,
+       111,    212,     -7,    597,   -154,    818,   -401,  -1408,
+       748,   2502,   1426,  -2897,   1069,    326,   -605,    120,
+     -4149,  -3087,    729,     82,    224,    320,    353,    -77,
+      -163,   -322,    220,  -1073,     10,    545,   -518,   -453,
+        50,   -386,  -2002,    614,   -705,   -806,   -928,   2941,
+      -520,    -35,   1208,    413,    900,    138,   -414,   -289,
+       -15,    -75,    185,   -373,    649,   -251,    666,   2708,
+     -2817,   -749,   -159,   -112,    454,   -385,   1037,    -46,
+       -25,    -14,     66,    552,    160,    -40,   -552,   -156,
+       151,  -5287,    541,   -242,    -82,  -1164,    849,   -773,
+      -136,   -162,    -76,     23,   -371,   -222,  -2245,    468,
+       425,   -356,    418,     -3,   -322,  -3573,    148,    260,
+      -155,   3301,   -165,  -3186,   -709,   -458,    870,    386,
+        59,   -161,    533,   -150,    598,    384,    900,  -1233,
+       -74,   -464,   -519,   -661,    -55,  -2562,    290,   1489,
+      1739,   2277,    874,  -1483,   -447,     93,    309,    311,
+      -203,    -19,   2271,  -1280,   -125,   -443,   -538,   2650,
+       -42,    290,    245,   -149,     24,     38,   -133,   1638,
+       210,   -239,   -180,    516,    -12,   -719,    -19,   -517,
+     -6190,   -181,    -89,    318,    485,    631,     11,   -205,
+       -57,    257,    573,    -72,    273,   -579,    107,     -5,
+       112,    425,   2449,   2741,    758,    656,   -663,   -282,
+       -48,    -45,   -294,   -448,  -5562,     61,     -1,   -464,
+      -263,   -688,   -115,    -15,   -108,   -569,   -448,    -48,
+      -180,   -105,     14,   -180,    490,    274,    625,   -588,
+      -120,   -196,   -305,   -126,    435,  -2490,  -2693,  -3414,
+        31,     97,   -167,   -114,    247,   7695,   -189,   -580,
+       219,    241,    188,    327,    179,   -193,    135,   -176,
+       127,    479,    529,    234,    112,    234,   -358,   -286,
+      1109,   2940,   -610,    -13,  -2650,    495,   1355,   -574,
+       -43,  -1497,   -292,   -503,    564,   -363,     24,   -313,
+      1387,    221,  -3612,    783,    637,     43,   1351,    217,
+       -21,    149,  -3104,    190,   -259,   -201,   -342,   -201,
+       166,   2411,  -1082,    283,   -382,   -725,    157,    155,
+     -1609,   -592,    527,  -2959,      9,    216,    526,     79,
+        54,   -132,    202,    785,    929,   1755,   -663,    366,
+     -3735,   3282,    305,    572,    -36,   -111,   -231,    119,
+       603,   1357,   -153,    553,    363,   -760,  -1188,    890,
+       147,  -3844,  -3788,    150,    257,   -588,   -234,    497,
+       361,   -543,    255,   -175,   -377,     49,   -616,   -200,
+      4115,   -541,    130,    678,  -3458,   -506,   -218,  -1317,
+       889,     29,   -104,     -2,    532,   -393,    513,   -792,
+};
+
+static const int16_t cb0808sm1[] = {
+      4123,    -74,    639,    326,   -110,   1896,    826,   -855,
+      -299,   -452,    536,   -323,    262,     79,    486,    144,
+       270,    -64,    277,    154,    399,     50,  -7270,    -61,
+        14,     -8,     19,   -104,    333,    119,    374,    389,
+      -196,     77,   -322,    261,     75,    386,    162,   2360,
+       644,  -2785,    355,    277,   -121,   -148,    156,   2136,
+       112,   -453,    429,    171,   2405,  -1245,   -775,   -181,
+      2110,   -583,    127,    889,   -290,   -550,   -165,   1027,
+      2155,   -351,   -936,    432,   2689,    217,    -20,    646,
+      -785,    908,    654,    970,   -294,    -41,    466,   -245,
+       138,     50,   -108,   -366,    177,    481,  -2118,    968,
+      -594,   3892,    528,    188,   -613,     18,    283,    733,
+       -35,   1598,    387,      1,    156,   -206,   -437,    203,
+      -244,   -347,    325,    296,    100,   1171,     49,    920,
+      -418,    -54,  -2756,     24,    123,   1018,    303,   -501,
+       901,   -447,    322,  -2361,   1039,  -1067,    877,   1329,
+      -143,  -2773,    269,   1560,    398,  -3193,    102,    990,
+       279,    379,   -204,   -144,   -174,    139,    411,   -234,
+        21,  -5064,   -188,    365,    278,    353,   -189,     94,
+       593,   -402,   -353,   -257,   -788,    383,  -1036,    569,
+       -72,  -1764,    571,   1003,    629,    670,  -1400,      0,
+      -435,     64,    189,   2874,    239,   1128,    992,   1213,
+        69,   -128,    207,    713,  -2436,   -931,   -387,   -111,
+      1064,   -170,  -2853,  -1072,   -367,  -1048,   -238,    -60,
+       -49,    340,   2382,    370,   -245,    351,    248,    -64,
+      2331,    458,   -484,    -34,    281,    689,    483,    636,
+       199,   3153,    607,   -124,  -3296,    953,   -407,     49,
+       455,   1083,    690,   -169,   -725,    311,   -493,  -1761,
+     -3054,    376,   -544,    479,     91,    159,  -2837,  -1257,
+      -830,   -948,   -254,    289,  -1039,    856,     86,   1123,
+       203,   -768,   1089,     73,   -866,    308,    437,    674,
+     -2067,   -240,  -1079,     33,  -1069,  -3502,    756,   -676,
+        45,  -2544,    378,   -365,   -275,   -293,   -394,   -649,
+      -507,  -2850,    672,    370,    186,   -417,    682,    185,
+       -15,   2863,     21,   -165,    356,  -3776,   -103,    535,
+      -416,   -345,    -31,     24,    -90,   -205,     96,   -966,
+        94,    424,     -5,   -188,    149,  -2193,   -183,   2342,
+       425,   -647,  -1697,   -627,   -444,   1248,   -967,   -702,
+       -48,   3616,  -3484,    774,   -299,     94,    421,    472,
+        71,   -144,   -523,    114,   -172,    349,   -285,   -106,
+       101,     59,    429,    512,   3362,    -38,    -62,     50,
+      -225,  -1408,    780,  -2747,   -404,    489,   -975,    840,
+       357,    982,    488,   -275,   -109,    393,    375,   4794,
+       183,   -110,    922,   -760,     61,  -1067,     -8,    322,
+        74,   -101,    554,   -350,   -486,     66,    384,    748,
+        14,    223,    -45,   -386,     69,   6231,    247,    325,
+      -320,    -47,    -50,   -165,    153,   -380,    589,  -3243,
+      -173,   -140,    341,   -747,  -1559,    639,  -1658,    356,
+       110,   -150,   -273,     76,   -632,   -425,   -227,    640,
+       211,    192,   -747,   -165,   4608,    290,   -160,   1268,
+      2754,     -3,    578,    189,   -485,  -2747,   -123,  -1309,
+       662,    601,     43,   -136,     84,   1625,  -1113,   1400,
+        75,   -126,   3581,   -243,   2339,   -514,   2203,   -400,
+      -483,    521,     30,   -246,    -76,    359,    101,    663,
+       -40,     57,     52,    360,   -447,   -290,    254,    104,
+       102,    113,    215,   -163,   -388,    299,   4570,     31,
+       108,    -41,     41,  -2633,   2891,   1188,   -505,   1061,
+      -349,   -604,   -449,   -374,   -320,    969,   -304,   -192,
+       246,   -152,    441,    -46,  -1416,    137,   1987,    495,
+       -63,   1087,    875,    699,    201,    211,  -3157,   -273,
+       -60,    195,  -2813,   -239,   2486,    -55,    294,    315,
+      -133,    448,  -1849,    363,   1063,     76,   -928,   -574,
+       -72,    -57,    168,   5673,   -156,   -116,    400,   -124,
+        82,    218,   -487,     37,    112,     53,   -544,    178,
+        99,    480,  -7179,   -196,    271,   -160,    308,    -62,
+       393,    394,   -220,   -740,    -14,     92,    408,   -364,
+       299,   -305,     76,   -239,     26,   -312,   -234,     34,
+      -189,    871,   -297,    364,    282,   -321,   -927,   4511,
+         2,      6,    308,    -82,     87,   -128,    518,     82,
+     -4509,   1145,    960,   -109,   -186,     83,   -144,    752,
+        84,  -2876,   -162,    877,   -249,    317,    510,    338,
+       298,    744,   2892,   -791,    363,   1088,    630,  -2506,
+        -1,   3150,    219,    130,    119,    313,   -822,   -668,
+      1201,  -2948,   -237,   -106,   -711,    405,    276,   -255,
+         0,    440,    161,   2587,   -734,   3376,    276,    154,
+       287,   -200,    594,    -29,    198,   -237,   -608,   -445,
+      -286,    202,   -783,    112,  -3879,     78,   2809,   -337,
+      -606,   -684,   -434,    559,    273,    201,    331,    903,
+       -53,    346,    700,   2599,    302,   -590,  -2551,   -498,
+       -26,   -667,    576,   -546,    457,   -289,  -1408,  -1021,
+       -63,     78,    153,    -83,   -696,  -3105,   2498,  -1502,
+     -1249,   -238,    254,   -287,    215,    313,    279,   -517,
+        67,    -58,   -148,  -1111,     58,   5151,    346,    283,
+      -367,   -900,    542,    209,   -438,   -128,   -135,     54,
+         7,    869,    291,  -1073,    775,    -61,   -145,    457,
+       562,   1332,  -4589,     99,   1366,    184,    980,   -920,
+        80,   -266,   -152,  -1877,   -266,    364,  -1432,    272,
+      2275,    567,     60,     50,  -2504,   -386,   -700,    373,
+      6775,    -15,   -434,    347,    215,   -369,    -20,   -281,
+      -243,   -325,    227,   -283,   -665,    -74,    336,   -674,
+      -112,   -369,    -53,   -396,    328,   3588,   -541,   -557,
+      -164,   1305,   -817,   -462,   1986,   1249,   -574,    130,
+       152,  -2375,   -425,    442,  -3827,    322,   -728,    563,
+      -179,    534,    620,   -937,    590,     -1,    -59,    584,
+       175,   -193,   -168,     -5,   -150,    156,   -175,   -178,
+      -245,  -7481,   -273,    212,    -35,    318,   -178,    446,
+       -55,    -26,     42,    -46,   -265,    767,    330,    295,
+       910,    -54,    490,   2952,    598,  -2578,   -644,    403,
+       149,    -88,    549,   -510,    596,   -225,  -2341,   -286,
+     -2724,      5,  -1960,   -262,    922,    537,    646,    -62,
+       -18,   8192,    484,    112,   -222,   -211,   -224,    317,
+       112,     82,   -853,      1,    176,   -475,   -162,    200,
+      -193,    166,   -228,   -214,     72,    417,    -27,    -16,
+         4,    395,   -515,  -6832,     28,    -47,    626,   -173,
+        63,     90,    141,    217,   1037,    335,   4520,   -896,
+       111,     91,   -656,   -103,   -729,    -29,    653,   -599,
+       -11,   2734,   -378,   -291,     60,    228,     47,  -3670,
+      -192,    653,    733,   -597,    898,   -420,   1572,   -133,
+      -154,    329,   -259,   -225,    218,    -82,    117,    300,
+      -479,    277,    787,  -1719,    136,  -3603,    702,   1357,
+      3340,    362,   -438,    131,  -1463,    367,   -467,   1722,
+     -2186,    343,   -379,   1221,   -562,   -260,   1157,   2692,
+        37,    -89,   -322,   -322,   8192,   -284,    235,   -528,
+       113,   -359,     44,     74,    119,   -917,    403,    410,
+      -150,    157,    514,    168,    407,   -246,    -31,    510,
+       105,    449,   4612,    635,    -90,  -1260,    774,   -284,
+       -80,    456,      7,  -3000,   -324,   -212,   -104,   -374,
+      -440,   1268,   2736,     53,  -1178,   -403,   -438,   -534,
+       121,    261,   -497,    -73,     10,   -262,     17,  -1870,
+       178,  -1339,    224,   3115,   -436,   -448,    385,    894,
+        -1,    105,    -18,    268,    342,    270,    891,    367,
+       121,   -325,  -1610,    -75,  -3233,   -189,  -1050,    961,
+     -2833,   -304,    -51,    400,   -284,   -810,    824,    -71,
+      -135,    194,    297,   -297,   1129,    660,    518,   2426,
+      -225,    251,   4677,   -176,   -464,    296,  -1208,   -423,
+      -875,   -581,   -707,  -1150,    499,   -778,     28,     29,
+       101,  -4213,   -127,  -3681,    425,    481,   -529,   -679,
+        11,    266,    127,   -445,    527,   -577,    310,   1465,
+};
+
+static const int16_t cb1110l0[] = {
+     -3748,  -3820,   -105,     16,    -22,     -7,    112,    -14,
+        52,     28,    -42,   -113,    132,    -81,     -8,   -112,
+        19,     33,   -251,    117,    -33,     -9,    -13,    -28,
+        60,    -30,     29,     27,    -58,     -7,      4,     43,
+    -10108,    -38,     -3,     48,      3,    -23,    202,   -175,
+      -202,     71,  -2143,      3,    -82,    -38,   -113,    141,
+        38,    -66,   -118,    -38,    -14,    148,   -264,    143,
+       -13,    -56,     -9,    -21,    -28,   8930,    -23,     53,
+       -40,     30,     72,    -46,     26,     66,     22,     32,
+        44,     22,    -50,    -66,   -115,   -141,     24,  -3013,
+     -3460,    492,    207,    -62,   -567,    134,    -26,    -64,
+       287,    343,   -213,     42,   -274,   -144,   -144,    -77,
+       -26,    -39,      4,     -4,     42,     43,     30,    -16,
+        34,    113,   9291,   -171,    -17,     24,    -53,    -27,
+        45,     42,    533,    146,    -65,     32,    156,   -144,
+      2821,    889,     -7,    614,     11,      1,   -473,    434,
+       659,   -323,  -2448,     23,   -138,   -582,    436,   -152,
+       -30,     29,   -290,   -302,   3127,    496,     14,   -346,
+       -70,    457,  -1976,   -229,     53,  -2077,   -313,     58,
+        33,    -91,   -175,    141,   2728,   3232,  -2150,    245,
+      -142,     13,   -318,     70,   -152,    -64,    132,   -322,
+        44,     30,    -70,   -184,    433,    -25,    -97,  -2035,
+       145,     47,    640,    179,   -441,     48,   -108,   1742,
+      -280,     33,  -3259,     79,   -147,    324,    -80,     65,
+        48,     90,     -7,    -21,     22,      3,     56,    -30,
+        14,     -2,   -111,     22,     -8,  -8252,   -103,    -36,
+        57,   -203,    287,  -2761,   -220,    143,     11,  -3597,
+        21,    -81,     62,    -99,     41,   -172,    108,     29,
+       351,   -370,     15,   -122,   -207,    275,    -93,  -2760,
+       400,   -212,    225,    230,   -239,  -3530,    -73,    211,
+       288,     85,     -6,   -634,     57,    -78,    361,   -149,
+     -1843,    -23,     17,    -37,    -71,   -174,   -237,     42,
+       -22,   -243,     63,   -101,    131,     35,    136,  -4025,
+        41,   -262,    -57,    197,   -290,    307,     35,    -16,
+         3,     -5,     45,     -7,      1,    -47,     41,    -19,
+        79,     78,     42,    -85,     74,   -414,   1696,    703,
+       297,  -3296,    108,   -546,   1129,     44,    447,   -433,
+       315,  -1012,    133,    141,   1051,    601,    -18,   -532,
+       -30,    712,   -127,   -210,     10,   2442,    -95,    -46,
+       -14,     77,     32,    -11,     10,   -103,    -15,    637,
+       -60,    352,    694,   -202,    284,  -5524,     92,    -82,
+         5,    140,    -54,   -115,     45,    287,    -14,   -307,
+      -342,     10,   -181,     50,    -30,     -6,  10144,     77,
+        42,     13,     26,    -20,     34,     10,     37,    -37,
+       -47,     90,     -5,    -44,    -85,    -64,    -51,     -1,
+        16,   -152,    -91,    212,      4,    -25,   -237,  -6124,
+        22,   -120,     -1,    171,    -17,    -43,    141,    -13,
+       -57,   -185,     80,    273,   -493,    178,     45,     11,
+       -57,     16,    -23,    -30,    -37,     82,      4,    -13,
+      -130,     98,    272,   -450,   -161,    133,   5104,     14,
+      4576,   -193,     11,     55,    -30,      1,    123,   -265,
+       -84,   -340,    -18,    152,    -24,   -266,     33,    -90,
+      -108,   -639,   1662,    299,    -14,   -389,   4679,   -226,
+        21,    311,   -294,    159,   -209,    172,    184,    292,
+      -373,    169,     84,     55,   -269,   1453,    -50,     41,
+        68,     -9,    -62,     35,     23,   -132,     96,     58,
+      -122,  -3956,   -318,    210,   -117,    678,   -104,    378,
+      -842,     61,   2549,     37,    149,   -512,     70,  -2971,
+       225,   -411,    230,   -214,    697,    -58,   -871,   -281,
+      -128,   -204,    -37,   -128,     51,   -174,   -405,    497,
+     -4455,   -219,    124,   -120,     63,    135,    201,   -122,
+      -435,   -677,    221,    138,    486,    535,   3153,    165,
+        11,   -275,     94,   -100,     69,     52,    -67,   -742,
+       212,     16,    -93,   -428,    863,    -17,  -2465,    767,
+       -35,   -130,     97,   1387,     34,     72,    -23,    -17,
+      2845,    -90,    -71,    213,    291,     87,    826,    -63,
+       189,    641,   -256,    832,   2087,   -199,   -170,   -193,
+       -62,     -7,     37,    -60,  -4277,    -43,     24,    -69,
+       574,   -163,   -113,    263,    -86,     45,    171,   1075,
+      -154,    -39,    121,     74,   -132,    182,     34,     13,
+      -278,    -41,     96,    716,   -221,   -626,   1205,    244,
+      -351,   3914,    -78,    -32,   2833,   -150,    -37,     95,
+      -227,    -84,  -3432,     57,    238,   -143,   -365,     39,
+        27,   -238,   -307,   -170,    124,     66,   -133,     40,
+        62,    -19,     42,    -66,      2,    -80,     -2,     60,
+         7,     10,    263,  -4987,    -69,   -389,     62,    -53,
+       -66,     24,    -87,     13,     34,    -15,    -25,    -20,
+       197,      9,    101,    -83,    -79,   -156,   -100,      2,
+      -108,   5687,   -157,    878,  -1728,     32,     72,    -66,
+        70,     -2,    -46,   -163,    206,     17,    247,   2974,
+       -66,   1354,    335,    238,   -249,   -410,   -553,    354,
+       -41,    132,    -96,     68,   2174,   -329,    -58,    -76,
+         6,   3089,    284,   -274,   -398,    471,    283,    427,
+      -220,     81,   2676,     40,    -23,    -46,    251,    109,
+     -3059,     50,    -25,   -551,    124,   -389,    228,     95,
+        56,  -1320,    -79,   1027,  -4938,   -105,    -82,     13,
+      -159,     52,   -101,     23,   -220,    -77,   -153,    113,
+      -282,     42,    185,   -144,   -402,     46,   -144,    -99,
+     -2862,  -3432,     -2,     16,    -32,     23,    -25,   -145,
+       181,     49,      6,   -236,   -226,    -28,    234,    -26,
+       -89,    -14,   -355,    146,    117,    -50,     76,    -10,
+       441,    -95,     -2,    346,   -242,  -3745,    884,   -305,
+      -184,    350,     18,   -293,   -328,    257,    109,     49,
+       157,    -44,    -70,     35,      6,     89,  -4085,   -167,
+      -263,    -59,     35,    -13,    430,   -212,     17,   -618,
+        -5,  -8968,    114,     41,     73,    -85,    122,      5,
+        38,     19,    -60,     14,    -36,    -42,    -89,     20,
+        85,    -17,     20,    282,  -3396,    -25,   3722,    151,
+      -183,    100,   -150,     19,   -221,    126,     34,    -21,
+        72,     28,    138,    -90,     30,    162,     46,     40,
+        27,     15,    -55,    -21,     38,     55,     32,     83,
+      9675,     31,     26,     -2,      4,     96,    -51,    120,
+      -132,    213,   2106,     39,   -251,     98,  -2572,   -429,
+      -331,   1436,   2078,    335,   -381,    371,    299,    339,
+       300,   -141,    -99,   -303,   2952,     49,     93,     40,
+     -3949,    -45,     50,   -215,     73,    -39,   -165,   -283,
+        46,   -123,   -347,     23,   -158,     41,     20,     41,
+       -46,     19,     34,     86,  -8770,     40,     20,    -32,
+       -30,    -16,     77,     72,     -4,     92,    -34,    103,
+       -77,    128,   -532,   -314,     24,    728,     49,    -36,
+      -178,     76,     22,    -14,   -164,   -194,     69,   3133,
+      1007,   -130,   -280,   2502,    482,     -2,     45,    -62,
+        -7,    -94,     17,     23,     -4,   9516,    -27,     11,
+        22,     54,    -13,      2,     -2,      6,    -22,    -63,
+        67,   -686,    130,  -2180,   -124,     57,    -61,   -158,
+      3364,    518,      4,    315,   -367,   -103,   -295,    259,
+      -597,     56,     -6,     72,    -86,    -45,    -13,    -47,
+       -13,    -27,     -3,     48,    -12,    -52,     -6,    -14,
+       -26,    -16,    -34,   9554,     80,     91,   -270,      1,
+      -121,    117,     33,      8,     40,    -99,    -79,     43,
+     -3451,    -92,    -70,    -57,     43,     68,     64,    284,
+      -639,    458,    118,    -54,  -2755,    370,    -66,     54,
+        27,   -198,    331,    115,    -40,   -209,   -312,     82,
+       -16,      8,    230,    212,   1853,    -94,   1957,   -118,
+       153,    -13,    -73,     71,    116,    -72,  -3285,    106,
+        19,   -121,    177,   -300,    455,    -29,     94,    190,
+       -21,     -8,    201,     16,      2,     83,  -6280,     32,
+       -18,     59,    -18,    -41,   -132,     22,      1,    -39,
+      -212,   -198,    186,   3154,   -102,   3463,   -280,   -118,
+      -132,   -132,     63,    -19,    353,    -24,    -77,    224,
+        82,    143,    -65,    165,    -16,  -3774,   3543,    -28,
+       -44,     93,    -45,    -13,    -24,     -5,    -40,     58,
+         3,     89,     71,    113,     46,     62,     44,    160,
+       -77,     -8,    -59,  -6505,    134,    -42,    -73,      0,
+        85,      2,     16,     34,    157,    -34,    -60,     78,
+        24,     64,     96,    478,    231,   -125,   -217,     13,
+        21,     44,     83,    198,    -69,     21,   -167,    -52,
+      4085,   -234,   -393,     17,   -446,   -354,    -28,     42,
+        53,    -37,     28,     15,    -16,    -10,    -85,   9471,
+       -16,    -89,    -87,    -56,     52,    -97,     86,     -7,
+      -103,    -12,     71,    -39,     17,    -40,     23,     63,
+        65,    -19,    -14,   -106,     29,   9707,     -1,    -12,
+         1,    -86,    100,      7,   1097,    266,    252,    197,
+       -64,   -214,   -197,    -28,   3843,  -1577,    310,   -117,
+       594,     13,     90,   -309,   -384,    134,    -90,   -194,
+      -316,   2884,    156,   -185,    196,   -103,     75,   1009,
+        69,    768,    -75,   -605,  -1488,    389,    242,    368,
+       278,   -122,  -2500,    121,      7,   -303,     91,    -10,
+      3642,     23,   -109,    -13,    138,   -405,     18,    -43,
+         3,     42,    194,   -112,    237,  -2241,     23,    296,
+       -83,    -14,    -58,   -163,     -8,   -174,   -239,     85,
+      -108,    -82,    -79,    344,    236,   -427,    127,     52,
+};
+
+static const int16_t cb1110l1[] = {
+       -64,     11,    -74,    -96,     39,   6072,     16,     46,
+      -215,    137,     77,    128,   -195,   -192,    -87,     96,
+       379,    -73,    367,    437,   -366,     84,   -155,    -29,
+       -69,    -61,    -34,   -129,    260,   -177,   3738,    739,
+      -221,    -14,    -40,      2,   -483,   -269,   2664,    166,
+        29,   -256,     30,     92,     51,    111,    -45,   3893,
+        90,    -30,    -99,     12,     74,    201,    -52,    -96,
+      -196,    -85,    -36,    123,    -44,    -68,      2,   8666,
+        33,    -41,     24,    -12,    -52,     69,     59,    -27,
+        38,   -148,    -55,    -20,    -60,     50,   3363,     30,
+      3749,    -92,    228,    173,   -239,   -167,    -75,    -79,
+       -86,   -217,     32,     34,   -137,    -13,     17,   -128,
+     -1462,   -170,   -224,   -393,  -3383,  -1243,    -47,     24,
+      -223,     26,    311,   -343,    -47,    784,    459,   -548,
+       558,    983,    103,    269,     32,     13,     19,    -84,
+       -37,    -29,    -47,  -6286,      7,     48,   -100,     13,
+        11,   -271,    -86,    115,    -17,    183,   3247,  -3336,
+        57,    -67,   -117,    -87,     19,     74,   -271,    237,
+       -24,    242,     49,   -179,    298,     85,    -69,    328,
+      -238,    -34,    103,    -50,     79,      2,    -27,    -16,
+      -103,    -61,   5868,   -105,   -262,     74,    -74,   -158,
+       263,   -110,    154,    212,     -3,    -84,   -126,     25,
+       -67,  -2501,    -12,    -35,    139,    259,    -95,   -141,
+       137,     90,     12,   -244,   -142,    314,     15,   -124,
+         1,    -25,    -27,     -2,     -6,     28,    -48,    -17,
+        -2,     43,     67,     42,   9023,    -25,     19,    -13,
+       -23,    -43,     73,    -30,    143,     -1,   2884,   -142,
+        -4,   3549,    -49,   -366,    110,    314,     19,    -55,
+       363,    204,    469,    189,    217,   -181,    119,     41,
+      -133,     29,    -55,    -94,     71,    -49,     41,     85,
+       -14,   6140,     71,   -142,     10,     18,    169,    136,
+       282,    -49,     36,    446,    -99,    263,     92,   2201,
+      -127,     43,   -143,   -350,     36,    389,   -208,     15,
+     -3610,   -275,    383,   1599,   -179,   -177,  -1100,     -4,
+        67,    -38,      2,    278,     39,    107,   -120,    465,
+       204,   -397,    305,    416,      7,   -262,     68,   2341,
+       189,    -75,    -23,     25,    -20,    -74,     56,    -43,
+      -125,    170,    509,     63,     26,    263,   -741,    -31,
+         8,   -296,    101,     20,   -149,   2846,   -218,    379,
+      -310,    151,    901,     84,    -85,    -83,   -387,    161,
+     -3102,   -158,   -438,     38,    191,    -58,   -202,    127,
+       126,    -88,   -430,  -3077,  -1829,   -332,     61,   -152,
+       -14,    -32,   -156,     -5,   -375,  -1083,  -5130,    110,
+        77,   -201,    -15,      4,     13,     86,    119,     67,
+       149,     80,    264,   -253,   -121,     63,    193,   -103,
+      -129,     63,    120,   -226,   -100,   3196,     72,    -11,
+         8,    -56,    279,    -73,   -192,     47,    -87,    125,
+       -43,   -108,    277,    188,   -107,    289,   5966,    -20,
+      -303,    -78,    -21,     40,   -139,     44,     28,      6,
+      -254,   -244,     47,     -1,   -151,     29,   -344,  -2318,
+        30,  -3767,    114,     84,   -155,     85,    -90,    155,
+       111,   -506,      6,    453,   -241,    215,    131,   -802,
+        15,   -343,    176,   -430,    251,    -74,      6,    -41,
+       -44,   -131,   -105,   -248,    346,     39,  -4524,     93,
+      -120,    -79,   -777,   -416,   -570,   -221,     21,     28,
+       -52,     56,     71,   -187,   2949,  -2531,    666,    799,
+      -137,    970,    243,   -695,   -148,   -281,    326,    450,
+      -734,    -99,  -2078,    112,    -83,    -90,    -78,    262,
+      -138,    -31,     -5,    -74,   -171,    -99,    344,    143,
+      4035,     56,   -121,   -921,     -8,     46,   4576,     97,
+      -219,    -34,    123,    -44,     -1,     85,    -36,    399,
+      -260,   -231,    132,   -318,     55,   -181,    156,  -3093,
+       142,     -9,  -3418,    -31,     43,    126,    136,    309,
+       -50,    -20,    170,    -90,    188,   -173,    175,     50,
+       144,   -244,     22,     64,   -476,    -22,    -66,    272,
+      3839,    715,   -188,    -82,   -250,   -587,     10,    368,
+      -507,    242,    -40,   -531,    451,     35,    560,   -107,
+       138,     15,    113,     56,    242,     33,    -23,    -27,
+        81,   -157,    301,   -327,    359,   3648,     62,  -1489,
+      -167,    136,    -39,    183,     53,   -151,    -16,    -60,
+       -65,  -5182,    -17,   -257,    -10,     56,   -104,    713,
+        -2,    328,     72,    353,     43,    -51,  -5949,     40,
+        32,    -82,    -36,    -22,     57,     56,     55,    112,
+      -104,     76,      5,     80,    -29,    173,   -360,   -113,
+        42,   -119,    180,    -26,    120,    250,  -3024,    198,
+       115,   -140,     22,    136,    275,    698,   -149,    699,
+       426,   -220,    279,     63,     55,    -63,   -108,    -51,
+       -70,    -70,    419,   -156,   5870,     33,    -57,   -114,
+      -388,   -213,   -164,   1543,    117,    165,   1944,    223,
+       -83,     46,    201,     12,   -103,    228,    139,   -207,
+       136,  -1218,   -544,   -723,     90,   -652,    793,     -1,
+      -100,    -32,   -236,     49,    164,    138,     16,     82,
+     -3221,    -62,   -168,     62,   -313,     98,   -652,   -484,
+       684,    -91,     33,  -2926,  -3453,    566,     34,     35,
+       104,     13,    189,    235,    -49,   -324,    126,    226,
+      -102,    123,   -253,   -403,     38,    160,     -5,    100,
+       -30,     16,    -19,    -44,      2,    -70,    -30,     82,
+       118,      6,    132,    -15,    -36,     59,  -8835,   -448,
+      3707,    324,     87,     67,   -110,    114,    -76,    294,
+       354,      7,    140,     11,    340,   -117,   -559,     67,
+       129,    201,   -314,    328,   -209,    102,   -121,    378,
+     -5010,    140,     53,     15,   -253,    -14,    414,   -183,
+       -70,    -25,    -51,     34,   -347,   -171,    146,    -98,
+      -101,     -3,    -99,     96,     66,     50,     -5,   -115,
+       -23,    -45,   -351,  -4202,    143,    480,    -46,    140,
+        17,  -6312,   -110,    -23,    150,     60,    -39,     -9,
+       -48,    -60,     -8,    -20,     37,     57,   -162,     60,
+      -137,     55,   -101,     65,    100,  -8952,      3,    -49,
+        -3,     -9,     28,     15,    -89,   -136,     59,    125,
+       -73,    -35,   -111,    -69,    -28,    111,    -16,     48,
+        27,   9272,     55,     34,    -92,     66,      3,      3,
+       -38,     12,     59,     95,   -100,      3,     51,    121,
+       146,   -200,    142,   -254,     65,      3,   -169,     -8,
+       -65,     44,     10,     15,    -99,     56,     -6,   -108,
+       -20,  -5461,    -89,    395,   2085,    486,    -48,    324,
+       422,  -3703,    468,    198,    239,      0,   -277,   -115,
+      -227,    227,    -29,    159,   -128,   -447,   -291,  -1953,
+      -110,     25,   2274,    141,    177,    204,     38,   -258,
+        90,     -8,   -131,  -2636,     55,    561,    -99,   -220,
+       -33,    142,   -334,   -160,   -117,    -12,    -33,      6,
+        72,     -3,    -11,     50,      1,    -45,      8,     23,
+       -15,    -33,    -15,     30,    -32,    107,    145,     14,
+        60,    114,     45,     24,   8811,     -9,     61,    192,
+        16,    124,     46,    -54,    -31,     89,   -147,   -112,
+      3341,   -395,     91,   -323,     45,   -156,     25,    -18,
+        34,   -534,    118,     83,   -187,    -92,    180,     34,
+       659,    135,    103,  -2342,     54,      6,    179,     40,
+       143,    232,  -3858,   -201,    179,     32,    -56,    406,
+      -236,    541,    -70,    -88,   -121,    447,   3028,   -223,
+       138,   -557,    230,   3457,     96,     -4,    -22,    -13,
+      -136,    -45,   -123,     -8,    107,    270,    132,    -64,
+       -32,    464,    -33,    -44,  -2544,   -251,   -246,    -71,
+     -4063,     40,    107,    384,    -22,   -197,     64,    166,
+      -137,    -44,     98,    -35,    193,      4,  -2103,     57,
+      -109,    245,   3487,    -55,    -60,     21,    187,   -267,
+       279,      3,    166,    -78,    108,   -135,    126,   -122,
+       171,   -133,    -21,   -134,    183,     25,    -56,  -6210,
+       107,    109,     22,    -93,     39,     95,     43,    -11,
+       -44,     -5,    -82,      6,    -54,    -27,   -116,    -16,
+        84,     44,     22,    -68,     -1,    -57,     78,     35,
+        83,   4664,     46,      1,   -164,   3301,   -358,  -3757,
+       236,    104,    -81,   -121,   -278,   -112,    -20,     89,
+      -123,     35,    113,     17,   -331,    273,   -172,    125,
+       -73,     77,   2515,  -3944,   -170,    -87,    174,     84,
+       142,    138,     13,    227,    127,    146,    141,    196,
+        38,    -40,   -112,    136,   2311,    328,     87,    -22,
+       -77,    -34,   -195,     58,   -333,    337,   -159,    626,
+     -3008,    408,    523,   -316,    539,   -587,    -81,  -2824,
+        98,    200,    613,   -107,   -170,  -1190,   1121,    521,
+       229,   -217,    143,    144,  -1248,   -384,   1535,    470,
+      -655,    492,   -429,    -26,   -132,   -180,     52,     97,
+        10,    -35,    -60,      7,  -5422,    -26,    154,   -132,
+      -221,    124,    136,    -17,    -68,     25,     29,      4,
+         5,    -15,      9,     69,    -16,    -47,    -76,      5,
+        41,      6,    -22,     63,     -8,   9709,    -33,    650,
+      -545,   -159,     81,    -75,     54,    -92,    -49,    -80,
+        14,    -78,   -145,   -399,  -3935,    186,  -1144,    207,
+        60,    286,   2642,     44,    117,   3758,   -154,    426,
+       331,   -615,   -216,    271,   -121,   -109,    495,     42,
+       813,    -19,    545,   -149,    633,  -2424,  -2089,    265,
+      -136,    -58,      4,    -28,    147,      2,   -123,    -93,
+        14,    -50,    317,    131,   -130,   -152,    322,   1023,
+};
+
+static const int16_t cb1110s0[] = {
+     -6433,    495,   -277,   -630,    411,   1241,   -326,   -425,
+       523,    114,   -225,    -53,   -538,   -702,   -260,   -417,
+      -401,   -222,   -263,   -416,    163,  -1256,    590,  -1176,
+      1865,   1483,   -927,    -65,   -674,   1303,   -147,   -750,
+      -132,    407,   -283,    852,   1788,  -2257,    210,   -450,
+       303,   -272,  -2536,     94,   2010,    428,   -921,     -3,
+       -71,   -875,    156,   -681,    521,     49,     51,   -523,
+      1532,   1619,   -690,    402,   -923,    318,    865,    193,
+     -2187,   -662,    553,  -1104,    -70,  -1313,    462,  -1045,
+       320,    937,  -1453,   -514,    404,   -231,  -1748,  -1592,
+     -2039,   -217,   -364,  -1313,   -428,   2419,   1257,  -1292,
+        19,   2867,   -278,  -1832,   -239,   -691,   -383,     62,
+       185,   -455,  -1589,    116,    419,   -319,   -418,    537,
+      -280,  -1834,   2681,   -857,   -210,   -156,  -1143,   -104,
+     -1774,   1702,    184,   1017,   -135,   -610,    525,    335,
+      -355,   -494,   -231,   -154,    986,    434,   1134,   1213,
+       914,   1457,   -258,  -1086,    477,  -2247,    498,  -1741,
+      -975,   -262,    812,    108,    834,   -412,    120,  -1032,
+      -533,   -456,    139,   -301,   -387,   -690,    798,      3,
+     -1556,   1261,    745,  -4486,      8,    213,    977,   -151,
+      -269,   -344,     13,    544,   -270,   -166,   -706,    672,
+       184,   -943,  -1714,   1510,   -739,   1891,   -477,    528,
+      1847,  -1572,    420,    103,    -85,    508,    231,   2024,
+     -1343,     20,    238,   -655,    668,  -1561,   -743,   -651,
+       709,  -1136,   -208,    979,    258,   -693,   -535,  -1126,
+      -283,   -944,   -209,    603,  -1797,  -2998,    253,   -296,
+       842,     63,   -203,   -468,    675,    337,   1458,    114,
+       259,   3202,    145,    419,    631,    352,   2309,   1337,
+       815,    -99,   -824,   -779,  -1839,  -1455,    166,  -2092,
+      1299,    162,  -1026,   -914,    128,   1321,    896,   -209,
+       255,  -1144,    807,  -2870,   -632,   -588,    866,     81,
+       453,    154,  -1258,   -499,   -452,    -98,   2599,   3070,
+       540,   -834,   -228,  -1268,   -313,   1269,    -65,    -56,
+      1035,   -499,   -507,   -657,    447,     26,     96,   -175,
+       133,   -291,   -538,   -259,      7,   -206,    411,    145,
+        25,    215,    267,  -4354,   -442,    250,   -814,   -143,
+      -459,   -182,   -640,  -1258,    169,    379,  -1196,    429,
+      -128,  -1971,   2681,    -45,   1641,    152,   -556,    909,
+       365,   -618,   -417,   -363,   -434,    270,  -1388,   -473,
+        62,     58,    509,  -3909,   1327,   1571,    482,   1081,
+      -896,    459,    480,   -557,   -267,    390,    -15,    484,
+       248,     52,     49,    702,    -10,    162,    245,   -416,
+      1397,     23,    183,    325,    591,   -816,   4429,    674,
+      -332,  -1243,     68,    285,    235,    759,   -315,    799,
+       313,   -331,   -182,   -629,    394,  -1079,   3879,    -81,
+       651,   -774,    -21,   -297,    231,  -1826,     47,    104,
+       284,   -171,   -198,   -110,   -193,    881,   -715,    294,
+      -490,    395,  -1261,   2859,  -3175,  -1477,    668,   -215,
+       310,     10,    762,   -837,    101,    142,    201,   -940,
+       453,    -82,    493,   -983,     23,   -211,    990,   1327,
+      4664,    -27,    821,    809,    500,    243,     41,    568,
+        44,   -320,    105,    461,    306,   -408,   -793,    -35,
+       -18,    229,    -12,   -416,    577,   -301,   4870,   -520,
+       499,     57,   -544,    -21,    611,    226,    -20,   -412,
+       440,   -680,    448,    430,    226,   -610,   -310,   -218,
+      1161,    523,   -400,   -148,    783,    395,   -126,    370,
+       686,   -497,   -301,    161,     -5,    238,    375,    357,
+      -126,    954,   5952,    -53,    121,   -405,   1571,    435,
+       461,  -1166,  -1163,   1347,   1394,    170,   2035,  -1580,
+      -958,    276,   -680,   -968,    275,   -323,    524,     48,
+     -1896,     46,   -495,    548,   -929,   -859,    224,   1079,
+       863,   3080,  -1594,   -379,    302,   -403,    710,    655,
+      -293,   -719,   -683,   -944,    228,   -341,    563,   -495,
+       920,    738,   -614,    552,   -249,   -402,   -164,   -262,
+      -425,  -4025,    164,   -984,   -518,    157,  -1156,   -729,
+      1024,   -768,   1003,    481,   -116,    319,   -918,   1563,
+      -662,   4852,    617,   -250,    549,   -265,    -93,    680,
+       470,    925,   -293,    629,    142,    231,     44,    133,
+        12,     40,   -867,    269,    -77,    445,  -1132,   -985,
+     -1304,    728,    424,    530,   -258,   -625,    377,  -1400,
+     -2538,   -470,  -1711,    413,  -1603,    -81,   -393,  -1013,
+      1130,    906,    287,    640,   3785,   -463,   -159,     43,
+      -165,   -441,   -513,   -287,   -554,   1547,    848,   -275,
+       936,    653,    769,    -58,  -1007,   -698,   -792,   2175,
+       398,   1382,   -122,    459,     -7,    281,   2785,   -637,
+       632,   -279,    293,  -1078,   -996,     96,   -293,  -1335,
+       -74,   -587,   -286,   -565,   -977,   -228,   5080,      3,
+       171,    111,    -34,   -177,   -619,    577,    448,   -280,
+       189,   1033,   -579,    134,   -713,   -947,   -249,  -1897,
+       364,   1748,  -2098,     21,    859,    -73,  -1881,    116,
+        36,   1591,   1386,  -1128,   -346,  -1015,    -25,    -90,
+      -691,   -984,   -120,     29,   -635,   -236,     26,   -691,
+      -742,   -203,    294,   -472,   -901,   2582,   -171,   -357,
+       406,    162,   1561,   -913,    308,  -3319,    461,    779,
+      -305,   -927,    290,   -941,    615,   -688,   -508,    222,
+      -432,    387,    170,   -115,  -5338,    508,   -212,    150,
+        26,    -38,    306,    -15,     50,   2008,  -1112,   -187,
+        44,    591,   -280,   1187,    934,   -228,    554,     65,
+     -1387,  -1999,   -805,   2555,  -1225,   -283,   -435,   -430,
+       -50,   -655,   -103,    248,   -234,     32,   -826,   -708,
+      -704,  -1006,    176,    784,    274,    626,  -2353,    707,
+      1852,   -132,   -196,   -169,   -463,  -2117,     56,    413,
+      -141,   -818,   -365,    921,   -816,   -126,   -135,    438,
+      -948,   -145,   -349,    700,    205,   1001,  -3626,    314,
+      -493,  -1182,    131,    733,   2404,  -1244,    564,   -960,
+       328,  -1137,   -108,   -755,   -168,   -995,    966,  -1706,
+      -565,    806,   -693,   1369,   -269,   -428,    675,    768,
+       341,   -794,   2265,   -208,  -1883,   -801,  -1889,    961,
+       182,   -504,   -595,    871,  -1280,    952,   1351,    665,
+       474,   1032,     58,    451,   -198,    345,    176,   -853,
+     -2891,   2250,    624,   -616,    183,    144,    736,      0,
+      -198,   -138,  -1218,   -501,   -658,    -24,   1232,   -286,
+      -233,   -937,   2150,  -1035,    449,   -623,  -2748,  -2176,
+       918,   -170,    421,   1376,     93,    153,    627,    493,
+        28,    549,   -292,   -175,   1066,   1037,   -475,    413,
+     -2006,  -2022,   -334,    365,    901,    945,   -663,    515,
+      -351,   -597,    155,   1318,   -153,    417,   -425,     44,
+       338,  -1958,   -355,   -596,  -2134,    360,    341,   2501,
+       824,  -2106,   -282,  -1723,   -735,   -550,   -743,    113,
+      1027,   -479,  -2114,    -16,   -631,   -282,  -1054,   1320,
+      -158,   -234,   3479,     28,   1818,    627,   1464,   -795,
+       -22,    897,     -6,    392,   -234,   -170,    714,   -382,
+      1262,     67,   -618,    145,     25,   -710,   -247,   -545,
+     -1386,  -1797,   -995,    865,    465,   -364,    830,    -53,
+     -1108,   -383,   -538,     85,    731,   -188,   -813,      2,
+     -1667,   3379,    289,    425,   1319,   -259,   -592,   -212,
+       271,   -268,   -126,   1282,    306,   3859,  -1423,    607,
+        20,    755,    174,   -782,     72,   -234,    675,  -1177,
+      1101,   -635,  -1641,   2574,   -978,  -1390,  -1743,   2183,
+        53,     75,    650,    -97,   -456,   -126,   -719,   -675,
+       557,   -375,    643,    853,    -81,   -192,  -1174,  -1288,
+      -954,   -883,   -806,  -2182,  -2111,  -1426,    180,   -266,
+      -301,    626,   -443,     61,   -149,   -443,   -935,    -48,
+       642,    250,     17,    596,   1342,  -2127,    323,  -1456,
+      1995,    837,  -1456,  -1683,    945,   -722,  -1445,    452,
+       178,   -441,   -250,   -137,   -128,    -50,   -311,   -600,
+      2237,    922,    139,   -107,   -637,   1770,  -2503,    413,
+      -803,    496,    209,   -391,    401,    412,   -552,    605,
+       -37,   -667,  -1609,    -19,  -1073,   1522,   -705,    670,
+      -992,    882,  -1213,   -854,   2150,   -371,     73,  -1167,
+      -592,   -153,   -509,   -584,   -495,    -83,   2075,  -1489,
+       719,   1245,  -1138,     72,    950,   -950,    542,   -590,
+       988,   1646,    -64,    562,   -223,     73,    583,   -151,
+       215,    914,   1391,  -2997,    161,    436,     49,   2225,
+       271,   -283,   3844,   -578,    335,    -90,   -698,   -162,
+      1236,   -117,    470,    383,   -718,    520,    295,     29,
+       292,   -179,    774,    204,    372,   -251,   -824,   -487,
+     -1822,   -312,   -731,    568,  -1008,   -255,    189,  -1195,
+       657,   -227,   3422,    651,   -220,  -1204,   -590,    713,
+       365,   -977,    204,   3118,    321,    922,   -347,   1505,
+       375,    -77,  -1520,  -1411,   -680,   -507,    543,   -492,
+     -1844,    135,    689,    384,   -408,    140,    633,  -1192,
+       475,    220,  -1711,  -1318,    606,   -103,   -712,  -1734,
+      -218,   -855,   -835,  -3071,   -109,   1391,     62,     21,
+       -75,    -77,    369,    216,  -1484,   2057,    661,    314,
+       275,   1048,    175,   1842,    743,    808,   -594,    338,
+     -1217,   1606,   -531,  -1360,  -1073,    452,   -531,   -798,
+      -771,  -1292,   -918,    606,  -1776,   -509,    178,   1422,
+      3424,    634,    722,   -257,    525,    437,   -197,   -130,
+       291,   -411,   -259,   -890,    -84,    368,   1117,  -1321,
+      -324,  -2122,    515,   1158,   1749,   -963,    681,     39,
+       268,    549,    324,   -601,    151,   -200,    829,   3881,
+       797,    660,   -572,   -693,    633,   1023,   -147,   -581,
+       102,   -207,   -163,   -511,    -30,   -102,    379,    776,
+       494,   -510,     55,  -1811,   1073,   4384,   -318,   3277,
+      1958,   -209,   -539,   1823,   1200,   -182,   -186,    213,
+       123,    506,   -471,   -431,   -698,   -331,  -1168,     88,
+       276,   -184,    733,   -295,  -1053,   -717,    862,  -1453,
+     -4235,   1063,   1049,   -621,   -429,    372,   1043,    599,
+       271,   -693,   -689,    122,    466,   -323,    332,   -533,
+       645,    516,   -371,   -207,  -2046,     72,  -1125,   -229,
+     -2769,   -330,   1387,    -89,    342,   2786,   -730,    152,
+       629,    809,   -459,   -248,   -266,    111,    380,    724,
+      -411,    640,    -72,    323,     34,   -277,    443,    289,
+       151,  -4816,    402,   -171,   -731,    635,    -84,   -133,
+      -310,    397,    904,   1193,  -1512,    -25,  -1306,    587,
+       322,  -3762,    537,   -306,   -981,    917,    190,    787,
+      -613,    149,    301,   -376,    366,    350,     18,    893,
+};
+
+static const int16_t cb1110s1[] = {
+      -332,   1306,   1626,   1555,  -3510,   -225,    418,   1520,
+      -969,    -74,   -286,    233,   -313,    -97,    375,    181,
+      -309,   1348,    969,   -504,   -141,    789,  -1224,   -137,
+      -704,     98,   1003,    466,   2259,   1485,   -225,     61,
+       272,   -223,   -347,    -23,   -368,     96,   2345,    112,
+       363,   -552,     -6,   -806,  -1637,  -1703,   1597,  -2114,
+      -196,    293,  -1173,   -630,   -863,  -1224,    784,   -722,
+       744,    885,    798,   -384,     92,    298,   -873,   1808,
+      1389,    488,  -1569,  -1541,  -3064,   -734,      3,    467,
+      -987,    346,   1915,   -683,    205,   -487,    341,   -330,
+       274,    -25,     49,    -83,   1246,   -405,   -777,    266,
+       121,   -250,    466,  -1232,  -3197,   -871,   -638,   -332,
+      1563,   1900,   -470,    556,   -465,   -412,    901,    -86,
+      -683,   -577,  -1033,    808,   -863,   1212,   -724,   2222,
+       429,   2733,    413,    891,   1669,    515,   -439,    187,
+      -359,    414,    176,   -706,    679,    -63,   1247,  -1721,
+       779,  -2770,   -484,   -633,   -993,   -243,   1442,   -312,
+      -324,   -370,    392,   -407,    229,     97,   1267,    -18,
+        46,   -303,   -684,    515,   -166,   4212,   -775,    -23,
+       -53,     23,   1966,   -465,    231,   1195,    252,  -1036,
+        16,   -824,   -116,   -582,   -286,    470,   -159,    217,
+      -456,    549,    648,     60,  -1119,    221,   -747,    354,
+      -628,   -486,    894,   1280,  -2631,    247,    430,  -1703,
+        69,   -236,    147,   1445,    540,   -936,    181,   -163,
+       931,  -1044,    669,   2457,    519,    597,  -2031,     11,
+     -1319,     -4,  -1190,     85,    254,  -1494,    230,   1583,
+      -547,    277,  -2006,   -103,   1195,  -2522,   1301,   -633,
+      -104,   -511,    573,   1628,   -451,  -1022,    564,   -692,
+       255,   1029,   -408,    757,    172,   -395,   -472,  -1703,
+     -1856,   -379,    289,    509,   -628,  -1349,   -207,    404,
+      -399,   1671,    392,   -935,   -190,    952,  -1267,   1150,
+      1562,   -609,    491,   -346,   -270,   -483,    310,   1420,
+     -1017,   1714,   -645,    897,  -1327,   3154,  -1046,   -857,
+      -499,   -496,  -1348,    399,     63,   -653,   -315,    820,
+      1645,    614,   2202,    779,   3001,   1382,    387,   -843,
+     -1840,    422,  -1017,    246,   -219,   -550,    105,   -608,
+       426,   -346,   -224,    375,     22,   -448,   -270,  -1150,
+      -897,   4298,   -882,     49,    633,   -937,   -694,    675,
+      -322,   -793,   -516,   -360,   -248,   1190,    575,   -843,
+       -13,     50,   -801,   1181,    452,   -335,   -495,   -102,
+     -1057,    506,   -206,     66,   -647,    991,    259,    259,
+      -468,    197,    373,  -4216,   -750,    224,   -182,    520,
+      -530,   1888,  -2018,  -1492,    656,  -1447,    993,   -790,
+      -785,    792,   1658,    373,    131,   -460,   -703,   1080,
+      -875,   -212,   -694,    747,   -639,  -2267,   1263,   -415,
+      -749,  -1278,    591,   -745,   -225,  -1677,     69,    625,
+      -146,    212,    345,    728,   -553,   1117,    471,    550,
+      -498,   -729,  -2070,   1006,   -330,    939,   3636,     34,
+       349,    761,   -131,    372,    610,   -399,     10,     86,
+       110,    931,  -1159,   -175,    633,    568,    140,    712,
+      2800,  -1558,   2343,      3,   -974,   -673,    233,   1436,
+      -783,    599,   -442,    852,    639,    447,   -976,   -564,
+      1511,     36,    529,    433,    677,   1971,   2777,   -820,
+      -655,  -1463,  -1392,  -1142,   -352,    432,    730,    439,
+      -273,    844,    108,    115,    408,   -361,    504,    337,
+        58,   1074,  -1645,  -1623,   -493,    -70,  -1585,   2878,
+      -741,    636,   -224,   -974,    722,   -147,    149,    135,
+      -107,   -154,  -1027,    -18,   -989,    282,   3173,   1123,
+      -778,   1389,   -591,    337,   1660,   -288,   1162,    -65,
+       660,    326,    141,    358,    679,   -222,    460,    105,
+       512,     36,   -854,   -477,   -942,  -2362,    265,   2252,
+      -164,  -2059,    106,    666,   -420,    521,   -178,    396,
+     -1836,    475,     82,    356,    207,    433,  -1005,     97,
+       385,   -304,   -853,   1282,   -239,  -2134,     83,     84,
+       201,  -1894,  -1603,    683,  -1957,   -113,    839,   1187,
+      -313,    774,   -754,    941,   -739,    748,    116,    716,
+      1134,   -530,  -2178,     71,   -611,   1544,   3527,     -3,
+       283,    527,    457,    399,    762,     17,   -279,    196,
+      -518,   -160,  -1204,   -289,  -1354,    132,   -315,   -290,
+     -2179,    676,  -1474,  -1010,  -1397,    363,    -45,    783,
+      1326,    -33,   -109,   -617,   -271,   -967,   -103,   1867,
+       769,    740,   -818,   1011,   1411,   -693,  -2458,    808,
+       806,   -213,    468,     31,    -70,    166,    230,   -405,
+       163,     70,    652,   1077,   -190,   -622,   2343,  -1328,
+       601,    928,  -1661,    174,    429,  -2479,    501,    503,
+       -41,   1365,    671,   1006,  -1968,      7,    103,   -399,
+      -382,    573,    -27,    554,  -2263,  -3174,    277,    177,
+       807,   -328,   -816,    453,  -1548,    828,   -327,    187,
+      -393,   -745,    -76,   -808,    575,     -8,   -326,  -2062,
+       601,    566,    755,    775,    595,    419,  -3925,   -226,
+       272,    368,    395,     59,   1117,    548,   -649,   -429,
+       321,    549,   -744,    319,     82,    135,     73,     14,
+       374,     93,   -270,   -453,    177,   4991,    569,    169,
+       111,   -246,   -362,    -88,    -49,    583,    -35,     60,
+      -759,   1327,   1768,    766,   -350,   -880,   -106,   -449,
+      -113,   -683,   -418,   -999,    992,    559,   -290,   -147,
+      -324,     93,   -947,  -3932,    -37,    307,   1087,   -314,
+      -293,    432,    830,   -130,   -208,     59,    719,   -348,
+      4511,    224,    488,   -174,    588,    795,   -301,   -246,
+      -447,    682,    917,  -1207,   -503,   -450,    575,   -116,
+      -126,    594,    -22,   -101,      5,  -1188,   -431,   1146,
+     -3869,    -72,    402,   -417,   -390,    350,   1141,   -138,
+       697,     77,  -3255,   -268,   -786,   -106,  -1386,    400,
+      -856,   -691,   -438,  -1550,   -228,   2162,    236,     64,
+      -382,      1,   1032,    153,   -659,   1563,   -410,   1280,
+      1573,  -3675,  -1041,    240,    401,    215,   -353,  -1140,
+       265,   -103,   -824,    -93,   -319,   -849,    253,   -477,
+      -463,    153,  -1017,    538,   1233,  -1041,     11,    998,
+      -437,   -569,   -970,   2118,  -1577,      1,    321,   1784,
+      -298,   2315,     72,    -20,     83,    905,  -1289,   -246,
+       731,   4076,  -1477,    602,   -911,    978,    698,   -239,
+       391,   -729,   -276,    225,    143,   -417,   -500,    -27,
+     -1220,     89,   -403,  -1453,  -2546,   1015,     70,     78,
+      2364,   -159,   -775,     29,     37,   -231,     73,    433,
+       426,   -529,    420,   -613,   -100,   -605,   1463,   1001,
+      1159,  -4082,   -553,    348,   -806,    624,   -162,  -1121,
+       -25,    919,    -62,     90,   -275,    233,    203,     32,
+       745,   -221,    458,    529,    901,   1088,     38,   1209,
+       450,    451,   2250,   -411,   -205,    761,    249,  -1226,
+      -266,  -3195,   -801,    -31,   1015,   -324,   -596,    -42,
+       150,    207,   2597,   1041,  -1045,  -2254,  -1428,    250,
+       217,     69,   -933,   1424,    280,    446,    524,    540,
+       639,  -1027,     23,    412,     36,    -67,    475,  -1126,
+      -739,   1160,    514,   -157,  -2832,  -1432,    559,     77,
+       740,   -888,    134,   1304,   -267,   -267,    329,      8,
+      1721,   1488,    -29,  -1760,  -1904,  -2634,  -1342,   -528,
+      2233,   -219,   -194,  -2919,    128,   1203,   -623,   -127,
+       488,   -386,   -133,   -329,     62,     85,   1271,   -185,
+      -479,   -588,  -2964,    546,   1651,   1526,   -830,   1046,
+       347,     63,  -1048,    239,   1402,    -22,    307,  -1606,
+       768,    999,    304,   -512,   -175,   -246,   -373,    529,
+        93,   -521,   1310,   -508,  -4366,     27,   -768,   -358,
+      -575,     -2,   -593,    -21,   -838,    635,    197,    634,
+       321,   -263,   -377,   -549,     20,    739,    395,     -9,
+      -392,     70,   5679,   -133,   -130,   -240,   -678,    421,
+      -101,    412,    143,    209,    194,    216,    200,    -22,
+      -748,   -399,   2863,    284,    231,    691,    571,  -3460,
+      -200,    312,    480,  -1338,   -603,    435,   -308,   -615,
+       520,    178,     68,   -716,     45,   -593,    -32,  -1393,
+      -554,  -1000,   -867,    613,    288,    507,    202,   -113,
+        17,     93,   -141,    -47,    665,    559,   -808,  -4091,
+      -575,   -193,   -873,   -790,    673,   -608,   -941,    745,
+      1562,  -1060,    988,   1192,     29,  -1207,    207,    653,
+      -622,   -132,    370,   1435,   1977,  -1878,   -119,    101,
+      -100,   -154,   -869,  -2375,   1254,    122,    188,    877,
+       188,   -838,   -355,    667,   3813,   1076,    369,   -771,
+      -712,   -669,    -14,    107,   1027,    112,   2306,   1418,
+       133,   1055,    377,    249,   1023,   -927,     12,  -1983,
+      1174,    223,    385,    827,   1425,  -1694,  -1178,    -94,
+      -593,   -286,   1263,   -671,   -425,   2002,    701,   1546,
+       547,    182,   1013,    128,    351,   -243,    407,   2349,
+      -376,    445,    -93,    968,   -337,   -601,   1342,    987,
+     -1499,   -644,    521,    327,   -557,   1800,     12,    285,
+       127,   -269,  -1989,   -449,     87,  -1042,    184,   -499,
+      1231,  -1664,   -352,      4,   1253,    403,  -1064,    837,
+     -1702,    133,   1687,  -1300,   2248,    179,   -847,   -617,
+       460,    450,   -260,     94,   -780,   -675,   1209,     38,
+       453,    857,   -631,    317,    535,   1086,   -196,    638,
+      -288,   -389,    688,    -93,   1271,  -4290,    -96,    445,
+        64,   -211,    148,    -74,    486,  -1873,   1214,   1836,
+      -708,   1800,   1644,    576,  -1088,  -1212,   1147,   -456,
+       173,   -911,    489,   -443,    644,    534,    846,  -1522,
+      -786,    497,   -401,  -1087,   1410,   1391,    837,   -253,
+       124,   -598,   -254,  -3945,  -1169,    103,   -193,     50,
+       846,  -1014,    353,    455,    784,   1343,   3055,    178,
+      -628,   -148,   -266,   -324,    -96,   -190,   -930,    115,
+       475,   -651,   -314,    -82,   -236,    -88,  -3753,  -1048,
+      -283,   -178,    351,   -671,    325,   1054,     28,    540,
+       113,    -73,    763,    844,    543,     -6,    799,    245,
+       176,    124,    262,   -112,   1010,    361,   -843,   3290,
+     -3741,    914,  -1835,   -259,   2467,    297,  -1205,    168,
+     -1917,    156,     87,    637,   -677,   -955,    312,   1246,
+      -219,     92,   1090,   -292,   -773,    343,   -523,    299,
+      -513,   1321,   -536,    586,  -1324,   2345,   2384,   -719,
+      -936,   1389,    -27,    880,    338,   -127,   -666,   -441,
+      1603,    143,   -218,   2167,  -1335,    469,  -1224,   2489,
+      1365,    568,     19,  -1322,   -736,    208,   -494,   -454,
+       990,   -250,    305,   -575,    206,   -168,  -1177,    282,
+};
+
+static const int16_t cb1110m0[] = {
+       429,   -104,   -210,    216,    361,  -2586,    253,  -1350,
+       145,   2795,     -5,    663,   -262,     37,   -122,    205,
+       270,    321,   2623,    256,      4,    -42,    -37,    112,
+      -346,     20,    -51,      9,    -90,  -3342,     78,     52,
+      -239,   -454,   -207,    355,   -136,    -19,    394,   -212,
+      -166,    -73,    -68,   1049,  -2945,    385,   -545,   -211,
+       116,    -15,    687,   -232,   1824,    -66,    133,   -403,
+       -63,      3,     46,   -104,   -101,    136,    -61,    420,
+       149,    -24,     -9,   4277,   -149,   -166,     96,    -35,
+      1786,  -1044,    115,  -1326,   3381,   -520,     70,   -134,
+      -433,   -198,    146,   -615,   -143,    201,    342,    412,
+      -162,     22,    111,     16,    -85,     14,   -120,     79,
+       -30,    -84,     56,    -34,    -52,   -147,     19,    155,
+        17,   -120,   5853,     96,    767,    262,   -194,    124,
+      -180,     13,   3081,     39,    402,     90,    292,     84,
+      1999,    -16,    866,    292,    416,   -314,    177,     -1,
+        68,      3,    -28,    -56,    -54,     10,     -5,    -63,
+        89,    -69,   -251,     70,   7523,    -83,     67,     62,
+       178,  -1723,    -76,    101,    369,   -139,     58,    135,
+       -32,    138,   3393,   -575,    586,    292,   -296,   -505,
+      -634,     52,    280,     78,     14,    117,    -39,     77,
+       231,    136,     14,     51,    173,    -96,      5,    378,
+       -52,  -4340,   -263,     61,     22,  -2896,    -20,    180,
+        21,   3636,   -138,    104,   -279,     56,   -407,     -8,
+      -123,    134,    -95,   -500,    266,    -64,    -43,      1,
+      -170,     31,    110,     53,     56,  -5938,    151,     49,
+       -76,   -166,     34,     -8,    193,    198,   -118,     -4,
+       -44,    249,    -28,   -102,  -3614,     49,    464,   -388,
+      -744,   -500,    603,    -88,    -19,   1606,    325,   -227,
+      -277,   -142,    232,  -1835,    150,    -89,     29,      9,
+        76,    425,   -320,    179,    231,   1720,    424,  -2730,
+      -298,    666,     72,   -428,  -1243,   -299,     93,    -12,
+       -20,    -96,   -123,     18,    188,     -1,   -235,     -2,
+      3328,    107,  -1489,    199,    893,    -63,     46,   3799,
+        22,   -118,   -127,    283,    254,  -2091,    293,    331,
+       857,    -92,     46,     13,   -457,    169,    851,    -19,
+      -231,  -8735,    -62,     69,   -190,   -103,    -31,    108,
+        66,     95,     53,     -6,     12,     19,    -73,    105,
+       -40,    -29,     60,   -263,   -107,   2233,   -246,    485,
+       342,   1732,     76,   2489,     40,     44,   -300,    280,
+      -109,   -107,   -990,    -45,   1014,  -5073,      1,   -169,
+        25,    -55,   -340,   -427,    603,    206,    151,    360,
+       312,    -44,   -106,    514,    683,     98,   3331,     19,
+      -106,    106,  -3383,     85,   -161,    -88,      8,     12,
+      -163,    183,   -393,    117,   -243,   -498,    -60,    292,
+      -322,  -2105,    920,    301,     41,    -19,   -142,  -2485,
+       631,   -289,   -849,    132,    800,   -255,   -390,    137,
+      -850,   -411,     41,    -93,  -8653,      9,    -25,    134,
+       -66,    222,    152,     59,     29,   -193,   -129,   -105,
+        39,    -21,    188,    111,     25,     -3,      0,    -79,
+      8907,    -24,    -18,     37,    -33,    -42,     87,    -44,
+        56,    -79,    -67,    -52,     18,   -132,   1925,    309,
+       145,   -443,   1279,    200,   1215,    281,   3343,    311,
+       390,   -154,   -119,   -523,     19,   -529,    190,    272,
+       541,   -393,    278,    161,     13,    161,    891,    -65,
+      -199,  -1376,   -350,  -1409,    340,   2115,   -209,   2459,
+        30,   -509,    141,     11,   -557,  -1560,  -1912,   -234,
+        76,    787,   2781,     45,   -158,    330,   -623,    655,
+      -845,   -463,   -119,   -252,   -299,  -1940,    145,     17,
+      -183,    -71,     98,     67,    145,   -134,    -88,     -5,
+     -3636,      3,     34,    231,    981,     33,   -953,   -403,
+       129,    215,    -11,    109,   -188,     51,   5176,    -89,
+      -113,     60,   -138,    -94,    142,    216,    322,    -33,
+       350,   -285,    182,     92,    -16,     12,     15,    126,
+       -27,      5,  -5220,   -154,     13,    109,     18,   -326,
+      -257,    118,    313,    342,   2289,    -35,    -22,    115,
+      -256,  -2908,     68,   1211,    203,   -735,   -380,   -134,
+       249,    522,    109,    -48,  -5114,     32,    -42,     85,
+       -99,    265,   -187,    -93,    373,    341,   -254,     16,
+      -121,    -92,   -260,    -80,     -2,   -322,    234,    -96,
+     -2834,    230,    146,   -264,  -3287,   -153,     41,   -349,
+      -149,    -98,    140,   -115,    628,    -11,    292,      4,
+      -166,     82,  -4548,    116,    -23,   -311,    612,   -334,
+       451,    259,    559,    320,   -267,    517,   -139,   -166,
+       126,     27,    -89,   -156,     14,     63,     -3,     31,
+       109,    -43,     10,  -7682,     36,    -23,     73,    129,
+         0,   -116,     66,      5,    137,    -17,   2523,    203,
+       431,  -2729,    175,    540,    454,   -175,   -297,    -60,
+       348,     53,    688,    -49,    133,    -72,    200,   -348,
+       136,   -142,  -2259,  -3047,    -60,   -737,     48,   -331,
+        85,   -134,    218,   -962,   -278,   -148,  -1077,   -131,
+        53,   -127,  -2265,     82,    -31,   -262,    226,   -385,
+        83,    756,  -2715,   -492,   -115,    663,   -312,    240,
+      -318,   -819,   3040,   -181,    148,    165,    376,     92,
+      -233,    188,   -100,    902,   -401,   1005,    -52,    162,
+       219,   1831,    -68,    -66, -10023,    -90,    -23,     39,
+       -91,   -231,     23,    174,     42,     79,    -57,    -58,
+        18,    175,     32,    122,   -185,    266,    162,    300,
+     -3158,  -3381,     -3,   -312,    178,    -24,   -234,    248,
+        68,    293,    360,   -146,    -30,     -2,    177,    113,
+     -1215,   -538,   -274,     79,     -2,    -17,   2791,     71,
+     -1300,     93,   -818,   -558,   -331,    115,    215,   -603,
+      -202,    113,    -87,     39,   -277,   3564,     75,   -444,
+       201,    111,   -369,  -1072,    212,   -276,   -322,   -484,
+      -700,     37,   -302,    177,     86,     10,    -87,     56,
+        76,  -8941,    -27,    -73,   -133,    -51,   -106,    -28,
+       -52,     49,     68,     26,     16,    -81,   -423,   2834,
+         7,    -54,   -107,    144,  -3812,     17,   -355,      3,
+       -32,    -24,     14,     76,    169,   -260,    349,   -159,
+      3691,   -184,   4345,    -46,    146,    -14,    143,   -384,
+       -75,     12,    144,    105,     47,    141,    -32,    -31,
+        48,    187,     74,    139,    132,     86,    -15,   -317,
+      -267,   3112,   1821,   -363,   -125,  -1152,   -294,   -449,
+       277,   1151,   -341,     12,    -41,    210,    -51,      6,
+        18,     53,     11,     37,    -36,    -70,     65,     44,
+     -7302,     15,   -133,     56,    150,     63,    515,    271,
+       -32,     47,     41,   -130,    168,   -158,   -239,    -60,
+       226,    247,   -593,   -237,  -3559,     65,    623,     16,
+      -212,     26,   -181,     81,     83,     26,    -25,    -92,
+        -5,     36,    -31,    277,   -263,    135,     78,   -173,
+       220,  -5260,   2239,    -96,    -19,    -95,     75,    -25,
+       -64,    244,   -154,  -2646,   -446,    980,    512,    392,
+      -402,  -1050,    276,   -456,  -1334,   1863,    636,  -1512,
+       234,    199,    237,    363,     66,    284,    198,   -277,
+      -267,   -540,   -329,    856,   -482,   -645,    178,   -240,
+      -178,   6633,     -5,    127,    -80,   -167,    307,      7,
+       248,     13,     53,    124,    215,   -310,    255,   -194,
+     -3066,    -22,   3524,     51,    193,    165,     82,    -80,
+        54,   -191,   -278,    -19,    379,    285,    -58,   -157,
+      -168,   -183,    388,   -198,    191,    107,     10,     -2,
+     -6148,     45,    -58,     48,   -150,    -72,    112,   -124,
+       -41,   -129,     36,    -66,  -3311,  -4092,     15,    -11,
+        93,    -54,     72,   -105,    131,     66,     29,    -54,
+       201,   -210,    221,     47,     55,    -99,     31,  -3626,
+     -3623,   -175,     91,    -53,     40,    -98,    -76,    224,
+        15,    172,     85,    103,   -147,   -135,   -214,   -313,
+      1304,    143,    190,     19,  -2526,    -91,   -168,    875,
+       -27,    789,    791,   -462,    912,   -580,     70,   1523,
+       787,   -150,    567,   2717,     -5,   2943,   -107,    155,
+        32,     65,    158,    133,   -191,    -44,    141,   -149,
+       199,    177,    270,    -14,    -57,  -3669,   3891,   -158,
+       239,    -17,     52,    244,   -343,   -118,    186,    -54,
+      -134,    106,   -133,   -116,    186,   -149,   -894,    -22,
+      -399,      1,    288,  -3988,   -260,    113,     66,   -276,
+       179,   -226,    119,    420,     51,   -483,    551,    129,
+       245,   2013,    639,    -87,   5058,     41,    -53,   -116,
+      -130,   -223,   -104,   -760,    276,    117,    338,   -137,
+      -233,    -65,    119,    100,  -3245,      2,   3877,    126,
+       172,     -2,    -72,   -153,    200,   -109,    -62,    135,
+       194,    -82,   -150,     98,    550,   -251,   -274,     71,
+       160,    121,    -13,   -365,    356,   -212,   -271,   5067,
+      -203,   -251,    222,     75,   -131,     17,    103,   -911,
+      -348,    -26,      6,    110,    120,   -645,    355,   -649,
+      -132,  -3416,     65,  -1478,    461,   -109,    258,    -15,
+};
+
+static const int16_t cb1110m1[] = {
+      -110,   2743,    -31,     86,    -11,   3705,    192,    -89,
+        57,   -252,    -11,   -212,    163,      0,   -137,    405,
+       -99,   -124,   -137,   -407,    125,    106,   -922,   1567,
+        85,    165,    241,    110,   2918,    598,   -443,    812,
+       159,    518,    555,  -1886,    -65,    -52,     -3,    -27,
+        56,    -30,   -126,    126,     23,     74,    157,   6990,
+       -34,     56,   -257,   -172,    115,    -23,   -616,   -243,
+      -441,     34,    159,      6,     78,   -119,     49,     34,
+      -133,    988,  -1007,    474,     77,   -274,    354,   4907,
+       222,    -16,     69,     -4,    924,    -18,   3535,   -299,
+       -38,    -83,   -111,    977,   -138,  -1075,   -444,    540,
+       199,    202,   -502,   -194,   -198,    249,    101,    276,
+       -89,     96,   -301,      6,  -4023,    -70,    174,     93,
+       192,   -120,    755,   -560,    -22,     78,     56,     29,
+        28,    -44,     65,     -4,      0,     49,   -250,     87,
+        46,     44,    -41,  -7035,     14,    288,    632,   -259,
+       -64,     20,   -178,   -343,   -274,    106,   2842,    336,
+      -283,    245,   -612,     -5,    500,     77,   2492,   -250,
+        64,    171,   -988,      4,    -51,    -34,   -555,   -171,
+     -2629,    272,   2852,   -162,    -98,   -237,   -278,   -489,
+       641,    -96,   7815,   -139,   -116,   -137,   -121,   -314,
+      -161,    211,     76,    136,    -35,   -124,    -27,     76,
+       -98,    133,     85,    332,  -4352,    507,    -14,   -275,
+      -212,    308,    258,    129,   -165,   -197,   -104,   -150,
+      -104,     60,    125,    568,     -3,   1694,     62,    -70,
+       109,    122,    -57,    -18,   8642,    100,     50,     92,
+        17,    -86,    -93,    -68,   -121,    -61,    -32,     27,
+      -188,    502,    123,    -81,     37,     48,    187,     75,
+       -30,    -22,   -224,   -292,     99,    -49,   4273,     10,
+       834,    -25,    225,   2773,     78,  -3281,   -181,    234,
+      -130,    -74,    101,    214,    -26,   -113,   -268,   -168,
+       -90,   -435,    -26,     38,   -569,  -4009,     -1,     11,
+        69,      3,    249,     98,    178,    131,    300,   -826,
+        48,    337,   -828,   -371,     96,    312,    712,   -667,
+       -70,  -2070,   -242,    519,   -676,    143,   -613,    893,
+     -2193,    471,   1071,    213,  -1231,   -196,   -580,    155,
+       401,     78,    -64,     27,   -238,     22,    -73,    -19,
+       194,     60,    -87,   -210,   -155,    244,   -123,   -169,
+     -4442,    169,   3132,   -181,     65,   3950,   -396,    209,
+        39,    -52,    -26,    166,      1,   -164,    143,    -66,
+       169,     46,    -16,   -295,     39,     42,     40,     67,
+        25,     17,     -1,  -8920,    -82,    -42,     49,     81,
+       -61,      1,     39,    -40,     18,     74,    206,   -131,
+       -71,    106,      7,     88,    -13,     69,   -113,    -89,
+       212,     -4,   4373,    -34,    283,    105,    252,     59,
+     -2578,   -298,   1846,   -110,   -105,   -310,   -143,   -127,
+       274,    225,    861,    262,   -815,   -311,    -26,   -685,
+       243,   -620,   -374,   2992,   -112,    -35,   2903,    -94,
+       -56,   -213,     65,    383,     41,    508,   -258,   -103,
+      -440,   -237,    428,    132,   2793,    -77,   -113,    -58,
+       -19,  -3857,    -25,     40,   -167,   -243,   -233,    -41,
+      -279,    213,    -22,      8,    120,    126,    159,   -212,
+      -244,    183,   1605,     62,    -12,   -244,    519,    780,
+       116,  -3197,   -992,    341,    222,    681,   -357,   -669,
+        55,   1213,    100,    441,      1,    -57,    232,     10,
+      -114,    318,   -147,     89,    188,    448,   -327,   3735,
+      -292,    875,   -216,    211,    111,    160,    172,    286,
+     -3513,   -849,   -185,     -9,     31,    442,    747,  -1045,
+       187,    704,   -219,    509,     48,     69,    -25,    -10,
+        75,     23,     10,     23,    -32,     89,   8628,    -77,
+       -19,     27,      0,   -232,     22,    -50,  -1904,   -137,
+      -169,    128,    138,     78,   -443,    243,    157,  -3809,
+       231,    277,   -341,     73,    -70,    596,    259,    157,
+      2197,    575,   2445,     11,    -53,    118,   -115,    562,
+       108,     30,   -241,     30,   -394,   -155,   -186,   -344,
+      -237,   -319,  -2258,    343,   -311,     14,    169,     59,
+       -15,    233,    732,    365,   -692,   -108,   1416,   -463,
+      -279,   -248,  -1731,   -406,   -278,    298,    209,   5333,
+      -198,   -167,     50,    439,    142,     91,   -523,    226,
+       262,   -130,    -15,    573,     -4,    271,     -2,    -47,
+         7,  -9106,    -69,    -44,   -144,    -98,    199,   -181,
+         6,     45,     47,     37,    -51,    -68,    -50,   -116,
+      -105,     49,    376,   -420,    187,   2894,     29,   -471,
+      -221,    455,     -1,   -858,     55,   -197,    359,  -1972,
+      -188,    921,   -134,    186,   -843,  -2542,    322,     -1,
+      -158,   -352,   -307,   -578,    -60,    143,  -1302,    333,
+       681,   1373,  -1021,     18,    284,    -28,      8,    -57,
+       -16,     15,     58,     31,   8389,    -35,     18,     77,
+       -78,     15,     36,     17,   -134,    -17,    316,   -680,
+       491,     38,   -217,   -278,    276,   -299,    -75,  -4030,
+      -293,   -507,    -62,   -344,     64,   -438,   -344,   -256,
+       341,    199,    -66,     28,    -17,    -17,      2,    142,
+         6,    -48,   -169,    -27,   -117,   6739,     42,    -61,
+       140,    246,   3357,  -3243,     48,    -55,     49,     27,
+         4,    172,   -169,      6,     69,   -265,     70,     25,
+       223,     28,    129,    231,     57,  -1608,   2640,    -28,
+      -197,     29,    -11,    138,    621,    427,     20,    514,
+       663,    562,    447,   -158,   -909,    343,   -321,   -257,
+      6641,     -1,    -20,    -70,     62,    241,     51,    -83,
+       -48,   -156,   -266,   -335,    -43,    421,    350,    306,
+       165,   -541,     47,      5,    -40,    364,     21,    190,
+     -4584,   -125,   -441,    489,   -571,    -47,    -10,    205,
+        60,    -73,   -584,    417,    233,    -34,   -109,     85,
+        41,    134,    485,   -171,   -183,  -1522,    202,    390,
+     -3112,    144,   1675,    651,    402,   1953,    120,     93,
+      -276,  -1930,   -197,    -61,    100,     81,   -250,   -155,
+       -19,    336,   -178,  -2340,     88,   -543,    226,  -2507,
+       -60,    -62,    218,     -9,    158,  -3617,    -66,     32,
+       314,   -192,   -121,    372,    334,    516,    412,    247,
+      -609,  -1237,    312,   -120,    -39,     47,     61,    -63,
+       -90,   4500,   -191,   -353,     10,     54,   -163,   -345,
+       121,   -318,   -235,    190,    -99,    181,  -3369,      4,
+      -188,    -87,    128,    167,   -507,  -1132,   -666,   -354,
+       121,     43,   -546,    601,   -409,    181,    -47,   -315,
+       127,  -2845,    487,    186,  -2724,    343,    177,   -837,
+       387,    -84,    259,    122,   -159,     88,    117,    137,
+        79,    126,   1584,   -521,  -2448,   2648,   -246,    -75,
+       567,    114,    244,    653,   -551,   -196,   -623,    205,
+       816,     48,   -326,     66,    -94,    -33,    133,    412,
+      -241,    491,    -32,   -712,   -249,  -3756,   -185,   -229,
+       248,    268,    557,     73,    164,     24,    -70,    -27,
+        54,   -156,    -51,    -47,    -26,     43,    187,    179,
+       -38,   -137,    218,   1916,   4614,    435,    -15,     21,
+       145,   1868,    241,    240,    299,   -204,     73,    -24,
+      -118,   -372,    -89,     23,   -298,    479,   2837,    959,
+       -76,    -85,     -2,     28,     94,  -3245,     28,   -130,
+       159,    295,    264,   -419,    -98,    -16,   -159,    349,
+       202,   -158,  -2680,   -210,   -390,    -18,     -8,    364,
+      1367,   -110,    932,   -232,   1348,    -80,    865,   -291,
+      -408,    406,   -118,   6462,    -55,     10,   -152,   -161,
+      -132,    231,    258,    135,    -13,   -104,    247,    207,
+      -238,    212,    -19,    -31,  -3303,   -160,    -24,   3402,
+        50,    116,   -191,     97,   -139,   -100,     71,    -49,
+      -293,    133,   -120,    -10,    197,    196,   -516,   -686,
+        79,    -52,   6002,    -47,     88,   -201,    146,    136,
+        54,    162,   -180,    287,     67,     70,    -55,    210,
+     -1938,    635,   -162,     82,   -120,   -456,    -75,  -3753,
+       -83,    176,    137,     18,     -6,   -281,    232,    137,
+      -167,    373,     78,  -2622,    -38,   -293,     89,     69,
+     -3476,      8,    152,    136,     32,    -15,   -140,     11,
+         6,     13,    481,   -175,   -228,   -254,    158,  -3423,
+       206,     22,    900,   2025,    266,   -402,    132,   -356,
+       558,   -592,   -262,   -419,   1002,     73,   -246,    -24,
+     -3145,   3220,    -33,    283,    398,    -31,    -25,     -7,
+       103,    -93,   -143,      1,     32,   -497,    206,    -35,
+      1424,    114,    140,   2393,   3245,   -218,   -163,    113,
+       191,   -164,   -215,    504,   -256,    140,   -364,   -226,
+      -340,     91,   -464,     32,    188,      4,     15,  -6068,
+        69,    109,    219,     75,    196,    -24,    -84,   -218,
+        27,     57,    -97,      8,   -338,     -4,    358,     23,
+       -52,    -68,    552,   4023,   -255,    684,    144,    188,
+       100,   -293,    462,    553,      9,    665,     12,   -640,
+     -5099,   -158,   -245,    -74,   -168,    263,   -355,   -370,
+      -653,   -163,   -473,   -394,   -233,    750,     17,    -31,
+};
+
+static const int16_t cb1110sl0[] = {
+     -3736,  -3737,    -18,   -285,    383,   -144,   -155,   -204,
+       296,   -399,   -663,    356,   -364,    329,   -330,     -5,
+       -52,    -88,    -41,    228,    -21,    -45,   -136,   -280,
+      -109,    -86,     57,     91,   -212,    158,   -106,    -90,
+     -8192,     70,   -255,     78,     -8,    -89,   -110,    -58,
+       104,    -51,  -2598,    411,    -94,   -567,    209,   -464,
+       139,   -234,   -336,    754,    863,    399,    345,    117,
+     -3435,   -219,    369,     59,   -325,   2439,   -148,      6,
+       -48,     84,    -14,     71,     94,     10,      6,     73,
+       106,   -490,   -200,    186,    345,     -8,     99,  -3687,
+     -1571,   1836,  -1593,   1111,  -3700,    470,     -6,    401,
+      -182,   -119,    438,   -263,    228,    785,   -361,    -56,
+      -492,    465,    333,     61,     53,    234,    -23,    -87,
+        39,    105,   7282,     59,    -47,    -57,    -77,    -45,
+      -172,     12,    179,   -134,     37,   -157,    -19,   -206,
+         9,   1186,   -264,    600,    350,    374,    115,    -55,
+       727,   -164,  -3903,   -735,    586,    -24,    145,   -786,
+      -118,    943,    514,    396,   3435,    -35,     83,    294,
+       107,     16,  -3636,    -93,    360,   -307,   -105,   -172,
+       204,    320,   -148,    410,    175,    335,      0,   -178,
+        12,     94,    -47,    -91,    -49,   -159,   -155,    -65,
+       -17,   -159,   -316,     64,    155,   -260,     81,  -4766,
+      -150,   -116,   -332,    128,    675,   -105,   -479,    563,
+      -101,    101,   -379,     33,     37,      1,    106,    151,
+        69,    140,     -6,    -74,    157,   -125,   -120,    -33,
+      -178,   -286,     60,   -158,     43,  -7291,   -295,    -68,
+       -34,    -68,    -58,      8,    176,    -42,   -212,    176,
+      -533,    -62,    -27,    167,    291,     59,    311,  -3050,
+       552,   -493,   -207,   2576,   -991,   -375,   -102,   -980,
+      1130,   -565,   -199,    559,  -1390,   -428,   -618,     70,
+      -437,   -245,  -1132,  -1302,   -453,     83,    222,  -1555,
+      -178,  -1396,  -1176,   -228,    730,  -3121,  -1085,     84,
+      -326,     71,   -185,   -315,    889,    803,  -2910,  -3609,
+      -639,   -199,    187,    137,   -622,    473,    121,    181,
+        85,    395,    523,    589,     71,    703,    123,    361,
+        47,   -675,    299,   -446,    307,    591,   3341,     64,
+       526,  -1541,    -50,  -1369,    701,   -144,   1720,   -713,
+       562,    297,    146,    -34,   1315,    956,    761,   -415,
+     -1311,    637,  -1263,  -1096,   -385,   3228,   -395,    317,
+      -354,   -503,    255,   -526,    245,    598,    853,   -269,
+      -110,   1354,    333,    110,    855,  -3346,    635,    636,
+      -917,   -577,    260,    147,   1041,   1273,    385,   -862,
+      1751,  -1099,     80,   -148,    120,   -118,   5565,   -484,
+       -74,    326,    291,    234,    -41,    212,    192,    207,
+      -108,    198,    118,   -389,    178,   -151,   -252,    -69,
+      -243,   -800,   2640,   -531,     84,   -301,    157,  -3428,
+         3,   -418,   -173,   -166,   -722,    207,    448,   -387,
+      -504,    202,    453,    210,   -203,    304,    190,   -264,
+       101,    -23,     36,     74,   -146,     26,     29,    -33,
+        59,   -127,     22,    213,   -167,    103,   8192,    183,
+      2709,   -125,    324,   -964,   -259,   -400,    -41,   -430,
+       367,    127,    266,    369,   1081,   -190,   -220,  -1083,
+       641,  -2733,    750,    525,   -623,    -18,   3159,    686,
+      -278,  -2083,   1680,    587,    123,     -6,   -266,    376,
+       522,   -433,   -499,    169,    106,   2041,    174,    571,
+      -108,    129,   -116,    -87,   -252,     89,    -14,     14,
+       120,  -7874,   -204,     15,     19,   -110,    -82,    -54,
+        66,     31,    210,     55,    339,     61,   -219,  -3205,
+      1292,     80,    344,   -733,   3172,    -21,    -55,    712,
+      -192,     38,    408,    489,    388,   -343,   -763,    438,
+     -1812,     -6,   -129,  -1392,   -382,    -28,    105,   -284,
+      -168,   -462,   -284,     22,    113,   1203,   3253,   -589,
+      -619,    348,    113,    847,      3,   -557,    460,   -636,
+      -601,   -742,     46,   -111,     51,    -66,  -2867,    551,
+       455,    898,     17,   2205,   1004,    -46,  -1475,   -367,
+      2849,    766,    -32,   -119,    624,   -722,   3371,    172,
+      -330,     93,   -221,    457,   -453,     84,   -281,   -360,
+       108,    487,   -301,    166,  -2611,    577,    192,     34,
+      1105,    705,     34,     29,  -3041,   -898,    172,    578,
+       307,    483,   -439,   -327,    360,   -935,    -76,    387,
+     -2485,    800,    333,    601,   -712,   -973,    -65,   -442,
+       220,   3577,   -428,   -210,    565,    757,   -382,    289,
+       726,    -19,   -182,    384,    -32,     38,   -810,   -181,
+     -2978,    259,   -213,   -473,   -187,   -823,   -279,   1518,
+        26,   -385,   1143,   -409,   1310,    676,  -2472,     64,
+      -391,   -102,    455,  -5751,    278,     30,     64,   -177,
+      -113,   -170,     94,   -234,   -167,    101,     -2,   -149,
+      -131,    351,   -254,   -138,    149,    -42,    631,    -21,
+       237,   2893,   -291,   2917,  -1240,    211,   -215,     22,
+      -827,   -160,    140,   -213,    156,   -250,  -1233,    691,
+       498,    -30,    350,    -28,    -12,    217,     34,   -348,
+       -70,   -140,    103,    -60,    353,   -200,   -314,    -74,
+       112,   4435,    -80,   -287,    413,    -99,   1407,   1519,
+     -2230,    114,   3179,   -523,     39,    340,   -379,    373,
+     -1552,   -138,   -446,   -106,   -762,  -1017,   -297,   -183,
+       498,   -481,    374,    271,  -5609,    297,     98,   -378,
+       187,    -78,   -125,    333,    114,    -81,     62,   -145,
+        14,    362,    518,    134,    195,    130,    -34,    -72,
+     -3088,  -2965,   -114,    585,    -78,      6,    552,   -633,
+       -98,   -224,    980,    338,    -83,  -1064,     42,    106,
+      -119,    644,   -293,    496,     67,    128,   -129,    620,
+        20,    526,   -177,     68,    351,  -3703,   1465,    905,
+      -245,     86,    511,     39,   -512,   -150,    239,     86,
+        60,     39,    -79,     -9,    -65,     77,  -7993,     57,
+       -19,     56,    -38,    161,   -221,   -129,      8,     93,
+        52,  -5622,   -114,    133,     26,     64,   -194,   -316,
+      -143,    225,    -66,    -81,    -74,    240,    130,    137,
+      -549,     11,    352,    -53,  -4029,    513,   3164,   -205,
+       127,     80,   -193,   -197,    -36,   -885,    223,   -858,
+         5,   -458,    290,    459,    247,   -284,   -176,   -748,
+       173,    191,    114,    406,    126,      3,     91,     84,
+      8027,    379,    -56,     47,     35,    246,   -143,     65,
+       -36,      8,     59,     67,    -69,   -421,  -3492,    312,
+      -252,    261,   3367,    319,    -67,     77,   -346,    386,
+        34,    237,     18,    111,    348,   -547,    186,    -93,
+     -3558,   -178,  -3801,   -133,    -27,   -561,   -308,    112,
+      -224,    272,   -195,   -270,   -179,   -165,    199,   -524,
+       681,   -117,   -429,     37,  -5891,     94,    -55,   -433,
+      -354,    122,    -60,     67,   -200,    -80,    267,   -136,
+       -42,    130,   -324,    -25,    156,    167,    -47,    178,
+         8,    289,    157,     88,    -28,    -39,   -262,    -11,
+         9,   -113,     76,   8192,     89,    115,   -298,    137,
+        34,      0,    261,    -30,     49,    274,    130,    824,
+      -944,    -56,   1074,   -314,    -76,    527,     75,  -3321,
+       733,   -798,   -352,  -1038,   1049,     72,   -233,    312,
+      3363,     69,    104,   -149,     22,    283,    -20,   -101,
+     -3350,    164,   -328,   -362,   -993,    430,     78,    125,
+       269,    -29,    362,    -73,    -30,  -1189,   1396,     59,
+     -1285,   -216,   -121,   3893,     84,   -464,    -38,   -113,
+      -369,   -181,   -930,  -1012,    394,    120,    274,   -552,
+      -800,    105,   -141,    -12,    241,   -667,    543,   -416,
+        28,   -182,     51,    905,  -3964,  -1213,     12,   -271,
+       378,   -234,    838,   -113,     56,    567,     35,     48,
+       490,   -180,   1097,    170,   2596,    -28,   3098,   -220,
+       424,    885,    -42,    783,    -30,    907,     63,     46,
+      -131,     28,    -55,     54,    -46,    -25,     30,     58,
+       -15,   -200,     -6,     11,    -70,     66,  -8089,     86,
+      -136,     96,    -56,   -101,    300,   -661,    -41,   -201,
+       760,   -252,    955,    189,   1459,   3562,   -457,     35,
+       -54,   -164,   -329,  -1245,   -830,   -365,   -399,    -23,
+       616,   -238,  -1301,   -198,    335,  -3400,    149,    175,
+       -97,   -279,   -594,    -92,   -915,   -830,    468,    628,
+       728,   1024,   -549,   1073,    222,   -142,    296,    -75,
+      -168,     -5,    -67,  -7311,    -50,   -256,   -321,    121,
+       358,   -272,     30,    258,    105,   -161,   -291,    462,
+        -7,   -211,   -227,   -104,   -151,   -152,    -72,    -98,
+       -59,    -23,    -98,   -203,    103,     89,    239,   -484,
+      7749,    110,     35,    345,    282,   -578,    140,    -51,
+       -62,   -238,    102,    454,     64,   -107,   -223,   -174,
+       285,    110,   -190,    -16,   1624,    142,   3813,   -849,
+        43,    234,     84,      0,   -132,    131,   -135,    -70,
+        -1,    125,    -83,    171,    109,   8044,     97,    -38,
+       143,     64,     13,      4,   -225,    181,    712,    626,
+        20,    167,   -467,    186,   3801,  -2179,   -647,   -119,
+      -112,   -183,   -223,    295,   -438,   -407,    -29,     36,
+       -34,   2536,    -47,   -402,    -33,    -62,   -136,   2444,
+      -152,   -717,   -868,     86,  -2323,    931,    659,  -1281,
+       -98,    638,   -162,    195,     -5,    -40,    -88,   3019,
+      3466,   -323,    316,   -784,   -715,      5,    188,     42,
+       155,   -608,    500,    185,    475,    100,    -51,    879,
+      -891,   -158,     18,   -453,    380,   -207,   -143,    401,
+      -153,    926,   -184,   2775,   3176,   -797,   -198,   -888,
+       405,    460,    309,    304,   -114,   2386,   2319,    658,
+     -2200,    216,    435,  -1210,   -655,    154,     81,    538,
+       908,    220,   -118,    482,   -864,   -526,   -241,    857,
+      -473,    774,   -288,   -886,     46,    250,    -96,    301,
+       120,   -488,   -128,   -233,    422,     38,  -3416,   -974,
+      -243,   -226,    381,   2394,    652,   3124,   -205,  -1303,
+      1484,   -159,   -152,  -1037,   -105,   -121,   -466,    -76,
+       605,    181,    -55,   -326,   -527,   -126,   1691,   1316,
+};
+
+static const int16_t cb1110sl1[] = {
+      -743,   -300,   -347,   -441,     85,   5282,   -250,     32,
+        28,   -306,   -434,     78,   -178,   -112,    -28,   -162,
+      -188,    -43,     17,     94,   -242,   -258,  -2691,   -471,
+      -556,   -815,    120,    -57,    -36,   -325,   3282,   -765,
+       355,      2,   -162,   -454,    -72,    192,     86,    219,
+      -123,    237,    135,    -42,    492,   -471,   -114,   5146,
+      -164,     28,     77,     70,    276,   -148,    333,     64,
+       -89,    -46,   -135,    474,   -218,   -119,    351,   7619,
+        93,    -80,    -84,    -51,   -110,   -223,    -13,   -116,
+      -160,   -102,    -64,   -140,   -376,    156,   -143,   -421,
+       105,    102,    519,   1256,    786,   -284,  -3029,  -3021,
+      -365,   -515,  -1358,   -273,    394,    489,   -242,     31,
+       239,  -1328,    169,   -488,  -3069,   -398,    303,   -274,
+       498,  -2758,   -748,   -208,   -324,   -285,     78,   -386,
+     -1063,    298,      5,    693,    160,   -629,   1656,    186,
+       457,    742,    422,  -3723,   1997,   1025,    -24,    291,
+      -588,     16,   -327,    459,   -521,    421,   1279,   -408,
+        -2,  -1320,    101,   -372,    -66,    100,   -605,   3214,
+      -374,   -660,   -371,    207,    175,   -553,   -574,   2962,
+       119,   -551,   -140,    -62,     50,   -608,   -237,   -100,
+       108,    101,   3258,    -31,    -45,    375,   -161,    132,
+      2842,   1458,    235,    800,   -113,    719,   -291,    -29,
+      -512,   -267,     53,    780,    -59,   3387,   -175,     88,
+       -78,   -475,   -536,    584,  -3025,    -19,   -105,     91,
+       875,    -55,   -771,    143,    384,    810,   -372,   -253,
+       160,   -128,    232,     98,   7755,    181,    -19,   -177,
+        46,    -39,    -30,   -212,   -289,     75,    127,   -114,
+        80,     79,    325,   -128,   -436,   2547,    -73,    -29,
+      1046,    344,   3340,   -335,    458,    637,   -175,   -695,
+      -366,    294,   -322,    564,    542,    209,    524,    -62,
+       444,   2827,    -53,     66,   -959,     84,    484,   -147,
+       158,    259,   -479,   3216,    232,    -68,    583,   -810,
+       107,     93,    629,   -168,    143,   -552,     96,    -71,
+     -3903,   -438,    335,   -133,   -186,   -278,     73,   -575,
+      -253,   -733,    -91,     -8,  -1149,    350,    140,     12,
+      3935,   -236,    103,    469,    610,   -536,   -305,   3112,
+        13,   -182,   -686,    637,    525,    327,    102,    -49,
+      -450,    -16,   -480,    233,    -82,   -132,  -3979,    426,
+       757,     54,    152,   -701,    513,   2330,    148,    242,
+      1709,    162,   -168,    146,      0,    891,   -644,    109,
+      -549,    104,    -50,    275,   -193,    -55,   -144,   -117,
+        31,   -234,     68,  -5369,     72,     54,     54,    119,
+      -140,    192,    286,    -42,   -278,  -3524,  -3609,    692,
+      -366,    -15,    343,   -885,   -267,    294,   -387,   -215,
+       -83,   -469,    790,     85,    428,   -613,    114,    634,
+       279,   -570,    616,   -813,   -117,   3073,   3121,   -717,
+      -200,    285,  -1061,    -44,    945,    386,   -166,    494,
+       776,     36,    -25,   -444,   -260,    407,   3885,   1049,
+      1348,    185,    454,   -136,  -2275,   1064,   -271,   -316,
+       645,  -1050,    483,    430,     32,    569,   -676,   -335,
+      -328,  -2982,   -370,     50,    189,    155,   1058,   -119,
+      -407,   -310,    461,   3293,   -604,    195,     48,     68,
+       196,    194,    547,   -210,    785,   -383,   -410,   -268,
+      -149,    192,    -88,    -13,     20,    -80,  -5146,    -86,
+      -111,     40,    -36,   -138,     12,    239,    -36,    -84,
+      -512,    149,   -237,   -672,   3477,  -3446,   1198,    220,
+       146,   -747,    242,     48,   -146,   -196,   -335,   -777,
+      -405,    620,   -340,   -367,   -389,   -108,    -27,   -184,
+     -2024,    518,    241,   -104,    417,  -1356,  -1961,    134,
+      3221,   -423,    286,    -60,   -110,   -568,     14,     76,
+      -144,    159,    704,   -410,    542,    -43,    223,    105,
+      -154,   -141,    -84,   -132,   -271,   -235,   -285,   -248,
+       480,    430,  -4711,   -487,    -86,    482,     80,     46,
+      -239,    -93,   -115,    -54,     -1,      7,     97,    -12,
+       151,   -180,    159,    -63,     65,   -215,     54,   5712,
+      2886,   -115,   -236,    113,    -25,   -301,   -450,   -276,
+       -78,    197,    -55,   -278,   -511,    163,   3442,   -910,
+       -74,   -225,   -103,     63,   -204,    -43,   -126,   -334,
+       223,    192,   -131,    202,    -83,   5000,    -66,    441,
+        33,      0,   -116,    237,   -238,    -37,    445,    -48,
+         7,  -1855,  -1154,   -251,   -117,   -185,    125,   1877,
+       375,    388,   -904,    202,    649,    376,  -3231,    897,
+       101,   -637,    376,     16,      1,    845,   -550,   -610,
+      -380,  -1363,   -955,     71,   1303,    296,   -264,   -584,
+       247,   3247,     98,   1035,   -670,    416,  -2008,   -448,
+       -56,   -169,  -1787,   3314,    408,   2541,   -833,     -2,
+      -169,   -184,    193,   -575,    -81,    410,   -293,   -478,
+        21,    194,    223,   -111,   4648,     60,    354,   -593,
+     -2429,   -671,    150,   -350,    151,   -448,     -5,    386,
+      -441,    131,   -339,     87,    815,    279,     51,    131,
+        56,  -3194,   -170,  -3899,   -297,    270,     21,   -215,
+         7,    205,   -305,    141,    577,     83,   -289,   -502,
+       -66,    -96,    433,   -106,   -685,   -194,    -82,     33,
+        98,    315,    258,  -2453,  -2957,    608,    672,    152,
+      -681,   1804,    -74,   -459,   -423,    114,  -1183,   -100,
+      -798,    357,    -79,  -3418,   -676,    580,  -1637,   -506,
+       306,    437,   1001,    731,   -885,  -1276,   -583,   -359,
+       650,     15,   -189,    190,     86,     39,  -7987,   -133,
+       324,    174,     22,     86,   -144,   -125,    -43,    -81,
+       -49,     68,     39,   -204,   -159,   -291,   -217,    -68,
+       264,    193,    406,    247,     27,   -272,   -168,    536,
+     -5740,   -141,     38,     18,     -7,    258,   -111,    125,
+       476,   -364,      5,     72,  -2668,   -197,   -605,   -671,
+       -82,    201,   -752,    227,    240,    345,    -11,   -138,
+       551,   -351,   -228,  -2774,   -132,   1115,  -1038,    -18,
+       791,  -3136,     81,    219,    357,    755,    579,     26,
+     -3129,   -398,   -719,    193,    495,    290,  -1123,    854,
+      -381,   -535,     33,    232,   2340,  -4577,    -94,   1023,
+      -117,     39,    -54,     15,   -161,   -860,     64,   -209,
+      -597,    415,   -135,   -407,   1068,    894,   -784,    108,
+       267,   7506,    140,     67,    198,     74,     52,   -388,
+      -184,    -24,    -54,    -24,    172,    172,    -50,   -184,
+      -113,    164,    128,    -39,    252,     90,    356,   -313,
+       -90,   -313,   -355,    -73,     19,    139,    141,   -122,
+      -231,  -4548,   -157,   -227,     47,    231,   -421,     60,
+       -80,  -3619,   4252,   -354,     69,    148,    336,    446,
+      -183,     86,    248,     35,     73,    120,    157,    156,
+      -291,   -523,     35,   -264,   3434,    189,    495,    -59,
+       533,   -343,   -554,  -3014,   -415,     17,    436,    552,
+      -240,   -394,   -761,     43,   -766,     46,  -1119,   -254,
+      1540,    195,   -298,   -833,     45,    -93,     61,     40,
+      -171,    167,     82,    107,     16,     40,   -166,    -46,
+       120,   -185,     13,    151,   8151,   -235,     92,    -23,
+       214,    206,    260,     93,    163,     78,    184,    -60,
+       -12,   -171,   -499,   -151,   -219,     11,   -221,    221,
+      3253,   -376,  -1079,   -481,    763,   -257,   -120,    -10,
+        34,   -640,    341,  -2953,    528,    567,   -672,   -335,
+      -175,    -61,    581,   -260,   1159,   -802,   1070,     12,
+       168,   2305,    291,    203,    -15,   -569,   3247,   -179,
+       620,    339,    224,    710,   -416,    512,    -86,    571,
+       439,   -167,    571,    -72,   -144,    236,   -382,     11,
+       268,   -176,   -136,   -337,    220,     64,    341,    361,
+     -4474,     25,    385,    453,   -153,     89,   -572,    245,
+      -197,     33,     75,    588,     51,   -199,    -74,   -149,
+       224,    210,   4689,    282,     20,    -47,    129,    221,
+       -72,     27,     76,     93,    331,    215,     -5,    -20,
+        74,    -80,    169,    126,    -40,   -137,    -24,  -8101,
+       -23,    165,    271,    403,    -34,    -19,    290,   -199,
+       -14,    205,    657,    301,   -885,   2457,  -1965,  -2266,
+     -1004,   -224,   -554,    182,   -220,   -467,   -611,   1012,
+      -122,   3303,    -73,   -205,     93,   3549,    217,   -223,
+        55,   -459,    541,    286,    -46,    128,    354,    137,
+       824,   -313,     32,    301,    139,   -492,    170,    136,
+       -35,   -752,   4613,   -830,    -34,     41,    344,    279,
+       643,   -394,   -461,    163,   -330,    199,   -215,     83,
+      1096,    613,   -473,    816,   3534,    210,   -772,    935,
+      -275,   -600,   -341,    602,    104,   -598,   -217,   -789,
+     -2428,    870,   -351,    474,     50,    321,   -148,  -2929,
+        25,   -135,    -46,     11,   -566,  -3057,   -664,    700,
+      -300,    256,   -960,    350,   -480,    414,    431,     24,
+       -51,   -228,    407,    142,   -321,    316,   -290,    149,
+        56,    -84,   -359,   -118,  -4948,    138,    373,    -49,
+       142,     71,   -163,    -13,   -279,     38,   -121,     35,
+       -47,    -70,    -43,    116,      3,   -159,    -11,     97,
+      -116,    -62,    156,    307,   -173,   7294,   -143,    288,
+       -34,    671,    613,     16,   -240,   -229,   -414,   -494,
+       -43,   -169,   -854,    336,   -991,    719,   -353,   -163,
+      -750,   2685,   2837,   -558,    129,   2076,    -47,    641,
+       -37,    -93,    226,    -69,    598,   -284,    127,    106,
+      -426,   -555,   -947,    485,     54,  -3175,    622,   -341,
+      -544,    278,   -205,   -689,    391,    238,      9,    152,
+      -233,   -392,     28,     36,   -394,  -1059,    132,   3761,
+      -480,     87,   -656,   1304,    478,   -272,     65,   -147,
+        91,    520,   -896,    166,     62,    -30,    -28,    194,
+       542,      3,    625,   1795,   3613,   1097,   1030,    906,
+       400,    133,   -127,    219,    958,     93,   -546,   -702,
+      2937,   -524,   -270,   -767,   -192,    725,   -897,   -643,
+      2502,    141,  -1147,    257,    279,    470,  -3001,   -104,
+        79,    508,    450,    265,    -21,    -74,   -437,    647,
+     -2755,   -407,   -816,    620,     24,    537,   -668,    604,
+};
+
+static const int16_t cb1110ss0[] = {
+     -8187,     90,   -694,   -168,   -452,     -4,   -259,   -332,
+       352,   -554,     43,    389,    236,    508,   -175,    461,
+      -277,    118,    651,   -245,    696,  -1423,    368,  -1417,
+      1782,   1650,   -540,     27,   -461,    516,   -599,   -185,
+       422,    -11,   -181,     19,   1809,  -3226,   -839,   -191,
+       468,    180,   -550,    198,   2487,   -923,  -1335,  -1008,
+      1029,   1716,    588,    371,    902,  -1214,    179,   1026,
+      1560,   1815,  -1714,   1230,   -712,   1675,   1867,   -154,
+     -2860,   -484,   2289,  -1018,     33,  -1494,    614,  -2340,
+      -724,  -1088,  -1930,   -775,   -876,    642,  -1358,   -144,
+     -2518,     62,    543,  -1049,  -1081,    672,   1305,  -1506,
+       -86,   2920,    518,  -1836,   -546,   -132,    -45,   -642,
+       381,   -404,  -2206,  -1211,    698,   -703,   -667,   -606,
+      -677,  -2246,    526,  -1157,    177,    510,  -1420,   -617,
+     -1819,   1710,   1631,   1049,  -1697,   -495,    961,  -1250,
+        39,    482,    445,   -956,    -71,    977,    426,   1826,
+       286,     36,    295,   1786,    794,  -3456,   1645,   -766,
+     -1580,  -2435,   1108,   -286,    731,   -659,    960,  -1759,
+      -978,    316,   -350,     91,    -35,   -222,  -1417,    -53,
+      -529,   -679,    681,  -4700,   -524,    -39,   -350,    196,
+       199,    191,    653,   1344,   -942,   -428,    156,    173,
+       636,  -1538,   1795,   1709,   -190,   1265,    164,    650,
+      2302,  -1757,   1762,    413,   -851,     44,  -1371,    343,
+     -3845,   -122,   1864,   -489,    601,   -748,   -402,    590,
+      -124,  -1988,  -1536,   -999,    399,   -753,    295,   -384,
+     -1316,     55,   -669,    262,  -1157,  -3766,    992,   -111,
+     -2928,  -1424,    -98,    -62,   -334,  -1848,    377,   1560,
+       947,   1568,   1554,    206,    664,   2014,   2098,   -164,
+      -640,  -2897,   -647,  -1675,  -2307,   -254,   -555,  -2426,
+      1497,    465,  -1525,  -1148,     55,    632,    554,   2068,
+       451,  -1532,   -715,  -2065,  -1177,   -623,    478,    -88,
+     -1140,    -72,   -450,   -248,  -1111,   -250,   1356,   2717,
+     -1841,    420,  -1299,  -1715,    746,   -101,    600,   1130,
+      -903,   -473,   1225,   -876,    193,    694,   -193,   -482,
+     -1838,     94,    157,   1131,    267,   -242,   2021,    -39,
+       795,   -285,    438,  -4322,   1097,   -621,   -518,   -338,
+      -289,   -114,   -671,   1700,   -477,    449,  -1664,   -693,
+      1403,  -3629,   1480,   -991,   -234,   -213,    354,   -269,
+     -1140,    -40,   1455,   -758,   1273,    497,   -686,   -945,
+        59,    -66,   -769,  -2930,   2343,   2452,  -1576,    995,
+      -734,   1009,     98,   -350,  -1116,    545,    189,     99,
+       566,   -916,     20,    117,   -807,    986,   -428,    177,
+      1247,    485,   -680,   1139,  -1263,   -256,   4828,     89,
+        27,  -1339,  -1091,    149,   -641,   -703,   -570,   -112,
+       346,    -93,   -641,    -97,   -991,  -2247,   2284,    847,
+      2110,  -1393,   -315,  -1468,    514,  -1493,    -46,   1135,
+     -1231,     39,   -913,   -278,   -762,   1775,   -684,    735,
+     -1676,    386,  -2030,   2534,  -2371,  -1661,   1204,   -111,
+        -8,   -607,   1233,  -1532,  -1263,   1530,   -537,  -1728,
+      -335,    269,   -614,     12,  -1187,   -770,    471,    373,
+      4743,     12,    197,    610,   -101,    417,   -350,    551,
+       544,   -898,    387,   -682,  -1216,    126,     96,     94,
+      -268,    535,    126,   -778,   1595,  -1379,   3366,     49,
+       460,   1772,    198,   -896,     75,    253,  -1376,     68,
+       838,  -1121,   -578,   -630,   -718,   -975,   -565,   1303,
+       354,   -769,    -38,   -246,   -193,   -408,     41,    165,
+       374,    -87,   -155,     -8,   -746,   -430,   -869,  -1842,
+      -385,    281,   5119,    432,   1119,   -807,   1756,    816,
+       131,   -548,   -528,   1347,    478,   1482,   2942,   -290,
+       650,   1012,    163,    840,   -804,     94,   2507,   1514,
+      -953,   -289,     23,   1128,   -895,  -1009,   1871,   -370,
+       699,    659,  -3069,   -695,  -1559,   1435,    672,     94,
+      1496,   -637,  -2208,   1083,    688,    485,    251,   -828,
+      1313,    -21,  -1948,    230,   -603,    783,   -829,    524,
+     -1142,  -3845,  -1383,    323,   1295,    732,    759,    591,
+        68,  -1869,   -756,   1727,    339,  -1565,   -510,   2623,
+       358,   3071,    281,   -790,   1129,    243,   -588,   -431,
+       492,    372,     96,    890,   -935,   -727,   -236,   -416,
+       171,    226,  -1090,   1257,  -1063,   -303,   -817,  -1506,
+      -947,   2282,   -659,   -406,     79,    772,   -816,  -2610,
+     -1802,  -1019,   -816,  -1886,  -1306,   1365,    624,  -2314,
+       -57,   1012,    215,   -130,   3404,   -864,    959,    202,
+       -26,  -1015,  -1212,    -34,   -408,   3494,   -284,    845,
+       275,  -1005,    458,    840,  -2258,    -13,   -129,   2536,
+      1269,   1216,   2071,   -243,    624,    584,   2192,    720,
+       604,  -1397,    766,    984,  -1050,    157,   -246,    438,
+       240,   -587,   1251,   -649,    -22,     33,   5818,    608,
+      -996,    474,   -523,   -454,   1252,   -791,    631,   -465,
+       663,    452,   1793,    853,     39,   3732,    758,  -1329,
+        11,   2217,   -136,   -540,   1335,     65,  -2047,    943,
+       701,   1886,   2085,   -890,    -16,   -184,    325,  -1077,
+      -271,  -1246,    391,  -1686,   -651,    -77,    319,    292,
+      -160,   1204,   1093,    776,   -310,   1512,  -1196,    149,
+        46,    593,   1738,   -566,     97,  -3667,   -485,   -683,
+      -121,   -216,   -149,   -344,    406,   -989,   -311,    383,
+       979,   -828,    394,    -22,  -5143,  -1368,    -18,   -433,
+       359,    607,    996,  -1144,   -229,   1365,  -1243,    413,
+      -591,   -621,    803,   1356,   -625,   1149,   -234,    182,
+     -1285,  -2487,    359,   2640,  -1426,    -66,   -688,    237,
+      1307,   -361,    108,    207,   1026,   -500,  -1156,  -1043,
+     -2192,  -2232,   1790,   1135,   1742,   1494,  -1156,   -698,
+      2520,  -2596,   -620,    431,    748,     88,    912,    832,
+      1122,   -483,   1837,   1821,   -826,   1112,   -424,   -306,
+      -750,   1085,    260,    152,   -114,  -1065,  -4518,   -300,
+      -976,    143,   1452,   1395,   1677,     59,    -51,  -1072,
+       868,   -171,    -26,   -914,   -109,  -2420,    -48,     69,
+      -230,    630,   -522,   2274,   1265,  -1612,   2570,    836,
+     -2042,  -1922,   2970,    775,   -320,  -2486,  -2935,    553,
+       178,    994,  -1054,  -1321,    699,    749,   1002,    513,
+       586,   1550,     35,    654,   -995,   1743,  -1049,   -405,
+     -3431,   1943,    700,    555,    111,    -67,   1007,    111,
+       -57,    661,    404,   -628,    425,   2185,    860,   -516,
+      -523,    452,    238,  -1778,   -378,   -721,  -2197,    218,
+       864,  -1031,   -832,    135,  -2543,   -447,    789,   1117,
+     -1491,    120,   1294,   -702,    627,   -412,   -902,    404,
+     -1843,   -786,   -597,    900,   1963,     22,   -843,   1168,
+     -1045,   -797,    764,   -423,    329,   2308,  -1950,    331,
+     -1090,  -2466,   -483,   2023,  -3363,   2126,    495,   2812,
+      1922,  -1488,  -1041,   -798,    135,    408,     33,    563,
+      1333,    -36,  -2181,   -787,    709,    287,   -971,     93,
+      -459,   -975,   2412,    280,   2555,     32,   2217,  -1825,
+       650,    313,    585,   -947,   1170,     45,   1108,   -435,
+      1092,    220,   -155,    512,    460,    211,   -231,   -627,
+      -836,  -2205,   -181,   -113,    130,    226,   -321,   -765,
+     -1327,  -1190,   -676,   -357,    691,    232,   -365,  -1818,
+     -3007,   2210,    997,    601,   2156,   -782,   1626,  -1081,
+       -49,   -616,    685,    -12,     40,   3480,    563,    515,
+       245,     51,    290,   1227,    171,  -1078,    520,   -483,
+       280,  -1517,  -1331,   2132,  -1176,  -1381,  -1546,   1436,
+      -852,   -505,    672,   -807,    623,   -244,   -125,  -1958,
+       516,    798,   1185,    922,    441,    651,   -610,  -1430,
+     -1887,    114,   -869,  -2024,  -1627,  -2276,   2008,  -1224,
+       125,   -609,    371,  -1104,   -506,   -942,   -624,   -478,
+       197,    141,   -242,  -1051,   1532,  -1269,    666,  -1055,
+      1689,    444,   1720,     16,    301,  -2311,   1196,   1108,
+      1298,   -564,  -1197,  -1858,    439,   -198,    324,  -1884,
+      3193,   2281,    201,    587,  -2028,   1969,  -1087,   -352,
+       -87,   -632,    144,    165,     68,   1150,    173,    478,
+      -837,   -470,   -464,   -195,   -205,   2111,     15,    643,
+      -453,   -339,  -1128,  -1368,   1182,    822,    654,  -2331,
+     -1668,   -215,   -678,  -2460,   1169,   -664,    777,   -348,
+      2570,   -767,   -563,    254,    562,   -557,      4,    -97,
+      1990,    373,   -780,   -677,   1996,  -1527,   -365,   -416,
+      -325,    587,    910,  -3780,   -553,    104,   1705,    240,
+      -719,  -1717,   2765,   -582,    -76,    399,  -1152,   2379,
+      3169,  -1153,   -725,    -35,  -1214,    362,   1600,   -724,
+       424,   -722,    472,    872,    694,   -126,  -1649,  -1314,
+     -1814,    -95,   -312,    -34,    780,   -884,    824,   -864,
+       526,   -100,   3820,    -56,   -452,     43,    564,    487,
+       177,    890,  -1423,    894,   -552,   1438,    204,   1015,
+        -4,    327,  -3327,   -433,   -335,   -869,   1312,   -488,
+     -1287,   -169,   2018,    435,     73,    508,   1160,  -1060,
+      -134,  -1304,   -341,    623,    125,    -15,  -1120,    108,
+       -71,  -1487,   -189,  -3640,   1424,   1740,   1116,    579,
+      1603,  -3294,   1241,   -225,   1481,   2775,   1326,   -242,
+      -632,  -1560,    563,    559,    138,    115,   -557,   2004,
+     -1771,    717,  -1052,  -1115,  -1634,    889,   -441,   1954,
+      -164,  -1507,  -1312,   -407,    662,   -867,   -896,    225,
+      2576,   -224,   -107,    237,   -694,    859,    192,  -1033,
+      2255,  -1225,   -891,  -1994,    -90,    339,   -382,   -774,
+      1460,  -1553,    648,   -521,   2370,    160,    714,     54,
+      -906,   1435,  -1752,   -274,   -523,    -36,   1208,   1553,
+      -339,   1000,   -178,    209,  -1001,    916,    495,    310,
+       726,    127,   -391,    107,   -513,  -1052,   -376,    297,
+      -307,    933,   -233,   -253,   1196,   4619,  -1278,    762,
+       -13,   -387,   -973,   2153,     68,    362,   -887,  -1922,
+      -106,    298,  -1127,  -2601,  -2184,   -111,    111,  -1588,
+      1002,   -365,  -2226,   -290,   -599,    610,    551,  -1368,
+     -4344,    618,   -172,    349,   -914,   -530,   -192,    718,
+       348,   -675,   -884,    913,    -94,    215,   -834,    353,
+       753,   -811,    -84,   -905,   -128,   -483,  -1782,  -1255,
+     -2333,  -1110,    477,   -566,    346,   2018,  -1644,   -325,
+      1365,  -1223,    158,  -1786,    566,    203,    742,    281,
+      -555,    573,   -978,   -459,  -1671,    378,   -689,    349,
+       606,  -5961,    562,    -13,   -223,   -419,   -442,   -447,
+       125,  -1052,     53,   2594,  -1377,    209,  -1549,    533,
+      -118,  -2538,   1808,   -364,    -37,   1221,    607,    593,
+       309,   -240,   1574,    254,    434,   -141,   -220,  -2018,
+};
+
+static const int16_t cb1110ss1[] = {
+       631,   3041,   1215,   2376,  -1843,   -103,    750,    144,
+       -87,   -249,    715,   -201,    758,    202,   -197,   -135,
+      -523,   1243,    457,   -717,   -700,   1662,    918,    -48,
+     -1008,    180,    411,    948,   2192,   2607,   -826,   -962,
+     -1130,    -59,  -1047,   -305,   -325,  -1032,   2096,   -287,
+       395,  -1543,   -268,  -1218,  -2045,  -1674,    951,  -1846,
+      -636,    263,   -138,   -287,   -327,  -2208,   -664,    496,
+      2179,   1645,    340,   -601,    473,    670,    950,   2774,
+       364,    613,  -1896,  -1876,  -3177,   -105,    506,   -164,
+       281,    718,   2419,  -1077,    -50,    365,  -1631,   -134,
+      -384,    231,    767,   -285,   1268,    321,  -1408,    217,
+      -409,   -725,   1225,  -2551,  -2622,   -274,    473,   2752,
+       -11,    342,   -495,   1627,     79,    240,      2,  -1021,
+       640,   -508,   -269,    648,   -116,  -1283,   -217,     13,
+     -1674,   2402,   -879,   1791,   2753,   2386,   1195,   -700,
+      -282,   -428,   -671,    -92,   1187,   -672,   1037,  -1913,
+       246,   -816,    -69,  -2284,   -712,   -996,   2498,    902,
+       809,   -149,     66,    775,    -44,   -566,    955,  -1073,
+     -1438,   -894,   -978,    274,   -390,   5528,   1153,     17,
+      -750,     63,    545,   -725,   -301,   -323,    661,   -813,
+      -347,    739,    335,    136,    203,    342,    802,   -199,
+      -818,   -679,   -282,   2195,  -1714,   -757,   -154,    182,
+       132,  -1737,    405,   2394,  -3727,   1349,    213,   -193,
+     -2495,  -1354,   -629,  -1171,   1429,    -16,    834,  -1260,
+       160,  -1892,    874,   1754,   -567,    344,  -3499,   1612,
+      -987,   -424,   -997,  -1640,    594,   1058,   -783,    511,
+      -604,  -1480,  -1754,   -424,   2262,  -1991,   1297,   -638,
+       350,   -588,    -55,   1483,   -456,   -567,    146,   -946,
+       731,   1541,   -759,    592,   1231,   -270,    171,  -1975,
+     -2707,   -456,   -227,    392,   -891,   1008,  -1066,   -487,
+       231,   1372,    -51,   -599,   -227,    696,   -820,    354,
+      1928,    -48,  -1302,   -570,    316,   -283,   -848,   2563,
+      -266,   2821,    540,    553,  -1272,   1120,  -1164,   -451,
+       384,  -1058,  -1018,   1735,    992,  -1220,    -83,   1490,
+      2304,    122,   1630,   1108,   1997,   2346,   -647,    301,
+     -1746,   -218,    313,    462,   1486,   -536,   -508,   -463,
+       104,    930,    605,   2116,    793,   2881,   -724,  -1379,
+       -53,   4458,    793,    275,   -180,   -516,   -489,   -774,
+      -265,    704,    112,    175,    112,   -121,    652,    310,
+       564,   -440,    773,   1885,    927,   -672,   -773,   1726,
+      -614,    818,   1589,   -372,   -207,    499,   -894,    987,
+       796,    652,  -1228,  -4010,  -2208,    458,    645,    498,
+      -279,   -852,  -1897,  -1820,    -35,    674,    201,    474,
+        77,     94,   2327,    723,  -1081,    261,    209,   1179,
+     -1175,    623,  -1293,   2154,   -117,  -3707,    940,    813,
+     -1059,   -335,   1306,    525,   -191,  -2066,   -425,     19,
+      -366,    529,   -145,    822,   -913,    254,    424,   -354,
+      -167,  -2437,  -1433,    603,   -318,  -1517,   4250,    541,
+     -1360,    450,   -531,    200,    534,   1200,   -222,   -535,
+      -162,  -1211,   -116,   -144,   -462,   -139,   -482,    511,
+      2068,  -2100,    971,  -1487,  -1050,  -3150,   -701,    119,
+        16,   1535,    272,  -1184,   2242,    488,   -492,   -915,
+      1660,    212,   -826,   -444,   1003,   2705,   3591,   -174,
+      -333,   -431,    -59,   -903,     61,    751,   1087,    -45,
+     -1031,    617,    686,    -15,    848,   -348,    947,    396,
+       931,   1785,   -552,   -920,   -669,    -63,  -1869,   2357,
+     -1549,    807,    889,  -1581,  -1071,   1587,  -1108,   1300,
+      -658,   -625,    300,   -285,   -977,   1656,   4183,   1487,
+      -191,    658,   -300,    497,   1378,   -300,   1031,    322,
+       114,   -449,    666,   1250,    264,    125,   -109,    748,
+      -503,    -40,    199,  -1212,  -1643,  -2522,    151,    121,
+     -1128,  -3200,    876,   -446,    878,   -989,   1510,   2261,
+     -1507,   1793,   -402,     30,    228,    -50,    985,  -1568,
+       755,   1559,   -688,   1342,   -423,  -1507,     96,   -501,
+       474,  -2926,  -2493,   -131,   -656,    450,   1035,    812,
+       -14,   -933,    941,   1396,   -957,   -621,   -516,    379,
+      -225,  -2063,  -2048,    669,    287,   1688,   1727,    299,
+      -658,    852,    745,   -260,    993,    158,  -1236,  -1422,
+        33,    611,   -112,   -323,   -194,    839,  -1407,  -1505,
+     -2010,   1267,   -355,   -675,  -3779,    768,   -228,   -643,
+       661,   1313,   -529,    962,   -948,   -212,   1043,   1560,
+      -174,   1744,   -938,    289,   1942,  -2228,  -1932,   1056,
+      -590,   -940,    922,    601,   -853,   -791,   -637,     -2,
+       -52,    -83,   -209,   1422,    856,  -1141,   2500,  -1195,
+       773,   1087,  -1389,    409,    439,  -3674,    453,   1637,
+       -15,   1013,   2635,   1530,  -1104,    440,    895,   -210,
+      1118,     -6,     45,     65,  -1110,  -3307,   -331,    478,
+      -155,   -410,   -721,  -1234,    129,   -971,  -1117,    -27,
+     -1132,  -1289,   1888,  -1112,    203,  -1091,    442,  -2207,
+       501,   -343,    468,    -52,    385,    269,  -3102,   -366,
+      -469,    391,    505,    176,    356,    -69,   -929,   1155,
+      -280,  -1264,   -897,   1006,   -494,    155,     36,   -627,
+       924,   -816,    154,   -750,   -837,   5263,  -1099,     91,
+      -481,     71,   -681,   -574,   1229,    675,   1217,   1073,
+      -695,    274,   -381,   -140,   1372,   -524,   1164,    341,
+      -149,   -856,    793,  -1294,    981,   -961,    371,   1178,
+      1463,    373,   1375,  -4384,    239,    136,     67,  -1196,
+      -126,  -1001,   -228,    150,    437,  -1830,    477,    498,
+      4246,    793,   -661,    260,  -1810,   1405,     76,    902,
+      -844,    908,   1830,     27,   -124,    257,    765,    -98,
+       592,    487,   -132,    202,    675,   -669,   -679,   1309,
+     -4002,   -206,    -66,   -390,   -253,   -190,   -921,    -83,
+      1411,   -417,  -2560,   -646,   1853,   -148,    548,   -370,
+      -723,    959,   -906,  -3058,   -276,    467,  -1280,    970,
+       687,    484,    506,   1143,  -1509,    828,  -2169,   2931,
+      1322,   -579,   1033,    209,   -979,    217,   -434,  -1438,
+       314,   2384,   -906,    -29,  -1478,    -31,    574,   -373,
+      1478,   -124,   -680,    330,    794,   -753,   -977,   1151,
+     -1190,  -1479,   -642,   1658,  -2201,  -1469,   1589,    587,
+        52,   1298,   2092,  -1483,    678,   1988,    918,   -648,
+       328,   2096,  -1090,   2153,  -1416,    295,    537,    261,
+       398,  -1389,   -399,   1105,     10,   -395,   1169,   -431,
+      -423,  -1617,    766,  -1900,  -3205,    131,   -746,   -852,
+      2215,   -317,   -232,   1079,    293,   -727,     50,   -446,
+      -713,   -897,    768,   -896,   -667,   -281,    377,    115,
+      1695,  -4870,    713,   -393,    251,   1268,    477,   -497,
+       294,     18,   -359,    556,    308,   -752,   -863,   -216,
+       151,   -163,    695,    587,    810,   2107,   -107,    921,
+      1203,   -472,   1280,    372,    110,   -581,   -225,   -714,
+       -58,  -2587,  -1980,   -186,   -372,  -1410,  -1504,  -1020,
+      -745,    -88,   2373,   -568,  -2841,  -2041,  -1841,   2065,
+       389,   -430,   1163,   -208,    569,    375,    650,    317,
+      1114,  -1036,   -959,   -896,   1060,   1014,   -599,  -1743,
+      1121,    808,   1556,    326,  -2876,  -1556,  -1283,    384,
+     -1102,    378,   1433,    702,   1454,  -1243,   -725,    224,
+      -610,   -455,   1413,  -1747,  -2516,   -572,  -1455,   -313,
+       231,    780,   1531,  -2475,    -34,    921,  -1650,    269,
+       818,      5,    835,   -209,   -911,   -432,  -1104,    165,
+     -1638,    -46,  -2031,   -445,   1308,   1519,  -1992,   1606,
+       956,    757,   1139,    116,    829,  -1376,    209,   -893,
+       963,   -569,   -466,   -185,  -1345,   1524,   1714,    269,
+       219,   -161,    482,  -1178,  -3621,   -831,   -668,   1871,
+      -529,   -983,    558,   -818,     81,    555,     33,   -473,
+      -187,    113,    899,   -577,  -1093,   1408,    902,   -258,
+      -111,   -648,   4340,   -780,   -651,    789,    -92,   2310,
+      -401,    669,   -213,    369,   -104,   -820,   -290,     48,
+      -917,     71,   1070,   -239,   -744,    891,     23,  -5130,
+      -761,    312,    319,    842,    280,     78,   -149,    352,
+      -594,   -361,    354,   -906,     42,  -1610,    835,    157,
+      -631,   1100,   -297,   1081,    -96,    484,   -825,  -2132,
+       549,   1305,    128,   -314,  -1733,   -265,   1285,  -4061,
+      -348,   -136,   -940,   -507,   -232,  -1511,   -876,     78,
+      2120,    175,   2216,   1179,    497,    335,    350,    -18,
+     -1307,   -387,  -2207,    587,   3209,   -370,   1155,   1501,
+     -1687,   -796,  -1417,   -733,   -269,    801,     83,   1173,
+       718,  -2702,     19,   -315,   4501,   1025,   -365,    348,
+      -417,   -510,   -172,  -1201,   1478,    671,   1933,   1759,
+       676,    416,     30,    400,    531,    351,  -1176,  -2807,
+      1969,  -1398,   1159,   -568,    754,   -149,  -1880,   -274,
+     -1203,    -43,   1391,    383,    702,   2116,   1299,   1952,
+       646,   -719,   1735,   -986,    100,   -956,   1040,   2287,
+     -1606,    612,   1760,    733,  -2453,    531,    -14,     -1,
+     -3214,  -1993,    371,    227,     45,   2011,   -531,   1089,
+     -1029,    282,  -2426,   -525,    989,   -469,    285,   1787,
+       927,   -335,   1127,   -305,   1143,   -412,  -1626,   1759,
+     -2567,    -82,   1170,  -3051,   1266,   1522,   -124,  -1935,
+       552,   1122,    -51,    347,   -674,   -360,   1183,    223,
+      3015,    955,   -826,   1108,   2325,    868,   1152,   1079,
+       223,    217,   -428,    382,    642,  -2849,   -767,    -70,
+       407,    147,   -392,   -407,    -55,   -508,   1785,   -683,
+      -885,    851,   3879,    471,   -674,   -231,   1493,   1621,
+     -1698,    528,    623,    300,   1367,   -588,    816,    -24,
+       600,   -182,   -841,    854,    370,    715,    116,    714,
+     -1308,   1435,   1802,  -2627,   -814,    363,   -318,    -73,
+       850,  -1744,   2509,   -303,   1077,    660,   2145,   2130,
+      -730,    -88,   -115,   -517,   -154,    160,   -337,     27,
+      1502,    509,    -70,    502,    820,   -309,  -3740,  -1294,
+      -610,    241,   -662,   -524,   1319,    456,    926,    958,
+      -111,  -1004,   1795,   -604,   1086,    462,   -127,   -125,
+       264,  -1093,   1427,    334,    838,   1979,   -576,   3052,
+     -3590,   1607,    356,    728,   1619,   -400,    279,    570,
+      -434,    777,  -1448,   -888,    156,   -277,  -1529,   1122,
+      2235,   -794,   3417,   -830,    -82,   -664,  -1837,    946,
+      -370,   1434,    -50,    742,  -2368,   1438,   1264,   1172,
+     -1338,   -108,   -226,   -958,  -2130,     -2,    917,    896,
+      1563,   2181,   2684,   2343,    237,   -407,  -2685,   1447,
+      1028,   -728,    109,   -620,    478,     46,   -542,   -789,
+      -879,   -438,   1244,   1075,  -1730,    119,   -694,    137,
+};
+
+static const int16_t cb1110sm0[] = {
+       916,   -269,    -44,    343,    623,  -2512,   -171,  -1904,
+      1001,   2776,    226,   1487,    705,    763,   -616,    288,
+      -212,   -535,   3080,   -352,   -367,    512,   -673,    620,
+      -874,    769,   -956,    460,   -601,  -2793,   -102,   -765,
+      -431,  -1369,    149,    481,    -49,    109,   -412,    670,
+      -615,    287,    150,    321,  -3293,   -237,  -1627,    188,
+      1867,   1481,    353,   -134,   2706,    147,     74,    -77,
+      -148,   -224,    196,    -60,    179,    125,    -13,   1011,
+      -189,   -172,    658,   4441,   -540,    531,    239,   -329,
+      2782,    392,     97,   -660,   3488,    -78,   1308,   -574,
+      -903,   -170,   -279,    173,    -70,    601,   -385,    123,
+      -423,   -512,   -193,   -233,    106,    175,    210,    185,
+       489,   -236,    153,   -670,     25,     61,   -196,    213,
+        67,    339,   5443,    116,   -647,    149,   -130,    197,
+       -11,    305,   2669,   1212,    298,     84,    219,    -26,
+      2661,    650,   1348,    -65,    574,  -1482,   -268,    -30,
+       626,    328,    279,   -245,     87,     94,   -202,      2,
+       366,   -505,   -592,      2,   5666,    384,     22,    227,
+       208,  -1221,     78,    155,    260,  -1111,    165,    396,
+      -678,   -739,   2503,  -2395,   2025,   1424,   -343,   -759,
+      -837,    101,     55,    274,   -481,     22,   -568,   1044,
+      -271,   -124,   -609,   -833,   -206,     53,   -591,   1150,
+     -1950,  -2875,   1949,     59,   -334,  -3230,    176,   1133,
+      -372,   2937,   -803,   -663,    631,   -659,    -32,    -82,
+       851,    113,    -60,   -625,    556,    177,    112,   -753,
+       -33,    313,    -33,   -208,   -177,  -5496,     55,   -533,
+      -815,    123,   -755,   -215,    638,    223,   -156,   -917,
+      -166,    -33,    504,    704,  -3001,    124,   -153,  -1809,
+      -977,   -717,   1718,    476,    212,   1661,    953,  -1422,
+     -1014,    -94,   -524,  -2562,   -267,    371,    104,    -63,
+      -546,    262,    193,  -1714,    261,   1867,    738,  -1878,
+       400,   1754,   -445,   -405,   -841,   -439,    709,     44,
+       675,    248,    640,   -138,   1217,    393,  -1402,    653,
+      3110,   -938,  -2491,   -688,   1214,   -649,  -1356,   2506,
+       203,    172,    679,   1003,    772,  -3010,     82,   -998,
+      1011,   -980,    -28,   -138,   -430,    614,    427,   -341,
+       201,  -8082,   -118,    224,  -1167,    195,   -920,   -352,
+      -657,      5,     46,    -39,    -72,    698,   -136,    -40,
+       391,    287,    157,  -1197,    -60,   2808,   -123,    489,
+       152,   2318,   -805,    958,     98,  -1496,   -835,   -846,
+       589,    455,   -868,    245,    -10,  -5047,     12,    -50,
+      1277,    -95,    456,    -49,    570,    608,   -658,   -352,
+      -277,   -268,    214,    388,   1865,      2,   3033,   -269,
+       259,    -75,  -3437,    800,   -190,    668,   -263,   -111,
+       229,    -43,   -139,    659,   -290,    782,    -18,   -854,
+       271,  -2223,     30,   -162,     71,     47,    756,  -1269,
+       336,    863,  -1998,    -16,   1172,    236,    929,   -477,
+     -2446,    -92,   -425,   -193,  -8192,    321,   -102,     85,
+       -85,    108,    318,    149,    -27,   -182,     69,   -237,
+        35,    451,   -263,   -890,   -348,   -295,     64,    410,
+      6427,    569,    604,    543,     38,     31,    -15,    148,
+       249,    -83,    -67,    457,    -76,   -560,    694,   -797,
+       190,   -113,   2006,    136,   1705,   -428,   3549,   -550,
+        70,     -3,   -147,   -288,   1142,   -919,    493,  -1305,
+      -460,   -151,    831,    623,   -768,   -211,     31,   -296,
+       167,  -2721,    -16,   -654,    243,   2555,   -311,   1845,
+      -531,   -576,    143,   -574,    490,  -1089,  -2302,   1080,
+       701,    472,   2782,    320,  -1455,   -632,   -218,    281,
+     -1492,   -661,  -1379,   -538,   -236,  -1928,   -502,   -565,
+      -480,    525,    -81,     38,    263,      3,    366,    163,
+     -3140,    882,    189,   1123,    382,  -1748,  -1210,    371,
+      -602,    696,   -413,   -207,    358,   -616,   4725,   -473,
+      -784,    249,    621,    764,   -265,  -1004,   -570,    339,
+      -643,   -123,    302,    284,      1,   -159,   -321,    250,
+      -297,    -43,  -3512,  -1064,   -493,    556,  -1184,   -263,
+      1314,   2028,   1074,      9,   2941,   -998,   -271,    966,
+      -754,  -2589,     88,    741,   -307,    134,    152,    -86,
+       311,    904,   -917,   1199,  -5090,    118,    181,   -311,
+      -412,    475,   -647,   -717,   -637,   -221,   -291,   -469,
+        77,    946,  -1196,   -119,   -175,    530,   -465,    383,
+     -1253,    589,    826,    835,  -3578,   -319,    -80,    488,
+      -238,   -497,    360,    839,   1870,    762,  -1669,   -769,
+       429,    778,  -3121,   -325,    -55,   -128,   2606,   -874,
+      1043,   -902,   1746,   -725,    115,    167,    142,    604,
+      -101,   -725,    -11,   -458,    -27,    450,    293,      2,
+      -383,     23,    172,  -6725,    400,   -205,    165,     45,
+       -38,     86,    372,    354,    -68,    390,   2444,    521,
+         4,  -3586,    357,    129,    665,   -328,    524,    113,
+      -446,   -514,   1132,    289,   -560,    239,    167,   -349,
+      -724,    101,  -3165,  -3139,   -163,   -147,    865,   -617,
+         0,   -789,    797,  -1026,    432,    359,   -460,   -105,
+      1119,    486,   -233,   -360,   -175,   -349,    837,    469,
+      -250,   -521,  -4470,   -108,   1009,   -575,    283,     22,
+      -555,   -682,   -234,   -249,    -33,   -106,    521,    515,
+      -283,    -78,    101,   -135,   -648,    506,    181,    392,
+      -517,   5405,    442,   -106,  -8168,     51,   -310,   -813,
+        49,   -314,    586,   -479,    376,    113,    337,   -151,
+       245,    270,     -1,    619,   -312,    -37,   -215,   -482,
+     -3055,  -3261,   -346,   -493,   -357,    306,   -160,    -21,
+       258,    872,   -577,   -141,     18,    -84,    693,    151,
+       218,   -533,    -37,    540,     61,     40,   3150,    157,
+     -2549,   -324,    267,   -456,  -1236,    798,    517,   -224,
+      -196,    587,   -495,     18,    258,   3147,    -15,   -568,
+       957,   -444,    637,   -354,    828,   1182,   -769,   -137,
+     -2130,    408,  -1667,    252,    282,    201,    239,    154,
+       125,  -7882,   -332,    198,    -47,    265,   -289,    358,
+        -4,    103,   -795,    207,     82,    229,    429,    361,
+       263,   -409,   -451,  -1036,  -3419,    899,   -568,  -1480,
+       898,    284,    -53,    179,    975,  -1283,    759,   -150,
+      3244,    408,   2579,   -418,   -117,    226,    583,    210,
+       -62,  -1513,   -148,   -820,   1073,   1290,   -263,   -454,
+       653,    555,    286,    218,   -105,   -135,    231,   -892,
+      -284,   2513,   2715,  -1530,   -165,  -1419,   -223,    -66,
+       525,   1556,    -18,   -664,    -19,    856,    179,    535,
+      -339,   -245,    498,    193,    235,    328,   -491,    231,
+     -5629,     65,    -85,    313,   -395,      6,    344,    267,
+       672,   -991,    178,  -1335,    -64,      9,  -1508,    -69,
+        57,   -310,  -1793,   -850,  -3669,    427,    -79,   -720,
+       219,    366,    131,    523,    141,  -1055,    -66,     13,
+      -843,    -55,   -794,    661,    112,   -407,   -496,    550,
+       931,  -3938,   1780,   -509,   -543,   -157,   -270,  -1015,
+       564,   -231,   -854,  -3372,   -327,    869,   -196,   -981,
+      -205,   -215,    605,    746,  -2188,   2250,     74,  -2979,
+      -242,    832,   -190,    365,  -1327,    453,     95,     76,
+       158,   -683,    628,    297,   -867,   -542,   -143,   -568,
+      -414,   6018,    -40,    -35,   -456,   -632,   -779,   -226,
+      -442,   -295,    310,   -766,    578,   -197,     84,   -961,
+     -3346,   -106,   3266,     -3,   -477,     -8,    652,    122,
+      -606,     49,     34,    686,    385,   -258,    214,   -572,
+       -72,   -193,    124,    440,     48,     45,     75,      9,
+     -7724,    200,   -364,    578,    318,   -461,     84,   -233,
+        46,   -404,    185,    470,  -3387,  -3397,    374,   -519,
+      -320,   -378,     27,    921,   -280,    188,   -245,    -69,
+      -322,    504,    -72,    460,    -80,    -35,   -220,  -3098,
+     -3678,    477,    248,   -801,    580,    187,    468,   -636,
+      -364,   -432,    183,    -82,    -79,    266,   -787,   -740,
+       552,    228,    238,    482,  -2229,    275,    149,   -360,
+      -350,   2774,    871,   -118,     55,   -961,   -165,   2429,
+       982,    313,   -502,   3094,   -431,   3485,    473,   -347,
+       171,    544,    253,   -324,    -50,    464,    116,    650,
+      1102,    495,    420,   -404,     -1,  -2991,   4055,    207,
+       374,   -187,   -121,    130,   -451,   -953,    822,    526,
+       287,    120,   -979,    376,    594,    -79,   -130,   -362,
+      -979,    166,    693,  -4108,     84,   -135,   -195,   -703,
+     -1506,  -1098,   -611,    870,    935,   -156,    974,    286,
+       -86,     83,   2975,   -681,   3218,   -286,   -452,    -70,
+      -113,   -395,    137,  -1295,   -503,    853,    297,   -352,
+     -1004,   -117,    476,   -431,  -2848,     -7,   3601,    402,
+      -534,    312,     86,   1524,   -358,   -164,    -43,    913,
+      1003,    239,   -364,    -88,   -468,   -672,    220,   -211,
+      -326,   -431,    438,   -297,    380,    125,   -146,   4550,
+      -271,   -831,    768,  -1360,    -45,    266,   -278,   -246,
+       625,   -132,    153,    514,    115,  -1311,    707,   -361,
+      -601,  -3224,    376,  -2107,   -259,  -1155,    426,   -646,
+};
+
+static const int16_t cb1110sm1[] = {
+       360,   3106,   -518,    185,   -906,   3245,    508,    -91,
+       938,  -1270,   -492,     36,    168,   -997,   -208,    991,
+        99,   1553,   -294,    204,    -22,   -108,  -2405,   2893,
+        49,     72,   -490,   -529,   -218,   1343,   -786,    903,
+       411,    207,    131,   -636,   -129,   -134,    621,   -253,
+       319,    135,   -234,    -75,   -293,     46,    207,   5985,
+       280,    -86,    -78,    690,    984,   -770,   -565,   -226,
+      -242,    374,     26,   -696,     81,   -277,     -9,    639,
+      -730,    250,   -232,   -488,   -284,    460,   -398,   4336,
+      -303,   -266,    546,   -292,   2936,     70,   2077,    373,
+      -141,    292,   2102,    340,   -312,   -523,   -341,   1017,
+       457,    224,    315,    271,   1080,    152,    192,    568,
+      1014,    155,     85,    329,  -5235,    137,   -503,    141,
+       275,     -7,    752,    282,   -267,    321,   -735,    746,
+       489,    450,    478,    432,   -152,    451,  -1192,   1267,
+      -341,   1136,    100,  -3538,  -1551,   1547,   -551,    294,
+      -473,   -821,    -51,    718,   -655,    -11,   2817,    -26,
+        73,   -459,  -1569,    181,    516,   -151,   2846,   -112,
+       186,    714,   -228,   -210,   -451,    920,    -99,   -132,
+     -2662,    589,   3040,    376,    662,   -834,    782,    542,
+      1485,    538,   3531,    107,     47,     62,    398,    -11,
+       -15,   -733,    471,   -231,    668,   -212,     38,   -536,
+     -1905,   2769,   -149,   1623,  -3418,    237,     55,   -328,
+      -770,    335,   2755,    340,     62,   -466,    267,   -946,
+       427,    266,     80,   1134,     34,    949,    366,   -339,
+      -112,      3,   -105,    442,   5117,    545,    -93,    611,
+      -186,    566,    -39,   -172,    -59,  -1120,    388,    703,
+       619,   -359,   -117,    -68,    569,    148,   -214,   -245,
+       281,    617,  -2337,    -88,   -255,    124,   3292,    443,
+       434,    -17,  -1157,   3090,   -205,   -245,   -983,    250,
+     -1086,    643,   1392,    831,    733,    -59,  -1199,   1747,
+      -415,   1073,    279,    428,   -512,  -3392,      0,     -6,
+       526,    275,    -79,    477,    411,     85,   1485,    795,
+      -209,    495,  -2628,    367,  -1734,    900,    301,    239,
+       -53,  -2068,    403,   1333,  -1304,   -566,  -1420,   -771,
+     -2300,    -15,    842,    342,  -2373,     61,  -1379,    303,
+       733,   -108,   -316,     94,   -477,   -254,   -211,    807,
+       273,   -792,    159,    -66,   -857,   1092,  -1001,    -69,
+     -3770,    999,   2418,    854,    173,   2281,   -681,    485,
+       578,    145,  -1245,    845,   -375,    219,   -259,    374,
+       751,    226,  -1347,   -825,     66,    319,   -173,    191,
+       445,    284,     62,  -8150,    -71,     53,    637,    -96,
+       227,     75,     73,    -88,    654,    -24,   -466,    477,
+       671,   -125,   -942,    104,    248,   -151,   -383,     11,
+       322,    332,   4160,    108,   -301,    463,   -402,    352,
+     -1799,    580,   1443,    396,    287,   -158,   -421,    340,
+      -349,    109,     61,     47,  -2816,   -298,   -947,   -817,
+       673,    189,     36,   4069,   -584,   -335,   2608,     10,
+      -378,   -630,   -801,    228,    946,   -405,  -1186,    473,
+       625,     -2,   -741,    523,   3747,    318,    733,    171,
+       268,  -2554,    402,   -252,   -205,    292,   -351,     64,
+       289,    801,    989,    435,   -100,   -163,  -1215,   -467,
+       661,   -714,    165,   -228,   -637,   1357,   -498,    -52,
+       488,  -3882,    130,  -1053,    796,   1040,    381,   -729,
+       147,    803,    169,     46,   -157,    167,   -209,    126,
+     -1016,     88,  -1018,   -458,   -527,   1259,    621,   3847,
+      -525,   1247,     18,    253,    642,    340,   -705,    838,
+     -2769,   -672,    153,    115,    453,    773,      9,  -2285,
+      -291,      6,   -219,    628,    284,   -330,    568,   -240,
+      -206,   -127,    273,    373,    367,   -494,   8192,   -595,
+      -255,   -158,   -326,    -60,    513,    334,   -667,   -549,
+      -110,      2,    573,   1086,   -610,   -368,    259,  -3611,
+      -455,   1577,   -524,     11,    904,    390,    313,    707,
+      2670,   -223,   2710,    593,    -25,    228,    540,    663,
+       740,  -1108,    298,   1223,   -531,  -1978,    248,   -661,
+      -341,   -910,  -2434,    111,    217,    748,    231,   -305,
+      -419,   1873,   1094,   -936,  -1741,   1133,   1881,   -671,
+        41,    268,  -1826,    466,    135,     37,   -200,   4623,
+     -1212,   -969,    541,   1278,    652,   1061,   -759,   -747,
+      -427,   -107,  -1329,   -583,   -255,    -67,   -311,    -10,
+      -421,  -8192,    322,   -181,   -442,     76,    176,   -742,
+      -175,    147,    385,   -275,    -87,   -704,   -545,   -315,
+      -414,    569,     81,   -387,    628,   2954,   -604,  -1459,
+       -29,   1693,    840,  -1024,    -66,   -317,    266,  -2465,
+      -917,    -14,    151,   -369,    366,  -2388,      1,   -773,
+      1333,    -99,    223,   -694,  -1169,    917,  -2496,  -1290,
+      -286,  -1007,   -508,    734,    451,   -256,    266,   -105,
+      -143,    439,   -120,   -146,   7690,   -183,    188,     68,
+      -385,      7,   -278,    -24,    -66,    292,    137,    143,
+        21,   -495,   -527,   -284,     89,  -1584,    -64,  -3664,
+       286,  -2258,     80,   -932,   -771,   -338,   -830,  -1029,
+       -99,    -32,   -800,    351,    -87,    600,    -93,    133,
+       389,   -690,    269,    201,   -328,   5489,    558,   -702,
+      -487,    210,   3107,  -3628,    -96,   -388,   -169,   -221,
+       339,    403,   -816,    -24,    469,   -112,    560,    844,
+      -441,    698,    169,   -378,   -283,   -924,   2842,   -479,
+      -694,   -117,    -94,    523,    974,   1356,   -638,    590,
+       820,   2164,    247,   -532,    648,   -243,   -599,    -67,
+      5686,    174,     78,   -608,    230,   -172,    369,    342,
+      -113,    111,   -345,   -311,    594,    350,   -260,  -1423,
+      -425,   -407,  -1017,   -298,   -180,   -738,   -891,     66,
+     -3312,  -1157,      1,    811,  -1431,    612,    797,  -1344,
+      -890,   -959,    318,    392,   -190,    735,    196,   -347,
+        61,   -116,    344,    243,   -411,   -446,     62,   -128,
+     -3386,    476,   2695,   -193,    -39,   1960,     -7,    909,
+      -118,  -2275,    -28,   -997,   -210,    374,   -586,    -82,
+       914,    323,    -73,  -2743,    858,    -65,     43,  -2444,
+      -246,    145,     78,   -638,    844,  -2079,    352,   -332,
+       615,   -779,    270,   1799,    680,    500,    686,   1168,
+      -397,  -2233,    -31,   -163,    -18,    602,   -232,   -915,
+      -941,   3708,   -337,   -559,    315,   -401,     42,     26,
+       316,   -100,   -191,     36,    206,    214,  -3336,   -407,
+       494,    749,   -491,   -162,    -55,  -2902,  -1515,   -198,
+      -311,   -359,    439,    359,   -935,    203,   -214,  -2401,
+      -607,  -2843,    818,   -579,  -2066,    388,   -514,   -912,
+       787,    564,    149,   -103,   -757,    389,    173,   -303,
+       154,    814,   1631,   -393,  -2264,   1664,   -802,    904,
+       541,    784,   1063,   1152,  -2510,    297,     84,   -154,
+       160,   -497,    -78,   1503,   -598,   -543,     86,   1683,
+      -330,     46,    -24,   -892,    747,  -3336,   -393,  -2268,
+       107,    710,   1682,   -277,   -278,   -276,   1253,    327,
+      -986,    802,    191,   -732,    286,   -761,   1008,    461,
+      1615,  -1041,   2127,   2456,   3927,   -160,    187,     31,
+      -101,   3258,    202,    -75,    330,    375,   -301,   -275,
+      -782,    949,     12,   -621,   -617,    572,   1007,    414,
+       -91,   -428,   -392,   -985,   -692,  -3422,    199,    845,
+        91,    418,    290,   -983,    721,  -1265,    208,   1200,
+        91,   -758,  -2649,   -451,   -814,   -623,   -458,    272,
+      2777,    809,   1282,    763,   1122,     21,    520,     50,
+     -1018,    428,    385,   6149,   -255,      8,    -12,     21,
+        20,    293,   -315,   -446,   -423,    549,    428,    -56,
+      -497,    101,    653,   -177,  -3975,     56,   -127,   3214,
+       291,   -384,   -721,    478,   -314,   -231,   -469,   -362,
+      -682,    765,   -308,    420,    456,    322,    -54,     -2,
+        10,   -239,   6916,   -461,   -482,   -211,   -286,   -110,
+      -877,   -711,   -470,    159,    260,     59,    252,    -97,
+     -2978,   -646,    -35,    156,   -123,    360,    556,  -3254,
+      -475,   -313,   -268,  -1771,   -538,    203,    967,    283,
+      -653,   -565,    387,  -3097,   -255,     25,    295,    264,
+     -3716,    505,   1024,   -315,   -215,   -222,   -780,    660,
+       431,   -341,   -521,     46,    127,   -244,   -772,  -3741,
+       190,   -335,    -17,   2135,    744,    -35,    627,  -1115,
+       681,   -343,    123,  -1534,    -86,   -542,   -297,    -82,
+     -2772,   3914,    -75,    526,    124,   -523,   -112,    500,
+       863,    371,    190,   1036,    141,  -1011,    373,    796,
+       421,   -682,    403,   2924,   3730,      6,    211,   -691,
+      -167,   -391,   -655,    162,    348,    216,   -227,   -535,
+      -147,    367,   -189,    331,   -191,    159,     49,  -4905,
+      -252,   -290,    609,   -452,   1042,   1027,   -645,   -159,
+      -633,   -542,   -925,   -262,    -91,    192,   1266,     -2,
+      -164,    587,    188,   3434,  -1014,      2,   1373,   1832,
+     -1224,   -965,    831,   -987,   1180,   1389,   -925,     48,
+     -3239,    263,   -329,   -660,   -733,    262,   -988,    598,
+     -2421,    630,    720,   -925,   -455,    208,   1092,   -294,
+};
+
 static const int16_t cb1616l0[] = {
        -15,  -7707,    115,     30,    -36,    -27,    -22,    -43,
          2,      5,     31,     -1,     87,      2,     41,     21,
@@ -1625,6 +5553,2220 @@
       -275,    100,      0,   2484,   -482,   -128,   -144,   -206,
 };
 
+static const int16_t cb1616sl0[] = {
+       -46,  -5073,    119,    -68,      8,   -160,    201,    -15,
+        55,     44,     44,   -197,   -110,    -83,    -90,    -66,
+       -29,   -128,   2449,   -182,   2226,    298,    -69,    189,
+      -167,    199,    -78,     60,   -154,   -169,   -242,    189,
+       214,    132,    -41,    169,    222,   -130,    209,     20,
+      -154,   -327,  -3458,    186,   1356,    672,    133,    100,
+       375,   -491,    -52,    -87,    153,    537,   2513,   -349,
+        47,    -27,    118,   -301,    250,     45,    191,   -150,
+       279,   2367,    -70,    191,   -301,   -206,     -5,    -40,
+      -201,   3680,    -67,     36,   -341,   -133,   -197,   -383,
+      -101,     21,    -68,  -1240,     69,     -8,     -7,    -16,
+        28,    -47,   -145,   -169,     32,    170,    246,    149,
+      3039,  -2617,    -42,    -95,    184,    -74,     71,    -56,
+       -22,    -85,   -203,    129,     97,   -105,    -91,   -304,
+         4,     93,     89,   2724,   2809,   -178,     52,   -155,
+      -152,    149,     47,    182,    124,    -75,     24,    256,
+       -38,     53,   -135,     63,     70,     59,    -59,      7,
+         6,     46,   8192,   -157,    142,     81,    121,    136,
+       -87,   -147,    -71,     59,     57,    119,     21,  -1938,
+        46,    186,    100,   -158,    -52,     34,     95,     22,
+        20,    179,    112,    116,    234,   2551,  -3012,   -167,
+       -93,   -379,    -90,     24,    208,    257,    253,     23,
+     -1361,    209,     75,    191,    -23,   -115,   2024,    264,
+        77,   -159,     77,   -219,   -237,   -154,     13,    273,
+     -3338,    122,   -205,   3796,    -96,    103,   -136,    -60,
+       115,    -81,     19,     69,    396,    225,   -280,     86,
+       329,    284,    505,    403,    -37,    203,    310,  -2587,
+     -2374,   -241,    -17,    492,    -42,    -32,    261,    112,
+       123,    -33,  -1271,   -112,    -41,     12,     82,     67,
+       -71,     56,    -10,    -83,    -28,     15,    -12,     42,
+      2292,    297,   -235,     -3,    528,    -57,    159,   -185,
+       -54,    -84,   -152,    775,     15,     54,    451,   -294,
+        53,     -2,    141,     39,    -65,     75,    149,  -5460,
+        17,    -58,   -126,   -281,    264,    151,    362,    -98,
+        62,  -2361,  -2560,    173,     42,   -290,   -161,    -96,
+       -52,     82,    130,    -86,   -150,     48,     20,    -57,
+        52,  -2263,    -96,   2662,    -66,     21,     74,    -37,
+        22,    323,     64,    270,   -141,   -599,   -300,   -121,
+       -12,   -128,    -96,     -3,   -129,  -4339,   -293,    -55,
+        31,    -82,      8,     82,    -20,     58,     15,   -238,
+       140,   -125,    -98,   7632,    -14,     96,   -129,    -12,
+       -39,     85,      0,   -104,   -225,     24,      3,     95,
+       -87,    115,    168,     19,     22,     95,   8056,     36,
+       -12,    106,    -99,    -15,    -87,    112,   -122,     55,
+        14,    282,    -31,     80,     42,     -4,     81,    -73,
+        74,    -10,     82,     35,    173,    -20,    -40,  -8192,
+       -35,   -386,    270,    263,   -231,   -142,     42,   -445,
+       204,    177,   -330,   -859,    715,   2731,     59,   2578,
+       220,   -478,      3,    410,    -47,     61,   -214,   2765,
+      -206,    174,     56,    427,    442,    118,   2708,    -66,
+       -40,     41,    119,    -65,    -71,    -21,    124,    106,
+       -18,  -2586,    -35,    106,   -364,    286,    -16,   -178,
+      -146,    -82,    157,     92,     -4,   -437,   -131,    -85,
+       -27,    -90,     23,    -58,  -5332,    115,    -69,    -25,
+       -14,     13,     52,     14,   -286,    -13,    -60,     16,
+        19,     53,     35,      7,    -21,      7,    231,     48,
+      2495,    -82,   2836,     44,   -134,    -76,     33,   -394,
+        47,   -124,   -175,     95,    103,    161,     57,    -37,
+       174,   -499,    131,   -394,   2007,  -2596,   -481,    294,
+       152,    601,    144,   -438,    109,   -204,    317,     37,
+       362,   -153,    216,    269,    -39,   1250,    505,    505,
+      2571,   -115,   -595,   -806,   -998,   1226,    -71,     26,
+       -67,    262,     51,   -161,    183,   1622,    -32,    233,
+         3,   -217,     19,    -16,    209,     51,     40,    -40,
+       -43,    -27,  -7227,     13,   -128,    -18,     82,    154,
+       133,   -121,     33,    -66,      8,   -102,     71,      8,
+      2780,    -43,     79,   3212,   -282,   -165,    125,     78,
+      -101,    -59,     59,   -136,    308,    -61,   -295,   -241,
+       -29,     27,   -326,   2932,   -563,    308,   -269,    -34,
+      -158,    -26,    -64,   -411,    -75,    420,   -294,   -239,
+       -11,    429,     44,     36,     69,   -200,    -56,    279,
+        80,   -218,   -294,   -294,    252,     64,   7793,      7,
+      -155,    -56,  -3118,  -2749,   -178,     62,    441,    105,
+       -45,     23,     23,   -101,   -109,    -26,   -149,    566,
+       -29,   -394,   -850,   1699,   1986,    243,   -665,    565,
+       155,  -1746,     96,   -344,   -651,    387,   -363,    283,
+       241,    101,     71,    -18,     -9,     43,    114,    -22,
+         9,   -109,   -119,    -92,    117,   8192,    -67,     87,
+       174,    -42,   -195,    527,   -155,   -195,   -167,  -1619,
+      2638,   -824,    121,     44,    138,   -808,    407,    584,
+      -217,    -90,   -278,    549,   -118,  -1278,    837,    220,
+       142,   -956,   -294,     89,   2627,    269,   -129,    253,
+        10,     15,    167,    163,     87,   -262,     89,     48,
+        14,     24,   2967,   -175,   2550,     51,     11,   -152,
+      -111,    230,   -267,    -79,    321,   -641,    507,    -32,
+       -20,   -238,     23,   -322,  -2506,    173,   2205,    -91,
+       -21,  -1594,    420,   -157,     97,     64,    126,    -38,
+       -84,     10,    -85,     93,    -21,    272,   -427,     30,
+       -60,     61,    -81,    -40,     27,     18,    -29,   -208,
+       -70,  -8192,     16,     15,     53,     34,     49,    -26,
+     -2512,   -152,     23,    -77,   3015,     87,   -164,    247,
+       119,     91,    444,    -43,   -166,    -26,    253,    -93,
+        50,    408,  -3274,    913,    104,    119,     17,    -54,
+        42,     19,   -294,   -298,   -416,    -82,     38,   -263,
+       137,    132,  -2609,    -44,   2783,    -34,     -9,    266,
+         8,     18,   -183,    520,    515,    -93,   -159,    -21,
+       186,     27,    -89,    137,     77,    -60,    -33,     34,
+     -5115,    -44,   -172,   -122,     -9,   -104,     69,     16,
+        94,   2813,   -200,   -142,    -50,    375,   3276,   -272,
+       -44,     47,    -41,   -188,    263,   -237,    -24,    312,
+       120,   -326,    823,    193,    410,    -95,    356,    565,
+       296,   1202,  -2737,   -968,     87,   -204,  -1329,   -826,
+      -827,    584,    194,    -31,    -12,   -109,    -39,     -7,
+        73,     29,     24,    -12,    256,    -98,    -46,     63,
+       207,     -8,     73,   -342,   4578,    -37,     60,    -66,
+         8,    -39,   -176,   -125,    -34,     57,   -141,    -52,
+       -39,   -128,    -50,   -143,    -85,   -107,     19,    -38,
+        74,    -40,   -161,    -54,    -63,  -3452,    176,    116,
+      5274,     19,    -42,    198,      3,     33,     80,    -99,
+      -111,     11,    -90,     97,     -6,     -3,    -52,    301,
+      2335,    148,   -171,    -88,     44,   -404,    124,      4,
+       -80,    189,   2838,     62,   -247,    394,   -230,    -91,
+        92,  -2587,     84,   -139,    -31,   3014,     25,    201,
+      -137,    -64,    383,      2,    -70,   -115,   -210,     43,
+     -1111,   -403,   -379,     -9,    243,     77,   -220,    -60,
+       -38,    -15,      7,    109,     41,    143,     56,   -211,
+     -2492,    -48,   -218,   -115,   -321,   -358,    388,    -10,
+      -172,    -52,    177,   2996,    -96,    480,    -23,    -15,
+       177,   -225,    217,     10,    367,    129,    -45,   -114,
+        23,    257,    -48,   2497,    236,     12,    197,    245,
+        19,   -173,   -321,    310,    406,   -280,    -72,   -279,
+        73,   3307,    245,     78,   -186,   2928,    264,    263,
+      -227,     50,    172,     91,    293,     24,   -148,   -245,
+       -61,    219,    -88,    169,    220,    -99,   3222,      3,
+         0,    103,     19,    116,     69,   -180,     -7,    -49,
+        26,    -59,    -93,    -68,    123,    357,    241,  -3308,
+      -297,    198,     40,    -80,    285,    161,     90,    -46,
+      -165,    -32,     87,  -5676,    254,    -37,      7,    -20,
+};
+
+static const int16_t cb1616sl1[] = {
+        73,     78,    -64,     76,     17,   6250,     -4,   -167,
+        52,      4,     -3,     11,   -189,    -19,   -136,   -220,
+        15,      6,   -420,  -2205,     38,  -2944,     16,    118,
+      -116,     61,    119,   -390,    217,    548,     24,    161,
+       -24,  -2342,   -148,   -159,  -2783,    225,    401,   -226,
+       210,    643,   -366,    240,    264,    167,    115,    827,
+       -39,   -161,     30,   -173,     42,     29,     98,    377,
+       -58,   -163,    -41,     27,     25,   4368,     87,  -2836,
+      -175,    -71,    -62,    -84,   -476,      4,   2466,    113,
+     -2830,   -916,    593,    276,   -356,   -427,   -686,   -215,
+      2752,    395,     -9,   -345,    117,   -122,   -327,     92,
+       107,   -106,     32,    270,    271,    171,   3138,    198,
+       -46,    -70,     46,    502,     91,     77,    -19,    216,
+        94,    122,    -64,   -392,    -31,  -2696,   -364,   -131,
+      -315,    129,   -461,    229,    192,    236,    185,   -263,
+      -173,     44,     24,   -267,    -40,   -177,   -149,  -2471,
+        26,    113,   -183,  -1693,   -188,     48,     22,    -73,
+        50,   -133,     58,    -70,   -173,   -308,   -442,   -188,
+        92,    389,    -35,    167,    235,     66,   2593,   2435,
+       244,    630,    -22,    235,    112,    -32,    533,   -158,
+        81,     71,     44,    -59,   -158,    -23,     28,   8192,
+       -58,   -181,     39,    220,    -54,   -124,    -59,   -277,
+        71,     41,    -82,   -157,  -6860,     -4,     44,    -84,
+       -48,    134,   -193,    159,    -45,    218,    -47,   -133,
+       147,   1749,    765,    -84,    184,   -317,   -286,    -17,
+      -340,   -262,   -244,    -21,   3122,    290,   -127,   -119,
+       179,   -128,   -125,   -439,   2766,   1917,     85,     57,
+       -32,    373,    -16,    170,    -74,     31,    425,    626,
+         1,   -511,     64,    387,    142,   -621,    183,   -224,
+       220,   1195,    386,  -3360,    332,    484,  -1112,    -96,
+       187,     43,   1838,     39,    -36,     13,   -132,     -8,
+        -1,    -43,     29,   -132,    -19,     10,     10,   -218,
+     -3659,    119,   -103,    -27,    -29,   -108,     13,    181,
+        39,   -117,     92,     37,    -17,   -198,    330,    538,
+        17,    113,   4758,      1,     28,    -10,     87,     22,
+        96,    -14,    -99,    -56,   -130,      0,    -55,     45,
+       -63,  -2845,   2751,    464,    -31,    -62,     76,   -154,
+        88,     81,    125,    373,   -348,    587,   -314,   -278,
+       -53,   2039,   -516,   2437,    191,   -212,     87,     -2,
+       181,   -242,    117,     23,    -63,    334,    145,    454,
+       343,   -235,     91,     69,     -8,      2,   -106,   -108,
+        -5,    137,   -168,  -7818,   -231,     25,     37,     75,
+      -138,     56,    142,   -596,    130,   -114,   3293,   -366,
+       290,    160,     -2,   -219,     83,    843,    -18,   1289,
+      -177,    226,    667,    252,   -683,    816,     26,    157,
+       168,   -487,    -49,  -3282,    432,    184,   1207,     23,
+       164,    544,    965,     -1,     61,   -118,     92,   1359,
+        89,  -3234,     15,    496,    244,    177,   -613,   -160,
+       -23,   -195,   -111,   -372,   -115,    278,     96,     77,
+     -2567,     49,   -423,   -468,     13,   -484,   1345,   -298,
+       194,   -123,   -248,   -139,    738,    102,   1154,   -335,
+      2694,   1326,    213,    758,     17,    154,    609,   -518,
+      -367,    201,   -144,     61,     66,   2288,     50,   2688,
+       -87,     45,    -13,   -101,    127,   -190,    -40,   -286,
+         6,    121,     32,     31,    119,    -85,     28,     93,
+      8192,    273,    169,     44,     37,    255,   -224,    219,
+       -34,   -127,   -134,    165,    169,    126,   -188,    -52,
+        98,     15,  -5820,   -193,   -331,   -395,     -1,     49,
+      -187,     55,   -121,   -196,    114,     10,    258,   -145,
+       -14,   -385,    105,   -187,     59,    383,   5322,    147,
+      -110,    -69,    378,    138,   -352,    -69,     15,   -267,
+        75,    162,     -6,   3148,    515,    231,    -74,   -436,
+      1288,   1234,   -105,     68,    -96,   -166,    -49,    -64,
+       144,    -67,    135,    258,    -71,   -162,    156,   -366,
+        -7,    -67,   -133,    -20,   -119,     71,    -84,     31,
+        26,    116,  -2237,    212,     43,    380,    -74,     13,
+        -7,    774,  -1276,   -103,   -124,    -48,   -178,   -319,
+        26,    435,   -111,    858,    295,   1601,  -2727,   -242,
+         8,     36,    -61,    -20,    -19,    -19,     31,    258,
+        21,    -14,    381,   -153,  -8192,    -99,    327,     72,
+       175,  -1181,   -271,    104,    -30,   -135,   -169,     21,
+        29,   -182,    -25,    125,    165,    -82,     73,    -26,
+      2311,    -85,  -2983,   -125,     85,   -206,   -100,   -100,
+        36,     -3,    -77,   -180,     35,      0,   -170,    123,
+       168,   -302,    366,   -334,   2936,    -70,    404,  -2870,
+        13,     79,    226,   -163,   -242,   -124,    -40,   -171,
+      -109,    189,     20,    -52,    144,  -1869,    -88,    230,
+        -8,    -27,     45,    131,    -11,   -188,     93,   -227,
+      -452,   -229,    158,    377,     -9,  -1736,     16,   3268,
+      -164,     41,    305,   -414,   -642,   -111,   -100,    118,
+      -155,   -236,    936,   -114,     51,     31,     60,   1299,
+         5,   3048,    274,    273,   -197,   -289,   -245,   -288,
+      1927,     -7,     27,    307,    174,   -243,    -95,   -134,
+        14,     24,   -119,   -132,  -2811,   -254,     35,     95,
+        22,    135,     21,   -155,    -80,   -143,    -60,     -6,
+       182,     77,     11,   -197,     -8,  -6080,     28,    155,
+        11,    -27,     22,    -48,     -8,    -50,   -122,     11,
+       -34,    342,     -1,     40,   -208,    117,    -35,    -69,
+       150,  -3944,   -425,     46,    456,    182,   -451,   -219,
+        38,     15,   -203,    766,   -232,    243,    -70,    179,
+      2107,   -222,    346,   -166,    143,    239,    245,     59,
+      -137,     17,    475,    -68,   2679,   -423,     20,   -313,
+        74,    152,    171,   -269,     68,     39,  -4743,     94,
+        -3,    110,    134,   -168,     73,    180,   -116,    276,
+       -74,   -203,      2,    -83,     17,    170,     96,    169,
+        75,  -5541,     46,     20,   -168,    -22,     35,    -74,
+       104,   -153,    264,      4,    -57,     94,   -192,    161,
+        15,      7,     45,   -186,     15,   -125,    121,  -4981,
+      -254,    179,    282,     72,    543,    -97,    363,     -5,
+       -67,   -389,    -66,    178,    427,   -276,  -2675,    447,
+        -2,   -125,   -223,   2869,   -502,    117,   2017,    -71,
+        41,      9,    124,     19,    357,   -562,     25,   -385,
+        80,    -53,   -175,   2532,    -73,  -2990,   -164,     57,
+      -128,   -254,     53,   -150,   -180,     16,    -45,    322,
+       266,  -2418,   -264,    317,    371,      5,    197,      7,
+     -2476,    -93,    152,     90,   -165,     11,   -259,    -24,
+       -55,    -16,     98,  -4904,   -116,     53,    205,    -45,
+       -57,    116,     75,    161,    -55,     97,   -292,     27,
+     -1396,    105,   -127,    133,   -265,    -33,      5,  -3622,
+        25,     -3,   -104,      8,   -283,   -229,    236,   -208,
+       145,    627,   -240,    118,    296,    108,   -309,     48,
+     -3345,    582,    498,    259,     20,    785,   -138,    421,
+        97,    370,    161,    141,  -2793,    106,   -246,   -140,
+      -172,     42,   -194,   -202,   -319,   -107,    -24,    423,
+      7293,   -109,    -13,   -242,     55,    171,     13,    -93,
+       131,   -141,     88,    132,     76,    176,     78,    153,
+       -63,    -55,   -410,    -39,      6,     27,   -223,   -174,
+        61,    645,    167,    -35,   3079,   -173,    950,      1,
+      -109,   -118,   -106,     15,  -1345,    -14,     50,    -70,
+       -69,     24,    109,    182,     84,     31,   -179,    -93,
+     -3152,  -3013,    -60,     56,    -60,     58,    166,   -161,
+        24,    129,      1,    181,    128,    -12,    273,    -43,
+     -1256,    134,    159,    -36,    175,     43,    -49,     41,
+        48,    -38,    -45,     59,    -36,    -82,     48,    -74,
+      -104,   2944,   -124,    -24,     98,    248,   -146,   -231,
+      -241,     72,   -114,    776,   -498,    242,   -357,    250,
+      -102,   7121,    109,     11,     94,    -53,     37,    -37,
+      -133,     24,   -157,     47,    -46,    -69,     62,    -79,
+};
+
+static const int16_t cb1616ss0[] = {
+      1401,    373,   -516,    330,   -711,   -752,   -475,   -224,
+       139,    492,   -556,   4629,   1039,    333,    872,   -542,
+       474,   -360,   -378,  -3459,    254,   1199,    113,   -525,
+     -1705,    231,     46,    188,    -50,  -1038,     32,   -198,
+      -109,    619,   1071,  -1601,   1002,   -411,   -189,  -3276,
+       615,   -468,   -467,   -275,  -1286,    736,    541,  -1107,
+       423,    191,    439,   -205,     17,    -87,    500,    176,
+       262,   -341,   -142,    268,   8164,     -2,    112,   -190,
+       227,    -50,   -143,   -326,    647,    601,    482,    443,
+      2761,   -497,    979,   -298,    454,  -2927,    746,   -735,
+      3921,    480,   -167,   -317,   1303,    111,    216,   -961,
+       110,   -595,    244,    246,   -222,   -205,     46,     61,
+      -798,    258,    360,  -7038,   -654,    -95,     75,    498,
+       -24,   -250,     71,    138,    527,    240,   -215,    250,
+      -408,    552,   -325,    333,   -989,   2648,   -483,  -1121,
+      2344,  -1647,   -116,   -901,    615,    327,      1,    497,
+       411,   -138,    332,    281,   -145,    337,    163,  -7379,
+        70,    265,    365,    238,    604,     99,   -149,    233,
+       109,    827,   -704,   1367,   1208,   -717,    -17,   -223,
+        15,  -3259,     53,   -485,   -631,    285,    511,     -8,
+       242,    547,    129,    145,   2046,    520,     44,   -177,
+       382,    283,   -169,   -346,  -2737,    294,  -1311,    145,
+      1873,    815,   1078,    677,  -3419,   -434,    484,    144,
+       -27,    669,    153,   -242,   -242,    814,    350,    361,
+      -462,    -63,   2317,   1259,   -373,   -489,   -534,    300,
+       867,   2621,   -117,   -168,   -414,   -239,    812,    840,
+       112,   -463,  -6286,   -693,   -830,    140,   -168,    448,
+       549,   -149,    418,   -105,    137,     31,    -40,    -43,
+       422,    -99,    297,      3,   -220,    -15,     81,     45,
+      -647,   -535,   -448,   -731,    250,  -6742,   -320,   -350,
+      -192,   1540,  -1112,  -1043,   1317,  -1203,   1035,   -506,
+       673,    721,    854,  -1487,    780,   -294,   1173,   2142,
+     -8192,   -170,   -138,    -54,    -54,   -233,   -127,    145,
+      -233,   -185,     87,     20,    530,   -305,    141,   -394,
+       310,     40,    645,    809,   4801,   -186,   -432,   -451,
+       312,   -144,    -65,     65,    135,    -64,    -15,   -357,
+     -3546,  -1299,    216,    249,    261,   -207,    117,  -3138,
+       527,     14,   -142,    286,    100,    340,    581,    157,
+       234,    739,  -2521,     -3,    639,  -1440,    131,  -3796,
+       159,     39,     41,   -659,    284,    165,   1100,   -346,
+      -481,    295,    806,   -227,   -288,   4520,    253,    487,
+      -252,     88,    -43,  -1612,     -5,    -57,    -66,     18,
+        19,    557,   -337,   1526,  -2897,    144,    844,   -404,
+      1976,    787,    246,    264,   -406,    778,   -918,     51,
+      -113,   -235,    518,    602,   -307,  -2046,   -692,   2775,
+       400,  -2165,   -184,    139,    403,  -1855,  -1317,    289,
+       710,   1124,   1888,   -517,    276,    190,    637,   -441,
+       717,    972,   -370,    478,    626,   -354,    241,  -3651,
+       145,      7,   -738,    397,    991,   -343,   -826,    142,
+       672,   2425,   -616,  -3278,    751,   -193,   -944,    -35,
+     -1061,   1258,    631,   -721,    145,   -112,    -69,    828,
+       -39,   -196,   -237,    -73,    771,   -195,    239,   -533,
+     -1673,   3477,   -559,    104,   -647,   -798,    167,   -497,
+      -559,    591,    259,    300,    -25,    422,     93,     39,
+       -63,    233,    144,  -1170,    142,   -456,     73,    411,
+      6920,   -338,   -307,    436,    143,    420,    152,     -9,
+     -1788,  -1096,  -2998,   -727,   -524,    128,    460,    782,
+      -102,   -576,   -138,   -976,   1035,  -3196,   -436,    -27,
+     -1047,  -1389,   3244,   -143,   -883,  -1012,      4,    327,
+        16,    411,   -497,   1444,    516,   1183,    252,    510,
+      -698,   -676,    569,    -70,   -397,   -227,   7829,    312,
+      -410,     20,     41,    -65,   -219,    175,    297,     40,
+     -1534,   -498,    194,    871,    409,    280,   1098,  -1471,
+     -2825,    931,   -105,   -545,   -801,   -795,   -372,     73,
+       331,    100,    488,  -2101,    560,     44,    885,   1065,
+       380,   -195,    276,    124,    -87,    193,   3979,     30,
+        95,   -509,   -931,   2737,   -457,    805,     10,     53,
+       -73,   -203,   -587,   -177,    242,    238,    656,  -3403,
+      -380,   2364,   2902,   -226,    204,   1559,  -2219,    -40,
+      -442,    111,   -703,   -424,   -252,   -241,    461,    749,
+       658,   -481,    125,   -366,    601,   -246,   -286,    132,
+       297,   -232,   5231,   -141,    196,   -121,   -235,    406,
+      -199,   -174,     87,   -107,    363,    272,   -563,   -620,
+       235,    223,   -627,   -339,   -467,    349,  -1596,  -5496,
+       644,    -96,    -81,   1938,    749,   -160,  -1976,  -1436,
+     -1056,  -1045,  -1098,   2327,    976,    -57,   -124,   1139,
+       275,   -209,   -636,    298,   2484,   2764,    962,    -39,
+       108,   -718,   -442,      9,    797,   1123,   1092,   1179,
+     -1170,   -701,   -381,   -237,  -1266,  -1045,   -337,   -351,
+      -274,   -981,   -272,   -111,  -3409,   -387,    421,   -406,
+     -2123,    623,    -18,   2473,    617,    176,     26,   1402,
+     -1351,    212,     23,   -172,    296,   1572,    -63,   -402,
+       837,   -521,   2209,   -613,   -329,   -309,   -180,  -1152,
+      -535,  -1380,  -2617,    475,    385,   -672,    182,     92,
+     -2211,    320,    109,   -633,   -582,   1208,  -1536,   1009,
+       896,   1991,   -374,   1750,  -1259,   -341,   1774,   1063,
+       678,  -2084,    987,   -337,     48,   -205,    -82,   -288,
+       388,    217,   1263,   2427,  -1472,  -1073,   -964,   -836,
+      2086,   -161,    438,   -449,    -37,   -926,  -3706,    164,
+      -372,   -616,    160,   -572,   -725,    727,     11,     53,
+       -84,   7494,    -74,    523,   -172,    464,    452,   -426,
+       803,    106,   -262,     32,    298,   -491,   -181,   -760,
+      -908,    303,    747,   1316,    272,    906,    767,    105,
+       247,   6120,    948,   -557,   -928,   -595,   -342,   -450,
+       686,   -815,  -1243,   -157,    572,   1414,    166,   -229,
+      3317,   1940,   -283,    623,   -781,    717,   -212,   -707,
+        30,   3635,   1147,   -696,   -928,   -637,    925,    797,
+       843,  -1359,    214,   1096,   1031,    852,    -84,   -228,
+       -34,   1067,  -1109,    392,    292,   -755,   3495,    -40,
+     -1806,   -637,   -236,   -602,   -264,   -147,    -68,   -233,
+       -55,  -2005,   -271,   -647,    963,    309,     -5,     56,
+      -275,   -398,     34,   -496,   2556,   1249,    -87,   -112,
+      1663,   -554,  -1926,    627,   2515,  -1128,   -566,   1539,
+       740,     38,   -614,    272,   -232,   -152,   -782,   -420,
+      -304,  -2313,    -33,   -944,    -77,  -3468,    -69,  -1730,
+       -21,    665,   -314,  -1640,    660,    661,    106,    -21,
+     -1505,  -2888,   -427,   -866,   -666,   3128,    786,    -55,
+       739,    112,      8,    567,   -602,   -350,    165,    108,
+       767,     64,   -715,    980,    673,   -186,    768,   -545,
+      -298,   -233,   -524,    -70,    511,  -2051,   3816,  -1104,
+       529,   1012,   2577,    777,    342,   -387,   2730,    247,
+       -20,   -227,   -432,   -263,   -885,  -1192,   -644,   -259,
+      2314,     38,    108,    614,   -386,    470,    -78,    681,
+     -3334,  -1049,   -300,    177,   -174,   -422,    110,   -641,
+      -406,   -472,    468,    885,   -730,   -877,  -1972,  -1372,
+      -410,    545,    543,   -800,  -1156,    279,   3290,  -1305,
+      -213,   -262,   -832,   -994,  -1110,    718,   -364,   1416,
+        -7,    963,    452,    680,    165,  -3815,    903,    806,
+       149,     11,  -1332,   -622,   -451,    152,   -618,   -309,
+       246,    435,  -2098,    487,    469,   -451,  -1574,   -204,
+      -187,    552,   -333,    515,   -331,   1452,    278,  -2691,
+      -146,   1009,    353,   -839,      6,  -3206,  -1080,   -572,
+     -2698,    752,  -1726,   -318,    397,   -152,   -128,    -77,
+       -36,   -506,    456,   1094,    281,   -158,    -19,   -149,
+        48,  -2831,   2042,   2545,   -161,    619,   1129,    274,
+        24,      1,    313,   -164,    655,    157,    770,    182,
+      1942,    241,   -898,  -1748,   -589,    256,    322,    683,
+       -65,    -73,    621,     74,   -317,   2585,    185,   -465,
+};
+
+static const int16_t cb1616ss1[] = {
+     -3218,   -607,   1665,   1100,   -563,    421,    377,    445,
+      -270,     -3,  -1503,    224,   -593,   -316,     31,    362,
+      1186,    389,  -1817,    589,  -2842,    289,  -1925,   -356,
+      -228,   -148,    618,    135,    358,    238,      1,   -767,
+      -266,      1,    101,    245,    231,   -167,    408,      1,
+       162,    -35,    241,    215,  -4702,    486,    546,   -339,
+       349,   -292,   1342,   -881,    184,   -675,   2639,   -284,
+      -995,    346,   -499,   1499,   1616,    578,    445,    -78,
+       844,   1800,   -686,   -414,  -1425,    795,    754,  -1418,
+      -178,  -2226,    515,   -143,     43,    569,    967,  -2333,
+     -1991,    282,    528,   1410,   -377,    736,    394,   -230,
+      -365,   -242,   2773,    136,   -738,    -36,  -1171,    -76,
+      -132,   -300,   -223,   -680,   -416,  -2738,     93,    414,
+       490,   -346,     75,  -1089,  -1132,   2237,   1844,    395,
+       325,  -1514,   1913,  -1850,   1162,   -442,    689,    -66,
+       -71,    -83,    342,   -197,   -940,    206,  -3381,  -1275,
+      -423,    -87,   -455,    498,    865,    355,   1225,   -115,
+     -3333,   -404,   -588,   1021,  -2180,  -1470,   1225,    728,
+        59,   2592,   -335,    194,   -649,   3586,   -951,   -142,
+      -947,    898,    -99,   -269,    977,   1520,    488,   -364,
+      -253,    127,   2524,    849,  -1166,   -191,    627,    372,
+       772,    145,    -21,    279,    402,   -863,  -2695,   1217,
+      1543,   1005,  -1419,   1712,    110,  -2191,    969,   1563,
+       183,    811,   -218,  -1078,   -220,  -1092,   -322,    803,
+      -533,   -359,    405,    -70,   -771,   -267,  -4730,    235,
+      -607,   -387,   -285,    -68,     48,    -60,   -222,    229,
+     -1087,  -1261,  -2249,   1265,  -1624,    864,    -65,    223,
+      -322,    337,   -262,  -3170,    -12,   4571,     19,    198,
+       458,  -1029,   2560,     -3,   -115,    619,   -645,   -836,
+      -399,    246,    -81,    -12,  -1057,  -2119,   2780,     25,
+     -1559,    291,    592,   -513,     62,    157,    553,    570,
+      -657,     72,   -118,   -284,   -454,   3853,    145,    259,
+     -1709,  -2161,  -3167,    189,   -233,  -1099,    141,    114,
+      -506,  -1012,   -775,    474,    331,    798,    469,   1915,
+        96,   -266,   -385,   -329,   -658,    192,     16,     97,
+       -47,    284,   -163,    200,    189,     18,  -7453,    160,
+     -2988,   2725,    520,   -132,   2593,    627,   -694,    -26,
+      -558,     44,   -209,     40,    377,    491,    -68,    384,
+       271,   2117,    642,   3166,   -569,    702,    513,  -1858,
+       108,    944,    248,    166,    681,    408,   -908,    525,
+      -145,   1035,    189,   2812,    135,   -356,  -2551,    401,
+       150,   -508,   -265,    244,    461,    958,   -233,   -204,
+       744,  -1603,    397,   -229,   -174,    539,   -139,  -4473,
+       837,   -310,    253,   -635,    397,    -80,    601,   -371,
+     -2015,   -261,   -364,     50,    331,     89,   -938,    709,
+      1444,  -2910,   -228,   -162,    419,     62,   -319,   -266,
+       584,   3728,     57,    220,   -543,    768,   -630,    361,
+       361,    642,   -313,    182,   -488,    -48,   3001,   -397,
+       640,    179,      8,   1081,  -1161,    -58,    -70,    -64,
+      4456,    323,    883,   -191,    -16,     61,    419,    429,
+       627,   -898,   -883,    750,    499,  -1335,   -467,  -1410,
+        -5,    283,   -301,    276,  -1636,    310,    114,   -428,
+     -8192,     12,   -114,     74,    215,    511,    317,   -314,
+       -86,    198,    138,    315,   -271,    246,   -363,    426,
+       608,   -714,    367,  -1356,  -2217,   1178,   -385,   1442,
+        28,   -642,   -371,    -87,  -2895,   -710,    303,   -150,
+      -398,   -868,  -1727,   1548,    982,   1177,    332,   -377,
+      1580,    962,  -1028,   1922,   1494,   -824,     93,  -1362,
+      -552,   1641,  -1729,    228,   1054,    421,   -185,   -536,
+        51,     87,   -204,     88,   -847,   -754,  -3761,  -2706,
+      -138,  -1242,     35,     64,    418,   -460,    713,   3960,
+       733,    468,   -150,   -823,   -211,   -674,    366,   -269,
+       180,   -294,   -384,    604,   1829,   -121,    271,    241,
+       192,   -211,  -2672,  -1483,  -1102,    960,     90,     49,
+     -1144,   2552,   -887,    -32,   -301,     62,   -183,    193,
+        78,   -781,    193,   -606,   -285,  -3082,    240,    392,
+       704,     20,  -1103,   -195,    166,    577,   -105,    -45,
+      -310,   -106,   3035,     28,   -369,    725,     53,     87,
+      -232,   -191,      7,   -282,   -572,  -8192,    325,     99,
+       162,   -113,   -237,   -209,    412,   -573,    295,   -389,
+     -1603,    -66,   -485,   -867,    466,   -882,    862,   -216,
+       221,     50,    -51,   3927,    557,    441,    223,    234,
+      4048,   -173,    420,   1670,    436,    341,    175,   -441,
+      -201,     75,   -549,    315,    172,    418,   -159,      7,
+      2973,     -3,   -220,  -1360,     26,   2781,    132,    295,
+       -15,    217,   -166,    187,   -282,    357,   -121,    480,
+      -216,    294,    263,     95,  -7367,    589,    -63,   -412,
+      -103,   -201,    335,    -96,   -203,    240,    223,   -435,
+       366,   -467,    118,    528,   -472,   -559,   -417,   -189,
+      -641,    339,   1546,  -2741,   1413,   -265,    637,  -1556,
+       -49,    422,   -195,    392,    -21,      3,     -2,    282,
+      -130,   -272,   -483,   -860,   -675,    762,  -1455,   5212,
+       178,    197,   -468,    270,   -310,   1038,    406,   2699,
+      -537,    -33,    272,    225,  -1986,   1295,   -857,  -2906,
+      -904,  -1861,   -206,    866,   -145,   -207,    252,   -825,
+      3051,  -1361,   -441,     85,   -186,   -127,    139,    285,
+      3067,   -332,   1163,    248,   -483,   -177,    268,    691,
+       733,   -104,    -54,   2541,  -1042,   -226,    165,    250,
+         7,   -259,   -383,    327,   2164,   2272,   -750,   2482,
+      -930,   -139,   1203,    766,    150,    320,    970,     28,
+     -1351,    467,    544,    521,  -2908,    -75,   -902,    611,
+       575,   1216,   -209,     -7,    541,    330,    528,    347,
+      -185,   -306,   -432,  -3384,  -1844,   -380,    155,  -1230,
+       629,  -1085,   -413,    119,    114,   1093,    198,    806,
+       491,   -137,   -518,    536,    -64,    387,  -1712,    608,
+       -24,   4961,    149,    299,   -342,    505,    503,   -387,
+      -944,   -297,  -2423,    -98,  -1027,   -432,   -259,    736,
+       127,   3561,   -473,   -623,   -751,    114,   -438,    657,
+      2448,    863,   -413,    -81,   2066,    988,   -539,   -528,
+      -111,    314,    390,  -1228,   -863,     19,    763,   2227,
+      -844,    -24,   4164,    139,    130,   -111,   -630,   -428,
+       538,   -606,    940,   -877,    122,    526,    194,   -104,
+       127,    117,    907,   -789,   2865,    526,   -548,   -253,
+       289,   2329,    176,    -70,    775,    681,     21,     38,
+     -1481,    766,   2093,  -2974,   -289,   -571,   -445,   1833,
+       333,    -84,   -243,   -413,    188,   -492,    -22,   -867,
+       605,   -333,    904,   3192,    -29,    491,   -411,    370,
+      -556,  -2671,   -294,    132,   -243,   -233,    180,    181,
+       383,    -79,     26,  -3539,    642,   1127,  -2125,   -170,
+      -386,   -135,   -703,   -290,   -157,   -444,   -885,   -341,
+      -920,    460,   -407,   -176,   3153,  -3084,   -505,    543,
+         7,     79,   1191,   1148,   -401,    -17,    289,   -735,
+       300,   1971,    626,   -146,    110,  -1281,   -613,   -649,
+      -206,   1850,    701,   1138,   -803,    742,  -1392,    147,
+       554,   1861,   -658,  -1481,    108,    856,   1021,    574,
+      3314,    518,  -1156,   -307,     42,    -92,   -132,    278,
+      -352,    -37,     35,    146,    -93,   -662,    216,    125,
+       823,   -876,   -170,  -5027,    444,   -182,    844,    189,
+      -490,  -1441,   -335,   -907,   -173,   1138,   -472,  -1505,
+     -1641,    648,     66,    627,     64,  -1096,   -620,   1588,
+      -506,    309,   -100,   5702,   -555,   -157,   -179,    -85,
+      -299,   -114,    -20,    178,    415,    118,   -581,   -132,
+      1025,  -2631,  -1154,   2623,   -286,    201,    340,    949,
+       235,    171,    649,    328,    397,   -142,   1369,     -7,
+      2305,   -373,    658,  -1681,   -744,  -3574,     34,   -183,
+      -504,    165,     81,     21,    635,   -307,    428,   -520,
+       164,  -4701,    744,    249,   -844,     -7,   -334,     38,
+       539,    267,   -213,     73,    134,   -251,   -248,   -923,
+};
+
+static const int16_t cb1616sm0[] = {
+     -4119,  -2861,    -76,    -49,   -192,   -542,      0,     94,
+      -550,      6,    601,    236,   -446,   -202,    167,    238,
+      2609,   -688,   -406,    265,  -3078,    321,     59,   -601,
+       157,    200,   -265,     78,   -699,   -679,     18,    -54,
+       203,   -687,   2683,   -111,  -3037,   -627,   -493,    413,
+      -480,     54,     75,    276,    206,  -1861,     17,   -420,
+      -169,    312,    361,   -277,    -12,   -363,   -592,    758,
+      -123,   3267,     78,   -862,     81,   -356,    596,   -536,
+       729,   2239,    -49,    553,    112,    444,    652,  -2990,
+       -70,   1084,   -436,     34,     53,    -10,    -23,     41,
+        -3,   -126,    207,   -130,   -208,     63,    480,    191,
+      6229,    -45,    -33,    -82,     35,     56,    259,      1,
+      8034,    -97,     52,   -159,   -334,    -41,     50,    -57,
+        56,   -194,   -567,   2050,    146,    987,   -383,    416,
+      -258,   2846,     51,      8,    690,   -126,   -704,    316,
+        16,     -4,    -90,    159,     34,    126,     65,    218,
+     -7037,   -261,    -87,    -21,   -185,     14,    112,     42,
+      -164,    274,   -269,   1138,   -208,    574,    589,   -143,
+      -479,   2745,    782,    -13,  -2492,   -132,    498,   -406,
+       260,    828,   -580,    558,  -2861,   -600,   -447,   -313,
+      1316,    800,   1772,   1131,    323,    -48,  -3972,    697,
+         5,   -403,     46,     95,    130,     84,    -39,    219,
+       117,   1629,   -189,  -1371,     25,   -116,   2311,   -681,
+      -411,   -685,  -1340,   -409,    223,   -462,   2530,   -816,
+     -1118,    314,   -893,   -109,   -262,    376,  -2795,    -48,
+     -2878,     -6,    180,     53,   -500,   -181,    125,   -291,
+      -265,   -154,    -23,   -184,    185,   -563,  -1159,    675,
+        24,   -213,    273,  -2905,   -242,   2373,     -6,   -166,
+        92,    276,   1375,    -28,   1879,   2572,    205,   -121,
+        51,    356,   -873,   -308,  -1060,    952,    719,    456,
+       106,    116,   -107,   -211,    -21,   3319,   2109,   -172,
+      -172,    143,   -718,   -138,   1135,    232,  -1361,    157,
+       -99,    522,  -4367,     84,    605,    319,   -937,   -397,
+       117,   -434,     82,    633,    274,  -1555,   -221,    -59,
+     -2419,  -2486,   -112,    136,   -182,   -480,     27,   -548,
+      -237,    817,    530,    656,    252,  -2685,    -26,    703,
+     -3268,    381,   -383,   -323,    105,   -500,     66,   -299,
+     -1056,   -363,    -69,     21,    292,    398,   -379,   -106,
+      -356,     38,    169,   2866,    206,   -523,   -277,  -2875,
+      -582,    -69,    649,     -3,    198,    -30,     98,    145,
+      -125,   -186,    -19,   -107,   -102,   -173,  -7299,    -62,
+      -503,   -231,     24,    145,   1367,   -355,   -175,    373,
+      -953,   -704,  -3454,    170,    899,    386,    592,   -754,
+       620,     81,     86,    -65,     84,    683,   3054,   -280,
+     -2825,   -757,     53,    -10,    441,   -145,    138,   1364,
+        -2,    -92,   -300,    225,   -199,  -2087,   1095,   -363,
+       -75,    288,    765,   -869,     -7,   3261,      9,  -2860,
+      -330,   -382,   3309,     28,    629,    244,   -143,   -298,
+      -512,   -409,   -241,    104,     -6,   -271,     -2,   8192,
+      -137,    139,   -304,    -14,     81,    262,    -36,     51,
+       380,     11,    101,    100,   -153,   2167,   -271,    267,
+       306,  -3008,    579,   -277,    316,    327,   1168,     71,
+     -1401,    389,    -25,   -265,    101,    -53,   -170,   -226,
+      2861,    145,   3040,   -159,     77,    -16,    233,   -570,
+       490,    661,    452,   1986,   -522,    212,   -107,    196,
+      -247,    308,   -353,    186,  -2689,    486,    -46,    813,
+       -24,    233,   -166,   3305,   2832,   -343,    -82,    475,
+       267,   -385,     26,    -35,   -226,     27,    416,    231,
+        12,     88,   -209,   -139,    404,   -239,   -109,   -182,
+      -851,    260,    242,    109,     11,  -1096,     85,  -4226,
+      -124,     12,   -139,   -100,   -604,    -87,     89,   5820,
+        59,    -43,    -84,    264,   -543,      0,    428,    -16,
+      -146,   -556,   -195,   -159,    875,     27,    261,    207,
+      -182,   2367,   -622,  -3193,    481,   -289,     52,     12,
+        34,   3014,     10,   -345,    -94,  -2883,    -62,    400,
+       249,     51,   -178,   1190,   -128,  -3940,     41,   -296,
+       -48,     13,    -26,    223,  -2392,    516,   -384,     33,
+       -46,   -161,    -43,   -224,    -89,     -4,   -349,    135,
+       540,   -120,   -276,   -198,    129,  -5113,    175,    -45,
+       -34,   -109,    419,    -45,   -104,   -185,   -393,    416,
+     -3514,    149,  -3088,   -115,    -78,    431,   -172,     21,
+      -290,   -162,    216,     41,    -56,   -487,    705,   -194,
+     -1003,    100,    172,   2793,    -83,   2584,   -189,   1198,
+       551,   -119,    -73,    -91,   2103,   -619,    124,    128,
+      2628,    192,    160,   -110,    270,   1739,   1062,   -568,
+       -73,    -56,    328,    100,    384,   -173,     83,     39,
+      -236,    -25,   -457,     53,  -6413,    345,   -459,   -110,
+        28,   -127,   -109,   -593,     32,    141,   -879,    254,
+      2132,   -410,   -623,   1103,  -2302,    528,    156,     28,
+        81,    613,    602,    171,    500,  -2356,    620,     17,
+      -523,  -2961,   -921,   -107,   -405,   -230,   -129,     18,
+       363,   -881,   1282,   1427,   -363,    658,    205,    -51,
+      2835,  -2003,    188,    -26,     73,   -231,    352,     74,
+      -490,   -222,   2423,   -341,  -2762,    -14,    -56,   -260,
+       -41,     33,    169,   -190,   1248,    -77,  -2322,   -607,
+      3610,   -104,   -200,    -90,    -81,    719,    -52,   -359,
+       394,   -301,     66,    -39,    -56,  -8192,     87,     56,
+      -291,     50,    231,    284,   -211,    -16,    -86,    -84,
+       -28,     52,      3,    -51,    304,   -224,    228,   -374,
+       458,  -1958,   -210,  -2613,    401,  -2128,   -119,    -12,
+       -60,    -14,  -8192,     53,     27,    113,    289,     -7,
+        22,     60,   -192,    333,     72,   -344,    238,    147,
+     -2235,    324,    124,    176,   -415,    450,   -476,   -558,
+      -429,   -246,   -551,   -287,    672,   2145,   8192,    161,
+      -165,    -34,    193,   -108,   -137,    -96,    -68,    156,
+       308,   -182,      5,    438,    -71,    -27,   -164,    187,
+      -110,   5786,    -82,   -130,   -126,    197,   -262,   -182,
+      -118,   -110,    121,    -93,    235,    -56,    -99,   -212,
+     -3013,   -193,    -10,  -2944,     58,   -135,   -624,   -170,
+        84,    339,    115,    -85,  -1886,    250,    123,   -104,
+      -374,  -2241,   2454,   -438,   -168,    632,   -136,   -725,
+      -329,   -394,    -60,     19,   2795,    438,   -796,    141,
+      -143,    132,    251,     37,    286,   1858,     39,   2381,
+        -9,    -85,   -110,    149,   -415,    355,   -172,     -9,
+      -149,    554,   -324,  -4931,   -537,   -261,   -585,   -291,
+       764,    -92,   -139,     -8,    -80,     65,     -6,    -26,
+       -81,     37,    -14,     45,    115,    171,   -321,    313,
+       308,  -4637,   -128,   -120,   -174,    148,    768,    490,
+        81,   -175,   -261,   -136,   1501,    345,     25,    -56,
+      -212,   -324,   -836,    207,   -652,   -752,   2406,   -332,
+       489,   -275,   -932,    284,   3103,   -315,    614,  -2711,
+      1706,  -1072,   -163,    -75,  -1104,    163,   -421,   1532,
+       -92,   -163,   -811,   -118,    -38,   -754,    466,   -314,
+       232,   -595,   3613,    -30,    570,    -62,    785,   1626,
+      1080,    553,   -407,     32,   -105,     82,   -156,    -75,
+      8063,    -67,    114,    -65,    -65,   -242,     98,   -124,
+        38,    441,  -2645,    -92,     69,     17,  -3284,   -278,
+      -278,    116,    567,   -742,    182,   -304,    432,    261,
+        86,  -4109,    389,    795,   -138,    151,    111,   -223,
+      2392,    399,   -135,   -545,    182,   -226,     61,    234,
+};
+
+static const int16_t cb1616sm1[] = {
+       -29,    -13,  -6217,   -136,   -196,     24,   -228,   -301,
+      -155,    -37,    -54,    -91,     -4,   -130,   -424,    -89,
+      -181,    657,    110,  -4526,   -391,    762,   1033,   -310,
+      -808,   -282,   -721,   -690,    258,   -259,     16,   -555,
+      2675,   -379,  -2580,    356,    198,   -455,     95,   -194,
+      -754,    383,   -263,   -873,    271,   -107,   -191,    -28,
+        11,    -66,     91,     25,   -215,      9,    152,     11,
+      -124,     66,    422,    521,   5401,    103,   -179,   -291,
+      -821,  -1265,   -396,    150,    -69,    -15,    154,   1504,
+      -445,    116,   -136,  -3528,   2819,     -5,    174,    166,
+       289,    -60,    158,   -701,     83,   -636,   -407,    194,
+      -240,   -138,    124,    -94,    132,   -105,   -106,     72,
+       139,    101,     97,  -7928,      6,    112,    164,    -83,
+      -329,     41,    124,    389,    -22,   -194,    157,   -378,
+     -2255,   -431,   3176,   -199,   -310,     49,    483,   -208,
+      -235,     11,     45,    637,   1220,   2309,     93,    514,
+     -1939,    136,    276,   -165,    137,   2496,     56,     31,
+       238,   -538,   -433,    690,   -318,    -44,    834,  -1684,
+      -132,   2619,   -157,   1959,   -566,    119,    183,    227,
+      2066,    401,    -48,   1257,    604,   1306,    149,    273,
+       586,   -199,   2166,    257,   2047,    -46,   -377,   -761,
+       -25,   -454,  -1592,    -42,    432,  -2312,    222,   -528,
+       -87,   -287,    532,   2906,  -2011,    720,    554,    423,
+      -576,    425,    280,   -894,   -232,   -179,    485,    628,
+     -2918,    405,    229,     -2,   -146,    127,   -329,   -243,
+       194,   2443,   -531,    592,    -14,   1679,    292,   -914,
+      -332,   2382,  -3040,    297,  -2856,    -88,    236,   -485,
+       438,    241,   -283,    448,    579,   -660,    277,    233,
+       201,    126,     15,   -411,   -560,   -582,   -389,   -392,
+        -7,    238,      1,    344,   -216,  -4601,   -457,   1027,
+      -114,     13,   -301,    288,    172,   -488,   -124,  -2721,
+       100,   -105,    434,    -13,   2791,   -827,   1600,   -219,
+     -4992,   -100,    411,    326,   -608,   -779,     94,    974,
+       453,  -1326,   -236,    429,   -189,    830,     32,    187,
+       459,   2489,    476,    165,   3261,   -445,    169,    179,
+      -113,    168,   -393,     52,   -383,    -33,     73,    137,
+     -6021,   -259,   -121,    -29,    -46,   -156,     68,   -225,
+       217,    152,   -280,      7,     62,      3,     17,    295,
+       221,   -158,  -5406,   -335,    232,   -454,   -320,    467,
+       -45,     96,   -170,   -267,   1273,    287,    258,    536,
+      -695,   -953,   1134,    428,    251,   3331,    717,   -804,
+       627,   1099,    120,      4,     42,    191,     -9,    259,
+      -335,   -337,    -25,    -56,    116,   -228,   -351,   -463,
+      5942,    193,   -114,    -64,   -268,    300,    146,    -15,
+       657,    367,     -2,  -2911,    838,   -251,     -1,   2897,
+       -78,   -609,   -545,   -588,    488,   1383,    486,   1820,
+       126,   2971,   -151,     11,     10,   -349,   -279,   -260,
+      -265,    142,   -683,   -191,    172,     30,   -293,  -5103,
+       -61,   -247,    -38,    722,    275,   -326,    -34,    132,
+       297,   3305,    -46,    227,  -1052,  -1114,    562,     62,
+     -1618,    699,    362,  -1624,   -455,    150,   -110,     61,
+      -266,   -168,   -168,   -391,    136,   -569,   -772,   -203,
+       467,     20,  -4747,   -170,    142,   -138,    129,   1719,
+      1896,    210,  -1008,    206,    585,   -325,    295,    175,
+     -2542,   -489,    121,    -94,    -38,  -2766,   -115,  -3206,
+      -305,    320,   -179,    503,     83,    -72,   -122,    -52,
+      -181,     98,     39,   -506,  -2751,    -93,     -1,    -59,
+      2645,    248,   -309,   -203,    138,    324,   -567,    696,
+      -493,    170,   2440,    919,   -420,  -3029,   -335,   -593,
+       -72,    536,    -82,    202,     78,    510,    184,     -2,
+       227,  -2830,     19,   1590,   -281,    387,    -46,    408,
+      -463,   -536,    262,   2214,   -115,  -1614,   -385,    203,
+        32,   -885,  -2606,   2338,     97,    292,   -449,    449,
+     -1038,   -582,      0,    -68,    211,   -160,     62,   -286,
+     -2466,   -421,    -48,   1903,  -1037,   -173,   1339,   -591,
+       152,  -1231,    792,    524,    214,    -92,     29,    181,
+      -225,   -150,     -1,    139,  -8135,    238,   -119,    189,
+        34,   -140,   -188,    141,   -112,     56,   -176,    154,
+        91,   5653,    298,   -316,    -23,    232,    -74,   -317,
+        -4,   -630,   -506,    105,  -1655,   -126,   2417,    113,
+       -95,   -472,    134,    290,   -755,    152,  -1222,    -58,
+       981,   -236,   8192,   -154,     75,    218,   -185,    107,
+       -10,     39,    265,   -225,    -87,      9,    123,   -906,
+      -382,   2544,     44,  -1985,   -102,    407,    -91,  -1835,
+      -108,    122,    142,    169,    134,   -721,  -1530,     -4,
+      -133,     45,    374,  -1049,    -76,     16,   -357,    277,
+       158,  -2596,     -4,  -1484,    -13,   2660,   -198,      9,
+      -218,    408,    -63,    177,    -71,   -195,   4293,     -8,
+       228,     34,   -421,    695,  -1409,     85,   2740,    350,
+        44,    473,    141,    -93,    144,    -59,   -220,   -154,
+      -148,   -168,   -205,   3049,    229,    194,   -107,     90,
+      -353,    508,   -343,    473,   -446,    457,   -452,   -116,
+      3493,    504,   2152,   -228,  -1832,   -463,   -657,    555,
+       657,    540,    546,    604,   2214,    -68,    254,    563,
+       267,    227,     92,   -107,    143,    260,     23,     42,
+        64,    -67,    138,   -167,     72,    457,   4958,     61,
+      -933,      1,   5341,    -32,     89,    161,    504,    823,
+       311,     11,   -184,   -574,    -79,  -1654,    -74,   -366,
+       164,   -363,    117,     53,    706,   -701,  -2966,    233,
+        11,    165,    394,    462,  -2632,    703,   -291,    -65,
+       -49,   4080,   -862,    -65,    -19,   -110,   -872,    323,
+       833,   -154,    369,    475,   2211,     20,   -212,   1711,
+       -24,    -28,    -58,     32,   1746,     41,   -779,    614,
+       508,   3050,    687,    423,   -182,   -484,    -60,    242,
+      3895,   -565,   -453,    110,    547,   -961,    320,    -34,
+      -347,  -1963,   -116,    730,   -435,    -34,     41,     26,
+       -51,   8192,   -115,    312,    184,   -148,   -199,    157,
+       153,     82,     99,    138,    -32,    -19,    -64,   -139,
+       107,     43,    133,    -87,     42,   -148,   7080,   -158,
+      -335,   -249,    -64,     81,    157,    813,   -279,   2226,
+       -16,   1191,   -705,    607,    205,    -11,  -1341,   -548,
+     -2251,   -326,   -149,  -2536,    139,   -750,     73,   -394,
+      -218,    -35,    181,    925,   -557,    226,    -63,   2582,
+      -737,    164,    181,   -167,   -230,    413,    328,    406,
+      -287,  -2992,    539,   1133,    -85,  -2162,   -154,   -357,
+      -245,     -8,    162,   -118,    111,   1275,     47,   -314,
+     -2043,  -2732,  -1052,    -28,    625,   -810,   -487,     40,
+      -131,    273,    105,   2605,  -2974,    268,    -19,   -257,
+       842,   -662,    855,    505,    590,   -243,     68,   6978,
+       118,   -101,    349,   -232,   -258,   -318,    212,     55,
+      -686,   -177,   -173,   -102,    480,     35,    149,    263,
+     -2838,   -198,    942,    392,    135,   2980,     34,     92,
+      -237,   -672,    224,   -298,    298,   2128,    359,    254,
+       150,   -839,   1001,   3234,   -169,    261,   -302,     74,
+      -277,    498,    321,    194,  -3275,   -152,  -2786,     33,
+        70,    236,   -222,     88,   -393,     47,   -636,    869,
+      -754,    842,  -2326,   -460,    133,      0,    264,    172,
+     -2955,   -286,   -243,    399,    882,   -722,   -382,    872,
+      -119,    -65,  -2403,   -119,   -246,   -890,   -185,    102,
+       -32,   -573,    225,   3044,   -484,    -40,   -809,    403,
+};
+
+static const int16_t cb2224l0[] = {
+     -3546,   -433,    -76,     46,     24,   -641,    214,    114,
+      -779,   -930,    -57,   -462,   -569,   -848,   -413,     53,
+        45,  -3172,   2915,   -734,    152,    487,   -113,    246,
+      -196,   -187,   -136,    469,    475,    382,    213,   -886,
+      -275,    313,   3148,    -62,   -773,    785,    -24,  -1499,
+       -65,   -175,  -1942,   -325,     78,    -15,    -38,      2,
+         6,    -29,    -16,   9690,    -15,    -49,    -13,     12,
+       -21,     11,    -45,    -63,   -528,    192,   -137,    201,
+       138,   -154,     57,    -88,  -1695,    155,    105,    121,
+      4249,    -59,    467,   -439,   4483,   -130,    -39,    262,
+       -21,   -377,    441,   -353,   -768,    366,     23,    841,
+       529,    195,   2722,   2892,   -255,    -67,    628,   -498,
+        33,    241,    212,  -1020,    -97,   -723,    594,     35,
+       -31,   1459,     19,    -75,    -27,     -1,     48,     28,
+       267,   -275,   3780,   -515,   -467,     36,   -405,   -272,
+     -1968,     60,     44,    449,  -2877,   -124,  -1524,   1195,
+      1042,    117,    115,   -305,    225,    215,   -357,    144,
+        35,    -23,     89,   2133,      2,     65,    -27,    -48,
+      -243,   -216,   -807,    700,   1258,      6,   -140,      4,
+       -31,    -21,     42,     67,     97,     -2,    104,    -10,
+     -7734,    134,    -50,    -95,    -88,   -269,    105,    -18,
+      -229,    453,   1038,  -2609,  -2944,    -57,     27,    372,
+        59,   -556,    -87,   -242,    114,   1083,   -119,   -139,
+       175,    146,    -55,   1689,    342,    501,   2722,  -1273,
+      1626,    868,   -290,   -145,     62,    194,    -23,   -179,
+      1540,    -85,    360,    254,    339,   -681,   2081,   2730,
+       838,   -128,     31,  -2133,   -173,    483,   -138,   2706,
+      2007,     91,    293,   -642,     35,    280,   -132,    454,
+       -66,  -6263,    -24,     82,    -31,    -39,      5,     41,
+        66,    239,     18,    -57,     61,   -117,    103,     16,
+     -1231,   1384,   -164,    104,    370,  -1891,   2237,   -440,
+     -1399,  -1394,      3,    274,    223,    -30,    -70,    579,
+       361,    423,    355,   -176,   -164,   -443,   -306,  -2382,
+       713,  -2987,   -340,   -691,   1407,     -5,    439,   -264,
+       -86,   1964,    -17,     88,    175,     56,   -119,     31,
+       466,   1980,    176,    513,   1809,     17,   3000,   1861,
+       -71,    314,   -255,   2041,    576,    203,    443,   -392,
+      -539,   -380,   -685,   -204,   -161,    287,    378,   -502,
+      1898,   1540,   1073,   2282,    573,    867,    122,   1064,
+      -628,   -564,     97,    280,    -36,   1601,    -90,   -174,
+       -10,     45,    -57,    159,   -496,    641,   -959,    -91,
+       -90,   3057,   1680,    -83,     80,     19,     63,   -119,
+         1,    -72,    466,   -335,    453,   -177,   3930,    -21,
+       327,   -199,   -651,    -38,     -6,    -13,      7,    -77,
+         1,      8,     40,   -125,     36,   -136,    272,   6266,
+     -3299,   3331,     24,     18,    -71,      9,    -79,   -374,
+      -277,    128,   -233,   -175,   -350,   -216,     81,   -693,
+       -49,     33,    -44,    -37,  -4260,    -70,     96,    177,
+      -319,    133,    178,   -377,    -45,    182,    156,   -155,
+       -34,     10,     22,     53,   -211,      4,   5740,     48,
+       -42,    114,    149,    -30,    122,   -106,   -309,   -148,
+       -82,     20,    130,   2734,    -40,   -596,   1309,   1163,
+     -1470,    396,   -264,    884,    142,  -1818,     67,     -1,
+        38,    -52,    -73,      1,    279,    143,    278,    -45,
+      1541,   -886,   -677,  -2609,    -88,  -3766,   -201,    237,
+       -40,    195,    -50,   -366,     88,    166,    403,    236,
+      -130,    205,    -45,  -8636,    -13,    -27,    -50,      8,
+        40,     21,     41,    -36,    -25,    -40,    -14,    -14,
+        42,    296,   2495,    372,   -361,   -501,   1951,  -2141,
+       220,   -847,     98,    228,   -250,    563,  -1121,    -29,
+      2888,   -196,    151,    -19,   -287,  -2298,     65,   -482,
+      -124,   -186,   1215,    468,   -781,   -227,    621,    298,
+       -42,    -44,   -115,      0,     50,    179,     23,      9,
+       -65,     -8,     10,   -101,  -4998,     77,   1181,   -304,
+       139,    250,  -2257,    -97,    847,    433,    385,  -2411,
+       800,   -852,   -528,    435,   -953,    -23,      4,    928,
+      -108,   -634,   -273,   -879,   2566,  -2609,    621,    807,
+       295,    -77,    627,  -1114,   -297,   -109,   2103,    -53,
+        -9,     44,     32,    339,    679,     77,  -3186,   -416,
+      1234,   -801,    472,    408,    153,    465,   1703,    879,
+     -2411,   -553,    440,   2099,   -899,   -288,    310,    665,
+       -47,   -148,   1457,   3932,   -213,    243,  -1763,     -2,
+       288,   -425,   -972,    478,   -302,    552,   -377,   -352,
+       179,   -480,   1466,   2019,   2817,      5,    824,     13,
+      -384,   -582,   -297,  -1165,    689,   -120,    703,   -118,
+       663,    206,    -49,  -2853,    -76,     32,    170,     11,
+        42,   -503,  -1139,   1548,   -287,  -1112,    765,   -455,
+       -35,   2452,     22,   -134,    144,   1867,   -149,   2771,
+        19,    264,    700,    -48,    286,   -593,  -2637,    408,
+      2304,    -14,    187,   -135,   -210,    745,    282,    724,
+       861,     21,   -414,    606,    836,   -564,    212,    203,
+        64,   4706,    -30,    -43,    -85,    -61,    -90,    644,
+      -281,    287,   -122,   -340,   -137,     36,     -4,    -22,
+         8,   9486,     -3,      4,     10,      4,     86,     58,
+        -8,      6,   -105,    -15,     15,    -63,    -58,    -30,
+        15,      0,    -19,     78,  -8267,   -134,     -8,    -45,
+       163,    -19,    149,   -298,   -167,     34,    190,    -39,
+     -2229,   2821,    126,    185,   -791,  -1229,   1003,   -331,
+       980,    659,    -60,    -60,    -48,     20,     12,   -167,
+       -60,    -39,     66,    180,    -22,    -20,     84,   -108,
+       131,    -10,  -8493,     -1,    -18,     -4,    -53,     25,
+       -63,    -14,     20,     25,    -41,     40,     -5,  -2330,
+       -74,     59,     -7,   -154,   -293,    -64,  -2702,    819,
+        75,    977,   -602,   1138,    160,    262,     26,    -81,
+        18,   5558,    118,   -167,     98,    110,     -5,    -44,
+       -27,     72,     51,   -189,      0,   1868,    743,   -275,
+      2530,      6,    180,  -1019,  -1307,    710,    303,   -152,
+      -115,  -1498,   -501,   -495,   -103,    -76,     78,     -7,
+     -9337,     -6,     31,    -21,     16,    -14,     57,     36,
+       -81,    -67,    -30,   -535,    216,    313,    310,   -157,
+      2830,   -914,    122,   1353,  -1842,    298,  -1165,    -13,
+      -253,   -100,   -560,    -61,     40,     24,      3,     56,
+       -18,   5709,     41,     13,    -23,    -55,    -98,    214,
+       109,   -205,    -45,     27,    -26,    177,   -290,     89,
+         8,   1315,   3102,   1657,    210,  -1032,    774,   -211,
+      -581,    -51,    896,    852,    331,    349,   -474,   -119,
+      -865,   -145,   2270,    703,  -1967,  -2088,    610,   -700,
+       113,   -231,   2062,   -152,   -599,   -474,    -38,   -601,
+       432,   -983,   -731,    744,  -2880,    156,   -240,  -1903,
+      2497,    -89,   -963,  -2179,  -1208,    189,    318,    150,
+       204,     29,   -167,   -138,    -93,     73,    292,  -3225,
+      -310,   -510,    173,    -90,    154,   1831,    380,  -1191,
+      -976,  -1460,   -514,    235,     13,  -2950,     22,    -95,
+       228,     85,     10,    264,  -3165,     46,   -184,   -782,
+       143,     -9,     37,     12,    108,    -65,    -64,    115,
+        86,   5039,    -55,   -203,   -163,   -462,     77,    -92,
+       423,    139,    239,     -5,   1887,    426,    729,    118,
+      -159,  -2821,   -124,   2147,   -167,  -1023,     92,    -23,
+       162,   -159,    -47,     -3,     14,    -34,     37,    -29,
+       -97,     41,    -92,    -75,  -6983,   -224,    250,    -80,
+};
+
+static const int16_t cb2224l1[] = {
+     -2888,   -183,   3606,      0,     33,     99,    -76,   -264,
+      -351,   -508,   -546,   -103,    252,    -49,     46,    -32,
+        48,   -245,     67,  -2408,    340,   3153,   -154,   -280,
+      -440,    374,   -224,    -39,   -720,   -289,   -136,  -3095,
+       -98,    -37,    -86,    145,     51,    132,    773,  -1158,
+      -330,   -449,   -141,  -1831,    666,  -2680,   -110,   -906,
+      -307,  -3299,    287,     55,   -521,   -173,   -431,   -383,
+        67,    -28,     34,    247,   2814,   1479,     32,  -2196,
+     -1625,    135,     72,      3,    634,     76,    502,   -306,
+      -366,   -120,   -219,   1934,    372,   -130,   -113,    255,
+       -14,     30,   -687,   -576,    797,    306,  -2360,   -242,
+      2062,     69,   2273,     26,    -20,    -21,    -68,    -69,
+     -4618,     60,   -171,   -235,   -271,    175,   -110,    147,
+       100,   1628,   -197,     -2,  -4002,    520,  -1236,    -21,
+        62,   -396,    513,   -369,   -168,    285,    561,    131,
+      1347,     83,   -101,     89,    206,      5,   4556,    -23,
+      1191,     39,    352,   -158,     99,   -195,    -33,    481,
+      -446,   -125,    181,   2678,   2860,   -524,   -239,     55,
+      -360,   -358,   -560,     93,    307,    285,     77,   -295,
+       -90,    114,    -45,     54,   -328,     94,   -222,    -30,
+     -5004,   -164,    100,    379,    208,    424,    -11,     26,
+        10,    -26,    -32,    114,     30,     18,    -44,   -221,
+      -184,    -32,      0,    -99,  -9001,     -7,    -33,      1,
+        41,     -3,     13,      9,    -46,    -86,     47,     56,
+        72,     -7,      5,  -1162,    101,    456,   -217,   3440,
+      -220,    400,    100,   1503,    365,    655,   -230,     42,
+      1129,    767,    192,    -16,  -3440,    -79,   -236,      3,
+       -80,     51,    -11,   -984,   -142,     29,    554,    339,
+      1851,    105,   -279,  -2915,    116,   3090,   -431,    233,
+       337,     61,    927,     32,   -174,    237,    255,   -250,
+       604,    115,   2036,     78,    -79,    -50,   -349,    338,
+       285,    169,    394,    -49,   1194,  -2966,    447,     57,
+     -2591,    415,   -586,  -2616,   -197,    -61,    596,  -1159,
+       130,   -441,    356,     47,   1192,    496,  -1801,    -15,
+      -142,    -23,    132,     21,     84,    234,   -137,     23,
+      -147,  -3254,    407,    107,   1132,    130,     74,    153,
+      3148,   2184,   -464,   1294,    222,    589,    457,   -397,
+       -87,   -605,   -631,    311,   -703,    110,     20,    -23,
+       -75,     18,    -43,   -182,      8,    -94,    151,   4989,
+      -619,    662,     82,      8,     69,     -4,    126,    -35,
+       -99,   -277,   -227,  -2212,   3188,   1115,   -467,   -618,
+      -989,    681,    218,    -25,    -37,     -9,     32,    -46,
+        97,     15,    -23,    -95,     -6,     55,     19,   7904,
+       -14,   -508,      3,     14,    -12,    -58,     28,    154,
+        11,    271,   -593,    344,   -336,   3489,    -41,  -2998,
+       622,  -2739,   2796,   1536,    310,    176,   -318,    399,
+       -70,   -298,   -509,    256,   -381,   -158,    322,   -197,
+         3,    -53,     37,     98,  -6136,    -25,    -54,     57,
+       138,    -74,    239,    -46,    -18,     29,   -265,  -2278,
+        22,    110,    -21,   -147,    266,     85,   -286,    137,
+      3434,   -485,     68,    475,     -3,    159,   -181,   -237,
+      1595,    759,    786,   1490,    926,  -2841,   -160,   1092,
+        -7,    130,    895,   -345,    -95,    -31,    -35,    139,
+       -98,   2106,    305,    672,    -66,    349,    229,  -1561,
+     -1694,  -1786,   -743,    -76,    -67,   1666,     76,     10,
+       -22,     60,    -45,      5,    409,   -458,    583,   -405,
+      2586,   -264,    175,    633,    842,   3208,  -1488,   -802,
+        40,   -119,   -197,    -84,   1645,    328,    823,   -175,
+       342,     12,   -217,     67,    124,   -180,   -106,  -2877,
+      -336,    171,    185,    132,  -2263,    -75,   -622,   -631,
+     -2404,    176,   -132,     35,    179,  -1498,    182,     68,
+       699,    597,  -2728,    325,     52,    421,   -863,    609,
+        53,   -159,    258,   -307,   2919,     44,   -826,   -467,
+        91,    542,   1883,    815,   -682,    548,   -419,    593,
+        82,  -2108,   -158,    -75,   -524,   2440,   -528,   -469,
+       723,    -14,  -1817,   -487,    448,      4,   -155,    -70,
+     -1715,     34,    -55,    134,      0,     19,    107,    419,
+       334,     74,    446,   1241,  -4288,     61,    -65,     21,
+        71,    133,      2,    -88,   -238,    322,   -283,     -6,
+       404,     98,     78,  -1951,    412,  -1942,    418,    257,
+       -42,  -2444,    -97,   1491,    464,    346,    229,   -154,
+        96,    261,     29,    302,     39,   -201,    -40,    -98,
+      -157,    335,  -3624,   -349,   -573,    633,   -116,   -312,
+       -82,    263,     -2,   -101,    -57,   1817,   -424,      3,
+      -245,    386,     74,    609,   2171,    -77,  -2604,  -1036,
+      -117,   1585,     -2,      9,    -23,     31,    -12,     48,
+       215,     84,     13,    219,    419,   -275,   4373,    -91,
+        -6,     18,   2228,    -46,    157,   -408,   2288,    654,
+      -725,   -245,    -10,  -1182,   1726,    324,    367,   3013,
+      3429,   -140,    360,   -122,   -574,   -165,    109,   -330,
+       -82,    340,   -133,    210,    355,     -8,     47,    -52,
+      8064,      5,     60,    -42,    -95,     -3,     91,    -69,
+       -47,    -42,    101,    118,    -44,    -16,    -14,     -9,
+        27,      8,    -33,     -3,  -9302,     27,     49,     -6,
+        61,     74,    204,    430,    252,   -259,     73,    125,
+       366,   -458,  -2846,     89,  -2694,   -106,   -344,   -702,
+       809,    451,     69,    585,  -1897,    608,  -1138,     52,
+       618,    106,    771,   2992,    266,   1007,    184,   -486,
+        36,   3317,   -311,     38,    105,    -89,     16,     97,
+       -88,     28,    183,  -2834,    -44,    387,    -49,    467,
+     -2524,     77,    -56,  -3727,     81,   -308,     63,   -137,
+       203,    -77,    139,    254,    -65,   -264,    -58,    631,
+     -2559,    739,  -1343,    595,   -117,   -193,  -2572,    322,
+       267,    185,    669,   -110,    641,    212,     45,    -16,
+        12,     14,     -3,    -12,     78,    -48,   -196,   -128,
+       179,    146,  -7348,    177,   -138,    -48,    142,    -33,
+        34,  -6037,     15,   -105,    103,    136,    -48,    217,
+      -169,     88,    -31,      9,     24,     41,   1733,  -2757,
+      -335,   1783,    988,   -161,   1014,    633,    -66,  -1114,
+       525,   -266,    461,   1137,    -26,   -173,     89,     82,
+     -3365,     67,   -198,   -107,     44,    352,   -793,    867,
+      -807,   -166,    107,      4,     71,     61,    124,     27,
+     -2477,    178,    -32,   -172,   2895,   1301,    798,    707,
+       267,   -720,   -403,    167,   -157,   2572,   -210,    527,
+      -312,  -1664,   -214,  -1556,   -332,    595,  -1634,    -58,
+       203,  -1777,   -469,     24,    188,    -59,   -860,    879,
+        15,    855,  -1534,   2910,    534,    -71,    276,    471,
+        41,    -25,    105,    -37,   -150,    110,    226,   -277,
+     -4687,    574,    139,   -152,   -586,     67,  -1082,    261,
+       -68,     25,   -216,    110,     46,  -3703,    281,    355,
+      -506,     80,   -218,    164,   -398,     75,    -97,   5782,
+        39,    -68,     26,     76,     74,     38,   -103,    105,
+        44,    116,    187,    288,     90,   5847,    -41,     28,
+       -19,     20,    129,    -99,    258,     22,    -28,   -120,
+      -101,   -121,     79,   -180,    -23,     22,     -5,    -60,
+        63,     35,  -8987,    -11,      2,    -15,     -3,    -28,
+        47,     29,    241,    132,   -166,   -259,    -48,    102,
+        70,   2830,   3163,    285,   -813,      0,    105,    176,
+      -455,    141,   1382,   -481,  -2282,   2971,   -200,   -473,
+        37,   -930,  -1162,    930,    890,    412,    190,   -160,
+};
+
+static const int16_t cb2224s0[] = {
+     -5789,   1229,   -138,   1010,    823,   -602,   -987,   -237,
+        47,    -29,    428,    210,     87,    -11,    -20,   -261,
+     -3148,   1219,  -2074,   -132,   -258,    707,   -634,    878,
+      -486,    989,   -276,   -137,   -263,    592,   1248,    474,
+      -293,   -981,   2125,   -653,  -1451,   -833,  -1522,    387,
+      -269,    349,    698,    295,    870,    661,   1532,    202,
+       654,    362,  -1265,   3972,   -651,    224,    213,   -728,
+       -83,    575,   -503,   -766,    559,   -657,     86,    941,
+      1498,    -72,   2297,   1413,   -376,    697,   -738,    384,
+      -807,   -354,   1141,    374,   1186,   -597,    222,    630,
+      -717,  -1653,    106,  -1377,   -929,    982,  -3469,   -321,
+      -201,  -1185,   -147,    -13,    268,    103,   2967,  -2083,
+      -416,    702,    377,  -1126,     92,    963,   -494,    -94,
+      -436,   1893,   1401,    -40,  -1464,  -1608,   1980,     44,
+       254,    676,    529,   -891,    -95,      9,   -172,   -129,
+       158,   -403,  -1147,   1026,   -410,     86,   2593,  -1060,
+      -621,    480,    254,   -780,    691,  -1020,     79,   -192,
+     -2264,  -1219,   -748,    602,    243,    338,    550,   -444,
+      -130,     79,     24,   3396,    124,   -572,    749,    976,
+        33,   -883,   -368,   -609,    694,   -569,   -560,    192,
+       868,    644,    173,     86,  -4302,    633,   7899,   -360,
+       478,    493,   -306,     14,    244,     96,     71,   -169,
+       336,    346,     74,    -52,   1779,    828,   -252,    739,
+     -1005,   -755,     31,    -46,    200,    581,    -11,    802,
+      1104,   3252,  -1053,    723,   -491,  -2492,  -2330,   -245,
+       308,  -1021,   -312,    563,    -85,    991,    -16,    224,
+       -85,   -957,   2262,  -4585,  -1475,    102,    310,    298,
+      -875,     -6,   -268,      8,   -284,    324,   -471,   -224,
+       133,   1502,  -1714,  -1095,   -104,    809,   2584,   -273,
+     -1014,   -296,    130,    732,   -259,   -335,   -745,   -619,
+      -716,    247,    503,    862,   -277,   -137,   -224,  -4897,
+       124,    277,    298,    -40,    169,    678,    557,   4379,
+       677,  -2016,   -506,   -108,    -47,     49,   -115,   -260,
+      -300,    206,   1196,    -17,    202,    365,   -808,   -473,
+      -160,   -609,    526,  -1124,   1629,  -2924,    713,   -487,
+      -109,    540,   -511,    221,   -394,  -1420,   1023,   -460,
+       424,    -86,   -875,  -1557,    -88,   -244,  -1597,  -3015,
+       355,    166,    330,   -334,   -325,    505,   3632,  -1760,
+      1626,   -427,    573,   1197,   -317,   -566,   -663,    460,
+       338,   -442,   -597,   1565,   -854,   -534,   -219,   -128,
+     -2175,    739,   1064,   2050,    -61,   -349,    361,   -375,
+      1111,   -122,   -121,   -164,  -2573,    938,   1758,    -15,
+       884,    865,   -630,   -573,    994,   1112,    -26,      9,
+       -30,   3893,    -38,   1386,    605,    568,   -680,    117,
+        37,    572,    245,    -53,  -1030,   -241,    397,    363,
+     -1632,   -567,    -26,   -698,  -2109,  -1033,  -1389,   1381,
+      -418,    402,   -534,      9,   1143,    991,    693,   2557,
+     -1268,   1273,   -192,   1225,    876,    472,    835,    509,
+      -452,  -1519,    482,   1103,   -626,   -299,   1580,  -1532,
+       599,   2245,    503,   -110,  -1879,    978,  -1158,   -130,
+      -665,    448,  -1247,    604,   -528,   -677,   -711,     78,
+      -563,   -349,    -53,    261,    952,   -338,   -534,     43,
+        -2,  -2555,   1976,   2393,   1715,    996,   5628,   1036,
+       171,    -28,   -199,    -83,   -126,    -35,   -248,   -393,
+        36,    209,     77,  -1793,    244,   -108,   -130,    -41,
+      -578,  -2347,   -687,   1650,    131,   -138,    407,   -228,
+     -1348,   -209,   -841,   1332,   -542,    220,   -193,    843,
+      -103,    853,    261,   -653,    217,   -107,   -113,    -54,
+     -4151,  -1303,   -287,   4065,   -376,    -71,     43,  -1481,
+      -359,   -481,     78,    529,    689,   -194,    178,     60,
+      -997,  -1555,   1687,    345,    169,    266,   2894,     83,
+      -500,   -425,   -396,   -245,      6,    517,    112,    129,
+       725,   -121,   -404,    234,     47,    -61,   -122,    710,
+     -4283,    985,     56,   -105,    -45,   1043,    720,     73,
+       321,   4452,  -1614,     91,   -620,   -299,    506,    766,
+      -882,    650,   -138,    123,   -608,    210,  -1582,   -538,
+       -62,    246,    464,   -332,  -1560,   2271,   1559,   -199,
+      -832,  -1133,   -797,    341,   1860,   1628,  -1133,   -607,
+       637,   -404,    437,  -1148,    542,   -474,   -882,   -610,
+     -1340,   -159,   1524,   1424,    169,     -6,     52,    447,
+     -5513,   -592,    244,   -294,     44,    164,    -51,    147,
+       202,    -48,    139,    113,   -399,    -17,   -173,   -199,
+         1,     17,   -166,     15,   -258,     -7,    238,  -5748,
+      -394,   -852,   -248,    -46,    192,    -32,  -1033,   -349,
+       151,    483,    130,  -1628,  -3391,   1527,    694,   -305,
+       740,   -357,   -491,   -186,  -1649,  -1394,   -873,    213,
+       652,  -1975,    319,  -1131,   -103,    -48,    673,    155,
+      -627,   1115,    469,  -1122,   1901,   -184,   -237,   -296,
+     -2887,   -120,    211,    835,     57,   -826,   1272,   -255,
+      -937,    242,   -525,    836,   -334,    393,   -624,    111,
+      -347,   -178,  -3441,    219,   -352,   1831,   -296,    587,
+      -357,  -1099,      5,    313,  -3806,   -394,    814,   -118,
+      -233,    -23,   -125,    -21,  -1414,    813,   -403,   2482,
+       442,   -184,    934,    340,    472,    374,   1073,   -283,
+     -2348,    477,   -387,   -713,   1071,   -899,    252,  -1299,
+      -502,   -375,   -410,  -1785,    686,   -605,   -141,   -871,
+     -1777,   2780,     53,   -237,   -237,   2701,    944,     44,
+       595,      3,   1263,  -1558,  -2267,   -998,    221,    355,
+      -319,   -739,  -1160,   -594,   2977,    191,    -41,   -284,
+        83,    484,    481,    -73,    -13,    138,  -2761,   -909,
+      -578,   -139,  -1056,    189,   -645,   -147,    -61,   -168,
+       368,    130,    390,   4187,    101,     79,    -45,    451,
+     -1374,  -1941,   -534,   -301,   -979,   -668,   -533,  -2978,
+       386,    574,   -454,     -4,    554,   -120,    366,     83,
+      1079,   -351,    156,    389,   7724,     83,    102,   -191,
+     -1059,   -255,    -86,    451,   -211,    175,    774,    306,
+      -253,   2386,   1166,  -2025,    223,    438,   1279,   1721,
+       -23,    -91,    606,  -1285,   -775,  -3228,   -536,    543,
+       877,   1140,  -1616,   -603,    550,   -678,   -462,    248,
+       209,   -515,   -310,  -2538,  -2002,    231,   -495,    319,
+       538,    509,   -113,    -17,    143,  -3062,    -29,    -52,
+       299,    681,    595,    390,    530,   -398,   -969,    472,
+     -1145,    860,   4113,    329,  -1183,   -691,   -605,    859,
+       305,    986,    -81,   2029,    408,      2,  -2442,     59,
+       -85,   -911,   -285,   -532,     28,    434,  -2295,    -76,
+     -2977,     51,    824,  -1786,   2301,    622,   -593,     -9,
+       643,    246,    427,    193,     51,    118,      4,    234,
+       459,     31,   -408,    710,   -264,    144,   -404,   -476,
+       278,  -4836,   -113,    382,    -29,    177,    345,    -33,
+       -17,    -85,   6027,     72,   -165,    544,   -198,     75,
+      -278,   -262,    155,    501,   -305,   -279,   -439,   1506,
+       827,   -875,  -2592,  -1196,  -1201,    149,     16,    547,
+      1020,   -616,    374,   -193,   -155,  -3627,    231,    264,
+     -2143,     90,    419,    574,   -795,    177,    328,    752,
+      -295,    210,   -360,  -1250,   2639,  -3172,    -13,    -34,
+       489,    484,   -390,   -159,   -285,     27,    444,   -252,
+       265,    530,  -2714,   -340,  -1543,   2330,  -1152,   -114,
+       452,    304,   -224,   -451,   -317,   -579,    301,   -567,
+      1214,   -594,   -621,  -2718,     59,    257,    410,     -3,
+       145,     70,    877,  -3103,    244,  -1134,    236,  -1148,
+};
+
+static const int16_t cb2224s1[] = {
+      8488,    277,     63,    173,    224,    -30,   -158,     64,
+       133,   -133,    234,    205,    -65,    408,    249,   -546,
+       -30,     -1,   -430,     80,    102,   -450,   -160,  -5634,
+       145,   -406,   -351,     37,    282,    232,   -898,    430,
+      3301,  -1175,   -559,    495,   2685,    -21,   -215,    -87,
+       728,    -55,    235,    430,   -250,   -505,    506,   -128,
+       -72,   3288,   1588,    291,      7,    -39,   -944,    478,
+      1719,    168,  -1085,    225,    330,   1480,   -183,   -597,
+     -6131,    668,   -387,    672,   -173,    -55,    113,     40,
+      -113,    -44,    341,   -340,   -594,  -1001,   1757,    127,
+       -59,    537,  -1834,   1401,    856,  -1153,   -234,   1232,
+      -562,    476,    110,   2188,    146,    119,   2119,   -872,
+       450,    597,   -371,  -1350,   -996,   -120,   -495,    829,
+       111,   -897,  -5445,   -670,    390,   -118,      4,    109,
+       772,    495,    196,    410,   -125,    812,    426,    900,
+       436,   1155,   -553,  -1223,    275,    266,   -891,     63,
+     -1267,    523,   -548,  -2445,    239,   1163,     72,    -68,
+     -1576,   2212,   -340,   1499,    494,   -671,    -73,   -281,
+       598,   1901,  -1652,   -845,    266,    795,   -545,   -574,
+        19,   -461,    371,    288,  -3959,    421,    299,   -121,
+     -2561,    -65,    118,    181,   -227,    719,    -92,  -2334,
+     -3178,  -2497,   -198,     58,   1279,   -309,    152,   -715,
+       466,   -316,     10,     98,   1568,  -1015,    -18,   -435,
+       -42,   2606,   1971,   -119,    705,    254,    443,     36,
+       788,   1135,   1234,   2281,    942,    115,    581,   -113,
+      -194,   -694,    434,    -30,   2835,   -423,    436,    522,
+       406,   1329,   1191,  -2628,    421,  -2601,    646,   -202,
+       637,    610,   -584,    357,  -1586,   -499,  -1230,    134,
+       -83,  -1264,   2434,    -58,  -2924,    641,   -285,    172,
+      -478,   -402,    584,  -1180,   -137,   -238,   -151,   -679,
+      -619,   -495,   1044,   1281,  -1180,   -444,    376,   1969,
+      -693,   -283,    618,    128,  -2622,    -90,   -115,    672,
+      1738,   -459,    519,   -924,   2582,    937,   -555,    672,
+       131,     31,    775,    307,   -282,   -527,  -1299,   -516,
+        10,    239,  -4069,    118,     10,   -665,    -15,   -484,
+       472,    262,    279,    677,   -755,   1288,  -1278,    403,
+       666,   -394,  -1230,  -2819,   -221,    109,    603,    754,
+       951,    488,   -147,   -107,   -426,   1875,   2056,   -129,
+       239,   -561,     81,   -324,    243,    349,    197,   -811,
+      -146,   -929,   1193,   1433,   -776,   3209,    434,     -6,
+      2465,   -231,    -57,    312,    899,   -396,   -170,   -549,
+       346,    135,     17,   -596,    401,    269,    499,    -64,
+      -321,   -342,   -132,   -312,   5845,    276,   -104,     -9,
+       -50,   -678,   -478,  -1125,  -1477,   2058,    156,    538,
+       451,   2572,    495,    101,     74,   -753,     98,    685,
+      2424,  -1999,   1050,   -280,  -1030,     29,   -178,   -244,
+      -134,    130,   -137,   -103,   -245,   2161,   -446,  -1016,
+       464,    573,   -473,    446,  -3822,    942,  -1261,   -334,
+       568,   -528,   -301,    415,   -740,    661,   -813,    849,
+      1491,    774,   -774,   1637,   -977,   -246,    647,   -572,
+      -140,  -2946,   -654,   -650,   -311,    339,   -165,    757,
+       803,   -958,    704,    171,    380,    763,    159,   2721,
+     -1599,   1006,   -118,   -597,   2985,   2699,     69,    395,
+       523,    657,    438,    190,     72,    164,   -268,   -145,
+       506,   -550,    222,  -3641,      5,   -173,     60,   -194,
+       677,    686,    724,   -107,    882,   -339,     14,    -54,
+       555,    483,   1523,    119,   -142,   -394,  -1683,   -984,
+        18,   -108,   -190,    141,    540,    281,  -1238,  -2195,
+      -341,   -327,  -1014,   -990,   4694,     46,  -1018,    360,
+      -671,    -83,    218,    857,    144,   -188,    463,   -379,
+      -571,   -865,  -1345,   -447,    -18,    -64,   5201,    132,
+        90,   -158,   -132,    381,    -85,   -107,   -103,    970,
+      -555,  -1204,   1802,   1230,    253,    540,   -372,  -2347,
+      -386,    835,   -705,   -437,    941,    795,   -182,   -368,
+      1088,    168,    256,    210,   -667,    290,   1783,   -636,
+       165,   -363,    638,  -3527,   1872,   1997,   1503,   -189,
+     -2587,   -359,    384,    493,   -384,   -658,  -1758,    993,
+      -306,    148,    198,    163,    430,   -313,   -149,   -337,
+       352,   -354,    484,    358,   -264,  -4525,   -560,    -55,
+       154,    374,   -317,   -426,   1446,   -161,   -285,   -110,
+       209,    299,   2329,     99,   1406,   1374,    993,   1178,
+      -413,   -642,   -103,   3678,  -1829,   -754,  -1358,   -349,
+       648,   -492,    755,    188,    114,   -444,   -930,   -224,
+       319,    212,   1223,   -648,    593,   1293,  -1289,     24,
+      -712,   2591,   -494,   1503,     -9,    534,    923,   1490,
+       985,    491,    272,    988,    348,   -503,   -454,    893,
+       409,   -422,  -1187,   3097,    602,   -402,    462,   1598,
+      -219,    982,    319,    125,    558,   -100,   -261,    108,
+       -59,  -3435,     76,  -1065,   -150,  -1758,  -1997,   1921,
+      1239,    426,    507,    173,   -856,   -829,   -538,    247,
+     -1203,    488,  -1094,    453,  -1104,   1021,   2185,  -2855,
+       427,    177,   -778,   -182,    641,   -670,     91,    569,
+        50,    -90,    571,    108,   -374,    174,   1997,    964,
+       644,   -428,  -1868,    668,    171,    320,    676,    121,
+      -218,   1901,   -857,   -721,   -194,  -2433,    -34,  -1671,
+       352,   -644,    295,    571,    253,   -288,  -1786,     32,
+        74,    -73,   -902,  -1954,  -1126,  -3427,    168,   -318,
+        23,   -755,   -441,    201,    -84,    499,    367,   -153,
+      -426,    716,    650,   -457,     80,   -709,    859,  -2098,
+      -723,   -197,  -1030,   -253,    283,  -1187,   -899,   1403,
+      -117,    -25,   7617,    -63,   -355,   -283,   -560,    -85,
+      -358,    -45,     63,    179,   -193,    130,   -294,   -676,
+      -525,   -907,   -430,   -627,  -5267,   -539,    257,    594,
+      -173,    890,    203,    -33,   -136,   -803,    479,    -56,
+      -634,    464,   -919,   -146,    306,      5,    198,    -90,
+      -138,   -337,   4826,   -310,    259,   1651,   -687,  -1676,
+       424,   2729,   -966,    -61,    386,     60,    769,    -72,
+     -1652,     49,    106,    503,  -1462,  -1056,    892,    359,
+       209,   -129,    260,   -130,  -2081,    798,    488,    846,
+      -836,   -366,   1786,  -2237,   -484,     72,  -2680,   -828,
+      -857,    920,    560,    930,   -197,     56,   -872,    -34,
+      -355,    929,     35,   -449,    514,     70,  -1277,    208,
+       353,   3654,   -256,    134,   -895,   -184,    375,    402,
+      1576,   1515,   -100,   -438,   -679,    384,   1143,    -24,
+       100,  -2818,    554,   -219,    105,    652,  -2778,   -108,
+        44,    306,    445,   -470,  -1151,  -1170,   1305,   -741,
+      1223,   -443,   -838,    374,  -3000,     72,   -590,   -587,
+      3686,     76,   -493,    246,   1348,  -1215,    473,   -244,
+      -304,   1937,    -68,   -626,    278,    392,   1167,  -1899,
+      -309,    474,    226,   -421,    -95,   -483,    105,   -148,
+       749,   -430,  -3057,   -789,  -1793,  -1857,   -158,   -489,
+      -676,   -204,    806,   -930,  -3192,   -204,   -106,   -812,
+      1159,    648,    119,    -93,   -205,   -139,    280,  -7786,
+      -388,   -132,    -12,   -332,     32,   -174,    100,    153,
+        -7,    289,    -29,   -984,   -329,   -592,   2568,    704,
+       544,     66,    521,   -661,  -1632,   -868,   -310,    313,
+      -466,   -347,   -146,    197,    266,    765,   -240,   -201,
+      -265,  -1129,    -35,   -563,   -356,    172,    862,   3831,
+      1547,  -1618,  -1445,  -3726,    388,    548,   -457,    143,
+       -38,    402,    255,    840,   -703,   -154,    776,  -1038,
+};
+
+static const int16_t cb2224m0[] = {
+     -7078,   2846,     79,   -111,    -20,    330,    227,    -36,
+       305,     45,     81,    148,    -13,     68,    364,   -317,
+       -72,   2021,     28,     93,    328,   -256,   -181,   2547,
+       235,  -1102,    130,   -577,   -164,   1290,   1885,   -171,
+      -147,  -3247,    324,    -72,   -313,    -62,     32,    284,
+      -138,     -9,   -146,   1709,   -390,   1833,    289,    125,
+      2369,     60,    223,   -137,    642,   -113,    204,    288,
+     -1516,   -138,    228,    368,    219,   -622,    273,   3211,
+      -215,   -423,    139,     65,     85,   -203,   -953,     11,
+       193,    294,    279,   3267,    246,  -2377,    -59,   -324,
+       136,   -492,     23,    -56,     79,    307,    115,   -146,
+      2229,    325,  -1680,   -597,   -423,   2200,    -44,     48,
+       386,    396,   -122,    -36,     35,   9763,     33,    -67,
+        19,    -34,     15,     41,    -25,    -30,    -61,     20,
+      -121,    117,   -155,    -28,    -65,    -27,     40,    137,
+       188,   -211,   -240,     71,    -33,  -4873,   1992,     56,
+     -2701,     -1,    151,    -96,    286,   -398,   -418,   -221,
+       295,   -394,   -119,   -182,   -124,     77,      7,    -44,
+       168,    -34,   -154,    257,      4,   -114,    634,    131,
+      4930,   -118,  -2364,     46,   -204,   -129,  -3168,   -138,
+      -489,    454,    -96,    120,   -447,      9,   -230,    174,
+     11359,    456,   -261,    -74,   -249,    -28,    149,    -79,
+       -36,    211,    -10,    213,   -110,    337,  -3800,      4,
+      -223,    -18,    136,   -290,   -155,   -235,     57,    447,
+      -495,   -231,    -15,  -1036,    -85,   -154,  -4421,    -19,
+      -237,  -1191,     12,    -19,      2,    -88,    -84,    269,
+        -7,    431,    -26,  -2676,   -100,    287,    -31,  -2916,
+      -160,    -83,   -198,      9,    183,   -279,    -68,    -23,
+       -55,   2955,   -121,    -71,    183,   -702,   -323,   1689,
+      -132,    309,    136,  -1217,    440,   -125,  -1671,   1569,
+      -161,   -108,    232,    269,   -516,     37,     21,   -260,
+      -230,    564,   -375,    224,    129,   4332,   -120,   3306,
+       153,    -25,   -260,    -84,    123,     21,      5,    -17,
+      -145,    -44,      7,     -1,    290,  -2394,   -182,     51,
+       933,   1037,     26,    211,    187,  -1783,     68,   -749,
+       -52,   1428,  -1571,   -261,     34,   -199,    722,   -127,
+      -118,   -114,  -2385,    146,  -1042,    -71,  -1475,   -150,
+     -2195,    151,    -29,      6,     96,  -1213,    282,    219,
+       466,    144,   -300,    109,    -74,    125,   2863,      2,
+     -2963,   -218,    235,      3,    359,    319,    372,   -500,
+      -271,    494,   2695,    -65,    -29,     47,     74,    -34,
+       -95,    -48,    -76,    -71,  -2985,    -30,    -11,     26,
+      -176,    107,     96,     22,    -60,    114,    -70,   -147,
+       -43,   6981,    110,    -86,     33,     66,      8,    -61,
+        52,   -169,     82,    233,     56,   -115,   -295,    241,
+     -1053,  -3914,    -79,    361,   -869,   -144,   -144,   -805,
+       158,   -278,    515,      4,   -317,    917,   -669,   3314,
+       253,   1316,    259,     12,   8170,     15,    129,   -200,
+       120,    -11,     34,    -77,    -13,    257,     79,      9,
+        23,     54,     73,      0,  -9972,      5,      7,     43,
+        29,      4,   -104,     43,    -36,     76,   -228,      1,
+       -77,   -156,    -69,   -209,     84,  -2826,    242,  -1461,
+      -718,    -14,   1784,    527,    226,   9852,     83,    -15,
+      -389,     34,     51,    -16,    -46,     -1,    232,    115,
+        26,    -42,   -124,    -78,     58,   3092,  -2757,   -111,
+       223,   -286,     23,   -170,   -166,   -264,    331,   -172,
+       -49,    -26,    166,   2616,    128,   3118,     59,    844,
+      -121,   -504,   -193,    -53,    -95,    282,    -21,     -8,
+       -11,     58,    -48,   9830,     25,    -26,     53,    113,
+        96,    125,     12,    -64,    185,    -31,     19,   -251,
+      -307,   -136,   1383,    -37,   -128,     56,   4303,   -232,
+      -272,     44,   -192,    531,   -143,   -697,  -2291,     70,
+       229,   -432,   -592,   1262,    906,   -207,   1522,    261,
+     -7848,    -39,   -976,    150,    115,   -139,     61,    -26,
+      -211,    807,    -25,    311,    -98,   -297,    133,    461,
+      -109,     -6,  -1031,    236,  -2851,     86,   2184,   -254,
+       -83,   -119,    878,   -107,    -25,   1636,   1696,   1517,
+       249,    -41,   -283,    -66,    741,    704,   -898,    302,
+       470,    360,     -7,  -6002,     26,    268,   -109,    150,
+       202,    196,   -262,    -57,    160,    155,      7,      9,
+     -5770,     28,    127,    112,    -76,   -790,     45,   -118,
+       201,   -831,     67,    -81,    199,    296,   1692,    -30,
+      -126,   -121,     29,    387,    215,    269,   -518,   -232,
+       155,   2735,   -235,    -82,    -33,   3089,  -3696,    -39,
+       -51,    124,   -220,     37,     51,   -129,    194,    -80,
+        81,      0,   -239,  -1924,   -244,    107,    372,    111,
+       206,    418,     39,   -118,  -2059,   -446,   1378,    661,
+     -2135,    122,   -105,     60,    272,    -91,   -227,     48,
+     -3226,    -88,   -109,    199,    566,    158,   2412,  -4380,
+      -177,    153,    252,     24,   -323,    264,   -116,    -12,
+      -333,     99,   -181,   -124,    256,   -131,    -39,    -45,
+       -88,     69,    -26,   -173,  -4820,    286,   -171,    -82,
+       431,     18,   -827,   -107,    142,     60,    300,    422,
+       263,     61,    350,     85,   1088,   -133,  -1284,     70,
+     -4577,      5,    114,    -23,     23,   2907,    174,     43,
+        18,     33,    -31,    320,     -9,    290,      2,     -7,
+        39,    -11,     52,     32,     -4,   8454,     18,     10,
+        67,     20,     22,     -3,   -209,   -103,   -212,   -101,
+      -101,   -420,  -2837,    -28,    398,    140,   1027,   -187,
+     -2338,    406,   -152,   -288,    723,   -412,  -1851,    185,
+       641,   -190,    107,     -7,  -3194,   -128,   -382,    165,
+      -256,     85,     96,    155,   -144,    431,   -356,    342,
+     -2508,  -2190,   -265,   -320,  -1345,     27,  -1981,  -1949,
+        95,    -78,   -456,   -359,    382,   -218,   -102,    164,
+       382,    907,    599,    665,   2843,   4275,     17,   -156,
+      -264,     73,    104,    -25,   -120,     91,     84,    325,
+       170,    -65,   -245,    -23,     89,     52,   4651,    124,
+       185,     30,    321,    145,    111,  -1265,    128,   -156,
+        64,     24,  -1934,    133,    -84,    -10,     34,    801,
+      -148,    -88,    169,  -1687,    419,   1739,   -204,    -70,
+       185,    117,    379,   -420,    145,  -3650,   -264,   1118,
+       331,   -818,   -665,   -420,     74,     32,   -152,   -226,
+         6,    216,   4173,     23,   1230,    239,      2,    -57,
+      -690,    516,     90,     58,    -24,    -61,    175,  -2796,
+      -113,   -270,     94,  -2319,   -158,  -1075,   -275,   -647,
+     -3839,     37,   4267,     20,    -49,    -88,     72,   -171,
+      -195,     45,    -23,   -159,    -64,    110,   -211,     42,
+      -211,   1591,    276,  -3662,    213,     54,   -180,    786,
+       -92,   -329,    382,    344,    165,    -63,     14,     -7,
+        66,     29,   8875,     43,    -50,     65,     13,     15,
+        48,    -40,    114,    125,    -27,    158,      3,    843,
+         8,   -646,    100,  -3121,   1720,     88,    898,    346,
+};
+
+static const int16_t cb2224m1[] = {
+      9581,   -198,   -100,    -22,    237,    -15,   -101,    -23,
+        46,    129,     63,   -143,      5,   -307,   -143,     -9,
+        27,     50,     40,   6048,     25,     58,    -16,   -161,
+      -109,   -157,    137,    115,    121,    164,      4,    -54,
+      6477,    -68,   -120,    -29,     45,     -8,    -13,    334,
+       -87,    105,  -1460,     28,   -334,   -163,    -64,  -3629,
+       -71,    176,   -195,     53,     -1,    -96,   -560,    -21,
+       135,    178,    -77,  -4202,     20,   2544,   -205,     85,
+      -332,    158,     61,   -105,    398,    -88,     14,    241,
+      -149,     62,   -124,   -136,   -153,     27,    190,   2595,
+        25,  -2499,   -530,   1809,   -104,  -2753,    298,    145,
+      -771,    139,    165,   2462,   -502,    860,   -174,    199,
+        74,    163,   -686,    -25,     57,   -103,   -309,   -360,
+        39,   -296,  -2765,   -319,   -950,   -678,  -1159,  -1743,
+      1499,   1776,   -176,      9,     44,   -581,     69,     39,
+       162,    326,    -96,    329,     -9,   1274,  -2443,   -105,
+       -50,   4212,    -23,    146,   -231,    -22,    -50,   -128,
+        11,     28,    116,   -215,     46,    217,    204,    153,
+       -73,   -156,   -100,    -31,   2632,   -190,  -2258,    199,
+     -1757,    194,     53,     38,  -5723,     66,    169,    352,
+       -39,   -150,     -1,   -462,     41,    -98,   -110,    -40,
+     -5763,   -190,   -158,  -1380,    205,   -227,   -402,     81,
+      -171,    407,   -125,   -320,   -456,   -317,    489,    698,
+      -308,   3989,   -172,    402,    196,   -457,  -1238,   -192,
+      -581,    -63,   -235,    153,  -1094,    -53,    -45,    -86,
+       240,   -192,  -2660,   2356,    153,    -60,    277,     33,
+       198,    -57,   1221,  -2984,   -327,   -326,    -48,     61,
+        93,    -34,   -167,   -311,    904,    348,    415,     57,
+      2000,    -77,    238,     40,  -3072,    -36,    283,    -54,
+      -655,   -250,    -22,   -569,   -584,    -18,    733,   -251,
+       -72,    -28,     80,   -306,    211,    188,   -149,   4596,
+       305,    372,    351,    -82,   -184,    -79,    -65,   2688,
+      2670,    -54,    -81,   -170,     19,    -88,    122,   -117,
+        33,     51,    -29,   -113,  -2973,     46,  -3294,     90,
+         8,   -180,   -227,    -62,     43,    -25,    187,   -380,
+       -29,    -89,    138,   -352,    231,   2632,    158,   1993,
+       -15,    350,    107,   -982,    -16,  -1120,    136,   -171,
+       -42,   2605,   -186,    110,    167,   1673,   1140,    -29,
+      -689,     81,    909,   -455,   2979,     44,      1,   -260,
+        26,     28,    -90,   -568,   -123,   -175,    232,    -38,
+      2372,    111,    312,    529,    -65,    331,    100,    488,
+        12,   -596,   -497,   2311,  -1097,   1242,    -94,  -2290,
+      -158,  -2651,     16,   -232,   3352,     24,    -53,    -83,
+        -5,    -52,    205,   -104,   -294,    217,   -196,    -37,
+        -7,      0,    -28,    -45,     60,     13,     41,    111,
+       142,  -7331,    -40,   -200,     18,   -166,  -1266,    -47,
+      -250,   -592,   -604,     33,     83,   -204,  -1131,   -166,
+      1348,  -1337,    184,     50, -10066,     30,     24,   -184,
+       137,     53,     32,     87,    -27,    151,    100,     10,
+       -47,     28,   -138,     12,  -2977,   -376,     58,    168,
+      1642,    144,   1039,   -399,   -807,      5,  -1715,     12,
+      -142,    -77,   -306,    758,    674,    -82,   3216,   -369,
+        60,    480,    276,   -423,   5102,   3325,    169,     47,
+       235,     37,     81,    -86,    -28,    -56,    -59,   -205,
+      -126,     28,    279,  -8433,    137,    -26,   -409,    -19,
+       106,   -163,    -76,    -57,    235,      7,    131,    -81,
+      -197,   -318,   1281,    310,  -2934,    972,  -1335,     35,
+      -308,    -93,   -128,    433,    527,   -193,  -1303,    162,
+       -34,    -87,   -157,    262,   4999,     25,   -311,   -349,
+        94,   -262,      0,   -219,     57,     12,     -4,     10,
+       -17,     38,   -320,     48,    156,     80,   5880,     48,
+        45,     31,  -1022,     31,    227,   -727,   -135,    261,
+       -21,   -688,    307,   3196,    565,    627,   -546,    237,
+     -2367,    -33,   1622,    -87,   1722,   -201,    720,   -539,
+      -288,  -1012,    141,   -388,    -72,    -20,    -59,  -2042,
+       -53,   -101,    208,   -233,   -835,    -16,   3092,      2,
+       310,     94,   -362,   -163,   -128,     30,    -22,   -145,
+       420,     -1,    322,   -524,   2742,   -276,    206,  -2475,
+       575,   -653,   -342,   1412,      1,     75,    -14,     54,
+       170,     66,    342,   -261,    709,    -75,   2240,   -134,
+        32,    665,    171,   -134,   1822,    109,    569,   3129,
+       168,   -356,     53,   1259,    -67,     43,    120,   -124,
+      2185,   2461,    -17,   -255,   -349,   -167,   -158,    -19,
+        84,   -732,   -972,    286,     87,   4603,   -160,      7,
+       141,      1,    286,    310,   -315,    -99,    282,    384,
+        68,     93,  -1815,     63,    -86,    121,   -293,    210,
+       115,     63,   -174,    616,  -1848,   -124,   1275,    298,
+       185,   -267,   3516,   -105,   -162,   -253,   -434,   -674,
+       -90,  -2232,     38,    168,   -261,    289,     70,   3714,
+      4096,    -81,     17,     56,     57,     68,    -20,   -146,
+        28,   -152,    -17,    -97,   -131,   2648,     71,  -3359,
+        40,   -277,    313,     85,    -26,     41,   -202,     76,
+         8,    -80,   -160,   -102,    -17,    155,    189,   1552,
+     -3498,   -446,   -103,   -232,   -205,   -574,   -132,    169,
+       206,   1689,   1043,   -736,   -178,    -93,  -2969,     26,
+      -251,   -148,    139,     70,   -325,    117,  -3073,      9,
+        43,    -11,   -380,   -190,   -314,  -3012,     50,   -330,
+       -26,    710,    153,     19,  -2943,     58,  -3052,    -56,
+         7,     40,      9,    321,    -37,   -461,    -22,   -374,
+        57,   -203,     16,    -15,    -25,    -16,    -37,     -8,
+       -41,   -116,   7964,     70,    -59,     77,    200,      0,
+       -43,    118,    -72,    -67,    104,     -6,     78,    171,
+        13,   -103,    793,     98,  -4738,   -204,     11,     30,
+       -72,     33,    -62,     47,    157,    236,   -147,   -416,
+      -726,    578,      5,   4038,    162,     -2,   2367,   -138,
+      -185,    470,   3121,     70,    185,    -22,   -205,     37,
+       -63,   -335,   -397,     43,     10,  -6557,   -112,   -254,
+       106,   -129,   -236,      0,   -250,     42,   -128,     84,
+      -531,    -27,   2259,   -282,    -21,    -70,   -408,     19,
+      -664,    945,   -196,  -1074,   1369,    -40,  -3233,     28,
+        20,  -2133,    125,    343,    113,    584,    -14,     50,
+      -130,   -464,    513,    807,  -4474,    -63,     57,   1120,
+        64,    -30,    346,    462,    129,    219,    -30,    287,
+       448,    384,    198,   -359,   1097,   -256,    828,  -2635,
+      -314,    336,    506,   -144,    194,    167,   1323,   -273,
+     -4168,   2805,   -118,     -8,    136,    -82,   -212,     53,
+      -259,    -61,     94,    214,     11,     29,   -262,    -69,
+        24,    102,     45,    -31,   -186,     58,    641,    659,
+      -172,   3628,   -192,   -423,     34,      3,     45,     19,
+       349,    117,     -5,  -4923,     99,   -148,    180,    631,
+        50,   -204,    641,    -92,    156,  -1985,   1077,    201,
+        56,   -405,    710,   -220,  -1917,   -273,   -234,    100,
+};
+
+static const int16_t cb2224sl0[] = {
+     -3113,     97,    229,    309,   -156,   -226,   -469,    582,
+     -3202,   -336,    102,     20,     96,   -960,    297,   -227,
+       592,  -3352,   2798,   -637,   -133,    191,   -407,    170,
+      -576,   -203,   -280,    808,    853,   -502,   -113,  -1704,
+     -1025,    411,   2802,    233,   -568,    360,   -616,  -1715,
+        47,    391,  -2117,   -458,   -291,   -149,    -82,     26,
+       -29,    -88,   -156,   7905,     32,    -75,   -154,    -78,
+       -44,    155,     -1,   -338,   -891,    170,    -75,    155,
+       226,   -192,   -328,   -239,   -574,    -91,     95,   -600,
+      4271,     25,    990,   -207,   4676,     59,   -324,    884,
+       363,     65,    423,   -776,   -906,    -79,     -4,   1475,
+       549,   -252,   3584,   3543,   -409,    282,    278,    125,
+      -379,    125,   -180,   -123,   -252,   -316,   -193,    347,
+        53,   2009,    195,    152,   -104,    233,    -75,   -546,
+       564,   -177,   3243,   -865,   -924,    518,   -692,   -381,
+     -1885,   -110,   -188,   1140,  -2043,   -438,  -1721,   1019,
+      1678,     13,    273,   -751,    922,   -291,    -15,     75,
+       232,   -112,     60,   2702,     88,    175,   -119,     43,
+      -549,  -1094,  -1879,    401,   1587,   1287,    -41,     41,
+      -116,    -23,    313,    168,    147,   -101,    -57,   -115,
+     -6990,     54,    -14,   -240,   -164,    127,     25,   -703,
+      -361,    769,   1555,  -2440,  -2616,   -192,     86,    769,
+       -29,   -721,    554,   -663,    327,    659,    -31,    -79,
+        91,    365,    -74,   1268,    115,    480,   3054,  -1758,
+      1704,    759,   -657,   -272,   -329,     31,   -145,   -534,
+      1265,     73,    435,    -54,    480,   -867,   2724,   2373,
+       890,   -314,   -112,  -2576,   -598,    473,    121,   2764,
+      1659,    105,    579,   -416,    -87,    158,    300,    447,
+      -281,  -6109,     35,    217,    185,     56,   -357,    151,
+       108,    -49,   -282,   -484,   -220,    -78,   -141,    256,
+     -1095,   1812,   -985,   1115,    555,  -2116,   2317,  -1141,
+      -792,   -866,   -119,    187,    615,   -194,     73,    -43,
+       268,    437,    250,    -52,    477,   -249,   -475,  -2621,
+       590,  -2987,   -603,   -652,    971,   -684,    337,   -140,
+      -336,   2342,    390,   -204,    295,     85,    -44,    321,
+       754,   2660,     61,    782,   1654,    -76,   2727,   1590,
+     -1099,    354,     49,   2784,    443,   -762,    828,   -308,
+      -493,   -755,   -370,   -336,   -207,    388,    630,   -127,
+      1955,   1929,   1270,   2054,    525,    388,    562,    942,
+      -789,   -453,    158,    995,    -99,   2258,   -317,   -493,
+       385,    -90,    -79,    199,  -1187,    519,   -254,    179,
+       573,   2803,   2341,    407,     95,    515,    332,      1,
+        -6,   -337,    142,   -316,    418,    542,   3281,     10,
+       604,   -542,  -1595,     43,     79,     10,     75,   -122,
+       100,    -55,    212,   -223,   -353,   -557,    490,   4870,
+     -3689,   3594,   -145,   -192,    -47,   -252,   -380,   -180,
+      -221,    656,     78,   -188,    120,    135,   -253,   -437,
+      -208,   -151,   -504,    217,  -3715,   -150,    528,    121,
+     -1468,    383,    823,    -55,  -1167,     -8,   -198,   -515,
+      -296,    -24,     84,    129,   -472,      7,   5071,   -114,
+      -200,    -16,   -271,     59,   -430,   -142,   -315,     90,
+       273,    -56,    370,   3342,   -159,    235,    934,   1605,
+     -1499,    207,  -1650,   1137,    396,  -2250,    276,   -320,
+      -317,    -23,    276,   -519,    163,    566,    366,     -6,
+      2262,  -2035,   -662,  -3300,   -133,  -3811,   -362,   -348,
+       113,    146,    -79,   -298,    238,    221,     99,    194,
+       326,    325,   -112,  -8160,    -59,    -15,      8,    -41,
+      -261,    -20,     -6,    -68,   -140,    -41,    167,   -125,
+       129,    337,   2404,    281,   -336,   -475,   2085,  -2646,
+       572,  -1308,    376,    114,   -506,   1062,   -575,   -529,
+      3347,   -212,    520,    274,   -163,  -3058,    -93,   -203,
+      -932,   -207,    -36,    303,   -117,    278,    287,    204,
+       205,   -228,   -242,    227,      3,    611,   -190,   -458,
+       -44,   -209,    122,   -390,  -4561,   -139,   1378,   -329,
+       440,    989,  -1782,   -348,   1241,    967,   -477,  -2312,
+       554,   -970,  -1103,    473,   -771,    -50,    150,    327,
+       394,   -267,   -648,   -680,   2376,  -2543,    276,   1220,
+       552,     10,   1399,  -1498,   -801,      9,   2351,    -55,
+       155,    327,     88,    864,    428,    179,  -3234,      6,
+       544,   -647,   -306,    132,    329,   1147,   1920,   1436,
+     -2107,  -1122,    341,   2020,   -432,    -97,    117,    793,
+       100,   -693,    174,   3639,   -570,    910,  -2771,    231,
+      -148,   -960,  -1085,     57,    188,    744,   -709,   -441,
+       533,   -295,   1287,   2939,   2987,    885,    611,    700,
+       364,   -205,   -855,   -617,     48,   -162,   -244,   -318,
+       208,    772,   -124,  -2505,    454,    330,   -220,    335,
+      -362,   -899,   -827,   2188,    -40,  -1638,    356,   -160,
+      -127,   2886,    -69,    -41,    209,   1847,   -236,   2752,
+       -24,    387,    354,   -111,    526,   -237,  -2169,   1319,
+      2211,    144,   -348,   -434,   -319,   1373,     78,    906,
+       701,    539,   -134,    414,    496,   -325,    -36,    116,
+       124,   4198,    -35,   -439,   -208,   -531,   -100,   1453,
+      -175,    723,   -908,   -461,     87,    127,    -91,   -125,
+      -140,   8012,   -186,     23,    -93,    107,    176,    218,
+        35,    193,    174,    -27,     -4,     77,   -103,   -199,
+       116,    -41,    -80,    186,  -6965,   -188,    125,    -54,
+        43,      9,    -49,   -192,     69,   -136,    -24,   -117,
+     -2244,   2289,    145,    226,  -1161,  -1950,    881,   -152,
+      1611,   1015,   -174,   -277,   -158,    369,     49,   -233,
+       221,    275,     69,    108,    136,   -124,      1,   -470,
+       376,    149,  -7596,     55,     53,    213,   -247,     80,
+      -217,    -11,    189,    125,    -17,   -141,    165,  -2890,
+        14,    201,    106,    242,   -254,   -306,  -3157,    459,
+       -10,     24,   -271,    877,    437,   -438,     18,   -126,
+        -9,   5553,     63,     22,     55,    172,     21,   -335,
+       127,    160,    208,    121,     13,   1989,    676,   -294,
+      2208,    -78,    634,  -1518,  -1037,   1309,    124,    -39,
+      -322,  -1420,   -404,    377,    -35,    -14,    178,    110,
+     -8146,     26,    -98,   -153,   -243,    145,    280,     -8,
+        29,    -57,     85,   -309,    281,    282,    -47,    -27,
+      2827,   -947,    141,    856,  -2481,    406,   -638,   -362,
+     -1031,    230,   -341,   -119,    -17,      1,    190,     41,
+       -15,   5111,     59,     74,    123,   -282,    -25,   -300,
+         4,   -460,   -216,    295,   -217,     26,    227,     62,
+       385,    748,   2923,   1946,    391,  -1676,    599,    148,
+      -456,    -96,   1066,    478,    117,    255,   -169,   -669,
+     -1939,   -656,   2676,    677,  -2020,  -1314,    425,   -525,
+       -89,   -522,   2707,    153,      5,   -207,    244,  -1045,
+       331,  -1315,    -82,    449,  -2444,    326,   -484,  -2232,
+      2380,   -591,   -999,  -2552,  -1581,    349,   -440,    217,
+       298,   -729,     -6,   -396,    -74,    110,    -70,  -3543,
+      -388,    -51,    596,    126,    295,   2075,   -123,   -693,
+     -1072,  -1779,   -420,    127,    432,  -3241,   -231,   -246,
+       105,   -437,    -67,   -119,  -2941,   -257,     47,   -969,
+       379,    618,    -93,      7,    202,   -425,    -38,    140,
+       458,   3599,    242,    -24,   -811,   -624,    -19,    524,
+      2398,   -300,    111,    376,   2015,    431,    125,    231,
+      -293,  -2379,   -634,   1842,     -1,  -1326,   -610,    -88,
+       128,     80,     75,     30,    172,   -235,     34,    206,
+       -79,    328,    128,   -283,  -6862,   -101,    260,     68,
+};
+
+static const int16_t cb2224sl1[] = {
+     -3710,   -340,   3183,    200,   -124,    423,   -417,   -432,
+       232,   -808,     85,   -145,     39,    196,   -197,    -60,
+      -154,   -213,   -320,  -2941,    993,   3044,   -508,     61,
+      -853,     75,     40,    873,   -765,   -365,   -621,  -2670,
+       188,     57,   -403,   -230,   -137,     40,    565,  -1910,
+     -1120,  -1019,   -603,  -1927,    150,  -3089,     23,   -416,
+      -199,  -3265,     15,    128,   -525,   -531,     91,    -39,
+       578,   -388,    315,     40,   2376,   1762,      2,  -1475,
+     -1774,    111,    934,   -459,    777,   -582,    114,   -218,
+       -82,   -195,    165,   2171,    632,    -67,    239,    345,
+      -257,    104,    -34,   -879,    488,   -422,  -2156,   -823,
+      1940,    699,   2911,   -233,   -125,   -218,   -111,   -335,
+     -3475,    -61,    -71,   -445,    249,   -330,    102,    376,
+      -116,   2667,   -453,     19,  -4129,     90,   -507,    236,
+       418,     43,     79,     61,    296,    181,    190,    408,
+       216,    198,     32,    -81,    245,   -157,   5555,   -162,
+       318,    179,    339,   -463,   -448,   -254,   -526,   -192,
+      -427,    575,    588,   2792,   2683,   -853,   -566,     19,
+       -26,    106,   -220,    518,    734,   -233,     68,   -604,
+      -231,    256,   -187,    -59,   -405,    206,    331,    -25,
+     -4837,   -323,    146,    541,    723,    915,   -144,    450,
+       102,   -371,     27,     88,    -80,    276,    239,    101,
+       157,    -69,    -14,    234,  -8192,    -18,   -110,    -52,
+        -8,     48,     79,    -43,    153,    187,    211,   -118,
+      -111,    238,     11,  -2006,    680,    478,   -695,   3078,
+       -30,    892,    -23,   1512,   -194,    423,    -16,   -318,
+       895,    406,    634,     47,  -3277,   -205,   -764,    297,
+      -357,    -61,   -188,  -1547,   -868,   -174,    342,    261,
+      1926,     88,    -35,  -3250,    -20,   3168,   -368,    778,
+       376,    167,    598,    442,    134,    487,    164,    -32,
+       245,    436,   2067,    595,   -578,     49,   -163,    633,
+       138,   -279,    -99,    118,   1141,  -3168,    580,    -90,
+     -3192,    551,   -663,  -2673,    -55,    147,   1307,      9,
+        15,    432,    307,    527,   1002,   -469,  -2380,   -342,
+      -293,    -73,   -259,    410,    309,     76,   -320,   -161,
+       282,  -3300,     -7,    160,    732,    484,    -65,    147,
+      2923,   2321,   -840,   1933,    268,    684,   1172,   -377,
+      -365,   -568,   -283,    492,   -538,    409,   -194,     17,
+      -297,    -52,   -123,   -270,    161,    -94,     92,   4495,
+      -396,    540,    229,    -30,   -108,     29,      1,    198,
+       492,   -572,   -394,  -2386,   2787,    885,  -1175,   -129,
+     -1137,    220,    148,    261,    -65,   -244,      1,     58,
+       195,    -49,   -290,    -94,    -21,    105,     71,   6641,
+      -200,   -407,   -496,    -75,    233,    222,    549,    363,
+       188,    739,   -869,    122,   -355,   3326,    323,  -2366,
+       115,  -3207,   2783,   2015,    148,    924,   -153,   -133,
+      -175,   -287,    400,     73,   -181,   -174,     72,     45,
+       219,    -92,    -11,     59,  -5407,   -362,   -188,   -120,
+       239,    249,    133,   -229,    158,    180,   -575,  -2386,
+      -354,    248,    532,   -590,    615,    -85,    -69,    394,
+      3052,   -877,   -320,    484,    218,   -463,   -202,   -841,
+      1729,    284,   1253,   2193,    526,  -2444,   -351,   1287,
+      -373,    387,    440,   -203,    163,   -153,    206,    -57,
+       -96,   2616,    -84,    552,     33,    705,   -731,   -843,
+     -2197,  -2138,   -570,     22,   -264,   2143,    725,   -132,
+      -392,    471,   -245,     51,    739,  -1057,   1049,   -760,
+      2701,    456,     20,    484,    595,   3248,  -1415,   -862,
+       332,   -417,    323,   -431,   2082,     78,    684,   -169,
+       596,   -228,   -219,    172,    160,   -180,   -228,  -3193,
+      -520,   -100,   -447,   -629,  -2178,   -259,   -246,  -1788,
+     -2264,    223,    115,    -74,    230,  -2515,    212,   -179,
+       456,    209,  -2379,   -246,   -345,   -102,   -559,    259,
+      -270,   -426,    333,   -358,   2866,   -589,  -1494,   -418,
+      -160,   -138,   2088,    683,  -1313,   1061,    -88,    916,
+      -148,  -2329,   -301,   -271,   -249,   2822,   -525,   -405,
+       592,   -322,  -1328,    -16,    135,   -582,   -676,   -503,
+     -2162,   -327,   -237,    361,    166,    600,   1176,   1015,
+        97,     -5,    465,   2321,  -4544,    202,   -350,    313,
+       149,    544,   -420,    552,    183,    351,  -1663,    688,
+       238,    587,    907,  -1719,   1267,  -2325,    368,    236,
+       296,  -2608,    240,    997,    496,    105,     75,   -179,
+       235,    125,    -40,     57,    -22,   -412,   -464,   -494,
+       -81,    576,  -3461,  -1037,   -744,   1358,   -856,   -284,
+      -536,    387,   -358,    184,    -85,   2150,  -1142,   -124,
+       119,   1242,    648,    711,   2161,   -591,  -1864,   -672,
+        62,   1879,    -13,     55,    285,   -167,    142,   -130,
+       322,      8,    -35,   -230,    632,   -699,   4114,   -500,
+      -189,    -48,   2746,     47,    421,  -1200,   2418,    460,
+      -306,    331,    164,  -1358,    802,    453,    458,   3594,
+      3065,    -24,   -134,   -437,   -892,   -110,    241,   -368,
+       336,    673,   -147,    130,    154,     89,     81,   -341,
+      7151,    175,    118,   -227,   -282,    262,    276,   -118,
+      -118,   -245,      7,    144,    -87,   -136,   -146,   -484,
+        70,    221,   -220,    -13,  -7638,     93,    -38,   -319,
+      -478,     26,    -28,    281,   -180,    182,   -186,     90,
+       192,     50,  -2919,    153,  -2651,    289,     47,   -783,
+       768,    384,     39,    194,  -2358,   1242,  -1679,     80,
+      1292,     28,    682,   2807,    342,    466,    299,   -380,
+       376,   4466,     12,    553,    153,   -447,    733,     99,
+         8,   -142,    606,  -2364,    168,    167,    -62,    404,
+     -3144,    352,    115,  -3734,    360,   -202,   -462,   -196,
+       464,   -412,    192,   -363,   -413,   -405,    254,    357,
+     -2801,   1054,  -1602,    642,   -254,   -430,  -2259,    -97,
+        16,   -311,    757,    -64,    412,    339,   -227,   -216,
+       -29,    219,     67,     63,     26,   -232,   -138,   -301,
+       241,    -52,  -6118,    223,   -379,   -157,   -221,   -201,
+       -93,  -5630,   -286,   -194,    133,     46,    151,    444,
+      -472,    103,   -115,   -259,    -53,    673,   1744,  -2374,
+       359,   2541,    613,   -393,   1235,    221,   -117,   -842,
+      1166,    105,   -142,   1426,      3,   -423,     36,    398,
+     -2742,    723,   -740,    985,    498,    431,  -1312,    832,
+     -1644,    146,    -69,   -110,    420,   -130,    335,    269,
+     -2865,    -67,    -88,     50,   2735,   1038,    973,    371,
+       654,   -169,   -112,    579,   -319,   2434,   -760,    710,
+       241,  -1889,     39,  -1807,    -30,   1383,  -1080,    449,
+       639,  -2478,   -760,    559,    298,     56,   -421,    818,
+      -442,   1558,  -1610,   2136,    -12,    -11,    592,     73,
+        77,   -172,     77,     92,   -113,    281,    581,   -584,
+     -4448,    507,   -195,    183,   -508,    312,   -724,   1043,
+       -18,    -10,   -776,   -534,    249,  -3178,    904,   1234,
+      -482,    382,  -1040,   -448,   -579,    227,    -82,   5628,
+      -165,    255,    109,   -141,      7,    -28,     63,     93,
+      -211,      0,    162,    581,   -153,   5844,    -66,    122,
+      -102,    -90,   -205,   -181,    243,    312,    111,   -435,
+      -105,   -343,    272,   -141,      6,    -98,    -16,    -73,
+       -26,   -125,  -7627,    -73,    -66,    108,   -175,    186,
+      -189,   -102,   -240,    -37,   -354,   -260,   -120,     30,
+        87,   2560,   3157,    369,   -662,    338,   -503,    -66,
+     -1405,    178,   1100,   -683,  -2618,   2459,  -1291,   -248,
+      -139,   -683,   -865,   1445,    165,    368,    507,   -585,
+};
+
+static const int16_t cb2224ss0[] = {
+     -6880,    657,   -621,     69,    219,   -588,    681,    229,
+       248,   -302,   -110,    734,     12,    253,   -454,   -890,
+     -3596,    778,  -2600,   -256,    529,    332,    -69,    295,
+      -455,    982,   -265,    -70,   -332,   -367,   1494,    586,
+      -158,  -1054,   2529,   -313,   -661,  -1302,  -2486,    476,
+         5,    126,    581,    361,   1618,    650,   2033,    202,
+        76,   -265,   -161,   3659,   -800,   1069,   -167,  -1792,
+       389,   -580,    597,   -268,    621,  -1035,    710,    854,
+      2004,   -785,   2714,   1659,    785,    800,    -80,      9,
+      -341,  -1032,    789,    651,   1068,   -609,    661,    747,
+      -928,   -999,  -1369,  -1173,   -416,   1596,  -2800,    330,
+       546,  -1275,   -746,   -392,   -529,   -378,   3571,  -2795,
+      -731,   -183,   -330,  -1591,    371,    866,    323,   -516,
+       -89,   2277,   1593,    960,  -1726,  -2229,    727,   -415,
+       189,    500,   -145,   -177,    550,    467,    240,   1131,
+       474,   -419,  -1236,    674,   -616,   -519,   2439,  -1213,
+      -650,    867,    974,   -908,   1229,   -512,    932,   -495,
+     -2521,   -865,   -466,      8,   -426,    912,    -77,   -236,
+      -407,    433,    128,   3653,    854,    243,    770,    191,
+       224,    -68,   -453,   -383,    279,   -701,   -691,    282,
+      -449,   1148,   -783,    241,  -5021,    643,   8113,   -345,
+        13,     90,    -57,    475,     64,   -268,   -163,   -100,
+       -95,    518,    577,    541,   2055,    358,   -157,    360,
+       280,   -840,  -1161,    500,     95,    302,   -662,   1134,
+       827,   3300,    695,    775,   -798,  -2651,  -2891,  -1123,
+       555,  -1125,    156,    328,    671,    751,   -347,   -972,
+      -392,  -1216,   2725,  -5152,   -402,    -15,    150,     31,
+      -182,   -278,    245,     81,     -3,    -46,    310,    -72,
+      -138,   1511,  -1762,  -1840,   -364,    123,   2801,    -16,
+      -543,  -1312,    562,   -262,    148,    521,   -711,     61,
+      -863,    145,    329,    761,     76,   -155,    101,  -4986,
+       192,    269,   -364,   -174,    640,   -261,    629,   3638,
+       397,  -1757,  -1177,    342,    388,   1089,    824,    115,
+       150,    125,    806,   1271,   -198,    800,   -175,   -897,
+      -649,   -837,    690,   -755,   1416,  -2347,   1179,   -781,
+       826,   1567,   -148,   -156,  -1036,  -1572,   1248,   -187,
+       464,   -260,   -749,  -1070,     85,   -466,  -2160,  -2802,
+       233,   -181,    447,   -482,    113,    548,   2957,  -1600,
+      1341,   -559,    803,   2085,   -807,   -711,  -1169,   -456,
+       657,    -76,   -147,   1932,  -1054,   -967,  -1100,    -49,
+     -2829,   1412,    929,   1207,     58,   -146,     77,   -458,
+       538,   -627,    -12,    214,  -2397,    692,   1284,    366,
+      1286,   1997,   -856,    267,   1866,   1236,     25,    254,
+     -1187,   3456,    283,    584,   2348,    604,  -1130,      7,
+       500,    232,    -51,    120,   -695,   -930,    317,     67,
+     -1346,   -500,    312,  -1060,  -2338,  -1860,  -1491,   1539,
+     -1707,    778,   -653,    -41,    401,    311,    -13,   2155,
+     -1011,   1163,    712,   2090,   1336,   -726,    574,   1200,
+     -1254,  -1567,    723,    683,   -877,   -653,   1137,  -1594,
+      1127,   2641,    465,    259,  -2095,    696,   -405,     40,
+      -259,   -808,   -942,    395,   -180,  -1119,   -966,   -230,
+      -534,   -114,     88,   -661,    757,     75,   -286,   -119,
+       924,  -2925,   2483,   1662,   1823,    590,   4307,    810,
+       447,    165,    243,   -184,   -162,    436,   -126,   -194,
+       365,    601,   -354,  -1983,   -211,   -663,    276,    155,
+      -696,  -2542,   -830,   2374,   -235,   -585,   -469,   -478,
+        21,    867,  -1633,   1949,   -949,   -330,   -546,    328,
+      -224,   1236,    266,  -1117,     36,    -61,    221,    153,
+     -3491,  -1463,   -237,   4676,   -241,    273,    268,    347,
+      -393,   -277,    168,    426,    155,    -65,   -605,   -569,
+     -1416,  -1303,   1248,    595,   -148,    512,   3622,    291,
+      -444,   -523,    616,    105,    101,   1357,    772,   -337,
+       494,    570,     15,    150,   -400,    572,    590,   1674,
+     -4106,    940,    167,   -327,   -336,    696,    591,    362,
+       279,   4489,  -1325,    608,    294,    -41,    549,    982,
+       -31,   -184,    367,     77,   -466,    398,  -1928,   -607,
+       239,     55,     15,   1031,   -486,   2788,   2151,   -519,
+     -1197,  -1144,    274,    671,   1620,   2079,  -1555,   -961,
+       543,    -11,     26,   -627,    777,   -581,  -1060,  -1177,
+      -808,    807,   2863,    607,    144,    195,   -274,     18,
+     -5656,   -355,  -1026,     56,    116,   -431,   -493,    517,
+       286,    353,    353,    199,   -651,   -863,   -276,   -556,
+      -562,   -867,   -143,   -355,   -323,    -14,    -54,  -5354,
+       -43,  -1592,      8,   -543,     24,     94,   -731,   -545,
+       705,   -171,    504,  -1078,  -3367,   1349,    452,   -148,
+      1183,  -1650,  -1400,   -246,  -1032,   -119,   -309,   -566,
+       998,  -3240,   -444,   -658,   -605,   -186,    491,    439,
+      -190,    688,    -29,   -965,   2562,   -112,   -329,    -25,
+     -2593,    355,    -53,    692,     12,   -593,   1930,   -804,
+       -82,    386,   -632,    927,   1006,   -229,  -1147,   -181,
+     -1075,   -245,  -3678,    904,   -298,   2263,     50,    563,
+       337,  -1051,    173,    310,  -3540,   -615,   -504,    749,
+       192,    -90,   -113,   -730,  -1994,    802,    -45,   2234,
+       167,    289,   1722,   -562,    682,    453,   1571,    171,
+     -2429,   -441,   -230,  -1144,    985,  -1602,    358,   -685,
+       -23,   -523,   -529,  -2438,    700,   -624,     37,  -1475,
+     -1318,   3292,    702,    394,   -798,   2563,   1057,   -335,
+       614,    270,   3135,  -1281,  -2089,   -250,   -140,     45,
+      -517,   -470,  -1429,   -172,   2637,    267,     55,  -1037,
+      -174,    912,   -865,   -786,   -406,    537,  -2805,   -642,
+     -1599,    888,  -1044,   -175,    312,     28,  -1157,   -240,
+      -181,    298,    521,   3802,    -87,     93,     48,   1336,
+     -1071,  -1870,    339,  -1106,   -944,  -1036,    361,  -3719,
+      -147,    625,    326,   -122,    407,   -217,    396,    273,
+        -2,   -315,   -262,    632,   6868,    228,   -267,    207,
+       -29,   -274,    192,     63,   -353,    588,    550,     -3,
+       156,   2115,   1580,  -2366,    306,    633,   1354,   2313,
+      -360,   -345,    270,   -499,   -976,  -3685,  -1305,    907,
+      1431,   1545,  -1334,     18,   1159,    229,   -124,    157,
+       470,   -105,    700,  -1786,  -1895,    795,  -1052,   -278,
+       745,   -111,    -45,    694,    599,  -3469,    552,    -70,
+      -222,     45,    896,   -251,      1,    250,   -769,    301,
+     -1151,   1313,   4314,    710,    680,   -169,   -663,     40,
+       399,   1171,    581,    775,    936,   -488,  -2918,    155,
+      -169,  -1560,   -862,   -473,    783,    -72,  -1791,    567,
+     -2109,   -156,   1250,  -1486,   3253,     61,    -50,   -374,
+      -277,    942,    111,    607,   -316,    197,   -748,    871,
+       612,   -242,   -296,     53,   -193,   1233,     11,   -962,
+       505,  -4492,     21,    754,   -150,    451,    183,    881,
+      -652,   -159,   6384,    170,    271,   1035,    401,     48,
+      -463,   -240,    -95,   -625,    613,    -91,  -1138,   1172,
+       542,  -1483,  -2638,  -1396,  -1173,    612,    512,   1355,
+       977,   -362,    -22,    -17,    124,  -3178,   -532,    352,
+     -2691,    610,    569,    740,  -1603,     -5,   -492,    704,
+      -436,    -96,   -595,  -1495,   2730,  -3089,   -164,    565,
+      1300,   -477,   -569,   1069,    294,   -233,   -133,    708,
+       150,    388,  -2108,  -1042,  -1603,   2275,  -1722,    561,
+       140,    507,   -899,   -281,    162,  -1297,   1504,   -158,
+       193,   -730,   -944,  -2484,    615,    -30,     32,   -354,
+      -383,     86,    329,  -3434,   -382,  -1604,   -299,    208,
+};
+
+static const int16_t cb2224ss1[] = {
+      8192,   -187,   -471,   -201,    185,   -465,    976,    257,
+        83,   -530,    310,    676,    341,     48,    265,   -351,
+       306,    280,    302,     48,    496,   -339,    424,  -5250,
+      -253,    604,   -317,   -289,    278,    573,   -579,     79,
+      3218,   -574,   -377,    276,   2831,   -287,   -254,    332,
+      -225,     42,    162,   -457,   -959,  -1421,    683,    -59,
+       -33,   3362,    393,    606,    249,   -873,   -930,   1224,
+      1469,     37,  -1592,   1665,   -582,   1729,    284,    106,
+     -4753,   -120,   -475,    867,   -444,   -203,    431,    -11,
+      -526,   -324,    732,  -1070,   -160,   -611,   1808,   -297,
+      -536,   -194,   -822,   1224,   2220,  -2330,     72,   1004,
+      -787,   -149,    557,   2925,     29,    809,   2397,  -1143,
+       648,    904,   -568,   -707,   -839,   -274,  -1322,   1177,
+      -467,   -482,  -5181,    234,    223,    354,    386,    737,
+      1273,    234,   -353,     31,     -8,   -392,     85,   -234,
+      1366,   1449,    120,   -695,    838,   -622,    -96,    382,
+     -1421,    612,   -173,  -3199,   -150,    474,   -394,   -561,
+     -1171,   2541,   -271,   2513,    670,    285,    636,   -452,
+      -202,   1319,  -2182,   -935,   -586,    243,   -813,    -41,
+       -53,  -1041,    212,     58,  -3424,    111,    268,    964,
+     -3231,   -500,    867,   -191,    207,    543,    383,  -1509,
+     -2712,  -2752,    201,    428,    721,    498,     19,   -747,
+        67,     87,    500,   1200,   2244,  -1158,    466,  -1032,
+      -153,   1197,   2737,   -324,   2002,   -338,     89,   -428,
+        78,    575,    330,   2013,    175,    305,    567,   -539,
+        17,    384,    485,    860,   3330,    173,    586,    649,
+       388,    963,   1820,  -2610,    251,  -2966,   1383,   -153,
+      -146,    564,   -718,    998,  -1283,   -566,   -619,    394,
+       459,  -1233,   2566,   -357,  -2601,     98,   -929,   -367,
+      -501,     96,   1217,  -1695,   -324,    393,    261,   1745,
+     -1095,   -751,    924,   1044,   -337,  -1243,    393,   2454,
+     -1499,   -245,    902,    925,  -2126,    167,    838,    638,
+      2296,   -294,    306,   -715,   2794,   1522,   -339,     21,
+       318,    -95,   1334,     75,   -173,    -91,  -2012,   -920,
+      -801,    334,  -3363,   -348,    550,   -911,   -261,  -1073,
+       185,   -425,    431,    515,   -339,   1817,  -1589,    241,
+       548,   -337,   -471,  -3532,  -1166,    888,    141,   -277,
+      1353,    310,   -654,    198,   -516,   2951,   2251,   -534,
+       701,    237,     20,   -597,   -301,      3,    410,   -456,
+      -581,  -1254,   1052,   1321,    165,   3108,    477,    196,
+      2716,     85,      5,    -34,    721,   -562,      4,     84,
+      -793,    744,    243,    134,   -385,   -129,   -122,   -128,
+      -333,   -483,   -604,    269,   6209,      3,    515,    -63,
+      -634,   -551,   -795,  -1696,  -2210,   2184,    348,     30,
+       413,   2531,    214,    214,   -186,    -72,   -552,    958,
+      1727,  -1639,    618,    -61,   -432,    365,   -753,     15,
+       -14,     33,    976,   -940,   -355,   3318,    677,  -1938,
+        21,    881,   -326,    -83,  -3355,   1483,  -1211,   -674,
+       166,    139,   -276,    158,   -736,   1038,  -1005,   1129,
+      1219,   1115,   -392,    558,     96,   -188,    314,    536,
+      -423,  -3262,    395,   -130,   1099,    304,   -181,    853,
+      -160,  -1272,    428,   -179,    634,    608,   -173,   2690,
+     -2191,   1385,   -518,   -416,   3239,   3250,    313,    -23,
+       200,    643,   -639,    -17,   -208,     27,   -182,    262,
+      -203,   -671,    157,  -4131,    383,   -404,    337,     51,
+       431,     92,    138,   -438,     29,    337,    488,   -252,
+       656,    509,   2037,   -635,  -1074,  -1115,  -2135,   -772,
+      -386,   -214,   -654,   -441,   1661,    542,   -383,  -1720,
+        22,   -103,  -1474,  -1288,   4361,    282,  -1252,    734,
+      -858,   -556,    294,    243,    293,    133,    848,     65,
+      -727,   -887,  -1314,    443,    -96,   -422,   4268,    672,
+       142,    608,   -442,    843,    365,   -866,   -157,    780,
+       107,   -888,   2089,   1769,     73,    739,    -15,  -1730,
+     -1235,    920,  -1713,    163,    552,   1479,   -692,   -755,
+      1430,   -193,   -276,   -264,   -690,    772,   1403,    -40,
+       679,   -260,    642,  -3562,    962,   2053,   1348,     36,
+     -2974,    155,    303,    821,   -944,   -179,   -967,    632,
+      -725,    411,   -447,   -463,    694,   -337,   -146,     59,
+        -1,   -416,     12,    524,   -497,  -4682,   -745,    625,
+      1011,     20,   -462,   -503,   2012,   -475,    -27,     85,
+     -1190,    534,   2250,     87,   2591,   1195,   1665,    423,
+      -813,   -571,   -372,   2601,  -2013,   -853,   -734,   -403,
+       793,   -549,   1243,    312,    722,  -1013,  -1434,   -749,
+      -571,    494,    -88,   -129,   1331,    806,  -1227,    326,
+     -1164,   2487,    -59,   2346,    583,    519,    368,    793,
+      1178,    661,    140,   1226,    378,   -429,  -1214,   1438,
+      -319,    -77,  -1495,   3598,    361,     21,     39,   1930,
+       198,   1050,    531,    274,     32,   -499,   -349,     -5,
+      -133,  -3324,   -379,   -742,   -250,  -1618,  -1536,   2084,
+      1369,    765,   -132,   -324,    406,  -2198,    314,    502,
+     -1431,    759,   -729,    320,  -2120,   1484,   2468,  -3283,
+         4,    272,     -2,    492,     91,   -803,     48,    691,
+       375,     87,   -508,   -725,   -632,    268,   2929,   1302,
+       -11,   -628,  -2225,    723,    533,    909,    934,    682,
+       350,   1509,   -707,  -1142,    106,  -2174,    342,   -965,
+       456,   -655,   1137,   -553,    415,   -418,  -2631,   -121,
+       237,      3,  -1123,  -1555,  -1413,  -3333,    717,    115,
+     -1030,  -1007,   -819,    130,   -851,    281,    -43,   -473,
+     -1091,    326,    869,   -377,    278,   -148,    418,  -2104,
+      -422,    623,  -1777,    633,   1033,  -2031,  -1221,   4126,
+       -60,    -16,   8025,    243,   -340,   -599,   -501,   -289,
+      -219,   -104,   -230,    464,    191,     18,    345,    -65,
+       -68,   -481,    625,   -822,  -4011,   -516,    741,    734,
+      -316,    530,    122,    945,    371,   -298,   1194,   -250,
+      -167,    392,    -95,   -151,     -1,   -486,    189,     90,
+      -140,     30,   4485,    581,     54,   1905,   -895,  -2032,
+      -174,   2473,   -688,   -104,   -315,   -376,    830,    296,
+      -548,    754,    195,   -901,  -1548,  -1931,    792,    510,
+       294,    153,    619,  -1034,  -3038,   1134,    142,    -29,
+      -806,   -118,    -29,  -2314,   -159,    770,  -2899,     23,
+     -1045,   1037,   1496,   1104,   -527,    135,   -281,   -310,
+       -59,    202,   -346,   -612,    206,     27,   -456,    758,
+        67,   3547,    867,    227,     -3,    573,   1440,    421,
+       170,   1491,   -691,    -43,     -8,    784,    307,    557,
+       618,  -2387,    566,   -396,    182,    877,  -2666,   -163,
+       553,   -155,    691,   -188,  -1584,  -1085,   1033,   -308,
+      1356,   -570,   -721,   -232,  -3145,    104,    511,   -964,
+      2783,   -685,   -168,    -51,   1554,  -1816,   2431,    327,
+      -440,   1174,   -265,    -36,    120,   -397,   1094,  -1254,
+      -973,    574,   1085,   -139,   -751,   -529,   -240,     25,
+      1137,   -467,  -3471,    338,   -806,  -2028,     94,    -98,
+      -336,   -537,   1189,   -880,  -3607,   -168,    -59,    100,
+       309,   1097,    295,    262,    106,     -8,    210,  -7461,
+       395,   -248,    461,    490,   -326,    264,    105,     13,
+      -160,    608,   -443,  -1331,    835,  -1342,   3507,    763,
+       966,    101,   1047,   -469,  -1455,  -1080,     28,     99,
+       -44,    270,   -752,    130,      2,     57,    358,   -409,
+         2,   -658,   -812,   -899,    155,    141,   2101,   3616,
+        40,  -1957,  -1028,  -4137,    212,   1580,    578,   1019,
+      -512,    167,    366,   -580,    448,    216,     79,   -149,
+};
+
+static const int16_t cb2224sm0[] = {
+     -4334,   1434,   -228,   1477,  -1329,    230,    686,   -558,
+       486,   -188,    424,   -454,   -568,   -141,   -326,   -132,
+       -39,   2488,      9,    631,    513,    460,   -417,   2656,
+       633,  -1404,    -81,   -283,   -287,    480,   2558,    -19,
+      -158,  -2699,    405,    276,   -639,   -151,    529,    241,
+      -941,   -796,   -213,   1125,   -391,   2515,     78,   -177,
+      2677,    217,    955,   -687,    867,   -485,   -121,   1023,
+     -1572,   -591,    139,    798,   1262,   -467,    722,   2643,
+      -237,  -1048,    386,   -432,    180,   -788,   -178,    234,
+       403,    267,    312,   2661,    585,  -2775,   -686,    -88,
+       -16,  -1243,   -445,   -259,    303,    298,    285,    277,
+      2355,    163,  -2399,   -416,    115,   2277,   -707,    194,
+       283,   1183,     23,    119,     97,   8192,    -40,     67,
+      -101,    151,    169,     21,   -147,   -160,     55,   -207,
+       550,    -36,   -500,    -32,    225,    206,     72,    179,
+       464,   -406,     52,    696,    -18,  -4827,   1547,   -516,
+     -2275,    855,    430,   -523,     83,  -1633,  -1898,    285,
+       202,   -645,   -167,    102,   -124,    382,     24,    236,
+       830,    324,    -84,    491,    -95,   -154,    767,     25,
+      4741,   -574,  -2576,   -297,   -250,   -346,  -2867,    -64,
+     -1119,   1007,   -883,    457,   -328,   -854,   -981,    -55,
+      6922,    569,   -307,    261,   -100,   -832,    129,    416,
+      -154,    681,   -136,   1152,   -144,    -26,  -2266,   -320,
+      -141,   -897,    544,   -206,    845,   -590,     88,    211,
+     -1761,   -574,   -653,  -2788,    252,   -266,  -4252,    295,
+        97,  -2112,    209,   -144,    655,    -89,   -369,    591,
+       205,   1137,     30,  -2907,     88,     92,   -240,  -3106,
+       -16,   -398,   -576,   -720,    421,    427,   -423,   -195,
+       -18,   2503,   -133,   -918,    104,   -512,   -489,   2623,
+      -314,    215,   -103,  -1014,    761,    382,  -1456,   1719,
+      -980,    248,     55,    644,  -1945,     42,   -162,    -35,
+      -852,   1993,   -189,    664,   -149,   3132,    -50,   3438,
+       550,   -234,   -566,    434,     64,    379,   -169,   -291,
+      -718,   -608,     31,   -207,    651,  -2567,   -790,    906,
+       518,   1740,    373,   1158,    114,  -2044,    285,  -1136,
+      -373,    932,  -2185,   -488,    148,      3,    724,    623,
+      -568,   -359,  -2748,    751,  -1098,   -858,  -1140,   -253,
+     -2377,   -402,   -312,   -398,    -47,  -2618,    816,   -568,
+      1274,   -158,    118,    107,    181,    394,   2758,     80,
+     -3057,     20,   -279,    110,    482,   1010,   -162,  -1081,
+       -56,    685,   2207,    -10,     82,    440,    593,     43,
+      1010,   -853,   -624,    288,  -3045,   -426,      9,    132,
+       104,    157,    466,   -118,    116,    226,   -214,   -219,
+       299,   6093,    122,      7,    174,    444,    200,    -42,
+        -4,   -313,     99,    218,    292,   -159,   -409,    523,
+     -1357,  -4098,    -96,    968,      8,   -172,   -444,  -1040,
+       755,   -476,    967,    175,   -100,   1689,   -813,   3175,
+       369,   1828,    248,   -161,   6693,    631,    536,   -125,
+       274,   -467,    259,   -427,    130,   -523,    361,    584,
+        27,     60,    -57,    -30,  -8192,    148,    -64,    217,
+      -308,    163,   -116,     89,    108,    191,   -129,   -149,
+       128,     60,    575,    253,   -385,  -2937,    888,  -1402,
+      -543,   -607,   2639,    156,    251,   6966,   -147,   -382,
+      -388,     39,    476,    260,  -1048,    575,    401,   -245,
+      -441,    121,    389,   -666,     95,   2919,  -2212,   -765,
+       169,   -161,    184,   -320,   -315,   -497,    136,   -470,
+       479,   -541,    712,   2966,    519,   2595,    -77,   1089,
+        18,   -697,   -616,    241,    -54,    388,    461,    368,
+       144,   -149,    181,   7699,     11,      3,   -368,     65,
+       304,    358,    -29,    255,   -162,   -169,   -470,    -16,
+       198,     92,   2137,    233,    273,    255,   4078,   -279,
+      -194,   -274,    101,     45,   -225,   -716,  -2522,   -188,
+        10,   -590,   -745,    894,   1976,    -48,   2302,     -4,
+     -4691,    -67,  -1325,   -506,    605,   -297,    317,   -271,
+      -176,   1706,    541,      1,     31,   -580,    103,    148,
+      -122,   -141,   -849,     76,  -3094,    -67,   2775,    -38,
+      -598,   -314,    793,     40,    324,   1474,   1986,   1505,
+       832,   -504,    739,  -1233,   1201,    695,  -1363,    670,
+       805,    696,   -137,  -4977,   -306,    137,   -885,    455,
+      1021,    600,  -1711,    536,    235,   -149,     31,     -5,
+     -3747,   -405,    394,    140,    102,  -1576,    190,    408,
+       663,  -2075,   -747,    466,    631,    807,   1867,   -655,
+       102,    341,    435,    551,    500,    426,   -650,    -88,
+       -26,   2672,  -1791,     34,    -86,   2963,  -3330,   -793,
+      -307,    277,   -584,   -240,   -141,    258,    708,   -242,
+      -499,    808,   -104,  -2061,   -518,    684,    889,    406,
+       259,    211,    462,    428,  -2597,  -1147,   1729,    683,
+     -2173,   -167,    392,    440,    599,   -815,   -624,   -368,
+     -2962,   -172,    845,    423,    362,    711,   2131,  -3899,
+        84,    147,    826,   -399,   -637,   1132,    108,   -480,
+       230,    265,   -423,     48,     11,    239,   -599,   -281,
+        10,    541,   -397,    142,  -4322,   1172,   -257,   -101,
+       292,   -321,   -401,     60,   -309,    468,    267,    611,
+       438,   -638,   2194,    346,   1421,  -1192,  -3109,   -170,
+     -3336,    -49,    -69,    -75,    184,   3094,    591,     82,
+      -373,    140,    -22,    848,    124,    589,    157,     -4,
+       260,   -177,    147,     73,   -284,   6253,    111,    302,
+       -74,    356,    381,   -547,    -16,   -275,   -500,     93,
+       344,   -346,  -2837,    364,    -43,   -592,   1741,   -702,
+     -2247,    848,   -203,    168,    758,   -849,  -2454,    562,
+      1104,   -169,    463,   -398,  -2759,   -299,   -903,    647,
+       -62,   -124,    301,    337,   -201,    463,    -86,   -139,
+     -2189,  -2424,   -942,   -376,  -2043,    -80,  -1791,  -1580,
+       513,     29,  -1115,   -582,   1214,   -642,    355,    240,
+       285,   1759,   1209,    862,   1707,   3353,   -223,    245,
+      -515,   -928,    794,   -190,   -282,   1097,    -32,   1675,
+       857,   -730,    -15,    102,    356,   -309,   3867,     24,
+        93,    899,   -608,   -497,   -215,  -2244,    735,   -194,
+       102,    -51,  -1939,    846,     74,   -116,      7,   1981,
+       512,    233,    574,  -2508,     83,   1966,   -251,    -96,
+       532,     97,    897,  -1120,    390,  -3192,   -652,   2045,
+       193,   -880,   -398,   -148,    548,   -281,    -19,   -987,
+       467,   -326,   2777,    195,   1560,   1034,   -828,    102,
+     -1531,   1292,   -126,    539,   -247,     36,     55,  -2487,
+      -297,   -362,    482,  -2241,  -1021,  -1535,   -244,     38,
+     -3416,    141,   3408,     35,    -67,     95,    333,   -427,
+      -235,   -128,    304,   -548,    337,   -349,   -330,     23,
+      -450,   1657,    327,  -3087,    695,   -273,  -1090,   1262,
+      -111,   -868,   1516,    269,    119,    192,     14,    200,
+       141,   -395,   7145,     48,    334,    143,   -139,    154,
+      -102,   -312,     -2,    283,    238,    -30,    626,   1328,
+       242,   -416,    442,  -3050,   1388,   -100,   1215,    817,
+};
+
+static const int16_t cb2224sm1[] = {
+      8192,    -13,    346,    -52,      5,    131,   -294,   -167,
+       -65,   -347,   -438,   -559,     57,    -86,   -223,   -224,
+      -251,    629,    -58,   5249,    127,   -464,    644,    210,
+      -154,   -480,    165,    211,     13,    318,    152,   -173,
+      5451,    235,    170,   -100,     -6,   -460,   -249,    390,
+        54,    993,  -1637,   -288,   -978,   -197,    234,  -2877,
+      -570,   -151,    -82,    772,    199,   -385,  -1899,    345,
+       -25,    527,   -477,  -2918,    385,   2784,     78,   -524,
+      -759,    795,    433,    511,    856,   -275,    511,    136,
+      -444,    151,    233,    208,   -589,   -375,    282,   2886,
+        30,  -2749,   -930,   1079,     86,  -2285,    980,   -229,
+     -1369,     93,    -80,   2314,   -170,   1224,    397,    405,
+       463,   1014,   -377,    -90,   -269,    -82,   -376,   -773,
+       684,    -94,  -2893,   -323,   -644,   -849,  -1892,  -2244,
+       417,   2165,   -164,    221,    454,  -2337,    142,     99,
+       418,    486,    -49,     97,    138,   2221,  -2301,   -156,
+      -578,   3963,    196,    140,   -374,    180,    451,    354,
+      -952,    946,   -479,   -874,   -159,    145,    290,    240,
+      -240,   -233,   -418,    226,   2878,   -571,  -2491,    741,
+     -1438,    557,    197,   -370,  -4720,    379,     32,    821,
+        39,   -545,   -141,  -1507,    192,  -1150,    905,  -1095,
+     -5028,   -169,    533,    -23,    371,    162,  -1198,    465,
+      -369,    -14,   -861,   -656,   -701,   -296,     31,    450,
+      -387,   3060,   -696,    597,     14,  -1019,  -2741,   -208,
+     -1186,   -338,    712,    -64,   -344,     41,    327,      9,
+       576,   -349,  -2808,   2428,    433,   -566,    908,   -108,
+      -145,  -1011,    201,  -3042,   -327,    210,   -368,    230,
+      -310,   -400,     12,  -1034,   1734,    992,   1842,   1022,
+      2162,    588,    366,    154,  -3078,   -587,   1096,    215,
+     -1072,   -784,    472,  -1089,     94,    487,     18,     72,
+        34,    -15,   -374,   -607,    316,    830,   -146,   4377,
+      -301,    390,    838,    121,   -110,   -143,    -93,   2988,
+      2914,   -352,   -353,   -744,   -115,     99,    495,   -343,
+       309,   1261,   -519,    101,  -2662,    -44,  -3139,   -491,
+      1142,   -323,    -50,    776,     86,    187,    480,    271,
+      -167,      1,   -267,    -99,    991,   2492,   -152,   2423,
+      -225,     34,    576,  -1486,   -236,   -375,    160,   -176,
+      -145,   2525,   -131,    194,    317,   1215,   1553,    295,
+     -1408,    130,   2279,  -1185,   2671,   -137,   -324,    -23,
+        26,   -779,   -431,     -4,    488,   -186,    174,   -119,
+      3062,   -149,   -168,    191,    169,   1124,    301,   1471,
+      -409,   -999,   -166,   2174,  -1405,    992,   -179,  -2606,
+       -71,  -3151,     92,   -976,   3091,   -322,    310,   -374,
+      -779,    599,    -55,    425,   -697,     63,     27,    -38,
+        86,    170,    -11,   -616,    -97,    525,     78,     14,
+       684,  -5556,   -308,   -444,    266,   -396,  -1665,     86,
+      -722,  -1087,   -921,   -525,      3,   -439,  -1600,    -37,
+      2038,  -2672,   -187,    361,  -8192,    425,    365,     54,
+       343,   -703,    253,    284,    -57,   -327,   -154,    392,
+        99,   -181,    213,    395,  -2412,   -303,    182,     82,
+      2311,     45,   1801,   -209,   -988,     42,  -1430,     38,
+      -721,    118,   -163,   1279,   2184,    -18,   2851,    274,
+      -363,    297,    150,   -220,   3653,   3135,   -381,    335,
+       254,    378,    -52,     52,    328,   -383,    -61,   -802,
+      -409,    -49,     49,  -8192,    362,    -48,   -430,    -54,
+       255,    243,   -525,     14,    152,     10,   -392,   -301,
+      -594,   -539,   1200,    626,  -2979,    233,  -1504,    664,
+      -728,  -1293,   -491,    394,   1317,    298,    169,    214,
+      -429,  -1083,     42,    389,   4751,    510,    299,   -542,
+       456,   -852,     30,    208,    -63,   -131,     72,   -425,
+        73,    213,   -287,   -277,     43,    128,   5528,    165,
+      -316,   -135,   -576,   -583,    217,  -1298,     47,    134,
+       103,  -1894,    148,   3406,    880,    964,   -697,    -94,
+     -1626,    223,   1256,   -514,   2079,   -529,   1917,  -1452,
+      -616,   -605,    385,   -963,    395,    105,   -154,  -1627,
+      -214,     40,    969,   -708,  -1492,   -824,   2457,    275,
+       404,    876,   -781,  -1029,     34,     72,    229,   -137,
+       264,   -387,    305,    -57,   2908,   -143,   -249,  -2473,
+       202,  -1467,   -364,   2094,   -521,    -70,    260,    132,
+       465,     71,    982,    -36,   1792,    306,   2907,    -55,
+       254,    421,    231,    140,   1727,    474,    761,   3153,
+       -18,   -356,    414,   2218,    564,   -247,   -510,     67,
+      2390,   2531,    240,    117,   -487,   -310,    261,    222,
+      -286,   -861,  -2180,    480,    -75,   4769,   -407,    248,
+       227,   -224,    302,    901,  -1200,   -728,   1025,    734,
+      -336,    115,  -1726,   -179,    131,     43,   -357,    364,
+      -681,    283,   -189,    715,  -2793,   -692,   1367,    916,
+        28,   -500,   3094,   -543,   -627,   -709,   -506,  -1094,
+        34,  -2464,    434,    257,    357,     10,   -390,   3206,
+      3483,    137,    147,    180,    231,   -260,   -707,   -818,
+       476,   -528,    656,    824,     -8,   3073,    362,  -3034,
+      -199,     47,    694,   -252,    819,   -147,   -479,    -32,
+       530,   -141,    -91,    251,   -154,    376,   -603,   2305,
+     -2853,   -622,    316,   -680,    402,   -819,    323,    471,
+       -47,   1772,   1507,  -1052,   -685,     18,  -2509,   -418,
+       377,    -31,   -412,    105,   -906,   -267,  -2806,   -189,
+       -97,    198,   -802,    -82,   -658,  -2980,    795,   -447,
+       646,   1037,    486,   -689,  -2654,     55,  -3534,    540,
+       -68,    502,    -90,    277,    -87,   -497,     24,   -246,
+       400,    392,    348,     76,   -345,   -231,    -71,    155,
+        -7,   -226,   6553,    371,    261,   -290,     88,    -44,
+       311,    470,     -5,    182,   -105,     56,   -324,    267,
+       241,    327,    966,    218,  -4695,   -968,     27,   -352,
+      -315,    202,   -204,    435,    360,   -539,   -375,   -527,
+     -1157,   1010,   -241,   4171,   -292,     66,   2343,    310,
+      -682,    595,   3040,    539,   -118,   -573,   -128,    952,
+      -172,   -547,   -285,     -1,    345,  -5701,    345,   -153,
+        77,    349,   -225,   -364,   -655,   -270,   -716,   -825,
+        27,     55,   2179,   -154,   -275,    359,   -501,   -992,
+      -665,   1538,   -218,  -1159,   2176,   -845,  -3018,    105,
+      -459,  -3146,     67,   -197,   -293,    539,    115,    -74,
+       119,   -158,    -89,   1449,  -3006,    104,    651,    886,
+      -310,   -242,   1219,   1805,    176,   2235,    579,    294,
+       634,   1345,     -1,   -454,    755,  -1030,   1760,  -2404,
+      -406,    894,    614,    -74,    113,  -1325,   1843,   -392,
+     -3239,   2440,    -54,    222,   1349,   -695,  -1009,    434,
+      -468,   -509,   -280,    462,    228,    573,    213,     55,
+       325,    557,    100,   -721,   -674,    600,    795,   1567,
+       407,   3273,    -58,  -1330,    349,   -181,    417,   -503,
+       911,    350,   -681,  -4502,   -127,    -26,    330,    618,
+       241,   -147,    284,   -226,   -127,  -2692,    484,   -146,
+       -18,   -416,    755,     85,  -3119,   -404,      0,   -478,
+};
+
 static const int16_t cb4432l0[] = {
      -3764,   -227,    184,   -258,  -1713,    122,    410,    -32,
       -244,  -1337,   -328,    -20,   -236,   -359,    -13,    -52,
@@ -2699,6 +8841,856 @@
      -1617,   -765,    839,    505,    -36,    -58,  -2894,    226,
 };
 
+static const int16_t cb4440sl0[] = {
+     -3624,   -495,    158,   -246,   -529,   -813,    689,    504,
+      -527,  -2216,   -198,   -323,   -690,   -591,    175,    262,
+       243,  -3676,   2648,   -986,    166,    243,    301,   -700,
+       324,   -324,     13,    362,    222,   -470,     30,     20,
+       -46,   -147,   4050,    -97,   -560,    284,    317,  -1611,
+       655,   -416,  -1582,   -675,    389,   -124,    150,    -27,
+       325,    -84,     48,   7474,     97,    105,     19,     38,
+       133,     19,     28,     25,     40,     34,    -59,     22,
+        11,     27,     21,      5,  -1596,   -428,    439,    353,
+      2288,    -18,    357,   -274,   2582,   -126,    -90,     71,
+        -9,   -704,    205,     22,     44,   -120,    -43,    517,
+       817,   1370,   2151,   2818,   -470,     90,    395,  -1243,
+      -345,    959,     19,     -1,    123,   -108,    347,     25,
+      -138,     15,    119,   -117,   -146,    142,    183,   -254,
+      -276,   -174,   5980,    283,   -317,     70,     51,    -15,
+     -2447,    -79,    234,    736,  -2600,   -641,  -1162,    376,
+       959,   -250,    701,    -40,   -102,    204,    -38,    -24,
+      -893,   -387,    339,   1338,    -91,   -655,   -864,     78,
+       299,    228,  -2732,    234,   1995,  -1321,   -139,    500,
+      -316,   -140,      2,    -80,    186,     11,     16,    -69,
+     -7534,     85,   -263,    189,     -7,     -1,    -67,    -68,
+         3,     24,    391,  -3299,  -2952,   -121,   -393,    103,
+       -60,   -113,    141,    185,   -119,    240,    270,   -392,
+      -105,      9,    -39,   2529,    -17,    353,   2966,   -855,
+      1042,   1294,    132,   -257,   -257,   -496,    112,   -179,
+       424,    486,    -63,     77,    275,   -198,   2026,   1657,
+       913,   -255,   -147,  -1748,     -5,    418,    356,   2022,
+       927,   -295,    194,    165,     28,    109,     13,    209,
+      -133,  -2802,    420,  -1873,   -648,    309,  -1172,  -1825,
+       -36,    840,    280,     44,   -118,    128,     34,    241,
+     -1005,   1160,   -303,    318,    726,  -1716,   2625,   -950,
+      -839,  -1257,   -901,   -238,   1123,    131,    252,      1,
+       440,   1455,    -14,   -274,   -461,     87,   -515,  -2299,
+       928,  -2867,   -804,   -215,    680,    147,     80,    215,
+        15,   1339,    141,    -95,    134,    -35,    122,     53,
+       429,    168,    476,    -45,    745,    236,   4229,    318,
+       247,   -201,   -372,   2289,    161,    431,    337,   -707,
+     -1024,    121,  -1773,   -795,  -1187,   -401,    394,  -1431,
+      1526,    -35,    432,   2929,     90,   1880,    628,   1298,
+      -552,   -498,    207,    -97,  -1431,   1105,     29,   -739,
+       -56,     62,     94,    537,   -732,   1255,   -766,    200,
+      -365,   2846,   2139,    435,     92,   -710,   -512,    360,
+      -339,   1021,    474,   -132,    405,   -440,   3435,     75,
+      -254,  -2443,   -880,    325,    343,    285,    230,   -431,
+      -191,    215,    201,   -443,     93,    -81,   -131,   2981,
+     -2986,   1003,    437,    434,   -386,     17,    222,     70,
+       173,   -550,    267,   -121,    -43,    114,    -11,   -795,
+       561,   -147,    187,   -198,  -4969,     50,     59,    674,
+      -853,    163,     71,   -205,   -284,    -50,    -28,  -1412,
+      -105,    262,    272,    565,   -824,   -541,   3381,    430,
+       -81,    228,   -426,    978,   -294,    422,   -538,     13,
+         9,    430,    180,   2329,   -564,  -1082,   1740,   1108,
+     -2011,     11,    343,    868,    723,   -806,    342,    339,
+      -141,   -173,    186,     50,    297,    705,    783,   -593,
+      1609,    212,    528,  -2547,   -863,  -2457,   -876,    164,
+       162,    365,     68,     30,     11,     48,     47,   -285,
+       -64,    166,    -21,  -6880,   -191,   -226,     89,     -1,
+        22,    -93,     -6,     44,    282,     52,    294,   -690,
+      -147,    372,   2247,    804,   -637,     54,   2385,  -1799,
+       315,   -929,    692,    -65,    -54,    218,   -752,   -519,
+      2171,    177,    907,     22,   -778,  -2656,     62,   -418,
+      -434,    307,   1906,   -280,    196,     76,     58,    -46,
+        70,   -367,    -67,     50,    125,     77,   -547,   -287,
+       -97,    -10,    -84,   -271,  -4856,     10,    490,   -560,
+       -21,     66,  -2469,   -322,   1021,    936,    625,  -2520,
+      1144,   -373,    270,    804,    603,    -91,    262,    659,
+         9,   -324,     50,   -712,   2705,  -3016,    594,     87,
+       -88,    697,   -205,   -799,   -128,     37,    504,     59,
+      -274,    655,    672,    -20,   1294,   -221,  -2954,    198,
+       674,  -1676,    863,    324,    968,    731,   1125,    -41,
+      -149,   -303,    223,   1370,    -67,   -194,     -1,   -194,
+       251,   -459,    -39,   4477,    113,    -74,   -386,    214,
+       -72,    -77,  -1593,    511,   -461,    752,   -559,   -476,
+       204,   -722,   1050,   2080,   2468,   -154,   -208,    964,
+       103,    -58,    390,  -1863,    910,   -307,    209,    -32,
+       663,    103,   -133,  -3137,   -423,    259,   -605,   -242,
+       139,   -391,   -488,     77,   -266,  -1694,    397,   -659,
+       237,   2068,     -3,   -867,    870,   1647,    645,   1848,
+        68,    382,    455,   -551,    -87,    -99,  -2926,    372,
+      2438,  -1166,     -6,    521,   -195,   1259,   -162,    917,
+       140,    275,   -273,    133,    318,    -25,    252,   -119,
+      -132,   3120,    397,    398,   -420,   1756,    666,   2176,
+      -141,    271,    -51,     22,   -494,    -36,     57,    308,
+       222,   3585,     16,   -265,   2628,    -24,    162,     13,
+      -240,    -96,    620,    331,   -449,    710,   -123,   -105,
+        23,   -170,     20,    256,  -5228,    398,   -186,    272,
+       129,    175,    598,    -16,   -502,     11,   -215,     28,
+      -110,   3570,     68,    199,  -2535,   -933,    781,   -762,
+       325,     18,   -438,   -319,    473,   -677,    176,    290,
+         0,     67,     -6,   -156,     31,     35,   -131,   -127,
+        24,   -100,  -6826,   -117,    -53,    -40,     99,    -50,
+       -93,     31,     34,   -251,    186,    487,   -203,   -662,
+      -182,    -96,    239,    308,    338,    -86,  -4871,    264,
+       -48,    314,    -66,    100,   -188,    151,     24,    198,
+         4,   5046,    -47,   -654,    -43,     41,    109,    103,
+      -262,     93,   -118,    -63,     58,   2088,    336,   -320,
+      2326,    548,   -810,  -1315,   -864,    461,    171,     76,
+     -1109,  -1510,   -874,   -620,     97,     88,     40,     -4,
+     -7295,   -128,    -39,     23,   -100,     -9,    -74,    112,
+      -151,     67,     21,     53,      2,    -29,    -33,     52,
+      3287,  -2178,    626,    339,   -817,    349,  -1187,   -550,
+      -390,     57,    -41,    295,    756,    185,   -215,     17,
+         3,   7502,   -134,   -122,    -31,    -53,     91,   -170,
+       -71,    133,    -34,     57,   -112,     -5,    -66,     17,
+         1,   2328,   3714,    214,   -123,   -839,      9,    -62,
+        54,     70,    -18,    817,    186,    -61,   -252,     37,
+        98,      9,   2010,    738,  -1651,  -1924,   1106,   -624,
+       143,   -548,    847,   -198,   -140,   -691,    478,   -758,
+        56,     54,     -7,    209,  -2665,    109,   -127,   -134,
+      2099,    333,   -602,  -2217,   -743,    346,     74,    216,
+       579,    223,     61,    -30,     57,     94,    224,  -2595,
+      -566,   -851,    246,    314,     65,   2857,    114,   -760,
+        77,   -611,    119,    181,      4,  -2556,    127,    138,
+      -164,   -219,   -116,    157,  -3143,    197,    -98,  -1040,
+       235,   -332,   -424,   -152,   -338,    -33,   -220,    207,
+       254,   5469,   -102,   -390,   -125,   -420,    113,   -233,
+       329,    -34,    109,   -171,    103,     50,     58,     96,
+      -500,  -2317,   -259,   2178,    109,  -2030,    759,   -780,
+       448,    678,   -384,   -271,    213,    334,   -271,     23,
+     -1121,    636,  -1103,   -482,  -3059,  -1200,   1160,    109,
+      -232,    541,   -788,    130,   -166,   -300,    664,    233,
+       -97,    -29,   -286,     33,   1272,   -298,   -382,   -242,
+      -199,     47,    479,    224,  -1761,  -1904,   1780,   1439,
+      -681,  -1973,   -118,    -90,   -148,    247,   -758,   1936,
+       182,   1373,   2346,    120,   -758,   -476,   1789,   1177,
+       611,   -394,    -14,    -39,   -994,   -674,   1049,    -41,
+       836,   -391,    942,  -1040,  -1437,   1376,  -1916,   1129,
+     -1018,   -653,   1284,    -72,   -166,    321,    194,   -142,
+      -151,    -77,    251,   -162,    732,   -790,    107,   -292,
+      -675,  -4248,    -51,    -86,   -299,   -495,    413,   -128,
+      -455,   -105,   -842,    881,   -492,   1241,  -1432,  -1296,
+       -52,   -430,   2533,  -1765,    838,     84,    -24,   -798,
+      -428,   -154,   -658,     37,   -388,   -591,   -931,   -433,
+     -1837,   1363,   -683,   -717,   3115,    104,      0,   1104,
+       208,    148,    404,    101,     18,    217,     58,     49,
+         4,    -49,   -195,    187,   -239,    -21,    294,   -138,
+};
+
+static const int16_t cb4440sl1[] = {
+     -3057,   -853,   3212,   -334,      5,    224,     63,   -250,
+      -345,   -102,   -289,   -115,     75,    -99,    206,     -8,
+        19,     96,   -254,  -2566,    334,   2773,    136,    199,
+     -1076,    347,   -187,    481,    -64,    654,     -9,  -1094,
+       196,     40,    -95,      5,    163,   -135,    253,  -1053,
+       316,   -231,     24,  -2307,   1480,  -2052,    -18,   -459,
+      -550,  -1860,    -15,     98,  -1406,    -66,   -250,     21,
+       497,   -404,    -54,   -228,   2477,   2011,   -145,  -1957,
+      -426,   -906,    608,     15,   1453,    218,    -79,   -636,
+     -1005,   -332,    304,   2338,   1356,     81,  -1201,   -170,
+      -126,  -1177,  -1644,  -1046,     16,    182,   -328,   -347,
+       346,    591,    418,    623,   -110,   -342,   -227,     10,
+     -5055,   -411,    128,   -103,     87,    -28,   -133,    196,
+       333,   1785,   -479,   -442,  -2892,    453,  -2292,    -19,
+      -383,    -44,   -435,   -193,    503,    130,      4,    144,
+      2184,   -245,     -7,    458,     82,    -76,   3052,   -375,
+      1299,    -76,    364,   -145,    372,     36,     59,    -39,
+        48,    385,   -230,   2764,   2956,   -741,   -372,    428,
+      -504,   -220,   -821,    -47,    -49,    609,    -62,     56,
+         6,    216,    376,    519,   -512,     54,   -318,   -183,
+     -4563,    297,    795,   -182,    108,    234,    404,    218,
+      -123,    -17,   -192,    170,    349,    134,    -91,     43,
+      -135,    -24,     -6,    -32,  -6681,     50,   -138,    -89,
+       -18,     15,     24,   -416,    356,    311,     83,   -267,
+        81,    209,   -155,   -368,    396,    358,    232,   4696,
+      -347,    724,    112,     10,    331,    358,    197,     54,
+       824,    646,   -214,    113,  -4425,    184,    -11,    101,
+      -313,    186,    253,    169,     78,     52,    -70,   -108,
+      1669,    -22,    -18,  -2600,    -27,   2806,    288,   -106,
+       506,    176,    616,   -299,     58,    -30,      1,   -220,
+       400,   -177,    874,     70,    -36,   -274,   -139,   1148,
+       372,     40,    236,    505,    619,  -4002,    -95,    -48,
+     -2854,    114,    -69,  -2805,   -401,     -9,    203,  -1011,
+       472,  -1066,    412,   -220,    245,   -183,    -27,     35,
+      -762,    312,   -137,   -292,   -242,    896,    172,   -345,
+       106,  -4490,    506,    569,    -11,   -352,   -108,    334,
+      -165,   2389,   -895,   2761,    467,    201,    150,   -516,
+        39,  -1105,      4,    587,   -152,   -764,   -184,    -15,
+      -137,    -30,    -12,      7,    382,   -461,   1577,   3519,
+      -173,   1370,     80,    499,    344,   -771,    123,    -13,
+       288,    233,    111,  -2472,   3952,    771,    216,   -505,
+      -446,    531,   -230,    103,    -72,     34,     61,    249,
+      -175,    353,     83,     51,    169,    -97,    -60,   7827,
+        95,     75,    -13,    201,    -27,    103,    -11,      1,
+         3,    121,    -73,    -28,      7,   2908,   -209,   -987,
+      -129,   -341,   2840,    889,   -147,   -521,    123,     95,
+      -239,    552,   -738,    279,    -66,      0,     16,    116,
+       -45,    -28,    -43,    -38,  -7627,     30,    -52,   -209,
+       281,    -46,     23,    -24,     56,    -25,    -23,  -2534,
+      -107,    -46,    -93,    -49,    238,    -25,     96,   -356,
+      3483,   -459,   -414,    205,    102,    202,   -150,   -116,
+      1785,   1399,    793,    543,    685,  -2837,    255,    362,
+       -96,    410,    926,   1068,    416,    558,   -169,    246,
+       138,   2136,     39,    -96,   -605,    279,   -130,  -2741,
+     -1101,   -935,    -20,   -227,    453,   1261,    103,    275,
+       358,     43,    197,    -23,   -251,    322,    -22,    233,
+      2560,   -214,      2,   -101,    645,   2864,    287,   -479,
+       904,    -65,     73,    224,   2418,    -95,    428,   -678,
+      -278,     71,   -545,   -571,   -566,   -181,   -212,  -2947,
+       222,    780,   -365,    124,  -2703,   -198,    -69,   -246,
+     -3056,   -184,   -598,    -75,   -145,   -690,    380,    194,
+       485,    214,   -484,     54,    163,    363,   -924,   1684,
+       201,     34,    236,   -539,   2374,   -150,   -490,  -1313,
+       -61,    317,   2123,    315,   -551,    -26,   -328,    207,
+       253,  -3015,    166,    109,   -662,   2466,   -157,   -740,
+       751,    254,   -788,   -369,     -6,    100,   -211,    107,
+      -309,    -39,    -47,    279,   -126,    -91,     97,   -705,
+       235,   -231,    182,    283,  -5097,    -68,    285,     49,
+        50,    637,    111,     39,   -386,    923,    223,    115,
+      1638,   1214,   -640,  -2168,    482,  -2228,    857,    172,
+        15,  -2207,    -89,    335,    -18,    295,    718,   -956,
+        26,    604,   -436,   2856,  -1131,     98,   -754,    243,
+         9,     29,  -4028,  -1725,  -1741,    432,   -211,    -60,
+      -535,    201,   -273,    111,    444,    607,   -250,    122,
+        98,    159,     97,    281,   3071,   -412,  -2849,   -721,
+       -14,    960,    -43,    794,   -427,    297,    478,    379,
+       -47,    -22,     69,    -60,    -30,   -732,   2456,    170,
+       142,      6,   2520,   -644,   -201,    -16,   1602,    -20,
+      -293,    542,   -451,   -167,     -9,     14,   1052,   2707,
+      2980,   -117,    479,   -202,    -92,     36,    904,    -66,
+     -1088,    -31,     75,    -62,   -110,    -29,    112,   -102,
+      5217,    -85,     14,   -191,   -202,   -175,    -71,    182,
+      -231,    275,    144,     -1,   -202,    -13,    -29,    -19,
+        70,     39,     46,     56,  -7608,    -53,   -104,    -61,
+        44,     23,      1,   -157,     42,     12,     38,     37,
+       331,   -609,  -2516,   -174,  -2491,    258,   -256,   -926,
+       983,    100,     83,    173,   -965,    650,   -304,    -97,
+        98,   -166,    534,   2570,   -611,    493,    103,    -98,
+       148,   3081,   -131,    285,     13,   -367,    205,    -53,
+        41,     29,   -154,  -2657,    -51,   -312,    134,     50,
+     -1514,    634,    411,  -2885,   -391,    365,   -373,    -54,
+       -74,   -151,     80,    152,    -91,    -64,   -209,   1134,
+     -2921,    316,   -951,   1124,    713,      2,  -2212,     31,
+       164,   -260,    103,     36,    229,    111,    -23,    -65,
+       -37,   -220,   -108,    -30,     86,     17,     87,    205,
+       163,     63,  -5763,    254,    178,    -18,   1760,   -380,
+      1453,  -3151,    710,    106,     66,    387,    235,    463,
+      -295,    688,   -124,    322,   -193,     82,   1012,  -2033,
+      -656,   1362,    805,   -747,   2527,    470,     43,  -1001,
+       100,    -83,    161,     74,  -1128,   -307,    -82,   -197,
+     -5470,    226,   -327,    137,   -131,    471,   -432,    -16,
+       243,    224,    168,   -164,    -58,    125,     23,     -2,
+     -2752,    268,    -92,   -466,   2876,    874,    182,    540,
+      -407,   -338,   -396,    562,   -376,    536,   -225,    160,
+        44,  -1501,   -246,  -1062,   -378,    446,  -2448,   -124,
+       499,  -2297,   -353,   -637,    395,    598,   -747,    418,
+      -495,      5,  -1014,   2138,    289,    -75,    301,    944,
+        66,   -457,   -459,   -253,     -2,    678,    367,    116,
+     -2901,    436,   -239,   -303,   -973,    384,  -2574,      6,
+      -225,   -164,   -440,    627,    388,  -3074,   -263,    156,
+      -805,    381,     -9,   -112,  -1481,    536,   -711,   3770,
+      -496,    908,    483,    474,    298,   -424,   -793,   -203,
+      -334,    134,    -91,    208,    -73,   5440,   -316,   -304,
+       249,     -1,    -98,   -214,    190,    242,    -57,    -38,
+       244,   -219,     30,   -224,     66,    -30,     22,     24,
+        24,   -109,  -7594,   -115,     90,   -147,    -83,     21,
+      -257,    -52,    134,    -49,     92,   -117,     30,     -8,
+      -636,   1551,   2207,    -66,  -1962,    212,    567,    969,
+     -1595,   -562,    355,   -467,   -861,    937,   -148,     15,
+       -68,  -1516,  -2118,   1477,    777,   1458,    976,    522,
+       325,    957,   -130,   -132,   -918,    448,   1088,    102,
+       142,   -644,   -284,    687,   -665,   -132,  -1870,   1387,
+       733,    -84,    920,   -508,     53,  -2183,    254,    565,
+      2056,     97,     57,    219,    688,   -344,    659,   2033,
+       963,  -1717,   -290,   -934,  -2119,     57,  -1452,     24,
+      -639,   -739,   -232,    170,     28,    359,   -312,    310,
+      -103,  -1067,   -953,   1081,   -857,   1926,   1364,  -1719,
+      -863,   1832,    786,     55,    166,    383,  -1373,   -347,
+      1710,   -908,     91,   1257,   2013,   -592,  -1337,   1431,
+       -90,    617,    549,   -356,    -68,    134,    -48,   -133,
+      -176,    -18,    -65,     23,     84,    -23,    -36,     -4,
+       230,    297,   -204,   -150,     86,  -4965,    742,     40,
+        32,  -1070,    149,     38,    302,   -329,   -386,    -57,
+        45,  -1622,   1425,   1817,   1568,   2202,      7,  -1192,
+      -201,    -42,    -62,   -170,    -32,   -117,    -38,    229,
+        44,   -226,    155,     70,    747,    259,   -261,   -120,
+};
+
+static const int16_t cb4440ss0[] = {
+     -3021,   2048,   -450,   1147,   1487,   -796,   -657,    459,
+       609,     63,   -153,  -1174,   -144,     37,   -176,   -160,
+        43,    -31,  -2577,     88,   -797,   1179,   -707,   3154,
+      -543,    875,    116,    -40,   -150,    326,    293,   -112,
+       -73,    -34,     61,      8,  -2251,  -1551,  -2507,      6,
+       -52,     -5,   -323,   -313,   1076,    920,   1116,  -1100,
+      1103,    310,   -144,    904,    149,    -59,    636,  -1508,
+      -378,    381,   -917,   -868,   1388,  -1225,    -68,   1491,
+       685,   -220,   3253,     48,   -504,    192,    114,    -11,
+     -1718,   -916,    660,   -240,    767,  -1061,    332,    591,
+      -477,   -278,     25,  -1485,     55,    216,  -3238,    -19,
+      -320,   -148,    273,   -876,     22,   -529,   3263,  -2535,
+      -756,   -133,   -481,  -1024,     34,    418,   -415,    412,
+       -92,    -90,    161,    -49,  -1699,  -2737,   2923,   -243,
+       122,     87,    984,   -377,    -37,    128,    350,   -444,
+       -98,    -52,     14,    -14,    -86,    255,   1997,  -1239,
+        42,    247,    -15,     16,    405,    302,    -17,     84,
+     -4033,    -12,    254,   -365,   -205,   -162,    329,     31,
+     -1158,   -210,   -376,   3958,  -1601,  -1128,    737,    731,
+       300,   -785,   -777,   -403,    463,   -226,   -109,   -277,
+       -70,    -53,   -856,   -785,   -997,     71,   5565,    317,
+       447,   -279,   -357,    254,     93,    -47,   -206,    133,
+        88,    272,      7,     44,   2229,   1666,    234,    519,
+     -1996,  -1195,    549,    449,    174,  -1010,    622,    425,
+      2288,     -9,   -390,    612,    -40,     32,  -1867,   -673,
+       -70,  -1174,    106,    134,    354,     61,   -144,   -290,
+        82,   -604,    202,  -3954,    248,    -76,      7,    224,
+     -1844,     99,   -146,    206,   -335,    243,     25,     60,
+       186,    117,     67,   -137,    119,     46,   4563,     45,
+       -46,     -2,    874,    533,    216,    -38,    185,   -540,
+      -191,   -163,   -126,   -108,   -184,    193,    -39,  -4768,
+       111,    -89,    -61,     17,   1064,   1678,    894,   4334,
+       139,   -892,    317,   -351,    417,    -87,    -22,    195,
+        20,    140,    234,   -197,   -268,     -5,  -1618,   -756,
+      -119,  -1749,   -704,   -943,    421,  -3488,    871,   -468,
+       656,    266,    -79,    325,   -303,     45,     -3,    -31,
+      1140,   -707,  -1578,  -1434,    290,    327,  -1365,  -2913,
+      1048,     38,   -136,   -871,   -572,    -30,    186,    343,
+       -30,   -157,   1301,   1913,   -515,   -842,   -723,    -84,
+      -340,    270,   -918,   3213,  -1530,   -394,   -184,    -60,
+      -391,    -27,   -110,     84,    104,    419,   1201,   -810,
+      1546,     39,   -914,   -334,  -4257,    427,    -95,   -426,
+       -94,    256,   -148,    246,    -80,      9,   -462,  -1125,
+       644,   3541,   -140,   2346,   1045,   -335,   -867,    809,
+       432,    386,     -6,    159,     70,    -10,    218,     43,
+     -2229,   -607,    537,   -924,  -3038,   -943,   -968,   1261,
+        28,    197,   -285,     61,    137,     69,     -2,   -251,
+       111,    -19,   -314,   2064,    960,   1529,   1056,    926,
+      -319,  -1617,   1305,   1473,   -867,    684,   1357,   -834,
+       -66,    477,     74,    -15,  -1769,   1925,  -2448,  -1777,
+      -507,    264,  -1740,    176,   -518,    -58,     32,   -108,
+       165,    -68,    189,     35,     40,    -85,  -1152,    255,
+        36,  -1922,   1500,   1415,    841,    -92,   3305,   -110,
+         3,   -219,    167,    573,    219,    310,     27,    195,
+       359,   -244,    538,  -2042,    355,    656,     51,   -199,
+      -204,  -3611,   -396,    839,    743,   -241,    -80,   -210,
+      -101,     28,  -1399,   1062,   -955,     54,   -630,   -178,
+      -376,    212,    237,   -219,     47,    805,    216,     26,
+     -4334,    455,      4,      4,  -1587,     95,   1186,  -3101,
+      -140,   -862,    916,   2063,    211,     96,    337,   -185,
+      -195,    424,   1207,    -31,   -162,    206,   2485,    -46,
+      -451,  -1778,    -40,    144,   -155,   2884,    803,    396,
+      1196,   -635,    297,    -76,   -121,   -162,   -206,   -149,
+     -2204,   1035,    232,   -815,    -49,   1006,    553,   -407,
+       161,   3650,   -264,    370,   -418,    -28,    141,   -177,
+      -113,    -90,   -315,    626,     62,   1392,  -1815,    336,
+     -1276,   -402,    486,  -1060,  -1848,   2610,    826,    485,
+      -250,     39,    208,     14,   2555,   2869,   -813,  -2074,
+       337,    601,    855,   -655,    566,   -707,    189,    -77,
+       137,   -510,   -282,     79,     42,     73,     62,    650,
+     -4732,   -486,    354,    420,    828,   -645,   -492,    388,
+       753,     18,      2,    766,   -212,    126,    -43,     45,
+       447,   -283,    607,    251,   -166,    -10,     48,  -5850,
+      -251,    128,   -205,    -95,     90,     90,     67,     24,
+       -50,    -48,   -167,  -3231,  -2926,   1831,    199,    484,
+       169,   -614,   -135,   -374,   -418,   -239,    -89,   -121,
+        45,     75,    -11,     16,  -1058,    354,   1633,    589,
+     -1223,   1218,    842,  -1146,   2186,    374,   -363,    216,
+     -2153,   -429,    429,   -597,     93,    148,   1849,   -797,
+      -162,     31,   -325,    343,   -323,    161,   -373,    684,
+      -367,   -452,  -4306,    -88,     28,    -56,    -59,     43,
+       -49,  -1998,   -956,   1331,  -4214,   -129,     30,     79,
+       -90,   -129,    109,    130,   -160,    409,    105,    298,
+       208,    178,   1724,    731,    773,    128,    817,   -425,
+     -4046,    180,   -782,   -116,    191,   -259,    181,    -31,
+       162,     43,    -41,    -69,   1463,  -1769,     -2,   -442,
+      -636,   1495,   -218,   -123,    -58,   3616,    454,   -475,
+       247,   -383,    304,    185,    155,     40,   1104,   1046,
+        -8,   -736,  -1155,   -115,   3925,   -257,    -35,   -599,
+      -437,   -135,   -256,     55,    214,    -88,    215,    -57,
+     -1097,    183,   -501,   -608,   -135,    148,    405,    295,
+        96,   -513,   1013,   4350,   -162,    -61,    427,    315,
+        24,    -77,  -1278,   -167,  -1774,   -133,   -323,  -4339,
+       732,    597,    -30,   -103,     79,   -241,    177,   -388,
+         7,     44,    175,   -143,   5030,    277,     58,     42,
+      -222,   -133,   -319,      6,    240,    217,   -238,   -198,
+       218,    -43,    439,     49,     37,    106,   1123,   2196,
+       158,    171,    458,   -932,   -435,  -2783,   -300,    444,
+      2317,   -146,   -339,   -162,    157,   -216,      1,     66,
+       987,   -190,   -728,  -3188,  -3167,    378,     -1,    158,
+       459,     78,    -42,    386,   -133,    155,    294,    359,
+       -29,     78,   1763,    780,   1019,   -330,    179,    -51,
+      -393,    338,   4422,   -296,   -392,    170,      2,     52,
+       253,    150,   -191,    139,   -371,    161,  -2202,    156,
+        37,  -1004,   -384,   -466,     23,    183,  -3701,     97,
+     -1293,   -355,    -83,    -63,    -26,     69,  -1817,    641,
+      2996,    -16,   2011,   -406,   -647,   -652,    332,    788,
+       484,    918,   -440,   1246,    165,     52,   -260,     31,
+      -255,  -7237,     14,     90,   -135,    122,     14,    154,
+         5,    -78,    111,   -254,    154,    -23,    -24,    -83,
+        -9,     49,   -426,   1657,     99,    -36,   -191,   2625,
+       655,    -20,  -2723,   -977,   -222,    -48,    155,     41,
+        20,    194,    -73,    -26,  -1206,  -3517,   -471,   -815,
+     -1144,   -371,   1353,  -1069,  -1238,    829,   -227,    487,
+      -297,   -101,    914,    100,    -17,    115,   -806,   -798,
+       585,   1097,     -1,   -792,    818,     29,   -256,   -417,
+       942,     68,  -4165,     34,   -408,   -252,     55,    -77,
+       246,   2055,     -4,   -313,   -661,   -836,    559,   -393,
+      2043,    153,    286,  -2700,     98,   -177,   1201,     99,
+       308,    -73,   1441,  -3902,    730,  -1610,    886,   -599,
+      -126,    473,     43,   -252,     45,     95,   -291,    101,
+      -307,    259,   -149,     26,   -510,    498,   1403,    -78,
+     -1039,  -2551,    773,  -1176,  -1525,   -405,   -259,   -283,
+       398,   2080,   -199,     62,    239,    -26,    960,    582,
+      2516,    799,  -2127,    325,   -253,  -1652,   -965,   1413,
+         8,   -119,    396,   -342,    277,    541,    186,   -142,
+      1210,   -732,    798,    -47,   -557,    -12,     63,    537,
+       148,   -128,    328,    290,    203,    361,   -328,    -64,
+      4004,    197,   -640,    996,    -93,  -2314,     76,   -914,
+      1437,   -964,  -1735,    984,   -578,   1389,  -1025,    -66,
+      -120,  -1211,    -32,      5,  -1215,    771,   1621,   -934,
+      -984,    148,  -1592,   -446,     19,   -976,  -1709,  -1113,
+      -218,    191,   -279,   2183,     10,    -37,   -842,  -1582,
+       -92,    558,    227,   -702,   -365,   -576,   -100,    670,
+      -305,    285,     48,   -329,    253,   3878,    156,     70,
+     -1008,    641,   1541,   -234,   1440,    421,   1088,    735,
+      -206,    -83,    460,   -139,    107,  -1160,     -6,   2087,
+      1894,   -117,    962,    113,   -990,     93,    -29,    579,
+      1217,    -52,   -342,   -451,    670,    202,  -1070,    837,
+      -132,   3507,    -59,   -114,   -691,    208,  -1170,   1089,
+       305,   -200,    603,  -1301,   -942,  -1631,   1291,  -2727,
+       414,     80,    815,   -443,     54,    -34,  -1141,   1301,
+     -1199,    372,    102,   -257,     70,    450,    -55,     80,
+      -227,    218,    264,    739,    -52,   -200,   3873,     83,
+};
+
+static const int16_t cb4440ss1[] = {
+      6875,   -104,    -66,    161,     57,     24,     -4,     76,
+      -122,   -100,     31,    188,   -119,    -50,   -244,     49,
+         1,   -100,    555,    253,    433,    633,   -163,  -5345,
+      -170,   -217,    -49,    -29,    331,    633,    -87,    -46,
+       -29,     44,   -174,    -74,   2188,    434,    660,   -593,
+      1548,    379,   1443,   1676,    -63,  -2125,    246,    534,
+      -463,    872,   -169,    -12,     33,    211,   -409,    408,
+      1514,   -189,   -277,    391,   -361,    -35,    145,   -362,
+     -4669,    212,    -97,    -65,    387,    -81,     70,     36,
+       448,    303,    332,  -1077,   -258,  -1353,   1185,    -50,
+       -12,    -74,  -2101,   2429,   1817,   -939,    393,    169,
+       -22,    -36,   1219,   3237,    816,    452,   1807,   -646,
+       407,   -447,  -1778,   -370,   -528,   -127,    104,    416,
+      -121,   -134,    -62,     20,   1751,   -640,   -222,    950,
+      1603,    555,      9,    219,  -1272,   2724,   1004,   1237,
+      -395,    356,   -453,    -98,    -24,     80,  -1621,    474,
+     -1947,   -237,  -1059,  -2091,    780,   1211,    939,    268,
+      -412,   1923,   -419,    851,    230,    567,    143,     48,
+      1506,   2228,  -1226,   -453,    246,    469,    540,   -538,
+       -96,    977,    508,    105,  -3150,   -142,    -37,    395,
+         9,    -38,      1,   -135,   -391,   1702,   -179,  -1566,
+     -3181,  -1679,    203,   -151,    387,    250,    563,    203,
+       443,   -168,     82,     61,   1604,  -1878,    229,    -82,
+       208,   2965,   1093,    251,   1592,   -432,   -532,    153,
+       407,    157,    191,   -216,     52,    -58,    935,  -2161,
+      -409,   -513,    977,   -113,   3247,  -1207,   -743,  -1178,
+       136,    206,    184,   -885,    -64,     16,    -23,    -24,
+       731,   1769,   -941,   1543,  -2386,   -669,   -958,    233,
+       105,  -1124,    948,     97,  -1949,     59,   -152,    -65,
+       114,     82,    387,  -1908,   -492,    129,   -624,     93,
+       658,   -753,   1032,   2480,  -1776,    360,    -38,   1924,
+       168,    -12,    -10,   -128,  -1712,   -446,    939,    465,
+       605,   -586,   -299,   -393,   3878,    111,   -379,    146,
+       186,    -50,   -279,    -30,     -3,     35,  -1941,    360,
+       -79,   -111,  -4287,     -6,    671,   -214,   -792,    277,
+        77,     58,      8,     16,    133,    161,     21,     33,
+      1535,   -296,  -2668,  -3198,    -28,   -386,   1156,    144,
+      -201,    256,   -411,    298,     67,    670,     11,   -227,
+        -4,   -104,     12,  -1000,   1192,    860,    813,    360,
+        25,     93,    792,   -350,     81,   4046,   -178,    122,
+       332,     28,   -112,     -8,    288,    539,    -17,    -63,
+         8,    231,     55,   -514,    105,   -344,    252,   -153,
+        59,    -10,    -21,     51,   6793,     45,    259,    384,
+       209,  -2010,    311,   -769,  -1957,   2791,   -463,   -293,
+      -218,   1026,    897,   -798,     47,   -525,     31,    -42,
+      2018,  -2767,   1658,    685,  -1947,     46,  -1468,    340,
+      -272,    318,     21,   -421,   -396,    244,    -51,    290,
+        45,      3,  -1530,   1359,  -3681,   1487,  -1689,    209,
+       438,   -785,   -220,      2,    -55,   -483,    -35,     40,
+         6,    189,   -200,      2,  -2026,  -1747,    838,   -880,
+      1128,  -3108,    184,   -671,   -261,      8,    296,   -130,
+       -78,   -268,   -100,     18,   -105,     -9,    448,   3184,
+      -570,    656,   -376,   -969,   1682,   2635,   -277,    577,
+       217,    281,    219,   -351,     31,     64,    101,     82,
+       957,  -1885,    774,  -3536,   -168,   -431,   -106,   -479,
+      1041,   -103,    774,   -142,    894,   -724,    -94,   -766,
+       -58,    112,   2028,    566,   -346,   -139,  -2671,  -1907,
+      1039,    189,    -33,   1690,    263,   -514,   -225,   -237,
+       145,   -319,     38,    116,   2891,    -77,  -2065,   2559,
+      -327,   -763,     86,   -172,   -283,   -147,    137,    245,
+      -333,    220,     92,    194,   -176,    105,   3108,    329,
+      -372,  -1188,    670,    773,   -235,     34,   -146,    876,
+      -259,  -1580,    876,    105,    582,    259,    -63,    -99,
+     -1558,   1122,  -1541,   -438,    227,   1221,  -1297,   -746,
+      2698,    -29,   1169,    995,     -2,    201,    392,   -405,
+       -22,    -36,    757,  -4039,    725,   1960,   1478,   -107,
+        67,   -367,    -97,    -88,    154,    -80,      0,   -265,
+      -163,     14,   -109,     33,    597,    115,    543,    468,
+      -757,    826,    509,   -176,   -305,  -4959,   -118,   -464,
+      -421,    -72,      1,   -187,    123,    -88,  -1086,     26,
+       368,    610,   3394,   -337,    364,   2594,    491,    759,
+      -309,    395,    152,    338,    249,    303,   -122,     63,
+      1019,   -864,   1546,    196,     75,   -633,    -93,   -631,
+       777,    -74,   1235,   -745,    377,   3113,   -174,   -282,
+       -24,     89,   -920,   2124,    620,    566,   1290,   2977,
+      1180,    278,    188,    750,    981,   -357,     80,     69,
+        77,   -151,    150,    -15,    834,   -893,    818,   1655,
+      -500,    237,    133,    243,    405,    239,     16,   -152,
+       -70,  -3692,   -110,    145,     58,    -57,  -2527,   3072,
+      2226,    218,   -824,    384,    -96,    119,   -228,   -194,
+       136,    111,   -251,   -109,   -179,    -34,    143,    109,
+      1157,   -216,  -1429,   -702,    323,  -1199,    -60,    632,
+      -585,   -340,   1040,    471,    -32,   -380,   3432,    455,
+      -138,    -39,  -2416,    652,   -253,    145,    281,    393,
+      -671,   2841,  -1616,    -46,   -385,  -1417,   -273,   -168,
+       318,   -263,     -2,    -69,   -638,   -137,  -2668,   -359,
+       -86,     79,   -777,   -404,   -560,  -3533,    122,   -113,
+       617,    497,    117,   -268,    110,     73,    752,  -1105,
+      -521,    762,    695,   -587,   -147,  -1235,   1866,  -2250,
+      -671,   -511,  -2178,   -820,   -619,    162,    -37,    102,
+      -342,   -278,   6837,   -278,    185,     10,    361,    -52,
+      -171,    246,    184,   -175,     19,    166,    -48,    -41,
+        92,   -152,  -1227,   -983,  -3985,   -703,   1143,    204,
+      -523,   1053,   -623,   1002,    231,     53,   -277,   -409,
+       -67,    -56,    -90,    -47,    448,    754,    554,    972,
+       505,   -331,   4946,   -193,     89,    530,    -24,   -172,
+       254,    244,    140,    -10,     40,    -77,   1655,   -438,
+     -2776,     51,   -553,    592,  -2902,    280,    804,    776,
+       131,     69,   -207,    131,      7,    209,     93,    -19,
+     -1148,   -733,   2674,  -1628,  -1243,   -506,  -2346,   -857,
+     -1028,    666,    365,   -353,    105,    120,    210,    -85,
+        37,    -40,   1027,     11,   1234,     -5,  -1976,    515,
+       289,   3815,   -142,   -188,   -248,   -273,   -265,    593,
+       205,    164,    -65,     70,   -992,   1586,   2130,    779,
+        92,  -3067,    421,      1,   1172,    496,   -917,   -760,
+       169,    -64,     14,    -40,   -247,    -95,   1769,   -145,
+       712,   -794,   -571,    240,  -1774,    -38,   -129,   -836,
+      3372,    887,   -451,     73,   -107,    182,    100,     14,
+      -703,   2559,    490,   -839,   -333,    134,    804,  -3549,
+        50,   -199,   -215,   -370,    453,    -86,    151,    -98,
+       -58,    128,  -2624,  -1507,  -1623,  -2186,    -89,    -55,
+      -472,   -667,      2,   -439,  -1453,   -262,    565,     56,
+      -118,    288,    -56,     87,   -398,    729,     40,  -6015,
+       219,   -212,    287,   -250,   -211,    -29,    -61,    -55,
+      -120,    -92,     30,    129,   -122,    111,   2037,   1260,
+       943,   -252,    -13,   -794,  -2570,  -1117,    297,    374,
+     -1629,     -1,   -407,   -597,   -324,   -179,    408,     58,
+      -902,  -1672,    611,   -198,    -61,    103,    366,    915,
+       811,   -280,   -401,  -3849,   -111,    221,    353,    232,
+         4,    -18,    673,   1792,  -2350,    132,   1979,  -2318,
+      -417,   -689,    326,    768,   -377,   -522,    373,   -389,
+      -105,   -103,     33,    -48,   1497,   1125,   1893,  -2744,
+     -1219,    921,    472,   -165,   -438,   -129,   -682,   -783,
+      -685,    167,   -715,    156,     64,     61,   1147,   -892,
+       -72,    579,   1191,  -2759,   1831,   1895,    663,    816,
+       -98,    -61,   -223,   -366,   -429,     31,   -129,   -121,
+      -255,   1804,    138,    180,  -1063,    598,    763,    720,
+       385,   -526,    143,     80,    168,    976,   -714,    236,
+     -3204,     93,    874,    238,   -359,   1595,    191,    568,
+      -182,     20,   -608,   -288,    602,   -224,   3874,   -308,
+       -70,   -826,   -109,    -42,   -882,  -1421,  -1603,    625,
+     -1206,     31,    782,   -106,   -700,   -246,   -571,   -124,
+      -848,   -390,   -523,  -2903,     -9,     39,   -109,   -199,
+       497,    -11,    377,      5,     25,   -115,    -61,    283,
+        27,   -131,   -193,    280,    178,  -5439,     44,    -52,
+     -1210,   -617,   -162,  -1097,     -3,    748,    -45,  -1197,
+     -1058,    909,   1607,    693,     42,   -749,  -3001,    407,
+       -62,     45,    214,   -312,  -1054,    498,   1291,   1189,
+     -1268,   1083,   -757,   -319,  -2796,   -716,    310,   1583,
+      -608,    319,    -84,   -119,  -1415,   -602,    628,    463,
+     -1213,   -794,   -474,   2682,    931,    240,   2491,     76,
+      -234,   -161,   -690,    359,     28,    -19,   -774,  -1023,
+       738,    675,    248,     52,   -348,   -545,  -2715,   -599,
+      -252,    660,   -387,   -104,   2316,    456,    -90,    100,
+};
+
+static const int16_t cb4440sm0[] = {
+     -6448,    -59,    298,   -659,    -59,    329,   -569,    397,
+      -224,    128,   -216,    153,   -100,    319,    -53,    -90,
+        50,   3313,      4,   -215,    405,   -256,     78,   2890,
+      -187,   -969,    195,  -1022,   -119,    214,    254,   -360,
+      -222,     39,   2139,     91,   -290,    529,    -73,    -16,
+      -318,    128,   -348,    565,  -1190,    202,   -185,   -234,
+      3498,     48,     68,  -1917,   1694,    212,   -477,    239,
+     -3301,   -489,    424,    418,    -82,    -61,    599,   1530,
+      -200,   -252,    162,   -243,     43,   -534,  -2695,    255,
+       317,    489,    279,   3337,    246,   -349,   -149,   -128,
+      -146,    256,   -455,    137,    -75,    836,    209,   -349,
+      3494,    255,  -1948,   -732,    367,   1373,   -211,    608,
+       345,    -17,     43,    102,     19,   -219,    173,  -2361,
+       130,   -862,    637,   -103,   -589,    219,  -1261,   -238,
+     -2528,   1643,  -1587,   -690,   -166,      7,    -57,   1221,
+       326,    103,   -830,    608,    196,  -3705,   1103,    568,
+     -1602,    543,   -153,   -416,     74,    185,    156,     34,
+      1329,   -798,   -214,   -515,    121,   -797,    749,    346,
+       629,   -609,   -877,    -60,    184,   -157,    250,    193,
+      4385,    369,   -181,   -191,   -308,   -314,   -395,   -173,
+       -88,   -388,    -43,     46,      9,   -167,    189,   -192,
+      6086,   -226,  -1795,    126,   -941,   -423,    397,    380,
+       461,    319,    364,   -194,    433,   1214,  -3715,   -274,
+         9,   -327,    212,   -375,    130,   -917,    -63,   1120,
+      -651,   -211,    149,  -1128,    265,    -73,  -4630,    493,
+       -83,    -20,   -314,    -91,    910,   -109,     -3,   -417,
+      -109,    374,    357,  -2773,    253,   -234,   -306,  -3060,
+      -762,     53,    476,   -299,    -89,  -2440,   -658,    -83,
+      -854,   3770,    374,    552,    450,     51,    346,    887,
+      -463,    189,    254,    182,     15,    -37,  -3263,   2594,
+      -647,    -83,    404,    770,    691,   -654,   -301,     81,
+       -13,    742,    371,     54,     31,    -83,    -59,   4196,
+       653,    256,  -1075,   -539,   1084,  -1077,   1238,    259,
+        20,   -191,    854,    179,    -47,  -1025,   -189,    281,
+      2556,   1765,    106,    -79,    320,  -3066,    228,   -500,
+         1,   -183,    -46,    220,   -233,    -50,    -98,   -261,
+       -84,    -25,  -4378,   -428,  -1395,   -582,   -619,    443,
+     -1456,    375,    144,    -32,    356,   -454,     28,    136,
+         5,    247,  -1057,    709,   -362,    293,   3084,    545,
+     -2804,   -625,     16,   -228,   -238,    164,   -201,   -114,
+      -149,     58,    -74,    203,    271,    462,   1037,    159,
+     -1652,   -591,   -846,   -166,  -3272,    710,    773,    824,
+     -1138,    630,    -14,    209,    348,   1476,    322,   -371,
+       241,   4133,   -877,   -476,   -391,    602,   1259,  -1204,
+       352,     90,   -473,     43,   -152,   -439,   -131,   -217,
+     -1559,  -5029,   -186,   -239,    -44,    750,     33,   -167,
+      -211,    -67,    -91,   -143,    124,     32,    -16,   8192,
+        68,   -102,    163,    -31,    458,     38,    249,     21,
+       157,    -63,     36,     49,    -22,     89,      9,    153,
+        46,     60,   -146,    -13,  -7506,   -104,    101,   -141,
+        25,    165,    -84,    219,     53,   -182,    -94,     46,
+     -1314,   -371,   -298,   -527,      6,  -1955,     52,   -714,
+      -461,    174,   1450,   -298,    107,   2965,    250,    -65,
+        46,   -171,    296,   -785,   -784,     35,     36,     29,
+       915,   -891,   -391,    168,    509,   3763,  -1267,   -138,
+       132,    424,    -53,   -669,  -1491,   -927,    712,   -638,
+      -440,   -299,    522,   1593,    445,   3234,    547,    498,
+       440,    145,   -135,   -188,   -296,   1080,    468,     77,
+       176,   -315,    221,   4784,   -666,    274,    762,    -42,
+       218,    -86,   -273,    116,    814,    -21,    402,   -266,
+      -392,   -425,   1126,    -68,    142,    357,   5143,    363,
+      -224,   -198,    115,   -221,   -262,   -736,  -2774,   -196,
+      -208,   -613,    163,    696,    789,    132,    114,    121,
+     -3138,    164,    172,   -189,    232,     53,    310,    -50,
+      -407,   1207,   -474,    249,   -806,     21,     20,     72,
+      -534,    101,    -47,   -223,  -4568,   -128,    -29,   -910,
+      -254,    105,   3163,   -119,   -135,   1745,   1744,   1105,
+       291,   -333,   -278,   -441,    660,    141,   -291,    314,
+       149,    142,   -121,  -7878,   -240,   -204,    189,    376,
+         3,   -129,     59,     46,    170,     82,   -150,    -34,
+        67,   -110,    635,    148,    256,  -2939,    157,   -509,
+      1439,  -2470,    794,   -298,    407,    980,    805,    349,
+       208,    -35,   1009,   1180,   -114,    776,   -339,   -776,
+       250,   1951,   -557,    172,   -395,    795,  -3075,   -348,
+      -106,    122,    -47,     -9,     55,     40,   3002,    421,
+       538,     -1,   -277,  -3062,    -15,    168,    461,    521,
+      -525,    413,   -196,    159,  -3314,    -85,    983,    565,
+     -3113,     38,     79,   -172,     20,   -228,   -520,    346,
+        47,    485,   -177,     51,    175,    444,   3475,  -3416,
+       -81,    118,    264,   -162,     20,   -192,   -219,   -111,
+       -57,   -225,    159,   -218,    117,    -28,   -150,  -1100,
+      -681,    444,    -54,    -11,  -4669,   -216,  -1151,    858,
+       168,    -39,     52,    387,     74,    -39,   -154,   2767,
+       307,   -132,    531,    175,    906,     14,   -129,     49,
+     -3389,    476,   -127,   -329,    479,    118,    -85,    209,
+         4,    227,    154,     -2,   -238,    263,    -24,    553,
+      -231,     78,      2,   -183,     31,   5933,    117,     86,
+       386,    359,    153,    101,   -784,   -553,    -13,    256,
+      -347,  -1311,   -936,    -64,   1718,   -444,    168,   -590,
+     -3252,   -194,   -243,   -269,   2096,   -994,  -1081,    309,
+      1003,    290,    -66,    306,  -3239,    -25,    700,    365,
+      -770,    144,      4,    259,   -185,   1493,   -158,    726,
+     -3180,  -1683,   -119,     45,   -493,   -205,  -1728,  -1226,
+      -235,    -87,    -88,    -87,   1966,      8,    142,    496,
+       239,    828,     30,   -517,   3150,   2266,    402,   -315,
+        74,   -312,   -414,    -16,    458,    381,    376,   1287,
+      1093,   -410,   -967,     80,    382,   -106,   4419,    445,
+       293,   -283,    282,    324,    -80,    -25,    115,  -1667,
+      -756,   1893,  -2772,    395,      3,   -349,    138,   1094,
+       406,    432,    214,  -1328,    632,   -132,   -100,    135,
+      1627,   1062,   1026,  -1341,     24,  -3352,   -173,   1265,
+       861,   -821,    -87,   -367,    278,    151,   -101,    -32,
+       161,    387,   5778,   -564,    492,     83,    324,     29,
+      -423,     91,   -132,    190,   -310,   -457,    -62,    -99,
+       171,   -214,   -159,  -2500,   -693,  -1538,   -311,   -784,
+     -2422,   -498,   1781,    342,   -467,    -78,    466,   -252,
+       241,    197,    186,  -1039,   -190,    346,  -1881,   -240,
+       -65,   1438,   1001,  -3009,    -52,    221,   -490,   1224,
+       -63,    -39,     53,    169,    130,     86,    -56,    -90,
+       116,      4,   7098,     -5,     61,   -172,    -65,    160,
+       -94,    -30,   -111,    270,   -653,    521,   -426,   1084,
+     -1169,  -1158,    584,  -2499,   2494,   -321,    695,    823,
+      -429,     35,    529,   -280,    -45,   -286,   2997,    207,
+      -633,  -2207,   1708,   -298,   -413,    673,  -1017,    292,
+       493,     76,   -136,   -365,    -65,    266,    852,    512,
+       791,   -129,   1364,  -1065,   1371,    383,   -524,    505,
+       943,    147,    229,     39,  -2969,     70,   -295,     66,
+      2759,    -16,   -435,   -474,  -1058,    762,     54,   -257,
+       560,  -3167,   -572,   -418,   -478,    370,     72,    -20,
+       296,     54,  -2683,    550,    -15,   -155,   2146,   -143,
+     -1144,    463,   -117,  -1690,  -1917,     42,    249,   -278,
+      -319,   -513,    544,  -2033,   -317,  -1955,  -2646,   1345,
+       759,    268,    207,   1243,    256,    -32,    -45,   -750,
+      -211,   -184,   2397,    473,   2572,   -489,    260,    389,
+      -237,    602,   -463,    569,   1673,   -176,   -227,    964,
+       203,    130,   -269,   -190,   1339,   -978,    973,   1986,
+      1145,   1258,    272,   1779,   -436,  -1306,    652,    807,
+       574,   1401,     53,   -183,   1612,   -828,  -3094,    -82,
+      1061,   1042,   -200,   -891,   -126,    181,  -1324,    549,
+       555,     -4,   -868,     79,    157,  -1533,     18,    230,
+     -1096,   -335,   -669,   -166,   1853,   -310,   -340,    249,
+      -954,   -594,  -2929,    415,      5,    135,  -1315,   -237,
+      1868,    787,   1912,  -1100,   1139,  -1103,   -217,   -382,
+      -654,   2078,    528,    133,   -115,    -56,    -41,   -207,
+        69,    461,    465,   -396,   1725,   1306,   -443,   -720,
+     -1600,   1176,    652,   -997,   -306,  -1040,   2258,    -75,
+};
+
+static const int16_t cb4440sm1[] = {
+      8192,     96,    214,   -395,   -106,    291,   -401,    305,
+      -102,    194,    -73,     31,     71,    -19,   -349,     65,
+      -183,     26,    -21,   8154,    107,   -136,    -37,    -35,
+        85,    127,   -202,     43,   -195,    225,    -51,    -69,
+       -57,   -107,    141,   -120,   -284,   -227,     28,    680,
+       218,     29,  -1800,    488,   -207,   -453,    -99,  -3680,
+      -210,     39,    279,   1406,    278,    -37,  -1596,    232,
+       376,     90,    234,  -3348,    242,   1765,    555,   -883,
+       118,    115,     48,   -116,   2166,   -292,    136,    527,
+      -236,    -18,    411,    -20,   -190,   -480,    665,   3332,
+       378,   -287,    337,    199,     -5,  -3904,    311,   -297,
+     -2720,   -193,    -17,    911,   -224,    457,    -48,    254,
+       271,    -24,    -77,    165,     23,    182,  -1122,    122,
+      -520,    309,  -3604,  -1013,   -405,   -647,   -145,  -1162,
+      1019,   -190,   -278,     69,    362,   -185,    -78,   -245,
+       472,    670,   -493,    620,     76,    717,  -2296,   -111,
+      -454,   3224,     27,     47,   -351,   -154,   -293,    187,
+       -93,     96,     87,   -453,   -132,      9,    125,   -209,
+       -26,    284,   -552,    255,     87,    227,  -5445,    112,
+       172,    -15,   -448,    475,  -5747,    367,    149,   -228,
+      -797,    371,     67,   -102,   -118,   -418,    332,     38,
+      -100,     90,   -183,  -3302,     15,  -1049,  -1560,   1299,
+      -710,   1257,    698,    316,   -283,    955,    240,    182,
+       269,     12,    -37,   1817,    649,  -1273,  -2071,  -1719,
+      -765,    977,  -1159,    351,  -1583,    -85,   -771,   -215,
+       123,    314,   -158,     32,    560,    208,    265,   -451,
+      -413,     32,   1954,  -3598,  -1680,   -832,   -646,    761,
+       272,    394,    213,    -35,    -44,    343,    309,    244,
+      3041,   -399,    -50,   -126,  -2755,   -146,    243,   -367,
+      -600,   -166,   -832,   -537,    269,    -48,   2419,   -526,
+      -309,    -17,   -235,     73,    341,    351,   -840,   3241,
+       -94,   -432,    404,   -588,    158,   -127,    -49,   3259,
+      3543,    134,   -256,   -106,    622,    -45,   -170,   -109,
+        68,    377,    -84,    210,   -250,   -267,    257,    -77,
+         6,  -1109,  -1498,   -327,   1063,    992,    632,   -245,
+      -656,  -1100,    -60,   -456,   -170,   3208,     -6,     13,
+       -95,    606,   -594,  -2039,   -369,  -1743,    275,    -93,
+       117,   2828,   -138,   -108,    206,   1819,     98,    -45,
+        45,   -163,   2962,   -398,   3536,   -183,   -259,   -581,
+        65,   -498,   -288,   -357,   -339,    -13,    -71,   -409,
+        36,    -15,   -545,   1433,    135,   -220,     99,    752,
+       177,   -455,   -251,   1172,  -1274,   1062,   -774,   -999,
+       -63,  -2756,     99,    -86,   4695,   -171,   -129,   -856,
+        26,   -543,    610,  -1350,     -2,    271,    455,   -150,
+       358,    101,    536,    125,    101,     88,    -16,    -12,
+       488,  -7479,    110,    264,    140,   -302,    110,    232,
+         0,     15,     70,    -28,    -27,   -110,    -99,    201,
+        78,    215,   -108,   -267,  -7548,     34,    312,    -86,
+       197,    125,     80,    -75,   -117,     -2,    128,   -207,
+      -131,   -513,    614,     33,  -4844,   -302,   -323,    160,
+       808,    645,    243,   -603,     68,    -70,    158,   -131,
+      -212,    -34,   -247,    625,    134,    -42,    525,    -89,
+        31,    116,     -1,    508,   5021,    395,    111,    -86,
+      -172,   1433,   -114,   -126,   -148,   -337,   -260,    233,
+      -479,    275,   -247,  -5672,    386,   -110,    -99,   -142,
+      -171,   -154,   -358,     30,   1028,    -78,    575,    523,
+      -586,   -739,   1586,   1076,  -2519,   1572,  -1448,   -201,
+       166,    -54,    137,   1268,   1157,   -411,  -2905,    195,
+       489,   -740,    154,    522,   2276,   -604,    194,  -1112,
+       192,    400,   -271,    250,    413,    273,    158,   -299,
+      -874,   -228,  -2454,    162,    819,    457,   3401,    689,
+      -208,   -298,   -461,   -360,    -70,  -2133,   -114,   -124,
+        81,   -228,    625,   3525,    909,    254,   -234,   1316,
+      -773,    531,    -30,    -16,   -164,    -84,   2360,  -1900,
+       351,  -2979,    545,    653,    416,    273,    -79,   -825,
+      -107,     71,    495,    223,   -176,    129,     40,    424,
+      1627,    207,     47,     -8,   -273,   -715,     60,  -1253,
+      1501,  -1199,   -248,     39,   2859,   -432,     89,    299,
+       948,  -2608,   -896,   3468,     84,    511,     55,    151,
+       733,    270,   -354,    470,   -219,   -115,   -105,     91,
+      -259,   1941,    775,     12,   2764,    484,    557,   2288,
+      -118,    294,    -32,    719,    -62,    -64,   -295,    -82,
+      -145,   -285,   -492,     87,   -135,    -98,    194,   -288,
+        -8,    263,   -475,    -53,   -388,   5621,     41,    -28,
+        34,   -323,    138,   1935,  -1806,   -185,    340,   1380,
+        48,   -542,  -2965,   -339,     88,    554,     41,      4,
+      -151,    182,    -39,   -193,  -3355,   -312,   3106,   -203,
+       442,   -110,    317,   -269,    225,     31,    -62,   -277,
+       163,   -766,   -408,    210,    -58,    128,    161,   3308,
+      3321,   -138,   -278,   -149,    216,    134,   -253,   -135,
+      -154,   -123,    254,    200,     -2,    133,   -307,  -6253,
+       310,     -6,    959,     26,    191,    315,    528,    -75,
+      -230,   -203,    153,   -265,    -94,    -61,     -2,   2761,
+     -4623,   -353,    -19,    102,   -139,     54,    438,    267,
+       -73,    447,    226,     71,    -19,     75,    -40,    -32,
+      -850,   -500,    422,   1237,   -688,    357,  -3158,   -468,
+      -450,   -279,   -694,  -1109,    734,  -1602,   -117,    122,
+       261,    979,    -20,    385,  -2929,    342,  -3164,   -146,
+       252,   -104,     62,    469,    289,    249,   -214,    -38,
+        73,     83,     -7,     18,   -394,     -5,   -140,   -267,
+       331,   -147,   6540,    395,   -103,   -147,   -271,    -20,
+       191,     73,   -155,    197,     71,    503,     19,    138,
+      -129,    335,    209,     75,  -6207,    140,   -176,     -5,
+        35,    -40,    -61,   -146,   1080,     58,    327,    -49,
+      -842,   1431,    595,   3461,      1,    142,   2001,    297,
+       -16,   -425,   1156,   -101,    -54,   1060,   -222,   -295,
+       938,  -1212,  -2374,     73,   -272,  -3318,     -8,   -718,
+       114,   -154,     85,     -9,     72,     86,  -1330,    226,
+     -1414,   -521,   3161,  -1856,    133,    240,   -499,   -371,
+      -745,    779,   -463,   -506,    463,   -229,   -226,    389,
+       135,  -4137,    360,    735,   -318,    777,    593,    977,
+      -174,    286,    187,    -95,  -1626,    245,     97,      9,
+       277,    299,   1568,   1066,    375,   1342,   -390,    884,
+       271,    185,   -258,  -1100,   2113,   -107,   -447,  -1917,
+       -58,    -29,   1081,   -455,   -524,   -196,   1869,   -677,
+     -3564,   1443,     29,   -425,    -28,   -370,   -342,    -28,
+        30,   -118,     58,    607,    454,     45,   -120,    232,
+        20,     21,   -175,   -112,   -236,    492,    411,     42,
+       -42,   4041,     39,  -2579,    235,   -146,    122,     24,
+      1301,    123,   -461,  -3264,    316,    -88,   -209,    140,
+       387,   -430,     78,    508,    149,  -3588,   1107,    820,
+      -140,    654,    812,   -566,  -2578,   -403,    -72,    120,
+       355,   -136,   -121,    209,    240,    116,    231,   1630,
+       208,   -178,  -3160,   2203,    -52,    451,     84,   -310,
+     -1199,    596,     69,    285,    242,     15,     49,    341,
+      -154,  -2286,   1206,   -109,   1048,   -647,   1127,     98,
+     -1264,   -808,   1744,  -1597,     13,     26,   -216,    263,
+      3276,   3192,   -105,   -390,    -31,    676,     73,    265,
+        31,    101,    479,    -69,    123,    -24,    -49,     32,
+      -653,   2253,     49,   -346,   1476,   1820,    396,    639,
+      -219,    792,   1728,    147,   -765,   -140,   1181,     98,
+       153,    -98,   -755,   2473,    452,    231,   2031,   2468,
+      -416,    587,    724,    148,    500,   -933,   -229,     55,
+       102,     74,   -164,    652,   -425,    100,  -2684,   1358,
+      1626,   -350,    544,   -301,  -1589,   -305,  -1266,     11,
+       243,   -125,   -330,    294,   1471,  -2922,   1581,   -546,
+       582,    231,  -1407,   -877,    602,    219,    350,   1130,
+       -86,    214,    -56,    201,   -181,  -2140,   1108,    493,
+       456,   -542,   -113,   -852,   1647,   1897,    840,  -1178,
+      -369,    788,    488,    256,    366,   2298,   1167,   -205,
+       256,    585,   -555,    292,   2615,    748,   -247,  -1102,
+     -1682,    226,    415,     20,     27,    100,      9,    436,
+     -1746,   2621,   1583,   -211,   -833,    441,     54,  -1183,
+      -826,   -916,   -707,    564,   -232,    -14,    147,    453,
+        70,   1094,   -903,   -337,    450,  -1546,   -662,  -1047,
+     -2345,   -811,  -1037,     96,    560,   1381,   -119,   -383,
+};
+
 static const int16_t cb4448sl0[] = {
      -3850,  -1289,   -449,    -36,  -1178,  -1175,    705,    -97,
         37,   -650,    426,   -477,   -145,    124,      6,    207,
@@ -3574,6 +10566,481 @@
         12,   -674,   -901,   -897,   -827,   -682,    323,   2580,
 };
 
+static const int16_t fcb8sl[] = {
+     -1269,  -1637,  -1349,  -1672,  -1421,   2750,    212,   3563,
+       -74,   1555,  -1495,  -1148,  -1172,   1351,   -484,   -473,
+      1418,    557,    899,    635,   6124,  -1140,  -1154,    783,
+     -1444,  -1509,  -1041,   1793,   4459,   1325,   2055,   -921,
+      -794,   -713,   1625,    -50,     78,   -159,    361,    855,
+     10282,  -1533,  -1105,  -1582,  -1704,  -1697,  -1440,  -1001,
+       864,   2038,  -1347,   -847,  -1419,   1474,  -1369,  -1189,
+     -1125,   -655,   -134,    950,  -1398,   -222,  -1498,  -1262,
+      2597,    729,   2521,   -544,    457,   2058,   3821,  -1568,
+     -1577,   2013,  -1717,  -1620,  -1292,   2771,   2559,   4942,
+     -1497,  -1576,  -1724,  -1550,  -1775,  -1734,  -1097,   -635,
+      1934,   2706,  -1399,   -994,   1685,  -1142,   -511,   1595,
+      -275,    861,    484,    958,  -1374,   -764,  -1105,  -1493,
+     -1678,  -1630,   -521,   5138,     53,   1331,   4909,  -1376,
+      2134,  -1638,   1562,  -1565,  -1487,  -1625,   3232,   4742,
+     -1017,  -1353,  -1212,  -1585,  -1309,  -1139,    -71,   -820,
+      5928,   2987,   -641,  -1314,  -1198,  -1182,  -1005,   -542,
+     -1287,  -1210,  -1103,   6865,  -1130,   1375,   -884,   1241,
+      -532,   -173,    -68,     15,    309,    192,  -1128,  -1107,
+      -849,  -1343,   2233,  -1281,   -535,   -679,   3878,   1865,
+     -1427,   4508,  -1022,   -747,  -1117,  -1104,    -33,    669,
+      1216,   1482,  -1360,  -1075,  -1483,  -1390,  -1366,   -754,
+     -1042,   -766,   3467,   -624,   -968,  -1101,   -393,   -890,
+      -447,   -995,   2346,   -909,   -784,    977,  -1141,  -1201,
+      5256,  -1552,   -536,  -1419,      0,    596,    556,   1654,
+     -1124,  -1225,   -830,   1267,   -719,   1791,   -546,   -297,
+       978,    378,   2674,  -1261,  -1159,   -951,  -1027,   2537,
+      -470,   -360,   -268,   1098,  -1154,  -1513,   -729,  -1455,
+      5671,  -1236,   -800,   -874,   1630,   1273,   1909,   -623,
+      -724,   1417,   -559,   -326,   -257,   -189,    265,    220,
+      -284,  -1302,  -1272,  -1223,   -842,   4338,   -934,  -1001,
+      -495,   2944,   4295,   -924,  -1004,  -1097,  -1024,   -328,
+      1736,    106,    452,    158,  -1024,   -541,  -1296,   4376,
+     -1117,  -1224,   -843,   1097,   1121,   1251,   -829,  -1374,
+      2292,  -1505,   1850,  -1153,   -943,   -979,   -534,   1444,
+     -1510,  -1494,  -1147,  -1397,   1535,   -794,    -21,   1313,
+       638,   1015,  -1072,  -1275,  -1166,  -1602,  -1618,  -1379,
+      4541,   -226,   2169,    888,  -1369,   2392,  -1087,   -948,
+      1074,    674,    384,    124,    500,    749,    398,  -1091,
+      -721,   -114,    -15,    413,    200,    135,    290,    189,
+     -1185,  -1188,  -1339,  -1549,   -871,   -574,   2333,   -346,
+       554,   3773,  -1247,  -1531,  -1408,  -1310,  -1007,   2861,
+      2465,    608,   1080,   1224,  -1103,  -1477,   1884,  -1412,
+      -904,  -1473,   -846,   -188,    782,   2049,  -1473,   1531,
+     -1530,  -1459,  -1546,  -1260,   -856,   1191,    652,    933,
+      5072,  -1456,  -1653,   3759,  -1751,   -531,  -1391,   4297,
+      -374,   -751,  -1570,  -1242,   1461,  -1286,   -913,   -621,
+      1768,   1246,   1291,    779,  -1360,   1641,   1122,   -629,
+      -328,   -197,    241,    359,    560,    536,  -1474,   -506,
+     -1523,    298,  -1551,  -1254,   -985,   3603,   4317,    958,
+      -885,   -241,  -1159,   -930,  -1249,   1490,   -825,    274,
+       347,    307,  -1060,  -1027,   -809,  -1063,   1554,   1708,
+      -242,    -23,    424,    804,  -1317,   -853,   1571,   1898,
+       239,   -556,    298,   -161,    777,    765,  -1464,   1053,
+     -1198,  -1156,   -917,      0,   1460,    447,   1178,    629,
+     -1455,  -1591,    296,  -1785,  -1694,  -1631,   3669,   3819,
+      3437,   3274,   -956,   -666,   -874,   -284,   -858,   -202,
+      -687,   1728,   -512,   -951,   4692,  -1360,  -1242,  -1188,
+     -1513,   -449,  -1566,  -1515,  -1226,   3857,   1246,  -1225,
+      -860,  -1068,   -748,    -27,    380,   1190,    591,    552,
+     -1391,    194,   -763,   -463,    331,   -265,    702,    181,
+       290,   -145,   -838,  -1359,  -1381,  -1569,  -1399,  -1088,
+     -1357,  -1295,   -486,   -612,   1638,   -586,   1458,   -774,
+      -223,   -620,   -104,    189,    344,    269,   1555,   1428,
+      -867,   -621,   -294,   -206,     32,    235,    261,    161,
+     -1021,   -105,    654,   -235,   -282,     -7,    189,   -159,
+      -218,    113,  -1096,  -1318,  -1256,  -1335,   -931,   -476,
+     -1041,  -1199,  -1134,   2781,  -1479,  -1222,  -1397,   -867,
+      -815,   -661,    740,   -240,   1158,    735,  -1435,  -1003,
+       351,   -990,   -245,    -72,   -347,    -72,   1408,    634,
+     -1697,  -1727,  -1534,  -1716,  -1436,   -102,    402,   1518,
+      1903,   1311,  -1477,   -930,   -355,    508,   -162,     21,
+       -46,    454,    387,    173,  -1312,  -1284,  -1486,  -1172,
+     -1356,   -965,  -1106,   1760,   -670,   2163,    -70,    417,
+      -559,   -667,   -545,   -945,   -429,   -363,    157,   1280,
+      2059,  -1319,  -1291,   -975,  -1354,  -1249,   -780,   -476,
+      1410,   1252,  -1193,   -927,  -1462,    871,  -1281,  -1327,
+      -900,   1540,   1531,   1227,  -1651,  -1334,  -1073,   -752,
+      -154,    710,    830,    773,    279,    307,  -1294,   -796,
+      -761,   1012,   1583,   -420,   -177,   -323,    154,    582,
+};
+
+static const int16_t fcb8ss[] = {
+     -1481,  -1069,  -1082,   -726,   -818,   -550,   -417,    343,
+       489,    275,   -814,   -510,   -712,   -933,   -558,   -236,
+        32,   3051,    451,    301,   -414,   -237,   -683,   -599,
+      3627,   -445,   -232,     56,     58,    112,  -1226,   -639,
+      4096,   -644,   -226,    -23,     90,    162,    313,    104,
+     -1385,   5607,   -428,   -860,   -447,   -265,   -145,   -132,
+       115,   -200,  -1349,  -1280,  -1216,  -1046,   -657,     43,
+      1333,    831,    675,   1174,  -1394,   2288,   1840,   -682,
+      -497,   -256,     22,     22,    261,     70,  -1369,   -826,
+      -975,   2286,   -329,   -267,    142,     36,    437,    313,
+      1570,     52,   -470,    622,   -244,   -247,   -114,     22,
+      -117,   -541,  -1167,   -596,   -809,   -929,   -669,   -327,
+       102,    516,   2790,    597,  -1317,   -870,   1327,    987,
+       -25,    391,    -48,    -82,    209,   -242,   4424,   -311,
+      -396,   -765,   -382,   -336,   -365,   -414,    -74,    -13,
+      1127,   -588,   1363,   -714,    368,   -450,   -390,   -364,
+        84,    139,   1864,   1881,    -15,   -790,   -281,   -286,
+        38,   -186,    -31,   -238,  -1249,    262,   -841,    731,
+      -414,    -61,   -274,    280,    100,    557,   -841,   -775,
+     -1007,  -1063,   -687,   -374,   -360,     31,   1048,   3471,
+     -1385,   2464,   -840,  -1105,   -714,   -400,     56,    445,
+       588,    427,   1785,  -1093,   -783,   -847,     41,    -23,
+       465,    392,    382,    428,   -518,   -249,    -58,   -791,
+      -689,   -581,   3146,   -183,    296,     66,  -1243,   1059,
+     -1076,   -874,    416,    544,    253,     66,    168,    211,
+     -1388,   1253,    138,   -727,   -509,    905,    319,   -297,
+        67,   -525,  -1470,   2237,    -87,    547,    556,   -239,
+        90,   -147,   -114,   -302,  -1017,   -824,   -585,     25,
+         0,     62,   1422,   -155,    -41,   -320,  -1125,  -1069,
+     -1134,   -783,   1129,     45,    183,     47,    716,    672,
+       409,  -1169,   -910,   -447,    -34,     79,     95,    455,
+       504,    381,    342,   -877,   -506,   -812,   -805,   3031,
+      -249,   -518,    -69,    564,    243,    261,   -332,   -434,
+      -173,    -37,     61,     45,     -5,      6,  -1433,  -1009,
+      1428,   -951,   -582,    154,    143,    625,    383,    387,
+     -1392,  -1222,   -578,    229,   1294,    218,   -142,    355,
+      -149,    201,  -1341,  -1135,   -857,   -767,   -273,   2059,
+       255,    578,    350,    315,  -1041,   -617,    254,   -504,
+      -255,    -96,   -537,   -396,    363,   1074,  -1361,    484,
+       538,   -789,   -704,   -447,    200,    521,    213,     90,
+};
+
+static const int16_t fcb8sm[] = {
+     -1183,  -1170,   -867,   -948,   -746,    492,   1531,   1412,
+       524,     82,    590,   -994,   -916,   -859,   -680,     12,
+       742,    961,    230,    255,     34,     38,   -176,     -1,
+      1880,   -240,   -769,   -531,    269,    -32,   -772,   -494,
+       757,   -583,   -677,   -281,    717,    440,    561,     91,
+     -1121,  -1054,  -1189,  -1100,   -745,   -417,    -61,    302,
+      3079,   1817,  -1384,  -1479,  -1477,  -1509,  -1077,   -323,
+       902,   2348,   1464,   1038,   -487,   -179,   -447,   -311,
+      -296,   -439,   -172,   2166,    245,    -28,  -1050,   -390,
+      -238,    633,    302,   -335,    843,    -52,    185,    230,
+      -110,   -433,   -690,    148,     63,   -289,   -404,   -469,
+      1948,    245,   2016,   1337,   -341,   -554,   -617,   -457,
+      -436,   -459,   -400,   -520,   -661,     -7,   1078,    971,
+      -326,   -332,    -23,   -749,     83,   -104,   2106,   -947,
+      -867,   -883,   -705,   -433,    -35,    164,    427,    646,
+      -924,   2196,   -656,   -798,   -282,    217,   -227,    134,
+       446,    -15,   -584,     33,    185,   -571,   -159,   1852,
+      -405,    -94,    -61,    -83,   -329,   -516,   -394,   -450,
+      -173,   -140,    -54,   -156,    226,   1850,   -752,  -1304,
+     -1378,  -1275,  -1017,   -680,   -337,    356,   1131,   4143,
+     -1120,  -1253,  -1269,   -860,     90,    973,    152,    886,
+       609,   1454,    -29,     36,   -117,   -815,   -651,   -346,
+      2085,   -414,     24,    -93,   -235,  -1103,  -1132,   -758,
+       -98,   1497,   1285,   -289,    -34,    402,   -646,    637,
+      2147,   -677,   -350,   -266,   -232,    -61,   -199,   -359,
+       167,   1546,    816,   -453,    -35,   -251,   -468,   -491,
+      -371,   -593,   -878,   1445,   -795,    651,    108,   -155,
+      -201,    -14,    250,   -271,   -732,    793,    154,   -288,
+       -86,     16,    557,    642,   -592,   -587,    -87,   -365,
+      -309,   1753,    -40,     95,   -529,    -87,   -214,   -234,
+      4999,   -466,   -755,   -800,   -785,   -722,   -532,   -703,
+      -526,   -465,    591,   3937,   -229,   -804,   -808,   -698,
+      -576,   -613,   -506,   -725,     10,     13,   -117,    -55,
+       101,     52,    125,    -76,    -25,    -28,   1469,   -245,
+         8,    -25,     65,    -53,   -262,   -282,   -411,   -588,
+      -667,   1374,    304,   -787,   -661,   -675,     55,    320,
+       720,     -4,    366,   -103,   -136,   -332,   -314,   -293,
+       -38,    127,    151,    380,  -1330,  -1338,   -618,    -40,
+      1284,   1500,    466,   -515,    105,   -161,     19,    697,
+      -417,   -559,   -317,   -712,   -756,   -567,    754,   1481,
+};
+
+static const int16_t fcb11l[] = {
+     -1291,  -1237,  -1175,  -1186,  -1139,    524,   1225,   1464,
+     -1042,   -721,   -901,     41,   -728,    822,   -657,   1078,
+      -483,   1530,   -489,   1253,    926,   -326,    404,     89,
+     -1191,  -1170,  -1237,   1633,   1493,   -465,    986,   1184,
+      -857,   -832,   -300,   -811,   -936,   -667,   -254,    492,
+      4044,  -1136,   -983,   -855,   -592,   -199,    383,    876,
+      2076,  -1042,  -1019,   -729,   1435,    -25,     64,    845,
+      -991,   -921,   -861,    916,   -402,   -551,    236,    429,
+      5253,  -1233,  -1268,   -414,   1793,   -463,   -569,   1693,
+     -1197,   6322,   -887,   -211,   -945,   -540,    626,    903,
+      -993,   1500,   -490,   1445,   -764,   -136,    321,    548,
+       462,   -228,    127,   -322,    481,   -183,     88,    155,
+      -809,   -844,   -959,   4011,   -581,   -232,    330,    986,
+      -900,   -916,  -1069,   -866,   -979,   -439,   4016,   1558,
+     -1023,   2121,   1717,   -612,   -588,   -446,    223,    430,
+      2567,   -972,   2118,  -1030,   -900,   -664,    180,    858,
+      3232,   -991,  -1132,   2119,   -446,   -548,   -258,    895,
+      -962,   -184,   2639,   1081,   -661,   -222,    292,    530,
+      -952,   1767,   -213,   -701,   1079,     37,    131,    489,
+      -875,   -749,   3167,   -776,   1247,   -109,    -83,    636,
+     -1146,  -1070,  -1001,  -1064,   -942,   2891,   1137,   1585,
+     -1314,   -632,  -1179,  -1105,   1101,     51,   2038,   2036,
+      -926,   -727,    180,   1515,   -566,   1191,    101,    595,
+      2247,   -364,   -315,   -105,   -130,    -79,    121,    210,
+      7994,  -1302,   -898,   -785,   -758,   -777,     31,    415,
+       744,   -652,    688,   1226,   -649,   -605,   -268,    314,
+       611,    662,   -240,   -411,   -698,   -434,    377,    339,
+       953,   -810,   -931,   1054,   -484,   -298,    721,    522,
+       922,  -1046,   -952,   -871,   -618,   -270,    419,    635,
+      1006,    129,   -838,   -724,    220,    481,    253,    329,
+       205,   -456,   -724,    675,    598,    332,    -14,    291,
+     -1016,   -695,    542,   1270,    498,   -456,   -113,    362,
+      -547,  -1068,  -1178,  -1261,  -1161,   -905,    390,   2204,
+     -1056,  -1102,   5611,  -1100,  -1076,   -902,    360,    978,
+      -538,   -286,   1253,   -430,   -457,   -148,     -1,    -60,
+     -1116,   -955,   2869,   -926,   -680,   1111,    706,    842,
+     -1311,  -1275,  -1150,   -236,    675,    897,    758,    912,
+      1886,  -1115,   -999,    -84,   -588,   2190,   -171,    739,
+      -737,    150,   -902,   -854,   -917,    334,    557,    534,
+      -851,    -39,    -25,    214,   -136,    -73,    263,    234,
+     -1021,   1332,   -543,   -655,   -712,   -651,     80,    479,
+      1555,   1933,   -707,   -485,   -206,    139,    312,    405,
+      2472,  -1172,   -945,   -939,   -713,    568,   1421,    684,
+        70,  -1263,  -1235,    586,   -195,  -1065,   -449,   3182,
+     -1143,    529,   -926,   -558,    419,    390,    375,    563,
+     -1090,   3370,   -688,   -528,   -346,    136,    317,    615,
+      -803,   -977,  -1082,   -806,   3607,   -443,   -156,   1130,
+     -1288,   1585,  -1218,  -1226,   -979,    359,   1555,   1402,
+      -341,   -416,   -480,   -360,   -415,    542,   -148,   -322,
+     -1095,  -1074,    762,   -864,   -634,   1770,    340,    466,
+     -1040,   -834,   1508,   -707,    143,     74,   1418,    905,
+     -1094,   -710,   -549,   -860,    373,   1492,   2024,    741,
+      -938,   -910,   2661,  -1087,  -1105,   -901,    383,    906,
+       755,   -819,    581,   -612,   -420,    305,    344,    363,
+      -356,   -991,   -845,  -1051,   2112,   1738,    554,    954,
+     -1028,   -943,   -892,   -896,   -236,   -674,   1076,    679,
+      -611,  -1099,   -859,   -914,   -444,    910,    491,    709,
+     -1063,    775,    496,   -669,   -304,    672,    261,    496,
+     -1086,   -963,   1037,   -639,   -134,   -577,     33,    607,
+     -1070,   -649,    730,   -748,   1884,    -18,    346,    627,
+     -1089,  -1118,   -955,    751,   -690,    606,   1204,   1037,
+     -1016,  -1095,    473,   -919,  -1036,   -685,   1744,   1216,
+      -834,   -916,   -920,   -634,   1086,   -474,    161,    620,
+      -997,   -899,    -25,   -499,    399,    405,    163,    401,
+};
+
+static const int16_t fcb11s[] = {
+     -1148,  -1134,  -1000,   -585,    715,    774,    626,    650,
+      2109,   -898,   -729,   -239,   -213,    847,     77,    371,
+      -902,   -790,   1853,   -871,   -816,    163,    295,    377,
+      1718,  -1070,   -840,   -791,   1612,   -129,    144,    450,
+      -830,   1909,   -539,    803,   -411,   -188,    122,    148,
+      1202,    705,   -696,   -578,   -213,    -25,    126,    142,
+      3309,  -1083,   -865,   -771,   -470,   -237,    980,    521,
+       428,   -995,  -1003,   3088,  -1000,   -455,    320,    503,
+      -615,   1746,   -751,   -734,   1092,     31,     97,    225,
+     -1175,   2287,   1278,   -421,   -315,     91,    130,    120,
+     -1203,   4211,   -970,   -878,   -228,     71,    327,    288,
+     -1012,   -850,   1471,   -732,   1228,    201,    146,    271,
+      -868,   -528,   1196,    744,   -186,     85,     38,    153,
+     -1081,   -895,   -742,   1014,   1110,     66,    237,    335,
+     -1012,  -1137,   4357,  -1062,   -569,    377,    268,    445,
+      1203,   -717,   1070,   -541,    -72,    -29,     91,    104,
+      6448,  -1148,  -1069,   -810,   -659,    118,   -284,    300,
+     -1085,   -940,   -214,   -621,   -781,   -622,   1789,    711,
+     -1165,   1643,   -890,   -809,   -533,    148,    384,    373,
+      -910,   -986,   -855,  -1032,   3647,   -478,   -132,    713,
+        -3,   -674,  -1036,   -956,   -899,   2698,    629,    665,
+      -764,  -1066,  -1173,  -1058,   -692,   -144,   1114,   3195,
+     -1012,   -643,   -670,   1547,   -576,    351,    251,    273,
+      -950,    563,   -742,    248,   -149,    514,    100,    185,
+      -193,   -616,   -655,    255,   -364,   -323,    172,    256,
+       308,    228,     16,   -187,   -243,    219,     88,     53,
+     -1024,    664,    450,   -416,   -189,   -239,     43,    102,
+       -64,   -499,   -159,   -400,    905,    -64,    -68,     46,
+     -1055,    -77,   -813,   -661,     59,    -77,    226,    321,
+      1224,   -553,   -436,    793,   -155,    -83,     -5,     72,
+      -652,   -897,   -157,   -579,   -539,    846,    181,    318,
+       782,   -967,   -802,   -569,     -6,    364,    540,    513,
+};
+
+static const int16_t fcb11m[] = {
+      -453,  -1087,  -1133,  -1125,   -852,   -158,   1152,   3313,
+      1015,   -444,   1085,   -465,   -317,   -298,   -471,   -238,
+      -647,   1426,   -241,    149,   -300,   -169,    -19,   -228,
+      3282,   -269,  -1025,  -1069,  -1097,  -1071,   -539,   1303,
+      1111,   -933,   -741,   -801,   -553,     98,    393,   1031,
+      -786,   -729,   -835,   -810,    -78,   1569,    631,    944,
+      1031,    651,   -409,   -397,   -346,   -221,    -99,   -216,
+       -88,   -211,   -419,    193,   1298,    196,   -221,   -879,
+     -1036,  -1303,  -1282,  -1052,   -575,    283,   3110,   1337,
+       489,   -463,   -640,    112,    341,   -322,    261,    266,
+      1646,   -817,  -1256,  -1273,  -1217,  -1031,   -142,   3691,
+      3012,   1564,   -289,   -830,   -970,  -1032,  -1075,   -989,
+       556,     52,   -588,   -589,   -613,   -748,   -352,   2054,
+       -69,   -785,   -718,   -499,   -141,    192,   1396,    446,
+        -3,   -514,   -612,      3,    171,   1067,   -114,   -109,
+      -812,   -893,   -776,   -342,   1428,    421,    438,    552,
+      -933,  -1143,   -207,   1312,    791,    166,   -198,    -79,
+      -632,   1122,   -537,   -620,    450,     97,    -85,    174,
+      1760,    123,   -168,    485,    -77,   -567,   -776,   -952,
+      -758,  -1176,  -1322,  -1355,  -1207,   -928,   -177,   6229,
+      -413,    261,   -327,   -848,   -725,   -395,    849,   1533,
+      -201,   -124,   2976,   -335,   -703,   -674,   -727,   -949,
+      -521,    209,   1004,    838,     56,   -477,   -751,   -603,
+      -922,   -615,   1832,   -448,   -329,   -148,     73,    467,
+      4991,    -86,   -809,   -928,   -951,   -956,   -819,   -751,
+      1841,   -790,   -712,   -116,   -113,    -91,      0,   -388,
+      -729,   -196,    758,   -377,     68,     85,    428,    -35,
+        -5,      2,     -9,     18,    -31,     53,    -23,     26,
+      -896,   -445,   -188,    818,   -347,    -44,    502,    578,
+       101,   2968,    269,   -724,   -702,   -747,   -719,   -673,
+      7587,     68,  -1171,  -1377,  -1441,  -1455,  -1473,  -1178,
+       699,    585,     15,   2257,   -503,   -940,  -1085,  -1288,
+};
+
+static const int16_t fcb11sl[] = {
+     -1502,  -1463,  -1336,  -1177,   -367,     89,    475,    867,
+       550,    820,   -805,   -580,   -803,    -89,   -817,   1691,
+      -304,    120,     36,    564,    409,   -525,   -820,    362,
+      -969,   -870,   -605,   1983,    993,    722,   1505,   1101,
+      -842,   -848,   -918,   -379,    -71,    257,    499,    607,
+      1619,   -956,  -1024,   -869,   -744,    -74,    795,    684,
+       532,    634,  -1360,   -818,     49,   -981,    111,   -473,
+      -718,   -477,    377,    710,  -1399,  -1105,  -1152,  -1024,
+      2426,   -356,   -191,   1079,    911,   1164,   -809,   -791,
+      -919,   2731,   -851,   -400,   -113,    242,    508,    847,
+     -1229,   1199,   -910,   1127,   -686,   -383,     26,    352,
+       536,    646,   -790,  -1243,  -1103,  -1170,  -1132,  -1065,
+      -788,   -521,    161,   3842,  -1098,   -883,  -1052,      8,
+     -1103,   -747,   -552,   -480,   -241,    820,   3392,   -770,
+      -770,   -724,   -588,   -426,   -153,    426,    639,    724,
+      1626,   -713,   1157,   -736,   -492,   -512,   -160,    461,
+       569,    583,  -1351,   1332,  -1222,  -1358,    240,   1541,
+      -724,    612,   1583,   1194,  -1061,   -990,   -671,   -969,
+      -952,   2368,   -442,   -413,   1933,   1023,   -144,   -283,
+      -992,   -940,    983,   -232,    818,    341,    502,    549,
+     -1420,  -1268,  -1279,  -1213,   -621,   2019,    685,   1948,
+      1264,   1200,  -1293,   -664,    392,   -848,    866,   1191,
+      -220,     95,    450,    640,  -1334,   1098,   -751,   -701,
+      1296,   -347,    -92,    233,    532,    599,   -952,   -694,
+      3085,   -908,   -256,   -494,   -177,    123,    809,    941,
+        18,  -1089,   -801,    303,   -761,     11,    632,    288,
+       476,    518,   -241,  -1138,  -1068,   -869,    292,    121,
+       -26,    -96,    457,    548,   -106,   -784,    930,   -700,
+      1842,   -812,   -617,   -307,    430,    655,   -698,   1157,
+       947,   -803,   -662,   -743,    -49,   1120,    348,    578,
+       855,  -1049,   -753,    -67,    710,   -347,    -28,    694,
+       411,    468,    -61,    239,     23,  -1072,   -757,    477,
+      -658,   -362,    239,    576,  -1479,  -1279,  -1286,   -677,
+      -939,   -722,   3217,    338,   1562,   1566,    925,    917,
+      -697,   -708,    645,   -447,   -280,    714,    503,    552,
+     -1050,  -1021,    889,   -956,   -934,    705,    457,    616,
+       556,    667,  -1331,    -51,   -256,    -48,   -234,    240,
+       757,    -74,    148,    356,  -1278,   1538,    234,   -372,
+      -472,   -221,   -424,   -494,    170,    551,    216,    294,
+      -885,    231,   -263,    334,    -64,    -54,    291,    350,
+     -1140,  -1074,  -1199,  -1374,  -1278,   -845,   -547,    667,
+      4544,   1922,   -899,   -930,   -954,  -1120,  -1092,   1156,
+      1889,   -404,    259,   1114,   -956,   -836,    881,   -316,
+      -977,   -860,    202,   -249,    121,    816,  -1188,   3644,
+      -829,   -876,   -670,   -473,   -161,    420,    851,    886,
+     -1014,   1191,   -938,   -958,   -864,    741,    241,    957,
+       288,    629,  -1155,   -898,   1104,   -789,     28,   -867,
+      -580,   2588,    836,   1234,   -953,   -749,    934,   1137,
+      -310,   -177,   -113,    244,    532,    424,   -341,   -602,
+      -880,  -1105,   -303,   -381,   -527,   1943,    126,    759,
+     -1277,  -1037,     59,   -783,    485,   -589,   1341,    737,
+       488,    709,  -1473,  -1208,  -1082,    589,    791,    735,
+       447,    322,    835,    731,  -1116,   -681,   -592,    704,
+       520,   -545,   -104,    -24,    263,    458,    632,   -721,
+     -1086,  -1223,  -1150,   -866,   1537,   2815,    123,   1097,
+     -1238,   -861,  -1217,  -1238,  -1261,   -914,   1165,    422,
+       711,    883,  -1196,   -972,   -428,   -230,    171,      8,
+      -448,   1195,    445,    440,   -413,   -139,   -375,   -568,
+      -781,   -520,    611,   -586,    881,    589,   -724,    972,
+      -907,   -794,   -819,   -641,   1650,     66,    254,    703,
+     -1380,  -1168,   -967,    676,   -765,   -537,    578,   1542,
+       687,    833,   1151,   -811,   -948,   -995,   -246,   1301,
+      -377,    262,    632,    652,   1530,   -679,   -682,    993,
+      -666,   -457,    -72,    -20,    317,    516,    861,   -528,
+        24,   -579,   -386,     53,    526,    -76,     66,    345,
+       -59,   -612,    165,   -181,    -98,    -34,    -66,    286,
+        95,    108,  -1118,   -147,    643,  -1055,   -768,   -502,
+      -587,     27,   2113,    811,  -1219,   -947,   -811,  -1188,
+      1143,   -609,   -753,     88,   2844,   1424,  -1428,  -1082,
+     -1273,   1086,  -1206,  -1171,    279,   -510,   2325,   1757,
+     -1437,    654,  -1278,  -1267,  -1117,   -950,    779,   2205,
+      1150,   1101,  -1484,  -1009,  -1199,  -1416,  -1215,    657,
+      -737,    634,   1266,   1742,  -1445,  -1193,  -1358,  -1158,
+     -1015,   -995,   -655,   4035,   1966,   1903,  -1069,    954,
+     -1099,  -1171,  -1029,   -818,   -576,   -104,   1390,   1069,
+       559,   -914,  -1034,  -1152,   -987,   -582,   -222,    394,
+      1204,    775,  -1464,    -51,   -959,  -1005,   -452,    347,
+       -94,      1,    525,    595,  -1324,  -1226,  -1102,   -825,
+      -927,   -776,   -582,    175,   1675,    632,   -859,     28,
+      -914,   -209,   -468,   -625,   -230,    646,    579,    446,
+};
+
+static const int16_t fcb11ss[] = {
+     -1351,  -1229,  -1174,   -767,   1403,    182,    532,    445,
+       415,    610,  -1095,   -771,  -1142,   3221,   -803,   -680,
+      -302,    318,    441,    438,  -1188,   1145,   1552,   -528,
+       887,   -547,   -429,    124,     99,    128,   -768,   1049,
+      -562,   1121,   -593,    -96,   -105,    105,    251,    154,
+      1684,   1598,   -635,   -685,   -177,   -211,   -268,    234,
+      -118,    -49,   -719,   -873,  -1092,   -985,   -678,   -406,
+      -234,    407,    653,   3195,    991,   -584,   -874,    -14,
+      -683,   2964,   -769,   -450,    287,    350,    853,   -803,
+      -574,   1761,   -410,    -60,   -230,    -78,    -21,     19,
+     -1271,   4435,   -673,   -790,    110,   -243,    -81,    147,
+       191,    145,   5571,   -611,   -634,   -699,   -195,   -281,
+      -249,   -302,   -272,    -67,   -893,   -656,   -745,   -697,
+      -550,   -639,   -409,   3085,    383,    798,   -311,   -340,
+      -564,   -787,   3628,   -332,   -510,   -219,    465,    351,
+      -747,  -1084,   -972,   -727,   -404,   -630,   -176,    437,
+      3352,    978,   -886,   -751,   -767,   -580,   -693,   -942,
+      -803,   -158,    -36,     -3,   -966,   -674,   3075,   -926,
+      -172,     -9,    -40,    111,    169,    212,    181,   -811,
+      -715,   -986,   -521,   -686,   3915,     18,    -58,    499,
+       210,  -1187,   -903,   -915,   -522,   1038,    477,    788,
+       290,    412,  -1010,   -791,   -700,   -710,     34,   1774,
+      -256,     96,    131,    241,  -1251,   2086,     -5,   -765,
+      -446,    141,     93,    160,     88,    129,  -1153,   1171,
+     -1192,  -1073,   -391,   -187,    206,    416,    444,    648,
+       707,   -542,   -504,   -750,   -623,   -648,    776,    692,
+       165,    330,   1112,  -1199,   -876,   -428,    949,     65,
+       250,    104,    108,    173,   2147,   -905,   -846,   -540,
+      -376,   -131,   -113,    124,    314,    485,   1253,   -515,
+      1435,   -527,     21,   -100,   -368,    -84,   -119,   -144,
+     -1375,  -1189,  -1189,   -999,   -723,   -190,    796,    639,
+       699,    816,  -1188,   -919,    683,    842,    177,    -62,
+       -25,     71,     15,     16,    157,     80,   -331,   -343,
+        12,    193,   -133,    -94,    -94,    -64,  -1306,    531,
+      -917,   -142,   1274,    102,    -15,    184,    159,    148,
+       -43,  -1103,   -581,   -419,    447,   -132,   -204,    187,
+       631,    461,  -1302,  -1162,   -927,    896,    203,    164,
+       -55,    287,    544,    485,  -1258,   -791,    677,   -945,
+      -244,   -101,    423,    362,    298,    389,   -825,   -640,
+      -646,    274,    -73,   -274,   1473,    -13,    132,    169,
+};
+
+static const int16_t fcb11sm[] = {
+      -767,  -1179,  -1188,  -1069,   -690,   -172,    787,   1389,
+      1623,    844,   -169,   -894,   -919,     51,     15,    426,
+      -326,   1579,    182,     77,    202,   -417,   -357,    -17,
+      2154,    -77,   -607,   -589,   -375,   -261,   -376,    175,
+      -829,   -801,   -579,   -290,   -244,    533,   1307,    873,
+      -877,  -1175,  -1157,   -726,    461,   1729,    433,    219,
+       246,    606,   -791,   -827,    649,    891,    820,    720,
+       407,   -641,   -727,   -708,   2498,    961,    -99,   -542,
+      -530,   -507,   -536,   -608,   -642,   -622,    316,    195,
+      -721,   -549,   -253,   1520,    171,    -81,   -372,   -333,
+      1166,  -1072,  -1230,  -1123,  -1031,   -868,   -370,    209,
+      1561,   1751,    113,   -367,    399,   -663,    -10,   -271,
+       950,    118,   -335,   -272,   -863,     60,   -875,   1850,
+      -242,   -276,    -38,   -106,    471,     30,    823,   -344,
+      -752,   -714,   -309,   -419,     86,   1604,   -250,   -185,
+      -839,   -703,   -561,   -281,   1813,    -57,    255,    266,
+       -32,     99,    400,   2520,    315,   -372,   -306,   -511,
+      -549,   -659,   -760,   -729,   -559,   -137,   -610,    174,
+       924,   -310,   -705,   -307,    885,    512,   -611,  -1097,
+     -1172,  -1072,   -758,   -527,   -192,    278,    740,   3398,
+     -1136,    409,   -230,   -353,   -137,    322,    326,    365,
+       133,    173,   2291,   -644,   -725,   -596,   -535,   -340,
+       -88,    -65,    -53,    273,   -760,   -390,   -649,    119,
+      -243,   -222,   1726,   -113,     44,    326,   -618,    311,
+      2345,   -241,   -398,   -399,   -382,   -322,   -444,   -457,
+      1873,   -454,   -505,     42,    481,    187,    -49,   -505,
+      -634,   -754,   1052,   -597,   1315,    297,   -412,   -110,
+      -205,   -552,   -682,   -524,  -1055,   -431,    971,   -363,
+      -539,   -366,     39,    995,    181,    476,    662,    229,
+      -445,   1682,   -205,   -181,   -273,   -497,   -685,   -628,
+      6135,    -21,   -834,   -934,  -1002,  -1066,   -931,   -974,
+      -902,   -643,   -820,   1891,   -706,   -288,   -252,   -231,
+       -79,    126,     35,     37,     10,    -10,    -36,     -6,
+        -9,    -47,     -7,      1,     11,     -2,    644,    315,
+       145,   -353,   -396,   -428,   -357,    -60,    275,    109,
+     -1179,   -952,   -698,    138,    286,    171,    394,    263,
+       814,    495,   -490,    110,    369,    599,      9,    599,
+      -431,   -233,   -328,    -69,    410,  -1002,   -462,     77,
+        97,    196,    133,    -91,    512,     49,    621,   -436,
+      -352,   -390,   -211,   -188,   -454,   -318,     44,   1424,
+};
+
 static const int16_t fcb16l[] = {
        -13,   -798,   -772,    235,    515,   -181,   -120,   -509,
       -392,  -1159,   -844,  -1041,   -881,  -1193,   1103,  -1080,
@@ -3751,6 +11218,641 @@
         0, 0, 0, 0, 0, 0, 0, 0,
 };
 
+static const int16_t fcb16sl[] = {
+     -1337,  -1122,  -1559,  -1452,  -1353,   -973,   3858,   1145,
+      1225,   2103,   -607,   -181,    557,   -429,     15,   -496,
+      -444,   -523,  -1866,  -1134,  -1270,   3029,  -1110,   -798,
+      -824,   -659,     44,    614,   1059,   1173,    714,   -932,
+     -1095,  -1061,   -921,  -1034,   -873,      7,   -872,    660,
+     -1335,  -1496,  -1623,  -1405,  -1070,   -680,    943,    134,
+      -190,   2837,  -1034,   -221,   -337,   -540,   -571,   -173,
+      -411,   2314,   -111,    970,  -1220,  -1036,  -1096,   -147,
+      1087,    604,   -367,     83,    461,    679,  -1333,    194,
+     -1292,  -1139,  -1097,   -570,   -508,   -109,     54,    962,
+      2592,  -1112,   -944,   -636,   -521,     12,    230,    442,
+       562,    624,  -1107,  -1190,   1554,   -981,   1507,  -1013,
+      -394,    595,    823,   1094,  -1453,  -1298,    242,  -1185,
+      -686,   -541,    858,    331,    695,   1197,  -1259,    968,
+     -1180,  -1254,   -752,   1473,    222,    342,    973,   1029,
+     -1631,  -1500,  -1619,  -1517,  -1299,   1683,   2203,   1163,
+      1225,   1497,  -1189,   -937,   -931,   3193,   -977,   -708,
+      -262,    549,    917,   1465,    704,   -565,   -708,    846,
+      -130,   -322,   -257,    221,    367,    309,  -1416,  -1123,
+     -1323,  -1260,   -405,   3303,   -210,    785,   1007,   1616,
+     -1043,   -717,     44,    824,    419,   -492,   -579,   -604,
+       -15,    676,  -1067,  -1079,   3897,  -1211,   -474,  -1020,
+      -589,    114,    593,   1504,  -1481,  -1249,  -1036,  -1012,
+      -719,    846,   -189,   -297,    -31,   1209,  -1761,  -1566,
+     -1449,  -1645,  -1464,   1422,     24,   2153,   1377,   1948,
+     -1480,    652,   -929,   -415,   -689,   -386,   1628,    489,
+       487,    756,  -1424,   -805,   1241,    228,   -697,   -316,
+       423,    660,    557,    587,   1248,   -777,   1088,   -848,
+      -498,   -399,    -60,    169,    497,    689,   5679,   -778,
+     -1109,  -1118,   -895,  -1042,   -504,    390,   1670,    469,
+       977,   -929,  -1173,  -1058,   -999,   -696,   1912,     52,
+      1297,   1081,  -1469,  -1243,  -1055,    385,   -529,    910,
+        79,    508,   1225,    753,    656,  -1307,  -1239,  -1470,
+     -1110,  -1255,   -362,   2351,    889,   1687,  -1566,  -1331,
+     -1410,  -1385,    779,   -499,   -217,    936,   2064,   1493,
+     -1499,  -1345,  -1162,    790,  -1115,   -673,   2083,   1010,
+       588,   1265,  -1439,  -1168,  -1294,    752,  -1421,  -1234,
+      -169,   -529,   1606,   2131,  -1556,  -1442,  -1444,    487,
+     -1260,  -1139,    360,   2528,   1994,   1686,  -1548,  -1473,
+      -563,  -1125,    967,   1490,   1503,    487,    991,   1024,
+     -1430,  -1151,  -1215,   -729,   -746,   -762,   -472,    778,
+       889,    774,  -1329,  -1129,   1383,  -1230,   -723,   1478,
+       379,    161,   1266,   1238,  -1467,   -843,  -1277,  -1323,
+      -715,     58,   -182,   5140,    762,   1723,  -1285,   1134,
+     -1175,  -1057,   1294,     -4,   -417,    557,    939,   1182,
+        39,    565,   -809,   -703,   -783,   -883,   -112,    412,
+      1056,    691,   -273,  -1334,   -898,  -1345,  -1069,  -1247,
+      -105,    638,   6811,   1157,    982,   -856,   -805,  -1093,
+      1267,   -747,   -650,    311,    281,   1076,   1371,   1614,
+      -891,   -886,   -396,   -246,    -65,     77,    472,    605,
+      -943,    178,   -509,    112,   -142,    512,    -66,    109,
+       144,     76,   2934,  -1203,  -1428,  -1525,  -1269,  -1618,
+     -1129,   -184,   -225,   3157,   -249,  -1276,  -1055,   -439,
+      -161,   -268,    284,    614,    778,    670,  -1243,   1682,
+       919,   -468,   -479,   -341,     31,    468,    325,    606,
+     -1081,   -723,     83,   -399,   -275,   -658,    240,    149,
+      2746,    679,  -1573,  -1287,   -494,    775,    975,   -751,
+       -47,   1758,    652,   1155,  -1465,  -1073,  -1087,  -1026,
+       289,    340,    448,   1348,    351,    682,   2065,  -1183,
+     -1313,  -1562,   -466,  -1546,  -1077,   -477,   3012,   2512,
+     -1560,  -1532,  -1441,  -1229,    861,   -421,   1515,   2195,
+      1163,   1418,  -1268,  -1103,   -804,  -1094,   3254,   -711,
+      -558,    713,   1414,   1684,    542,   -781,   -827,   -814,
+      -245,   1129,   -160,    210,    386,    618,  -1633,    488,
+     -1584,  -1571,  -1349,   -662,    711,   1516,   1661,   1673,
+     -1510,  -1530,   1013,  -1172,    425,  -1415,   -856,   2963,
+      2258,   1919,   -744,  -1208,   -863,   -634,   -729,  -1068,
+      -857,   -289,    701,   6703,  -1502,  -1353,  -1531,  -1372,
+     -1388,  -1067,   1392,    100,   2570,   1703,  -1551,  -1500,
+     -1587,  -1693,  -1753,  -1431,  -1048,   1162,   1308,   3073,
+      -998,  -1575,   -517,  -1346,  -1293,  -1493,  -1375,  -1109,
+      -803,   2972,  -1446,  -1316,  -1114,  -1405,  -1240,  -1057,
+     -1109,   -589,   2623,   1626,  -1555,  -1026,  -1346,  -1467,
+      -902,   1291,    176,    630,   4293,   1949,  -1233,  -1362,
+      -930,  -1175,  -1118,  -1375,  -1172,   -967,   4896,   4195,
+     -1744,  -1562,  -1797,  -1815,  -1577,  -1194,    371,   3326,
+      3183,   3071,  -1425,  -1773,  -1562,  -1358,   -547,   -246,
+        24,   -526,  -1502,  29376,   -860,   -614,   -857,   -795,
+       793,   -616,   1691,   -125,    156,    559,  -1643,  -1462,
+     -1523,  -1413,  -1251,   -592,   1014,   1888,    243,   1041,
+};
+
+static const int16_t fcb16ss[] = {
+       308,   -532,   -811,   -974,   -641,   -431,   3409,    258,
+       567,    641,   1315,   -723,   -738,   -502,    142,    678,
+       -67,   -170,     73,    -65,   2717,   -804,   -958,   -878,
+      -532,   -562,    238,    497,    548,    718,   -868,   -669,
+      -932,  -1004,   -518,   -502,   -286,    405,   2987,   1420,
+       174,   -779,   -748,   -575,   -153,    -40,    340,    413,
+       275,    387,    965,     82,   -550,   -744,   -592,   -591,
+      -604,   -163,    428,    843,  -1280,   1756,   -368,    777,
+       -29,   -453,    -61,     43,     50,    137,    950,   -229,
+      1504,   -491,   -353,   -167,   -285,   -158,    -94,   -185,
+     -1431,    303,    673,   -758,   -610,   -308,   1247,    348,
+        95,     31,   1631,   1963,   -624,   -770,   -466,   -150,
+      -122,   -123,     34,   -141,   -883,   -374,   -948,   -629,
+      3420,   -772,   -392,    -31,    603,    646,   -760,   -871,
+      -936,   -948,   -727,   3563,   -376,    858,    699,    561,
+     -1370,   2366,   -775,  -1241,  -1105,   -247,    177,    432,
+       414,    379,  -1360,  -1057,   -945,   -848,   -568,   -779,
+      -632,   -328,   -295,    425,   -349,    630,   -275,   -527,
+       438,     47,   -194,    -96,   -239,   -545,  -1381,   -689,
+      1644,   1165,   -437,   -153,   -193,    307,    183,     66,
+     -1335,   2590,   2169,   -447,   -435,   -317,    -82,    204,
+        45,   -145,  -1324,   -205,   4019,   -973,   -578,     28,
+       175,    506,    235,    -98,   -908,   -294,   1443,   -850,
+      -556,   1707,   -277,     58,    241,   -188,   -853,   -572,
+      -577,   1258,   1007,   -190,      1,     -3,    103,    -49,
+      5385,    137,   -707,   -834,   -510,   -517,   -392,   -390,
+      -231,   -275,  -1249,   5229,   -812,   -893,   -353,   -663,
+       -29,    187,     45,     10,  -1388,  -1171,  -1051,    412,
+      -379,   -411,    240,    574,    632,    284,   -838,   -912,
+      -924,   3062,   -695,   -409,   -224,    422,    293,    267,
+     -1436,  -1237,  -1303,  -1305,   -914,   -243,    821,    839,
+      1043,   1284,  -1178,   -496,   1594,   -736,   1752,   -601,
+      -396,    330,    231,     48,  -1253,    808,   -896,   -967,
+      -653,    -84,      4,    442,    363,    589,  -1005,   -672,
+      -687,    -93,   -274,   1376,   -232,    -52,    399,    255,
+     -1085,  -1214,  -1088,   -748,   1036,    414,    220,    509,
+       436,    499,   -648,   -765,   -931,   -983,   -758,   -543,
+      -379,   -115,    780,   3327,  -1086,   -893,   -773,   -881,
+      -683,    -11,   -322,   3418,    739,    961,  -1363,   -929,
+       899,  -1005,   -792,   -338,   -185,    702,    627,    638,
+};
+
+static const int16_t fcb16sm[] = {
+     -1125,  -1385,  -1439,  -1387,  -1120,   -681,   -135,    616,
+      3086,   2537,  -1440,  -1209,  -1027,  -1209,   -626,    173,
+       662,    899,    861,   2180,    387,   1032,    936,    140,
+      -353,   -302,   -290,   -330,   -551,  -1019,   3555,    -68,
+      -441,   -539,   -500,    -27,   -423,   -506,   -522,   -415,
+      2347,   1890,   -312,   -742,   -679,   -679,   -653,   -609,
+      -433,   -472,   2709,   -755,  -1153,  -1066,  -1028,   -862,
+      -826,   -315,     78,   1699,   -363,   -429,   -690,   -190,
+      -358,   -667,   1909,     39,     -1,    138,  -1592,  -1559,
+     -1357,  -1554,   -750,    813,   1676,   1537,    977,   -269,
+      8320,   -602,  -1140,  -1153,  -1136,  -1174,  -1004,  -1091,
+     -1388,  -1187,   -507,   3103,   -200,   -665,   -590,   -381,
+      -365,    -40,   -295,   -591,   -963,    271,   2231,   -547,
+       -65,   -270,    -64,    243,   -183,   -548,   -796,   -277,
+        -7,   -168,   1575,   -361,     35,    -19,    192,   -154,
+      -384,    144,   -426,   -528,   -598,   -778,   -297,   1847,
+       564,    218,    864,   -654,   -485,   -435,     45,    709,
+       630,    -11,   -691,   -111,   -775,   -356,   -522,   2247,
+       -79,   -433,   -620,    594,     79,     60,   -828,   -475,
+       768,    -79,   -655,    550,   -201,     77,    858,    -11,
+      -803,   1173,   1027,   -971,   -656,   -648,    -40,     17,
+       720,    176,  -1055,   -936,   -258,    550,   1086,   1065,
+         0,   -473,   -364,     30,     53,     -6,    -54,    -24,
+        21,    -81,    -88,    -45,    -14,     81,    674,  -1189,
+     -1049,   -846,   -489,    -24,    -47,    165,    658,   1909,
+      -241,   -390,   -387,   -454,   -319,   -549,   -307,   -112,
+       778,   1486,   -314,     34,    -93,   -799,   -538,   2219,
+      -445,     39,    -38,   -258,   -427,   -943,   -760,   -602,
+      -575,   -450,    376,    668,    879,   1215,  -1216,   -784,
+      -646,   -291,    275,   1019,    -77,    124,    256,   1166,
+      -410,   -993,  -1145,  -1118,   -940,   -825,   -560,   -131,
+      1006,   4878,  -1401,  -1286,  -1316,  -1394,    177,   -919,
+       162,   2292,   1792,   1242,   -762,    937,   -168,   -900,
+      -829,    203,   1225,    626,   -122,   -515,    992,   -198,
+      -782,    -25,     74,   1019,   -606,   -364,   -350,     -5,
+       451,    324,    265,  -1143,   -820,    382,   -362,     85,
+      -797,    693,   1594,   -335,   -229,   -396,   -211,   -356,
+       -97,   -115,     92,     49,   -476,  -1124,  -1084,   -594,
+      -228,    728,     16,    589,   1213,    841,   -829,   1874,
+      -907,  -1000,   1411,   -621,   -707,    356,    437,     37,
+};
+
+static const int16_t fcb22l[] = {
+      2735,  -1224,  -1198,  -1073,  -1115,  -1054,   -713,   1693,
+     -1106,  -1259,    722,  -1256,  -1223,   1686,   1589,   2003,
+      -906,   2529,   2141,   -396,   -338,    -36,     52,    476,
+       319,   -420,    561,   -492,   -526,   -359,   -221,   -254,
+      -752,  -1136,   -690,   -896,   4307,   -363,    -42,   1363,
+      -717,  -1036,   -874,   2315,   -952,   -872,    262,   1418,
+       737,   1374,   -506,   -470,   -275,   -126,    242,    428,
+      -678,   -681,   -581,   1016,   -553,   -509,   -485,   -408,
+      9595,  -1015,  -1168,   -932,   -812,   -690,   -167,    753,
+      -935,   -439,   2105,   -526,   -710,   -570,      9,    548,
+       530,  -1308,  -1060,   -351,   -974,  -1038,     93,   5579,
+      -737,  -1282,   1386,  -1284,  -1243,  -1105,    790,   2169,
+      -701,   -660,   -555,   1317,   2805,    792,   2209,   -490,
+      -758,  -1262,  -1083,  -1073,    930,   -810,   -170,   2326,
+     -1213,  -1286,   3435,  -1135,  -1051,    220,   3040,   1999,
+      -933,   -663,   -714,   -855,   -372,   -599,   -437,    373,
+      5873,   -987,  -1081,  -1003,   -747,   -271,    582,   1069,
+      -917,   -754,   5676,   -565,   -616,   -396,    177,    908,
+      3106,   1459,   -678,   -543,   -340,     47,    336,    493,
+     -1060,   1427,   -560,   -763,   -710,   -661,    193,    595,
+      -996,   2488,   -588,   -752,   1306,    114,    292,    689,
+     -1202,   2334,  -1173,  -1167,   -755,    353,   1711,   1572,
+      -932,   -751,   2099,   2025,   -417,     62,    458,    611,
+      -981,   4387,   -639,   -560,   -520,   -152,    262,    748,
+      -828,   -818,   -682,   5250,   -640,   -270,    385,   1049,
+     -1072,   -774,   1870,   -668,   1514,   -158,    283,    793,
+     -1087,  -1150,   -899,   -875,   -188,   -184,   6656,   2311,
+      -906,   1654,   -446,   1677,   -654,   -101,    364,    721,
+     -1272,   7928,   -812,   -576,   -708,   -347,    397,   1128,
+      3830,  -1034,  -1055,   2244,   -759,   -706,     79,    893,
+      -922,  -1067,   2740,   -868,   -858,   1129,     34,   1096,
+      2455,   -694,   1970,   -650,   -674,   -131,    370,    697,
+     -1069,  -1137,   -948,  -1045,  -1087,   -964,    367,   1091,
+      4096,   -960,   -921,   -870,   1397,   -511,   -190,    545,
+      -657,  -1194,   -536,   -951,  -1094,    117,   -720,   2532,
+     -1098,  -1147,  -1177,   1764,   -757,   -121,   2372,   2010,
+      3662,   -952,   -995,   -894,   -625,    464,    731,    863,
+      -607,   -505,    401,   -423,   -540,   2144,    755,   -430,
+     -1499,  -1242,  -1202,  -1190,   -626,   1249,   3388,   2379,
+      -983,  -1090,   -907,  -1021,  -1012,   -870,   2723,   1589,
+      -913,    332,   -102,     99,    226,      6,    176,    354,
+       156,    -36,   -829,   -774,   -685,    -15,    498,    503,
+      2030,   -409,   -599,   -572,   -341,     -2,    111,    302,
+       788,  -1002,   -978,   -929,  -1001,   -886,    578,    995,
+      1237,   -747,   -696,   -653,   1143,     62,    506,    571,
+       994,   -993,   -902,   -871,   -662,   1527,    370,    979,
+       980,   -466,   -484,    787,   -261,     61,    250,    377,
+      -112,   -676,   -535,   -344,    274,    363,    185,    334,
+       -48,  -1144,  -1095,  -1011,   -552,    445,   1355,   1207,
+     -1108,  -1128,  -1085,   -826,    -83,   2001,   1265,   1429,
+     -1024,   1199,   -671,   -701,   -444,   1192,    187,    673,
+     -1039,  -1056,   -953,   -732,    359,    714,    787,    935,
+     -1187,  -1133,  -1112,   -971,   2158,   1720,    801,   2016,
+     -1056,  -1068,   -889,   1808,    503,    892,    358,   1041,
+     -1180,  -1184,  -1068,   -788,   1423,   -573,   2141,   1949,
+     -1042,   -924,   -849,    512,   -629,   -272,    779,    815,
+      1939,  -1069,  -1092,  -1027,   -770,     48,   1554,   1285,
+     -1109,  -1148,  -1157,  -1033,   -934,    779,   1358,   1560,
+     -1053,    222,  -1095,  -1001,   -681,    -26,   1112,   1035,
+     -1168,  -1285,  -1169,  -1180,  -1085,  -1097,   1313,   3112,
+      -928,   -655,   -811,   -618,   1555,   -480,     71,    467,
+     -1220,  -1123,  -1008,   -577,   -845,   3854,    491,   1878,
+     -1051,   -761,    617,   -650,   -453,     51,    784,    757,
+      -993,   -883,   -905,   -708,   -869,    969,    -64,    655,
+};
+
+static const int16_t fcb22s[] = {
+      9854,   -479,  -1163,  -1147,  -1316,  -1137,   -991,   -942,
+       522,    739,  -1042,  -1306,  -1040,   -126,   1147,   3526,
+      1880,   -477,   -483,   -328,   -899,   1063,   1243,   -610,
+      -721,   -527,   -372,    171,     90,    196,   6615,  -1167,
+     -1189,  -1079,   -954,   -817,   -833,   2246,    439,   1038,
+     -1053,  -1136,   -938,   -805,  -1022,  -1041,   -717,   2021,
+       341,    935,  -1164,  -1230,   -573,   1768,  11111,  -1113,
+      -874,   -631,   -367,      7,  -1077,   -925,   1558,   -850,
+      -918,   -755,   -512,    452,    260,    400,   -787,   -966,
+      -690,   -584,   -843,   -802,   2092,    120,    103,    580,
+      -746,   -512,   -241,   -621,   2771,   -486,   -268,    258,
+       171,    232,  -1265,  -1253,  15128,  -1123,  -1037,   -885,
+     -1109,   -664,   -659,   -240,   1558,   -909,  -1160,  -1247,
+     -1223,  -1031,   -989,   -415,   3504,   1569,   -651,  -1241,
+     -1145,  -1014,  -1322,  -1000,   -354,     59,    709,   4206,
+     -1124,   -986,   -633,   -976,   -907,   -636,   -371,    255,
+      1195,    876,   -145,  -1146,  -1018,   -992,   -480,   -762,
+      6904,   -703,   -431,   1043,  -1048,   -638,   -142,    394,
+      -852,   -730,   -533,   -361,    234,    221,  -1070,   -930,
+      -764,   3210,   -780,   -256,   1777,    258,    307,    382,
+     -1224,    987,   4894,   3525,   -412,   -558,   -819,   -863,
+      -572,   -497,  -1175,  -1197,   7637,  -1109,   -748,   -116,
+      -306,     27,    386,    630,  -1334,  -1378,  -1302,  12592,
+     -1327,   -971,     89,   -731,    259,    201,  -1135,   -951,
+      -585,    -64,   3489,   2765,     43,     75,   -527,   -162,
+      2865,  -1344,  -1394,  -1391,  -1231,   -748,   -962,   5403,
+       719,   1418,   -724,  -1101,   -955,   -743,   -937,  -1064,
+     -1095,   -601,    -60,    411,  -1113,   -873,   -603,   2913,
+      2512,   -339,    -36,     26,    -39,     78,   -757,   -998,
+      -522,   -838,   5507,   -973,    796,    536,    250,    312,
+     -1363,   -944,   6021,    -58,   5313,   -690,   -549,   -485,
+       -66,   -133,  -1257,   6004,   6374,   1487,   -976,   -987,
+      -969,   -803,  -1027,   -624,   -967,   1744,   3504,      6,
+      -659,   -691,   -326,   -129,    -49,    148,  -1032,   -683,
+      1819,   1804,   -491,   -452,   -295,     33,    -20,     42,
+     -1226,  -1086,   -792,   6412,   -657,   -278,   -103,    -25,
+       -82,    207,   2450,     -6,   2417,    251,   -622,   -593,
+      -409,   -193,   -339,   -304,   -862,   -667,   2457,   -500,
+      -438,   -504,   1408,    143,    203,    265,  -1128,  -1148,
+      2791,   -373,   -951,   2129,   -842,   -278,     81,    307,
+      -787,   -822,   2655,   -604,   2028,   -787,      4,    335,
+       170,    219,    649,   -457,    972,   -607,   -359,   -470,
+      -238,     68,    -57,    107,   2285,   -526,   -490,   -604,
+       179,    -41,    230,     64,     20,     50,   -802,   1168,
+      -235,   -264,   -316,   1469,   -499,    108,    183,    150,
+     -1068,   -806,   -399,   1244,   -355,    487,    -57,    450,
+       195,    248,  -1122,  -1096,   3327,   -956,   1084,   1306,
+       247,    442,    169,    283,   3416,   -609,   -891,   -879,
+      -853,   -573,   -285,   -147,    380,    608,   1271,   -874,
+      -931,     40,   -989,   1432,   1981,    -34,    285,    190,
+      -902,   -974,   4117,   -868,   -784,   -584,   -358,    200,
+       261,    521,   -945,   -981,   -773,   3517,   -961,   2420,
+         9,    318,    187,    322,  -1006,   -779,   -526,   2972,
+      -712,   -578,   -576,    167,    156,    270,    460,    -74,
+      -237,    939,   -440,   -515,    126,     63,     82,     67,
+     -1069,  -1104,   -923,   -634,   -190,   1151,    526,   2920,
+       125,    566,  -1144,   4199,   1314,   -458,   -568,   -336,
+      -515,   -332,   -352,   -143,   -770,    283,   -770,   -785,
+      -807,   -348,     93,    427,    181,    334,   -798,   -830,
+      -300,   -509,   1257,   -554,   1341,      6,    242,    272,
+     -1030,     62,   1293,    340,    752,   -493,     -6,    -34,
+        33,     85,   -893,  -1202,    244,   -131,   -306,   7590,
+      -832,    420,     80,    423,   -799,   -870,   -930,   -720,
+      -640,   2390,   -409,   -177,     91,    370,   -864,   -949,
+       838,   -574,   -234,    555,     46,     -9,    -83,    146,
+      -825,   -478,   -664,    -57,    867,   -296,   -380,    -73,
+        70,    171,  -1124,  10522,   -228,   -609,   -958,  -1025,
+      -548,   -384,   -257,     55,   5414,    436,   -651,   -748,
+      -671,   -525,    -25,   -273,   -264,     57,  -1129,   1974,
+      -145,   1650,   -317,   -514,   -305,    -78,   -154,     59,
+      1269,   1008,   -510,   -711,   -534,   -358,    194,    117,
+       102,     57,   -837,   1260,   -126,   -494,     47,   -162,
+       924,    -72,    130,     97,    742,   -803,   -711,   -755,
+      -402,   -188,     24,    309,    187,    379,  -1092,   5862,
+      -647,   -807,   -715,   -696,   -408,    -29,    104,    353,
+      3298,   2193,   -263,   -772,   -908,   -754,   -449,   -164,
+      -157,    -44,   -986,   2313,   -596,     56,   2057,   -478,
+        74,    -51,     51,    121,   -899,   1793,   -595,   -669,
+      -743,   -689,   -546,     71,    201,    382,  -1061,   3375,
+      -776,   -876,   -648,   -407,    -44,    260,    258,    393,
+};
+
+static const int16_t fcb22m[] = {
+     11522,    868,  -1444,  -1572,  -1674,  -1745,  -1844,  -1616,
+     -1723,  -1508,     27,   -321,   -693,   -597,   -374,   -380,
+       327,    209,    611,   1182,   -548,    176,   -544,   -485,
+      -341,   -376,   -383,   1024,   1316,     -4,    192,   -649,
+      -979,   -945,   -802,   -183,   3749,    812,   -416,   -527,
+      -734,   1059,   -521,    924,   -462,   -631,    -76,    182,
+       126,    100,   -653,   -643,  -1189,  -1264,  -1312,  -1311,
+     -1212,  -1016,   -218,   8415,  -1005,    734,   1303,   -272,
+      -397,   -521,   -245,    389,    242,   -234,    458,   -912,
+     -1215,  -1228,  -1288,  -1131,   -845,   -404,    912,   5497,
+       413,   3161,   -432,   -148,   1704,   -663,   -996,  -1009,
+     -1419,   -929,    -36,   -471,   -640,   -571,   -197,   -573,
+      -462,   2586,   -179,   -382,   -757,   -895,  -1096,  -1140,
+     -1216,  -1051,   -688,    -44,   3311,   3518,   -474,   2530,
+      1475,   -676,   -702,   -777,   -380,   -316,   -538,   -468,
+      -708,    542,   -213,   -713,   -911,   -482,   -696,   -135,
+      1282,   2006,   5707,    476,   -707,   -771,   -650,   -788,
+      -778,   -853,   -962,   -926,     10,    -11,      3,      1,
+       -12,    -14,     21,      7,    -13,    -10,  -1410,  -1712,
+      1379,   5757,    218,  -1232,   -563,   -929,   -684,   -827,
+      -261,   1040,   -154,   -309,    -99,     62,    856,    199,
+      -614,   -926,   -626,   1568,   -258,    374,   1071,   -140,
+      -250,   -332,   -832,   -706,   -863,   -714,   -749,   3081,
+       498,   -695,   -395,   -600,   -279,    588,    245,   3122,
+      -329,   -677,   -262,     67,     19,   -530,   -882,   -862,
+     -1033,   -160,   1542,   1916,   -416,   -600,   -553,   -219,
+      -130,   -497,   -699,   1719,    160,   3293,   -212,   -923,
+     -1045,   -761,  -1238,  -1038,   1543,    738,   -548,   -541,
+      -403,   -281,   -115,    -95,   -313,    -19,   -292,   1136,
+      3592,    696,   -654,   -856,   -726,   -693,  -1057,  -1267,
+      -722,   -381,   -683,   1364,    -30,    589,    454,    262,
+       -57,  -1018,   -312,    846,   -139,   -587,   -127,   2482,
+      -178,   -233,   -977,   -796,     -6,    250,    220,   1577,
+      1141,   -251,   -649,   -809,  -1051,   -873,   -762,   -990,
+     -1010,   -890,   -897,   -639,   -671,   1964,    788,   2310,
+      6001,     20,  -1008,  -1159,  -1208,  -1208,  -1318,  -1227,
+      -829,   1680,  -1023,   -998,  -1224,   -945,   -769,    -41,
+      2033,    196,    917,   1615,   2026,   -654,  -1014,   -918,
+      -750,   -675,   -839,   1541,    282,    430,  -1059,   -708,
+      -507,   -522,   -169,    438,    196,    835,    778,    897,
+       420,    526,   1239,    198,   -736,   -953,   -835,   -229,
+      -348,    726,   -767,   1311,    248,   -353,   -550,   1017,
+      -250,   -732,    256,   -175,   -638,    763,   -761,   -957,
+      -554,    539,    252,    299,    431,    613,   4398,   -378,
+     -1022,  -1020,   -990,   -757,   -621,    -83,    -34,    122,
+      -476,     77,   -799,   -116,   4546,   -787,   -735,   -462,
+      -875,   -907,  -1373,  -1354,  -1355,  -1220,  -1024,    -88,
+      1298,   2844,    940,   1135,   2261,   2142,    181,   -735,
+      -924,   -941,   -799,   -715,   -662,     86,   -719,   -521,
+       115,   -576,   -699,   1052,   1295,    -57,     42,    230,
+      2876,    501,   -294,   -158,    104,   -157,   -515,   -662,
+      -987,  -1069,   -703,   -985,  -1061,   -946,   -878,   -267,
+       397,    132,    534,   3642,   1298,   -560,   -701,   -526,
+      -294,    197,    310,     75,     -3,    267,   -342,   2058,
+      -328,   -427,   -709,   -688,     14,    -43,    237,    506,
+      2822,   -337,   -900,   -818,   -638,   -192,    883,    -14,
+      -271,   -559,   2822,   -165,   -988,   -933,   -917,   -603,
+      -583,   -397,    467,   1092,  -1044,   -479,   2478,   -386,
+      -535,   -253,     63,    -49,     79,     27,   -182,   -100,
+       362,   -628,   -661,   -707,   1557,    136,    335,     89,
+      -197,   5697,    220,   -473,   -472,  -1053,  -1023,  -1087,
+     -1203,   -756,   -377,   -917,   -925,   -568,   -237,   1422,
+       197,    -98,    614,    867,   -831,   -829,   -969,   -720,
+       414,   1080,   1707,    828,   -121,   -757,  -1044,   -289,
+       816,    284,    809,    -84,    -22,   -552,     -9,    193,
+      -359,     66,   -582,   -674,   1992,    -31,     58,    427,
+      -515,   -299,    932,   -608,  -1103,  -1068,  -1016,   -770,
+       200,   1031,   1112,   1026,   -598,   -818,   -891,   -635,
+      -828,   -866,   -650,   4795,   -407,    215,   -853,    373,
+      -696,    159,    995,    465,   -509,    109,     60,     10,
+      8455,    198,   -999,  -1131,  -1111,  -1195,  -1246,  -1192,
+     -1181,   -934,   -365,   -764,   -689,   -589,   -734,   2479,
+      -960,   1279,    104,   -209,  -1012,   -824,  -1059,   -921,
+      -812,   -204,    199,    601,   3136,    637,   3021,   3851,
+      -490,    -18,   -930,  -1081,  -1133,  -1182,  -1268,   -980,
+      -864,   -945,   -278,    961,   -514,   -123,    562,    874,
+      -130,    336,   3314,   -331,  -1112,  -1162,  -1227,  -1230,
+     -1172,   -988,   -319,   3582,    890,     50,   -681,   -788,
+      -906,   -876,   -829,   -827,    -41,   3416,   -740,   -913,
+      -893,    404,   2059,   -651,   -474,    302,    516,    578,
+};
+
+static const int16_t fcb22sl[] = {
+      1098,  -1107,  -1125,   -983,   -770,   -233,    201,    823,
+     -1433,  -1294,    -17,  -1156,   -301,   1185,   1307,   1108,
+     -1247,   1829,   1353,   -537,   -457,    116,    574,    712,
+       159,   -489,    511,   -340,     54,    119,    213,    351,
+     -1489,  -1256,  -1324,  -1132,   3710,    262,   1087,   1465,
+     -1434,  -1027,  -1116,    825,   -662,   -428,   -109,   1045,
+       229,    753,   -604,   -422,    122,   -220,    279,    375,
+      -349,   -684,   -197,    490,   -160,   -116,   -120,    146,
+      5195,   -895,   -974,   -758,   -524,     21,    761,   1016,
+     -1216,    151,    864,   -602,   -715,   -591,   -347,    592,
+     -1265,  -1328,  -1375,   -878,   -660,   -549,    143,   4302,
+     -1433,  -1277,    360,  -1032,   -835,   -385,    337,   1111,
+     -1345,  -1250,  -1156,    914,   1594,     22,    912,   1012,
+     -1576,  -1411,  -1364,  -1153,    842,   -184,    240,   1302,
+     -1486,  -1162,   1246,   -880,   -830,     14,   2487,   1607,
+     -1384,   -158,   -572,   -977,     43,    -30,   -184,    572,
+      2759,   -892,   -768,   -522,   -289,    -44,    351,    575,
+     -1292,   -546,   3736,   -609,   -538,    -25,    514,    924,
+      1772,   1639,   -903,   -595,   -263,    340,    579,    670,
+     -1425,    770,  -1179,   -920,  -1158,   -675,    496,   1208,
+     -1337,   1240,  -1030,  -1044,   1840,    312,    809,    908,
+     -1457,   1410,  -1240,  -1083,   -541,    568,   2768,   1432,
+     -1249,   -890,   1078,   1278,   -558,     63,    573,    778,
+     -1285,   1932,  -1004,   -902,   -339,     59,     17,    659,
+     -1352,   -935,   -877,   3421,   -455,    160,    820,   1230,
+     -1326,   -978,    986,   -790,   1541,     41,    542,    743,
+     -1491,  -1162,  -1389,  -1265,   -928,   -139,   5045,   2259,
+     -1182,   1358,   -953,   1338,   -502,    122,    749,    839,
+     -1284,   4389,  -1001,   -813,   -421,     44,    855,   1072,
+      1658,   -881,   -821,   1409,   -299,      4,    453,    700,
+     -1144,  -1112,   1230,   -790,   -421,   1250,    -12,    655,
+      1545,   -872,   1199,   -632,   -365,     56,    415,    663,
+     -1401,  -1189,  -1403,  -1189,  -1145,   -687,   -116,   1120,
+      1768,  -1068,  -1024,   -629,   1440,     88,    578,    711,
+     -1651,  -1561,  -1564,  -1430,  -1037,   1264,    -21,   1944,
+     -1552,  -1336,  -1277,    916,   -412,     27,   2454,   1661,
+      1996,  -1087,  -1223,   -924,   -393,   1673,    794,   1017,
+     -1362,   -132,    151,    537,   -992,   1830,    777,    991,
+     -1591,  -1355,  -1494,  -1420,   -666,   2407,   3210,   2092,
+     -1114,   -624,  -1087,   -903,   -808,   -438,   1881,    654,
+     -1140,    254,   -105,    212,    386,     49,    256,    314,
+        83,     98,  -1128,   -901,   -578,    362,    702,    691,
+      1191,   -204,   -335,   -226,   -102,    -44,     -5,    120,
+        57,  -1110,   -403,   -651,   -806,   -202,    567,    690,
+       349,   -908,  -1075,   -941,   1487,    464,    763,    782,
+       387,  -1070,   -990,   -765,   -295,   1669,    341,    881,
+       232,  -1013,  -1043,    723,   -311,    294,    646,    574,
+        72,  -1191,   -546,   -183,    493,    161,    201,    465,
+      -185,  -1434,  -1368,  -1051,     64,    385,    748,    986,
+      -740,   -530,  -1199,   -562,    142,   1388,   1487,    715,
+     -1359,    873,  -1187,   -923,   -455,   1914,    403,   1016,
+     -1245,  -1223,   -624,   -495,    724,    652,    433,    585,
+     -1499,  -1277,  -1381,  -1148,   1679,   2138,    995,   1424,
+     -1345,  -1319,  -1296,    906,   -228,   1534,    506,   1024,
+     -1628,  -1410,  -1422,  -1197,   1393,    -22,   2728,   1784,
+     -1245,  -1056,   -942,      2,   -165,   -115,    840,    569,
+      1016,  -1191,  -1091,   -862,   -457,     95,   2087,   1029,
+     -1460,  -1486,  -1459,  -1104,   -571,    925,   1234,    935,
+     -1568,    -49,  -1325,  -1255,    -64,    315,    838,    962,
+     -1651,  -1562,  -1606,  -1571,  -1308,   -380,   1988,   2117,
+      -848,   -412,   -987,   -370,   1224,   -304,     10,    498,
+     -1523,  -1348,  -1373,   -959,   -772,   3767,    621,   1773,
+      -931,   -628,    169,   -513,     61,   -306,    994,    476,
+     -1116,   -879,   -875,   -484,   -795,    958,   -162,    444,
+};
+
+static const int16_t fcb22ss[] = {
+      6765,   -638,  -1108,   -977,   -679,   -446,   -325,   -432,
+      -127,     96,   -569,   -621,  -1050,   -841,   -800,   1474,
+      1170,     60,    330,    223,  -1317,    855,    307,   -931,
+      -648,   -549,   -148,    535,    642,    445,   3666,  -1146,
+     -1167,   -944,   -584,    942,   -284,     25,    573,    472,
+     -1041,  -1096,  -1209,  -1082,   -770,   -737,   -139,   2073,
+       753,    832,    507,   -828,  -1112,  -1130,   4284,   -722,
+      -261,    -57,    499,    300,  -1380,  -1130,    135,   -898,
+      -816,   -395,    195,    453,    650,    537,   -953,  -1109,
+     -1221,   -981,   -747,   -647,   2360,    467,    845,    684,
+     -1177,   -792,  -1254,  -1148,   1344,   -745,   -323,    180,
+       729,    739,  -1020,    183,   5226,   -638,   -358,    -86,
+      -268,   -143,     84,   -115,    480,   -543,  -1229,  -1097,
+      -594,   -983,   -792,   -391,   2637,   1405,   -761,   -866,
+     -1186,   -973,   -792,   -640,   -220,   -102,   1165,   3159,
+     -1241,  -1057,  -1322,  -1007,   -731,     44,    264,    668,
+      2645,   1592,   2885,  -1155,  -1347,  -1209,   -309,  -1161,
+      4216,    -64,    830,    616,   -688,   -638,   -596,    202,
+      -665,   -623,   -499,   -248,    512,    749,  -1395,   -708,
+     -1086,   1209,   -745,   -367,   1397,    279,    374,    259,
+     -1357,   -254,   2310,   1839,   -147,     36,   -402,    300,
+       -49,     47,  -1328,   -992,   3453,   -889,   -621,    135,
+       437,     70,    663,    346,  -1339,  -1136,  -1275,   6675,
+     -1309,   2285,   -869,   1154,    640,    617,   -505,  -1042,
+      -984,   -702,   1283,   1573,   -168,    135,    249,    253,
+      -783,  -1119,  -1342,   -975,  -1127,   1391,   -705,   4439,
+      1160,    845,  -1283,  -1224,  -1286,  -1142,  -1019,   -901,
+      -658,   -157,    231,    611,   -994,   -463,  -1017,   1082,
+      1831,   -459,   -164,    114,      0,    108,  -1386,  -1079,
+     -1318,  -1091,   2540,   -717,    762,   1414,    849,    576,
+     -1405,   -566,   2704,   -996,   2133,   -678,    404,    281,
+         4,    -32,  -1474,   3530,   2301,   -711,   -919,   -305,
+      -125,    184,    450,     73,  -1132,   1567,   1620,   -551,
+      -198,   -645,     19,      8,    190,    191,   -741,   -728,
+       410,   1067,   -322,   -239,     86,     11,   -137,   -220,
+      -489,   -607,   -963,   3630,   -624,   -478,    -12,    124,
+       219,     63,   2040,     75,   1338,   -293,   -333,   -336,
+      -330,   -246,   -360,   -344,   -953,   -393,   1550,   -701,
+      -616,   -254,   1908,    211,    328,    -43,  -1089,   -299,
+      1070,   -723,   -923,   2170,   -400,    -13,    -28,    108,
+      -812,   -400,    876,   -650,   1308,   -772,   -256,   -200,
+       117,    329,    649,   -639,    437,   -704,   -567,    -20,
+      -211,    197,    330,    342,   1670,   -468,   -920,   -588,
+       972,   -310,      9,    -46,     70,    -29,  -1313,   1684,
+      -794,   -979,   -752,   1864,   -173,    108,    248,    292,
+     -1247,  -1226,  -1059,    288,   -112,    189,     20,    540,
+       454,    380,  -1035,   -803,   1267,   -767,    746,   1331,
+       107,    317,    158,   -116,   2093,   -723,  -1064,   -906,
+      -713,   -789,   -518,     48,    494,   1018,   1835,  -1353,
+     -1303,  -1098,   -559,    800,    520,    662,    615,    574,
+     -1282,   -526,   1829,  -1086,   -885,   -356,   -539,    -50,
+       493,    402,   -777,   -374,   -754,   1721,   -701,   2086,
+      -348,    218,    138,    109,  -1367,  -1226,  -1041,   1949,
+      -433,   -291,   -363,    567,    613,    560,   1166,   -481,
+      -737,   1193,   -479,   -163,    -69,      2,    133,    239,
+     -1444,  -1448,  -1350,   -987,   -296,    606,    755,    543,
+       741,    806,   -851,   2437,     23,   -681,   -670,   -271,
+      -439,   -227,   -243,   -198,  -1307,    424,  -1212,   -987,
+      -745,   -369,    162,    641,    915,    611,    -24,   -728,
+     -1061,   -659,    808,   -532,   1241,   -233,    266,    353,
+       175,    210,   -262,   -328,    101,   -238,     66,   -339,
+      -472,   -415,    952,  -1490,  -1302,   -955,  -1270,   5776,
+      -792,    777,   1097,    807,  -1334,  -1172,  -1211,   -924,
+      -877,   2458,   -355,    593,    936,    699,   -336,   -700,
+      -762,   -569,   -337,    642,     97,    441,   -188,   -533,
+     -1062,    188,   -873,   -801,    418,   -167,    -57,    -29,
+        79,    241,  -1110,   6430,   -816,   -807,   -462,   -601,
+       -56,    -45,    188,     74,   2869,     43,  -1122,   -799,
+      -772,   -847,   1394,    -36,    294,     13,  -1304,   2155,
+      -534,   1545,   -315,   -325,    183,     31,    372,    187,
+       873,   1376,  -1037,   -810,   -516,   -235,    485,     99,
+       287,    327,  -1074,   1203,  -1089,   -882,   -515,   -544,
+      2041,    -40,    208,    191,    597,  -1141,  -1274,   -885,
+      -386,    106,    593,    394,    671,    678,  -1292,   3861,
+     -1085,  -1150,   -748,   -218,    500,     55,    335,    469,
+      3217,   2888,   -882,   -643,   -590,   -506,     43,   -459,
+      -210,   -222,   -965,   2453,   -830,   -779,   1808,   -588,
+       130,      4,    130,    -23,  -1269,   1374,  -1238,  -1148,
+      -523,   -659,   -170,   -302,   1055,   1389,  -1467,   2505,
+      -930,  -1181,   -842,   -516,    399,    886,    849,    738,
+};
+
+static const int16_t fcb22sm[] = {
+      5761,   -398,   -743,   -948,   -944,   -845,   -883,   -896,
+      -811,   -604,  -1142,  -1388,  -1190,   -685,   -118,   1498,
+      1590,    293,    564,    352,    124,    851,   -131,   -652,
+      -573,   -279,   -756,   -478,    833,    670,   2609,  -1138,
+     -1107,  -1024,   -739,   -646,   -387,     33,    635,   1037,
+      -717,   -990,  -1161,   -948,   -660,   -230,     69,   2510,
+      1274,    841,    -49,   -872,   -764,   -211,   3046,    -30,
+      -143,   -311,   -324,   -413,   -760,     67,    619,   -699,
+      -725,    305,   -484,   1292,    472,   -156,   -568,  -1243,
+     -1256,   -994,   -803,   -386,   1692,    596,   1325,   1290,
+      -492,  -1007,   -732,   -788,   1136,   -610,     45,   1307,
+       420,    649,   -534,  -1075,   -949,   -367,    219,    444,
+      -120,    251,    476,   1806,    902,   -927,  -1151,   -879,
+      -659,   -741,     -5,    298,   1861,    995,   -244,  -1031,
+     -1142,  -1085,   -952,   -773,   -468,     -9,   1637,   3592,
+      -971,  -1150,  -1199,   -985,   -689,   -317,    150,    540,
+      2727,   1678,   -223,   -403,    102,   -902,   -773,   -223,
+      3182,   -457,     75,   -188,   -291,   -428,   -101,   -365,
+      -442,   -336,   -128,    -33,    781,   1242,    501,   -753,
+      -846,    757,   -444,   -311,   1182,      4,     -8,   -122,
+      1866,   -528,   -142,   1598,    -15,   -219,   -557,   -804,
+      -916,   -965,    114,    130,   3672,    -19,   -873,   -280,
+      -777,   -919,   -824,   -654,   1078,     39,    -50,    119,
+      -411,   -311,   -359,    -57,   -137,      7,   -780,   -892,
+      -767,   -167,   1302,   1693,   -205,    -51,   -174,    -71,
+       838,   -220,  -1133,   -993,   -710,   -340,    650,   1341,
+       191,     -5,    743,   -543,   -125,   -567,     70,    -42,
+      -501,   -448,     47,   1151,    400,   -774,   -781,   1324,
+      1089,     32,   -256,   -415,   -352,   -214,    912,  -1141,
+      -988,   -638,   1349,    251,    124,     -4,     89,    -16,
+      -678,   -569,   1502,    146,    114,    816,    -98,   -269,
+      -622,   -808,   -634,   3319,   1218,   -323,   -750,   -548,
+      -525,   -575,   -591,   -730,     35,    764,   1423,    574,
+      -352,   -672,   -802,   -314,   -308,    -29,  -1040,   -717,
+       469,    421,   -527,   -420,    589,    195,    556,    472,
+      -626,   -864,   -133,   3531,   -667,   -460,   -523,    103,
+        23,   -309,   2381,    136,   1197,   -399,   -399,   -501,
+      -638,   -899,   -813,   -707,   -249,    719,    821,   -989,
+      -629,   -568,    642,     -4,    297,     70,  -1105,    454,
+       400,   -235,   -562,   1607,   -116,   -205,      1,   -490,
+         7,   -523,    764,    329,    992,   -240,   -249,   -275,
+      -366,   -265,    662,   -803,    393,   -567,   -501,    -32,
+       178,    371,    126,   -146,   1748,   -516,   -634,   -395,
+       268,    893,    154,    -36,   -620,   -999,    304,   1490,
+      -512,   -821,   -479,   1922,   -610,   -481,   -482,   -805,
+      -996,    -16,   -567,    542,    -22,    589,   -114,     69,
+       322,    358,   -848,   1205,    509,   -527,     25,    111,
+      -243,   -197,    -20,     62,   1500,   -977,   -974,   -391,
+      -555,    448,   -256,     79,    392,    547,   1472,  -1276,
+     -1203,   -987,   -315,    515,    855,    183,    231,     62,
+     -1176,   -397,   2831,   -527,   -575,   -435,    174,   -337,
+       723,    107,   -502,   -765,   -455,   1124,   -218,   1444,
+        53,   -201,   -135,   -267,   -510,  -1058,   -869,   1130,
+      -128,   -394,     16,    873,    597,    455,     16,      0,
+       -11,     14,    -12,      9,      6,    -14,    -11,    -23,
+      -453,  -1056,   -988,   -713,   -267,    794,    954,   1361,
+       822,   -448,    379,   1163,    336,   -724,     55,    109,
+       237,    -80,   -732,  -1017,   -264,    654,  -1043,  -1015,
+      -654,     91,     17,    548,    504,    932,  -1057,  -1151,
+      -964,   -130,   1171,   -146,    740,    134,    790,    539,
+      -591,   -577,   -388,    154,    609,    341,    657,    838,
+      -379,   -872,    711,   -665,   -818,   -549,   -151,   2501,
+       -28,   -189,   -255,   -378,   -363,  -1157,   -929,   -887,
+      -338,   1926,    -33,    -26,   1009,    765,    -79,    -98,
+       -37,   -967,   -566,   1012,    905,   -245,     41,    322,
+       194,   -148,   -220,   -171,   -239,   -242,   -147,    -14,
+       221,    575,   1754,   3059,   -246,   -713,   -696,   -636,
+      -640,   -843,   -841,   -755,   2554,   -504,   -568,   -318,
+      -324,   -171,   -294,   -238,   -288,   -174,   -289,   1273,
+      -231,   1053,   -284,   -338,   -394,   -227,   -303,   -226,
+       966,    742,   -873,   -503,   -586,   -286,    119,    -59,
+       339,    -38,   -843,    977,   -448,   -238,    227,    -77,
+       729,      6,     45,   -493,    277,  -1385,  -1289,   -846,
+      -117,    376,    763,    553,    769,    670,   -652,   3280,
+      -762,   -882,   -396,   -299,    124,   -270,    -31,   -210,
+      2413,    644,   -790,   -912,   -581,   -507,   -110,   -408,
+       -54,    -30,    632,    969,   -632,   -206,    955,    -95,
+      -578,   -337,   -377,   -467,   1264,     67,   -854,   -863,
+      -909,   -751,   -616,   -479,    563,   2070,   -972,   1478,
+      -450,   -715,   -859,   -689,    190,    736,    617,    530,
+};
+
 static const int16_t fcb44sl[] = {
       2433,   -925,  -1015,  -1009,   -875,   -276,    378,    464,
        694,    795,  -1044,   -601,   -658,    257,   -898,   -509,
@@ -4063,7 +12165,407 @@
      0.0482,  0.1174,  0.1270,  0.0594,  0.0165,  0.0949,  0.1098,  0.0137,
      0.4951,  0.4999,  0.4958,  0.4907,  0.4984,  0.4965,  0.4958,  0.4996,
      0.4987,  0.4958,  0.4986,  0.4977,  0.2841,  0.2186,  0.1474,  0.1687,
-     0.2217,  0.2632,  0.2706,  0.2624,  0.2162,  0.2453,  0.2460,  0.2531
+     0.2217,  0.2632,  0.2706,  0.2624,  0.2162,  0.2453,  0.2460,  0.2531,
+};
+
+static const float lsp8s[] = {
+     0.2702,  0.5096,  0.6437,  0.7672,  0.9639,  1.0696,  1.2625,  1.5789,
+     1.9285,  2.2383,  2.5129,  2.8470,  0.1740,  0.3677,  0.6082,  0.8387,
+     1.1084,  1.3721,  1.6362,  1.8733,  2.0640,  2.3442,  2.6087,  2.8548,
+     0.1536,  0.3279,  0.5143,  0.6859,  0.9763,  1.2744,  1.5605,  1.8566,
+     2.1007,  2.3450,  2.6075,  2.8850,  0.2075,  0.4533,  0.7709,  1.0377,
+     1.2953,  1.5132,  1.7826,  2.0351,  2.2590,  2.4996,  2.6795,  2.8748,
+     0.1393,  0.2453,  0.3754,  0.5453,  0.8148,  1.1289,  1.4389,  1.7592,
+     2.0353,  2.3215,  2.5934,  2.8588,  0.1250,  0.3627,  0.7613,  1.1380,
+     1.4163,  1.5565,  1.6920,  1.8130,  1.8678,  2.0427,  2.4318,  2.8544,
+     0.2256,  0.4223,  0.6452,  0.8599,  1.0673,  1.3118,  1.5486,  1.8366,
+     2.0759,  2.3026,  2.5284,  2.8030,  0.2304,  0.4404,  0.6891,  0.8964,
+     1.1510,  1.4202,  1.6483,  1.8580,  2.1181,  2.3686,  2.6078,  2.9128,
+     0.2230,  0.3816,  0.5520,  0.6062,  0.7909,  1.0988,  1.4330,  1.7846,
+     2.0713,  2.3457,  2.6048,  2.8708,  0.2447,  0.5800,  0.8249,  0.9905,
+     1.1721,  1.3990,  1.6694,  1.9064,  2.1307,  2.4255,  2.6815,  2.9117,
+     0.1974,  0.3812,  0.5802,  0.7759,  0.9280,  1.1547,  1.4170,  1.6369,
+     1.8890,  2.2587,  2.5626,  2.8239,  0.1209,  0.2510,  0.4841,  0.8048,
+     1.1197,  1.3563,  1.6073,  1.8926,  2.1350,  2.3669,  2.6291,  2.8985,
+     0.2352,  0.4347,  0.6582,  0.8178,  0.9548,  1.1654,  1.4942,  1.8812,
+     2.1703,  2.3779,  2.6412,  2.8871,  0.2091,  0.4084,  0.6730,  0.9151,
+     1.1259,  1.3262,  1.5937,  1.8129,  2.0237,  2.3317,  2.5778,  2.8620,
+     0.1167,  0.2406,  0.4520,  0.7298,  0.9848,  1.2448,  1.5137,  1.7874,
+     2.0280,  2.3020,  2.5914,  2.8794,  0.3003,  0.4966,  0.6520,  0.8505,
+     1.1600,  1.3981,  1.5805,  1.8346,  2.0757,  2.3102,  2.5760,  2.8499,
+     0.2451,  0.4163,  0.5960,  0.7805,  0.9507,  1.2438,  1.5587,  1.8581,
+     2.0735,  2.3198,  2.5704,  2.8220,  0.3112,  0.5517,  0.7032,  0.8528,
+     1.1489,  1.4257,  1.6848,  1.9388,  2.1577,  2.4265,  2.6678,  2.9051,
+     0.2249,  0.3897,  0.5559,  0.7473,  1.0158,  1.3581,  1.6914,  1.9930,
+     2.1843,  2.3534,  2.5512,  2.8065,  0.2600,  0.4574,  0.7349,  0.9691,
+     1.1696,  1.3848,  1.6335,  1.9021,  2.1174,  2.3481,  2.5902,  2.8390,
+     0.2246,  0.3372,  0.4560,  0.5249,  0.7056,  1.0273,  1.3810,  1.7132,
+     1.9819,  2.2574,  2.5410,  2.8491,  0.1419,  0.4834,  0.8835,  1.1453,
+     1.2839,  1.4224,  1.5593,  1.7877,  2.1285,  2.4070,  2.6043,  2.8511,
+     0.1886,  0.3677,  0.5617,  0.8099,  1.1277,  1.3841,  1.5804,  1.8136,
+     2.0307,  2.2805,  2.5399,  2.8322,  0.2351,  0.4151,  0.6675,  0.8713,
+     1.0464,  1.3292,  1.6586,  1.9281,  2.1355,  2.3495,  2.6222,  2.8782,
+     0.2700,  0.4489,  0.6206,  0.7121,  0.7737,  0.9848,  1.3658,  1.7433,
+     2.0139,  2.2243,  2.4806,  2.8175,  0.2479,  0.4425,  0.6490,  0.8745,
+     1.1161,  1.3849,  1.6773,  1.9566,  2.1491,  2.3624,  2.5685,  2.8114,
+     0.2035,  0.3701,  0.5567,  0.7953,  1.0082,  1.2758,  1.5373,  1.7822,
+     2.0175,  2.2601,  2.4759,  2.7771,  0.1856,  0.3461,  0.5998,  0.9041,
+     1.2383,  1.4612,  1.6667,  1.9305,  2.1617,  2.4107,  2.6477,  2.8656,
+     0.2107,  0.3715,  0.5289,  0.6651,  0.8420,  1.1168,  1.4401,  1.7230,
+     1.9901,  2.2687,  2.5452,  2.8655,  0.1218,  0.2999,  0.6348,  0.9482,
+     1.2745,  1.5876,  1.9129,  2.2348,  2.4020,  2.4922,  2.6351,  2.8357,
+     0.1617,  0.3483,  0.5869,  0.8163,  1.0366,  1.2344,  1.4609,  1.7029,
+     1.9476,  2.2337,  2.5258,  2.8442,  0.2505,  0.4894,  0.7510,  0.9152,
+     1.0845,  1.3657,  1.6528,  1.8346,  2.0160,  2.2811,  2.5338,  2.8136,
+     0.0947,  0.1158,  0.0578, -0.0337, -0.0066,  0.0104, -0.0447, -0.0505,
+    -0.0778, -0.0293,  0.0251, -0.0143,  0.0349, -0.0227, -0.0909,  0.0523,
+     0.0325, -0.0410, -0.1045, -0.0899, -0.0009,  0.0075, -0.0575, -0.0855,
+    -0.0129,  0.0575,  0.0597,  0.0391,  0.0371, -0.0184, -0.0083,  0.0287,
+     0.0143,  0.0167,  0.0120, -0.0168,  0.0452,  0.0223, -0.0352,  0.0119,
+    -0.0496, -0.0965, -0.0661, -0.0072,  0.1099,  0.0843, -0.0087, -0.0478,
+    -0.0128, -0.0120, -0.0004,  0.0731,  0.1047,  0.0630,  0.0196, -0.0103,
+    -0.0399, -0.0986, -0.0912, -0.0390, -0.0247, -0.0694, -0.0749, -0.0066,
+     0.0223,  0.0634,  0.0343, -0.0134,  0.0727,  0.0241,  0.0066,  0.0437,
+     0.0610,  0.0364,  0.0248, -0.0358, -0.0686, -0.0104,  0.0426,  0.0088,
+    -0.0137, -0.0165,  0.0671,  0.0815, -0.0863, -0.0644, -0.0088,  0.0023,
+     0.0482,  0.1174,  0.1270,  0.0594,  0.0165,  0.0949,  0.1098,  0.0137,
+     0.4951,  0.4999,  0.4958,  0.4907,  0.4984,  0.4965,  0.4958,  0.4996,
+     0.4987,  0.4958,  0.4986,  0.4977,  0.2841,  0.2186,  0.1474,  0.1687,
+     0.2217,  0.2632,  0.2706,  0.2624,  0.2162,  0.2453,  0.2460,  0.2531,
+};
+
+static const float lsp11[] = {
+     0.1103,  0.3862,  0.6863,  0.8447,  0.9231,  1.0261,  1.1248,  1.4057,
+     1.6621,  1.8010,  1.8692,  2.0704,  2.3490,  2.6060,  2.7539,  2.8977,
+     0.1273,  0.2407,  0.3812,  0.6004,  0.7767,  0.9383,  1.1344,  1.3351,
+     1.5233,  1.7262,  1.9466,  2.1739,  2.3495,  2.5162,  2.7164,  2.9202,
+     0.2010,  0.3330,  0.4488,  0.6465,  0.8046,  0.9889,  1.1479,  1.2964,
+     1.4770,  1.6606,  1.8789,  2.1155,  2.3287,  2.5199,  2.7101,  2.9119,
+     0.1168,  0.2197,  0.3279,  0.4691,  0.6268,  0.8251,  1.0533,  1.2714,
+     1.4712,  1.6762,  1.8831,  2.1114,  2.3230,  2.5297,  2.7365,  2.9270,
+     0.1405,  0.3109,  0.4986,  0.6891,  0.8634,  1.0583,  1.2594,  1.4349,
+     1.6232,  1.8116,  1.9905,  2.1935,  2.3799,  2.5656,  2.7661,  2.9486,
+     0.1703,  0.3057,  0.4403,  0.5225,  0.5969,  0.8110,  1.0729,  1.3215,
+     1.5407,  1.7381,  1.9477,  2.1680,  2.3586,  2.5612,  2.7630,  2.9410,
+     0.1128,  0.2628,  0.4523,  0.6495,  0.8176,  0.9816,  1.1746,  1.3710,
+     1.5568,  1.7518,  1.9497,  2.1452,  2.3346,  2.5389,  2.7362,  2.9264,
+     0.1809,  0.3287,  0.5205,  0.7264,  0.9298,  1.1217,  1.2970,  1.4894,
+     1.6874,  1.8493,  2.0576,  2.2382,  2.4097,  2.6041,  2.7796,  2.9389,
+     0.2502,  0.4709,  0.6892,  0.8346,  0.9209,  1.0455,  1.2399,  1.4616,
+     1.6463,  1.8380,  2.0475,  2.2397,  2.4665,  2.6550,  2.7701,  2.8895,
+     0.1040,  0.2340,  0.3964,  0.5740,  0.7764,  0.9941,  1.2000,  1.4014,
+     1.6024,  1.7974,  1.9939,  2.1959,  2.3783,  2.5663,  2.7613,  2.9484,
+     0.1912,  0.3393,  0.4743,  0.6313,  0.8014,  0.9879,  1.1855,  1.3922,
+     1.5678,  1.7289,  1.9271,  2.1165,  2.3089,  2.5414,  2.7448,  2.9269,
+     0.0965,  0.2025,  0.3398,  0.4990,  0.6934,  0.9386,  1.1730,  1.3766,
+     1.5783,  1.7783,  1.9790,  2.1831,  2.3670,  2.5578,  2.7641,  2.9516,
+     0.2126,  0.3652,  0.5545,  0.7170,  0.8674,  1.0640,  1.2558,  1.4061,
+     1.5904,  1.8095,  1.9760,  2.1505,  2.3549,  2.5575,  2.7023,  2.8877,
+     0.1827,  0.3426,  0.4894,  0.6488,  0.7960,  0.9535,  1.1217,  1.2798,
+     1.4566,  1.6453,  1.8044,  2.0042,  2.2379,  2.4611,  2.6697,  2.8966,
+     0.2034,  0.3822,  0.5231,  0.6960,  0.9200,  1.0394,  1.1616,  1.3772,
+     1.5493,  1.7330,  1.9646,  2.1233,  2.3334,  2.5361,  2.7087,  2.9470,
+     0.1050,  0.2060,  0.3705,  0.5998,  0.8337,  1.0577,  1.2559,  1.4327,
+     1.6334,  1.8165,  1.9853,  2.2058,  2.4063,  2.5818,  2.7625,  2.9458,
+     0.1419,  0.4053,  0.6660,  0.8911,  1.0405,  1.1547,  1.2506,  1.3926,
+     1.5669,  1.7527,  1.9694,  2.2054,  2.3889,  2.5743,  2.7586,  2.9174,
+     0.1514,  0.2825,  0.4309,  0.5772,  0.7470,  0.9703,  1.1462,  1.3316,
+     1.5321,  1.7259,  1.9282,  2.1266,  2.3106,  2.5064,  2.7067,  2.9094,
+     0.1693,  0.3156,  0.4878,  0.6635,  0.8206,  0.9569,  1.1154,  1.3064,
+     1.5109,  1.7184,  1.9179,  2.1036,  2.2763,  2.4820,  2.6949,  2.9105,
+     0.1432,  0.2718,  0.4241,  0.5564,  0.6939,  0.9011,  1.1582,  1.3948,
+     1.6181,  1.8024,  1.9814,  2.1740,  2.3459,  2.5456,  2.7491,  2.9307,
+     0.2294,  0.3857,  0.5590,  0.7434,  0.9189,  1.0941,  1.2740,  1.4456,
+     1.6178,  1.7994,  1.9689,  2.1644,  2.3525,  2.5385,  2.7468,  2.9405,
+     0.1667,  0.3109,  0.4612,  0.6032,  0.7375,  0.8866,  1.0840,  1.3053,
+     1.4982,  1.7044,  1.9146,  2.1117,  2.2942,  2.4983,  2.7084,  2.9132,
+     0.1810,  0.3205,  0.4696,  0.6231,  0.7641,  0.9959,  1.2427,  1.4361,
+     1.5889,  1.7544,  1.9083,  2.0733,  2.2457,  2.4461,  2.6793,  2.9098,
+     0.1164,  0.3753,  0.6068,  0.7503,  1.0100,  1.2131,  1.3793,  1.5302,
+     1.6300,  1.7950,  1.9057,  2.1031,  2.3830,  2.5745,  2.6949,  2.8779,
+     0.1571,  0.4378,  0.6735,  0.8312,  0.8944,  0.9818,  1.1622,  1.4094,
+     1.6423,  1.8066,  1.9258,  2.1838,  2.4363,  2.6279,  2.7358,  2.8790,
+     0.1398,  0.2686,  0.4248,  0.6156,  0.7870,  1.0035,  1.2012,  1.3689,
+     1.5363,  1.7398,  1.9604,  2.1619,  2.3345,  2.5097,  2.7271,  2.9368,
+     0.1913,  0.3338,  0.4987,  0.6446,  0.7852,  1.0163,  1.1886,  1.3610,
+     1.5379,  1.7230,  1.8880,  2.0862,  2.2960,  2.4928,  2.7122,  2.9151,
+     0.0908,  0.1752,  0.2899,  0.5365,  0.7761,  1.0100,  1.2124,  1.4060,
+     1.6019,  1.8010,  1.9774,  2.1905,  2.3733,  2.5623,  2.7660,  2.9565,
+     0.1773,  0.3179,  0.4925,  0.6864,  0.8452,  0.9897,  1.1860,  1.3722,
+     1.5515,  1.7658,  1.9802,  2.1819,  2.3620,  2.5442,  2.7250,  2.9220,
+     0.1286,  0.2341,  0.3689,  0.5364,  0.7176,  0.9350,  1.1083,  1.2943,
+     1.4974,  1.7059,  1.9047,  2.1145,  2.3242,  2.5361,  2.7453,  2.9329,
+     0.2273,  0.3834,  0.5565,  0.7192,  0.8431,  0.9962,  1.1763,  1.3571,
+     1.5774,  1.7419,  1.9202,  2.1131,  2.2919,  2.4898,  2.6895,  2.9180,
+     0.1775,  0.3058,  0.4274,  0.6023,  0.8151,  1.0734,  1.3211,  1.5178,
+     1.6706,  1.8154,  1.9686,  2.1537,  2.3461,  2.5276,  2.7181,  2.9121,
+     0.1653,  0.4304,  0.6361,  0.7824,  0.9183,  1.0452,  1.2071,  1.4077,
+     1.6206,  1.8299,  2.0089,  2.1948,  2.3900,  2.5982,  2.7844,  2.9487,
+     0.1492,  0.2609,  0.3820,  0.5485,  0.7243,  0.9319,  1.1538,  1.3579,
+     1.5266,  1.7002,  1.8873,  2.1016,  2.3175,  2.5221,  2.7241,  2.9243,
+     0.2074,  0.3781,  0.5209,  0.6869,  0.8577,  0.9875,  1.1849,  1.3568,
+     1.4907,  1.7335,  1.8902,  2.1224,  2.3099,  2.4918,  2.7023,  2.8765,
+     0.1359,  0.2254,  0.3286,  0.4432,  0.6586,  0.8964,  1.1125,  1.3523,
+     1.5626,  1.7579,  1.9846,  2.1905,  2.3548,  2.5542,  2.7663,  2.9346,
+     0.1430,  0.2966,  0.4685,  0.6493,  0.8315,  1.0304,  1.2220,  1.4082,
+     1.5995,  1.7888,  1.9774,  2.1737,  2.3607,  2.5577,  2.7558,  2.9405,
+     0.1477,  0.2694,  0.4056,  0.5626,  0.7051,  0.8647,  1.0491,  1.2488,
+     1.4814,  1.7072,  1.9150,  2.1147,  2.3038,  2.5144,  2.7184,  2.9202,
+     0.1690,  0.3033,  0.4580,  0.6686,  0.8536,  1.0293,  1.2124,  1.3998,
+     1.5718,  1.7607,  1.9580,  2.1245,  2.2971,  2.4762,  2.6896,  2.9177,
+     0.1092,  0.2779,  0.4853,  0.6880,  0.9011,  1.0953,  1.2752,  1.4618,
+     1.6623,  1.8484,  2.0264,  2.2152,  2.4017,  2.5835,  2.7671,  2.9436,
+     0.1497,  0.3637,  0.6014,  0.8032,  0.9963,  1.1835,  1.3741,  1.5698,
+     1.7382,  1.9094,  2.0710,  2.2392,  2.4082,  2.5926,  2.7762,  2.9536,
+     0.1434,  0.2492,  0.3966,  0.5934,  0.8033,  1.0657,  1.2796,  1.4276,
+     1.5745,  1.7833,  1.9288,  2.1247,  2.3543,  2.5412,  2.7049,  2.8872,
+     0.1612,  0.2926,  0.4574,  0.6387,  0.8265,  1.0180,  1.1808,  1.3526,
+     1.5564,  1.7536,  1.9187,  2.1192,  2.3149,  2.5006,  2.7101,  2.9217,
+     0.0828,  0.1863,  0.3235,  0.5050,  0.7250,  0.9867,  1.2093,  1.3941,
+     1.5980,  1.7932,  1.9809,  2.1894,  2.3918,  2.5773,  2.7540,  2.9329,
+     0.2001,  0.3655,  0.5290,  0.6761,  0.8027,  0.9972,  1.2090,  1.4255,
+     1.6085,  1.7825,  1.9804,  2.1681,  2.3457,  2.5325,  2.7319,  2.9196,
+     0.1505,  0.2767,  0.4254,  0.6054,  0.7821,  0.9567,  1.1294,  1.3080,
+     1.4984,  1.6954,  1.8666,  2.0736,  2.2875,  2.4969,  2.7072,  2.9163,
+     0.1589,  0.4151,  0.5749,  0.6651,  0.8061,  1.0470,  1.2616,  1.3690,
+     1.4985,  1.7808,  1.9825,  2.1068,  2.2751,  2.5448,  2.7133,  2.8689,
+     0.0916,  0.1846,  0.3788,  0.6329,  0.8774,  1.0687,  1.2653,  1.4561,
+     1.6573,  1.8449,  2.0402,  2.2254,  2.3968,  2.5861,  2.7792,  2.9508,
+     0.2282,  0.4159,  0.5834,  0.6899,  0.8108,  1.0321,  1.2795,  1.5262,
+     1.6936,  1.8469,  2.0922,  2.2607,  2.3795,  2.5301,  2.7386,  2.9530,
+     0.1651,  0.3004,  0.4555,  0.6179,  0.7891,  0.9584,  1.1372,  1.3707,
+     1.5951,  1.7880,  1.9434,  2.1465,  2.3311,  2.5081,  2.6977,  2.8970,
+     0.1279,  0.3828,  0.6330,  0.8323,  0.9652,  1.1175,  1.2319,  1.3511,
+     1.5115,  1.6392,  1.7835,  1.9558,  2.2008,  2.4635,  2.6910,  2.9058,
+     0.1193,  0.2185,  0.3521,  0.5311,  0.7378,  0.9239,  1.1105,  1.3217,
+     1.5362,  1.7504,  1.9536,  2.1627,  2.3560,  2.5506,  2.7548,  2.9453,
+     0.1806,  0.3432,  0.4981,  0.6948,  0.8928,  1.0527,  1.2467,  1.4140,
+     1.6326,  1.7950,  1.9935,  2.1969,  2.3512,  2.5682,  2.7445,  2.9277,
+     0.1846,  0.3112,  0.4568,  0.5891,  0.7317,  0.8493,  1.0204,  1.2022,
+     1.3688,  1.6020,  1.8428,  2.0710,  2.2725,  2.4879,  2.7057,  2.9160,
+     0.0880,  0.2514,  0.5332,  0.7272,  0.8906,  1.1354,  1.3199,  1.4941,
+     1.6010,  1.7151,  1.8712,  2.0643,  2.2755,  2.5375,  2.7054,  2.8891,
+     0.1382,  0.2833,  0.4658,  0.6897,  0.9071,  1.0716,  1.2469,  1.4143,
+     1.5910,  1.7947,  1.9805,  2.1581,  2.3338,  2.5215,  2.7292,  2.9211,
+     0.1061,  0.3494,  0.6327,  0.8570,  0.9748,  1.0560,  1.1529,  1.3250,
+     1.6032,  1.8340,  1.9711,  2.1157,  2.3011,  2.5464,  2.8078,  2.9803,
+     0.1603,  0.2839,  0.4307,  0.5980,  0.7980,  1.0399,  1.1971,  1.3524,
+     1.5715,  1.7838,  1.9468,  2.1498,  2.3627,  2.5514,  2.7327,  2.9148,
+     0.1691,  0.3117,  0.4796,  0.6895,  0.8732,  1.0164,  1.1916,  1.3707,
+     1.5384,  1.7202,  1.8857,  2.0672,  2.2487,  2.4593,  2.6789,  2.8940,
+     0.0965,  0.1702,  0.3191,  0.5721,  0.8100,  1.0241,  1.2272,  1.4196,
+     1.6093,  1.8057,  1.9884,  2.2037,  2.3925,  2.5805,  2.7578,  2.9366,
+     0.1950,  0.3519,  0.5272,  0.6973,  0.8732,  1.0656,  1.2112,  1.3959,
+     1.6116,  1.7821,  1.9445,  2.1592,  2.3348,  2.5142,  2.7440,  2.9297,
+     0.1388,  0.2557,  0.4120,  0.5727,  0.7354,  0.9196,  1.0985,  1.2805,
+     1.4643,  1.6535,  1.8340,  2.0546,  2.2758,  2.4778,  2.6921,  2.9122,
+     0.1823,  0.3336,  0.4957,  0.6771,  0.8563,  1.0137,  1.2299,  1.3849,
+     1.5718,  1.7667,  1.9193,  2.1326,  2.3135,  2.5268,  2.7133,  2.8998,
+     0.0790,  0.1901,  0.4083,  0.6456,  0.8463,  1.0285,  1.2297,  1.4181,
+     1.6159,  1.8056,  1.9971,  2.1912,  2.3816,  2.5746,  2.7692,  2.9497,
+     0.0049,  0.0116,  0.0045,  0.0039, -0.0010, -0.0122, -0.0205, -0.0034,
+    -0.0140, -0.0041,  0.0191, -0.0322,  0.0002, -0.0124, -0.0269,  0.0059,
+     0.0586,  0.0339, -0.0389, -0.0319, -0.0079, -0.0205, -0.0363, -0.0211,
+     0.0241,  0.0595,  0.0469,  0.0283,  0.0176, -0.0183, -0.0173, -0.0004,
+     0.0024,  0.0145,  0.0534,  0.0197, -0.0065, -0.0067,  0.0133,  0.0358,
+    -0.0104, -0.0386, -0.0109, -0.0078,  0.0275,  0.0565,  0.0251, -0.0027,
+    -0.0053,  0.0171,  0.0088,  0.0495,  0.0141,  0.0039, -0.0445, -0.0426,
+    -0.0184, -0.0280, -0.0223,  0.0039, -0.0171, -0.0606, -0.0786, -0.0430,
+     0.0544,  0.0595,  0.0320, -0.0012,  0.0108,  0.0185,  0.0066,  0.0408,
+     0.0552, -0.0073, -0.0247, -0.0480, -0.0288,  0.0186,  0.0212, -0.0013,
+     0.0403,  0.0598,  0.0690,  0.0516, -0.0298, -0.0177,  0.0278,  0.0168,
+    -0.0106,  0.0251,  0.0386,  0.0331, -0.0052,  0.0133,  0.0291, -0.0158,
+    -0.0329, -0.0367,  0.0287,  0.0462, -0.0176,  0.0049,  0.0242, -0.0034,
+     0.0135,  0.0086, -0.0149,  0.0241,  0.0504,  0.0246, -0.0273, -0.0369,
+    -0.0108, -0.0449, -0.0625, -0.0414, -0.0292, -0.0571, -0.0440, -0.0088,
+     0.0098,  0.0009, -0.0004,  0.0007, -0.0314, -0.0208, -0.0138, -0.0277,
+    -0.0044,  0.0522,  0.0315, -0.0270, -0.0277, -0.0256, -0.0103, -0.0201,
+    -0.0287, -0.0279, -0.0182,  0.0472,  0.0613,  0.0450,  0.0413,  0.0333,
+     0.0444,  0.0223,  0.0061,  0.0316,  0.0321,  0.0501,  0.0460,  0.0250,
+     0.0227,  0.0235,  0.0099,  0.0185, -0.0347, -0.0684, -0.0189,  0.0242,
+    -0.0190, -0.0273, -0.0012, -0.0253,  0.0293, -0.0231, -0.0219, -0.0010,
+     0.0153,  0.0128, -0.0166, -0.0435, -0.0417, -0.0121, -0.0351, -0.0390,
+     0.0077, -0.0278, -0.0355,  0.0092, -0.0063,  0.0005,  0.0216,  0.0461,
+     0.0538,  0.0451,  0.0298, -0.0130,  0.0058,  0.0206,  0.0471,  0.0499,
+     0.0280,  0.0086, -0.0007, -0.0317,  0.0259,  0.0176,  0.0043,  0.0212,
+     0.0138,  0.0106,  0.0220, -0.0025,  0.0050,  0.0122, -0.0051, -0.0086,
+    -0.0472, -0.0005,  0.0193,  0.0032,  0.0246,  0.0222,  0.0090, -0.0320,
+    -0.0713, -0.0526, -0.0151, -0.0440, -0.0648, -0.0466, -0.0092,  0.0115,
+    -0.0129,  0.0053, -0.0344, -0.0385,  0.0392,  0.0599,  0.0414,  0.0165,
+    -0.0098, -0.0320, -0.0261, -0.0055, -0.0139, -0.0110,  0.0084,  0.0172,
+    -0.0492, -0.0537, -0.0320, -0.0036,  0.0265,  0.0385,  0.0064, -0.0280,
+    -0.0230,  0.0134,  0.0241,  0.0106,  0.0387,  0.0105,  0.0068,  0.0260,
+     0.4940,  0.4911,  0.4849,  0.4820,  0.4837,  0.4839,  0.4824,  0.4799,
+     0.4812,  0.4782,  0.4788,  0.4711,  0.4706,  0.4671,  0.4601,  0.4578,
+     0.2954,  0.2121,  0.1859,  0.1958,  0.1474,  0.1086,  0.1351,  0.1362,
+     0.1486,  0.1342,  0.1215,  0.1423,  0.1634,  0.1588,  0.1539,  0.1857,
+};
+
+static const float lsp11s[] = {
+     0.1103,  0.3862,  0.6863,  0.8447,  0.9231,  1.0261,  1.1248,  1.4057,
+     1.6621,  1.8010,  1.8692,  2.0704,  2.3490,  2.6060,  2.7539,  2.8977,
+     0.1273,  0.2407,  0.3812,  0.6004,  0.7767,  0.9383,  1.1344,  1.3351,
+     1.5233,  1.7262,  1.9466,  2.1739,  2.3495,  2.5162,  2.7164,  2.9202,
+     0.2010,  0.3330,  0.4488,  0.6465,  0.8046,  0.9889,  1.1479,  1.2964,
+     1.4770,  1.6606,  1.8789,  2.1155,  2.3287,  2.5199,  2.7101,  2.9119,
+     0.1168,  0.2197,  0.3279,  0.4691,  0.6268,  0.8251,  1.0533,  1.2714,
+     1.4712,  1.6762,  1.8831,  2.1114,  2.3230,  2.5297,  2.7365,  2.9270,
+     0.1405,  0.3109,  0.4986,  0.6891,  0.8634,  1.0583,  1.2594,  1.4349,
+     1.6232,  1.8116,  1.9905,  2.1935,  2.3799,  2.5656,  2.7661,  2.9486,
+     0.1703,  0.3057,  0.4403,  0.5225,  0.5969,  0.8110,  1.0729,  1.3215,
+     1.5407,  1.7381,  1.9477,  2.1680,  2.3586,  2.5612,  2.7630,  2.9410,
+     0.1128,  0.2628,  0.4523,  0.6495,  0.8176,  0.9816,  1.1746,  1.3710,
+     1.5568,  1.7518,  1.9497,  2.1452,  2.3346,  2.5389,  2.7362,  2.9264,
+     0.1809,  0.3287,  0.5205,  0.7264,  0.9298,  1.1217,  1.2970,  1.4894,
+     1.6874,  1.8493,  2.0576,  2.2382,  2.4097,  2.6041,  2.7796,  2.9389,
+     0.2502,  0.4709,  0.6892,  0.8346,  0.9209,  1.0455,  1.2399,  1.4616,
+     1.6463,  1.8380,  2.0475,  2.2397,  2.4665,  2.6550,  2.7701,  2.8895,
+     0.1040,  0.2340,  0.3964,  0.5740,  0.7764,  0.9941,  1.2000,  1.4014,
+     1.6024,  1.7974,  1.9939,  2.1959,  2.3783,  2.5663,  2.7613,  2.9484,
+     0.1912,  0.3393,  0.4743,  0.6313,  0.8014,  0.9879,  1.1855,  1.3922,
+     1.5678,  1.7289,  1.9271,  2.1165,  2.3089,  2.5414,  2.7448,  2.9269,
+     0.0965,  0.2025,  0.3398,  0.4990,  0.6934,  0.9386,  1.1730,  1.3766,
+     1.5783,  1.7783,  1.9790,  2.1831,  2.3670,  2.5578,  2.7641,  2.9516,
+     0.2126,  0.3652,  0.5545,  0.7170,  0.8674,  1.0640,  1.2558,  1.4061,
+     1.5904,  1.8095,  1.9760,  2.1505,  2.3549,  2.5575,  2.7023,  2.8877,
+     0.1827,  0.3426,  0.4894,  0.6488,  0.7960,  0.9535,  1.1217,  1.2798,
+     1.4566,  1.6453,  1.8044,  2.0042,  2.2379,  2.4611,  2.6697,  2.8966,
+     0.2034,  0.3822,  0.5231,  0.6960,  0.9200,  1.0394,  1.1616,  1.3772,
+     1.5493,  1.7330,  1.9646,  2.1233,  2.3334,  2.5361,  2.7087,  2.9470,
+     0.1050,  0.2060,  0.3705,  0.5998,  0.8337,  1.0577,  1.2559,  1.4327,
+     1.6334,  1.8165,  1.9853,  2.2058,  2.4063,  2.5818,  2.7625,  2.9458,
+     0.1419,  0.4053,  0.6660,  0.8911,  1.0405,  1.1547,  1.2506,  1.3926,
+     1.5669,  1.7527,  1.9694,  2.2054,  2.3889,  2.5743,  2.7586,  2.9174,
+     0.1514,  0.2825,  0.4309,  0.5772,  0.7470,  0.9703,  1.1462,  1.3316,
+     1.5321,  1.7259,  1.9282,  2.1266,  2.3106,  2.5064,  2.7067,  2.9094,
+     0.1693,  0.3156,  0.4878,  0.6635,  0.8206,  0.9569,  1.1154,  1.3064,
+     1.5109,  1.7184,  1.9179,  2.1036,  2.2763,  2.4820,  2.6949,  2.9105,
+     0.1432,  0.2718,  0.4241,  0.5564,  0.6939,  0.9011,  1.1582,  1.3948,
+     1.6181,  1.8024,  1.9814,  2.1740,  2.3459,  2.5456,  2.7491,  2.9307,
+     0.2294,  0.3857,  0.5590,  0.7434,  0.9189,  1.0941,  1.2740,  1.4456,
+     1.6178,  1.7994,  1.9689,  2.1644,  2.3525,  2.5385,  2.7468,  2.9405,
+     0.1667,  0.3109,  0.4612,  0.6032,  0.7375,  0.8866,  1.0840,  1.3053,
+     1.4982,  1.7044,  1.9146,  2.1117,  2.2942,  2.4983,  2.7084,  2.9132,
+     0.1810,  0.3205,  0.4696,  0.6231,  0.7641,  0.9959,  1.2427,  1.4361,
+     1.5889,  1.7544,  1.9083,  2.0733,  2.2457,  2.4461,  2.6793,  2.9098,
+     0.1164,  0.3753,  0.6068,  0.7503,  1.0100,  1.2131,  1.3793,  1.5302,
+     1.6300,  1.7950,  1.9057,  2.1031,  2.3830,  2.5745,  2.6949,  2.8779,
+     0.1571,  0.4378,  0.6735,  0.8312,  0.8944,  0.9818,  1.1622,  1.4094,
+     1.6423,  1.8066,  1.9258,  2.1838,  2.4363,  2.6279,  2.7358,  2.8790,
+     0.1398,  0.2686,  0.4248,  0.6156,  0.7870,  1.0035,  1.2012,  1.3689,
+     1.5363,  1.7398,  1.9604,  2.1619,  2.3345,  2.5097,  2.7271,  2.9368,
+     0.1913,  0.3338,  0.4987,  0.6446,  0.7852,  1.0163,  1.1886,  1.3610,
+     1.5379,  1.7230,  1.8880,  2.0862,  2.2960,  2.4928,  2.7122,  2.9151,
+     0.0908,  0.1752,  0.2899,  0.5365,  0.7761,  1.0100,  1.2124,  1.4060,
+     1.6019,  1.8010,  1.9774,  2.1905,  2.3733,  2.5623,  2.7660,  2.9565,
+     0.1773,  0.3179,  0.4925,  0.6864,  0.8452,  0.9897,  1.1860,  1.3722,
+     1.5515,  1.7658,  1.9802,  2.1819,  2.3620,  2.5442,  2.7250,  2.9220,
+     0.1286,  0.2341,  0.3689,  0.5364,  0.7176,  0.9350,  1.1083,  1.2943,
+     1.4974,  1.7059,  1.9047,  2.1145,  2.3242,  2.5361,  2.7453,  2.9329,
+     0.2273,  0.3834,  0.5565,  0.7192,  0.8431,  0.9962,  1.1763,  1.3571,
+     1.5774,  1.7419,  1.9202,  2.1131,  2.2919,  2.4898,  2.6895,  2.9180,
+     0.1775,  0.3058,  0.4274,  0.6023,  0.8151,  1.0734,  1.3211,  1.5178,
+     1.6706,  1.8154,  1.9686,  2.1537,  2.3461,  2.5276,  2.7181,  2.9121,
+     0.1653,  0.4304,  0.6361,  0.7824,  0.9183,  1.0452,  1.2071,  1.4077,
+     1.6206,  1.8299,  2.0089,  2.1948,  2.3900,  2.5982,  2.7844,  2.9487,
+     0.1492,  0.2609,  0.3820,  0.5485,  0.7243,  0.9319,  1.1538,  1.3579,
+     1.5266,  1.7002,  1.8873,  2.1016,  2.3175,  2.5221,  2.7241,  2.9243,
+     0.2074,  0.3781,  0.5209,  0.6869,  0.8577,  0.9875,  1.1849,  1.3568,
+     1.4907,  1.7335,  1.8902,  2.1224,  2.3099,  2.4918,  2.7023,  2.8765,
+     0.1359,  0.2254,  0.3286,  0.4432,  0.6586,  0.8964,  1.1125,  1.3523,
+     1.5626,  1.7579,  1.9846,  2.1905,  2.3548,  2.5542,  2.7663,  2.9346,
+     0.1430,  0.2966,  0.4685,  0.6493,  0.8315,  1.0304,  1.2220,  1.4082,
+     1.5995,  1.7888,  1.9774,  2.1737,  2.3607,  2.5577,  2.7558,  2.9405,
+     0.1477,  0.2694,  0.4056,  0.5626,  0.7051,  0.8647,  1.0491,  1.2488,
+     1.4814,  1.7072,  1.9150,  2.1147,  2.3038,  2.5144,  2.7184,  2.9202,
+     0.1690,  0.3033,  0.4580,  0.6686,  0.8536,  1.0293,  1.2124,  1.3998,
+     1.5718,  1.7607,  1.9580,  2.1245,  2.2971,  2.4762,  2.6896,  2.9177,
+     0.1092,  0.2779,  0.4853,  0.6880,  0.9011,  1.0953,  1.2752,  1.4618,
+     1.6623,  1.8484,  2.0264,  2.2152,  2.4017,  2.5835,  2.7671,  2.9436,
+     0.1497,  0.3637,  0.6014,  0.8032,  0.9963,  1.1835,  1.3741,  1.5698,
+     1.7382,  1.9094,  2.0710,  2.2392,  2.4082,  2.5926,  2.7762,  2.9536,
+     0.1434,  0.2492,  0.3966,  0.5934,  0.8033,  1.0657,  1.2796,  1.4276,
+     1.5745,  1.7833,  1.9288,  2.1247,  2.3543,  2.5412,  2.7049,  2.8872,
+     0.1612,  0.2926,  0.4574,  0.6387,  0.8265,  1.0180,  1.1808,  1.3526,
+     1.5564,  1.7536,  1.9187,  2.1192,  2.3149,  2.5006,  2.7101,  2.9217,
+     0.0828,  0.1863,  0.3235,  0.5050,  0.7250,  0.9867,  1.2093,  1.3941,
+     1.5980,  1.7932,  1.9809,  2.1894,  2.3918,  2.5773,  2.7540,  2.9329,
+     0.2001,  0.3655,  0.5290,  0.6761,  0.8027,  0.9972,  1.2090,  1.4255,
+     1.6085,  1.7825,  1.9804,  2.1681,  2.3457,  2.5325,  2.7319,  2.9196,
+     0.1505,  0.2767,  0.4254,  0.6054,  0.7821,  0.9567,  1.1294,  1.3080,
+     1.4984,  1.6954,  1.8666,  2.0736,  2.2875,  2.4969,  2.7072,  2.9163,
+     0.1589,  0.4151,  0.5749,  0.6651,  0.8061,  1.0470,  1.2616,  1.3690,
+     1.4985,  1.7808,  1.9825,  2.1068,  2.2751,  2.5448,  2.7133,  2.8689,
+     0.0916,  0.1846,  0.3788,  0.6329,  0.8774,  1.0687,  1.2653,  1.4561,
+     1.6573,  1.8449,  2.0402,  2.2254,  2.3968,  2.5861,  2.7792,  2.9508,
+     0.2282,  0.4159,  0.5834,  0.6899,  0.8108,  1.0321,  1.2795,  1.5262,
+     1.6936,  1.8469,  2.0922,  2.2607,  2.3795,  2.5301,  2.7386,  2.9530,
+     0.1651,  0.3004,  0.4555,  0.6179,  0.7891,  0.9584,  1.1372,  1.3707,
+     1.5951,  1.7880,  1.9434,  2.1465,  2.3311,  2.5081,  2.6977,  2.8970,
+     0.1279,  0.3828,  0.6330,  0.8323,  0.9652,  1.1175,  1.2319,  1.3511,
+     1.5115,  1.6392,  1.7835,  1.9558,  2.2008,  2.4635,  2.6910,  2.9058,
+     0.1193,  0.2185,  0.3521,  0.5311,  0.7378,  0.9239,  1.1105,  1.3217,
+     1.5362,  1.7504,  1.9536,  2.1627,  2.3560,  2.5506,  2.7548,  2.9453,
+     0.1806,  0.3432,  0.4981,  0.6948,  0.8928,  1.0527,  1.2467,  1.4140,
+     1.6326,  1.7950,  1.9935,  2.1969,  2.3512,  2.5682,  2.7445,  2.9277,
+     0.1846,  0.3112,  0.4568,  0.5891,  0.7317,  0.8493,  1.0204,  1.2022,
+     1.3688,  1.6020,  1.8428,  2.0710,  2.2725,  2.4879,  2.7057,  2.9160,
+     0.0880,  0.2514,  0.5332,  0.7272,  0.8906,  1.1354,  1.3199,  1.4941,
+     1.6010,  1.7151,  1.8712,  2.0643,  2.2755,  2.5375,  2.7054,  2.8891,
+     0.1382,  0.2833,  0.4658,  0.6897,  0.9071,  1.0716,  1.2469,  1.4143,
+     1.5910,  1.7947,  1.9805,  2.1581,  2.3338,  2.5215,  2.7292,  2.9211,
+     0.1061,  0.3494,  0.6327,  0.8570,  0.9748,  1.0560,  1.1529,  1.3250,
+     1.6032,  1.8340,  1.9711,  2.1157,  2.3011,  2.5464,  2.8078,  2.9803,
+     0.1603,  0.2839,  0.4307,  0.5980,  0.7980,  1.0399,  1.1971,  1.3524,
+     1.5715,  1.7838,  1.9468,  2.1498,  2.3627,  2.5514,  2.7327,  2.9148,
+     0.1691,  0.3117,  0.4796,  0.6895,  0.8732,  1.0164,  1.1916,  1.3707,
+     1.5384,  1.7202,  1.8857,  2.0672,  2.2487,  2.4593,  2.6789,  2.8940,
+     0.0965,  0.1702,  0.3191,  0.5721,  0.8100,  1.0241,  1.2272,  1.4196,
+     1.6093,  1.8057,  1.9884,  2.2037,  2.3925,  2.5805,  2.7578,  2.9366,
+     0.1950,  0.3519,  0.5272,  0.6973,  0.8732,  1.0656,  1.2112,  1.3959,
+     1.6116,  1.7821,  1.9445,  2.1592,  2.3348,  2.5142,  2.7440,  2.9297,
+     0.1388,  0.2557,  0.4120,  0.5727,  0.7354,  0.9196,  1.0985,  1.2805,
+     1.4643,  1.6535,  1.8340,  2.0546,  2.2758,  2.4778,  2.6921,  2.9122,
+     0.1823,  0.3336,  0.4957,  0.6771,  0.8563,  1.0137,  1.2299,  1.3849,
+     1.5718,  1.7667,  1.9193,  2.1326,  2.3135,  2.5268,  2.7133,  2.8998,
+     0.0790,  0.1901,  0.4083,  0.6456,  0.8463,  1.0285,  1.2297,  1.4181,
+     1.6159,  1.8056,  1.9971,  2.1912,  2.3816,  2.5746,  2.7692,  2.9497,
+     0.0049,  0.0116,  0.0045,  0.0039, -0.0010, -0.0122, -0.0205, -0.0034,
+    -0.0140, -0.0041,  0.0191, -0.0322,  0.0002, -0.0124, -0.0269,  0.0059,
+     0.0586,  0.0339, -0.0389, -0.0319, -0.0079, -0.0205, -0.0363, -0.0211,
+     0.0241,  0.0595,  0.0469,  0.0283,  0.0176, -0.0183, -0.0173, -0.0004,
+     0.0024,  0.0145,  0.0534,  0.0197, -0.0065, -0.0067,  0.0133,  0.0358,
+    -0.0104, -0.0386, -0.0109, -0.0078,  0.0275,  0.0565,  0.0251, -0.0027,
+    -0.0053,  0.0171,  0.0088,  0.0495,  0.0141,  0.0039, -0.0445, -0.0426,
+    -0.0184, -0.0280, -0.0223,  0.0039, -0.0171, -0.0606, -0.0786, -0.0430,
+     0.0544,  0.0595,  0.0320, -0.0012,  0.0108,  0.0185,  0.0066,  0.0408,
+     0.0552, -0.0073, -0.0247, -0.0480, -0.0288,  0.0186,  0.0212, -0.0013,
+     0.0403,  0.0598,  0.0690,  0.0516, -0.0298, -0.0177,  0.0278,  0.0168,
+    -0.0106,  0.0251,  0.0386,  0.0331, -0.0052,  0.0133,  0.0291, -0.0158,
+    -0.0329, -0.0367,  0.0287,  0.0462, -0.0176,  0.0049,  0.0242, -0.0034,
+     0.0135,  0.0086, -0.0149,  0.0241,  0.0504,  0.0246, -0.0273, -0.0369,
+    -0.0108, -0.0449, -0.0625, -0.0414, -0.0292, -0.0571, -0.0440, -0.0088,
+     0.0098,  0.0009, -0.0004,  0.0007, -0.0314, -0.0208, -0.0138, -0.0277,
+    -0.0044,  0.0522,  0.0315, -0.0270, -0.0277, -0.0256, -0.0103, -0.0201,
+    -0.0287, -0.0279, -0.0182,  0.0472,  0.0613,  0.0450,  0.0413,  0.0333,
+     0.0444,  0.0223,  0.0061,  0.0316,  0.0321,  0.0501,  0.0460,  0.0250,
+     0.0227,  0.0235,  0.0099,  0.0185, -0.0347, -0.0684, -0.0189,  0.0242,
+    -0.0190, -0.0273, -0.0012, -0.0253,  0.0293, -0.0231, -0.0219, -0.0010,
+     0.0153,  0.0128, -0.0166, -0.0435, -0.0417, -0.0121, -0.0351, -0.0390,
+     0.0077, -0.0278, -0.0355,  0.0092, -0.0063,  0.0005,  0.0216,  0.0461,
+     0.0538,  0.0451,  0.0298, -0.0130,  0.0058,  0.0206,  0.0471,  0.0499,
+     0.0280,  0.0086, -0.0007, -0.0317,  0.0259,  0.0176,  0.0043,  0.0212,
+     0.0138,  0.0106,  0.0220, -0.0025,  0.0050,  0.0122, -0.0051, -0.0086,
+    -0.0472, -0.0005,  0.0193,  0.0032,  0.0246,  0.0222,  0.0090, -0.0320,
+    -0.0713, -0.0526, -0.0151, -0.0440, -0.0648, -0.0466, -0.0092,  0.0115,
+    -0.0129,  0.0053, -0.0344, -0.0385,  0.0392,  0.0599,  0.0414,  0.0165,
+    -0.0098, -0.0320, -0.0261, -0.0055, -0.0139, -0.0110,  0.0084,  0.0172,
+    -0.0492, -0.0537, -0.0320, -0.0036,  0.0265,  0.0385,  0.0064, -0.0280,
+    -0.0230,  0.0134,  0.0241,  0.0106,  0.0387,  0.0105,  0.0068,  0.0260,
+     0.4940,  0.4911,  0.4849,  0.4820,  0.4837,  0.4839,  0.4824,  0.4799,
+     0.4812,  0.4782,  0.4788,  0.4711,  0.4706,  0.4671,  0.4601,  0.4578,
+     0.2954,  0.2121,  0.1859,  0.1958,  0.1474,  0.1086,  0.1351,  0.1362,
+     0.1486,  0.1342,  0.1215,  0.1423,  0.1634,  0.1588,  0.1539,  0.1857,
 };
 
 static const float lsp16[] = {
@@ -4242,7 +12744,520 @@
      0.0306,  0.0090, -0.0054,  0.0333,  0.0047,  0.0238,  0.0141,  0.0165,
      0.0306,  0.0420,  0.0159,  0.0124,  0.0414,  0.0158, -0.0237,  0.0141,
      0.0765,  0.0057, -0.0260, -0.0426, -0.0395, -0.0126, -0.0579, -0.0417,
-    -0.0429, -0.0615, -0.0893, -0.0618, -0.0384, -0.0134, -0.0232, -0.0238
+    -0.0429, -0.0615, -0.0893, -0.0618, -0.0384, -0.0134, -0.0232, -0.0238,
+};
+
+static const float lsp16s[] = {
+     0.1813,  0.3911,  0.6301,  0.8012,  1.0057,  1.2041,  1.4271,  1.6943,
+     1.9402,  2.1733,  2.3521,  2.4989,  2.5839,  2.6846,  2.7634,  2.8950,
+     0.1311,  0.3183,  0.4659,  0.5601,  0.6658,  0.7828,  1.0065,  1.2717,
+     1.5185,  1.7339,  1.9530,  2.2189,  2.3739,  2.4991,  2.6984,  2.9256,
+     0.1627,  0.4519,  0.6323,  0.7012,  0.7848,  0.9801,  1.1810,  1.3222,
+     1.5413,  1.8129,  1.9338,  2.0809,  2.3180,  2.5189,  2.7066,  2.9514,
+     0.1475,  0.2447,  0.4240,  0.5669,  0.7872,  0.9838,  1.1823,  1.3814,
+     1.5358,  1.6820,  1.8794,  2.1419,  2.4132,  2.6112,  2.7911,  2.9511,
+     0.1224,  0.2876,  0.5013,  0.6985,  0.8902,  1.0901,  1.2835,  1.4768,
+     1.6596,  1.8538,  2.0467,  2.2304,  2.4124,  2.5942,  2.7729,  2.9531,
+     0.1741,  0.3034,  0.4677,  0.5879,  0.7258,  0.9648,  1.1417,  1.3220,
+     1.5081,  1.7151,  1.9212,  2.1286,  2.3208,  2.4938,  2.6765,  2.8891,
+     0.1657,  0.3174,  0.4907,  0.6559,  0.8295,  1.0254,  1.2071,  1.3880,
+     1.5737,  1.7845,  1.9027,  2.1139,  2.3323,  2.5157,  2.7323,  2.9015,
+     0.1592,  0.2758,  0.4417,  0.6315,  0.8257,  0.9873,  1.1277,  1.2830,
+     1.4337,  1.6315,  1.8899,  2.1356,  2.3572,  2.5632,  2.7468,  2.9420,
+     0.1524,  0.4325,  0.5931,  0.7036,  0.7696,  0.8923,  1.1739,  1.4773,
+     1.6609,  1.7911,  1.9666,  2.1972,  2.3754,  2.5045,  2.6613,  2.8882,
+     0.2130,  0.3013,  0.3721,  0.4257,  0.5079,  0.7015,  0.9815,  1.2554,
+     1.4648,  1.6966,  1.9138,  2.1075,  2.3318,  2.5292,  2.7453,  2.9347,
+     0.1142,  0.3748,  0.6205,  0.7642,  0.8121,  0.9022,  0.9843,  1.1558,
+     1.4467,  1.7422,  1.9574,  2.1302,  2.3812,  2.5898,  2.7720,  2.9583,
+     0.1255,  0.2339,  0.3570,  0.5323,  0.7458,  1.0003,  1.1729,  1.3567,
+     1.5217,  1.6977,  1.8924,  2.0942,  2.3145,  2.5408,  2.7553,  2.9337,
+     0.1316,  0.2289,  0.4327,  0.6663,  0.8509,  0.9994,  1.1697,  1.3804,
+     1.5609,  1.6903,  1.8572,  2.1019,  2.3687,  2.5789,  2.7715,  2.9472,
+     0.1502,  0.2546,  0.3883,  0.5333,  0.6976,  0.9163,  1.1071,  1.3364,
+     1.5420,  1.7525,  1.8948,  2.0839,  2.2819,  2.4651,  2.6875,  2.8987,
+     0.1593,  0.3014,  0.4573,  0.6354,  0.8157,  0.9805,  1.1783,  1.3747,
+     1.5678,  1.7326,  1.9286,  2.1340,  2.3253,  2.5280,  2.7180,  2.9298,
+     0.1811,  0.3167,  0.4655,  0.6507,  0.8198,  1.0075,  1.1892,  1.3743,
+     1.5227,  1.7090,  1.8849,  2.0743,  2.2750,  2.4830,  2.6896,  2.8953,
+     0.1846,  0.3577,  0.5315,  0.7290,  0.9176,  1.1016,  1.2654,  1.4525,
+     1.6315,  1.8268,  2.0238,  2.1934,  2.3868,  2.5753,  2.7682,  2.9469,
+     0.0876,  0.1439,  0.2048,  0.3654,  0.6281,  0.8853,  1.0907,  1.2992,
+     1.5227,  1.7373,  1.9395,  2.1419,  2.3488,  2.5486,  2.7466,  2.9348,
+     0.1391,  0.4170,  0.6561,  0.7953,  0.8734,  0.9986,  1.1870,  1.4520,
+     1.6042,  1.7910,  2.0135,  2.1870,  2.3358,  2.5066,  2.7409,  2.9955,
+     0.0804,  0.1355,  0.2599,  0.4998,  0.7408,  0.9474,  1.1276,  1.3428,
+     1.5556,  1.7712,  1.9699,  2.1535,  2.3605,  2.5548,  2.7489,  2.9325,
+     0.1304,  0.3087,  0.4979,  0.6584,  0.8414,  1.0329,  1.2244,  1.4189,
+     1.6118,  1.8200,  1.9985,  2.1893,  2.3915,  2.5794,  2.7647,  2.9344,
+     0.1895,  0.2849,  0.3705,  0.4126,  0.6265,  0.9207,  1.1774,  1.3762,
+     1.5757,  1.7728,  1.9568,  2.1662,  2.3615,  2.5575,  2.7561,  2.9416,
+     0.1800,  0.3078,  0.4805,  0.6796,  0.8503,  1.0046,  1.1703,  1.3269,
+     1.4862,  1.6502,  1.8454,  2.0873,  2.3175,  2.5356,  2.7516,  2.9469,
+     0.1950,  0.3233,  0.4568,  0.5940,  0.7589,  0.9978,  1.1701,  1.3383,
+     1.5017,  1.6565,  1.8243,  2.0605,  2.2938,  2.5147,  2.7419,  2.9396,
+     0.2531,  0.4391,  0.5790,  0.7170,  0.8998,  1.1430,  1.3577,  1.5326,
+     1.6328,  1.7627,  1.9726,  2.1762,  2.3563,  2.5478,  2.7385,  2.9067,
+     0.1805,  0.2788,  0.3591,  0.3881,  0.5441,  0.8055,  1.0766,  1.3165,
+     1.5316,  1.7508,  1.9477,  2.1374,  2.3438,  2.5484,  2.7501,  2.9410,
+     0.2044,  0.3671,  0.5396,  0.7042,  0.8582,  0.9831,  1.1261,  1.3194,
+     1.4769,  1.6979,  1.8717,  2.0463,  2.2620,  2.4739,  2.7054,  2.9208,
+     0.1048,  0.2175,  0.4206,  0.5923,  0.7483,  0.9400,  1.1356,  1.3799,
+     1.5958,  1.7320,  1.8984,  2.1296,  2.3594,  2.5492,  2.7387,  2.9305,
+     0.0842,  0.1729,  0.3951,  0.6447,  0.8688,  1.0605,  1.2472,  1.4330,
+     1.6232,  1.8144,  2.0216,  2.1915,  2.3878,  2.5763,  2.7685,  2.9464,
+     0.1461,  0.2593,  0.4105,  0.5677,  0.7328,  0.8919,  1.0484,  1.2302,
+     1.4386,  1.6635,  1.8873,  2.1024,  2.3116,  2.5268,  2.7273,  2.9269,
+     0.1503,  0.3108,  0.4756,  0.6731,  0.8600,  1.0233,  1.2115,  1.3971,
+     1.5915,  1.7892,  1.9517,  2.1603,  2.3487,  2.5460,  2.7308,  2.8998,
+     0.2163,  0.3669,  0.5125,  0.6709,  0.8143,  0.9930,  1.2095,  1.4205,
+     1.6176,  1.7112,  1.8398,  2.0896,  2.3513,  2.5290,  2.6667,  2.8960,
+     0.2133,  0.4382,  0.6287,  0.8702,  1.1088,  1.3749,  1.6062,  1.7446,
+     1.8333,  1.9122,  1.9614,  2.0669,  2.1789,  2.3449,  2.6038,  2.8849,
+     0.1598,  0.2719,  0.3877,  0.4815,  0.5926,  0.7795,  1.0449,  1.3045,
+     1.5210,  1.7391,  1.9462,  2.1397,  2.3553,  2.5458,  2.7540,  2.9392,
+     0.2918,  0.5607,  0.6801,  0.7404,  0.8285,  0.9431,  1.1579,  1.4080,
+     1.6332,  1.8472,  1.9738,  2.0771,  2.2890,  2.5178,  2.7445,  2.9830,
+     0.1664,  0.2842,  0.3965,  0.5463,  0.8162,  1.0346,  1.1849,  1.3446,
+     1.5122,  1.7563,  1.9960,  2.2002,  2.3796,  2.5689,  2.7712,  2.9550,
+     0.0911,  0.2397,  0.5052,  0.7868,  1.0299,  1.1311,  1.2244,  1.3333,
+     1.4395,  1.6790,  1.9369,  2.1717,  2.3689,  2.5538,  2.7340,  2.9326,
+     0.1647,  0.2931,  0.3836,  0.4978,  0.6255,  0.9243,  1.1339,  1.3001,
+     1.5269,  1.8010,  1.9715,  2.1419,  2.3784,  2.5503,  2.6719,  2.8745,
+     0.2440,  0.3802,  0.4756,  0.6613,  0.8627,  1.0292,  1.2291,  1.4060,
+     1.5198,  1.7354,  1.9044,  2.1010,  2.3147,  2.4996,  2.7171,  2.9041,
+     0.1590,  0.2876,  0.4572,  0.5996,  0.7713,  0.9490,  1.1205,  1.2815,
+     1.4516,  1.6385,  1.8179,  2.0457,  2.2759,  2.4785,  2.6861,  2.9080,
+     0.2297,  0.4309,  0.5712,  0.6717,  0.8138,  1.0463,  1.2492,  1.4560,
+     1.6796,  1.8458,  1.9642,  2.1452,  2.3636,  2.5395,  2.7456,  2.9495,
+     0.2975,  0.4678,  0.4996,  0.5809,  0.6279,  0.6884,  0.8606,  1.1386,
+     1.4412,  1.6876,  1.8760,  2.0932,  2.3178,  2.5166,  2.7345,  2.9280,
+     0.1278,  0.3737,  0.6004,  0.7069,  0.8147,  1.0180,  1.2581,  1.3812,
+     1.4855,  1.7268,  1.9970,  2.1258,  2.2936,  2.5702,  2.7563,  2.8983,
+     0.1314,  0.2508,  0.3999,  0.5680,  0.7424,  0.9367,  1.1286,  1.3175,
+     1.5336,  1.7404,  1.9317,  2.1404,  2.3514,  2.5562,  2.7510,  2.9402,
+     0.1043,  0.2367,  0.4293,  0.6376,  0.8160,  0.9836,  1.1779,  1.3850,
+     1.5835,  1.7875,  1.9765,  2.1593,  2.3654,  2.5577,  2.7465,  2.9398,
+     0.1529,  0.2515,  0.3454,  0.4374,  0.7011,  0.9015,  1.0744,  1.3532,
+     1.5699,  1.7545,  2.0021,  2.1259,  2.2278,  2.4546,  2.7264,  2.9425,
+     0.1429,  0.2808,  0.4395,  0.6334,  0.8069,  0.9705,  1.1520,  1.3250,
+     1.5109,  1.7285,  1.9356,  2.1469,  2.3479,  2.5554,  2.7512,  2.9348,
+     0.1625,  0.3022,  0.4756,  0.6315,  0.8032,  0.9924,  1.1596,  1.3204,
+     1.4994,  1.6929,  1.8955,  2.1090,  2.3025,  2.5018,  2.6908,  2.8980,
+     0.1692,  0.3427,  0.5228,  0.7756,  0.9688,  1.0950,  1.3056,  1.4360,
+     1.5675,  1.8049,  1.9376,  2.1151,  2.3407,  2.5012,  2.7192,  2.9258,
+     0.0474,  0.1251,  0.1939,  0.3841,  0.6501,  0.9231,  1.1153,  1.3240,
+     1.5478,  1.7599,  1.9651,  2.1510,  2.3645,  2.5552,  2.7542,  2.9393,
+     0.2196,  0.4656,  0.7492,  0.9922,  1.1678,  1.2489,  1.3112,  1.3657,
+     1.4223,  1.5302,  1.7212,  1.9996,  2.2523,  2.4844,  2.7036,  2.9145,
+     0.1128,  0.2368,  0.3704,  0.5476,  0.7723,  0.9968,  1.1930,  1.3992,
+     1.6013,  1.7957,  1.9888,  2.1857,  2.3825,  2.5705,  2.7616,  2.9434,
+     0.1341,  0.2768,  0.4510,  0.6359,  0.8332,  1.0335,  1.2004,  1.3952,
+     1.5762,  1.7681,  1.9815,  2.1735,  2.3657,  2.5552,  2.7514,  2.9498,
+     0.1247,  0.2559,  0.3516,  0.4726,  0.6861,  0.9483,  1.1852,  1.3858,
+     1.5851,  1.7815,  1.9778,  2.1737,  2.3729,  2.5664,  2.7620,  2.9429,
+     0.1988,  0.3320,  0.4777,  0.6737,  0.8425,  1.0265,  1.1694,  1.3655,
+     1.5463,  1.7135,  1.9385,  2.1650,  2.3529,  2.5367,  2.7545,  2.9585,
+     0.1376,  0.2620,  0.4273,  0.6169,  0.7755,  0.9441,  1.1169,  1.3157,
+     1.5179,  1.7020,  1.8931,  2.1059,  2.3112,  2.5136,  2.7169,  2.9198,
+     0.2112,  0.4385,  0.6091,  0.7618,  0.9553,  1.1543,  1.3445,  1.5396,
+     1.7153,  1.9192,  2.1263,  2.3593,  2.5958,  2.8171,  2.9394,  3.0409,
+     0.1347,  0.2099,  0.2646,  0.3453,  0.5266,  0.7869,  1.0513,  1.2795,
+     1.4880,  1.7181,  1.9294,  2.1332,  2.3362,  2.5442,  2.7433,  2.9362,
+     0.3141,  0.5935,  0.7517,  0.8313,  0.8568,  0.9570,  1.0250,  1.1275,
+     1.3422,  1.6303,  1.8577,  2.0705,  2.2957,  2.5095,  2.7244,  2.9262,
+     0.0962,  0.2116,  0.3961,  0.5641,  0.7122,  0.8883,  1.1023,  1.3481,
+     1.5623,  1.7554,  1.9618,  2.1675,  2.3706,  2.5556,  2.7430,  2.9337,
+     0.0898,  0.1510,  0.3060,  0.5820,  0.8221,  1.0388,  1.2261,  1.4289,
+     1.6054,  1.8103,  1.9941,  2.1844,  2.3742,  2.5711,  2.7632,  2.9474,
+     0.1326,  0.2316,  0.3761,  0.5177,  0.6782,  0.8761,  1.0952,  1.3175,
+     1.5078,  1.7034,  1.9051,  2.1245,  2.3424,  2.5484,  2.7444,  2.9389,
+     0.1740,  0.3293,  0.5174,  0.6824,  0.8394,  1.0372,  1.2046,  1.3723,
+     1.5656,  1.7444,  1.9442,  2.1386,  2.3139,  2.4960,  2.7071,  2.9297,
+     0.2304,  0.3775,  0.4865,  0.6182,  0.7842,  0.9208,  1.1151,  1.2843,
+     1.4641,  1.6988,  1.9209,  2.1260,  2.3099,  2.5229,  2.7414,  2.9276,
+     0.0094,  0.0261, -0.0037,  0.0041, -0.0092, -0.0044, -0.0232, -0.0073,
+    -0.0047, -0.0021,  0.0250, -0.0580, -0.0140, -0.0342, -0.0586,  0.0020,
+     0.0449,  0.0155, -0.0523, -0.0279,  0.0299, -0.0183, -0.0736, -0.0639,
+    -0.0017,  0.0336,  0.0209,  0.0046,  0.0077, -0.0148, -0.0114, -0.0120,
+     0.0115, -0.0050,  0.0445,  0.0048,  0.0188, -0.0137, -0.0080,  0.0239,
+    -0.0184, -0.0524, -0.0195, -0.0126,  0.0284,  0.0632,  0.0141, -0.0093,
+    -0.0096,  0.0196,  0.0230,  0.0379,  0.0308,  0.0237, -0.0224, -0.0600,
+    -0.0755, -0.1074, -0.0988, -0.0606, -0.1038, -0.1552, -0.1480, -0.0672,
+     0.0504,  0.0676,  0.0336, -0.0042,  0.0729,  0.1013,  0.0868,  0.0846,
+     0.0954,  0.0515, -0.0066, -0.0851, -0.0485,  0.0294,  0.0395,  0.0087,
+     0.0078,  0.0446,  0.0881,  0.0672, -0.0384, -0.0025,  0.0415,  0.0353,
+     0.0080,  0.0052,  0.0190,  0.0182,  0.0069,  0.0168,  0.0374,  0.0037,
+    -0.0292, -0.0429,  0.0302,  0.0681, -0.0233, -0.0238, -0.0003, -0.0043,
+     0.0054, -0.0029, -0.0149,  0.0642,  0.0622,  0.0341, -0.0232, -0.0461,
+    -0.0082, -0.0469, -0.0618, -0.0326, -0.0452, -0.0649, -0.0597, -0.0398,
+    -0.0318, -0.0116,  0.0011,  0.0009, -0.0384, -0.0384, -0.0156, -0.0260,
+    -0.0007,  0.0473,  0.0111, -0.0358, -0.0484, -0.0204, -0.0029, -0.0090,
+    -0.0285, -0.0495, -0.0376,  0.0917,  0.1192,  0.1026,  0.0745,  0.0397,
+     0.0463,  0.0253,  0.0025,  0.0465,  0.0100,  0.0488,  0.0416,  0.0223,
+     0.0263,  0.0072, -0.0053,  0.0595,  0.0060, -0.0518, -0.0316, -0.0043,
+    -0.0133, -0.0233, -0.0075, -0.0251,  0.0277, -0.0067, -0.0136, -0.0004,
+     0.0235,  0.0112, -0.0182, -0.0324, -0.0210, -0.0035, -0.0395, -0.0384,
+     0.0005, -0.0150, -0.0356,  0.0127, -0.0033, -0.0034,  0.0205,  0.0747,
+     0.1138,  0.1015,  0.0995, -0.0161, -0.0045,  0.0129,  0.0472,  0.0575,
+     0.0222,  0.0091,  0.0037, -0.0471,  0.0371,  0.0132,  0.0208,  0.0247,
+     0.0117,  0.0164,  0.0225,  0.0124, -0.0023,  0.0088, -0.0046,  0.0047,
+    -0.0393,  0.0018,  0.0148,  0.0020,  0.0044,  0.0165,  0.0229, -0.0208,
+    -0.0477, -0.0310, -0.0164, -0.0390, -0.0764, -0.0525, -0.0094,  0.0075,
+    -0.0102, -0.0045, -0.0504, -0.0709,  0.0822,  0.0710,  0.0426,  0.0014,
+    -0.0371, -0.0400, -0.0157, -0.0155, -0.0173, -0.0138, -0.0015,  0.0134,
+    -0.0418, -0.0682, -0.0256,  0.0050,  0.0360,  0.0354,  0.0074, -0.0396,
+    -0.0235,  0.0284,  0.0494,  0.0153,  0.0448,  0.0025, -0.0061,  0.0252,
+     0.1000,  0.2260,  0.2158,  0.2116,  0.2198,  0.2055,  0.2110,  0.1873,
+     0.1907,  0.2071,  0.2164,  0.2009,  0.2059,  0.2124,  0.2141,  0.2093,
+     0.0875,  0.0981,  0.1177,  0.1071,  0.1033,  0.1248,  0.1048,  0.1238,
+     0.1166,  0.1008,  0.1062,  0.0992,  0.0994,  0.1067,  0.0999,  0.1187,
+     0.0750,  0.0794,  0.0828,  0.0854,  0.0859,  0.0801,  0.0891,  0.0933,
+     0.0969,  0.0920,  0.0915,  0.0862,  0.0868,  0.0891,  0.0842,  0.0824,
+     0.0625,  0.0930,  0.0815,  0.0853,  0.0898,  0.0828,  0.0822,  0.0910,
+     0.0873,  0.0906,  0.0856,  0.0840,  0.0774,  0.0785,  0.0684,  0.0711,
+     0.3319,  0.4219,  0.4588,  0.4090,  0.4092,  0.4014,  0.3548,  0.3353,
+     0.3708,  0.3352,  0.3720,  0.3538,  0.4084,  0.4289,  0.4060,  0.4210,
+     0.0588,  0.0209, -0.0082, -0.0115, -0.0343, -0.0621, -0.0541, -0.0346,
+    -0.0346, -0.0366, -0.0220, -0.0265, -0.0102,  0.0374,  0.0306,  0.0404,
+     0.0306,  0.0090, -0.0054,  0.0333,  0.0047,  0.0238,  0.0141,  0.0165,
+     0.0306,  0.0420,  0.0159,  0.0124,  0.0414,  0.0158, -0.0237,  0.0141,
+     0.0765,  0.0057, -0.0260, -0.0426, -0.0395, -0.0126, -0.0579, -0.0417,
+    -0.0429, -0.0615, -0.0893, -0.0618, -0.0384, -0.0134, -0.0232, -0.0238,
+};
+
+static const float lsp22[] = {
+     0.0664,  0.1875,  0.4300,  0.6730,  0.8793,  1.0640,  1.2563,  1.4433,
+     1.6394,  1.8176,  2.0029,  2.1921,  2.3796,  2.5671,  2.7595,  2.9536,
+     0.2128,  0.4052,  0.5311,  0.6404,  0.7875,  0.8775,  1.0974,  1.3261,
+     1.5563,  1.6790,  1.8339,  2.1195,  2.3226,  2.4609,  2.6440,  2.8947,
+     0.2024,  0.3362,  0.4834,  0.6784,  0.9088,  1.0850,  1.2188,  1.4054,
+     1.6102,  1.7767,  1.9679,  2.1436,  2.3445,  2.5467,  2.7429,  2.9320,
+     0.1181,  0.2279,  0.4413,  0.6114,  0.7710,  0.9427,  1.1142,  1.2707,
+     1.4892,  1.7416,  1.9526,  2.1466,  2.3629,  2.5445,  2.7293,  2.9205,
+     0.1155,  0.2720,  0.4886,  0.6812,  0.8594,  1.0422,  1.2315,  1.4116,
+     1.6137,  1.8020,  1.9758,  2.1743,  2.3602,  2.5568,  2.7472,  2.9374,
+     0.1110,  0.3312,  0.4735,  0.5612,  0.7129,  0.8146,  1.0233,  1.3155,
+     1.5765,  1.7746,  1.9574,  2.1416,  2.3220,  2.5384,  2.7334,  2.9318,
+     0.1656,  0.3350,  0.4215,  0.5609,  0.6759,  0.8503,  1.1405,  1.4094,
+     1.6057,  1.6860,  1.7639,  2.0031,  2.2680,  2.5076,  2.7263,  2.9368,
+     0.1466,  0.3638,  0.4587,  0.5674,  0.7381,  0.8669,  0.9619,  1.1658,
+     1.4667,  1.7440,  1.9335,  2.1018,  2.3022,  2.5281,  2.7359,  2.9261,
+     0.1061,  0.2566,  0.4739,  0.6751,  0.8711,  1.0704,  1.2720,  1.4655,
+     1.6605,  1.8494,  2.0290,  2.2197,  2.4008,  2.5912,  2.7772,  2.9513,
+     0.1116,  0.2364,  0.3971,  0.6316,  0.8583,  1.0335,  1.1686,  1.3302,
+     1.5612,  1.7877,  1.9829,  2.2052,  2.3596,  2.5460,  2.7341,  2.9290,
+     0.2661,  0.4186,  0.5126,  0.6477,  0.8818,  1.1045,  1.2852,  1.4128,
+     1.5851,  1.7593,  1.9399,  2.1757,  2.3684,  2.5136,  2.6927,  2.9064,
+     0.1495,  0.2749,  0.4391,  0.6304,  0.8239,  1.0181,  1.1995,  1.3759,
+     1.5669,  1.7722,  1.9671,  2.1635,  2.3586,  2.5528,  2.7445,  2.9311,
+     0.0912,  0.1759,  0.3066,  0.5660,  0.8005,  0.9568,  1.1832,  1.4504,
+     1.6259,  1.7948,  2.0113,  2.2002,  2.3654,  2.5583,  2.7929,  2.9735,
+     0.1353,  0.2747,  0.4078,  0.5977,  0.7658,  0.9124,  1.1081,  1.3630,
+     1.5875,  1.7847,  1.9323,  2.1181,  2.3321,  2.5046,  2.7183,  2.9225,
+     0.1938,  0.4063,  0.4982,  0.6002,  0.7702,  0.9071,  1.1631,  1.3885,
+     1.6043,  1.8118,  1.9306,  2.0893,  2.2724,  2.4609,  2.6283,  2.8802,
+     0.1857,  0.3351,  0.4381,  0.6101,  0.7561,  0.8555,  1.0384,  1.3171,
+     1.5667,  1.6904,  1.7552,  1.9689,  2.2597,  2.5260,  2.7272,  2.9337,
+     0.1037,  0.2159,  0.4188,  0.6174,  0.8035,  1.0285,  1.2256,  1.4230,
+     1.6400,  1.8322,  2.0144,  2.1988,  2.3810,  2.5682,  2.7613,  2.9438,
+     0.1625,  0.2776,  0.4225,  0.6001,  0.7879,  0.9087,  1.0801,  1.2759,
+     1.4899,  1.7448,  1.9911,  2.1770,  2.3723,  2.5777,  2.7971,  2.9444,
+     0.2111,  0.3640,  0.5839,  0.7290,  0.8051,  1.0023,  1.2315,  1.4143,
+     1.5878,  1.7755,  1.9804,  2.1498,  2.3312,  2.5350,  2.7613,  2.9472,
+     0.1423,  0.2646,  0.4136,  0.6350,  0.8070,  0.9514,  1.1168,  1.3213,
+     1.5776,  1.7721,  1.9404,  2.1545,  2.3385,  2.5137,  2.7396,  2.9553,
+     0.1132,  0.2386,  0.4103,  0.5931,  0.7808,  0.9881,  1.1840,  1.3860,
+     1.6021,  1.7990,  1.9922,  2.1885,  2.3852,  2.5717,  2.7640,  2.9510,
+     0.1267,  0.2602,  0.3913,  0.5944,  0.7598,  0.9198,  1.0781,  1.2715,
+     1.5299,  1.7573,  1.9308,  2.1346,  2.3267,  2.5419,  2.7466,  2.9320,
+     0.2023,  0.3417,  0.4392,  0.6141,  0.7439,  0.8593,  1.1096,  1.3543,
+     1.5185,  1.6553,  1.7862,  2.0341,  2.2718,  2.4834,  2.7103,  2.9466,
+     0.1113,  0.2470,  0.3677,  0.5686,  0.7700,  0.9356,  1.0806,  1.2452,
+     1.4830,  1.7344,  1.9268,  2.1404,  2.3371,  2.5169,  2.7329,  2.9012,
+     0.1664,  0.3554,  0.5573,  0.7471,  0.9245,  1.0998,  1.2787,  1.4655,
+     1.6654,  1.8346,  2.0179,  2.2159,  2.4096,  2.5946,  2.7790,  2.9530,
+     0.1313,  0.2625,  0.4731,  0.6444,  0.8110,  0.9878,  1.1493,  1.3212,
+     1.5719,  1.8138,  1.9861,  2.1943,  2.3714,  2.5578,  2.7346,  2.9296,
+     0.1186,  0.3035,  0.5049,  0.6860,  0.8670,  0.9975,  1.1364,  1.3471,
+     1.5695,  1.7412,  1.9346,  2.1506,  2.3413,  2.5531,  2.7794,  2.9627,
+     0.1108,  0.2697,  0.4787,  0.6344,  0.7909,  0.9586,  1.1440,  1.3511,
+     1.5686,  1.7601,  1.9246,  2.1241,  2.3293,  2.5390,  2.7315,  2.9333,
+     0.0985,  0.2302,  0.3544,  0.5759,  0.7620,  0.9651,  1.1497,  1.3080,
+     1.5500,  1.7845,  1.9518,  2.1734,  2.3565,  2.5665,  2.7605,  2.9102,
+     0.1208,  0.2727,  0.4381,  0.5736,  0.7382,  0.8390,  1.0102,  1.2648,
+     1.5100,  1.7440,  1.9619,  2.1430,  2.3307,  2.5159,  2.7264,  2.9211,
+     0.1582,  0.2777,  0.4475,  0.6551,  0.8591,  1.0084,  1.1414,  1.3291,
+     1.5902,  1.7826,  1.9543,  2.1659,  2.3233,  2.5044,  2.6935,  2.9199,
+     0.1360,  0.2873,  0.4585,  0.6295,  0.7592,  0.9089,  1.0492,  1.2733,
+     1.5391,  1.7768,  1.9372,  2.1329,  2.3168,  2.5015,  2.6857,  2.8837,
+     0.0886,  0.1829,  0.3696,  0.6126,  0.8334,  1.0135,  1.2303,  1.4674,
+     1.6743,  1.8564,  2.0530,  2.2370,  2.3960,  2.5787,  2.7756,  2.9377,
+     0.2005,  0.3537,  0.4700,  0.6249,  0.7385,  0.9097,  1.1759,  1.3811,
+     1.5314,  1.6705,  1.8546,  2.1229,  2.3292,  2.5251,  2.7951,  2.9646,
+     0.1999,  0.3112,  0.4722,  0.7146,  0.8908,  1.0028,  1.1831,  1.3903,
+     1.6125,  1.7514,  1.9083,  2.1248,  2.3271,  2.5339,  2.6945,  2.8918,
+     0.1243,  0.2606,  0.4382,  0.5850,  0.7705,  0.9727,  1.1214,  1.3059,
+     1.5218,  1.7406,  1.9137,  2.1353,  2.3354,  2.5299,  2.7287,  2.9068,
+     0.1039,  0.2426,  0.4265,  0.6284,  0.8152,  0.9941,  1.2004,  1.4038,
+     1.5912,  1.7763,  1.9650,  2.1598,  2.3474,  2.5488,  2.7419,  2.9322,
+     0.1364,  0.2420,  0.3886,  0.5864,  0.7663,  0.8844,  1.0860,  1.3242,
+     1.5518,  1.7893,  2.0004,  2.1562,  2.3619,  2.5516,  2.7687,  2.9181,
+     0.1483,  0.2851,  0.4479,  0.6312,  0.7924,  0.9821,  1.1705,  1.3386,
+     1.5375,  1.7226,  1.9053,  2.0991,  2.2898,  2.4953,  2.7000,  2.9146,
+     0.2332,  0.4561,  0.5407,  0.6212,  0.7524,  0.8215,  0.9522,  1.1685,
+     1.5216,  1.7132,  1.8291,  2.0647,  2.2811,  2.4857,  2.7071,  2.9281,
+     0.1348,  0.3126,  0.5179,  0.7192,  0.9227,  1.1363,  1.3223,  1.4756,
+     1.6509,  1.8191,  1.9991,  2.1976,  2.3877,  2.5768,  2.7590,  2.9386,
+     0.1093,  0.2211,  0.4763,  0.6703,  0.8282,  0.9536,  1.1202,  1.3796,
+     1.6043,  1.8031,  1.9832,  2.1604,  2.3578,  2.5856,  2.7650,  2.9291,
+     0.1865,  0.3027,  0.4580,  0.6719,  0.8400,  1.0082,  1.1901,  1.3782,
+     1.5448,  1.6885,  1.9477,  2.1381,  2.2797,  2.5113,  2.7465,  2.9414,
+     0.1575,  0.3124,  0.4649,  0.6262,  0.8095,  0.9858,  1.1676,  1.3602,
+     1.5646,  1.7582,  1.9550,  2.1671,  2.3628,  2.5734,  2.7670,  2.9519,
+     0.1174,  0.2777,  0.4663,  0.6333,  0.8169,  1.0096,  1.1885,  1.3847,
+     1.5803,  1.7571,  1.9380,  2.1398,  2.3414,  2.5407,  2.7360,  2.9375,
+     0.1073,  0.2264,  0.4083,  0.5973,  0.7474,  0.9514,  1.1349,  1.3337,
+     1.5433,  1.7348,  1.9380,  2.1436,  2.3441,  2.5438,  2.7457,  2.9383,
+     0.1472,  0.2880,  0.4793,  0.6268,  0.8015,  1.0063,  1.1715,  1.3644,
+     1.5525,  1.7410,  1.9258,  2.1227,  2.3214,  2.5149,  2.7148,  2.9196,
+     0.1414,  0.2565,  0.4349,  0.6111,  0.7695,  0.9496,  1.1212,  1.3265,
+     1.5218,  1.7209,  1.9015,  2.0887,  2.3158,  2.5077,  2.7233,  2.9421,
+     0.1252,  0.2667,  0.4454,  0.6431,  0.8371,  1.0124,  1.2110,  1.4160,
+     1.6240,  1.8242,  2.0047,  2.1974,  2.3902,  2.5778,  2.7637,  2.9481,
+     0.1321,  0.2565,  0.3846,  0.5847,  0.7578,  0.9259,  1.0637,  1.2239,
+     1.4690,  1.7346,  1.9750,  2.1882,  2.3712,  2.5509,  2.7280,  2.8885,
+     0.1437,  0.2930,  0.4428,  0.6156,  0.8045,  0.9638,  1.1450,  1.3138,
+     1.5144,  1.7355,  1.9469,  2.1534,  2.3414,  2.5452,  2.7353,  2.9334,
+     0.1692,  0.2770,  0.3831,  0.6100,  0.7825,  0.9302,  1.0690,  1.2481,
+     1.4615,  1.6799,  1.9165,  2.1739,  2.3435,  2.5349,  2.7520,  2.9163,
+     0.1235,  0.2489,  0.4354,  0.6343,  0.8236,  1.0066,  1.1908,  1.3474,
+     1.5656,  1.8275,  2.0620,  2.2548,  2.4135,  2.5913,  2.7639,  2.9334,
+     0.1090,  0.1961,  0.3854,  0.5701,  0.7024,  0.8843,  1.1393,  1.3785,
+     1.5940,  1.7797,  1.9442,  2.1740,  2.3853,  2.5773,  2.7727,  2.9406,
+     0.1560,  0.3477,  0.5011,  0.6287,  0.7612,  0.9896,  1.1510,  1.3420,
+     1.5435,  1.6816,  1.8731,  2.0651,  2.2613,  2.4999,  2.7027,  2.8971,
+     0.1459,  0.2416,  0.3833,  0.5450,  0.7916,  0.9223,  1.0662,  1.1953,
+     1.4029,  1.6616,  1.9320,  2.1459,  2.3386,  2.5081,  2.6799,  2.9195,
+     0.1546,  0.3854,  0.6184,  0.8460,  1.0599,  1.2428,  1.3906,  1.5550,
+     1.7388,  1.8945,  2.0757,  2.2386,  2.4014,  2.5705,  2.7574,  2.9400,
+     0.1080,  0.2307,  0.4112,  0.6067,  0.7725,  0.9467,  1.1285,  1.3205,
+     1.5348,  1.7609,  1.9937,  2.1878,  2.3583,  2.5515,  2.7199,  2.9049,
+     0.1482,  0.3178,  0.4983,  0.6342,  0.7783,  0.9880,  1.2019,  1.3404,
+     1.5223,  1.7296,  1.9211,  2.0943,  2.2928,  2.5008,  2.7136,  2.9224,
+     0.1145,  0.2910,  0.4891,  0.6492,  0.8126,  0.9530,  1.1180,  1.3155,
+     1.5054,  1.6893,  1.8899,  2.1188,  2.3389,  2.5512,  2.7313,  2.9224,
+     0.0939,  0.1689,  0.3250,  0.5792,  0.7698,  0.9245,  1.1574,  1.3865,
+     1.5959,  1.7977,  1.9821,  2.1528,  2.3326,  2.5540,  2.7553,  2.9179,
+     0.1243,  0.2474,  0.3923,  0.6199,  0.7908,  0.9379,  1.1497,  1.3734,
+     1.5582,  1.7420,  1.9539,  2.1385,  2.3240,  2.5277,  2.7311,  2.9178,
+     0.1961,  0.3748,  0.5176,  0.6387,  0.8169,  1.0477,  1.2124,  1.3869,
+     1.5604,  1.7225,  1.8770,  2.0837,  2.2960,  2.5103,  2.6945,  2.8862,
+     0.1295,  0.2403,  0.4149,  0.6189,  0.7913,  0.9130,  1.0832,  1.2787,
+     1.4860,  1.7112,  1.9502,  2.1348,  2.2776,  2.4982,  2.7431,  2.9522,
+     0.0160,  0.0362,  0.0097,  0.0057, -0.0014, -0.0073, -0.0046, -0.0064,
+    -0.0121,  0.0019,  0.0149, -0.0440, -0.0479, -0.0382, -0.0480, -0.0182,
+     0.0170,  0.0114, -0.0298, -0.0175, -0.0033, -0.0354, -0.0510, -0.0025,
+     0.0307,  0.0351,  0.0338,  0.0420,  0.0138, -0.0175, -0.0102,  0.0053,
+     0.0084, -0.0003,  0.0412, -0.0027,  0.0145, -0.0039,  0.0083,  0.0400,
+     0.0001, -0.0262,  0.0055, -0.0082,  0.0348,  0.0433,  0.0137, -0.0024,
+    -0.0055,  0.0262,  0.0521,  0.0349,  0.0185,  0.0076, -0.0319, -0.0561,
+    -0.0460, -0.0253, -0.0097,  0.0163,  0.0184, -0.0037, -0.0480, -0.0371,
+     0.0628,  0.0665,  0.0296, -0.0057,  0.0253,  0.0227,  0.0350,  0.0692,
+     0.0545,  0.0218,  0.0094, -0.0449, -0.0372,  0.0005,  0.0258,  0.0118,
+     0.0285,  0.0760,  0.0822,  0.0527, -0.0299, -0.0049,  0.0170,  0.0195,
+     0.0136,  0.0286,  0.0289,  0.0139,  0.0054,  0.0152,  0.0244,  0.0028,
+    -0.0056, -0.0260,  0.0307,  0.0572, -0.0087,  0.0088,  0.0062,  0.0000,
+     0.0125,  0.0000, -0.0292,  0.0820,  0.0872,  0.0646,  0.0346,  0.0076,
+    -0.0022, -0.0253, -0.0567, -0.0188, -0.0336, -0.0673, -0.0549, -0.0166,
+    -0.0259, -0.0140,  0.0040, -0.0029, -0.0430, -0.0531, -0.0253, -0.0019,
+    -0.0071,  0.0393,  0.0072, -0.0327, -0.0236, -0.0235, -0.0177, -0.0186,
+    -0.0280, -0.0201, -0.0077,  0.0383,  0.0418,  0.0321,  0.0294,  0.0169,
+     0.0468,  0.0301,  0.0133,  0.0363,  0.0516,  0.0937,  0.1240,  0.1404,
+     0.1325,  0.1178,  0.0999,  0.0251, -0.0037, -0.0495, -0.0703, -0.0219,
+    -0.0261, -0.0304, -0.0204, -0.0372,  0.0355,  0.0131, -0.0093, -0.0099,
+    -0.0069, -0.0034, -0.0065, -0.0208, -0.0231, -0.0117, -0.0211, -0.0243,
+     0.0046, -0.0107, -0.0070,  0.0123,  0.0230,  0.0152,  0.0164,  0.0412,
+     0.0619,  0.0858,  0.0862, -0.0056,  0.0125,  0.0182,  0.0347,  0.0388,
+     0.0456,  0.0407, -0.0249, -0.0460,  0.0206,  0.0299,  0.0253,  0.0207,
+     0.0177,  0.0238,  0.0253,  0.0030,  0.0042,  0.0020, -0.0081, -0.0136,
+    -0.0290, -0.0042,  0.0122,  0.0051,  0.0107,  0.0228,  0.0211, -0.0068,
+    -0.0436, -0.0299, -0.0078, -0.0779, -0.1157, -0.0679,  0.0172,  0.0150,
+    -0.0051,  0.0081, -0.0512, -0.0616,  0.0576,  0.0799,  0.0803,  0.0336,
+     0.0001, -0.0298, -0.0747, -0.0115, -0.0101, -0.0170, -0.0050,  0.0174,
+    -0.0290, -0.0601, -0.0150,  0.0121,  0.0165,  0.0230,  0.0028, -0.0317,
+    -0.0165,  0.0356,  0.0451,  0.0120,  0.0321,  0.0084, -0.0058,  0.0122,
+     0.1935,  0.1802,  0.2195,  0.2410,  0.2201,  0.1915,  0.1840,  0.1935,
+     0.2213,  0.2079,  0.1858,  0.1974,  0.2239,  0.2173,  0.1840,  0.2120,
+     0.4912,  0.4777,  0.4607,  0.4395,  0.4426,  0.4388,  0.4416,  0.4345,
+     0.4239,  0.4331,  0.4522,  0.4423,  0.4475,  0.4387,  0.4525,  0.4446,
+};
+
+static const float lsp22s[] = {
+     0.0664,  0.1875,  0.4300,  0.6730,  0.8793,  1.0640,  1.2563,  1.4433,
+     1.6394,  1.8176,  2.0029,  2.1921,  2.3796,  2.5671,  2.7595,  2.9536,
+     0.2128,  0.4052,  0.5311,  0.6404,  0.7875,  0.8775,  1.0974,  1.3261,
+     1.5563,  1.6790,  1.8339,  2.1195,  2.3226,  2.4609,  2.6440,  2.8947,
+     0.2024,  0.3362,  0.4834,  0.6784,  0.9088,  1.0850,  1.2188,  1.4054,
+     1.6102,  1.7767,  1.9679,  2.1436,  2.3445,  2.5467,  2.7429,  2.9320,
+     0.1181,  0.2279,  0.4413,  0.6114,  0.7710,  0.9427,  1.1142,  1.2707,
+     1.4892,  1.7416,  1.9526,  2.1466,  2.3629,  2.5445,  2.7293,  2.9205,
+     0.1155,  0.2720,  0.4886,  0.6812,  0.8594,  1.0422,  1.2315,  1.4116,
+     1.6137,  1.8020,  1.9758,  2.1743,  2.3602,  2.5568,  2.7472,  2.9374,
+     0.1110,  0.3312,  0.4735,  0.5612,  0.7129,  0.8146,  1.0233,  1.3155,
+     1.5765,  1.7746,  1.9574,  2.1416,  2.3220,  2.5384,  2.7334,  2.9318,
+     0.1656,  0.3350,  0.4215,  0.5609,  0.6759,  0.8503,  1.1405,  1.4094,
+     1.6057,  1.6860,  1.7639,  2.0031,  2.2680,  2.5076,  2.7263,  2.9368,
+     0.1466,  0.3638,  0.4587,  0.5674,  0.7381,  0.8669,  0.9619,  1.1658,
+     1.4667,  1.7440,  1.9335,  2.1018,  2.3022,  2.5281,  2.7359,  2.9261,
+     0.1061,  0.2566,  0.4739,  0.6751,  0.8711,  1.0704,  1.2720,  1.4655,
+     1.6605,  1.8494,  2.0290,  2.2197,  2.4008,  2.5912,  2.7772,  2.9513,
+     0.1116,  0.2364,  0.3971,  0.6316,  0.8583,  1.0335,  1.1686,  1.3302,
+     1.5612,  1.7877,  1.9829,  2.2052,  2.3596,  2.5460,  2.7341,  2.9290,
+     0.2661,  0.4186,  0.5126,  0.6477,  0.8818,  1.1045,  1.2852,  1.4128,
+     1.5851,  1.7593,  1.9399,  2.1757,  2.3684,  2.5136,  2.6927,  2.9064,
+     0.1495,  0.2749,  0.4391,  0.6304,  0.8239,  1.0181,  1.1995,  1.3759,
+     1.5669,  1.7722,  1.9671,  2.1635,  2.3586,  2.5528,  2.7445,  2.9311,
+     0.0912,  0.1759,  0.3066,  0.5660,  0.8005,  0.9568,  1.1832,  1.4504,
+     1.6259,  1.7948,  2.0113,  2.2002,  2.3654,  2.5583,  2.7929,  2.9735,
+     0.1353,  0.2747,  0.4078,  0.5977,  0.7658,  0.9124,  1.1081,  1.3630,
+     1.5875,  1.7847,  1.9323,  2.1181,  2.3321,  2.5046,  2.7183,  2.9225,
+     0.1938,  0.4063,  0.4982,  0.6002,  0.7702,  0.9071,  1.1631,  1.3885,
+     1.6043,  1.8118,  1.9306,  2.0893,  2.2724,  2.4609,  2.6283,  2.8802,
+     0.1857,  0.3351,  0.4381,  0.6101,  0.7561,  0.8555,  1.0384,  1.3171,
+     1.5667,  1.6904,  1.7552,  1.9689,  2.2597,  2.5260,  2.7272,  2.9337,
+     0.1037,  0.2159,  0.4188,  0.6174,  0.8035,  1.0285,  1.2256,  1.4230,
+     1.6400,  1.8322,  2.0144,  2.1988,  2.3810,  2.5682,  2.7613,  2.9438,
+     0.1625,  0.2776,  0.4225,  0.6001,  0.7879,  0.9087,  1.0801,  1.2759,
+     1.4899,  1.7448,  1.9911,  2.1770,  2.3723,  2.5777,  2.7971,  2.9444,
+     0.2111,  0.3640,  0.5839,  0.7290,  0.8051,  1.0023,  1.2315,  1.4143,
+     1.5878,  1.7755,  1.9804,  2.1498,  2.3312,  2.5350,  2.7613,  2.9472,
+     0.1423,  0.2646,  0.4136,  0.6350,  0.8070,  0.9514,  1.1168,  1.3213,
+     1.5776,  1.7721,  1.9404,  2.1545,  2.3385,  2.5137,  2.7396,  2.9553,
+     0.1132,  0.2386,  0.4103,  0.5931,  0.7808,  0.9881,  1.1840,  1.3860,
+     1.6021,  1.7990,  1.9922,  2.1885,  2.3852,  2.5717,  2.7640,  2.9510,
+     0.1267,  0.2602,  0.3913,  0.5944,  0.7598,  0.9198,  1.0781,  1.2715,
+     1.5299,  1.7573,  1.9308,  2.1346,  2.3267,  2.5419,  2.7466,  2.9320,
+     0.2023,  0.3417,  0.4392,  0.6141,  0.7439,  0.8593,  1.1096,  1.3543,
+     1.5185,  1.6553,  1.7862,  2.0341,  2.2718,  2.4834,  2.7103,  2.9466,
+     0.1113,  0.2470,  0.3677,  0.5686,  0.7700,  0.9356,  1.0806,  1.2452,
+     1.4830,  1.7344,  1.9268,  2.1404,  2.3371,  2.5169,  2.7329,  2.9012,
+     0.1664,  0.3554,  0.5573,  0.7471,  0.9245,  1.0998,  1.2787,  1.4655,
+     1.6654,  1.8346,  2.0179,  2.2159,  2.4096,  2.5946,  2.7790,  2.9530,
+     0.1313,  0.2625,  0.4731,  0.6444,  0.8110,  0.9878,  1.1493,  1.3212,
+     1.5719,  1.8138,  1.9861,  2.1943,  2.3714,  2.5578,  2.7346,  2.9296,
+     0.1186,  0.3035,  0.5049,  0.6860,  0.8670,  0.9975,  1.1364,  1.3471,
+     1.5695,  1.7412,  1.9346,  2.1506,  2.3413,  2.5531,  2.7794,  2.9627,
+     0.1108,  0.2697,  0.4787,  0.6344,  0.7909,  0.9586,  1.1440,  1.3511,
+     1.5686,  1.7601,  1.9246,  2.1241,  2.3293,  2.5390,  2.7315,  2.9333,
+     0.0985,  0.2302,  0.3544,  0.5759,  0.7620,  0.9651,  1.1497,  1.3080,
+     1.5500,  1.7845,  1.9518,  2.1734,  2.3565,  2.5665,  2.7605,  2.9102,
+     0.1208,  0.2727,  0.4381,  0.5736,  0.7382,  0.8390,  1.0102,  1.2648,
+     1.5100,  1.7440,  1.9619,  2.1430,  2.3307,  2.5159,  2.7264,  2.9211,
+     0.1582,  0.2777,  0.4475,  0.6551,  0.8591,  1.0084,  1.1414,  1.3291,
+     1.5902,  1.7826,  1.9543,  2.1659,  2.3233,  2.5044,  2.6935,  2.9199,
+     0.1360,  0.2873,  0.4585,  0.6295,  0.7592,  0.9089,  1.0492,  1.2733,
+     1.5391,  1.7768,  1.9372,  2.1329,  2.3168,  2.5015,  2.6857,  2.8837,
+     0.0886,  0.1829,  0.3696,  0.6126,  0.8334,  1.0135,  1.2303,  1.4674,
+     1.6743,  1.8564,  2.0530,  2.2370,  2.3960,  2.5787,  2.7756,  2.9377,
+     0.2005,  0.3537,  0.4700,  0.6249,  0.7385,  0.9097,  1.1759,  1.3811,
+     1.5314,  1.6705,  1.8546,  2.1229,  2.3292,  2.5251,  2.7951,  2.9646,
+     0.1999,  0.3112,  0.4722,  0.7146,  0.8908,  1.0028,  1.1831,  1.3903,
+     1.6125,  1.7514,  1.9083,  2.1248,  2.3271,  2.5339,  2.6945,  2.8918,
+     0.1243,  0.2606,  0.4382,  0.5850,  0.7705,  0.9727,  1.1214,  1.3059,
+     1.5218,  1.7406,  1.9137,  2.1353,  2.3354,  2.5299,  2.7287,  2.9068,
+     0.1039,  0.2426,  0.4265,  0.6284,  0.8152,  0.9941,  1.2004,  1.4038,
+     1.5912,  1.7763,  1.9650,  2.1598,  2.3474,  2.5488,  2.7419,  2.9322,
+     0.1364,  0.2420,  0.3886,  0.5864,  0.7663,  0.8844,  1.0860,  1.3242,
+     1.5518,  1.7893,  2.0004,  2.1562,  2.3619,  2.5516,  2.7687,  2.9181,
+     0.1483,  0.2851,  0.4479,  0.6312,  0.7924,  0.9821,  1.1705,  1.3386,
+     1.5375,  1.7226,  1.9053,  2.0991,  2.2898,  2.4953,  2.7000,  2.9146,
+     0.2332,  0.4561,  0.5407,  0.6212,  0.7524,  0.8215,  0.9522,  1.1685,
+     1.5216,  1.7132,  1.8291,  2.0647,  2.2811,  2.4857,  2.7071,  2.9281,
+     0.1348,  0.3126,  0.5179,  0.7192,  0.9227,  1.1363,  1.3223,  1.4756,
+     1.6509,  1.8191,  1.9991,  2.1976,  2.3877,  2.5768,  2.7590,  2.9386,
+     0.1093,  0.2211,  0.4763,  0.6703,  0.8282,  0.9536,  1.1202,  1.3796,
+     1.6043,  1.8031,  1.9832,  2.1604,  2.3578,  2.5856,  2.7650,  2.9291,
+     0.1865,  0.3027,  0.4580,  0.6719,  0.8400,  1.0082,  1.1901,  1.3782,
+     1.5448,  1.6885,  1.9477,  2.1381,  2.2797,  2.5113,  2.7465,  2.9414,
+     0.1575,  0.3124,  0.4649,  0.6262,  0.8095,  0.9858,  1.1676,  1.3602,
+     1.5646,  1.7582,  1.9550,  2.1671,  2.3628,  2.5734,  2.7670,  2.9519,
+     0.1174,  0.2777,  0.4663,  0.6333,  0.8169,  1.0096,  1.1885,  1.3847,
+     1.5803,  1.7571,  1.9380,  2.1398,  2.3414,  2.5407,  2.7360,  2.9375,
+     0.1073,  0.2264,  0.4083,  0.5973,  0.7474,  0.9514,  1.1349,  1.3337,
+     1.5433,  1.7348,  1.9380,  2.1436,  2.3441,  2.5438,  2.7457,  2.9383,
+     0.1472,  0.2880,  0.4793,  0.6268,  0.8015,  1.0063,  1.1715,  1.3644,
+     1.5525,  1.7410,  1.9258,  2.1227,  2.3214,  2.5149,  2.7148,  2.9196,
+     0.1414,  0.2565,  0.4349,  0.6111,  0.7695,  0.9496,  1.1212,  1.3265,
+     1.5218,  1.7209,  1.9015,  2.0887,  2.3158,  2.5077,  2.7233,  2.9421,
+     0.1252,  0.2667,  0.4454,  0.6431,  0.8371,  1.0124,  1.2110,  1.4160,
+     1.6240,  1.8242,  2.0047,  2.1974,  2.3902,  2.5778,  2.7637,  2.9481,
+     0.1321,  0.2565,  0.3846,  0.5847,  0.7578,  0.9259,  1.0637,  1.2239,
+     1.4690,  1.7346,  1.9750,  2.1882,  2.3712,  2.5509,  2.7280,  2.8885,
+     0.1437,  0.2930,  0.4428,  0.6156,  0.8045,  0.9638,  1.1450,  1.3138,
+     1.5144,  1.7355,  1.9469,  2.1534,  2.3414,  2.5452,  2.7353,  2.9334,
+     0.1692,  0.2770,  0.3831,  0.6100,  0.7825,  0.9302,  1.0690,  1.2481,
+     1.4615,  1.6799,  1.9165,  2.1739,  2.3435,  2.5349,  2.7520,  2.9163,
+     0.1235,  0.2489,  0.4354,  0.6343,  0.8236,  1.0066,  1.1908,  1.3474,
+     1.5656,  1.8275,  2.0620,  2.2548,  2.4135,  2.5913,  2.7639,  2.9334,
+     0.1090,  0.1961,  0.3854,  0.5701,  0.7024,  0.8843,  1.1393,  1.3785,
+     1.5940,  1.7797,  1.9442,  2.1740,  2.3853,  2.5773,  2.7727,  2.9406,
+     0.1560,  0.3477,  0.5011,  0.6287,  0.7612,  0.9896,  1.1510,  1.3420,
+     1.5435,  1.6816,  1.8731,  2.0651,  2.2613,  2.4999,  2.7027,  2.8971,
+     0.1459,  0.2416,  0.3833,  0.5450,  0.7916,  0.9223,  1.0662,  1.1953,
+     1.4029,  1.6616,  1.9320,  2.1459,  2.3386,  2.5081,  2.6799,  2.9195,
+     0.1546,  0.3854,  0.6184,  0.8460,  1.0599,  1.2428,  1.3906,  1.5550,
+     1.7388,  1.8945,  2.0757,  2.2386,  2.4014,  2.5705,  2.7574,  2.9400,
+     0.1080,  0.2307,  0.4112,  0.6067,  0.7725,  0.9467,  1.1285,  1.3205,
+     1.5348,  1.7609,  1.9937,  2.1878,  2.3583,  2.5515,  2.7199,  2.9049,
+     0.1482,  0.3178,  0.4983,  0.6342,  0.7783,  0.9880,  1.2019,  1.3404,
+     1.5223,  1.7296,  1.9211,  2.0943,  2.2928,  2.5008,  2.7136,  2.9224,
+     0.1145,  0.2910,  0.4891,  0.6492,  0.8126,  0.9530,  1.1180,  1.3155,
+     1.5054,  1.6893,  1.8899,  2.1188,  2.3389,  2.5512,  2.7313,  2.9224,
+     0.0939,  0.1689,  0.3250,  0.5792,  0.7698,  0.9245,  1.1574,  1.3865,
+     1.5959,  1.7977,  1.9821,  2.1528,  2.3326,  2.5540,  2.7553,  2.9179,
+     0.1243,  0.2474,  0.3923,  0.6199,  0.7908,  0.9379,  1.1497,  1.3734,
+     1.5582,  1.7420,  1.9539,  2.1385,  2.3240,  2.5277,  2.7311,  2.9178,
+     0.1961,  0.3748,  0.5176,  0.6387,  0.8169,  1.0477,  1.2124,  1.3869,
+     1.5604,  1.7225,  1.8770,  2.0837,  2.2960,  2.5103,  2.6945,  2.8862,
+     0.1295,  0.2403,  0.4149,  0.6189,  0.7913,  0.9130,  1.0832,  1.2787,
+     1.4860,  1.7112,  1.9502,  2.1348,  2.2776,  2.4982,  2.7431,  2.9522,
+     0.0160,  0.0362,  0.0097,  0.0057, -0.0014, -0.0073, -0.0046, -0.0064,
+    -0.0121,  0.0019,  0.0149, -0.0440, -0.0479, -0.0382, -0.0480, -0.0182,
+     0.0170,  0.0114, -0.0298, -0.0175, -0.0033, -0.0354, -0.0510, -0.0025,
+     0.0307,  0.0351,  0.0338,  0.0420,  0.0138, -0.0175, -0.0102,  0.0053,
+     0.0084, -0.0003,  0.0412, -0.0027,  0.0145, -0.0039,  0.0083,  0.0400,
+     0.0001, -0.0262,  0.0055, -0.0082,  0.0348,  0.0433,  0.0137, -0.0024,
+    -0.0055,  0.0262,  0.0521,  0.0349,  0.0185,  0.0076, -0.0319, -0.0561,
+    -0.0460, -0.0253, -0.0097,  0.0163,  0.0184, -0.0037, -0.0480, -0.0371,
+     0.0628,  0.0665,  0.0296, -0.0057,  0.0253,  0.0227,  0.0350,  0.0692,
+     0.0545,  0.0218,  0.0094, -0.0449, -0.0372,  0.0005,  0.0258,  0.0118,
+     0.0285,  0.0760,  0.0822,  0.0527, -0.0299, -0.0049,  0.0170,  0.0195,
+     0.0136,  0.0286,  0.0289,  0.0139,  0.0054,  0.0152,  0.0244,  0.0028,
+    -0.0056, -0.0260,  0.0307,  0.0572, -0.0087,  0.0088,  0.0062,  0.0000,
+     0.0125,  0.0000, -0.0292,  0.0820,  0.0872,  0.0646,  0.0346,  0.0076,
+    -0.0022, -0.0253, -0.0567, -0.0188, -0.0336, -0.0673, -0.0549, -0.0166,
+    -0.0259, -0.0140,  0.0040, -0.0029, -0.0430, -0.0531, -0.0253, -0.0019,
+    -0.0071,  0.0393,  0.0072, -0.0327, -0.0236, -0.0235, -0.0177, -0.0186,
+    -0.0280, -0.0201, -0.0077,  0.0383,  0.0418,  0.0321,  0.0294,  0.0169,
+     0.0468,  0.0301,  0.0133,  0.0363,  0.0516,  0.0937,  0.1240,  0.1404,
+     0.1325,  0.1178,  0.0999,  0.0251, -0.0037, -0.0495, -0.0703, -0.0219,
+    -0.0261, -0.0304, -0.0204, -0.0372,  0.0355,  0.0131, -0.0093, -0.0099,
+    -0.0069, -0.0034, -0.0065, -0.0208, -0.0231, -0.0117, -0.0211, -0.0243,
+     0.0046, -0.0107, -0.0070,  0.0123,  0.0230,  0.0152,  0.0164,  0.0412,
+     0.0619,  0.0858,  0.0862, -0.0056,  0.0125,  0.0182,  0.0347,  0.0388,
+     0.0456,  0.0407, -0.0249, -0.0460,  0.0206,  0.0299,  0.0253,  0.0207,
+     0.0177,  0.0238,  0.0253,  0.0030,  0.0042,  0.0020, -0.0081, -0.0136,
+    -0.0290, -0.0042,  0.0122,  0.0051,  0.0107,  0.0228,  0.0211, -0.0068,
+    -0.0436, -0.0299, -0.0078, -0.0779, -0.1157, -0.0679,  0.0172,  0.0150,
+    -0.0051,  0.0081, -0.0512, -0.0616,  0.0576,  0.0799,  0.0803,  0.0336,
+     0.0001, -0.0298, -0.0747, -0.0115, -0.0101, -0.0170, -0.0050,  0.0174,
+    -0.0290, -0.0601, -0.0150,  0.0121,  0.0165,  0.0230,  0.0028, -0.0317,
+    -0.0165,  0.0356,  0.0451,  0.0120,  0.0321,  0.0084, -0.0058,  0.0122,
+     0.1935,  0.1802,  0.2195,  0.2410,  0.2201,  0.1915,  0.1840,  0.1935,
+     0.2213,  0.2079,  0.1858,  0.1974,  0.2239,  0.2173,  0.1840,  0.2120,
+     0.4912,  0.4777,  0.4607,  0.4395,  0.4426,  0.4388,  0.4416,  0.4345,
+     0.4239,  0.4331,  0.4522,  0.4423,  0.4475,  0.4387,  0.4525,  0.4446,
 };
 
 static const float lsp44s[] = {
@@ -4450,7 +13465,7 @@
      0.4534,  0.4468,  0.4412,  0.4354,  0.4298,  0.4272,  0.4498,  0.4506,
      0.4560,  0.4592,  0.4758,  0.4941,  0.2476,  0.1771,  0.1974,  0.1881,
      0.1667,  0.1826,  0.2067,  0.2031,  0.1734,  0.1534,  0.1415,  0.1761,
-     0.1897,  0.1772,  0.1651,  0.1247,  0.1041,  0.1231,  0.1809,  0.2234
+     0.1897,  0.1772,  0.1651,  0.1247,  0.1041,  0.1231,  0.1809,  0.2234,
 };
 
 static const int16_t shape8[] = {
@@ -4616,6 +13631,495 @@
        991,   3527,   -281,  -6050,  -1251,   1802,      8,  -3916,
 };
 
+static const int16_t shape8s[] = {
+      2639,    550,   6487,   2812,   1014,   1926,   2959,    757,
+     -1452,   -111,    -45,   -409,    401,    545,   1545,  -1677,
+        75,   -607,  -3658,   -368,  -4486,    272,   6017,   -468,
+      1108,   1056,    606,  -3288,   1003,   -830,   -336,  -2940,
+       247,    227,   1700,    338,   -161,   5694,    317,   -584,
+      6278,  -2902,  -3862,    293,  -3400,    540,    177,   -840,
+      -471,    963,   -243,   -289,     77,     39,   7626,    333,
+       577,    327,   -359,    999,   -392,    107,   1410,    509,
+      -983,     36,   -193,    -68,  -7612,   -775,   -178,   1415,
+      1069,   1534,  -1276,   1204,    615,   2065,    499,    124,
+       265,   -454,   1974,   6428,  -4028,   1102,  -1418,    -85,
+      -816,    -64,    -46,    926,   -960,     78,   4823,    -41,
+       -74,   -682,   -761,  -6598,   3084,  -1597,   2945,   -861,
+     -3203,   -669,  -3717,   -310,  -2865,  -1447,     72,   1987,
+       364,   4919,   -247,   3678,   -196,  -6807,   -127,   -965,
+       233,   -133,   4000,    -76,   -182,   3825,     67,    700,
+     -1934,    545,  -2467,  -1441,    629,   3409,    512,  -3333,
+       539,  -4896,   3413,  -2083,    554,    574,   9430,    296,
+       -88,   -533,   -321,  -1082,   2363,     42,    -50,  -5402,
+      -123,   4458,   1130,   2737,    378,   1509,  -3267,    970,
+       179,  -2114,    602,    479,   -438,    277,  -9389,   1144,
+      2453,  -3705,  -3842,   3965,    482,   1230,   2211,   -281,
+     -1833,  -1741,   1653,   -868,    485,  -3740,   5371,    989,
+      1182,     10,  -1812,    233,   1028,  -3300,   4698,   1572,
+      1580,    928,   -314,  -3452,    830,  -1511,  -1079,    554,
+       641,   1383,    105,  -1101,   1549,  -3944,    902,  -6557,
+       493,  -3117,    782,   -699,  -4806,    910,   -259,    -28,
+      1713,  -7012,    570,  -1270,  -4698,     -8,    220,  -4295,
+      1135,  -3905,    945,   -467,  -2164,   -651,    181,    212,
+       159,    587,   1587,   1101,  -7153,   -309,  -1470,  -1135,
+      -265,   -326,    172,   8840,    726,   -780,    170,  -1038,
+       466,    216,    764,    231,   -547,   2456,   -420,   8132,
+       486,    866,   -359,   3351,  -1829,   2018,   -352,  -1353,
+       711,    645,   1149,     74,   -466,   -669,   1009,   3086,
+       240,   7468,   -182,   1947,   -221,    496,   -448,    189,
+      -113,   -752,    133,   -214,  -1310,   -144,  -1034,   5235,
+     -1939,  -2664,    192,   1526,  -2320,    762,   -778,    357,
+      1251,    424,   -225,  -1008,   -229,   -352,  -3559,   -271,
+     -1069,   1274,   -175,    368,   6453,   -505,     31,   7678,
+       165,   -418,   -112,   -649,   1421,    667,   -334,   1041,
+      -353,    585,   4109,   1095,   5283,    685,   -687,  -1459,
+      1054,   5048,   -194,   2220,     81,    244,   3789,     12,
+      -923,  -1459,    319,   2378,    -53,   4097,   -662,  -1156,
+       223,   2589,   -547,   4951,   -346,  -1812,   -111,    344,
+      5247,    387,   -459,   -810,   1022,    234,    726,   1840,
+      -545,   -888,    728,    106,   1027,   -497,    349,   -248,
+     11173,   -311,    126,    479,  -2036,    265,  -1286,  -7196,
+      -511,    128,  -1833,    496,   7620,   2539,  -1809,    962,
+      -614,   -876,    857,   2178,    642,  -1180,  -2294,    911,
+      3932,    711,  -1073,  -1381,  -5317,    237,   -414,    579,
+       -78,    -27,    -78,    -14,    100,   -191,    142,     -1,
+       430,   -182,    207,    -61,    -72,  -4866,    583,   5099,
+      -704,  -1496,   1065,   -206,   2371,   1496,   1777,   -308,
+      4802,  -1415,   1178,   2650,    312,   -338,   -250,    -64,
+       -27,  -3163,   -561,  -1283,    952,   -902,    354,   1597,
+       -74,   -685,  -3266,   -873,   -744,   7079,    732,    697,
+       550,  -1362,    251,     34,   -742,      0,    105,   -608,
+        -1,  10459,    854,   -103,   -419,   2286,  -3041,  -3278,
+       -51,   -491,   -187,   4204,    857,  -1085,  -2501,  -1647,
+      6740,    605,  -2079,   1748,    519,   3462,    106,   -699,
+       220,   -615,   -406,    420,    786,    572,    679,    218,
+      -888,  10283,    129,  -2286,   -705,    -78,   5072,    634,
+       702,  -6315,   -551,   -307,  -7946,    177,  -1897,   -579,
+      1620,    125,    116,    -89,   -308,  -1018,    142,   -506,
+      -624,    917,   -779,    632,  -5103,    314,   -155,   5687,
+        77,   -144,   2957,   -176,     30,   1347,   -426,    -51,
+      7829,   1201,   -592,      1,   4617,  -5476,   2216,    414,
+      1281,    -81,   -423,   -322,   3623,    447,    863,   -375,
+      -489,    526,   -485,    159,   1090,    463,    401,   -131,
+       223,   1630,  -2462,  -2261,    623,   1019,   6385,   -595,
+      -654,  -2787,   2381,    328,  -2069,   5410,   -402,   -554,
+     -1594,   -860,     83,  -5011,   -938,   1061,    163,  -3523,
+     -1064,   1215,    761,   1604,  -4224,    904,  -2706,   4907,
+     -1838,   3287,  -3118,   -464,   -217,  -1187,  -6792,   1748,
+      -569,    613,  -3177,   -253,    164,   -845,    539,   -440,
+     -1871,  -2010,  -2322,  -3026,    478,   2297,   -560,  -5813,
+       768,  -1709,   -620,     66,  -4667,    805,   -215,   5366,
+      -442,   -233,  -6732,    345,    106,   4483,   1720,   2725,
+      -109,   2746,   -188,    204,   1905,   1225,    253,   3270,
+      1912,  -1852,   -256,  -4131,    768,   3984,    473,  -1434,
+      4380,    208,   2547,   1051,   3347,   -171,    629,  -2389,
+      -722,   -759,    166,   2192,    325,   -193,   -289,   -945,
+      -436,    931,   1352,   6918,  -2707,   -987,   2940,   3574,
+      4135,  -3205,    351,    927,    128,  -1873,  -4894,  -4816,
+      -461,    696,  -1618,    129,    -28,   2195,   2450,    585,
+      2557,  -1308,  -2204,   -590,   2345,   3699,   -312,   4436,
+      3422,   -611,   -106,  -2647,  -1752,    -73,   8914,   -673,
+      1625,    850,    720,  -1182,   -245,   -113,    882,   -223,
+     -4873,  -1009,   5643,    -97,  -4779,   -155,    444,   2894,
+      -876,  -5534,   1268,   -132,   -881,   -389,  -4250,   -153,
+       -44,    986,   1820,   8671,    662,   -344,   -198,  -1909,
+      1083,    114,   -318,   1070,  -3293,   -375,   6621,    232,
+     -2973,   -100,   -483,   -529,   -120,  -5312,   1702,    651,
+      -631,    485,   5675,     50,   1132,   -465,  -1053,   2675,
+     -1592,   5565,   1036,  -2808,    325,    999,    524,   2813,
+      -265,    337,   4226,    514,    576,   6047,    175,    204,
+      -514,   -617,    -94,  -2862,   -294,   1774,    978,  -7040,
+      -169,    835,   -829,   2258,    -37,   -319,   2750,    138,
+      -289,  -1092,     78,   1032,   4316,  -1201,    808,  -6243,
+      -940,   4136,     89,  -1076,   -647,   -255,   -207,    227,
+       -70,    -62,   -202,     66,     24,   -988,  -9542,   -225,
+      -739,    161,  -2698,    117,   -608,    173,   -629,   1770,
+      5037,   5145,   2530,  -1028,   3077,   -496,   4671,  -1859,
+      2148,    447,  -4231,    170,    713,    323,    746,   1447,
+     -1880,   5069,   7765,   -492,   -775,   -659,   -770,    -59,
+      -258,    -92,  -1683,  -4639,  -1727,  -2128,    545,  -5060,
+      2536,   1549,    492,  -1280,  -6034,    965,   3244,    475,
+     -1208,    680,   -283,    295,   -357,   -257,   1753,   -362,
+      3159,    106,   -181,   1805,    947,  -1002,   -136,    756,
+      1189,    237,  -2427,   -263,  -5746,     13,   2171,  -1197,
+      -319,   -372,  -1300,   5458,    955,   1224,    618,  -1087,
+      2661,  -2026,    -20,   2137,    342,   4076,    482,   5441,
+        -6,   2126,   -143,  -1596,    274,   1009,     94,  -3446,
+       398,   1079,    289,   2042,    883,  -2005,   -320,   3848,
+       395,    472,    615,   3245,    753,  -1881,   -216,   5670,
+       -64,   -565,  -2560,   1574,    772,  -3824,    932,   4830,
+      1182,  -1054,    390,    -40,   1833,   -350,    151,    149,
+      -966,    -62,   -713,  -8794,   -593,     87,  -3523,   -243,
+       560,  -3296,    244,   -775,   7174,    749,   -271,   8566,
+        99,   1258,   1239,   -489,   -107,  -1699,   -611,   1046,
+        65,   -509,    524,   -354,   6400,   -248,    148,   -682,
+       -93,  -1584,    -61,   4509,    479,    110,   7116,   -295,
+       480,   1545,      3,    127,  -2292,    894,   1261,  -6288,
+       -45,   -410,   -402,   -356,   2649,    649,   1652,   -643,
+      6587,    117,    876,    -33,    956,   -302,   1619,  -1023,
+       -99,    386,    -86,   -498,    684,   1189,    146,    381,
+      9832,    -97,    264,     91,  -1197,    461,    374,  -6788,
+       427,    294,  -4776,      0,   2868,   5199,   4573,   -827,
+     -1867,    623,  -1214,   -573,  -1099,  -1476,    306,   -701,
+      -224,  -4261,  -1135,   2500,  -4758,   1469,   -101,   1812,
+      -129,     15,    760,   -149,   -892,  -1417,    761,   1213,
+      -417,   1569,    -98,   1675,   -139,  -7382,   -633,   2584,
+      -519,  -5483,     29,    320,   -383,   -596,   -295,   -357,
+      -416,   4054,   -457,   -355,  -5213,   -840,   -319,   1321,
+      -424,   -129,   5225,    181,  -2696,   -174,  -7363,   -327,
+       519,    860,  -5132,    275,   -141,   4943,    204,   -200,
+      2989,    939,    390,   -461,   -333,   -394,   -174,    312,
+      -129,   7257,   -402,    860,     -1,   2677,    901,    609,
+       248,    935,   -493,   8147,   2081,  -1171,  -2145,   1560,
+      1634,     55,  -1746,    561,   -747,    931,   -712,   -544,
+       798,    -98,    580,   -829,   -546,    238,  -2052,   -197,
+       802,  13067,    373,  -6438,   1159,   -845,   4313,     19,
+       670,   -627,   -944,   1277,  -6997,   -609,   1913,    607,
+      -454,    -89,    859,    -43,    -71,    494,    169,   -713,
+     -2014,   1570,  -4712,    233,  -4113,    210,  -3689,   1019,
+       200,     49,   1800,   -611,   -472,   1234,    579,    363,
+      -134,    233,    101,  -5539,   1924,  -1734,   -982,   -928,
+      -707,  -1238,   1586,   3676,   4741,  -2770,   3105,    942,
+     -1933,   1363,    288,  -2528,    160,    485,    -38,     23,
+       113,    -19,   -518,   -110,   -173,   -170,    589,   -473,
+       296,  -3742,   1109,  -2977,   1349,   5899,     98,   3130,
+       855,    499,      3,  -3111,   -592,    572,   -890,    687,
+       697,    194,   -344,   1139,   3255,   1270,  -2451,   1958,
+      -395,    267,   -951,  -2224,   2108,    -11,  -3357,   2602,
+      2403,   1596,   -532,   2701,   2251,  -1217,  -2148,    691,
+      -757,  -2051,    373,   1964,   1493,   4756,   1246,  -4345,
+      -496,  -1333,    -20,    -84,  -1558,    305,   1183,   8148,
+      -628,   -702,  -1730,    232,   -261,   2732,    245,    353,
+     -3745,   1013,    186,  -2042,    810,  -3894,    351,   2501,
+       852,   4162,   -425,  -4941,  -1536,   2237,   1348,  -4274,
+};
+
+static const int16_t shape11[] = {
+       347,  -5391,    106,    156,   -182,    -36,    177,    401,
+       700,    524,  -1343,   -402,  -6982,     63,    194,    -14,
+        82,    -36,   -677,   -393,    187,   7364,   -507,  -1173,
+      -759,  -3759,   -728,   2970,   1334,     32,  -1322,  -2965,
+       156,   -839,    382,  -6382,   -149,    874,   1352,    -35,
+      -499,     99,   -425,  -3118,    -32,  -1596,   5608,   -822,
+       -41,   2974,   -592,    615,   1777,   2364,   5189,  -4171,
+      -581,    936,   -527,    318,  -1606,   -551,   5350,   -448,
+       -40,   7476,    189,    319,  -1390,     10,   -921,  10016,
+       573,  -1065,    829,  -1190,    -22,  -4263,     87,  -1742,
+      -325,    313,   -188,    540,  -5542,   -188,    511,   -168,
+      -518,     17,    152,   1966,  -2568,   -860,   2735,  -1210,
+       404,   -144,  -6873,   -129,    434,  -2978,   2829,    -48,
+     -9196,  -1829, -11261,   1492,  -4938,   1802,     93,    384,
+      1340,    236,  10066,    731,    861,   -195,  -7571,    -77,
+      -481,   -700,   4694,   -734,  -6317,    281,   1773,    175,
+     -5535,    532,     31,   7012,   -637,  -3586,   1096,   3596,
+      -197,  -7837,   -611,   1825,    -26,   -259,   2307,     12,
+       729,  -1958,    156,    262,   5494,     26,  -5792,  -3146,
+       450,  -1075,    297,    509,    154,    668,    191,   -268,
+     -1585,    369,   1314,   -693,    677,   1482,    198,    378,
+     11088,    -83,   2321,   -193,  -1082,  -3053,     20,   -271,
+     12975,    272,   1114,    476,   -798,   -309,   -159,   5406,
+      -109,   -675,    621,  -2564,  11190,  -1342,    -88,    428,
+      -465,  -4633,   -503,    106,  -9448,   -454,    -28,   -402,
+      1271,  -7972,    754,   -207,  -2491,    518,  -3701,   -542,
+     -1268,   -617,   -177,    467,   -130,    990,   4087,    857,
+      -524,  -5822,    145,    217,  -7703,   -275,   6647,    -81,
+       550,    887,   -433,   -802,    532,    643,    188,   1965,
+      -920,   -284,   3711,   1196,  -8896,   -357,   -626,    908,
+      -284,   -706,  -1582,    182,   7705,   -138,  -2372,   -158,
+      -888,   4247,   4381,  -6722,  -1619,  -1810,    632,  -1176,
+       -62,   4261,    -89,    265,   1405,  -1449,   -389,  -7068,
+       258,   -244,   -272,  -8149,     37,   -457,  -8839,   3243,
+     -4291,   -396,  -3935,    907,    -58,   2388,   -908,  -1209,
+      -635,   -487,  -1717,   6989,  -4834,   2136,   -822,   -699,
+      2187,    -96,  -9775,  -3464,    795,    634,   -823,   -669,
+       146,   -843,     15,   -227,    671,   -707, -10004,    198,
+        81,  -1611,    -34,  -2127,  -2385,   -689,    622,   1834,
+       -63,  -4925,   -215,  -1181,   -514,   7701,    607,   2030,
+      -264,   2479,    913,    178,   3625,   -194,    613,    877,
+      -384,  -7732,   1008,   2117,    528,   -301,    540,    -80,
+       559,     28,   7542,   -496,   1146,  -6573,  -1457,   7789,
+      -227,  -1671,    -76,   -371,   -865,   -141,     42,     96,
+       277,   -410,  -5606,    328,  -8954,   -222,  -1792,    981,
+      -120,   -650,   2269,  -1412,   1038,   -186,  -8530,   -264,
+      2284,   -727,   1511,  -4611,  -1653,   1985,    -50,  -8985,
+      -245,  -3315,    407,   -915,    -23,    -70,     30,   -669,
+      -303,    902,     84,    433,    217,  -8303,   7847,  -1865,
+      -680,    254,    -38,    364,     16,     50,     90,   -534,
+     -4649,   -800,    969,  -1081,    454,    147,    -62,   8797,
+        84,   -912,   -518,   -351,     76,   -560,  -1438,    629,
+     16384,    656,    151,    880,    396,    -90,    752,   -138,
+      -861,   9605,    258,   -440,  -6441,    434,   5765,    282,
+      1494,   -260,   -180,   -769,   7867,    -86,    536,   -262,
+      -230,  -8956,   5857,   -591,   1533,    418,   -505,   -156,
+      1165,    415,   -168,  -1504,   -336,   -667,    527,   5725,
+        42,    429,   1691,      1,     85,   -196,   3681,     36,
+       469,   -364,    559,    910,  -1848,    259,    249,  -1688,
+       261,    -36,   -592,   -156,    -69,  -5938,   -180,   -294,
+        22,   -903,   1389,   4853,    121,   5185,    970,   1210,
+       561,    926,    472,   -183,   6623,    357,    -78,  -5877,
+        91,   -188,  -6746,   -146,    342,  -5648,   3697,   1336,
+       728,    -69,    398,   2667,  -2103,   1901,   -807,    258,
+        72,   -137,    341,     71,   -169,   -104,    -83,    206,
+      -420,   1187,    744,    120,  -5151,   -574,     72,  -8553,
+      -312,    140,    -69,   6067,   5229,    202,  -1722,   -164,
+        73,   1695,  -1064,    234,     24,   4881,   -849,   -460,
+      8641,   -328,  -1217,   1666,   -283,    -76,   2772,    401,
+       843,  -4756,    297,   8593,    367,   -732,   -225,   -198,
+     -3936,    248,   -436,    473,    -19,   -441,    164,    220,
+      -266,      3,    106,   -244,  -5814,    597,   -666,   -245,
+     -9298,   -867,   -480,    280,    -40,   -139,  -6378,  -4972,
+      -886,   3062,    747,  -1991,  -1668,   -423,    534,    866,
+       -73,  -6501,   -195,    324,    -51,   -123,    298,    500,
+       193,    278,  -8503,   -297,   1034,    -16,   -209,   7451,
+       521,   -305,   -297,  -1537,  -3025,    689,    248,    319,
+      5393,   1497,   2228,   -773,   -141,   2184,   1024,  -4535,
+     -9160,   -600,   -932,  -2145,   -539,    460,  -1943,   4265,
+     -2512,   4416,   -304,   1744,    489,   -362,    898,   2236,
+     -2224,     49,   -192,    332,    366,   -143,    329,  -7747,
+        -4,   1075,    116,    551,     19,     -7,   7090,   -169,
+       837,    -71,   -371,    451,    -31,    474,    867,   -421,
+     -4544,     78,   3208,   -549,   1984,   1386,  -2208,  -1402,
+      1616,    189,    -37,  -6953,  -5733,   1589,  -1314,   1040,
+     -1480,  -5608,   2627,   3517,    250,   7930,     94,   4687,
+      1522,   5543,   -130,   -462,   7613,   -654,    647,  -6187,
+       139,    342,   5069,   -729,    128,     17,    -49,    176,
+       122,    826,    503,     76,   -196,  15583,  12884,    746,
+     -3942,    814,  -1744,   1774,   -338,   3089,  -1694,    559,
+     -5355,   2834,  -1448,    108,   -329,   -711,    350,    171,
+       297,   -123,    672,    625,  -5884,   6822,    842,    276,
+       242,  -2254,   -623,   -846,   2441,    887,  -2066,  -1019,
+      1329,    107,    -83,    826,    -67,   -352,    549,    137,
+     -1023,   -184,    -11,  13790,     48,    883,   3538,   -533,
+     -5553,    861,    738,   -436,  -5259,    -66,   -405,   3777,
+      -574,    738,    253,    363,    -76,    288,    324,   -337,
+       157,   -119,    -97,    171,    514,  -1932,  -5171,    579,
+       249,   1072,   -204,   -194,   -311,    655,  -6728,    186,
+      -178,     99,   5749,   -329,    419,    924,  -1131,    598,
+       -15,   -103,  -2277,    186,   -716,   -542,    153,   -226,
+      5689,    219,     52,   3706,   -917,    140, -10576,   -151,
+      1060,    645,    404,   1310,    331,    216,  -1413,  -6030,
+     -5069,  -3992,   1366,    932,   1559,    -87,   7799,   3854,
+      3762,  -1043,    474,   1184,    102,  -2775,  -1199,  -1079,
+       358,    -63,   9784,    141,   3947,    194,   -132,   -332,
+      -512,   -212,  -5839,   -227,   7759,    807,   -597,  -1782,
+      -148,   -352,  -1225,   -692,    147,  -1970,   3508,   -947,
+      3463,   -197,   4737,   -698,    578,   -172,   -775,   8167,
+      3102,    883,   -914,     16,    827,    114,  -1916,   -909,
+      -606,     87,   1036,   -435,    102,     96,   -370,   -204,
+    -11952,     21,    477,   1285,   6281,    855,  -7717,   1155,
+      -501,   -597,   5943,    145,   -630,  -3406,     13,  -4211,
+       679,   6570,   -231,  -6042,   -503,   -194,   1437,   5640,
+     -1222,   8181,    386,   -986,   -503,   1221,    839,    763,
+      -277,  -1787,  -1491,      5,   -206,     42,   2800,   -332,
+     -2841,   -143,   -456,    646,   -668,   -117,    883,     86,
+      7111,   -270,    624,  -1133,   -308,   -479,  -9149,  -1424,
+       242, -12048,      8,   2307,  -6530,   -529,    462,  -1346,
+      -153,   4315,   -182,   -675,    -78,   -480,    -49,    398,
+      -408,  -1440,   8196,    436,   -561,   -184,    175,   1799,
+      -154,   -439,   -721,   2170,    322,   6555,   -539,  -1672,
+      -629,  -2985,    239,    -37,   7544,  -1048,  -1241,   7241,
+      -636,   2044,   -750,   1206,   1363,   -530,  -5960,    342,
+     -7440,    616,    372,   4572,   -118,    343,   1086,    570,
+      -164,    553,   -433,    562,     33,   8225,   -235,   -234,
+      1230,    234,    906,    563,    -73,  10464,   -353,   -644,
+     -1453,   1119,    237,    670,   -112,   7083,   -451,   3410,
+      -105,   3244,  -1331,    102,    738,  -3602,     76,    413,
+      -318,     10,  -5471,   1024,   -335,    246,  -7820,   -164,
+      2515,  -1411,    673,   6022,     50,  -6715,    268,   2152,
+      -951,    -60,    234,  -2085,    342,   3002,   -169,   2473,
+      -667,  -6846,    870,   5467,    150,    -66,  -4294,   -299,
+      -612,  -3859,    177,    353,  -4726,    547,    340,  -5646,
+     -2022,    117,  -4949,   -303,    280,   -266,   -361,    673,
+      -139,     -5,  -7123,   -264,    243,  -5245,    351,    656,
+      5005,    682,   -107,    298,    -79,   1407,   -449,   -797,
+      -669,   -552,   -242,  -8013,     56,   4092,   1583,  -3981,
+       -49,  -7972,    390,    366,    -31,   1126,    272,   5120,
+       -10,   1147,  -3682,   -155,    252,    163,    455,    358,
+      -746,  -2719,   -431,    444,   -433,    432,   -357,   5370,
+       328,     -3,   1748,    514,   7198,   -527,    172,    401,
+       -59,  -3586,   1443,    534,   1029,    539,   3723,   5392,
+     -6619,  -2559,   2344,    282,   -980,     97,   -317,   -786,
+       475,  -8646,    307,    447,  -3107,    211,    -56,   3344,
+     -1549,  -9223,    454,    352,    -27,    205,    503,    260,
+      -372,   -631,  -1165,  -6543,    444,   1535,    404,  -1752,
+       -43,  -9381,    754,    -94,  -7134,   2064,    170,   8222,
+      -280,  -1250,   -347,   1688,  -1203,    239,  -1048,  -4570,
+     -4720,   -434,  -1008,  -4151,  -2211,  -1414,   -506,  -5411,
+      5379,    984,   4587,    -63,    143,    968,   -203,   5315,
+       591,   -756,   1228,   -372,    703,   6829,    -76,   6935,
+       467,   3119,     -2,  -3825,    175,  -4000,  -3012,  -7745,
+      -832,  -2582,    173,   1992,   3768,    275,     39,    603,
+      -536,   5851,    474,    254,    -72,   1286,   -836,   5576,
+      1357,   3524,    406,  -9214,   -554,   3974,   -352,   1763,
+      -482,    658,   1628,   3885,   1938,   6172,   1693,  -5183,
+       150,  -6729,   1238,   1062, -10035,   -428,     48,    421,
+      -185,    659,   -426,   -633,    131,   -741,    462,   -463,
+      -391,   -193,   -270,   -682,   -343, -12130,    -86,   -148,
+};
+
+static const int16_t shape11s[] = {
+        22,  -5296,   -415,   -206,    306,    265,    189,    376,
+       721,  -1503,   -429,   -538,  -6008,    -97,   -385,   -570,
+      -313,  -1469,   -219,  -1661,     10,   6256,  -1230,   -635,
+       -28,  -4208,   -344,    394,    138,   1174,   -170,   -822,
+       114,  -1087,   -101,  -7362,     84,    862,   1514,    341,
+      -115,    320,   -120,  -1625,     55,   -719,   1443,   -733,
+      -577,   7197,    148,     26,    120,   1969,   4940,  -3777,
+      -607,   1675,     64,   -634,    -84,    334,   6882,   -644,
+      -232,   5008,   -316,   -164,   -138,    -16,     15,   9441,
+       -74,    -65,    262,    834,   1143,   -101,    434,   -329,
+       123,   -204,    -45,    147,  -4586,   -742,    464,   1412,
+       548,  -1602,    -56,   1356,   -771,    263,    709,   -481,
+      -193,    345,  -8395,    -41,     36,  -1900,   -178,    816,
+     -7590,     31,  -3011,   -371,  -2698,   2234,    -99,      0,
+       714,   -845,   9357,    701,  -1269,   -187,  -4227,   -450,
+       -73,  -1637,   4679,   -138,  -4470,    356,   1416,   1462,
+     -3162,    453,    -61,   5243,   -241,  -2385,    438,   4919,
+      -252,  -3781,    150,    335,     58,   -185,   1870,    179,
+       192,  -2572,   -454,     77,   4819,   1891,  -4843,  -2106,
+      -472,  -3842,    167,   1092,   -671,    194,   -870,    139,
+      -115,   -455,    452,   -519,    299,   1024,    330,    -99,
+     11189,     82,     57,   -849,    167,  -4190,    639,    768,
+      7477,    626,     94,  -1259,   -303,    181,   -280,   2873,
+      -589,   -461,   1591,    -29,   6940,  -1264,    120,   -282,
+      -159,  -3755,     -4,    -61, -10172,    152,    -12,   -200,
+       111,  -8471,   -243,    400,   -842,   1661,  -3099,    500,
+      -451,   -423,   -193,    230,    423,    263,   5011,   1010,
+      1044,  -4781,    707,     84,  -6091,   -213,   5193,    434,
+       534,   1100,   -520,  -1590,     75,   -322,      2,   2008,
+      -534,    153,   2641,   1510,  -6830,   -246,      4,    271,
+        75,  -1308,  -1934,   -257,   6748,    589,   -301,    627,
+      1197,   3708,   4450,  -5582,  -1312,  -2859,    881,    429,
+       552,    738,   -882,    984,    488,   -868,   -464,  -6969,
+       721,  -2078,    417,  -6121,   -184,   -128,  -7840,   2659,
+     -2584,   -254,    176,   -790,   -727,    482,    357,    104,
+      -441,   -158,   -980,   4563,  -4098,   1086,  -1217,   -562,
+      2033,    512,  -8331,  -3506,    -73,    808,   -372,  -1602,
+       748,    911,   -599,  -1499,     58,    309, -10000,   -115,
+        70,   1603,    280,   -146,   -817,    517,     18,   1355,
+      -121,  -4134,    152,  -1300,    247,   7258,    415,    130,
+       -27,   2108,    337,   -816,   2480,    396,    533,     66,
+      -171,  -6213,     47,   3081,   -648,   -930,   1810,   -233,
+      -433,   -588,   5526,     58,    -18,  -3498,   -381,   8009,
+         7,   1229,    152,   -410,   -567,    423,   -354,    463,
+       -82,   -146,  -2868,    271,  -5773,   2694,  -1006,    150,
+      -113,   -521,   2553,   -278,    593,    -69,  -6517,   -785,
+       369,  -2483,   -216,  -3144,   -889,   1724,   -168,  -6303,
+       171,  -1895,   -798,   -137,   -172,   -746,    -54,    162,
+      -607,    409,    201,   -284,   -143, -10681,   7747,  -1148,
+       303,     58,      4,    -96,   -485,   -146,   -286,   -577,
+      -644,   -512,    236,    576,    421,     93,    293,  10284,
+        -2,   -117,   -590,   -546,    350,    445,   -301,   -300,
+     10823,   -224,    -96,   -551,   -148,   1042,   -125,    224,
+      -706,   8583,   -195,     52,  -2732,    200,   4419,    390,
+       870,    100,   -184,    233,   6179,   -317,   -472,   1964,
+      -302,  -8722,   2509,   -644,    488,  -3101,    891,   -253,
+       -38,    133,    -15,  -1365,   -779,   -612,    673,   5587,
+       834,    377,    835,  -2018,     75,   -185,   3641,    121,
+       693,     63,    503,    646,     -7,    348,    141,  -1311,
+       532,   -513,     95,   -315,    -65,  -6478,    -16,   -848,
+      -210,   -120,    676,   5125,    533,   4147,   -622,     -4,
+      -150,  -1507,   -124,   -185,   5365,    267,   1073,  -4479,
+       173,   -204,  -4164,   -952,    -23,  -4088,   1391,    205,
+       712,   -473,   -373,    547,   -685,   4542,    -49,    -71,
+        33,   -271,    132,    246,   -188,      6,   -309,    118,
+        96,   1774,    158,    -83,  -3573,   1175,   -122,  -6619,
+     -1677,  -1161,   -266,   4776,   3453,     62,   -346,   -450,
+     -1380,    103,   -457,  -1260,    -71,   4271,   -338,  -1394,
+      6462,    395,    647,   2430,   -735,    444,   1837,    403,
+       144,  -5573,    211,   4608,    -15,    804,     70,   1969,
+     -3451,   -138,   -352,   1176,   -171,   -518,   -114,    -88,
+       335,   -308,    -64,   -428,  -4115,    318,   -205,   -126,
+     -7854,   -609,    105,    144,    270,    266,  -4543,  -5246,
+      -311,    587,    305,   -115,    372,    727,   -294,    414,
+       877,  -7899,    411,   -538,    394,    535,    233,   -826,
+       329,    491,  -4848,   -650,    331,   1026,   -140,   6474,
+       194,   -457,     98,   -871,  -2293,    873,    353,    812,
+      4510,   1102,    379,    651,   -214,   -110,     20,  -2749,
+     -8040,    -96,    221,    221,    -39,    444,   -280,   2814,
+      -536,   3509,    111,    830,    594,    553,     47,   2812,
+     -1898,    203,   -353,    -60,    371,    181,    824,  -5448,
+       297,    476,     42,   -133,     97,    425,   8586,   -317,
+       121,    453,   1014,   -350,    175,    747,    -78,   -287,
+     -5832,    625,   4170,   -308,   1853,   2846,     -3,   -876,
+       535,    431,   -411,  -2139,  -6021,    374,    298,   1572,
+        19,  -4069,   1567,    144,      3,   5541,   -438,    920,
+        87,   1728,    230,    807,   5848,   -413,      7,  -6241,
+       214,    205,   1312,   -675,     70,    264,    114,    -24,
+      -482,    -72,   -296,    327,    249,  11047,  11070,     18,
+      -937,    350,     22,    362,    555,    815,    130,   -125,
+     -4545,   2662,    203,   -318,   -305,    323,    633,    416,
+      -254,    301,     99,    407,  -4951,   4766,   -790,   1334,
+       912,  -1046,   -350,   -135,   3744,     22,  -1647,   -422,
+      -151,   -113,   -130,   -345,     -2,   -263,     18,    -24,
+      -771,    -34,   -543,  10259,    183,      0,   1743,   1267,
+     -2554,    320,    611,  -1064,  -1446,    875,   -808,   4865,
+      -816,   3452,     68,    326,   -178,    177,    -10,   -138,
+       -33,    -93,     65,    264,    185,   -157,  -5749,    110,
+       407,   1240,   -698,    -61,    176,   1557,  -6012,   -606,
+      -555,    458,   3226,   -939,    933,    153,    -32,    928,
+        69,   -490,  -1543,    -87,    -20,   -196,   -327,    423,
+      7911,   -189,    178,    335,   -194,    459, -10572,   -196,
+       174,   -286,    502,  -1041,     12,     39,   -101,  -3983,
+     -1650,  -2902,    386,   -151,   1051,   -619,   6854,   3408,
+      1140,  -1854,   -755,    -40,  -1108,  -1502,    221,   -397,
+       375,   1081,  10375,    389,    270,   -239,    311,   -212,
+       384,   1237,  -2951,    199,   5281,    -56,     34,   -704,
+       942,   1169,     33,   -310,     97,  -1216,   3023,   -836,
+      3256,    404,   3951,   -257,   2139,    111,    179,   8255,
+       611,   -240,   -252,   -367,   -251,   -296,  -2282,    957,
+        61,   -265,    720,    232,     34,    146,    204,   -290,
+     -9923,    529,     65,    696,   2958,    352,  -3852,   1248,
+      -743,   -395,   5969,     92,   -132,  -1206,    314,  -4013,
+       717,   5157,   -770,  -1878,  -1201,   -958,    525,   4028,
+       116,   6772,    -45,  -1086,   -335,   5815,     51,     57,
+       -85,  -2301,   -133,   -300,      7,    227,   3429,  -1075,
+     -4353,   -832,     30,   1259,   -484,    451,    604,   -717,
+      6765,    294,    118,   -410,    299,    592,  -3845,     66,
+      -502,  -9088,    -74,    259,    450,    475,    202,  -1792,
+        23,   4719,    709,   -398,  -1676,   -351,   -898,   -622,
+       145,  -1392,   7305,   1014,    -80,    519,  -2065,   1531,
+       860,  -1448,    134,   1683,    689,   7179,   -345,   -327,
+      1004,  -2467,   -340,  -1302,   5825,    373,     50,   6796,
+       314,     13,   -270,   -426,    702,    279,  -4392,   -508,
+     -6521,     60,   -278,   2479,    847,   -360,    -68,  -1948,
+        91,    969,    421,    459,   -341,   6020,   -550,    -77,
+      -687,   -754,      5,    109,    410,  10860,   -183,   -317,
+      -734,    -87,    501,   -601,    158,   5836,  -1057,   1236,
+      -850,   2965,   -330,    547,   1249,  -2804,    127,    218,
+      -455,   -805,  -4002,    108,   -569,    660,  -5356,  -1091,
+       581,   -445,   -311,   6409,    510,  -6789,    519,   1607,
+       296,    342,    368,  -1440,   -846,   1997,   -227,   2332,
+     -2062,  -4657,   1030,   5322,    135,    131,  -3414,    320,
+      1030,  -3341,   -256,   -373,  -4565,   1222,    171,  -4972,
+     -1444,    303,  -5427,    435,    208,    251,    467,    539,
+       136,    199,  -8876,   -195,   -771,  -3096,    740,    368,
+      1047,   -490,     83,    485,    168,    531,   -635,   -801,
+      -953,      4,    -95,  -7603,    -59,   2023,    739,   -702,
+       263,  -9230,   -313,   -997,   -510,   -772,    156,   3986,
+      -113,    398,  -2602,  -1079,    195,   -211,    128,   1917,
+       221,   -965,     11,     71,   -101,    180,    -36,   7839,
+      -144,   -722,    288,    429,   5704,   -984,   -510,    775,
+       440,  -1849,  -1348,   1989,    300,     43,   1928,   4341,
+     -3840,  -2427,   2025,   -660,   -293,     23,   -249,   -177,
+      -327,  -7858,     33,    245,  -1334,    237,   -687,   2800,
+        30,  -8807,   -404,     43,    183,    289,    528,    510,
+      -197,    590,    -94,  -5423,    381,   1317,    141,  -1639,
+      -432,  -7628,   -224,     56,  -7788,    113,    134,   6981,
+      -636,    756,   -743,     97,    159,   1263,   -143,  -2941,
+     -2680,   -479,   1395,  -1667,   -472,   -992,   -451,  -5708,
+      4262,    334,   3053,     76,   -584,   -599,   -276,   3518,
+       264,  -2118,    358,   -106,    911,   5053,    480,   4538,
+       949,   5203,   -103,    -14,    177,  -3397,     55,  -6813,
+       680,  -1788,    145,   2267,   1104,   -789,     54,    261,
+       228,   5494,     15,   -224,    192,    740,      0,   7632,
+       398,   2879,    430,  -8212,   -657,    815,   -228,   -488,
+       -90,  -1296,    595,   2979,    -15,   4055,   -252,  -3883,
+      -935,  -7654,    330,     97, -10200,    462,    223,  -1017,
+      -309,   -342,   -124,  -1258,    211,    351,    316,    414,
+       -91,    -18,   -202,    -74,    410, -11127,    326,    261,
+};
+
 static const int16_t shape16[] = {
       -855,   1549,  -4841,    629,    932,  -5896,    840,  -2041,
       -305,  -2574,    343,    -31,   -780,   -773,   -353,    403,
@@ -4859,6 +14363,543 @@
         79,  -1325,    397,   -150,   1977,    442,    747,   -127,
 };
 
+static const int16_t shape16s[] = {
+      -392,     96,  -7720,     99,    524,  -8272,    -20,    164,
+      -434,    -85,   -428,   1362,    108,    223,   1053,    -11,
+      -193,  -5140,   -191,   -159,    193,   8005,    -39,   -483,
+      1764,  -1061,   -268,   -318,   -880,    474,     49,     -8,
+      -223,    130,  11263,    165,     12,    -43,   -103,  -1145,
+      -588,    -81,    299,     73,    444,  -7243,  -1411,   -640,
+      -946,     16,   -881,    496,   2403,   -476,   1090,   -294,
+        29,   -148,    109,    145,    -52,    247,   -545,   1115,
+     -7451,   -491,  -1459,    397,  -8603,  -1022,   1494,    298,
+     -5156,   -358,  -1097,  -2911,    423,    652,   -378,  -2357,
+       -74,    415,   -367,    402,   2173,   -154,    122,    283,
+      1352,    302,   -373,   -431,   -283,   -109,    -64,   -343,
+      -108,     55, -14644,    241,     37,   -723,    -71,   -208,
+      -126,   4061,  -9887,    494,   2273,   -505,  -4040,     66,
+      -806,  -1121,  -1894,    783,  -1445,    426,   -820,  -1739,
+       -11,    650,   -282,   -518,    124,  -7266,    -21,    160,
+      -339,      5,   -208,  11712,    198,    -53,    921,     89,
+      5987,  -4806,    176,   1884,     64,   -517,   2169,    108,
+       297,   -111,   -389,   -840,    663,     75,   -485,  -4862,
+      -177,   2663,   -229,   8120,   -219,    462,   3104,    955,
+       384,   1310,    -73,   -504,    258,    170,  -1796,   -482,
+      5691,   -437,  -8474,    583,  -1685,   -827,    292,    -65,
+      1994,   -384,    105,    123,    256,    -82,   -367,  15204,
+      -128,   -260,    -10,    169,    249,  -1286,   1055,    136,
+       678,     61,   1420,   -159,    -15,   -221,   -250,    107,
+       -21,    297,     54,    242,   -111,    468,    237,    -36,
+      -159,     37,   -102,   -488,  -4577,     72,   1009,     -1,
+      1218,   2023,   -640,   -437,    766,   -299,   6144,    184,
+     -1023,    171,   -388,    884,  -1294,   -320,   8718,    896,
+      -295,   -976,   -803,   3092,   1720,   -255,  -1354,   -665,
+       -63,   4382,     41,   -121,   -157,    354,    127,    587,
+      -599,   -231,    484,   -150,   -284,   -498,   -511,     79,
+      5503,     13,   6537,    761,  -1619,   1164,  -2403,   3057,
+     -4966,    724,   1076,  -1555,    889,   -365,     60,   -440,
+     -7144,   -132,    283,   -305,   -126,  -1482,    125,    -52,
+       -33,   1284,   -961,   1355,    953,  -1012,   -227,     86,
+       731,    -14, -15977,    -56,   -875,  -1676,    127,    500,
+      3390,    -14,   -319,   -644,    143,    249, -10752,     23,
+        54,  -1075,   -111,    680,  -1714,    328,  -2092,   -852,
+       622,    949,     61,      6,    -17,    144,    190,    216,
+       130,    -65,     27,   -322,   -139,     43,     89,     76,
+       -84, -10120,    -47,    367,   -261,     38,     50,   4233,
+      -210,     14,     -1,     25,    762,   -299,   -132,    177,
+       974,   -492,   -145,    -43,   5105,   -394,   -196,    -91,
+       -25,    473,  -8358,   -476,    589,  -1372,   -254,  -2387,
+      -293,   -304,   3828,   -254,   -193,    493,     54,   -108,
+     -8789,   -262,   -233,   -821,   -222,    714,   1270,    -61,
+       892,     13,   3952,    -36,  -1567,   -620,   -126,  -1056,
+       587,    390,    -24,   2027,    267,    218,     15,    -56,
+      -130,     40,    551,    -29,  14594,    -23,    106,    -14,
+      -172,    279,    427,   -241,    303,    -20,   -748,     55,
+      5187,    598,   -217,   2026,    643,    118,    911,   8023,
+       296,    791,     39,  -2621,    655,    228,   -671,   -272,
+      -176,   6644,   -166,   -264, -10429,     91,    -83,   -684,
+      -169,   -344,   2123,   -102,   -333,   -317,   -826,    586,
+       116,  -9311,    445,    141,  -1315,   -758,    144,   5620,
+       363,     66,    142,   -161,   -684,    454,  -6584,   -205,
+       577,    205,    305,  -1536,  -4109,   -318,    121,   -323,
+     -1036,   8020,   1146,  -4004,    175,  -1568,  -1537,   -525,
+      2284,     62,     11,    640,   1243,    260,   -104,   -344,
+       102,   -624,    122,   -300,    266,  -6104,  -1149,    412,
+     -1380,     22,   7561,    360,    564,    398,   -338,    174,
+       -76,    131,     44,   -426,    -12,   -175,   -113,     78,
+       293,   -120,    -92,    331, -16163,    -74,   -101,  -1198,
+      -298,   -171,   4052,   -139,   -187,    131,    323,    370,
+      -144,   -160,    131,   -284,   -190,     83,    878, -14817,
+        14,    196,    198,    294,   -120,     40,    800,   1841,
+       393,   -168,    337,   -540,   -356,    130,   9210,    880,
+       304,  -2304,   -275,   1394,   9903,    673,    -62,  -4706,
+      -130,    274,    528,     89,   -458,    -90,   6318,   -133,
+       310,  -5953,    682,     37,   2937,   -371,    197,     77,
+      -184,   1240,     22,  -7695,   -171,  -4874,   -676,  -1121,
+      -842,   -642,   1160,  -1088,   -864,    352,   -790,    794,
+       801,  10564,  -1777,   1095,   -441,   1718,    116,    982,
+      -268,    199,  -2408,  -2042,    279,   -146,    645,  -1350,
+         5,   -150,   -932,    113,     25,   -672,    153,    158,
+     -6140,   -262,    142,   4815,     -1,   -424,    810,     63,
+        88,   -510,   -236,   3964,    -66,   1229,    -16,   -758,
+    -11023,  -1149,     48,  -1756,    167,   2308,    -96,   -654,
+      -639,    369,   -221,     47,    202,    329,   -352,    -26,
+       -19,  13198,   -383,    124,  -1211,   3879,   -344,  -1954,
+     -8702,     32,    924,    472,   7953,    692,   -216,   -415,
+     -3174,  -1959,    935,   4048,    155,   7521,    854,   -157,
+       643,   3760,   -107,  -2536,    622,   -742,   1881,   2262,
+       758,   -968,   -271,   -131,    385,  -5107,   -212,  -2548,
+        29,   -132,   -506,   -190,  -1065,    314,    202,    332,
+     -2274,    701,      4,    -22,   -439,    198,   -265,    -92,
+      -143,    460,    -32,    189,    334,     87,  -7639,     45,
+      -387,   4240,   1231,     92,   1032,   -333,   -280,   2061,
+       296,    365,   2003,   -426,    -35,     96,    -62,    882,
+      -784,    483,   -128,   -143,    474,  13740,   -166,    184,
+      -714,    142,    278,   5622,    -67,    282,    647,   -130,
+       -31,    300,    727,    728,    409,    178,   -601,     84,
+      8305,   -446,    179,    115,    209,   -273,    -47,   1932,
+      -255,  -3171,   -102,    461,   -119,  -8102,   -809,    108,
+     -1680,  -3171,   -775,    324,   -246,    132,    -27,     84,
+      8495,    -45,    153,     21,  -1384,    290,   -869,     38,
+      -440,    133,   -257,    -22,  -3046,     12,  -2797,   4517,
+       142,   1605,    423,    579,   -558,   -301,   -257,    701,
+      -246,   -468,  -1946,    120,    321,    710,   -217,   -203,
+       -50,    -44,  -5866,     80,    259,    488,    754,    124,
+      -517,    703,   -197,    146,    576,   -717,    247,   4121,
+        10,   -422,  -2686,    329,   1183,  14573,     72,    301,
+      2043,   -125,  -1420,  -1263,  10340,   -678,  -1226,    330,
+       -62,    173,   5885,    -56,   -178,  -1090,   -616,    953,
+      -216,   8277,   -124,    411,   7758,    -78,   -326,    786,
+        46,  -1365,   -555,    479,   -774,   -576,      8,    304,
+       390,   -186,   -820,     72,    -67,   -585,  11070,   -213,
+       -12,    344,   -399,   -748,   -150,   2719,    195,   5652,
+      4626,    549,   2782,     -4,   1928,    482,   1008,  -6398,
+       843,    457,   1843,    269,   1247,    350,   -661,    -35,
+     -6477,   3727,   2313,   -424,   -907,    415,   1075,   3960,
+     -1499,     61,    594,   -744,    110,   2486,    967,     27,
+     -5263,   -618,   -578,    313,   7055,  -1081,    739,   -492,
+     -2051,    317,    112,   -155,   -304,   -507,    150,    253,
+       -42,    221,     92,   -275,   -355,  -8494,   -663,    109,
+       282,   -836,   -271,   9316,    165,     63,   -171,     10,
+       -38,   -180,   -219,   -250,   -924,   -573,   -241,    566,
+      -175,     20,    454,    251,   -328,    236,   -215,  -5673,
+         0,   -265,    225,    354,    113,   -488,    174,   -132,
+       134,   -188,   1255,    -94,    -55,   -193,    404,    504,
+       784,   -377,  -5731,    333,   -447,    222,    138,     72,
+      -256,    -58,   -230,   -169,    728,   -481,     95,   -394,
+       -74,   -489,   -253, -13770,     61,    184,    -36,   5025,
+      -232,    321,    253,  -3414,    120,  -2512,    799,   -586,
+      1186,  -1135,   -955,    -54,      7,     83,      0,   5259,
+       466,  -6358,    254,    388,   -211,    207,   2449,    379,
+       430,   -219,   -442,    228,    151,  11819,     67,   -101,
+       239,   -282,    121,   -270,   1209,   -386,    553,   -108,
+       789,   -518,    237,    -48,    497,   8986,     80,   8232,
+       -89,   -359,   -803,    473,    995,   1132,    624,   1353,
+      -305,    711,    -71,    -26,     18,    254,  13079,    -72,
+       178,    -18,   -116,    293,    155,   -254,   -819,   -166,
+      -808,   -190,    150,  -4328,    -33,    -14,    272,  -6417,
+        78,     78,     67,    310,   -177,   -435,    225,    610,
+       -15,      1,  -6706,     30,      1,   -189,    270,    -21,
+       276,   -182,     77,   -231,     30,   -116,  -7713,    158,
+       344,    560,   1466,   3575,    -84,  -4583,  -1260,    372,
+      1395,  -5223,    284,  -1911,    315,  -2312,    -47,   -207,
+       414,    129,     36,     85,    317,   -125,    -63,   -212,
+       -76,    130,   -385,    157,    117,     12,  16140,   -171,
+       375,   -721,    161,   -342,    950,   -667,   1011,     15,
+       536,  -1203,   1039,   -242,   -159,   7664,   -429,   -264,
+     -8221,   -109,    867,    -74,    -79,   -414,    544,    206,
+       120,   1859,    -44,     73,    554,    121,   -160,   -127,
+       -33,     44,    -24,    285,    589, -12514,     51,    464,
+        17,    264,     58,  -6861,    367,   -672,    227,   2793,
+       782,  -6286,   -420,   -808,  -1247,    895,    950,   1533,
+     -1079,   -207,  -1927,  -4947,   -803,   -328,   7677,   -386,
+     -4608,   -329,   -485,   2365,  -1492,  -1738,   -378,   -707,
+     -1850,   9044,    314,   3530,     61,   2921,     79,   9508,
+     -1102,  -3487,    814,  -2828,    550,   -929,   -712,   -274,
+      -566,  -2521,    536,   -296,    -97,    951,  11352,   -614,
+       106,   -342,  -1017,  -1183,   -157,   -457,    266,    109,
+       545,   -313,   1015,   6961,     52,   -224,   2247,   -248,
+      -180,  12367,    311,    514,   1218,   -561,  -2546,  -3275,
+       218,   8281,    187,  -6550,    -96,  -1001,   1777,     89,
+       916,   1042,    399,   -267,    -97,  -3552,    397,   1984,
+     -6134,    784,   2136,  -1346,    619,  -1450,  -1022,  -1226,
+       185,    306,   -274,   -122,    343,    129,  -4481,   -749,
+      -759,   -496,   8785,   -178,    457,   -601,    875,   1040,
+      -268,  -1592,   -531,   9667,    360,  -4978,    525,   -436,
+       123,  -1566,    227,    820,     74,     -5,   1477,    154,
+     -1589,  -9411,    248,   -485,  -3293,   -690,    175,     53,
+       -21,    303,  -2376,    106,    515,   2688,   -401,  -1278,
+       425,    540,   -353,    662,  -7461,   -397,  -7029,   -976,
+       445,  -1648,    164,   -254,   -563,    556,    876,   -205,
+       884,    214,    -92,   -509,     96,    -53,   5734,   -295,
+      -136,    211,    168,    261,    -74,    411,     25,    -59,
+      3596,    400,    320,    -69,    -21,  14062,   -510,    142,
+      -232,   1597,     34,    240,   -476,    131,  -3836,   -186,
+      2579,   2812,  -1501,    274,   2685,   2809,  -1100,   2696,
+      -402,     67,    650,  -1804,    -11,   -216,   6751,    112,
+       455,  -7210,   -251,  -1075,   -833,   -966,   1443,   -138,
+       273,   -494,   1557,    -15,   -339,    -82,    402,    206,
+        31,    -77,    -94,     78,  -5468,   -179,    -44,    421,
+       163,   -386,   -133,  -6334,    427,    747,   -121,   -292,
+       368,  -1087,   -338,  -1534,   3740,   -881,  -2012,  -1284,
+       902,     97,  -3407,   -567,   -118,   1340,    -77,   -445,
+       642,    184,    901,   -341,    -81,    595,  -6531,   -248,
+      -167,   8740,    373,    408,     23,  10709,   -299,   -876,
+      -584,  -1067,     20,  -4556,    295,  -1956,    990,   -132,
+      -152,   4068,    -92,    142,  -1512,     23,   -815,    454,
+       330,   -331,   9042,    120,   -100,     34,     96,    152,
+    -11083,    345,   -567,   -498,    198,    -37,   9276,   -479,
+       611,  -2788,    253,   -176,    617,   -224,    248,    390,
+        39,     25,   -110,    127,    -13,   6675,    -84,    115,
+       294,     84,   -366,   -405,    -32,   -109, -10469,     99,
+        17,    -88,   -226,    316,   -133,   -203,    -60,    311,
+       -87,   -331,    357,    -11,    158,     74,    562,      8,
+       354, -10843,   -114,   -206,    699,   -617,   -141,    807,
+        87,   -149,    174,    199,    -55,  10880,   -332,    182,
+       544,    651,    -27,    261,   -190,   -655,     24,   -443,
+      -630,    204,    207,  -4174,   3557,     89,   -386,   1754,
+      -485,   -127,    -97,     40,  -1336,   -488,   -177,   -750,
+        88,  -1040,  -2215,   -507,    169,   2908,     69,    -52,
+      8458,    601,    174,   1635,    480,    181,   3004,  -3021,
+      1868,   -364,  -2100,   -256,  -3065,    -33,  -7467,   -890,
+     -1949,    -20,  -9472,   -230,   -847,   -634,   -377,    -40,
+      1184,    242,    265,   7056,     42,     16,  -5070,    -71,
+       300,  -1186,    187,    337,  -1331,     77,   -473,   3213,
+      5738,    626,   2524,    531,   1001,   -803,   1231,  -1083,
+      -564,    539,    191,   -498,    184,    603,  -1777,   -479,
+      2298,   -604,  -2077,    634,   4682,  -1387,   -875,    498,
+    -10011,   -173,    752,    109,    -70,    171,    -64,   -261,
+       -79,     37,   -233,    128,    -66,    -70,    356,   -310,
+       214, -14792,      6,    200,   -227,     59,   -241,    560,
+      -230,    479,    403,    -22,    148,   7428,    110,   -177,
+       110,   7518,  -2372,  -1277,    223,   -708,    731,    695,
+      -702,  -2906,    256,  -1160,   4941,    121,  -1148,    -68,
+      -424,  -1590,   4697,    705,    525,    684,   -451,   -246,
+      -115,    556,    543,  -6658,    384,   -589,  -1505,     12,
+       114,     82,  -5084,    164,    154,   -295,    106,   -271,
+       -40,   -394,   -437,    397,   -279,  -3825,   -286,    632,
+     -1041,   1137,    -93,     48,    192,  -5914,    -92,   -235,
+       682,   5817,   -702,    180,   -243,   -219,   -910,   -174,
+      -146,    142,     12,    -69,   -207,   -269,    -53,    567,
+      -336,    114,   9601,   -272,   -270,    459,    610,   -258,
+        97, -10950,    397,     57,     -7,    229,   1669,   -173,
+      -173,    -92,   -347,   -133,   -357,     92,    132,   -609,
+        60,   -124,    116,    -54, -15205,    142,    109,   1127,
+       268,   -220,    336,   -743,   -238,    -29,   -902,     91,
+     -3597,   -288,   1114,  -3797,  -1615,     32,  11481,     55,
+       194,   3567,  -1857,  -2561,   -237,    -15,    -48,   -232,
+       -58,    -21,     37,   -535,   -450,    857,   2001,     12,
+        48,    840,    211,    126,   4833,    275,    176,   -111,
+         9,   -112,   -403,    182,    296,    181,   -425,    -14,
+       276,    118,   -240,    384,    139,   9183,   -230,    143,
+      2412,    -70,    250,  10191,    809,    -15,   -257,  -1242,
+      -163,  -4253,   -352,   -436,    264,  -4998,    -17,   -215,
+      1412,   1592,    856,   -159,   4756,  -5032,    307,   -251,
+       194,   6414,    -56,     -7,   -503,   -261,   -646,  -1050,
+      -271,   -578,   -291,    614,    130,   -336,   -923,   -120,
+       149,  -6012,    273,   -295,  -4586,    137,    206,   1246,
+       498,    614,    991,  13776,    122,     52,   -660,    -76,
+      -211,   -477,   -224,    196,    411,    398,   -590,    820,
+      -441,    -35,   4394,   5010,   -902,    509,     45,    747,
+      1035,   -455,   -579,    105,   1103,   -496,  -1249,   -248,
+        46,  -5771,   -198,   -386,    736,     15,   -335,    -85,
+      -624,   -124,    580,   -327,   -102,    -18,    866,    381,
+};
+
+static const int16_t shape22[] = {
+      2560,   -127,   -137,   -385,  -1875,     90,   -240,    140,
+      1290,    200,  -6762,    374,   1871,   8730,   -111,   -555,
+     -1524,  -2175,  -4689,    521,   -179,    166,  -1573,   1056,
+      -346,    247,    -92,   5713,    561,    233,   -360,    480,
+      -741,  -7552,  -1508,    259,  -8746,   1604,   1385,    723,
+      5678,   2243,    403,  12370,   3526,    574,   4982,    563,
+      1713,  -1337,   1336,    -60,   -890,  -2184,   -563,   9347,
+       775,   6318,   -883,   1476,   -335,    736,   -564,    635,
+     -5557,    617,     54,    257,   -325,    -66,  -5689,   1061,
+      -897,     90,   8394,   2004,   9456,   -222,  -2026,   -969,
+        93,     -5,   -922,  -6491,   1496,  -1537,    651,   -277,
+     -1038,   6072,  -8534,  -2526,   1645,   1459,    547,   2347,
+       -85,   -761,  -7210,   -153,    414,   6096,    383,    320,
+       370,   -902,    823,   3071,    499,   -731,     38,    473,
+      1693,  -9456,    946,   1218,  -1054,     70,    367,   -469,
+     -7861,   -913,    401,    198,    -83,    877,   -308,   8633,
+       253,  -2025,   1925,   1412,   1351,   -360,   -948,  -7526,
+      1089,  -7449,   1652,    141,    -43,  -2082,     44,    130,
+     -7525, -15049,  -1345,    180,  -3009,  -4581,   -267,   2309,
+     -1397,   -112,    -63,    307,   -746,    -13,     35,  -8800,
+     -1947,  -1143,  -1096,  -2582,  -1210,   7683,   -743,  -1589,
+      5699,    -80,  -1375,    -93,   -483,    129,   6076,  -6099,
+       374,   -176,  -1150,   -416,    137,  -4309,  -1926,   3099,
+        82,   -836,    392,   -655,    108,    428,   3361,    313,
+       363,   7534,   1153,    334,   2262,   -367,    -69,   -813,
+     -9702,   3074,  -5461,      0,  -1889,   1303,  -8306,   -113,
+      -677,    692,  -2752,   1292,   -171,    430,   4609,  -2238,
+       196,   1661,    -25,   -164,  -2590,  -4919,   -615,     -7,
+      -753,   5104,   5197,    -66,   -310,    827,   -126,    615,
+        70,   -456,    238,    682,   -639,   -561,    369,    183,
+       113,    430,   -840,   -792,  -7282,  -7537,    619,   -445,
+       588,     19,  -1061,    652,     46,    861,   9641,  -1251,
+       -41,   -699,   -605,  -1389,    240, -10798,    733,    194,
+     -1230,  -1092,   -520,   -219,      7,    518,   -181, -12062,
+       651,    -40,   1128,   -390,   -220,   -438,    471,    510,
+       632,   -321,   1393,   8827,  -3241,  -6683,    350,   1953,
+      -246,   -582,  -5486,  -7576,   -157,    888,   2965,    -23,
+       762,   6867,   3697,    -43,  -7905,   -938,   2119,    377,
+       -25,    691,    136,   -725,   7643,   -730,   2024,  -6932,
+       804,     53,    392,    440,    336,   6235,  -7037,  -5584,
+     -1579,   1115,   1757,   1001,     32,   -294,   -592,    300,
+      -764,  -8879,  -1612,   -845,   1722,   6968,    384,    267,
+       862,  10830,   -364,  -1138,    -49,   1041,   -908, -14960,
+       809,    628,  -1150,  -1348,   -437,    805,    877,    -64,
+      1041,   5253,   -270,   2022,   1253,   -992,  11015,   2686,
+        17,     80,  -1463,   4229,     80,   -834,  -9286,   1179,
+        66,    -39,    -64,  -4057,   -423,    116,  -1441,  -1733,
+       752,   1674,   1443,    757,  -3149,   9057,  -3522,   4007,
+      -893,   1179,   -388,   6368,   -478,   4397,  13868,  -2996,
+       790,    704,  -2299,  -6003,    449,  -5410,   1999,    181,
+     -1807,   -362,    -57,    454,  -2371,   3658,   -485,   -212,
+     11551,   1535,    478,  -1570,   -278,    584,    608,  -5211,
+      6965,   1042,   -168,   -337,  -1071,     72,    451,   -204,
+     -1000,  -1044,    689,    186,   -166,   -375,   9426,    363,
+        93,   -717,    304,    107,   7853,  -1251,   1093,    692,
+      -742,     33,    576,    447,    678,    452,    408,  -4813,
+       711,   -595,   -516,  -1108,   1941,   3056,   -219,  -3413,
+     10946,   1513,  -2375,     48,   -408,     49,   -399,  -5608,
+       -58,    161,   4808,    436,     68,  -5675,    230,    832,
+     -1228,   6382,   -588,  -1312,    772,   4337,   -405,  -5467,
+      -222,   1382,   2158,    620,   -840,    810,  -3830,     48,
+      -101,    529,  -2670,   -249,   1035,  -7620,  -1081,  -6646,
+      1469,   1043,    743,   1553,   -556,   -274,     68,    238,
+      1078,   -110,  -5163,    562,    735,  -8317,   1202,  -1325,
+      -962,     61,   4280,    570,   7450,    265,  -1516,    696,
+     -1567,   -681,      0,  -4064,   1548,  -2521,    657,    567,
+     -8343,   1691,  -1430,   4827,    807,    905,  -2601,  -7415,
+       921,  -1741,    363,    309,    211,   -521,   3013,   -797,
+       648,  -3709,    961,    662,    403,   -386,   -719,  -5752,
+      1355,   6717,    191,    591,   -371,  -1225,  -5125,    800,
+      -252,  -5769,   1101,    657,   -141,   2377,  -1365,   -218,
+      -114,    148,    276,    358,   -354,     18,    -31,  -9413,
+     -5514,  -1458,   -220,    298,    666,    659,    359,    980,
+     -1389,    101,   1500,   4661,    472,    264,  -7590,  -1469,
+        41,     38,   -259,   -346,   -486,  -9949,    812,    422,
+     -1354,  -2461,  -2057,   -253,   1806,   -107,    -41,  16384,
+      -140,   -684,   5421,   1907,    -10,   -889,  -1877,  -6815,
+      -818,  -5854,  -3196,   -895,  -1706,   -186,   7944,    100,
+    -11260,  -4573,   -415,   4685,    395,  -6035,   5789,  -4566,
+       624,  -2146,    570,    130,   -892,   1385,   -262,   6638,
+     -2324,    348,   -288,    607,  -1574,   7119,  -1037,    -40,
+     -4955,   -946,  -5215,  -1013,  -1232,   -875,    -78,   -399,
+       231,   -173,  -5860,    189,   -755,  -8265,    745,    966,
+       202,  -1858,    -26,   -658,     55,   1131,    -56,   3030,
+       158,   3742,  -1261,    317,   6397,    521,   -508,   -522,
+     -2040,   -747,  -6906,   -868,   -110,   -719,   2602,   2570,
+     -1106,   -787,   -352,   9212,   -545,   7339, -10183,   -726,
+      1104,  -1118,  -1655,    383,   1370,   1412,    528,  -4689,
+      -398,  -3802,   -682, -11004,  -2310,   8011,   2301,  -5941,
+      -512,   3813,    210,   1379, -15209,   1143,  -2344,   2459,
+      2368,  -6484,  -2078,   -246,    383,   -204,   1449,   -453,
+     -1539,    416,    508,  -7168,  -1930,   4279,    453,   -215,
+      -296,   -346,   5691,   -200,   -855,    552,   5921,   -109,
+       588,  -3049,   1312,   6767,    -78,  -7204,   1187,   -754,
+     -1043,   -455,    412,   -490,   3124,   -273,   1468,   -546,
+       552,   -306,    835,   -263,  -7234,    324,    318,  -1224,
+       240,    198,    193,   -550,   -684, -12416,     85,  -1469,
+      -463,   -301,    180,    290,   -928,  -6399,   -931,    176,
+       310,   -692,   7964,   -204,    512,    975,  -6415,   -394,
+       -30,   -120,   1638,  -1474,   -381,   5912,    156,   -830,
+      -575,   -225,  -4079,   -787,   -957,   -801,    181,    575,
+      1116,   -795,   -743,   -981,    434,   -365,  -9780,  -1814,
+      1447,   1081,    153,    884,   8697,    259,    881,   -661,
+     -1232,   -547,    464,    898,  -3988,   -476,    790,   7589,
+      -525,   -809,  -2900,  -1271,    170,    223,  -5050,  -2554,
+      1458,   -666,    537,  -6733,    212,    448,  -1556,   1459,
+       802,  -2716,  -8785,  11020,   -258,   1229,   1138,    843,
+       508,    103,   -657,   1273,   8140,    368,   -605,   6856,
+       110,   -423,   5458,   -417,    993,    257,   5552,    -47,
+      1401,   -119,  -1320,   6193,  -1196,     56,    -93,  -1604,
+     -1491,   -897,    238,    823,   4213,    104,    145,  -1049,
+     -9286,    -26,   -813,   -139,    499, -10351,   -466,   -515,
+     -1166,   -412,   -746,    503,   1872,     17, -11941,  -3350,
+      -108,  -7296,   -411,   4811,  -1870,    162,   5595,   -658,
+       339,   -904,   6911,   -715,   -240,    -71,    377,   4747,
+       -57,  -8920,    521,    753,   -375,  -1185,   1322,   -328,
+         5,    525,   -610,    127,   1519,    791,    784, -16384,
+       116,  -1007,   -352,    486,  -7871,    202,  -3684,   -387,
+       676,  -8942,   -713,   -447,   -557,   1159,    974,   -380,
+     -1183,   1049,     -9,    838,   -932,   -139,    371,   1688,
+     -7617,   1192,   2350,   -220,  -4558,   2681,   1568,    102,
+      1274,   -446,   -351,   1551,   1101,  -8995,  -5276,  -4416,
+      3411,    221,   -429,    412,   1625,  -4575,    254,   -631,
+       310,   -378,   9743,    859,    934,    142,  -1400,  -6921,
+      6466,  -4068,   2664,    418,     70,    284,   -903,    -23,
+      -502,   4354,  -5993,    125,    -34,  -1246,  -1946,   -204,
+      1002,  -7454,    -88,  -8628,   2449,  13715,    318,  -8759,
+       294,  -2212,    138,   -761,    285,  -1686,    291,    606,
+       180,    761,   -359,  -1467,    299,   -417,   -361,   -895,
+     -5692,    127,   -951,    165,      1,    396,   -819,  -5508,
+       280,    760,   -411,  -1025,   -649,  -1688,  -6290,    272,
+       -17,  -7595,      9,    307,    128,  -3995,   -119,    481,
+     -3100,   -255,    651,    139,  -3492,     -6,  -4471,    452,
+       -71,    139,   1255,  -6128,   1191,    326,     28,   -238,
+      1374,   -334,   -457,   -836, -10390,    185,   -616,   3366,
+       -39,    183,    -21,   6240,   1141,    341,   -348,    738,
+       121,    -65,   -386,    -27,   -548,    337,     -4,   -126,
+       571,   2263,   4936,  -1093,   -397,    961,  -5886,   -734,
+      1509,   -660,    -61,    170,   -783,  -4197,  -1459,    906,
+       -31,    400,   -481,    561,      6,    489,  -5397,  -1666,
+        41,   -536,   -116,   6713,   1288,   -157,   -116,   4256,
+      1895,   6671,   1837,   -544,   1276,   2031,    345,   6471,
+       -84,   1868,  -2006,  -1304,  -7792,    702,  -1189,    105,
+     -4869,   -282,   -790,   7083,   -628,  -1273,    252,   -179,
+};
+
+static const int16_t shape22s[] = {
+       493,     -2,   -310,   -109,  -1218,   -193,   -267,    -11,
+      -466,    -34,  -2492,    287,    241,   3621,   -537,    458,
+       869,   -915,   -290,    782,     65,    -90,   -635,   1836,
+        80,    519,    868,   1359,    550,    -92,   -704,    110,
+      -210,  -4337,   -376,   -200,  -2693,      6,    381,    688,
+       556,    883,    -88,   1698,   1081,    133,   1130,    -78,
+       853,   -424,    -39,   -909,  -1579,  -2774,   -372,   3604,
+      -519,   3777,    -66,   1330,  -1055,   1135,   -995,    220,
+     -3124,    122,     83,   1045,   -701,   -120,  -6800,   -269,
+       195,   1197,   5500,   -490,   5453,   -201,    411,    823,
+      -146,     46,    252,  -2724,    606,   -924,  -1538,    394,
+      -420,   6405,  -5632,   -941,   -402,   -137,    984,    -24,
+       594,    -40,   -140,    -20,    204,   1211,    290,   -680,
+       103,   -434,   -294,   1646,   -159,  -2296,   -237,    507,
+       -67,  -8999,    -97,    403,  -1473,   -111,     22,   -257,
+     -2203,   -600,    577,   -117,     48,   2216,   -170,   1192,
+       700,   -477,   1678,    979,   2395,    -69,  -1746,  -2139,
+      -294,  -4210,    181,   -372,    320,   -180,   -503,   -550,
+     -3994,  -6315,    502,   -804,   -432,   -112,   -457,  -1016,
+       637,    297,    932,    533,    798,    229,  -1001,  -2780,
+     -4009,   1176,    189,  -1575,     21,   3512,   -348,  -1450,
+      2488,    463,    611,    -46,     85,     94,   3319,  -3041,
+      -362,   -261,  -1534,  -1900,      7,   -519,    -52,   1166,
+      -174,   -152,   -189,   -415,    641,     27,   1764,    280,
+      -301,   2976,    146,   -632,   4022,  -1994,    -84,    -61,
+     -1633,    285,   -439,    781,   -592,    399,  -4794,    203,
+      -295,     32,  -1423,    216,  -2773,     -9,   3589,  -3952,
+      -195,    161,   -223,  -2240,  -1886,  -2643,    978,    113,
+     -1019,   1645,   1493,   -851,   1417,    -74,    717,    411,
+       887,  -1384,     73,    117,    -65,     -7,    133,     18,
+        69,     11,    -98,     45,  -1751,  -2710,     11,   -140,
+        29,    185,    327,    705,     56,    152,   8202,   -117,
+       157,   -478,     36,   -564,    996,  -9359,   -707,    674,
+      1169,    270,    156,   -679,     15,    720,    -38,  -4952,
+      -196,    183,   -356,  -1004,    185,   -148,    -61,    151,
+      -229,   -161,     23,   4350,   -650,  -4384,    -21,    909,
+       105,   -271,  -2538,  -4018,  -1268,    351,    396,   -190,
+      -135,    970,   3159,   -935,  -6968,   -131,  -1031,     53,
+      -430,    242,   -219,    384,   2832,   -151,    152,  -6891,
+      1444,    -63,    -46,     72,    653,   3955,  -4187,   -321,
+      -298,    678,   -471,    664,    -42,    -30,    825,    195,
+     -1147,  -2728,   -178,  -2305,    680,   1980,   -147,    320,
+      -348,   4307,    806,   -263,    -60,   -102,      8, -10085,
+       626,   -130,    267,   -621,     45,   -157,    438,    190,
+        78,   1608,   -246,   -386,    256,   -255,   5651,   -449,
+       -13,    198,  -3193,    329,   -500,  -1368,  -6647,    609,
+      -507,    -96,    222,  -1196,    171,    -12,   -299,  -1423,
+       442,     47,     -5,   -282,    -18,   4969,  -1764,    231,
+      -471,   5044,    412,   1496,   -146,     35,   5083,   -228,
+       355,   -482,  -1063,   1265,     80,  -1278,   1225,    826,
+     -1914,    779,    439,   -511,  -4177,    425,    -38,    -55,
+      9786,   1005,   -538,   -664,   -641,    638,    125,  -2811,
+      2308,     28,  -1157,   -229,   -624,     45,    354,   -368,
+     -1661,     90,    778,   -328,    272,   -223,   9558,    822,
+      -167,    -12,  -1020,   2962,   2372,   -932,   1961,   1398,
+      2660,      3,    235,    421,    114,   -283,    371,  -1652,
+       329,   -435,   -113,  -1296,   -501,   -686,    297,   -384,
+     10328,    472,    614,    139,   -765,   -309,    180,  -2009,
+      -171,   -175,   3571,    146,     46,  -1356,   -134,    -15,
+      -166,   2046,    108,    119,   -281,    971,   -471,  -1134,
+        34,   -104,    219,    746,   -223,    245,   -181,     12,
+      -165,    216,   -792,     86,    562,  -1807,   -116,  -1324,
+       590,   -320,    -80,   1863,   -420,  -1066,   -698,  -2879,
+        -6,    182,  -2325,    575,     97,  -2616,   2938,   -673,
+      -693,   -116,   1905,   -430,   4739,    -12,  -3307,    693,
+      -227,    223,   -111,  -1498,      5,   1751,    -36,    234,
+     -4584,    838,   -370,   -296,   -818,    337,    -46,  -8921,
+       875,   -423,    496,  -1196,    -24,  -1014,    969,    294,
+       237,  -1733,     27,   2543,   1494,    190,    457,  -1391,
+      1209,   5651,    548,    504,    686,  -2889,   -151,    725,
+       486,  -3716,   -285,    830,     31,   5132,    770,    -24,
+      -482,   -369,   -126,  -1552,   -347,   -272,   -387,  -9485,
+     -1547,  -1189,    369,    812,    311,    536,    391,    361,
+     -1708,   -288,    -94,   2053,    557,   -611,  -4551,  -2368,
+       173,    472,    160,  -1849,     96,  -7569,    183,    484,
+      -393,   -346,   -309,    -13,     -7,      2,   -239,  10395,
+      -587,   -115,   1282,   -634,     81,     90,   -725,  -2685,
+     -1214,  -4455,  -1897,  -2903,   -827,    124,   2215,    696,
+     -1225,  -1353,   -371,    343,    421,   -640,   1480,  -1174,
+        76,   -835,   -716,   -625,   -547,   1250,  -2696,   2132,
+      -548,    439,   -607,    408,   -221,   5026,    352,   -344,
+     -1339,   -602,  -1650,   -404,   -458,   -502,     61,   -164,
+        53,    -26,  -2652,   -209,     64,  -4068,    713,    193,
+      -117,  -1290,     95,    -86,   -515,   1336,   -492,   1654,
+     -2963,   3663,  -4231,     -1,   3017,    371,    276,     -7,
+      -289,    -33,  -5942,    237,     30,    586,   -264,   -493,
+       435,   -388,   -165,  10434,    192,   3897,  -5414,    361,
+       845,   -259,    481,    331,    650,   -232,     23,  -1789,
+        27,  -4065,   1020,  -4261,   -651,   3174,    951,  -3363,
+       577,   -112,    642,  -1177,  -1707,    492,   -250,  -1236,
+        24,  -1394,  -1807,   -853,   1681,    -69,    851,   -959,
+     -5759,   -202,     30,  -3466,   -593,   5414,     65,    141,
+      -319,    674,   1183,   -155,   -312,    372,   2829,    -75,
+       -60,  -2618,   -240,   2944,   -631,  -4221,    -16,    467,
+       211,    -58,     55,   -527,    -51,   -160,    642,   -305,
+       388,    413,    210,    -81,  -3383,   -120,    144,   -220,
+      -672,   1352,   -630,  -2324,   -423,  -8053,   -131,   -912,
+      -260,   -380,    470,    154,  -1346,  -2417,   -426,   -403,
+      -137,   -160,   2823,    609,   -216,   -173,   -585,   -514,
+        95,   -202,    222,     16,    136,   1751,    237,  -1089,
+       957,   -144,   -518,    416,   -347,    -60,    207,    277,
+       512,  -1133,    166,   1423,   -883,   -194,  -7016,  -1938,
+       417,   2302,   -992,   -179,    738,    -74,    411,   -462,
+      -413,     67,    234,   -322,   -164,    -47,    -89,   1409,
+       390,  -1180,  -2888,    655,   1958,      0,  -1826,   -471,
+     -1247,    307,    104,  -8502,   -198,   -222,    191,    281,
+      -868,     47,  -4553,   2434,    174,    263,   2844,    -72,
+      -597,  -1183,   -374,    -93,   3348,     13,    173,   6285,
+       -32,   -213,   1882,    411,   -608,   -562,   2998,    293,
+        54,   -147,   -120,    822,    -93,    679,    206,  -3229,
+      -767,  -1603,   -259,   -310,   4306,    548,     -9,    -99,
+     -5722,   -328,   -176,    453,    338,  -9687,    -63,    844,
+       322,    615,  -1075,   -370,    159,    -33,  -6213,  -1375,
+       741,   -801,  -1319,   1513,   1331,    -69,   2702,   -458,
+      -203,    103,   4696,   -284,    465,    -62,    -40,   3184,
+       238,  -6131,    546,   1713,   -365,    -24,    116,    -33,
+       304,    807,   -231,    291,    903,    749,   -254, -12215,
+       115,    -35,    -95,   -166,  -3776,   -170,  -4517,   -151,
+        67,  -7725,    666,   -573,   -744,   -719,     37,     31,
+       373,    148,   -125,     15,   -150,   -905,    -42,    272,
+     -5223,    650,   5233,    109,  -1235,    991,    211,   1522,
+      -555,   -328,    -52,   5335,    -22,  -5476,  -3102,   -637,
+       986,    468,    -37,   -164,   -264,  -1290,    754,   -940,
+      -685,   -862,   7270,   -279,   -441,    472,   -153,  -2515,
+      3899,    -95,    360,    762,     14,    434,    619,    185,
+      -230,   1233,  -1330,   1360,   -756,    361,  -1391,   -247,
+       120,  -3573,    293,    375,    806,   5526,    536,    137,
+       486,   -484,     13,    -37,     12,     -4,     81,     43,
+        10,     43,    -38,   -371,    -64,  -1167,   -117,   -371,
+     -1958,   -166,    543,    -97,    -83,    391,    -59,  -1631,
+       302,   1077,   -128,   -641,    -64,     21,  -2562,   -235,
+       342,  -7121,   -646,    -49,   -961,   -141,   -210,   -555,
+     -1596,   -988,    723,   -209,  -3585,     10,    -35,   1051,
+         0,    138,    941,  -5002,    805,   3009,     35,    -70,
+       513,    -21,   -432,   -224, -10628,   -167,  -1045,   2603,
+       336,    360,    515,    683,    981,   3028,    492,   -543,
+     -1844,     23,    -30,     52,    -40,    447,     11,    363,
+       -95,   1609,   2613,    -13,   -400,    719,  -4513,   -676,
+      -290,    456,   -332,    -11,   -261,   -455,     89,   -301,
+       285,    287,    202,    281,     87,   -202,  -1482,   -535,
+       874,   -478,   -201,   4715,    824,   -204,    145,   2882,
+       404,   3376,    363,    -18,   -127,    764,    106,   1626,
+       178,    185,     22,   -637,  -6216,   1399,   -961,    -88,
+      -553,    -91,     98,   1831,      9,   -583,   1253,  -1741,
+};
+
 static const int16_t shape44s[] = {
        -20,   -140,    683,   -586,  -1742,    177,   -538,   1900,
       2193,    -17,  -2096,    261,    645,    339,     77,   1136,
@@ -5019,6 +15060,57 @@
     2, 1, 2, 2, 3, 4, 5, 7, 13, 25
 };
 
+static const uint16_t bark_tab_l8s_512[] = {
+      7,   8,   7,   8,   8,   8,   8,   8,
+      8,   9,   9,  10,  10,  11,  11,  12,
+     12,  14,  15,  16,  18,  19,  21,  24,
+     27,  30,  35,  40,  46,  53,
+};
+
+static const uint16_t bark_tab_s8s_64[] = {
+      3,   3,   3,   3,   4,   5,   6,   8,
+     12,  17,
+};
+
+static const uint16_t bark_tab_m8s_256[] = {
+      6,   5,   6,   6,   6,   6,   7,   7,
+      8,   8,   9,  10,  11,  13,  15,  18,
+     20,  25,  31,  39,
+};
+
+static const uint16_t bark_tab_l11_512[] = {
+      4,   4,   5,   4,   5,   4,   5,   6,
+      6,   6,   7,   8,   9,  10,  12,  14,
+     17,  21,  27,  33,  44,  58,  82, 121,
+};
+
+static const uint16_t bark_tab_s11_64[] = {
+      2,   1,   2,   3,   4,   6,  13,  33,
+};
+
+static const uint16_t bark_tab_m11_256[] = {
+      3,   3,   4,   3,   4,   4,   5,   6,
+      7,   9,  11,  15,  21,  30,  48,  83,
+};
+
+static const uint16_t bark_tab_l11s_512[] = {
+      6,   6,   6,   6,   6,   6,   7,   6,
+      7,   7,   8,   8,   8,   9,  10,  10,
+     11,  13,  13,  15,  17,  18,  21,  25,
+     27,  33,  38,  45,  54,  66,
+};
+
+static const uint16_t bark_tab_s11s_64[] = {
+      2,   3,   2,   3,   3,   4,   6,   8,
+     12,  21,
+};
+
+static const uint16_t bark_tab_m11s_256[] = {
+      4,   5,   4,   5,   5,   5,   6,   5,
+      7,   7,   8,   9,  10,  12,  15,  17,
+     22,  28,  35,  47,
+};
+
 static const uint16_t bark_tab_l16_1024[] = {
      5,  5,  5,  5,  5,  5,  5,  6,  6,  7,  7,   7,   8,   9, 10, 11,
     12, 14, 17, 19, 22, 27, 33, 40, 51, 64, 84, 114, 164, 257
@@ -5037,6 +15129,60 @@
     1, 1, 2, 2, 3, 6, 11, 38
 };
 
+static const uint16_t bark_tab_l16s_1024[] = {
+      9,   9,   8,   9,  10,   9,  10,  10,
+     10,  12,  11,  13,  13,  14,  16,  17,
+     19,  20,  24,  26,  30,  35,  40,  48,
+     56,  68,  83, 102, 128, 165,
+};
+
+static const uint16_t bark_tab_s16s_128[] = {
+      3,   4,   4,   4,   5,   7,  10,  16,
+     26,  49,
+};
+
+static const uint16_t bark_tab_m16s_512[] = {
+      7,   6,   7,   7,   7,   8,   9,   9,
+     10,  11,  14,  15,  18,  22,  27,  34,
+     44,  59,  81, 117,
+};
+
+static const uint16_t bark_tab_l22_1024[] = {
+      3,   4,   3,   4,   3,   4,   4,   4,
+      4,   4,   5,   5,   5,   6,   7,   7,
+      8,   9,  11,  12,  14,  16,  20,  24,
+     29,  36,  45,  60,  80, 113, 173, 302,
+};
+
+static const uint16_t bark_tab_s22_128[] = {
+      1,   2,   1,   2,   3,   4,   6,  10,
+     23,  76,
+};
+
+static const uint16_t bark_tab_m22_512[] = {
+      3,   2,   3,   3,   3,   4,   3,   5,
+      4,   6,   7,   8,  10,  14,  18,  25,
+     36,  55,  95, 208,
+};
+
+static const uint16_t bark_tab_l22s_1024[] = {
+      6,   7,   6,   6,   7,   7,   7,   7,
+      7,   8,   9,   8,  10,  10,  11,  12,
+     13,  15,  16,  18,  21,  24,  27,  33,
+     38,  46,  55,  68,  84, 107, 140, 191,
+};
+
+static const uint16_t bark_tab_s22s_128[] = {
+      3,   2,   3,   4,   4,   6,   9,  14,
+     26,  57,
+};
+
+static const uint16_t bark_tab_m22s_512[] = {
+      5,   5,   5,   6,   5,   7,   6,   7,
+      9,   9,  11,  13,  15,  20,  24,  33,
+     43,  61,  88, 140,
+};
+
 static const uint16_t bark_tab_l44_2048[] = {
      5,  6,  5,   6,   5,   6,   6,   6,  6,  6,  7,  7,  7,  8,  8,  9,
      9, 10, 11,  11,  13,  14,  16,  17, 19, 22, 25, 29, 33, 39, 46, 54,
@@ -5052,6 +15198,24 @@
     1, 2, 1, 2, 3, 4, 6, 10, 23, 76
 };
 
+const TwinVQModeTab ff_metasound_mode0806 = {
+    {
+        {  8, bark_tab_s8_64,  10, fcb8s, 1, 5, cb0806ss0, cb0806ss1, 27 },
+        {  2, bark_tab_m8_256, 20, fcb8m, 2, 5, cb0806sm0, cb0806sm1, 22 },
+        {  1, bark_tab_l8_512, 30, fcb8l, 3, 6, cb0806sl0, cb0806sl1, 24 }
+    },
+    512, 12, lsp8, 1, 5, 3, 3, shape8, 8, 28, 20, 6, 200
+};
+
+const TwinVQModeTab ff_metasound_mode0806s = {
+    {
+        {  8, bark_tab_s8s_64,  10, fcb8ss, 1, 5, cb0806ss0, cb0806ss1, 27 },
+        {  2, bark_tab_m8s_256, 20, fcb8sm, 2, 5, cb0806sm0, cb0806sm1, 22 },
+        {  1, bark_tab_l8s_512, 30, fcb8sl, 3, 6, cb0806sl0, cb0806sl1, 24 }
+    },
+    512, 12, lsp8s, 1, 5, 3, 3, shape8s, 8, 28, 20, 6, 200
+};
+
 const TwinVQModeTab ff_metasound_mode0808 = {
     {
         { 8, bark_tab_s8_64,  10, fcb8s, 1, 5, cb0808s0, cb0808s1, 18 },
@@ -5061,6 +15225,33 @@
     512, 12, lsp8, 1, 5, 3, 3, shape8, 8, 28, 20, 6, 200
 };
 
+const TwinVQModeTab ff_metasound_mode0808s = {
+    {
+        {  8, bark_tab_s8s_64,  10, fcb8ss, 1, 5, cb0808ss0, cb0808ss1, 18 },
+        {  2, bark_tab_m8s_256, 20, fcb8sm, 2, 5, cb0808sm0, cb0808sm1, 16 },
+        {  1, bark_tab_l8s_512, 30, fcb8sl, 3, 6, cb0808sl0, cb0808sl1, 17 }
+    },
+    512, 12, lsp8s, 1, 5, 3, 3, shape8s, 8, 28, 20, 6, 200
+};
+
+const TwinVQModeTab ff_metasound_mode1110 = {
+    {
+        {  8, bark_tab_s11_64,   8, fcb11s, 1, 5, cb1110s0, cb1110s1, 21 },
+        {  2, bark_tab_m11_256, 16, fcb11m, 2, 5, cb1110m0, cb1110m1, 18 },
+        {  1, bark_tab_l11_512, 24, fcb11l, 3, 6, cb1110l0, cb1110l1, 19 }
+    },
+    512, 16, lsp11, 1, 6, 4, 3, shape11, 9, 28, 20, 7, 200
+};
+
+const TwinVQModeTab ff_metasound_mode1110s = {
+    {
+        {  8, bark_tab_s11s_64,  10, fcb11ss, 1, 5, cb1110ss0, cb1110ss1, 21 },
+        {  2, bark_tab_m11s_256, 20, fcb11sm, 2, 5, cb1110sm0, cb1110sm1, 18 },
+        {  1, bark_tab_l11s_512, 30, fcb11sl, 3, 6, cb1110sl0, cb1110sl1, 20 }
+    },
+    512, 16, lsp11s, 1, 6, 4, 3, shape11s, 9, 36, 30, 7, 200
+};
+
 const TwinVQModeTab ff_metasound_mode1616 = {
     {
         { 8, bark_tab_s16_128,  10, fcb16s, 1, 5, cb1616s0, cb1616s1, 16 },
@@ -5070,6 +15261,33 @@
     1024, 16, lsp16, 1, 6, 4, 3, shape16, 9, 28, 30, 7, 200
 };
 
+const TwinVQModeTab ff_metasound_mode1616s = {
+    {
+        { 8, bark_tab_s16s_128,  10, fcb16ss, 1, 5, cb1616ss0, cb1616ss1, 16 },
+        { 2, bark_tab_m16s_512,  20, fcb16sm, 2, 5, cb1616sm0, cb1616sm1, 15 },
+        { 1, bark_tab_l16s_1024, 30, fcb16sl, 3, 6, cb1616sl0, cb1616sl1, 16 }
+    },
+    1024, 16, lsp16, 1, 6, 4, 3, shape16s, 9, 56, 60, 7, 200
+};
+
+const TwinVQModeTab ff_metasound_mode2224 = {
+    {
+        { 8, bark_tab_s22_128,  10, fcb22s, 1, 6, cb2224s0, cb2224s1, 15 },
+        { 2, bark_tab_m22_512,  20, fcb22m, 2, 6, cb2224m0, cb2224m1, 14 },
+        { 1, bark_tab_l22_1024, 32, fcb22l, 4, 6, cb2224l0, cb2224l1, 15 }
+    },
+    1024, 16, lsp22, 1, 6, 4, 3, shape22, 9, 56, 36, 7, 200
+};
+
+const TwinVQModeTab ff_metasound_mode2224s = {
+    {
+        { 8, bark_tab_s22s_128,  10, fcb22ss, 1, 6, cb2224ss0, cb2224ss1, 15 },
+        { 2, bark_tab_m22s_512,  20, fcb22sm, 2, 6, cb2224sm0, cb2224sm1, 14 },
+        { 1, bark_tab_l22s_1024, 32, fcb22sl, 4, 6, cb2224sl0, cb2224sl1, 15 }
+    },
+    1024, 16, lsp22s, 1, 6, 4, 3, shape22s, 9, 56, 36, 7, 200
+};
+
 const TwinVQModeTab ff_metasound_mode4432 = {
     {
         { 16, bark_tab_s44_128,  10, fcb44ss, 1, 6, cb4432s0, cb4432s1, 23 },
@@ -5079,6 +15297,42 @@
     2048, 20, lsp44s, 1, 6, 4, 4, shape44s, 9, 84, 54, 7, 200,
 };
 
+const TwinVQModeTab ff_metasound_mode4432s = {
+    {
+        { 16, bark_tab_s44_128,  10, fcb44ss, 1, 6, cb4432s0, cb4432s1, 23 },
+        {  4, bark_tab_m44_512,  20, fcb44sm, 2, 6, cb4432m0, cb4432m1, 21 },
+        {  1, bark_tab_l44_2048, 40, fcb44sl, 4, 6, cb4432l0, cb4432l1, 22 }
+    },
+    2048, 20, lsp44s, 1, 6, 4, 4, shape44s, 9, 84, 54, 7, 200,
+};
+
+const TwinVQModeTab ff_metasound_mode4440 = {
+    {
+        { 16, bark_tab_s44_128,  10, fcb44ss, 1, 6, cb4440ss0, cb4440ss1, 18 },
+        {  4, bark_tab_m44_512,  20, fcb44sm, 2, 6, cb4440sm0, cb4440sm1, 17 },
+        {  1, bark_tab_l44_2048, 40, fcb44sl, 4, 6, cb4440sl0, cb4440sl1, 17 }
+    },
+    2048, 20, lsp44s, 1, 6, 4, 4, shape44s, 9, 84, 54, 7, 200
+};
+
+const TwinVQModeTab ff_metasound_mode4440s = {
+    {
+        { 16, bark_tab_s44_128,  10, fcb44ss, 1, 6, cb4440ss0, cb4440ss1, 18 },
+        {  4, bark_tab_m44_512,  20, fcb44sm, 2, 6, cb4440sm0, cb4440sm1, 17 },
+        {  1, bark_tab_l44_2048, 40, fcb44sl, 4, 6, cb4440sl0, cb4440sl1, 17 }
+    },
+    2048, 20, lsp44s, 1, 6, 4, 4, shape44s, 9, 84, 54, 7, 200
+};
+
+const TwinVQModeTab ff_metasound_mode4448 = {
+    {
+        { 16, bark_tab_s44_128,  10, fcb44ss, 1, 6, cb4448ss0, cb4448ss1, 15 },
+        {  4, bark_tab_m44_512,  20, fcb44sm, 2, 6, cb4448sm0, cb4448sm1, 14 },
+        {  1, bark_tab_l44_2048, 40, fcb44sl, 4, 6, cb4448sl0, cb4448sl1, 14 }
+    },
+    2048, 20, lsp44s, 1, 6, 4, 4, shape44s, 9, 84, 54, 7, 200
+};
+
 const TwinVQModeTab ff_metasound_mode4448s = {
     {
         { 16, bark_tab_s44_128,  10, fcb44ss, 1, 6, cb4448ss0, cb4448ss1, 15 },

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/mimic.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/mimic.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/mjpegbdec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/mjpegbdec.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/mjpegdec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/mjpegdec.c Changed

@@ -83,13 +83,27 @@
               avpriv_mjpeg_val_ac_chrominance, 251, 0, 0);
 }
 
+static void parse_avid(MJpegDecodeContext *s, uint8_t *buf, int len)
+{
+    s->buggy_avid = 1;
+    if (len > 14 && buf[12] == 1) /* 1 - NTSC */
+        s->interlace_polarity = 1;
+    if (len > 14 && buf[12] == 2) /* 2 - PAL */
+        s->interlace_polarity = 0;
+    if (s->avctx->debug & FF_DEBUG_PICT_INFO)
+        av_log(s->avctx, AV_LOG_INFO, "AVID: len:%d %d\n", len, len > 14 ? buf[12] : -1);
+}
+
 av_cold int ff_mjpeg_decode_init(AVCodecContext *avctx)
 {
     MJpegDecodeContext *s = avctx->priv_data;
 
-    if (!s->picture_ptr)
-        s->picture_ptr = &s->picture;
-    avcodec_get_frame_defaults(&s->picture);
+    if (!s->picture_ptr) {
+        s->picture = av_frame_alloc();
+        if (!s->picture)
+            return AVERROR(ENOMEM);
+        s->picture_ptr = s->picture;
+    }
 
     s->avctx = avctx;
     ff_hpeldsp_init(&s->hdsp, avctx->flags);
@@ -117,7 +131,17 @@
     if (avctx->field_order == AV_FIELD_BB) { /* quicktime icefloe 019 */
         s->interlace_polarity = 1;           /* bottom field first */
         av_log(avctx, AV_LOG_DEBUG, "bottom field first\n");
+    } else if (avctx->field_order == AV_FIELD_UNKNOWN) {
+        if (avctx->codec_tag == AV_RL32("MJPG"))
+            s->interlace_polarity = 1;
+    }
+
+    if (   avctx->extradata_size > 8
+        && AV_RL32(avctx->extradata) == 0x2C
+        && AV_RL32(avctx->extradata+4) == 0x18) {
+        parse_avid(s, avctx->extradata, avctx->extradata_size);
     }
+
     if (avctx->codec->id == AV_CODEC_ID_AMV)
         s->flipped = 1;
 
@@ -215,7 +239,7 @@
 
 int ff_mjpeg_decode_sof(MJpegDecodeContext *s)
 {
-    int len, nb_components, i, width, height, pix_fmt_id;
+    int len, nb_components, i, width, height, pix_fmt_id, ret;
     int h_count[MAX_COMPONENTS];
     int v_count[MAX_COMPONENTS];
 
@@ -326,12 +350,14 @@
             height *= 2;
         }
 
-        avcodec_set_dimensions(s->avctx, width, height);
+        ret = ff_set_dimensions(s->avctx, width, height);
+        if (ret < 0)
+            return ret;
 
         s->first_picture = 0;
     }
 
-    if (s->interlaced && (s->bottom_field == !s->interlace_polarity)) {
+    if (s->got_picture && s->interlaced && (s->bottom_field == !s->interlace_polarity)) {
         if (s->progressive) {
             avpriv_request_sample(s->avctx, "progressively coded interlaced picture");
             return AVERROR_INVALIDDATA;
@@ -373,8 +399,12 @@
         if (s->rgb)
             s->avctx->pix_fmt = s->bits <= 9 ? AV_PIX_FMT_ABGR : AV_PIX_FMT_RGBA64;
         else {
-            s->avctx->pix_fmt = s->bits <= 8 ? AV_PIX_FMT_YUVA444P : AV_PIX_FMT_YUVA444P16;
-            s->avctx->color_range = s->cs_itu601 ? AVCOL_RANGE_MPEG : AVCOL_RANGE_JPEG;
+            if (s->adobe_transform == 0 && s->bits <= 8) {
+                s->avctx->pix_fmt = AV_PIX_FMT_GBRAP;
+            } else {
+                s->avctx->pix_fmt = s->bits <= 8 ? AV_PIX_FMT_YUVA444P : AV_PIX_FMT_YUVA444P16;
+                s->avctx->color_range = s->cs_itu601 ? AVCOL_RANGE_MPEG : AVCOL_RANGE_JPEG;
+            }
         }
         av_assert0(s->nb_components == 4);
         break;
@@ -474,6 +504,12 @@
             s->avctx->pix_fmt = AV_PIX_FMT_GRAY16;
     }
 
+    s->pix_desc = av_pix_fmt_desc_get(s->avctx->pix_fmt);
+    if (!s->pix_desc) {
+        av_log(s->avctx, AV_LOG_ERROR, "Could not get a pixel format descriptor.\n");
+        return AVERROR_BUG;
+    }
+
     av_frame_unref(s->picture_ptr);
     if (ff_get_buffer(s->avctx, s->picture_ptr, AV_GET_BUFFER_FLAG_REF) < 0)
         return -1;
@@ -481,7 +517,7 @@
     s->picture_ptr->key_frame = 1;
     s->got_picture            = 1;
 
-    for (i = 0; i < 3; i++)
+    for (i = 0; i < 4; i++)
         s->linesize[i] = s->picture_ptr->linesize[i] << s->interlaced;
 
     av_dlog(s->avctx, "%d %d %d %d %d %d\n",
@@ -505,7 +541,7 @@
             int size = bw * bh * s->h_count[i] * s->v_count[i];
             av_freep(&s->blocks[i]);
             av_freep(&s->last_nnz[i]);
-            s->blocks[i]       = av_malloc(size * sizeof(**s->blocks));
+            s->blocks[i]       = av_mallocz(size * sizeof(**s->blocks));
             s->last_nnz[i]     = av_mallocz(size * sizeof(**s->last_nnz));
             if (!s->blocks[i] || !s->last_nnz[i])
                 return AVERROR(ENOMEM);
@@ -823,7 +859,7 @@
         buffer[0][i] = 1 << (s->bits - 1);
 
     for (mb_y = 0; mb_y < s->mb_height; mb_y++) {
-        uint8_t *ptr = s->picture.data[0] + (linesize * mb_y);
+        uint8_t *ptr = s->picture_ptr->data[0] + (linesize * mb_y);
 
         if (s->interlaced && s->bottom_field)
             ptr += linesize >> 1;
@@ -957,7 +993,7 @@
                         if(dc == 0xFFFFF)
                             return -1;
                         if(bits<=8){
-                        ptr = s->picture.data[c] + (linesize * (v * mb_y + y)) + (h * mb_x + x); //FIXME optimize this crap
+                        ptr = s->picture_ptr->data[c] + (linesize * (v * mb_y + y)) + (h * mb_x + x); //FIXME optimize this crap
                         if(y==0 && toprow){
                             if(x==0 && leftcol){
                                 pred= 1 << (bits - 1);
@@ -977,7 +1013,7 @@
                         pred &= mask;
                         *ptr= pred + (dc << point_transform);
                         }else{
-                            ptr16 = (uint16_t*)(s->picture.data[c] + 2*(linesize * (v * mb_y + y)) + 2*(h * mb_x + x)); //FIXME optimize this crap
+                            ptr16 = (uint16_t*)(s->picture_ptr->data[c] + 2*(linesize * (v * mb_y + y)) + 2*(h * mb_x + x)); //FIXME optimize this crap
                             if(y==0 && toprow){
                                 if(x==0 && leftcol){
                                     pred= 1 << (bits - 1);
@@ -1025,7 +1061,7 @@
                         if(dc == 0xFFFFF)
                             return -1;
                         if(bits<=8){
-                            ptr = s->picture.data[c] +
+                            ptr = s->picture_ptr->data[c] +
                               (linesize * (v * mb_y + y)) +
                               (h * mb_x + x); //FIXME optimize this crap
                             PREDICT(pred, ptr[-linesize-1], ptr[-linesize], ptr[-1], predictor);
@@ -1033,7 +1069,7 @@
                             pred &= mask;
                             *ptr = pred + (dc << point_transform);
                         }else{
-                            ptr16 = (uint16_t*)(s->picture.data[c] + 2*(linesize * (v * mb_y + y)) + 2*(h * mb_x + x)); //FIXME optimize this crap
+                            ptr16 = (uint16_t*)(s->picture_ptr->data[c] + 2*(linesize * (v * mb_y + y)) + 2*(h * mb_x + x)); //FIXME optimize this crap
                             PREDICT(pred, ptr16[-linesize-1], ptr16[-linesize], ptr16[-1], predictor);
 
                             pred &= mask;
@@ -1089,6 +1125,7 @@
 
 static int mjpeg_decode_scan(MJpegDecodeContext *s, int nb_components, int Ah,
                              int Al, const uint8_t *mb_bitmask,
+                             int mb_bitmask_size,
                              const AVFrame *reference)
 {
     int i, mb_x, mb_y;
@@ -1098,28 +1135,22 @@
     GetBitContext mb_bitmask_gb;
     int bytes_per_pixel = 1 + (s->bits > 8);
 
-    if (mb_bitmask)
+    if (mb_bitmask) {
+        if (mb_bitmask_size != (s->mb_width * s->mb_height + 7)>>3) {
+            av_log(s->avctx, AV_LOG_ERROR, "mb_bitmask_size mismatches\n");
+            return AVERROR_INVALIDDATA;
+        }
         init_get_bits(&mb_bitmask_gb, mb_bitmask, s->mb_width * s->mb_height);
-
-    if (s->flipped && s->avctx->lowres) {
-        av_log(s->avctx, AV_LOG_ERROR, "Can not flip image with lowres\n");
-        s->flipped = 0;
     }
+
     s->restart_count = 0;
+
     for (i = 0; i < nb_components; i++) {
         int c   = s->comp_index[i];
         data[c] = s->picture_ptr->data[c];
         reference_data[c] = reference ? reference->data[c] : NULL;
         linesize[c] = s->linesize[c];
         s->coefs_finished[c] |= 1;
-        if (s->flipped && !(s->avctx->flags & CODEC_FLAG_EMU_EDGE)) {
-            // picture should be flipped upside-down for this codec
-            int offset = (linesize[c] * (s->v_scount[i] *
-                         (8 * s->mb_height - ((s->height / s->v_max) & 7)) - 1));
-            data[c]           += offset;
-            reference_data[c] += offset;
-            linesize[c]       *= -1;
-        }
     }
 
     for (mb_y = 0; mb_y < s->mb_height; mb_y++) {
@@ -1207,7 +1238,7 @@
     int mb_x, mb_y;
     int EOBRUN = 0;
     int c = s->comp_index[0];
-    uint8_t *data = s->picture.data[c];
+    uint8_t *data = s->picture_ptr->data[c];
     int linesize  = s->linesize[c];
     int last_scan = 0;
     int16_t *quant_matrix = s->quant_matrixes[s->quant_sindex[0]];
@@ -1265,7 +1296,7 @@
 }
 
 int ff_mjpeg_decode_sos(MJpegDecodeContext *s, const uint8_t *mb_bitmask,
-                        const AVFrame *reference)
+                        int mb_bitmask_size, const AVFrame *reference)
 {
     int len, nb_components, i, h, v, predictor, point_transform;
     int index, id, ret;
@@ -1368,7 +1399,7 @@
         s->last_dc[i] = (4 << s->bits);
 
     if (s->lossless) {
-        av_assert0(s->picture_ptr == &s->picture);
+        av_assert0(s->picture_ptr == s->picture);
         if (CONFIG_JPEGLS_DECODER && s->ls) {
 //            for () {
 //            reset_ls_coding_parameters(s, 0);
@@ -1389,7 +1420,7 @@
         }
     } else {
         if (s->progressive && predictor) {
-            av_assert0(s->picture_ptr == &s->picture);
+            av_assert0(s->picture_ptr == s->picture);
             if ((ret = mjpeg_decode_scan_progressive_ac(s, predictor,
                                                         ilv, prev_shift,
                                                         point_transform)) < 0)
@@ -1397,7 +1428,7 @@
         } else {
             if ((ret = mjpeg_decode_scan(s, nb_components,
                                          prev_shift, point_transform,
-                                         mb_bitmask, reference)) < 0)
+                                         mb_bitmask, mb_bitmask_size, reference)) < 0)
                 return ret;
         }
     }
@@ -1441,7 +1472,7 @@
     int len, id, i;
 
     len = get_bits(&s->gb, 16);
-    if (len < 5)
+    if (len < 6)
         return AVERROR_INVALIDDATA;
     if (8 * len > get_bits_left(&s->gb))
         return AVERROR_INVALIDDATA;
@@ -1449,8 +1480,11 @@
     id   = get_bits_long(&s->gb, 32);
     len -= 6;
 
-    if (s->avctx->debug & FF_DEBUG_STARTCODE)
-        av_log(s->avctx, AV_LOG_DEBUG, "APPx %8X len=%d\n", id, len);
+    if (s->avctx->debug & FF_DEBUG_STARTCODE) {
+        char id_str[32];
+        av_get_codec_tag_string(id_str, sizeof(id_str), av_bswap32(id));
+        av_log(s->avctx, AV_LOG_DEBUG, "APPx (%s / %8X) len=%d\n", id_str, id, len);
+    }
 
     /* Buggy AVID, it puts EOI only at every 10th frame. */
     /* Also, this fourcc is used by non-avid files too, it holds some
@@ -1506,12 +1540,12 @@
     }
 
     if (id == AV_RB32("Adob") && (get_bits(&s->gb, 8) == 'e')) {
-        if (s->avctx->debug & FF_DEBUG_PICT_INFO)
-            av_log(s->avctx, AV_LOG_INFO, "mjpeg: Adobe header found\n");
         skip_bits(&s->gb, 16); /* version */
         skip_bits(&s->gb, 16); /* flags0 */
         skip_bits(&s->gb, 16); /* flags1 */
-        skip_bits(&s->gb,  8); /* transform */
+        s->adobe_transform = get_bits(&s->gb,  8);
+        if (s->avctx->debug & FF_DEBUG_PICT_INFO)
+            av_log(s->avctx, AV_LOG_INFO, "mjpeg: Adobe header found, transform=%d\n", s->adobe_transform);
         len -= 7;
         goto out;
     }
@@ -1554,8 +1588,47 @@
         goto out;
     }
 
+    /* JPS extension by VRex */
+    if (s->start_code == APP3 && id == AV_RB32("_JPS") && len >= 10) {
+        int flags, layout, type;
+        if (s->avctx->debug & FF_DEBUG_PICT_INFO)
+            av_log(s->avctx, AV_LOG_INFO, "_JPSJPS_\n");
+
+        skip_bits(&s->gb, 32); len -= 4;  /* JPS_ */
+        skip_bits(&s->gb, 16); len -= 2;  /* block length */
+        skip_bits(&s->gb, 8);             /* reserved */
+        flags  = get_bits(&s->gb, 8);
+        layout = get_bits(&s->gb, 8);
+        type   = get_bits(&s->gb, 8);
+        len -= 4;
+
+        s->stereo3d = av_stereo3d_alloc();
+        if (!s->stereo3d) {
+            goto out;
+        }
+        if (type == 0) {
+            s->stereo3d->type = AV_STEREO3D_2D;
+        } else if (type == 1) {
+            switch (layout) {
+            case 0x01:
+                s->stereo3d->type = AV_STEREO3D_LINES;
+                break;
+            case 0x02:
+                s->stereo3d->type = AV_STEREO3D_SIDEBYSIDE;
+                break;
+            case 0x03:
+                s->stereo3d->type = AV_STEREO3D_TOPBOTTOM;
+                break;
+            }
+            if (!(flags & 0x04)) {
+                s->stereo3d->flags = AV_STEREO3D_FLAG_INVERT;
+            }
+        }
+        goto out;
+    }
+
     /* EXIF metadata */
-    if (s->start_code == APP1 && id == AV_RB32("Exif")) {
+    if (s->start_code == APP1 && id == AV_RB32("Exif") && len >= 2) {
         GetByteContext gbytes;
         int ret, le, ifd_offset, bytes_read;
         const uint8_t *aligned;
@@ -1642,9 +1715,7 @@
 
             /* buggy avid, it puts EOI only at every 10th frame */
             if (!strncmp(cbuf, "AVID", 4)) {
-                s->buggy_avid = 1;
-                if (len > 14 && cbuf[12] == 1) /* 1 - NTSC, 2 - PAL */
-                    s->interlace_polarity = 1;
+                parse_avid(s, cbuf, len);
             } else if (!strcmp(cbuf, "CS=ITU601"))
                 s->cs_itu601 = 1;
             else if ((!strncmp(cbuf, "Intel(R) JPEG Library, version 1", 32)) ||
@@ -1732,8 +1803,6 @@
         int t = 0, b = 0;
         PutBitContext pb;
 
-        s->cur_scan++;
-
         /* find marker */
         while (src + t < buf_end) {
             uint8_t x = src[t++];
@@ -1776,6 +1845,7 @@
 int ff_mjpeg_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
                           AVPacket *avpkt)
 {
+    AVFrame     *frame = data;
     const uint8_t *buf = avpkt->data;
     int buf_size       = avpkt->size;
     MJpegDecodeContext *s = avctx->priv_data;
@@ -1788,6 +1858,8 @@
     int ret = 0;
 
     av_dict_free(&s->exif_metadata);
+    av_freep(&s->stereo3d);
+    s->adobe_transform = -1;
 
     buf_ptr = buf;
     buf_end = buf + buf_size;
@@ -1798,7 +1870,7 @@
                                           &unescaped_buf_size);
         /* EOF */
         if (start_code < 0) {
-            goto the_end;
+            break;
         } else if (unescaped_buf_size > INT_MAX / 8) {
             av_log(avctx, AV_LOG_ERROR,
                    "MJPEG packet 0x%x too big (%d/%d), corrupt data?\n",
@@ -1901,7 +1973,7 @@
                 if (s->bottom_field == !s->interlace_polarity)
                     break;
             }
-            if ((ret = av_frame_ref(data, s->picture_ptr)) < 0)
+            if ((ret = av_frame_ref(frame, s->picture_ptr)) < 0)
                 return ret;
             *got_frame = 1;
             s->got_picture = 0;
@@ -1923,7 +1995,8 @@
 
             goto the_end;
         case SOS:
-            if ((ret = ff_mjpeg_decode_sos(s, NULL, NULL)) < 0 &&
+            s->cur_scan++;
+            if ((ret = ff_mjpeg_decode_sos(s, NULL, 0, NULL)) < 0 &&
                 (avctx->err_recognition & AV_EF_EXPLODE))
                 goto fail;
             break;
@@ -1951,7 +2024,7 @@
                "marker parser used %d bytes (%d bits)\n",
                (get_bits_count(&s->gb) + 7) / 8, get_bits_count(&s->gb));
     }
-    if (s->got_picture) {
+    if (s->got_picture && s->cur_scan) {
         av_log(avctx, AV_LOG_WARNING, "EOI missing, emulating\n");
         goto eoi_parser;
     }
@@ -1994,28 +2067,59 @@
             dst -= s->linesize[s->upscale_v];
         }
     }
-    if (s->flipped && (s->avctx->flags & CODEC_FLAG_EMU_EDGE)) {
+    if (s->flipped) {
         int j;
         avcodec_get_chroma_sub_sample(s->avctx->pix_fmt, &hshift, &vshift);
         for (index=0; index<4; index++) {
             uint8_t *dst = s->picture_ptr->data[index];
-            int w = s->width;
-            int h = s->height;
+            int w = s->picture_ptr->width;
+            int h = s->picture_ptr->height;
             if(index && index<3){
                 w = FF_CEIL_RSHIFT(w, hshift);
                 h = FF_CEIL_RSHIFT(h, vshift);
             }
             if(dst){
-                uint8_t *dst2 = dst + s->linesize[index]*(h-1);
+                uint8_t *dst2 = dst + s->picture_ptr->linesize[index]*(h-1);
                 for (i=0; i<h/2; i++) {
                     for (j=0; j<w; j++)
                         FFSWAP(int, dst[j], dst2[j]);
-                    dst  += s->linesize[index];
-                    dst2 -= s->linesize[index];
+                    dst  += s->picture_ptr->linesize[index];
+                    dst2 -= s->picture_ptr->linesize[index];
                 }
             }
         }
     }
+    if (s->adobe_transform == 0 && s->avctx->pix_fmt == AV_PIX_FMT_GBRAP) {
+        int w = s->picture_ptr->width;
+        int h = s->picture_ptr->height;
+        for (i=0; i<h; i++) {
+            int j;
+            uint8_t *dst[4];
+            for (index=0; index<4; index++) {
+                dst[index] =   s->picture_ptr->data[index]
+                             + s->picture_ptr->linesize[index]*i;
+            }
+            for (j=0; j<w; j++) {
+                int k = dst[3][j];
+                int r = dst[0][j] * k;
+                int g = dst[1][j] * k;
+                int b = dst[2][j] * k;
+                dst[0][j] = g*257 >> 16;
+                dst[1][j] = b*257 >> 16;
+                dst[2][j] = r*257 >> 16;
+                dst[3][j] = 255;
+            }
+        }
+    }
+
+    if (s->stereo3d) {
+        AVStereo3D *stereo = av_stereo3d_create_side_data(data);
+        if (stereo) {
+            stereo->type  = s->stereo3d->type;
+            stereo->flags = s->stereo3d->flags;
+        }
+        av_freep(&s->stereo3d);
+    }
 
     av_dict_copy(avpriv_frame_get_metadatap(data), s->exif_metadata, 0);
     av_dict_free(&s->exif_metadata);
@@ -2035,10 +2139,14 @@
         av_log(avctx, AV_LOG_INFO, "Single field\n");
     }
 
-    if (s->picture_ptr)
+    if (s->picture) {
+        av_frame_free(&s->picture);
+        s->picture_ptr = NULL;
+    } else if (s->picture_ptr)
         av_frame_unref(s->picture_ptr);
 
-    av_free(s->buffer);
+    av_freep(&s->buffer);
+    av_freep(&s->stereo3d);
     av_freep(&s->ljpeg_buffer);
     s->ljpeg_buffer_size = 0;

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/mjpegdec.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/mjpegdec.h Changed

@@ -30,6 +30,8 @@
 #define AVCODEC_MJPEGDEC_H
 
 #include "libavutil/log.h"
+#include "libavutil/pixdesc.h"
+#include "libavutil/stereo3d.h"
 
 #include "avcodec.h"
 #include "get_bits.h"
@@ -67,6 +69,7 @@
     int bits;           /* bits per component */
     int colr;
     int xfrm;
+    int adobe_transform;
 
     int maxval;
     int near;         ///< near lossless bound (si 0 for lossless)
@@ -90,7 +93,7 @@
     int h_max, v_max; /* maximum h and v counts */
     int quant_index[4];   /* quant table index for each component */
     int last_dc[MAX_COMPONENTS]; /* last DEQUANTIZED dc (XXX: am I right to do that ?) */
-    AVFrame picture; /* picture structure */
+    AVFrame *picture; /* picture structure */
     AVFrame *picture_ptr; /* pointer to picture structure */
     int got_picture;                                ///< we found a SOF and picture is valid, too.
     int linesize[MAX_COMPONENTS];                   ///< linesize << interlaced
@@ -120,6 +123,10 @@
 
     int extern_huff;
     AVDictionary *exif_metadata;
+
+    AVStereo3D *stereo3d; ///!< stereoscopic information (cached, since it is read before frame allocation)
+
+    const AVPixFmtDescriptor *pix_desc;
 } MJpegDecodeContext;
 
 int ff_mjpeg_decode_init(AVCodecContext *avctx);
@@ -131,7 +138,8 @@
 int ff_mjpeg_decode_dht(MJpegDecodeContext *s);
 int ff_mjpeg_decode_sof(MJpegDecodeContext *s);
 int ff_mjpeg_decode_sos(MJpegDecodeContext *s,
-                        const uint8_t *mb_bitmask, const AVFrame *reference);
+                        const uint8_t *mb_bitmask,int mb_bitmask_size,
+                        const AVFrame *reference);
 int ff_mjpeg_find_marker(MJpegDecodeContext *s,
                          const uint8_t **buf_ptr, const uint8_t *buf_end,
                          const uint8_t **unescaped_buf_ptr, int *unescaped_buf_size);

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/mjpegenc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/mjpegenc.c Changed

@@ -30,28 +30,25 @@
  * MJPEG encoder.
  */
 
+#include "libavutil/pixdesc.h"
+
 #include "avcodec.h"
 #include "mpegvideo.h"
 #include "mjpeg.h"
 #include "mjpegenc.h"
 
-/* use two quantizer tables (one for luminance and one for chrominance) */
-/* not yet working */
-#undef TWOMATRIXES
-
-
 av_cold int ff_mjpeg_encode_init(MpegEncContext *s)
 {
     MJpegContext *m;
 
     if (s->width > 65500 || s->height > 65500) {
         av_log(s, AV_LOG_ERROR, "JPEG does not support resolutions above 65500x65500\n");
-        return -1;
+        return AVERROR(EINVAL);
     }
 
     m = av_malloc(sizeof(MJpegContext));
     if (!m)
-        return -1;
+        return AVERROR(ENOMEM);
 
     s->min_qcoeff=-1023;
     s->max_qcoeff= 1023;
@@ -84,10 +81,9 @@
 }
 
 /* table_class: 0 = DC coef, 1 = AC coefs */
-static int put_huffman_table(MpegEncContext *s, int table_class, int table_id,
+static int put_huffman_table(PutBitContext *p, int table_class, int table_id,
                              const uint8_t *bits_table, const uint8_t *value_table)
 {
-    PutBitContext *p = &s->pb;
     int n, i;
 
     put_bits(p, 4, table_class);
@@ -105,40 +101,43 @@
     return n + 17;
 }
 
-static void jpeg_table_header(MpegEncContext *s)
+static void jpeg_table_header(AVCodecContext *avctx, PutBitContext *p,
+                              ScanTable *intra_scantable,
+                              uint16_t luma_intra_matrix[64],
+                              uint16_t chroma_intra_matrix[64],
+                              int hsample[3])
 {
-    PutBitContext *p = &s->pb;
     int i, j, size;
     uint8_t *ptr;
 
-    if (s->avctx->codec_id != AV_CODEC_ID_LJPEG) {
+    if (avctx->codec_id != AV_CODEC_ID_LJPEG) {
+        int matrix_count = 1 + !!memcmp(luma_intra_matrix,
+                                        chroma_intra_matrix,
+                                        sizeof(luma_intra_matrix[0]) * 64);
     /* quant matrixes */
     put_marker(p, DQT);
-#ifdef TWOMATRIXES
-    put_bits(p, 16, 2 + 2 * (1 + 64));
-#else
-    put_bits(p, 16, 2 + 1 * (1 + 64));
-#endif
+    put_bits(p, 16, 2 + matrix_count * (1 + 64));
     put_bits(p, 4, 0); /* 8 bit precision */
     put_bits(p, 4, 0); /* table 0 */
     for(i=0;i<64;i++) {
-        j = s->intra_scantable.permutated[i];
-        put_bits(p, 8, s->intra_matrix[j]);
-    }
-#ifdef TWOMATRIXES
-    put_bits(p, 4, 0); /* 8 bit precision */
-    put_bits(p, 4, 1); /* table 1 */
-    for(i=0;i<64;i++) {
-        j = s->intra_scantable.permutated[i];
-        put_bits(p, 8, s->chroma_intra_matrix[j]);
+        j = intra_scantable->permutated[i];
+        put_bits(p, 8, luma_intra_matrix[j]);
     }
-#endif
+
+        if (matrix_count > 1) {
+            put_bits(p, 4, 0); /* 8 bit precision */
+            put_bits(p, 4, 1); /* table 1 */
+            for(i=0;i<64;i++) {
+                j = intra_scantable->permutated[i];
+                put_bits(p, 8, chroma_intra_matrix[j]);
+            }
+        }
     }
 
-    if(s->avctx->active_thread_type & FF_THREAD_SLICE){
+    if(avctx->active_thread_type & FF_THREAD_SLICE){
         put_marker(p, DRI);
         put_bits(p, 16, 4);
-        put_bits(p, 16, (s->width-1)/(8*s->mjpeg_hsample[0]) + 1);
+        put_bits(p, 16, (avctx->width-1)/(8*hsample[0]) + 1);
     }
 
     /* huffman table */
@@ -147,40 +146,38 @@
     ptr = put_bits_ptr(p);
     put_bits(p, 16, 0); /* patched later */
     size = 2;
-    size += put_huffman_table(s, 0, 0, avpriv_mjpeg_bits_dc_luminance,
+    size += put_huffman_table(p, 0, 0, avpriv_mjpeg_bits_dc_luminance,
                               avpriv_mjpeg_val_dc);
-    size += put_huffman_table(s, 0, 1, avpriv_mjpeg_bits_dc_chrominance,
+    size += put_huffman_table(p, 0, 1, avpriv_mjpeg_bits_dc_chrominance,
                               avpriv_mjpeg_val_dc);
 
-    size += put_huffman_table(s, 1, 0, avpriv_mjpeg_bits_ac_luminance,
+    size += put_huffman_table(p, 1, 0, avpriv_mjpeg_bits_ac_luminance,
                               avpriv_mjpeg_val_ac_luminance);
-    size += put_huffman_table(s, 1, 1, avpriv_mjpeg_bits_ac_chrominance,
+    size += put_huffman_table(p, 1, 1, avpriv_mjpeg_bits_ac_chrominance,
                               avpriv_mjpeg_val_ac_chrominance);
     AV_WB16(ptr, size);
 }
 
-static void jpeg_put_comments(MpegEncContext *s)
+static void jpeg_put_comments(AVCodecContext *avctx, PutBitContext *p)
 {
-    PutBitContext *p = &s->pb;
     int size;
     uint8_t *ptr;
 
-    if (s->avctx->sample_aspect_ratio.num /* && !lossless */)
-    {
-    /* JFIF header */
-    put_marker(p, APP0);
-    put_bits(p, 16, 16);
-    avpriv_put_string(p, "JFIF", 1); /* this puts the trailing zero-byte too */
-    put_bits(p, 16, 0x0102); /* v 1.02 */
-    put_bits(p, 8, 0); /* units type: 0 - aspect ratio */
-    put_bits(p, 16, s->avctx->sample_aspect_ratio.num);
-    put_bits(p, 16, s->avctx->sample_aspect_ratio.den);
-    put_bits(p, 8, 0); /* thumbnail width */
-    put_bits(p, 8, 0); /* thumbnail height */
+    if (avctx->sample_aspect_ratio.num > 0 && avctx->sample_aspect_ratio.den > 0) {
+        /* JFIF header */
+        put_marker(p, APP0);
+        put_bits(p, 16, 16);
+        avpriv_put_string(p, "JFIF", 1); /* this puts the trailing zero-byte too */
+        put_bits(p, 16, 0x0102);         /* v 1.02 */
+        put_bits(p,  8, 0);              /* units type: 0 - aspect ratio */
+        put_bits(p, 16, avctx->sample_aspect_ratio.num);
+        put_bits(p, 16, avctx->sample_aspect_ratio.den);
+        put_bits(p, 8, 0); /* thumbnail width */
+        put_bits(p, 8, 0); /* thumbnail height */
     }
 
     /* comment */
-    if(!(s->flags & CODEC_FLAG_BITEXACT)){
+    if (!(avctx->flags & CODEC_FLAG_BITEXACT)) {
         put_marker(p, COM);
         flush_put_bits(p);
         ptr = put_bits_ptr(p);
@@ -190,9 +187,9 @@
         AV_WB16(ptr, size);
     }
 
-    if(  s->avctx->pix_fmt == AV_PIX_FMT_YUV420P
-       ||s->avctx->pix_fmt == AV_PIX_FMT_YUV422P
-       ||s->avctx->pix_fmt == AV_PIX_FMT_YUV444P){
+    if (avctx->pix_fmt == AV_PIX_FMT_YUV420P ||
+        avctx->pix_fmt == AV_PIX_FMT_YUV422P ||
+        avctx->pix_fmt == AV_PIX_FMT_YUV444P) {
         put_marker(p, COM);
         flush_put_bits(p);
         ptr = put_bits_ptr(p);
@@ -203,105 +200,144 @@
     }
 }
 
-void ff_mjpeg_encode_picture_header(MpegEncContext *s)
+void ff_mjpeg_init_hvsample(AVCodecContext *avctx, int hsample[3], int vsample[3])
 {
-    const int lossless= s->avctx->codec_id != AV_CODEC_ID_MJPEG;
+    int chroma_h_shift, chroma_v_shift;
+
+    av_pix_fmt_get_chroma_sub_sample(avctx->pix_fmt, &chroma_h_shift,
+                                     &chroma_v_shift);
+    if (avctx->codec->id == AV_CODEC_ID_LJPEG &&
+        (   avctx->pix_fmt == AV_PIX_FMT_BGR0
+         || avctx->pix_fmt == AV_PIX_FMT_BGRA
+         || avctx->pix_fmt == AV_PIX_FMT_BGR24)) {
+        vsample[0] = hsample[0] =
+        vsample[1] = hsample[1] =
+        vsample[2] = hsample[2] = 1;
+    } else if (avctx->pix_fmt == AV_PIX_FMT_YUV444P || avctx->pix_fmt == AV_PIX_FMT_YUVJ444P) {
+        vsample[0] = vsample[1] = vsample[2] = 2;
+        hsample[0] = hsample[1] = hsample[2] = 1;
+    } else {
+        vsample[0] = 2;
+        vsample[1] = 2 >> chroma_v_shift;
+        vsample[2] = 2 >> chroma_v_shift;
+        hsample[0] = 2;
+        hsample[1] = 2 >> chroma_h_shift;
+        hsample[2] = 2 >> chroma_h_shift;
+    }
+}
+
+void ff_mjpeg_encode_picture_header(AVCodecContext *avctx, PutBitContext *pb,
+                                    ScanTable *intra_scantable,
+                                    uint16_t luma_intra_matrix[64],
+                                    uint16_t chroma_intra_matrix[64])
+{
+    const int lossless = avctx->codec_id != AV_CODEC_ID_MJPEG && avctx->codec_id != AV_CODEC_ID_AMV;
+    int hsample[3], vsample[3];
     int i;
+    int chroma_matrix = !!memcmp(luma_intra_matrix,
+                                 chroma_intra_matrix,
+                                 sizeof(luma_intra_matrix[0])*64);
 
-    put_marker(&s->pb, SOI);
+    ff_mjpeg_init_hvsample(avctx, hsample, vsample);
+
+    put_marker(pb, SOI);
 
     // hack for AMV mjpeg format
-    if(s->avctx->codec_id == AV_CODEC_ID_AMV) goto end;
+    if(avctx->codec_id == AV_CODEC_ID_AMV) goto end;
 
-    jpeg_put_comments(s);
+    jpeg_put_comments(avctx, pb);
 
-    jpeg_table_header(s);
+    jpeg_table_header(avctx, pb, intra_scantable, luma_intra_matrix, chroma_intra_matrix, hsample);
 
-    switch(s->avctx->codec_id){
-    case AV_CODEC_ID_MJPEG:  put_marker(&s->pb, SOF0 ); break;
-    case AV_CODEC_ID_LJPEG:  put_marker(&s->pb, SOF3 ); break;
+    switch (avctx->codec_id) {
+    case AV_CODEC_ID_MJPEG:  put_marker(pb, SOF0 ); break;
+    case AV_CODEC_ID_LJPEG:  put_marker(pb, SOF3 ); break;
     default: av_assert0(0);
     }
 
-    put_bits(&s->pb, 16, 17);
-    if(lossless && (s->avctx->pix_fmt == AV_PIX_FMT_BGR0
-                    || s->avctx->pix_fmt == AV_PIX_FMT_BGRA
-                    || s->avctx->pix_fmt == AV_PIX_FMT_BGR24))
-        put_bits(&s->pb, 8, 9); /* 9 bits/component RCT */
+    put_bits(pb, 16, 17);
+    if (lossless && (  avctx->pix_fmt == AV_PIX_FMT_BGR0
+                    || avctx->pix_fmt == AV_PIX_FMT_BGRA
+                    || avctx->pix_fmt == AV_PIX_FMT_BGR24))
+        put_bits(pb, 8, 9); /* 9 bits/component RCT */
     else
-        put_bits(&s->pb, 8, 8); /* 8 bits/component */
-    put_bits(&s->pb, 16, s->height);
-    put_bits(&s->pb, 16, s->width);
-    put_bits(&s->pb, 8, 3); /* 3 components */
+        put_bits(pb, 8, 8); /* 8 bits/component */
+    put_bits(pb, 16, avctx->height);
+    put_bits(pb, 16, avctx->width);
+    put_bits(pb, 8, 3); /* 3 components */
 
     /* Y component */
-    put_bits(&s->pb, 8, 1); /* component number */
-    put_bits(&s->pb, 4, s->mjpeg_hsample[0]); /* H factor */
-    put_bits(&s->pb, 4, s->mjpeg_vsample[0]); /* V factor */
-    put_bits(&s->pb, 8, 0); /* select matrix */
+    put_bits(pb, 8, 1); /* component number */
+    put_bits(pb, 4, hsample[0]); /* H factor */
+    put_bits(pb, 4, vsample[0]); /* V factor */
+    put_bits(pb, 8, 0); /* select matrix */
 
     /* Cb component */
-    put_bits(&s->pb, 8, 2); /* component number */
-    put_bits(&s->pb, 4, s->mjpeg_hsample[1]); /* H factor */
-    put_bits(&s->pb, 4, s->mjpeg_vsample[1]); /* V factor */
-#ifdef TWOMATRIXES
-    put_bits(&s->pb, 8, lossless ? 0 : 1); /* select matrix */
-#else
-    put_bits(&s->pb, 8, 0); /* select matrix */
-#endif
+    put_bits(pb, 8, 2); /* component number */
+    put_bits(pb, 4, hsample[1]); /* H factor */
+    put_bits(pb, 4, vsample[1]); /* V factor */
+    put_bits(pb, 8, lossless ? 0 : chroma_matrix); /* select matrix */
 
     /* Cr component */
-    put_bits(&s->pb, 8, 3); /* component number */
-    put_bits(&s->pb, 4, s->mjpeg_hsample[2]); /* H factor */
-    put_bits(&s->pb, 4, s->mjpeg_vsample[2]); /* V factor */
-#ifdef TWOMATRIXES
-    put_bits(&s->pb, 8, lossless ? 0 : 1); /* select matrix */
-#else
-    put_bits(&s->pb, 8, 0); /* select matrix */
-#endif
+    put_bits(pb, 8, 3); /* component number */
+    put_bits(pb, 4, hsample[2]); /* H factor */
+    put_bits(pb, 4, vsample[2]); /* V factor */
+    put_bits(pb, 8, lossless ? 0 : chroma_matrix); /* select matrix */
 
     /* scan header */
-    put_marker(&s->pb, SOS);
-    put_bits(&s->pb, 16, 12); /* length */
-    put_bits(&s->pb, 8, 3); /* 3 components */
+    put_marker(pb, SOS);
+    put_bits(pb, 16, 12); /* length */
+    put_bits(pb, 8, 3); /* 3 components */
 
     /* Y component */
-    put_bits(&s->pb, 8, 1); /* index */
-    put_bits(&s->pb, 4, 0); /* DC huffman table index */
-    put_bits(&s->pb, 4, 0); /* AC huffman table index */
+    put_bits(pb, 8, 1); /* index */
+    put_bits(pb, 4, 0); /* DC huffman table index */
+    put_bits(pb, 4, 0); /* AC huffman table index */
 
     /* Cb component */
-    put_bits(&s->pb, 8, 2); /* index */
-    put_bits(&s->pb, 4, 1); /* DC huffman table index */
-    put_bits(&s->pb, 4, lossless ? 0 : 1); /* AC huffman table index */
+    put_bits(pb, 8, 2); /* index */
+    put_bits(pb, 4, 1); /* DC huffman table index */
+    put_bits(pb, 4, lossless ? 0 : 1); /* AC huffman table index */
 
     /* Cr component */
-    put_bits(&s->pb, 8, 3); /* index */
-    put_bits(&s->pb, 4, 1); /* DC huffman table index */
-    put_bits(&s->pb, 4, lossless ? 0 : 1); /* AC huffman table index */
+    put_bits(pb, 8, 3); /* index */
+    put_bits(pb, 4, 1); /* DC huffman table index */
+    put_bits(pb, 4, lossless ? 0 : 1); /* AC huffman table index */
 
-    put_bits(&s->pb, 8, lossless ? s->avctx->prediction_method+1 : 0); /* Ss (not used) */
+    put_bits(pb, 8, lossless ? avctx->prediction_method + 1 : 0); /* Ss (not used) */
 
-    switch(s->avctx->codec_id){
-    case AV_CODEC_ID_MJPEG:  put_bits(&s->pb, 8, 63); break; /* Se (not used) */
-    case AV_CODEC_ID_LJPEG:  put_bits(&s->pb, 8,  0); break; /* not used */
+    switch (avctx->codec_id) {
+    case AV_CODEC_ID_MJPEG:  put_bits(pb, 8, 63); break; /* Se (not used) */
+    case AV_CODEC_ID_LJPEG:  put_bits(pb, 8,  0); break; /* not used */
     default: av_assert0(0);
     }
 
-    put_bits(&s->pb, 8, 0); /* Ah/Al (not used) */
+    put_bits(pb, 8, 0); /* Ah/Al (not used) */
 
 end:
-    s->esc_pos = put_bits_count(&s->pb) >> 3;
-    for(i=1; i<s->slice_context_count; i++)
-        s->thread_context[i]->esc_pos = 0;
+    if (!lossless) {
+        MpegEncContext *s = avctx->priv_data;
+        av_assert0(avctx->codec->priv_data_size == sizeof(MpegEncContext));
+
+        s->esc_pos = put_bits_count(pb) >> 3;
+        for(i=1; i<s->slice_context_count; i++)
+            s->thread_context[i]->esc_pos = 0;
+    }
 }
 
-static void escape_FF(MpegEncContext *s, int start)
+void ff_mjpeg_escape_FF(PutBitContext *pb, int start)
 {
-    int size= put_bits_count(&s->pb) - start*8;
+    int size;
     int i, ff_count;
-    uint8_t *buf= s->pb.buf + start;
+    uint8_t *buf = pb->buf + start;
     int align= (-(size_t)(buf))&3;
+    int pad = (-put_bits_count(pb))&7;
+
+    if (pad)
+        put_bits(pb, pad, (1<<pad)-1);
+
+    flush_put_bits(pb);
+    size = put_bits_count(pb) - start * 8;
 
     av_assert1((size&7) == 0);
     size >>= 3;
@@ -333,8 +369,8 @@
 
     if(ff_count==0) return;
 
-    flush_put_bits(&s->pb);
-    skip_put_bytes(&s->pb, ff_count);
+    flush_put_bits(pb);
+    skip_put_bytes(pb, ff_count);
 
     for(i=size-1; ff_count; i--){
         int v= buf[i];
@@ -350,14 +386,11 @@
 
 void ff_mjpeg_encode_stuffing(MpegEncContext *s)
 {
-    int length, i;
+    int i;
     PutBitContext *pbc = &s->pb;
     int mb_y = s->mb_y - !s->mb_x;
-    length= (-put_bits_count(pbc))&7;
-    if(length) put_bits(pbc, length, (1<<length)-1);
 
-    flush_put_bits(&s->pb);
-    escape_FF(s, s->esc_pos);
+    ff_mjpeg_escape_FF(pbc, s->esc_pos);
 
     if((s->avctx->active_thread_type & FF_THREAD_SLICE) && mb_y < s->mb_height)
         put_marker(pbc, RST0 + (mb_y&7));
@@ -367,22 +400,20 @@
         s->last_dc[i] = 128 << s->intra_dc_precision;
 }
 
-void ff_mjpeg_encode_picture_trailer(MpegEncContext *s)
+void ff_mjpeg_encode_picture_trailer(PutBitContext *pb, int header_bits)
 {
+    av_assert1((header_bits & 7) == 0);
 
-    av_assert1((s->header_bits&7)==0);
-
-
-    put_marker(&s->pb, EOI);
+    put_marker(pb, EOI);
 }
 
-void ff_mjpeg_encode_dc(MpegEncContext *s, int val,
+void ff_mjpeg_encode_dc(PutBitContext *pb, int val,
                         uint8_t *huff_size, uint16_t *huff_code)
 {
     int mant, nbits;
 
     if (val == 0) {
-        put_bits(&s->pb, huff_size[0], huff_code[0]);
+        put_bits(pb, huff_size[0], huff_code[0]);
     } else {
         mant = val;
         if (val < 0) {
@@ -392,9 +423,9 @@
 
         nbits= av_log2_16bit(val) + 1;
 
-        put_bits(&s->pb, huff_size[nbits], huff_code[nbits]);
+        put_bits(pb, huff_size[nbits], huff_code[nbits]);
 
-        put_sbits(&s->pb, nbits, mant);
+        put_sbits(pb, nbits, mant);
     }
 }
 
@@ -411,11 +442,11 @@
     dc = block[0]; /* overflow is impossible */
     val = dc - s->last_dc[component];
     if (n < 4) {
-        ff_mjpeg_encode_dc(s, val, m->huff_size_dc_luminance, m->huff_code_dc_luminance);
+        ff_mjpeg_encode_dc(&s->pb, val, m->huff_size_dc_luminance, m->huff_code_dc_luminance);
         huff_size_ac = m->huff_size_ac_luminance;
         huff_code_ac = m->huff_code_ac_luminance;
     } else {
-        ff_mjpeg_encode_dc(s, val, m->huff_size_dc_chrominance, m->huff_code_dc_chrominance);
+        ff_mjpeg_encode_dc(&s->pb, val, m->huff_size_dc_chrominance, m->huff_code_dc_chrominance);
         huff_size_ac = m->huff_size_ac_chrominance;
         huff_code_ac = m->huff_code_ac_chrominance;
     }
@@ -441,7 +472,7 @@
                 mant--;
             }
 
-            nbits= av_log2(val) + 1;
+            nbits= av_log2_16bit(val) + 1;
             code = (run << 4) | nbits;
 
             put_bits(&s->pb, huff_size_ac[code], huff_code_ac[code]);
@@ -498,19 +529,28 @@
 
 {
     MpegEncContext *s = avctx->priv_data;
-    AVFrame pic = *pic_arg;
-    int i;
+    AVFrame *pic;
+    int i, ret;
+    int chroma_h_shift, chroma_v_shift;
+
+    av_pix_fmt_get_chroma_sub_sample(avctx->pix_fmt, &chroma_h_shift, &chroma_v_shift);
 
     //CODEC_FLAG_EMU_EDGE have to be cleared
     if(s->avctx->flags & CODEC_FLAG_EMU_EDGE)
-        return -1;
+        return AVERROR(EINVAL);
 
+    pic = av_frame_clone(pic_arg);
+    if (!pic)
+        return AVERROR(ENOMEM);
     //picture should be flipped upside-down
     for(i=0; i < 3; i++) {
-        pic.data[i] += (pic.linesize[i] * (s->mjpeg_vsample[i] * (8 * s->mb_height -((s->height/V_MAX)&7)) - 1 ));
-        pic.linesize[i] *= -1;
+        int vsample = i ? 2 >> chroma_v_shift : 2;
+        pic->data[i] += (pic->linesize[i] * (vsample * (8 * s->mb_height -((s->height/V_MAX)&7)) - 1 ));
+        pic->linesize[i] *= -1;
     }
-    return ff_MPV_encode_picture(avctx, pkt, &pic, got_packet);
+    ret = ff_MPV_encode_picture(avctx, pkt, pic, got_packet);
+    av_frame_free(&pic);
+    return ret;
 }
 
 #if CONFIG_MJPEG_ENCODER

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/mjpegenc.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/mjpegenc.h Changed

@@ -51,10 +51,15 @@
 
 int  ff_mjpeg_encode_init(MpegEncContext *s);
 void ff_mjpeg_encode_close(MpegEncContext *s);
-void ff_mjpeg_encode_picture_header(MpegEncContext *s);
-void ff_mjpeg_encode_picture_trailer(MpegEncContext *s);
+void ff_mjpeg_encode_picture_header(AVCodecContext *avctx, PutBitContext *pb,
+                                    ScanTable *intra_scantable,
+                                    uint16_t luma_intra_matrix[64],
+                                    uint16_t chroma_intra_matrix[64]);
+void ff_mjpeg_encode_picture_trailer(PutBitContext *pb, int header_bits);
+void ff_mjpeg_escape_FF(PutBitContext *pb, int start);
 void ff_mjpeg_encode_stuffing(MpegEncContext *s);
-void ff_mjpeg_encode_dc(MpegEncContext *s, int val,
+void ff_mjpeg_init_hvsample(AVCodecContext *avctx, int hsample[3], int vsample[3]);
+void ff_mjpeg_encode_dc(PutBitContext *pb, int val,
                         uint8_t *huff_size, uint16_t *huff_code);
 void ff_mjpeg_encode_mb(MpegEncContext *s, int16_t block[6][64]);

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/mlp.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/mlp.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/mlp_parser.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/mlp_parser.c Changed

@@ -170,14 +170,17 @@
         mh->group1_samplerate = mlp_samplerate(ratebits);
         mh->group2_samplerate = 0;
 
-        skip_bits(gb, 8);
+        skip_bits(gb, 4);
+
+        mh->channel_modifier_thd_stream0 = get_bits(gb, 2);
+        mh->channel_modifier_thd_stream1 = get_bits(gb, 2);
 
         mh->channel_arrangement=
         channel_arrangement            = get_bits(gb, 5);
         mh->channels_thd_stream1       = truehd_channels(channel_arrangement);
         mh->channel_layout_thd_stream1 = ff_truehd_layout(channel_arrangement);
 
-        skip_bits(gb, 2);
+        mh->channel_modifier_thd_stream2 = get_bits(gb, 2);
 
         channel_arrangement            = get_bits(gb, 13);
         mh->channels_thd_stream2       = truehd_channels(channel_arrangement);
@@ -340,7 +343,9 @@
 FF_ENABLE_DEPRECATION_WARNINGS
             } else
 #endif
-            if (avctx->request_channel_layout == AV_CH_LAYOUT_STEREO &&
+            if (avctx->request_channel_layout &&
+                (avctx->request_channel_layout & AV_CH_LAYOUT_STEREO) ==
+                avctx->request_channel_layout &&
                 mh.num_substreams > 1) {
                 avctx->channels       = 2;
                 avctx->channel_layout = AV_CH_LAYOUT_STEREO;
@@ -363,12 +368,16 @@
 FF_ENABLE_DEPRECATION_WARNINGS
             } else
 #endif
-            if (avctx->request_channel_layout == AV_CH_LAYOUT_STEREO &&
-                mh.num_substreams > 1) {
+                if (avctx->request_channel_layout &&
+                    (avctx->request_channel_layout & AV_CH_LAYOUT_STEREO) ==
+                    avctx->request_channel_layout &&
+                    mh.num_substreams > 1) {
                 avctx->channels       = 2;
                 avctx->channel_layout = AV_CH_LAYOUT_STEREO;
-            } else if (avctx->request_channel_layout == mh.channel_layout_thd_stream1 ||
-                       !mh.channels_thd_stream2) {
+            } else if (!mh.channels_thd_stream2 ||
+                       (avctx->request_channel_layout &&
+                        (avctx->request_channel_layout & mh.channel_layout_thd_stream1) ==
+                        avctx->request_channel_layout)) {
                 avctx->channels       = mh.channels_thd_stream1;
                 avctx->channel_layout = mh.channel_layout_thd_stream1;
             } else {

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/mlp_parser.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/mlp_parser.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/mlpdec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/mlpdec.c Changed

@@ -60,6 +60,8 @@
     uint8_t     ch_assign[MAX_CHANNELS];
     /// The channel layout for this substream
     uint64_t    ch_layout;
+    /// The matrix encoding mode for this substream
+    enum AVMatrixEncoding matrix_encoding;
 
     /// Channel coding parameters for channels in the substream
     ChannelParams channel_params[MAX_CHANNELS];
@@ -363,10 +365,22 @@
      * substream is Stereo. Subsequent substreams' layouts are indicated in the
      * major sync. */
     if (m->avctx->codec_id == AV_CODEC_ID_MLP) {
+        if (mh.stream_type != 0xbb) {
+            avpriv_request_sample(m->avctx,
+                        "unexpected stream_type %X in MLP",
+                        mh.stream_type);
+            return AVERROR_PATCHWELCOME;
+        }
         if ((substr = (mh.num_substreams > 1)))
             m->substream[0].ch_layout = AV_CH_LAYOUT_STEREO;
         m->substream[substr].ch_layout = mh.channel_layout_mlp;
     } else {
+        if (mh.stream_type != 0xba) {
+            avpriv_request_sample(m->avctx,
+                        "unexpected stream_type %X in !MLP",
+                        mh.stream_type);
+            return AVERROR_PATCHWELCOME;
+        }
         if ((substr = (mh.num_substreams > 1)))
             m->substream[0].ch_layout = AV_CH_LAYOUT_STEREO;
         if (mh.num_substreams > 2)
@@ -386,6 +400,46 @@
 
     m->needs_reordering = mh.channel_arrangement >= 18 && mh.channel_arrangement <= 20;
 
+    /* Parse the TrueHD decoder channel modifiers and set each substream's
+     * AVMatrixEncoding accordingly.
+     *
+     * The meaning of the modifiers depends on the channel layout:
+     *
+     * - THD_CH_MODIFIER_LTRT, THD_CH_MODIFIER_LBINRBIN only apply to 2-channel
+     *
+     * - THD_CH_MODIFIER_MONO applies to 1-channel or 2-channel (dual mono)
+     *
+     * - THD_CH_MODIFIER_SURROUNDEX, THD_CH_MODIFIER_NOTSURROUNDEX only apply to
+     *   layouts with an Ls/Rs channel pair
+     */
+    for (substr = 0; substr < MAX_SUBSTREAMS; substr++)
+        m->substream[substr].matrix_encoding = AV_MATRIX_ENCODING_NONE;
+    if (m->avctx->codec_id == AV_CODEC_ID_TRUEHD) {
+        if (mh.num_substreams > 2 &&
+            mh.channel_layout_thd_stream2 & AV_CH_SIDE_LEFT &&
+            mh.channel_layout_thd_stream2 & AV_CH_SIDE_RIGHT &&
+            mh.channel_modifier_thd_stream2 == THD_CH_MODIFIER_SURROUNDEX)
+            m->substream[2].matrix_encoding = AV_MATRIX_ENCODING_DOLBYEX;
+
+        if (mh.num_substreams > 1 &&
+            mh.channel_layout_thd_stream1 & AV_CH_SIDE_LEFT &&
+            mh.channel_layout_thd_stream1 & AV_CH_SIDE_RIGHT &&
+            mh.channel_modifier_thd_stream1 == THD_CH_MODIFIER_SURROUNDEX)
+            m->substream[1].matrix_encoding = AV_MATRIX_ENCODING_DOLBYEX;
+
+        if (mh.num_substreams > 0)
+            switch (mh.channel_modifier_thd_stream0) {
+            case THD_CH_MODIFIER_LTRT:
+                m->substream[0].matrix_encoding = AV_MATRIX_ENCODING_DOLBY;
+                break;
+            case THD_CH_MODIFIER_LBINRBIN:
+                m->substream[0].matrix_encoding = AV_MATRIX_ENCODING_DOLBYHEADPHONE;
+                break;
+            default:
+                break;
+            }
+    }
+
     return 0;
 }
 
@@ -474,8 +528,8 @@
 FF_ENABLE_DEPRECATION_WARNINGS
     } else
 #endif
-    if (m->avctx->request_channel_layout == s->ch_layout &&
-        m->max_decoded_substream > substr) {
+    if (m->avctx->request_channel_layout && (s->ch_layout & m->avctx->request_channel_layout) ==
+        m->avctx->request_channel_layout && m->max_decoded_substream > substr) {
         av_log(m->avctx, AV_LOG_DEBUG,
                "Extracting %d-channel downmix (0x%"PRIx64") from substream %d. "
                "Further substreams will be skipped.\n",
@@ -1044,6 +1098,10 @@
         }
     }
 
+    /* Update matrix encoding side data */
+    if ((ret = ff_side_data_update_matrix_encoding(frame, s->matrix_encoding)) < 0)
+        return ret;
+
     *got_frame_ptr = 1;
 
     return 0;

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/mmvideo.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/mmvideo.c Changed

@@ -48,7 +48,7 @@
 
 typedef struct MmContext {
     AVCodecContext *avctx;
-    AVFrame frame;
+    AVFrame *frame;
     int palette[AVPALETTE_COUNT];
     GetByteContext gb;
 } MmContext;
@@ -61,7 +61,9 @@
 
     avctx->pix_fmt = AV_PIX_FMT_PAL8;
 
-    avcodec_get_frame_defaults(&s->frame);
+    s->frame = av_frame_alloc();
+    if (!s->frame)
+        return AVERROR(ENOMEM);
 
     return 0;
 }
@@ -108,9 +110,9 @@
             return AVERROR_INVALIDDATA;
 
         if (color) {
-            memset(s->frame.data[0] + y*s->frame.linesize[0] + x, color, run_length);
+            memset(s->frame->data[0] + y*s->frame->linesize[0] + x, color, run_length);
             if (half_vert)
-                memset(s->frame.data[0] + (y+1)*s->frame.linesize[0] + x, color, run_length);
+                memset(s->frame->data[0] + (y+1)*s->frame->linesize[0] + x, color, run_length);
         }
         x+= run_length;
 
@@ -129,7 +131,8 @@
  */
 static int mm_decode_inter(MmContext * s, int half_horiz, int half_vert)
 {
-    int data_off = bytestream2_get_le16(&s->gb), y = 0;
+    int data_off = bytestream2_get_le16(&s->gb);
+    int y = 0;
     GetByteContext data_ptr;
 
     if (bytestream2_get_bytes_left(&s->gb) < data_off)
@@ -158,13 +161,13 @@
                     return AVERROR_INVALIDDATA;
                 if (replace) {
                     int color = bytestream2_get_byte(&data_ptr);
-                    s->frame.data[0][y*s->frame.linesize[0] + x] = color;
+                    s->frame->data[0][y*s->frame->linesize[0] + x] = color;
                     if (half_horiz)
-                        s->frame.data[0][y*s->frame.linesize[0] + x + 1] = color;
+                        s->frame->data[0][y*s->frame->linesize[0] + x + 1] = color;
                     if (half_vert) {
-                        s->frame.data[0][(y+1)*s->frame.linesize[0] + x] = color;
+                        s->frame->data[0][(y+1)*s->frame->linesize[0] + x] = color;
                         if (half_horiz)
-                            s->frame.data[0][(y+1)*s->frame.linesize[0] + x + 1] = color;
+                            s->frame->data[0][(y+1)*s->frame->linesize[0] + x + 1] = color;
                     }
                 }
                 x += 1 + half_horiz;
@@ -193,7 +196,7 @@
     buf_size -= MM_PREAMBLE_SIZE;
     bytestream2_init(&s->gb, buf, buf_size);
 
-    if ((res = ff_reget_buffer(avctx, &s->frame)) < 0)
+    if ((res = ff_reget_buffer(avctx, s->frame)) < 0)
         return res;
 
     switch(type) {
@@ -211,9 +214,9 @@
     if (res < 0)
         return res;
 
-    memcpy(s->frame.data[1], s->palette, AVPALETTE_SIZE);
+    memcpy(s->frame->data[1], s->palette, AVPALETTE_SIZE);
 
-    if ((res = av_frame_ref(data, &s->frame)) < 0)
+    if ((res = av_frame_ref(data, s->frame)) < 0)
         return res;
 
     *got_frame      = 1;
@@ -225,7 +228,7 @@
 {
     MmContext *s = avctx->priv_data;
 
-    av_frame_unref(&s->frame);
+    av_frame_free(&s->frame);
 
     return 0;
 }

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/motion_est.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/motion_est.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/motionpixels.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/motionpixels.c Changed

@@ -36,7 +36,7 @@
 
 typedef struct MotionPixelsContext {
     AVCodecContext *avctx;
-    AVFrame frame;
+    AVFrame *frame;
     DSPContext dsp;
     uint8_t *changes_map;
     int offset_bits_len;
@@ -50,6 +50,19 @@
     int bswapbuf_size;
 } MotionPixelsContext;
 
+static av_cold int mp_decode_end(AVCodecContext *avctx)
+{
+    MotionPixelsContext *mp = avctx->priv_data;
+
+    av_freep(&mp->changes_map);
+    av_freep(&mp->vpt);
+    av_freep(&mp->hpt);
+    av_freep(&mp->bswapbuf);
+    av_frame_free(&mp->frame);
+
+    return 0;
+}
+
 static av_cold int mp_decode_init(AVCodecContext *avctx)
 {
     MotionPixelsContext *mp = avctx->priv_data;
@@ -75,7 +88,13 @@
         return AVERROR(ENOMEM);
     }
     avctx->pix_fmt = AV_PIX_FMT_RGB555;
-    avcodec_get_frame_defaults(&mp->frame);
+
+    mp->frame = av_frame_alloc();
+    if (!mp->frame) {
+        mp_decode_end(avctx);
+        return AVERROR(ENOMEM);
+    }
+
     return 0;
 }
 
@@ -96,14 +115,14 @@
             continue;
         w = FFMIN(w, mp->avctx->width  - x);
         h = FFMIN(h, mp->avctx->height - y);
-        pixels = (uint16_t *)&mp->frame.data[0][y * mp->frame.linesize[0] + x * 2];
+        pixels = (uint16_t *)&mp->frame->data[0][y * mp->frame->linesize[0] + x * 2];
         while (h--) {
             mp->changes_map[offset] = w;
             if (read_color)
                 for (i = 0; i < w; ++i)
                     pixels[i] = color;
             offset += mp->avctx->width;
-            pixels += mp->frame.linesize[0] / 2;
+            pixels += mp->frame->linesize[0] / 2;
         }
     }
 }
@@ -165,7 +184,7 @@
 {
     int color;
 
-    color = *(uint16_t *)&mp->frame.data[0][y * mp->frame.linesize[0] + x * 2];
+    color = *(uint16_t *)&mp->frame->data[0][y * mp->frame->linesize[0] + x * 2];
     return mp_rgb_yuv_table[color];
 }
 
@@ -174,7 +193,7 @@
     int color;
 
     color = mp_yuv_to_rgb(p->y, p->v, p->u, 1);
-    *(uint16_t *)&mp->frame.data[0][y * mp->frame.linesize[0] + x * 2] = color;
+    *(uint16_t *)&mp->frame->data[0][y * mp->frame->linesize[0] + x * 2] = color;
 }
 
 static int mp_get_vlc(MotionPixelsContext *mp, GetBitContext *gb)
@@ -271,17 +290,16 @@
     GetBitContext gb;
     int i, count1, count2, sz, ret;
 
-    if ((ret = ff_reget_buffer(avctx, &mp->frame)) < 0)
+    if ((ret = ff_reget_buffer(avctx, mp->frame)) < 0)
         return ret;
 
     /* le32 bitstream msb first */
-    av_fast_malloc(&mp->bswapbuf, &mp->bswapbuf_size, buf_size + FF_INPUT_BUFFER_PADDING_SIZE);
+    av_fast_padded_malloc(&mp->bswapbuf, &mp->bswapbuf_size, buf_size);
     if (!mp->bswapbuf)
         return AVERROR(ENOMEM);
     mp->dsp.bswap_buf((uint32_t *)mp->bswapbuf, (const uint32_t *)buf, buf_size / 4);
     if (buf_size & 3)
         memcpy(mp->bswapbuf + (buf_size & ~3), buf + (buf_size & ~3), buf_size & 3);
-    memset(mp->bswapbuf + buf_size, 0, FF_INPUT_BUFFER_PADDING_SIZE);
     init_get_bits(&gb, mp->bswapbuf, buf_size * 8);
 
     memset(mp->changes_map, 0, avctx->width * avctx->height);
@@ -297,7 +315,7 @@
         goto end;
 
     if (mp->changes_map[0] == 0) {
-        *(uint16_t *)mp->frame.data[0] = get_bits(&gb, 15);
+        *(uint16_t *)mp->frame->data[0] = get_bits(&gb, 15);
         mp->changes_map[0] = 1;
     }
     if (mp_read_codes_table(mp, &gb) < 0)
@@ -317,25 +335,12 @@
     ff_free_vlc(&mp->vlc);
 
 end:
-    if ((ret = av_frame_ref(data, &mp->frame)) < 0)
+    if ((ret = av_frame_ref(data, mp->frame)) < 0)
         return ret;
     *got_frame       = 1;
     return buf_size;
 }
 
-static av_cold int mp_decode_end(AVCodecContext *avctx)
-{
-    MotionPixelsContext *mp = avctx->priv_data;
-
-    av_freep(&mp->changes_map);
-    av_freep(&mp->vpt);
-    av_freep(&mp->hpt);
-    av_freep(&mp->bswapbuf);
-    av_frame_unref(&mp->frame);
-
-    return 0;
-}
-
 AVCodec ff_motionpixels_decoder = {
     .name           = "motionpixels",
     .long_name      = NULL_IF_CONFIG_SMALL("Motion Pixels video"),

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/mpeg12.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/mpeg12.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/mpeg12dec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/mpeg12dec.c Changed

@@ -25,32 +25,40 @@
  * MPEG-1/2 decoder
  */
 
+#define UNCHECKED_BITSTREAM_READER 1
 #include "libavutil/attributes.h"
 #include "libavutil/internal.h"
-#include "internal.h"
+#include "libavutil/stereo3d.h"
+
 #include "avcodec.h"
+#include "bytestream.h"
 #include "dsputil.h"
-#include "mpegvideo.h"
 #include "error_resilience.h"
+#include "internal.h"
 #include "mpeg12.h"
 #include "mpeg12data.h"
-#include "bytestream.h"
+#include "mpegvideo.h"
+#include "thread.h"
+#include "version.h"
 #include "vdpau_internal.h"
 #include "xvmc_internal.h"
-#include "thread.h"
 
 typedef struct Mpeg1Context {
     MpegEncContext mpeg_enc_ctx;
     int mpeg_enc_ctx_allocated; /* true if decoding context allocated */
-    int repeat_field; /* true if we must repeat the field */
-    AVPanScan pan_scan;              /**< some temporary storage for the panscan */
+    int repeat_field;           /* true if we must repeat the field */
+    AVPanScan pan_scan;         /* some temporary storage for the panscan */
+    AVStereo3D stereo3d;
+    int has_stereo3d;
+    uint8_t *a53_caption;
+    int a53_caption_size;
     int slice_count;
-    int swap_uv;//indicate VCR2
     int save_aspect_info;
     int save_width, save_height, save_progressive_seq;
-    AVRational frame_rate_ext;       ///< MPEG-2 specific framerate modificator
-    int sync;                        ///< Did we reach a sync point like a GOP/SEQ/KEYFrame?
+    AVRational frame_rate_ext;  /* MPEG-2 specific framerate modificator */
+    int sync;                   /* Did we reach a sync point like a GOP/SEQ/KEYFrame? */
     int tmpgexs;
+    int first_slice;
     int extradata_decoded;
 } Mpeg1Context;
 
@@ -81,10 +89,10 @@
 };
 
 static const uint8_t non_linear_qscale[32] = {
-    0, 1, 2, 3, 4, 5, 6, 7,
-    8,10,12,14,16,18,20,22,
-    24,28,32,36,40,44,48,52,
-    56,64,72,80,88,96,104,112,
+     0,  1,  2,  3,  4,  5,   6,   7,
+     8, 10, 12, 14, 16, 18,  20,  22,
+    24, 28, 32, 36, 40, 44,  48,  52,
+    56, 64, 72, 80, 88, 96, 104, 112,
 };
 
 /* as H.263, but only 17 codes */
@@ -93,12 +101,10 @@
     int code, sign, val, shift;
 
     code = get_vlc2(&s->gb, ff_mv_vlc.table, MV_VLC_BITS, 2);
-    if (code == 0) {
+    if (code == 0)
         return pred;
-    }
-    if (code < 0) {
+    if (code < 0)
         return 0xffff;
-    }
 
     sign  = get_bits1(&s->gb);
     shift = fcode - 1;
@@ -116,12 +122,22 @@
     return sign_extend(val, 5 + shift);
 }
 
-static inline int mpeg1_decode_block_intra(MpegEncContext *s, int16_t *block, int n)
+#define check_scantable_index(ctx, x)                                         \
+    do {                                                                      \
+        if ((x) > 63) {                                                       \
+            av_log(ctx->avctx, AV_LOG_ERROR, "ac-tex damaged at %d %d\n",     \
+                   ctx->mb_x, ctx->mb_y);                                     \
+            return AVERROR_INVALIDDATA;                                       \
+        }                                                                     \
+    } while (0)
+
+static inline int mpeg1_decode_block_intra(MpegEncContext *s,
+                                           int16_t *block, int n)
 {
     int level, dc, diff, i, j, run;
     int component;
-    RLTable *rl = &ff_rl_mpeg1;
-    uint8_t * const scantable    = s->intra_scantable.permutated;
+    RLTable *rl                  = &ff_rl_mpeg1;
+    uint8_t *const scantable     = s->intra_scantable.permutated;
     const uint16_t *quant_matrix = s->intra_matrix;
     const int qscale             = s->qscale;
 
@@ -138,31 +154,40 @@
     i = 0;
     {
         OPEN_READER(re, &s->gb);
+        UPDATE_CACHE(re, &s->gb);
+        if (((int32_t)GET_CACHE(re, &s->gb)) <= (int32_t)0xBFFFFFFF)
+            goto end;
+
         /* now quantify & encode AC coefficients */
         for (;;) {
-            UPDATE_CACHE(re, &s->gb);
-            GET_RL_VLC(level, run, re, &s->gb, rl->rl_vlc[0], TEX_VLC_BITS, 2, 0);
+            GET_RL_VLC(level, run, re, &s->gb, rl->rl_vlc[0],
+                       TEX_VLC_BITS, 2, 0);
 
-            if (level == 127) {
-                break;
-            } else if (level != 0) {
+            if (level != 0) {
                 i += run;
+                check_scantable_index(s, i);
                 j = scantable[i];
                 level = (level * qscale * quant_matrix[j]) >> 4;
                 level = (level - 1) | 1;
-                level = (level ^ SHOW_SBITS(re, &s->gb, 1)) - SHOW_SBITS(re, &s->gb, 1);
-                LAST_SKIP_BITS(re, &s->gb, 1);
+                level = (level ^ SHOW_SBITS(re, &s->gb, 1)) -
+                        SHOW_SBITS(re, &s->gb, 1);
+                SKIP_BITS(re, &s->gb, 1);
             } else {
                 /* escape */
-                run = SHOW_UBITS(re, &s->gb, 6) + 1; LAST_SKIP_BITS(re, &s->gb, 6);
+                run = SHOW_UBITS(re, &s->gb, 6) + 1;
+                LAST_SKIP_BITS(re, &s->gb, 6);
                 UPDATE_CACHE(re, &s->gb);
-                level = SHOW_SBITS(re, &s->gb, 8); SKIP_BITS(re, &s->gb, 8);
+                level = SHOW_SBITS(re, &s->gb, 8);
+                SKIP_BITS(re, &s->gb, 8);
                 if (level == -128) {
-                    level = SHOW_UBITS(re, &s->gb, 8) - 256; LAST_SKIP_BITS(re, &s->gb, 8);
+                    level = SHOW_UBITS(re, &s->gb, 8) - 256;
+                    SKIP_BITS(re, &s->gb, 8);
                 } else if (level == 0) {
-                    level = SHOW_UBITS(re, &s->gb, 8)      ; LAST_SKIP_BITS(re, &s->gb, 8);
+                    level = SHOW_UBITS(re, &s->gb, 8);
+                    SKIP_BITS(re, &s->gb, 8);
                 }
                 i += run;
+                check_scantable_index(s, i);
                 j = scantable[i];
                 if (level < 0) {
                     level = -level;
@@ -174,17 +199,19 @@
                     level = (level - 1) | 1;
                 }
             }
-            if (i > 63) {
-                av_log(s->avctx, AV_LOG_ERROR, "ac-tex damaged at %d %d\n", s->mb_x, s->mb_y);
-                return -1;
-            }
 
             block[j] = level;
+            if (((int32_t)GET_CACHE(re, &s->gb)) <= (int32_t)0xBFFFFFFF)
+               break;
+
+            UPDATE_CACHE(re, &s->gb);
         }
+end:
+        LAST_SKIP_BITS(re, &s->gb, 2);
         CLOSE_READER(re, &s->gb);
     }
     s->block_last_index[n] = i;
-   return 0;
+    return 0;
 }
 
 int ff_mpeg1_decode_block_intra(MpegEncContext *s, int16_t *block, int n)
@@ -192,11 +219,12 @@
     return mpeg1_decode_block_intra(s, block, n);
 }
 
-static inline int mpeg1_decode_block_inter(MpegEncContext *s, int16_t *block, int n)
+static inline int mpeg1_decode_block_inter(MpegEncContext *s,
+                                           int16_t *block, int n)
 {
     int level, i, j, run;
-    RLTable *rl = &ff_rl_mpeg1;
-    uint8_t * const scantable    = s->intra_scantable.permutated;
+    RLTable *rl                  = &ff_rl_mpeg1;
+    uint8_t *const scantable     = s->intra_scantable.permutated;
     const uint16_t *quant_matrix = s->inter_matrix;
     const int qscale             = s->qscale;
 
@@ -205,7 +233,7 @@
         i = -1;
         // special case for first coefficient, no need to add second VLC table
         UPDATE_CACHE(re, &s->gb);
-        if (((int32_t)GET_CACHE(re, &s->gb)) < 0) {
+        if (((int32_t) GET_CACHE(re, &s->gb)) < 0) {
             level = (3 * qscale * quant_matrix[0]) >> 5;
             level = (level - 1) | 1;
             if (GET_CACHE(re, &s->gb) & 0x40000000)
@@ -213,31 +241,39 @@
             block[0] = level;
             i++;
             SKIP_BITS(re, &s->gb, 2);
-            if (((int32_t)GET_CACHE(re, &s->gb)) <= (int32_t)0xBFFFFFFF)
+            if (((int32_t) GET_CACHE(re, &s->gb)) <= (int32_t) 0xBFFFFFFF)
                 goto end;
         }
         /* now quantify & encode AC coefficients */
         for (;;) {
-            GET_RL_VLC(level, run, re, &s->gb, rl->rl_vlc[0], TEX_VLC_BITS, 2, 0);
+            GET_RL_VLC(level, run, re, &s->gb, rl->rl_vlc[0],
+                       TEX_VLC_BITS, 2, 0);
 
             if (level != 0) {
                 i += run;
+                check_scantable_index(s, i);
                 j = scantable[i];
                 level = ((level * 2 + 1) * qscale * quant_matrix[j]) >> 5;
                 level = (level - 1) | 1;
-                level = (level ^ SHOW_SBITS(re, &s->gb, 1)) - SHOW_SBITS(re, &s->gb, 1);
+                level = (level ^ SHOW_SBITS(re, &s->gb, 1)) -
+                        SHOW_SBITS(re, &s->gb, 1);
                 SKIP_BITS(re, &s->gb, 1);
             } else {
                 /* escape */
-                run = SHOW_UBITS(re, &s->gb, 6) + 1; LAST_SKIP_BITS(re, &s->gb, 6);
+                run = SHOW_UBITS(re, &s->gb, 6) + 1;
+                LAST_SKIP_BITS(re, &s->gb, 6);
                 UPDATE_CACHE(re, &s->gb);
-                level = SHOW_SBITS(re, &s->gb, 8); SKIP_BITS(re, &s->gb, 8);
+                level = SHOW_SBITS(re, &s->gb, 8);
+                SKIP_BITS(re, &s->gb, 8);
                 if (level == -128) {
-                    level = SHOW_UBITS(re, &s->gb, 8) - 256; SKIP_BITS(re, &s->gb, 8);
+                    level = SHOW_UBITS(re, &s->gb, 8) - 256;
+                    SKIP_BITS(re, &s->gb, 8);
                 } else if (level == 0) {
-                    level = SHOW_UBITS(re, &s->gb, 8)      ; SKIP_BITS(re, &s->gb, 8);
+                    level = SHOW_UBITS(re, &s->gb, 8);
+                    SKIP_BITS(re, &s->gb, 8);
                 }
                 i += run;
+                check_scantable_index(s, i);
                 j = scantable[i];
                 if (level < 0) {
                     level = -level;
@@ -249,13 +285,9 @@
                     level = (level - 1) | 1;
                 }
             }
-            if (i > 63) {
-                av_log(s->avctx, AV_LOG_ERROR, "ac-tex damaged at %d %d\n", s->mb_x, s->mb_y);
-                return -1;
-            }
 
             block[j] = level;
-            if (((int32_t)GET_CACHE(re, &s->gb)) <= (int32_t)0xBFFFFFFF)
+            if (((int32_t) GET_CACHE(re, &s->gb)) <= (int32_t) 0xBFFFFFFF)
                 break;
             UPDATE_CACHE(re, &s->gb);
         }
@@ -272,19 +304,20 @@
  * Changing this would eat up any speed benefits it has.
  * Do not use "fast" flag if you need the code to be robust.
  */
-static inline int mpeg1_fast_decode_block_inter(MpegEncContext *s, int16_t *block, int n)
+static inline int mpeg1_fast_decode_block_inter(MpegEncContext *s,
+                                                int16_t *block, int n)
 {
     int level, i, j, run;
-    RLTable *rl = &ff_rl_mpeg1;
-    uint8_t * const scantable = s->intra_scantable.permutated;
-    const int qscale          = s->qscale;
+    RLTable *rl              = &ff_rl_mpeg1;
+    uint8_t *const scantable = s->intra_scantable.permutated;
+    const int qscale         = s->qscale;
 
     {
         OPEN_READER(re, &s->gb);
         i = -1;
-        // special case for first coefficient, no need to add second VLC table
+        // Special case for first coefficient, no need to add second VLC table.
         UPDATE_CACHE(re, &s->gb);
-        if (((int32_t)GET_CACHE(re, &s->gb)) < 0) {
+        if (((int32_t) GET_CACHE(re, &s->gb)) < 0) {
             level = (3 * qscale) >> 1;
             level = (level - 1) | 1;
             if (GET_CACHE(re, &s->gb) & 0x40000000)
@@ -292,32 +325,40 @@
             block[0] = level;
             i++;
             SKIP_BITS(re, &s->gb, 2);
-            if (((int32_t)GET_CACHE(re, &s->gb)) <= (int32_t)0xBFFFFFFF)
+            if (((int32_t) GET_CACHE(re, &s->gb)) <= (int32_t) 0xBFFFFFFF)
                 goto end;
         }
 
         /* now quantify & encode AC coefficients */
         for (;;) {
-            GET_RL_VLC(level, run, re, &s->gb, rl->rl_vlc[0], TEX_VLC_BITS, 2, 0);
+            GET_RL_VLC(level, run, re, &s->gb, rl->rl_vlc[0],
+                       TEX_VLC_BITS, 2, 0);
 
             if (level != 0) {
                 i += run;
+                check_scantable_index(s, i);
                 j = scantable[i];
                 level = ((level * 2 + 1) * qscale) >> 1;
                 level = (level - 1) | 1;
-                level = (level ^ SHOW_SBITS(re, &s->gb, 1)) - SHOW_SBITS(re, &s->gb, 1);
+                level = (level ^ SHOW_SBITS(re, &s->gb, 1)) -
+                        SHOW_SBITS(re, &s->gb, 1);
                 SKIP_BITS(re, &s->gb, 1);
             } else {
                 /* escape */
-                run = SHOW_UBITS(re, &s->gb, 6)+1; LAST_SKIP_BITS(re, &s->gb, 6);
+                run = SHOW_UBITS(re, &s->gb, 6) + 1;
+                LAST_SKIP_BITS(re, &s->gb, 6);
                 UPDATE_CACHE(re, &s->gb);
-                level = SHOW_SBITS(re, &s->gb, 8); SKIP_BITS(re, &s->gb, 8);
+                level = SHOW_SBITS(re, &s->gb, 8);
+                SKIP_BITS(re, &s->gb, 8);
                 if (level == -128) {
-                    level = SHOW_UBITS(re, &s->gb, 8) - 256; SKIP_BITS(re, &s->gb, 8);
+                    level = SHOW_UBITS(re, &s->gb, 8) - 256;
+                    SKIP_BITS(re, &s->gb, 8);
                 } else if (level == 0) {
-                    level = SHOW_UBITS(re, &s->gb, 8)      ; SKIP_BITS(re, &s->gb, 8);
+                    level = SHOW_UBITS(re, &s->gb, 8);
+                    SKIP_BITS(re, &s->gb, 8);
                 }
                 i += run;
+                check_scantable_index(s, i);
                 j = scantable[i];
                 if (level < 0) {
                     level = -level;
@@ -331,7 +372,7 @@
             }
 
             block[j] = level;
-            if (((int32_t)GET_CACHE(re, &s->gb)) <= (int32_t)0xBFFFFFFF)
+            if (((int32_t) GET_CACHE(re, &s->gb)) <= (int32_t) 0xBFFFFFFF)
                 break;
             UPDATE_CACHE(re, &s->gb);
         }
@@ -343,12 +384,12 @@
     return 0;
 }
 
-
-static inline int mpeg2_decode_block_non_intra(MpegEncContext *s, int16_t *block, int n)
+static inline int mpeg2_decode_block_non_intra(MpegEncContext *s,
+                                               int16_t *block, int n)
 {
     int level, i, j, run;
     RLTable *rl = &ff_rl_mpeg1;
-    uint8_t * const scantable = s->intra_scantable.permutated;
+    uint8_t *const scantable = s->intra_scantable.permutated;
     const uint16_t *quant_matrix;
     const int qscale = s->qscale;
     int mismatch;
@@ -363,37 +404,43 @@
         else
             quant_matrix = s->chroma_inter_matrix;
 
-        // special case for first coefficient, no need to add second VLC table
+        // Special case for first coefficient, no need to add second VLC table.
         UPDATE_CACHE(re, &s->gb);
-        if (((int32_t)GET_CACHE(re, &s->gb)) < 0) {
-            level= (3 * qscale * quant_matrix[0]) >> 5;
+        if (((int32_t) GET_CACHE(re, &s->gb)) < 0) {
+            level = (3 * qscale * quant_matrix[0]) >> 5;
             if (GET_CACHE(re, &s->gb) & 0x40000000)
                 level = -level;
             block[0]  = level;
             mismatch ^= level;
             i++;
             SKIP_BITS(re, &s->gb, 2);
-            if (((int32_t)GET_CACHE(re, &s->gb)) <= (int32_t)0xBFFFFFFF)
+            if (((int32_t) GET_CACHE(re, &s->gb)) <= (int32_t) 0xBFFFFFFF)
                 goto end;
         }
 
         /* now quantify & encode AC coefficients */
         for (;;) {
-            GET_RL_VLC(level, run, re, &s->gb, rl->rl_vlc[0], TEX_VLC_BITS, 2, 0);
+            GET_RL_VLC(level, run, re, &s->gb, rl->rl_vlc[0],
+                       TEX_VLC_BITS, 2, 0);
 
             if (level != 0) {
                 i += run;
+                check_scantable_index(s, i);
                 j = scantable[i];
                 level = ((level * 2 + 1) * qscale * quant_matrix[j]) >> 5;
-                level = (level ^ SHOW_SBITS(re, &s->gb, 1)) - SHOW_SBITS(re, &s->gb, 1);
+                level = (level ^ SHOW_SBITS(re, &s->gb, 1)) -
+                        SHOW_SBITS(re, &s->gb, 1);
                 SKIP_BITS(re, &s->gb, 1);
             } else {
                 /* escape */
-                run = SHOW_UBITS(re, &s->gb, 6) + 1; LAST_SKIP_BITS(re, &s->gb, 6);
+                run = SHOW_UBITS(re, &s->gb, 6) + 1;
+                LAST_SKIP_BITS(re, &s->gb, 6);
                 UPDATE_CACHE(re, &s->gb);
-                level = SHOW_SBITS(re, &s->gb, 12); SKIP_BITS(re, &s->gb, 12);
+                level = SHOW_SBITS(re, &s->gb, 12);
+                SKIP_BITS(re, &s->gb, 12);
 
                 i += run;
+                check_scantable_index(s, i);
                 j = scantable[i];
                 if (level < 0) {
                     level = ((-level * 2 + 1) * qscale * quant_matrix[j]) >> 5;
@@ -402,14 +449,10 @@
                     level = ((level * 2 + 1) * qscale * quant_matrix[j]) >> 5;
                 }
             }
-            if (i > 63) {
-                av_log(s->avctx, AV_LOG_ERROR, "ac-tex damaged at %d %d\n", s->mb_x, s->mb_y);
-                return -1;
-            }
 
             mismatch ^= level;
             block[j]  = level;
-            if (((int32_t)GET_CACHE(re, &s->gb)) <= (int32_t)0xBFFFFFFF)
+            if (((int32_t) GET_CACHE(re, &s->gb)) <= (int32_t) 0xBFFFFFFF)
                 break;
             UPDATE_CACHE(re, &s->gb);
         }
@@ -432,22 +475,22 @@
                                                     int16_t *block, int n)
 {
     int level, i, j, run;
-    RLTable *rl = &ff_rl_mpeg1;
-    uint8_t * const scantable = s->intra_scantable.permutated;
-    const int qscale          = s->qscale;
+    RLTable *rl              = &ff_rl_mpeg1;
+    uint8_t *const scantable = s->intra_scantable.permutated;
+    const int qscale         = s->qscale;
     OPEN_READER(re, &s->gb);
     i = -1;
 
     // special case for first coefficient, no need to add second VLC table
     UPDATE_CACHE(re, &s->gb);
-    if (((int32_t)GET_CACHE(re, &s->gb)) < 0) {
+    if (((int32_t) GET_CACHE(re, &s->gb)) < 0) {
         level = (3 * qscale) >> 1;
         if (GET_CACHE(re, &s->gb) & 0x40000000)
             level = -level;
         block[0] = level;
         i++;
         SKIP_BITS(re, &s->gb, 2);
-        if (((int32_t)GET_CACHE(re, &s->gb)) <= (int32_t)0xBFFFFFFF)
+        if (((int32_t) GET_CACHE(re, &s->gb)) <= (int32_t) 0xBFFFFFFF)
             goto end;
     }
 
@@ -457,18 +500,21 @@
 
         if (level != 0) {
             i += run;
-            j  = scantable[i];
+            j = scantable[i];
             level = ((level * 2 + 1) * qscale) >> 1;
-            level = (level ^ SHOW_SBITS(re, &s->gb, 1)) - SHOW_SBITS(re, &s->gb, 1);
+            level = (level ^ SHOW_SBITS(re, &s->gb, 1)) -
+                    SHOW_SBITS(re, &s->gb, 1);
             SKIP_BITS(re, &s->gb, 1);
         } else {
             /* escape */
-            run = SHOW_UBITS(re, &s->gb, 6) + 1; LAST_SKIP_BITS(re, &s->gb, 6);
+            run = SHOW_UBITS(re, &s->gb, 6) + 1;
+            LAST_SKIP_BITS(re, &s->gb, 6);
             UPDATE_CACHE(re, &s->gb);
-            level = SHOW_SBITS(re, &s->gb, 12); SKIP_BITS(re, &s->gb, 12);
+            level = SHOW_SBITS(re, &s->gb, 12);
+            SKIP_BITS(re, &s->gb, 12);
 
             i += run;
-            j  = scantable[i];
+            j = scantable[i];
             if (level < 0) {
                 level = ((-level * 2 + 1) * qscale) >> 1;
                 level = -level;
@@ -478,8 +524,9 @@
         }
 
         block[j] = level;
-        if (((int32_t)GET_CACHE(re, &s->gb)) <= (int32_t)0xBFFFFFFF)
+        if (((int32_t) GET_CACHE(re, &s->gb)) <= (int32_t) 0xBFFFFFFF || i > 63)
             break;
+
         UPDATE_CACHE(re, &s->gb);
     }
 end:
@@ -489,13 +536,13 @@
     return 0;
 }
 
-
-static inline int mpeg2_decode_block_intra(MpegEncContext *s, int16_t *block, int n)
+static inline int mpeg2_decode_block_intra(MpegEncContext *s,
+                                           int16_t *block, int n)
 {
     int level, dc, diff, i, j, run;
     int component;
     RLTable *rl;
-    uint8_t * const scantable = s->intra_scantable.permutated;
+    uint8_t *const scantable = s->intra_scantable.permutated;
     const uint16_t *quant_matrix;
     const int qscale = s->qscale;
     int mismatch;
@@ -503,10 +550,10 @@
     /* DC coefficient */
     if (n < 4) {
         quant_matrix = s->intra_matrix;
-        component = 0;
+        component    = 0;
     } else {
         quant_matrix = s->chroma_intra_matrix;
-        component = (n & 1) + 1;
+        component    = (n & 1) + 1;
     }
     diff = decode_dc(&s->gb, component);
     if (diff >= 0xffff)
@@ -528,23 +575,29 @@
         /* now quantify & encode AC coefficients */
         for (;;) {
             UPDATE_CACHE(re, &s->gb);
-            GET_RL_VLC(level, run, re, &s->gb, rl->rl_vlc[0], TEX_VLC_BITS, 2, 0);
+            GET_RL_VLC(level, run, re, &s->gb, rl->rl_vlc[0],
+                       TEX_VLC_BITS, 2, 0);
 
             if (level == 127) {
                 break;
             } else if (level != 0) {
                 i += run;
-                j  = scantable[i];
+                check_scantable_index(s, i);
+                j = scantable[i];
                 level = (level * qscale * quant_matrix[j]) >> 4;
-                level = (level ^ SHOW_SBITS(re, &s->gb, 1)) - SHOW_SBITS(re, &s->gb, 1);
+                level = (level ^ SHOW_SBITS(re, &s->gb, 1)) -
+                        SHOW_SBITS(re, &s->gb, 1);
                 LAST_SKIP_BITS(re, &s->gb, 1);
             } else {
                 /* escape */
-                run = SHOW_UBITS(re, &s->gb, 6) + 1; LAST_SKIP_BITS(re, &s->gb, 6);
+                run = SHOW_UBITS(re, &s->gb, 6) + 1;
+                LAST_SKIP_BITS(re, &s->gb, 6);
                 UPDATE_CACHE(re, &s->gb);
-                level = SHOW_SBITS(re, &s->gb, 12); SKIP_BITS(re, &s->gb, 12);
+                level = SHOW_SBITS(re, &s->gb, 12);
+                SKIP_BITS(re, &s->gb, 12);
                 i += run;
-                j  = scantable[i];
+                check_scantable_index(s, i);
+                j = scantable[i];
                 if (level < 0) {
                     level = (-level * qscale * quant_matrix[j]) >> 4;
                     level = -level;
@@ -552,10 +605,6 @@
                     level = (level * qscale * quant_matrix[j]) >> 4;
                 }
             }
-            if (i > 63) {
-                av_log(s->avctx, AV_LOG_ERROR, "ac-tex damaged at %d %d\n", s->mb_x, s->mb_y);
-                return -1;
-            }
 
             mismatch ^= level;
             block[j]  = level;
@@ -573,22 +622,23 @@
  * Changing this would eat up any speed benefits it has.
  * Do not use "fast" flag if you need the code to be robust.
  */
-static inline int mpeg2_fast_decode_block_intra(MpegEncContext *s, int16_t *block, int n)
+static inline int mpeg2_fast_decode_block_intra(MpegEncContext *s,
+                                                int16_t *block, int n)
 {
-    int level, dc, diff, j, run;
+    int level, dc, diff, i, j, run;
     int component;
     RLTable *rl;
-    uint8_t * scantable = s->intra_scantable.permutated;
+    uint8_t *const scantable = s->intra_scantable.permutated;
     const uint16_t *quant_matrix;
     const int qscale = s->qscale;
 
     /* DC coefficient */
     if (n < 4) {
         quant_matrix = s->intra_matrix;
-        component = 0;
+        component    = 0;
     } else {
         quant_matrix = s->chroma_intra_matrix;
-        component = (n & 1) + 1;
+        component    = (n & 1) + 1;
     }
     diff = decode_dc(&s->gb, component);
     if (diff >= 0xffff)
@@ -597,6 +647,7 @@
     dc += diff;
     s->last_dc[component] = dc;
     block[0] = dc << (3 - s->intra_dc_precision);
+    i = 0;
     if (s->intra_vlc_format)
         rl = &ff_rl_mpeg2;
     else
@@ -607,23 +658,27 @@
         /* now quantify & encode AC coefficients */
         for (;;) {
             UPDATE_CACHE(re, &s->gb);
-            GET_RL_VLC(level, run, re, &s->gb, rl->rl_vlc[0], TEX_VLC_BITS, 2, 0);
+            GET_RL_VLC(level, run, re, &s->gb, rl->rl_vlc[0],
+                       TEX_VLC_BITS, 2, 0);
 
-            if (level == 127) {
+            if (level >= 64 || i > 63) {
                 break;
             } else if (level != 0) {
-                scantable += run;
-                j = *scantable;
+                i += run;
+                j = scantable[i];
                 level = (level * qscale * quant_matrix[j]) >> 4;
-                level = (level ^ SHOW_SBITS(re, &s->gb, 1)) - SHOW_SBITS(re, &s->gb, 1);
+                level = (level ^ SHOW_SBITS(re, &s->gb, 1)) -
+                        SHOW_SBITS(re, &s->gb, 1);
                 LAST_SKIP_BITS(re, &s->gb, 1);
             } else {
                 /* escape */
-                run = SHOW_UBITS(re, &s->gb, 6) + 1; LAST_SKIP_BITS(re, &s->gb, 6);
+                run = SHOW_UBITS(re, &s->gb, 6) + 1;
+                LAST_SKIP_BITS(re, &s->gb, 6);
                 UPDATE_CACHE(re, &s->gb);
-                level = SHOW_SBITS(re, &s->gb, 12); SKIP_BITS(re, &s->gb, 12);
-                scantable += run;
-                j = *scantable;
+                level = SHOW_SBITS(re, &s->gb, 12);
+                SKIP_BITS(re, &s->gb, 12);
+                i += run;
+                j = scantable[i];
                 if (level < 0) {
                     level = (-level * qscale * quant_matrix[j]) >> 4;
                     level = -level;
@@ -637,7 +692,7 @@
         CLOSE_READER(re, &s->gb);
     }
 
-    s->block_last_index[n] = scantable - s->intra_scantable.permutated;
+    s->block_last_index[n] = i;
     return 0;
 }
 
@@ -655,21 +710,12 @@
 static inline int get_qscale(MpegEncContext *s)
 {
     int qscale = get_bits(&s->gb, 5);
-    if (s->q_scale_type) {
+    if (s->q_scale_type)
         return non_linear_qscale[qscale];
-    } else {
+    else
         return qscale << 1;
-    }
 }
 
-static void exchange_uv(MpegEncContext *s)
-{
-    int16_t (*tmp)[64];
-
-    tmp           = s->pblocks[4];
-    s->pblocks[4] = s->pblocks[5];
-    s->pblocks[5] = tmp;
-}
 
 /* motion type (for MPEG-2) */
 #define MT_FIELD 1
@@ -689,19 +735,21 @@
     if (s->mb_skip_run-- != 0) {
         if (s->pict_type == AV_PICTURE_TYPE_P) {
             s->mb_skipped = 1;
-            s->current_picture.mb_type[s->mb_x + s->mb_y * s->mb_stride] = MB_TYPE_SKIP | MB_TYPE_L0 | MB_TYPE_16x16;
+            s->current_picture.mb_type[s->mb_x + s->mb_y * s->mb_stride] =
+                MB_TYPE_SKIP | MB_TYPE_L0 | MB_TYPE_16x16;
         } else {
             int mb_type;
 
             if (s->mb_x)
                 mb_type = s->current_picture.mb_type[s->mb_x + s->mb_y * s->mb_stride - 1];
             else
-                mb_type = s->current_picture.mb_type[s->mb_width + (s->mb_y - 1) * s->mb_stride - 1]; // FIXME not sure if this is allowed in MPEG at all
+                // FIXME not sure if this is allowed in MPEG at all
+                mb_type = s->current_picture.mb_type[s->mb_width + (s->mb_y - 1) * s->mb_stride - 1];
             if (IS_INTRA(mb_type)) {
                 av_log(s->avctx, AV_LOG_ERROR, "skip with previntra\n");
                 return -1;
             }
-            s->current_picture.mb_type[s->mb_x + s->mb_y*s->mb_stride] =
+            s->current_picture.mb_type[s->mb_x + s->mb_y * s->mb_stride] =
                 mb_type | MB_TYPE_SKIP;
 
             if ((s->mv[0][0][0] | s->mv[0][0][1] | s->mv[1][0][0] | s->mv[1][0][1]) == 0)
@@ -716,7 +764,9 @@
     case AV_PICTURE_TYPE_I:
         if (get_bits1(&s->gb) == 0) {
             if (get_bits1(&s->gb) == 0) {
-                av_log(s->avctx, AV_LOG_ERROR, "invalid mb type in I Frame at %d %d\n", s->mb_x, s->mb_y);
+                av_log(s->avctx, AV_LOG_ERROR,
+                       "invalid mb type in I Frame at %d %d\n",
+                       s->mb_x, s->mb_y);
                 return -1;
             }
             mb_type = MB_TYPE_QUANT | MB_TYPE_INTRA;
@@ -727,7 +777,8 @@
     case AV_PICTURE_TYPE_P:
         mb_type = get_vlc2(&s->gb, ff_mb_ptype_vlc.table, MB_PTYPE_VLC_BITS, 1);
         if (mb_type < 0) {
-            av_log(s->avctx, AV_LOG_ERROR, "invalid mb type in P Frame at %d %d\n", s->mb_x, s->mb_y);
+            av_log(s->avctx, AV_LOG_ERROR,
+                   "invalid mb type in P Frame at %d %d\n", s->mb_x, s->mb_y);
             return -1;
         }
         mb_type = ptype2mb_type[mb_type];
@@ -735,7 +786,8 @@
     case AV_PICTURE_TYPE_B:
         mb_type = get_vlc2(&s->gb, ff_mb_btype_vlc.table, MB_BTYPE_VLC_BITS, 1);
         if (mb_type < 0) {
-            av_log(s->avctx, AV_LOG_ERROR, "invalid mb type in B Frame at %d %d\n", s->mb_x, s->mb_y);
+            av_log(s->avctx, AV_LOG_ERROR,
+                   "invalid mb type in B Frame at %d %d\n", s->mb_x, s->mb_y);
             return -1;
         }
         mb_type = btype2mb_type[mb_type];
@@ -746,15 +798,14 @@
     if (IS_INTRA(mb_type)) {
         s->dsp.clear_blocks(s->block[0]);
 
-        if (!s->chroma_y_shift) {
+        if (!s->chroma_y_shift)
             s->dsp.clear_blocks(s->block[6]);
-        }
 
         /* compute DCT type */
-        if (s->picture_structure == PICT_FRAME && // FIXME add an interlaced_dct coded var?
-            !s->frame_pred_frame_dct) {
+        // FIXME: add an interlaced_dct coded var?
+        if (s->picture_structure == PICT_FRAME &&
+            !s->frame_pred_frame_dct)
             s->interlaced_dct = get_bits1(&s->gb);
-        }
 
         if (IS_QUANT(mb_type))
             s->qscale = get_qscale(s);
@@ -762,41 +813,40 @@
         if (s->concealment_motion_vectors) {
             /* just parse them */
             if (s->picture_structure != PICT_FRAME)
-                skip_bits1(&s->gb); /* field select */
+                skip_bits1(&s->gb);  /* field select */
 
-            s->mv[0][0][0]= s->last_mv[0][0][0]= s->last_mv[0][1][0] =
-                mpeg_decode_motion(s, s->mpeg_f_code[0][0], s->last_mv[0][0][0]);
-            s->mv[0][0][1]= s->last_mv[0][0][1]= s->last_mv[0][1][1] =
-                mpeg_decode_motion(s, s->mpeg_f_code[0][1], s->last_mv[0][0][1]);
+            s->mv[0][0][0]      =
+            s->last_mv[0][0][0] =
+            s->last_mv[0][1][0] = mpeg_decode_motion(s, s->mpeg_f_code[0][0],
+                                                     s->last_mv[0][0][0]);
+            s->mv[0][0][1]      =
+            s->last_mv[0][0][1] =
+            s->last_mv[0][1][1] = mpeg_decode_motion(s, s->mpeg_f_code[0][1],
+                                                     s->last_mv[0][0][1]);
 
             skip_bits1(&s->gb); /* marker */
-        } else
-            memset(s->last_mv, 0, sizeof(s->last_mv)); /* reset mv prediction */
+        } else {
+            /* reset mv prediction */
+            memset(s->last_mv, 0, sizeof(s->last_mv));
+        }
         s->mb_intra = 1;
         // if 1, we memcpy blocks in xvmcvideo
-        if (CONFIG_MPEG_XVMC_DECODER && s->avctx->xvmc_acceleration > 1) {
+        if ((CONFIG_MPEG1_XVMC_HWACCEL || CONFIG_MPEG2_XVMC_HWACCEL) && s->pack_pblocks)
             ff_xvmc_pack_pblocks(s, -1); // inter are always full blocks
-            if (s->swap_uv) {
-                exchange_uv(s);
-            }
-        }
 
         if (s->codec_id == AV_CODEC_ID_MPEG2VIDEO) {
             if (s->flags2 & CODEC_FLAG2_FAST) {
-                for (i = 0; i < 6; i++) {
+                for (i = 0; i < 6; i++)
                     mpeg2_fast_decode_block_intra(s, *s->pblocks[i], i);
-                }
             } else {
-                for (i = 0; i < mb_block_count; i++) {
+                for (i = 0; i < mb_block_count; i++)
                     if (mpeg2_decode_block_intra(s, *s->pblocks[i], i) < 0)
                         return -1;
-                }
             }
         } else {
-            for (i = 0; i < 6; i++) {
+            for (i = 0; i < 6; i++)
                 if (mpeg1_decode_block_intra(s, *s->pblocks[i], i) < 0)
                     return -1;
-            }
         }
     } else {
         if (mb_type & MB_TYPE_ZERO_MV) {
@@ -809,8 +859,8 @@
                     s->interlaced_dct = get_bits1(&s->gb);
                 s->mv_type = MV_TYPE_16X16;
             } else {
-                s->mv_type = MV_TYPE_FIELD;
-                mb_type |= MB_TYPE_INTERLACED;
+                s->mv_type            = MV_TYPE_FIELD;
+                mb_type              |= MB_TYPE_INTERLACED;
                 s->field_select[0][0] = s->picture_structure - 1;
             }
 
@@ -821,15 +871,15 @@
             s->last_mv[0][0][1] = 0;
             s->last_mv[0][1][0] = 0;
             s->last_mv[0][1][1] = 0;
-            s->mv[0][0][0] = 0;
-            s->mv[0][0][1] = 0;
+            s->mv[0][0][0]      = 0;
+            s->mv[0][0][1]      = 0;
         } else {
             av_assert2(mb_type & MB_TYPE_L0L1);
             // FIXME decide if MBs in field pictures are MB_TYPE_INTERLACED
             /* get additional motion vector type */
-            if (s->picture_structure == PICT_FRAME && s->frame_pred_frame_dct)
+            if (s->picture_structure == PICT_FRAME && s->frame_pred_frame_dct) {
                 motion_type = MT_FRAME;
-            else {
+            } else {
                 motion_type = get_bits(&s->gb, 2);
                 if (s->picture_structure == PICT_FRAME && HAS_CBP(mb_type))
                     s->interlaced_dct = get_bits1(&s->gb);
@@ -844,15 +894,21 @@
             switch (motion_type) {
             case MT_FRAME: /* or MT_16X8 */
                 if (s->picture_structure == PICT_FRAME) {
-                    mb_type |= MB_TYPE_16x16;
+                    mb_type   |= MB_TYPE_16x16;
                     s->mv_type = MV_TYPE_16X16;
                     for (i = 0; i < 2; i++) {
                         if (USES_LIST(mb_type, i)) {
                             /* MT_FRAME */
-                            s->mv[i][0][0]= s->last_mv[i][0][0]= s->last_mv[i][1][0] =
-                                mpeg_decode_motion(s, s->mpeg_f_code[i][0], s->last_mv[i][0][0]);
-                            s->mv[i][0][1]= s->last_mv[i][0][1]= s->last_mv[i][1][1] =
-                                mpeg_decode_motion(s, s->mpeg_f_code[i][1], s->last_mv[i][0][1]);
+                            s->mv[i][0][0]      =
+                            s->last_mv[i][0][0] =
+                            s->last_mv[i][1][0] =
+                                mpeg_decode_motion(s, s->mpeg_f_code[i][0],
+                                                   s->last_mv[i][0][0]);
+                            s->mv[i][0][1]      =
+                            s->last_mv[i][0][1] =
+                            s->last_mv[i][1][1] =
+                                mpeg_decode_motion(s, s->mpeg_f_code[i][1],
+                                                   s->last_mv[i][0][1]);
                             /* full_pel: only for MPEG-1 */
                             if (s->full_pel[i]) {
                                 s->mv[i][0][0] <<= 1;
@@ -861,7 +917,7 @@
                         }
                     }
                 } else {
-                    mb_type |= MB_TYPE_16x8 | MB_TYPE_INTERLACED;
+                    mb_type   |= MB_TYPE_16x8 | MB_TYPE_INTERLACED;
                     s->mv_type = MV_TYPE_16X8;
                     for (i = 0; i < 2; i++) {
                         if (USES_LIST(mb_type, i)) {
@@ -918,7 +974,7 @@
                 }
                 break;
             case MT_DMV:
-                if(s->progressive_sequence){
+                if (s->progressive_sequence){
                     av_log(s->avctx, AV_LOG_ERROR, "MT_DMV in progressive_sequence\n");
                     return -1;
                 }
@@ -972,7 +1028,8 @@
                 }
                 break;
             default:
-                av_log(s->avctx, AV_LOG_ERROR, "00 motion_type at %d %d\n", s->mb_x, s->mb_y);
+                av_log(s->avctx, AV_LOG_ERROR,
+                       "00 motion_type at %d %d\n", s->mb_x, s->mb_y);
                 return -1;
             }
         }
@@ -983,35 +1040,31 @@
 
             cbp = get_vlc2(&s->gb, ff_mb_pat_vlc.table, MB_PAT_VLC_BITS, 1);
             if (mb_block_count > 6) {
-                 cbp <<= mb_block_count - 6;
-                 cbp  |= get_bits(&s->gb, mb_block_count - 6);
-                 s->dsp.clear_blocks(s->block[6]);
+                cbp <<= mb_block_count - 6;
+                cbp  |= get_bits(&s->gb, mb_block_count - 6);
+                s->dsp.clear_blocks(s->block[6]);
             }
             if (cbp <= 0) {
-                av_log(s->avctx, AV_LOG_ERROR, "invalid cbp %d at %d %d\n", cbp, s->mb_x, s->mb_y);
+                av_log(s->avctx, AV_LOG_ERROR,
+                       "invalid cbp %d at %d %d\n", cbp, s->mb_x, s->mb_y);
                 return -1;
             }
 
-            //if 1, we memcpy blocks in xvmcvideo
-            if (CONFIG_MPEG_XVMC_DECODER && s->avctx->xvmc_acceleration > 1) {
+            // if 1, we memcpy blocks in xvmcvideo
+            if ((CONFIG_MPEG1_XVMC_HWACCEL || CONFIG_MPEG2_XVMC_HWACCEL) && s->pack_pblocks)
                 ff_xvmc_pack_pblocks(s, cbp);
-                if (s->swap_uv) {
-                    exchange_uv(s);
-                }
-            }
 
             if (s->codec_id == AV_CODEC_ID_MPEG2VIDEO) {
                 if (s->flags2 & CODEC_FLAG2_FAST) {
                     for (i = 0; i < 6; i++) {
-                        if (cbp & 32) {
+                        if (cbp & 32)
                             mpeg2_fast_decode_block_non_intra(s, *s->pblocks[i], i);
-                        } else {
+                        else
                             s->block_last_index[i] = -1;
-                        }
                         cbp += cbp;
                     }
                 } else {
-                    cbp <<= 12-mb_block_count;
+                    cbp <<= 12 - mb_block_count;
 
                     for (i = 0; i < mb_block_count; i++) {
                         if (cbp & (1 << 11)) {
@@ -1026,11 +1079,10 @@
             } else {
                 if (s->flags2 & CODEC_FLAG2_FAST) {
                     for (i = 0; i < 6; i++) {
-                        if (cbp & 32) {
+                        if (cbp & 32)
                             mpeg1_fast_decode_block_inter(s, *s->pblocks[i], i);
-                        } else {
+                        else
                             s->block_last_index[i] = -1;
-                        }
                         cbp += cbp;
                     }
                 } else {
@@ -1058,14 +1110,14 @@
 
 static av_cold int mpeg_decode_init(AVCodecContext *avctx)
 {
-    Mpeg1Context *s = avctx->priv_data;
+    Mpeg1Context *s    = avctx->priv_data;
     MpegEncContext *s2 = &s->mpeg_enc_ctx;
     int i;
 
     /* we need some permutation to store matrices,
      * until MPV_common_init() sets the real permutation. */
     for (i = 0; i < 64; i++)
-       s2->dsp.idct_permutation[i]=i;
+        s2->dsp.idct_permutation[i] = i;
 
     ff_MPV_decode_defaults(s2);
 
@@ -1079,7 +1131,7 @@
     s->mpeg_enc_ctx.picture_number = 0;
     s->repeat_field                = 0;
     s->mpeg_enc_ctx.codec_id       = avctx->codec->id;
-    avctx->color_range = AVCOL_RANGE_MPEG;
+    avctx->color_range             = AVCOL_RANGE_MPEG;
     if (avctx->codec->id == AV_CODEC_ID_MPEG1VIDEO)
         avctx->chroma_sample_location = AVCHROMA_LOC_CENTER;
     else
@@ -1087,17 +1139,21 @@
     return 0;
 }
 
-static int mpeg_decode_update_thread_context(AVCodecContext *avctx, const AVCodecContext *avctx_from)
+static int mpeg_decode_update_thread_context(AVCodecContext *avctx,
+                                             const AVCodecContext *avctx_from)
 {
     Mpeg1Context *ctx = avctx->priv_data, *ctx_from = avctx_from->priv_data;
     MpegEncContext *s = &ctx->mpeg_enc_ctx, *s1 = &ctx_from->mpeg_enc_ctx;
     int err;
 
-    if (avctx == avctx_from || !ctx_from->mpeg_enc_ctx_allocated || !s1->context_initialized)
+    if (avctx == avctx_from               ||
+        !ctx_from->mpeg_enc_ctx_allocated ||
+        !s1->context_initialized)
         return 0;
 
     err = ff_mpeg_update_thread_context(avctx, avctx_from);
-    if (err) return err;
+    if (err)
+        return err;
 
     if (!ctx->mpeg_enc_ctx_allocated)
         memcpy(s + 1, s1 + 1, sizeof(Mpeg1Context) - sizeof(MpegEncContext));
@@ -1116,15 +1172,13 @@
 
     memcpy(temp_matrix, matrix, 64 * sizeof(uint16_t));
 
-    for (i = 0; i < 64; i++) {
+    for (i = 0; i < 64; i++)
         matrix[new_perm[i]] = temp_matrix[old_perm[i]];
-    }
 }
 
 static const enum AVPixelFormat mpeg1_hwaccel_pixfmt_list_420[] = {
-#if CONFIG_MPEG_XVMC_DECODER
-    AV_PIX_FMT_XVMC_MPEG2_IDCT,
-    AV_PIX_FMT_XVMC_MPEG2_MC,
+#if CONFIG_MPEG1_XVMC_HWACCEL
+    AV_PIX_FMT_XVMC,
 #endif
 #if CONFIG_MPEG1_VDPAU_HWACCEL
     AV_PIX_FMT_VDPAU_MPEG1,
@@ -1135,9 +1189,8 @@
 };
 
 static const enum AVPixelFormat mpeg2_hwaccel_pixfmt_list_420[] = {
-#if CONFIG_MPEG_XVMC_DECODER
-    AV_PIX_FMT_XVMC_MPEG2_IDCT,
-    AV_PIX_FMT_XVMC_MPEG2_MC,
+#if CONFIG_MPEG2_XVMC_HWACCEL
+    AV_PIX_FMT_XVMC,
 #endif
 #if CONFIG_MPEG2_VDPAU_HWACCEL
     AV_PIX_FMT_VDPAU_MPEG2,
@@ -1159,15 +1212,15 @@
 
 static enum AVPixelFormat mpeg_get_pixelformat(AVCodecContext *avctx)
 {
-    Mpeg1Context *s1 = avctx->priv_data;
+    Mpeg1Context *s1  = avctx->priv_data;
     MpegEncContext *s = &s1->mpeg_enc_ctx;
 
-    if(s->chroma_format < 2) {
+    if (s->chroma_format < 2)
         return ff_thread_get_format(avctx,
                                 avctx->codec_id == AV_CODEC_ID_MPEG1VIDEO ?
                                 mpeg1_hwaccel_pixfmt_list_420 :
                                 mpeg2_hwaccel_pixfmt_list_420);
-    } else if(s->chroma_format == 2)
+    else if (s->chroma_format == 2)
         return AV_PIX_FMT_YUV422P;
     else
         return AV_PIX_FMT_YUV444P;
@@ -1175,37 +1228,40 @@
 
 static void setup_hwaccel_for_pixfmt(AVCodecContext *avctx)
 {
-    if (avctx->pix_fmt != AV_PIX_FMT_XVMC_MPEG2_IDCT && avctx->pix_fmt != AV_PIX_FMT_XVMC_MPEG2_MC) {
-        avctx->xvmc_acceleration = 0;
-    } else if (!avctx->xvmc_acceleration) {
-        avctx->xvmc_acceleration = 2;
-    }
-    avctx->hwaccel = ff_find_hwaccel(avctx->codec->id, avctx->pix_fmt);
+    avctx->hwaccel = ff_find_hwaccel(avctx);
     // until then pix_fmt may be changed right after codec init
-    if (avctx->pix_fmt == AV_PIX_FMT_XVMC_MPEG2_IDCT ||
-        avctx->hwaccel || uses_vdpau(avctx))
+    if (avctx->hwaccel || uses_vdpau(avctx))
         if (avctx->idct_algo == FF_IDCT_AUTO)
             avctx->idct_algo = FF_IDCT_SIMPLE;
+
+    if (avctx->hwaccel && avctx->pix_fmt == AV_PIX_FMT_XVMC) {
+        Mpeg1Context *s1 = avctx->priv_data;
+        MpegEncContext *s = &s1->mpeg_enc_ctx;
+
+        s->pack_pblocks = 1;
+#if FF_API_XVMC
+        avctx->xvmc_acceleration = 2;
+#endif /* FF_API_XVMC */
+    }
 }
 
 /* Call this function when we know all parameters.
  * It may be called in different places for MPEG-1 and MPEG-2. */
 static int mpeg_decode_postinit(AVCodecContext *avctx)
 {
-    Mpeg1Context *s1 = avctx->priv_data;
+    Mpeg1Context *s1  = avctx->priv_data;
     MpegEncContext *s = &s1->mpeg_enc_ctx;
     uint8_t old_permutation[64];
+    int ret;
 
-    if ((s1->mpeg_enc_ctx_allocated == 0) ||
-        avctx->coded_width  != s->width   ||
-        avctx->coded_height != s->height  ||
+    if ((s1->mpeg_enc_ctx_allocated == 0)                   ||
+        avctx->coded_width       != s->width                ||
+        avctx->coded_height      != s->height               ||
         s1->save_width           != s->width                ||
         s1->save_height          != s->height               ||
         s1->save_aspect_info     != s->aspect_ratio_info    ||
         (s1->save_progressive_seq != s->progressive_sequence && (s->height&31)) ||
-        0)
-    {
-
+        0) {
         if (s1->mpeg_enc_ctx_allocated) {
             ParseContext pc = s->parse_context;
             s->parse_context.buffer = 0;
@@ -1217,7 +1273,10 @@
         if ((s->width == 0) || (s->height == 0))
             return -2;
 
-        avcodec_set_dimensions(avctx, s->width, s->height);
+        ret = ff_set_dimensions(avctx, s->width, s->height);
+        if (ret < 0)
+            return ret;
+
         if (avctx->codec_id == AV_CODEC_ID_MPEG2VIDEO && s->bit_rate) {
             avctx->rc_max_rate = s->bit_rate;
         } else if (avctx->codec_id == AV_CODEC_ID_MPEG1VIDEO && s->bit_rate &&
@@ -1234,45 +1293,49 @@
         avctx->has_b_frames = !s->low_delay;
 
         if (avctx->codec_id == AV_CODEC_ID_MPEG1VIDEO) {
-            //MPEG-1 fps
+            // MPEG-1 fps
             avctx->time_base.den = ff_mpeg12_frame_rate_tab[s->frame_rate_index].num;
             avctx->time_base.num = ff_mpeg12_frame_rate_tab[s->frame_rate_index].den;
-            //MPEG-1 aspect
-            avctx->sample_aspect_ratio = av_d2q(1.0/ff_mpeg1_aspect[s->aspect_ratio_info], 255);
-            avctx->ticks_per_frame=1;
-        } else {//MPEG-2
-        //MPEG-2 fps
+            // MPEG-1 aspect
+            avctx->sample_aspect_ratio = av_d2q(1.0 / ff_mpeg1_aspect[s->aspect_ratio_info], 255);
+            avctx->ticks_per_frame     = 1;
+        } else { // MPEG-2
+            // MPEG-2 fps
             av_reduce(&s->avctx->time_base.den,
                       &s->avctx->time_base.num,
-                      ff_mpeg12_frame_rate_tab[s->frame_rate_index].num * s1->frame_rate_ext.num*2,
+                      ff_mpeg12_frame_rate_tab[s->frame_rate_index].num * s1->frame_rate_ext.num * 2,
                       ff_mpeg12_frame_rate_tab[s->frame_rate_index].den * s1->frame_rate_ext.den,
                       1 << 30);
             avctx->ticks_per_frame = 2;
-            //MPEG-2 aspect
+            // MPEG-2 aspect
             if (s->aspect_ratio_info > 1) {
                 AVRational dar =
                     av_mul_q(av_div_q(ff_mpeg2_aspect[s->aspect_ratio_info],
-                                      (AVRational) {s1->pan_scan.width, s1->pan_scan.height}),
-                             (AVRational) {s->width, s->height});
-
-                // we ignore the spec here and guess a bit as reality does not match the spec, see for example
-                // res_change_ffmpeg_aspect.ts and sequence-display-aspect.mpg
-                // issue1613, 621, 562
+                                      (AVRational) { s1->pan_scan.width,
+                                                     s1->pan_scan.height }),
+                             (AVRational) { s->width, s->height });
+
+                /* We ignore the spec here and guess a bit as reality does not
+                 * match the spec, see for example res_change_ffmpeg_aspect.ts
+                 * and sequence-display-aspect.mpg.
+                 * issue1613, 621, 562 */
                 if ((s1->pan_scan.width == 0) || (s1->pan_scan.height == 0) ||
-                   (av_cmp_q(dar, (AVRational) {4, 3}) && av_cmp_q(dar, (AVRational) {16, 9}))) {
+                    (av_cmp_q(dar, (AVRational) { 4, 3 }) &&
+                     av_cmp_q(dar, (AVRational) { 16, 9 }))) {
                     s->avctx->sample_aspect_ratio =
                         av_div_q(ff_mpeg2_aspect[s->aspect_ratio_info],
-                                 (AVRational) {s->width, s->height});
+                                 (AVRational) { s->width, s->height });
                 } else {
                     s->avctx->sample_aspect_ratio =
                         av_div_q(ff_mpeg2_aspect[s->aspect_ratio_info],
-                                 (AVRational) {s1->pan_scan.width, s1->pan_scan.height});
-//issue1613 4/3 16/9 -> 16/9
-//res_change_ffmpeg_aspect.ts 4/3 225/44 ->4/3
-//widescreen-issue562.mpg 4/3 16/9 -> 16/9
+                                 (AVRational) { s1->pan_scan.width, s1->pan_scan.height });
+// issue1613 4/3 16/9 -> 16/9
+// res_change_ffmpeg_aspect.ts 4/3 225/44 ->4/3
+// widescreen-issue562.mpg 4/3 16/9 -> 16/9
 //                    s->avctx->sample_aspect_ratio = av_mul_q(s->avctx->sample_aspect_ratio, (AVRational) {s->width, s->height});
                     av_dlog(avctx, "A %d/%d\n",
-                            ff_mpeg2_aspect[s->aspect_ratio_info].num, ff_mpeg2_aspect[s->aspect_ratio_info].den);
+                            ff_mpeg2_aspect[s->aspect_ratio_info].num,
+                            ff_mpeg2_aspect[s->aspect_ratio_info].den);
                     av_dlog(avctx, "B %d/%d\n", s->avctx->sample_aspect_ratio.num,
                             s->avctx->sample_aspect_ratio.den);
                 }
@@ -1302,14 +1365,14 @@
     return 0;
 }
 
-static int mpeg1_decode_picture(AVCodecContext *avctx,
-                                const uint8_t *buf, int buf_size)
+static int mpeg1_decode_picture(AVCodecContext *avctx, const uint8_t *buf,
+                                int buf_size)
 {
-    Mpeg1Context *s1 = avctx->priv_data;
+    Mpeg1Context *s1  = avctx->priv_data;
     MpegEncContext *s = &s1->mpeg_enc_ctx;
     int ref, f_code, vbv_delay;
 
-    init_get_bits(&s->gb, buf, buf_size*8);
+    init_get_bits(&s->gb, buf, buf_size * 8);
 
     ref = get_bits(&s->gb, 10); /* temporal ref */
     s->pict_type = get_bits(&s->gb, 3);
@@ -1318,7 +1381,8 @@
 
     vbv_delay = get_bits(&s->gb, 16);
     s->vbv_delay = vbv_delay;
-    if (s->pict_type == AV_PICTURE_TYPE_P || s->pict_type == AV_PICTURE_TYPE_B) {
+    if (s->pict_type == AV_PICTURE_TYPE_P ||
+        s->pict_type == AV_PICTURE_TYPE_B) {
         s->full_pel[0] = get_bits1(&s->gb);
         f_code = get_bits(&s->gb, 3);
         if (f_code == 0 && (avctx->err_recognition & (AV_EF_BITSTREAM|AV_EF_COMPLIANT)))
@@ -1340,7 +1404,8 @@
     s->current_picture.f.key_frame = s->pict_type == AV_PICTURE_TYPE_I;
 
     if (avctx->debug & FF_DEBUG_PICT_INFO)
-        av_log(avctx, AV_LOG_DEBUG, "vbv_delay %d, ref %d type:%d\n", vbv_delay, ref, s->pict_type);
+        av_log(avctx, AV_LOG_DEBUG,
+               "vbv_delay %d, ref %d type:%d\n", vbv_delay, ref, s->pict_type);
 
     s->y_dc_scale = 8;
     s->c_dc_scale = 8;
@@ -1349,14 +1414,14 @@
 
 static void mpeg_decode_sequence_extension(Mpeg1Context *s1)
 {
-    MpegEncContext *s= &s1->mpeg_enc_ctx;
+    MpegEncContext *s = &s1->mpeg_enc_ctx;
     int horiz_size_ext, vert_size_ext;
     int bit_rate_ext;
 
     skip_bits(&s->gb, 1); /* profile and level esc*/
     s->avctx->profile       = get_bits(&s->gb, 3);
     s->avctx->level         = get_bits(&s->gb, 4);
-    s->progressive_sequence = get_bits1(&s->gb); /* progressive_sequence */
+    s->progressive_sequence = get_bits1(&s->gb);   /* progressive_sequence */
     s->chroma_format        = get_bits(&s->gb, 2); /* chroma_format 1=420, 2=422, 3=444 */
     horiz_size_ext          = get_bits(&s->gb, 2);
     vert_size_ext           = get_bits(&s->gb, 2);
@@ -1375,12 +1440,13 @@
     s1->frame_rate_ext.den = get_bits(&s->gb, 5) + 1;
 
     av_dlog(s->avctx, "sequence extension\n");
-    s->codec_id      = s->avctx->codec_id = AV_CODEC_ID_MPEG2VIDEO;
+    s->codec_id = s->avctx->codec_id = AV_CODEC_ID_MPEG2VIDEO;
 
     if (s->avctx->debug & FF_DEBUG_PICT_INFO)
-        av_log(s->avctx, AV_LOG_DEBUG, "profile: %d, level: %d ps: %d cf:%d vbv buffer: %d, bitrate:%d\n",
-               s->avctx->profile, s->avctx->level, s->progressive_sequence, s->chroma_format, s->avctx->rc_buffer_size, s->bit_rate);
-
+        av_log(s->avctx, AV_LOG_DEBUG,
+               "profile: %d, level: %d ps: %d cf:%d vbv buffer: %d, bitrate:%d\n",
+               s->avctx->profile, s->avctx->level, s->progressive_sequence, s->chroma_format,
+               s->avctx->rc_buffer_size, s->bit_rate);
 }
 
 static void mpeg_decode_sequence_display_extension(Mpeg1Context *s1)
@@ -1396,7 +1462,7 @@
         s->avctx->colorspace      = get_bits(&s->gb, 8);
     }
     w = get_bits(&s->gb, 14);
-    skip_bits(&s->gb, 1); //marker
+    skip_bits(&s->gb, 1); // marker
     h = get_bits(&s->gb, 14);
     // remaining 3 bits are zero padding
 
@@ -1440,7 +1506,8 @@
                s1->pan_scan.position[2][0], s1->pan_scan.position[2][1]);
 }
 
-static int load_matrix(MpegEncContext *s, uint16_t matrix0[64], uint16_t matrix1[64], int intra)
+static int load_matrix(MpegEncContext *s, uint16_t matrix0[64],
+                       uint16_t matrix1[64], int intra)
 {
     int i;
 
@@ -1466,23 +1533,28 @@
 {
     av_dlog(s->avctx, "matrix extension\n");
 
-    if (get_bits1(&s->gb)) load_matrix(s, s->chroma_intra_matrix, s->intra_matrix, 1);
-    if (get_bits1(&s->gb)) load_matrix(s, s->chroma_inter_matrix, s->inter_matrix, 0);
-    if (get_bits1(&s->gb)) load_matrix(s, s->chroma_intra_matrix, NULL           , 1);
-    if (get_bits1(&s->gb)) load_matrix(s, s->chroma_inter_matrix, NULL           , 0);
+    if (get_bits1(&s->gb))
+        load_matrix(s, s->chroma_intra_matrix, s->intra_matrix, 1);
+    if (get_bits1(&s->gb))
+        load_matrix(s, s->chroma_inter_matrix, s->inter_matrix, 0);
+    if (get_bits1(&s->gb))
+        load_matrix(s, s->chroma_intra_matrix, NULL, 1);
+    if (get_bits1(&s->gb))
+        load_matrix(s, s->chroma_inter_matrix, NULL, 0);
 }
 
 static void mpeg_decode_picture_coding_extension(Mpeg1Context *s1)
 {
     MpegEncContext *s = &s1->mpeg_enc_ctx;
 
-    s->full_pel[0] = s->full_pel[1] = 0;
+    s->full_pel[0]       = s->full_pel[1] = 0;
     s->mpeg_f_code[0][0] = get_bits(&s->gb, 4);
     s->mpeg_f_code[0][1] = get_bits(&s->gb, 4);
     s->mpeg_f_code[1][0] = get_bits(&s->gb, 4);
     s->mpeg_f_code[1][1] = get_bits(&s->gb, 4);
     if (!s->pict_type && s1->mpeg_enc_ctx_allocated) {
-        av_log(s->avctx, AV_LOG_ERROR, "Missing picture start code, guessing missing values\n");
+        av_log(s->avctx, AV_LOG_ERROR,
+               "Missing picture start code, guessing missing values\n");
         if (s->mpeg_f_code[1][0] == 15 && s->mpeg_f_code[1][1] == 15) {
             if (s->mpeg_f_code[0][0] == 15 && s->mpeg_f_code[0][1] == 15)
                 s->pict_type = AV_PICTURE_TYPE_I;
@@ -1510,7 +1582,6 @@
     s->chroma_420_type            = get_bits1(&s->gb);
     s->progressive_frame          = get_bits1(&s->gb);
 
-
     if (s->alternate_scan) {
         ff_init_scantable(s->dsp.idct_permutation, &s->inter_scantable, ff_alternate_vertical_scan);
         ff_init_scantable(s->dsp.idct_permutation, &s->intra_scantable, ff_alternate_vertical_scan);
@@ -1534,7 +1605,7 @@
 static int mpeg_field_start(MpegEncContext *s, const uint8_t *buf, int buf_size)
 {
     AVCodecContext *avctx = s->avctx;
-    Mpeg1Context *s1 = (Mpeg1Context*)s;
+    Mpeg1Context *s1      = (Mpeg1Context *) s;
 
     /* start frame decoding */
     if (s->first_field || s->picture_structure == PICT_FRAME) {
@@ -1565,6 +1636,23 @@
             return AVERROR(ENOMEM);
         memcpy(pan_scan->data, &s1->pan_scan, sizeof(s1->pan_scan));
 
+        if (s1->a53_caption) {
+            AVFrameSideData *sd = av_frame_new_side_data(
+                &s->current_picture_ptr->f, AV_FRAME_DATA_A53_CC,
+                s1->a53_caption_size);
+            if (sd)
+                memcpy(sd->data, s1->a53_caption, s1->a53_caption_size);
+            av_freep(&s1->a53_caption);
+        }
+
+        if (s1->has_stereo3d) {
+            AVStereo3D *stereo = av_stereo3d_create_side_data(&s->current_picture_ptr->f);
+            if (!stereo)
+                return AVERROR(ENOMEM);
+
+            *stereo = s1->stereo3d;
+            s1->has_stereo3d = 0;
+        }
         if (HAVE_THREADS && (avctx->active_thread_type & FF_THREAD_FRAME))
             ff_thread_finish_setup(avctx);
     } else { // second field
@@ -1578,14 +1666,15 @@
         if (s->avctx->hwaccel &&
             (s->avctx->slice_flags & SLICE_FLAG_ALLOW_FIELD)) {
             if (s->avctx->hwaccel->end_frame(s->avctx) < 0)
-                av_log(avctx, AV_LOG_ERROR, "hardware accelerator failed to decode first field\n");
+                av_log(avctx, AV_LOG_ERROR,
+                       "hardware accelerator failed to decode first field\n");
         }
 
         for (i = 0; i < 4; i++) {
             s->current_picture.f.data[i] = s->current_picture_ptr->f.data[i];
-            if (s->picture_structure == PICT_BOTTOM_FIELD) {
-                s->current_picture.f.data[i] += s->current_picture_ptr->f.linesize[i];
-            }
+            if (s->picture_structure == PICT_BOTTOM_FIELD)
+                s->current_picture.f.data[i] +=
+                    s->current_picture_ptr->f.linesize[i];
         }
     }
 
@@ -1594,12 +1683,6 @@
             return -1;
     }
 
-// MPV_frame_start will call this function too,
-// but we need to call it on every field
-    if (CONFIG_MPEG_XVMC_DECODER && s->avctx->xvmc_acceleration)
-        if (ff_xvmc_field_start(s, avctx) < 0)
-            return -1;
-
     return 0;
 }
 
@@ -1625,7 +1708,7 @@
     av_assert0(mb_y < s->mb_height);
 
     init_get_bits(&s->gb, *buf, buf_size * 8);
-    if(s->codec_id != AV_CODEC_ID_MPEG1VIDEO && s->mb_height > 2800/16)
+    if (s->codec_id != AV_CODEC_ID_MPEG1VIDEO && s->mb_height > 2800/16)
         skip_bits(&s->gb, 3);
 
     ff_mpeg1_clean_buffers(s);
@@ -1639,9 +1722,8 @@
     }
 
     /* extra slice info */
-    while (get_bits1(&s->gb) != 0) {
-        skip_bits(&s->gb, 8);
-    }
+    if (skip_1stop_8data_bits(&s->gb) < 0)
+        return AVERROR_INVALIDDATA;
 
     s->mb_x = 0;
 
@@ -1656,9 +1738,8 @@
                 return -1;
             }
             if (code >= 33) {
-                if (code == 33) {
+                if (code == 33)
                     s->mb_x += 33;
-                }
                 /* otherwise, stuffing, nothing to do */
             } else {
                 s->mb_x += code;
@@ -1667,12 +1748,12 @@
         }
     }
 
-    if (s->mb_x >= (unsigned)s->mb_width) {
+    if (s->mb_x >= (unsigned) s->mb_width) {
         av_log(s->avctx, AV_LOG_ERROR, "initial skip overflow\n");
         return -1;
     }
 
-    if (avctx->hwaccel) {
+    if (avctx->hwaccel && avctx->hwaccel->decode_slice) {
         const uint8_t *buf_end, *buf_start = *buf - 4; /* include start_code */
         int start_code = -1;
         buf_end = avpriv_find_start_code(buf_start + 2, *buf + buf_size, &start_code);
@@ -1692,24 +1773,35 @@
 
     if (s->mb_y == 0 && s->mb_x == 0 && (s->first_field || s->picture_structure == PICT_FRAME)) {
         if (s->avctx->debug & FF_DEBUG_PICT_INFO) {
-             av_log(s->avctx, AV_LOG_DEBUG, "qp:%d fc:%2d%2d%2d%2d %s %s %s %s %s dc:%d pstruct:%d fdct:%d cmv:%d qtype:%d ivlc:%d rff:%d %s\n",
-                    s->qscale, s->mpeg_f_code[0][0], s->mpeg_f_code[0][1], s->mpeg_f_code[1][0], s->mpeg_f_code[1][1],
-                    s->pict_type == AV_PICTURE_TYPE_I ? "I" : (s->pict_type == AV_PICTURE_TYPE_P ? "P" : (s->pict_type == AV_PICTURE_TYPE_B ? "B" : "S")),
-                    s->progressive_sequence ? "ps" :"", s->progressive_frame ? "pf" : "", s->alternate_scan ? "alt" :"", s->top_field_first ? "top" :"",
-                    s->intra_dc_precision, s->picture_structure, s->frame_pred_frame_dct, s->concealment_motion_vectors,
-                    s->q_scale_type, s->intra_vlc_format, s->repeat_first_field, s->chroma_420_type ? "420" :"");
+            av_log(s->avctx, AV_LOG_DEBUG,
+                   "qp:%d fc:%2d%2d%2d%2d %s %s %s %s %s dc:%d pstruct:%d fdct:%d cmv:%d qtype:%d ivlc:%d rff:%d %s\n",
+                   s->qscale,
+                   s->mpeg_f_code[0][0], s->mpeg_f_code[0][1],
+                   s->mpeg_f_code[1][0], s->mpeg_f_code[1][1],
+                   s->pict_type  == AV_PICTURE_TYPE_I ? "I" :
+                   (s->pict_type == AV_PICTURE_TYPE_P ? "P" :
+                   (s->pict_type == AV_PICTURE_TYPE_B ? "B" : "S")),
+                   s->progressive_sequence ? "ps"  : "",
+                   s->progressive_frame    ? "pf"  : "",
+                   s->alternate_scan       ? "alt" : "",
+                   s->top_field_first      ? "top" : "",
+                   s->intra_dc_precision, s->picture_structure,
+                   s->frame_pred_frame_dct, s->concealment_motion_vectors,
+                   s->q_scale_type, s->intra_vlc_format,
+                   s->repeat_first_field, s->chroma_420_type ? "420" : "");
         }
     }
 
     for (;;) {
         // If 1, we memcpy blocks in xvmcvideo.
-        if (CONFIG_MPEG_XVMC_DECODER && s->avctx->xvmc_acceleration > 1)
+        if ((CONFIG_MPEG1_XVMC_HWACCEL || CONFIG_MPEG2_XVMC_HWACCEL) && s->pack_pblocks)
             ff_xvmc_init_block(s); // set s->block
 
         if (mpeg_decode_mb(s, s->block) < 0)
             return -1;
 
-        if (s->current_picture.motion_val[0] && !s->encoding) { // note motion_val is normally NULL unless we want to extract the MVs
+        // Note motion_val is normally NULL unless we want to extract the MVs.
+        if (s->current_picture.motion_val[0] && !s->encoding) {
             const int wrap = s->b8_stride;
             int xy         = s->mb_x * 2 + s->mb_y * 2 * wrap;
             int b8_xy      = 4 * (s->mb_x + s->mb_y * s->mb_stride);
@@ -1717,26 +1809,29 @@
 
             for (i = 0; i < 2; i++) {
                 for (dir = 0; dir < 2; dir++) {
-                    if (s->mb_intra || (dir == 1 && s->pict_type != AV_PICTURE_TYPE_B)) {
+                    if (s->mb_intra ||
+                        (dir == 1 && s->pict_type != AV_PICTURE_TYPE_B)) {
                         motion_x = motion_y = 0;
-                    } else if (s->mv_type == MV_TYPE_16X16 || (s->mv_type == MV_TYPE_FIELD && field_pic)) {
+                    } else if (s->mv_type == MV_TYPE_16X16 ||
+                               (s->mv_type == MV_TYPE_FIELD && field_pic)) {
                         motion_x = s->mv[dir][0][0];
                         motion_y = s->mv[dir][0][1];
-                    } else /*if ((s->mv_type == MV_TYPE_FIELD) || (s->mv_type == MV_TYPE_16X8))*/ {
+                    } else { /* if ((s->mv_type == MV_TYPE_FIELD) || (s->mv_type == MV_TYPE_16X8)) */
                         motion_x = s->mv[dir][i][0];
                         motion_y = s->mv[dir][i][1];
                     }
 
-                    s->current_picture.motion_val[dir][xy    ][0] = motion_x;
-                    s->current_picture.motion_val[dir][xy    ][1] = motion_y;
+                    s->current_picture.motion_val[dir][xy][0]     = motion_x;
+                    s->current_picture.motion_val[dir][xy][1]     = motion_y;
                     s->current_picture.motion_val[dir][xy + 1][0] = motion_x;
                     s->current_picture.motion_val[dir][xy + 1][1] = motion_y;
-                    s->current_picture.ref_index [dir][b8_xy    ] =
+                    s->current_picture.ref_index [dir][b8_xy]     =
                     s->current_picture.ref_index [dir][b8_xy + 1] = s->field_select[dir][i];
-                    av_assert2(s->field_select[dir][i] == 0 || s->field_select[dir][i] == 1);
+                    av_assert2(s->field_select[dir][i] == 0 ||
+                               s->field_select[dir][i] == 1);
                 }
-                xy += wrap;
-                b8_xy +=2;
+                xy    += wrap;
+                b8_xy += 2;
             }
         }
 
@@ -1749,17 +1844,21 @@
         if (++s->mb_x >= s->mb_width) {
             const int mb_size = 16 >> s->avctx->lowres;
 
-            ff_mpeg_draw_horiz_band(s, mb_size*(s->mb_y >> field_pic), mb_size);
+            ff_mpeg_draw_horiz_band(s, mb_size * (s->mb_y >> field_pic), mb_size);
             ff_MPV_report_decode_progress(s);
 
-            s->mb_x = 0;
+            s->mb_x  = 0;
             s->mb_y += 1 << field_pic;
 
             if (s->mb_y >= s->mb_height) {
                 int left   = get_bits_left(&s->gb);
-                int is_d10 = s->chroma_format == 2 && s->pict_type == AV_PICTURE_TYPE_I && avctx->profile == 0 && avctx->level == 5
-                             && s->intra_dc_precision == 2 && s->q_scale_type == 1 && s->alternate_scan == 0
-                             && s->progressive_frame == 0 /* vbv_delay == 0xBBB || 0xE10*/;
+                int is_d10 = s->chroma_format == 2 &&
+                             s->pict_type == AV_PICTURE_TYPE_I &&
+                             avctx->profile == 0 && avctx->level == 5 &&
+                             s->intra_dc_precision == 2 &&
+                             s->q_scale_type == 1 && s->alternate_scan == 0 &&
+                             s->progressive_frame == 0
+                             /* vbv_delay == 0xBBB || 0xE10 */;
 
                 if (left >= 32 && !is_d10) {
                     GetBitContext gb = s->gb;
@@ -1770,9 +1869,11 @@
                     }
                 }
 
-                if (left < 0 || (left && show_bits(&s->gb, FFMIN(left, 23)) && !is_d10)
-                    || ((avctx->err_recognition & (AV_EF_BITSTREAM | AV_EF_AGGRESSIVE)) && left > 8)) {
-                    av_log(avctx, AV_LOG_ERROR, "end mismatch left=%d %0X\n", left, show_bits(&s->gb, FFMIN(left, 23)));
+                if (left < 0 ||
+                    (left && show_bits(&s->gb, FFMIN(left, 23)) && !is_d10) ||
+                    ((avctx->err_recognition & (AV_EF_BITSTREAM | AV_EF_AGGRESSIVE)) && left > 8)) {
+                    av_log(avctx, AV_LOG_ERROR, "end mismatch left=%d %0X\n",
+                           left, show_bits(&s->gb, FFMIN(left, 23)));
                     return -1;
                 } else
                     goto eos;
@@ -1811,7 +1912,8 @@
             if (s->mb_skip_run) {
                 int i;
                 if (s->pict_type == AV_PICTURE_TYPE_I) {
-                    av_log(s->avctx, AV_LOG_ERROR, "skipped MB in I frame at %d %d\n", s->mb_x, s->mb_y);
+                    av_log(s->avctx, AV_LOG_ERROR,
+                           "skipped MB in I frame at %d %d\n", s->mb_x, s->mb_y);
                     return -1;
                 }
 
@@ -1841,14 +1943,16 @@
         }
     }
 eos: // end of slice
-    *buf += (get_bits_count(&s->gb)-1)/8;
+    if (get_bits_left(&s->gb) < 0)
+        return AVERROR_INVALIDDATA;
+    *buf += (get_bits_count(&s->gb) - 1) / 8;
     av_dlog(s, "y %d %d %d %d\n", s->resync_mb_x, s->resync_mb_y, s->mb_x, s->mb_y);
     return 0;
 }
 
 static int slice_decode_thread(AVCodecContext *c, void *arg)
 {
-    MpegEncContext *s   = *(void**)arg;
+    MpegEncContext *s   = *(void **) arg;
     const uint8_t *buf  = s->gb.buffer;
     int mb_y            = s->start_mb_y;
     const int field_pic = s->picture_structure != PICT_FRAME;
@@ -1868,18 +1972,22 @@
             if (c->err_recognition & AV_EF_EXPLODE)
                 return ret;
             if (s->resync_mb_x >= 0 && s->resync_mb_y >= 0)
-                ff_er_add_slice(&s->er, s->resync_mb_x, s->resync_mb_y, s->mb_x, s->mb_y, ER_AC_ERROR | ER_DC_ERROR | ER_MV_ERROR);
+                ff_er_add_slice(&s->er, s->resync_mb_x, s->resync_mb_y,
+                                s->mb_x, s->mb_y,
+                                ER_AC_ERROR | ER_DC_ERROR | ER_MV_ERROR);
         } else {
-            ff_er_add_slice(&s->er, s->resync_mb_x, s->resync_mb_y, s->mb_x-1, s->mb_y, ER_AC_END | ER_DC_END | ER_MV_END);
+            ff_er_add_slice(&s->er, s->resync_mb_x, s->resync_mb_y,
+                            s->mb_x - 1, s->mb_y,
+                            ER_AC_END | ER_DC_END | ER_MV_END);
         }
 
         if (s->mb_y == s->end_mb_y)
             return 0;
 
         start_code = -1;
-        buf = avpriv_find_start_code(buf, s->gb.buffer_end, &start_code);
-        mb_y= start_code - SLICE_MIN_START_CODE;
-        if(s->codec_id != AV_CODEC_ID_MPEG1VIDEO && s->mb_height > 2800/16)
+        buf        = avpriv_find_start_code(buf, s->gb.buffer_end, &start_code);
+        mb_y       = start_code - SLICE_MIN_START_CODE;
+        if (s->codec_id != AV_CODEC_ID_MPEG1VIDEO && s->mb_height > 2800/16)
             mb_y += (*buf&0xE0)<<2;
         mb_y <<= field_pic;
         if (s->picture_structure == PICT_BOTTOM_FIELD)
@@ -1895,7 +2003,7 @@
  */
 static int slice_end(AVCodecContext *avctx, AVFrame *pict)
 {
-    Mpeg1Context *s1 = avctx->priv_data;
+    Mpeg1Context *s1  = avctx->priv_data;
     MpegEncContext *s = &s1->mpeg_enc_ctx;
 
     if (!s1->mpeg_enc_ctx_allocated || !s->current_picture_ptr)
@@ -1903,14 +2011,12 @@
 
     if (s->avctx->hwaccel) {
         if (s->avctx->hwaccel->end_frame(s->avctx) < 0)
-            av_log(avctx, AV_LOG_ERROR, "hardware accelerator failed to decode picture\n");
+            av_log(avctx, AV_LOG_ERROR,
+                   "hardware accelerator failed to decode picture\n");
     }
 
-    if (CONFIG_MPEG_XVMC_DECODER && s->avctx->xvmc_acceleration)
-        ff_xvmc_field_end(s);
-
     /* end of slice reached */
-    if (/*s->mb_y << field_pic == s->mb_height &&*/ !s->first_field && !s->first_slice) {
+    if (/* s->mb_y << field_pic == s->mb_height && */ !s->first_field && !s1->first_slice) {
         /* end of image */
 
         ff_er_frame_end(&s->er);
@@ -1946,18 +2052,18 @@
 static int mpeg1_decode_sequence(AVCodecContext *avctx,
                                  const uint8_t *buf, int buf_size)
 {
-    Mpeg1Context *s1 = avctx->priv_data;
+    Mpeg1Context *s1  = avctx->priv_data;
     MpegEncContext *s = &s1->mpeg_enc_ctx;
     int width, height;
     int i, v, j;
 
-    init_get_bits(&s->gb, buf, buf_size*8);
+    init_get_bits(&s->gb, buf, buf_size * 8);
 
     width  = get_bits(&s->gb, 12);
     height = get_bits(&s->gb, 12);
     if (width == 0 || height == 0) {
-        av_log(avctx, AV_LOG_WARNING, "Invalid horizontal or vertical size "
-               "value.\n");
+        av_log(avctx, AV_LOG_WARNING,
+               "Invalid horizontal or vertical size value.\n");
         if (avctx->err_recognition & (AV_EF_BITSTREAM | AV_EF_COMPLIANT))
             return AVERROR_INVALIDDATA;
     }
@@ -2006,14 +2112,15 @@
         return -1;
     }
 
-    /* we set MPEG-2 parameters so that it emulates MPEG-1 */
+    /* We set MPEG-2 parameters so that it emulates MPEG-1. */
     s->progressive_sequence = 1;
     s->progressive_frame    = 1;
     s->picture_structure    = PICT_FRAME;
     s->first_field          = 0;
     s->frame_pred_frame_dct = 1;
     s->chroma_format        = 1;
-    s->codec_id             = s->avctx->codec_id = AV_CODEC_ID_MPEG1VIDEO;
+    s->codec_id             =
+    s->avctx->codec_id      = AV_CODEC_ID_MPEG1VIDEO;
     s->out_format           = FMT_MPEG1;
     s->swap_uv              = 0; // AFAIK VCR2 does not have SEQ_HEADER
     if (s->flags & CODEC_FLAG_LOW_DELAY)
@@ -2028,7 +2135,7 @@
 
 static int vcr2_init_sequence(AVCodecContext *avctx)
 {
-    Mpeg1Context *s1 = avctx->priv_data;
+    Mpeg1Context *s1  = avctx->priv_data;
     MpegEncContext *s = &s1->mpeg_enc_ctx;
     int i, v;
 
@@ -2038,10 +2145,10 @@
         ff_MPV_common_end(s);
         s1->mpeg_enc_ctx_allocated = 0;
     }
-    s->width  = avctx->coded_width;
-    s->height = avctx->coded_height;
+    s->width            = avctx->coded_width;
+    s->height           = avctx->coded_height;
     avctx->has_b_frames = 0; // true?
-    s->low_delay = 1;
+    s->low_delay        = 1;
 
     avctx->pix_fmt = mpeg_get_pixelformat(avctx);
     setup_hwaccel_for_pixfmt(avctx);
@@ -2070,7 +2177,6 @@
     if (s->codec_tag == AV_RL32("BW10")) {
         s->codec_id              = s->avctx->codec_id = AV_CODEC_ID_MPEG1VIDEO;
     } else {
-        exchange_uv(s); // common init reset pblocks, so we swap them here
         s->swap_uv = 1; // in case of xvmc we need to swap uv for each MB
         s->codec_id              = s->avctx->codec_id = AV_CODEC_ID_MPEG2VIDEO;
     }
@@ -2080,6 +2186,58 @@
     return 0;
 }
 
+static int mpeg_decode_a53_cc(AVCodecContext *avctx,
+                              const uint8_t *p, int buf_size)
+{
+    Mpeg1Context *s1 = avctx->priv_data;
+
+    if (buf_size >= 6 &&
+        p[0] == 'G' && p[1] == 'A' && p[2] == '9' && p[3] == '4' &&
+        p[4] == 3 && (p[5] & 0x40)) {
+        /* extract A53 Part 4 CC data */
+        int cc_count = p[5] & 0x1f;
+        if (cc_count > 0 && buf_size >= 7 + cc_count * 3) {
+            av_freep(&s1->a53_caption);
+            s1->a53_caption_size = cc_count * 3;
+            s1->a53_caption      = av_malloc(s1->a53_caption_size);
+            if (s1->a53_caption)
+                memcpy(s1->a53_caption, p + 7, s1->a53_caption_size);
+        }
+        return 1;
+    } else if (buf_size >= 11 &&
+               p[0] == 'C' && p[1] == 'C' && p[2] == 0x01 && p[3] == 0xf8) {
+        /* extract DVD CC data */
+        int cc_count = 0;
+        int i;
+        // There is a caption count field in the data, but it is often
+        // incorect.  So count the number of captions present.
+        for (i = 5; i + 6 <= buf_size && ((p[i] & 0xfe) == 0xfe); i += 6)
+            cc_count++;
+        // Transform the DVD format into A53 Part 4 format
+        if (cc_count > 0) {
+            av_freep(&s1->a53_caption);
+            s1->a53_caption_size = cc_count * 6;
+            s1->a53_caption      = av_malloc(s1->a53_caption_size);
+            if (s1->a53_caption) {
+                uint8_t field1 = !!(p[4] & 0x80);
+                uint8_t *cap = s1->a53_caption;
+                p += 5;
+                for (i = 0; i < cc_count; i++) {
+                    cap[0] = (p[0] == 0xff && field1) ? 0xfc : 0xfd;
+                    cap[1] = p[1];
+                    cap[2] = p[2];
+                    cap[3] = (p[3] == 0xff && !field1) ? 0xfc : 0xfd;
+                    cap[4] = p[4];
+                    cap[5] = p[5];
+                    cap += 6;
+                    p += 6;
+                }
+            }
+        }
+        return 1;
+    }
+    return 0;
+}
 
 static void mpeg_decode_user_data(AVCodecContext *avctx,
                                   const uint8_t *p, int buf_size)
@@ -2087,10 +2245,10 @@
     Mpeg1Context *s = avctx->priv_data;
     const uint8_t *buf_end = p + buf_size;
 
-    if(buf_size > 29){
+    if (buf_size > 29){
         int i;
         for(i=0; i<20; i++)
-            if(!memcmp(p+i, "\0TMPGEXS\0", 9)){
+            if (!memcmp(p+i, "\0TMPGEXS\0", 9)){
                 s->tmpgexs= 1;
             }
 
@@ -2114,6 +2272,37 @@
                 return;
             avctx->dtg_active_format = p[0] & 0x0f;
         }
+    } else if (buf_end - p >= 6 &&
+               p[0] == 'J' && p[1] == 'P' && p[2] == '3' && p[3] == 'D' &&
+               p[4] == 0x03) { // S3D_video_format_length
+        // the 0x7F mask ignores the reserved_bit value
+        const uint8_t S3D_video_format_type = p[5] & 0x7F;
+
+        if (S3D_video_format_type == 0x03 ||
+            S3D_video_format_type == 0x04 ||
+            S3D_video_format_type == 0x08 ||
+            S3D_video_format_type == 0x23) {
+            Mpeg1Context *s1   = avctx->priv_data;
+
+            s1->has_stereo3d = 1;
+
+            switch (S3D_video_format_type) {
+            case 0x03:
+                s1->stereo3d.type = AV_STEREO3D_SIDEBYSIDE;
+                break;
+            case 0x04:
+                s1->stereo3d.type = AV_STEREO3D_TOPBOTTOM;
+                break;
+            case 0x08:
+                s1->stereo3d.type = AV_STEREO3D_2D;
+                break;
+            case 0x23:
+                s1->stereo3d.type = AV_STEREO3D_SIDEBYSIDE_QUINCUNX;
+                break;
+            }
+        }
+    } else if (mpeg_decode_a53_cc(avctx, p, buf_size)) {
+        return;
     }
 }
 
@@ -2125,14 +2314,14 @@
     int broken_link;
     int64_t tc;
 
-    init_get_bits(&s->gb, buf, buf_size*8);
+    init_get_bits(&s->gb, buf, buf_size * 8);
 
     tc = avctx->timecode_frame_start = get_bits(&s->gb, 25);
 
     s->closed_gop = get_bits1(&s->gb);
-    /*broken_link indicate that after editing the
-      reference frames of the first B-Frames after GOP I-Frame
-      are missing (open gop)*/
+    /* broken_link indicate that after editing the
+     * reference frames of the first B-Frames after GOP I-Frame
+     * are missing (open gop) */
     broken_link = get_bits1(&s->gb);
 
     if (s->avctx->debug & FF_DEBUG_PICT_INFO) {
@@ -2144,9 +2333,8 @@
     }
 }
 
-static int decode_chunks(AVCodecContext *avctx,
-                         AVFrame *picture, int *got_output,
-                         const uint8_t *buf, int buf_size)
+static int decode_chunks(AVCodecContext *avctx, AVFrame *picture,
+                         int *got_output, const uint8_t *buf, int buf_size)
 {
     Mpeg1Context *s = avctx->priv_data;
     MpegEncContext *s2 = &s->mpeg_enc_ctx;
@@ -2162,12 +2350,15 @@
         buf_ptr = avpriv_find_start_code(buf_ptr, buf_end, &start_code);
         if (start_code > 0x1ff) {
             if (!skip_frame) {
-                if (HAVE_THREADS && (avctx->active_thread_type & FF_THREAD_SLICE) &&
+                if (HAVE_THREADS &&
+                    (avctx->active_thread_type & FF_THREAD_SLICE) &&
                     !avctx->hwaccel) {
                     int i;
                     av_assert0(avctx->thread_count > 1);
 
-                    avctx->execute(avctx, slice_decode_thread,  &s2->thread_context[0], NULL, s->slice_count, sizeof(void*));
+                    avctx->execute(avctx, slice_decode_thread,
+                                   &s2->thread_context[0], NULL,
+                                   s->slice_count, sizeof(void *));
                     for (i = 0; i < s->slice_count; i++)
                         s2->er.error_count += s2->thread_context[i]->er.error_count;
                 }
@@ -2180,29 +2371,35 @@
                 if (ret < 0)
                     return ret;
                 else if (ret) {
-                    if (s2->last_picture_ptr || s2->low_delay) //FIXME merge with the stuff in mpeg_decode_slice
+                    // FIXME: merge with the stuff in mpeg_decode_slice
+                    if (s2->last_picture_ptr || s2->low_delay)
                         *got_output = 1;
                 }
             }
             s2->pict_type = 0;
+
+            if (avctx->err_recognition & AV_EF_EXPLODE && s2->er.error_count)
+                return AVERROR_INVALIDDATA;
+
             return FFMAX(0, buf_ptr - buf - s2->parse_context.last_index);
         }
 
         input_size = buf_end - buf_ptr;
 
-        if (avctx->debug & FF_DEBUG_STARTCODE) {
-            av_log(avctx, AV_LOG_DEBUG, "%3X at %td left %d\n", start_code, buf_ptr-buf, input_size);
-        }
+        if (avctx->debug & FF_DEBUG_STARTCODE)
+            av_log(avctx, AV_LOG_DEBUG, "%3X at %td left %d\n",
+                   start_code, buf_ptr - buf, input_size);
 
         /* prepare data for next start code */
         switch (start_code) {
         case SEQ_START_CODE:
             if (last_code == 0) {
                 mpeg1_decode_sequence(avctx, buf_ptr, input_size);
-                if(buf != avctx->extradata)
-                    s->sync=1;
+                if (buf != avctx->extradata)
+                    s->sync = 1;
             } else {
-                av_log(avctx, AV_LOG_ERROR, "ignoring SEQ_START_CODE after %X\n", last_code);
+                av_log(avctx, AV_LOG_ERROR,
+                       "ignoring SEQ_START_CODE after %X\n", last_code);
                 if (avctx->err_recognition & AV_EF_EXPLODE)
                     return AVERROR_INVALIDDATA;
             }
@@ -2223,7 +2420,7 @@
                 return AVERROR_INVALIDDATA;
             }
 
-            if(s->tmpgexs){
+            if (s->tmpgexs){
                 s2->intra_dc_precision= 3;
                 s2->intra_matrix[0]= 1;
             }
@@ -2233,7 +2430,7 @@
 
                 avctx->execute(avctx, slice_decode_thread,
                                s2->thread_context, NULL,
-                               s->slice_count, sizeof(void*));
+                               s->slice_count, sizeof(void *));
                 for (i = 0; i < s->slice_count; i++)
                     s2->er.error_count += s2->thread_context[i]->er.error_count;
                 s->slice_count = 0;
@@ -2241,30 +2438,33 @@
             if (last_code == 0 || last_code == SLICE_MIN_START_CODE) {
                 ret = mpeg_decode_postinit(avctx);
                 if (ret < 0) {
-                    av_log(avctx, AV_LOG_ERROR, "mpeg_decode_postinit() failure\n");
+                    av_log(avctx, AV_LOG_ERROR,
+                           "mpeg_decode_postinit() failure\n");
                     return ret;
                 }
 
-                /* we have a complete image: we try to decompress it */
+                /* We have a complete image: we try to decompress it. */
                 if (mpeg1_decode_picture(avctx, buf_ptr, input_size) < 0)
                     s2->pict_type = 0;
-                s2->first_slice = 1;
-                last_code = PICTURE_START_CODE;
+                s->first_slice = 1;
+                last_code      = PICTURE_START_CODE;
             } else {
-                av_log(avctx, AV_LOG_ERROR, "ignoring pic after %X\n", last_code);
+                av_log(avctx, AV_LOG_ERROR,
+                       "ignoring pic after %X\n", last_code);
                 if (avctx->err_recognition & AV_EF_EXPLODE)
                     return AVERROR_INVALIDDATA;
             }
             break;
         case EXT_START_CODE:
-            init_get_bits(&s2->gb, buf_ptr, input_size*8);
+            init_get_bits(&s2->gb, buf_ptr, input_size * 8);
 
             switch (get_bits(&s2->gb, 4)) {
             case 0x1:
                 if (last_code == 0) {
-                mpeg_decode_sequence_extension(s);
+                    mpeg_decode_sequence_extension(s);
                 } else {
-                    av_log(avctx, AV_LOG_ERROR, "ignoring seq ext after %X\n", last_code);
+                    av_log(avctx, AV_LOG_ERROR,
+                           "ignoring seq ext after %X\n", last_code);
                     if (avctx->err_recognition & AV_EF_EXPLODE)
                         return AVERROR_INVALIDDATA;
                 }
@@ -2282,7 +2482,8 @@
                 if (last_code == PICTURE_START_CODE) {
                     mpeg_decode_picture_coding_extension(s);
                 } else {
-                    av_log(avctx, AV_LOG_ERROR, "ignoring pic cod ext after %X\n", last_code);
+                    av_log(avctx, AV_LOG_ERROR,
+                           "ignoring pic cod ext after %X\n", last_code);
                     if (avctx->err_recognition & AV_EF_EXPLODE)
                         return AVERROR_INVALIDDATA;
                 }
@@ -2294,11 +2495,12 @@
             break;
         case GOP_START_CODE:
             if (last_code == 0) {
-                s2->first_field=0;
+                s2->first_field = 0;
                 mpeg_decode_gop(avctx, buf_ptr, input_size);
-                s->sync=1;
+                s->sync = 1;
             } else {
-                av_log(avctx, AV_LOG_ERROR, "ignoring GOP_START_CODE after %X\n", last_code);
+                av_log(avctx, AV_LOG_ERROR,
+                       "ignoring GOP_START_CODE after %X\n", last_code);
                 if (avctx->err_recognition & AV_EF_EXPLODE)
                     return AVERROR_INVALIDDATA;
             }
@@ -2306,20 +2508,22 @@
         default:
             if (start_code >= SLICE_MIN_START_CODE &&
                 start_code <= SLICE_MAX_START_CODE && last_code == PICTURE_START_CODE) {
-
                 if (s2->progressive_sequence && !s2->progressive_frame) {
                     s2->progressive_frame = 1;
-                    av_log(s2->avctx, AV_LOG_ERROR, "interlaced frame in progressive sequence, ignoring\n");
+                    av_log(s2->avctx, AV_LOG_ERROR,
+                           "interlaced frame in progressive sequence, ignoring\n");
                 }
 
-                if (s2->picture_structure == 0 || (s2->progressive_frame && s2->picture_structure != PICT_FRAME)) {
-                    av_log(s2->avctx, AV_LOG_ERROR, "picture_structure %d invalid, ignoring\n", s2->picture_structure);
+                if (s2->picture_structure == 0 ||
+                    (s2->progressive_frame && s2->picture_structure != PICT_FRAME)) {
+                    av_log(s2->avctx, AV_LOG_ERROR,
+                           "picture_structure %d invalid, ignoring\n",
+                           s2->picture_structure);
                     s2->picture_structure = PICT_FRAME;
                 }
 
-                if (s2->progressive_sequence && !s2->frame_pred_frame_dct) {
+                if (s2->progressive_sequence && !s2->frame_pred_frame_dct)
                     av_log(s2->avctx, AV_LOG_WARNING, "invalid frame_pred_frame_dct\n");
-                }
 
                 if (s2->picture_structure == PICT_FRAME) {
                     s2->first_field = 0;
@@ -2335,7 +2539,7 @@
                 const int field_pic = s2->picture_structure != PICT_FRAME;
                 int mb_y = start_code - SLICE_MIN_START_CODE;
                 last_code = SLICE_MIN_START_CODE;
-                if(s2->codec_id != AV_CODEC_ID_MPEG1VIDEO && s2->mb_height > 2800/16)
+                if (s2->codec_id != AV_CODEC_ID_MPEG1VIDEO && s2->mb_height > 2800/16)
                     mb_y += (*buf_ptr&0xE0)<<2;
 
                 mb_y <<= field_pic;
@@ -2348,12 +2552,14 @@
                 }
 
                 if (mb_y >= s2->mb_height) {
-                    av_log(s2->avctx, AV_LOG_ERROR, "slice below image (%d >= %d)\n", mb_y, s2->mb_height);
+                    av_log(s2->avctx, AV_LOG_ERROR,
+                           "slice below image (%d >= %d)\n", mb_y, s2->mb_height);
                     return -1;
                 }
 
                 if (s2->last_picture_ptr == NULL) {
-                /* Skip B-frames if we do not have reference frames and gop is not closed */
+                    /* Skip B-frames if we do not have reference frames and
+                     * GOP is not closed. */
                     if (s2->pict_type == AV_PICTURE_TYPE_B) {
                         if (!s2->closed_gop) {
                             skip_frame = 1;
@@ -2362,17 +2568,20 @@
                     }
                 }
                 if (s2->pict_type == AV_PICTURE_TYPE_I || (s2->flags2 & CODEC_FLAG2_SHOW_ALL))
-                    s->sync=1;
+                    s->sync = 1;
                 if (s2->next_picture_ptr == NULL) {
-                /* Skip P-frames if we do not have a reference frame or we have an invalid header. */
+                    /* Skip P-frames if we do not have a reference frame or
+                     * we have an invalid header. */
                     if (s2->pict_type == AV_PICTURE_TYPE_P && !s->sync) {
                         skip_frame = 1;
                         break;
                     }
                 }
-                if ((avctx->skip_frame >= AVDISCARD_NONREF && s2->pict_type == AV_PICTURE_TYPE_B) ||
-                    (avctx->skip_frame >= AVDISCARD_NONKEY && s2->pict_type != AV_PICTURE_TYPE_I) ||
-                     avctx->skip_frame >= AVDISCARD_ALL) {
+                if ((avctx->skip_frame >= AVDISCARD_NONREF &&
+                     s2->pict_type == AV_PICTURE_TYPE_B) ||
+                    (avctx->skip_frame >= AVDISCARD_NONKEY &&
+                     s2->pict_type != AV_PICTURE_TYPE_I) ||
+                    avctx->skip_frame >= AVDISCARD_ALL) {
                     skip_frame = 1;
                     break;
                 }
@@ -2381,7 +2590,8 @@
                     break;
 
                 if (s2->codec_id == AV_CODEC_ID_MPEG2VIDEO) {
-                    if (mb_y < avctx->skip_top || mb_y >= s2->mb_height - avctx->skip_bottom)
+                    if (mb_y < avctx->skip_top ||
+                        mb_y >= s2->mb_height - avctx->skip_bottom)
                         break;
                 }
 
@@ -2392,14 +2602,15 @@
                     break;
                 }
 
-                if (s2->first_slice) {
-                    skip_frame = 0;
-                    s2->first_slice = 0;
+                if (s->first_slice) {
+                    skip_frame     = 0;
+                    s->first_slice = 0;
                     if (mpeg_field_start(s2, buf, buf_size) < 0)
                         return -1;
                 }
                 if (!s2->current_picture_ptr) {
-                    av_log(avctx, AV_LOG_ERROR, "current_picture not initialized\n");
+                    av_log(avctx, AV_LOG_ERROR,
+                           "current_picture not initialized\n");
                     return AVERROR_INVALIDDATA;
                 }
 
@@ -2408,7 +2619,8 @@
                     break;
                 }
 
-                if (HAVE_THREADS && (avctx->active_thread_type & FF_THREAD_SLICE) &&
+                if (HAVE_THREADS &&
+                    (avctx->active_thread_type & FF_THREAD_SLICE) &&
                     !avctx->hwaccel) {
                     int threshold = (s2->mb_height * s->slice_count +
                                      s2->slice_context_count / 2) /
@@ -2420,13 +2632,12 @@
                         thread_context->start_mb_y = mb_y;
                         thread_context->end_mb_y   = s2->mb_height;
                         if (s->slice_count) {
-                            s2->thread_context[s->slice_count-1]->end_mb_y = mb_y;
-                            ret = ff_update_duplicate_context(thread_context,
-                                                              s2);
+                            s2->thread_context[s->slice_count - 1]->end_mb_y = mb_y;
+                            ret = ff_update_duplicate_context(thread_context, s2);
                             if (ret < 0)
                                 return ret;
                         }
-                        init_get_bits(&thread_context->gb, buf_ptr, input_size*8);
+                        init_get_bits(&thread_context->gb, buf_ptr, input_size * 8);
                         s->slice_count++;
                     }
                     buf_ptr += 2; // FIXME add minimum number of bytes per slice
@@ -2438,9 +2649,13 @@
                         if (avctx->err_recognition & AV_EF_EXPLODE)
                             return ret;
                         if (s2->resync_mb_x >= 0 && s2->resync_mb_y >= 0)
-                            ff_er_add_slice(&s2->er, s2->resync_mb_x, s2->resync_mb_y, s2->mb_x, s2->mb_y, ER_AC_ERROR | ER_DC_ERROR | ER_MV_ERROR);
+                            ff_er_add_slice(&s2->er, s2->resync_mb_x,
+                                            s2->resync_mb_y, s2->mb_x, s2->mb_y,
+                                            ER_AC_ERROR | ER_DC_ERROR | ER_MV_ERROR);
                     } else {
-                        ff_er_add_slice(&s2->er, s2->resync_mb_x, s2->resync_mb_y, s2->mb_x-1, s2->mb_y, ER_AC_END | ER_DC_END | ER_MV_END);
+                        ff_er_add_slice(&s2->er, s2->resync_mb_x,
+                                        s2->resync_mb_y, s2->mb_x - 1, s2->mb_y,
+                                        ER_AC_END | ER_DC_END | ER_MV_END);
                     }
                 }
             }
@@ -2449,9 +2664,8 @@
     }
 }
 
-static int mpeg_decode_frame(AVCodecContext *avctx,
-                             void *data, int *got_output,
-                             AVPacket *avpkt)
+static int mpeg_decode_frame(AVCodecContext *avctx, void *data,
+                             int *got_output, AVPacket *avpkt)
 {
     const uint8_t *buf = avpkt->data;
     int ret;
@@ -2476,9 +2690,11 @@
     }
 
     if (s2->flags & CODEC_FLAG_TRUNCATED) {
-        int next = ff_mpeg1_find_frame_end(&s2->parse_context, buf, buf_size, NULL);
+        int next = ff_mpeg1_find_frame_end(&s2->parse_context, buf,
+                                           buf_size, NULL);
 
-        if (ff_combine_frame(&s2->parse_context, next, (const uint8_t **)&buf, &buf_size) < 0)
+        if (ff_combine_frame(&s2->parse_context, next,
+                             (const uint8_t **) &buf, &buf_size) < 0)
             return buf_size;
     }
 
@@ -2491,8 +2707,9 @@
     s->slice_count = 0;
 
     if (avctx->extradata && !s->extradata_decoded) {
-        ret = decode_chunks(avctx, picture, got_output, avctx->extradata, avctx->extradata_size);
-        if(*got_output) {
+        ret = decode_chunks(avctx, picture, got_output,
+                            avctx->extradata, avctx->extradata_size);
+        if (*got_output) {
             av_log(avctx, AV_LOG_ERROR, "picture in extradata\n");
             *got_output = 0;
         }
@@ -2510,12 +2727,11 @@
     return ret;
 }
 
-
 static void flush(AVCodecContext *avctx)
 {
     Mpeg1Context *s = avctx->priv_data;
 
-    s->sync=0;
+    s->sync       = 0;
 
     ff_mpeg_flush(avctx);
 }
@@ -2526,6 +2742,7 @@
 
     if (s->mpeg_enc_ctx_allocated)
         ff_MPV_common_end(&s->mpeg_enc_ctx);
+    av_freep(&s->a53_caption);
     return 0;
 }
 
@@ -2538,10 +2755,9 @@
     { FF_PROFILE_MPEG2_SIMPLE,       "Simple"             },
     { FF_PROFILE_RESERVED,           "Reserved"           },
     { FF_PROFILE_RESERVED,           "Reserved"           },
-    { FF_PROFILE_UNKNOWN },
+    { FF_PROFILE_UNKNOWN                                  },
 };
 
-
 AVCodec ff_mpeg1video_decoder = {
     .name                  = "mpeg1video",
     .long_name             = NULL_IF_CONFIG_SMALL("MPEG-1 video"),
@@ -2591,6 +2807,7 @@
     .max_lowres     = 3,
 };
 
+#if FF_API_XVMC
 #if CONFIG_MPEG_XVMC_DECODER
 static av_cold int mpeg_mc_decode_init(AVCodecContext *avctx)
 {
@@ -2619,11 +2836,12 @@
     .close          = mpeg_decode_end,
     .decode         = mpeg_decode_frame,
     .capabilities   = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 |
-                      CODEC_CAP_TRUNCATED| CODEC_CAP_HWACCEL | CODEC_CAP_DELAY,
+                      CODEC_CAP_TRUNCATED | CODEC_CAP_HWACCEL | CODEC_CAP_DELAY,
     .flush          = flush,
 };
 
 #endif
+#endif /* FF_API_XVMC */
 
 #if CONFIG_MPEG_VDPAU_DECODER
 AVCodec ff_mpeg_vdpau_decoder = {

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/mpeg12enc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/mpeg12enc.c Changed

@@ -25,11 +25,15 @@
  * MPEG1/2 encoder
  */
 
+#include <stdint.h>
+
 #include "libavutil/attributes.h"
 #include "libavutil/avassert.h"
 #include "libavutil/log.h"
 #include "libavutil/opt.h"
 #include "libavutil/timecode.h"
+#include "libavutil/stereo3d.h"
+
 #include "avcodec.h"
 #include "bytestream.h"
 #include "mathops.h"
@@ -386,6 +390,7 @@
 
 void ff_mpeg1_encode_picture_header(MpegEncContext *s, int picture_number)
 {
+    AVFrameSideData *side_data;
     mpeg1_encode_sequence_header(s);
 
     /* mpeg1 picture header */
@@ -469,6 +474,44 @@
         for (i = 0; i < sizeof(svcd_scan_offset_placeholder); i++)
             put_bits(&s->pb, 8, svcd_scan_offset_placeholder[i]);
     }
+    side_data = av_frame_get_side_data(&s->current_picture_ptr->f,
+                                       AV_FRAME_DATA_STEREO3D);
+    if (side_data) {
+        AVStereo3D *stereo = (AVStereo3D *)side_data->data;
+        uint8_t fpa_type;
+
+        switch (stereo->type) {
+        case AV_STEREO3D_SIDEBYSIDE:
+            fpa_type = 0x03;
+            break;
+        case AV_STEREO3D_TOPBOTTOM:
+            fpa_type = 0x04;
+            break;
+        case AV_STEREO3D_2D:
+            fpa_type = 0x08;
+            break;
+        case AV_STEREO3D_SIDEBYSIDE_QUINCUNX:
+            fpa_type = 0x23;
+            break;
+        default:
+            fpa_type = 0;
+            break;
+        }
+
+        if (fpa_type != 0) {
+            put_header(s, USER_START_CODE);
+            put_bits(&s->pb, 8, 'J');   // S3D_video_format_signaling_identifier
+            put_bits(&s->pb, 8, 'P');
+            put_bits(&s->pb, 8, '3');
+            put_bits(&s->pb, 8, 'D');
+            put_bits(&s->pb, 8, 0x03);  // S3D_video_format_length
+
+            put_bits(&s->pb, 1, 1);     // reserved_bit
+            put_bits(&s->pb, 7, fpa_type); // S3D_video_format_type
+            put_bits(&s->pb, 8, 0x04);  // reserved_data[0]
+            put_bits(&s->pb, 8, 0xFF);  // reserved_data[1]
+        }
+    }
 
     s->mb_y = 0;
     ff_mpeg1_encode_slice_header(s);

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/mpeg4video.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/mpeg4video.c Changed

@@ -24,19 +24,20 @@
 #include "mpeg4video.h"
 #include "mpeg4data.h"
 
-uint8_t ff_mpeg4_static_rl_table_store[3][2][2*MAX_RUN + MAX_LEVEL + 3];
-
-int ff_mpeg4_get_video_packet_prefix_length(MpegEncContext *s){
-    switch(s->pict_type){
-        case AV_PICTURE_TYPE_I:
-            return 16;
-        case AV_PICTURE_TYPE_P:
-        case AV_PICTURE_TYPE_S:
-            return s->f_code+15;
-        case AV_PICTURE_TYPE_B:
-            return FFMAX3(s->f_code, s->b_code, 2) + 15;
-        default:
-            return -1;
+uint8_t ff_mpeg4_static_rl_table_store[3][2][2 * MAX_RUN + MAX_LEVEL + 3];
+
+int ff_mpeg4_get_video_packet_prefix_length(MpegEncContext *s)
+{
+    switch (s->pict_type) {
+    case AV_PICTURE_TYPE_I:
+        return 16;
+    case AV_PICTURE_TYPE_P:
+    case AV_PICTURE_TYPE_S:
+        return s->f_code + 15;
+    case AV_PICTURE_TYPE_B:
+        return FFMAX3(s->f_code, s->b_code, 2) + 15;
+    default:
+        return -1;
     }
 }
 
@@ -44,70 +45,75 @@
 {
     int c_wrap, c_xy, l_wrap, l_xy;
 
-    l_wrap= s->b8_stride;
-    l_xy= (2*s->mb_y-1)*l_wrap + s->mb_x*2 - 1;
-    c_wrap= s->mb_stride;
-    c_xy= (s->mb_y-1)*c_wrap + s->mb_x - 1;
+    l_wrap = s->b8_stride;
+    l_xy   = (2 * s->mb_y - 1) * l_wrap + s->mb_x * 2 - 1;
+    c_wrap = s->mb_stride;
+    c_xy   = (s->mb_y - 1) * c_wrap + s->mb_x - 1;
 
 #if 0
     /* clean DC */
-    memsetw(s->dc_val[0] + l_xy, 1024, l_wrap*2+1);
-    memsetw(s->dc_val[1] + c_xy, 1024, c_wrap+1);
-    memsetw(s->dc_val[2] + c_xy, 1024, c_wrap+1);
+    memsetw(s->dc_val[0] + l_xy, 1024, l_wrap * 2 + 1);
+    memsetw(s->dc_val[1] + c_xy, 1024, c_wrap + 1);
+    memsetw(s->dc_val[2] + c_xy, 1024, c_wrap + 1);
 #endif
 
     /* clean AC */
-    memset(s->ac_val[0] + l_xy, 0, (l_wrap*2+1)*16*sizeof(int16_t));
-    memset(s->ac_val[1] + c_xy, 0, (c_wrap  +1)*16*sizeof(int16_t));
-    memset(s->ac_val[2] + c_xy, 0, (c_wrap  +1)*16*sizeof(int16_t));
+    memset(s->ac_val[0] + l_xy, 0, (l_wrap * 2 + 1) * 16 * sizeof(int16_t));
+    memset(s->ac_val[1] + c_xy, 0, (c_wrap     + 1) * 16 * sizeof(int16_t));
+    memset(s->ac_val[2] + c_xy, 0, (c_wrap     + 1) * 16 * sizeof(int16_t));
 
     /* clean MV */
     // we can't clear the MVs as they might be needed by a b frame
-//    memset(s->motion_val + l_xy, 0, (l_wrap*2+1)*2*sizeof(int16_t));
-//    memset(s->motion_val, 0, 2*sizeof(int16_t)*(2 + s->mb_width*2)*(2 + s->mb_height*2));
-    s->last_mv[0][0][0]=
-    s->last_mv[0][0][1]=
-    s->last_mv[1][0][0]=
-    s->last_mv[1][0][1]= 0;
+//    memset(s->motion_val + l_xy, 0, (l_wrap * 2 + 1) * 2 * sizeof(int16_t));
+//    memset(s->motion_val, 0, 2 * sizeof(int16_t) * (2 + s->mb_width * 2) *
+//           (2 + s->mb_height * 2));
+    s->last_mv[0][0][0] =
+    s->last_mv[0][0][1] =
+    s->last_mv[1][0][0] =
+    s->last_mv[1][0][1] = 0;
 }
 
 #define tab_size ((signed)FF_ARRAY_ELEMS(s->direct_scale_mv[0]))
-#define tab_bias (tab_size/2)
+#define tab_bias (tab_size / 2)
 
-//used by mpeg4 and rv10 decoder
-void ff_mpeg4_init_direct_mv(MpegEncContext *s){
+// used by mpeg4 and rv10 decoder
+void ff_mpeg4_init_direct_mv(MpegEncContext *s)
+{
     int i;
-    for(i=0; i<tab_size; i++){
-        s->direct_scale_mv[0][i] = (i-tab_bias)*s->pb_time/s->pp_time;
-        s->direct_scale_mv[1][i] = (i-tab_bias)*(s->pb_time-s->pp_time)/s->pp_time;
+    for (i = 0; i < tab_size; i++) {
+        s->direct_scale_mv[0][i] = (i - tab_bias) * s->pb_time / s->pp_time;
+        s->direct_scale_mv[1][i] = (i - tab_bias) * (s->pb_time - s->pp_time) /
+                                   s->pp_time;
     }
 }
 
-static inline void ff_mpeg4_set_one_direct_mv(MpegEncContext *s, int mx, int my, int i){
-    int xy= s->block_index[i];
-    uint16_t time_pp= s->pp_time;
-    uint16_t time_pb= s->pb_time;
+static inline void ff_mpeg4_set_one_direct_mv(MpegEncContext *s, int mx,
+                                              int my, int i)
+{
+    int xy           = s->block_index[i];
+    uint16_t time_pp = s->pp_time;
+    uint16_t time_pb = s->pb_time;
     int p_mx, p_my;
 
     p_mx = s->next_picture.motion_val[0][xy][0];
-    if((unsigned)(p_mx + tab_bias) < tab_size){
+    if ((unsigned)(p_mx + tab_bias) < tab_size) {
         s->mv[0][i][0] = s->direct_scale_mv[0][p_mx + tab_bias] + mx;
         s->mv[1][i][0] = mx ? s->mv[0][i][0] - p_mx
                             : s->direct_scale_mv[1][p_mx + tab_bias];
-    }else{
-        s->mv[0][i][0] = p_mx*time_pb/time_pp + mx;
+    } else {
+        s->mv[0][i][0] = p_mx * time_pb / time_pp + mx;
         s->mv[1][i][0] = mx ? s->mv[0][i][0] - p_mx
-                            : p_mx*(time_pb - time_pp)/time_pp;
+                            : p_mx * (time_pb - time_pp) / time_pp;
     }
     p_my = s->next_picture.motion_val[0][xy][1];
-    if((unsigned)(p_my + tab_bias) < tab_size){
+    if ((unsigned)(p_my + tab_bias) < tab_size) {
         s->mv[0][i][1] = s->direct_scale_mv[0][p_my + tab_bias] + my;
         s->mv[1][i][1] = my ? s->mv[0][i][1] - p_my
                             : s->direct_scale_mv[1][p_my + tab_bias];
-    }else{
-        s->mv[0][i][1] = p_my*time_pb/time_pp + my;
+    } else {
+        s->mv[0][i][1] = p_my * time_pb / time_pp + my;
         s->mv[1][i][1] = my ? s->mv[0][i][1] - p_my
-                            : p_my*(time_pb - time_pp)/time_pp;
+                            : p_my * (time_pb - time_pp) / time_pp;
     }
 }
 
@@ -115,56 +121,72 @@
 #undef tab_bias
 
 /**
- *
  * @return the mb_type
  */
-int ff_mpeg4_set_direct_mv(MpegEncContext *s, int mx, int my){
-    const int mb_index= s->mb_x + s->mb_y*s->mb_stride;
+int ff_mpeg4_set_direct_mv(MpegEncContext *s, int mx, int my)
+{
+    const int mb_index          = s->mb_x + s->mb_y * s->mb_stride;
     const int colocated_mb_type = s->next_picture.mb_type[mb_index];
     uint16_t time_pp;
     uint16_t time_pb;
     int i;
 
-    //FIXME avoid divides
+    // FIXME avoid divides
     // try special case with shifts for 1 and 3 B-frames?
 
-    if(IS_8X8(colocated_mb_type)){
+    if (IS_8X8(colocated_mb_type)) {
         s->mv_type = MV_TYPE_8X8;
-        for(i=0; i<4; i++){
+        for (i = 0; i < 4; i++)
             ff_mpeg4_set_one_direct_mv(s, mx, my, i);
-        }
         return MB_TYPE_DIRECT2 | MB_TYPE_8x8 | MB_TYPE_L0L1;
-    } else if(IS_INTERLACED(colocated_mb_type)){
+    } else if (IS_INTERLACED(colocated_mb_type)) {
         s->mv_type = MV_TYPE_FIELD;
-        for(i=0; i<2; i++){
+        for (i = 0; i < 2; i++) {
             int field_select = s->next_picture.ref_index[0][4 * mb_index + 2 * i];
-            s->field_select[0][i]= field_select;
-            s->field_select[1][i]= i;
-            if(s->top_field_first){
-                time_pp= s->pp_field_time - field_select + i;
-                time_pb= s->pb_field_time - field_select + i;
-            }else{
-                time_pp= s->pp_field_time + field_select - i;
-                time_pb= s->pb_field_time + field_select - i;
+            s->field_select[0][i] = field_select;
+            s->field_select[1][i] = i;
+            if (s->top_field_first) {
+                time_pp = s->pp_field_time - field_select + i;
+                time_pb = s->pb_field_time - field_select + i;
+            } else {
+                time_pp = s->pp_field_time + field_select - i;
+                time_pb = s->pb_field_time + field_select - i;
             }
-            s->mv[0][i][0] = s->p_field_mv_table[i][0][mb_index][0]*time_pb/time_pp + mx;
-            s->mv[0][i][1] = s->p_field_mv_table[i][0][mb_index][1]*time_pb/time_pp + my;
-            s->mv[1][i][0] = mx ? s->mv[0][i][0] - s->p_field_mv_table[i][0][mb_index][0]
-                                : s->p_field_mv_table[i][0][mb_index][0]*(time_pb - time_pp)/time_pp;
-            s->mv[1][i][1] = my ? s->mv[0][i][1] - s->p_field_mv_table[i][0][mb_index][1]
-                                : s->p_field_mv_table[i][0][mb_index][1]*(time_pb - time_pp)/time_pp;
+            s->mv[0][i][0] = s->p_field_mv_table[i][0][mb_index][0] *
+                             time_pb / time_pp + mx;
+            s->mv[0][i][1] = s->p_field_mv_table[i][0][mb_index][1] *
+                             time_pb / time_pp + my;
+            s->mv[1][i][0] = mx ? s->mv[0][i][0] -
+                                  s->p_field_mv_table[i][0][mb_index][0]
+                                : s->p_field_mv_table[i][0][mb_index][0] *
+                                  (time_pb - time_pp) / time_pp;
+            s->mv[1][i][1] = my ? s->mv[0][i][1] -
+                                  s->p_field_mv_table[i][0][mb_index][1]
+                                : s->p_field_mv_table[i][0][mb_index][1] *
+                                  (time_pb - time_pp) / time_pp;
         }
-        return MB_TYPE_DIRECT2 | MB_TYPE_16x8 | MB_TYPE_L0L1 | MB_TYPE_INTERLACED;
-    }else{
+        return MB_TYPE_DIRECT2 | MB_TYPE_16x8 |
+               MB_TYPE_L0L1    | MB_TYPE_INTERLACED;
+    } else {
         ff_mpeg4_set_one_direct_mv(s, mx, my, 0);
-        s->mv[0][1][0] = s->mv[0][2][0] = s->mv[0][3][0] = s->mv[0][0][0];
-        s->mv[0][1][1] = s->mv[0][2][1] = s->mv[0][3][1] = s->mv[0][0][1];
-        s->mv[1][1][0] = s->mv[1][2][0] = s->mv[1][3][0] = s->mv[1][0][0];
-        s->mv[1][1][1] = s->mv[1][2][1] = s->mv[1][3][1] = s->mv[1][0][1];
-        if((s->avctx->workaround_bugs & FF_BUG_DIRECT_BLOCKSIZE) || !s->quarter_sample)
-            s->mv_type= MV_TYPE_16X16;
+        s->mv[0][1][0] =
+        s->mv[0][2][0] =
+        s->mv[0][3][0] = s->mv[0][0][0];
+        s->mv[0][1][1] =
+        s->mv[0][2][1] =
+        s->mv[0][3][1] = s->mv[0][0][1];
+        s->mv[1][1][0] =
+        s->mv[1][2][0] =
+        s->mv[1][3][0] = s->mv[1][0][0];
+        s->mv[1][1][1] =
+        s->mv[1][2][1] =
+        s->mv[1][3][1] = s->mv[1][0][1];
+        if ((s->avctx->workaround_bugs & FF_BUG_DIRECT_BLOCKSIZE) ||
+            !s->quarter_sample)
+            s->mv_type = MV_TYPE_16X16;
         else
-            s->mv_type= MV_TYPE_8X8;
-        return MB_TYPE_DIRECT2 | MB_TYPE_16x16 | MB_TYPE_L0L1; //Note see prev line
+            s->mv_type = MV_TYPE_8X8;
+        // Note see prev line
+        return MB_TYPE_DIRECT2 | MB_TYPE_16x16 | MB_TYPE_L0L1;
     }
 }

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/mpeg4video.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/mpeg4video.h Changed

@@ -24,6 +24,7 @@
 #define AVCODEC_MPEG4VIDEO_H
 
 #include <stdint.h>
+
 #include "get_bits.h"
 #include "mpegvideo.h"
 #include "rl.h"
@@ -34,13 +35,13 @@
 #define BIN_ONLY_SHAPE   2
 #define GRAY_SHAPE       3
 
-#define SIMPLE_VO_TYPE             1
-#define CORE_VO_TYPE               3
-#define MAIN_VO_TYPE               4
-#define NBIT_VO_TYPE               5
-#define ARTS_VO_TYPE               10
-#define ACE_VO_TYPE                12
-#define ADV_SIMPLE_VO_TYPE         17
+#define SIMPLE_VO_TYPE           1
+#define CORE_VO_TYPE             3
+#define MAIN_VO_TYPE             4
+#define NBIT_VO_TYPE             5
+#define ARTS_VO_TYPE            10
+#define ACE_VO_TYPE             12
+#define ADV_SIMPLE_VO_TYPE      17
 
 // aspect_ratio_info
 #define EXTENDED_PAR 15
@@ -58,6 +59,49 @@
 #define VISUAL_OBJ_STARTCODE 0x1B5
 #define VOP_STARTCODE        0x1B6
 
+typedef struct Mpeg4DecContext {
+    MpegEncContext m;
+
+    /// number of bits to represent the fractional part of time
+    int time_increment_bits;
+    int shape;
+    int vol_sprite_usage;
+    int sprite_brightness_change;
+    int num_sprite_warping_points;
+    /// sprite trajectory points
+    uint16_t sprite_traj[4][2];
+    /// sprite shift [isChroma]
+    int sprite_shift[2];
+
+    // reversible vlc
+    int rvlc;
+    /// could this stream contain resync markers
+    int resync_marker;
+    /// time distance of first I -> B, used for interlaced b frames
+    int t_frame;
+
+    int new_pred;
+    int enhancement_type;
+    int scalability;
+    int use_intra_dc_vlc;
+
+    /// QP above whch the ac VLC should be used for intra dc
+    int intra_dc_threshold;
+
+    /* bug workarounds */
+    int divx_version;
+    int divx_build;
+    int xvid_build;
+    int lavc_build;
+
+    /// flag for having shown the warning about divxs invalid b frames
+    int showed_packed_warning;
+
+    int cplx_estimation_trash_i;
+    int cplx_estimation_trash_p;
+    int cplx_estimation_trash_b;
+} Mpeg4DecContext;
+
 /* dc encoding for mpeg4 */
 extern const uint8_t ff_mpeg4_DCtab_lum[13][2];
 extern const uint8_t ff_mpeg4_DCtab_chrom[13][2];
@@ -88,23 +132,25 @@
 void ff_mpeg4_encode_mb(MpegEncContext *s,
                         int16_t block[6][64],
                         int motion_x, int motion_y);
-void ff_mpeg4_pred_ac(MpegEncContext * s, int16_t *block, int n,
+void ff_mpeg4_pred_ac(MpegEncContext *s, int16_t *block, int n,
                       int dir);
-void ff_set_mpeg4_time(MpegEncContext * s);
+void ff_set_mpeg4_time(MpegEncContext *s);
 void ff_mpeg4_encode_picture_header(MpegEncContext *s, int picture_number);
 
-int ff_mpeg4_decode_picture_header(MpegEncContext * s, GetBitContext *gb);
+int ff_mpeg4_decode_picture_header(Mpeg4DecContext *ctx, GetBitContext *gb);
 void ff_mpeg4_encode_video_packet_header(MpegEncContext *s);
 void ff_mpeg4_clean_buffers(MpegEncContext *s);
-void ff_mpeg4_stuffing(PutBitContext * pbc);
+void ff_mpeg4_stuffing(PutBitContext *pbc);
 void ff_mpeg4_init_partitions(MpegEncContext *s);
 void ff_mpeg4_merge_partitions(MpegEncContext *s);
 void ff_clean_mpeg4_qscales(MpegEncContext *s);
-int ff_mpeg4_decode_partitions(MpegEncContext *s);
+int ff_mpeg4_decode_partitions(Mpeg4DecContext *ctx);
 int ff_mpeg4_get_video_packet_prefix_length(MpegEncContext *s);
-int ff_mpeg4_decode_video_packet_header(MpegEncContext *s);
+int ff_mpeg4_decode_video_packet_header(Mpeg4DecContext *ctx);
 void ff_mpeg4_init_direct_mv(MpegEncContext *s);
 void ff_mpeg4videodec_static_init(void);
+int ff_mpeg4_workaround_bugs(AVCodecContext *avctx);
+int ff_mpeg4_frame_end(AVCodecContext *avctx, const uint8_t *buf, int buf_size);
 
 /**
  *
@@ -112,8 +158,7 @@
  */
 int ff_mpeg4_set_direct_mv(MpegEncContext *s, int mx, int my);
 
-extern uint8_t ff_mpeg4_static_rl_table_store[3][2][2*MAX_RUN + MAX_LEVEL + 3];
-
+extern uint8_t ff_mpeg4_static_rl_table_store[3][2][2 * MAX_RUN + MAX_LEVEL + 3];
 
 #if 0 //3IV1 is quite rare and it slows things down a tiny bit
 #define IS_3IV1 s->codec_tag == AV_RL32("3IV1")
@@ -121,7 +166,6 @@
 #define IS_3IV1 0
 #endif
 
-
 /**
  * Predict the dc.
  * encoding quantized level -> quantized diff
@@ -129,75 +173,81 @@
  * @param n block index (0-3 are luma, 4-5 are chroma)
  * @param dir_ptr pointer to an integer where the prediction direction will be stored
  */
-static inline int ff_mpeg4_pred_dc(MpegEncContext * s, int n, int level, int *dir_ptr, int encoding)
+static inline int ff_mpeg4_pred_dc(MpegEncContext *s, int n, int level,
+                                   int *dir_ptr, int encoding)
 {
     int a, b, c, wrap, pred, scale, ret;
     int16_t *dc_val;
 
     /* find prediction */
-    if (n < 4) {
+    if (n < 4)
         scale = s->y_dc_scale;
-    } else {
+    else
         scale = s->c_dc_scale;
-    }
-    if(IS_3IV1)
-        scale= 8;
+    if (IS_3IV1)
+        scale = 8;
 
-    wrap= s->block_wrap[n];
+    wrap   = s->block_wrap[n];
     dc_val = s->dc_val[0] + s->block_index[n];
 
     /* B C
      * A X
      */
-    a = dc_val[ - 1];
-    b = dc_val[ - 1 - wrap];
-    c = dc_val[ - wrap];
-
-    /* outside slice handling (we can't do that by memset as we need the dc for error resilience) */
-    if(s->first_slice_line && n!=3){
-        if(n!=2) b=c= 1024;
-        if(n!=1 && s->mb_x == s->resync_mb_x) b=a= 1024;
+    a = dc_val[-1];
+    b = dc_val[-1 - wrap];
+    c = dc_val[-wrap];
+
+    /* outside slice handling (we can't do that by memset as we need the
+     * dc for error resilience) */
+    if (s->first_slice_line && n != 3) {
+        if (n != 2)
+            b = c = 1024;
+        if (n != 1 && s->mb_x == s->resync_mb_x)
+            b = a = 1024;
     }
-    if(s->mb_x == s->resync_mb_x && s->mb_y == s->resync_mb_y+1){
-        if(n==0 || n==4 || n==5)
-            b=1024;
+    if (s->mb_x == s->resync_mb_x && s->mb_y == s->resync_mb_y + 1) {
+        if (n == 0 || n == 4 || n == 5)
+            b = 1024;
     }
 
     if (abs(a - b) < abs(b - c)) {
-        pred = c;
+        pred     = c;
         *dir_ptr = 1; /* top */
     } else {
-        pred = a;
+        pred     = a;
         *dir_ptr = 0; /* left */
     }
     /* we assume pred is positive */
     pred = FASTDIV((pred + (scale >> 1)), scale);
 
-    if(encoding){
+    if (encoding) {
         ret = level - pred;
-    }else{
+    } else {
         level += pred;
-        ret= level;
-        if(s->err_recognition&(AV_EF_BITSTREAM|AV_EF_AGGRESSIVE)){
-            if(level<0){
-                av_log(s->avctx, AV_LOG_ERROR, "dc<0 at %dx%d\n", s->mb_x, s->mb_y);
+        ret    = level;
+        if (s->err_recognition & (AV_EF_BITSTREAM | AV_EF_AGGRESSIVE)) {
+            if (level < 0) {
+                av_log(s->avctx, AV_LOG_ERROR,
+                       "dc<0 at %dx%d\n", s->mb_x, s->mb_y);
                 return -1;
             }
-            if(level*scale > 2048 + scale){
-                av_log(s->avctx, AV_LOG_ERROR, "dc overflow at %dx%d\n", s->mb_x, s->mb_y);
+            if (level * scale > 2048 + scale) {
+                av_log(s->avctx, AV_LOG_ERROR,
+                       "dc overflow at %dx%d\n", s->mb_x, s->mb_y);
                 return -1;
             }
         }
     }
-    level *=scale;
-    if(level&(~2047)){
-        if(level<0)
-            level=0;
-        else if(!(s->workaround_bugs&FF_BUG_DC_CLIP))
-            level=2047;
+    level *= scale;
+    if (level & (~2047)) {
+        if (level < 0)
+            level = 0;
+        else if (!(s->workaround_bugs & FF_BUG_DC_CLIP))
+            level = 2047;
     }
-    dc_val[0]= level;
+    dc_val[0] = level;
 
     return ret;
 }
+
 #endif /* AVCODEC_MPEG4VIDEO_H */

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/mpeg4video_parser.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/mpeg4video_parser.c Changed

@@ -22,6 +22,7 @@
 
 #define UNCHECKED_BITSTREAM_READER 1
 
+#include "internal.h"
 #include "parser.h"
 #include "mpegvideo.h"
 #include "mpeg4video.h"
@@ -29,69 +30,73 @@
 
 struct Mp4vParseContext {
     ParseContext pc;
-    struct MpegEncContext enc;
+    Mpeg4DecContext dec_ctx;
     int first_picture;
 };
 
-int ff_mpeg4_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size){
+int ff_mpeg4_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size)
+{
     int vop_found, i;
     uint32_t state;
 
-    vop_found= pc->frame_start_found;
-    state= pc->state;
+    vop_found = pc->frame_start_found;
+    state     = pc->state;
 
-    i=0;
-    if(!vop_found){
-        for(i=0; i<buf_size; i++){
-            state= (state<<8) | buf[i];
-            if(state == 0x1B6){
+    i = 0;
+    if (!vop_found) {
+        for (i = 0; i < buf_size; i++) {
+            state = (state << 8) | buf[i];
+            if (state == 0x1B6) {
                 i++;
-                vop_found=1;
+                vop_found = 1;
                 break;
             }
         }
     }
 
-    if(vop_found){
+    if (vop_found) {
         /* EOF considered as end of frame */
         if (buf_size == 0)
             return 0;
-        for(; i<buf_size; i++){
-            state= (state<<8) | buf[i];
-            if((state&0xFFFFFF00) == 0x100){
-                pc->frame_start_found=0;
-                pc->state=-1;
-                return i-3;
+        for (; i < buf_size; i++) {
+            state = (state << 8) | buf[i];
+            if ((state & 0xFFFFFF00) == 0x100) {
+                pc->frame_start_found = 0;
+                pc->state             = -1;
+                return i - 3;
             }
         }
     }
-    pc->frame_start_found= vop_found;
-    pc->state= state;
+    pc->frame_start_found = vop_found;
+    pc->state             = state;
     return END_NOT_FOUND;
 }
 
 /* XXX: make it use less memory */
-static int av_mpeg4_decode_header(AVCodecParserContext *s1,
-                                  AVCodecContext *avctx,
-                                  const uint8_t *buf, int buf_size)
+static int mpeg4_decode_header(AVCodecParserContext *s1, AVCodecContext *avctx,
+                               const uint8_t *buf, int buf_size)
 {
     struct Mp4vParseContext *pc = s1->priv_data;
-    MpegEncContext *s = &pc->enc;
+    Mpeg4DecContext *dec_ctx = &pc->dec_ctx;
+    MpegEncContext *s = &dec_ctx->m;
     GetBitContext gb1, *gb = &gb1;
     int ret;
 
-    s->avctx = avctx;
+    s->avctx               = avctx;
     s->current_picture_ptr = &s->current_picture;
 
-    if (avctx->extradata_size && pc->first_picture){
-        init_get_bits(gb, avctx->extradata, avctx->extradata_size*8);
-        ret = ff_mpeg4_decode_picture_header(s, gb);
+    if (avctx->extradata_size && pc->first_picture) {
+        init_get_bits(gb, avctx->extradata, avctx->extradata_size * 8);
+        ret = ff_mpeg4_decode_picture_header(dec_ctx, gb);
     }
 
     init_get_bits(gb, buf, 8 * buf_size);
-    ret = ff_mpeg4_decode_picture_header(s, gb);
-    if (s->width && (!avctx->width || !avctx->height || !avctx->coded_width || !avctx->coded_height)) {
-        avcodec_set_dimensions(avctx, s->width, s->height);
+    ret = ff_mpeg4_decode_picture_header(dec_ctx, gb);
+    if (s->width && (!avctx->width || !avctx->height ||
+                     !avctx->coded_width || !avctx->coded_height)) {
+        ret = ff_set_dimensions(avctx, s->width, s->height);
+        if (ret < 0)
+            return ret;
     }
     if((s1->flags & PARSER_FLAG_USE_CODEC_TS) && s->avctx->time_base.den>0 && ret>=0){
         av_assert1(s1->pts == AV_NOPTS_VALUE);
@@ -100,7 +105,7 @@
         s1->pts = av_rescale_q(s->time, (AVRational){1, s->avctx->time_base.den}, (AVRational){1, 1200000});
     }
 
-    s1->pict_type= s->pict_type;
+    s1->pict_type     = s->pict_type;
     pc->first_picture = 0;
     return ret;
 }
@@ -111,40 +116,39 @@
 
     ff_mpeg4videodec_static_init();
 
-    pc->first_picture = 1;
-    pc->enc.quant_precision=5;
-    pc->enc.slice_context_count = 1;
-    pc->enc.showed_packed_warning = 1;
+    pc->first_picture           = 1;
+    pc->dec_ctx.m.quant_precision     = 5;
+    pc->dec_ctx.m.slice_context_count = 1;
+    pc->dec_ctx.showed_packed_warning = 1;
     return 0;
 }
 
 static int mpeg4video_parse(AVCodecParserContext *s,
-                           AVCodecContext *avctx,
-                           const uint8_t **poutbuf, int *poutbuf_size,
-                           const uint8_t *buf, int buf_size)
+                            AVCodecContext *avctx,
+                            const uint8_t **poutbuf, int *poutbuf_size,
+                            const uint8_t *buf, int buf_size)
 {
     ParseContext *pc = s->priv_data;
     int next;
 
-    if(s->flags & PARSER_FLAG_COMPLETE_FRAMES){
-        next= buf_size;
-    }else{
-        next= ff_mpeg4_find_frame_end(pc, buf, buf_size);
+    if (s->flags & PARSER_FLAG_COMPLETE_FRAMES) {
+        next = buf_size;
+    } else {
+        next = ff_mpeg4_find_frame_end(pc, buf, buf_size);
 
         if (ff_combine_frame(pc, next, &buf, &buf_size) < 0) {
-            *poutbuf = NULL;
+            *poutbuf      = NULL;
             *poutbuf_size = 0;
             return buf_size;
         }
     }
-    av_mpeg4_decode_header(s, avctx, buf, buf_size);
+    mpeg4_decode_header(s, avctx, buf, buf_size);
 
-    *poutbuf = buf;
+    *poutbuf      = buf;
     *poutbuf_size = buf_size;
     return next;
 }
 
-
 AVCodecParser ff_mpeg4video_parser = {
     .codec_ids      = { AV_CODEC_ID_MPEG4 },
     .priv_data_size = sizeof(struct Mp4vParseContext),

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/mpeg4videodec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/mpeg4videodec.c Changed

@@ -30,24 +30,23 @@
 #include "h263.h"
 #include "thread.h"
 
-// The defines below define the number of bits that are read at once for
-// reading vlc values. Changing these may improve speed and data cache needs
-// be aware though that decreasing them may need the number of stages that is
-// passed to get_vlc* to be increased.
+/* The defines below define the number of bits that are read at once for
+ * reading vlc values. Changing these may improve speed and data cache needs
+ * be aware though that decreasing them may need the number of stages that is
+ * passed to get_vlc* to be increased. */
 #define SPRITE_TRAJ_VLC_BITS 6
 #define DC_VLC_BITS 9
 #define MB_TYPE_B_VLC_BITS 4
 
-
 static VLC dc_lum, dc_chrom;
 static VLC sprite_trajectory;
 static VLC mb_type_b_vlc;
 
-static const int mb_type_b_map[4]= {
+static const int mb_type_b_map[4] = {
     MB_TYPE_DIRECT2 | MB_TYPE_L0L1,
-    MB_TYPE_L0L1 | MB_TYPE_16x16,
-    MB_TYPE_L1 | MB_TYPE_16x16,
-    MB_TYPE_L0 | MB_TYPE_16x16,
+    MB_TYPE_L0L1    | MB_TYPE_16x16,
+    MB_TYPE_L1      | MB_TYPE_16x16,
+    MB_TYPE_L0      | MB_TYPE_16x16,
 };
 
 /**
@@ -55,309 +54,328 @@
  * @param n block index (0-3 are luma, 4-5 are chroma)
  * @param dir the ac prediction direction
  */
-void ff_mpeg4_pred_ac(MpegEncContext * s, int16_t *block, int n,
-                      int dir)
+void ff_mpeg4_pred_ac(MpegEncContext *s, int16_t *block, int n, int dir)
 {
     int i;
     int16_t *ac_val, *ac_val1;
-    int8_t * const qscale_table = s->current_picture.qscale_table;
+    int8_t *const qscale_table = s->current_picture.qscale_table;
 
     /* find prediction */
-    ac_val = s->ac_val[0][0] + s->block_index[n] * 16;
+    ac_val  = s->ac_val[0][0] + s->block_index[n] * 16;
     ac_val1 = ac_val;
     if (s->ac_pred) {
         if (dir == 0) {
-            const int xy= s->mb_x-1 + s->mb_y*s->mb_stride;
+            const int xy = s->mb_x - 1 + s->mb_y * s->mb_stride;
             /* left prediction */
             ac_val -= 16;
 
-            if(s->mb_x==0 || s->qscale == qscale_table[xy] || n==1 || n==3){
+            if (s->mb_x == 0 || s->qscale == qscale_table[xy] ||
+                n == 1 || n == 3) {
                 /* same qscale */
-                for(i=1;i<8;i++) {
-                    block[s->dsp.idct_permutation[i<<3]] += ac_val[i];
-                }
-            }else{
+                for (i = 1; i < 8; i++)
+                    block[s->dsp.idct_permutation[i << 3]] += ac_val[i];
+            } else {
                 /* different qscale, we must rescale */
-                for(i=1;i<8;i++) {
-                    block[s->dsp.idct_permutation[i<<3]] += ROUNDED_DIV(ac_val[i]*qscale_table[xy], s->qscale);
-                }
+                for (i = 1; i < 8; i++)
+                    block[s->dsp.idct_permutation[i << 3]] += ROUNDED_DIV(ac_val[i] * qscale_table[xy], s->qscale);
             }
         } else {
-            const int xy= s->mb_x + s->mb_y*s->mb_stride - s->mb_stride;
+            const int xy = s->mb_x + s->mb_y * s->mb_stride - s->mb_stride;
             /* top prediction */
             ac_val -= 16 * s->block_wrap[n];
 
-            if(s->mb_y==0 || s->qscale == qscale_table[xy] || n==2 || n==3){
+            if (s->mb_y == 0 || s->qscale == qscale_table[xy] ||
+                n == 2 || n == 3) {
                 /* same qscale */
-                for(i=1;i<8;i++) {
+                for (i = 1; i < 8; i++)
                     block[s->dsp.idct_permutation[i]] += ac_val[i + 8];
-                }
-            }else{
+            } else {
                 /* different qscale, we must rescale */
-                for(i=1;i<8;i++) {
-                    block[s->dsp.idct_permutation[i]] += ROUNDED_DIV(ac_val[i + 8]*qscale_table[xy], s->qscale);
-                }
+                for (i = 1; i < 8; i++)
+                    block[s->dsp.idct_permutation[i]] += ROUNDED_DIV(ac_val[i + 8] * qscale_table[xy], s->qscale);
             }
         }
     }
     /* left copy */
-    for(i=1;i<8;i++)
-        ac_val1[i    ] = block[s->dsp.idct_permutation[i<<3]];
+    for (i = 1; i < 8; i++)
+        ac_val1[i] = block[s->dsp.idct_permutation[i << 3]];
 
     /* top copy */
-    for(i=1;i<8;i++)
-        ac_val1[8 + i] = block[s->dsp.idct_permutation[i   ]];
-
+    for (i = 1; i < 8; i++)
+        ac_val1[8 + i] = block[s->dsp.idct_permutation[i]];
 }
 
 /**
  * check if the next stuff is a resync marker or the end.
  * @return 0 if not
  */
-static inline int mpeg4_is_resync(MpegEncContext *s){
-    int bits_count= get_bits_count(&s->gb);
-    int v= show_bits(&s->gb, 16);
+static inline int mpeg4_is_resync(Mpeg4DecContext *ctx)
+{
+    MpegEncContext *s = &ctx->m;
+    int bits_count = get_bits_count(&s->gb);
+    int v          = show_bits(&s->gb, 16);
 
-    if(s->workaround_bugs&FF_BUG_NO_PADDING && !s->resync_marker){
+    if (s->workaround_bugs & FF_BUG_NO_PADDING && !ctx->resync_marker)
         return 0;
-    }
 
-    while(v<=0xFF){
-        if(s->pict_type==AV_PICTURE_TYPE_B || (v>>(8-s->pict_type)!=1) || s->partitioned_frame)
+    while (v <= 0xFF) {
+        if (s->pict_type == AV_PICTURE_TYPE_B ||
+            (v >> (8 - s->pict_type) != 1) || s->partitioned_frame)
             break;
-        skip_bits(&s->gb, 8+s->pict_type);
-        bits_count+= 8+s->pict_type;
-        v= show_bits(&s->gb, 16);
+        skip_bits(&s->gb, 8 + s->pict_type);
+        bits_count += 8 + s->pict_type;
+        v = show_bits(&s->gb, 16);
     }
 
-    if(bits_count + 8 >= s->gb.size_in_bits){
-        v>>=8;
-        v|= 0x7F >> (7-(bits_count&7));
+    if (bits_count + 8 >= s->gb.size_in_bits) {
+        v >>= 8;
+        v  |= 0x7F >> (7 - (bits_count & 7));
 
-        if(v==0x7F)
+        if (v == 0x7F)
             return s->mb_num;
-    }else{
-        if(v == ff_mpeg4_resync_prefix[bits_count&7]){
+    } else {
+        if (v == ff_mpeg4_resync_prefix[bits_count & 7]) {
             int len, mb_num;
-            int mb_num_bits= av_log2(s->mb_num - 1) + 1;
-            GetBitContext gb= s->gb;
+            int mb_num_bits = av_log2(s->mb_num - 1) + 1;
+            GetBitContext gb = s->gb;
 
             skip_bits(&s->gb, 1);
             align_get_bits(&s->gb);
 
-            for(len=0; len<32; len++){
-                if(get_bits1(&s->gb)) break;
-            }
+            for (len = 0; len < 32; len++)
+                if (get_bits1(&s->gb))
+                    break;
 
-            mb_num= get_bits(&s->gb, mb_num_bits);
-            if(!mb_num || mb_num > s->mb_num || get_bits_count(&s->gb)+6 > s->gb.size_in_bits)
+            mb_num = get_bits(&s->gb, mb_num_bits);
+            if (!mb_num || mb_num > s->mb_num || get_bits_count(&s->gb)+6 > s->gb.size_in_bits)
                 mb_num= -1;
 
-            s->gb= gb;
+            s->gb = gb;
 
-            if(len>=ff_mpeg4_get_video_packet_prefix_length(s))
+            if (len >= ff_mpeg4_get_video_packet_prefix_length(s))
                 return mb_num;
         }
     }
     return 0;
 }
 
-static int mpeg4_decode_sprite_trajectory(MpegEncContext *s, GetBitContext *gb)
+static int mpeg4_decode_sprite_trajectory(Mpeg4DecContext *ctx, GetBitContext *gb)
 {
-    int i;
-    int a= 2<<s->sprite_warping_accuracy;
-    int rho= 3-s->sprite_warping_accuracy;
-    int r=16/a;
-    const int vop_ref[4][2]= {{0,0}, {s->width,0}, {0, s->height}, {s->width, s->height}}; // only true for rectangle shapes
-    int d[4][2]={{0,0}, {0,0}, {0,0}, {0,0}};
+    MpegEncContext *s = &ctx->m;
+    int a     = 2 << s->sprite_warping_accuracy;
+    int rho   = 3  - s->sprite_warping_accuracy;
+    int r     = 16 / a;
+    int alpha = 0;
+    int beta  = 0;
+    int w     = s->width;
+    int h     = s->height;
+    int min_ab, i, w2, h2, w3, h3;
     int sprite_ref[4][2];
     int virtual_ref[2][2];
-    int w2, h2, w3, h3;
-    int alpha=0, beta=0;
-    int w= s->width;
-    int h= s->height;
-    int min_ab;
+
+    // only true for rectangle shapes
+    const int vop_ref[4][2] = { { 0, 0 },         { s->width, 0 },
+                                { 0, s->height }, { s->width, s->height } };
+    int d[4][2]             = { { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 } };
 
     if (w <= 0 || h <= 0)
         return AVERROR_INVALIDDATA;
 
-    for(i=0; i<s->num_sprite_warping_points; i++){
+    for (i = 0; i < ctx->num_sprite_warping_points; i++) {
         int length;
-        int x=0, y=0;
+        int x = 0, y = 0;
 
-        length= get_vlc2(gb, sprite_trajectory.table, SPRITE_TRAJ_VLC_BITS, 3);
-        if(length){
-            x= get_xbits(gb, length);
-        }
-        if(!(s->divx_version==500 && s->divx_build==413)) skip_bits1(gb); /* marker bit */
-
-        length= get_vlc2(gb, sprite_trajectory.table, SPRITE_TRAJ_VLC_BITS, 3);
-        if(length){
-            y=get_xbits(gb, length);
-        }
-        skip_bits1(gb); /* marker bit */
-        s->sprite_traj[i][0]= d[i][0]= x;
-        s->sprite_traj[i][1]= d[i][1]= y;
-    }
-    for(; i<4; i++)
-        s->sprite_traj[i][0]= s->sprite_traj[i][1]= 0;
-
-    while((1<<alpha)<w) alpha++;
-    while((1<<beta )<h) beta++; // there seems to be a typo in the mpeg4 std for the definition of w' and h'
-    w2= 1<<alpha;
-    h2= 1<<beta;
-
-// Note, the 4th point isn't used for GMC
-    if(s->divx_version==500 && s->divx_build==413){
-        sprite_ref[0][0]= a*vop_ref[0][0] + d[0][0];
-        sprite_ref[0][1]= a*vop_ref[0][1] + d[0][1];
-        sprite_ref[1][0]= a*vop_ref[1][0] + d[0][0] + d[1][0];
-        sprite_ref[1][1]= a*vop_ref[1][1] + d[0][1] + d[1][1];
-        sprite_ref[2][0]= a*vop_ref[2][0] + d[0][0] + d[2][0];
-        sprite_ref[2][1]= a*vop_ref[2][1] + d[0][1] + d[2][1];
+        length = get_vlc2(gb, sprite_trajectory.table, SPRITE_TRAJ_VLC_BITS, 3);
+        if (length)
+            x = get_xbits(gb, length);
+
+        if (!(ctx->divx_version == 500 && ctx->divx_build == 413))
+            skip_bits1(gb);     /* marker bit */
+
+        length = get_vlc2(gb, sprite_trajectory.table, SPRITE_TRAJ_VLC_BITS, 3);
+        if (length)
+            y = get_xbits(gb, length);
+
+        skip_bits1(gb);         /* marker bit */
+        ctx->sprite_traj[i][0] = d[i][0] = x;
+        ctx->sprite_traj[i][1] = d[i][1] = y;
+    }
+    for (; i < 4; i++)
+        ctx->sprite_traj[i][0] = ctx->sprite_traj[i][1] = 0;
+
+    while ((1 << alpha) < w)
+        alpha++;
+    while ((1 << beta) < h)
+        beta++;  /* typo in the mpeg4 std for the definition of w' and h' */
+    w2 = 1 << alpha;
+    h2 = 1 << beta;
+
+    // Note, the 4th point isn't used for GMC
+    if (ctx->divx_version == 500 && ctx->divx_build == 413) {
+        sprite_ref[0][0] = a * vop_ref[0][0] + d[0][0];
+        sprite_ref[0][1] = a * vop_ref[0][1] + d[0][1];
+        sprite_ref[1][0] = a * vop_ref[1][0] + d[0][0] + d[1][0];
+        sprite_ref[1][1] = a * vop_ref[1][1] + d[0][1] + d[1][1];
+        sprite_ref[2][0] = a * vop_ref[2][0] + d[0][0] + d[2][0];
+        sprite_ref[2][1] = a * vop_ref[2][1] + d[0][1] + d[2][1];
     } else {
-        sprite_ref[0][0]= (a>>1)*(2*vop_ref[0][0] + d[0][0]);
-        sprite_ref[0][1]= (a>>1)*(2*vop_ref[0][1] + d[0][1]);
-        sprite_ref[1][0]= (a>>1)*(2*vop_ref[1][0] + d[0][0] + d[1][0]);
-        sprite_ref[1][1]= (a>>1)*(2*vop_ref[1][1] + d[0][1] + d[1][1]);
-        sprite_ref[2][0]= (a>>1)*(2*vop_ref[2][0] + d[0][0] + d[2][0]);
-        sprite_ref[2][1]= (a>>1)*(2*vop_ref[2][1] + d[0][1] + d[2][1]);
-    }
-/*    sprite_ref[3][0]= (a>>1)*(2*vop_ref[3][0] + d[0][0] + d[1][0] + d[2][0] + d[3][0]);
-    sprite_ref[3][1]= (a>>1)*(2*vop_ref[3][1] + d[0][1] + d[1][1] + d[2][1] + d[3][1]); */
-
-// this is mostly identical to the mpeg4 std (and is totally unreadable because of that ...)
-// perhaps it should be reordered to be more readable ...
-// the idea behind this virtual_ref mess is to be able to use shifts later per pixel instead of divides
-// so the distance between points is converted from w&h based to w2&h2 based which are of the 2^x form
-    virtual_ref[0][0]= 16*(vop_ref[0][0] + w2)
-        + ROUNDED_DIV(((w - w2)*(r*sprite_ref[0][0] - 16*vop_ref[0][0]) + w2*(r*sprite_ref[1][0] - 16*vop_ref[1][0])),w);
-    virtual_ref[0][1]= 16*vop_ref[0][1]
-        + ROUNDED_DIV(((w - w2)*(r*sprite_ref[0][1] - 16*vop_ref[0][1]) + w2*(r*sprite_ref[1][1] - 16*vop_ref[1][1])),w);
-    virtual_ref[1][0]= 16*vop_ref[0][0]
-        + ROUNDED_DIV(((h - h2)*(r*sprite_ref[0][0] - 16*vop_ref[0][0]) + h2*(r*sprite_ref[2][0] - 16*vop_ref[2][0])),h);
-    virtual_ref[1][1]= 16*(vop_ref[0][1] + h2)
-        + ROUNDED_DIV(((h - h2)*(r*sprite_ref[0][1] - 16*vop_ref[0][1]) + h2*(r*sprite_ref[2][1] - 16*vop_ref[2][1])),h);
-
-    switch(s->num_sprite_warping_points)
-    {
-        case 0:
-            s->sprite_offset[0][0]= 0;
-            s->sprite_offset[0][1]= 0;
-            s->sprite_offset[1][0]= 0;
-            s->sprite_offset[1][1]= 0;
-            s->sprite_delta[0][0]= a;
-            s->sprite_delta[0][1]= 0;
-            s->sprite_delta[1][0]= 0;
-            s->sprite_delta[1][1]= a;
-            s->sprite_shift[0]= 0;
-            s->sprite_shift[1]= 0;
-            break;
-        case 1: //GMC only
-            s->sprite_offset[0][0]= sprite_ref[0][0] - a*vop_ref[0][0];
-            s->sprite_offset[0][1]= sprite_ref[0][1] - a*vop_ref[0][1];
-            s->sprite_offset[1][0]= ((sprite_ref[0][0]>>1)|(sprite_ref[0][0]&1)) - a*(vop_ref[0][0]/2);
-            s->sprite_offset[1][1]= ((sprite_ref[0][1]>>1)|(sprite_ref[0][1]&1)) - a*(vop_ref[0][1]/2);
-            s->sprite_delta[0][0]= a;
-            s->sprite_delta[0][1]= 0;
-            s->sprite_delta[1][0]= 0;
-            s->sprite_delta[1][1]= a;
-            s->sprite_shift[0]= 0;
-            s->sprite_shift[1]= 0;
-            break;
-        case 2:
-            s->sprite_offset[0][0]= (sprite_ref[0][0]<<(alpha+rho))
-                                                  + (-r*sprite_ref[0][0] + virtual_ref[0][0])*(-vop_ref[0][0])
-                                                  + ( r*sprite_ref[0][1] - virtual_ref[0][1])*(-vop_ref[0][1])
-                                                  + (1<<(alpha+rho-1));
-            s->sprite_offset[0][1]= (sprite_ref[0][1]<<(alpha+rho))
-                                                  + (-r*sprite_ref[0][1] + virtual_ref[0][1])*(-vop_ref[0][0])
-                                                  + (-r*sprite_ref[0][0] + virtual_ref[0][0])*(-vop_ref[0][1])
-                                                  + (1<<(alpha+rho-1));
-            s->sprite_offset[1][0]= ( (-r*sprite_ref[0][0] + virtual_ref[0][0])*(-2*vop_ref[0][0] + 1)
-                                     +( r*sprite_ref[0][1] - virtual_ref[0][1])*(-2*vop_ref[0][1] + 1)
-                                     +2*w2*r*sprite_ref[0][0]
-                                     - 16*w2
-                                     + (1<<(alpha+rho+1)));
-            s->sprite_offset[1][1]= ( (-r*sprite_ref[0][1] + virtual_ref[0][1])*(-2*vop_ref[0][0] + 1)
-                                     +(-r*sprite_ref[0][0] + virtual_ref[0][0])*(-2*vop_ref[0][1] + 1)
-                                     +2*w2*r*sprite_ref[0][1]
-                                     - 16*w2
-                                     + (1<<(alpha+rho+1)));
-            s->sprite_delta[0][0]=   (-r*sprite_ref[0][0] + virtual_ref[0][0]);
-            s->sprite_delta[0][1]=   (+r*sprite_ref[0][1] - virtual_ref[0][1]);
-            s->sprite_delta[1][0]=   (-r*sprite_ref[0][1] + virtual_ref[0][1]);
-            s->sprite_delta[1][1]=   (-r*sprite_ref[0][0] + virtual_ref[0][0]);
-
-            s->sprite_shift[0]= alpha+rho;
-            s->sprite_shift[1]= alpha+rho+2;
-            break;
-        case 3:
-            min_ab= FFMIN(alpha, beta);
-            w3= w2>>min_ab;
-            h3= h2>>min_ab;
-            s->sprite_offset[0][0]=  (sprite_ref[0][0]<<(alpha+beta+rho-min_ab))
-                                   + (-r*sprite_ref[0][0] + virtual_ref[0][0])*h3*(-vop_ref[0][0])
-                                   + (-r*sprite_ref[0][0] + virtual_ref[1][0])*w3*(-vop_ref[0][1])
-                                   + (1<<(alpha+beta+rho-min_ab-1));
-            s->sprite_offset[0][1]=  (sprite_ref[0][1]<<(alpha+beta+rho-min_ab))
-                                   + (-r*sprite_ref[0][1] + virtual_ref[0][1])*h3*(-vop_ref[0][0])
-                                   + (-r*sprite_ref[0][1] + virtual_ref[1][1])*w3*(-vop_ref[0][1])
-                                   + (1<<(alpha+beta+rho-min_ab-1));
-            s->sprite_offset[1][0]=  (-r*sprite_ref[0][0] + virtual_ref[0][0])*h3*(-2*vop_ref[0][0] + 1)
-                                   + (-r*sprite_ref[0][0] + virtual_ref[1][0])*w3*(-2*vop_ref[0][1] + 1)
-                                   + 2*w2*h3*r*sprite_ref[0][0]
-                                   - 16*w2*h3
-                                   + (1<<(alpha+beta+rho-min_ab+1));
-            s->sprite_offset[1][1]=  (-r*sprite_ref[0][1] + virtual_ref[0][1])*h3*(-2*vop_ref[0][0] + 1)
-                                   + (-r*sprite_ref[0][1] + virtual_ref[1][1])*w3*(-2*vop_ref[0][1] + 1)
-                                   + 2*w2*h3*r*sprite_ref[0][1]
-                                   - 16*w2*h3
-                                   + (1<<(alpha+beta+rho-min_ab+1));
-            s->sprite_delta[0][0]=   (-r*sprite_ref[0][0] + virtual_ref[0][0])*h3;
-            s->sprite_delta[0][1]=   (-r*sprite_ref[0][0] + virtual_ref[1][0])*w3;
-            s->sprite_delta[1][0]=   (-r*sprite_ref[0][1] + virtual_ref[0][1])*h3;
-            s->sprite_delta[1][1]=   (-r*sprite_ref[0][1] + virtual_ref[1][1])*w3;
-
-            s->sprite_shift[0]= alpha + beta + rho - min_ab;
-            s->sprite_shift[1]= alpha + beta + rho - min_ab + 2;
-            break;
+        sprite_ref[0][0] = (a >> 1) * (2 * vop_ref[0][0] + d[0][0]);
+        sprite_ref[0][1] = (a >> 1) * (2 * vop_ref[0][1] + d[0][1]);
+        sprite_ref[1][0] = (a >> 1) * (2 * vop_ref[1][0] + d[0][0] + d[1][0]);
+        sprite_ref[1][1] = (a >> 1) * (2 * vop_ref[1][1] + d[0][1] + d[1][1]);
+        sprite_ref[2][0] = (a >> 1) * (2 * vop_ref[2][0] + d[0][0] + d[2][0]);
+        sprite_ref[2][1] = (a >> 1) * (2 * vop_ref[2][1] + d[0][1] + d[2][1]);
+    }
+    /* sprite_ref[3][0] = (a >> 1) * (2 * vop_ref[3][0] + d[0][0] + d[1][0] + d[2][0] + d[3][0]);
+     * sprite_ref[3][1] = (a >> 1) * (2 * vop_ref[3][1] + d[0][1] + d[1][1] + d[2][1] + d[3][1]); */
+
+    /* this is mostly identical to the mpeg4 std (and is totally unreadable
+     * because of that...). Perhaps it should be reordered to be more readable.
+     * The idea behind this virtual_ref mess is to be able to use shifts later
+     * per pixel instead of divides so the distance between points is converted
+     * from w&h based to w2&h2 based which are of the 2^x form. */
+    virtual_ref[0][0] = 16 * (vop_ref[0][0] + w2) +
+                         ROUNDED_DIV(((w - w2) *
+                                      (r * sprite_ref[0][0] - 16 * vop_ref[0][0]) +
+                                      w2 * (r * sprite_ref[1][0] - 16 * vop_ref[1][0])), w);
+    virtual_ref[0][1] = 16 * vop_ref[0][1] +
+                        ROUNDED_DIV(((w - w2) *
+                                     (r * sprite_ref[0][1] - 16 * vop_ref[0][1]) +
+                                     w2 * (r * sprite_ref[1][1] - 16 * vop_ref[1][1])), w);
+    virtual_ref[1][0] = 16 * vop_ref[0][0] +
+                        ROUNDED_DIV(((h - h2) * (r * sprite_ref[0][0] - 16 * vop_ref[0][0]) +
+                                     h2 * (r * sprite_ref[2][0] - 16 * vop_ref[2][0])), h);
+    virtual_ref[1][1] = 16 * (vop_ref[0][1] + h2) +
+                        ROUNDED_DIV(((h - h2) * (r * sprite_ref[0][1] - 16 * vop_ref[0][1]) +
+                                     h2 * (r * sprite_ref[2][1] - 16 * vop_ref[2][1])), h);
+
+    switch (ctx->num_sprite_warping_points) {
+    case 0:
+        s->sprite_offset[0][0] =
+        s->sprite_offset[0][1] =
+        s->sprite_offset[1][0] =
+        s->sprite_offset[1][1] = 0;
+        s->sprite_delta[0][0]  = a;
+        s->sprite_delta[0][1]  =
+        s->sprite_delta[1][0]  = 0;
+        s->sprite_delta[1][1]  = a;
+        ctx->sprite_shift[0]   =
+        ctx->sprite_shift[1]   = 0;
+        break;
+    case 1:     // GMC only
+        s->sprite_offset[0][0] = sprite_ref[0][0] - a * vop_ref[0][0];
+        s->sprite_offset[0][1] = sprite_ref[0][1] - a * vop_ref[0][1];
+        s->sprite_offset[1][0] = ((sprite_ref[0][0] >> 1) | (sprite_ref[0][0] & 1)) -
+                                 a * (vop_ref[0][0] / 2);
+        s->sprite_offset[1][1] = ((sprite_ref[0][1] >> 1) | (sprite_ref[0][1] & 1)) -
+                                 a * (vop_ref[0][1] / 2);
+        s->sprite_delta[0][0]  = a;
+        s->sprite_delta[0][1]  =
+        s->sprite_delta[1][0]  = 0;
+        s->sprite_delta[1][1]  = a;
+        ctx->sprite_shift[0]   =
+        ctx->sprite_shift[1]   = 0;
+        break;
+    case 2:
+        s->sprite_offset[0][0] = (sprite_ref[0][0] << (alpha + rho)) +
+                                 (-r * sprite_ref[0][0] + virtual_ref[0][0]) *
+                                 (-vop_ref[0][0]) +
+                                 (r * sprite_ref[0][1] - virtual_ref[0][1]) *
+                                 (-vop_ref[0][1]) + (1 << (alpha + rho - 1));
+        s->sprite_offset[0][1] = (sprite_ref[0][1] << (alpha + rho)) +
+                                 (-r * sprite_ref[0][1] + virtual_ref[0][1]) *
+                                 (-vop_ref[0][0]) +
+                                 (-r * sprite_ref[0][0] + virtual_ref[0][0]) *
+                                 (-vop_ref[0][1]) + (1 << (alpha + rho - 1));
+        s->sprite_offset[1][0] = ((-r * sprite_ref[0][0] + virtual_ref[0][0]) *
+                                  (-2 * vop_ref[0][0] + 1) +
+                                  (r * sprite_ref[0][1] - virtual_ref[0][1]) *
+                                  (-2 * vop_ref[0][1] + 1) + 2 * w2 * r *
+                                  sprite_ref[0][0] - 16 * w2 + (1 << (alpha + rho + 1)));
+        s->sprite_offset[1][1] = ((-r * sprite_ref[0][1] + virtual_ref[0][1]) *
+                                  (-2 * vop_ref[0][0] + 1) +
+                                  (-r * sprite_ref[0][0] + virtual_ref[0][0]) *
+                                  (-2 * vop_ref[0][1] + 1) + 2 * w2 * r *
+                                  sprite_ref[0][1] - 16 * w2 + (1 << (alpha + rho + 1)));
+        s->sprite_delta[0][0] = (-r * sprite_ref[0][0] + virtual_ref[0][0]);
+        s->sprite_delta[0][1] = (+r * sprite_ref[0][1] - virtual_ref[0][1]);
+        s->sprite_delta[1][0] = (-r * sprite_ref[0][1] + virtual_ref[0][1]);
+        s->sprite_delta[1][1] = (-r * sprite_ref[0][0] + virtual_ref[0][0]);
+
+        ctx->sprite_shift[0]  = alpha + rho;
+        ctx->sprite_shift[1]  = alpha + rho + 2;
+        break;
+    case 3:
+        min_ab = FFMIN(alpha, beta);
+        w3     = w2 >> min_ab;
+        h3     = h2 >> min_ab;
+        s->sprite_offset[0][0] = (sprite_ref[0][0] << (alpha + beta + rho - min_ab)) +
+                                 (-r * sprite_ref[0][0] + virtual_ref[0][0]) *
+                                 h3 * (-vop_ref[0][0]) +
+                                 (-r * sprite_ref[0][0] + virtual_ref[1][0]) *
+                                 w3 * (-vop_ref[0][1]) +
+                                 (1 << (alpha + beta + rho - min_ab - 1));
+        s->sprite_offset[0][1] = (sprite_ref[0][1] << (alpha + beta + rho - min_ab)) +
+                                 (-r * sprite_ref[0][1] + virtual_ref[0][1]) *
+                                 h3 * (-vop_ref[0][0]) +
+                                 (-r * sprite_ref[0][1] + virtual_ref[1][1]) *
+                                 w3 * (-vop_ref[0][1]) +
+                                 (1 << (alpha + beta + rho - min_ab - 1));
+        s->sprite_offset[1][0] = (-r * sprite_ref[0][0] + virtual_ref[0][0]) *
+                                 h3 * (-2 * vop_ref[0][0] + 1) +
+                                 (-r * sprite_ref[0][0] + virtual_ref[1][0]) *
+                                 w3 * (-2 * vop_ref[0][1] + 1) + 2 * w2 * h3 *
+                                 r * sprite_ref[0][0] - 16 * w2 * h3 +
+                                 (1 << (alpha + beta + rho - min_ab + 1));
+        s->sprite_offset[1][1] = (-r * sprite_ref[0][1] + virtual_ref[0][1]) *
+                                 h3 * (-2 * vop_ref[0][0] + 1) +
+                                 (-r * sprite_ref[0][1] + virtual_ref[1][1]) *
+                                 w3 * (-2 * vop_ref[0][1] + 1) + 2 * w2 * h3 *
+                                 r * sprite_ref[0][1] - 16 * w2 * h3 +
+                                 (1 << (alpha + beta + rho - min_ab + 1));
+        s->sprite_delta[0][0] = (-r * sprite_ref[0][0] + virtual_ref[0][0]) * h3;
+        s->sprite_delta[0][1] = (-r * sprite_ref[0][0] + virtual_ref[1][0]) * w3;
+        s->sprite_delta[1][0] = (-r * sprite_ref[0][1] + virtual_ref[0][1]) * h3;
+        s->sprite_delta[1][1] = (-r * sprite_ref[0][1] + virtual_ref[1][1]) * w3;
+
+        ctx->sprite_shift[0]  = alpha + beta + rho - min_ab;
+        ctx->sprite_shift[1]  = alpha + beta + rho - min_ab + 2;
+        break;
     }
     /* try to simplify the situation */
-    if(   s->sprite_delta[0][0] == a<<s->sprite_shift[0]
-       && s->sprite_delta[0][1] == 0
-       && s->sprite_delta[1][0] == 0
-       && s->sprite_delta[1][1] == a<<s->sprite_shift[0])
-    {
-        s->sprite_offset[0][0]>>=s->sprite_shift[0];
-        s->sprite_offset[0][1]>>=s->sprite_shift[0];
-        s->sprite_offset[1][0]>>=s->sprite_shift[1];
-        s->sprite_offset[1][1]>>=s->sprite_shift[1];
-        s->sprite_delta[0][0]= a;
-        s->sprite_delta[0][1]= 0;
-        s->sprite_delta[1][0]= 0;
-        s->sprite_delta[1][1]= a;
-        s->sprite_shift[0]= 0;
-        s->sprite_shift[1]= 0;
-        s->real_sprite_warping_points=1;
-    }
-    else{
-        int shift_y= 16 - s->sprite_shift[0];
-        int shift_c= 16 - s->sprite_shift[1];
-        for(i=0; i<2; i++){
-            s->sprite_offset[0][i]<<= shift_y;
-            s->sprite_offset[1][i]<<= shift_c;
-            s->sprite_delta[0][i]<<= shift_y;
-            s->sprite_delta[1][i]<<= shift_y;
-            s->sprite_shift[i]= 16;
+    if (s->sprite_delta[0][0] == a << ctx->sprite_shift[0] &&
+        s->sprite_delta[0][1] == 0 &&
+        s->sprite_delta[1][0] == 0 &&
+        s->sprite_delta[1][1] == a << ctx->sprite_shift[0]) {
+        s->sprite_offset[0][0] >>= ctx->sprite_shift[0];
+        s->sprite_offset[0][1] >>= ctx->sprite_shift[0];
+        s->sprite_offset[1][0] >>= ctx->sprite_shift[1];
+        s->sprite_offset[1][1] >>= ctx->sprite_shift[1];
+        s->sprite_delta[0][0] = a;
+        s->sprite_delta[0][1] = 0;
+        s->sprite_delta[1][0] = 0;
+        s->sprite_delta[1][1] = a;
+        ctx->sprite_shift[0] = 0;
+        ctx->sprite_shift[1] = 0;
+        s->real_sprite_warping_points = 1;
+    } else {
+        int shift_y = 16 - ctx->sprite_shift[0];
+        int shift_c = 16 - ctx->sprite_shift[1];
+        for (i = 0; i < 2; i++) {
+            s->sprite_offset[0][i] <<= shift_y;
+            s->sprite_offset[1][i] <<= shift_c;
+            s->sprite_delta[0][i]  <<= shift_y;
+            s->sprite_delta[1][i]  <<= shift_y;
+            ctx->sprite_shift[i]     = 16;
         }
-        s->real_sprite_warping_points= s->num_sprite_warping_points;
+        s->real_sprite_warping_points = ctx->num_sprite_warping_points;
     }
+
     return 0;
 }
 
-static int decode_new_pred(MpegEncContext *s, GetBitContext *gb){
-    int len = FFMIN(s->time_increment_bits + 3, 15);
+static int decode_new_pred(Mpeg4DecContext *ctx, GetBitContext *gb) {
+    int len = FFMIN(ctx->time_increment_bits + 3, 15);
 
     get_bits(gb, len);
     if (get_bits1(gb))
@@ -371,86 +389,91 @@
  * Decode the next video packet.
  * @return <0 if something went wrong
  */
-int ff_mpeg4_decode_video_packet_header(MpegEncContext *s)
+int ff_mpeg4_decode_video_packet_header(Mpeg4DecContext *ctx)
 {
-    int mb_num_bits= av_log2(s->mb_num - 1) + 1;
-    int header_extension=0, mb_num, len;
+    MpegEncContext *s = &ctx->m;
+
+    int mb_num_bits      = av_log2(s->mb_num - 1) + 1;
+    int header_extension = 0, mb_num, len;
 
     /* is there enough space left for a video packet + header */
-    if( get_bits_count(&s->gb) > s->gb.size_in_bits-20) return -1;
+    if (get_bits_count(&s->gb) > s->gb.size_in_bits - 20)
+        return -1;
 
-    for(len=0; len<32; len++){
-        if(get_bits1(&s->gb)) break;
-    }
+    for (len = 0; len < 32; len++)
+        if (get_bits1(&s->gb))
+            break;
 
-    if(len!=ff_mpeg4_get_video_packet_prefix_length(s)){
+    if (len != ff_mpeg4_get_video_packet_prefix_length(s)) {
         av_log(s->avctx, AV_LOG_ERROR, "marker does not match f_code\n");
         return -1;
     }
 
-    if(s->shape != RECT_SHAPE){
-        header_extension= get_bits1(&s->gb);
-        //FIXME more stuff here
+    if (ctx->shape != RECT_SHAPE) {
+        header_extension = get_bits1(&s->gb);
+        // FIXME more stuff here
     }
 
-    mb_num= get_bits(&s->gb, mb_num_bits);
-    if(mb_num>=s->mb_num){
-        av_log(s->avctx, AV_LOG_ERROR, "illegal mb_num in video packet (%d %d) \n", mb_num, s->mb_num);
+    mb_num = get_bits(&s->gb, mb_num_bits);
+    if (mb_num >= s->mb_num) {
+        av_log(s->avctx, AV_LOG_ERROR,
+               "illegal mb_num in video packet (%d %d) \n", mb_num, s->mb_num);
         return -1;
     }
 
-    s->mb_x= mb_num % s->mb_width;
-    s->mb_y= mb_num / s->mb_width;
+    s->mb_x = mb_num % s->mb_width;
+    s->mb_y = mb_num / s->mb_width;
 
-    if(s->shape != BIN_ONLY_SHAPE){
-        int qscale= get_bits(&s->gb, s->quant_precision);
-        if(qscale)
-            s->chroma_qscale=s->qscale= qscale;
+    if (ctx->shape != BIN_ONLY_SHAPE) {
+        int qscale = get_bits(&s->gb, s->quant_precision);
+        if (qscale)
+            s->chroma_qscale = s->qscale = qscale;
     }
 
-    if(s->shape == RECT_SHAPE){
-        header_extension= get_bits1(&s->gb);
-    }
-    if(header_extension){
-        int time_incr=0;
+    if (ctx->shape == RECT_SHAPE)
+        header_extension = get_bits1(&s->gb);
+
+    if (header_extension) {
+        int time_incr = 0;
 
         while (get_bits1(&s->gb) != 0)
             time_incr++;
 
         check_marker(&s->gb, "before time_increment in video packed header");
-        skip_bits(&s->gb, s->time_increment_bits); /* time_increment */
+        skip_bits(&s->gb, ctx->time_increment_bits);      /* time_increment */
         check_marker(&s->gb, "before vop_coding_type in video packed header");
 
         skip_bits(&s->gb, 2); /* vop coding type */
-        //FIXME not rect stuff here
+        // FIXME not rect stuff here
 
-        if(s->shape != BIN_ONLY_SHAPE){
+        if (ctx->shape != BIN_ONLY_SHAPE) {
             skip_bits(&s->gb, 3); /* intra dc vlc threshold */
-//FIXME don't just ignore everything
-            if(s->pict_type == AV_PICTURE_TYPE_S && s->vol_sprite_usage==GMC_SPRITE){
-                if (mpeg4_decode_sprite_trajectory(s, &s->gb) < 0)
+            // FIXME don't just ignore everything
+            if (s->pict_type == AV_PICTURE_TYPE_S &&
+                ctx->vol_sprite_usage == GMC_SPRITE) {
+                if (mpeg4_decode_sprite_trajectory(ctx, &s->gb) < 0)
                     return AVERROR_INVALIDDATA;
                 av_log(s->avctx, AV_LOG_ERROR, "untested\n");
             }
 
-            //FIXME reduced res stuff here
+            // FIXME reduced res stuff here
 
             if (s->pict_type != AV_PICTURE_TYPE_I) {
                 int f_code = get_bits(&s->gb, 3);       /* fcode_for */
-                if(f_code==0){
-                    av_log(s->avctx, AV_LOG_ERROR, "Error, video packet header damaged (f_code=0)\n");
-                }
+                if (f_code == 0)
+                    av_log(s->avctx, AV_LOG_ERROR,
+                           "Error, video packet header damaged (f_code=0)\n");
             }
             if (s->pict_type == AV_PICTURE_TYPE_B) {
                 int b_code = get_bits(&s->gb, 3);
-                if(b_code==0){
-                    av_log(s->avctx, AV_LOG_ERROR, "Error, video packet header damaged (b_code=0)\n");
-                }
+                if (b_code == 0)
+                    av_log(s->avctx, AV_LOG_ERROR,
+                           "Error, video packet header damaged (b_code=0)\n");
             }
         }
     }
-    if (s->new_pred)
-        decode_new_pred(s, &s->gb);
+    if (ctx->new_pred)
+        decode_new_pred(ctx, &s->gb);
 
     return 0;
 }
@@ -460,43 +483,49 @@
  * @param n either 0 for the x component or 1 for y
  * @return the average MV for a GMC MB
  */
-static inline int get_amv(MpegEncContext *s, int n){
+static inline int get_amv(Mpeg4DecContext *ctx, int n)
+{
+    MpegEncContext *s = &ctx->m;
     int x, y, mb_v, sum, dx, dy, shift;
-    int len = 1 << (s->f_code + 4);
-    const int a= s->sprite_warping_accuracy;
+    int len     = 1 << (s->f_code + 4);
+    const int a = s->sprite_warping_accuracy;
 
-    if(s->workaround_bugs & FF_BUG_AMV)
+    if (s->workaround_bugs & FF_BUG_AMV)
         len >>= s->quarter_sample;
 
-    if(s->real_sprite_warping_points==1){
-        if(s->divx_version==500 && s->divx_build==413)
-            sum= s->sprite_offset[0][n] / (1<<(a - s->quarter_sample));
+    if (s->real_sprite_warping_points == 1) {
+        if (ctx->divx_version == 500 && ctx->divx_build == 413)
+            sum = s->sprite_offset[0][n] / (1 << (a - s->quarter_sample));
+        else
+            sum = RSHIFT(s->sprite_offset[0][n] << s->quarter_sample, a);
+    } else {
+        dx    = s->sprite_delta[n][0];
+        dy    = s->sprite_delta[n][1];
+        shift = ctx->sprite_shift[0];
+        if (n)
+            dy -= 1 << (shift + a + 1);
         else
-            sum= RSHIFT(s->sprite_offset[0][n]<<s->quarter_sample, a);
-    }else{
-        dx= s->sprite_delta[n][0];
-        dy= s->sprite_delta[n][1];
-        shift= s->sprite_shift[0];
-        if(n) dy -= 1<<(shift + a + 1);
-        else  dx -= 1<<(shift + a + 1);
-        mb_v= s->sprite_offset[0][n] + dx*s->mb_x*16 + dy*s->mb_y*16;
+            dx -= 1 << (shift + a + 1);
+        mb_v = s->sprite_offset[0][n] + dx * s->mb_x * 16 + dy * s->mb_y * 16;
 
-        sum=0;
-        for(y=0; y<16; y++){
+        sum = 0;
+        for (y = 0; y < 16; y++) {
             int v;
 
-            v= mb_v + dy*y;
-            //XXX FIXME optimize
-            for(x=0; x<16; x++){
-                sum+= v>>shift;
-                v+= dx;
+            v = mb_v + dy * y;
+            // FIXME optimize
+            for (x = 0; x < 16; x++) {
+                sum += v >> shift;
+                v   += dx;
             }
         }
-        sum= RSHIFT(sum, a+8-s->quarter_sample);
+        sum = RSHIFT(sum, a + 8 - s->quarter_sample);
     }
 
-    if      (sum < -len) sum= -len;
-    else if (sum >= len) sum= len-1;
+    if (sum < -len)
+        sum = -len;
+    else if (sum >= len)
+        sum = len - 1;
 
     return sum;
 }
@@ -507,7 +536,7 @@
  * @param dir_ptr the prediction direction will be stored here
  * @return the quantized dc
  */
-static inline int mpeg4_decode_dc(MpegEncContext * s, int n, int *dir_ptr)
+static inline int mpeg4_decode_dc(MpegEncContext *s, int n, int *dir_ptr)
 {
     int level, code;
 
@@ -515,29 +544,31 @@
         code = get_vlc2(&s->gb, dc_lum.table, DC_VLC_BITS, 1);
     else
         code = get_vlc2(&s->gb, dc_chrom.table, DC_VLC_BITS, 1);
-    if (code < 0 || code > 9 /* && s->nbit<9 */){
+
+    if (code < 0 || code > 9 /* && s->nbit < 9 */) {
         av_log(s->avctx, AV_LOG_ERROR, "illegal dc vlc\n");
         return -1;
     }
+
     if (code == 0) {
         level = 0;
     } else {
-        if(IS_3IV1){
-            if(code==1)
-                level= 2*get_bits1(&s->gb)-1;
-            else{
-                if(get_bits1(&s->gb))
-                    level = get_bits(&s->gb, code-1) + (1<<(code-1));
+        if (IS_3IV1) {
+            if (code == 1)
+                level = 2 * get_bits1(&s->gb) - 1;
+            else {
+                if (get_bits1(&s->gb))
+                    level = get_bits(&s->gb, code - 1) + (1 << (code - 1));
                 else
-                    level = -get_bits(&s->gb, code-1) - (1<<(code-1));
+                    level = -get_bits(&s->gb, code - 1) - (1 << (code - 1));
             }
-        }else{
+        } else {
             level = get_xbits(&s->gb, code);
         }
 
-        if (code > 8){
-            if(get_bits1(&s->gb)==0){ /* marker */
-                if(s->err_recognition&(AV_EF_BITSTREAM|AV_EF_COMPLIANT)){
+        if (code > 8) {
+            if (get_bits1(&s->gb) == 0) { /* marker */
+                if (s->err_recognition & (AV_EF_BITSTREAM|AV_EF_COMPLIANT)) {
                     av_log(s->avctx, AV_LOG_ERROR, "dc marker bit missing\n");
                     return -1;
                 }
@@ -552,124 +583,145 @@
  * Decode first partition.
  * @return number of MBs decoded or <0 if an error occurred
  */
-static int mpeg4_decode_partition_a(MpegEncContext *s){
-    int mb_num;
+static int mpeg4_decode_partition_a(Mpeg4DecContext *ctx)
+{
+    MpegEncContext *s = &ctx->m;
+    int mb_num = 0;
     static const int8_t quant_tab[4] = { -1, -2, 1, 2 };
 
     /* decode first partition */
-    mb_num=0;
-    s->first_slice_line=1;
-    for(; s->mb_y<s->mb_height; s->mb_y++){
+    s->first_slice_line = 1;
+    for (; s->mb_y < s->mb_height; s->mb_y++) {
         ff_init_block_index(s);
-        for(; s->mb_x<s->mb_width; s->mb_x++){
-            const int xy= s->mb_x + s->mb_y*s->mb_stride;
+        for (; s->mb_x < s->mb_width; s->mb_x++) {
+            const int xy = s->mb_x + s->mb_y * s->mb_stride;
             int cbpc;
-            int dir=0;
+            int dir = 0;
 
             mb_num++;
             ff_update_block_index(s);
-            if(s->mb_x == s->resync_mb_x && s->mb_y == s->resync_mb_y+1)
-                s->first_slice_line=0;
+            if (s->mb_x == s->resync_mb_x && s->mb_y == s->resync_mb_y + 1)
+                s->first_slice_line = 0;
 
-            if(s->pict_type==AV_PICTURE_TYPE_I){
+            if (s->pict_type == AV_PICTURE_TYPE_I) {
                 int i;
 
-                do{
-                    if(show_bits_long(&s->gb, 19)==DC_MARKER){
-                        return mb_num-1;
-                    }
+                do {
+                    if (show_bits_long(&s->gb, 19) == DC_MARKER)
+                        return mb_num - 1;
 
                     cbpc = get_vlc2(&s->gb, ff_h263_intra_MCBPC_vlc.table, INTRA_MCBPC_VLC_BITS, 2);
-                    if (cbpc < 0){
-                        av_log(s->avctx, AV_LOG_ERROR, "cbpc corrupted at %d %d\n", s->mb_x, s->mb_y);
+                    if (cbpc < 0) {
+                        av_log(s->avctx, AV_LOG_ERROR,
+                               "cbpc corrupted at %d %d\n", s->mb_x, s->mb_y);
                         return -1;
                     }
-                }while(cbpc == 8);
+                } while (cbpc == 8);
 
-                s->cbp_table[xy]= cbpc & 3;
+                s->cbp_table[xy]               = cbpc & 3;
                 s->current_picture.mb_type[xy] = MB_TYPE_INTRA;
-                s->mb_intra = 1;
+                s->mb_intra                    = 1;
 
-                if(cbpc & 4) {
+                if (cbpc & 4)
                     ff_set_qscale(s, s->qscale + quant_tab[get_bits(&s->gb, 2)]);
-                }
-                s->current_picture.qscale_table[xy]= s->qscale;
 
-                s->mbintra_table[xy]= 1;
-                for(i=0; i<6; i++){
+                s->current_picture.qscale_table[xy] = s->qscale;
+
+                s->mbintra_table[xy] = 1;
+                for (i = 0; i < 6; i++) {
                     int dc_pred_dir;
-                    int dc= mpeg4_decode_dc(s, i, &dc_pred_dir);
-                    if(dc < 0){
-                        av_log(s->avctx, AV_LOG_ERROR, "DC corrupted at %d %d\n", s->mb_x, s->mb_y);
+                    int dc = mpeg4_decode_dc(s, i, &dc_pred_dir);
+                    if (dc < 0) {
+                        av_log(s->avctx, AV_LOG_ERROR,
+                               "DC corrupted at %d %d\n", s->mb_x, s->mb_y);
                         return -1;
                     }
-                    dir<<=1;
-                    if(dc_pred_dir) dir|=1;
+                    dir <<= 1;
+                    if (dc_pred_dir)
+                        dir |= 1;
                 }
-                s->pred_dir_table[xy]= dir;
-            }else{ /* P/S_TYPE */
+                s->pred_dir_table[xy] = dir;
+            } else { /* P/S_TYPE */
                 int mx, my, pred_x, pred_y, bits;
-                int16_t * const mot_val = s->current_picture.motion_val[0][s->block_index[0]];
-                const int stride= s->b8_stride*2;
+                int16_t *const mot_val = s->current_picture.motion_val[0][s->block_index[0]];
+                const int stride       = s->b8_stride * 2;
 
 try_again:
-                bits= show_bits(&s->gb, 17);
-                if(bits==MOTION_MARKER){
-                    return mb_num-1;
-                }
+                bits = show_bits(&s->gb, 17);
+                if (bits == MOTION_MARKER)
+                    return mb_num - 1;
+
                 skip_bits1(&s->gb);
-                if(bits&0x10000){
+                if (bits & 0x10000) {
                     /* skip mb */
-                    if(s->pict_type==AV_PICTURE_TYPE_S && s->vol_sprite_usage==GMC_SPRITE){
-                        s->current_picture.mb_type[xy] = MB_TYPE_SKIP | MB_TYPE_16x16 | MB_TYPE_GMC | MB_TYPE_L0;
-                        mx= get_amv(s, 0);
-                        my= get_amv(s, 1);
-                    }else{
-                        s->current_picture.mb_type[xy] = MB_TYPE_SKIP | MB_TYPE_16x16 | MB_TYPE_L0;
-                        mx=my=0;
+                    if (s->pict_type == AV_PICTURE_TYPE_S &&
+                        ctx->vol_sprite_usage == GMC_SPRITE) {
+                        s->current_picture.mb_type[xy] = MB_TYPE_SKIP  |
+                                                         MB_TYPE_16x16 |
+                                                         MB_TYPE_GMC   |
+                                                         MB_TYPE_L0;
+                        mx = get_amv(ctx, 0);
+                        my = get_amv(ctx, 1);
+                    } else {
+                        s->current_picture.mb_type[xy] = MB_TYPE_SKIP  |
+                                                         MB_TYPE_16x16 |
+                                                         MB_TYPE_L0;
+                        mx = my = 0;
                     }
-                    mot_val[0       ]= mot_val[2       ]=
-                    mot_val[0+stride]= mot_val[2+stride]= mx;
-                    mot_val[1       ]= mot_val[3       ]=
-                    mot_val[1+stride]= mot_val[3+stride]= my;
+                    mot_val[0]          =
+                    mot_val[2]          =
+                    mot_val[0 + stride] =
+                    mot_val[2 + stride] = mx;
+                    mot_val[1]          =
+                    mot_val[3]          =
+                    mot_val[1 + stride] =
+                    mot_val[3 + stride] = my;
 
-                    if(s->mbintra_table[xy])
+                    if (s->mbintra_table[xy])
                         ff_clean_intra_table_entries(s);
                     continue;
                 }
 
                 cbpc = get_vlc2(&s->gb, ff_h263_inter_MCBPC_vlc.table, INTER_MCBPC_VLC_BITS, 2);
-                if (cbpc < 0){
-                    av_log(s->avctx, AV_LOG_ERROR, "cbpc corrupted at %d %d\n", s->mb_x, s->mb_y);
+                if (cbpc < 0) {
+                    av_log(s->avctx, AV_LOG_ERROR,
+                           "cbpc corrupted at %d %d\n", s->mb_x, s->mb_y);
                     return -1;
                 }
-                if(cbpc == 20)
+                if (cbpc == 20)
                     goto try_again;
 
-                s->cbp_table[xy]= cbpc&(8+3); //8 is dquant
+                s->cbp_table[xy] = cbpc & (8 + 3);  // 8 is dquant
 
                 s->mb_intra = ((cbpc & 4) != 0);
 
-                if(s->mb_intra){
+                if (s->mb_intra) {
                     s->current_picture.mb_type[xy] = MB_TYPE_INTRA;
-                    s->mbintra_table[xy]= 1;
-                    mot_val[0       ]= mot_val[2       ]=
-                    mot_val[0+stride]= mot_val[2+stride]= 0;
-                    mot_val[1       ]= mot_val[3       ]=
-                    mot_val[1+stride]= mot_val[3+stride]= 0;
-                }else{
-                    if(s->mbintra_table[xy])
+                    s->mbintra_table[xy] = 1;
+                    mot_val[0]          =
+                    mot_val[2]          =
+                    mot_val[0 + stride] =
+                    mot_val[2 + stride] = 0;
+                    mot_val[1]          =
+                    mot_val[3]          =
+                    mot_val[1 + stride] =
+                    mot_val[3 + stride] = 0;
+                } else {
+                    if (s->mbintra_table[xy])
                         ff_clean_intra_table_entries(s);
 
-                    if(s->pict_type==AV_PICTURE_TYPE_S && s->vol_sprite_usage==GMC_SPRITE && (cbpc & 16) == 0)
-                        s->mcsel= get_bits1(&s->gb);
-                    else s->mcsel= 0;
+                    if (s->pict_type == AV_PICTURE_TYPE_S &&
+                        ctx->vol_sprite_usage == GMC_SPRITE &&
+                        (cbpc & 16) == 0)
+                        s->mcsel = get_bits1(&s->gb);
+                    else
+                        s->mcsel = 0;
 
                     if ((cbpc & 16) == 0) {
                         /* 16x16 motion prediction */
 
                         ff_h263_pred_motion(s, 0, 0, &pred_x, &pred_y);
-                        if(!s->mcsel){
+                        if (!s->mcsel) {
                             mx = ff_h263_decode_motion(s, pred_x, s->f_code);
                             if (mx >= 0xffff)
                                 return -1;
@@ -677,22 +729,30 @@
                             my = ff_h263_decode_motion(s, pred_y, s->f_code);
                             if (my >= 0xffff)
                                 return -1;
-                            s->current_picture.mb_type[xy] = MB_TYPE_16x16 | MB_TYPE_L0;
+                            s->current_picture.mb_type[xy] = MB_TYPE_16x16 |
+                                                             MB_TYPE_L0;
                         } else {
-                            mx = get_amv(s, 0);
-                            my = get_amv(s, 1);
-                            s->current_picture.mb_type[xy] = MB_TYPE_16x16 | MB_TYPE_GMC | MB_TYPE_L0;
+                            mx = get_amv(ctx, 0);
+                            my = get_amv(ctx, 1);
+                            s->current_picture.mb_type[xy] = MB_TYPE_16x16 |
+                                                             MB_TYPE_GMC   |
+                                                             MB_TYPE_L0;
                         }
 
-                        mot_val[0       ]= mot_val[2       ] =
-                        mot_val[0+stride]= mot_val[2+stride]= mx;
-                        mot_val[1       ]= mot_val[3       ]=
-                        mot_val[1+stride]= mot_val[3+stride]= my;
+                        mot_val[0]          =
+                        mot_val[2]          =
+                        mot_val[0 + stride] =
+                        mot_val[2 + stride] = mx;
+                        mot_val[1]          =
+                        mot_val[3]          =
+                        mot_val[1 + stride] =
+                        mot_val[3 + stride] = my;
                     } else {
                         int i;
-                        s->current_picture.mb_type[xy] = MB_TYPE_8x8 | MB_TYPE_L0;
-                        for(i=0;i<4;i++) {
-                            int16_t *mot_val= ff_h263_pred_motion(s, i, 0, &pred_x, &pred_y);
+                        s->current_picture.mb_type[xy] = MB_TYPE_8x8 |
+                                                         MB_TYPE_L0;
+                        for (i = 0; i < 4; i++) {
+                            int16_t *mot_val = ff_h263_pred_motion(s, i, 0, &pred_x, &pred_y);
                             mx = ff_h263_decode_motion(s, pred_x, s->f_code);
                             if (mx >= 0xffff)
                                 return -1;
@@ -707,7 +767,7 @@
                 }
             }
         }
-        s->mb_x= 0;
+        s->mb_x = 0;
     }
 
     return mb_num;
@@ -717,85 +777,91 @@
  * decode second partition.
  * @return <0 if an error occurred
  */
-static int mpeg4_decode_partition_b(MpegEncContext *s, int mb_count){
-    int mb_num=0;
+static int mpeg4_decode_partition_b(MpegEncContext *s, int mb_count)
+{
+    int mb_num = 0;
     static const int8_t quant_tab[4] = { -1, -2, 1, 2 };
 
-    s->mb_x= s->resync_mb_x;
-    s->first_slice_line=1;
-    for(s->mb_y= s->resync_mb_y; mb_num < mb_count; s->mb_y++){
+    s->mb_x = s->resync_mb_x;
+    s->first_slice_line = 1;
+    for (s->mb_y = s->resync_mb_y; mb_num < mb_count; s->mb_y++) {
         ff_init_block_index(s);
-        for(; mb_num < mb_count && s->mb_x<s->mb_width; s->mb_x++){
-            const int xy= s->mb_x + s->mb_y*s->mb_stride;
+        for (; mb_num < mb_count && s->mb_x < s->mb_width; s->mb_x++) {
+            const int xy = s->mb_x + s->mb_y * s->mb_stride;
 
             mb_num++;
             ff_update_block_index(s);
-            if(s->mb_x == s->resync_mb_x && s->mb_y == s->resync_mb_y+1)
-                s->first_slice_line=0;
+            if (s->mb_x == s->resync_mb_x && s->mb_y == s->resync_mb_y + 1)
+                s->first_slice_line = 0;
 
-            if(s->pict_type==AV_PICTURE_TYPE_I){
-                int ac_pred= get_bits1(&s->gb);
-                int cbpy = get_vlc2(&s->gb, ff_h263_cbpy_vlc.table, CBPY_VLC_BITS, 1);
-                if(cbpy<0){
-                    av_log(s->avctx, AV_LOG_ERROR, "cbpy corrupted at %d %d\n", s->mb_x, s->mb_y);
+            if (s->pict_type == AV_PICTURE_TYPE_I) {
+                int ac_pred = get_bits1(&s->gb);
+                int cbpy    = get_vlc2(&s->gb, ff_h263_cbpy_vlc.table, CBPY_VLC_BITS, 1);
+                if (cbpy < 0) {
+                    av_log(s->avctx, AV_LOG_ERROR,
+                           "cbpy corrupted at %d %d\n", s->mb_x, s->mb_y);
                     return -1;
                 }
 
-                s->cbp_table[xy]|= cbpy<<2;
-                s->current_picture.mb_type[xy] |= ac_pred*MB_TYPE_ACPRED;
-            }else{ /* P || S_TYPE */
+                s->cbp_table[xy]               |= cbpy << 2;
+                s->current_picture.mb_type[xy] |= ac_pred * MB_TYPE_ACPRED;
+            } else { /* P || S_TYPE */
                 if (IS_INTRA(s->current_picture.mb_type[xy])) {
-                    int dir=0,i;
+                    int i;
+                    int dir     = 0;
                     int ac_pred = get_bits1(&s->gb);
-                    int cbpy = get_vlc2(&s->gb, ff_h263_cbpy_vlc.table, CBPY_VLC_BITS, 1);
+                    int cbpy    = get_vlc2(&s->gb, ff_h263_cbpy_vlc.table, CBPY_VLC_BITS, 1);
 
-                    if(cbpy<0){
-                        av_log(s->avctx, AV_LOG_ERROR, "I cbpy corrupted at %d %d\n", s->mb_x, s->mb_y);
+                    if (cbpy < 0) {
+                        av_log(s->avctx, AV_LOG_ERROR,
+                               "I cbpy corrupted at %d %d\n", s->mb_x, s->mb_y);
                         return -1;
                     }
 
-                    if(s->cbp_table[xy] & 8) {
+                    if (s->cbp_table[xy] & 8)
                         ff_set_qscale(s, s->qscale + quant_tab[get_bits(&s->gb, 2)]);
-                    }
                     s->current_picture.qscale_table[xy] = s->qscale;
 
-                    for(i=0; i<6; i++){
+                    for (i = 0; i < 6; i++) {
                         int dc_pred_dir;
-                        int dc= mpeg4_decode_dc(s, i, &dc_pred_dir);
-                        if(dc < 0){
-                            av_log(s->avctx, AV_LOG_ERROR, "DC corrupted at %d %d\n", s->mb_x, s->mb_y);
+                        int dc = mpeg4_decode_dc(s, i, &dc_pred_dir);
+                        if (dc < 0) {
+                            av_log(s->avctx, AV_LOG_ERROR,
+                                   "DC corrupted at %d %d\n", s->mb_x, s->mb_y);
                             return -1;
                         }
-                        dir<<=1;
-                        if(dc_pred_dir) dir|=1;
+                        dir <<= 1;
+                        if (dc_pred_dir)
+                            dir |= 1;
                     }
-                    s->cbp_table[xy]&= 3; //remove dquant
-                    s->cbp_table[xy]|= cbpy<<2;
-                    s->current_picture.mb_type[xy] |= ac_pred*MB_TYPE_ACPRED;
-                    s->pred_dir_table[xy]= dir;
+                    s->cbp_table[xy]               &= 3;  // remove dquant
+                    s->cbp_table[xy]               |= cbpy << 2;
+                    s->current_picture.mb_type[xy] |= ac_pred * MB_TYPE_ACPRED;
+                    s->pred_dir_table[xy]           = dir;
                 } else if (IS_SKIP(s->current_picture.mb_type[xy])) {
                     s->current_picture.qscale_table[xy] = s->qscale;
-                    s->cbp_table[xy]= 0;
-                }else{
+                    s->cbp_table[xy]                    = 0;
+                } else {
                     int cbpy = get_vlc2(&s->gb, ff_h263_cbpy_vlc.table, CBPY_VLC_BITS, 1);
 
-                    if(cbpy<0){
-                        av_log(s->avctx, AV_LOG_ERROR, "P cbpy corrupted at %d %d\n", s->mb_x, s->mb_y);
+                    if (cbpy < 0) {
+                        av_log(s->avctx, AV_LOG_ERROR,
+                               "P cbpy corrupted at %d %d\n", s->mb_x, s->mb_y);
                         return -1;
                     }
 
-                    if(s->cbp_table[xy] & 8) {
+                    if (s->cbp_table[xy] & 8)
                         ff_set_qscale(s, s->qscale + quant_tab[get_bits(&s->gb, 2)]);
-                    }
                     s->current_picture.qscale_table[xy] = s->qscale;
 
-                    s->cbp_table[xy]&= 3; //remove dquant
-                    s->cbp_table[xy]|= (cbpy^0xf)<<2;
+                    s->cbp_table[xy] &= 3;  // remove dquant
+                    s->cbp_table[xy] |= (cbpy ^ 0xf) << 2;
                 }
             }
         }
-        if(mb_num >= mb_count) return 0;
-        s->mb_x= 0;
+        if (mb_num >= mb_count)
+            return 0;
+        s->mb_x = 0;
     }
     return 0;
 }
@@ -804,50 +870,60 @@
  * Decode the first and second partition.
  * @return <0 if error (and sets error type in the error_status_table)
  */
-int ff_mpeg4_decode_partitions(MpegEncContext *s)
+int ff_mpeg4_decode_partitions(Mpeg4DecContext *ctx)
 {
+    MpegEncContext *s = &ctx->m;
     int mb_num;
-    const int part_a_error= s->pict_type==AV_PICTURE_TYPE_I ? (ER_DC_ERROR|ER_MV_ERROR) : ER_MV_ERROR;
-    const int part_a_end  = s->pict_type==AV_PICTURE_TYPE_I ? (ER_DC_END  |ER_MV_END)   : ER_MV_END;
+    const int part_a_error = s->pict_type == AV_PICTURE_TYPE_I ? (ER_DC_ERROR | ER_MV_ERROR) : ER_MV_ERROR;
+    const int part_a_end   = s->pict_type == AV_PICTURE_TYPE_I ? (ER_DC_END   | ER_MV_END)   : ER_MV_END;
 
-    mb_num= mpeg4_decode_partition_a(s);
-    if(mb_num<0){
-        ff_er_add_slice(&s->er, s->resync_mb_x, s->resync_mb_y, s->mb_x, s->mb_y, part_a_error);
+    mb_num = mpeg4_decode_partition_a(ctx);
+    if (mb_num < 0) {
+        ff_er_add_slice(&s->er, s->resync_mb_x, s->resync_mb_y,
+                        s->mb_x, s->mb_y, part_a_error);
         return -1;
     }
 
-    if(s->resync_mb_x + s->resync_mb_y*s->mb_width + mb_num > s->mb_num){
+    if (s->resync_mb_x + s->resync_mb_y * s->mb_width + mb_num > s->mb_num) {
         av_log(s->avctx, AV_LOG_ERROR, "slice below monitor ...\n");
-        ff_er_add_slice(&s->er, s->resync_mb_x, s->resync_mb_y, s->mb_x, s->mb_y, part_a_error);
+        ff_er_add_slice(&s->er, s->resync_mb_x, s->resync_mb_y,
+                        s->mb_x, s->mb_y, part_a_error);
         return -1;
     }
 
-    s->mb_num_left= mb_num;
+    s->mb_num_left = mb_num;
 
-    if(s->pict_type==AV_PICTURE_TYPE_I){
-        while(show_bits(&s->gb, 9) == 1)
+    if (s->pict_type == AV_PICTURE_TYPE_I) {
+        while (show_bits(&s->gb, 9) == 1)
             skip_bits(&s->gb, 9);
-        if(get_bits_long(&s->gb, 19)!=DC_MARKER){
-            av_log(s->avctx, AV_LOG_ERROR, "marker missing after first I partition at %d %d\n", s->mb_x, s->mb_y);
+        if (get_bits_long(&s->gb, 19) != DC_MARKER) {
+            av_log(s->avctx, AV_LOG_ERROR,
+                   "marker missing after first I partition at %d %d\n",
+                   s->mb_x, s->mb_y);
             return -1;
         }
-    }else{
-        while(show_bits(&s->gb, 10) == 1)
+    } else {
+        while (show_bits(&s->gb, 10) == 1)
             skip_bits(&s->gb, 10);
-        if(get_bits(&s->gb, 17)!=MOTION_MARKER){
-            av_log(s->avctx, AV_LOG_ERROR, "marker missing after first P partition at %d %d\n", s->mb_x, s->mb_y);
+        if (get_bits(&s->gb, 17) != MOTION_MARKER) {
+            av_log(s->avctx, AV_LOG_ERROR,
+                   "marker missing after first P partition at %d %d\n",
+                   s->mb_x, s->mb_y);
             return -1;
         }
     }
-    ff_er_add_slice(&s->er, s->resync_mb_x, s->resync_mb_y, s->mb_x-1, s->mb_y, part_a_end);
+    ff_er_add_slice(&s->er, s->resync_mb_x, s->resync_mb_y,
+                    s->mb_x - 1, s->mb_y, part_a_end);
 
-    if( mpeg4_decode_partition_b(s, mb_num) < 0){
-        if(s->pict_type==AV_PICTURE_TYPE_P)
-            ff_er_add_slice(&s->er, s->resync_mb_x, s->resync_mb_y, s->mb_x, s->mb_y, ER_DC_ERROR);
+    if (mpeg4_decode_partition_b(s, mb_num) < 0) {
+        if (s->pict_type == AV_PICTURE_TYPE_P)
+            ff_er_add_slice(&s->er, s->resync_mb_x, s->resync_mb_y,
+                            s->mb_x, s->mb_y, ER_DC_ERROR);
         return -1;
-    }else{
-        if(s->pict_type==AV_PICTURE_TYPE_P)
-            ff_er_add_slice(&s->er, s->resync_mb_x, s->resync_mb_y, s->mb_x-1, s->mb_y, ER_DC_END);
+    } else {
+        if (s->pict_type == AV_PICTURE_TYPE_P)
+            ff_er_add_slice(&s->er, s->resync_mb_x, s->resync_mb_y,
+                            s->mb_x - 1, s->mb_y, ER_DC_END);
     }
 
     return 0;
@@ -857,243 +933,265 @@
  * Decode a block.
  * @return <0 if an error occurred
  */
-static inline int mpeg4_decode_block(MpegEncContext * s, int16_t * block,
-                              int n, int coded, int intra, int rvlc)
+static inline int mpeg4_decode_block(Mpeg4DecContext *ctx, int16_t *block,
+                                     int n, int coded, int intra, int rvlc)
 {
-    int level, i, last, run;
+    MpegEncContext *s = &ctx->m;
+    int level, i, last, run, qmul, qadd;
     int av_uninit(dc_pred_dir);
-    RLTable * rl;
-    RL_VLC_ELEM * rl_vlc;
-    const uint8_t * scan_table;
-    int qmul, qadd;
-
-    //Note intra & rvlc should be optimized away if this is inlined
-
-    if(intra) {
-      if(s->use_intra_dc_vlc){
-        /* DC coef */
-        if(s->partitioned_frame){
-            level = s->dc_val[0][ s->block_index[n] ];
-            if(n<4) level= FASTDIV((level + (s->y_dc_scale>>1)), s->y_dc_scale);
-            else    level= FASTDIV((level + (s->c_dc_scale>>1)), s->c_dc_scale);
-            dc_pred_dir= (s->pred_dir_table[s->mb_x + s->mb_y*s->mb_stride]<<n)&32;
-        }else{
-            level = mpeg4_decode_dc(s, n, &dc_pred_dir);
-            if (level < 0)
-                return -1;
-        }
-        block[0] = level;
-        i = 0;
-      }else{
+    RLTable *rl;
+    RL_VLC_ELEM *rl_vlc;
+    const uint8_t *scan_table;
+
+    // Note intra & rvlc should be optimized away if this is inlined
+
+    if (intra) {
+        if (ctx->use_intra_dc_vlc) {
+            /* DC coef */
+            if (s->partitioned_frame) {
+                level = s->dc_val[0][s->block_index[n]];
+                if (n < 4)
+                    level = FASTDIV((level + (s->y_dc_scale >> 1)), s->y_dc_scale);
+                else
+                    level = FASTDIV((level + (s->c_dc_scale >> 1)), s->c_dc_scale);
+                dc_pred_dir = (s->pred_dir_table[s->mb_x + s->mb_y * s->mb_stride] << n) & 32;
+            } else {
+                level = mpeg4_decode_dc(s, n, &dc_pred_dir);
+                if (level < 0)
+                    return -1;
+            }
+            block[0] = level;
+            i        = 0;
+        } else {
             i = -1;
             ff_mpeg4_pred_dc(s, n, 0, &dc_pred_dir, 0);
-      }
-      if (!coded)
-          goto not_coded;
-
-      if(rvlc){
-          rl = &ff_rvlc_rl_intra;
-          rl_vlc = ff_rvlc_rl_intra.rl_vlc[0];
-      }else{
-          rl = &ff_mpeg4_rl_intra;
-          rl_vlc = ff_mpeg4_rl_intra.rl_vlc[0];
-      }
-      if (s->ac_pred) {
-          if (dc_pred_dir == 0)
-              scan_table = s->intra_v_scantable.permutated; /* left */
-          else
-              scan_table = s->intra_h_scantable.permutated; /* top */
-      } else {
+        }
+        if (!coded)
+            goto not_coded;
+
+        if (rvlc) {
+            rl     = &ff_rvlc_rl_intra;
+            rl_vlc = ff_rvlc_rl_intra.rl_vlc[0];
+        } else {
+            rl     = &ff_mpeg4_rl_intra;
+            rl_vlc = ff_mpeg4_rl_intra.rl_vlc[0];
+        }
+        if (s->ac_pred) {
+            if (dc_pred_dir == 0)
+                scan_table = s->intra_v_scantable.permutated;  /* left */
+            else
+                scan_table = s->intra_h_scantable.permutated;  /* top */
+        } else {
             scan_table = s->intra_scantable.permutated;
-      }
-      qmul=1;
-      qadd=0;
+        }
+        qmul = 1;
+        qadd = 0;
     } else {
         i = -1;
         if (!coded) {
             s->block_last_index[n] = i;
             return 0;
         }
-        if(rvlc) rl = &ff_rvlc_rl_inter;
-        else     rl = &ff_h263_rl_inter;
+        if (rvlc)
+            rl = &ff_rvlc_rl_inter;
+        else
+            rl = &ff_h263_rl_inter;
 
         scan_table = s->intra_scantable.permutated;
 
-        if(s->mpeg_quant){
-            qmul=1;
-            qadd=0;
-            if(rvlc){
+        if (s->mpeg_quant) {
+            qmul = 1;
+            qadd = 0;
+            if (rvlc)
                 rl_vlc = ff_rvlc_rl_inter.rl_vlc[0];
-            }else{
+            else
                 rl_vlc = ff_h263_rl_inter.rl_vlc[0];
-            }
-        }else{
+        } else {
             qmul = s->qscale << 1;
             qadd = (s->qscale - 1) | 1;
-            if(rvlc){
+            if (rvlc)
                 rl_vlc = ff_rvlc_rl_inter.rl_vlc[s->qscale];
-            }else{
+            else
                 rl_vlc = ff_h263_rl_inter.rl_vlc[s->qscale];
-            }
         }
     }
-  {
-    OPEN_READER(re, &s->gb);
-    for(;;) {
-        UPDATE_CACHE(re, &s->gb);
-        GET_RL_VLC(level, run, re, &s->gb, rl_vlc, TEX_VLC_BITS, 2, 0);
-        if (level==0) {
-          /* escape */
-          if(rvlc){
-                if(SHOW_UBITS(re, &s->gb, 1)==0){
-                    av_log(s->avctx, AV_LOG_ERROR, "1. marker bit missing in rvlc esc\n");
-                    return -1;
-                }; SKIP_CACHE(re, &s->gb, 1);
-
-                last=  SHOW_UBITS(re, &s->gb, 1); SKIP_CACHE(re, &s->gb, 1);
-                run=   SHOW_UBITS(re, &s->gb, 6);
-                SKIP_COUNTER(re, &s->gb, 1+1+6);
-                UPDATE_CACHE(re, &s->gb);
+    {
+        OPEN_READER(re, &s->gb);
+        for (;;) {
+            UPDATE_CACHE(re, &s->gb);
+            GET_RL_VLC(level, run, re, &s->gb, rl_vlc, TEX_VLC_BITS, 2, 0);
+            if (level == 0) {
+                /* escape */
+                if (rvlc) {
+                    if (SHOW_UBITS(re, &s->gb, 1) == 0) {
+                        av_log(s->avctx, AV_LOG_ERROR,
+                               "1. marker bit missing in rvlc esc\n");
+                        return -1;
+                    }
+                    SKIP_CACHE(re, &s->gb, 1);
 
-                if(SHOW_UBITS(re, &s->gb, 1)==0){
-                    av_log(s->avctx, AV_LOG_ERROR, "2. marker bit missing in rvlc esc\n");
-                    return -1;
-                }; SKIP_CACHE(re, &s->gb, 1);
+                    last = SHOW_UBITS(re, &s->gb, 1);
+                    SKIP_CACHE(re, &s->gb, 1);
+                    run = SHOW_UBITS(re, &s->gb, 6);
+                    SKIP_COUNTER(re, &s->gb, 1 + 1 + 6);
+                    UPDATE_CACHE(re, &s->gb);
 
-                level= SHOW_UBITS(re, &s->gb, 11); SKIP_CACHE(re, &s->gb, 11);
+                    if (SHOW_UBITS(re, &s->gb, 1) == 0) {
+                        av_log(s->avctx, AV_LOG_ERROR,
+                               "2. marker bit missing in rvlc esc\n");
+                        return -1;
+                    }
+                    SKIP_CACHE(re, &s->gb, 1);
 
-                if(SHOW_UBITS(re, &s->gb, 5)!=0x10){
-                    av_log(s->avctx, AV_LOG_ERROR, "reverse esc missing\n");
-                    return -1;
-                }; SKIP_CACHE(re, &s->gb, 5);
+                    level = SHOW_UBITS(re, &s->gb, 11);
+                    SKIP_CACHE(re, &s->gb, 11);
 
-                level=  level * qmul + qadd;
-                level = (level ^ SHOW_SBITS(re, &s->gb, 1)) - SHOW_SBITS(re, &s->gb, 1);
-                SKIP_COUNTER(re, &s->gb, 1+11+5+1);
+                    if (SHOW_UBITS(re, &s->gb, 5) != 0x10) {
+                        av_log(s->avctx, AV_LOG_ERROR, "reverse esc missing\n");
+                        return -1;
+                    }
+                    SKIP_CACHE(re, &s->gb, 5);
 
-                i+= run + 1;
-                if(last) i+=192;
-          }else{
-            int cache;
-            cache= GET_CACHE(re, &s->gb);
-
-            if(IS_3IV1)
-                cache ^= 0xC0000000;
-
-            if (cache&0x80000000) {
-                if (cache&0x40000000) {
-                    /* third escape */
-                    SKIP_CACHE(re, &s->gb, 2);
-                    last=  SHOW_UBITS(re, &s->gb, 1); SKIP_CACHE(re, &s->gb, 1);
-                    run=   SHOW_UBITS(re, &s->gb, 6);
-                    SKIP_COUNTER(re, &s->gb, 2+1+6);
-                    UPDATE_CACHE(re, &s->gb);
+                    level = level * qmul + qadd;
+                    level = (level ^ SHOW_SBITS(re, &s->gb, 1)) - SHOW_SBITS(re, &s->gb, 1);
+                    SKIP_COUNTER(re, &s->gb, 1 + 11 + 5 + 1);
 
-                    if(IS_3IV1){
-                        level= SHOW_SBITS(re, &s->gb, 12); LAST_SKIP_BITS(re, &s->gb, 12);
-                    }else{
-                        if(SHOW_UBITS(re, &s->gb, 1)==0){
-                            av_log(s->avctx, AV_LOG_ERROR, "1. marker bit missing in 3. esc\n");
-                            return -1;
-                        }; SKIP_CACHE(re, &s->gb, 1);
+                    i += run + 1;
+                    if (last)
+                        i += 192;
+                } else {
+                    int cache;
+                    cache = GET_CACHE(re, &s->gb);
 
-                        level= SHOW_SBITS(re, &s->gb, 12); SKIP_CACHE(re, &s->gb, 12);
+                    if (IS_3IV1)
+                        cache ^= 0xC0000000;
 
-                        if(SHOW_UBITS(re, &s->gb, 1)==0){
-                            av_log(s->avctx, AV_LOG_ERROR, "2. marker bit missing in 3. esc\n");
-                            return -1;
-                        }
+                    if (cache & 0x80000000) {
+                        if (cache & 0x40000000) {
+                            /* third escape */
+                            SKIP_CACHE(re, &s->gb, 2);
+                            last = SHOW_UBITS(re, &s->gb, 1);
+                            SKIP_CACHE(re, &s->gb, 1);
+                            run = SHOW_UBITS(re, &s->gb, 6);
+                            SKIP_COUNTER(re, &s->gb, 2 + 1 + 6);
+                            UPDATE_CACHE(re, &s->gb);
+
+                            if (IS_3IV1) {
+                                level = SHOW_SBITS(re, &s->gb, 12);
+                                LAST_SKIP_BITS(re, &s->gb, 12);
+                            } else {
+                                if (SHOW_UBITS(re, &s->gb, 1) == 0) {
+                                    av_log(s->avctx, AV_LOG_ERROR,
+                                           "1. marker bit missing in 3. esc\n");
+                                    return -1;
+                                }
+                                SKIP_CACHE(re, &s->gb, 1);
 
-                        SKIP_COUNTER(re, &s->gb, 1+12+1);
-                    }
+                                level = SHOW_SBITS(re, &s->gb, 12);
+                                SKIP_CACHE(re, &s->gb, 12);
 
-#if 0
-                    if(s->error_recognition >= FF_ER_COMPLIANT){
-                        const int abs_level= FFABS(level);
-                        if(abs_level<=MAX_LEVEL && run<=MAX_RUN){
-                            const int run1= run - rl->max_run[last][abs_level] - 1;
-                            if(abs_level <= rl->max_level[last][run]){
-                                av_log(s->avctx, AV_LOG_ERROR, "illegal 3. esc, vlc encoding possible\n");
-                                return -1;
-                            }
-                            if(s->error_recognition > FF_ER_COMPLIANT){
-                                if(abs_level <= rl->max_level[last][run]*2){
-                                    av_log(s->avctx, AV_LOG_ERROR, "illegal 3. esc, esc 1 encoding possible\n");
+                                if (SHOW_UBITS(re, &s->gb, 1) == 0) {
+                                    av_log(s->avctx, AV_LOG_ERROR,
+                                           "2. marker bit missing in 3. esc\n");
                                     return -1;
                                 }
-                                if(run1 >= 0 && abs_level <= rl->max_level[last][run1]){
-                                    av_log(s->avctx, AV_LOG_ERROR, "illegal 3. esc, esc 2 encoding possible\n");
-                                    return -1;
+
+                                SKIP_COUNTER(re, &s->gb, 1 + 12 + 1);
+                            }
+
+#if 0
+                            if (s->error_recognition >= FF_ER_COMPLIANT) {
+                                const int abs_level= FFABS(level);
+                                if (abs_level<=MAX_LEVEL && run<=MAX_RUN) {
+                                    const int run1= run - rl->max_run[last][abs_level] - 1;
+                                    if (abs_level <= rl->max_level[last][run]) {
+                                        av_log(s->avctx, AV_LOG_ERROR, "illegal 3. esc, vlc encoding possible\n");
+                                        return -1;
+                                    }
+                                    if (s->error_recognition > FF_ER_COMPLIANT) {
+                                        if (abs_level <= rl->max_level[last][run]*2) {
+                                            av_log(s->avctx, AV_LOG_ERROR, "illegal 3. esc, esc 1 encoding possible\n");
+                                            return -1;
+                                        }
+                                        if (run1 >= 0 && abs_level <= rl->max_level[last][run1]) {
+                                            av_log(s->avctx, AV_LOG_ERROR, "illegal 3. esc, esc 2 encoding possible\n");
+                                            return -1;
+                                        }
+                                    }
                                 }
                             }
-                        }
-                    }
 #endif
-                    if (level>0) level= level * qmul + qadd;
-                    else         level= level * qmul - qadd;
-
-                    if((unsigned)(level + 2048) > 4095){
-                        if(s->err_recognition & (AV_EF_BITSTREAM|AV_EF_AGGRESSIVE)){
-                            if(level > 2560 || level<-2560){
-                                av_log(s->avctx, AV_LOG_ERROR, "|level| overflow in 3. esc, qp=%d\n", s->qscale);
-                                return -1;
+                            if (level > 0)
+                                level = level * qmul + qadd;
+                            else
+                                level = level * qmul - qadd;
+
+                            if ((unsigned)(level + 2048) > 4095) {
+                                if (s->err_recognition & (AV_EF_BITSTREAM|AV_EF_AGGRESSIVE)) {
+                                    if (level > 2560 || level < -2560) {
+                                        av_log(s->avctx, AV_LOG_ERROR,
+                                               "|level| overflow in 3. esc, qp=%d\n",
+                                               s->qscale);
+                                        return -1;
+                                    }
+                                }
+                                level = level < 0 ? -2048 : 2047;
                             }
+
+                            i += run + 1;
+                            if (last)
+                                i += 192;
+                        } else {
+                            /* second escape */
+                            SKIP_BITS(re, &s->gb, 2);
+                            GET_RL_VLC(level, run, re, &s->gb, rl_vlc, TEX_VLC_BITS, 2, 1);
+                            i    += run + rl->max_run[run >> 7][level / qmul] + 1;  // FIXME opt indexing
+                            level = (level ^ SHOW_SBITS(re, &s->gb, 1)) - SHOW_SBITS(re, &s->gb, 1);
+                            LAST_SKIP_BITS(re, &s->gb, 1);
                         }
-                        level= level<0 ? -2048 : 2047;
+                    } else {
+                        /* first escape */
+                        SKIP_BITS(re, &s->gb, 1);
+                        GET_RL_VLC(level, run, re, &s->gb, rl_vlc, TEX_VLC_BITS, 2, 1);
+                        i    += run;
+                        level = level + rl->max_level[run >> 7][(run - 1) & 63] * qmul;  // FIXME opt indexing
+                        level = (level ^ SHOW_SBITS(re, &s->gb, 1)) - SHOW_SBITS(re, &s->gb, 1);
+                        LAST_SKIP_BITS(re, &s->gb, 1);
                     }
-
-                    i+= run + 1;
-                    if(last) i+=192;
-                } else {
-                    /* second escape */
-                    SKIP_BITS(re, &s->gb, 2);
-                    GET_RL_VLC(level, run, re, &s->gb, rl_vlc, TEX_VLC_BITS, 2, 1);
-                    i+= run + rl->max_run[run>>7][level/qmul] +1; //FIXME opt indexing
-                    level = (level ^ SHOW_SBITS(re, &s->gb, 1)) - SHOW_SBITS(re, &s->gb, 1);
-                    LAST_SKIP_BITS(re, &s->gb, 1);
                 }
             } else {
-                /* first escape */
-                SKIP_BITS(re, &s->gb, 1);
-                GET_RL_VLC(level, run, re, &s->gb, rl_vlc, TEX_VLC_BITS, 2, 1);
-                i+= run;
-                level = level + rl->max_level[run>>7][(run-1)&63] * qmul;//FIXME opt indexing
+                i    += run;
                 level = (level ^ SHOW_SBITS(re, &s->gb, 1)) - SHOW_SBITS(re, &s->gb, 1);
                 LAST_SKIP_BITS(re, &s->gb, 1);
             }
-          }
-        } else {
-            i+= run;
-            level = (level ^ SHOW_SBITS(re, &s->gb, 1)) - SHOW_SBITS(re, &s->gb, 1);
-            LAST_SKIP_BITS(re, &s->gb, 1);
-        }
-        if (i > 62){
-            i-= 192;
-            if(i&(~63)){
-                av_log(s->avctx, AV_LOG_ERROR, "ac-tex damaged at %d %d\n", s->mb_x, s->mb_y);
-                return -1;
+            if (i > 62) {
+                i -= 192;
+                if (i & (~63)) {
+                    av_log(s->avctx, AV_LOG_ERROR,
+                           "ac-tex damaged at %d %d\n", s->mb_x, s->mb_y);
+                    return -1;
+                }
+
+                block[scan_table[i]] = level;
+                break;
             }
 
             block[scan_table[i]] = level;
-            break;
         }
-
-        block[scan_table[i]] = level;
+        CLOSE_READER(re, &s->gb);
     }
-    CLOSE_READER(re, &s->gb);
-  }
- not_coded:
+
+not_coded:
     if (intra) {
-        if(!s->use_intra_dc_vlc){
+        if (!ctx->use_intra_dc_vlc) {
             block[0] = ff_mpeg4_pred_dc(s, n, block[0], &dc_pred_dir, 0);
 
-            i -= i>>31; //if(i == -1) i=0;
+            i -= i >> 31;  // if (i == -1) i = 0;
         }
 
         ff_mpeg4_pred_ac(s, block, n, dc_pred_dir);
-        if (s->ac_pred) {
-            i = 63; /* XXX: not optimal */
-        }
+        if (s->ac_pred)
+            i = 63;  // FIXME not optimal
     }
     s->block_last_index[n] = i;
     return 0;
@@ -1105,21 +1203,22 @@
  */
 static int mpeg4_decode_partitioned_mb(MpegEncContext *s, int16_t block[6][64])
 {
+    Mpeg4DecContext *ctx = (Mpeg4DecContext *)s;
     int cbp, mb_type;
-    const int xy= s->mb_x + s->mb_y*s->mb_stride;
+    const int xy = s->mb_x + s->mb_y * s->mb_stride;
 
     mb_type = s->current_picture.mb_type[xy];
-    cbp = s->cbp_table[xy];
+    cbp     = s->cbp_table[xy];
 
-    s->use_intra_dc_vlc= s->qscale < s->intra_dc_threshold;
+    ctx->use_intra_dc_vlc = s->qscale < ctx->intra_dc_threshold;
 
-    if (s->current_picture.qscale_table[xy] != s->qscale) {
+    if (s->current_picture.qscale_table[xy] != s->qscale)
         ff_set_qscale(s, s->current_picture.qscale_table[xy]);
-    }
 
-    if (s->pict_type == AV_PICTURE_TYPE_P || s->pict_type==AV_PICTURE_TYPE_S) {
+    if (s->pict_type == AV_PICTURE_TYPE_P ||
+        s->pict_type == AV_PICTURE_TYPE_S) {
         int i;
-        for(i=0; i<4; i++){
+        for (i = 0; i < 4; i++) {
             s->mv[0][i][0] = s->current_picture.motion_val[0][s->block_index[i]][0];
             s->mv[0][i][1] = s->current_picture.motion_val[0][s->block_index[i]][1];
         }
@@ -1127,21 +1226,22 @@
 
         if (IS_SKIP(mb_type)) {
             /* skip mb */
-            for(i=0;i<6;i++)
+            for (i = 0; i < 6; i++)
                 s->block_last_index[i] = -1;
-            s->mv_dir = MV_DIR_FORWARD;
+            s->mv_dir  = MV_DIR_FORWARD;
             s->mv_type = MV_TYPE_16X16;
-            if(s->pict_type==AV_PICTURE_TYPE_S && s->vol_sprite_usage==GMC_SPRITE){
-                s->mcsel=1;
+            if (s->pict_type == AV_PICTURE_TYPE_S
+                && ctx->vol_sprite_usage == GMC_SPRITE) {
+                s->mcsel      = 1;
                 s->mb_skipped = 0;
-            }else{
-                s->mcsel=0;
+            } else {
+                s->mcsel      = 0;
                 s->mb_skipped = 1;
             }
-        }else if(s->mb_intra){
+        } else if (s->mb_intra) {
             s->ac_pred = IS_ACPRED(s->current_picture.mb_type[xy]);
-        }else if(!s->mb_intra){
-//            s->mcsel= 0; //FIXME do we need to init that
+        } else if (!s->mb_intra) {
+            // s->mcsel = 0;  // FIXME do we need to init that?
 
             s->mv_dir = MV_DIR_FORWARD;
             if (IS_8X8(mb_type)) {
@@ -1152,7 +1252,7 @@
         }
     } else { /* I-Frame */
         s->mb_intra = 1;
-        s->ac_pred = IS_ACPRED(s->current_picture.mb_type[xy]);
+        s->ac_pred  = IS_ACPRED(s->current_picture.mb_type[xy]);
     }
 
     if (!IS_SKIP(mb_type)) {
@@ -1160,123 +1260,138 @@
         s->dsp.clear_blocks(s->block[0]);
         /* decode each block */
         for (i = 0; i < 6; i++) {
-            if(mpeg4_decode_block(s, block[i], i, cbp&32, s->mb_intra, s->rvlc) < 0){
-                av_log(s->avctx, AV_LOG_ERROR, "texture corrupted at %d %d %d\n", s->mb_x, s->mb_y, s->mb_intra);
+            if (mpeg4_decode_block(ctx, block[i], i, cbp & 32, s->mb_intra, ctx->rvlc) < 0) {
+                av_log(s->avctx, AV_LOG_ERROR,
+                       "texture corrupted at %d %d %d\n",
+                       s->mb_x, s->mb_y, s->mb_intra);
                 return -1;
             }
-            cbp+=cbp;
+            cbp += cbp;
         }
     }
 
     /* per-MB end of slice check */
-
-    if(--s->mb_num_left <= 0){
-        if(mpeg4_is_resync(s))
+    if (--s->mb_num_left <= 0) {
+        if (mpeg4_is_resync(ctx))
             return SLICE_END;
         else
             return SLICE_NOEND;
-    }else{
-        if(mpeg4_is_resync(s)){
-            const int delta= s->mb_x + 1 == s->mb_width ? 2 : 1;
-            if(s->cbp_table[xy+delta])
+    } else {
+        if (mpeg4_is_resync(ctx)) {
+            const int delta = s->mb_x + 1 == s->mb_width ? 2 : 1;
+            if (s->cbp_table[xy + delta])
                 return SLICE_END;
         }
         return SLICE_OK;
     }
 }
 
-static int mpeg4_decode_mb(MpegEncContext *s,
-                      int16_t block[6][64])
+static int mpeg4_decode_mb(MpegEncContext *s, int16_t block[6][64])
 {
+    Mpeg4DecContext *ctx = (Mpeg4DecContext *)s;
     int cbpc, cbpy, i, cbp, pred_x, pred_y, mx, my, dquant;
     int16_t *mot_val;
     static int8_t quant_tab[4] = { -1, -2, 1, 2 };
-    const int xy= s->mb_x + s->mb_y * s->mb_stride;
+    const int xy = s->mb_x + s->mb_y * s->mb_stride;
 
     av_assert2(s->h263_pred);
 
-    if (s->pict_type == AV_PICTURE_TYPE_P || s->pict_type==AV_PICTURE_TYPE_S) {
-        do{
+    if (s->pict_type == AV_PICTURE_TYPE_P ||
+        s->pict_type == AV_PICTURE_TYPE_S) {
+        do {
             if (get_bits1(&s->gb)) {
                 /* skip mb */
                 s->mb_intra = 0;
-                for(i=0;i<6;i++)
+                for (i = 0; i < 6; i++)
                     s->block_last_index[i] = -1;
-                s->mv_dir = MV_DIR_FORWARD;
+                s->mv_dir  = MV_DIR_FORWARD;
                 s->mv_type = MV_TYPE_16X16;
-                if(s->pict_type==AV_PICTURE_TYPE_S && s->vol_sprite_usage==GMC_SPRITE){
-                    s->current_picture.mb_type[xy] = MB_TYPE_SKIP | MB_TYPE_GMC | MB_TYPE_16x16 | MB_TYPE_L0;
-                    s->mcsel=1;
-                    s->mv[0][0][0]= get_amv(s, 0);
-                    s->mv[0][0][1]= get_amv(s, 1);
-
-                    s->mb_skipped = 0;
-                }else{
-                    s->current_picture.mb_type[xy] = MB_TYPE_SKIP | MB_TYPE_16x16 | MB_TYPE_L0;
-                    s->mcsel=0;
+                if (s->pict_type == AV_PICTURE_TYPE_S &&
+                    ctx->vol_sprite_usage == GMC_SPRITE) {
+                    s->current_picture.mb_type[xy] = MB_TYPE_SKIP  |
+                                                     MB_TYPE_GMC   |
+                                                     MB_TYPE_16x16 |
+                                                     MB_TYPE_L0;
+                    s->mcsel       = 1;
+                    s->mv[0][0][0] = get_amv(ctx, 0);
+                    s->mv[0][0][1] = get_amv(ctx, 1);
+                    s->mb_skipped  = 0;
+                } else {
+                    s->current_picture.mb_type[xy] = MB_TYPE_SKIP  |
+                                                     MB_TYPE_16x16 |
+                                                     MB_TYPE_L0;
+                    s->mcsel       = 0;
                     s->mv[0][0][0] = 0;
                     s->mv[0][0][1] = 0;
-                    s->mb_skipped = 1;
+                    s->mb_skipped  = 1;
                 }
                 goto end;
             }
             cbpc = get_vlc2(&s->gb, ff_h263_inter_MCBPC_vlc.table, INTER_MCBPC_VLC_BITS, 2);
-            if (cbpc < 0){
-                av_log(s->avctx, AV_LOG_ERROR, "cbpc damaged at %d %d\n", s->mb_x, s->mb_y);
+            if (cbpc < 0) {
+                av_log(s->avctx, AV_LOG_ERROR,
+                       "cbpc damaged at %d %d\n", s->mb_x, s->mb_y);
                 return -1;
             }
-        }while(cbpc == 20);
+        } while (cbpc == 20);
 
         s->dsp.clear_blocks(s->block[0]);
-        dquant = cbpc & 8;
+        dquant      = cbpc & 8;
         s->mb_intra = ((cbpc & 4) != 0);
-        if (s->mb_intra) goto intra;
+        if (s->mb_intra)
+            goto intra;
 
-        if(s->pict_type==AV_PICTURE_TYPE_S && s->vol_sprite_usage==GMC_SPRITE && (cbpc & 16) == 0)
-            s->mcsel= get_bits1(&s->gb);
-        else s->mcsel= 0;
+        if (s->pict_type == AV_PICTURE_TYPE_S &&
+            ctx->vol_sprite_usage == GMC_SPRITE && (cbpc & 16) == 0)
+            s->mcsel = get_bits1(&s->gb);
+        else
+            s->mcsel = 0;
         cbpy = get_vlc2(&s->gb, ff_h263_cbpy_vlc.table, CBPY_VLC_BITS, 1) ^ 0x0F;
 
         cbp = (cbpc & 3) | (cbpy << 2);
-        if (dquant) {
+        if (dquant)
             ff_set_qscale(s, s->qscale + quant_tab[get_bits(&s->gb, 2)]);
-        }
-        if((!s->progressive_sequence) && (cbp || (s->workaround_bugs&FF_BUG_XVID_ILACE)))
-            s->interlaced_dct= get_bits1(&s->gb);
+        if ((!s->progressive_sequence) &&
+            (cbp || (s->workaround_bugs & FF_BUG_XVID_ILACE)))
+            s->interlaced_dct = get_bits1(&s->gb);
 
         s->mv_dir = MV_DIR_FORWARD;
         if ((cbpc & 16) == 0) {
-            if(s->mcsel){
-                s->current_picture.mb_type[xy] = MB_TYPE_GMC | MB_TYPE_16x16 | MB_TYPE_L0;
+            if (s->mcsel) {
+                s->current_picture.mb_type[xy] = MB_TYPE_GMC   |
+                                                 MB_TYPE_16x16 |
+                                                 MB_TYPE_L0;
                 /* 16x16 global motion prediction */
-                s->mv_type = MV_TYPE_16X16;
-                mx= get_amv(s, 0);
-                my= get_amv(s, 1);
+                s->mv_type     = MV_TYPE_16X16;
+                mx             = get_amv(ctx, 0);
+                my             = get_amv(ctx, 1);
                 s->mv[0][0][0] = mx;
                 s->mv[0][0][1] = my;
-            }else if((!s->progressive_sequence) && get_bits1(&s->gb)){
-                s->current_picture.mb_type[xy] = MB_TYPE_16x8 | MB_TYPE_L0 | MB_TYPE_INTERLACED;
+            } else if ((!s->progressive_sequence) && get_bits1(&s->gb)) {
+                s->current_picture.mb_type[xy] = MB_TYPE_16x8 |
+                                                 MB_TYPE_L0   |
+                                                 MB_TYPE_INTERLACED;
                 /* 16x8 field motion prediction */
-                s->mv_type= MV_TYPE_FIELD;
+                s->mv_type = MV_TYPE_FIELD;
 
-                s->field_select[0][0]= get_bits1(&s->gb);
-                s->field_select[0][1]= get_bits1(&s->gb);
+                s->field_select[0][0] = get_bits1(&s->gb);
+                s->field_select[0][1] = get_bits1(&s->gb);
 
                 ff_h263_pred_motion(s, 0, 0, &pred_x, &pred_y);
 
-                for(i=0; i<2; i++){
+                for (i = 0; i < 2; i++) {
                     mx = ff_h263_decode_motion(s, pred_x, s->f_code);
                     if (mx >= 0xffff)
                         return -1;
 
-                    my = ff_h263_decode_motion(s, pred_y/2, s->f_code);
+                    my = ff_h263_decode_motion(s, pred_y / 2, s->f_code);
                     if (my >= 0xffff)
                         return -1;
 
                     s->mv[0][i][0] = mx;
                     s->mv[0][i][1] = my;
                 }
-            }else{
+            } else {
                 s->current_picture.mb_type[xy] = MB_TYPE_16x16 | MB_TYPE_L0;
                 /* 16x16 motion prediction */
                 s->mv_type = MV_TYPE_16X16;
@@ -1295,10 +1410,10 @@
             }
         } else {
             s->current_picture.mb_type[xy] = MB_TYPE_8x8 | MB_TYPE_L0;
-            s->mv_type = MV_TYPE_8X8;
-            for(i=0;i<4;i++) {
+            s->mv_type                     = MV_TYPE_8X8;
+            for (i = 0; i < 4; i++) {
                 mot_val = ff_h263_pred_motion(s, i, 0, &pred_x, &pred_y);
-                mx = ff_h263_decode_motion(s, pred_x, s->f_code);
+                mx      = ff_h263_decode_motion(s, pred_x, s->f_code);
                 if (mx >= 0xffff)
                     return -1;
 
@@ -1307,215 +1422,233 @@
                     return -1;
                 s->mv[0][i][0] = mx;
                 s->mv[0][i][1] = my;
-                mot_val[0] = mx;
-                mot_val[1] = my;
+                mot_val[0]     = mx;
+                mot_val[1]     = my;
             }
         }
-    } else if(s->pict_type==AV_PICTURE_TYPE_B) {
-        int modb1; // first bit of modb
-        int modb2; // second bit of modb
+    } else if (s->pict_type == AV_PICTURE_TYPE_B) {
+        int modb1;   // first bit of modb
+        int modb2;   // second bit of modb
         int mb_type;
 
-        s->mb_intra = 0; //B-frames never contain intra blocks
-        s->mcsel=0;      //     ...               true gmc blocks
+        s->mb_intra = 0;  // B-frames never contain intra blocks
+        s->mcsel    = 0;  //      ...               true gmc blocks
 
-        if(s->mb_x==0){
-            for(i=0; i<2; i++){
-                s->last_mv[i][0][0]=
-                s->last_mv[i][0][1]=
-                s->last_mv[i][1][0]=
-                s->last_mv[i][1][1]= 0;
+        if (s->mb_x == 0) {
+            for (i = 0; i < 2; i++) {
+                s->last_mv[i][0][0] =
+                s->last_mv[i][0][1] =
+                s->last_mv[i][1][0] =
+                s->last_mv[i][1][1] = 0;
             }
 
             ff_thread_await_progress(&s->next_picture_ptr->tf, s->mb_y, 0);
         }
 
         /* if we skipped it in the future P Frame than skip it now too */
-        s->mb_skipped = s->next_picture.mbskip_table[s->mb_y * s->mb_stride + s->mb_x]; // Note, skiptab=0 if last was GMC
+        s->mb_skipped = s->next_picture.mbskip_table[s->mb_y * s->mb_stride + s->mb_x];  // Note, skiptab=0 if last was GMC
 
-        if(s->mb_skipped){
-                /* skip mb */
-            for(i=0;i<6;i++)
+        if (s->mb_skipped) {
+            /* skip mb */
+            for (i = 0; i < 6; i++)
                 s->block_last_index[i] = -1;
 
-            s->mv_dir = MV_DIR_FORWARD;
-            s->mv_type = MV_TYPE_16X16;
-            s->mv[0][0][0] = 0;
-            s->mv[0][0][1] = 0;
-            s->mv[1][0][0] = 0;
+            s->mv_dir      = MV_DIR_FORWARD;
+            s->mv_type     = MV_TYPE_16X16;
+            s->mv[0][0][0] =
+            s->mv[0][0][1] =
+            s->mv[1][0][0] =
             s->mv[1][0][1] = 0;
-            s->current_picture.mb_type[xy] = MB_TYPE_SKIP | MB_TYPE_16x16 | MB_TYPE_L0;
+            s->current_picture.mb_type[xy] = MB_TYPE_SKIP  |
+                                             MB_TYPE_16x16 |
+                                             MB_TYPE_L0;
             goto end;
         }
 
-        modb1= get_bits1(&s->gb);
-        if(modb1){
-            mb_type= MB_TYPE_DIRECT2 | MB_TYPE_SKIP | MB_TYPE_L0L1; //like MB_TYPE_B_DIRECT but no vectors coded
-            cbp=0;
-        }else{
-            modb2= get_bits1(&s->gb);
-            mb_type= get_vlc2(&s->gb, mb_type_b_vlc.table, MB_TYPE_B_VLC_BITS, 1);
-            if(mb_type<0){
+        modb1 = get_bits1(&s->gb);
+        if (modb1) {
+            // like MB_TYPE_B_DIRECT but no vectors coded
+            mb_type = MB_TYPE_DIRECT2 | MB_TYPE_SKIP | MB_TYPE_L0L1;
+            cbp     = 0;
+        } else {
+            modb2   = get_bits1(&s->gb);
+            mb_type = get_vlc2(&s->gb, mb_type_b_vlc.table, MB_TYPE_B_VLC_BITS, 1);
+            if (mb_type < 0) {
                 av_log(s->avctx, AV_LOG_ERROR, "illegal MB_type\n");
                 return -1;
             }
-            mb_type= mb_type_b_map[ mb_type ];
-            if(modb2) cbp= 0;
-            else{
+            mb_type = mb_type_b_map[mb_type];
+            if (modb2) {
+                cbp = 0;
+            } else {
                 s->dsp.clear_blocks(s->block[0]);
-                cbp= get_bits(&s->gb, 6);
+                cbp = get_bits(&s->gb, 6);
             }
 
             if ((!IS_DIRECT(mb_type)) && cbp) {
-                if(get_bits1(&s->gb)){
-                    ff_set_qscale(s, s->qscale + get_bits1(&s->gb)*4 - 2);
-                }
+                if (get_bits1(&s->gb))
+                    ff_set_qscale(s, s->qscale + get_bits1(&s->gb) * 4 - 2);
             }
 
-            if(!s->progressive_sequence){
-                if(cbp)
-                    s->interlaced_dct= get_bits1(&s->gb);
+            if (!s->progressive_sequence) {
+                if (cbp)
+                    s->interlaced_dct = get_bits1(&s->gb);
 
-                if(!IS_DIRECT(mb_type) && get_bits1(&s->gb)){
+                if (!IS_DIRECT(mb_type) && get_bits1(&s->gb)) {
                     mb_type |= MB_TYPE_16x8 | MB_TYPE_INTERLACED;
                     mb_type &= ~MB_TYPE_16x16;
 
-                    if(USES_LIST(mb_type, 0)){
-                        s->field_select[0][0]= get_bits1(&s->gb);
-                        s->field_select[0][1]= get_bits1(&s->gb);
+                    if (USES_LIST(mb_type, 0)) {
+                        s->field_select[0][0] = get_bits1(&s->gb);
+                        s->field_select[0][1] = get_bits1(&s->gb);
                     }
-                    if(USES_LIST(mb_type, 1)){
-                        s->field_select[1][0]= get_bits1(&s->gb);
-                        s->field_select[1][1]= get_bits1(&s->gb);
+                    if (USES_LIST(mb_type, 1)) {
+                        s->field_select[1][0] = get_bits1(&s->gb);
+                        s->field_select[1][1] = get_bits1(&s->gb);
                     }
                 }
             }
 
             s->mv_dir = 0;
-            if((mb_type & (MB_TYPE_DIRECT2|MB_TYPE_INTERLACED)) == 0){
-                s->mv_type= MV_TYPE_16X16;
+            if ((mb_type & (MB_TYPE_DIRECT2 | MB_TYPE_INTERLACED)) == 0) {
+                s->mv_type = MV_TYPE_16X16;
 
-                if(USES_LIST(mb_type, 0)){
+                if (USES_LIST(mb_type, 0)) {
                     s->mv_dir = MV_DIR_FORWARD;
 
                     mx = ff_h263_decode_motion(s, s->last_mv[0][0][0], s->f_code);
                     my = ff_h263_decode_motion(s, s->last_mv[0][0][1], s->f_code);
-                    s->last_mv[0][1][0]= s->last_mv[0][0][0]= s->mv[0][0][0] = mx;
-                    s->last_mv[0][1][1]= s->last_mv[0][0][1]= s->mv[0][0][1] = my;
+                    s->last_mv[0][1][0] =
+                    s->last_mv[0][0][0] =
+                    s->mv[0][0][0]      = mx;
+                    s->last_mv[0][1][1] =
+                    s->last_mv[0][0][1] =
+                    s->mv[0][0][1]      = my;
                 }
 
-                if(USES_LIST(mb_type, 1)){
+                if (USES_LIST(mb_type, 1)) {
                     s->mv_dir |= MV_DIR_BACKWARD;
 
                     mx = ff_h263_decode_motion(s, s->last_mv[1][0][0], s->b_code);
                     my = ff_h263_decode_motion(s, s->last_mv[1][0][1], s->b_code);
-                    s->last_mv[1][1][0]= s->last_mv[1][0][0]= s->mv[1][0][0] = mx;
-                    s->last_mv[1][1][1]= s->last_mv[1][0][1]= s->mv[1][0][1] = my;
+                    s->last_mv[1][1][0] =
+                    s->last_mv[1][0][0] =
+                    s->mv[1][0][0]      = mx;
+                    s->last_mv[1][1][1] =
+                    s->last_mv[1][0][1] =
+                    s->mv[1][0][1]      = my;
                 }
-            }else if(!IS_DIRECT(mb_type)){
-                s->mv_type= MV_TYPE_FIELD;
+            } else if (!IS_DIRECT(mb_type)) {
+                s->mv_type = MV_TYPE_FIELD;
 
-                if(USES_LIST(mb_type, 0)){
+                if (USES_LIST(mb_type, 0)) {
                     s->mv_dir = MV_DIR_FORWARD;
 
-                    for(i=0; i<2; i++){
-                        mx = ff_h263_decode_motion(s, s->last_mv[0][i][0]  , s->f_code);
-                        my = ff_h263_decode_motion(s, s->last_mv[0][i][1]/2, s->f_code);
-                        s->last_mv[0][i][0]=  s->mv[0][i][0] = mx;
-                        s->last_mv[0][i][1]= (s->mv[0][i][1] = my)*2;
+                    for (i = 0; i < 2; i++) {
+                        mx = ff_h263_decode_motion(s, s->last_mv[0][i][0], s->f_code);
+                        my = ff_h263_decode_motion(s, s->last_mv[0][i][1] / 2, s->f_code);
+                        s->last_mv[0][i][0] =
+                        s->mv[0][i][0]      = mx;
+                        s->last_mv[0][i][1] = (s->mv[0][i][1] = my) * 2;
                     }
                 }
 
-                if(USES_LIST(mb_type, 1)){
+                if (USES_LIST(mb_type, 1)) {
                     s->mv_dir |= MV_DIR_BACKWARD;
 
-                    for(i=0; i<2; i++){
-                        mx = ff_h263_decode_motion(s, s->last_mv[1][i][0]  , s->b_code);
-                        my = ff_h263_decode_motion(s, s->last_mv[1][i][1]/2, s->b_code);
-                        s->last_mv[1][i][0]=  s->mv[1][i][0] = mx;
-                        s->last_mv[1][i][1]= (s->mv[1][i][1] = my)*2;
+                    for (i = 0; i < 2; i++) {
+                        mx = ff_h263_decode_motion(s, s->last_mv[1][i][0], s->b_code);
+                        my = ff_h263_decode_motion(s, s->last_mv[1][i][1] / 2, s->b_code);
+                        s->last_mv[1][i][0] =
+                        s->mv[1][i][0]      = mx;
+                        s->last_mv[1][i][1] = (s->mv[1][i][1] = my) * 2;
                     }
                 }
             }
         }
 
-        if(IS_DIRECT(mb_type)){
-            if(IS_SKIP(mb_type))
-                mx=my=0;
-            else{
+        if (IS_DIRECT(mb_type)) {
+            if (IS_SKIP(mb_type)) {
+                mx =
+                my = 0;
+            } else {
                 mx = ff_h263_decode_motion(s, 0, 1);
                 my = ff_h263_decode_motion(s, 0, 1);
             }
 
             s->mv_dir = MV_DIR_FORWARD | MV_DIR_BACKWARD | MV_DIRECT;
-            mb_type |= ff_mpeg4_set_direct_mv(s, mx, my);
+            mb_type  |= ff_mpeg4_set_direct_mv(s, mx, my);
         }
         s->current_picture.mb_type[xy] = mb_type;
     } else { /* I-Frame */
-        do{
+        do {
             cbpc = get_vlc2(&s->gb, ff_h263_intra_MCBPC_vlc.table, INTRA_MCBPC_VLC_BITS, 2);
-            if (cbpc < 0){
-                av_log(s->avctx, AV_LOG_ERROR, "I cbpc damaged at %d %d\n", s->mb_x, s->mb_y);
+            if (cbpc < 0) {
+                av_log(s->avctx, AV_LOG_ERROR,
+                       "I cbpc damaged at %d %d\n", s->mb_x, s->mb_y);
                 return -1;
             }
-        }while(cbpc == 8);
+        } while (cbpc == 8);
 
         dquant = cbpc & 4;
         s->mb_intra = 1;
+
 intra:
         s->ac_pred = get_bits1(&s->gb);
-        if(s->ac_pred)
+        if (s->ac_pred)
             s->current_picture.mb_type[xy] = MB_TYPE_INTRA | MB_TYPE_ACPRED;
         else
             s->current_picture.mb_type[xy] = MB_TYPE_INTRA;
 
         cbpy = get_vlc2(&s->gb, ff_h263_cbpy_vlc.table, CBPY_VLC_BITS, 1);
-        if(cbpy<0){
-            av_log(s->avctx, AV_LOG_ERROR, "I cbpy damaged at %d %d\n", s->mb_x, s->mb_y);
+        if (cbpy < 0) {
+            av_log(s->avctx, AV_LOG_ERROR,
+                   "I cbpy damaged at %d %d\n", s->mb_x, s->mb_y);
             return -1;
         }
         cbp = (cbpc & 3) | (cbpy << 2);
 
-        s->use_intra_dc_vlc= s->qscale < s->intra_dc_threshold;
+        ctx->use_intra_dc_vlc = s->qscale < ctx->intra_dc_threshold;
 
-        if (dquant) {
+        if (dquant)
             ff_set_qscale(s, s->qscale + quant_tab[get_bits(&s->gb, 2)]);
-        }
 
-        if(!s->progressive_sequence)
-            s->interlaced_dct= get_bits1(&s->gb);
+        if (!s->progressive_sequence)
+            s->interlaced_dct = get_bits1(&s->gb);
 
         s->dsp.clear_blocks(s->block[0]);
         /* decode each block */
         for (i = 0; i < 6; i++) {
-            if (mpeg4_decode_block(s, block[i], i, cbp&32, 1, 0) < 0)
+            if (mpeg4_decode_block(ctx, block[i], i, cbp & 32, 1, 0) < 0)
                 return -1;
-            cbp+=cbp;
+            cbp += cbp;
         }
         goto end;
     }
 
     /* decode each block */
     for (i = 0; i < 6; i++) {
-        if (mpeg4_decode_block(s, block[i], i, cbp&32, 0, 0) < 0)
+        if (mpeg4_decode_block(ctx, block[i], i, cbp & 32, 0, 0) < 0)
             return -1;
-        cbp+=cbp;
+        cbp += cbp;
     }
-end:
 
-        /* per-MB end of slice check */
-    if(s->codec_id==AV_CODEC_ID_MPEG4){
-        int next= mpeg4_is_resync(s);
-        if(next) {
+end:
+    /* per-MB end of slice check */
+    if (s->codec_id == AV_CODEC_ID_MPEG4) {
+        int next = mpeg4_is_resync(ctx);
+        if (next) {
             if        (s->mb_x + s->mb_y*s->mb_width + 1 >  next && (s->avctx->err_recognition & AV_EF_AGGRESSIVE)) {
                 return -1;
             } else if (s->mb_x + s->mb_y*s->mb_width + 1 >= next)
                 return SLICE_END;
 
-            if(s->pict_type==AV_PICTURE_TYPE_B){
+            if (s->pict_type == AV_PICTURE_TYPE_B) {
                 const int delta= s->mb_x + 1 == s->mb_width ? 2 : 1;
                 ff_thread_await_progress(&s->next_picture_ptr->tf,
-                                        (s->mb_x + delta >= s->mb_width) ? FFMIN(s->mb_y+1, s->mb_height-1) : s->mb_y, 0);
+                                         (s->mb_x + delta >= s->mb_width)
+                                         ? FFMIN(s->mb_y + 1, s->mb_height - 1)
+                                         : s->mb_y, 0);
                 if (s->next_picture.mbskip_table[xy + delta])
                     return SLICE_OK;
             }
@@ -1527,21 +1660,21 @@
     return SLICE_OK;
 }
 
-
-static int mpeg4_decode_gop_header(MpegEncContext * s, GetBitContext *gb){
+static int mpeg4_decode_gop_header(MpegEncContext *s, GetBitContext *gb)
+{
     int hours, minutes, seconds;
 
-    if(!show_bits(gb, 23)){
+    if (!show_bits(gb, 23)) {
         av_log(s->avctx, AV_LOG_WARNING, "GOP header invalid\n");
         return -1;
     }
 
-    hours= get_bits(gb, 5);
-    minutes= get_bits(gb, 6);
+    hours   = get_bits(gb, 5);
+    minutes = get_bits(gb, 6);
     skip_bits1(gb);
-    seconds= get_bits(gb, 6);
+    seconds = get_bits(gb, 6);
 
-    s->time_base= seconds + 60*(minutes + 60*hours);
+    s->time_base = seconds + 60*(minutes + 60*hours);
 
     skip_bits1(gb);
     skip_bits1(gb);
@@ -1549,7 +1682,8 @@
     return 0;
 }
 
-static int mpeg4_decode_profile_level(MpegEncContext * s, GetBitContext *gb){
+static int mpeg4_decode_profile_level(MpegEncContext *s, GetBitContext *gb)
+{
 
     s->avctx->profile = get_bits(gb, 4);
     s->avctx->level   = get_bits(gb, 4);
@@ -1562,33 +1696,35 @@
     return 0;
 }
 
-static int decode_vol_header(MpegEncContext *s, GetBitContext *gb){
+static int decode_vol_header(Mpeg4DecContext *ctx, GetBitContext *gb)
+{
+    MpegEncContext *s = &ctx->m;
     int width, height, vo_ver_id;
 
     /* vol header */
-    skip_bits(gb, 1); /* random access */
-    s->vo_type= get_bits(gb, 8);
-    if (get_bits1(gb) != 0) { /* is_ol_id */
-        vo_ver_id = get_bits(gb, 4); /* vo_ver_id */
-        skip_bits(gb, 3); /* vo_priority */
+    skip_bits(gb, 1);                   /* random access */
+    s->vo_type = get_bits(gb, 8);
+    if (get_bits1(gb) != 0) {           /* is_ol_id */
+        vo_ver_id = get_bits(gb, 4);    /* vo_ver_id */
+        skip_bits(gb, 3);               /* vo_priority */
     } else {
         vo_ver_id = 1;
     }
-    s->aspect_ratio_info= get_bits(gb, 4);
-    if(s->aspect_ratio_info == FF_ASPECT_EXTENDED){
-        s->avctx->sample_aspect_ratio.num= get_bits(gb, 8); // par_width
-        s->avctx->sample_aspect_ratio.den= get_bits(gb, 8); // par_height
-    }else{
-        s->avctx->sample_aspect_ratio= ff_h263_pixel_aspect[s->aspect_ratio_info];
+    s->aspect_ratio_info = get_bits(gb, 4);
+    if (s->aspect_ratio_info == FF_ASPECT_EXTENDED) {
+        s->avctx->sample_aspect_ratio.num = get_bits(gb, 8);  // par_width
+        s->avctx->sample_aspect_ratio.den = get_bits(gb, 8);  // par_height
+    } else {
+        s->avctx->sample_aspect_ratio = ff_h263_pixel_aspect[s->aspect_ratio_info];
     }
 
-    if ((s->vol_control_parameters=get_bits1(gb))) { /* vol control parameter */
-        int chroma_format= get_bits(gb, 2);
-        if(chroma_format!=CHROMA_420){
+    if ((s->vol_control_parameters = get_bits1(gb))) { /* vol control parameter */
+        int chroma_format = get_bits(gb, 2);
+        if (chroma_format != CHROMA_420)
             av_log(s->avctx, AV_LOG_ERROR, "illegal chroma format\n");
-        }
-        s->low_delay= get_bits1(gb);
-        if(get_bits1(gb)){ /* vbv parameters */
+
+        s->low_delay = get_bits1(gb);
+        if (get_bits1(gb)) {    /* vbv parameters */
             get_bits(gb, 15);   /* first_half_bitrate */
             skip_bits1(gb);     /* marker */
             get_bits(gb, 15);   /* latter_half_bitrate */
@@ -1601,97 +1737,108 @@
             get_bits(gb, 15);   /* latter_half_vbv_occupancy */
             skip_bits1(gb);     /* marker */
         }
-    }else{
-        // set low delay flag only once the smartest? low delay detection won't be overridden
-        if(s->picture_number==0)
-            s->low_delay=0;
+    } else {
+        /* is setting low delay flag only once the smartest thing to do?
+         * low delay detection won't be overriden. */
+        if (s->picture_number == 0)
+            s->low_delay = 0;
     }
 
-    s->shape = get_bits(gb, 2); /* vol shape */
-    if(s->shape != RECT_SHAPE) av_log(s->avctx, AV_LOG_ERROR, "only rectangular vol supported\n");
-    if(s->shape == GRAY_SHAPE && vo_ver_id != 1){
+    ctx->shape = get_bits(gb, 2); /* vol shape */
+    if (ctx->shape != RECT_SHAPE)
+        av_log(s->avctx, AV_LOG_ERROR, "only rectangular vol supported\n");
+    if (ctx->shape == GRAY_SHAPE && vo_ver_id != 1) {
         av_log(s->avctx, AV_LOG_ERROR, "Gray shape not supported\n");
-        skip_bits(gb, 4);  //video_object_layer_shape_extension
+        skip_bits(gb, 4);  /* video_object_layer_shape_extension */
     }
 
     check_marker(gb, "before time_increment_resolution");
 
     s->avctx->time_base.den = get_bits(gb, 16);
-    if(!s->avctx->time_base.den){
+    if (!s->avctx->time_base.den) {
         av_log(s->avctx, AV_LOG_ERROR, "time_base.den==0\n");
         s->avctx->time_base.num = 0;
         return -1;
     }
 
-    s->time_increment_bits = av_log2(s->avctx->time_base.den - 1) + 1;
-    if (s->time_increment_bits < 1)
-        s->time_increment_bits = 1;
+    ctx->time_increment_bits = av_log2(s->avctx->time_base.den - 1) + 1;
+    if (ctx->time_increment_bits < 1)
+        ctx->time_increment_bits = 1;
 
     check_marker(gb, "before fixed_vop_rate");
 
-    if (get_bits1(gb) != 0) {   /* fixed_vop_rate  */
-        s->avctx->time_base.num = get_bits(gb, s->time_increment_bits);
-    }else
+    if (get_bits1(gb) != 0)     /* fixed_vop_rate  */
+        s->avctx->time_base.num = get_bits(gb, ctx->time_increment_bits);
+    else
         s->avctx->time_base.num = 1;
 
-    s->t_frame=0;
+    ctx->t_frame = 0;
 
-    if (s->shape != BIN_ONLY_SHAPE) {
-        if (s->shape == RECT_SHAPE) {
+    if (ctx->shape != BIN_ONLY_SHAPE) {
+        if (ctx->shape == RECT_SHAPE) {
             check_marker(gb, "before width");
             width = get_bits(gb, 13);
             check_marker(gb, "before height");
             height = get_bits(gb, 13);
             check_marker(gb, "after height");
-            if(width && height && !(s->width && s->codec_tag == AV_RL32("MP4S"))){ /* they should be non zero but who knows ... */
+            if (width && height &&  /* they should be non zero but who knows */
+                !(s->width && s->codec_tag == AV_RL32("MP4S"))) {
                 if (s->width && s->height &&
                     (s->width != width || s->height != height))
                     s->context_reinit = 1;
-                s->width = width;
+                s->width  = width;
                 s->height = height;
             }
         }
 
-        s->progressive_sequence=
-        s->progressive_frame= get_bits1(gb)^1;
-        s->interlaced_dct=0;
-        if(!get_bits1(gb) && (s->avctx->debug & FF_DEBUG_PICT_INFO))
-            av_log(s->avctx, AV_LOG_INFO, "MPEG4 OBMC not supported (very likely buggy encoder)\n");   /* OBMC Disable */
-        if (vo_ver_id == 1) {
-            s->vol_sprite_usage = get_bits1(gb); /* vol_sprite_usage */
-        } else {
-            s->vol_sprite_usage = get_bits(gb, 2); /* vol_sprite_usage */
-        }
-        if(s->vol_sprite_usage==STATIC_SPRITE) av_log(s->avctx, AV_LOG_ERROR, "Static Sprites not supported\n");
-        if(s->vol_sprite_usage==STATIC_SPRITE || s->vol_sprite_usage==GMC_SPRITE){
-            if(s->vol_sprite_usage==STATIC_SPRITE){
-                s->sprite_width = get_bits(gb, 13);
+        s->progressive_sequence  =
+        s->progressive_frame     = get_bits1(gb) ^ 1;
+        s->interlaced_dct        = 0;
+        if (!get_bits1(gb) && (s->avctx->debug & FF_DEBUG_PICT_INFO))
+            av_log(s->avctx, AV_LOG_INFO,           /* OBMC Disable */
+                   "MPEG4 OBMC not supported (very likely buggy encoder)\n");
+        if (vo_ver_id == 1)
+            ctx->vol_sprite_usage = get_bits1(gb);    /* vol_sprite_usage */
+        else
+            ctx->vol_sprite_usage = get_bits(gb, 2);  /* vol_sprite_usage */
+
+        if (ctx->vol_sprite_usage == STATIC_SPRITE)
+            av_log(s->avctx, AV_LOG_ERROR, "Static Sprites not supported\n");
+        if (ctx->vol_sprite_usage == STATIC_SPRITE ||
+            ctx->vol_sprite_usage == GMC_SPRITE) {
+            if (ctx->vol_sprite_usage == STATIC_SPRITE) {
+                skip_bits(gb, 13); // sprite_width
                 skip_bits1(gb); /* marker */
-                s->sprite_height= get_bits(gb, 13);
+                skip_bits(gb, 13); // sprite_height
                 skip_bits1(gb); /* marker */
-                s->sprite_left  = get_bits(gb, 13);
+                skip_bits(gb, 13); // sprite_left
                 skip_bits1(gb); /* marker */
-                s->sprite_top   = get_bits(gb, 13);
+                skip_bits(gb, 13); // sprite_top
                 skip_bits1(gb); /* marker */
             }
-            s->num_sprite_warping_points= get_bits(gb, 6);
-            if(s->num_sprite_warping_points > 3){
-                av_log(s->avctx, AV_LOG_ERROR, "%d sprite_warping_points\n", s->num_sprite_warping_points);
-                s->num_sprite_warping_points= 0;
+            ctx->num_sprite_warping_points = get_bits(gb, 6);
+            if (ctx->num_sprite_warping_points > 3) {
+                av_log(s->avctx, AV_LOG_ERROR,
+                       "%d sprite_warping_points\n",
+                       ctx->num_sprite_warping_points);
+                ctx->num_sprite_warping_points = 0;
                 return -1;
             }
-            s->sprite_warping_accuracy = get_bits(gb, 2);
-            s->sprite_brightness_change= get_bits1(gb);
-            if(s->vol_sprite_usage==STATIC_SPRITE)
-                s->low_latency_sprite= get_bits1(gb);
+            s->sprite_warping_accuracy  = get_bits(gb, 2);
+            ctx->sprite_brightness_change = get_bits1(gb);
+            if (ctx->vol_sprite_usage == STATIC_SPRITE)
+                skip_bits1(gb); // low_latency_sprite
         }
         // FIXME sadct disable bit if verid!=1 && shape not rect
 
-        if (get_bits1(gb) == 1) {   /* not_8_bit */
-            s->quant_precision = get_bits(gb, 4); /* quant_precision */
-            if(get_bits(gb, 4)!=8) av_log(s->avctx, AV_LOG_ERROR, "N-bit not supported\n"); /* bits_per_pixel */
-            if(s->quant_precision!=5) av_log(s->avctx, AV_LOG_ERROR, "quant precision %d\n", s->quant_precision);
-            if(s->quant_precision<3 || s->quant_precision>9) {
+        if (get_bits1(gb) == 1) {                   /* not_8_bit */
+            s->quant_precision = get_bits(gb, 4);   /* quant_precision */
+            if (get_bits(gb, 4) != 8)               /* bits_per_pixel */
+                av_log(s->avctx, AV_LOG_ERROR, "N-bit not supported\n");
+            if (s->quant_precision != 5)
+                av_log(s->avctx, AV_LOG_ERROR,
+                       "quant precision %d\n", s->quant_precision);
+            if (s->quant_precision<3 || s->quant_precision>9) {
                 s->quant_precision = 5;
             }
         } else {
@@ -1700,186 +1847,195 @@
 
         // FIXME a bunch of grayscale shape things
 
-        if((s->mpeg_quant=get_bits1(gb))){ /* vol_quant_type */
+        if ((s->mpeg_quant = get_bits1(gb))) { /* vol_quant_type */
             int i, v;
 
             /* load default matrixes */
-            for(i=0; i<64; i++){
-                int j= s->dsp.idct_permutation[i];
-                v= ff_mpeg4_default_intra_matrix[i];
-                s->intra_matrix[j]= v;
-                s->chroma_intra_matrix[j]= v;
-
-                v= ff_mpeg4_default_non_intra_matrix[i];
-                s->inter_matrix[j]= v;
-                s->chroma_inter_matrix[j]= v;
+            for (i = 0; i < 64; i++) {
+                int j = s->dsp.idct_permutation[i];
+                v = ff_mpeg4_default_intra_matrix[i];
+                s->intra_matrix[j]        = v;
+                s->chroma_intra_matrix[j] = v;
+
+                v = ff_mpeg4_default_non_intra_matrix[i];
+                s->inter_matrix[j]        = v;
+                s->chroma_inter_matrix[j] = v;
             }
 
             /* load custom intra matrix */
-            if(get_bits1(gb)){
-                int last=0;
-                for(i=0; i<64; i++){
+            if (get_bits1(gb)) {
+                int last = 0;
+                for (i = 0; i < 64; i++) {
                     int j;
-                    v= get_bits(gb, 8);
-                    if(v==0) break;
-
-                    last= v;
-                    j= s->dsp.idct_permutation[ ff_zigzag_direct[i] ];
-                    s->intra_matrix[j]= v;
-                    s->chroma_intra_matrix[j]= v;
+                    v = get_bits(gb, 8);
+                    if (v == 0)
+                        break;
+
+                    last = v;
+                    j = s->dsp.idct_permutation[ff_zigzag_direct[i]];
+                    s->intra_matrix[j]        = last;
+                    s->chroma_intra_matrix[j] = last;
                 }
 
                 /* replicate last value */
-                for(; i<64; i++){
-                    int j= s->dsp.idct_permutation[ ff_zigzag_direct[i] ];
-                    s->intra_matrix[j]= last;
-                    s->chroma_intra_matrix[j]= last;
+                for (; i < 64; i++) {
+                    int j = s->dsp.idct_permutation[ff_zigzag_direct[i]];
+                    s->intra_matrix[j]        = last;
+                    s->chroma_intra_matrix[j] = last;
                 }
             }
 
             /* load custom non intra matrix */
-            if(get_bits1(gb)){
-                int last=0;
-                for(i=0; i<64; i++){
+            if (get_bits1(gb)) {
+                int last = 0;
+                for (i = 0; i < 64; i++) {
                     int j;
-                    v= get_bits(gb, 8);
-                    if(v==0) break;
-
-                    last= v;
-                    j= s->dsp.idct_permutation[ ff_zigzag_direct[i] ];
-                    s->inter_matrix[j]= v;
-                    s->chroma_inter_matrix[j]= v;
+                    v = get_bits(gb, 8);
+                    if (v == 0)
+                        break;
+
+                    last = v;
+                    j = s->dsp.idct_permutation[ff_zigzag_direct[i]];
+                    s->inter_matrix[j]        = v;
+                    s->chroma_inter_matrix[j] = v;
                 }
 
                 /* replicate last value */
-                for(; i<64; i++){
-                    int j= s->dsp.idct_permutation[ ff_zigzag_direct[i] ];
-                    s->inter_matrix[j]= last;
-                    s->chroma_inter_matrix[j]= last;
+                for (; i < 64; i++) {
+                    int j = s->dsp.idct_permutation[ff_zigzag_direct[i]];
+                    s->inter_matrix[j]        = last;
+                    s->chroma_inter_matrix[j] = last;
                 }
             }
 
             // FIXME a bunch of grayscale shape things
         }
 
-        if(vo_ver_id != 1)
-             s->quarter_sample= get_bits1(gb);
-        else s->quarter_sample=0;
-
-        if(!get_bits1(gb)){
-            int pos= get_bits_count(gb);
-            int estimation_method= get_bits(gb, 2);
-            if(estimation_method<2){
-                if(!get_bits1(gb)){
-                    s->cplx_estimation_trash_i += 8*get_bits1(gb); //opaque
-                    s->cplx_estimation_trash_i += 8*get_bits1(gb); //transparent
-                    s->cplx_estimation_trash_i += 8*get_bits1(gb); //intra_cae
-                    s->cplx_estimation_trash_i += 8*get_bits1(gb); //inter_cae
-                    s->cplx_estimation_trash_i += 8*get_bits1(gb); //no_update
-                    s->cplx_estimation_trash_i += 8*get_bits1(gb); //upampling
-                }
-                if(!get_bits1(gb)){
-                    s->cplx_estimation_trash_i += 8*get_bits1(gb); //intra_blocks
-                    s->cplx_estimation_trash_p += 8*get_bits1(gb); //inter_blocks
-                    s->cplx_estimation_trash_p += 8*get_bits1(gb); //inter4v_blocks
-                    s->cplx_estimation_trash_i += 8*get_bits1(gb); //not coded blocks
+        if (vo_ver_id != 1)
+            s->quarter_sample = get_bits1(gb);
+        else
+            s->quarter_sample = 0;
+
+        if (get_bits_left(gb) < 4) {
+            av_log(s->avctx, AV_LOG_ERROR, "VOL Header truncated\n");
+            return AVERROR_INVALIDDATA;
+        }
+
+        if (!get_bits1(gb)) {
+            int pos               = get_bits_count(gb);
+            int estimation_method = get_bits(gb, 2);
+            if (estimation_method < 2) {
+                if (!get_bits1(gb)) {
+                    ctx->cplx_estimation_trash_i += 8 * get_bits1(gb);  /* opaque */
+                    ctx->cplx_estimation_trash_i += 8 * get_bits1(gb);  /* transparent */
+                    ctx->cplx_estimation_trash_i += 8 * get_bits1(gb);  /* intra_cae */
+                    ctx->cplx_estimation_trash_i += 8 * get_bits1(gb);  /* inter_cae */
+                    ctx->cplx_estimation_trash_i += 8 * get_bits1(gb);  /* no_update */
+                    ctx->cplx_estimation_trash_i += 8 * get_bits1(gb);  /* upampling */
+                }
+                if (!get_bits1(gb)) {
+                    ctx->cplx_estimation_trash_i += 8 * get_bits1(gb);  /* intra_blocks */
+                    ctx->cplx_estimation_trash_p += 8 * get_bits1(gb);  /* inter_blocks */
+                    ctx->cplx_estimation_trash_p += 8 * get_bits1(gb);  /* inter4v_blocks */
+                    ctx->cplx_estimation_trash_i += 8 * get_bits1(gb);  /* not coded blocks */
                 }
-                if(!check_marker(gb, "in complexity estimation part 1")){
+                if (!check_marker(gb, "in complexity estimation part 1")) {
                     skip_bits_long(gb, pos - get_bits_count(gb));
                     goto no_cplx_est;
                 }
-                if(!get_bits1(gb)){
-                    s->cplx_estimation_trash_i += 8*get_bits1(gb); //dct_coeffs
-                    s->cplx_estimation_trash_i += 8*get_bits1(gb); //dct_lines
-                    s->cplx_estimation_trash_i += 8*get_bits1(gb); //vlc_syms
-                    s->cplx_estimation_trash_i += 4*get_bits1(gb); //vlc_bits
-                }
-                if(!get_bits1(gb)){
-                    s->cplx_estimation_trash_p += 8*get_bits1(gb); //apm
-                    s->cplx_estimation_trash_p += 8*get_bits1(gb); //npm
-                    s->cplx_estimation_trash_b += 8*get_bits1(gb); //interpolate_mc_q
-                    s->cplx_estimation_trash_p += 8*get_bits1(gb); //forwback_mc_q
-                    s->cplx_estimation_trash_p += 8*get_bits1(gb); //halfpel2
-                    s->cplx_estimation_trash_p += 8*get_bits1(gb); //halfpel4
+                if (!get_bits1(gb)) {
+                    ctx->cplx_estimation_trash_i += 8 * get_bits1(gb);  /* dct_coeffs */
+                    ctx->cplx_estimation_trash_i += 8 * get_bits1(gb);  /* dct_lines */
+                    ctx->cplx_estimation_trash_i += 8 * get_bits1(gb);  /* vlc_syms */
+                    ctx->cplx_estimation_trash_i += 4 * get_bits1(gb);  /* vlc_bits */
+                }
+                if (!get_bits1(gb)) {
+                    ctx->cplx_estimation_trash_p += 8 * get_bits1(gb);  /* apm */
+                    ctx->cplx_estimation_trash_p += 8 * get_bits1(gb);  /* npm */
+                    ctx->cplx_estimation_trash_b += 8 * get_bits1(gb);  /* interpolate_mc_q */
+                    ctx->cplx_estimation_trash_p += 8 * get_bits1(gb);  /* forwback_mc_q */
+                    ctx->cplx_estimation_trash_p += 8 * get_bits1(gb);  /* halfpel2 */
+                    ctx->cplx_estimation_trash_p += 8 * get_bits1(gb);  /* halfpel4 */
                 }
-                if(!check_marker(gb, "in complexity estimation part 2")){
+                if (!check_marker(gb, "in complexity estimation part 2")) {
                     skip_bits_long(gb, pos - get_bits_count(gb));
                     goto no_cplx_est;
                 }
-                if(estimation_method==1){
-                    s->cplx_estimation_trash_i += 8*get_bits1(gb); //sadct
-                    s->cplx_estimation_trash_p += 8*get_bits1(gb); //qpel
-                }
-            }else
-                av_log(s->avctx, AV_LOG_ERROR, "Invalid Complexity estimation method %d\n", estimation_method);
-        }else{
+                if (estimation_method == 1) {
+                    ctx->cplx_estimation_trash_i += 8 * get_bits1(gb);  /* sadct */
+                    ctx->cplx_estimation_trash_p += 8 * get_bits1(gb);  /* qpel */
+                }
+            } else
+                av_log(s->avctx, AV_LOG_ERROR,
+                       "Invalid Complexity estimation method %d\n",
+                       estimation_method);
+        } else {
+
 no_cplx_est:
-            s->cplx_estimation_trash_i=
-            s->cplx_estimation_trash_p=
-            s->cplx_estimation_trash_b= 0;
+            ctx->cplx_estimation_trash_i =
+            ctx->cplx_estimation_trash_p =
+            ctx->cplx_estimation_trash_b = 0;
         }
 
-        s->resync_marker= !get_bits1(gb); /* resync_marker_disabled */
+        ctx->resync_marker = !get_bits1(gb); /* resync_marker_disabled */
 
-        s->data_partitioning= get_bits1(gb);
-        if(s->data_partitioning){
-            s->rvlc= get_bits1(gb);
-        }
+        s->data_partitioning = get_bits1(gb);
+        if (s->data_partitioning)
+            ctx->rvlc = get_bits1(gb);
 
-        if(vo_ver_id != 1) {
-            s->new_pred= get_bits1(gb);
-            if(s->new_pred){
+        if (vo_ver_id != 1) {
+            ctx->new_pred = get_bits1(gb);
+            if (ctx->new_pred) {
                 av_log(s->avctx, AV_LOG_ERROR, "new pred not supported\n");
                 skip_bits(gb, 2); /* requested upstream message type */
-                skip_bits1(gb); /* newpred segment type */
+                skip_bits1(gb);   /* newpred segment type */
             }
-            s->reduced_res_vop= get_bits1(gb);
-            if(s->reduced_res_vop) av_log(s->avctx, AV_LOG_ERROR, "reduced resolution VOP not supported\n");
-        }
-        else{
-            s->new_pred=0;
-            s->reduced_res_vop= 0;
+            if (get_bits1(gb)) // reduced_res_vop
+                av_log(s->avctx, AV_LOG_ERROR,
+                       "reduced resolution VOP not supported\n");
+        } else {
+            ctx->new_pred = 0;
         }
 
-        s->scalability= get_bits1(gb);
+        ctx->scalability = get_bits1(gb);
 
-        if (s->scalability) {
-            GetBitContext bak= *gb;
+        if (ctx->scalability) {
+            GetBitContext bak = *gb;
             int h_sampling_factor_n;
             int h_sampling_factor_m;
             int v_sampling_factor_n;
             int v_sampling_factor_m;
 
-            s->hierachy_type= get_bits1(gb);
+            skip_bits1(gb);    // hierarchy_type
             skip_bits(gb, 4);  /* ref_layer_id */
             skip_bits1(gb);    /* ref_layer_sampling_dir */
-            h_sampling_factor_n= get_bits(gb, 5);
-            h_sampling_factor_m= get_bits(gb, 5);
-            v_sampling_factor_n= get_bits(gb, 5);
-            v_sampling_factor_m= get_bits(gb, 5);
-            s->enhancement_type= get_bits1(gb);
+            h_sampling_factor_n = get_bits(gb, 5);
+            h_sampling_factor_m = get_bits(gb, 5);
+            v_sampling_factor_n = get_bits(gb, 5);
+            v_sampling_factor_m = get_bits(gb, 5);
+            ctx->enhancement_type = get_bits1(gb);
 
-            if(   h_sampling_factor_n==0 || h_sampling_factor_m==0
-               || v_sampling_factor_n==0 || v_sampling_factor_m==0){
+            if (h_sampling_factor_n == 0 || h_sampling_factor_m == 0 ||
+                v_sampling_factor_n == 0 || v_sampling_factor_m == 0) {
                 /* illegal scalability header (VERY broken encoder),
                  * trying to workaround */
-                s->scalability=0;
-                *gb= bak;
-            }else
+                ctx->scalability = 0;
+                *gb            = bak;
+            } else
                 av_log(s->avctx, AV_LOG_ERROR, "scalability not supported\n");
 
             // bin shape stuff FIXME
         }
     }
 
-    if(s->avctx->debug&FF_DEBUG_PICT_INFO) {
+    if (s->avctx->debug&FF_DEBUG_PICT_INFO) {
         av_log(s->avctx, AV_LOG_DEBUG, "tb %d/%d, tincrbits:%d, qp_prec:%d, ps:%d,  %s%s%s%s\n",
                s->avctx->time_base.num, s->avctx->time_base.den,
-               s->time_increment_bits,
+               ctx->time_increment_bits,
                s->quant_precision,
                s->progressive_sequence,
-               s->scalability ? "scalability " :"" , s->quarter_sample ? "qpel " : "",
-               s->data_partitioning ? "partition " : "", s->rvlc ? "rvlc " : ""
+               ctx->scalability ? "scalability " :"" , s->quarter_sample ? "qpel " : "",
+               s->data_partitioning ? "partition " : "", ctx->rvlc ? "rvlc " : ""
         );
     }
 
@@ -1890,293 +2046,443 @@
  * Decode the user data stuff in the header.
  * Also initializes divx/xvid/lavc_version/build.
  */
-static int decode_user_data(MpegEncContext *s, GetBitContext *gb){
+static int decode_user_data(Mpeg4DecContext *ctx, GetBitContext *gb)
+{
+    MpegEncContext *s = &ctx->m;
     char buf[256];
     int i;
     int e;
     int ver = 0, build = 0, ver2 = 0, ver3 = 0;
     char last;
 
-    for(i=0; i<255 && get_bits_count(gb) < gb->size_in_bits; i++){
-        if(show_bits(gb, 23) == 0) break;
-        buf[i]= get_bits(gb, 8);
+    for (i = 0; i < 255 && get_bits_count(gb) < gb->size_in_bits; i++) {
+        if (show_bits(gb, 23) == 0)
+            break;
+        buf[i] = get_bits(gb, 8);
     }
-    buf[i]=0;
+    buf[i] = 0;
 
     /* divx detection */
-    e=sscanf(buf, "DivX%dBuild%d%c", &ver, &build, &last);
-    if(e<2)
-        e=sscanf(buf, "DivX%db%d%c", &ver, &build, &last);
-    if(e>=2){
-        s->divx_version= ver;
-        s->divx_build= build;
-        s->divx_packed= e==3 && last=='p';
-        if(s->divx_packed && !s->showed_packed_warning) {
+    e = sscanf(buf, "DivX%dBuild%d%c", &ver, &build, &last);
+    if (e < 2)
+        e = sscanf(buf, "DivX%db%d%c", &ver, &build, &last);
+    if (e >= 2) {
+        ctx->divx_version = ver;
+        ctx->divx_build   = build;
+        s->divx_packed  = e == 3 && last == 'p';
+        if (s->divx_packed && !ctx->showed_packed_warning) {
             av_log(s->avctx, AV_LOG_INFO, "Video uses a non-standard and "
                    "wasteful way to store B-frames ('packed B-frames'). "
                    "Consider using a tool like VirtualDub or avidemux to fix it.\n");
-            s->showed_packed_warning=1;
+            ctx->showed_packed_warning = 1;
         }
     }
 
     /* libavcodec detection */
-    e=sscanf(buf, "FFmpe%*[^b]b%d", &build)+3;
-    if(e!=4)
-        e=sscanf(buf, "FFmpeg v%d.%d.%d / libavcodec build: %d", &ver, &ver2, &ver3, &build);
-    if(e!=4){
-        e=sscanf(buf, "Lavc%d.%d.%d", &ver, &ver2, &ver3)+1;
-        if (e>1)
-            build= (ver<<16) + (ver2<<8) + ver3;
-    }
-    if(e!=4){
-        if(strcmp(buf, "ffmpeg")==0){
-            s->lavc_build= 4600;
-        }
-    }
-    if(e==4){
-        s->lavc_build= build;
+    e = sscanf(buf, "FFmpe%*[^b]b%d", &build) + 3;
+    if (e != 4)
+        e = sscanf(buf, "FFmpeg v%d.%d.%d / libavcodec build: %d", &ver, &ver2, &ver3, &build);
+    if (e != 4) {
+        e = sscanf(buf, "Lavc%d.%d.%d", &ver, &ver2, &ver3) + 1;
+        if (e > 1)
+            build = (ver << 16) + (ver2 << 8) + ver3;
+    }
+    if (e != 4) {
+        if (strcmp(buf, "ffmpeg") == 0)
+            ctx->lavc_build = 4600;
     }
+    if (e == 4)
+        ctx->lavc_build = build;
 
     /* Xvid detection */
-    e=sscanf(buf, "XviD%d", &build);
-    if(e==1){
-        s->xvid_build= build;
+    e = sscanf(buf, "XviD%d", &build);
+    if (e == 1)
+        ctx->xvid_build = build;
+
+    return 0;
+}
+
+int ff_mpeg4_workaround_bugs(AVCodecContext *avctx)
+{
+    Mpeg4DecContext *ctx = avctx->priv_data;
+    MpegEncContext *s = &ctx->m;
+
+    if (ctx->xvid_build == -1 && ctx->divx_version == -1 && ctx->lavc_build == -1) {
+        if (s->stream_codec_tag == AV_RL32("XVID") ||
+            s->codec_tag        == AV_RL32("XVID") ||
+            s->codec_tag        == AV_RL32("XVIX") ||
+            s->codec_tag        == AV_RL32("RMP4") ||
+            s->codec_tag        == AV_RL32("ZMP4") ||
+            s->codec_tag        == AV_RL32("SIPP"))
+            ctx->xvid_build = 0;
     }
 
+    if (ctx->xvid_build == -1 && ctx->divx_version == -1 && ctx->lavc_build == -1)
+        if (s->codec_tag == AV_RL32("DIVX") && s->vo_type == 0 &&
+            s->vol_control_parameters == 0)
+            ctx->divx_version = 400;  // divx 4
+
+    if (ctx->xvid_build >= 0 && ctx->divx_version >= 0) {
+        ctx->divx_version =
+        ctx->divx_build   = -1;
+    }
+
+    if (s->workaround_bugs & FF_BUG_AUTODETECT) {
+        if (s->codec_tag == AV_RL32("XVIX"))
+            s->workaround_bugs |= FF_BUG_XVID_ILACE;
+
+        if (s->codec_tag == AV_RL32("UMP4"))
+            s->workaround_bugs |= FF_BUG_UMP4;
+
+        if (ctx->divx_version >= 500 && ctx->divx_build < 1814)
+            s->workaround_bugs |= FF_BUG_QPEL_CHROMA;
+
+        if (ctx->divx_version > 502 && ctx->divx_build < 1814)
+            s->workaround_bugs |= FF_BUG_QPEL_CHROMA2;
+
+        if (ctx->xvid_build <= 3U)
+            s->padding_bug_score = 256 * 256 * 256 * 64;
+
+        if (ctx->xvid_build <= 1U)
+            s->workaround_bugs |= FF_BUG_QPEL_CHROMA;
+
+        if (ctx->xvid_build <= 12U)
+            s->workaround_bugs |= FF_BUG_EDGE;
+
+        if (ctx->xvid_build <= 32U)
+            s->workaround_bugs |= FF_BUG_DC_CLIP;
+
+#define SET_QPEL_FUNC(postfix1, postfix2)                           \
+    s->dsp.put_        ## postfix1 = ff_put_        ## postfix2;    \
+    s->dsp.put_no_rnd_ ## postfix1 = ff_put_no_rnd_ ## postfix2;    \
+    s->dsp.avg_        ## postfix1 = ff_avg_        ## postfix2;
+
+        if (ctx->lavc_build < 4653U)
+            s->workaround_bugs |= FF_BUG_STD_QPEL;
+
+        if (ctx->lavc_build < 4655U)
+            s->workaround_bugs |= FF_BUG_DIRECT_BLOCKSIZE;
+
+        if (ctx->lavc_build < 4670U)
+            s->workaround_bugs |= FF_BUG_EDGE;
+
+        if (ctx->lavc_build <= 4712U)
+            s->workaround_bugs |= FF_BUG_DC_CLIP;
+
+        if (ctx->divx_version >= 0)
+            s->workaround_bugs |= FF_BUG_DIRECT_BLOCKSIZE;
+        if (ctx->divx_version == 501 && ctx->divx_build == 20020416)
+            s->padding_bug_score = 256 * 256 * 256 * 64;
+
+        if (ctx->divx_version < 500U)
+            s->workaround_bugs |= FF_BUG_EDGE;
+
+        if (ctx->divx_version >= 0)
+            s->workaround_bugs |= FF_BUG_HPEL_CHROMA;
+    }
+
+    if (s->workaround_bugs & FF_BUG_STD_QPEL) {
+        SET_QPEL_FUNC(qpel_pixels_tab[0][5], qpel16_mc11_old_c)
+        SET_QPEL_FUNC(qpel_pixels_tab[0][7], qpel16_mc31_old_c)
+        SET_QPEL_FUNC(qpel_pixels_tab[0][9], qpel16_mc12_old_c)
+        SET_QPEL_FUNC(qpel_pixels_tab[0][11], qpel16_mc32_old_c)
+        SET_QPEL_FUNC(qpel_pixels_tab[0][13], qpel16_mc13_old_c)
+        SET_QPEL_FUNC(qpel_pixels_tab[0][15], qpel16_mc33_old_c)
+
+        SET_QPEL_FUNC(qpel_pixels_tab[1][5], qpel8_mc11_old_c)
+        SET_QPEL_FUNC(qpel_pixels_tab[1][7], qpel8_mc31_old_c)
+        SET_QPEL_FUNC(qpel_pixels_tab[1][9], qpel8_mc12_old_c)
+        SET_QPEL_FUNC(qpel_pixels_tab[1][11], qpel8_mc32_old_c)
+        SET_QPEL_FUNC(qpel_pixels_tab[1][13], qpel8_mc13_old_c)
+        SET_QPEL_FUNC(qpel_pixels_tab[1][15], qpel8_mc33_old_c)
+    }
+
+    if (avctx->debug & FF_DEBUG_BUGS)
+        av_log(s->avctx, AV_LOG_DEBUG,
+               "bugs: %X lavc_build:%d xvid_build:%d divx_version:%d divx_build:%d %s\n",
+               s->workaround_bugs, ctx->lavc_build, ctx->xvid_build,
+               ctx->divx_version, ctx->divx_build, s->divx_packed ? "p" : "");
+
+#if HAVE_MMX
+    if (s->codec_id == AV_CODEC_ID_MPEG4 && ctx->xvid_build >= 0 &&
+        avctx->idct_algo == FF_IDCT_AUTO &&
+        (av_get_cpu_flags() & AV_CPU_FLAG_MMX)) {
+        avctx->idct_algo = FF_IDCT_XVIDMMX;
+        ff_dct_common_init(s);
+        return 1;
+    }
+#endif
     return 0;
 }
 
-static int decode_vop_header(MpegEncContext *s, GetBitContext *gb){
+static int decode_vop_header(Mpeg4DecContext *ctx, GetBitContext *gb)
+{
+    MpegEncContext *s = &ctx->m;
     int time_incr, time_increment;
+    int64_t pts;
 
     s->pict_type = get_bits(gb, 2) + AV_PICTURE_TYPE_I;        /* pict type: I = 0 , P = 1 */
-    if(s->pict_type==AV_PICTURE_TYPE_B && s->low_delay && s->vol_control_parameters==0 && !(s->flags & CODEC_FLAG_LOW_DELAY)){
+    if (s->pict_type == AV_PICTURE_TYPE_B && s->low_delay &&
+        s->vol_control_parameters == 0 && !(s->flags & CODEC_FLAG_LOW_DELAY)) {
         av_log(s->avctx, AV_LOG_ERROR, "low_delay flag incorrectly, clearing it\n");
-        s->low_delay=0;
+        s->low_delay = 0;
     }
 
-    s->partitioned_frame= s->data_partitioning && s->pict_type!=AV_PICTURE_TYPE_B;
-    if(s->partitioned_frame)
-        s->decode_mb= mpeg4_decode_partitioned_mb;
+    s->partitioned_frame = s->data_partitioning && s->pict_type != AV_PICTURE_TYPE_B;
+    if (s->partitioned_frame)
+        s->decode_mb = mpeg4_decode_partitioned_mb;
     else
-        s->decode_mb= mpeg4_decode_mb;
+        s->decode_mb = mpeg4_decode_mb;
 
-    time_incr=0;
+    time_incr = 0;
     while (get_bits1(gb) != 0)
         time_incr++;
 
     check_marker(gb, "before time_increment");
 
-    if(s->time_increment_bits==0 || !(show_bits(gb, s->time_increment_bits+1)&1)){
-        av_log(s->avctx, AV_LOG_ERROR, "hmm, seems the headers are not complete, trying to guess time_increment_bits\n");
-
-        for(s->time_increment_bits=1 ;s->time_increment_bits<16; s->time_increment_bits++){
-            if (    s->pict_type == AV_PICTURE_TYPE_P
-                || (s->pict_type == AV_PICTURE_TYPE_S && s->vol_sprite_usage==GMC_SPRITE)) {
-                if((show_bits(gb, s->time_increment_bits+6)&0x37) == 0x30) break;
-            }else
-                if((show_bits(gb, s->time_increment_bits+5)&0x1F) == 0x18) break;
-        }
-
-        av_log(s->avctx, AV_LOG_ERROR, "my guess is %d bits ;)\n",s->time_increment_bits);
-        if (s->avctx->time_base.den && 4*s->avctx->time_base.den < 1<<s->time_increment_bits) {
-            s->avctx->time_base.den = 1<<s->time_increment_bits;
+    if (ctx->time_increment_bits == 0 ||
+        !(show_bits(gb, ctx->time_increment_bits + 1) & 1)) {
+        av_log(s->avctx, AV_LOG_ERROR,
+               "hmm, seems the headers are not complete, trying to guess time_increment_bits\n");
+
+        for (ctx->time_increment_bits = 1;
+             ctx->time_increment_bits < 16;
+             ctx->time_increment_bits++) {
+            if (s->pict_type == AV_PICTURE_TYPE_P ||
+                (s->pict_type == AV_PICTURE_TYPE_S &&
+                 ctx->vol_sprite_usage == GMC_SPRITE)) {
+                if ((show_bits(gb, ctx->time_increment_bits + 6) & 0x37) == 0x30)
+                    break;
+            } else if ((show_bits(gb, ctx->time_increment_bits + 5) & 0x1F) == 0x18)
+                break;
+        }
+
+        av_log(s->avctx, AV_LOG_ERROR,
+               "my guess is %d bits ;)\n", ctx->time_increment_bits);
+        if (s->avctx->time_base.den && 4*s->avctx->time_base.den < 1<<ctx->time_increment_bits) {
+            s->avctx->time_base.den = 1<<ctx->time_increment_bits;
         }
     }
 
-    if(IS_3IV1) time_increment= get_bits1(gb); //FIXME investigate further
-    else time_increment= get_bits(gb, s->time_increment_bits);
+    if (IS_3IV1)
+        time_increment = get_bits1(gb);        // FIXME investigate further
+    else
+        time_increment = get_bits(gb, ctx->time_increment_bits);
 
-    if(s->pict_type!=AV_PICTURE_TYPE_B){
-        s->last_time_base= s->time_base;
-        s->time_base+= time_incr;
-        s->time= s->time_base*s->avctx->time_base.den + time_increment;
-        if(s->workaround_bugs&FF_BUG_UMP4){
-            if(s->time < s->last_non_b_time){
+    if (s->pict_type != AV_PICTURE_TYPE_B) {
+        s->last_time_base = s->time_base;
+        s->time_base     += time_incr;
+        s->time = s->time_base * s->avctx->time_base.den + time_increment;
+        if (s->workaround_bugs & FF_BUG_UMP4) {
+            if (s->time < s->last_non_b_time) {
                 /* header is not mpeg-4-compatible, broken encoder,
                  * trying to workaround */
                 s->time_base++;
-                s->time+= s->avctx->time_base.den;
+                s->time += s->avctx->time_base.den;
             }
         }
-        s->pp_time= s->time - s->last_non_b_time;
-        s->last_non_b_time= s->time;
-    }else{
-        s->time= (s->last_time_base + time_incr)*s->avctx->time_base.den + time_increment;
-        s->pb_time= s->pp_time - (s->last_non_b_time - s->time);
-        if(s->pp_time <=s->pb_time || s->pp_time <= s->pp_time - s->pb_time || s->pp_time<=0){
+        s->pp_time         = s->time - s->last_non_b_time;
+        s->last_non_b_time = s->time;
+    } else {
+        s->time    = (s->last_time_base + time_incr) * s->avctx->time_base.den + time_increment;
+        s->pb_time = s->pp_time - (s->last_non_b_time - s->time);
+        if (s->pp_time <= s->pb_time ||
+            s->pp_time <= s->pp_time - s->pb_time ||
+            s->pp_time <= 0) {
             /* messed up order, maybe after seeking? skipping current b-frame */
             return FRAME_SKIPPED;
         }
         ff_mpeg4_init_direct_mv(s);
 
-        if(s->t_frame==0) s->t_frame= s->pb_time;
-        if(s->t_frame==0) s->t_frame=1; // 1/0 protection
-        s->pp_field_time= (  ROUNDED_DIV(s->last_non_b_time, s->t_frame)
-                           - ROUNDED_DIV(s->last_non_b_time - s->pp_time, s->t_frame))*2;
-        s->pb_field_time= (  ROUNDED_DIV(s->time, s->t_frame)
-                           - ROUNDED_DIV(s->last_non_b_time - s->pp_time, s->t_frame))*2;
-        if(!s->progressive_sequence){
-            if(s->pp_field_time <= s->pb_field_time || s->pb_field_time <= 1)
+        if (ctx->t_frame == 0)
+            ctx->t_frame = s->pb_time;
+        if (ctx->t_frame == 0)
+            ctx->t_frame = 1;  // 1/0 protection
+        s->pp_field_time = (ROUNDED_DIV(s->last_non_b_time, ctx->t_frame) -
+                            ROUNDED_DIV(s->last_non_b_time - s->pp_time, ctx->t_frame)) * 2;
+        s->pb_field_time = (ROUNDED_DIV(s->time, ctx->t_frame) -
+                            ROUNDED_DIV(s->last_non_b_time - s->pp_time, ctx->t_frame)) * 2;
+        if (s->pp_field_time <= s->pb_field_time || s->pb_field_time <= 1) {
+            s->pb_field_time = 2;
+            s->pp_field_time = 4;
+            if (!s->progressive_sequence)
                 return FRAME_SKIPPED;
         }
     }
 
-    if(s->avctx->time_base.num)
-        s->current_picture_ptr->f.pts = ROUNDED_DIV(s->time, s->avctx->time_base.num);
+    if (s->avctx->time_base.num)
+        pts = ROUNDED_DIV(s->time, s->avctx->time_base.num);
     else
-        s->current_picture_ptr->f.pts = AV_NOPTS_VALUE;
-    if(s->avctx->debug&FF_DEBUG_PTS)
+        pts = AV_NOPTS_VALUE;
+    if (s->avctx->debug&FF_DEBUG_PTS)
         av_log(s->avctx, AV_LOG_DEBUG, "MPEG4 PTS: %"PRId64"\n",
-               s->current_picture_ptr->f.pts);
+               pts);
 
     check_marker(gb, "before vop_coded");
 
     /* vop coded */
-    if (get_bits1(gb) != 1){
-        if(s->avctx->debug&FF_DEBUG_PICT_INFO)
+    if (get_bits1(gb) != 1) {
+        if (s->avctx->debug & FF_DEBUG_PICT_INFO)
             av_log(s->avctx, AV_LOG_ERROR, "vop not coded\n");
         return FRAME_SKIPPED;
     }
-    if (s->new_pred)
-        decode_new_pred(s, gb);
+    if (ctx->new_pred)
+        decode_new_pred(ctx, gb);
 
-    if (s->shape != BIN_ONLY_SHAPE && ( s->pict_type == AV_PICTURE_TYPE_P
-                          || (s->pict_type == AV_PICTURE_TYPE_S && s->vol_sprite_usage==GMC_SPRITE))) {
+    if (ctx->shape != BIN_ONLY_SHAPE &&
+                    (s->pict_type == AV_PICTURE_TYPE_P ||
+                     (s->pict_type == AV_PICTURE_TYPE_S &&
+                      ctx->vol_sprite_usage == GMC_SPRITE))) {
         /* rounding type for motion estimation */
         s->no_rounding = get_bits1(gb);
     } else {
         s->no_rounding = 0;
     }
-//FIXME reduced res stuff
+    // FIXME reduced res stuff
+
+    if (ctx->shape != RECT_SHAPE) {
+        if (ctx->vol_sprite_usage != 1 || s->pict_type != AV_PICTURE_TYPE_I) {
+            skip_bits(gb, 13);  /* width */
+            skip_bits1(gb);     /* marker */
+            skip_bits(gb, 13);  /* height */
+            skip_bits1(gb);     /* marker */
+            skip_bits(gb, 13);  /* hor_spat_ref */
+            skip_bits1(gb);     /* marker */
+            skip_bits(gb, 13);  /* ver_spat_ref */
+        }
+        skip_bits1(gb);         /* change_CR_disable */
+
+        if (get_bits1(gb) != 0)
+            skip_bits(gb, 8);   /* constant_alpha_value */
+    }
+
+    // FIXME complexity estimation stuff
+
+    if (ctx->shape != BIN_ONLY_SHAPE) {
+        skip_bits_long(gb, ctx->cplx_estimation_trash_i);
+        if (s->pict_type != AV_PICTURE_TYPE_I)
+            skip_bits_long(gb, ctx->cplx_estimation_trash_p);
+        if (s->pict_type == AV_PICTURE_TYPE_B)
+            skip_bits_long(gb, ctx->cplx_estimation_trash_b);
+
+        if (get_bits_left(gb) < 3) {
+            av_log(s->avctx, AV_LOG_ERROR, "Header truncated\n");
+            return -1;
+        }
+        ctx->intra_dc_threshold = ff_mpeg4_dc_threshold[get_bits(gb, 3)];
+        if (!s->progressive_sequence) {
+            s->top_field_first = get_bits1(gb);
+            s->alternate_scan  = get_bits1(gb);
+        } else
+            s->alternate_scan = 0;
+    }
 
-     if (s->shape != RECT_SHAPE) {
-         if (s->vol_sprite_usage != 1 || s->pict_type != AV_PICTURE_TYPE_I) {
-             skip_bits(gb, 13); /* width */
-             skip_bits1(gb);   /* marker */
-             skip_bits(gb, 13); /* height */
-             skip_bits1(gb);   /* marker */
-             skip_bits(gb, 13); /* hor_spat_ref */
-             skip_bits1(gb);   /* marker */
-             skip_bits(gb, 13); /* ver_spat_ref */
-         }
-         skip_bits1(gb); /* change_CR_disable */
-
-         if (get_bits1(gb) != 0) {
-             skip_bits(gb, 8); /* constant_alpha_value */
-         }
-     }
-//FIXME complexity estimation stuff
-
-     if (s->shape != BIN_ONLY_SHAPE) {
-         skip_bits_long(gb, s->cplx_estimation_trash_i);
-         if(s->pict_type != AV_PICTURE_TYPE_I)
-            skip_bits_long(gb, s->cplx_estimation_trash_p);
-         if(s->pict_type == AV_PICTURE_TYPE_B)
-            skip_bits_long(gb, s->cplx_estimation_trash_b);
-
-         if(get_bits_left(gb) < 3) {
-             av_log(s->avctx, AV_LOG_ERROR, "Header truncated\n");
-             return -1;
-         }
-         s->intra_dc_threshold= ff_mpeg4_dc_threshold[ get_bits(gb, 3) ];
-         if(!s->progressive_sequence){
-             s->top_field_first= get_bits1(gb);
-             s->alternate_scan= get_bits1(gb);
-         }else
-             s->alternate_scan= 0;
-     }
-
-     if(s->alternate_scan){
-         ff_init_scantable(s->dsp.idct_permutation, &s->inter_scantable  , ff_alternate_vertical_scan);
-         ff_init_scantable(s->dsp.idct_permutation, &s->intra_scantable  , ff_alternate_vertical_scan);
-         ff_init_scantable(s->dsp.idct_permutation, &s->intra_h_scantable, ff_alternate_vertical_scan);
-         ff_init_scantable(s->dsp.idct_permutation, &s->intra_v_scantable, ff_alternate_vertical_scan);
-     } else{
-         ff_init_scantable(s->dsp.idct_permutation, &s->inter_scantable  , ff_zigzag_direct);
-         ff_init_scantable(s->dsp.idct_permutation, &s->intra_scantable  , ff_zigzag_direct);
-         ff_init_scantable(s->dsp.idct_permutation, &s->intra_h_scantable, ff_alternate_horizontal_scan);
-         ff_init_scantable(s->dsp.idct_permutation, &s->intra_v_scantable, ff_alternate_vertical_scan);
-     }
-
-     if(s->pict_type == AV_PICTURE_TYPE_S && (s->vol_sprite_usage==STATIC_SPRITE || s->vol_sprite_usage==GMC_SPRITE)){
-         if (mpeg4_decode_sprite_trajectory(s, gb) < 0)
-             return AVERROR_INVALIDDATA;
-         if(s->sprite_brightness_change) av_log(s->avctx, AV_LOG_ERROR, "sprite_brightness_change not supported\n");
-         if(s->vol_sprite_usage==STATIC_SPRITE) av_log(s->avctx, AV_LOG_ERROR, "static sprite not supported\n");
-     }
-
-     if (s->shape != BIN_ONLY_SHAPE) {
-         s->chroma_qscale= s->qscale = get_bits(gb, s->quant_precision);
-         if(s->qscale==0){
-             av_log(s->avctx, AV_LOG_ERROR, "Error, header damaged or not MPEG4 header (qscale=0)\n");
-             return -1; // makes no sense to continue, as there is nothing left from the image then
-         }
-
-         if (s->pict_type != AV_PICTURE_TYPE_I) {
-             s->f_code = get_bits(gb, 3);       /* fcode_for */
-             if(s->f_code==0){
-                 av_log(s->avctx, AV_LOG_ERROR, "Error, header damaged or not MPEG4 header (f_code=0)\n");
-                 s->f_code=1;
-                 return -1; // makes no sense to continue, as the MV decoding will break very quickly
-             }
-         }else
-             s->f_code=1;
-
-         if (s->pict_type == AV_PICTURE_TYPE_B) {
-             s->b_code = get_bits(gb, 3);
-             if(s->b_code==0){
-                 av_log(s->avctx, AV_LOG_ERROR, "Error, header damaged or not MPEG4 header (b_code=0)\n");
-                 s->b_code=1;
-                 return -1; // makes no sense to continue, as the MV decoding will break very quickly
-             }
-         }else
-             s->b_code=1;
-
-         if(s->avctx->debug&FF_DEBUG_PICT_INFO){
-             av_log(s->avctx, AV_LOG_DEBUG, "qp:%d fc:%d,%d %s size:%d pro:%d alt:%d top:%d %spel part:%d resync:%d w:%d a:%d rnd:%d vot:%d%s dc:%d ce:%d/%d/%d time:%"PRId64" tincr:%d\n",
-                 s->qscale, s->f_code, s->b_code,
-                 s->pict_type == AV_PICTURE_TYPE_I ? "I" : (s->pict_type == AV_PICTURE_TYPE_P ? "P" : (s->pict_type == AV_PICTURE_TYPE_B ? "B" : "S")),
-                 gb->size_in_bits,s->progressive_sequence, s->alternate_scan, s->top_field_first,
-                 s->quarter_sample ? "q" : "h", s->data_partitioning, s->resync_marker, s->num_sprite_warping_points,
-                 s->sprite_warping_accuracy, 1-s->no_rounding, s->vo_type, s->vol_control_parameters ? " VOLC" : " ", s->intra_dc_threshold,
-                 s->cplx_estimation_trash_i, s->cplx_estimation_trash_p, s->cplx_estimation_trash_b,
-                 s->time,
-                 time_increment
-                   );
-         }
-
-         if(!s->scalability){
-             if (s->shape!=RECT_SHAPE && s->pict_type!=AV_PICTURE_TYPE_I) {
-                 skip_bits1(gb); // vop shape coding type
-             }
-         }else{
-             if(s->enhancement_type){
-                 int load_backward_shape= get_bits1(gb);
-                 if(load_backward_shape){
-                     av_log(s->avctx, AV_LOG_ERROR, "load backward shape isn't supported\n");
-                 }
-             }
-             skip_bits(gb, 2); //ref_select_code
-         }
-     }
-     /* detect buggy encoders which don't set the low_delay flag (divx4/xvid/opendivx)*/
-     // note we cannot detect divx5 without b-frames easily (although it's buggy too)
-     if(s->vo_type==0 && s->vol_control_parameters==0 && s->divx_version==-1 && s->picture_number==0){
-         av_log(s->avctx, AV_LOG_WARNING, "looks like this file was encoded with (divx4/(old)xvid/opendivx) -> forcing low_delay flag\n");
-         s->low_delay=1;
-     }
-
-     s->picture_number++; // better than pic number==0 always ;)
-
-     s->y_dc_scale_table= ff_mpeg4_y_dc_scale_table; //FIXME add short header support
-     s->c_dc_scale_table= ff_mpeg4_c_dc_scale_table;
-
-     if(s->workaround_bugs&FF_BUG_EDGE){
-         s->h_edge_pos= s->width;
-         s->v_edge_pos= s->height;
-     }
-     return 0;
+    if (s->alternate_scan) {
+        ff_init_scantable(s->dsp.idct_permutation, &s->inter_scantable,   ff_alternate_vertical_scan);
+        ff_init_scantable(s->dsp.idct_permutation, &s->intra_scantable,   ff_alternate_vertical_scan);
+        ff_init_scantable(s->dsp.idct_permutation, &s->intra_h_scantable, ff_alternate_vertical_scan);
+        ff_init_scantable(s->dsp.idct_permutation, &s->intra_v_scantable, ff_alternate_vertical_scan);
+    } else {
+        ff_init_scantable(s->dsp.idct_permutation, &s->inter_scantable,   ff_zigzag_direct);
+        ff_init_scantable(s->dsp.idct_permutation, &s->intra_scantable,   ff_zigzag_direct);
+        ff_init_scantable(s->dsp.idct_permutation, &s->intra_h_scantable, ff_alternate_horizontal_scan);
+        ff_init_scantable(s->dsp.idct_permutation, &s->intra_v_scantable, ff_alternate_vertical_scan);
+    }
+
+    if (s->pict_type == AV_PICTURE_TYPE_S &&
+        (ctx->vol_sprite_usage == STATIC_SPRITE ||
+         ctx->vol_sprite_usage == GMC_SPRITE)) {
+        if (mpeg4_decode_sprite_trajectory(ctx, gb) < 0)
+            return AVERROR_INVALIDDATA;
+        if (ctx->sprite_brightness_change)
+            av_log(s->avctx, AV_LOG_ERROR,
+                   "sprite_brightness_change not supported\n");
+        if (ctx->vol_sprite_usage == STATIC_SPRITE)
+            av_log(s->avctx, AV_LOG_ERROR, "static sprite not supported\n");
+    }
+
+    if (ctx->shape != BIN_ONLY_SHAPE) {
+        s->chroma_qscale = s->qscale = get_bits(gb, s->quant_precision);
+        if (s->qscale == 0) {
+            av_log(s->avctx, AV_LOG_ERROR,
+                   "Error, header damaged or not MPEG4 header (qscale=0)\n");
+            return -1;  // makes no sense to continue, as there is nothing left from the image then
+        }
+
+        if (s->pict_type != AV_PICTURE_TYPE_I) {
+            s->f_code = get_bits(gb, 3);        /* fcode_for */
+            if (s->f_code == 0) {
+                av_log(s->avctx, AV_LOG_ERROR,
+                       "Error, header damaged or not MPEG4 header (f_code=0)\n");
+                s->f_code = 1;
+                return -1;  // makes no sense to continue, as there is nothing left from the image then
+            }
+        } else
+            s->f_code = 1;
+
+        if (s->pict_type == AV_PICTURE_TYPE_B) {
+            s->b_code = get_bits(gb, 3);
+            if (s->b_code == 0) {
+                av_log(s->avctx, AV_LOG_ERROR,
+                       "Error, header damaged or not MPEG4 header (b_code=0)\n");
+                s->b_code=1;
+                return -1; // makes no sense to continue, as the MV decoding will break very quickly
+            }
+        } else
+            s->b_code = 1;
+
+        if (s->avctx->debug & FF_DEBUG_PICT_INFO) {
+            av_log(s->avctx, AV_LOG_DEBUG,
+                   "qp:%d fc:%d,%d %s size:%d pro:%d alt:%d top:%d %spel part:%d resync:%d w:%d a:%d rnd:%d vot:%d%s dc:%d ce:%d/%d/%d time:%"PRId64" tincr:%d\n",
+                   s->qscale, s->f_code, s->b_code,
+                   s->pict_type == AV_PICTURE_TYPE_I ? "I" : (s->pict_type == AV_PICTURE_TYPE_P ? "P" : (s->pict_type == AV_PICTURE_TYPE_B ? "B" : "S")),
+                   gb->size_in_bits,s->progressive_sequence, s->alternate_scan,
+                   s->top_field_first, s->quarter_sample ? "q" : "h",
+                   s->data_partitioning, ctx->resync_marker,
+                   ctx->num_sprite_warping_points, s->sprite_warping_accuracy,
+                   1 - s->no_rounding, s->vo_type,
+                   s->vol_control_parameters ? " VOLC" : " ", ctx->intra_dc_threshold,
+                   ctx->cplx_estimation_trash_i, ctx->cplx_estimation_trash_p,
+                   ctx->cplx_estimation_trash_b,
+                   s->time,
+                   time_increment
+                  );
+        }
+
+        if (!ctx->scalability) {
+            if (ctx->shape != RECT_SHAPE && s->pict_type != AV_PICTURE_TYPE_I)
+                skip_bits1(gb);  // vop shape coding type
+        } else {
+            if (ctx->enhancement_type) {
+                int load_backward_shape = get_bits1(gb);
+                if (load_backward_shape)
+                    av_log(s->avctx, AV_LOG_ERROR,
+                           "load backward shape isn't supported\n");
+            }
+            skip_bits(gb, 2);  // ref_select_code
+        }
+    }
+    /* detect buggy encoders which don't set the low_delay flag
+     * (divx4/xvid/opendivx). Note we cannot detect divx5 without b-frames
+     * easily (although it's buggy too) */
+    if (s->vo_type == 0 && s->vol_control_parameters == 0 &&
+        ctx->divx_version == -1 && s->picture_number == 0) {
+        av_log(s->avctx, AV_LOG_WARNING,
+               "looks like this file was encoded with (divx4/(old)xvid/opendivx) -> forcing low_delay flag\n");
+        s->low_delay = 1;
+    }
+
+    s->picture_number++;  // better than pic number==0 always ;)
+
+    // FIXME add short header support
+    s->y_dc_scale_table = ff_mpeg4_y_dc_scale_table;
+    s->c_dc_scale_table = ff_mpeg4_c_dc_scale_table;
+
+    if (s->workaround_bugs & FF_BUG_EDGE) {
+        s->h_edge_pos = s->width;
+        s->v_edge_pos = s->height;
+    }
+    return 0;
 }
 
 /**
@@ -2185,93 +2491,120 @@
  *         FRAME_SKIPPED if a not coded VOP is found
  *         0 if a VOP is found
  */
-int ff_mpeg4_decode_picture_header(MpegEncContext * s, GetBitContext *gb)
+int ff_mpeg4_decode_picture_header(Mpeg4DecContext *ctx, GetBitContext *gb)
 {
+    MpegEncContext *s = &ctx->m;
     unsigned startcode, v;
 
     /* search next start code */
     align_get_bits(gb);
 
-    if(s->codec_tag == AV_RL32("WV1F") && show_bits(gb, 24) == 0x575630){
+    if (s->codec_tag == AV_RL32("WV1F") && show_bits(gb, 24) == 0x575630) {
         skip_bits(gb, 24);
-        if(get_bits(gb, 8) == 0xF0)
+        if (get_bits(gb, 8) == 0xF0)
             goto end;
     }
 
     startcode = 0xff;
-    for(;;) {
-        if(get_bits_count(gb) >= gb->size_in_bits){
-            if(gb->size_in_bits==8 && (s->divx_version>=0 || s->xvid_build>=0) || s->codec_tag == AV_RL32("QMP4")){
+    for (;;) {
+        if (get_bits_count(gb) >= gb->size_in_bits) {
+            if (gb->size_in_bits == 8 &&
+                (ctx->divx_version >= 0 || ctx->xvid_build >= 0) || s->codec_tag == AV_RL32("QMP4")) {
                 av_log(s->avctx, AV_LOG_VERBOSE, "frame skip %d\n", gb->size_in_bits);
-                return FRAME_SKIPPED; //divx bug
-            }else
-                return -1; //end of stream
+                return FRAME_SKIPPED;  // divx bug
+            } else
+                return -1;  // end of stream
         }
 
         /* use the bits after the test */
         v = get_bits(gb, 8);
         startcode = ((startcode << 8) | v) & 0xffffffff;
 
-        if((startcode&0xFFFFFF00) != 0x100)
-            continue; //no startcode
+        if ((startcode & 0xFFFFFF00) != 0x100)
+            continue;  // no startcode
 
-        if(s->avctx->debug&FF_DEBUG_STARTCODE){
+        if (s->avctx->debug & FF_DEBUG_STARTCODE) {
             av_log(s->avctx, AV_LOG_DEBUG, "startcode: %3X ", startcode);
-            if     (startcode<=0x11F) av_log(s->avctx, AV_LOG_DEBUG, "Video Object Start");
-            else if(startcode<=0x12F) av_log(s->avctx, AV_LOG_DEBUG, "Video Object Layer Start");
-            else if(startcode<=0x13F) av_log(s->avctx, AV_LOG_DEBUG, "Reserved");
-            else if(startcode<=0x15F) av_log(s->avctx, AV_LOG_DEBUG, "FGS bp start");
-            else if(startcode<=0x1AF) av_log(s->avctx, AV_LOG_DEBUG, "Reserved");
-            else if(startcode==0x1B0) av_log(s->avctx, AV_LOG_DEBUG, "Visual Object Seq Start");
-            else if(startcode==0x1B1) av_log(s->avctx, AV_LOG_DEBUG, "Visual Object Seq End");
-            else if(startcode==0x1B2) av_log(s->avctx, AV_LOG_DEBUG, "User Data");
-            else if(startcode==0x1B3) av_log(s->avctx, AV_LOG_DEBUG, "Group of VOP start");
-            else if(startcode==0x1B4) av_log(s->avctx, AV_LOG_DEBUG, "Video Session Error");
-            else if(startcode==0x1B5) av_log(s->avctx, AV_LOG_DEBUG, "Visual Object Start");
-            else if(startcode==0x1B6) av_log(s->avctx, AV_LOG_DEBUG, "Video Object Plane start");
-            else if(startcode==0x1B7) av_log(s->avctx, AV_LOG_DEBUG, "slice start");
-            else if(startcode==0x1B8) av_log(s->avctx, AV_LOG_DEBUG, "extension start");
-            else if(startcode==0x1B9) av_log(s->avctx, AV_LOG_DEBUG, "fgs start");
-            else if(startcode==0x1BA) av_log(s->avctx, AV_LOG_DEBUG, "FBA Object start");
-            else if(startcode==0x1BB) av_log(s->avctx, AV_LOG_DEBUG, "FBA Object Plane start");
-            else if(startcode==0x1BC) av_log(s->avctx, AV_LOG_DEBUG, "Mesh Object start");
-            else if(startcode==0x1BD) av_log(s->avctx, AV_LOG_DEBUG, "Mesh Object Plane start");
-            else if(startcode==0x1BE) av_log(s->avctx, AV_LOG_DEBUG, "Still Texture Object start");
-            else if(startcode==0x1BF) av_log(s->avctx, AV_LOG_DEBUG, "Texture Spatial Layer start");
-            else if(startcode==0x1C0) av_log(s->avctx, AV_LOG_DEBUG, "Texture SNR Layer start");
-            else if(startcode==0x1C1) av_log(s->avctx, AV_LOG_DEBUG, "Texture Tile start");
-            else if(startcode==0x1C2) av_log(s->avctx, AV_LOG_DEBUG, "Texture Shape Layer start");
-            else if(startcode==0x1C3) av_log(s->avctx, AV_LOG_DEBUG, "stuffing start");
-            else if(startcode<=0x1C5) av_log(s->avctx, AV_LOG_DEBUG, "reserved");
-            else if(startcode<=0x1FF) av_log(s->avctx, AV_LOG_DEBUG, "System start");
+            if (startcode <= 0x11F)
+                av_log(s->avctx, AV_LOG_DEBUG, "Video Object Start");
+            else if (startcode <= 0x12F)
+                av_log(s->avctx, AV_LOG_DEBUG, "Video Object Layer Start");
+            else if (startcode <= 0x13F)
+                av_log(s->avctx, AV_LOG_DEBUG, "Reserved");
+            else if (startcode <= 0x15F)
+                av_log(s->avctx, AV_LOG_DEBUG, "FGS bp start");
+            else if (startcode <= 0x1AF)
+                av_log(s->avctx, AV_LOG_DEBUG, "Reserved");
+            else if (startcode == 0x1B0)
+                av_log(s->avctx, AV_LOG_DEBUG, "Visual Object Seq Start");
+            else if (startcode == 0x1B1)
+                av_log(s->avctx, AV_LOG_DEBUG, "Visual Object Seq End");
+            else if (startcode == 0x1B2)
+                av_log(s->avctx, AV_LOG_DEBUG, "User Data");
+            else if (startcode == 0x1B3)
+                av_log(s->avctx, AV_LOG_DEBUG, "Group of VOP start");
+            else if (startcode == 0x1B4)
+                av_log(s->avctx, AV_LOG_DEBUG, "Video Session Error");
+            else if (startcode == 0x1B5)
+                av_log(s->avctx, AV_LOG_DEBUG, "Visual Object Start");
+            else if (startcode == 0x1B6)
+                av_log(s->avctx, AV_LOG_DEBUG, "Video Object Plane start");
+            else if (startcode == 0x1B7)
+                av_log(s->avctx, AV_LOG_DEBUG, "slice start");
+            else if (startcode == 0x1B8)
+                av_log(s->avctx, AV_LOG_DEBUG, "extension start");
+            else if (startcode == 0x1B9)
+                av_log(s->avctx, AV_LOG_DEBUG, "fgs start");
+            else if (startcode == 0x1BA)
+                av_log(s->avctx, AV_LOG_DEBUG, "FBA Object start");
+            else if (startcode == 0x1BB)
+                av_log(s->avctx, AV_LOG_DEBUG, "FBA Object Plane start");
+            else if (startcode == 0x1BC)
+                av_log(s->avctx, AV_LOG_DEBUG, "Mesh Object start");
+            else if (startcode == 0x1BD)
+                av_log(s->avctx, AV_LOG_DEBUG, "Mesh Object Plane start");
+            else if (startcode == 0x1BE)
+                av_log(s->avctx, AV_LOG_DEBUG, "Still Texture Object start");
+            else if (startcode == 0x1BF)
+                av_log(s->avctx, AV_LOG_DEBUG, "Texture Spatial Layer start");
+            else if (startcode == 0x1C0)
+                av_log(s->avctx, AV_LOG_DEBUG, "Texture SNR Layer start");
+            else if (startcode == 0x1C1)
+                av_log(s->avctx, AV_LOG_DEBUG, "Texture Tile start");
+            else if (startcode == 0x1C2)
+                av_log(s->avctx, AV_LOG_DEBUG, "Texture Shape Layer start");
+            else if (startcode == 0x1C3)
+                av_log(s->avctx, AV_LOG_DEBUG, "stuffing start");
+            else if (startcode <= 0x1C5)
+                av_log(s->avctx, AV_LOG_DEBUG, "reserved");
+            else if (startcode <= 0x1FF)
+                av_log(s->avctx, AV_LOG_DEBUG, "System start");
             av_log(s->avctx, AV_LOG_DEBUG, " at %d\n", get_bits_count(gb));
         }
 
-        if(startcode >= 0x120 && startcode <= 0x12F){
-            if(decode_vol_header(s, gb) < 0)
+        if (startcode >= 0x120 && startcode <= 0x12F) {
+            if (decode_vol_header(ctx, gb) < 0)
                 return -1;
-        }
-        else if(startcode == USER_DATA_STARTCODE){
-            decode_user_data(s, gb);
-        }
-        else if(startcode == GOP_STARTCODE){
+        } else if (startcode == USER_DATA_STARTCODE) {
+            decode_user_data(ctx, gb);
+        } else if (startcode == GOP_STARTCODE) {
             mpeg4_decode_gop_header(s, gb);
-        }
-        else if(startcode == VOS_STARTCODE){
+        } else if (startcode == VOS_STARTCODE) {
             mpeg4_decode_profile_level(s, gb);
-        }
-        else if(startcode == VOP_STARTCODE){
+        } else if (startcode == VOP_STARTCODE) {
             break;
         }
 
         align_get_bits(gb);
         startcode = 0xff;
     }
+
 end:
-    if(s->flags& CODEC_FLAG_LOW_DELAY)
-        s->low_delay=1;
-    s->avctx->has_b_frames= !s->low_delay;
-    return decode_vop_header(s, gb);
+    if (s->flags & CODEC_FLAG_LOW_DELAY)
+        s->low_delay = 1;
+    s->avctx->has_b_frames = !s->low_delay;
+
+    return decode_vop_header(ctx, gb);
 }
 
 av_cold void ff_mpeg4videodec_static_init(void) {
@@ -2285,42 +2618,100 @@
         INIT_VLC_RL(ff_rvlc_rl_inter, 1072);
         INIT_VLC_RL(ff_rvlc_rl_intra, 1072);
         INIT_VLC_STATIC(&dc_lum, DC_VLC_BITS, 10 /* 13 */,
-                 &ff_mpeg4_DCtab_lum[0][1], 2, 1,
-                 &ff_mpeg4_DCtab_lum[0][0], 2, 1, 512);
+                        &ff_mpeg4_DCtab_lum[0][1], 2, 1,
+                        &ff_mpeg4_DCtab_lum[0][0], 2, 1, 512);
         INIT_VLC_STATIC(&dc_chrom, DC_VLC_BITS, 10 /* 13 */,
-                 &ff_mpeg4_DCtab_chrom[0][1], 2, 1,
-                 &ff_mpeg4_DCtab_chrom[0][0], 2, 1, 512);
+                        &ff_mpeg4_DCtab_chrom[0][1], 2, 1,
+                        &ff_mpeg4_DCtab_chrom[0][0], 2, 1, 512);
         INIT_VLC_STATIC(&sprite_trajectory, SPRITE_TRAJ_VLC_BITS, 15,
-                 &ff_sprite_trajectory_tab[0][1], 4, 2,
-                 &ff_sprite_trajectory_tab[0][0], 4, 2, 128);
+                        &ff_sprite_trajectory_tab[0][1], 4, 2,
+                        &ff_sprite_trajectory_tab[0][0], 4, 2, 128);
         INIT_VLC_STATIC(&mb_type_b_vlc, MB_TYPE_B_VLC_BITS, 4,
-                 &ff_mb_type_b_tab[0][1], 2, 1,
-                 &ff_mb_type_b_tab[0][0], 2, 1, 16);
+                        &ff_mb_type_b_tab[0][1], 2, 1,
+                        &ff_mb_type_b_tab[0][0], 2, 1, 16);
         done = 1;
     }
 }
 
+int ff_mpeg4_frame_end(AVCodecContext *avctx, const uint8_t *buf, int buf_size)
+{
+    Mpeg4DecContext *ctx = avctx->priv_data;
+    MpegEncContext    *s = &ctx->m;
+
+    /* divx 5.01+ bitstream reorder stuff */
+    /* Since this clobbers the input buffer and hwaccel codecs still need the
+     * data during hwaccel->end_frame we should not do this any earlier */
+    if (s->divx_packed) {
+        int current_pos     = s->gb.buffer == s->bitstream_buffer ? 0 : (get_bits_count(&s->gb) >> 3);
+        int startcode_found = 0;
+
+        if (buf_size - current_pos > 7) {
+
+            int i;
+            for (i = current_pos; i < buf_size - 4; i++)
+
+                if (buf[i]     == 0 &&
+                    buf[i + 1] == 0 &&
+                    buf[i + 2] == 1 &&
+                    buf[i + 3] == 0xB6) {
+                    startcode_found = !(buf[i + 4] & 0x40);
+                    break;
+                }
+        }
+
+        if (startcode_found) {
+            av_fast_padded_malloc(&s->bitstream_buffer,
+                           &s->allocated_bitstream_buffer_size,
+                           buf_size - current_pos);
+            if (!s->bitstream_buffer)
+                return AVERROR(ENOMEM);
+            memcpy(s->bitstream_buffer, buf + current_pos,
+                   buf_size - current_pos);
+            s->bitstream_buffer_size = buf_size - current_pos;
+        }
+    }
+
+    return 0;
+}
+
+static int mpeg4_update_thread_context(AVCodecContext *dst,
+                                       const AVCodecContext *src)
+{
+    Mpeg4DecContext *s = dst->priv_data;
+    const Mpeg4DecContext *s1 = src->priv_data;
+
+    int ret = ff_mpeg_update_thread_context(dst, src);
+
+    if (ret < 0)
+        return ret;
+
+    memcpy(((uint8_t*)s) + sizeof(MpegEncContext), ((uint8_t*)s1) + sizeof(MpegEncContext), sizeof(Mpeg4DecContext) - sizeof(MpegEncContext));
+
+    return 0;
+}
+
 static av_cold int decode_init(AVCodecContext *avctx)
 {
-    MpegEncContext *s = avctx->priv_data;
+    Mpeg4DecContext *ctx = avctx->priv_data;
+    MpegEncContext *s = &ctx->m;
     int ret;
 
-    s->divx_version=
-    s->divx_build=
-    s->xvid_build=
-    s->lavc_build= -1;
+    ctx->divx_version =
+    ctx->divx_build   =
+    ctx->xvid_build   =
+    ctx->lavc_build   = -1;
 
-    if((ret=ff_h263_decode_init(avctx)) < 0)
+    if ((ret = ff_h263_decode_init(avctx)) < 0)
         return ret;
 
     ff_mpeg4videodec_static_init();
 
     s->h263_pred = 1;
-    s->low_delay = 0; //default, might be overridden in the vol header during header parsing
-    s->decode_mb= mpeg4_decode_mb;
-    s->time_increment_bits = 4; /* default value for broken headers */
-    avctx->chroma_sample_location = AVCHROMA_LOC_LEFT;
+    s->low_delay = 0; /* default, might be overridden in the vol header during header parsing */
+    s->decode_mb = mpeg4_decode_mb;
+    ctx->time_increment_bits = 4; /* default value for broken headers */
 
+    avctx->chroma_sample_location = AVCHROMA_LOC_LEFT;
     avctx->internal->allocate_progress = 1;
 
     return 0;
@@ -2371,7 +2762,7 @@
     .long_name             = NULL_IF_CONFIG_SMALL("MPEG-4 part 2"),
     .type                  = AVMEDIA_TYPE_VIDEO,
     .id                    = AV_CODEC_ID_MPEG4,
-    .priv_data_size        = sizeof(MpegEncContext),
+    .priv_data_size        = sizeof(Mpeg4DecContext),
     .init                  = decode_init,
     .close                 = ff_h263_decode_end,
     .decode                = ff_h263_decode_frame,
@@ -2382,7 +2773,7 @@
     .max_lowres            = 3,
     .pix_fmts              = ff_h263_hwaccel_pixfmt_list_420,
     .profiles              = NULL_IF_CONFIG_SMALL(mpeg4_video_profiles),
-    .update_thread_context = ONLY_IF_THREADS_ENABLED(ff_mpeg_update_thread_context),
+    .update_thread_context = ONLY_IF_THREADS_ENABLED(mpeg4_update_thread_context),
     .priv_class = &mpeg4_class,
 };
 
@@ -2399,7 +2790,7 @@
     .decode         = ff_h263_decode_frame,
     .capabilities   = CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY |
                       CODEC_CAP_HWACCEL_VDPAU,
-    .pix_fmts       = (const enum AVPixelFormat[]){ AV_PIX_FMT_VDPAU_MPEG4,
+    .pix_fmts       = (const enum AVPixelFormat[]) { AV_PIX_FMT_VDPAU_MPEG4,
                                                   AV_PIX_FMT_NONE },
     .priv_class     = &mpeg4_vdpau_class,
 };

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/mpeg4videoenc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/mpeg4videoenc.c Changed

@@ -27,63 +27,66 @@
 #include "h263.h"
 #include "mpeg4video.h"
 
-//The uni_DCtab_* tables below contain unified bits+length tables to encode DC
-//differences in mpeg4. Unified in the sense that the specification specifies
-//this encoding in several steps.
-static uint8_t uni_DCtab_lum_len[512];
-static uint8_t uni_DCtab_chrom_len[512];
+/* The uni_DCtab_* tables below contain unified bits+length tables to encode DC
+ * differences in mpeg4. Unified in the sense that the specification specifies
+ * this encoding in several steps. */
+static uint8_t  uni_DCtab_lum_len[512];
+static uint8_t  uni_DCtab_chrom_len[512];
 static uint16_t uni_DCtab_lum_bits[512];
 static uint16_t uni_DCtab_chrom_bits[512];
 
-//unified encoding tables for run length encoding of coefficients
-//unified in the sense that the specification specifies the encoding in several steps.
-static uint32_t uni_mpeg4_intra_rl_bits[64*64*2*2];
-static uint8_t  uni_mpeg4_intra_rl_len [64*64*2*2];
-static uint32_t uni_mpeg4_inter_rl_bits[64*64*2*2];
-static uint8_t  uni_mpeg4_inter_rl_len [64*64*2*2];
-//#define UNI_MPEG4_ENC_INDEX(last,run,level) ((last)*128 + (run)*256 + (level))
-//#define UNI_MPEG4_ENC_INDEX(last,run,level) ((last)*128*64 + (run) + (level)*64)
-#define UNI_MPEG4_ENC_INDEX(last,run,level) ((last)*128*64 + (run)*128 + (level))
+/* Unified encoding tables for run length encoding of coefficients.
+ * Unified in the sense that the specification specifies the encoding in several steps. */
+static uint32_t uni_mpeg4_intra_rl_bits[64 * 64 * 2 * 2];
+static uint8_t  uni_mpeg4_intra_rl_len[64 * 64 * 2 * 2];
+static uint32_t uni_mpeg4_inter_rl_bits[64 * 64 * 2 * 2];
+static uint8_t  uni_mpeg4_inter_rl_len[64 * 64 * 2 * 2];
 
-/* mpeg4
-inter
-max level: 24/6
-max run: 53/63
-
-intra
-max level: 53/16
-max run: 29/41
-*/
+//#define UNI_MPEG4_ENC_INDEX(last, run, level) ((last) * 128 + (run) * 256 + (level))
+//#define UNI_MPEG4_ENC_INDEX(last, run, level) ((last) * 128 * 64 + (run) + (level) * 64)
+#define UNI_MPEG4_ENC_INDEX(last, run, level) ((last) * 128 * 64 + (run) * 128 + (level))
 
+/* mpeg4
+ * inter
+ * max level: 24/6
+ * max run: 53/63
+ *
+ * intra
+ * max level: 53/16
+ * max run: 29/41
+ */
 
 /**
  * Return the number of bits that encoding the 8x8 block in block would need.
  * @param[in]  block_last_index last index in scantable order that refers to a non zero element in block.
  */
-static inline int get_block_rate(MpegEncContext * s, int16_t block[64], int block_last_index, uint8_t scantable[64]){
-    int last=0;
+static inline int get_block_rate(MpegEncContext *s, int16_t block[64],
+                                 int block_last_index, uint8_t scantable[64])
+{
+    int last = 0;
     int j;
-    int rate=0;
-
-    for(j=1; j<=block_last_index; j++){
-        const int index= scantable[j];
-        int level= block[index];
-        if(level){
-            level+= 64;
-            if((level&(~127)) == 0){
-                if(j<block_last_index) rate+= s->intra_ac_vlc_length     [UNI_AC_ENC_INDEX(j-last-1, level)];
-                else                   rate+= s->intra_ac_vlc_last_length[UNI_AC_ENC_INDEX(j-last-1, level)];
-            }else
+    int rate = 0;
+
+    for (j = 1; j <= block_last_index; j++) {
+        const int index = scantable[j];
+        int level = block[index];
+        if (level) {
+            level += 64;
+            if ((level & (~127)) == 0) {
+                if (j < block_last_index)
+                    rate += s->intra_ac_vlc_length[UNI_AC_ENC_INDEX(j - last - 1, level)];
+                else
+                    rate += s->intra_ac_vlc_last_length[UNI_AC_ENC_INDEX(j - last - 1, level)];
+            } else
                 rate += s->ac_esc_length;
 
-            last= j;
+            last = j;
         }
     }
 
     return rate;
 }
 
-
 /**
  * Restore the ac coefficients in block that have been changed by decide_ac_pred().
  * This function also restores s->block_last_index.
@@ -92,25 +95,25 @@
  * @param[out] st scantable for each 8x8 block
  * @param[in] zigzag_last_index index referring to the last non zero coefficient in zigzag order
  */
-static inline void restore_ac_coeffs(MpegEncContext * s, int16_t block[6][64], const int dir[6], uint8_t *st[6], const int zigzag_last_index[6])
+static inline void restore_ac_coeffs(MpegEncContext *s, int16_t block[6][64],
+                                     const int dir[6], uint8_t *st[6],
+                                     const int zigzag_last_index[6])
 {
     int i, n;
-    memcpy(s->block_last_index, zigzag_last_index, sizeof(int)*6);
+    memcpy(s->block_last_index, zigzag_last_index, sizeof(int) * 6);
 
-    for(n=0; n<6; n++){
+    for (n = 0; n < 6; n++) {
         int16_t *ac_val = s->ac_val[0][0] + s->block_index[n] * 16;
 
-        st[n]= s->intra_scantable.permutated;
-        if(dir[n]){
+        st[n] = s->intra_scantable.permutated;
+        if (dir[n]) {
             /* top prediction */
-            for(i=1; i<8; i++){
-                block[n][s->dsp.idct_permutation[i   ]] = ac_val[i+8];
-            }
-        }else{
+            for (i = 1; i < 8; i++)
+                block[n][s->dsp.idct_permutation[i]] = ac_val[i + 8];
+        } else {
             /* left prediction */
-            for(i=1; i<8; i++){
-                block[n][s->dsp.idct_permutation[i<<3]]= ac_val[i  ];
-            }
+            for (i = 1; i < 8; i++)
+                block[n][s->dsp.idct_permutation[i << 3]] = ac_val[i];
         }
     }
 }
@@ -123,77 +126,81 @@
  * @param[out] st scantable for each 8x8 block
  * @param[out] zigzag_last_index index referring to the last non zero coefficient in zigzag order
  */
-static inline int decide_ac_pred(MpegEncContext * s, int16_t block[6][64], const int dir[6], uint8_t *st[6], int zigzag_last_index[6])
+static inline int decide_ac_pred(MpegEncContext *s, int16_t block[6][64],
+                                 const int dir[6], uint8_t *st[6],
+                                 int zigzag_last_index[6])
 {
-    int score= 0;
+    int score = 0;
     int i, n;
-    int8_t * const qscale_table = s->current_picture.qscale_table;
+    int8_t *const qscale_table = s->current_picture.qscale_table;
 
-    memcpy(zigzag_last_index, s->block_last_index, sizeof(int)*6);
+    memcpy(zigzag_last_index, s->block_last_index, sizeof(int) * 6);
 
-    for(n=0; n<6; n++){
+    for (n = 0; n < 6; n++) {
         int16_t *ac_val, *ac_val1;
 
-        score -= get_block_rate(s, block[n], s->block_last_index[n], s->intra_scantable.permutated);
+        score -= get_block_rate(s, block[n], s->block_last_index[n],
+                                s->intra_scantable.permutated);
 
-        ac_val = s->ac_val[0][0] + s->block_index[n] * 16;
-        ac_val1= ac_val;
-        if(dir[n]){
-            const int xy= s->mb_x + s->mb_y*s->mb_stride - s->mb_stride;
+        ac_val  = s->ac_val[0][0] + s->block_index[n] * 16;
+        ac_val1 = ac_val;
+        if (dir[n]) {
+            const int xy = s->mb_x + s->mb_y * s->mb_stride - s->mb_stride;
             /* top prediction */
-            ac_val-= s->block_wrap[n]*16;
-            if(s->mb_y==0 || s->qscale == qscale_table[xy] || n==2 || n==3){
+            ac_val -= s->block_wrap[n] * 16;
+            if (s->mb_y == 0 || s->qscale == qscale_table[xy] || n == 2 || n == 3) {
                 /* same qscale */
-                for(i=1; i<8; i++){
-                    const int level= block[n][s->dsp.idct_permutation[i   ]];
-                    block[n][s->dsp.idct_permutation[i   ]] = level - ac_val[i+8];
-                    ac_val1[i  ]=    block[n][s->dsp.idct_permutation[i<<3]];
-                    ac_val1[i+8]= level;
+                for (i = 1; i < 8; i++) {
+                    const int level = block[n][s->dsp.idct_permutation[i]];
+                    block[n][s->dsp.idct_permutation[i]] = level - ac_val[i + 8];
+                    ac_val1[i]     = block[n][s->dsp.idct_permutation[i << 3]];
+                    ac_val1[i + 8] = level;
                 }
-            }else{
+            } else {
                 /* different qscale, we must rescale */
-                for(i=1; i<8; i++){
-                    const int level= block[n][s->dsp.idct_permutation[i   ]];
-                    block[n][s->dsp.idct_permutation[i   ]] = level - ROUNDED_DIV(ac_val[i + 8]*qscale_table[xy], s->qscale);
-                    ac_val1[i  ]=    block[n][s->dsp.idct_permutation[i<<3]];
-                    ac_val1[i+8]= level;
+                for (i = 1; i < 8; i++) {
+                    const int level = block[n][s->dsp.idct_permutation[i]];
+                    block[n][s->dsp.idct_permutation[i]] = level - ROUNDED_DIV(ac_val[i + 8] * qscale_table[xy], s->qscale);
+                    ac_val1[i]     = block[n][s->dsp.idct_permutation[i << 3]];
+                    ac_val1[i + 8] = level;
                 }
             }
-            st[n]= s->intra_h_scantable.permutated;
-        }else{
-            const int xy= s->mb_x-1 + s->mb_y*s->mb_stride;
+            st[n] = s->intra_h_scantable.permutated;
+        } else {
+            const int xy = s->mb_x - 1 + s->mb_y * s->mb_stride;
             /* left prediction */
-            ac_val-= 16;
-            if(s->mb_x==0 || s->qscale == qscale_table[xy] || n==1 || n==3){
+            ac_val -= 16;
+            if (s->mb_x == 0 || s->qscale == qscale_table[xy] || n == 1 || n == 3) {
                 /* same qscale */
-                for(i=1; i<8; i++){
-                    const int level= block[n][s->dsp.idct_permutation[i<<3]];
-                    block[n][s->dsp.idct_permutation[i<<3]]= level - ac_val[i];
-                    ac_val1[i  ]= level;
-                    ac_val1[i+8]=    block[n][s->dsp.idct_permutation[i   ]];
+                for (i = 1; i < 8; i++) {
+                    const int level = block[n][s->dsp.idct_permutation[i << 3]];
+                    block[n][s->dsp.idct_permutation[i << 3]] = level - ac_val[i];
+                    ac_val1[i]     = level;
+                    ac_val1[i + 8] = block[n][s->dsp.idct_permutation[i]];
                 }
-            }else{
+            } else {
                 /* different qscale, we must rescale */
-                for(i=1; i<8; i++){
-                    const int level= block[n][s->dsp.idct_permutation[i<<3]];
-                    block[n][s->dsp.idct_permutation[i<<3]]= level - ROUNDED_DIV(ac_val[i]*qscale_table[xy], s->qscale);
-                    ac_val1[i  ]= level;
-                    ac_val1[i+8]=    block[n][s->dsp.idct_permutation[i   ]];
+                for (i = 1; i < 8; i++) {
+                    const int level = block[n][s->dsp.idct_permutation[i << 3]];
+                    block[n][s->dsp.idct_permutation[i << 3]] = level - ROUNDED_DIV(ac_val[i] * qscale_table[xy], s->qscale);
+                    ac_val1[i]     = level;
+                    ac_val1[i + 8] = block[n][s->dsp.idct_permutation[i]];
                 }
             }
-            st[n]= s->intra_v_scantable.permutated;
+            st[n] = s->intra_v_scantable.permutated;
         }
 
-        for(i=63; i>0; i--) //FIXME optimize
-            if(block[n][ st[n][i] ]) break;
-        s->block_last_index[n]= i;
+        for (i = 63; i > 0; i--)  // FIXME optimize
+            if (block[n][st[n][i]])
+                break;
+        s->block_last_index[n] = i;
 
         score += get_block_rate(s, block[n], s->block_last_index[n], st[n]);
     }
 
-    if(score < 0){
+    if (score < 0) {
         return 1;
-    }else{
+    } else {
         restore_ac_coeffs(s, block, dir, st, zigzag_last_index);
         return 0;
     }
@@ -202,51 +209,55 @@
 /**
  * modify mb_type & qscale so that encoding is actually possible in mpeg4
  */
-void ff_clean_mpeg4_qscales(MpegEncContext *s){
+void ff_clean_mpeg4_qscales(MpegEncContext *s)
+{
     int i;
-    int8_t * const qscale_table = s->current_picture.qscale_table;
+    int8_t *const qscale_table = s->current_picture.qscale_table;
 
     ff_clean_h263_qscales(s);
 
-    if(s->pict_type== AV_PICTURE_TYPE_B){
-        int odd=0;
-        /* ok, come on, this isn't funny anymore, there's more code for handling this mpeg4 mess than for the actual adaptive quantization */
+    if (s->pict_type == AV_PICTURE_TYPE_B) {
+        int odd = 0;
+        /* ok, come on, this isn't funny anymore, there's more code for
+         * handling this mpeg4 mess than for the actual adaptive quantization */
 
-        for(i=0; i<s->mb_num; i++){
-            int mb_xy= s->mb_index2xy[i];
-            odd += qscale_table[mb_xy]&1;
+        for (i = 0; i < s->mb_num; i++) {
+            int mb_xy = s->mb_index2xy[i];
+            odd += qscale_table[mb_xy] & 1;
         }
 
-        if(2*odd > s->mb_num) odd=1;
-        else                  odd=0;
+        if (2 * odd > s->mb_num)
+            odd = 1;
+        else
+            odd = 0;
 
-        for(i=0; i<s->mb_num; i++){
-            int mb_xy= s->mb_index2xy[i];
-            if((qscale_table[mb_xy]&1) != odd)
+        for (i = 0; i < s->mb_num; i++) {
+            int mb_xy = s->mb_index2xy[i];
+            if ((qscale_table[mb_xy] & 1) != odd)
                 qscale_table[mb_xy]++;
-            if(qscale_table[mb_xy] > 31)
-                qscale_table[mb_xy]= 31;
+            if (qscale_table[mb_xy] > 31)
+                qscale_table[mb_xy] = 31;
         }
 
-        for(i=1; i<s->mb_num; i++){
-            int mb_xy= s->mb_index2xy[i];
-            if(qscale_table[mb_xy] != qscale_table[s->mb_index2xy[i-1]] && (s->mb_type[mb_xy]&CANDIDATE_MB_TYPE_DIRECT)){
-                s->mb_type[mb_xy]|= CANDIDATE_MB_TYPE_BIDIR;
+        for (i = 1; i < s->mb_num; i++) {
+            int mb_xy = s->mb_index2xy[i];
+            if (qscale_table[mb_xy] != qscale_table[s->mb_index2xy[i - 1]] &&
+                (s->mb_type[mb_xy] & CANDIDATE_MB_TYPE_DIRECT)) {
+                s->mb_type[mb_xy] |= CANDIDATE_MB_TYPE_BIDIR;
             }
         }
     }
 }
 
-
 /**
  * Encode the dc value.
  * @param n block index (0-3 are luma, 4-5 are chroma)
  */
-static inline void mpeg4_encode_dc(PutBitContext * s, int level, int n)
+static inline void mpeg4_encode_dc(PutBitContext *s, int level, int n)
 {
 #if 1
     /* DC will overflow if level is outside the [-255,255] range. */
-    level+=256;
+    level += 256;
     if (n < 4) {
         /* luminance */
         put_bits(s, uni_DCtab_lum_len[level], uni_DCtab_lum_bits[level]);
@@ -258,7 +269,7 @@
     int size, v;
     /* find number of bits */
     size = 0;
-    v = abs(level);
+    v    = abs(level);
     while (v) {
         v >>= 1;
         size++;
@@ -283,85 +294,98 @@
 #endif
 }
 
-static inline int mpeg4_get_dc_length(int level, int n){
-    if (n < 4) {
+static inline int mpeg4_get_dc_length(int level, int n)
+{
+    if (n < 4)
         return uni_DCtab_lum_len[level + 256];
-    } else {
+    else
         return uni_DCtab_chrom_len[level + 256];
-    }
 }
 
 /**
  * Encode an 8x8 block.
  * @param n block index (0-3 are luma, 4-5 are chroma)
  */
-static inline void mpeg4_encode_block(MpegEncContext * s, int16_t * block, int n, int intra_dc,
-                               uint8_t *scan_table, PutBitContext *dc_pb, PutBitContext *ac_pb)
+static inline void mpeg4_encode_block(MpegEncContext *s,
+                                      int16_t *block, int n, int intra_dc,
+                                      uint8_t *scan_table, PutBitContext *dc_pb,
+                                      PutBitContext *ac_pb)
 {
     int i, last_non_zero;
     uint32_t *bits_tab;
     uint8_t *len_tab;
     const int last_index = s->block_last_index[n];
 
-    if (s->mb_intra) { //Note gcc (3.2.1 at least) will optimize this away
+    if (s->mb_intra) {  // Note gcc (3.2.1 at least) will optimize this away
         /* mpeg4 based DC predictor */
         mpeg4_encode_dc(dc_pb, intra_dc, n);
-        if(last_index<1) return;
+        if (last_index < 1)
+            return;
         i = 1;
-        bits_tab= uni_mpeg4_intra_rl_bits;
-        len_tab = uni_mpeg4_intra_rl_len;
+        bits_tab = uni_mpeg4_intra_rl_bits;
+        len_tab  = uni_mpeg4_intra_rl_len;
     } else {
-        if(last_index<0) return;
+        if (last_index < 0)
+            return;
         i = 0;
-        bits_tab= uni_mpeg4_inter_rl_bits;
-        len_tab = uni_mpeg4_inter_rl_len;
+        bits_tab = uni_mpeg4_inter_rl_bits;
+        len_tab  = uni_mpeg4_inter_rl_len;
     }
 
     /* AC coefs */
     last_non_zero = i - 1;
     for (; i < last_index; i++) {
-        int level = block[ scan_table[i] ];
+        int level = block[scan_table[i]];
         if (level) {
             int run = i - last_non_zero - 1;
-            level+=64;
-            if((level&(~127)) == 0){
-                const int index= UNI_MPEG4_ENC_INDEX(0, run, level);
+            level += 64;
+            if ((level & (~127)) == 0) {
+                const int index = UNI_MPEG4_ENC_INDEX(0, run, level);
                 put_bits(ac_pb, len_tab[index], bits_tab[index]);
-            }else{ //ESC3
-                put_bits(ac_pb, 7+2+1+6+1+12+1, (3<<23)+(3<<21)+(0<<20)+(run<<14)+(1<<13)+(((level-64)&0xfff)<<1)+1);
+            } else {  // ESC3
+                put_bits(ac_pb,
+                         7 + 2 + 1 + 6 + 1 + 12 + 1,
+                         (3 << 23) + (3 << 21) + (0 << 20) + (run << 14) +
+                         (1 << 13) + (((level - 64) & 0xfff) << 1) + 1);
             }
             last_non_zero = i;
         }
     }
-    /*if(i<=last_index)*/{
-        int level = block[ scan_table[i] ];
-        int run = i - last_non_zero - 1;
-        level+=64;
-        if((level&(~127)) == 0){
-            const int index= UNI_MPEG4_ENC_INDEX(1, run, level);
+    /* if (i <= last_index) */ {
+        int level = block[scan_table[i]];
+        int run   = i - last_non_zero - 1;
+        level += 64;
+        if ((level & (~127)) == 0) {
+            const int index = UNI_MPEG4_ENC_INDEX(1, run, level);
             put_bits(ac_pb, len_tab[index], bits_tab[index]);
-        }else{ //ESC3
-            put_bits(ac_pb, 7+2+1+6+1+12+1, (3<<23)+(3<<21)+(1<<20)+(run<<14)+(1<<13)+(((level-64)&0xfff)<<1)+1);
+        } else {  // ESC3
+            put_bits(ac_pb,
+                     7 + 2 + 1 + 6 + 1 + 12 + 1,
+                     (3 << 23) + (3 << 21) + (1 << 20) + (run << 14) +
+                     (1 << 13) + (((level - 64) & 0xfff) << 1) + 1);
         }
     }
 }
 
-static int mpeg4_get_block_length(MpegEncContext * s, int16_t * block, int n, int intra_dc,
-                               uint8_t *scan_table)
+static int mpeg4_get_block_length(MpegEncContext *s,
+                                  int16_t *block, int n,
+                                  int intra_dc, uint8_t *scan_table)
 {
     int i, last_non_zero;
     uint8_t *len_tab;
     const int last_index = s->block_last_index[n];
-    int len=0;
+    int len = 0;
 
-    if (s->mb_intra) { //Note gcc (3.2.1 at least) will optimize this away
+    if (s->mb_intra) {  // Note gcc (3.2.1 at least) will optimize this away
         /* mpeg4 based DC predictor */
         len += mpeg4_get_dc_length(intra_dc, n);
-        if(last_index<1) return len;
+        if (last_index < 1)
+            return len;
         i = 1;
         len_tab = uni_mpeg4_intra_rl_len;
     } else {
-        if(last_index<0) return 0;
+        if (last_index < 0)
+            return 0;
         i = 0;
         len_tab = uni_mpeg4_inter_rl_len;
     }
@@ -369,82 +393,88 @@
     /* AC coefs */
     last_non_zero = i - 1;
     for (; i < last_index; i++) {
-        int level = block[ scan_table[i] ];
+        int level = block[scan_table[i]];
         if (level) {
             int run = i - last_non_zero - 1;
-            level+=64;
-            if((level&(~127)) == 0){
-                const int index= UNI_MPEG4_ENC_INDEX(0, run, level);
+            level += 64;
+            if ((level & (~127)) == 0) {
+                const int index = UNI_MPEG4_ENC_INDEX(0, run, level);
                 len += len_tab[index];
-            }else{ //ESC3
-                len += 7+2+1+6+1+12+1;
+            } else {  // ESC3
+                len += 7 + 2 + 1 + 6 + 1 + 12 + 1;
             }
             last_non_zero = i;
         }
     }
-    /*if(i<=last_index)*/{
-        int level = block[ scan_table[i] ];
-        int run = i - last_non_zero - 1;
-        level+=64;
-        if((level&(~127)) == 0){
-            const int index= UNI_MPEG4_ENC_INDEX(1, run, level);
+    /* if (i <= last_index) */ {
+        int level = block[scan_table[i]];
+        int run   = i - last_non_zero - 1;
+        level += 64;
+        if ((level & (~127)) == 0) {
+            const int index = UNI_MPEG4_ENC_INDEX(1, run, level);
             len += len_tab[index];
-        }else{ //ESC3
-            len += 7+2+1+6+1+12+1;
+        } else {  // ESC3
+            len += 7 + 2 + 1 + 6 + 1 + 12 + 1;
         }
     }
 
     return len;
 }
 
-static inline void mpeg4_encode_blocks(MpegEncContext * s, int16_t block[6][64], int intra_dc[6],
-                               uint8_t **scan_table, PutBitContext *dc_pb, PutBitContext *ac_pb){
+static inline void mpeg4_encode_blocks(MpegEncContext *s, int16_t block[6][64],
+                                       int intra_dc[6], uint8_t **scan_table,
+                                       PutBitContext *dc_pb,
+                                       PutBitContext *ac_pb)
+{
     int i;
 
-    if(scan_table){
-        if(s->flags2 & CODEC_FLAG2_NO_OUTPUT){
-            for (i = 0; i < 6; i++) {
-                skip_put_bits(&s->pb, mpeg4_get_block_length(s, block[i], i, intra_dc[i], scan_table[i]));
-            }
-        }else{
+    if (scan_table) {
+        if (s->flags2 & CODEC_FLAG2_NO_OUTPUT) {
+            for (i = 0; i < 6; i++)
+                skip_put_bits(&s->pb,
+                              mpeg4_get_block_length(s, block[i], i,
+                                                     intra_dc[i], scan_table[i]));
+        } else {
             /* encode each block */
-            for (i = 0; i < 6; i++) {
-                mpeg4_encode_block(s, block[i], i, intra_dc[i], scan_table[i], dc_pb, ac_pb);
-            }
+            for (i = 0; i < 6; i++)
+                mpeg4_encode_block(s, block[i], i,
+                                   intra_dc[i], scan_table[i], dc_pb, ac_pb);
         }
-    }else{
-        if(s->flags2 & CODEC_FLAG2_NO_OUTPUT){
-            for (i = 0; i < 6; i++) {
-                skip_put_bits(&s->pb, mpeg4_get_block_length(s, block[i], i, 0, s->intra_scantable.permutated));
-            }
-        }else{
+    } else {
+        if (s->flags2 & CODEC_FLAG2_NO_OUTPUT) {
+            for (i = 0; i < 6; i++)
+                skip_put_bits(&s->pb,
+                              mpeg4_get_block_length(s, block[i], i, 0,
+                                                     s->intra_scantable.permutated));
+        } else {
             /* encode each block */
-            for (i = 0; i < 6; i++) {
-                mpeg4_encode_block(s, block[i], i, 0, s->intra_scantable.permutated, dc_pb, ac_pb);
-            }
+            for (i = 0; i < 6; i++)
+                mpeg4_encode_block(s, block[i], i, 0,
+                                   s->intra_scantable.permutated, dc_pb, ac_pb);
         }
     }
 }
 
-static inline int get_b_cbp(MpegEncContext * s, int16_t block[6][64],
+static inline int get_b_cbp(MpegEncContext *s, int16_t block[6][64],
                             int motion_x, int motion_y, int mb_type)
 {
     int cbp = 0, i;
 
     if (s->mpv_flags & FF_MPV_FLAG_CBP_RD) {
-        int score = 0;
+        int score        = 0;
         const int lambda = s->lambda2 >> (FF_LAMBDA_SHIFT - 6);
 
-        for (i = 0; i < 6; i++)
+        for (i = 0; i < 6; i++) {
             if (s->coded_score[i] < 0) {
                 score += s->coded_score[i];
                 cbp   |= 1 << (5 - i);
             }
+        }
 
         if (cbp) {
             int zero_score = -6;
             if ((motion_x | motion_y | s->dquant | mb_type) == 0)
-                zero_score -= 4; //2*MV + mb_type + cbp bit
+                zero_score -= 4;  // 2 * MV + mb_type + cbp bit
 
             zero_score *= lambda;
             if (zero_score <= score)
@@ -466,62 +496,61 @@
     return cbp;
 }
 
-//FIXME this is duplicated to h263.c
-static const int dquant_code[5]= {1,0,9,2,3};
+// FIXME this is duplicated to h263.c
+static const int dquant_code[5] = { 1, 0, 9, 2, 3 };
 
-void ff_mpeg4_encode_mb(MpegEncContext * s,
-                        int16_t block[6][64],
+void ff_mpeg4_encode_mb(MpegEncContext *s, int16_t block[6][64],
                         int motion_x, int motion_y)
 {
     int cbpc, cbpy, pred_x, pred_y;
-    PutBitContext * const pb2    = s->data_partitioning                         ? &s->pb2    : &s->pb;
-    PutBitContext * const tex_pb = s->data_partitioning && s->pict_type!=AV_PICTURE_TYPE_B ? &s->tex_pb : &s->pb;
-    PutBitContext * const dc_pb  = s->data_partitioning && s->pict_type!=AV_PICTURE_TYPE_I ? &s->pb2    : &s->pb;
-    const int interleaved_stats= (s->flags&CODEC_FLAG_PASS1) && !s->data_partitioning ? 1 : 0;
+    PutBitContext *const pb2    = s->data_partitioning ? &s->pb2 : &s->pb;
+    PutBitContext *const tex_pb = s->data_partitioning && s->pict_type != AV_PICTURE_TYPE_B ? &s->tex_pb : &s->pb;
+    PutBitContext *const dc_pb  = s->data_partitioning && s->pict_type != AV_PICTURE_TYPE_I ? &s->pb2 : &s->pb;
+    const int interleaved_stats = (s->flags & CODEC_FLAG_PASS1) && !s->data_partitioning ? 1 : 0;
 
     if (!s->mb_intra) {
         int i, cbp;
 
-        if(s->pict_type==AV_PICTURE_TYPE_B){
-            static const int mb_type_table[8]= {-1, 3, 2, 1,-1,-1,-1, 0}; /* convert from mv_dir to type */
-            int mb_type=  mb_type_table[s->mv_dir];
-
-            if(s->mb_x==0){
-                for(i=0; i<2; i++){
-                    s->last_mv[i][0][0]=
-                    s->last_mv[i][0][1]=
-                    s->last_mv[i][1][0]=
-                    s->last_mv[i][1][1]= 0;
-                }
+        if (s->pict_type == AV_PICTURE_TYPE_B) {
+            /* convert from mv_dir to type */
+            static const int mb_type_table[8] = { -1, 3, 2, 1, -1, -1, -1, 0 };
+            int mb_type = mb_type_table[s->mv_dir];
+
+            if (s->mb_x == 0) {
+                for (i = 0; i < 2; i++)
+                    s->last_mv[i][0][0] =
+                    s->last_mv[i][0][1] =
+                    s->last_mv[i][1][0] =
+                    s->last_mv[i][1][1] = 0;
             }
 
-            av_assert2(s->dquant>=-2 && s->dquant<=2);
-            av_assert2((s->dquant&1)==0);
-            av_assert2(mb_type>=0);
+            av_assert2(s->dquant >= -2 && s->dquant <= 2);
+            av_assert2((s->dquant & 1) == 0);
+            av_assert2(mb_type >= 0);
 
             /* nothing to do if this MB was skipped in the next P Frame */
-            if (s->next_picture.mbskip_table[s->mb_y * s->mb_stride + s->mb_x]) { //FIXME avoid DCT & ...
+            if (s->next_picture.mbskip_table[s->mb_y * s->mb_stride + s->mb_x]) {  // FIXME avoid DCT & ...
                 s->skip_count++;
-                s->mv[0][0][0]=
-                s->mv[0][0][1]=
-                s->mv[1][0][0]=
-                s->mv[1][0][1]= 0;
-                s->mv_dir= MV_DIR_FORWARD; //doesn't matter
+                s->mv[0][0][0] =
+                s->mv[0][0][1] =
+                s->mv[1][0][0] =
+                s->mv[1][0][1] = 0;
+                s->mv_dir  = MV_DIR_FORWARD;  // doesn't matter
                 s->qscale -= s->dquant;
-//                s->mb_skipped=1;
+//                s->mb_skipped = 1;
 
                 return;
             }
 
-            cbp= get_b_cbp(s, block, motion_x, motion_y, mb_type);
+            cbp = get_b_cbp(s, block, motion_x, motion_y, mb_type);
 
-            if ((cbp | motion_x | motion_y | mb_type) ==0) {
+            if ((cbp | motion_x | motion_y | mb_type) == 0) {
                 /* direct MB with MV={0,0} */
-                av_assert2(s->dquant==0);
+                av_assert2(s->dquant == 0);
 
                 put_bits(&s->pb, 1, 1); /* mb not coded modb1=1 */
 
-                if(interleaved_stats){
+                if (interleaved_stats) {
                     s->misc_bits++;
                     s->last_bits++;
                 }
@@ -529,149 +558,160 @@
                 return;
             }
 
-            put_bits(&s->pb, 1, 0);     /* mb coded modb1=0 */
-            put_bits(&s->pb, 1, cbp ? 0 : 1); /* modb2 */ //FIXME merge
-            put_bits(&s->pb, mb_type+1, 1); // this table is so simple that we don't need it :)
-            if(cbp) put_bits(&s->pb, 6, cbp);
+            put_bits(&s->pb, 1, 0);            /* mb coded modb1=0 */
+            put_bits(&s->pb, 1, cbp ? 0 : 1);  /* modb2 */ // FIXME merge
+            put_bits(&s->pb, mb_type + 1, 1);  // this table is so simple that we don't need it :)
+            if (cbp)
+                put_bits(&s->pb, 6, cbp);
 
-            if(cbp && mb_type){
-                if(s->dquant)
-                    put_bits(&s->pb, 2, (s->dquant>>2)+3);
+            if (cbp && mb_type) {
+                if (s->dquant)
+                    put_bits(&s->pb, 2, (s->dquant >> 2) + 3);
                 else
                     put_bits(&s->pb, 1, 0);
-            }else
+            } else
                 s->qscale -= s->dquant;
 
-            if(!s->progressive_sequence){
-                if(cbp)
+            if (!s->progressive_sequence) {
+                if (cbp)
                     put_bits(&s->pb, 1, s->interlaced_dct);
-                if(mb_type) // not direct mode
+                if (mb_type)                  // not direct mode
                     put_bits(&s->pb, 1, s->mv_type == MV_TYPE_FIELD);
             }
 
-            if(interleaved_stats){
-                s->misc_bits+= get_bits_diff(s);
-            }
+            if (interleaved_stats)
+                s->misc_bits += get_bits_diff(s);
 
-            if(mb_type == 0){
+            if (!mb_type) {
                 av_assert2(s->mv_dir & MV_DIRECT);
                 ff_h263_encode_motion_vector(s, motion_x, motion_y, 1);
                 s->b_count++;
                 s->f_count++;
-            }else{
+            } else {
                 av_assert2(mb_type > 0 && mb_type < 4);
-                if(s->mv_type != MV_TYPE_FIELD){
-                    if(s->mv_dir & MV_DIR_FORWARD){
-                        ff_h263_encode_motion_vector(s, s->mv[0][0][0] - s->last_mv[0][0][0],
-                                                        s->mv[0][0][1] - s->last_mv[0][0][1], s->f_code);
-                        s->last_mv[0][0][0]= s->last_mv[0][1][0]= s->mv[0][0][0];
-                        s->last_mv[0][0][1]= s->last_mv[0][1][1]= s->mv[0][0][1];
+                if (s->mv_type != MV_TYPE_FIELD) {
+                    if (s->mv_dir & MV_DIR_FORWARD) {
+                        ff_h263_encode_motion_vector(s,
+                                                     s->mv[0][0][0] - s->last_mv[0][0][0],
+                                                     s->mv[0][0][1] - s->last_mv[0][0][1],
+                                                     s->f_code);
+                        s->last_mv[0][0][0] =
+                        s->last_mv[0][1][0] = s->mv[0][0][0];
+                        s->last_mv[0][0][1] =
+                        s->last_mv[0][1][1] = s->mv[0][0][1];
                         s->f_count++;
                     }
-                    if(s->mv_dir & MV_DIR_BACKWARD){
-                        ff_h263_encode_motion_vector(s, s->mv[1][0][0] - s->last_mv[1][0][0],
-                                                        s->mv[1][0][1] - s->last_mv[1][0][1], s->b_code);
-                        s->last_mv[1][0][0]= s->last_mv[1][1][0]= s->mv[1][0][0];
-                        s->last_mv[1][0][1]= s->last_mv[1][1][1]= s->mv[1][0][1];
+                    if (s->mv_dir & MV_DIR_BACKWARD) {
+                        ff_h263_encode_motion_vector(s,
+                                                     s->mv[1][0][0] - s->last_mv[1][0][0],
+                                                     s->mv[1][0][1] - s->last_mv[1][0][1],
+                                                     s->b_code);
+                        s->last_mv[1][0][0] =
+                        s->last_mv[1][1][0] = s->mv[1][0][0];
+                        s->last_mv[1][0][1] =
+                        s->last_mv[1][1][1] = s->mv[1][0][1];
                         s->b_count++;
                     }
-                }else{
-                    if(s->mv_dir & MV_DIR_FORWARD){
+                } else {
+                    if (s->mv_dir & MV_DIR_FORWARD) {
                         put_bits(&s->pb, 1, s->field_select[0][0]);
                         put_bits(&s->pb, 1, s->field_select[0][1]);
                     }
-                    if(s->mv_dir & MV_DIR_BACKWARD){
+                    if (s->mv_dir & MV_DIR_BACKWARD) {
                         put_bits(&s->pb, 1, s->field_select[1][0]);
                         put_bits(&s->pb, 1, s->field_select[1][1]);
                     }
-                    if(s->mv_dir & MV_DIR_FORWARD){
-                        for(i=0; i<2; i++){
-                            ff_h263_encode_motion_vector(s, s->mv[0][i][0] - s->last_mv[0][i][0]  ,
-                                                            s->mv[0][i][1] - s->last_mv[0][i][1]/2, s->f_code);
-                            s->last_mv[0][i][0]= s->mv[0][i][0];
-                            s->last_mv[0][i][1]= s->mv[0][i][1]*2;
+                    if (s->mv_dir & MV_DIR_FORWARD) {
+                        for (i = 0; i < 2; i++) {
+                            ff_h263_encode_motion_vector(s,
+                                                         s->mv[0][i][0] - s->last_mv[0][i][0],
+                                                         s->mv[0][i][1] - s->last_mv[0][i][1] / 2,
+                                                         s->f_code);
+                            s->last_mv[0][i][0] = s->mv[0][i][0];
+                            s->last_mv[0][i][1] = s->mv[0][i][1] * 2;
                         }
                         s->f_count++;
                     }
-                    if(s->mv_dir & MV_DIR_BACKWARD){
-                        for(i=0; i<2; i++){
-                            ff_h263_encode_motion_vector(s, s->mv[1][i][0] - s->last_mv[1][i][0]  ,
-                                                            s->mv[1][i][1] - s->last_mv[1][i][1]/2, s->b_code);
-                            s->last_mv[1][i][0]= s->mv[1][i][0];
-                            s->last_mv[1][i][1]= s->mv[1][i][1]*2;
+                    if (s->mv_dir & MV_DIR_BACKWARD) {
+                        for (i = 0; i < 2; i++) {
+                            ff_h263_encode_motion_vector(s,
+                                                         s->mv[1][i][0] - s->last_mv[1][i][0],
+                                                         s->mv[1][i][1] - s->last_mv[1][i][1] / 2,
+                                                         s->b_code);
+                            s->last_mv[1][i][0] = s->mv[1][i][0];
+                            s->last_mv[1][i][1] = s->mv[1][i][1] * 2;
                         }
                         s->b_count++;
                     }
                 }
             }
 
-            if(interleaved_stats){
-                s->mv_bits+= get_bits_diff(s);
-            }
+            if (interleaved_stats)
+                s->mv_bits += get_bits_diff(s);
 
             mpeg4_encode_blocks(s, block, NULL, NULL, NULL, &s->pb);
 
-            if(interleaved_stats){
-                s->p_tex_bits+= get_bits_diff(s);
-            }
-
-        }else{ /* s->pict_type==AV_PICTURE_TYPE_B */
-            cbp= get_p_cbp(s, block, motion_x, motion_y);
-
-            if ((cbp | motion_x | motion_y | s->dquant) == 0 && s->mv_type==MV_TYPE_16X16) {
-                /* check if the B frames can skip it too, as we must skip it if we skip here
-                   why didn't they just compress the skip-mb bits instead of reusing them ?! */
-                if(s->max_b_frames>0){
+            if (interleaved_stats)
+                s->p_tex_bits += get_bits_diff(s);
+        } else { /* s->pict_type==AV_PICTURE_TYPE_B */
+            cbp = get_p_cbp(s, block, motion_x, motion_y);
+
+            if ((cbp | motion_x | motion_y | s->dquant) == 0 &&
+                s->mv_type == MV_TYPE_16X16) {
+                /* check if the B frames can skip it too, as we must skip it
+                 * if we skip here why didn't they just compress
+                 * the skip-mb bits instead of reusing them ?! */
+                if (s->max_b_frames > 0) {
                     int i;
-                    int x,y, offset;
+                    int x, y, offset;
                     uint8_t *p_pic;
 
-                    x= s->mb_x*16;
-                    y= s->mb_y*16;
+                    x = s->mb_x * 16;
+                    y = s->mb_y * 16;
 
-                    offset= x + y*s->linesize;
-                    p_pic = s->new_picture.f.data[0] + offset;
+                    offset = x + y * s->linesize;
+                    p_pic  = s->new_picture.f.data[0] + offset;
 
-                    s->mb_skipped=1;
-                    for(i=0; i<s->max_b_frames; i++){
+                    s->mb_skipped = 1;
+                    for (i = 0; i < s->max_b_frames; i++) {
                         uint8_t *b_pic;
                         int diff;
-                        Picture *pic= s->reordered_input_picture[i+1];
+                        Picture *pic = s->reordered_input_picture[i + 1];
 
-                        if (pic == NULL || pic->f.pict_type != AV_PICTURE_TYPE_B)
+                        if (!pic || pic->f.pict_type != AV_PICTURE_TYPE_B)
                             break;
 
                         b_pic = pic->f.data[0] + offset;
                         if (!pic->shared)
-                            b_pic+= INPLACE_OFFSET;
-
-                        if(x+16 > s->width || y+16 > s->height){
-                            int x1,y1;
-                            int xe= FFMIN(16, s->width - x);
-                            int ye= FFMIN(16, s->height- y);
-                            diff=0;
-                            for(y1=0; y1<ye; y1++){
-                                for(x1=0; x1<xe; x1++){
-                                    diff+= FFABS(p_pic[x1+y1*s->linesize] - b_pic[x1+y1*s->linesize]);
+                            b_pic += INPLACE_OFFSET;
+
+                        if (x + 16 > s->width || y + 16 > s->height) {
+                            int x1, y1;
+                            int xe = FFMIN(16, s->width - x);
+                            int ye = FFMIN(16, s->height - y);
+                            diff = 0;
+                            for (y1 = 0; y1 < ye; y1++) {
+                                for (x1 = 0; x1 < xe; x1++) {
+                                    diff += FFABS(p_pic[x1 + y1 * s->linesize] - b_pic[x1 + y1 * s->linesize]);
                                 }
                             }
-                            diff= diff*256/(xe*ye);
-                        }else{
-                            diff= s->dsp.sad[0](NULL, p_pic, b_pic, s->linesize, 16);
+                            diff = diff * 256 / (xe * ye);
+                        } else {
+                            diff = s->dsp.sad[0](NULL, p_pic, b_pic, s->linesize, 16);
                         }
-                        if(diff>s->qscale*70){ //FIXME check that 70 is optimal
-                            s->mb_skipped=0;
+                        if (diff > s->qscale * 70) {  // FIXME check that 70 is optimal
+                            s->mb_skipped = 0;
                             break;
                         }
                     }
-                }else
-                    s->mb_skipped=1;
+                } else
+                    s->mb_skipped = 1;
 
-                if(s->mb_skipped==1){
+                if (s->mb_skipped == 1) {
                     /* skip macroblock */
                     put_bits(&s->pb, 1, 1);
 
-                    if(interleaved_stats){
+                    if (interleaved_stats) {
                         s->misc_bits++;
                         s->last_bits++;
                     }
@@ -682,162 +722,164 @@
             }
 
             put_bits(&s->pb, 1, 0);     /* mb coded */
-            cbpc = cbp & 3;
-            cbpy = cbp >> 2;
+            cbpc  = cbp & 3;
+            cbpy  = cbp >> 2;
             cbpy ^= 0xf;
-            if(s->mv_type==MV_TYPE_16X16){
-                if(s->dquant) cbpc+= 8;
+            if (s->mv_type == MV_TYPE_16X16) {
+                if (s->dquant)
+                    cbpc += 8;
                 put_bits(&s->pb,
-                        ff_h263_inter_MCBPC_bits[cbpc],
-                        ff_h263_inter_MCBPC_code[cbpc]);
+                         ff_h263_inter_MCBPC_bits[cbpc],
+                         ff_h263_inter_MCBPC_code[cbpc]);
 
                 put_bits(pb2, ff_h263_cbpy_tab[cbpy][1], ff_h263_cbpy_tab[cbpy][0]);
-                if(s->dquant)
-                    put_bits(pb2, 2, dquant_code[s->dquant+2]);
+                if (s->dquant)
+                    put_bits(pb2, 2, dquant_code[s->dquant + 2]);
 
-                if(!s->progressive_sequence){
-                    if(cbp)
+                if (!s->progressive_sequence) {
+                    if (cbp)
                         put_bits(pb2, 1, s->interlaced_dct);
                     put_bits(pb2, 1, 0);
                 }
 
-                if(interleaved_stats){
-                    s->misc_bits+= get_bits_diff(s);
-                }
+                if (interleaved_stats)
+                    s->misc_bits += get_bits_diff(s);
 
                 /* motion vectors: 16x16 mode */
                 ff_h263_pred_motion(s, 0, 0, &pred_x, &pred_y);
 
-                ff_h263_encode_motion_vector(s, motion_x - pred_x,
-                                                motion_y - pred_y, s->f_code);
-            }else if(s->mv_type==MV_TYPE_FIELD){
-                if(s->dquant) cbpc+= 8;
+                ff_h263_encode_motion_vector(s,
+                                             motion_x - pred_x,
+                                             motion_y - pred_y,
+                                             s->f_code);
+            } else if (s->mv_type == MV_TYPE_FIELD) {
+                if (s->dquant)
+                    cbpc += 8;
                 put_bits(&s->pb,
-                        ff_h263_inter_MCBPC_bits[cbpc],
-                        ff_h263_inter_MCBPC_code[cbpc]);
+                         ff_h263_inter_MCBPC_bits[cbpc],
+                         ff_h263_inter_MCBPC_code[cbpc]);
 
                 put_bits(pb2, ff_h263_cbpy_tab[cbpy][1], ff_h263_cbpy_tab[cbpy][0]);
-                if(s->dquant)
-                    put_bits(pb2, 2, dquant_code[s->dquant+2]);
+                if (s->dquant)
+                    put_bits(pb2, 2, dquant_code[s->dquant + 2]);
 
                 av_assert2(!s->progressive_sequence);
-                if(cbp)
+                if (cbp)
                     put_bits(pb2, 1, s->interlaced_dct);
                 put_bits(pb2, 1, 1);
 
-                if(interleaved_stats){
-                    s->misc_bits+= get_bits_diff(s);
-                }
+                if (interleaved_stats)
+                    s->misc_bits += get_bits_diff(s);
 
                 /* motion vectors: 16x8 interlaced mode */
                 ff_h263_pred_motion(s, 0, 0, &pred_x, &pred_y);
-                pred_y /=2;
+                pred_y /= 2;
 
                 put_bits(&s->pb, 1, s->field_select[0][0]);
                 put_bits(&s->pb, 1, s->field_select[0][1]);
 
-                ff_h263_encode_motion_vector(s, s->mv[0][0][0] - pred_x,
-                                                s->mv[0][0][1] - pred_y, s->f_code);
-                ff_h263_encode_motion_vector(s, s->mv[0][1][0] - pred_x,
-                                                s->mv[0][1][1] - pred_y, s->f_code);
-            }else{
-                av_assert2(s->mv_type==MV_TYPE_8X8);
+                ff_h263_encode_motion_vector(s,
+                                             s->mv[0][0][0] - pred_x,
+                                             s->mv[0][0][1] - pred_y,
+                                             s->f_code);
+                ff_h263_encode_motion_vector(s,
+                                             s->mv[0][1][0] - pred_x,
+                                             s->mv[0][1][1] - pred_y,
+                                             s->f_code);
+            } else {
+                av_assert2(s->mv_type == MV_TYPE_8X8);
                 put_bits(&s->pb,
-                        ff_h263_inter_MCBPC_bits[cbpc+16],
-                        ff_h263_inter_MCBPC_code[cbpc+16]);
+                         ff_h263_inter_MCBPC_bits[cbpc + 16],
+                         ff_h263_inter_MCBPC_code[cbpc + 16]);
                 put_bits(pb2, ff_h263_cbpy_tab[cbpy][1], ff_h263_cbpy_tab[cbpy][0]);
 
-                if(!s->progressive_sequence){
-                    if(cbp)
-                        put_bits(pb2, 1, s->interlaced_dct);
-                }
+                if (!s->progressive_sequence && cbp)
+                    put_bits(pb2, 1, s->interlaced_dct);
 
-                if(interleaved_stats){
-                    s->misc_bits+= get_bits_diff(s);
-                }
+                if (interleaved_stats)
+                    s->misc_bits += get_bits_diff(s);
 
-                for(i=0; i<4; i++){
+                for (i = 0; i < 4; i++) {
                     /* motion vectors: 8x8 mode*/
                     ff_h263_pred_motion(s, i, 0, &pred_x, &pred_y);
 
-                    ff_h263_encode_motion_vector(s, s->current_picture.motion_val[0][ s->block_index[i] ][0] - pred_x,
-                                                    s->current_picture.motion_val[0][ s->block_index[i] ][1] - pred_y, s->f_code);
+                    ff_h263_encode_motion_vector(s,
+                                                 s->current_picture.motion_val[0][s->block_index[i]][0] - pred_x,
+                                                 s->current_picture.motion_val[0][s->block_index[i]][1] - pred_y,
+                                                 s->f_code);
                 }
             }
 
-            if(interleaved_stats){
-                s->mv_bits+= get_bits_diff(s);
-            }
+            if (interleaved_stats)
+                s->mv_bits += get_bits_diff(s);
 
             mpeg4_encode_blocks(s, block, NULL, NULL, NULL, tex_pb);
 
-            if(interleaved_stats){
-                s->p_tex_bits+= get_bits_diff(s);
-            }
+            if (interleaved_stats)
+                s->p_tex_bits += get_bits_diff(s);
+
             s->f_count++;
         }
     } else {
         int cbp;
-        int dc_diff[6];   //dc values with the dc prediction subtracted
-        int dir[6];  //prediction direction
+        int dc_diff[6];  // dc values with the dc prediction subtracted
+        int dir[6];      // prediction direction
         int zigzag_last_index[6];
         uint8_t *scan_table[6];
         int i;
 
-        for(i=0; i<6; i++){
-            dc_diff[i]= ff_mpeg4_pred_dc(s, i, block[i][0], &dir[i], 1);
-        }
+        for (i = 0; i < 6; i++)
+            dc_diff[i] = ff_mpeg4_pred_dc(s, i, block[i][0], &dir[i], 1);
 
-        if(s->flags & CODEC_FLAG_AC_PRED){
-            s->ac_pred= decide_ac_pred(s, block, dir, scan_table, zigzag_last_index);
-        }else{
-            for(i=0; i<6; i++)
-                scan_table[i]= s->intra_scantable.permutated;
+        if (s->flags & CODEC_FLAG_AC_PRED) {
+            s->ac_pred = decide_ac_pred(s, block, dir, scan_table, zigzag_last_index);
+        } else {
+            for (i = 0; i < 6; i++)
+                scan_table[i] = s->intra_scantable.permutated;
         }
 
         /* compute cbp */
         cbp = 0;
-        for (i = 0; i < 6; i++) {
+        for (i = 0; i < 6; i++)
             if (s->block_last_index[i] >= 1)
                 cbp |= 1 << (5 - i);
-        }
 
         cbpc = cbp & 3;
         if (s->pict_type == AV_PICTURE_TYPE_I) {
-            if(s->dquant) cbpc+=4;
+            if (s->dquant)
+                cbpc += 4;
             put_bits(&s->pb,
-                ff_h263_intra_MCBPC_bits[cbpc],
-                ff_h263_intra_MCBPC_code[cbpc]);
+                     ff_h263_intra_MCBPC_bits[cbpc],
+                     ff_h263_intra_MCBPC_code[cbpc]);
         } else {
-            if(s->dquant) cbpc+=8;
+            if (s->dquant)
+                cbpc += 8;
             put_bits(&s->pb, 1, 0);     /* mb coded */
             put_bits(&s->pb,
-                ff_h263_inter_MCBPC_bits[cbpc + 4],
-                ff_h263_inter_MCBPC_code[cbpc + 4]);
+                     ff_h263_inter_MCBPC_bits[cbpc + 4],
+                     ff_h263_inter_MCBPC_code[cbpc + 4]);
         }
         put_bits(pb2, 1, s->ac_pred);
         cbpy = cbp >> 2;
         put_bits(pb2, ff_h263_cbpy_tab[cbpy][1], ff_h263_cbpy_tab[cbpy][0]);
-        if(s->dquant)
-            put_bits(dc_pb, 2, dquant_code[s->dquant+2]);
+        if (s->dquant)
+            put_bits(dc_pb, 2, dquant_code[s->dquant + 2]);
 
-        if(!s->progressive_sequence){
+        if (!s->progressive_sequence)
             put_bits(dc_pb, 1, s->interlaced_dct);
-        }
 
-        if(interleaved_stats){
-            s->misc_bits+= get_bits_diff(s);
-        }
+        if (interleaved_stats)
+            s->misc_bits += get_bits_diff(s);
 
         mpeg4_encode_blocks(s, block, dc_diff, scan_table, dc_pb, tex_pb);
 
-        if(interleaved_stats){
-            s->i_tex_bits+= get_bits_diff(s);
-        }
+        if (interleaved_stats)
+            s->i_tex_bits += get_bits_diff(s);
         s->i_count++;
 
-        /* restore ac coeffs & last_index stuff if we messed them up with the prediction */
-        if(s->ac_pred)
+        /* restore ac coeffs & last_index stuff
+         * if we messed them up with the prediction */
+        if (s->ac_pred)
             restore_ac_coeffs(s, block, dir, scan_table, zigzag_last_index);
     }
 }
@@ -845,25 +887,28 @@
 /**
  * add mpeg4 stuffing bits (01...1)
  */
-void ff_mpeg4_stuffing(PutBitContext * pbc)
+void ff_mpeg4_stuffing(PutBitContext *pbc)
 {
     int length;
     put_bits(pbc, 1, 0);
-    length= (-put_bits_count(pbc))&7;
-    if(length) put_bits(pbc, length, (1<<length)-1);
+    length = (-put_bits_count(pbc)) & 7;
+    if (length)
+        put_bits(pbc, length, (1 << length) - 1);
 }
 
 /* must be called before writing the header */
-void ff_set_mpeg4_time(MpegEncContext * s){
-    if(s->pict_type==AV_PICTURE_TYPE_B){
+void ff_set_mpeg4_time(MpegEncContext *s)
+{
+    if (s->pict_type == AV_PICTURE_TYPE_B) {
         ff_mpeg4_init_direct_mv(s);
-    }else{
-        s->last_time_base= s->time_base;
-        s->time_base= FFUDIV(s->time, s->avctx->time_base.den);
+    } else {
+        s->last_time_base = s->time_base;
+        s->time_base      = FFUDIV(s->time, s->avctx->time_base.den);
     }
 }
 
-static void mpeg4_encode_gop_header(MpegEncContext * s){
+static void mpeg4_encode_gop_header(MpegEncContext *s)
+{
     int hours, minutes, seconds;
     int64_t time;
 
@@ -871,52 +916,51 @@
     put_bits(&s->pb, 16, GOP_STARTCODE);
 
     time = s->current_picture_ptr->f.pts;
-    if(s->reordered_input_picture[1])
+    if (s->reordered_input_picture[1])
         time = FFMIN(time, s->reordered_input_picture[1]->f.pts);
-    time= time*s->avctx->time_base.num;
-    s->last_time_base= FFUDIV(time, s->avctx->time_base.den);
+    time = time * s->avctx->time_base.num;
+    s->last_time_base = FFUDIV(time, s->avctx->time_base.den);
 
-    seconds= FFUDIV(time, s->avctx->time_base.den);
-    minutes= FFUDIV(seconds, 60); seconds = FFUMOD(seconds, 60);
-    hours  = FFUDIV(minutes, 60); minutes = FFUMOD(minutes, 60);
-    hours  = FFUMOD(hours  , 24);
+    seconds = FFUDIV(time, s->avctx->time_base.den);
+    minutes = FFUDIV(seconds, 60); seconds = FFUMOD(seconds, 60);
+    hours   = FFUDIV(minutes, 60); minutes = FFUMOD(minutes, 60);
+    hours   = FFUMOD(hours  , 24);
 
     put_bits(&s->pb, 5, hours);
     put_bits(&s->pb, 6, minutes);
     put_bits(&s->pb, 1, 1);
     put_bits(&s->pb, 6, seconds);
 
-    put_bits(&s->pb, 1, !!(s->flags&CODEC_FLAG_CLOSED_GOP));
-    put_bits(&s->pb, 1, 0); //broken link == NO
+    put_bits(&s->pb, 1, !!(s->flags & CODEC_FLAG_CLOSED_GOP));
+    put_bits(&s->pb, 1, 0);  // broken link == NO
 
     ff_mpeg4_stuffing(&s->pb);
 }
 
-static void mpeg4_encode_visual_object_header(MpegEncContext * s){
+static void mpeg4_encode_visual_object_header(MpegEncContext *s)
+{
     int profile_and_level_indication;
     int vo_ver_id;
 
-    if(s->avctx->profile != FF_PROFILE_UNKNOWN){
+    if (s->avctx->profile != FF_PROFILE_UNKNOWN) {
         profile_and_level_indication = s->avctx->profile << 4;
-    }else if(s->max_b_frames || s->quarter_sample){
-        profile_and_level_indication= 0xF0; // adv simple
-    }else{
-        profile_and_level_indication= 0x00; // simple
+    } else if (s->max_b_frames || s->quarter_sample) {
+        profile_and_level_indication = 0xF0;  // adv simple
+    } else {
+        profile_and_level_indication = 0x00;  // simple
     }
 
-    if(s->avctx->level != FF_LEVEL_UNKNOWN){
+    if (s->avctx->level != FF_LEVEL_UNKNOWN)
         profile_and_level_indication |= s->avctx->level;
-    }else{
-        profile_and_level_indication |= 1; //level 1
-    }
+    else
+        profile_and_level_indication |= 1;   // level 1
 
-    if(profile_and_level_indication>>4 == 0xF){
-        vo_ver_id= 5;
-    }else{
-        vo_ver_id= 1;
-    }
+    if (profile_and_level_indication >> 4 == 0xF)
+        vo_ver_id = 5;
+    else
+        vo_ver_id = 1;
 
-    //FIXME levels
+    // FIXME levels
 
     put_bits(&s->pb, 16, 0);
     put_bits(&s->pb, 16, VOS_STARTCODE);
@@ -927,28 +971,31 @@
     put_bits(&s->pb, 16, VISUAL_OBJ_STARTCODE);
 
     put_bits(&s->pb, 1, 1);
-        put_bits(&s->pb, 4, vo_ver_id);
-        put_bits(&s->pb, 3, 1); //priority
+    put_bits(&s->pb, 4, vo_ver_id);
+    put_bits(&s->pb, 3, 1);     // priority
 
-    put_bits(&s->pb, 4, 1); //visual obj type== video obj
+    put_bits(&s->pb, 4, 1);     // visual obj type== video obj
 
-    put_bits(&s->pb, 1, 0); //video signal type == no clue //FIXME
+    put_bits(&s->pb, 1, 0);     // video signal type == no clue // FIXME
 
     ff_mpeg4_stuffing(&s->pb);
 }
 
-static void mpeg4_encode_vol_header(MpegEncContext * s, int vo_number, int vol_number)
+static void mpeg4_encode_vol_header(MpegEncContext *s,
+                                    int vo_number,
+                                    int vol_number)
 {
     int vo_ver_id;
 
-    if (!CONFIG_MPEG4_ENCODER)  return;
+    if (!CONFIG_MPEG4_ENCODER)
+        return;
 
-    if(s->max_b_frames || s->quarter_sample){
-        vo_ver_id= 5;
-        s->vo_type= ADV_SIMPLE_VO_TYPE;
-    }else{
-        vo_ver_id= 1;
-        s->vo_type= SIMPLE_VO_TYPE;
+    if (s->max_b_frames || s->quarter_sample) {
+        vo_ver_id  = 5;
+        s->vo_type = ADV_SIMPLE_VO_TYPE;
+    } else {
+        vo_ver_id  = 1;
+        s->vo_type = SIMPLE_VO_TYPE;
     }
 
     put_bits(&s->pb, 16, 0);
@@ -958,7 +1005,7 @@
 
     put_bits(&s->pb, 1, 0);             /* random access vol */
     put_bits(&s->pb, 8, s->vo_type);    /* video obj type indication */
-    if(s->workaround_bugs & FF_BUG_MS) {
+    if (s->workaround_bugs & FF_BUG_MS) {
         put_bits(&s->pb, 1, 0);         /* is obj layer id= no */
     } else {
         put_bits(&s->pb, 1, 1);         /* is obj layer id= yes */
@@ -966,17 +1013,17 @@
         put_bits(&s->pb, 3, 1);         /* is obj layer priority */
     }
 
-    s->aspect_ratio_info= ff_h263_aspect_to_info(s->avctx->sample_aspect_ratio);
+    s->aspect_ratio_info = ff_h263_aspect_to_info(s->avctx->sample_aspect_ratio);
 
-    put_bits(&s->pb, 4, s->aspect_ratio_info);/* aspect ratio info */
-    if (s->aspect_ratio_info == FF_ASPECT_EXTENDED){
+    put_bits(&s->pb, 4, s->aspect_ratio_info); /* aspect ratio info */
+    if (s->aspect_ratio_info == FF_ASPECT_EXTENDED) {
         av_reduce(&s->avctx->sample_aspect_ratio.num, &s->avctx->sample_aspect_ratio.den,
                    s->avctx->sample_aspect_ratio.num,  s->avctx->sample_aspect_ratio.den, 255);
         put_bits(&s->pb, 8, s->avctx->sample_aspect_ratio.num);
         put_bits(&s->pb, 8, s->avctx->sample_aspect_ratio.den);
     }
 
-    if(s->workaround_bugs & FF_BUG_MS) { //
+    if (s->workaround_bugs & FF_BUG_MS) {
         put_bits(&s->pb, 1, 0);         /* vol control parameters= no @@@ */
     } else {
         put_bits(&s->pb, 1, 1);         /* vol control parameters= yes */
@@ -1000,16 +1047,15 @@
     put_bits(&s->pb, 1, 1);             /* marker bit */
     put_bits(&s->pb, 1, s->progressive_sequence ? 0 : 1);
     put_bits(&s->pb, 1, 1);             /* obmc disable */
-    if (vo_ver_id == 1) {
-        put_bits(&s->pb, 1, s->vol_sprite_usage);       /* sprite enable */
-    }else{
-        put_bits(&s->pb, 2, s->vol_sprite_usage);       /* sprite enable */
-    }
+    if (vo_ver_id == 1)
+        put_bits(&s->pb, 1, 0);       /* sprite enable */
+    else
+        put_bits(&s->pb, 2, 0);       /* sprite enable */
 
     put_bits(&s->pb, 1, 0);             /* not 8 bit == false */
     put_bits(&s->pb, 1, s->mpeg_quant); /* quant type= (0=h263 style)*/
 
-    if(s->mpeg_quant){
+    if (s->mpeg_quant) {
         ff_write_quant_matrix(&s->pb, s->avctx->intra_matrix);
         ff_write_quant_matrix(&s->pb, s->avctx->inter_matrix);
     }
@@ -1017,14 +1063,12 @@
     if (vo_ver_id != 1)
         put_bits(&s->pb, 1, s->quarter_sample);
     put_bits(&s->pb, 1, 1);             /* complexity estimation disable */
-    s->resync_marker= s->rtp_mode;
-    put_bits(&s->pb, 1, s->resync_marker ? 0 : 1);/* resync marker disable */
+    put_bits(&s->pb, 1, s->rtp_mode ? 0 : 1); /* resync marker disable */
     put_bits(&s->pb, 1, s->data_partitioning ? 1 : 0);
-    if(s->data_partitioning){
+    if (s->data_partitioning)
         put_bits(&s->pb, 1, 0);         /* no rvlc */
-    }
 
-    if (vo_ver_id != 1){
+    if (vo_ver_id != 1) {
         put_bits(&s->pb, 1, 0);         /* newpred */
         put_bits(&s->pb, 1, 0);         /* reduced res vop */
     }
@@ -1033,7 +1077,7 @@
     ff_mpeg4_stuffing(&s->pb);
 
     /* user data */
-    if(!(s->flags & CODEC_FLAG_BITEXACT)){
+    if (!(s->flags & CODEC_FLAG_BITEXACT)) {
         put_bits(&s->pb, 16, 0);
         put_bits(&s->pb, 16, 0x1B2);    /* user_data */
         avpriv_put_string(&s->pb, LIBAVCODEC_IDENT, 0);
@@ -1041,33 +1085,33 @@
 }
 
 /* write mpeg4 VOP header */
-void ff_mpeg4_encode_picture_header(MpegEncContext * s, int picture_number)
+void ff_mpeg4_encode_picture_header(MpegEncContext *s, int picture_number)
 {
     int time_incr;
     int time_div, time_mod;
 
-    if(s->pict_type==AV_PICTURE_TYPE_I){
-        if(!(s->flags&CODEC_FLAG_GLOBAL_HEADER)){
-            if(s->strict_std_compliance < FF_COMPLIANCE_VERY_STRICT) //HACK, the reference sw is buggy
+    if (s->pict_type == AV_PICTURE_TYPE_I) {
+        if (!(s->flags & CODEC_FLAG_GLOBAL_HEADER)) {
+            if (s->strict_std_compliance < FF_COMPLIANCE_VERY_STRICT)  // HACK, the reference sw is buggy
                 mpeg4_encode_visual_object_header(s);
-            if(s->strict_std_compliance < FF_COMPLIANCE_VERY_STRICT || picture_number==0) //HACK, the reference sw is buggy
+            if (s->strict_std_compliance < FF_COMPLIANCE_VERY_STRICT || picture_number == 0)  // HACK, the reference sw is buggy
                 mpeg4_encode_vol_header(s, 0, 0);
         }
-        if(!(s->workaround_bugs & FF_BUG_MS))
+        if (!(s->workaround_bugs & FF_BUG_MS))
             mpeg4_encode_gop_header(s);
     }
 
-    s->partitioned_frame= s->data_partitioning && s->pict_type!=AV_PICTURE_TYPE_B;
+    s->partitioned_frame = s->data_partitioning && s->pict_type != AV_PICTURE_TYPE_B;
 
     put_bits(&s->pb, 16, 0);                /* vop header */
     put_bits(&s->pb, 16, VOP_STARTCODE);    /* vop header */
     put_bits(&s->pb, 2, s->pict_type - 1);  /* pict type: I = 0 , P = 1 */
 
-    time_div= FFUDIV(s->time, s->avctx->time_base.den);
-    time_mod= FFUMOD(s->time, s->avctx->time_base.den);
-    time_incr= time_div - s->last_time_base;
+    time_div  = FFUDIV(s->time, s->avctx->time_base.den);
+    time_mod  = FFUMOD(s->time, s->avctx->time_base.den);
+    time_incr = time_div - s->last_time_base;
     av_assert0(time_incr >= 0);
-    while(time_incr--)
+    while (time_incr--)
         put_bits(&s->pb, 1, 1);
 
     put_bits(&s->pb, 1, 0);
@@ -1076,75 +1120,76 @@
     put_bits(&s->pb, s->time_increment_bits, time_mod); /* time increment */
     put_bits(&s->pb, 1, 1);                             /* marker */
     put_bits(&s->pb, 1, 1);                             /* vop coded */
-    if (    s->pict_type == AV_PICTURE_TYPE_P
-        || (s->pict_type == AV_PICTURE_TYPE_S && s->vol_sprite_usage==GMC_SPRITE)) {
+    if (s->pict_type == AV_PICTURE_TYPE_P) {
         put_bits(&s->pb, 1, s->no_rounding);    /* rounding type */
     }
     put_bits(&s->pb, 3, 0);     /* intra dc VLC threshold */
-    if(!s->progressive_sequence){
-         put_bits(&s->pb, 1, s->current_picture_ptr->f.top_field_first);
-         put_bits(&s->pb, 1, s->alternate_scan);
+    if (!s->progressive_sequence) {
+        put_bits(&s->pb, 1, s->current_picture_ptr->f.top_field_first);
+        put_bits(&s->pb, 1, s->alternate_scan);
     }
-    //FIXME sprite stuff
+    // FIXME sprite stuff
 
     put_bits(&s->pb, 5, s->qscale);
 
     if (s->pict_type != AV_PICTURE_TYPE_I)
-        put_bits(&s->pb, 3, s->f_code); /* fcode_for */
+        put_bits(&s->pb, 3, s->f_code);  /* fcode_for */
     if (s->pict_type == AV_PICTURE_TYPE_B)
-        put_bits(&s->pb, 3, s->b_code); /* fcode_back */
+        put_bits(&s->pb, 3, s->b_code);  /* fcode_back */
 }
 
-
 static av_cold void init_uni_dc_tab(void)
 {
     int level, uni_code, uni_len;
 
-    for(level=-256; level<256; level++){
+    for (level = -256; level < 256; level++) {
         int size, v, l;
         /* find number of bits */
         size = 0;
-        v = abs(level);
+        v    = abs(level);
         while (v) {
             v >>= 1;
             size++;
         }
 
         if (level < 0)
-            l= (-level) ^ ((1 << size) - 1);
+            l = (-level) ^ ((1 << size) - 1);
         else
-            l= level;
+            l = level;
 
         /* luminance */
-        uni_code= ff_mpeg4_DCtab_lum[size][0];
-        uni_len = ff_mpeg4_DCtab_lum[size][1];
+        uni_code = ff_mpeg4_DCtab_lum[size][0];
+        uni_len  = ff_mpeg4_DCtab_lum[size][1];
 
         if (size > 0) {
-            uni_code<<=size; uni_code|=l;
-            uni_len+=size;
-            if (size > 8){
-                uni_code<<=1; uni_code|=1;
+            uni_code <<= size;
+            uni_code  |= l;
+            uni_len   += size;
+            if (size > 8) {
+                uni_code <<= 1;
+                uni_code  |= 1;
                 uni_len++;
             }
         }
-        uni_DCtab_lum_bits[level+256]= uni_code;
-        uni_DCtab_lum_len [level+256]= uni_len;
+        uni_DCtab_lum_bits[level + 256] = uni_code;
+        uni_DCtab_lum_len[level + 256]  = uni_len;
 
         /* chrominance */
-        uni_code= ff_mpeg4_DCtab_chrom[size][0];
-        uni_len = ff_mpeg4_DCtab_chrom[size][1];
+        uni_code = ff_mpeg4_DCtab_chrom[size][0];
+        uni_len  = ff_mpeg4_DCtab_chrom[size][1];
 
         if (size > 0) {
-            uni_code<<=size; uni_code|=l;
-            uni_len+=size;
-            if (size > 8){
-                uni_code<<=1; uni_code|=1;
+            uni_code <<= size;
+            uni_code  |= l;
+            uni_len   += size;
+            if (size > 8) {
+                uni_code <<= 1;
+                uni_code  |= 1;
                 uni_len++;
             }
         }
-        uni_DCtab_chrom_bits[level+256]= uni_code;
-        uni_DCtab_chrom_len [level+256]= uni_len;
-
+        uni_DCtab_chrom_bits[level + 256] = uni_code;
+        uni_DCtab_chrom_len[level + 256]  = uni_len;
     }
 }
 
@@ -1154,77 +1199,89 @@
     int slevel, run, last;
 
     av_assert0(MAX_LEVEL >= 64);
-    av_assert0(MAX_RUN   >= 63);
-
-    for(slevel=-64; slevel<64; slevel++){
-        if(slevel==0) continue;
-        for(run=0; run<64; run++){
-            for(last=0; last<=1; last++){
-                const int index= UNI_MPEG4_ENC_INDEX(last, run, slevel+64);
-                int level= slevel < 0 ? -slevel : slevel;
-                int sign= slevel < 0 ? 1 : 0;
+    av_assert0(MAX_RUN >= 63);
+
+    for (slevel = -64; slevel < 64; slevel++) {
+        if (slevel == 0)
+            continue;
+        for (run = 0; run < 64; run++) {
+            for (last = 0; last <= 1; last++) {
+                const int index = UNI_MPEG4_ENC_INDEX(last, run, slevel + 64);
+                int level       = slevel < 0 ? -slevel : slevel;
+                int sign        = slevel < 0 ? 1 : 0;
                 int bits, len, code;
                 int level1, run1;
 
-                len_tab[index]= 100;
+                len_tab[index] = 100;
 
                 /* ESC0 */
-                code= get_rl_index(rl, last, run, level);
-                bits= rl->table_vlc[code][0];
-                len=  rl->table_vlc[code][1];
-                bits=bits*2+sign; len++;
-
-                if(code!=rl->n && len < len_tab[index]){
-                    bits_tab[index]= bits;
-                    len_tab [index]= len;
+                code = get_rl_index(rl, last, run, level);
+                bits = rl->table_vlc[code][0];
+                len  = rl->table_vlc[code][1];
+                bits = bits * 2 + sign;
+                len++;
+
+                if (code != rl->n && len < len_tab[index]) {
+                    bits_tab[index] = bits;
+                    len_tab[index]  = len;
                 }
                 /* ESC1 */
-                bits= rl->table_vlc[rl->n][0];
-                len=  rl->table_vlc[rl->n][1];
-                bits=bits*2;    len++; //esc1
-                level1= level - rl->max_level[last][run];
-                if(level1>0){
-                    code= get_rl_index(rl, last, run, level1);
-                    bits<<= rl->table_vlc[code][1];
-                    len  += rl->table_vlc[code][1];
-                    bits += rl->table_vlc[code][0];
-                    bits=bits*2+sign; len++;
-
-                    if(code!=rl->n && len < len_tab[index]){
-                        bits_tab[index]= bits;
-                        len_tab [index]= len;
+                bits = rl->table_vlc[rl->n][0];
+                len  = rl->table_vlc[rl->n][1];
+                bits = bits * 2;
+                len++;                 // esc1
+                level1 = level - rl->max_level[last][run];
+                if (level1 > 0) {
+                    code   = get_rl_index(rl, last, run, level1);
+                    bits <<= rl->table_vlc[code][1];
+                    len   += rl->table_vlc[code][1];
+                    bits  += rl->table_vlc[code][0];
+                    bits   = bits * 2 + sign;
+                    len++;
+
+                    if (code != rl->n && len < len_tab[index]) {
+                        bits_tab[index] = bits;
+                        len_tab[index]  = len;
                     }
                 }
                 /* ESC2 */
-                bits= rl->table_vlc[rl->n][0];
-                len=  rl->table_vlc[rl->n][1];
-                bits=bits*4+2;    len+=2; //esc2
+                bits = rl->table_vlc[rl->n][0];
+                len  = rl->table_vlc[rl->n][1];
+                bits = bits * 4 + 2;
+                len += 2;                 // esc2
                 run1 = run - rl->max_run[last][level] - 1;
-                if(run1>=0){
-                    code= get_rl_index(rl, last, run1, level);
-                    bits<<= rl->table_vlc[code][1];
-                    len  += rl->table_vlc[code][1];
-                    bits += rl->table_vlc[code][0];
-                    bits=bits*2+sign; len++;
-
-                    if(code!=rl->n && len < len_tab[index]){
-                        bits_tab[index]= bits;
-                        len_tab [index]= len;
+                if (run1 >= 0) {
+                    code   = get_rl_index(rl, last, run1, level);
+                    bits <<= rl->table_vlc[code][1];
+                    len   += rl->table_vlc[code][1];
+                    bits  += rl->table_vlc[code][0];
+                    bits   = bits * 2 + sign;
+                    len++;
+
+                    if (code != rl->n && len < len_tab[index]) {
+                        bits_tab[index] = bits;
+                        len_tab[index]  = len;
                     }
                 }
                 /* ESC3 */
-                bits= rl->table_vlc[rl->n][0];
-                len = rl->table_vlc[rl->n][1];
-                bits=bits*4+3;    len+=2; //esc3
-                bits=bits*2+last; len++;
-                bits=bits*64+run; len+=6;
-                bits=bits*2+1;    len++;  //marker
-                bits=bits*4096+(slevel&0xfff); len+=12;
-                bits=bits*2+1;    len++;  //marker
-
-                if(len < len_tab[index]){
-                    bits_tab[index]= bits;
-                    len_tab [index]= len;
+                bits = rl->table_vlc[rl->n][0];
+                len  = rl->table_vlc[rl->n][1];
+                bits = bits * 4 + 3;
+                len += 2;                 // esc3
+                bits = bits * 2 + last;
+                len++;
+                bits = bits * 64 + run;
+                len += 6;
+                bits = bits * 2 + 1;
+                len++;                    // marker
+                bits = bits * 4096 + (slevel & 0xfff);
+                len += 12;
+                bits = bits * 2 + 1;
+                len++;                    // marker
+
+                if (len < len_tab[index]) {
+                    bits_tab[index] = bits;
+                    len_tab[index]  = len;
                 }
             }
         }
@@ -1242,7 +1299,7 @@
         return AVERROR(EINVAL);
     }
 
-    if((ret=ff_MPV_encode_init(avctx)) < 0)
+    if ((ret = ff_MPV_encode_init(avctx)) < 0)
         return ret;
 
     if (!done) {
@@ -1256,81 +1313,79 @@
         init_uni_mpeg4_rl_tab(&ff_h263_rl_inter, uni_mpeg4_inter_rl_bits, uni_mpeg4_inter_rl_len);
     }
 
-    s->min_qcoeff= -2048;
-    s->max_qcoeff=  2047;
-    s->intra_ac_vlc_length     = uni_mpeg4_intra_rl_len;
-    s->intra_ac_vlc_last_length= uni_mpeg4_intra_rl_len + 128*64;
-    s->inter_ac_vlc_length     = uni_mpeg4_inter_rl_len;
-    s->inter_ac_vlc_last_length= uni_mpeg4_inter_rl_len + 128*64;
-    s->luma_dc_vlc_length= uni_DCtab_lum_len;
-    s->ac_esc_length= 7+2+1+6+1+12+1;
-    s->y_dc_scale_table= ff_mpeg4_y_dc_scale_table;
-    s->c_dc_scale_table= ff_mpeg4_c_dc_scale_table;
-
-    if(s->flags & CODEC_FLAG_GLOBAL_HEADER){
-
-        s->avctx->extradata= av_malloc(1024);
+    s->min_qcoeff               = -2048;
+    s->max_qcoeff               = 2047;
+    s->intra_ac_vlc_length      = uni_mpeg4_intra_rl_len;
+    s->intra_ac_vlc_last_length = uni_mpeg4_intra_rl_len + 128 * 64;
+    s->inter_ac_vlc_length      = uni_mpeg4_inter_rl_len;
+    s->inter_ac_vlc_last_length = uni_mpeg4_inter_rl_len + 128 * 64;
+    s->luma_dc_vlc_length       = uni_DCtab_lum_len;
+    s->ac_esc_length            = 7 + 2 + 1 + 6 + 1 + 12 + 1;
+    s->y_dc_scale_table         = ff_mpeg4_y_dc_scale_table;
+    s->c_dc_scale_table         = ff_mpeg4_c_dc_scale_table;
+
+    if (s->flags & CODEC_FLAG_GLOBAL_HEADER) {
+        s->avctx->extradata = av_malloc(1024);
         init_put_bits(&s->pb, s->avctx->extradata, 1024);
 
-        if(!(s->workaround_bugs & FF_BUG_MS))
+        if (!(s->workaround_bugs & FF_BUG_MS))
             mpeg4_encode_visual_object_header(s);
         mpeg4_encode_vol_header(s, 0, 0);
 
 //            ff_mpeg4_stuffing(&s->pb); ?
         flush_put_bits(&s->pb);
-        s->avctx->extradata_size= (put_bits_count(&s->pb)+7)>>3;
+        s->avctx->extradata_size = (put_bits_count(&s->pb) + 7) >> 3;
     }
     return 0;
 }
 
 void ff_mpeg4_init_partitions(MpegEncContext *s)
 {
-    uint8_t *start= put_bits_ptr(&s->pb);
-    uint8_t *end= s->pb.buf_end;
-    int size= end - start;
-    int pb_size = (((intptr_t)start + size/3)&(~3)) - (intptr_t)start;
-    int tex_size= (size - 2*pb_size)&(~3);
+    uint8_t *start = put_bits_ptr(&s->pb);
+    uint8_t *end   = s->pb.buf_end;
+    int size       = end - start;
+    int pb_size    = (((intptr_t)start + size / 3) & (~3)) - (intptr_t)start;
+    int tex_size   = (size - 2 * pb_size) & (~3);
 
     set_put_bits_buffer_size(&s->pb, pb_size);
-    init_put_bits(&s->tex_pb, start + pb_size           , tex_size);
-    init_put_bits(&s->pb2   , start + pb_size + tex_size, pb_size);
+    init_put_bits(&s->tex_pb, start + pb_size, tex_size);
+    init_put_bits(&s->pb2, start + pb_size + tex_size, pb_size);
 }
 
 void ff_mpeg4_merge_partitions(MpegEncContext *s)
 {
-    const int pb2_len   = put_bits_count(&s->pb2   );
-    const int tex_pb_len= put_bits_count(&s->tex_pb);
-    const int bits= put_bits_count(&s->pb);
+    const int pb2_len    = put_bits_count(&s->pb2);
+    const int tex_pb_len = put_bits_count(&s->tex_pb);
+    const int bits       = put_bits_count(&s->pb);
 
-    if(s->pict_type==AV_PICTURE_TYPE_I){
+    if (s->pict_type == AV_PICTURE_TYPE_I) {
         put_bits(&s->pb, 19, DC_MARKER);
-        s->misc_bits+=19 + pb2_len + bits - s->last_bits;
-        s->i_tex_bits+= tex_pb_len;
-    }else{
+        s->misc_bits  += 19 + pb2_len + bits - s->last_bits;
+        s->i_tex_bits += tex_pb_len;
+    } else {
         put_bits(&s->pb, 17, MOTION_MARKER);
-        s->misc_bits+=17 + pb2_len;
-        s->mv_bits+= bits - s->last_bits;
-        s->p_tex_bits+= tex_pb_len;
+        s->misc_bits  += 17 + pb2_len;
+        s->mv_bits    += bits - s->last_bits;
+        s->p_tex_bits += tex_pb_len;
     }
 
     flush_put_bits(&s->pb2);
     flush_put_bits(&s->tex_pb);
 
     set_put_bits_buffer_size(&s->pb, s->pb2.buf_end - s->pb.buf);
-    avpriv_copy_bits(&s->pb, s->pb2.buf   , pb2_len);
+    avpriv_copy_bits(&s->pb, s->pb2.buf, pb2_len);
     avpriv_copy_bits(&s->pb, s->tex_pb.buf, tex_pb_len);
-    s->last_bits= put_bits_count(&s->pb);
+    s->last_bits = put_bits_count(&s->pb);
 }
 
-
 void ff_mpeg4_encode_video_packet_header(MpegEncContext *s)
 {
-    int mb_num_bits= av_log2(s->mb_num - 1) + 1;
+    int mb_num_bits = av_log2(s->mb_num - 1) + 1;
 
     put_bits(&s->pb, ff_mpeg4_get_video_packet_prefix_length(s), 0);
     put_bits(&s->pb, 1, 1);
 
-    put_bits(&s->pb, mb_num_bits, s->mb_x + s->mb_y*s->mb_width);
+    put_bits(&s->pb, mb_num_bits, s->mb_x + s->mb_y * s->mb_width);
     put_bits(&s->pb, s->quant_precision, s->qscale);
     put_bits(&s->pb, 1, 0); /* no HEC */
 }
@@ -1338,8 +1393,8 @@
 #define OFFSET(x) offsetof(MpegEncContext, x)
 #define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM
 static const AVOption options[] = {
-    { "data_partitioning",       "Use data partitioning.",      OFFSET(data_partitioning), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, VE },
-    { "alternate_scan",          "Enable alternate scantable.", OFFSET(alternate_scan),    AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, VE },
+    { "data_partitioning", "Use data partitioning.",      OFFSET(data_partitioning), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, VE },
+    { "alternate_scan",    "Enable alternate scantable.", OFFSET(alternate_scan),    AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, VE },
     FF_MPV_COMMON_OPTS
     { NULL },
 };
@@ -1360,7 +1415,7 @@
     .init           = encode_init,
     .encode2        = ff_MPV_encode_picture,
     .close          = ff_MPV_encode_end,
-    .pix_fmts       = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE },
+    .pix_fmts       = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE },
     .capabilities   = CODEC_CAP_DELAY | CODEC_CAP_SLICE_THREADS,
     .priv_class     = &mpeg4enc_class,
 };

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/mpegaudio.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/mpegaudio.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/mpegaudio_parser.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/mpegaudio_parser.c Changed

@@ -64,10 +64,11 @@
         }else{
             while(i<buf_size){
                 int ret, sr, channels, bit_rate, frame_size;
+                enum AVCodecID codec_id;
 
                 state= (state<<8) + buf[i++];
 
-                ret = avpriv_mpa_decode_header(avctx, state, &sr, &channels, &frame_size, &bit_rate);
+                ret = avpriv_mpa_decode_header2(state, &sr, &channels, &frame_size, &bit_rate, &codec_id);
                 if (ret < 4) {
                     if (i > 4)
                         s->header_count = -2;
@@ -78,10 +79,11 @@
                     s->header_count++;
                     s->frame_size = ret-4;
 
-                    if (s->header_count > 0) {
+                    if (s->header_count > 0 + (avctx->codec_id != AV_CODEC_ID_NONE && avctx->codec_id != codec_id)) {
                         avctx->sample_rate= sr;
                         avctx->channels   = channels;
                         s1->duration      = frame_size;
+                        avctx->codec_id   = codec_id;
                         if (s->no_bitrate || !avctx->bit_rate) {
                             s->no_bitrate = 1;
                             avctx->bit_rate += (bit_rate - avctx->bit_rate) / s->header_count;

omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/mpegaudiodec_fixed.c Added

@@ -0,0 +1,120 @@
+/*
+ * Fixed-point MPEG audio decoder
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "config.h"
+#include "libavutil/samplefmt.h"
+
+#define USE_FLOATS 0
+
+#include "mpegaudio.h"
+
+#define SHR(a,b)       ((a)>>(b))
+/* WARNING: only correct for positive numbers */
+#define FIXR_OLD(a)    ((int)((a) * FRAC_ONE + 0.5))
+#define FIXR(a)        ((int)((a) * FRAC_ONE + 0.5))
+#define FIXHR(a)       ((int)((a) * (1LL<<32) + 0.5))
+#define MULH3(x, y, s) MULH((s)*(x), y)
+#define MULLx(x, y, s) MULL(x,y,s)
+#define RENAME(a)      a ## _fixed
+#define OUT_FMT   AV_SAMPLE_FMT_S16
+#define OUT_FMT_P AV_SAMPLE_FMT_S16P
+
+#include "mpegaudiodec_template.c"
+
+#if CONFIG_MP1_DECODER
+AVCodec ff_mp1_decoder = {
+    .name           = "mp1",
+    .long_name      = NULL_IF_CONFIG_SMALL("MP1 (MPEG audio layer 1)"),
+    .type           = AVMEDIA_TYPE_AUDIO,
+    .id             = AV_CODEC_ID_MP1,
+    .priv_data_size = sizeof(MPADecodeContext),
+    .init           = decode_init,
+    .decode         = decode_frame,
+    .capabilities   = CODEC_CAP_DR1,
+    .flush          = flush,
+    .sample_fmts    = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16P,
+                                                      AV_SAMPLE_FMT_S16,
+                                                      AV_SAMPLE_FMT_NONE },
+};
+#endif
+#if CONFIG_MP2_DECODER
+AVCodec ff_mp2_decoder = {
+    .name           = "mp2",
+    .long_name      = NULL_IF_CONFIG_SMALL("MP2 (MPEG audio layer 2)"),
+    .type           = AVMEDIA_TYPE_AUDIO,
+    .id             = AV_CODEC_ID_MP2,
+    .priv_data_size = sizeof(MPADecodeContext),
+    .init           = decode_init,
+    .decode         = decode_frame,
+    .capabilities   = CODEC_CAP_DR1,
+    .flush          = flush,
+    .sample_fmts    = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16P,
+                                                      AV_SAMPLE_FMT_S16,
+                                                      AV_SAMPLE_FMT_NONE },
+};
+#endif
+#if CONFIG_MP3_DECODER
+AVCodec ff_mp3_decoder = {
+    .name           = "mp3",
+    .long_name      = NULL_IF_CONFIG_SMALL("MP3 (MPEG audio layer 3)"),
+    .type           = AVMEDIA_TYPE_AUDIO,
+    .id             = AV_CODEC_ID_MP3,
+    .priv_data_size = sizeof(MPADecodeContext),
+    .init           = decode_init,
+    .decode         = decode_frame,
+    .capabilities   = CODEC_CAP_DR1,
+    .flush          = flush,
+    .sample_fmts    = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16P,
+                                                      AV_SAMPLE_FMT_S16,
+                                                      AV_SAMPLE_FMT_NONE },
+};
+#endif
+#if CONFIG_MP3ADU_DECODER
+AVCodec ff_mp3adu_decoder = {
+    .name           = "mp3adu",
+    .long_name      = NULL_IF_CONFIG_SMALL("ADU (Application Data Unit) MP3 (MPEG audio layer 3)"),
+    .type           = AVMEDIA_TYPE_AUDIO,
+    .id             = AV_CODEC_ID_MP3ADU,
+    .priv_data_size = sizeof(MPADecodeContext),
+    .init           = decode_init,
+    .decode         = decode_frame_adu,
+    .capabilities   = CODEC_CAP_DR1,
+    .flush          = flush,
+    .sample_fmts    = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16P,
+                                                      AV_SAMPLE_FMT_S16,
+                                                      AV_SAMPLE_FMT_NONE },
+};
+#endif
+#if CONFIG_MP3ON4_DECODER
+AVCodec ff_mp3on4_decoder = {
+    .name           = "mp3on4",
+    .long_name      = NULL_IF_CONFIG_SMALL("MP3onMP4"),
+    .type           = AVMEDIA_TYPE_AUDIO,
+    .id             = AV_CODEC_ID_MP3ON4,
+    .priv_data_size = sizeof(MP3On4DecodeContext),
+    .init           = decode_init_mp3on4,
+    .close          = decode_close_mp3on4,
+    .decode         = decode_frame_mp3on4,
+    .capabilities   = CODEC_CAP_DR1,
+    .flush          = flush_mp3on4,
+    .sample_fmts    = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16P,
+                                                      AV_SAMPLE_FMT_NONE },
+};
+#endif

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/mpegaudiodec_float.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/mpegaudiodec_float.c Changed

omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/mpegaudiodec_template.c Added

@@ -0,0 +1,1983 @@
+/*
+ * MPEG Audio decoder
+ * Copyright (c) 2001, 2002 Fabrice Bellard
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * MPEG Audio decoder
+ */
+
+#include "libavutil/attributes.h"
+#include "libavutil/avassert.h"
+#include "libavutil/channel_layout.h"
+#include "libavutil/float_dsp.h"
+#include "libavutil/libm.h"
+#include "avcodec.h"
+#include "get_bits.h"
+#include "internal.h"
+#include "mathops.h"
+#include "mpegaudiodsp.h"
+
+/*
+ * TODO:
+ *  - test lsf / mpeg25 extensively.
+ */
+
+#include "mpegaudio.h"
+#include "mpegaudiodecheader.h"
+
+#define BACKSTEP_SIZE 512
+#define EXTRABYTES 24
+#define LAST_BUF_SIZE 2 * BACKSTEP_SIZE + EXTRABYTES
+
+/* layer 3 "granule" */
+typedef struct GranuleDef {
+    uint8_t scfsi;
+    int part2_3_length;
+    int big_values;
+    int global_gain;
+    int scalefac_compress;
+    uint8_t block_type;
+    uint8_t switch_point;
+    int table_select[3];
+    int subblock_gain[3];
+    uint8_t scalefac_scale;
+    uint8_t count1table_select;
+    int region_size[3]; /* number of huffman codes in each region */
+    int preflag;
+    int short_start, long_end; /* long/short band indexes */
+    uint8_t scale_factors[40];
+    DECLARE_ALIGNED(16, INTFLOAT, sb_hybrid)[SBLIMIT * 18]; /* 576 samples */
+} GranuleDef;
+
+typedef struct MPADecodeContext {
+    MPA_DECODE_HEADER
+    uint8_t last_buf[LAST_BUF_SIZE];
+    int last_buf_size;
+    /* next header (used in free format parsing) */
+    uint32_t free_format_next_header;
+    GetBitContext gb;
+    GetBitContext in_gb;
+    DECLARE_ALIGNED(32, MPA_INT, synth_buf)[MPA_MAX_CHANNELS][512 * 2];
+    int synth_buf_offset[MPA_MAX_CHANNELS];
+    DECLARE_ALIGNED(32, INTFLOAT, sb_samples)[MPA_MAX_CHANNELS][36][SBLIMIT];
+    INTFLOAT mdct_buf[MPA_MAX_CHANNELS][SBLIMIT * 18]; /* previous samples, for layer 3 MDCT */
+    GranuleDef granules[2][2]; /* Used in Layer 3 */
+    int adu_mode; ///< 0 for standard mp3, 1 for adu formatted mp3
+    int dither_state;
+    int err_recognition;
+    AVCodecContext* avctx;
+    MPADSPContext mpadsp;
+    AVFloatDSPContext fdsp;
+    AVFrame *frame;
+} MPADecodeContext;
+
+#define HEADER_SIZE 4
+
+#include "mpegaudiodata.h"
+#include "mpegaudiodectab.h"
+
+/* vlc structure for decoding layer 3 huffman tables */
+static VLC huff_vlc[16];
+static VLC_TYPE huff_vlc_tables[
+    0 + 128 + 128 + 128 + 130 + 128 + 154 + 166 +
+  142 + 204 + 190 + 170 + 542 + 460 + 662 + 414
+  ][2];
+static const int huff_vlc_tables_sizes[16] = {
+    0,  128,  128,  128,  130,  128,  154,  166,
+  142,  204,  190,  170,  542,  460,  662,  414
+};
+static VLC huff_quad_vlc[2];
+static VLC_TYPE  huff_quad_vlc_tables[128+16][2];
+static const int huff_quad_vlc_tables_sizes[2] = { 128, 16 };
+/* computed from band_size_long */
+static uint16_t band_index_long[9][23];
+#include "mpegaudio_tablegen.h"
+/* intensity stereo coef table */
+static INTFLOAT is_table[2][16];
+static INTFLOAT is_table_lsf[2][2][16];
+static INTFLOAT csa_table[8][4];
+
+static int16_t division_tab3[1<<6 ];
+static int16_t division_tab5[1<<8 ];
+static int16_t division_tab9[1<<11];
+
+static int16_t * const division_tabs[4] = {
+    division_tab3, division_tab5, NULL, division_tab9
+};
+
+/* lower 2 bits: modulo 3, higher bits: shift */
+static uint16_t scale_factor_modshift[64];
+/* [i][j]:  2^(-j/3) * FRAC_ONE * 2^(i+2) / (2^(i+2) - 1) */
+static int32_t scale_factor_mult[15][3];
+/* mult table for layer 2 group quantization */
+
+#define SCALE_GEN(v) \
+{ FIXR_OLD(1.0 * (v)), FIXR_OLD(0.7937005259 * (v)), FIXR_OLD(0.6299605249 * (v)) }
+
+static const int32_t scale_factor_mult2[3][3] = {
+    SCALE_GEN(4.0 / 3.0), /* 3 steps */
+    SCALE_GEN(4.0 / 5.0), /* 5 steps */
+    SCALE_GEN(4.0 / 9.0), /* 9 steps */
+};
+
+/**
+ * Convert region offsets to region sizes and truncate
+ * size to big_values.
+ */
+static void region_offset2size(GranuleDef *g)
+{
+    int i, k, j = 0;
+    g->region_size[2] = 576 / 2;
+    for (i = 0; i < 3; i++) {
+        k = FFMIN(g->region_size[i], g->big_values);
+        g->region_size[i] = k - j;
+        j = k;
+    }
+}
+
+static void init_short_region(MPADecodeContext *s, GranuleDef *g)
+{
+    if (g->block_type == 2) {
+        if (s->sample_rate_index != 8)
+            g->region_size[0] = (36 / 2);
+        else
+            g->region_size[0] = (72 / 2);
+    } else {
+        if (s->sample_rate_index <= 2)
+            g->region_size[0] = (36 / 2);
+        else if (s->sample_rate_index != 8)
+            g->region_size[0] = (54 / 2);
+        else
+            g->region_size[0] = (108 / 2);
+    }
+    g->region_size[1] = (576 / 2);
+}
+
+static void init_long_region(MPADecodeContext *s, GranuleDef *g,
+                             int ra1, int ra2)
+{
+    int l;
+    g->region_size[0] = band_index_long[s->sample_rate_index][ra1 + 1] >> 1;
+    /* should not overflow */
+    l = FFMIN(ra1 + ra2 + 2, 22);
+    g->region_size[1] = band_index_long[s->sample_rate_index][      l] >> 1;
+}
+
+static void compute_band_indexes(MPADecodeContext *s, GranuleDef *g)
+{
+    if (g->block_type == 2) {
+        if (g->switch_point) {
+            if(s->sample_rate_index == 8)
+                avpriv_request_sample(s->avctx, "switch point in 8khz");
+            /* if switched mode, we handle the 36 first samples as
+                long blocks.  For 8000Hz, we handle the 72 first
+                exponents as long blocks */
+            if (s->sample_rate_index <= 2)
+                g->long_end = 8;
+            else
+                g->long_end = 6;
+
+            g->short_start = 3;
+        } else {
+            g->long_end    = 0;
+            g->short_start = 0;
+        }
+    } else {
+        g->short_start = 13;
+        g->long_end    = 22;
+    }
+}
+
+/* layer 1 unscaling */
+/* n = number of bits of the mantissa minus 1 */
+static inline int l1_unscale(int n, int mant, int scale_factor)
+{
+    int shift, mod;
+    int64_t val;
+
+    shift   = scale_factor_modshift[scale_factor];
+    mod     = shift & 3;
+    shift >>= 2;
+    val     = MUL64(mant + (-1 << n) + 1, scale_factor_mult[n-1][mod]);
+    shift  += n;
+    /* NOTE: at this point, 1 <= shift >= 21 + 15 */
+    return (int)((val + (1LL << (shift - 1))) >> shift);
+}
+
+static inline int l2_unscale_group(int steps, int mant, int scale_factor)
+{
+    int shift, mod, val;
+
+    shift   = scale_factor_modshift[scale_factor];
+    mod     = shift & 3;
+    shift >>= 2;
+
+    val = (mant - (steps >> 1)) * scale_factor_mult2[steps >> 2][mod];
+    /* NOTE: at this point, 0 <= shift <= 21 */
+    if (shift > 0)
+        val = (val + (1 << (shift - 1))) >> shift;
+    return val;
+}
+
+/* compute value^(4/3) * 2^(exponent/4). It normalized to FRAC_BITS */
+static inline int l3_unscale(int value, int exponent)
+{
+    unsigned int m;
+    int e;
+
+    e  = table_4_3_exp  [4 * value + (exponent & 3)];
+    m  = table_4_3_value[4 * value + (exponent & 3)];
+    e -= exponent >> 2;
+#ifdef DEBUG
+    if(e < 1)
+        av_log(NULL, AV_LOG_WARNING, "l3_unscale: e is %d\n", e);
+#endif
+    if (e > 31)
+        return 0;
+    m = (m + (1 << (e - 1))) >> e;
+
+    return m;
+}
+
+static av_cold void decode_init_static(void)
+{
+    int i, j, k;
+    int offset;
+
+    /* scale factors table for layer 1/2 */
+    for (i = 0; i < 64; i++) {
+        int shift, mod;
+        /* 1.0 (i = 3) is normalized to 2 ^ FRAC_BITS */
+        shift = i / 3;
+        mod   = i % 3;
+        scale_factor_modshift[i] = mod | (shift << 2);
+    }
+
+    /* scale factor multiply for layer 1 */
+    for (i = 0; i < 15; i++) {
+        int n, norm;
+        n = i + 2;
+        norm = ((INT64_C(1) << n) * FRAC_ONE) / ((1 << n) - 1);
+        scale_factor_mult[i][0] = MULLx(norm, FIXR(1.0          * 2.0), FRAC_BITS);
+        scale_factor_mult[i][1] = MULLx(norm, FIXR(0.7937005259 * 2.0), FRAC_BITS);
+        scale_factor_mult[i][2] = MULLx(norm, FIXR(0.6299605249 * 2.0), FRAC_BITS);
+        av_dlog(NULL, "%d: norm=%x s=%x %x %x\n", i, norm,
+                scale_factor_mult[i][0],
+                scale_factor_mult[i][1],
+                scale_factor_mult[i][2]);
+    }
+
+    RENAME(ff_mpa_synth_init)(RENAME(ff_mpa_synth_window));
+
+    /* huffman decode tables */
+    offset = 0;
+    for (i = 1; i < 16; i++) {
+        const HuffTable *h = &mpa_huff_tables[i];
+        int xsize, x, y;
+        uint8_t  tmp_bits [512] = { 0 };
+        uint16_t tmp_codes[512] = { 0 };
+
+        xsize = h->xsize;
+
+        j = 0;
+        for (x = 0; x < xsize; x++) {
+            for (y = 0; y < xsize; y++) {
+                tmp_bits [(x << 5) | y | ((x&&y)<<4)]= h->bits [j  ];
+                tmp_codes[(x << 5) | y | ((x&&y)<<4)]= h->codes[j++];
+            }
+        }
+
+        /* XXX: fail test */
+        huff_vlc[i].table = huff_vlc_tables+offset;
+        huff_vlc[i].table_allocated = huff_vlc_tables_sizes[i];
+        init_vlc(&huff_vlc[i], 7, 512,
+                 tmp_bits, 1, 1, tmp_codes, 2, 2,
+                 INIT_VLC_USE_NEW_STATIC);
+        offset += huff_vlc_tables_sizes[i];
+    }
+    av_assert0(offset == FF_ARRAY_ELEMS(huff_vlc_tables));
+
+    offset = 0;
+    for (i = 0; i < 2; i++) {
+        huff_quad_vlc[i].table = huff_quad_vlc_tables+offset;
+        huff_quad_vlc[i].table_allocated = huff_quad_vlc_tables_sizes[i];
+        init_vlc(&huff_quad_vlc[i], i == 0 ? 7 : 4, 16,
+                 mpa_quad_bits[i], 1, 1, mpa_quad_codes[i], 1, 1,
+                 INIT_VLC_USE_NEW_STATIC);
+        offset += huff_quad_vlc_tables_sizes[i];
+    }
+    av_assert0(offset == FF_ARRAY_ELEMS(huff_quad_vlc_tables));
+
+    for (i = 0; i < 9; i++) {
+        k = 0;
+        for (j = 0; j < 22; j++) {
+            band_index_long[i][j] = k;
+            k += band_size_long[i][j];
+        }
+        band_index_long[i][22] = k;
+    }
+
+    /* compute n ^ (4/3) and store it in mantissa/exp format */
+
+    mpegaudio_tableinit();
+
+    for (i = 0; i < 4; i++) {
+        if (ff_mpa_quant_bits[i] < 0) {
+            for (j = 0; j < (1 << (-ff_mpa_quant_bits[i]+1)); j++) {
+                int val1, val2, val3, steps;
+                int val = j;
+                steps   = ff_mpa_quant_steps[i];
+                val1    = val % steps;
+                val    /= steps;
+                val2    = val % steps;
+                val3    = val / steps;
+                division_tabs[i][j] = val1 + (val2 << 4) + (val3 << 8);
+            }
+        }
+    }
+
+
+    for (i = 0; i < 7; i++) {
+        float f;
+        INTFLOAT v;
+        if (i != 6) {
+            f = tan((double)i * M_PI / 12.0);
+            v = FIXR(f / (1.0 + f));
+        } else {
+            v = FIXR(1.0);
+        }
+        is_table[0][    i] = v;
+        is_table[1][6 - i] = v;
+    }
+    /* invalid values */
+    for (i = 7; i < 16; i++)
+        is_table[0][i] = is_table[1][i] = 0.0;
+
+    for (i = 0; i < 16; i++) {
+        double f;
+        int e, k;
+
+        for (j = 0; j < 2; j++) {
+            e = -(j + 1) * ((i + 1) >> 1);
+            f = exp2(e / 4.0);
+            k = i & 1;
+            is_table_lsf[j][k ^ 1][i] = FIXR(f);
+            is_table_lsf[j][k    ][i] = FIXR(1.0);
+            av_dlog(NULL, "is_table_lsf %d %d: %f %f\n",
+                    i, j, (float) is_table_lsf[j][0][i],
+                    (float) is_table_lsf[j][1][i]);
+        }
+    }
+
+    for (i = 0; i < 8; i++) {
+        float ci, cs, ca;
+        ci = ci_table[i];
+        cs = 1.0 / sqrt(1.0 + ci * ci);
+        ca = cs * ci;
+#if !USE_FLOATS
+        csa_table[i][0] = FIXHR(cs/4);
+        csa_table[i][1] = FIXHR(ca/4);
+        csa_table[i][2] = FIXHR(ca/4) + FIXHR(cs/4);
+        csa_table[i][3] = FIXHR(ca/4) - FIXHR(cs/4);
+#else
+        csa_table[i][0] = cs;
+        csa_table[i][1] = ca;
+        csa_table[i][2] = ca + cs;
+        csa_table[i][3] = ca - cs;
+#endif
+    }
+}
+
+static av_cold int decode_init(AVCodecContext * avctx)
+{
+    static int initialized_tables = 0;
+    MPADecodeContext *s = avctx->priv_data;
+
+    if (!initialized_tables) {
+        decode_init_static();
+        initialized_tables = 1;
+    }
+
+    s->avctx = avctx;
+
+    avpriv_float_dsp_init(&s->fdsp, avctx->flags & CODEC_FLAG_BITEXACT);
+    ff_mpadsp_init(&s->mpadsp);
+
+    if (avctx->request_sample_fmt == OUT_FMT &&
+        avctx->codec_id != AV_CODEC_ID_MP3ON4)
+        avctx->sample_fmt = OUT_FMT;
+    else
+        avctx->sample_fmt = OUT_FMT_P;
+    s->err_recognition = avctx->err_recognition;
+
+    if (avctx->codec_id == AV_CODEC_ID_MP3ADU)
+        s->adu_mode = 1;
+
+    return 0;
+}
+
+#define C3 FIXHR(0.86602540378443864676/2)
+#define C4 FIXHR(0.70710678118654752439/2) //0.5 / cos(pi*(9)/36)
+#define C5 FIXHR(0.51763809020504152469/2) //0.5 / cos(pi*(5)/36)
+#define C6 FIXHR(1.93185165257813657349/4) //0.5 / cos(pi*(15)/36)
+
+/* 12 points IMDCT. We compute it "by hand" by factorizing obvious
+   cases. */
+static void imdct12(INTFLOAT *out, INTFLOAT *in)
+{
+    INTFLOAT in0, in1, in2, in3, in4, in5, t1, t2;
+
+    in0  = in[0*3];
+    in1  = in[1*3] + in[0*3];
+    in2  = in[2*3] + in[1*3];
+    in3  = in[3*3] + in[2*3];
+    in4  = in[4*3] + in[3*3];
+    in5  = in[5*3] + in[4*3];
+    in5 += in3;
+    in3 += in1;
+
+    in2  = MULH3(in2, C3, 2);
+    in3  = MULH3(in3, C3, 4);
+
+    t1   = in0 - in4;
+    t2   = MULH3(in1 - in5, C4, 2);
+
+    out[ 7] =
+    out[10] = t1 + t2;
+    out[ 1] =
+    out[ 4] = t1 - t2;
+
+    in0    += SHR(in4, 1);
+    in4     = in0 + in2;
+    in5    += 2*in1;
+    in1     = MULH3(in5 + in3, C5, 1);
+    out[ 8] =
+    out[ 9] = in4 + in1;
+    out[ 2] =
+    out[ 3] = in4 - in1;
+
+    in0    -= in2;
+    in5     = MULH3(in5 - in3, C6, 2);
+    out[ 0] =
+    out[ 5] = in0 - in5;
+    out[ 6] =
+    out[11] = in0 + in5;
+}
+
+/* return the number of decoded frames */
+static int mp_decode_layer1(MPADecodeContext *s)
+{
+    int bound, i, v, n, ch, j, mant;
+    uint8_t allocation[MPA_MAX_CHANNELS][SBLIMIT];
+    uint8_t scale_factors[MPA_MAX_CHANNELS][SBLIMIT];
+
+    if (s->mode == MPA_JSTEREO)
+        bound = (s->mode_ext + 1) * 4;
+    else
+        bound = SBLIMIT;
+
+    /* allocation bits */
+    for (i = 0; i < bound; i++) {
+        for (ch = 0; ch < s->nb_channels; ch++) {
+            allocation[ch][i] = get_bits(&s->gb, 4);
+        }
+    }
+    for (i = bound; i < SBLIMIT; i++)
+        allocation[0][i] = get_bits(&s->gb, 4);
+
+    /* scale factors */
+    for (i = 0; i < bound; i++) {
+        for (ch = 0; ch < s->nb_channels; ch++) {
+            if (allocation[ch][i])
+                scale_factors[ch][i] = get_bits(&s->gb, 6);
+        }
+    }
+    for (i = bound; i < SBLIMIT; i++) {
+        if (allocation[0][i]) {
+            scale_factors[0][i] = get_bits(&s->gb, 6);
+            scale_factors[1][i] = get_bits(&s->gb, 6);
+        }
+    }
+
+    /* compute samples */
+    for (j = 0; j < 12; j++) {
+        for (i = 0; i < bound; i++) {
+            for (ch = 0; ch < s->nb_channels; ch++) {
+                n = allocation[ch][i];
+                if (n) {
+                    mant = get_bits(&s->gb, n + 1);
+                    v = l1_unscale(n, mant, scale_factors[ch][i]);
+                } else {
+                    v = 0;
+                }
+                s->sb_samples[ch][j][i] = v;
+            }
+        }
+        for (i = bound; i < SBLIMIT; i++) {
+            n = allocation[0][i];
+            if (n) {
+                mant = get_bits(&s->gb, n + 1);
+                v = l1_unscale(n, mant, scale_factors[0][i]);
+                s->sb_samples[0][j][i] = v;
+                v = l1_unscale(n, mant, scale_factors[1][i]);
+                s->sb_samples[1][j][i] = v;
+            } else {
+                s->sb_samples[0][j][i] = 0;
+                s->sb_samples[1][j][i] = 0;
+            }
+        }
+    }
+    return 12;
+}
+
+static int mp_decode_layer2(MPADecodeContext *s)
+{
+    int sblimit; /* number of used subbands */
+    const unsigned char *alloc_table;
+    int table, bit_alloc_bits, i, j, ch, bound, v;
+    unsigned char bit_alloc[MPA_MAX_CHANNELS][SBLIMIT];
+    unsigned char scale_code[MPA_MAX_CHANNELS][SBLIMIT];
+    unsigned char scale_factors[MPA_MAX_CHANNELS][SBLIMIT][3], *sf;
+    int scale, qindex, bits, steps, k, l, m, b;
+
+    /* select decoding table */
+    table = ff_mpa_l2_select_table(s->bit_rate / 1000, s->nb_channels,
+                                   s->sample_rate, s->lsf);
+    sblimit     = ff_mpa_sblimit_table[table];
+    alloc_table = ff_mpa_alloc_tables[table];
+
+    if (s->mode == MPA_JSTEREO)
+        bound = (s->mode_ext + 1) * 4;
+    else
+        bound = sblimit;
+
+    av_dlog(s->avctx, "bound=%d sblimit=%d\n", bound, sblimit);
+
+    /* sanity check */
+    if (bound > sblimit)
+        bound = sblimit;
+
+    /* parse bit allocation */
+    j = 0;
+    for (i = 0; i < bound; i++) {
+        bit_alloc_bits = alloc_table[j];
+        for (ch = 0; ch < s->nb_channels; ch++)
+            bit_alloc[ch][i] = get_bits(&s->gb, bit_alloc_bits);
+        j += 1 << bit_alloc_bits;
+    }
+    for (i = bound; i < sblimit; i++) {
+        bit_alloc_bits = alloc_table[j];
+        v = get_bits(&s->gb, bit_alloc_bits);
+        bit_alloc[0][i] = v;
+        bit_alloc[1][i] = v;
+        j += 1 << bit_alloc_bits;
+    }
+
+    /* scale codes */
+    for (i = 0; i < sblimit; i++) {
+        for (ch = 0; ch < s->nb_channels; ch++) {
+            if (bit_alloc[ch][i])
+                scale_code[ch][i] = get_bits(&s->gb, 2);
+        }
+    }
+
+    /* scale factors */
+    for (i = 0; i < sblimit; i++) {
+        for (ch = 0; ch < s->nb_channels; ch++) {
+            if (bit_alloc[ch][i]) {
+                sf = scale_factors[ch][i];
+                switch (scale_code[ch][i]) {
+                default:
+                case 0:
+                    sf[0] = get_bits(&s->gb, 6);
+                    sf[1] = get_bits(&s->gb, 6);
+                    sf[2] = get_bits(&s->gb, 6);
+                    break;
+                case 2:
+                    sf[0] = get_bits(&s->gb, 6);
+                    sf[1] = sf[0];
+                    sf[2] = sf[0];
+                    break;
+                case 1:
+                    sf[0] = get_bits(&s->gb, 6);
+                    sf[2] = get_bits(&s->gb, 6);
+                    sf[1] = sf[0];
+                    break;
+                case 3:
+                    sf[0] = get_bits(&s->gb, 6);
+                    sf[2] = get_bits(&s->gb, 6);
+                    sf[1] = sf[2];
+                    break;
+                }
+            }
+        }
+    }
+
+    /* samples */
+    for (k = 0; k < 3; k++) {
+        for (l = 0; l < 12; l += 3) {
+            j = 0;
+            for (i = 0; i < bound; i++) {
+                bit_alloc_bits = alloc_table[j];
+                for (ch = 0; ch < s->nb_channels; ch++) {
+                    b = bit_alloc[ch][i];
+                    if (b) {
+                        scale = scale_factors[ch][i][k];
+                        qindex = alloc_table[j+b];
+                        bits = ff_mpa_quant_bits[qindex];
+                        if (bits < 0) {
+                            int v2;
+                            /* 3 values at the same time */
+                            v = get_bits(&s->gb, -bits);
+                            v2 = division_tabs[qindex][v];
+                            steps  = ff_mpa_quant_steps[qindex];
+
+                            s->sb_samples[ch][k * 12 + l + 0][i] =
+                                l2_unscale_group(steps,  v2       & 15, scale);
+                            s->sb_samples[ch][k * 12 + l + 1][i] =
+                                l2_unscale_group(steps, (v2 >> 4) & 15, scale);
+                            s->sb_samples[ch][k * 12 + l + 2][i] =
+                                l2_unscale_group(steps,  v2 >> 8      , scale);
+                        } else {
+                            for (m = 0; m < 3; m++) {
+                                v = get_bits(&s->gb, bits);
+                                v = l1_unscale(bits - 1, v, scale);
+                                s->sb_samples[ch][k * 12 + l + m][i] = v;
+                            }
+                        }
+                    } else {
+                        s->sb_samples[ch][k * 12 + l + 0][i] = 0;
+                        s->sb_samples[ch][k * 12 + l + 1][i] = 0;
+                        s->sb_samples[ch][k * 12 + l + 2][i] = 0;
+                    }
+                }
+                /* next subband in alloc table */
+                j += 1 << bit_alloc_bits;
+            }
+            /* XXX: find a way to avoid this duplication of code */
+            for (i = bound; i < sblimit; i++) {
+                bit_alloc_bits = alloc_table[j];
+                b = bit_alloc[0][i];
+                if (b) {
+                    int mant, scale0, scale1;
+                    scale0 = scale_factors[0][i][k];
+                    scale1 = scale_factors[1][i][k];
+                    qindex = alloc_table[j+b];
+                    bits = ff_mpa_quant_bits[qindex];
+                    if (bits < 0) {
+                        /* 3 values at the same time */
+                        v = get_bits(&s->gb, -bits);
+                        steps = ff_mpa_quant_steps[qindex];
+                        mant = v % steps;
+                        v = v / steps;
+                        s->sb_samples[0][k * 12 + l + 0][i] =
+                            l2_unscale_group(steps, mant, scale0);
+                        s->sb_samples[1][k * 12 + l + 0][i] =
+                            l2_unscale_group(steps, mant, scale1);
+                        mant = v % steps;
+                        v = v / steps;
+                        s->sb_samples[0][k * 12 + l + 1][i] =
+                            l2_unscale_group(steps, mant, scale0);
+                        s->sb_samples[1][k * 12 + l + 1][i] =
+                            l2_unscale_group(steps, mant, scale1);
+                        s->sb_samples[0][k * 12 + l + 2][i] =
+                            l2_unscale_group(steps, v, scale0);
+                        s->sb_samples[1][k * 12 + l + 2][i] =
+                            l2_unscale_group(steps, v, scale1);
+                    } else {
+                        for (m = 0; m < 3; m++) {
+                            mant = get_bits(&s->gb, bits);
+                            s->sb_samples[0][k * 12 + l + m][i] =
+                                l1_unscale(bits - 1, mant, scale0);
+                            s->sb_samples[1][k * 12 + l + m][i] =
+                                l1_unscale(bits - 1, mant, scale1);
+                        }
+                    }
+                } else {
+                    s->sb_samples[0][k * 12 + l + 0][i] = 0;
+                    s->sb_samples[0][k * 12 + l + 1][i] = 0;
+                    s->sb_samples[0][k * 12 + l + 2][i] = 0;
+                    s->sb_samples[1][k * 12 + l + 0][i] = 0;
+                    s->sb_samples[1][k * 12 + l + 1][i] = 0;
+                    s->sb_samples[1][k * 12 + l + 2][i] = 0;
+                }
+                /* next subband in alloc table */
+                j += 1 << bit_alloc_bits;
+            }
+            /* fill remaining samples to zero */
+            for (i = sblimit; i < SBLIMIT; i++) {
+                for (ch = 0; ch < s->nb_channels; ch++) {
+                    s->sb_samples[ch][k * 12 + l + 0][i] = 0;
+                    s->sb_samples[ch][k * 12 + l + 1][i] = 0;
+                    s->sb_samples[ch][k * 12 + l + 2][i] = 0;
+                }
+            }
+        }
+    }
+    return 3 * 12;
+}
+
+#define SPLIT(dst,sf,n)             \
+    if (n == 3) {                   \
+        int m = (sf * 171) >> 9;    \
+        dst   = sf - 3 * m;         \
+        sf    = m;                  \
+    } else if (n == 4) {            \
+        dst  = sf & 3;              \
+        sf >>= 2;                   \
+    } else if (n == 5) {            \
+        int m = (sf * 205) >> 10;   \
+        dst   = sf - 5 * m;         \
+        sf    = m;                  \
+    } else if (n == 6) {            \
+        int m = (sf * 171) >> 10;   \
+        dst   = sf - 6 * m;         \
+        sf    = m;                  \
+    } else {                        \
+        dst = 0;                    \
+    }
+
+static av_always_inline void lsf_sf_expand(int *slen, int sf, int n1, int n2,
+                                           int n3)
+{
+    SPLIT(slen[3], sf, n3)
+    SPLIT(slen[2], sf, n2)
+    SPLIT(slen[1], sf, n1)
+    slen[0] = sf;
+}
+
+static void exponents_from_scale_factors(MPADecodeContext *s, GranuleDef *g,
+                                         int16_t *exponents)
+{
+    const uint8_t *bstab, *pretab;
+    int len, i, j, k, l, v0, shift, gain, gains[3];
+    int16_t *exp_ptr;
+
+    exp_ptr = exponents;
+    gain    = g->global_gain - 210;
+    shift   = g->scalefac_scale + 1;
+
+    bstab  = band_size_long[s->sample_rate_index];
+    pretab = mpa_pretab[g->preflag];
+    for (i = 0; i < g->long_end; i++) {
+        v0 = gain - ((g->scale_factors[i] + pretab[i]) << shift) + 400;
+        len = bstab[i];
+        for (j = len; j > 0; j--)
+            *exp_ptr++ = v0;
+    }
+
+    if (g->short_start < 13) {
+        bstab    = band_size_short[s->sample_rate_index];
+        gains[0] = gain - (g->subblock_gain[0] << 3);
+        gains[1] = gain - (g->subblock_gain[1] << 3);
+        gains[2] = gain - (g->subblock_gain[2] << 3);
+        k        = g->long_end;
+        for (i = g->short_start; i < 13; i++) {
+            len = bstab[i];
+            for (l = 0; l < 3; l++) {
+                v0 = gains[l] - (g->scale_factors[k++] << shift) + 400;
+                for (j = len; j > 0; j--)
+                    *exp_ptr++ = v0;
+            }
+        }
+    }
+}
+
+/* handle n = 0 too */
+static inline int get_bitsz(GetBitContext *s, int n)
+{
+    return n ? get_bits(s, n) : 0;
+}
+
+
+static void switch_buffer(MPADecodeContext *s, int *pos, int *end_pos,
+                          int *end_pos2)
+{
+    if (s->in_gb.buffer && *pos >= s->gb.size_in_bits) {
+        s->gb           = s->in_gb;
+        s->in_gb.buffer = NULL;
+        av_assert2((get_bits_count(&s->gb) & 7) == 0);
+        skip_bits_long(&s->gb, *pos - *end_pos);
+        *end_pos2 =
+        *end_pos  = *end_pos2 + get_bits_count(&s->gb) - *pos;
+        *pos      = get_bits_count(&s->gb);
+    }
+}
+
+/* Following is a optimized code for
+            INTFLOAT v = *src
+            if(get_bits1(&s->gb))
+                v = -v;
+            *dst = v;
+*/
+#if USE_FLOATS
+#define READ_FLIP_SIGN(dst,src)                     \
+    v = AV_RN32A(src) ^ (get_bits1(&s->gb) << 31);  \
+    AV_WN32A(dst, v);
+#else
+#define READ_FLIP_SIGN(dst,src)     \
+    v      = -get_bits1(&s->gb);    \
+    *(dst) = (*(src) ^ v) - v;
+#endif
+
+static int huffman_decode(MPADecodeContext *s, GranuleDef *g,
+                          int16_t *exponents, int end_pos2)
+{
+    int s_index;
+    int i;
+    int last_pos, bits_left;
+    VLC *vlc;
+    int end_pos = FFMIN(end_pos2, s->gb.size_in_bits);
+
+    /* low frequencies (called big values) */
+    s_index = 0;
+    for (i = 0; i < 3; i++) {
+        int j, k, l, linbits;
+        j = g->region_size[i];
+        if (j == 0)
+            continue;
+        /* select vlc table */
+        k       = g->table_select[i];
+        l       = mpa_huff_data[k][0];
+        linbits = mpa_huff_data[k][1];
+        vlc     = &huff_vlc[l];
+
+        if (!l) {
+            memset(&g->sb_hybrid[s_index], 0, sizeof(*g->sb_hybrid) * 2 * j);
+            s_index += 2 * j;
+            continue;
+        }
+
+        /* read huffcode and compute each couple */
+        for (; j > 0; j--) {
+            int exponent, x, y;
+            int v;
+            int pos = get_bits_count(&s->gb);
+
+            if (pos >= end_pos){
+                switch_buffer(s, &pos, &end_pos, &end_pos2);
+                if (pos >= end_pos)
+                    break;
+            }
+            y = get_vlc2(&s->gb, vlc->table, 7, 3);
+
+            if (!y) {
+                g->sb_hybrid[s_index  ] =
+                g->sb_hybrid[s_index+1] = 0;
+                s_index += 2;
+                continue;
+            }
+
+            exponent= exponents[s_index];
+
+            av_dlog(s->avctx, "region=%d n=%d x=%d y=%d exp=%d\n",
+                    i, g->region_size[i] - j, x, y, exponent);
+            if (y & 16) {
+                x = y >> 5;
+                y = y & 0x0f;
+                if (x < 15) {
+                    READ_FLIP_SIGN(g->sb_hybrid + s_index, RENAME(expval_table)[exponent] + x)
+                } else {
+                    x += get_bitsz(&s->gb, linbits);
+                    v  = l3_unscale(x, exponent);
+                    if (get_bits1(&s->gb))
+                        v = -v;
+                    g->sb_hybrid[s_index] = v;
+                }
+                if (y < 15) {
+                    READ_FLIP_SIGN(g->sb_hybrid + s_index + 1, RENAME(expval_table)[exponent] + y)
+                } else {
+                    y += get_bitsz(&s->gb, linbits);
+                    v  = l3_unscale(y, exponent);
+                    if (get_bits1(&s->gb))
+                        v = -v;
+                    g->sb_hybrid[s_index+1] = v;
+                }
+            } else {
+                x = y >> 5;
+                y = y & 0x0f;
+                x += y;
+                if (x < 15) {
+                    READ_FLIP_SIGN(g->sb_hybrid + s_index + !!y, RENAME(expval_table)[exponent] + x)
+                } else {
+                    x += get_bitsz(&s->gb, linbits);
+                    v  = l3_unscale(x, exponent);
+                    if (get_bits1(&s->gb))
+                        v = -v;
+                    g->sb_hybrid[s_index+!!y] = v;
+                }
+                g->sb_hybrid[s_index + !y] = 0;
+            }
+            s_index += 2;
+        }
+    }
+
+    /* high frequencies */
+    vlc = &huff_quad_vlc[g->count1table_select];
+    last_pos = 0;
+    while (s_index <= 572) {
+        int pos, code;
+        pos = get_bits_count(&s->gb);
+        if (pos >= end_pos) {
+            if (pos > end_pos2 && last_pos) {
+                /* some encoders generate an incorrect size for this
+                   part. We must go back into the data */
+                s_index -= 4;
+                skip_bits_long(&s->gb, last_pos - pos);
+                av_log(s->avctx, AV_LOG_INFO, "overread, skip %d enddists: %d %d\n", last_pos - pos, end_pos-pos, end_pos2-pos);
+                if(s->err_recognition & (AV_EF_BITSTREAM|AV_EF_COMPLIANT))
+                    s_index=0;
+                break;
+            }
+            switch_buffer(s, &pos, &end_pos, &end_pos2);
+            if (pos >= end_pos)
+                break;
+        }
+        last_pos = pos;
+
+        code = get_vlc2(&s->gb, vlc->table, vlc->bits, 1);
+        av_dlog(s->avctx, "t=%d code=%d\n", g->count1table_select, code);
+        g->sb_hybrid[s_index+0] =
+        g->sb_hybrid[s_index+1] =
+        g->sb_hybrid[s_index+2] =
+        g->sb_hybrid[s_index+3] = 0;
+        while (code) {
+            static const int idxtab[16] = { 3,3,2,2,1,1,1,1,0,0,0,0,0,0,0,0 };
+            int v;
+            int pos = s_index + idxtab[code];
+            code   ^= 8 >> idxtab[code];
+            READ_FLIP_SIGN(g->sb_hybrid + pos, RENAME(exp_table)+exponents[pos])
+        }
+        s_index += 4;
+    }
+    /* skip extension bits */
+    bits_left = end_pos2 - get_bits_count(&s->gb);
+    if (bits_left < 0 && (s->err_recognition & (AV_EF_BUFFER|AV_EF_COMPLIANT))) {
+        av_log(s->avctx, AV_LOG_ERROR, "bits_left=%d\n", bits_left);
+        s_index=0;
+    } else if (bits_left > 0 && (s->err_recognition & (AV_EF_BUFFER|AV_EF_AGGRESSIVE))) {
+        av_log(s->avctx, AV_LOG_ERROR, "bits_left=%d\n", bits_left);
+        s_index = 0;
+    }
+    memset(&g->sb_hybrid[s_index], 0, sizeof(*g->sb_hybrid) * (576 - s_index));
+    skip_bits_long(&s->gb, bits_left);
+
+    i = get_bits_count(&s->gb);
+    switch_buffer(s, &i, &end_pos, &end_pos2);
+
+    return 0;
+}
+
+/* Reorder short blocks from bitstream order to interleaved order. It
+   would be faster to do it in parsing, but the code would be far more
+   complicated */
+static void reorder_block(MPADecodeContext *s, GranuleDef *g)
+{
+    int i, j, len;
+    INTFLOAT *ptr, *dst, *ptr1;
+    INTFLOAT tmp[576];
+
+    if (g->block_type != 2)
+        return;
+
+    if (g->switch_point) {
+        if (s->sample_rate_index != 8)
+            ptr = g->sb_hybrid + 36;
+        else
+            ptr = g->sb_hybrid + 72;
+    } else {
+        ptr = g->sb_hybrid;
+    }
+
+    for (i = g->short_start; i < 13; i++) {
+        len  = band_size_short[s->sample_rate_index][i];
+        ptr1 = ptr;
+        dst  = tmp;
+        for (j = len; j > 0; j--) {
+            *dst++ = ptr[0*len];
+            *dst++ = ptr[1*len];
+            *dst++ = ptr[2*len];
+            ptr++;
+        }
+        ptr += 2 * len;
+        memcpy(ptr1, tmp, len * 3 * sizeof(*ptr1));
+    }
+}
+
+#define ISQRT2 FIXR(0.70710678118654752440)
+
+static void compute_stereo(MPADecodeContext *s, GranuleDef *g0, GranuleDef *g1)
+{
+    int i, j, k, l;
+    int sf_max, sf, len, non_zero_found;
+    INTFLOAT (*is_tab)[16], *tab0, *tab1, tmp0, tmp1, v1, v2;
+    int non_zero_found_short[3];
+
+    /* intensity stereo */
+    if (s->mode_ext & MODE_EXT_I_STEREO) {
+        if (!s->lsf) {
+            is_tab = is_table;
+            sf_max = 7;
+        } else {
+            is_tab = is_table_lsf[g1->scalefac_compress & 1];
+            sf_max = 16;
+        }
+
+        tab0 = g0->sb_hybrid + 576;
+        tab1 = g1->sb_hybrid + 576;
+
+        non_zero_found_short[0] = 0;
+        non_zero_found_short[1] = 0;
+        non_zero_found_short[2] = 0;
+        k = (13 - g1->short_start) * 3 + g1->long_end - 3;
+        for (i = 12; i >= g1->short_start; i--) {
+            /* for last band, use previous scale factor */
+            if (i != 11)
+                k -= 3;
+            len = band_size_short[s->sample_rate_index][i];
+            for (l = 2; l >= 0; l--) {
+                tab0 -= len;
+                tab1 -= len;
+                if (!non_zero_found_short[l]) {
+                    /* test if non zero band. if so, stop doing i-stereo */
+                    for (j = 0; j < len; j++) {
+                        if (tab1[j] != 0) {
+                            non_zero_found_short[l] = 1;
+                            goto found1;
+                        }
+                    }
+                    sf = g1->scale_factors[k + l];
+                    if (sf >= sf_max)
+                        goto found1;
+
+                    v1 = is_tab[0][sf];
+                    v2 = is_tab[1][sf];
+                    for (j = 0; j < len; j++) {
+                        tmp0    = tab0[j];
+                        tab0[j] = MULLx(tmp0, v1, FRAC_BITS);
+                        tab1[j] = MULLx(tmp0, v2, FRAC_BITS);
+                    }
+                } else {
+found1:
+                    if (s->mode_ext & MODE_EXT_MS_STEREO) {
+                        /* lower part of the spectrum : do ms stereo
+                           if enabled */
+                        for (j = 0; j < len; j++) {
+                            tmp0    = tab0[j];
+                            tmp1    = tab1[j];
+                            tab0[j] = MULLx(tmp0 + tmp1, ISQRT2, FRAC_BITS);
+                            tab1[j] = MULLx(tmp0 - tmp1, ISQRT2, FRAC_BITS);
+                        }
+                    }
+                }
+            }
+        }
+
+        non_zero_found = non_zero_found_short[0] |
+                         non_zero_found_short[1] |
+                         non_zero_found_short[2];
+
+        for (i = g1->long_end - 1;i >= 0;i--) {
+            len   = band_size_long[s->sample_rate_index][i];
+            tab0 -= len;
+            tab1 -= len;
+            /* test if non zero band. if so, stop doing i-stereo */
+            if (!non_zero_found) {
+                for (j = 0; j < len; j++) {
+                    if (tab1[j] != 0) {
+                        non_zero_found = 1;
+                        goto found2;
+                    }
+                }
+                /* for last band, use previous scale factor */
+                k  = (i == 21) ? 20 : i;
+                sf = g1->scale_factors[k];
+                if (sf >= sf_max)
+                    goto found2;
+                v1 = is_tab[0][sf];
+                v2 = is_tab[1][sf];
+                for (j = 0; j < len; j++) {
+                    tmp0    = tab0[j];
+                    tab0[j] = MULLx(tmp0, v1, FRAC_BITS);
+                    tab1[j] = MULLx(tmp0, v2, FRAC_BITS);
+                }
+            } else {
+found2:
+                if (s->mode_ext & MODE_EXT_MS_STEREO) {
+                    /* lower part of the spectrum : do ms stereo
+                       if enabled */
+                    for (j = 0; j < len; j++) {
+                        tmp0    = tab0[j];
+                        tmp1    = tab1[j];
+                        tab0[j] = MULLx(tmp0 + tmp1, ISQRT2, FRAC_BITS);
+                        tab1[j] = MULLx(tmp0 - tmp1, ISQRT2, FRAC_BITS);
+                    }
+                }
+            }
+        }
+    } else if (s->mode_ext & MODE_EXT_MS_STEREO) {
+        /* ms stereo ONLY */
+        /* NOTE: the 1/sqrt(2) normalization factor is included in the
+           global gain */
+#if USE_FLOATS
+       s->fdsp.butterflies_float(g0->sb_hybrid, g1->sb_hybrid, 576);
+#else
+        tab0 = g0->sb_hybrid;
+        tab1 = g1->sb_hybrid;
+        for (i = 0; i < 576; i++) {
+            tmp0    = tab0[i];
+            tmp1    = tab1[i];
+            tab0[i] = tmp0 + tmp1;
+            tab1[i] = tmp0 - tmp1;
+        }
+#endif
+    }
+}
+
+#if USE_FLOATS
+#if HAVE_MIPSFPU
+#   include "mips/compute_antialias_float.h"
+#endif /* HAVE_MIPSFPU */
+#else
+#if HAVE_MIPSDSPR1
+#   include "mips/compute_antialias_fixed.h"
+#endif /* HAVE_MIPSDSPR1 */
+#endif /* USE_FLOATS */
+
+#ifndef compute_antialias
+#if USE_FLOATS
+#define AA(j) do {                                                      \
+        float tmp0 = ptr[-1-j];                                         \
+        float tmp1 = ptr[   j];                                         \
+        ptr[-1-j] = tmp0 * csa_table[j][0] - tmp1 * csa_table[j][1];    \
+        ptr[   j] = tmp0 * csa_table[j][1] + tmp1 * csa_table[j][0];    \
+    } while (0)
+#else
+#define AA(j) do {                                              \
+        int tmp0 = ptr[-1-j];                                   \
+        int tmp1 = ptr[   j];                                   \
+        int tmp2 = MULH(tmp0 + tmp1, csa_table[j][0]);          \
+        ptr[-1-j] = 4 * (tmp2 - MULH(tmp1, csa_table[j][2]));   \
+        ptr[   j] = 4 * (tmp2 + MULH(tmp0, csa_table[j][3]));   \
+    } while (0)
+#endif
+
+static void compute_antialias(MPADecodeContext *s, GranuleDef *g)
+{
+    INTFLOAT *ptr;
+    int n, i;
+
+    /* we antialias only "long" bands */
+    if (g->block_type == 2) {
+        if (!g->switch_point)
+            return;
+        /* XXX: check this for 8000Hz case */
+        n = 1;
+    } else {
+        n = SBLIMIT - 1;
+    }
+
+    ptr = g->sb_hybrid + 18;
+    for (i = n; i > 0; i--) {
+        AA(0);
+        AA(1);
+        AA(2);
+        AA(3);
+        AA(4);
+        AA(5);
+        AA(6);
+        AA(7);
+
+        ptr += 18;
+    }
+}
+#endif /* compute_antialias */
+
+static void compute_imdct(MPADecodeContext *s, GranuleDef *g,
+                          INTFLOAT *sb_samples, INTFLOAT *mdct_buf)
+{
+    INTFLOAT *win, *out_ptr, *ptr, *buf, *ptr1;
+    INTFLOAT out2[12];
+    int i, j, mdct_long_end, sblimit;
+
+    /* find last non zero block */
+    ptr  = g->sb_hybrid + 576;
+    ptr1 = g->sb_hybrid + 2 * 18;
+    while (ptr >= ptr1) {
+        int32_t *p;
+        ptr -= 6;
+        p    = (int32_t*)ptr;
+        if (p[0] | p[1] | p[2] | p[3] | p[4] | p[5])
+            break;
+    }
+    sblimit = ((ptr - g->sb_hybrid) / 18) + 1;
+
+    if (g->block_type == 2) {
+        /* XXX: check for 8000 Hz */
+        if (g->switch_point)
+            mdct_long_end = 2;
+        else
+            mdct_long_end = 0;
+    } else {
+        mdct_long_end = sblimit;
+    }
+
+    s->mpadsp.RENAME(imdct36_blocks)(sb_samples, mdct_buf, g->sb_hybrid,
+                                     mdct_long_end, g->switch_point,
+                                     g->block_type);
+
+    buf = mdct_buf + 4*18*(mdct_long_end >> 2) + (mdct_long_end & 3);
+    ptr = g->sb_hybrid + 18 * mdct_long_end;
+
+    for (j = mdct_long_end; j < sblimit; j++) {
+        /* select frequency inversion */
+        win     = RENAME(ff_mdct_win)[2 + (4  & -(j & 1))];
+        out_ptr = sb_samples + j;
+
+        for (i = 0; i < 6; i++) {
+            *out_ptr = buf[4*i];
+            out_ptr += SBLIMIT;
+        }
+        imdct12(out2, ptr + 0);
+        for (i = 0; i < 6; i++) {
+            *out_ptr     = MULH3(out2[i    ], win[i    ], 1) + buf[4*(i + 6*1)];
+            buf[4*(i + 6*2)] = MULH3(out2[i + 6], win[i + 6], 1);
+            out_ptr += SBLIMIT;
+        }
+        imdct12(out2, ptr + 1);
+        for (i = 0; i < 6; i++) {
+            *out_ptr     = MULH3(out2[i    ], win[i    ], 1) + buf[4*(i + 6*2)];
+            buf[4*(i + 6*0)] = MULH3(out2[i + 6], win[i + 6], 1);
+            out_ptr += SBLIMIT;
+        }
+        imdct12(out2, ptr + 2);
+        for (i = 0; i < 6; i++) {
+            buf[4*(i + 6*0)] = MULH3(out2[i    ], win[i    ], 1) + buf[4*(i + 6*0)];
+            buf[4*(i + 6*1)] = MULH3(out2[i + 6], win[i + 6], 1);
+            buf[4*(i + 6*2)] = 0;
+        }
+        ptr += 18;
+        buf += (j&3) != 3 ? 1 : (4*18-3);
+    }
+    /* zero bands */
+    for (j = sblimit; j < SBLIMIT; j++) {
+        /* overlap */
+        out_ptr = sb_samples + j;
+        for (i = 0; i < 18; i++) {
+            *out_ptr = buf[4*i];
+            buf[4*i]   = 0;
+            out_ptr += SBLIMIT;
+        }
+        buf += (j&3) != 3 ? 1 : (4*18-3);
+    }
+}
+
+/* main layer3 decoding function */
+static int mp_decode_layer3(MPADecodeContext *s)
+{
+    int nb_granules, main_data_begin;
+    int gr, ch, blocksplit_flag, i, j, k, n, bits_pos;
+    GranuleDef *g;
+    int16_t exponents[576]; //FIXME try INTFLOAT
+
+    /* read side info */
+    if (s->lsf) {
+        main_data_begin = get_bits(&s->gb, 8);
+        skip_bits(&s->gb, s->nb_channels);
+        nb_granules = 1;
+    } else {
+        main_data_begin = get_bits(&s->gb, 9);
+        if (s->nb_channels == 2)
+            skip_bits(&s->gb, 3);
+        else
+            skip_bits(&s->gb, 5);
+        nb_granules = 2;
+        for (ch = 0; ch < s->nb_channels; ch++) {
+            s->granules[ch][0].scfsi = 0;/* all scale factors are transmitted */
+            s->granules[ch][1].scfsi = get_bits(&s->gb, 4);
+        }
+    }
+
+    for (gr = 0; gr < nb_granules; gr++) {
+        for (ch = 0; ch < s->nb_channels; ch++) {
+            av_dlog(s->avctx, "gr=%d ch=%d: side_info\n", gr, ch);
+            g = &s->granules[ch][gr];
+            g->part2_3_length = get_bits(&s->gb, 12);
+            g->big_values     = get_bits(&s->gb,  9);
+            if (g->big_values > 288) {
+                av_log(s->avctx, AV_LOG_ERROR, "big_values too big\n");
+                return AVERROR_INVALIDDATA;
+            }
+
+            g->global_gain = get_bits(&s->gb, 8);
+            /* if MS stereo only is selected, we precompute the
+               1/sqrt(2) renormalization factor */
+            if ((s->mode_ext & (MODE_EXT_MS_STEREO | MODE_EXT_I_STEREO)) ==
+                MODE_EXT_MS_STEREO)
+                g->global_gain -= 2;
+            if (s->lsf)
+                g->scalefac_compress = get_bits(&s->gb, 9);
+            else
+                g->scalefac_compress = get_bits(&s->gb, 4);
+            blocksplit_flag = get_bits1(&s->gb);
+            if (blocksplit_flag) {
+                g->block_type = get_bits(&s->gb, 2);
+                if (g->block_type == 0) {
+                    av_log(s->avctx, AV_LOG_ERROR, "invalid block type\n");
+                    return AVERROR_INVALIDDATA;
+                }
+                g->switch_point = get_bits1(&s->gb);
+                for (i = 0; i < 2; i++)
+                    g->table_select[i] = get_bits(&s->gb, 5);
+                for (i = 0; i < 3; i++)
+                    g->subblock_gain[i] = get_bits(&s->gb, 3);
+                init_short_region(s, g);
+            } else {
+                int region_address1, region_address2;
+                g->block_type = 0;
+                g->switch_point = 0;
+                for (i = 0; i < 3; i++)
+                    g->table_select[i] = get_bits(&s->gb, 5);
+                /* compute huffman coded region sizes */
+                region_address1 = get_bits(&s->gb, 4);
+                region_address2 = get_bits(&s->gb, 3);
+                av_dlog(s->avctx, "region1=%d region2=%d\n",
+                        region_address1, region_address2);
+                init_long_region(s, g, region_address1, region_address2);
+            }
+            region_offset2size(g);
+            compute_band_indexes(s, g);
+
+            g->preflag = 0;
+            if (!s->lsf)
+                g->preflag = get_bits1(&s->gb);
+            g->scalefac_scale     = get_bits1(&s->gb);
+            g->count1table_select = get_bits1(&s->gb);
+            av_dlog(s->avctx, "block_type=%d switch_point=%d\n",
+                    g->block_type, g->switch_point);
+        }
+    }
+
+    if (!s->adu_mode) {
+        int skip;
+        const uint8_t *ptr = s->gb.buffer + (get_bits_count(&s->gb)>>3);
+        int extrasize = av_clip(get_bits_left(&s->gb) >> 3, 0, EXTRABYTES);
+        av_assert1((get_bits_count(&s->gb) & 7) == 0);
+        /* now we get bits from the main_data_begin offset */
+        av_dlog(s->avctx, "seekback:%d, lastbuf:%d\n",
+                main_data_begin, s->last_buf_size);
+
+        memcpy(s->last_buf + s->last_buf_size, ptr, extrasize);
+        s->in_gb = s->gb;
+        init_get_bits(&s->gb, s->last_buf, s->last_buf_size*8);
+#if !UNCHECKED_BITSTREAM_READER
+        s->gb.size_in_bits_plus8 += FFMAX(extrasize, LAST_BUF_SIZE - s->last_buf_size) * 8;
+#endif
+        s->last_buf_size <<= 3;
+        for (gr = 0; gr < nb_granules && (s->last_buf_size >> 3) < main_data_begin; gr++) {
+            for (ch = 0; ch < s->nb_channels; ch++) {
+                g = &s->granules[ch][gr];
+                s->last_buf_size += g->part2_3_length;
+                memset(g->sb_hybrid, 0, sizeof(g->sb_hybrid));
+                compute_imdct(s, g, &s->sb_samples[ch][18 * gr][0], s->mdct_buf[ch]);
+            }
+        }
+        skip = s->last_buf_size - 8 * main_data_begin;
+        if (skip >= s->gb.size_in_bits && s->in_gb.buffer) {
+            skip_bits_long(&s->in_gb, skip - s->gb.size_in_bits);
+            s->gb           = s->in_gb;
+            s->in_gb.buffer = NULL;
+        } else {
+            skip_bits_long(&s->gb, skip);
+        }
+    } else {
+        gr = 0;
+    }
+
+    for (; gr < nb_granules; gr++) {
+        for (ch = 0; ch < s->nb_channels; ch++) {
+            g = &s->granules[ch][gr];
+            bits_pos = get_bits_count(&s->gb);
+
+            if (!s->lsf) {
+                uint8_t *sc;
+                int slen, slen1, slen2;
+
+                /* MPEG1 scale factors */
+                slen1 = slen_table[0][g->scalefac_compress];
+                slen2 = slen_table[1][g->scalefac_compress];
+                av_dlog(s->avctx, "slen1=%d slen2=%d\n", slen1, slen2);
+                if (g->block_type == 2) {
+                    n = g->switch_point ? 17 : 18;
+                    j = 0;
+                    if (slen1) {
+                        for (i = 0; i < n; i++)
+                            g->scale_factors[j++] = get_bits(&s->gb, slen1);
+                    } else {
+                        for (i = 0; i < n; i++)
+                            g->scale_factors[j++] = 0;
+                    }
+                    if (slen2) {
+                        for (i = 0; i < 18; i++)
+                            g->scale_factors[j++] = get_bits(&s->gb, slen2);
+                        for (i = 0; i < 3; i++)
+                            g->scale_factors[j++] = 0;
+                    } else {
+                        for (i = 0; i < 21; i++)
+                            g->scale_factors[j++] = 0;
+                    }
+                } else {
+                    sc = s->granules[ch][0].scale_factors;
+                    j = 0;
+                    for (k = 0; k < 4; k++) {
+                        n = k == 0 ? 6 : 5;
+                        if ((g->scfsi & (0x8 >> k)) == 0) {
+                            slen = (k < 2) ? slen1 : slen2;
+                            if (slen) {
+                                for (i = 0; i < n; i++)
+                                    g->scale_factors[j++] = get_bits(&s->gb, slen);
+                            } else {
+                                for (i = 0; i < n; i++)
+                                    g->scale_factors[j++] = 0;
+                            }
+                        } else {
+                            /* simply copy from last granule */
+                            for (i = 0; i < n; i++) {
+                                g->scale_factors[j] = sc[j];
+                                j++;
+                            }
+                        }
+                    }
+                    g->scale_factors[j++] = 0;
+                }
+            } else {
+                int tindex, tindex2, slen[4], sl, sf;
+
+                /* LSF scale factors */
+                if (g->block_type == 2)
+                    tindex = g->switch_point ? 2 : 1;
+                else
+                    tindex = 0;
+
+                sf = g->scalefac_compress;
+                if ((s->mode_ext & MODE_EXT_I_STEREO) && ch == 1) {
+                    /* intensity stereo case */
+                    sf >>= 1;
+                    if (sf < 180) {
+                        lsf_sf_expand(slen, sf, 6, 6, 0);
+                        tindex2 = 3;
+                    } else if (sf < 244) {
+                        lsf_sf_expand(slen, sf - 180, 4, 4, 0);
+                        tindex2 = 4;
+                    } else {
+                        lsf_sf_expand(slen, sf - 244, 3, 0, 0);
+                        tindex2 = 5;
+                    }
+                } else {
+                    /* normal case */
+                    if (sf < 400) {
+                        lsf_sf_expand(slen, sf, 5, 4, 4);
+                        tindex2 = 0;
+                    } else if (sf < 500) {
+                        lsf_sf_expand(slen, sf - 400, 5, 4, 0);
+                        tindex2 = 1;
+                    } else {
+                        lsf_sf_expand(slen, sf - 500, 3, 0, 0);
+                        tindex2 = 2;
+                        g->preflag = 1;
+                    }
+                }
+
+                j = 0;
+                for (k = 0; k < 4; k++) {
+                    n  = lsf_nsf_table[tindex2][tindex][k];
+                    sl = slen[k];
+                    if (sl) {
+                        for (i = 0; i < n; i++)
+                            g->scale_factors[j++] = get_bits(&s->gb, sl);
+                    } else {
+                        for (i = 0; i < n; i++)
+                            g->scale_factors[j++] = 0;
+                    }
+                }
+                /* XXX: should compute exact size */
+                for (; j < 40; j++)
+                    g->scale_factors[j] = 0;
+            }
+
+            exponents_from_scale_factors(s, g, exponents);
+
+            /* read Huffman coded residue */
+            huffman_decode(s, g, exponents, bits_pos + g->part2_3_length);
+        } /* ch */
+
+        if (s->mode == MPA_JSTEREO)
+            compute_stereo(s, &s->granules[0][gr], &s->granules[1][gr]);
+
+        for (ch = 0; ch < s->nb_channels; ch++) {
+            g = &s->granules[ch][gr];
+
+            reorder_block(s, g);
+            compute_antialias(s, g);
+            compute_imdct(s, g, &s->sb_samples[ch][18 * gr][0], s->mdct_buf[ch]);
+        }
+    } /* gr */
+    if (get_bits_count(&s->gb) < 0)
+        skip_bits_long(&s->gb, -get_bits_count(&s->gb));
+    return nb_granules * 18;
+}
+
+static int mp_decode_frame(MPADecodeContext *s, OUT_INT **samples,
+                           const uint8_t *buf, int buf_size)
+{
+    int i, nb_frames, ch, ret;
+    OUT_INT *samples_ptr;
+
+    init_get_bits(&s->gb, buf + HEADER_SIZE, (buf_size - HEADER_SIZE) * 8);
+
+    /* skip error protection field */
+    if (s->error_protection)
+        skip_bits(&s->gb, 16);
+
+    switch(s->layer) {
+    case 1:
+        s->avctx->frame_size = 384;
+        nb_frames = mp_decode_layer1(s);
+        break;
+    case 2:
+        s->avctx->frame_size = 1152;
+        nb_frames = mp_decode_layer2(s);
+        break;
+    case 3:
+        s->avctx->frame_size = s->lsf ? 576 : 1152;
+    default:
+        nb_frames = mp_decode_layer3(s);
+
+        s->last_buf_size=0;
+        if (s->in_gb.buffer) {
+            align_get_bits(&s->gb);
+            i = get_bits_left(&s->gb)>>3;
+            if (i >= 0 && i <= BACKSTEP_SIZE) {
+                memmove(s->last_buf, s->gb.buffer + (get_bits_count(&s->gb)>>3), i);
+                s->last_buf_size=i;
+            } else
+                av_log(s->avctx, AV_LOG_ERROR, "invalid old backstep %d\n", i);
+            s->gb           = s->in_gb;
+            s->in_gb.buffer = NULL;
+        }
+
+        align_get_bits(&s->gb);
+        av_assert1((get_bits_count(&s->gb) & 7) == 0);
+        i = get_bits_left(&s->gb) >> 3;
+
+        if (i < 0 || i > BACKSTEP_SIZE || nb_frames < 0) {
+            if (i < 0)
+                av_log(s->avctx, AV_LOG_ERROR, "invalid new backstep %d\n", i);
+            i = FFMIN(BACKSTEP_SIZE, buf_size - HEADER_SIZE);
+        }
+        av_assert1(i <= buf_size - HEADER_SIZE && i >= 0);
+        memcpy(s->last_buf + s->last_buf_size, s->gb.buffer + buf_size - HEADER_SIZE - i, i);
+        s->last_buf_size += i;
+    }
+
+    if(nb_frames < 0)
+        return nb_frames;
+
+    /* get output buffer */
+    if (!samples) {
+        av_assert0(s->frame != NULL);
+        s->frame->nb_samples = s->avctx->frame_size;
+        if ((ret = ff_get_buffer(s->avctx, s->frame, 0)) < 0)
+            return ret;
+        samples = (OUT_INT **)s->frame->extended_data;
+    }
+
+    /* apply the synthesis filter */
+    for (ch = 0; ch < s->nb_channels; ch++) {
+        int sample_stride;
+        if (s->avctx->sample_fmt == OUT_FMT_P) {
+            samples_ptr   = samples[ch];
+            sample_stride = 1;
+        } else {
+            samples_ptr   = samples[0] + ch;
+            sample_stride = s->nb_channels;
+        }
+        for (i = 0; i < nb_frames; i++) {
+            RENAME(ff_mpa_synth_filter)(&s->mpadsp, s->synth_buf[ch],
+                                        &(s->synth_buf_offset[ch]),
+                                        RENAME(ff_mpa_synth_window),
+                                        &s->dither_state, samples_ptr,
+                                        sample_stride, s->sb_samples[ch][i]);
+            samples_ptr += 32 * sample_stride;
+        }
+    }
+
+    return nb_frames * 32 * sizeof(OUT_INT) * s->nb_channels;
+}
+
+static int decode_frame(AVCodecContext * avctx, void *data, int *got_frame_ptr,
+                        AVPacket *avpkt)
+{
+    const uint8_t *buf  = avpkt->data;
+    int buf_size        = avpkt->size;
+    MPADecodeContext *s = avctx->priv_data;
+    uint32_t header;
+    int ret;
+
+    while(buf_size && !*buf){
+        buf++;
+        buf_size--;
+    }
+
+    if (buf_size < HEADER_SIZE)
+        return AVERROR_INVALIDDATA;
+
+    header = AV_RB32(buf);
+    if (header>>8 == AV_RB32("TAG")>>8) {
+        av_log(avctx, AV_LOG_DEBUG, "discarding ID3 tag\n");
+        return buf_size;
+    }
+    if (ff_mpa_check_header(header) < 0) {
+        av_log(avctx, AV_LOG_ERROR, "Header missing\n");
+        return AVERROR_INVALIDDATA;
+    }
+
+    if (avpriv_mpegaudio_decode_header((MPADecodeHeader *)s, header) == 1) {
+        /* free format: prepare to compute frame size */
+        s->frame_size = -1;
+        return AVERROR_INVALIDDATA;
+    }
+    /* update codec info */
+    avctx->channels       = s->nb_channels;
+    avctx->channel_layout = s->nb_channels == 1 ? AV_CH_LAYOUT_MONO : AV_CH_LAYOUT_STEREO;
+    if (!avctx->bit_rate)
+        avctx->bit_rate = s->bit_rate;
+
+    if (s->frame_size <= 0 || s->frame_size > buf_size) {
+        av_log(avctx, AV_LOG_ERROR, "incomplete frame\n");
+        return AVERROR_INVALIDDATA;
+    } else if (s->frame_size < buf_size) {
+        av_log(avctx, AV_LOG_DEBUG, "incorrect frame size - multiple frames in buffer?\n");
+        buf_size= s->frame_size;
+    }
+
+    s->frame = data;
+
+    ret = mp_decode_frame(s, NULL, buf, buf_size);
+    if (ret >= 0) {
+        s->frame->nb_samples = avctx->frame_size;
+        *got_frame_ptr       = 1;
+        avctx->sample_rate   = s->sample_rate;
+        //FIXME maybe move the other codec info stuff from above here too
+    } else {
+        av_log(avctx, AV_LOG_ERROR, "Error while decoding MPEG audio frame.\n");
+        /* Only return an error if the bad frame makes up the whole packet or
+         * the error is related to buffer management.
+         * If there is more data in the packet, just consume the bad frame
+         * instead of returning an error, which would discard the whole
+         * packet. */
+        *got_frame_ptr = 0;
+        if (buf_size == avpkt->size || ret != AVERROR_INVALIDDATA)
+            return ret;
+    }
+    s->frame_size = 0;
+    return buf_size;
+}
+
+static void mp_flush(MPADecodeContext *ctx)
+{
+    memset(ctx->synth_buf, 0, sizeof(ctx->synth_buf));
+    ctx->last_buf_size = 0;
+}
+
+static void flush(AVCodecContext *avctx)
+{
+    mp_flush(avctx->priv_data);
+}
+
+#if CONFIG_MP3ADU_DECODER || CONFIG_MP3ADUFLOAT_DECODER
+static int decode_frame_adu(AVCodecContext *avctx, void *data,
+                            int *got_frame_ptr, AVPacket *avpkt)
+{
+    const uint8_t *buf  = avpkt->data;
+    int buf_size        = avpkt->size;
+    MPADecodeContext *s = avctx->priv_data;
+    uint32_t header;
+    int len, ret;
+    int av_unused out_size;
+
+    len = buf_size;
+
+    // Discard too short frames
+    if (buf_size < HEADER_SIZE) {
+        av_log(avctx, AV_LOG_ERROR, "Packet is too small\n");
+        return AVERROR_INVALIDDATA;
+    }
+
+
+    if (len > MPA_MAX_CODED_FRAME_SIZE)
+        len = MPA_MAX_CODED_FRAME_SIZE;
+
+    // Get header and restore sync word
+    header = AV_RB32(buf) | 0xffe00000;
+
+    if (ff_mpa_check_header(header) < 0) { // Bad header, discard frame
+        av_log(avctx, AV_LOG_ERROR, "Invalid frame header\n");
+        return AVERROR_INVALIDDATA;
+    }
+
+    avpriv_mpegaudio_decode_header((MPADecodeHeader *)s, header);
+    /* update codec info */
+    avctx->sample_rate = s->sample_rate;
+    avctx->channels    = s->nb_channels;
+    avctx->channel_layout = s->nb_channels == 1 ? AV_CH_LAYOUT_MONO : AV_CH_LAYOUT_STEREO;
+    if (!avctx->bit_rate)
+        avctx->bit_rate = s->bit_rate;
+
+    s->frame_size = len;
+
+    s->frame = data;
+
+    ret = mp_decode_frame(s, NULL, buf, buf_size);
+    if (ret < 0) {
+        av_log(avctx, AV_LOG_ERROR, "Error while decoding MPEG audio frame.\n");
+        return ret;
+    }
+
+    *got_frame_ptr = 1;
+
+    return buf_size;
+}
+#endif /* CONFIG_MP3ADU_DECODER || CONFIG_MP3ADUFLOAT_DECODER */
+
+#if CONFIG_MP3ON4_DECODER || CONFIG_MP3ON4FLOAT_DECODER
+
+/**
+ * Context for MP3On4 decoder
+ */
+typedef struct MP3On4DecodeContext {
+    int frames;                     ///< number of mp3 frames per block (number of mp3 decoder instances)
+    int syncword;                   ///< syncword patch
+    const uint8_t *coff;            ///< channel offsets in output buffer
+    MPADecodeContext *mp3decctx[5]; ///< MPADecodeContext for every decoder instance
+} MP3On4DecodeContext;
+
+#include "mpeg4audio.h"
+
+/* Next 3 arrays are indexed by channel config number (passed via codecdata) */
+
+/* number of mp3 decoder instances */
+static const uint8_t mp3Frames[8] = { 0, 1, 1, 2, 3, 3, 4, 5 };
+
+/* offsets into output buffer, assume output order is FL FR C LFE BL BR SL SR */
+static const uint8_t chan_offset[8][5] = {
+    { 0             },
+    { 0             },  // C
+    { 0             },  // FLR
+    { 2, 0          },  // C FLR
+    { 2, 0, 3       },  // C FLR BS
+    { 2, 0, 3       },  // C FLR BLRS
+    { 2, 0, 4, 3    },  // C FLR BLRS LFE
+    { 2, 0, 6, 4, 3 },  // C FLR BLRS BLR LFE
+};
+
+/* mp3on4 channel layouts */
+static const int16_t chan_layout[8] = {
+    0,
+    AV_CH_LAYOUT_MONO,
+    AV_CH_LAYOUT_STEREO,
+    AV_CH_LAYOUT_SURROUND,
+    AV_CH_LAYOUT_4POINT0,
+    AV_CH_LAYOUT_5POINT0,
+    AV_CH_LAYOUT_5POINT1,
+    AV_CH_LAYOUT_7POINT1
+};
+
+static av_cold int decode_close_mp3on4(AVCodecContext * avctx)
+{
+    MP3On4DecodeContext *s = avctx->priv_data;
+    int i;
+
+    for (i = 0; i < s->frames; i++)
+        av_free(s->mp3decctx[i]);
+
+    return 0;
+}
+
+
+static av_cold int decode_init_mp3on4(AVCodecContext * avctx)
+{
+    MP3On4DecodeContext *s = avctx->priv_data;
+    MPEG4AudioConfig cfg;
+    int i;
+
+    if ((avctx->extradata_size < 2) || (avctx->extradata == NULL)) {
+        av_log(avctx, AV_LOG_ERROR, "Codec extradata missing or too short.\n");
+        return AVERROR_INVALIDDATA;
+    }
+
+    avpriv_mpeg4audio_get_config(&cfg, avctx->extradata,
+                                 avctx->extradata_size * 8, 1);
+    if (!cfg.chan_config || cfg.chan_config > 7) {
+        av_log(avctx, AV_LOG_ERROR, "Invalid channel config number.\n");
+        return AVERROR_INVALIDDATA;
+    }
+    s->frames             = mp3Frames[cfg.chan_config];
+    s->coff               = chan_offset[cfg.chan_config];
+    avctx->channels       = ff_mpeg4audio_channels[cfg.chan_config];
+    avctx->channel_layout = chan_layout[cfg.chan_config];
+
+    if (cfg.sample_rate < 16000)
+        s->syncword = 0xffe00000;
+    else
+        s->syncword = 0xfff00000;
+
+    /* Init the first mp3 decoder in standard way, so that all tables get builded
+     * We replace avctx->priv_data with the context of the first decoder so that
+     * decode_init() does not have to be changed.
+     * Other decoders will be initialized here copying data from the first context
+     */
+    // Allocate zeroed memory for the first decoder context
+    s->mp3decctx[0] = av_mallocz(sizeof(MPADecodeContext));
+    if (!s->mp3decctx[0])
+        goto alloc_fail;
+    // Put decoder context in place to make init_decode() happy
+    avctx->priv_data = s->mp3decctx[0];
+    decode_init(avctx);
+    // Restore mp3on4 context pointer
+    avctx->priv_data = s;
+    s->mp3decctx[0]->adu_mode = 1; // Set adu mode
+
+    /* Create a separate codec/context for each frame (first is already ok).
+     * Each frame is 1 or 2 channels - up to 5 frames allowed
+     */
+    for (i = 1; i < s->frames; i++) {
+        s->mp3decctx[i] = av_mallocz(sizeof(MPADecodeContext));
+        if (!s->mp3decctx[i])
+            goto alloc_fail;
+        s->mp3decctx[i]->adu_mode = 1;
+        s->mp3decctx[i]->avctx = avctx;
+        s->mp3decctx[i]->mpadsp = s->mp3decctx[0]->mpadsp;
+    }
+
+    return 0;
+alloc_fail:
+    decode_close_mp3on4(avctx);
+    return AVERROR(ENOMEM);
+}
+
+
+static void flush_mp3on4(AVCodecContext *avctx)
+{
+    int i;
+    MP3On4DecodeContext *s = avctx->priv_data;
+
+    for (i = 0; i < s->frames; i++)
+        mp_flush(s->mp3decctx[i]);
+}
+
+
+static int decode_frame_mp3on4(AVCodecContext *avctx, void *data,
+                               int *got_frame_ptr, AVPacket *avpkt)
+{
+    AVFrame *frame         = data;
+    const uint8_t *buf     = avpkt->data;
+    int buf_size           = avpkt->size;
+    MP3On4DecodeContext *s = avctx->priv_data;
+    MPADecodeContext *m;
+    int fsize, len = buf_size, out_size = 0;
+    uint32_t header;
+    OUT_INT **out_samples;
+    OUT_INT *outptr[2];
+    int fr, ch, ret;
+
+    /* get output buffer */
+    frame->nb_samples = MPA_FRAME_SIZE;
+    if ((ret = ff_get_buffer(avctx, frame, 0)) < 0)
+        return ret;
+    out_samples = (OUT_INT **)frame->extended_data;
+
+    // Discard too short frames
+    if (buf_size < HEADER_SIZE)
+        return AVERROR_INVALIDDATA;
+
+    avctx->bit_rate = 0;
+
+    ch = 0;
+    for (fr = 0; fr < s->frames; fr++) {
+        fsize = AV_RB16(buf) >> 4;
+        fsize = FFMIN3(fsize, len, MPA_MAX_CODED_FRAME_SIZE);
+        m     = s->mp3decctx[fr];
+        av_assert1(m);
+
+        if (fsize < HEADER_SIZE) {
+            av_log(avctx, AV_LOG_ERROR, "Frame size smaller than header size\n");
+            return AVERROR_INVALIDDATA;
+        }
+        header = (AV_RB32(buf) & 0x000fffff) | s->syncword; // patch header
+
+        if (ff_mpa_check_header(header) < 0) {
+            av_log(avctx, AV_LOG_ERROR, "Bad header, discard block\n");
+            return AVERROR_INVALIDDATA;
+        }
+
+        avpriv_mpegaudio_decode_header((MPADecodeHeader *)m, header);
+
+        if (ch + m->nb_channels > avctx->channels ||
+            s->coff[fr] + m->nb_channels > avctx->channels) {
+            av_log(avctx, AV_LOG_ERROR, "frame channel count exceeds codec "
+                                        "channel count\n");
+            return AVERROR_INVALIDDATA;
+        }
+        ch += m->nb_channels;
+
+        outptr[0] = out_samples[s->coff[fr]];
+        if (m->nb_channels > 1)
+            outptr[1] = out_samples[s->coff[fr] + 1];
+
+        if ((ret = mp_decode_frame(m, outptr, buf, fsize)) < 0) {
+            av_log(avctx, AV_LOG_ERROR, "failed to decode channel %d\n", ch);
+            memset(outptr[0], 0, MPA_FRAME_SIZE*sizeof(OUT_INT));
+            if (m->nb_channels > 1)
+                memset(outptr[1], 0, MPA_FRAME_SIZE*sizeof(OUT_INT));
+            ret = m->nb_channels * MPA_FRAME_SIZE*sizeof(OUT_INT);
+        }
+
+        out_size += ret;
+        buf      += fsize;
+        len      -= fsize;
+
+        avctx->bit_rate += m->bit_rate;
+    }
+    if (ch != avctx->channels) {
+        av_log(avctx, AV_LOG_ERROR, "failed to decode all channels\n");
+        return AVERROR_INVALIDDATA;
+    }
+
+    /* update codec info */
+    avctx->sample_rate = s->mp3decctx[0]->sample_rate;
+
+    frame->nb_samples = out_size / (avctx->channels * sizeof(OUT_INT));
+    *got_frame_ptr    = 1;
+
+    return buf_size;
+}
+#endif /* CONFIG_MP3ON4_DECODER || CONFIG_MP3ON4FLOAT_DECODER */

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/mpegaudiodecheader.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/mpegaudiodecheader.c Changed

@@ -108,7 +108,7 @@
     return 0;
 }
 
-int avpriv_mpa_decode_header(AVCodecContext *avctx, uint32_t head, int *sample_rate, int *channels, int *frame_size, int *bit_rate)
+int avpriv_mpa_decode_header2(uint32_t head, int *sample_rate, int *channels, int *frame_size, int *bit_rate, enum AVCodecID *codec_id)
 {
     MPADecodeHeader s1, *s = &s1;
 
@@ -121,16 +121,16 @@
 
     switch(s->layer) {
     case 1:
-        avctx->codec_id = AV_CODEC_ID_MP1;
+        *codec_id = AV_CODEC_ID_MP1;
         *frame_size = 384;
         break;
     case 2:
-        avctx->codec_id = AV_CODEC_ID_MP2;
+        *codec_id = AV_CODEC_ID_MP2;
         *frame_size = 1152;
         break;
     default:
     case 3:
-        avctx->codec_id = AV_CODEC_ID_MP3;
+        *codec_id = AV_CODEC_ID_MP3;
         if (s->lsf)
             *frame_size = 576;
         else
@@ -143,3 +143,8 @@
     *bit_rate = s->bit_rate;
     return s->frame_size;
 }
+
+int avpriv_mpa_decode_header(AVCodecContext *avctx, uint32_t head, int *sample_rate, int *channels, int *frame_size, int *bit_rate)
+{
+    return avpriv_mpa_decode_header2(head, sample_rate, channels, frame_size, bit_rate, &avctx->codec_id);
+}

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/mpegaudiodecheader.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/mpegaudiodecheader.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/mpegaudiodsp_fixed.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/mpegaudiodsp_fixed.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/mpegaudiodsp_float.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/mpegaudiodsp_float.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/mpegaudiodsp_template.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/mpegaudiodsp_template.c Changed

omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/mpegaudioenc_fixed.c Added

@@ -0,0 +1,41 @@
+/*
+ * The simplest mpeg audio layer 2 encoder
+ * Copyright (c) 2000, 2001 Fabrice Bellard
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "mpegaudioenc_template.c"
+
+AVCodec ff_mp2fixed_encoder = {
+    .name                  = "mp2fixed",
+    .long_name             = NULL_IF_CONFIG_SMALL("MP2 fixed point (MPEG audio layer 2)"),
+    .type                  = AVMEDIA_TYPE_AUDIO,
+    .id                    = AV_CODEC_ID_MP2,
+    .priv_data_size        = sizeof(MpegAudioContext),
+    .init                  = MPA_encode_init,
+    .encode2               = MPA_encode_frame,
+    .sample_fmts           = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16,
+                                                            AV_SAMPLE_FMT_NONE },
+    .supported_samplerates = (const int[]){
+        44100, 48000,  32000, 22050, 24000, 16000, 0
+    },
+    .channel_layouts       = (const uint64_t[]){ AV_CH_LAYOUT_MONO,
+                                                 AV_CH_LAYOUT_STEREO,
+                                                 0 },
+    .defaults              = mp2_defaults,
+};

omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/mpegaudioenc_float.c Added

@@ -0,0 +1,42 @@
+/*
+ * The simplest mpeg audio layer 2 encoder
+ * Copyright (c) 2000, 2001 Fabrice Bellard
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#define USE_FLOATS 1
+#include "mpegaudioenc_template.c"
+
+AVCodec ff_mp2_encoder = {
+    .name                  = "mp2",
+    .long_name             = NULL_IF_CONFIG_SMALL("MP2 (MPEG audio layer 2)"),
+    .type                  = AVMEDIA_TYPE_AUDIO,
+    .id                    = AV_CODEC_ID_MP2,
+    .priv_data_size        = sizeof(MpegAudioContext),
+    .init                  = MPA_encode_init,
+    .encode2               = MPA_encode_frame,
+    .sample_fmts           = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16,
+                                                            AV_SAMPLE_FMT_NONE },
+    .supported_samplerates = (const int[]){
+        44100, 48000,  32000, 22050, 24000, 16000, 0
+    },
+    .channel_layouts       = (const uint64_t[]){ AV_CH_LAYOUT_MONO,
+                                                 AV_CH_LAYOUT_STEREO,
+                                                 0 },
+    .defaults              = mp2_defaults,
+};

omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/mpegaudioenc_template.c Added

@@ -0,0 +1,779 @@
+/*
+ * The simplest mpeg audio layer 2 encoder
+ * Copyright (c) 2000, 2001 Fabrice Bellard
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * The simplest mpeg audio layer 2 encoder.
+ */
+
+#include "libavutil/channel_layout.h"
+
+#include "avcodec.h"
+#include "internal.h"
+#include "put_bits.h"
+
+#define FRAC_BITS   15   /* fractional bits for sb_samples and dct */
+#define WFRAC_BITS  14   /* fractional bits for window */
+
+#include "mpegaudio.h"
+#include "mpegaudiodsp.h"
+#include "mpegaudiodata.h"
+#include "mpegaudiotab.h"
+
+/* currently, cannot change these constants (need to modify
+   quantization stage) */
+#define MUL(a,b) (((int64_t)(a) * (int64_t)(b)) >> FRAC_BITS)
+
+#define SAMPLES_BUF_SIZE 4096
+
+typedef struct MpegAudioContext {
+    PutBitContext pb;
+    int nb_channels;
+    int lsf;           /* 1 if mpeg2 low bitrate selected */
+    int bitrate_index; /* bit rate */
+    int freq_index;
+    int frame_size; /* frame size, in bits, without padding */
+    /* padding computation */
+    int frame_frac, frame_frac_incr, do_padding;
+    short samples_buf[MPA_MAX_CHANNELS][SAMPLES_BUF_SIZE]; /* buffer for filter */
+    int samples_offset[MPA_MAX_CHANNELS];       /* offset in samples_buf */
+    int sb_samples[MPA_MAX_CHANNELS][3][12][SBLIMIT];
+    unsigned char scale_factors[MPA_MAX_CHANNELS][SBLIMIT][3]; /* scale factors */
+    /* code to group 3 scale factors */
+    unsigned char scale_code[MPA_MAX_CHANNELS][SBLIMIT];
+    int sblimit; /* number of used subbands */
+    const unsigned char *alloc_table;
+    int16_t filter_bank[512];
+    int scale_factor_table[64];
+    unsigned char scale_diff_table[128];
+#if USE_FLOATS
+    float scale_factor_inv_table[64];
+#else
+    int8_t scale_factor_shift[64];
+    unsigned short scale_factor_mult[64];
+#endif
+    unsigned short total_quant_bits[17]; /* total number of bits per allocation group */
+} MpegAudioContext;
+
+static av_cold int MPA_encode_init(AVCodecContext *avctx)
+{
+    MpegAudioContext *s = avctx->priv_data;
+    int freq = avctx->sample_rate;
+    int bitrate = avctx->bit_rate;
+    int channels = avctx->channels;
+    int i, v, table;
+    float a;
+
+    if (channels <= 0 || channels > 2){
+        av_log(avctx, AV_LOG_ERROR, "encoding %d channel(s) is not allowed in mp2\n", channels);
+        return AVERROR(EINVAL);
+    }
+    bitrate = bitrate / 1000;
+    s->nb_channels = channels;
+    avctx->frame_size = MPA_FRAME_SIZE;
+    avctx->delay      = 512 - 32 + 1;
+
+    /* encoding freq */
+    s->lsf = 0;
+    for(i=0;i<3;i++) {
+        if (avpriv_mpa_freq_tab[i] == freq)
+            break;
+        if ((avpriv_mpa_freq_tab[i] / 2) == freq) {
+            s->lsf = 1;
+            break;
+        }
+    }
+    if (i == 3){
+        av_log(avctx, AV_LOG_ERROR, "Sampling rate %d is not allowed in mp2\n", freq);
+        return AVERROR(EINVAL);
+    }
+    s->freq_index = i;
+
+    /* encoding bitrate & frequency */
+    for(i=0;i<15;i++) {
+        if (avpriv_mpa_bitrate_tab[s->lsf][1][i] == bitrate)
+            break;
+    }
+    if (i == 15){
+        av_log(avctx, AV_LOG_ERROR, "bitrate %d is not allowed in mp2\n", bitrate);
+        return AVERROR(EINVAL);
+    }
+    s->bitrate_index = i;
+
+    /* compute total header size & pad bit */
+
+    a = (float)(bitrate * 1000 * MPA_FRAME_SIZE) / (freq * 8.0);
+    s->frame_size = ((int)a) * 8;
+
+    /* frame fractional size to compute padding */
+    s->frame_frac = 0;
+    s->frame_frac_incr = (int)((a - floor(a)) * 65536.0);
+
+    /* select the right allocation table */
+    table = ff_mpa_l2_select_table(bitrate, s->nb_channels, freq, s->lsf);
+
+    /* number of used subbands */
+    s->sblimit = ff_mpa_sblimit_table[table];
+    s->alloc_table = ff_mpa_alloc_tables[table];
+
+    av_dlog(avctx, "%d kb/s, %d Hz, frame_size=%d bits, table=%d, padincr=%x\n",
+            bitrate, freq, s->frame_size, table, s->frame_frac_incr);
+
+    for(i=0;i<s->nb_channels;i++)
+        s->samples_offset[i] = 0;
+
+    for(i=0;i<257;i++) {
+        int v;
+        v = ff_mpa_enwindow[i];
+#if WFRAC_BITS != 16
+        v = (v + (1 << (16 - WFRAC_BITS - 1))) >> (16 - WFRAC_BITS);
+#endif
+        s->filter_bank[i] = v;
+        if ((i & 63) != 0)
+            v = -v;
+        if (i != 0)
+            s->filter_bank[512 - i] = v;
+    }
+
+    for(i=0;i<64;i++) {
+        v = (int)(exp2((3 - i) / 3.0) * (1 << 20));
+        if (v <= 0)
+            v = 1;
+        s->scale_factor_table[i] = v;
+#if USE_FLOATS
+        s->scale_factor_inv_table[i] = exp2(-(3 - i) / 3.0) / (float)(1 << 20);
+#else
+#define P 15
+        s->scale_factor_shift[i] = 21 - P - (i / 3);
+        s->scale_factor_mult[i] = (1 << P) * exp2((i % 3) / 3.0);
+#endif
+    }
+    for(i=0;i<128;i++) {
+        v = i - 64;
+        if (v <= -3)
+            v = 0;
+        else if (v < 0)
+            v = 1;
+        else if (v == 0)
+            v = 2;
+        else if (v < 3)
+            v = 3;
+        else
+            v = 4;
+        s->scale_diff_table[i] = v;
+    }
+
+    for(i=0;i<17;i++) {
+        v = ff_mpa_quant_bits[i];
+        if (v < 0)
+            v = -v;
+        else
+            v = v * 3;
+        s->total_quant_bits[i] = 12 * v;
+    }
+
+    return 0;
+}
+
+/* 32 point floating point IDCT without 1/sqrt(2) coef zero scaling */
+static void idct32(int *out, int *tab)
+{
+    int i, j;
+    int *t, *t1, xr;
+    const int *xp = costab32;
+
+    for(j=31;j>=3;j-=2) tab[j] += tab[j - 2];
+
+    t = tab + 30;
+    t1 = tab + 2;
+    do {
+        t[0] += t[-4];
+        t[1] += t[1 - 4];
+        t -= 4;
+    } while (t != t1);
+
+    t = tab + 28;
+    t1 = tab + 4;
+    do {
+        t[0] += t[-8];
+        t[1] += t[1-8];
+        t[2] += t[2-8];
+        t[3] += t[3-8];
+        t -= 8;
+    } while (t != t1);
+
+    t = tab;
+    t1 = tab + 32;
+    do {
+        t[ 3] = -t[ 3];
+        t[ 6] = -t[ 6];
+
+        t[11] = -t[11];
+        t[12] = -t[12];
+        t[13] = -t[13];
+        t[15] = -t[15];
+        t += 16;
+    } while (t != t1);
+
+
+    t = tab;
+    t1 = tab + 8;
+    do {
+        int x1, x2, x3, x4;
+
+        x3 = MUL(t[16], FIX(SQRT2*0.5));
+        x4 = t[0] - x3;
+        x3 = t[0] + x3;
+
+        x2 = MUL(-(t[24] + t[8]), FIX(SQRT2*0.5));
+        x1 = MUL((t[8] - x2), xp[0]);
+        x2 = MUL((t[8] + x2), xp[1]);
+
+        t[ 0] = x3 + x1;
+        t[ 8] = x4 - x2;
+        t[16] = x4 + x2;
+        t[24] = x3 - x1;
+        t++;
+    } while (t != t1);
+
+    xp += 2;
+    t = tab;
+    t1 = tab + 4;
+    do {
+        xr = MUL(t[28],xp[0]);
+        t[28] = (t[0] - xr);
+        t[0] = (t[0] + xr);
+
+        xr = MUL(t[4],xp[1]);
+        t[ 4] = (t[24] - xr);
+        t[24] = (t[24] + xr);
+
+        xr = MUL(t[20],xp[2]);
+        t[20] = (t[8] - xr);
+        t[ 8] = (t[8] + xr);
+
+        xr = MUL(t[12],xp[3]);
+        t[12] = (t[16] - xr);
+        t[16] = (t[16] + xr);
+        t++;
+    } while (t != t1);
+    xp += 4;
+
+    for (i = 0; i < 4; i++) {
+        xr = MUL(tab[30-i*4],xp[0]);
+        tab[30-i*4] = (tab[i*4] - xr);
+        tab[   i*4] = (tab[i*4] + xr);
+
+        xr = MUL(tab[ 2+i*4],xp[1]);
+        tab[ 2+i*4] = (tab[28-i*4] - xr);
+        tab[28-i*4] = (tab[28-i*4] + xr);
+
+        xr = MUL(tab[31-i*4],xp[0]);
+        tab[31-i*4] = (tab[1+i*4] - xr);
+        tab[ 1+i*4] = (tab[1+i*4] + xr);
+
+        xr = MUL(tab[ 3+i*4],xp[1]);
+        tab[ 3+i*4] = (tab[29-i*4] - xr);
+        tab[29-i*4] = (tab[29-i*4] + xr);
+
+        xp += 2;
+    }
+
+    t = tab + 30;
+    t1 = tab + 1;
+    do {
+        xr = MUL(t1[0], *xp);
+        t1[0] = (t[0] - xr);
+        t[0] = (t[0] + xr);
+        t -= 2;
+        t1 += 2;
+        xp++;
+    } while (t >= tab);
+
+    for(i=0;i<32;i++) {
+        out[i] = tab[bitinv32[i]];
+    }
+}
+
+#define WSHIFT (WFRAC_BITS + 15 - FRAC_BITS)
+
+static void filter(MpegAudioContext *s, int ch, const short *samples, int incr)
+{
+    short *p, *q;
+    int sum, offset, i, j;
+    int tmp[64];
+    int tmp1[32];
+    int *out;
+
+    offset = s->samples_offset[ch];
+    out = &s->sb_samples[ch][0][0][0];
+    for(j=0;j<36;j++) {
+        /* 32 samples at once */
+        for(i=0;i<32;i++) {
+            s->samples_buf[ch][offset + (31 - i)] = samples[0];
+            samples += incr;
+        }
+
+        /* filter */
+        p = s->samples_buf[ch] + offset;
+        q = s->filter_bank;
+        /* maxsum = 23169 */
+        for(i=0;i<64;i++) {
+            sum = p[0*64] * q[0*64];
+            sum += p[1*64] * q[1*64];
+            sum += p[2*64] * q[2*64];
+            sum += p[3*64] * q[3*64];
+            sum += p[4*64] * q[4*64];
+            sum += p[5*64] * q[5*64];
+            sum += p[6*64] * q[6*64];
+            sum += p[7*64] * q[7*64];
+            tmp[i] = sum;
+            p++;
+            q++;
+        }
+        tmp1[0] = tmp[16] >> WSHIFT;
+        for( i=1; i<=16; i++ ) tmp1[i] = (tmp[i+16]+tmp[16-i]) >> WSHIFT;
+        for( i=17; i<=31; i++ ) tmp1[i] = (tmp[i+16]-tmp[80-i]) >> WSHIFT;
+
+        idct32(out, tmp1);
+
+        /* advance of 32 samples */
+        offset -= 32;
+        out += 32;
+        /* handle the wrap around */
+        if (offset < 0) {
+            memmove(s->samples_buf[ch] + SAMPLES_BUF_SIZE - (512 - 32),
+                    s->samples_buf[ch], (512 - 32) * 2);
+            offset = SAMPLES_BUF_SIZE - 512;
+        }
+    }
+    s->samples_offset[ch] = offset;
+}
+
+static void compute_scale_factors(MpegAudioContext *s,
+                                  unsigned char scale_code[SBLIMIT],
+                                  unsigned char scale_factors[SBLIMIT][3],
+                                  int sb_samples[3][12][SBLIMIT],
+                                  int sblimit)
+{
+    int *p, vmax, v, n, i, j, k, code;
+    int index, d1, d2;
+    unsigned char *sf = &scale_factors[0][0];
+
+    for(j=0;j<sblimit;j++) {
+        for(i=0;i<3;i++) {
+            /* find the max absolute value */
+            p = &sb_samples[i][0][j];
+            vmax = abs(*p);
+            for(k=1;k<12;k++) {
+                p += SBLIMIT;
+                v = abs(*p);
+                if (v > vmax)
+                    vmax = v;
+            }
+            /* compute the scale factor index using log 2 computations */
+            if (vmax > 1) {
+                n = av_log2(vmax);
+                /* n is the position of the MSB of vmax. now
+                   use at most 2 compares to find the index */
+                index = (21 - n) * 3 - 3;
+                if (index >= 0) {
+                    while (vmax <= s->scale_factor_table[index+1])
+                        index++;
+                } else {
+                    index = 0; /* very unlikely case of overflow */
+                }
+            } else {
+                index = 62; /* value 63 is not allowed */
+            }
+
+            av_dlog(NULL, "%2d:%d in=%x %x %d\n",
+                    j, i, vmax, s->scale_factor_table[index], index);
+            /* store the scale factor */
+            av_assert2(index >=0 && index <= 63);
+            sf[i] = index;
+        }
+
+        /* compute the transmission factor : look if the scale factors
+           are close enough to each other */
+        d1 = s->scale_diff_table[sf[0] - sf[1] + 64];
+        d2 = s->scale_diff_table[sf[1] - sf[2] + 64];
+
+        /* handle the 25 cases */
+        switch(d1 * 5 + d2) {
+        case 0*5+0:
+        case 0*5+4:
+        case 3*5+4:
+        case 4*5+0:
+        case 4*5+4:
+            code = 0;
+            break;
+        case 0*5+1:
+        case 0*5+2:
+        case 4*5+1:
+        case 4*5+2:
+            code = 3;
+            sf[2] = sf[1];
+            break;
+        case 0*5+3:
+        case 4*5+3:
+            code = 3;
+            sf[1] = sf[2];
+            break;
+        case 1*5+0:
+        case 1*5+4:
+        case 2*5+4:
+            code = 1;
+            sf[1] = sf[0];
+            break;
+        case 1*5+1:
+        case 1*5+2:
+        case 2*5+0:
+        case 2*5+1:
+        case 2*5+2:
+            code = 2;
+            sf[1] = sf[2] = sf[0];
+            break;
+        case 2*5+3:
+        case 3*5+3:
+            code = 2;
+            sf[0] = sf[1] = sf[2];
+            break;
+        case 3*5+0:
+        case 3*5+1:
+        case 3*5+2:
+            code = 2;
+            sf[0] = sf[2] = sf[1];
+            break;
+        case 1*5+3:
+            code = 2;
+            if (sf[0] > sf[2])
+              sf[0] = sf[2];
+            sf[1] = sf[2] = sf[0];
+            break;
+        default:
+            av_assert2(0); //cannot happen
+            code = 0;           /* kill warning */
+        }
+
+        av_dlog(NULL, "%d: %2d %2d %2d %d %d -> %d\n", j,
+                sf[0], sf[1], sf[2], d1, d2, code);
+        scale_code[j] = code;
+        sf += 3;
+    }
+}
+
+/* The most important function : psycho acoustic module. In this
+   encoder there is basically none, so this is the worst you can do,
+   but also this is the simpler. */
+static void psycho_acoustic_model(MpegAudioContext *s, short smr[SBLIMIT])
+{
+    int i;
+
+    for(i=0;i<s->sblimit;i++) {
+        smr[i] = (int)(fixed_smr[i] * 10);
+    }
+}
+
+
+#define SB_NOTALLOCATED  0
+#define SB_ALLOCATED     1
+#define SB_NOMORE        2
+
+/* Try to maximize the smr while using a number of bits inferior to
+   the frame size. I tried to make the code simpler, faster and
+   smaller than other encoders :-) */
+static void compute_bit_allocation(MpegAudioContext *s,
+                                   short smr1[MPA_MAX_CHANNELS][SBLIMIT],
+                                   unsigned char bit_alloc[MPA_MAX_CHANNELS][SBLIMIT],
+                                   int *padding)
+{
+    int i, ch, b, max_smr, max_ch, max_sb, current_frame_size, max_frame_size;
+    int incr;
+    short smr[MPA_MAX_CHANNELS][SBLIMIT];
+    unsigned char subband_status[MPA_MAX_CHANNELS][SBLIMIT];
+    const unsigned char *alloc;
+
+    memcpy(smr, smr1, s->nb_channels * sizeof(short) * SBLIMIT);
+    memset(subband_status, SB_NOTALLOCATED, s->nb_channels * SBLIMIT);
+    memset(bit_alloc, 0, s->nb_channels * SBLIMIT);
+
+    /* compute frame size and padding */
+    max_frame_size = s->frame_size;
+    s->frame_frac += s->frame_frac_incr;
+    if (s->frame_frac >= 65536) {
+        s->frame_frac -= 65536;
+        s->do_padding = 1;
+        max_frame_size += 8;
+    } else {
+        s->do_padding = 0;
+    }
+
+    /* compute the header + bit alloc size */
+    current_frame_size = 32;
+    alloc = s->alloc_table;
+    for(i=0;i<s->sblimit;i++) {
+        incr = alloc[0];
+        current_frame_size += incr * s->nb_channels;
+        alloc += 1 << incr;
+    }
+    for(;;) {
+        /* look for the subband with the largest signal to mask ratio */
+        max_sb = -1;
+        max_ch = -1;
+        max_smr = INT_MIN;
+        for(ch=0;ch<s->nb_channels;ch++) {
+            for(i=0;i<s->sblimit;i++) {
+                if (smr[ch][i] > max_smr && subband_status[ch][i] != SB_NOMORE) {
+                    max_smr = smr[ch][i];
+                    max_sb = i;
+                    max_ch = ch;
+                }
+            }
+        }
+        if (max_sb < 0)
+            break;
+        av_dlog(NULL, "current=%d max=%d max_sb=%d max_ch=%d alloc=%d\n",
+                current_frame_size, max_frame_size, max_sb, max_ch,
+                bit_alloc[max_ch][max_sb]);
+
+        /* find alloc table entry (XXX: not optimal, should use
+           pointer table) */
+        alloc = s->alloc_table;
+        for(i=0;i<max_sb;i++) {
+            alloc += 1 << alloc[0];
+        }
+
+        if (subband_status[max_ch][max_sb] == SB_NOTALLOCATED) {
+            /* nothing was coded for this band: add the necessary bits */
+            incr = 2 + nb_scale_factors[s->scale_code[max_ch][max_sb]] * 6;
+            incr += s->total_quant_bits[alloc[1]];
+        } else {
+            /* increments bit allocation */
+            b = bit_alloc[max_ch][max_sb];
+            incr = s->total_quant_bits[alloc[b + 1]] -
+                s->total_quant_bits[alloc[b]];
+        }
+
+        if (current_frame_size + incr <= max_frame_size) {
+            /* can increase size */
+            b = ++bit_alloc[max_ch][max_sb];
+            current_frame_size += incr;
+            /* decrease smr by the resolution we added */
+            smr[max_ch][max_sb] = smr1[max_ch][max_sb] - quant_snr[alloc[b]];
+            /* max allocation size reached ? */
+            if (b == ((1 << alloc[0]) - 1))
+                subband_status[max_ch][max_sb] = SB_NOMORE;
+            else
+                subband_status[max_ch][max_sb] = SB_ALLOCATED;
+        } else {
+            /* cannot increase the size of this subband */
+            subband_status[max_ch][max_sb] = SB_NOMORE;
+        }
+    }
+    *padding = max_frame_size - current_frame_size;
+    av_assert0(*padding >= 0);
+}
+
+/*
+ * Output the mpeg audio layer 2 frame. Note how the code is small
+ * compared to other encoders :-)
+ */
+static void encode_frame(MpegAudioContext *s,
+                         unsigned char bit_alloc[MPA_MAX_CHANNELS][SBLIMIT],
+                         int padding)
+{
+    int i, j, k, l, bit_alloc_bits, b, ch;
+    unsigned char *sf;
+    int q[3];
+    PutBitContext *p = &s->pb;
+
+    /* header */
+
+    put_bits(p, 12, 0xfff);
+    put_bits(p, 1, 1 - s->lsf); /* 1 = mpeg1 ID, 0 = mpeg2 lsf ID */
+    put_bits(p, 2, 4-2);  /* layer 2 */
+    put_bits(p, 1, 1); /* no error protection */
+    put_bits(p, 4, s->bitrate_index);
+    put_bits(p, 2, s->freq_index);
+    put_bits(p, 1, s->do_padding); /* use padding */
+    put_bits(p, 1, 0);             /* private_bit */
+    put_bits(p, 2, s->nb_channels == 2 ? MPA_STEREO : MPA_MONO);
+    put_bits(p, 2, 0); /* mode_ext */
+    put_bits(p, 1, 0); /* no copyright */
+    put_bits(p, 1, 1); /* original */
+    put_bits(p, 2, 0); /* no emphasis */
+
+    /* bit allocation */
+    j = 0;
+    for(i=0;i<s->sblimit;i++) {
+        bit_alloc_bits = s->alloc_table[j];
+        for(ch=0;ch<s->nb_channels;ch++) {
+            put_bits(p, bit_alloc_bits, bit_alloc[ch][i]);
+        }
+        j += 1 << bit_alloc_bits;
+    }
+
+    /* scale codes */
+    for(i=0;i<s->sblimit;i++) {
+        for(ch=0;ch<s->nb_channels;ch++) {
+            if (bit_alloc[ch][i])
+                put_bits(p, 2, s->scale_code[ch][i]);
+        }
+    }
+
+    /* scale factors */
+    for(i=0;i<s->sblimit;i++) {
+        for(ch=0;ch<s->nb_channels;ch++) {
+            if (bit_alloc[ch][i]) {
+                sf = &s->scale_factors[ch][i][0];
+                switch(s->scale_code[ch][i]) {
+                case 0:
+                    put_bits(p, 6, sf[0]);
+                    put_bits(p, 6, sf[1]);
+                    put_bits(p, 6, sf[2]);
+                    break;
+                case 3:
+                case 1:
+                    put_bits(p, 6, sf[0]);
+                    put_bits(p, 6, sf[2]);
+                    break;
+                case 2:
+                    put_bits(p, 6, sf[0]);
+                    break;
+                }
+            }
+        }
+    }
+
+    /* quantization & write sub band samples */
+
+    for(k=0;k<3;k++) {
+        for(l=0;l<12;l+=3) {
+            j = 0;
+            for(i=0;i<s->sblimit;i++) {
+                bit_alloc_bits = s->alloc_table[j];
+                for(ch=0;ch<s->nb_channels;ch++) {
+                    b = bit_alloc[ch][i];
+                    if (b) {
+                        int qindex, steps, m, sample, bits;
+                        /* we encode 3 sub band samples of the same sub band at a time */
+                        qindex = s->alloc_table[j+b];
+                        steps = ff_mpa_quant_steps[qindex];
+                        for(m=0;m<3;m++) {
+                            sample = s->sb_samples[ch][k][l + m][i];
+                            /* divide by scale factor */
+#if USE_FLOATS
+                            {
+                                float a;
+                                a = (float)sample * s->scale_factor_inv_table[s->scale_factors[ch][i][k]];
+                                q[m] = (int)((a + 1.0) * steps * 0.5);
+                            }
+#else
+                            {
+                                int q1, e, shift, mult;
+                                e = s->scale_factors[ch][i][k];
+                                shift = s->scale_factor_shift[e];
+                                mult = s->scale_factor_mult[e];
+
+                                /* normalize to P bits */
+                                if (shift < 0)
+                                    q1 = sample << (-shift);
+                                else
+                                    q1 = sample >> shift;
+                                q1 = (q1 * mult) >> P;
+                                q[m] = ((q1 + (1 << P)) * steps) >> (P + 1);
+                                if (q[m] < 0)
+                                    q[m] = 0;
+                            }
+#endif
+                            if (q[m] >= steps)
+                                q[m] = steps - 1;
+                            av_assert2(q[m] >= 0 && q[m] < steps);
+                        }
+                        bits = ff_mpa_quant_bits[qindex];
+                        if (bits < 0) {
+                            /* group the 3 values to save bits */
+                            put_bits(p, -bits,
+                                     q[0] + steps * (q[1] + steps * q[2]));
+                        } else {
+                            put_bits(p, bits, q[0]);
+                            put_bits(p, bits, q[1]);
+                            put_bits(p, bits, q[2]);
+                        }
+                    }
+                }
+                /* next subband in alloc table */
+                j += 1 << bit_alloc_bits;
+            }
+        }
+    }
+
+    /* padding */
+    for(i=0;i<padding;i++)
+        put_bits(p, 1, 0);
+
+    /* flush */
+    flush_put_bits(p);
+}
+
+static int MPA_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
+                            const AVFrame *frame, int *got_packet_ptr)
+{
+    MpegAudioContext *s = avctx->priv_data;
+    const int16_t *samples = (const int16_t *)frame->data[0];
+    short smr[MPA_MAX_CHANNELS][SBLIMIT];
+    unsigned char bit_alloc[MPA_MAX_CHANNELS][SBLIMIT];
+    int padding, i, ret;
+
+    for(i=0;i<s->nb_channels;i++) {
+        filter(s, i, samples + i, s->nb_channels);
+    }
+
+    for(i=0;i<s->nb_channels;i++) {
+        compute_scale_factors(s, s->scale_code[i], s->scale_factors[i],
+                              s->sb_samples[i], s->sblimit);
+    }
+    for(i=0;i<s->nb_channels;i++) {
+        psycho_acoustic_model(s, smr[i]);
+    }
+    compute_bit_allocation(s, smr, bit_alloc, &padding);
+
+    if ((ret = ff_alloc_packet2(avctx, avpkt, MPA_MAX_CODED_FRAME_SIZE)) < 0)
+        return ret;
+
+    init_put_bits(&s->pb, avpkt->data, avpkt->size);
+
+    encode_frame(s, bit_alloc, padding);
+
+    if (frame->pts != AV_NOPTS_VALUE)
+        avpkt->pts = frame->pts - ff_samples_to_time_base(avctx, avctx->delay);
+
+    avpkt->size = put_bits_count(&s->pb) / 8;
+    *got_packet_ptr = 1;
+    return 0;
+}
+
+static const AVCodecDefault mp2_defaults[] = {
+    { "b",    "128k" },
+    { NULL },
+};
+

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/mpegaudiotab.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/mpegaudiotab.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/mpegvideo.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/mpegvideo.c Changed

@@ -30,6 +30,8 @@
 #include "libavutil/attributes.h"
 #include "libavutil/avassert.h"
 #include "libavutil/imgutils.h"
+#include "libavutil/internal.h"
+#include "libavutil/timer.h"
 #include "avcodec.h"
 #include "dsputil.h"
 #include "h264chroma.h"
@@ -38,25 +40,9 @@
 #include "mpegvideo.h"
 #include "mjpegenc.h"
 #include "msmpeg4.h"
-#include "xvmc_internal.h"
 #include "thread.h"
 #include <limits.h>
 
-static void dct_unquantize_mpeg1_intra_c(MpegEncContext *s,
-                                   int16_t *block, int n, int qscale);
-static void dct_unquantize_mpeg1_inter_c(MpegEncContext *s,
-                                   int16_t *block, int n, int qscale);
-static void dct_unquantize_mpeg2_intra_c(MpegEncContext *s,
-                                   int16_t *block, int n, int qscale);
-static void dct_unquantize_mpeg2_intra_bitexact(MpegEncContext *s,
-                                   int16_t *block, int n, int qscale);
-static void dct_unquantize_mpeg2_inter_c(MpegEncContext *s,
-                                   int16_t *block, int n, int qscale);
-static void dct_unquantize_h263_intra_c(MpegEncContext *s,
-                                  int16_t *block, int n, int qscale);
-static void dct_unquantize_h263_inter_c(MpegEncContext *s,
-                                  int16_t *block, int n, int qscale);
-
 static const uint8_t ff_default_chroma_qscale_table[32] = {
 //   0   1   2   3   4   5   6   7   8   9  10  11  12  13  14  15
      0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15,
@@ -123,6 +109,213 @@
     AV_PIX_FMT_NONE
 };
 
+static void dct_unquantize_mpeg1_intra_c(MpegEncContext *s,
+                                   int16_t *block, int n, int qscale)
+{
+    int i, level, nCoeffs;
+    const uint16_t *quant_matrix;
+
+    nCoeffs= s->block_last_index[n];
+
+    block[0] *= n < 4 ? s->y_dc_scale : s->c_dc_scale;
+    /* XXX: only mpeg1 */
+    quant_matrix = s->intra_matrix;
+    for(i=1;i<=nCoeffs;i++) {
+        int j= s->intra_scantable.permutated[i];
+        level = block[j];
+        if (level) {
+            if (level < 0) {
+                level = -level;
+                level = (int)(level * qscale * quant_matrix[j]) >> 3;
+                level = (level - 1) | 1;
+                level = -level;
+            } else {
+                level = (int)(level * qscale * quant_matrix[j]) >> 3;
+                level = (level - 1) | 1;
+            }
+            block[j] = level;
+        }
+    }
+}
+
+static void dct_unquantize_mpeg1_inter_c(MpegEncContext *s,
+                                   int16_t *block, int n, int qscale)
+{
+    int i, level, nCoeffs;
+    const uint16_t *quant_matrix;
+
+    nCoeffs= s->block_last_index[n];
+
+    quant_matrix = s->inter_matrix;
+    for(i=0; i<=nCoeffs; i++) {
+        int j= s->intra_scantable.permutated[i];
+        level = block[j];
+        if (level) {
+            if (level < 0) {
+                level = -level;
+                level = (((level << 1) + 1) * qscale *
+                         ((int) (quant_matrix[j]))) >> 4;
+                level = (level - 1) | 1;
+                level = -level;
+            } else {
+                level = (((level << 1) + 1) * qscale *
+                         ((int) (quant_matrix[j]))) >> 4;
+                level = (level - 1) | 1;
+            }
+            block[j] = level;
+        }
+    }
+}
+
+static void dct_unquantize_mpeg2_intra_c(MpegEncContext *s,
+                                   int16_t *block, int n, int qscale)
+{
+    int i, level, nCoeffs;
+    const uint16_t *quant_matrix;
+
+    if(s->alternate_scan) nCoeffs= 63;
+    else nCoeffs= s->block_last_index[n];
+
+    block[0] *= n < 4 ? s->y_dc_scale : s->c_dc_scale;
+    quant_matrix = s->intra_matrix;
+    for(i=1;i<=nCoeffs;i++) {
+        int j= s->intra_scantable.permutated[i];
+        level = block[j];
+        if (level) {
+            if (level < 0) {
+                level = -level;
+                level = (int)(level * qscale * quant_matrix[j]) >> 3;
+                level = -level;
+            } else {
+                level = (int)(level * qscale * quant_matrix[j]) >> 3;
+            }
+            block[j] = level;
+        }
+    }
+}
+
+static void dct_unquantize_mpeg2_intra_bitexact(MpegEncContext *s,
+                                   int16_t *block, int n, int qscale)
+{
+    int i, level, nCoeffs;
+    const uint16_t *quant_matrix;
+    int sum=-1;
+
+    if(s->alternate_scan) nCoeffs= 63;
+    else nCoeffs= s->block_last_index[n];
+
+    block[0] *= n < 4 ? s->y_dc_scale : s->c_dc_scale;
+    sum += block[0];
+    quant_matrix = s->intra_matrix;
+    for(i=1;i<=nCoeffs;i++) {
+        int j= s->intra_scantable.permutated[i];
+        level = block[j];
+        if (level) {
+            if (level < 0) {
+                level = -level;
+                level = (int)(level * qscale * quant_matrix[j]) >> 3;
+                level = -level;
+            } else {
+                level = (int)(level * qscale * quant_matrix[j]) >> 3;
+            }
+            block[j] = level;
+            sum+=level;
+        }
+    }
+    block[63]^=sum&1;
+}
+
+static void dct_unquantize_mpeg2_inter_c(MpegEncContext *s,
+                                   int16_t *block, int n, int qscale)
+{
+    int i, level, nCoeffs;
+    const uint16_t *quant_matrix;
+    int sum=-1;
+
+    if(s->alternate_scan) nCoeffs= 63;
+    else nCoeffs= s->block_last_index[n];
+
+    quant_matrix = s->inter_matrix;
+    for(i=0; i<=nCoeffs; i++) {
+        int j= s->intra_scantable.permutated[i];
+        level = block[j];
+        if (level) {
+            if (level < 0) {
+                level = -level;
+                level = (((level << 1) + 1) * qscale *
+                         ((int) (quant_matrix[j]))) >> 4;
+                level = -level;
+            } else {
+                level = (((level << 1) + 1) * qscale *
+                         ((int) (quant_matrix[j]))) >> 4;
+            }
+            block[j] = level;
+            sum+=level;
+        }
+    }
+    block[63]^=sum&1;
+}
+
+static void dct_unquantize_h263_intra_c(MpegEncContext *s,
+                                  int16_t *block, int n, int qscale)
+{
+    int i, level, qmul, qadd;
+    int nCoeffs;
+
+    av_assert2(s->block_last_index[n]>=0 || s->h263_aic);
+
+    qmul = qscale << 1;
+
+    if (!s->h263_aic) {
+        block[0] *= n < 4 ? s->y_dc_scale : s->c_dc_scale;
+        qadd = (qscale - 1) | 1;
+    }else{
+        qadd = 0;
+    }
+    if(s->ac_pred)
+        nCoeffs=63;
+    else
+        nCoeffs= s->inter_scantable.raster_end[ s->block_last_index[n] ];
+
+    for(i=1; i<=nCoeffs; i++) {
+        level = block[i];
+        if (level) {
+            if (level < 0) {
+                level = level * qmul - qadd;
+            } else {
+                level = level * qmul + qadd;
+            }
+            block[i] = level;
+        }
+    }
+}
+
+static void dct_unquantize_h263_inter_c(MpegEncContext *s,
+                                  int16_t *block, int n, int qscale)
+{
+    int i, level, qmul, qadd;
+    int nCoeffs;
+
+    av_assert2(s->block_last_index[n]>=0);
+
+    qadd = (qscale - 1) | 1;
+    qmul = qscale << 1;
+
+    nCoeffs= s->inter_scantable.raster_end[ s->block_last_index[n] ];
+
+    for(i=0; i<=nCoeffs; i++) {
+        level = block[i];
+        if (level) {
+            if (level < 0) {
+                level = level * qmul - qadd;
+            } else {
+                level = level * qmul + qadd;
+            }
+            block[i] = level;
+        }
+    }
+}
+
 static void mpeg_er_decode_mb(void *opaque, int ref, int mv_dir, int mv_type,
                               int (*mv)[2][4][2],
                               int mb_x, int mb_y, int mb_intra, int mb_skipped)
@@ -172,8 +365,6 @@
         ff_MPV_common_init_axp(s);
     if (ARCH_ARM)
         ff_MPV_common_init_arm(s);
-    if (ARCH_BFIN)
-        ff_MPV_common_init_bfin(s);
     if (ARCH_PPC)
         ff_MPV_common_init_ppc(s);
     if (ARCH_X86)
@@ -195,7 +386,7 @@
     return 0;
 }
 
-int ff_mpv_frame_size_alloc(MpegEncContext *s, int linesize)
+static int frame_size_alloc(MpegEncContext *s, int linesize)
 {
     int alloc_size = FFALIGN(FFABS(linesize) + 64, 32);
 
@@ -225,27 +416,45 @@
  */
 static int alloc_frame_buffer(MpegEncContext *s, Picture *pic)
 {
+    int edges_needed = av_codec_is_encoder(s->avctx->codec);
     int r, ret;
 
     pic->tf.f = &pic->f;
     if (s->codec_id != AV_CODEC_ID_WMV3IMAGE &&
         s->codec_id != AV_CODEC_ID_VC1IMAGE  &&
-        s->codec_id != AV_CODEC_ID_MSS2)
+        s->codec_id != AV_CODEC_ID_MSS2) {
+        if (edges_needed) {
+            pic->f.width  = s->avctx->width  + 2 * EDGE_WIDTH;
+            pic->f.height = s->avctx->height + 2 * EDGE_WIDTH;
+        }
+
         r = ff_thread_get_buffer(s->avctx, &pic->tf,
                                  pic->reference ? AV_GET_BUFFER_FLAG_REF : 0);
-    else {
+    } else {
         pic->f.width  = s->avctx->width;
         pic->f.height = s->avctx->height;
         pic->f.format = s->avctx->pix_fmt;
         r = avcodec_default_get_buffer2(s->avctx, &pic->f, 0);
     }
 
-    if (r < 0 || !pic->f.data[0]) {
+    if (r < 0 || !pic->f.buf[0]) {
         av_log(s->avctx, AV_LOG_ERROR, "get_buffer() failed (%d %p)\n",
                r, pic->f.data[0]);
         return -1;
     }
 
+    if (edges_needed) {
+        int i;
+        for (i = 0; pic->f.data[i]; i++) {
+            int offset = (EDGE_WIDTH >> (i ? s->chroma_y_shift : 0)) *
+                         pic->f.linesize[i] +
+                         (EDGE_WIDTH >> (i ? s->chroma_x_shift : 0));
+            pic->f.data[i] += offset;
+        }
+        pic->f.width  = s->avctx->width;
+        pic->f.height = s->avctx->height;
+    }
+
     if (s->avctx->hwaccel) {
         assert(!pic->hwaccel_picture_private);
         if (s->avctx->hwaccel->priv_data_size) {
@@ -274,7 +483,7 @@
     }
 
     if (!s->edge_emu_buffer &&
-        (ret = ff_mpv_frame_size_alloc(s, pic->f.linesize[0])) < 0) {
+        (ret = frame_size_alloc(s, pic->f.linesize[0])) < 0) {
         av_log(s->avctx, AV_LOG_ERROR,
                "get_buffer() failed to allocate context scratch buffers.\n");
         ff_mpeg_unref_picture(s, pic);
@@ -284,7 +493,7 @@
     return 0;
 }
 
-static void free_picture_tables(Picture *pic)
+void ff_free_picture_tables(Picture *pic)
 {
     int i;
 
@@ -327,8 +536,7 @@
             return AVERROR(ENOMEM);
     }
 
-    if (s->out_format == FMT_H263 || s->encoding ||
-               (s->avctx->debug & FF_DEBUG_MV) || s->avctx->debug_mv) {
+    if (s->out_format == FMT_H263 || s->encoding || s->avctx->debug_mv) {
         int mv_size        = 2 * (b8_array_size + 4) * sizeof(int16_t);
         int ref_index_size = 4 * mb_array_size;
 
@@ -382,13 +590,13 @@
     if (pic->qscale_table_buf)
         if (   pic->alloc_mb_width  != s->mb_width
             || pic->alloc_mb_height != s->mb_height)
-            free_picture_tables(pic);
+            ff_free_picture_tables(pic);
 
     if (shared) {
         av_assert0(pic->f.data[0]);
         pic->shared = 1;
     } else {
-        av_assert0(!pic->f.data[0]);
+        av_assert0(!pic->f.buf[0]);
 
         if (alloc_frame_buffer(s, pic) < 0)
             return -1;
@@ -425,7 +633,7 @@
 fail:
     av_log(s->avctx, AV_LOG_ERROR, "Error allocating a picture.\n");
     ff_mpeg_unref_picture(s, pic);
-    free_picture_tables(pic);
+    ff_free_picture_tables(pic);
     return AVERROR(ENOMEM);
 }
 
@@ -449,7 +657,7 @@
     av_buffer_unref(&pic->hwaccel_priv_buf);
 
     if (pic->needs_realloc)
-        free_picture_tables(pic);
+        ff_free_picture_tables(pic);
 
     memset((uint8_t*)pic + off, 0, sizeof(*pic) - off);
 }
@@ -465,7 +673,7 @@
         av_buffer_unref(&dst->table);\
         dst->table = av_buffer_ref(src->table);\
         if (!dst->table) {\
-            free_picture_tables(dst);\
+            ff_free_picture_tables(dst);\
             return AVERROR(ENOMEM);\
         }\
     }\
@@ -537,6 +745,15 @@
     return ret;
 }
 
+static void exchange_uv(MpegEncContext *s)
+{
+    int16_t (*tmp)[64];
+
+    tmp           = s->pblocks[4];
+    s->pblocks[4] = s->pblocks[5];
+    s->pblocks[5] = tmp;
+}
+
 static int init_duplicate_context(MpegEncContext *s)
 {
     int y_size = s->b8_stride * (2 * s->mb_height + 1);
@@ -544,6 +761,9 @@
     int yc_size = y_size + 2 * c_size;
     int i;
 
+    if (s->mb_height & 1)
+        yc_size += 2*s->b8_stride + 2*s->mb_stride;
+
     s->edge_emu_buffer =
     s->me.scratchpad   =
     s->me.temp         =
@@ -567,6 +787,8 @@
     for (i = 0; i < 12; i++) {
         s->pblocks[i] = &s->block[i];
     }
+    if (s->avctx->codec_tag == AV_RL32("VCR2"))
+        exchange_uv(s);
 
     if (s->out_format == FMT_H263) {
         /* ac values */
@@ -641,8 +863,10 @@
     for (i = 0; i < 12; i++) {
         dst->pblocks[i] = &dst->block[i];
     }
+    if (dst->avctx->codec_tag == AV_RL32("VCR2"))
+        exchange_uv(dst);
     if (!dst->edge_emu_buffer &&
-        (ret = ff_mpv_frame_size_alloc(dst, dst->linesize)) < 0) {
+        (ret = frame_size_alloc(dst, dst->linesize)) < 0) {
         av_log(dst->avctx, AV_LOG_ERROR, "failed to allocate context "
                "scratch buffers.\n");
         return ret;
@@ -698,13 +922,12 @@
 
     s->coded_picture_number = s1->coded_picture_number;
     s->picture_number       = s1->picture_number;
-    s->input_picture_number = s1->input_picture_number;
 
     av_assert0(!s->picture || s->picture != s1->picture);
     if(s->picture)
     for (i = 0; i < MAX_PICTURE_COUNT; i++) {
         ff_mpeg_unref_picture(s, &s->picture[i]);
-        if (s1->picture[i].f.data[0] &&
+        if (s1->picture[i].f.buf[0] &&
             (ret = ff_mpeg_ref_picture(s, &s->picture[i], &s1->picture[i])) < 0)
             return ret;
     }
@@ -712,7 +935,7 @@
 #define UPDATE_PICTURE(pic)\
 do {\
     ff_mpeg_unref_picture(s, &s->pic);\
-    if (s1->pic.f.data[0])\
+    if (s1->pic.f.buf[0])\
         ret = ff_mpeg_ref_picture(s, &s->pic, &s1->pic);\
     else\
         ret = update_picture_tables(&s->pic, &s1->pic);\
@@ -734,8 +957,9 @@
     s->padding_bug_score    = s1->padding_bug_score;
 
     // MPEG4 timing info
-    memcpy(&s->time_increment_bits, &s1->time_increment_bits,
-           (char *) &s1->shape - (char *) &s1->time_increment_bits);
+    memcpy(&s->last_time_base, &s1->last_time_base,
+           (char *) &s1->pb_field_time + sizeof(s1->pb_field_time) -
+           (char *) &s1->last_time_base);
 
     // B-frame info
     s->max_b_frames = s1->max_b_frames;
@@ -761,7 +985,7 @@
     // linesize dependend scratch buffer allocation
     if (!s->edge_emu_buffer)
         if (s1->linesize) {
-            if (ff_mpv_frame_size_alloc(s, s1->linesize) < 0) {
+            if (frame_size_alloc(s, s1->linesize) < 0) {
                 av_log(s->avctx, AV_LOG_ERROR, "Failed to allocate context "
                        "scratch buffers.\n");
                 return AVERROR(ENOMEM);
@@ -779,10 +1003,6 @@
         s->last_pict_type = s1->pict_type;
         if (s1->current_picture_ptr)
             s->last_lambda_for[s1->pict_type] = s1->current_picture_ptr->f.quality;
-
-        if (s1->pict_type != AV_PICTURE_TYPE_B) {
-            s->last_non_b_pict_type = s1->pict_type;
-        }
     }
 
     return 0;
@@ -805,9 +1025,6 @@
 
     s->coded_picture_number  = 0;
     s->picture_number        = 0;
-    s->input_picture_number  = 0;
-
-    s->picture_in_gop_number = 0;
 
     s->f_code                = 1;
     s->b_code                = 1;
@@ -894,6 +1111,9 @@
     c_size  = s->mb_stride * (s->mb_height + 1);
     yc_size = y_size + 2   * c_size;
 
+    if (s->mb_height & 1)
+        yc_size += 2*s->b8_stride + 2*s->mb_stride;
+
     FF_ALLOCZ_OR_GOTO(s->avctx, s->mb_index2xy, (s->mb_num + 1) * sizeof(int), fail); // error ressilience code looks cleaner with this
     for (y = 0; y < s->mb_height; y++)
         for (x = 0; x < s->mb_width; x++)
@@ -951,7 +1171,7 @@
     }
     if (s->out_format == FMT_H263) {
         /* cbp values */
-        FF_ALLOCZ_OR_GOTO(s->avctx, s->coded_block_base, y_size, fail);
+        FF_ALLOCZ_OR_GOTO(s->avctx, s->coded_block_base, y_size + (s->mb_height&1)*2*s->b8_stride, fail);
         s->coded_block = s->coded_block_base + s->b8_stride + 1;
 
         /* cbp, ac_pred, pred_dir */
@@ -1034,44 +1254,21 @@
                                   &s->chroma_y_shift);
 
     /* convert fourcc to upper case */
-    s->codec_tag        = avpriv_toupper4(s->avctx->codec_tag);
-    s->stream_codec_tag = avpriv_toupper4(s->avctx->stream_codec_tag);
-
-    s->avctx->coded_frame = &s->current_picture.f;
+    s->codec_tag          = avpriv_toupper4(s->avctx->codec_tag);
 
-    if (s->encoding) {
-        if (s->msmpeg4_version) {
-            FF_ALLOCZ_OR_GOTO(s->avctx, s->ac_stats,
-                                2 * 2 * (MAX_LEVEL + 1) *
-                                (MAX_RUN + 1) * 2 * sizeof(int), fail);
-        }
-        FF_ALLOCZ_OR_GOTO(s->avctx, s->avctx->stats_out, 256, fail);
-
-        FF_ALLOCZ_OR_GOTO(s->avctx, s->q_intra_matrix,          64 * 32   * sizeof(int), fail)
-        FF_ALLOCZ_OR_GOTO(s->avctx, s->q_chroma_intra_matrix,   64 * 32   * sizeof(int), fail)
-        FF_ALLOCZ_OR_GOTO(s->avctx, s->q_inter_matrix,          64 * 32   * sizeof(int), fail)
-        FF_ALLOCZ_OR_GOTO(s->avctx, s->q_intra_matrix16,        64 * 32 * 2 * sizeof(uint16_t), fail)
-        FF_ALLOCZ_OR_GOTO(s->avctx, s->q_chroma_intra_matrix16, 64 * 32 * 2 * sizeof(uint16_t), fail)
-        FF_ALLOCZ_OR_GOTO(s->avctx, s->q_inter_matrix16,        64 * 32 * 2 * sizeof(uint16_t), fail)
-        FF_ALLOCZ_OR_GOTO(s->avctx, s->input_picture,           MAX_PICTURE_COUNT * sizeof(Picture *), fail)
-        FF_ALLOCZ_OR_GOTO(s->avctx, s->reordered_input_picture, MAX_PICTURE_COUNT * sizeof(Picture *), fail)
-
-        if (s->avctx->noise_reduction) {
-            FF_ALLOCZ_OR_GOTO(s->avctx, s->dct_offset, 2 * 64 * sizeof(uint16_t), fail);
-        }
-    }
+    s->stream_codec_tag   = avpriv_toupper4(s->avctx->stream_codec_tag);
 
     FF_ALLOCZ_OR_GOTO(s->avctx, s->picture,
                       MAX_PICTURE_COUNT * sizeof(Picture), fail);
     for (i = 0; i < MAX_PICTURE_COUNT; i++) {
-        avcodec_get_frame_defaults(&s->picture[i].f);
+        av_frame_unref(&s->picture[i].f);
     }
     memset(&s->next_picture, 0, sizeof(s->next_picture));
     memset(&s->last_picture, 0, sizeof(s->last_picture));
     memset(&s->current_picture, 0, sizeof(s->current_picture));
-    avcodec_get_frame_defaults(&s->next_picture.f);
-    avcodec_get_frame_defaults(&s->last_picture.f);
-    avcodec_get_frame_defaults(&s->current_picture.f);
+    av_frame_unref(&s->next_picture.f);
+    av_frame_unref(&s->last_picture.f);
+    av_frame_unref(&s->current_picture.f);
 
         if (init_context_frame(s))
             goto fail;
@@ -1261,36 +1458,19 @@
     av_freep(&s->bitstream_buffer);
     s->allocated_bitstream_buffer_size = 0;
 
-    av_freep(&s->avctx->stats_out);
-    av_freep(&s->ac_stats);
-
-    if(s->q_chroma_intra_matrix   != s->q_intra_matrix  ) av_freep(&s->q_chroma_intra_matrix);
-    if(s->q_chroma_intra_matrix16 != s->q_intra_matrix16) av_freep(&s->q_chroma_intra_matrix16);
-    s->q_chroma_intra_matrix=   NULL;
-    s->q_chroma_intra_matrix16= NULL;
-    av_freep(&s->q_intra_matrix);
-    av_freep(&s->q_inter_matrix);
-    av_freep(&s->q_intra_matrix16);
-    av_freep(&s->q_inter_matrix16);
-    av_freep(&s->input_picture);
-    av_freep(&s->reordered_input_picture);
-    av_freep(&s->dct_offset);
-
     if (s->picture) {
         for (i = 0; i < MAX_PICTURE_COUNT; i++) {
-            free_picture_tables(&s->picture[i]);
+            ff_free_picture_tables(&s->picture[i]);
             ff_mpeg_unref_picture(s, &s->picture[i]);
         }
     }
     av_freep(&s->picture);
-    free_picture_tables(&s->last_picture);
+    ff_free_picture_tables(&s->last_picture);
     ff_mpeg_unref_picture(s, &s->last_picture);
-    free_picture_tables(&s->current_picture);
+    ff_free_picture_tables(&s->current_picture);
     ff_mpeg_unref_picture(s, &s->current_picture);
-    free_picture_tables(&s->next_picture);
+    ff_free_picture_tables(&s->next_picture);
     ff_mpeg_unref_picture(s, &s->next_picture);
-    free_picture_tables(&s->new_picture);
-    ff_mpeg_unref_picture(s, &s->new_picture);
 
     free_context_frame(s);
 
@@ -1393,16 +1573,14 @@
     }
 }
 
-void ff_release_unused_pictures(MpegEncContext*s, int remove_current)
+static void release_unused_pictures(MpegEncContext *s)
 {
     int i;
 
     /* release non reference frames */
     for (i = 0; i < MAX_PICTURE_COUNT; i++) {
-        if (!s->picture[i].reference &&
-            (remove_current || &s->picture[i] !=  s->current_picture_ptr)) {
+        if (!s->picture[i].reference)
             ff_mpeg_unref_picture(s, &s->picture[i]);
-        }
     }
 }
 
@@ -1410,7 +1588,7 @@
 {
     if (pic == s->last_picture_ptr)
         return 0;
-    if (pic->f.data[0] == NULL)
+    if (pic->f.buf[0] == NULL)
         return 1;
     if (pic->needs_realloc && !(pic->reference & DELAYED_PIC_REF))
         return 1;
@@ -1423,7 +1601,7 @@
 
     if (shared) {
         for (i = 0; i < MAX_PICTURE_COUNT; i++) {
-            if (s->picture[i].f.data[0] == NULL && &s->picture[i] != s->last_picture_ptr)
+            if (s->picture[i].f.buf[0] == NULL && &s->picture[i] != s->last_picture_ptr)
                 return i;
         }
     } else {
@@ -1457,38 +1635,16 @@
     if (ret >= 0 && ret < MAX_PICTURE_COUNT) {
         if (s->picture[ret].needs_realloc) {
             s->picture[ret].needs_realloc = 0;
-            free_picture_tables(&s->picture[ret]);
+            ff_free_picture_tables(&s->picture[ret]);
             ff_mpeg_unref_picture(s, &s->picture[ret]);
-            avcodec_get_frame_defaults(&s->picture[ret].f);
         }
     }
     return ret;
 }
 
-static void update_noise_reduction(MpegEncContext *s)
-{
-    int intra, i;
-
-    for (intra = 0; intra < 2; intra++) {
-        if (s->dct_count[intra] > (1 << 16)) {
-            for (i = 0; i < 64; i++) {
-                s->dct_error_sum[intra][i] >>= 1;
-            }
-            s->dct_count[intra] >>= 1;
-        }
-
-        for (i = 0; i < 64; i++) {
-            s->dct_offset[intra][i] = (s->avctx->noise_reduction *
-                                       s->dct_count[intra] +
-                                       s->dct_error_sum[intra][i] / 2) /
-                                      (s->dct_error_sum[intra][i] + 1);
-        }
-    }
-}
-
 /**
- * generic function for encode/decode called after coding/decoding
- * the header and before a frame is coded/decoded.
+ * generic function called after decoding
+ * the header and before a frame is decoded.
  */
 int ff_MPV_frame_start(MpegEncContext *s, AVCodecContext *avctx)
 {
@@ -1504,68 +1660,64 @@
     /* mark & release old frames */
     if (s->pict_type != AV_PICTURE_TYPE_B && s->last_picture_ptr &&
         s->last_picture_ptr != s->next_picture_ptr &&
-        s->last_picture_ptr->f.data[0]) {
+        s->last_picture_ptr->f.buf[0]) {
         ff_mpeg_unref_picture(s, s->last_picture_ptr);
     }
 
     /* release forgotten pictures */
     /* if (mpeg124/h263) */
-    if (!s->encoding) {
-        for (i = 0; i < MAX_PICTURE_COUNT; i++) {
-            if (&s->picture[i] != s->last_picture_ptr &&
-                &s->picture[i] != s->next_picture_ptr &&
-                s->picture[i].reference && !s->picture[i].needs_realloc) {
-                if (!(avctx->active_thread_type & FF_THREAD_FRAME))
-                    av_log(avctx, AV_LOG_ERROR,
-                           "releasing zombie picture\n");
-                ff_mpeg_unref_picture(s, &s->picture[i]);
-            }
+    for (i = 0; i < MAX_PICTURE_COUNT; i++) {
+        if (&s->picture[i] != s->last_picture_ptr &&
+            &s->picture[i] != s->next_picture_ptr &&
+            s->picture[i].reference && !s->picture[i].needs_realloc) {
+            if (!(avctx->active_thread_type & FF_THREAD_FRAME))
+                av_log(avctx, AV_LOG_ERROR,
+                       "releasing zombie picture\n");
+            ff_mpeg_unref_picture(s, &s->picture[i]);
         }
     }
 
     ff_mpeg_unref_picture(s, &s->current_picture);
 
-    if (!s->encoding) {
-        ff_release_unused_pictures(s, 1);
+    release_unused_pictures(s);
 
-        if (s->current_picture_ptr &&
-            s->current_picture_ptr->f.data[0] == NULL) {
-            // we already have a unused image
-            // (maybe it was set before reading the header)
-            pic = s->current_picture_ptr;
-        } else {
-            i   = ff_find_unused_picture(s, 0);
-            if (i < 0) {
-                av_log(s->avctx, AV_LOG_ERROR, "no frame buffer available\n");
-                return i;
-            }
-            pic = &s->picture[i];
+    if (s->current_picture_ptr &&
+        s->current_picture_ptr->f.buf[0] == NULL) {
+        // we already have a unused image
+        // (maybe it was set before reading the header)
+        pic = s->current_picture_ptr;
+    } else {
+        i   = ff_find_unused_picture(s, 0);
+        if (i < 0) {
+            av_log(s->avctx, AV_LOG_ERROR, "no frame buffer available\n");
+            return i;
         }
+        pic = &s->picture[i];
+    }
 
-        pic->reference = 0;
-        if (!s->droppable) {
-            if (s->pict_type != AV_PICTURE_TYPE_B)
-                pic->reference = 3;
-        }
+    pic->reference = 0;
+    if (!s->droppable) {
+        if (s->pict_type != AV_PICTURE_TYPE_B)
+            pic->reference = 3;
+    }
 
-        pic->f.coded_picture_number = s->coded_picture_number++;
+    pic->f.coded_picture_number = s->coded_picture_number++;
 
-        if (ff_alloc_picture(s, pic, 0) < 0)
-            return -1;
+    if (ff_alloc_picture(s, pic, 0) < 0)
+        return -1;
 
-        s->current_picture_ptr = pic;
-        // FIXME use only the vars from current_pic
-        s->current_picture_ptr->f.top_field_first = s->top_field_first;
-        if (s->codec_id == AV_CODEC_ID_MPEG1VIDEO ||
-            s->codec_id == AV_CODEC_ID_MPEG2VIDEO) {
-            if (s->picture_structure != PICT_FRAME)
-                s->current_picture_ptr->f.top_field_first =
-                    (s->picture_structure == PICT_TOP_FIELD) == s->first_field;
-        }
-        s->current_picture_ptr->f.interlaced_frame = !s->progressive_frame &&
-                                                     !s->progressive_sequence;
-        s->current_picture_ptr->field_picture      =  s->picture_structure != PICT_FRAME;
-    }
+    s->current_picture_ptr = pic;
+    // FIXME use only the vars from current_pic
+    s->current_picture_ptr->f.top_field_first = s->top_field_first;
+    if (s->codec_id == AV_CODEC_ID_MPEG1VIDEO ||
+        s->codec_id == AV_CODEC_ID_MPEG2VIDEO) {
+        if (s->picture_structure != PICT_FRAME)
+            s->current_picture_ptr->f.top_field_first =
+                (s->picture_structure == PICT_TOP_FIELD) == s->first_field;
+    }
+    s->current_picture_ptr->f.interlaced_frame = !s->progressive_frame &&
+                                                 !s->progressive_sequence;
+    s->current_picture_ptr->field_picture      =  s->picture_structure != PICT_FRAME;
 
     s->current_picture_ptr->f.pict_type = s->pict_type;
     // if (s->flags && CODEC_FLAG_QSCALE)
@@ -1589,13 +1741,13 @@
             s->pict_type, s->droppable);
 
     if ((s->last_picture_ptr == NULL ||
-         s->last_picture_ptr->f.data[0] == NULL) &&
+         s->last_picture_ptr->f.buf[0] == NULL) &&
         (s->pict_type != AV_PICTURE_TYPE_I ||
          s->picture_structure != PICT_FRAME)) {
         int h_chroma_shift, v_chroma_shift;
         av_pix_fmt_get_chroma_sub_sample(s->avctx->pix_fmt,
                                          &h_chroma_shift, &v_chroma_shift);
-        if (s->pict_type == AV_PICTURE_TYPE_B && s->next_picture_ptr && s->next_picture_ptr->f.data[0])
+        if (s->pict_type == AV_PICTURE_TYPE_B && s->next_picture_ptr && s->next_picture_ptr->f.buf[0])
             av_log(avctx, AV_LOG_DEBUG,
                    "allocating dummy last picture for B frame\n");
         else if (s->pict_type != AV_PICTURE_TYPE_I)
@@ -1612,31 +1764,38 @@
             return i;
         }
         s->last_picture_ptr = &s->picture[i];
+
+        s->last_picture_ptr->reference   = 3;
         s->last_picture_ptr->f.key_frame = 0;
+        s->last_picture_ptr->f.pict_type = AV_PICTURE_TYPE_P;
+
         if (ff_alloc_picture(s, s->last_picture_ptr, 0) < 0) {
             s->last_picture_ptr = NULL;
             return -1;
         }
 
-        memset(s->last_picture_ptr->f.data[0], 0x80,
-               avctx->height * s->last_picture_ptr->f.linesize[0]);
-        memset(s->last_picture_ptr->f.data[1], 0x80,
-               (avctx->height >> v_chroma_shift) *
-               s->last_picture_ptr->f.linesize[1]);
-        memset(s->last_picture_ptr->f.data[2], 0x80,
-               (avctx->height >> v_chroma_shift) *
-               s->last_picture_ptr->f.linesize[2]);
-
-        if(s->codec_id == AV_CODEC_ID_FLV1 || s->codec_id == AV_CODEC_ID_H263){
+        if (!avctx->hwaccel) {
             for(i=0; i<avctx->height; i++)
-            memset(s->last_picture_ptr->f.data[0] + s->last_picture_ptr->f.linesize[0]*i, 16, avctx->width);
+                memset(s->last_picture_ptr->f.data[0] + s->last_picture_ptr->f.linesize[0]*i,
+                       0x80, avctx->width);
+            for(i=0; i<FF_CEIL_RSHIFT(avctx->height, v_chroma_shift); i++) {
+                memset(s->last_picture_ptr->f.data[1] + s->last_picture_ptr->f.linesize[1]*i,
+                       0x80, FF_CEIL_RSHIFT(avctx->width, h_chroma_shift));
+                memset(s->last_picture_ptr->f.data[2] + s->last_picture_ptr->f.linesize[2]*i,
+                       0x80, FF_CEIL_RSHIFT(avctx->width, h_chroma_shift));
+            }
+
+            if(s->codec_id == AV_CODEC_ID_FLV1 || s->codec_id == AV_CODEC_ID_H263){
+                for(i=0; i<avctx->height; i++)
+                memset(s->last_picture_ptr->f.data[0] + s->last_picture_ptr->f.linesize[0]*i, 16, avctx->width);
+            }
         }
 
         ff_thread_report_progress(&s->last_picture_ptr->tf, INT_MAX, 0);
         ff_thread_report_progress(&s->last_picture_ptr->tf, INT_MAX, 1);
     }
     if ((s->next_picture_ptr == NULL ||
-         s->next_picture_ptr->f.data[0] == NULL) &&
+         s->next_picture_ptr->f.buf[0] == NULL) &&
         s->pict_type == AV_PICTURE_TYPE_B) {
         /* Allocate a dummy frame */
         i = ff_find_unused_picture(s, 0);
@@ -1645,7 +1804,11 @@
             return i;
         }
         s->next_picture_ptr = &s->picture[i];
+
+        s->next_picture_ptr->reference   = 3;
         s->next_picture_ptr->f.key_frame = 0;
+        s->next_picture_ptr->f.pict_type = AV_PICTURE_TYPE_P;
+
         if (ff_alloc_picture(s, s->next_picture_ptr, 0) < 0) {
             s->next_picture_ptr = NULL;
             return -1;
@@ -1660,21 +1823,21 @@
 #endif
     if (s->last_picture_ptr) {
         ff_mpeg_unref_picture(s, &s->last_picture);
-        if (s->last_picture_ptr->f.data[0] &&
+        if (s->last_picture_ptr->f.buf[0] &&
             (ret = ff_mpeg_ref_picture(s, &s->last_picture,
                                        s->last_picture_ptr)) < 0)
             return ret;
     }
     if (s->next_picture_ptr) {
         ff_mpeg_unref_picture(s, &s->next_picture);
-        if (s->next_picture_ptr->f.data[0] &&
+        if (s->next_picture_ptr->f.buf[0] &&
             (ret = ff_mpeg_ref_picture(s, &s->next_picture,
                                        s->next_picture_ptr)) < 0)
             return ret;
     }
 
     av_assert0(s->pict_type == AV_PICTURE_TYPE_I || (s->last_picture_ptr &&
-                                                 s->last_picture_ptr->f.data[0]));
+                                                 s->last_picture_ptr->f.buf[0]));
 
     if (s->picture_structure!= PICT_FRAME) {
         int i;
@@ -1705,77 +1868,14 @@
         s->dct_unquantize_inter = s->dct_unquantize_mpeg1_inter;
     }
 
-    if (s->dct_error_sum) {
-        av_assert2(s->avctx->noise_reduction && s->encoding);
-        update_noise_reduction(s);
-    }
-
-    if (CONFIG_MPEG_XVMC_DECODER && s->avctx->xvmc_acceleration)
-        return ff_xvmc_field_start(s, avctx);
-
     return 0;
 }
 
-/* generic function for encode/decode called after a
- * frame has been coded/decoded. */
+/* called after a frame has been decoded. */
 void ff_MPV_frame_end(MpegEncContext *s)
 {
-    /* redraw edges for the frame if decoding didn't complete */
-    // just to make sure that all data is rendered.
-    if (CONFIG_MPEG_XVMC_DECODER && s->avctx->xvmc_acceleration) {
-        ff_xvmc_field_end(s);
-   } else if ((s->er.error_count || s->encoding || !(s->avctx->codec->capabilities&CODEC_CAP_DRAW_HORIZ_BAND)) &&
-              !s->avctx->hwaccel &&
-              !(s->avctx->codec->capabilities & CODEC_CAP_HWACCEL_VDPAU) &&
-              s->unrestricted_mv &&
-              s->current_picture.reference &&
-              !s->intra_only &&
-              !(s->flags & CODEC_FLAG_EMU_EDGE) &&
-              !s->avctx->lowres
-            ) {
-        const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(s->avctx->pix_fmt);
-        int hshift = desc->log2_chroma_w;
-        int vshift = desc->log2_chroma_h;
-        s->dsp.draw_edges(s->current_picture.f.data[0], s->current_picture.f.linesize[0],
-                          s->h_edge_pos, s->v_edge_pos,
-                          EDGE_WIDTH, EDGE_WIDTH,
-                          EDGE_TOP | EDGE_BOTTOM);
-        s->dsp.draw_edges(s->current_picture.f.data[1], s->current_picture.f.linesize[1],
-                          s->h_edge_pos >> hshift, s->v_edge_pos >> vshift,
-                          EDGE_WIDTH >> hshift, EDGE_WIDTH >> vshift,
-                          EDGE_TOP | EDGE_BOTTOM);
-        s->dsp.draw_edges(s->current_picture.f.data[2], s->current_picture.f.linesize[2],
-                          s->h_edge_pos >> hshift, s->v_edge_pos >> vshift,
-                          EDGE_WIDTH >> hshift, EDGE_WIDTH >> vshift,
-                          EDGE_TOP | EDGE_BOTTOM);
-    }
-
     emms_c();
 
-    s->last_pict_type                 = s->pict_type;
-    s->last_lambda_for [s->pict_type] = s->current_picture_ptr->f.quality;
-    if (s->pict_type!= AV_PICTURE_TYPE_B) {
-        s->last_non_b_pict_type = s->pict_type;
-    }
-#if 0
-    /* copy back current_picture variables */
-    for (i = 0; i < MAX_PICTURE_COUNT; i++) {
-        if (s->picture[i].f.data[0] == s->current_picture.f.data[0]) {
-            s->picture[i] = s->current_picture;
-            break;
-        }
-    }
-    av_assert0(i < MAX_PICTURE_COUNT);
-#endif
-
-    // clear copies, to avoid confusion
-#if 0
-    memset(&s->last_picture,    0, sizeof(Picture));
-    memset(&s->next_picture,    0, sizeof(Picture));
-    memset(&s->current_picture, 0, sizeof(Picture));
-#endif
-    s->avctx->coded_frame = &s->current_picture_ptr->f;
-
     if (s->current_picture.reference)
         ff_thread_report_progress(&s->current_picture_ptr->tf, INT_MAX, 0);
 }
@@ -2204,12 +2304,11 @@
 
     if ((unsigned)src_x > FFMAX( h_edge_pos - (!!sx) - w,                 0) ||
         (unsigned)src_y > FFMAX((v_edge_pos >> field_based) - (!!sy) - h, 0)) {
-        s->vdsp.emulated_edge_mc(s->edge_emu_buffer, s->linesize,
-                                src, s->linesize, w + 1,
-                                (h + 1) << field_based, src_x,
-                                src_y   << field_based,
-                                h_edge_pos,
-                                v_edge_pos);
+        s->vdsp.emulated_edge_mc(s->edge_emu_buffer, src,
+                                 s->linesize, s->linesize,
+                                 w + 1, (h + 1) << field_based,
+                                 src_x, src_y   << field_based,
+                                 h_edge_pos, v_edge_pos);
         src = s->edge_emu_buffer;
         emu = 1;
     }
@@ -2307,21 +2406,22 @@
 
     if ((unsigned) src_x > FFMAX( h_edge_pos - (!!sx) - 2 * block_s,       0) || uvsrc_y<0 ||
         (unsigned) src_y > FFMAX((v_edge_pos >> field_based) - (!!sy) - h, 0)) {
-        s->vdsp.emulated_edge_mc(s->edge_emu_buffer, linesize >> field_based, ptr_y,
-                                linesize >> field_based, 17, 17 + field_based,
+        s->vdsp.emulated_edge_mc(s->edge_emu_buffer, ptr_y,
+                                 linesize >> field_based, linesize >> field_based,
+                                 17, 17 + field_based,
                                 src_x, src_y << field_based, h_edge_pos,
                                 v_edge_pos);
         ptr_y = s->edge_emu_buffer;
         if (!CONFIG_GRAY || !(s->flags & CODEC_FLAG_GRAY)) {
             uint8_t *uvbuf = s->edge_emu_buffer + 18 * s->linesize;
-            s->vdsp.emulated_edge_mc(uvbuf, uvlinesize >> field_based,
-                                    ptr_cb, uvlinesize >> field_based, 9,
-                                    9 + field_based,
+            s->vdsp.emulated_edge_mc(uvbuf,  ptr_cb,
+                                     uvlinesize >> field_based, uvlinesize >> field_based,
+                                     9, 9 + field_based,
                                     uvsrc_x, uvsrc_y << field_based,
                                     h_edge_pos >> 1, v_edge_pos >> 1);
-            s->vdsp.emulated_edge_mc(uvbuf + 16, uvlinesize >> field_based,
-                                    ptr_cr, uvlinesize >> field_based, 9,
-                                    9 + field_based,
+            s->vdsp.emulated_edge_mc(uvbuf + 16,  ptr_cr,
+                                     uvlinesize >> field_based,uvlinesize >> field_based,
+                                     9, 9 + field_based,
                                     uvsrc_x, uvsrc_y << field_based,
                                     h_edge_pos >> 1, v_edge_pos >> 1);
             ptr_cb = uvbuf;
@@ -2393,8 +2493,10 @@
     ptr = ref_picture[1] + offset;
     if ((unsigned) src_x > FFMAX(h_edge_pos - (!!sx) - block_s, 0) ||
         (unsigned) src_y > FFMAX(v_edge_pos - (!!sy) - block_s, 0)) {
-        s->vdsp.emulated_edge_mc(s->edge_emu_buffer, s->uvlinesize, ptr, s->uvlinesize,
-                                9, 9, src_x, src_y, h_edge_pos, v_edge_pos);
+        s->vdsp.emulated_edge_mc(s->edge_emu_buffer, ptr,
+                                 s->uvlinesize, s->uvlinesize,
+                                 9, 9,
+                                 src_x, src_y, h_edge_pos, v_edge_pos);
         ptr = s->edge_emu_buffer;
         emu = 1;
     }
@@ -2404,9 +2506,10 @@
 
     ptr = ref_picture[2] + offset;
     if (emu) {
-        s->vdsp.emulated_edge_mc(s->edge_emu_buffer, s->uvlinesize,
-                                ptr, s->uvlinesize, 9, 9,
-                                src_x, src_y, h_edge_pos, v_edge_pos);
+        s->vdsp.emulated_edge_mc(s->edge_emu_buffer, ptr,
+                                 s->uvlinesize, s->uvlinesize,
+                                 9, 9,
+                                 src_x, src_y, h_edge_pos, v_edge_pos);
         ptr = s->edge_emu_buffer;
     }
     pix_op[op_index](dest_cr, ptr, s->uvlinesize, block_s, sx, sy);
@@ -2667,8 +2770,10 @@
                             int lowres_flag, int is_mpeg12)
 {
     const int mb_xy = s->mb_y * s->mb_stride + s->mb_x;
-    if(CONFIG_MPEG_XVMC_DECODER && s->avctx->xvmc_acceleration){
-        ff_xvmc_decode_mb(s);//xvmc uses pblocks
+
+    if (CONFIG_XVMC &&
+        s->avctx->hwaccel && s->avctx->hwaccel->decode_mb) {
+        s->avctx->hwaccel->decode_mb(s);//xvmc uses pblocks
         return;
     }
 
@@ -2700,7 +2805,9 @@
     else if (!is_mpeg12 && (s->h263_pred || s->h263_aic))
         s->mbintra_table[mb_xy]=1;
 
-    if ((s->flags&CODEC_FLAG_PSNR) || !(s->encoding && (s->intra_only || s->pict_type==AV_PICTURE_TYPE_B) && s->avctx->mb_decision != FF_MB_DECISION_RD)) { //FIXME precalc
+    if (   (s->flags&CODEC_FLAG_PSNR)
+        || s->avctx->frame_skip_threshold || s->avctx->frame_skip_factor
+        || !(s->encoding && (s->intra_only || s->pict_type==AV_PICTURE_TYPE_B) && s->avctx->mb_decision != FF_MB_DECISION_RD)) { //FIXME precalc
         uint8_t *dest_y, *dest_cb, *dest_cr;
         int dct_linesize, dct_offset;
         op_pixels_func (*op_pix)[4];
@@ -2768,7 +2875,7 @@
                         MPV_motion_lowres(s, dest_y, dest_cb, dest_cr, 1, s->next_picture.f.data, op_pix);
                     }
                 }else{
-                    op_qpix= s->me.qpel_put;
+                    op_qpix = s->me.qpel_put;
                     if ((!s->no_rounding) || s->pict_type==AV_PICTURE_TYPE_B){
                         op_pix = s->hdsp.put_pixels_tab;
                     }else{
@@ -2879,7 +2986,7 @@
                     }else{
 
                         dct_linesize = uvlinesize << s->interlaced_dct;
-                        dct_offset   = s->interlaced_dct? uvlinesize : uvlinesize*block_size;
+                        dct_offset   = s->interlaced_dct ? uvlinesize : uvlinesize*block_size;
 
                         s->dsp.idct_put(dest_cb,              dct_linesize, block[4]);
                         s->dsp.idct_put(dest_cr,              dct_linesize, block[5]);
@@ -2918,13 +3025,11 @@
 /**
  * @param h is the normal height, this will be reduced automatically if needed for the last row
  */
-void ff_draw_horiz_band(AVCodecContext *avctx, DSPContext *dsp, Picture *cur,
+void ff_draw_horiz_band(AVCodecContext *avctx, Picture *cur,
                         Picture *last, int y, int h, int picture_structure,
-                        int first_field, int draw_edges, int low_delay,
-                        int v_edge_pos, int h_edge_pos)
+                        int first_field, int low_delay)
 {
     const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(avctx->pix_fmt);
-    int hshift = desc->log2_chroma_w;
     int vshift = desc->log2_chroma_h;
     const int field_pic = picture_structure != PICT_FRAME;
     if(field_pic){
@@ -2932,30 +3037,6 @@
         y <<= 1;
     }
 
-    if (!avctx->hwaccel &&
-        !(avctx->codec->capabilities & CODEC_CAP_HWACCEL_VDPAU) &&
-        draw_edges &&
-        cur->reference &&
-        !(avctx->flags & CODEC_FLAG_EMU_EDGE)) {
-        int *linesize = cur->f.linesize;
-        int sides = 0, edge_h;
-        if (y==0) sides |= EDGE_TOP;
-        if (y + h >= v_edge_pos)
-            sides |= EDGE_BOTTOM;
-
-        edge_h= FFMIN(h, v_edge_pos - y);
-
-        dsp->draw_edges(cur->f.data[0] + y * linesize[0],
-                        linesize[0], h_edge_pos, edge_h,
-                        EDGE_WIDTH, EDGE_WIDTH, sides);
-        dsp->draw_edges(cur->f.data[1] + (y >> vshift) * linesize[1],
-                        linesize[1], h_edge_pos >> hshift, edge_h >> vshift,
-                        EDGE_WIDTH >> hshift, EDGE_WIDTH >> vshift, sides);
-        dsp->draw_edges(cur->f.data[2] + (y >> vshift) * linesize[2],
-                        linesize[2], h_edge_pos >> hshift, edge_h >> vshift,
-                        EDGE_WIDTH >> hshift, EDGE_WIDTH >> vshift, sides);
-    }
-
     h = FFMIN(h, avctx->height - y);
 
     if(field_pic && first_field && !(avctx->slice_flags&SLICE_FLAG_ALLOW_FIELD)) return;
@@ -2995,11 +3076,9 @@
 
 void ff_mpeg_draw_horiz_band(MpegEncContext *s, int y, int h)
 {
-    int draw_edges = s->unrestricted_mv && !s->intra_only;
-    ff_draw_horiz_band(s->avctx, &s->dsp, s->current_picture_ptr,
+    ff_draw_horiz_band(s->avctx, s->current_picture_ptr,
                        s->last_picture_ptr, y, h, s->picture_structure,
-                       s->first_field, draw_edges, s->low_delay,
-                       s->v_edge_pos, s->h_edge_pos);
+                       s->first_field, s->low_delay);
 }
 
 void ff_init_block_index(MpegEncContext *s){ //FIXME maybe rename
@@ -3091,213 +3170,6 @@
     s->pp_time=0;
 }
 
-static void dct_unquantize_mpeg1_intra_c(MpegEncContext *s,
-                                   int16_t *block, int n, int qscale)
-{
-    int i, level, nCoeffs;
-    const uint16_t *quant_matrix;
-
-    nCoeffs= s->block_last_index[n];
-
-    block[0] *= n < 4 ? s->y_dc_scale : s->c_dc_scale;
-    /* XXX: only mpeg1 */
-    quant_matrix = s->intra_matrix;
-    for(i=1;i<=nCoeffs;i++) {
-        int j= s->intra_scantable.permutated[i];
-        level = block[j];
-        if (level) {
-            if (level < 0) {
-                level = -level;
-                level = (int)(level * qscale * quant_matrix[j]) >> 3;
-                level = (level - 1) | 1;
-                level = -level;
-            } else {
-                level = (int)(level * qscale * quant_matrix[j]) >> 3;
-                level = (level - 1) | 1;
-            }
-            block[j] = level;
-        }
-    }
-}
-
-static void dct_unquantize_mpeg1_inter_c(MpegEncContext *s,
-                                   int16_t *block, int n, int qscale)
-{
-    int i, level, nCoeffs;
-    const uint16_t *quant_matrix;
-
-    nCoeffs= s->block_last_index[n];
-
-    quant_matrix = s->inter_matrix;
-    for(i=0; i<=nCoeffs; i++) {
-        int j= s->intra_scantable.permutated[i];
-        level = block[j];
-        if (level) {
-            if (level < 0) {
-                level = -level;
-                level = (((level << 1) + 1) * qscale *
-                         ((int) (quant_matrix[j]))) >> 4;
-                level = (level - 1) | 1;
-                level = -level;
-            } else {
-                level = (((level << 1) + 1) * qscale *
-                         ((int) (quant_matrix[j]))) >> 4;
-                level = (level - 1) | 1;
-            }
-            block[j] = level;
-        }
-    }
-}
-
-static void dct_unquantize_mpeg2_intra_c(MpegEncContext *s,
-                                   int16_t *block, int n, int qscale)
-{
-    int i, level, nCoeffs;
-    const uint16_t *quant_matrix;
-
-    if(s->alternate_scan) nCoeffs= 63;
-    else nCoeffs= s->block_last_index[n];
-
-    block[0] *= n < 4 ? s->y_dc_scale : s->c_dc_scale;
-    quant_matrix = s->intra_matrix;
-    for(i=1;i<=nCoeffs;i++) {
-        int j= s->intra_scantable.permutated[i];
-        level = block[j];
-        if (level) {
-            if (level < 0) {
-                level = -level;
-                level = (int)(level * qscale * quant_matrix[j]) >> 3;
-                level = -level;
-            } else {
-                level = (int)(level * qscale * quant_matrix[j]) >> 3;
-            }
-            block[j] = level;
-        }
-    }
-}
-
-static void dct_unquantize_mpeg2_intra_bitexact(MpegEncContext *s,
-                                   int16_t *block, int n, int qscale)
-{
-    int i, level, nCoeffs;
-    const uint16_t *quant_matrix;
-    int sum=-1;
-
-    if(s->alternate_scan) nCoeffs= 63;
-    else nCoeffs= s->block_last_index[n];
-
-    block[0] *= n < 4 ? s->y_dc_scale : s->c_dc_scale;
-    sum += block[0];
-    quant_matrix = s->intra_matrix;
-    for(i=1;i<=nCoeffs;i++) {
-        int j= s->intra_scantable.permutated[i];
-        level = block[j];
-        if (level) {
-            if (level < 0) {
-                level = -level;
-                level = (int)(level * qscale * quant_matrix[j]) >> 3;
-                level = -level;
-            } else {
-                level = (int)(level * qscale * quant_matrix[j]) >> 3;
-            }
-            block[j] = level;
-            sum+=level;
-        }
-    }
-    block[63]^=sum&1;
-}
-
-static void dct_unquantize_mpeg2_inter_c(MpegEncContext *s,
-                                   int16_t *block, int n, int qscale)
-{
-    int i, level, nCoeffs;
-    const uint16_t *quant_matrix;
-    int sum=-1;
-
-    if(s->alternate_scan) nCoeffs= 63;
-    else nCoeffs= s->block_last_index[n];
-
-    quant_matrix = s->inter_matrix;
-    for(i=0; i<=nCoeffs; i++) {
-        int j= s->intra_scantable.permutated[i];
-        level = block[j];
-        if (level) {
-            if (level < 0) {
-                level = -level;
-                level = (((level << 1) + 1) * qscale *
-                         ((int) (quant_matrix[j]))) >> 4;
-                level = -level;
-            } else {
-                level = (((level << 1) + 1) * qscale *
-                         ((int) (quant_matrix[j]))) >> 4;
-            }
-            block[j] = level;
-            sum+=level;
-        }
-    }
-    block[63]^=sum&1;
-}
-
-static void dct_unquantize_h263_intra_c(MpegEncContext *s,
-                                  int16_t *block, int n, int qscale)
-{
-    int i, level, qmul, qadd;
-    int nCoeffs;
-
-    av_assert2(s->block_last_index[n]>=0 || s->h263_aic);
-
-    qmul = qscale << 1;
-
-    if (!s->h263_aic) {
-        block[0] *= n < 4 ? s->y_dc_scale : s->c_dc_scale;
-        qadd = (qscale - 1) | 1;
-    }else{
-        qadd = 0;
-    }
-    if(s->ac_pred)
-        nCoeffs=63;
-    else
-        nCoeffs= s->inter_scantable.raster_end[ s->block_last_index[n] ];
-
-    for(i=1; i<=nCoeffs; i++) {
-        level = block[i];
-        if (level) {
-            if (level < 0) {
-                level = level * qmul - qadd;
-            } else {
-                level = level * qmul + qadd;
-            }
-            block[i] = level;
-        }
-    }
-}
-
-static void dct_unquantize_h263_inter_c(MpegEncContext *s,
-                                  int16_t *block, int n, int qscale)
-{
-    int i, level, qmul, qadd;
-    int nCoeffs;
-
-    av_assert2(s->block_last_index[n]>=0);
-
-    qadd = (qscale - 1) | 1;
-    qmul = qscale << 1;
-
-    nCoeffs= s->inter_scantable.raster_end[ s->block_last_index[n] ];
-
-    for(i=0; i<=nCoeffs; i++) {
-        level = block[i];
-        if (level) {
-            if (level < 0) {
-                level = level * qmul - qadd;
-            } else {
-                level = level * qmul + qadd;
-            }
-            block[i] = level;
-        }
-    }
-}
-
 /**
  * set qscale and update qscale dependent variables.
  */

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/mpegvideo.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/mpegvideo.h Changed

@@ -33,6 +33,7 @@
 #include "error_resilience.h"
 #include "get_bits.h"
 #include "h264chroma.h"
+#include "h263dsp.h"
 #include "hpeldsp.h"
 #include "put_bits.h"
 #include "ratecontrol.h"
@@ -65,6 +66,8 @@
 #define MAX_THREADS 32
 #define MAX_PICTURE_COUNT 36
 
+#define MAX_B_FRAMES 16
+
 #define ME_MAP_SIZE 64
 #define ME_MAP_SHIFT 3
 #define ME_MAP_MV_BITS 11
@@ -96,6 +99,7 @@
  */
 typedef struct Picture{
     struct AVFrame f;
+    uint8_t avframe_padding[1024]; // hack to allow linking to a avutil with larger AVFrame
     ThreadFrame tf;
 
     AVBufferRef *qscale_table_buf;
@@ -107,6 +111,30 @@
     AVBufferRef *mb_type_buf;
     uint32_t *mb_type;
 
+#if !FF_API_MB_TYPE
+#define MB_TYPE_INTRA4x4   0x0001
+#define MB_TYPE_INTRA16x16 0x0002 //FIXME H.264-specific
+#define MB_TYPE_INTRA_PCM  0x0004 //FIXME H.264-specific
+#define MB_TYPE_16x16      0x0008
+#define MB_TYPE_16x8       0x0010
+#define MB_TYPE_8x16       0x0020
+#define MB_TYPE_8x8        0x0040
+#define MB_TYPE_INTERLACED 0x0080
+#define MB_TYPE_DIRECT2    0x0100 //FIXME
+#define MB_TYPE_ACPRED     0x0200
+#define MB_TYPE_GMC        0x0400
+#define MB_TYPE_SKIP       0x0800
+#define MB_TYPE_P0L0       0x1000
+#define MB_TYPE_P1L0       0x2000
+#define MB_TYPE_P0L1       0x4000
+#define MB_TYPE_P1L1       0x8000
+#define MB_TYPE_L0         (MB_TYPE_P0L0 | MB_TYPE_P1L0)
+#define MB_TYPE_L1         (MB_TYPE_P0L1 | MB_TYPE_P1L1)
+#define MB_TYPE_L0L1       (MB_TYPE_L0   | MB_TYPE_L1)
+#define MB_TYPE_QUANT      0x00010000
+#define MB_TYPE_CBP        0x00020000
+#endif
+
     AVBufferRef *mbskip_table_buf;
     uint8_t *mbskip_table;
 
@@ -167,16 +195,17 @@
     int ref_count[2][2];        ///< number of entries in ref_poc              (FIXME need per slice)
     int mbaff;                  ///< h264 1 -> MBAFF frame 0-> not MBAFF
     int field_picture;          ///< whether or not the picture was encoded in separate fields
-    int sync;                   ///< has been decoded after a keyframe
 
-    int mb_var_sum;             ///< sum of MB variance for current frame
-    int mc_mb_var_sum;          ///< motion compensated MB variance for current frame
+    int64_t mb_var_sum;         ///< sum of MB variance for current frame
+    int64_t mc_mb_var_sum;      ///< motion compensated MB variance for current frame
 
     int b_frame_score;
     int needs_realloc;          ///< Picture needs to be reallocated (eg due to a frame size change)
 
     int reference;
     int shared;
+    int recovered;              ///< Picture at IDR or recovery point + recovery count
+    int invalid_gap;
 
     int crop;
     int crop_left;
@@ -223,8 +252,8 @@
     int stride;
     int uvstride;
     /* temp variables for picture complexity calculation */
-    int mc_mb_var_sum_temp;
-    int mb_var_sum_temp;
+    int64_t mc_mb_var_sum_temp;
+    int64_t mb_var_sum_temp;
     int scene_change_score;
 /*    cmp, chroma_cmp;*/
     op_pixels_func (*hpel_put)[4];
@@ -396,6 +425,7 @@
     H264ChromaContext h264chroma;
     HpelDSPContext hdsp;
     VideoDSPContext vdsp;
+    H263DSPContext h263dsp;
     int f_code;                 ///< forward MV resolution
     int b_code;                 ///< backward MV resolution for B Frames (mpeg4)
     int16_t (*p_mv_table_base)[2];
@@ -540,7 +570,6 @@
     /* H.263 specific */
     int gob_index;
     int obmc;                       ///< overlapped block motion compensation
-    int showed_packed_warning;      ///< flag for having shown the warning about divxs invalid b frames
     int mb_info;                    ///< interval for outputting info about mb offsets as side data
     int prev_mb_info, last_mb_info;
     uint8_t *mb_info_ptr;
@@ -557,7 +586,8 @@
     int custom_pcf;
 
     /* mpeg4 specific */
-    int time_increment_bits;        ///< number of bits to represent the fractional part of time
+    ///< number of bits to represent the fractional part of time (encoder only)
+    int time_increment_bits;
     int last_time_base;
     int time_base;                  ///< time in seconds of last I,P,S Frame
     int64_t time;                   ///< time of current frame
@@ -566,61 +596,30 @@
     uint16_t pb_time;               ///< time distance between the last b and p,s,i frame
     uint16_t pp_field_time;
     uint16_t pb_field_time;         ///< like above, just for interlaced
-    int shape;
-    int vol_sprite_usage;
-    int sprite_width;
-    int sprite_height;
-    int sprite_left;
-    int sprite_top;
-    int sprite_brightness_change;
-    int num_sprite_warping_points;
     int real_sprite_warping_points;
-    uint16_t sprite_traj[4][2];      ///< sprite trajectory points
     int sprite_offset[2][2];         ///< sprite offset[isChroma][isMVY]
     int sprite_delta[2][2];          ///< sprite_delta [isY][isMVY]
-    int sprite_shift[2];             ///< sprite shift [isChroma]
     int mcsel;
     int quant_precision;
     int quarter_sample;              ///< 1->qpel, 0->half pel ME/MC
-    int scalability;
-    int hierachy_type;
-    int enhancement_type;
-    int new_pred;
-    int reduced_res_vop;
     int aspect_ratio_info; //FIXME remove
     int sprite_warping_accuracy;
-    int low_latency_sprite;
     int data_partitioning;           ///< data partitioning flag from header
     int partitioned_frame;           ///< is current frame partitioned
-    int rvlc;                        ///< reversible vlc
-    int resync_marker;               ///< could this stream contain resync markers
     int low_delay;                   ///< no reordering needed / has no b-frames
     int vo_type;
     int vol_control_parameters;      ///< does the stream contain the low_delay flag, used to workaround buggy encoders
-    int intra_dc_threshold;          ///< QP above whch the ac VLC should be used for intra dc
-    int use_intra_dc_vlc;
     PutBitContext tex_pb;            ///< used for data partitioned VOPs
     PutBitContext pb2;               ///< used for data partitioned VOPs
     int mpeg_quant;
-    int t_frame;                       ///< time distance of first I -> B, used for interlaced b frames
     int padding_bug_score;             ///< used to detect the VERY common padding bug in MPEG4
-    int cplx_estimation_trash_i;
-    int cplx_estimation_trash_p;
-    int cplx_estimation_trash_b;
 
     /* divx specific, used to workaround (many) bugs in divx5 */
-    int divx_version;
-    int divx_build;
     int divx_packed;
     uint8_t *bitstream_buffer; //Divx 5.01 puts several frames in a single one, this is used to reorder them
     int bitstream_buffer_size;
     unsigned int allocated_bitstream_buffer_size;
 
-    int xvid_build;
-
-    /* lavc specific stuff, used to workaround bugs in libavcodec */
-    int lavc_build;
-
     /* RV10 specific */
     int rv10_version; ///< RV10 version: 0 or 3
     int rv10_first_dc_coded[3];
@@ -628,8 +627,6 @@
 
     /* MJPEG specific */
     struct MJpegContext *mjpeg_ctx;
-    int mjpeg_vsample[3];       ///< vertical sampling factors, default = {2, 1, 1}
-    int mjpeg_hsample[3];       ///< horizontal sampling factors, default = {2, 1, 1}
     int esc_pos;
 
     /* MSMPEG4 specific */
@@ -656,7 +653,6 @@
     /* Mpeg1 specific */
     int gop_picture_number;  ///< index of the first picture of a GOP based on fake_pic_num & mpeg1 specific
     int last_mv_dir;         ///< last mv_dir, used for b frame encoding
-    int broken_link;         ///< no_output_of_prior_pics_flag
     uint8_t *vbv_delay_ptr;  ///< pointer to vbv_delay in the bitstream
 
     /* MPEG-2-specific - I wished not to have to support this mess. */
@@ -687,7 +683,6 @@
     int progressive_frame;
     int full_pel[2];
     int interlaced_dct;
-    int first_slice;
     int first_field;         ///< is 1 for the first field of a field picture 0 otherwise
     int drop_frame_timecode; ///< timecode is in drop frame format.
     int scan_offset;         ///< reserve space for SVCD scan offset user data.
@@ -700,6 +695,7 @@
 
     uint8_t *ptr_lastgob;
     int swap_uv;             //vcr2 codec is an MPEG-2 variant with U and V swapped
+    int pack_pblocks;        //xvmc needs to keep blocks without gaps.
     int16_t (*pblocks[12])[64];
 
     int16_t (*block)[64]; ///< points to one of the following blocks
@@ -745,6 +741,11 @@
     int context_reinit;
 
     ERContext er;
+
+    int error_rate;
+
+    /* temporary frames used by b_frame_strategy = 2 */
+    AVFrame *tmp_frames[MAX_B_FRAMES + 2];
 } MpegEncContext;
 
 #define REBASE_PICTURE(pic, new_ctx, old_ctx)             \
@@ -770,7 +771,9 @@
                                                                       FF_MPV_OFFSET(luma_elim_threshold), AV_OPT_TYPE_INT, { .i64 = 0 }, INT_MIN, INT_MAX, FF_MPV_OPT_FLAGS },\
 { "chroma_elim_threshold", "single coefficient elimination threshold for chrominance (negative values also consider dc coefficient)",\
                                                                       FF_MPV_OFFSET(chroma_elim_threshold), AV_OPT_TYPE_INT, { .i64 = 0 }, INT_MIN, INT_MAX, FF_MPV_OPT_FLAGS },\
-{ "quantizer_noise_shaping", NULL,                                  FF_MPV_OFFSET(quantizer_noise_shaping), AV_OPT_TYPE_INT, { .i64 = 0 },       0, INT_MAX, FF_MPV_OPT_FLAGS },
+{ "quantizer_noise_shaping", NULL,                                  FF_MPV_OFFSET(quantizer_noise_shaping), AV_OPT_TYPE_INT, { .i64 = 0 },       0, INT_MAX, FF_MPV_OPT_FLAGS },\
+{ "error_rate", "Simulate errors in the bitstream to test error concealment.",                                                                                                  \
+                                                                    FF_MPV_OFFSET(error_rate),              AV_OPT_TYPE_INT, { .i64 = 0 },       0, INT_MAX, FF_MPV_OPT_FLAGS },
 
 extern const AVOption ff_mpv_generic_options[];
 
@@ -791,7 +794,6 @@
 
 void ff_MPV_decode_defaults(MpegEncContext *s);
 int ff_MPV_common_init(MpegEncContext *s);
-int ff_mpv_frame_size_alloc(MpegEncContext *s, int linesize);
 int ff_MPV_common_frame_size_change(MpegEncContext *s);
 void ff_MPV_common_end(MpegEncContext *s);
 void ff_MPV_decode_mb(MpegEncContext *s, int16_t block[12][64]);
@@ -800,18 +802,16 @@
 int ff_MPV_encode_init(AVCodecContext *avctx);
 int ff_MPV_encode_end(AVCodecContext *avctx);
 int ff_MPV_encode_picture(AVCodecContext *avctx, AVPacket *pkt,
-                          AVFrame *frame, int *got_packet);
+                          const AVFrame *frame, int *got_packet);
 void ff_dct_encode_init_x86(MpegEncContext *s);
 void ff_MPV_common_init_x86(MpegEncContext *s);
 void ff_MPV_common_init_axp(MpegEncContext *s);
 void ff_MPV_common_init_arm(MpegEncContext *s);
-void ff_MPV_common_init_bfin(MpegEncContext *s);
 void ff_MPV_common_init_ppc(MpegEncContext *s);
 void ff_clean_intra_table_entries(MpegEncContext *s);
-void ff_draw_horiz_band(AVCodecContext *avctx, DSPContext *dsp, Picture *cur,
-                        Picture *last, int y, int h, int picture_structure,
-                        int first_field, int draw_edges, int low_delay,
-                        int v_edge_pos, int h_edge_pos);
+void ff_draw_horiz_band(AVCodecContext *avctx, Picture *cur, Picture *last,
+                        int y, int h, int picture_structure, int first_field,
+                        int low_delay);
 void ff_mpeg_draw_horiz_band(MpegEncContext *s, int y, int h);
 void ff_mpeg_flush(AVCodecContext *avctx);
 
@@ -823,7 +823,6 @@
 int ff_mpv_export_qp_table(MpegEncContext *s, AVFrame *f, Picture *p, int qp_type);
 
 void ff_write_quant_matrix(PutBitContext *pb, uint16_t *matrix);
-void ff_release_unused_pictures(MpegEncContext *s, int remove_current);
 int ff_find_unused_picture(MpegEncContext *s, int shared);
 void ff_denoise_dct(MpegEncContext *s, int16_t *block);
 int ff_update_duplicate_context(MpegEncContext *dst, MpegEncContext *src);
@@ -924,7 +923,6 @@
 
 extern const uint8_t ff_aic_dc_scale_table[32];
 extern const uint8_t ff_h263_chroma_qscale_table[32];
-extern const uint8_t ff_h263_loop_filter_strength[32];
 
 /* rv10.c */
 void ff_rv10_encode_picture_header(MpegEncContext *s, int picture_number);
@@ -956,6 +954,7 @@
 
 int ff_mpeg_ref_picture(MpegEncContext *s, Picture *dst, Picture *src);
 void ff_mpeg_unref_picture(MpegEncContext *s, Picture *picture);
+void ff_free_picture_tables(Picture *pic);
 
 
 #endif /* AVCODEC_MPEGVIDEO_H */

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/mpegvideo_enc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/mpegvideo_enc.c Changed

@@ -27,11 +27,14 @@
  * The simplest mpeg encoder (well, it was the simplest!).
  */
 
+#include <stdint.h>
+
 #include "libavutil/internal.h"
 #include "libavutil/intmath.h"
 #include "libavutil/mathematics.h"
 #include "libavutil/pixdesc.h"
 #include "libavutil/opt.h"
+#include "libavutil/timer.h"
 #include "avcodec.h"
 #include "dct.h"
 #include "dsputil.h"
@@ -215,12 +218,17 @@
     }
     s->me.mv_penalty = default_mv_penalty;
     s->fcode_tab     = default_fcode_tab;
+
+    s->input_picture_number  = 0;
+    s->picture_in_gop_number = 0;
 }
 
 av_cold int ff_dct_encode_init(MpegEncContext *s) {
     if (ARCH_X86)
         ff_dct_encode_init_x86(s);
 
+    if (CONFIG_H263_ENCODER)
+        ff_h263dsp_init(&s->h263dsp);
     if (!s->dct_quantize)
         s->dct_quantize = ff_dct_quantize_c;
     if (!s->denoise_dct)
@@ -236,8 +244,7 @@
 av_cold int ff_MPV_encode_init(AVCodecContext *avctx)
 {
     MpegEncContext *s = avctx->priv_data;
-    int i;
-    int chroma_h_shift, chroma_v_shift;
+    int i, ret;
 
     MPV_encode_defaults(s);
 
@@ -250,21 +257,6 @@
             return -1;
         }
         break;
-    case AV_CODEC_ID_LJPEG:
-        if (avctx->pix_fmt != AV_PIX_FMT_YUVJ420P &&
-            avctx->pix_fmt != AV_PIX_FMT_YUVJ422P &&
-            avctx->pix_fmt != AV_PIX_FMT_YUVJ444P &&
-            avctx->pix_fmt != AV_PIX_FMT_BGR0     &&
-            avctx->pix_fmt != AV_PIX_FMT_BGRA     &&
-            avctx->pix_fmt != AV_PIX_FMT_BGR24    &&
-            ((avctx->pix_fmt != AV_PIX_FMT_YUV420P &&
-              avctx->pix_fmt != AV_PIX_FMT_YUV422P &&
-              avctx->pix_fmt != AV_PIX_FMT_YUV444P) ||
-             avctx->strict_std_compliance > FF_COMPLIANCE_UNOFFICIAL)) {
-            av_log(avctx, AV_LOG_ERROR, "colorspace not supported in LJPEG\n");
-            return -1;
-        }
-        break;
     case AV_CODEC_ID_MJPEG:
     case AV_CODEC_ID_AMV:
         if (avctx->pix_fmt != AV_PIX_FMT_YUVJ420P &&
@@ -315,6 +307,11 @@
     s->avctx        = avctx;
     s->flags        = avctx->flags;
     s->flags2       = avctx->flags2;
+    if (avctx->max_b_frames > MAX_B_FRAMES) {
+        av_log(avctx, AV_LOG_ERROR, "Too many B-frames requested, maximum "
+               "is %d.\n", MAX_B_FRAMES);
+        avctx->max_b_frames = MAX_B_FRAMES;
+    }
     s->max_b_frames = avctx->max_b_frames;
     s->codec_id     = avctx->codec->id;
     s->strict_std_compliance = avctx->strict_std_compliance;
@@ -412,7 +409,7 @@
         avctx->bit_rate * av_q2d(avctx->time_base) >
             avctx->bit_rate_tolerance) {
         av_log(avctx, AV_LOG_ERROR,
-               "bitrate tolerance too small for bitrate\n");
+               "bitrate tolerance %d too small for bitrate %d\n", avctx->bit_rate_tolerance, avctx->bit_rate);
         return -1;
     }
 
@@ -452,6 +449,11 @@
         av_log(avctx, AV_LOG_ERROR, "b frames not supported by codec\n");
         return -1;
     }
+    if (s->max_b_frames < 0) {
+        av_log(avctx, AV_LOG_ERROR,
+               "max b frames must be 0 or positive for mpegvideo based encoders\n");
+        return -1;
+    }
 
     if ((s->codec_id == AV_CODEC_ID_MPEG4 ||
          s->codec_id == AV_CODEC_ID_H263  ||
@@ -641,8 +643,6 @@
 
     av_log(avctx, AV_LOG_DEBUG, "intra_quant_bias = %d inter_quant_bias = %d\n",s->intra_quant_bias,s->inter_quant_bias);
 
-    avcodec_get_chroma_sub_sample(avctx->pix_fmt, &chroma_h_shift, &chroma_v_shift);
-
     if (avctx->codec_id == AV_CODEC_ID_MPEG4 &&
         s->avctx->time_base.den > (1 << 16) - 1) {
         av_log(avctx, AV_LOG_ERROR,
@@ -666,30 +666,11 @@
         avctx->delay  = s->low_delay ? 0 : (s->max_b_frames + 1);
         s->rtp_mode   = 1;
         break;
-    case AV_CODEC_ID_LJPEG:
     case AV_CODEC_ID_MJPEG:
     case AV_CODEC_ID_AMV:
         s->out_format = FMT_MJPEG;
         s->intra_only = 1; /* force intra only for jpeg */
-        if (avctx->codec->id == AV_CODEC_ID_LJPEG &&
-            (avctx->pix_fmt == AV_PIX_FMT_BGR0
-             || s->avctx->pix_fmt == AV_PIX_FMT_BGRA
-             || s->avctx->pix_fmt == AV_PIX_FMT_BGR24)) {
-            s->mjpeg_vsample[0] = s->mjpeg_hsample[0] =
-            s->mjpeg_vsample[1] = s->mjpeg_hsample[1] =
-            s->mjpeg_vsample[2] = s->mjpeg_hsample[2] = 1;
-        } else if (avctx->pix_fmt == AV_PIX_FMT_YUV444P || avctx->pix_fmt == AV_PIX_FMT_YUVJ444P) {
-            s->mjpeg_vsample[0] = s->mjpeg_vsample[1] = s->mjpeg_vsample[2] = 2;
-            s->mjpeg_hsample[0] = s->mjpeg_hsample[1] = s->mjpeg_hsample[2] = 1;
-        } else {
-            s->mjpeg_vsample[0] = 2;
-            s->mjpeg_vsample[1] = 2 >> chroma_v_shift;
-            s->mjpeg_vsample[2] = 2 >> chroma_v_shift;
-            s->mjpeg_hsample[0] = 2;
-            s->mjpeg_hsample[1] = 2 >> chroma_h_shift;
-            s->mjpeg_hsample[2] = 2 >> chroma_h_shift;
-        }
-        if (!(CONFIG_MJPEG_ENCODER || CONFIG_LJPEG_ENCODER) ||
+        if (!CONFIG_MJPEG_ENCODER ||
             ff_mjpeg_encode_init(s) < 0)
             return -1;
         avctx->delay = 0;
@@ -821,6 +802,31 @@
     if (ff_MPV_common_init(s) < 0)
         return -1;
 
+    s->avctx->coded_frame = &s->current_picture.f;
+
+    if (s->msmpeg4_version) {
+        FF_ALLOCZ_OR_GOTO(s->avctx, s->ac_stats,
+                          2 * 2 * (MAX_LEVEL + 1) *
+                          (MAX_RUN + 1) * 2 * sizeof(int), fail);
+    }
+    FF_ALLOCZ_OR_GOTO(s->avctx, s->avctx->stats_out, 256, fail);
+
+    FF_ALLOCZ_OR_GOTO(s->avctx, s->q_intra_matrix,   64 * 32 * sizeof(int), fail);
+    FF_ALLOCZ_OR_GOTO(s->avctx, s->q_chroma_intra_matrix, 64 * 32 * sizeof(int), fail);
+    FF_ALLOCZ_OR_GOTO(s->avctx, s->q_inter_matrix,   64 * 32 * sizeof(int), fail);
+    FF_ALLOCZ_OR_GOTO(s->avctx, s->q_intra_matrix16, 64 * 32 * 2 * sizeof(uint16_t), fail);
+    FF_ALLOCZ_OR_GOTO(s->avctx, s->q_chroma_intra_matrix16, 64 * 32 * 2 * sizeof(uint16_t), fail);
+    FF_ALLOCZ_OR_GOTO(s->avctx, s->q_inter_matrix16, 64 * 32 * 2 * sizeof(uint16_t), fail);
+    FF_ALLOCZ_OR_GOTO(s->avctx, s->input_picture,
+                      MAX_PICTURE_COUNT * sizeof(Picture *), fail);
+    FF_ALLOCZ_OR_GOTO(s->avctx, s->reordered_input_picture,
+                      MAX_PICTURE_COUNT * sizeof(Picture *), fail);
+
+    if (s->avctx->noise_reduction) {
+        FF_ALLOCZ_OR_GOTO(s->avctx, s->dct_offset,
+                          2 * 64 * sizeof(uint16_t), fail);
+    }
+
     ff_dct_encode_init(s);
 
     if ((CONFIG_H263P_ENCODER || CONFIG_RV20_ENCODER) && s->modified_quant)
@@ -876,22 +882,70 @@
     if (ff_rate_control_init(s) < 0)
         return -1;
 
+#if FF_API_ERROR_RATE
+    FF_DISABLE_DEPRECATION_WARNINGS
+    if (avctx->error_rate)
+        s->error_rate = avctx->error_rate;
+    FF_ENABLE_DEPRECATION_WARNINGS;
+#endif
+
+    if (avctx->b_frame_strategy == 2) {
+        for (i = 0; i < s->max_b_frames + 2; i++) {
+            s->tmp_frames[i] = av_frame_alloc();
+            if (!s->tmp_frames[i])
+                return AVERROR(ENOMEM);
+
+            s->tmp_frames[i]->format = AV_PIX_FMT_YUV420P;
+            s->tmp_frames[i]->width  = s->width  >> avctx->brd_scale;
+            s->tmp_frames[i]->height = s->height >> avctx->brd_scale;
+
+            ret = av_frame_get_buffer(s->tmp_frames[i], 32);
+            if (ret < 0)
+                return ret;
+        }
+    }
+
     return 0;
+fail:
+    ff_MPV_encode_end(avctx);
+    return AVERROR_UNKNOWN;
 }
 
 av_cold int ff_MPV_encode_end(AVCodecContext *avctx)
 {
     MpegEncContext *s = avctx->priv_data;
+    int i;
 
     ff_rate_control_uninit(s);
 
     ff_MPV_common_end(s);
-    if ((CONFIG_MJPEG_ENCODER || CONFIG_LJPEG_ENCODER) &&
+    if (CONFIG_MJPEG_ENCODER &&
         s->out_format == FMT_MJPEG)
         ff_mjpeg_encode_close(s);
 
     av_freep(&avctx->extradata);
 
+    for (i = 0; i < FF_ARRAY_ELEMS(s->tmp_frames); i++)
+        av_frame_free(&s->tmp_frames[i]);
+
+    ff_free_picture_tables(&s->new_picture);
+    ff_mpeg_unref_picture(s, &s->new_picture);
+
+    av_freep(&s->avctx->stats_out);
+    av_freep(&s->ac_stats);
+
+    if(s->q_chroma_intra_matrix   != s->q_intra_matrix  ) av_freep(&s->q_chroma_intra_matrix);
+    if(s->q_chroma_intra_matrix16 != s->q_intra_matrix16) av_freep(&s->q_chroma_intra_matrix16);
+    s->q_chroma_intra_matrix=   NULL;
+    s->q_chroma_intra_matrix16= NULL;
+    av_freep(&s->q_intra_matrix);
+    av_freep(&s->q_inter_matrix);
+    av_freep(&s->q_intra_matrix16);
+    av_freep(&s->q_inter_matrix16);
+    av_freep(&s->input_picture);
+    av_freep(&s->reordered_input_picture);
+    av_freep(&s->dct_offset);
+
     return 0;
 }
 
@@ -983,6 +1037,12 @@
             direct = 0;
         if (pic_arg->linesize[2] != s->uvlinesize)
             direct = 0;
+        if ((s->width & 15) || (s->height & 15))
+            direct = 0;
+        if (((intptr_t)(pic_arg->data[0])) & (STRIDE_ALIGN-1))
+            direct = 0;
+        if (s->linesize & (STRIDE_ALIGN-1))
+            direct = 0;
 
         av_dlog(s->avctx, "%d %d %td %td\n", pic_arg->linesize[0],
                 pic_arg->linesize[1], s->linesize, s->uvlinesize);
@@ -1093,19 +1153,23 @@
                 uint8_t *rptr = ref->f.data[plane] + 8 * (x + y * stride);
                 int v   = s->dsp.frame_skip_cmp[1](s, dptr, rptr, stride, 8);
 
-                switch (s->avctx->frame_skip_exp) {
+                switch (FFABS(s->avctx->frame_skip_exp)) {
                 case 0: score    =  FFMAX(score, v);          break;
                 case 1: score   += FFABS(v);                  break;
-                case 2: score   += v * v;                     break;
-                case 3: score64 += FFABS(v * v * (int64_t)v); break;
-                case 4: score64 += v * v * (int64_t)(v * v);  break;
+                case 2: score64 += v * (int64_t)v;                       break;
+                case 3: score64 += FFABS(v * (int64_t)v * v);            break;
+                case 4: score64 += (v * (int64_t)v) * (v * (int64_t)v);  break;
                 }
             }
         }
     }
+    emms_c();
 
     if (score)
         score64 = score;
+    if (s->avctx->frame_skip_exp < 0)
+        score64 = pow(score64 / (double)(s->mb_width * s->mb_height),
+                      -1.0/s->avctx->frame_skip_exp);
 
     if (score64 < s->avctx->frame_skip_threshold)
         return 1;
@@ -1133,7 +1197,6 @@
 {
     AVCodec *codec    = avcodec_find_encoder(s->avctx->codec_id);
     AVCodecContext *c = avcodec_alloc_context3(NULL);
-    AVFrame input[FF_MAX_B_FRAMES + 2];
     const int scale = s->avctx->brd_scale;
     int i, j, out_size, p_lambda, b_lambda, lambda2;
     int64_t best_rd  = INT64_MAX;
@@ -1154,7 +1217,7 @@
     c->width        = s->width  >> scale;
     c->height       = s->height >> scale;
     c->flags        = CODEC_FLAG_QSCALE | CODEC_FLAG_PSNR |
-                      CODEC_FLAG_INPUT_PRESERVED /*| CODEC_FLAG_EMU_EDGE*/;
+                      CODEC_FLAG_INPUT_PRESERVED;
     c->flags       |= s->avctx->flags & CODEC_FLAG_QPEL;
     c->mb_decision  = s->avctx->mb_decision;
     c->me_cmp       = s->avctx->me_cmp;
@@ -1168,19 +1231,9 @@
         return -1;
 
     for (i = 0; i < s->max_b_frames + 2; i++) {
-        int ysize = c->width * c->height;
-        int csize = (c->width / 2) * (c->height / 2);
         Picture pre_input, *pre_input_ptr = i ? s->input_picture[i - 1] :
                                                 s->next_picture_ptr;
 
-        avcodec_get_frame_defaults(&input[i]);
-        input[i].data[0]     = av_malloc(ysize + 2 * csize);
-        input[i].data[1]     = input[i].data[0] + ysize;
-        input[i].data[2]     = input[i].data[1] + csize;
-        input[i].linesize[0] = c->width;
-        input[i].linesize[1] =
-        input[i].linesize[2] = c->width / 2;
-
         if (pre_input_ptr && (!i || s->input_picture[i - 1])) {
             pre_input = *pre_input_ptr;
 
@@ -1190,13 +1243,13 @@
                 pre_input.f.data[2] += INPLACE_OFFSET;
             }
 
-            s->dsp.shrink[scale](input[i].data[0], input[i].linesize[0],
+            s->dsp.shrink[scale](s->tmp_frames[i]->data[0], s->tmp_frames[i]->linesize[0],
                                  pre_input.f.data[0], pre_input.f.linesize[0],
                                  c->width,      c->height);
-            s->dsp.shrink[scale](input[i].data[1], input[i].linesize[1],
+            s->dsp.shrink[scale](s->tmp_frames[i]->data[1], s->tmp_frames[i]->linesize[1],
                                  pre_input.f.data[1], pre_input.f.linesize[1],
                                  c->width >> 1, c->height >> 1);
-            s->dsp.shrink[scale](input[i].data[2], input[i].linesize[2],
+            s->dsp.shrink[scale](s->tmp_frames[i]->data[2], s->tmp_frames[i]->linesize[2],
                                  pre_input.f.data[2], pre_input.f.linesize[2],
                                  c->width >> 1, c->height >> 1);
         }
@@ -1210,21 +1263,21 @@
 
         c->error[0] = c->error[1] = c->error[2] = 0;
 
-        input[0].pict_type = AV_PICTURE_TYPE_I;
-        input[0].quality   = 1 * FF_QP2LAMBDA;
+        s->tmp_frames[0]->pict_type = AV_PICTURE_TYPE_I;
+        s->tmp_frames[0]->quality   = 1 * FF_QP2LAMBDA;
 
-        out_size = encode_frame(c, &input[0]);
+        out_size = encode_frame(c, s->tmp_frames[0]);
 
         //rd += (out_size * lambda2) >> FF_LAMBDA_SHIFT;
 
         for (i = 0; i < s->max_b_frames + 1; i++) {
             int is_p = i % (j + 1) == j || i == s->max_b_frames;
 
-            input[i + 1].pict_type = is_p ?
+            s->tmp_frames[i + 1]->pict_type = is_p ?
                                      AV_PICTURE_TYPE_P : AV_PICTURE_TYPE_B;
-            input[i + 1].quality   = is_p ? p_lambda : b_lambda;
+            s->tmp_frames[i + 1]->quality   = is_p ? p_lambda : b_lambda;
 
-            out_size = encode_frame(c, &input[i + 1]);
+            out_size = encode_frame(c, s->tmp_frames[i + 1]);
 
             rd += (out_size * lambda2) >> (FF_LAMBDA_SHIFT - 3);
         }
@@ -1246,10 +1299,6 @@
     avcodec_close(c);
     av_freep(&c);
 
-    for (i = 0; i < s->max_b_frames + 2; i++) {
-        av_freep(&input[i].data[0]);
-    }
-
     return best_b_count;
 }
 
@@ -1263,6 +1312,19 @@
 
     /* set next picture type & ordering */
     if (s->reordered_input_picture[0] == NULL && s->input_picture[0]) {
+        if (s->avctx->frame_skip_threshold || s->avctx->frame_skip_factor) {
+            if (s->picture_in_gop_number < s->gop_size &&
+                s->next_picture_ptr &&
+                skip_check(s, s->input_picture[0], s->next_picture_ptr)) {
+                // FIXME check that te gop check above is +-1 correct
+                av_frame_unref(&s->input_picture[0]->f);
+
+                ff_vbv_update(s, 0);
+
+                goto no_output_pic;
+            }
+        }
+
         if (/*s->picture_in_gop_number >= s->gop_size ||*/
             s->next_picture_ptr == NULL || s->intra_only) {
             s->reordered_input_picture[0] = s->input_picture[0];
@@ -1272,19 +1334,6 @@
         } else {
             int b_frames;
 
-            if (s->avctx->frame_skip_threshold || s->avctx->frame_skip_factor) {
-                if (s->picture_in_gop_number < s->gop_size &&
-                    skip_check(s, s->input_picture[0], s->next_picture_ptr)) {
-                    // FIXME check that te gop check above is +-1 correct
-                    av_frame_unref(&s->input_picture[0]->f);
-
-                    emms_c();
-                    ff_vbv_update(s, 0);
-
-                    goto no_output_pic;
-                }
-            }
-
             if (s->flags & CODEC_FLAG_PASS2) {
                 for (i = 0; i < s->max_b_frames + 1; i++) {
                     int pict_num = s->input_picture[0]->f.display_picture_number + i;
@@ -1431,8 +1480,134 @@
     return 0;
 }
 
+static void frame_end(MpegEncContext *s)
+{
+    if (s->unrestricted_mv &&
+        s->current_picture.reference &&
+        !s->intra_only) {
+        const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(s->avctx->pix_fmt);
+        int hshift = desc->log2_chroma_w;
+        int vshift = desc->log2_chroma_h;
+        s->dsp.draw_edges(s->current_picture.f.data[0], s->current_picture.f.linesize[0],
+                          s->h_edge_pos, s->v_edge_pos,
+                          EDGE_WIDTH, EDGE_WIDTH,
+                          EDGE_TOP | EDGE_BOTTOM);
+        s->dsp.draw_edges(s->current_picture.f.data[1], s->current_picture.f.linesize[1],
+                          s->h_edge_pos >> hshift, s->v_edge_pos >> vshift,
+                          EDGE_WIDTH >> hshift, EDGE_WIDTH >> vshift,
+                          EDGE_TOP | EDGE_BOTTOM);
+        s->dsp.draw_edges(s->current_picture.f.data[2], s->current_picture.f.linesize[2],
+                          s->h_edge_pos >> hshift, s->v_edge_pos >> vshift,
+                          EDGE_WIDTH >> hshift, EDGE_WIDTH >> vshift,
+                          EDGE_TOP | EDGE_BOTTOM);
+    }
+
+    emms_c();
+
+    s->last_pict_type                 = s->pict_type;
+    s->last_lambda_for [s->pict_type] = s->current_picture_ptr->f.quality;
+    if (s->pict_type!= AV_PICTURE_TYPE_B)
+        s->last_non_b_pict_type = s->pict_type;
+
+    s->avctx->coded_frame = &s->current_picture_ptr->f;
+
+}
+
+static void update_noise_reduction(MpegEncContext *s)
+{
+    int intra, i;
+
+    for (intra = 0; intra < 2; intra++) {
+        if (s->dct_count[intra] > (1 << 16)) {
+            for (i = 0; i < 64; i++) {
+                s->dct_error_sum[intra][i] >>= 1;
+            }
+            s->dct_count[intra] >>= 1;
+        }
+
+        for (i = 0; i < 64; i++) {
+            s->dct_offset[intra][i] = (s->avctx->noise_reduction *
+                                       s->dct_count[intra] +
+                                       s->dct_error_sum[intra][i] / 2) /
+                                      (s->dct_error_sum[intra][i] + 1);
+        }
+    }
+}
+
+static int frame_start(MpegEncContext *s)
+{
+    int ret;
+
+    /* mark & release old frames */
+    if (s->pict_type != AV_PICTURE_TYPE_B && s->last_picture_ptr &&
+        s->last_picture_ptr != s->next_picture_ptr &&
+        s->last_picture_ptr->f.buf[0]) {
+        ff_mpeg_unref_picture(s, s->last_picture_ptr);
+    }
+
+    s->current_picture_ptr->f.pict_type = s->pict_type;
+    s->current_picture_ptr->f.key_frame = s->pict_type == AV_PICTURE_TYPE_I;
+
+    ff_mpeg_unref_picture(s, &s->current_picture);
+    if ((ret = ff_mpeg_ref_picture(s, &s->current_picture,
+                                   s->current_picture_ptr)) < 0)
+        return ret;
+
+    if (s->pict_type != AV_PICTURE_TYPE_B) {
+        s->last_picture_ptr = s->next_picture_ptr;
+        if (!s->droppable)
+            s->next_picture_ptr = s->current_picture_ptr;
+    }
+
+    if (s->last_picture_ptr) {
+        ff_mpeg_unref_picture(s, &s->last_picture);
+        if (s->last_picture_ptr->f.buf[0] &&
+            (ret = ff_mpeg_ref_picture(s, &s->last_picture,
+                                       s->last_picture_ptr)) < 0)
+            return ret;
+    }
+    if (s->next_picture_ptr) {
+        ff_mpeg_unref_picture(s, &s->next_picture);
+        if (s->next_picture_ptr->f.buf[0] &&
+            (ret = ff_mpeg_ref_picture(s, &s->next_picture,
+                                       s->next_picture_ptr)) < 0)
+            return ret;
+    }
+
+    if (s->picture_structure!= PICT_FRAME) {
+        int i;
+        for (i = 0; i < 4; i++) {
+            if (s->picture_structure == PICT_BOTTOM_FIELD) {
+                s->current_picture.f.data[i] +=
+                    s->current_picture.f.linesize[i];
+            }
+            s->current_picture.f.linesize[i] *= 2;
+            s->last_picture.f.linesize[i]    *= 2;
+            s->next_picture.f.linesize[i]    *= 2;
+        }
+    }
+
+    if (s->mpeg_quant || s->codec_id == AV_CODEC_ID_MPEG2VIDEO) {
+        s->dct_unquantize_intra = s->dct_unquantize_mpeg2_intra;
+        s->dct_unquantize_inter = s->dct_unquantize_mpeg2_inter;
+    } else if (s->out_format == FMT_H263 || s->out_format == FMT_H261) {
+        s->dct_unquantize_intra = s->dct_unquantize_h263_intra;
+        s->dct_unquantize_inter = s->dct_unquantize_h263_inter;
+    } else {
+        s->dct_unquantize_intra = s->dct_unquantize_mpeg1_intra;
+        s->dct_unquantize_inter = s->dct_unquantize_mpeg1_inter;
+    }
+
+    if (s->dct_error_sum) {
+        av_assert2(s->avctx->noise_reduction && s->encoding);
+        update_noise_reduction(s);
+    }
+
+    return 0;
+}
+
 int ff_MPV_encode_picture(AVCodecContext *avctx, AVPacket *pkt,
-                          AVFrame *pic_arg, int *got_packet)
+                          const AVFrame *pic_arg, int *got_packet)
 {
     MpegEncContext *s = avctx->priv_data;
     int i, stuffing_count, ret;
@@ -1470,8 +1645,9 @@
 
         s->pict_type = s->new_picture.f.pict_type;
         //emms_c();
-        if (ff_MPV_frame_start(s, avctx) < 0)
-            return -1;
+        ret = frame_start(s);
+        if (ret < 0)
+            return ret;
 vbv_retry:
         if (encode_picture(s, s->picture_number) < 0)
             return -1;
@@ -1486,10 +1662,10 @@
         avctx->p_count     = s->mb_num - s->i_count - s->skip_count;
         avctx->skip_count  = s->skip_count;
 
-        ff_MPV_frame_end(s);
+        frame_end(s);
 
         if (CONFIG_MJPEG_ENCODER && s->out_format == FMT_MJPEG)
-            ff_mjpeg_encode_picture_trailer(s);
+            ff_mjpeg_encode_picture_trailer(&s->pb, s->header_bits);
 
         if (avctx->rc_buffer_size) {
             RateControlContext *rcc = &s->rc_context;
@@ -1507,7 +1683,7 @@
                                   s->lambda_table[i] * (s->qscale + 1) /
                                   s->qscale);
                 }
-                s->mb_skipped = 0;        // done in MPV_frame_start()
+                s->mb_skipped = 0;        // done in frame_start()
                 // done in encode_picture() so we must undo it
                 if (s->pict_type == AV_PICTURE_TYPE_P) {
                     if (s->flipflop_rounding          ||
@@ -1815,19 +1991,25 @@
     ptr_cr = s->new_picture.f.data[2] +
              (mb_y * mb_block_height * wrap_c) + mb_x * mb_block_width;
 
-    if((mb_x*16+16 > s->width || mb_y*16+16 > s->height) && s->codec_id != AV_CODEC_ID_AMV){
+    if((mb_x * 16 + 16 > s->width || mb_y * 16 + 16 > s->height) && s->codec_id != AV_CODEC_ID_AMV){
         uint8_t *ebuf = s->edge_emu_buffer + 32;
         int cw = (s->width  + s->chroma_x_shift) >> s->chroma_x_shift;
         int ch = (s->height + s->chroma_y_shift) >> s->chroma_y_shift;
-        s->vdsp.emulated_edge_mc(ebuf, wrap_y, ptr_y, wrap_y, 16, 16, mb_x * 16,
-                                 mb_y * 16, s->width, s->height);
+        s->vdsp.emulated_edge_mc(ebuf, ptr_y,
+                                 wrap_y, wrap_y,
+                                 16, 16, mb_x * 16, mb_y * 16,
+                                 s->width, s->height);
         ptr_y = ebuf;
-        s->vdsp.emulated_edge_mc(ebuf + 18 * wrap_y, wrap_c, ptr_cb, wrap_c, mb_block_width,
-                                 mb_block_height, mb_x * mb_block_width, mb_y * mb_block_height,
+        s->vdsp.emulated_edge_mc(ebuf + 18 * wrap_y, ptr_cb,
+                                 wrap_c, wrap_c,
+                                 mb_block_width, mb_block_height,
+                                 mb_x * mb_block_width, mb_y * mb_block_height,
                                  cw, ch);
         ptr_cb = ebuf + 18 * wrap_y;
-        s->vdsp.emulated_edge_mc(ebuf + 18 * wrap_y + 16, wrap_c, ptr_cr, wrap_c, mb_block_width,
-                                 mb_block_height, mb_x * mb_block_width, mb_y * mb_block_height,
+        s->vdsp.emulated_edge_mc(ebuf + 18 * wrap_y + 16, ptr_cr,
+                                 wrap_c, wrap_c,
+                                 mb_block_width, mb_block_height,
+                                 mb_x * mb_block_width, mb_y * mb_block_height,
                                  cw, ch);
         ptr_cr = ebuf + 18 * wrap_y + 16;
     }
@@ -2567,6 +2749,7 @@
                 if(is_gob_start){
                     if(s->start_mb_y != mb_y || mb_x!=0){
                         write_slice_end(s);
+
                         if(CONFIG_MPEG4_ENCODER && s->codec_id==AV_CODEC_ID_MPEG4 && s->partitioned_frame){
                             ff_mpeg4_init_partitions(s);
                         }
@@ -2575,9 +2758,9 @@
                     av_assert2((put_bits_count(&s->pb)&7) == 0);
                     current_packet_size= put_bits_ptr(&s->pb) - s->ptr_lastgob;
 
-                    if(s->avctx->error_rate && s->resync_mb_x + s->resync_mb_y > 0){
+                    if (s->error_rate && s->resync_mb_x + s->resync_mb_y > 0) {
                         int r= put_bits_count(&s->pb)/8 + s->picture_number + 16 + s->mb_x + s->mb_y;
-                        int d= 100 / s->avctx->error_rate;
+                        int d = 100 / s->error_rate;
                         if(r % d == 0){
                             current_packet_size=0;
                             s->pb.buf_ptr= s->ptr_lastgob;
@@ -3209,7 +3392,7 @@
         update_qscale(s);
     }
 
-    if(s->codec_id != AV_CODEC_ID_AMV){
+    if(s->codec_id != AV_CODEC_ID_AMV && s->codec_id != AV_CODEC_ID_MJPEG){
         if(s->q_chroma_intra_matrix   != s->q_intra_matrix  ) av_freep(&s->q_chroma_intra_matrix);
         if(s->q_chroma_intra_matrix16 != s->q_intra_matrix16) av_freep(&s->q_chroma_intra_matrix16);
         s->q_chroma_intra_matrix   = s->q_intra_matrix;
@@ -3260,7 +3443,7 @@
             s->mb_type[i]= CANDIDATE_MB_TYPE_INTRA;
         if(s->msmpeg4_version >= 3)
             s->no_rounding=1;
-        av_dlog(s, "Scene change detected, encoding as I Frame %d %d\n",
+        av_dlog(s, "Scene change detected, encoding as I Frame %"PRId64" %"PRId64"\n",
                 s->current_picture.mb_var_sum, s->current_picture.mc_mb_var_sum);
     }
 
@@ -3325,17 +3508,31 @@
         s->qscale= 3; //reduce clipping problems
 
     if (s->out_format == FMT_MJPEG) {
+        const uint16_t *  luma_matrix = ff_mpeg1_default_intra_matrix;
+        const uint16_t *chroma_matrix = ff_mpeg1_default_intra_matrix;
+
+        if (s->avctx->intra_matrix) {
+            chroma_matrix =
+            luma_matrix = s->avctx->intra_matrix;
+        }
+        if (s->avctx->chroma_intra_matrix)
+            chroma_matrix = s->avctx->chroma_intra_matrix;
+
         /* for mjpeg, we do include qscale in the matrix */
         for(i=1;i<64;i++){
             int j= s->dsp.idct_permutation[i];
 
-            s->intra_matrix[j] = av_clip_uint8((ff_mpeg1_default_intra_matrix[i] * s->qscale) >> 3);
+            s->chroma_intra_matrix[j] = av_clip_uint8((chroma_matrix[i] * s->qscale) >> 3);
+            s->       intra_matrix[j] = av_clip_uint8((  luma_matrix[i] * s->qscale) >> 3);
         }
         s->y_dc_scale_table=
         s->c_dc_scale_table= ff_mpeg2_dc_scale_table[s->intra_dc_precision];
+        s->chroma_intra_matrix[0] =
         s->intra_matrix[0] = ff_mpeg2_dc_scale_table[s->intra_dc_precision][8];
         ff_convert_matrix(&s->dsp, s->q_intra_matrix, s->q_intra_matrix16,
                        s->intra_matrix, s->intra_quant_bias, 8, 8, 1);
+        ff_convert_matrix(&s->dsp, s->q_chroma_intra_matrix, s->q_chroma_intra_matrix16,
+                       s->chroma_intra_matrix, s->intra_quant_bias, 8, 8, 1);
         s->qscale= 8;
     }
     if(s->codec_id == AV_CODEC_ID_AMV){
@@ -3372,7 +3569,8 @@
     switch(s->out_format) {
     case FMT_MJPEG:
         if (CONFIG_MJPEG_ENCODER)
-            ff_mjpeg_encode_picture_header(s);
+            ff_mjpeg_encode_picture_header(s->avctx, &s->pb, &s->intra_scantable,
+                                           s->intra_matrix, s->chroma_intra_matrix);
         break;
     case FMT_H261:
         if (CONFIG_H261_ENCODER)
@@ -3572,7 +3770,7 @@
 
             av_assert2(level);
 
-            if(s->out_format == FMT_H263){
+            if(s->out_format == FMT_H263 || s->out_format == FMT_H261){
                 unquant_coeff= alevel*qmul + qadd;
             }else{ //MPEG1
                 j= s->dsp.idct_permutation[ scantable[i] ]; //FIXME optimize
@@ -3601,7 +3799,7 @@
                     }
                 }
 
-                if(s->out_format == FMT_H263){
+                if(s->out_format == FMT_H263 || s->out_format == FMT_H261){
                     for(j=survivor_count-1; j>=0; j--){
                         int run= i - survivor[j];
                         int score= distortion + last_length[UNI_AC_ENC_INDEX(run, level)]*lambda;
@@ -3627,7 +3825,7 @@
                     }
                 }
 
-                if(s->out_format == FMT_H263){
+                if(s->out_format == FMT_H263 || s->out_format == FMT_H261){
                   for(j=survivor_count-1; j>=0; j--){
                         int run= i - survivor[j];
                         int score= distortion + score_tab[i-run];
@@ -3660,7 +3858,7 @@
         survivor[ survivor_count++ ]= i+1;
     }
 
-    if(s->out_format != FMT_H263){
+    if(s->out_format != FMT_H263 && s->out_format != FMT_H261){
         last_score= 256*256*256*120;
         for(i= survivor[0]; i<=last_non_zero + 1; i++){
             int score= score_tab[i];
@@ -3693,7 +3891,7 @@
             int alevel= FFABS(level);
             int unquant_coeff, score, distortion;
 
-            if(s->out_format == FMT_H263){
+            if(s->out_format == FMT_H263 || s->out_format == FMT_H261){
                     unquant_coeff= (alevel*qmul + qadd)>>3;
             }else{ //MPEG1
                     unquant_coeff = (((  alevel  << 1) + 1) * qscale * ((int) s->inter_matrix[0])) >> 4;

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/mpegvideo_motion.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/mpegvideo_motion.c Changed

@@ -60,15 +60,15 @@
 
     ptr = ref_picture[0] + src_y * linesize + src_x;
 
-        if ((unsigned)src_x >= FFMAX(s->h_edge_pos - 17, 0) ||
-            (unsigned)src_y >= FFMAX(s->v_edge_pos - 17, 0)) {
-            s->vdsp.emulated_edge_mc(s->edge_emu_buffer, linesize, ptr,
-                                     linesize,
-                                     17, 17,
-                                     src_x, src_y,
-                                     s->h_edge_pos, s->v_edge_pos);
-            ptr = s->edge_emu_buffer;
-        }
+    if ((unsigned)src_x >= FFMAX(s->h_edge_pos - 17, 0) ||
+        (unsigned)src_y >= FFMAX(s->v_edge_pos - 17, 0)) {
+        s->vdsp.emulated_edge_mc(s->edge_emu_buffer, ptr,
+                                 linesize, linesize,
+                                 17, 17,
+                                 src_x, src_y,
+                                 s->h_edge_pos, s->v_edge_pos);
+        ptr = s->edge_emu_buffer;
+    }
 
     if ((motion_x | motion_y) & 7) {
         s->dsp.gmc1(dest_y, ptr, linesize, 16,
@@ -104,23 +104,23 @@
 
     offset = (src_y * uvlinesize) + src_x;
     ptr    = ref_picture[1] + offset;
-        if ((unsigned)src_x >= FFMAX((s->h_edge_pos >> 1) - 9, 0) ||
-            (unsigned)src_y >= FFMAX((s->v_edge_pos >> 1) - 9, 0)) {
-            s->vdsp.emulated_edge_mc(s->edge_emu_buffer, uvlinesize,
-                                     ptr, uvlinesize,
-                                     9, 9,
-                                     src_x, src_y,
-                                     s->h_edge_pos >> 1, s->v_edge_pos >> 1);
-            ptr = s->edge_emu_buffer;
-            emu = 1;
-        }
+    if ((unsigned)src_x >= FFMAX((s->h_edge_pos >> 1) - 9, 0) ||
+        (unsigned)src_y >= FFMAX((s->v_edge_pos >> 1) - 9, 0)) {
+        s->vdsp.emulated_edge_mc(s->edge_emu_buffer, ptr,
+                                 uvlinesize, uvlinesize,
+                                 9, 9,
+                                 src_x, src_y,
+                                 s->h_edge_pos >> 1, s->v_edge_pos >> 1);
+        ptr = s->edge_emu_buffer;
+        emu = 1;
+    }
     s->dsp.gmc1(dest_cb, ptr, uvlinesize, 8,
                 motion_x & 15, motion_y & 15, 128 - s->no_rounding);
 
     ptr = ref_picture[2] + offset;
     if (emu) {
-        s->vdsp.emulated_edge_mc(s->edge_emu_buffer, uvlinesize,
-                                 ptr, uvlinesize,
+        s->vdsp.emulated_edge_mc(s->edge_emu_buffer, ptr,
+                                 uvlinesize, uvlinesize,
                                  9, 9,
                                  src_x, src_y,
                                  s->h_edge_pos >> 1, s->v_edge_pos >> 1);
@@ -209,18 +209,16 @@
         dxy |= (motion_y & 1) << 1;
     src += src_y * s->linesize + src_x;
 
-    if (s->unrestricted_mv && (s->flags & CODEC_FLAG_EMU_EDGE)) {
         if ((unsigned)src_x > FFMAX(s->h_edge_pos - (motion_x & 1) - 8, 0) ||
             (unsigned)src_y > FFMAX(s->v_edge_pos - (motion_y & 1) - 8, 0)) {
-            s->vdsp.emulated_edge_mc(s->edge_emu_buffer, s->linesize, src,
-                                     s->linesize,
+            s->vdsp.emulated_edge_mc(s->edge_emu_buffer, src,
+                                     s->linesize, s->linesize,
                                      9, 9,
                                      src_x, src_y,
                                      s->h_edge_pos, s->v_edge_pos);
             src = s->edge_emu_buffer;
             emu = 1;
         }
-    }
     pix_op[dxy](dest, src, s->linesize, 8);
     return emu;
 }
@@ -317,21 +315,21 @@
                    src_y);
             return;
         }
-        s->vdsp.emulated_edge_mc(s->edge_emu_buffer, s->linesize, ptr_y,
-                                 s->linesize,
+        s->vdsp.emulated_edge_mc(s->edge_emu_buffer, ptr_y,
+                                 s->linesize, s->linesize,
                                  17, 17 + field_based,
                                  src_x, src_y << field_based,
                                  s->h_edge_pos, s->v_edge_pos);
         ptr_y = s->edge_emu_buffer;
         if (!CONFIG_GRAY || !(s->flags & CODEC_FLAG_GRAY)) {
             uint8_t *uvbuf = s->edge_emu_buffer + 18 * s->linesize;
-            s->vdsp.emulated_edge_mc(uvbuf, s->uvlinesize, ptr_cb,
-                                     s->uvlinesize,
+            s->vdsp.emulated_edge_mc(uvbuf, ptr_cb,
+                                     s->uvlinesize, s->uvlinesize,
                                      9, 9 + field_based,
                                      uvsrc_x, uvsrc_y << field_based,
                                      s->h_edge_pos >> 1, s->v_edge_pos >> 1);
-            s->vdsp.emulated_edge_mc(uvbuf + 16, s->uvlinesize, ptr_cr,
-                                     s->uvlinesize,
+            s->vdsp.emulated_edge_mc(uvbuf + 16, ptr_cr,
+                                     s->uvlinesize, s->uvlinesize,
                                      9, 9 + field_based,
                                      uvsrc_x, uvsrc_y << field_based,
                                      s->h_edge_pos >> 1, s->v_edge_pos >> 1);
@@ -538,24 +536,21 @@
 
     if ((unsigned)src_x > FFMAX(s->h_edge_pos - (motion_x & 3) - 16, 0) ||
         (unsigned)src_y > FFMAX(   v_edge_pos - (motion_y & 3) - h, 0)) {
-        s->vdsp.emulated_edge_mc(s->edge_emu_buffer,
-                                 s->linesize,
-                                 ptr_y, s->linesize,
+        s->vdsp.emulated_edge_mc(s->edge_emu_buffer, ptr_y,
+                                 s->linesize, s->linesize,
                                  17, 17 + field_based,
                                  src_x, src_y << field_based,
                                  s->h_edge_pos, s->v_edge_pos);
         ptr_y = s->edge_emu_buffer;
         if (!CONFIG_GRAY || !(s->flags & CODEC_FLAG_GRAY)) {
             uint8_t *uvbuf = s->edge_emu_buffer + 18 * s->linesize;
-            s->vdsp.emulated_edge_mc(uvbuf, s->uvlinesize,
-                                     ptr_cb,
-                                     s->uvlinesize,
+            s->vdsp.emulated_edge_mc(uvbuf, ptr_cb,
+                                     s->uvlinesize, s->uvlinesize,
                                      9, 9 + field_based,
                                      uvsrc_x, uvsrc_y << field_based,
                                      s->h_edge_pos >> 1, s->v_edge_pos >> 1);
-            s->vdsp.emulated_edge_mc(uvbuf + 16, s->uvlinesize,
-                                     ptr_cr,
-                                     s->uvlinesize,
+            s->vdsp.emulated_edge_mc(uvbuf + 16, ptr_cr,
+                                     s->uvlinesize, s->uvlinesize,
                                      9, 9 + field_based,
                                      uvsrc_x, uvsrc_y << field_based,
                                      s->h_edge_pos >> 1, s->v_edge_pos >> 1);
@@ -622,23 +617,21 @@
 
     offset = src_y * s->uvlinesize + src_x;
     ptr    = ref_picture[1] + offset;
-    if (s->flags & CODEC_FLAG_EMU_EDGE) {
-        if ((unsigned)src_x > FFMAX((s->h_edge_pos >> 1) - (dxy & 1) - 8, 0) ||
-            (unsigned)src_y > FFMAX((s->v_edge_pos >> 1) - (dxy >> 1) - 8, 0)) {
-            s->vdsp.emulated_edge_mc(s->edge_emu_buffer, s->uvlinesize,
-                                     ptr, s->uvlinesize,
-                                     9, 9, src_x, src_y,
-                                     s->h_edge_pos >> 1, s->v_edge_pos >> 1);
-            ptr = s->edge_emu_buffer;
-            emu = 1;
-        }
+    if ((unsigned)src_x > FFMAX((s->h_edge_pos >> 1) - (dxy & 1) - 8, 0) ||
+        (unsigned)src_y > FFMAX((s->v_edge_pos >> 1) - (dxy >> 1) - 8, 0)) {
+        s->vdsp.emulated_edge_mc(s->edge_emu_buffer, ptr,
+                                 s->uvlinesize, s->uvlinesize,
+                                 9, 9, src_x, src_y,
+                                 s->h_edge_pos >> 1, s->v_edge_pos >> 1);
+        ptr = s->edge_emu_buffer;
+        emu = 1;
     }
     pix_op[dxy](dest_cb, ptr, s->uvlinesize, 8);
 
     ptr = ref_picture[2] + offset;
     if (emu) {
-        s->vdsp.emulated_edge_mc(s->edge_emu_buffer, s->uvlinesize,
-                                 ptr, s->uvlinesize,
+        s->vdsp.emulated_edge_mc(s->edge_emu_buffer, ptr,
+                                 s->uvlinesize, s->uvlinesize,
                                  9, 9, src_x, src_y,
                                  s->h_edge_pos >> 1, s->v_edge_pos >> 1);
         ptr = s->edge_emu_buffer;
@@ -782,18 +775,15 @@
                 dxy &= ~12;
 
             ptr = ref_picture[0] + (src_y * s->linesize) + (src_x);
-            if (s->flags & CODEC_FLAG_EMU_EDGE) {
-                if ((unsigned)src_x > FFMAX(s->h_edge_pos - (motion_x & 3) - 8, 0) ||
-                    (unsigned)src_y > FFMAX(s->v_edge_pos - (motion_y & 3) - 8, 0)) {
-                    s->vdsp.emulated_edge_mc(s->edge_emu_buffer,
-                                             s->linesize, ptr,
-                                             s->linesize,
-                                             9, 9,
-                                             src_x, src_y,
-                                             s->h_edge_pos,
-                                             s->v_edge_pos);
-                    ptr = s->edge_emu_buffer;
-                }
+            if ((unsigned)src_x > FFMAX(s->h_edge_pos - (motion_x & 3) - 8, 0) ||
+                (unsigned)src_y > FFMAX(s->v_edge_pos - (motion_y & 3) - 8, 0)) {
+                s->vdsp.emulated_edge_mc(s->edge_emu_buffer, ptr,
+                                         s->linesize, s->linesize,
+                                         9, 9,
+                                         src_x, src_y,
+                                         s->h_edge_pos,
+                                         s->v_edge_pos);
+                ptr = s->edge_emu_buffer;
             }
             dest = dest_y + ((i & 1) * 8) + (i >> 1) * 8 * s->linesize;
             qpix_op[1][dxy](dest, ptr, s->linesize);

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/mpegvideo_parser.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/mpegvideo_parser.c Changed

@@ -66,7 +66,7 @@
                 pc->width  = (buf[0] << 4) | (buf[1] >> 4);
                 pc->height = ((buf[1] & 0x0f) << 8) | buf[2];
                 if(!avctx->width || !avctx->height || !avctx->coded_width || !avctx->coded_height){
-                    avcodec_set_dimensions(avctx, pc->width, pc->height);
+                    ff_set_dimensions(avctx, pc->width, pc->height);
                     did_set_size=1;
                 }
                 frame_rate_index = buf[3] & 0xf;
@@ -94,7 +94,7 @@
                         pc->height |=( vert_size_ext << 12);
                         bit_rate = (bit_rate&0x3FFFF) | (bit_rate_ext << 18);
                         if(did_set_size)
-                            avcodec_set_dimensions(avctx, pc->width, pc->height);
+                            ff_set_dimensions(avctx, pc->width, pc->height);
                         avctx->time_base.den = pc->frame_rate.den * (frame_rate_ext_n + 1) * 2;
                         avctx->time_base.num = pc->frame_rate.num * (frame_rate_ext_d + 1);
                         avctx->codec_id = AV_CODEC_ID_MPEG2VIDEO;

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/mpegvideo_xvmc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/mpegvideo_xvmc.c Changed

@@ -30,6 +30,7 @@
 
 #include "xvmc.h"
 #include "xvmc_internal.h"
+#include "version.h"
 
 /**
  * Initialize the block field of the MpegEncContext pointer passed as
@@ -46,6 +47,15 @@
     s->block = (int16_t (*)[64])(render->data_blocks + render->next_free_data_block_num * 64);
 }
 
+static void exchange_uv(MpegEncContext *s)
+{
+    int16_t (*tmp)[64];
+
+    tmp           = s->pblocks[4];
+    s->pblocks[4] = s->pblocks[5];
+    s->pblocks[5] = tmp;
+}
+
 /**
  * Fill individual block pointers, so there are no gaps in the data_block array
  * in case not all blocks in the macroblock are coded.
@@ -63,6 +73,9 @@
             s->pblocks[i] = NULL;
         cbp += cbp;
     }
+    if (s->swap_uv) {
+        exchange_uv(s);
+    }
 }
 
 /**
@@ -70,8 +83,9 @@
  * This function should be called for every new field and/or frame.
  * It should be safe to call the function a few times for the same field.
  */
-int ff_xvmc_field_start(MpegEncContext *s, AVCodecContext *avctx)
+static int ff_xvmc_field_start(AVCodecContext *avctx, const uint8_t *buf, uint32_t buf_size)
 {
+    struct MpegEncContext *s = avctx->priv_data;
     struct xvmc_pix_fmt *last, *next, *render = (struct xvmc_pix_fmt*)s->current_picture.f.data[2];
     const int mb_block_count = 4 + (1 << s->chroma_format);
 
@@ -138,20 +152,22 @@
  * some leftover blocks, for example from error_resilience(), may remain.
  * It should be safe to call the function a few times for the same field.
  */
-void ff_xvmc_field_end(MpegEncContext *s)
+static int ff_xvmc_field_end(AVCodecContext *avctx)
 {
+    struct MpegEncContext *s = avctx->priv_data;
     struct xvmc_pix_fmt *render = (struct xvmc_pix_fmt*)s->current_picture.f.data[2];
     assert(render);
 
     if (render->filled_mv_blocks_num > 0)
         ff_mpeg_draw_horiz_band(s, 0, 0);
+    return 0;
 }
 
 /**
  * Synthesize the data needed by XvMC to render one macroblock of data.
  * Fill all relevant fields, if necessary do IDCT.
  */
-void ff_xvmc_decode_mb(MpegEncContext *s)
+static void ff_xvmc_decode_mb(struct MpegEncContext *s)
 {
     XvMCMacroBlock *mv_block;
     struct xvmc_pix_fmt *render;
@@ -310,7 +326,7 @@
                  * slowdown. */
             }
             // copy blocks only if the codec doesn't support pblocks reordering
-            if (s->avctx->xvmc_acceleration == 1) {
+            if (!s->pack_pblocks) {
                 memcpy(&render->data_blocks[render->next_free_data_block_num*64],
                        s->pblocks[i], sizeof(*s->pblocks[i]));
             }
@@ -329,3 +345,31 @@
     if (render->filled_mv_blocks_num == render->allocated_mv_blocks)
         ff_mpeg_draw_horiz_band(s, 0, 0);
 }
+
+#if CONFIG_MPEG1_XVMC_HWACCEL
+AVHWAccel ff_mpeg1_xvmc_hwaccel = {
+    .name           = "mpeg1_xvmc",
+    .type           = AVMEDIA_TYPE_VIDEO,
+    .id             = AV_CODEC_ID_MPEG1VIDEO,
+    .pix_fmt        = AV_PIX_FMT_XVMC,
+    .start_frame    = ff_xvmc_field_start,
+    .end_frame      = ff_xvmc_field_end,
+    .decode_slice   = NULL,
+    .decode_mb      = ff_xvmc_decode_mb,
+    .priv_data_size = 0,
+};
+#endif
+
+#if CONFIG_MPEG2_XVMC_HWACCEL
+AVHWAccel ff_mpeg2_xvmc_hwaccel = {
+    .name           = "mpeg2_xvmc",
+    .type           = AVMEDIA_TYPE_VIDEO,
+    .id             = AV_CODEC_ID_MPEG2VIDEO,
+    .pix_fmt        = AV_PIX_FMT_XVMC,
+    .start_frame    = ff_xvmc_field_start,
+    .end_frame      = ff_xvmc_field_end,
+    .decode_slice   = NULL,
+    .decode_mb      = ff_xvmc_decode_mb,
+    .priv_data_size = 0,
+};
+#endif

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/msgsmdec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/msgsmdec.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/msgsmdec.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/msgsmdec.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/msmpeg4.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/msmpeg4.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/msmpeg4dec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/msmpeg4dec.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/msrle.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/msrle.c Changed

@@ -35,10 +35,11 @@
 #include "avcodec.h"
 #include "internal.h"
 #include "msrledec.h"
+#include "libavutil/imgutils.h"
 
 typedef struct MsrleContext {
     AVCodecContext *avctx;
-    AVFrame frame;
+    AVFrame *frame;
 
     GetByteContext gb;
     const unsigned char *buf;
@@ -70,7 +71,9 @@
         return AVERROR_INVALIDDATA;
     }
 
-    avcodec_get_frame_defaults(&s->frame);
+    s->frame = av_frame_alloc();
+    if (!s->frame)
+        return AVERROR(ENOMEM);
 
     if (avctx->extradata_size >= 4)
         for (i = 0; i < FFMIN(avctx->extradata_size, AVPALETTE_SIZE)/4; i++)
@@ -92,24 +95,24 @@
     s->buf = buf;
     s->size = buf_size;
 
-    if ((ret = ff_reget_buffer(avctx, &s->frame)) < 0)
+    if ((ret = ff_reget_buffer(avctx, s->frame)) < 0)
         return ret;
 
     if (avctx->bits_per_coded_sample > 1 && avctx->bits_per_coded_sample <= 8) {
         const uint8_t *pal = av_packet_get_side_data(avpkt, AV_PKT_DATA_PALETTE, NULL);
 
         if (pal) {
-            s->frame.palette_has_changed = 1;
+            s->frame->palette_has_changed = 1;
             memcpy(s->pal, pal, AVPALETTE_SIZE);
         }
         /* make the palette available */
-        memcpy(s->frame.data[1], s->pal, AVPALETTE_SIZE);
+        memcpy(s->frame->data[1], s->pal, AVPALETTE_SIZE);
     }
 
     /* FIXME how to correctly detect RLE ??? */
     if (avctx->height * istride == avpkt->size) { /* assume uncompressed */
-        int linesize = (avctx->width * avctx->bits_per_coded_sample + 7) / 8;
-        uint8_t *ptr = s->frame.data[0];
+        int linesize = av_image_get_linesize(avctx->pix_fmt, avctx->width, 0);
+        uint8_t *ptr = s->frame->data[0];
         uint8_t *buf = avpkt->data + (avctx->height-1)*istride;
         int i, j;
 
@@ -125,14 +128,14 @@
                 memcpy(ptr, buf, linesize);
             }
             buf -= istride;
-            ptr += s->frame.linesize[0];
+            ptr += s->frame->linesize[0];
         }
     } else {
         bytestream2_init(&s->gb, buf, buf_size);
-        ff_msrle_decode(avctx, (AVPicture*)&s->frame, avctx->bits_per_coded_sample, &s->gb);
+        ff_msrle_decode(avctx, (AVPicture*)s->frame, avctx->bits_per_coded_sample, &s->gb);
     }
 
-    if ((ret = av_frame_ref(data, &s->frame)) < 0)
+    if ((ret = av_frame_ref(data, s->frame)) < 0)
         return ret;
 
     *got_frame      = 1;
@@ -146,7 +149,7 @@
     MsrleContext *s = avctx->priv_data;
 
     /* release the last frame */
-    av_frame_unref(&s->frame);
+    av_frame_free(&s->frame);
 
     return 0;
 }

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/mss1.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/mss1.c Changed

@@ -30,7 +30,7 @@
 
 typedef struct MSS1Context {
     MSS12Context   ctx;
-    AVFrame        pic;
+    AVFrame       *pic;
     SliceContext   sc;
 } MSS1Context;
 
@@ -60,7 +60,7 @@
     }
 }
 
-ARITH_GET_BIT()
+ARITH_GET_BIT(arith)
 
 static int arith_get_bits(ArithCoder *c, int bits)
 {
@@ -105,7 +105,7 @@
     return sym;
 }
 
-ARITH_GET_MODEL_SYM()
+ARITH_GET_MODEL_SYM(arith)
 
 static void arith_init(ArithCoder *c, GetBitContext *gb)
 {
@@ -139,8 +139,6 @@
 static int mss1_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
                              AVPacket *avpkt)
 {
-    const uint8_t *buf = avpkt->data;
-    int buf_size = avpkt->size;
     MSS1Context *ctx = avctx->priv_data;
     MSS12Context *c = &ctx->ctx;
     GetBitContext gb;
@@ -148,41 +146,43 @@
     int pal_changed = 0;
     int ret;
 
-    init_get_bits(&gb, buf, buf_size * 8);
+    if ((ret = init_get_bits8(&gb, avpkt->data, avpkt->size)) < 0)
+        return ret;
+
     arith_init(&acoder, &gb);
 
-    if ((ret = ff_reget_buffer(avctx, &ctx->pic)) < 0)
+    if ((ret = ff_reget_buffer(avctx, ctx->pic)) < 0)
         return ret;
 
-    c->pal_pic    =  ctx->pic.data[0] + ctx->pic.linesize[0] * (avctx->height - 1);
-    c->pal_stride = -ctx->pic.linesize[0];
+    c->pal_pic    =  ctx->pic->data[0] + ctx->pic->linesize[0] * (avctx->height - 1);
+    c->pal_stride = -ctx->pic->linesize[0];
     c->keyframe   = !arith_get_bit(&acoder);
     if (c->keyframe) {
         c->corrupted = 0;
         ff_mss12_slicecontext_reset(&ctx->sc);
         pal_changed        = decode_pal(c, &acoder);
-        ctx->pic.key_frame = 1;
-        ctx->pic.pict_type = AV_PICTURE_TYPE_I;
+        ctx->pic->key_frame = 1;
+        ctx->pic->pict_type = AV_PICTURE_TYPE_I;
     } else {
         if (c->corrupted)
             return AVERROR_INVALIDDATA;
-        ctx->pic.key_frame = 0;
-        ctx->pic.pict_type = AV_PICTURE_TYPE_P;
+        ctx->pic->key_frame = 0;
+        ctx->pic->pict_type = AV_PICTURE_TYPE_P;
     }
     c->corrupted = ff_mss12_decode_rect(&ctx->sc, &acoder, 0, 0,
                                         avctx->width, avctx->height);
     if (c->corrupted)
         return AVERROR_INVALIDDATA;
-    memcpy(ctx->pic.data[1], c->pal, AVPALETTE_SIZE);
-    ctx->pic.palette_has_changed = pal_changed;
+    memcpy(ctx->pic->data[1], c->pal, AVPALETTE_SIZE);
+    ctx->pic->palette_has_changed = pal_changed;
 
-    if ((ret = av_frame_ref(data, &ctx->pic)) < 0)
+    if ((ret = av_frame_ref(data, ctx->pic)) < 0)
         return ret;
 
     *got_frame      = 1;
 
     /* always report that the buffer was completely consumed */
-    return buf_size;
+    return avpkt->size;
 }
 
 static av_cold int mss1_decode_init(AVCodecContext *avctx)
@@ -192,7 +192,9 @@
 
     c->ctx.avctx       = avctx;
 
-    avcodec_get_frame_defaults(&c->pic);
+    c->pic = av_frame_alloc();
+    if (!c->pic)
+        return AVERROR(ENOMEM);
 
     ret = ff_mss12_decode_init(&c->ctx, 0, &c->sc, NULL);
 
@@ -205,7 +207,7 @@
 {
     MSS1Context * const ctx = avctx->priv_data;
 
-    av_frame_unref(&ctx->pic);
+    av_frame_free(&ctx->pic);
     ff_mss12_decode_end(&ctx->ctx);
 
     return 0;

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/mss12.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/mss12.h Changed

@@ -99,8 +99,8 @@
                          SliceContext *sc1, SliceContext *sc2);
 int ff_mss12_decode_end(MSS12Context *ctx);
 
-#define ARITH_GET_BIT(VERSION)                                          \
-static int arith ## VERSION ## _get_bit(ArithCoder *c)                  \
+#define ARITH_GET_BIT(prefix)                                           \
+static int prefix ## _get_bit(ArithCoder *c)                            \
 {                                                                       \
     int range = c->high - c->low + 1;                                   \
     int bit   = 2 * c->value - c->low >= c->high;                       \
@@ -110,22 +110,22 @@
     else                                                                \
         c->high = c->low + (range >> 1) - 1;                            \
                                                                         \
-    arith ## VERSION ## _normalise(c);                                  \
+    prefix ## _normalise(c);                                            \
                                                                         \
     return bit;                                                         \
 }
 
-#define ARITH_GET_MODEL_SYM(VERSION)                                    \
-static int arith ## VERSION ## _get_model_sym(ArithCoder *c, Model *m)  \
+#define ARITH_GET_MODEL_SYM(prefix)                                     \
+static int prefix ## _get_model_sym(ArithCoder *c, Model *m)            \
 {                                                                       \
     int idx, val;                                                       \
                                                                         \
-    idx = arith ## VERSION ## _get_prob(c, m->cum_prob);                \
+    idx = prefix ## _get_prob(c, m->cum_prob);                          \
                                                                         \
     val = m->idx2sym[idx];                                              \
     ff_mss12_model_update(m, idx);                                      \
                                                                         \
-    arith ## VERSION ## _normalise(c);                                  \
+    prefix ## _normalise(c);                                            \
                                                                         \
     return val;                                                         \
 }

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/mss2.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/mss2.c Changed

@@ -54,7 +54,7 @@
     }
 }
 
-ARITH_GET_BIT(2)
+ARITH_GET_BIT(arith2)
 
 /* L. Stuiver and A. Moffat: "Piecewise Integer Mapping for Arithmetic Coding."
  * In Proc. 8th Data Compression Conference (DCC '98), pp. 3-12, Mar. 1998 */
@@ -127,7 +127,7 @@
     return i;
 }
 
-ARITH_GET_MODEL_SYM(2)
+ARITH_GET_MODEL_SYM(arith2)
 
 static int arith2_get_consumed_bytes(ArithCoder *c)
 {
@@ -377,14 +377,8 @@
 
     ff_mpeg_flush(avctx);
 
-    if (s->current_picture_ptr == NULL || s->current_picture_ptr->f.data[0]) {
-        int i = ff_find_unused_picture(s, 0);
-        if (i < 0)
-            return i;
-        s->current_picture_ptr = &s->picture[i];
-    }
-
-    init_get_bits(&s->gb, buf, buf_size * 8);
+    if ((ret = init_get_bits8(&s->gb, buf, buf_size)) < 0)
+        return ret;
 
     s->loop_filter = avctx->skip_loop_filter < AVDISCARD_ALL;
 
@@ -427,8 +421,8 @@
 
     if (v->respic == 3) {
         ctx->dsp.upsample_plane(f->data[0], f->linesize[0], w,      h);
-        ctx->dsp.upsample_plane(f->data[1], f->linesize[1], w >> 1, h >> 1);
-        ctx->dsp.upsample_plane(f->data[2], f->linesize[2], w >> 1, h >> 1);
+        ctx->dsp.upsample_plane(f->data[1], f->linesize[1], w+1 >> 1, h+1 >> 1);
+        ctx->dsp.upsample_plane(f->data[2], f->linesize[2], w+1 >> 1, h+1 >> 1);
     } else if (v->respic)
         avpriv_request_sample(v->s.avctx,
                               "Asymmetric WMV9 rectangle subsampling");
@@ -482,7 +476,8 @@
     av_assert0(FF_INPUT_BUFFER_PADDING_SIZE >=
                ARITH2_PADDING + (MIN_CACHE_BITS + 7) / 8);
 
-    init_get_bits(&gb, buf, buf_size * 8);
+    if ((ret = init_get_bits8(&gb, buf, buf_size)) < 0)
+        return ret;
 
     if (keyframe = get_bits1(&gb))
         skip_bits(&gb, 7);
@@ -640,7 +635,8 @@
                 ff_mss12_slicecontext_reset(&ctx->sc[1]);
         }
         if (is_rle) {
-            init_get_bits(&gb, buf, buf_size * 8);
+            if ((ret = init_get_bits8(&gb, buf, buf_size)) < 0)
+                return ret;
             if (ret = decode_rle(&gb, c->pal_pic, c->pal_stride,
                                  c->rgb_pic, c->rgb_stride, c->pal, keyframe,
                                  ctx->split_position, 0,
@@ -743,8 +739,6 @@
     int ret;
 
     v->s.avctx    = avctx;
-    avctx->flags |= CODEC_FLAG_EMU_EDGE;
-    v->s.flags   |= CODEC_FLAG_EMU_EDGE;
 
     if ((ret = ff_vc1_init_common(v)) < 0)
         return ret;
@@ -775,7 +769,7 @@
 
     v->overlap         = 0;
 
-    v->s.resync_marker = 0;
+    v->resync_marker   = 0;
     v->rangered        = 0;
 
     v->s.max_b_frames = avctx->max_b_frames = 0;
@@ -837,6 +831,7 @@
     avctx->pix_fmt = c->free_colours == 127 ? AV_PIX_FMT_RGB555
                                             : AV_PIX_FMT_RGB24;
 
+
     return 0;
 }

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/mss3.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/mss3.c Changed

@@ -803,15 +803,24 @@
     return buf_size;
 }
 
+static av_cold int mss3_decode_end(AVCodecContext *avctx)
+{
+    MSS3Context * const c = avctx->priv_data;
+    int i;
+
+    av_frame_free(&c->pic);
+    for (i = 0; i < 3; i++)
+        av_freep(&c->dct_coder[i].prev_dc);
+
+    return 0;
+}
+
 static av_cold int mss3_decode_init(AVCodecContext *avctx)
 {
     MSS3Context * const c = avctx->priv_data;
     int i;
 
     c->avctx = avctx;
-    c->pic = av_frame_alloc();
-    if (!c->pic)
-        return AVERROR(ENOMEM);
 
     if ((avctx->width & 0xF) || (avctx->height & 0xF)) {
         av_log(avctx, AV_LOG_ERROR,
@@ -838,6 +847,12 @@
         }
     }
 
+    c->pic = av_frame_alloc();
+    if (!c->pic) {
+        mss3_decode_end(avctx);
+        return AVERROR(ENOMEM);
+    }
+
     avctx->pix_fmt     = AV_PIX_FMT_YUV420P;
 
     init_coders(c);
@@ -845,18 +860,6 @@
     return 0;
 }
 
-static av_cold int mss3_decode_end(AVCodecContext *avctx)
-{
-    MSS3Context * const c = avctx->priv_data;
-    int i;
-
-    av_frame_free(&c->pic);
-    for (i = 0; i < 3; i++)
-        av_freep(&c->dct_coder[i].prev_dc);
-
-    return 0;
-}
-
 AVCodec ff_msa1_decoder = {
     .name           = "msa1",
     .long_name      = NULL_IF_CONFIG_SMALL("MS ATC Screen"),

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/mss4.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/mss4.c Changed

@@ -626,14 +626,23 @@
     return buf_size;
 }
 
-static av_cold int mss4_decode_init(AVCodecContext *avctx)
+static av_cold int mss4_decode_end(AVCodecContext *avctx)
 {
     MSS4Context * const c = avctx->priv_data;
     int i;
 
-    c->pic = av_frame_alloc();
-    if (!c->pic)
-        return AVERROR(ENOMEM);
+    av_frame_free(&c->pic);
+    for (i = 0; i < 3; i++)
+        av_freep(&c->prev_dc[i]);
+    mss4_free_vlcs(c);
+
+    return 0;
+}
+
+static av_cold int mss4_decode_init(AVCodecContext *avctx)
+{
+    MSS4Context * const c = avctx->priv_data;
+    int i;
 
     if (mss4_init_vlcs(c)) {
         av_log(avctx, AV_LOG_ERROR, "Cannot initialise VLCs\n");
@@ -650,21 +659,13 @@
         }
     }
 
-    avctx->pix_fmt     = AV_PIX_FMT_YUV444P;
-
-    return 0;
-}
-
-static av_cold int mss4_decode_end(AVCodecContext *avctx)
-{
-    MSS4Context * const c = avctx->priv_data;
-    int i;
-
-    av_frame_free(&c->pic);
+    c->pic = av_frame_alloc();
+    if (!c->pic) {
+        mss4_decode_end(avctx);
+        return AVERROR(ENOMEM);
+    }
 
-    for (i = 0; i < 3; i++)
-        av_freep(&c->prev_dc[i]);
-    mss4_free_vlcs(c);
+    avctx->pix_fmt     = AV_PIX_FMT_YUV444P;
 
     return 0;
 }

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/msvideo1.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/msvideo1.c Changed

@@ -47,7 +47,7 @@
 typedef struct Msvideo1Context {
 
     AVCodecContext *avctx;
-    AVFrame frame;
+    AVFrame *frame;
 
     const unsigned char *buf;
     int size;
@@ -67,12 +67,16 @@
     if (s->avctx->bits_per_coded_sample == 8) {
         s->mode_8bit = 1;
         avctx->pix_fmt = AV_PIX_FMT_PAL8;
+        if (avctx->extradata_size >= AVPALETTE_SIZE)
+            memcpy(s->pal, avctx->extradata, AVPALETTE_SIZE);
     } else {
         s->mode_8bit = 0;
         avctx->pix_fmt = AV_PIX_FMT_RGB555;
     }
 
-    avcodec_get_frame_defaults(&s->frame);
+    s->frame = av_frame_alloc();
+    if (!s->frame)
+        return AVERROR(ENOMEM);
 
     return 0;
 }
@@ -93,8 +97,8 @@
     unsigned short flags;
     int skip_blocks;
     unsigned char colors[8];
-    unsigned char *pixels = s->frame.data[0];
-    int stride = s->frame.linesize[0];
+    unsigned char *pixels = s->frame->data[0];
+    int stride = s->frame->linesize[0];
 
     stream_ptr = 0;
     skip_blocks = 0;
@@ -174,7 +178,7 @@
 
     /* make the palette available on the way out */
     if (s->avctx->pix_fmt == AV_PIX_FMT_PAL8)
-        memcpy(s->frame.data[1], s->pal, AVPALETTE_SIZE);
+        memcpy(s->frame->data[1], s->pal, AVPALETTE_SIZE);
 }
 
 static void msvideo1_decode_16bit(Msvideo1Context *s)
@@ -193,8 +197,8 @@
     unsigned short flags;
     int skip_blocks;
     unsigned short colors[8];
-    unsigned short *pixels = (unsigned short *)s->frame.data[0];
-    int stride = s->frame.linesize[0] / 2;
+    unsigned short *pixels = (unsigned short *)s->frame->data[0];
+    int stride = s->frame->linesize[0] / 2;
 
     stream_ptr = 0;
     skip_blocks = 0;
@@ -298,7 +302,7 @@
     s->buf = buf;
     s->size = buf_size;
 
-    if ((ret = ff_reget_buffer(avctx, &s->frame)) < 0)
+    if ((ret = ff_reget_buffer(avctx, s->frame)) < 0)
         return ret;
 
     if (s->mode_8bit) {
@@ -306,7 +310,7 @@
 
         if (pal) {
             memcpy(s->pal, pal, AVPALETTE_SIZE);
-            s->frame.palette_has_changed = 1;
+            s->frame->palette_has_changed = 1;
         }
     }
 
@@ -315,7 +319,7 @@
     else
         msvideo1_decode_16bit(s);
 
-    if ((ret = av_frame_ref(data, &s->frame)) < 0)
+    if ((ret = av_frame_ref(data, s->frame)) < 0)
         return ret;
 
     *got_frame      = 1;
@@ -328,7 +332,7 @@
 {
     Msvideo1Context *s = avctx->priv_data;
 
-    av_frame_unref(&s->frame);
+    av_frame_free(&s->frame);
 
     return 0;
 }

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/msvideo1enc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/msvideo1enc.c Changed

@@ -35,7 +35,6 @@
  */
 typedef struct Msvideo1EncContext {
     AVCodecContext *avctx;
-    AVFrame pic;
     AVLFG rnd;
     uint8_t *prev;
 
@@ -58,7 +57,7 @@
 };
 
 #define SKIP_PREFIX 0x8400
-#define SKIPS_MAX 0x0FFF
+#define SKIPS_MAX 0x03FF
 #define MKRGB555(in, off) ((in[off] << 10) | (in[off + 1] << 5) | (in[off + 2]))
 
 static const int remap[16] = { 0, 1, 4, 5, 2, 3, 6, 7, 8, 9, 12, 13, 10, 11, 14, 15 };
@@ -67,7 +66,7 @@
                                const AVFrame *pict, int *got_packet)
 {
     Msvideo1EncContext * const c = avctx->priv_data;
-    AVFrame * const p = &c->pic;
+    const AVFrame *p = pict;
     uint16_t *src;
     uint8_t *prevptr;
     uint8_t *dst, *buf;
@@ -75,12 +74,12 @@
     int no_skips = 1;
     int i, j, k, x, y, ret;
     int skips = 0;
+    int quality = 24;
 
     if ((ret = ff_alloc_packet2(avctx, pkt, avctx->width*avctx->height*9 + FF_MIN_BUFFER_SIZE)) < 0)
         return ret;
     dst= buf= pkt->data;
 
-    *p = *pict;
     if(!c->prev)
         c->prev = av_malloc(avctx->width * 3 * (avctx->height + 3));
     prevptr = c->prev + avctx->width * 3 * (FFALIGN(avctx->height, 4) - 1);
@@ -88,7 +87,6 @@
     if(c->keyint >= avctx->keyint_min)
         keyframe = 1;
 
-    p->quality = 24;
 
     for(y = 0; y < avctx->height; y += 4){
         for(x = 0; x < avctx->width; x += 4){
@@ -114,12 +112,12 @@
                         bestscore += t*t;
                     }
                 }
-                bestscore /= p->quality;
+                bestscore /= quality;
             }
             // try to find optimal value to fill whole 4x4 block
             score = 0;
-            ff_init_elbg(c->block, 3, 16, c->avg, 1, 1, c->output, &c->rnd);
-            ff_do_elbg  (c->block, 3, 16, c->avg, 1, 1, c->output, &c->rnd);
+            avpriv_init_elbg(c->block, 3, 16, c->avg, 1, 1, c->output, &c->rnd);
+            avpriv_do_elbg  (c->block, 3, 16, c->avg, 1, 1, c->output, &c->rnd);
             if(c->avg[0] == 1) // red component = 1 will be written as skip code
                 c->avg[0] = 0;
             for(j = 0; j < 4; j++){
@@ -130,7 +128,7 @@
                     }
                 }
             }
-            score /= p->quality;
+            score /= quality;
             score += 2;
             if(score < bestscore){
                 bestscore = score;
@@ -138,8 +136,8 @@
             }
             // search for optimal filling of 2-color block
             score = 0;
-            ff_init_elbg(c->block, 3, 16, c->codebook, 2, 1, c->output, &c->rnd);
-            ff_do_elbg  (c->block, 3, 16, c->codebook, 2, 1, c->output, &c->rnd);
+            avpriv_init_elbg(c->block, 3, 16, c->codebook, 2, 1, c->output, &c->rnd);
+            avpriv_do_elbg  (c->block, 3, 16, c->codebook, 2, 1, c->output, &c->rnd);
             // last output value should be always 1, swap codebooks if needed
             if(!c->output[15]){
                 for(i = 0; i < 3; i++)
@@ -155,7 +153,7 @@
                     }
                 }
             }
-            score /= p->quality;
+            score /= quality;
             score += 6;
             if(score < bestscore){
                 bestscore = score;
@@ -164,8 +162,8 @@
             // search for optimal filling of 2-color 2x2 subblocks
             score = 0;
             for(i = 0; i < 4; i++){
-                ff_init_elbg(c->block2 + i*4*3, 3, 4, c->codebook2 + i*2*3, 2, 1, c->output2 + i*4, &c->rnd);
-                ff_do_elbg  (c->block2 + i*4*3, 3, 4, c->codebook2 + i*2*3, 2, 1, c->output2 + i*4, &c->rnd);
+                avpriv_init_elbg(c->block2 + i*4*3, 3, 4, c->codebook2 + i*2*3, 2, 1, c->output2 + i*4, &c->rnd);
+                avpriv_do_elbg  (c->block2 + i*4*3, 3, 4, c->codebook2 + i*2*3, 2, 1, c->output2 + i*4, &c->rnd);
             }
             // last value should be always 1, swap codebooks if needed
             if(!c->output2[15]){
@@ -182,7 +180,7 @@
                     }
                 }
             }
-            score /= p->quality;
+            score /= quality;
             score += 18;
             if(score < bestscore){
                 bestscore = score;
@@ -248,8 +246,6 @@
         c->keyint = 0;
     else
         c->keyint++;
-    p->pict_type= keyframe ? AV_PICTURE_TYPE_I : AV_PICTURE_TYPE_P;
-    p->key_frame= keyframe;
     if (keyframe) pkt->flags |= AV_PKT_FLAG_KEY;
     pkt->size = dst - buf;
     *got_packet = 1;
@@ -274,8 +270,6 @@
         return -1;
     }
 
-    avcodec_get_frame_defaults(&c->pic);
-    avctx->coded_frame = (AVFrame*)&c->pic;
     avctx->bits_per_coded_sample = 16;
 
     c->keyint = avctx->keyint_min;

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/mvcdec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/mvcdec.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/mxpegdec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/mxpegdec.c Changed

@@ -31,7 +31,7 @@
 
 typedef struct MXpegDecodeContext {
     MJpegDecodeContext jpg;
-    AVFrame picture[2]; /* pictures array */
+    AVFrame *picture[2]; /* pictures array */
     int picture_index; /* index of current picture */
     int got_sof_data; /* true if SOF data successfully parsed */
     int got_mxm_bitmask; /* true if MXM bitmask available */
@@ -42,11 +42,37 @@
     unsigned mb_width, mb_height; /* size of picture in MB's from MXM header */
 } MXpegDecodeContext;
 
+static av_cold int mxpeg_decode_end(AVCodecContext *avctx)
+{
+    MXpegDecodeContext *s = avctx->priv_data;
+    MJpegDecodeContext *jpg = &s->jpg;
+    int i;
+
+    jpg->picture_ptr = NULL;
+    ff_mjpeg_decode_end(avctx);
+
+    for (i = 0; i < 2; ++i)
+        av_frame_free(&s->picture[i]);
+
+    s->bitmask_size = 0;
+    av_freep(&s->mxm_bitmask);
+    av_freep(&s->completion_bitmask);
+
+    return 0;
+}
+
 static av_cold int mxpeg_decode_init(AVCodecContext *avctx)
 {
     MXpegDecodeContext *s = avctx->priv_data;
 
-    s->jpg.picture_ptr      = &s->picture[0];
+    s->picture[0] = av_frame_alloc();
+    s->picture[1] = av_frame_alloc();
+    if (!s->picture[0] || !s->picture[1]) {
+        mxpeg_decode_end(avctx);
+        return AVERROR(ENOMEM);
+    }
+
+    s->jpg.picture_ptr      = s->picture[0];
     return ff_mjpeg_decode_init(avctx);
 }
 
@@ -260,7 +286,7 @@
                 }
 
                 if (s->got_mxm_bitmask) {
-                    AVFrame *reference_ptr = &s->picture[s->picture_index ^ 1];
+                    AVFrame *reference_ptr = s->picture[s->picture_index ^ 1];
                     if (mxpeg_check_dimensions(s, jpg, reference_ptr) < 0)
                         break;
 
@@ -270,11 +296,11 @@
                                              AV_GET_BUFFER_FLAG_REF)) < 0)
                         return ret;
 
-                    ret = ff_mjpeg_decode_sos(jpg, s->mxm_bitmask, reference_ptr);
+                    ret = ff_mjpeg_decode_sos(jpg, s->mxm_bitmask, s->bitmask_size, reference_ptr);
                     if (ret < 0 && (avctx->err_recognition & AV_EF_EXPLODE))
                         return ret;
                 } else {
-                    ret = ff_mjpeg_decode_sos(jpg, NULL, NULL);
+                    ret = ff_mjpeg_decode_sos(jpg, NULL, 0, NULL);
                     if (ret < 0 && (avctx->err_recognition & AV_EF_EXPLODE))
                         return ret;
                 }
@@ -295,7 +321,7 @@
         *got_frame = 1;
 
         s->picture_index ^= 1;
-        jpg->picture_ptr = &s->picture[s->picture_index];
+        jpg->picture_ptr = s->picture[s->picture_index];
 
         if (!s->has_complete_frame) {
             if (!s->got_mxm_bitmask)
@@ -308,24 +334,6 @@
     return buf_ptr - buf;
 }
 
-static av_cold int mxpeg_decode_end(AVCodecContext *avctx)
-{
-    MXpegDecodeContext *s = avctx->priv_data;
-    MJpegDecodeContext *jpg = &s->jpg;
-    int i;
-
-    jpg->picture_ptr = NULL;
-    ff_mjpeg_decode_end(avctx);
-
-    for (i = 0; i < 2; ++i)
-        av_frame_unref(&s->picture[i]);
-
-    av_freep(&s->mxm_bitmask);
-    av_freep(&s->completion_bitmask);
-
-    return 0;
-}
-
 AVCodec ff_mxpeg_decoder = {
     .name           = "mxpeg",
     .long_name      = NULL_IF_CONFIG_SMALL("Mobotix MxPEG video"),

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/nuv.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/nuv.c Changed

@@ -32,7 +32,7 @@
 #include "rtjpeg.h"
 
 typedef struct {
-    AVFrame pic;
+    AVFrame *pic;
     int codec_frameheader;
     int quality;
     int width, height;
@@ -140,7 +140,7 @@
         }
         ff_rtjpeg_decode_init(&c->rtj, &c->dsp, c->width, c->height,
                               c->lq, c->cq);
-        av_frame_unref(&c->pic);
+        av_frame_unref(c->pic);
         return 1;
     } else if (quality != c->quality)
         ff_rtjpeg_decode_init(&c->rtj, &c->dsp, c->width, c->height,
@@ -218,6 +218,7 @@
         }
         buf      = c->decomp_buf;
         buf_size = c->decomp_size - FFMAX(FF_INPUT_BUFFER_PADDING_SIZE, AV_LZO_OUTPUT_PADDING) - outlen;
+        memset(c->decomp_buf + buf_size, 0, FF_INPUT_BUFFER_PADDING_SIZE);
     }
     if (c->codec_frameheader) {
         int w, h, q;
@@ -248,20 +249,20 @@
     }
 
     if (size_change || keyframe) {
-        av_frame_unref(&c->pic);
+        av_frame_unref(c->pic);
         init_frame = 1;
     }
 
-    if ((result = ff_reget_buffer(avctx, &c->pic)) < 0)
+    if ((result = ff_reget_buffer(avctx, c->pic)) < 0)
         return result;
     if (init_frame) {
-        memset(c->pic.data[0], 0,    avctx->height * c->pic.linesize[0]);
-        memset(c->pic.data[1], 0x80, avctx->height * c->pic.linesize[1] / 2);
-        memset(c->pic.data[2], 0x80, avctx->height * c->pic.linesize[2] / 2);
+        memset(c->pic->data[0], 0,    avctx->height * c->pic->linesize[0]);
+        memset(c->pic->data[1], 0x80, avctx->height * c->pic->linesize[1] / 2);
+        memset(c->pic->data[2], 0x80, avctx->height * c->pic->linesize[2] / 2);
     }
 
-    c->pic.pict_type = keyframe ? AV_PICTURE_TYPE_I : AV_PICTURE_TYPE_P;
-    c->pic.key_frame = keyframe;
+    c->pic->pict_type = keyframe ? AV_PICTURE_TYPE_I : AV_PICTURE_TYPE_P;
+    c->pic->key_frame = keyframe;
     // decompress/copy/whatever data
     switch (comptype) {
     case NUV_LZO:
@@ -272,19 +273,19 @@
             height = buf_size / c->width / 3 * 2;
         }
         if(height > 0)
-            copy_frame(&c->pic, buf, c->width, height);
+            copy_frame(c->pic, buf, c->width, height);
         break;
     }
     case NUV_RTJPEG_IN_LZO:
     case NUV_RTJPEG:
-        ret = ff_rtjpeg_decode_frame_yuv420(&c->rtj, &c->pic, buf, buf_size);
+        ret = ff_rtjpeg_decode_frame_yuv420(&c->rtj, c->pic, buf, buf_size);
         if (ret < 0)
             return ret;
         break;
     case NUV_BLACK:
-        memset(c->pic.data[0], 0, c->width * c->height);
-        memset(c->pic.data[1], 128, c->width * c->height / 4);
-        memset(c->pic.data[2], 128, c->width * c->height / 4);
+        memset(c->pic->data[0], 0, c->width * c->height);
+        memset(c->pic->data[1], 128, c->width * c->height / 4);
+        memset(c->pic->data[2], 128, c->width * c->height / 4);
         break;
     case NUV_COPY_LAST:
         /* nothing more to do here */
@@ -294,7 +295,7 @@
         return AVERROR_INVALIDDATA;
     }
 
-    if ((result = av_frame_ref(picture, &c->pic)) < 0)
+    if ((result = av_frame_ref(picture, c->pic)) < 0)
         return result;
 
     *got_frame = 1;
@@ -306,8 +307,11 @@
     NuvContext *c  = avctx->priv_data;
     int ret;
 
+    c->pic = av_frame_alloc();
+    if (!c->pic)
+        return AVERROR(ENOMEM);
+
     avctx->pix_fmt = AV_PIX_FMT_YUV420P;
-    c->pic.data[0] = NULL;
     c->decomp_buf  = NULL;
     c->quality     = -1;
     c->width       = 0;
@@ -331,7 +335,7 @@
     NuvContext *c = avctx->priv_data;
 
     av_freep(&c->decomp_buf);
-    av_frame_unref(&c->pic);
+    av_frame_free(&c->pic);
 
     return 0;
 }

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/old_codec_ids.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/old_codec_ids.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/options.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/options.c Changed

@@ -86,14 +86,6 @@
     .get_category            = get_category,
 };
 
-#if FF_API_ALLOC_CONTEXT
-void avcodec_get_context_defaults2(AVCodecContext *s, enum AVMediaType codec_type){
-    AVCodec c= {0};
-    c.type= codec_type;
-    avcodec_get_context_defaults3(s, &c);
-}
-#endif
-
 int avcodec_get_context_defaults3(AVCodecContext *s, const AVCodec *codec)
 {
     int flags=0;
@@ -162,26 +154,6 @@
     return avctx;
 }
 
-#if FF_API_ALLOC_CONTEXT
-AVCodecContext *avcodec_alloc_context2(enum AVMediaType codec_type){
-    AVCodecContext *avctx= av_malloc(sizeof(AVCodecContext));
-
-    if(avctx==NULL) return NULL;
-
-    avcodec_get_context_defaults2(avctx, codec_type);
-
-    return avctx;
-}
-
-void avcodec_get_context_defaults(AVCodecContext *s){
-    avcodec_get_context_defaults2(s, AVMEDIA_TYPE_UNKNOWN);
-}
-
-AVCodecContext *avcodec_alloc_context(void){
-    return avcodec_alloc_context2(AVMEDIA_TYPE_UNKNOWN);
-}
-#endif
-
 int avcodec_copy_context(AVCodecContext *dest, const AVCodecContext *src)
 {
     if (avcodec_is_open(dest)) { // check that the dest context is uninitialized
@@ -201,7 +173,6 @@
     dest->codec           = NULL;
     dest->slice_offset    = NULL;
     dest->hwaccel         = NULL;
-    dest->thread_opaque   = NULL;
     dest->internal        = NULL;
 
     /* reallocate values that should be allocated separately */

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/options_table.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/options_table.h Changed

@@ -24,6 +24,7 @@
 
 #include <float.h>
 #include <limits.h>
+#include <stdint.h>
 
 #include "libavutil/opt.h"
 #include "avcodec.h"
@@ -70,6 +71,7 @@
 {"aic", "H.263 advanced intra coding / MPEG-4 AC prediction", 0, AV_OPT_TYPE_CONST, {.i64 = CODEC_FLAG_AC_PRED }, INT_MIN, INT_MAX, V|E, "flags"},
 {"ilme", "interlaced motion estimation", 0, AV_OPT_TYPE_CONST, {.i64 = CODEC_FLAG_INTERLACED_ME }, INT_MIN, INT_MAX, V|E, "flags"},
 {"cgop", "closed GOP", 0, AV_OPT_TYPE_CONST, {.i64 = CODEC_FLAG_CLOSED_GOP }, INT_MIN, INT_MAX, V|E, "flags"},
+{"output_corrupt", "Output even potentially corrupted frames", 0, AV_OPT_TYPE_CONST, {.i64 = CODEC_FLAG_OUTPUT_CORRUPT }, INT_MIN, INT_MAX, V|D, "flags"},
 {"fast", "allow non-spec-compliant speedup tricks", 0, AV_OPT_TYPE_CONST, {.i64 = CODEC_FLAG2_FAST }, INT_MIN, INT_MAX, V|E, "flags2"},
 {"noout", "skip bitstream encoding", 0, AV_OPT_TYPE_CONST, {.i64 = CODEC_FLAG2_NO_OUTPUT }, INT_MIN, INT_MAX, V|E, "flags2"},
 {"ignorecrop", "ignore cropping information from sps", 0, AV_OPT_TYPE_CONST, {.i64 = CODEC_FLAG2_IGNORE_CROP }, INT_MIN, INT_MAX, V|D, "flags2"},
@@ -105,7 +107,7 @@
 {"qmin", "minimum video quantizer scale (VBR)", OFFSET(qmin), AV_OPT_TYPE_INT, {.i64 = 2 }, -1, 69, V|E},
 {"qmax", "maximum video quantizer scale (VBR)", OFFSET(qmax), AV_OPT_TYPE_INT, {.i64 = 31 }, -1, 1024, V|E},
 {"qdiff", "maximum difference between the quantizer scales (VBR)", OFFSET(max_qdiff), AV_OPT_TYPE_INT, {.i64 = 3 }, INT_MIN, INT_MAX, V|E},
-{"bf", "use 'frames' B frames", OFFSET(max_b_frames), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, -1, FF_MAX_B_FRAMES, V|E},
+{"bf", "set maximum number of B frames between non-B-frames", OFFSET(max_b_frames), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, -1, INT_MAX, V|E},
 {"b_qfactor", "QP factor between P- and B-frames", OFFSET(b_quant_factor), AV_OPT_TYPE_FLOAT, {.dbl = 1.25 }, -FLT_MAX, FLT_MAX, V|E},
 {"rc_strategy", "ratecontrol method", OFFSET(rc_strategy), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E},
 {"b_strategy", "strategy to choose between I/P/B-frames", OFFSET(b_frame_strategy), AV_OPT_TYPE_INT, {.i64 = 0 }, INT_MIN, INT_MAX, V|E},
@@ -122,12 +124,16 @@
 {"codec_tag", NULL, OFFSET(codec_tag), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX},
 {"bug", "work around not autodetected encoder bugs", OFFSET(workaround_bugs), AV_OPT_TYPE_FLAGS, {.i64 = FF_BUG_AUTODETECT }, INT_MIN, INT_MAX, V|D, "bug"},
 {"autodetect", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_BUG_AUTODETECT }, INT_MIN, INT_MAX, V|D, "bug"},
+#if FF_API_OLD_MSMPEG4
 {"old_msmpeg4", "some old lavc-generated MSMPEG4v3 files (no autodetection)", 0, AV_OPT_TYPE_CONST, {.i64 = FF_BUG_OLD_MSMPEG4 }, INT_MIN, INT_MAX, V|D, "bug"},
+#endif
 {"xvid_ilace", "Xvid interlacing bug (autodetected if FOURCC == XVIX)", 0, AV_OPT_TYPE_CONST, {.i64 = FF_BUG_XVID_ILACE }, INT_MIN, INT_MAX, V|D, "bug"},
 {"ump4", "(autodetected if FOURCC == UMP4)", 0, AV_OPT_TYPE_CONST, {.i64 = FF_BUG_UMP4 }, INT_MIN, INT_MAX, V|D, "bug"},
 {"no_padding", "padding bug (autodetected)", 0, AV_OPT_TYPE_CONST, {.i64 = FF_BUG_NO_PADDING }, INT_MIN, INT_MAX, V|D, "bug"},
 {"amv", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_BUG_AMV }, INT_MIN, INT_MAX, V|D, "bug"},
+#if FF_API_AC_VLC
 {"ac_vlc", "illegal VLC bug (autodetected per FOURCC)", 0, AV_OPT_TYPE_CONST, {.i64 = FF_BUG_AC_VLC }, INT_MIN, INT_MAX, V|D, "bug"},
+#endif
 {"qpel_chroma", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_BUG_QPEL_CHROMA }, INT_MIN, INT_MAX, V|D, "bug"},
 {"std_qpel", "old standard qpel (autodetected per FOURCC/version)", 0, AV_OPT_TYPE_CONST, {.i64 = FF_BUG_STD_QPEL }, INT_MIN, INT_MAX, V|D, "bug"},
 {"qpel_chroma2", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_BUG_QPEL_CHROMA2 }, INT_MIN, INT_MAX, V|D, "bug"},
@@ -144,7 +150,7 @@
 {"unofficial", "allow unofficial extensions", 0, AV_OPT_TYPE_CONST, {.i64 = FF_COMPLIANCE_UNOFFICIAL }, INT_MIN, INT_MAX, V|D|E, "strict"},
 {"experimental", "allow non-standardized experimental things", 0, AV_OPT_TYPE_CONST, {.i64 = FF_COMPLIANCE_EXPERIMENTAL }, INT_MIN, INT_MAX, V|D|E, "strict"},
 {"b_qoffset", "QP offset between P- and B-frames", OFFSET(b_quant_offset), AV_OPT_TYPE_FLOAT, {.dbl = 1.25 }, -FLT_MAX, FLT_MAX, V|E},
-{"err_detect", "set error detection flags", OFFSET(err_recognition), AV_OPT_TYPE_FLAGS, {.i64 = AV_EF_CRCCHECK }, INT_MIN, INT_MAX, A|V|D, "err_detect"},
+{"err_detect", "set error detection flags", OFFSET(err_recognition), AV_OPT_TYPE_FLAGS, {.i64 = 0 }, INT_MIN, INT_MAX, A|V|D, "err_detect"},
 {"crccheck", "verify embedded CRCs", 0, AV_OPT_TYPE_CONST, {.i64 = AV_EF_CRCCHECK }, INT_MIN, INT_MAX, A|V|D, "err_detect"},
 {"bitstream", "detect bitstream specification deviations", 0, AV_OPT_TYPE_CONST, {.i64 = AV_EF_BITSTREAM }, INT_MIN, INT_MAX, A|V|D, "err_detect"},
 {"buffer", "detect improper bitstream length", 0, AV_OPT_TYPE_CONST, {.i64 = AV_EF_BUFFER }, INT_MIN, INT_MAX, A|V|D, "err_detect"},
@@ -196,7 +202,9 @@
 {"simplearmv5te", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_SIMPLEARMV5TE }, INT_MIN, INT_MAX, V|E|D, "idct"},
 {"simplearmv6", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_SIMPLEARMV6 }, INT_MIN, INT_MAX, V|E|D, "idct"},
 {"simpleneon", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_SIMPLENEON }, INT_MIN, INT_MAX, V|E|D, "idct"},
+#if FF_API_ARCH_ALPHA
 {"simplealpha", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_SIMPLEALPHA }, INT_MIN, INT_MAX, V|E|D, "idct"},
+#endif
 {"ipp", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_IPP }, INT_MIN, INT_MAX, V|E|D, "idct"},
 {"xvidmmx", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_XVIDMMX }, INT_MIN, INT_MAX, V|E|D, "idct"},
 {"faani", "floating point AAN IDCT", 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_FAAN }, INT_MIN, INT_MAX, V|D|E, "idct"},
@@ -216,7 +224,9 @@
 {"bitstream", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_BITSTREAM }, INT_MIN, INT_MAX, V|D, "debug"},
 {"mb_type", "macroblock (MB) type", 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_MB_TYPE }, INT_MIN, INT_MAX, V|D, "debug"},
 {"qp", "per-block quantization parameter (QP)", 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_QP }, INT_MIN, INT_MAX, V|D, "debug"},
+#if FF_API_DEBUG_MV
 {"mv", "motion vector", 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_MV }, INT_MIN, INT_MAX, V|D, "debug"},
+#endif
 {"dct_coeff", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_DCT_COEFF }, INT_MIN, INT_MAX, V|D, "debug"},
 {"skip", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_SKIP }, INT_MIN, INT_MAX, V|D, "debug"},
 {"startcode", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_STARTCODE }, INT_MIN, INT_MAX, V|D, "debug"},
@@ -272,7 +282,9 @@
 {"deflate", "deflate-based coder", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CODER_TYPE_DEFLATE }, INT_MIN, INT_MAX, V|E, "coder"},
 {"context", "context model", OFFSET(context_model), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E},
 {"slice_flags", NULL, OFFSET(slice_flags), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX},
+#if FF_API_XVMC
 {"xvmc_acceleration", NULL, OFFSET(xvmc_acceleration), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX},
+#endif /* FF_API_XVMC */
 {"mbd", "macroblock decision algorithm (high quality mode)", OFFSET(mb_decision), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, 0, 2, V|E, "mbd"},
 {"simple", "use mbcmp (default)", 0, AV_OPT_TYPE_CONST, {.i64 = FF_MB_DECISION_SIMPLE }, INT_MIN, INT_MAX, V|E, "mbd"},
 {"bits", "use fewest bits", 0, AV_OPT_TYPE_CONST, {.i64 = FF_MB_DECISION_BITS }, INT_MIN, INT_MAX, V|E, "mbd"},
@@ -284,7 +296,9 @@
 {"nr", "noise reduction", OFFSET(noise_reduction), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E},
 {"rc_init_occupancy", "number of bits which should be loaded into the rc buffer before decoding starts", OFFSET(rc_initial_buffer_occupancy), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E},
 {"flags2", NULL, OFFSET(flags2), AV_OPT_TYPE_FLAGS, {.i64 = DEFAULT}, 0, UINT_MAX, V|A|E|D, "flags2"},
+#if FF_API_ERROR_RATE
 {"error", NULL, OFFSET(error_rate), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E},
+#endif
 {"threads", NULL, OFFSET(thread_count), AV_OPT_TYPE_INT, {.i64 = 1 }, 0, INT_MAX, V|A|E|D, "threads"},
 {"auto", "autodetect a suitable number of threads to use", 0, AV_OPT_TYPE_CONST, {.i64 = 0 }, INT_MIN, INT_MAX, V|E|D, "threads"},
 {"me_threshold", "motion estimation threshold", OFFSET(me_threshold), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E},
@@ -372,7 +386,7 @@
 {"em", "Emergency",          0, AV_OPT_TYPE_CONST, {.i64 = AV_AUDIO_SERVICE_TYPE_EMERGENCY },         INT_MIN, INT_MAX, A|E, "audio_service_type"},
 {"vo", "Voice Over",         0, AV_OPT_TYPE_CONST, {.i64 = AV_AUDIO_SERVICE_TYPE_VOICE_OVER },        INT_MIN, INT_MAX, A|E, "audio_service_type"},
 {"ka", "Karaoke",            0, AV_OPT_TYPE_CONST, {.i64 = AV_AUDIO_SERVICE_TYPE_KARAOKE },           INT_MIN, INT_MAX, A|E, "audio_service_type"},
-{"request_sample_fmt", "sample format audio decoders should prefer", OFFSET(request_sample_fmt), AV_OPT_TYPE_SAMPLE_FMT, {.i64=AV_SAMPLE_FMT_NONE}, -1, AV_SAMPLE_FMT_NB-1, A|D, "request_sample_fmt"},
+{"request_sample_fmt", "sample format audio decoders should prefer", OFFSET(request_sample_fmt), AV_OPT_TYPE_SAMPLE_FMT, {.i64=AV_SAMPLE_FMT_NONE}, -1, INT_MAX, A|D, "request_sample_fmt"},
 {"pkt_timebase", NULL, OFFSET(pkt_timebase), AV_OPT_TYPE_RATIONAL, {.dbl = 0 }, 0, INT_MAX, 0},
 {"sub_charenc", "set input text subtitles character encoding", OFFSET(sub_charenc), AV_OPT_TYPE_STRING, {.str = NULL}, CHAR_MIN, CHAR_MAX, S|D},
 {"sub_charenc_mode", "set input text subtitles character encoding mode", OFFSET(sub_charenc_mode), AV_OPT_TYPE_FLAGS, {.i64 = FF_SUB_CHARENC_MODE_AUTOMATIC}, -1, INT_MAX, S|D, "sub_charenc_mode"},

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/pamenc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/pamenc.c Changed

@@ -21,13 +21,11 @@
 
 #include "avcodec.h"
 #include "internal.h"
-#include "pnm.h"
-
 
 static int pam_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
                             const AVFrame *p, int *got_packet)
 {
-    PNMContext *s     = avctx->priv_data;
+    uint8_t *bytestream_start, *bytestream, *bytestream_end;
     int i, h, w, n, linesize, depth, maxval, ret;
     const char *tuple_type;
     uint8_t *ptr;
@@ -90,14 +88,14 @@
     if ((ret = ff_alloc_packet2(avctx, pkt, n*h + 200)) < 0)
         return ret;
 
-    s->bytestream_start =
-    s->bytestream       = pkt->data;
-    s->bytestream_end   = pkt->data + pkt->size;
+    bytestream_start =
+    bytestream       = pkt->data;
+    bytestream_end   = pkt->data + pkt->size;
 
-    snprintf(s->bytestream, s->bytestream_end - s->bytestream,
+    snprintf(bytestream, bytestream_end - bytestream,
              "P7\nWIDTH %d\nHEIGHT %d\nDEPTH %d\nMAXVAL %d\nTUPLTYPE %s\nENDHDR\n",
              w, h, depth, maxval, tuple_type);
-    s->bytestream += strlen(s->bytestream);
+    bytestream += strlen(bytestream);
 
     ptr      = p->data[0];
     linesize = p->linesize[0];
@@ -106,30 +104,48 @@
         int j;
         for (i = 0; i < h; i++) {
             for (j = 0; j < w; j++)
-                *s->bytestream++ = ptr[j >> 3] >> (7 - j & 7) & 1;
+                *bytestream++ = ptr[j >> 3] >> (7 - j & 7) & 1;
             ptr += linesize;
         }
     } else {
         for (i = 0; i < h; i++) {
-            memcpy(s->bytestream, ptr, n);
-            s->bytestream += n;
-            ptr           += linesize;
+            memcpy(bytestream, ptr, n);
+            bytestream += n;
+            ptr        += linesize;
         }
     }
 
-    pkt->size   = s->bytestream - s->bytestream_start;
+    pkt->size   = bytestream - bytestream_start;
     pkt->flags |= AV_PKT_FLAG_KEY;
     *got_packet = 1;
     return 0;
 }
 
+static av_cold int pam_encode_init(AVCodecContext *avctx)
+{
+    avctx->coded_frame = av_frame_alloc();
+    if (!avctx->coded_frame)
+        return AVERROR(ENOMEM);
+
+    avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I;
+    avctx->coded_frame->key_frame = 1;
+
+    return 0;
+}
+
+static av_cold int pam_encode_close(AVCodecContext *avctx)
+{
+    av_frame_free(&avctx->coded_frame);
+    return 0;
+}
 
 AVCodec ff_pam_encoder = {
     .name           = "pam",
     .long_name      = NULL_IF_CONFIG_SMALL("PAM (Portable AnyMap) image"),
     .type           = AVMEDIA_TYPE_VIDEO,
     .id             = AV_CODEC_ID_PAM,
-    .priv_data_size = sizeof(PNMContext),
+    .init           = pam_encode_init,
+    .close          = pam_encode_close,
     .encode2        = pam_encode_frame,
     .pix_fmts       = (const enum AVPixelFormat[]){
         AV_PIX_FMT_RGB24, AV_PIX_FMT_RGBA, AV_PIX_FMT_RGB48BE, AV_PIX_FMT_RGBA64BE, AV_PIX_FMT_GRAY8, AV_PIX_FMT_GRAY8A, AV_PIX_FMT_GRAY16BE, AV_PIX_FMT_MONOBLACK, AV_PIX_FMT_NONE

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/parser.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/parser.c Changed

@@ -20,17 +20,22 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <stdint.h>
 #include <string.h>
 
-#include "parser.h"
 #include "libavutil/atomic.h"
 #include "libavutil/mem.h"
 
+#include "parser.h"
+
 static AVCodecParser *av_first_parser = NULL;
 
-AVCodecParser* av_parser_next(AVCodecParser *p){
-    if(p) return p->next;
-    else  return av_first_parser;
+AVCodecParser *av_parser_next(AVCodecParser *p)
+{
+    if (p)
+        return p->next;
+    else
+        return av_first_parser;
 }
 
 void av_register_codec_parser(AVCodecParser *parser)
@@ -46,10 +51,10 @@
     AVCodecParser *parser;
     int ret;
 
-    if(codec_id == AV_CODEC_ID_NONE)
+    if (codec_id == AV_CODEC_ID_NONE)
         return NULL;
 
-    for(parser = av_first_parser; parser != NULL; parser = parser->next) {
+    for (parser = av_first_parser; parser != NULL; parser = parser->next) {
         if (parser->codec_ids[0] == codec_id ||
             parser->codec_ids[1] == codec_id ||
             parser->codec_ids[2] == codec_id ||
@@ -58,7 +63,8 @@
             goto found;
     }
     return NULL;
- found:
+
+found:
     s = av_mallocz(sizeof(AVCodecParserContext));
     if (!s)
         goto err_out;
@@ -73,7 +79,7 @@
         if (ret != 0)
             goto err_out;
     }
-    s->key_frame = -1;
+    s->key_frame            = -1;
     s->convergence_duration = 0;
     s->dts_sync_point       = INT_MIN;
     s->dts_ref_dts_delta    = INT_MIN;
@@ -87,72 +93,72 @@
     return NULL;
 }
 
-void ff_fetch_timestamp(AVCodecParserContext *s, int off, int remove){
+void ff_fetch_timestamp(AVCodecParserContext *s, int off, int remove)
+{
     int i;
 
-    s->dts= s->pts= AV_NOPTS_VALUE;
-    s->pos= -1;
-    s->offset= 0;
-    for(i = 0; i < AV_PARSER_PTS_NB; i++) {
-        if (   s->cur_offset + off >= s->cur_frame_offset[i]
-            && (s->frame_offset < s->cur_frame_offset[i] ||
-              (!s->frame_offset && !s->next_frame_offset)) // first field/frame
+    s->dts    =
+    s->pts    = AV_NOPTS_VALUE;
+    s->pos    = -1;
+    s->offset = 0;
+    for (i = 0; i < AV_PARSER_PTS_NB; i++) {
+        if (s->cur_offset + off >= s->cur_frame_offset[i] &&
+            (s->frame_offset < s->cur_frame_offset[i] ||
+             (!s->frame_offset && !s->next_frame_offset)) && // first field/frame
             // check disabled since MPEG-TS does not send complete PES packets
-            && /*s->next_frame_offset + off <*/  s->cur_frame_end[i]){
-            s->dts= s->cur_frame_dts[i];
-            s->pts= s->cur_frame_pts[i];
-            s->pos= s->cur_frame_pos[i];
+            /*s->next_frame_offset + off <*/  s->cur_frame_end[i]){
+
+            s->dts    = s->cur_frame_dts[i];
+            s->pts    = s->cur_frame_pts[i];
+            s->pos    = s->cur_frame_pos[i];
             s->offset = s->next_frame_offset - s->cur_frame_offset[i];
-            if(remove)
-                s->cur_frame_offset[i]= INT64_MAX;
-            if(s->cur_offset + off < s->cur_frame_end[i])
+            if (remove)
+                s->cur_frame_offset[i] = INT64_MAX;
+            if (s->cur_offset + off < s->cur_frame_end[i])
                 break;
         }
     }
 }
 
-int av_parser_parse2(AVCodecParserContext *s,
-                     AVCodecContext *avctx,
+int av_parser_parse2(AVCodecParserContext *s, AVCodecContext *avctx,
                      uint8_t **poutbuf, int *poutbuf_size,
                      const uint8_t *buf, int buf_size,
-                     int64_t pts, int64_t dts,
-                     int64_t pos)
+                     int64_t pts, int64_t dts, int64_t pos)
 {
     int index, i;
     uint8_t dummy_buf[FF_INPUT_BUFFER_PADDING_SIZE];
 
-    if(!(s->flags & PARSER_FLAG_FETCHED_OFFSET)) {
+    if (!(s->flags & PARSER_FLAG_FETCHED_OFFSET)) {
         s->next_frame_offset =
         s->cur_offset        = pos;
-        s->flags |= PARSER_FLAG_FETCHED_OFFSET;
+        s->flags            |= PARSER_FLAG_FETCHED_OFFSET;
     }
 
     if (buf_size == 0) {
         /* padding is always necessary even if EOF, so we add it here */
         memset(dummy_buf, 0, sizeof(dummy_buf));
         buf = dummy_buf;
-    } else if (s->cur_offset + buf_size !=
-               s->cur_frame_end[s->cur_frame_start_index]) { /* skip remainder packets */
+    } else if (s->cur_offset + buf_size != s->cur_frame_end[s->cur_frame_start_index]) { /* skip remainder packets */
         /* add a new packet descriptor */
-            i = (s->cur_frame_start_index + 1) & (AV_PARSER_PTS_NB - 1);
-            s->cur_frame_start_index = i;
-            s->cur_frame_offset[i] = s->cur_offset;
-            s->cur_frame_end[i] = s->cur_offset + buf_size;
-            s->cur_frame_pts[i] = pts;
-            s->cur_frame_dts[i] = dts;
-            s->cur_frame_pos[i] = pos;
+        i = (s->cur_frame_start_index + 1) & (AV_PARSER_PTS_NB - 1);
+        s->cur_frame_start_index = i;
+        s->cur_frame_offset[i]   = s->cur_offset;
+        s->cur_frame_end[i]      = s->cur_offset + buf_size;
+        s->cur_frame_pts[i]      = pts;
+        s->cur_frame_dts[i]      = dts;
+        s->cur_frame_pos[i]      = pos;
     }
 
-    if (s->fetch_timestamp){
-        s->fetch_timestamp=0;
-        s->last_pts = s->pts;
-        s->last_dts = s->dts;
-        s->last_pos = s->pos;
+    if (s->fetch_timestamp) {
+        s->fetch_timestamp = 0;
+        s->last_pts        = s->pts;
+        s->last_dts        = s->dts;
+        s->last_pos        = s->pos;
         ff_fetch_timestamp(s, 0, 0);
     }
-
     /* WARNING: the returned index can be negative */
-    index = s->parser->parser_parse(s, avctx, (const uint8_t **)poutbuf, poutbuf_size, buf, buf_size);
+    index = s->parser->parser_parse(s, avctx, (const uint8_t **) poutbuf,
+                                    poutbuf_size, buf, buf_size);
     /* update the file pointer */
     if (*poutbuf_size) {
         /* fill the data for the current frame */
@@ -160,7 +166,7 @@
 
         /* offset of the next frame */
         s->next_frame_offset = s->cur_offset + index;
-        s->fetch_timestamp=1;
+        s->fetch_timestamp   = 1;
     }
     if (index < 0)
         index = 0;
@@ -168,32 +174,32 @@
     return index;
 }
 
-int av_parser_change(AVCodecParserContext *s,
-                     AVCodecContext *avctx,
+int av_parser_change(AVCodecParserContext *s, AVCodecContext *avctx,
                      uint8_t **poutbuf, int *poutbuf_size,
-                     const uint8_t *buf, int buf_size, int keyframe){
-
-    if(s && s->parser->split){
-        if((avctx->flags & CODEC_FLAG_GLOBAL_HEADER) || (avctx->flags2 & CODEC_FLAG2_LOCAL_HEADER)){
-            int i= s->parser->split(avctx, buf, buf_size);
-            buf += i;
+                     const uint8_t *buf, int buf_size, int keyframe)
+{
+    if (s && s->parser->split) {
+        if (avctx->flags  & CODEC_FLAG_GLOBAL_HEADER ||
+            avctx->flags2 & CODEC_FLAG2_LOCAL_HEADER) {
+            int i = s->parser->split(avctx, buf, buf_size);
+            buf      += i;
             buf_size -= i;
         }
     }
 
     /* cast to avoid warning about discarding qualifiers */
-    *poutbuf= (uint8_t *) buf;
-    *poutbuf_size= buf_size;
-    if(avctx->extradata){
-        if(  (keyframe && (avctx->flags2 & CODEC_FLAG2_LOCAL_HEADER))
-            /*||(s->pict_type != AV_PICTURE_TYPE_I && (s->flags & PARSER_FLAG_DUMP_EXTRADATA_AT_NOKEY))*/
-            /*||(? && (s->flags & PARSER_FLAG_DUMP_EXTRADATA_AT_BEGIN)*/){
-            int size= buf_size + avctx->extradata_size;
-            *poutbuf_size= size;
-            *poutbuf= av_malloc(size + FF_INPUT_BUFFER_PADDING_SIZE);
+    *poutbuf      = (uint8_t *) buf;
+    *poutbuf_size = buf_size;
+    if (avctx->extradata) {
+        if (keyframe && (avctx->flags2 & CODEC_FLAG2_LOCAL_HEADER)) {
+            int size = buf_size + avctx->extradata_size;
+
+            *poutbuf_size = size;
+            *poutbuf      = av_malloc(size + FF_INPUT_BUFFER_PADDING_SIZE);
 
             memcpy(*poutbuf, avctx->extradata, avctx->extradata_size);
-            memcpy((*poutbuf) + avctx->extradata_size, buf, buf_size + FF_INPUT_BUFFER_PADDING_SIZE);
+            memcpy(*poutbuf + avctx->extradata_size, buf,
+                   buf_size + FF_INPUT_BUFFER_PADDING_SIZE);
             return 1;
         }
     }
@@ -203,7 +209,7 @@
 
 void av_parser_close(AVCodecParserContext *s)
 {
-    if(s){
+    if (s) {
         if (s->parser->parser_close)
             s->parser->parser_close(s);
         av_free(s->priv_data);
@@ -211,33 +217,33 @@
     }
 }
 
-/*****************************************************/
-
-int ff_combine_frame(ParseContext *pc, int next, const uint8_t **buf, int *buf_size)
+int ff_combine_frame(ParseContext *pc, int next,
+                     const uint8_t **buf, int *buf_size)
 {
-    if(pc->overread){
+    if (pc->overread) {
         av_dlog(NULL, "overread %d, state:%X next:%d index:%d o_index:%d\n",
                 pc->overread, pc->state, next, pc->index, pc->overread_index);
-        av_dlog(NULL, "%X %X %X %X\n", (*buf)[0], (*buf)[1], (*buf)[2], (*buf)[3]);
+        av_dlog(NULL, "%X %X %X %X\n",
+                (*buf)[0], (*buf)[1], (*buf)[2], (*buf)[3]);
     }
 
     /* Copy overread bytes from last frame into buffer. */
-    for(; pc->overread>0; pc->overread--){
-        pc->buffer[pc->index++]= pc->buffer[pc->overread_index++];
-    }
+    for (; pc->overread > 0; pc->overread--)
+        pc->buffer[pc->index++] = pc->buffer[pc->overread_index++];
 
     /* flush remaining if EOF */
-    if(!*buf_size && next == END_NOT_FOUND){
-        next= 0;
-    }
+    if (!*buf_size && next == END_NOT_FOUND)
+        next = 0;
 
-    pc->last_index= pc->index;
+    pc->last_index = pc->index;
 
     /* copy into buffer end return */
-    if(next == END_NOT_FOUND){
-        void* new_buffer = av_fast_realloc(pc->buffer, &pc->buffer_size, (*buf_size) + pc->index + FF_INPUT_BUFFER_PADDING_SIZE);
+    if (next == END_NOT_FOUND) {
+        void *new_buffer = av_fast_realloc(pc->buffer, &pc->buffer_size,
+                                           *buf_size + pc->index +
+                                           FF_INPUT_BUFFER_PADDING_SIZE);
 
-        if(!new_buffer) {
+        if (!new_buffer) {
             pc->index = 0;
             return AVERROR(ENOMEM);
         }
@@ -247,13 +253,15 @@
         return -1;
     }
 
-    *buf_size=
-    pc->overread_index= pc->index + next;
+    *buf_size          =
+    pc->overread_index = pc->index + next;
 
     /* append to buffer */
-    if(pc->index){
-        void* new_buffer = av_fast_realloc(pc->buffer, &pc->buffer_size, next + pc->index + FF_INPUT_BUFFER_PADDING_SIZE);
-        if(!new_buffer) {
+    if (pc->index) {
+        void *new_buffer = av_fast_realloc(pc->buffer, &pc->buffer_size,
+                                           next + pc->index +
+                                           FF_INPUT_BUFFER_PADDING_SIZE);
+        if (!new_buffer) {
             pc->overread_index =
             pc->index = 0;
             return AVERROR(ENOMEM);
@@ -263,20 +271,21 @@
             memcpy(&pc->buffer[pc->index], *buf,
                    next + FF_INPUT_BUFFER_PADDING_SIZE);
         pc->index = 0;
-        *buf= pc->buffer;
+        *buf      = pc->buffer;
     }
 
     /* store overread bytes */
-    for(;next < 0; next++){
-        pc->state = (pc->state<<8) | pc->buffer[pc->last_index + next];
-        pc->state64 = (pc->state64<<8) | pc->buffer[pc->last_index + next];
+    for (; next < 0; next++) {
+        pc->state   = pc->state   << 8 | pc->buffer[pc->last_index + next];
+        pc->state64 = pc->state64 << 8 | pc->buffer[pc->last_index + next];
         pc->overread++;
     }
 
-    if(pc->overread){
+    if (pc->overread) {
         av_dlog(NULL, "overread %d, state:%X next:%d index:%d o_index:%d\n",
                 pc->overread, pc->state, next, pc->index, pc->overread_index);
-        av_dlog(NULL, "%X %X %X %X\n", (*buf)[0], (*buf)[1],(*buf)[2],(*buf)[3]);
+        av_dlog(NULL, "%X %X %X %X\n",
+                (*buf)[0], (*buf)[1], (*buf)[2], (*buf)[3]);
     }
 
     return 0;
@@ -289,18 +298,15 @@
     av_freep(&pc->buffer);
 }
 
-/*************************/
-
-int ff_mpeg4video_split(AVCodecContext *avctx,
-                           const uint8_t *buf, int buf_size)
+int ff_mpeg4video_split(AVCodecContext *avctx, const uint8_t *buf, int buf_size)
 {
     int i;
-    uint32_t state= -1;
+    uint32_t state = -1;
 
-    for(i=0; i<buf_size; i++){
-        state= (state<<8) | buf[i];
-        if(state == 0x1B3 || state == 0x1B6)
-            return i-3;
+    for (i = 0; i < buf_size; i++) {
+        state = state << 8 | buf[i];
+        if (state == 0x1B3 || state == 0x1B6)
+            return i - 3;
     }
     return 0;
 }

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/pcm-dvd.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/pcm-dvd.c Changed

@@ -70,6 +70,7 @@
     /* early exit if the header didn't change apart from the frame number */
     if (s->last_header == header_int)
         return 0;
+    s->last_header = -1;
 
     if (avctx->debug & FF_DEBUG_PICT_INFO)
         av_dlog(avctx, "pcm_dvd_parse_header: header = %02x%02x%02x\n",
@@ -173,6 +174,17 @@
 #endif
         return dst16;
     case 20:
+        if (avctx->channels == 1) {
+            do {
+                for (i = 2; i; i--) {
+                    dst32[0] = bytestream2_get_be16u(&gb) << 16;
+                    dst32[1] = bytestream2_get_be16u(&gb) << 16;
+                    t = bytestream2_get_byteu(&gb);
+                    *dst32++ += (t & 0xf0) << 8;
+                    *dst32++ += (t & 0x0f) << 12;
+                }
+            } while (--blocks);
+        } else {
         do {
             for (i = s->groups_per_block; i; i--) {
                 dst32[0] = bytestream2_get_be16u(&gb) << 16;
@@ -180,15 +192,26 @@
                 dst32[2] = bytestream2_get_be16u(&gb) << 16;
                 dst32[3] = bytestream2_get_be16u(&gb) << 16;
                 t = bytestream2_get_byteu(&gb);
-                *dst32 += (t & 0xf0) << 8;
-                *dst32 += (t & 0x0f) << 12;
+                *dst32++ += (t & 0xf0) << 8;
+                *dst32++ += (t & 0x0f) << 12;
                 t = bytestream2_get_byteu(&gb);
-                *dst32 += (t & 0xf0) << 8;
-                *dst32 += (t & 0x0f) << 12;
+                *dst32++ += (t & 0xf0) << 8;
+                *dst32++ += (t & 0x0f) << 12;
             }
         } while (--blocks);
+        }
         return dst32;
     case 24:
+        if (avctx->channels == 1) {
+            do {
+                for (i = 2; i; i--) {
+                    dst32[0] = bytestream2_get_be16u(&gb) << 16;
+                    dst32[1] = bytestream2_get_be16u(&gb) << 16;
+                    *dst32++ += bytestream2_get_byteu(&gb) << 8;
+                    *dst32++ += bytestream2_get_byteu(&gb) << 8;
+                }
+            } while (--blocks);
+        } else {
         do {
             for (i = s->groups_per_block; i; i--) {
                 dst32[0] = bytestream2_get_be16u(&gb) << 16;
@@ -201,6 +224,7 @@
                 *dst32++ += bytestream2_get_byteu(&gb) << 8;
             }
         } while (--blocks);
+        }
         return dst32;
     default:
         return NULL;
@@ -225,8 +249,8 @@
 
     if ((retval = pcm_dvd_parse_header(avctx, src)))
         return retval;
-    if (s->last_block_size != s->block_size) {
-        av_log(avctx, AV_LOG_WARNING, "block_size has changed\n");
+    if (s->last_block_size && s->last_block_size != s->block_size) {
+        av_log(avctx, AV_LOG_WARNING, "block_size has changed %d != %d\n", s->last_block_size, s->block_size);
         s->extra_sample_count = 0;
     }
     s->last_block_size = s->block_size;

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/pcx.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/pcx.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/pcxenc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/pcxenc.c Changed

@@ -33,6 +33,24 @@
 
 static const uint32_t monoblack_pal[16] = { 0x000000, 0xFFFFFF };
 
+static av_cold int pcx_encode_init(AVCodecContext *avctx)
+{
+    avctx->coded_frame = av_frame_alloc();
+    if (!avctx->coded_frame)
+        return AVERROR(ENOMEM);
+
+    avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I;
+    avctx->coded_frame->key_frame = 1;
+
+    return 0;
+}
+
+static av_cold int pcx_encode_close(AVCodecContext *avctx)
+{
+    av_frame_free(&avctx->coded_frame);
+    return 0;
+}
+
 /**
  * PCX run-length encoder
  * @param dst output buffer
@@ -86,7 +104,6 @@
 static int pcx_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
                             const AVFrame *frame, int *got_packet)
 {
-    AVFrame *const pict = (AVFrame *) frame;
     const uint8_t *buf_end;
     uint8_t *buf;
 
@@ -95,9 +112,6 @@
     uint32_t palette256[256];
     const uint8_t *src;
 
-    pict->pict_type = AV_PICTURE_TYPE_I;
-    pict->key_frame = 1;
-
     if (avctx->width > 65535 || avctx->height > 65535) {
         av_log(avctx, AV_LOG_ERROR, "image dimensions do not fit in 16 bits\n");
         return -1;
@@ -121,7 +135,7 @@
     case AV_PIX_FMT_PAL8:
         bpp = 8;
         nplanes = 1;
-        pal = (uint32_t *)pict->data[1];
+        pal = (uint32_t *)frame->data[1];
         break;
     case AV_PIX_FMT_MONOBLACK:
         bpp = 1;
@@ -166,7 +180,7 @@
     while (buf - pkt->data < 128)
         *buf++= 0;
 
-    src = pict->data[0];
+    src = frame->data[0];
 
     for (y = 0; y < avctx->height; y++) {
         if ((written = pcx_rle_encode(buf, buf_end - buf,
@@ -175,7 +189,7 @@
             return -1;
         }
         buf += written;
-        src += pict->linesize[0];
+        src += frame->linesize[0];
     }
 
     if (nplanes == 1 && bpp == 8) {
@@ -201,6 +215,8 @@
     .long_name      = NULL_IF_CONFIG_SMALL("PC Paintbrush PCX image"),
     .type           = AVMEDIA_TYPE_VIDEO,
     .id             = AV_CODEC_ID_PCX,
+    .init           = pcx_encode_init,
+    .close          = pcx_encode_close,
     .encode2        = pcx_encode_frame,
     .pix_fmts       = (const enum AVPixelFormat[]){
         AV_PIX_FMT_RGB24,

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/pgssubdec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/pgssubdec.c Changed

@@ -27,6 +27,8 @@
 #include "avcodec.h"
 #include "dsputil.h"
 #include "bytestream.h"
+#include "internal.h"
+
 #include "libavutil/colorspace.h"
 #include "libavutil/imgutils.h"
 #include "libavutil/opt.h"
@@ -230,7 +232,7 @@
     ctx->pictures[picture_id].w = width;
     ctx->pictures[picture_id].h = height;
 
-    av_fast_malloc(&ctx->pictures[picture_id].rle, &ctx->pictures[picture_id].rle_buffer_size, rle_bitmap_len);
+    av_fast_padded_malloc(&ctx->pictures[picture_id].rle, &ctx->pictures[picture_id].rle_buffer_size, rle_bitmap_len);
 
     if (!ctx->pictures[picture_id].rle)
         return -1;
@@ -294,11 +296,12 @@
  * @param buf_size size of packet to process
  * @todo TODO: Implement cropping
  */
-static void parse_presentation_segment(AVCodecContext *avctx,
-                                       const uint8_t *buf, int buf_size,
-                                       int64_t pts)
+static int parse_presentation_segment(AVCodecContext *avctx,
+                                      const uint8_t *buf, int buf_size,
+                                      int64_t pts)
 {
     PGSSubContext *ctx = avctx->priv_data;
+    int ret;
 
     int w = bytestream_get_be16(&buf);
     int h = bytestream_get_be16(&buf);
@@ -309,8 +312,9 @@
 
     av_dlog(avctx, "Video Dimensions %dx%d\n",
             w, h);
-    if (av_image_check_size(w, h, 0, avctx) >= 0)
-        avcodec_set_dimensions(avctx, w, h);
+    ret = ff_set_dimensions(avctx, w, h);
+    if (ret < 0)
+        return ret;
 
     /* Skip 1 bytes of unknown, frame rate? */
     buf++;
@@ -327,20 +331,20 @@
 
     ctx->presentation.object_count = bytestream_get_byte(&buf);
     if (!ctx->presentation.object_count)
-        return;
+        return 0;
 
     /* Verify that enough bytes are remaining for all of the objects. */
     buf_size -= 11;
     if (buf_size < ctx->presentation.object_count * 8) {
         ctx->presentation.object_count = 0;
-        return;
+        return AVERROR_INVALIDDATA;
     }
 
     av_freep(&ctx->presentation.objects);
     ctx->presentation.objects = av_malloc(sizeof(PGSSubPictureReference) * ctx->presentation.object_count);
     if (!ctx->presentation.objects) {
         ctx->presentation.object_count = 0;
-        return;
+        return AVERROR(ENOMEM);
     }
 
     for (object_index = 0; object_index < ctx->presentation.object_count; ++object_index) {
@@ -365,6 +369,8 @@
             reference->y = 0;
         }
     }
+
+    return 0;
 }
 
 /**
@@ -456,7 +462,7 @@
     const uint8_t *buf_end;
     uint8_t       segment_type;
     int           segment_length;
-    int i;
+    int i, ret;
 
     av_dlog(avctx, "PGS sub packet:\n");
 
@@ -495,7 +501,9 @@
             parse_picture_segment(avctx, buf, segment_length);
             break;
         case PRESENTATION_SEGMENT:
-            parse_presentation_segment(avctx, buf, segment_length, sub->pts);
+            ret = parse_presentation_segment(avctx, buf, segment_length, sub->pts);
+            if (ret < 0)
+                return ret;
             break;
         case WINDOW_SEGMENT:
             /*

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/pictordec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/pictordec.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/png_parser.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/png_parser.c Changed

@@ -27,12 +27,11 @@
 #include "parser.h"
 #include "png.h"
 
-typedef struct PNGParseContext
-{
+typedef struct PNGParseContext {
     ParseContext pc;
-    uint32_t index;
-    uint32_t chunk_length;
-    uint32_t remaining_size;
+    uint32_t chunk_pos;           ///< position inside current chunk
+    uint32_t chunk_length;        ///< length of the current chunk
+    uint32_t remaining_size;      ///< remaining size of the current chunk
 } PNGParseContext;
 
 static int png_parse(AVCodecParserContext *s, AVCodecContext *avctx,
@@ -60,38 +59,37 @@
             }
         }
         ppc->pc.state64 = state64;
-    } else
-        if (ppc->remaining_size) {
-            i = FFMIN(ppc->remaining_size, buf_size);
-            ppc->remaining_size -= i;
-            if (ppc->remaining_size)
-                goto flush;
-            if (ppc->index == -1) {
-                next = i;
-                goto flush;
-            }
+    } else if (ppc->remaining_size) {
+        i = FFMIN(ppc->remaining_size, buf_size);
+        ppc->remaining_size -= i;
+        if (ppc->remaining_size)
+            goto flush;
+        if (ppc->chunk_pos == -1) {
+            next = i;
+            goto flush;
         }
+    }
 
-    for (;ppc->pc.frame_start_found && i < buf_size; i++) {
-        ppc->pc.state = (ppc->pc.state<<8) | buf[i];
-        if (ppc->index == 3) {
+    for (; ppc->pc.frame_start_found && i < buf_size; i++) {
+        ppc->pc.state = (ppc->pc.state << 8) | buf[i];
+        if (ppc->chunk_pos == 3) {
             ppc->chunk_length = ppc->pc.state;
             if (ppc->chunk_length > 0x7fffffff) {
-                ppc->index = ppc->pc.frame_start_found = 0;
+                ppc->chunk_pos = ppc->pc.frame_start_found = 0;
                 goto flush;
             }
             ppc->chunk_length += 4;
-        } else if (ppc->index == 7) {
+        } else if (ppc->chunk_pos == 7) {
             if (ppc->chunk_length >= buf_size - i)
-                    ppc->remaining_size = ppc->chunk_length - buf_size + i + 1;
+                ppc->remaining_size = ppc->chunk_length - buf_size + i + 1;
             if (ppc->pc.state == MKBETAG('I', 'E', 'N', 'D')) {
                 if (ppc->remaining_size)
-                    ppc->index = -1;
+                    ppc->chunk_pos = -1;
                 else
                     next = ppc->chunk_length + i + 1;
                 break;
             } else {
-                ppc->index = 0;
+                ppc->chunk_pos = 0;
                 if (ppc->remaining_size)
                     break;
                 else
@@ -99,13 +97,14 @@
                 continue;
             }
         }
-        ppc->index++;
+        ppc->chunk_pos++;
     }
+
 flush:
     if (ff_combine_frame(&ppc->pc, next, &buf, &buf_size) < 0)
         return buf_size;
 
-    ppc->index = ppc->pc.frame_start_found = 0;
+    ppc->chunk_pos = ppc->pc.frame_start_found = 0;
 
     *poutbuf      = buf;
     *poutbuf_size = buf_size;

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/pngdec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/pngdec.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/pngenc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/pngenc.c Changed

@@ -38,7 +38,6 @@
     uint8_t *bytestream;
     uint8_t *bytestream_start;
     uint8_t *bytestream_end;
-    AVFrame picture;
 
     int filter_type;
 
@@ -114,6 +113,22 @@
     }
 }
 
+static void sub_left_prediction(DSPContext *dsp, uint8_t *dst, const uint8_t *src, int bpp, int size)
+{
+    const uint8_t *src1 = src + bpp;
+    const uint8_t *src2 = src;
+    int x, unaligned_w;
+
+    memcpy(dst, src, bpp);
+    dst += bpp;
+    size -= bpp;
+    unaligned_w = FFMIN(32 - bpp, size);
+    for (x = 0; x < unaligned_w; x++)
+        *dst++ = *src1++ - *src2++;
+    size -= unaligned_w;
+    dsp->diff_bytes(dst, src1, src2, size);
+}
+
 static void png_filter_row(DSPContext *dsp, uint8_t *dst, int filter_type,
                            uint8_t *src, uint8_t *top, int size, int bpp)
 {
@@ -124,8 +139,7 @@
         memcpy(dst, src, size);
         break;
     case PNG_FILTER_VALUE_SUB:
-        dsp->diff_bytes(dst, src, src-bpp, size);
-        memcpy(dst, src, bpp);
+        sub_left_prediction(dsp, dst, src, bpp, size);
         break;
     case PNG_FILTER_VALUE_UP:
         dsp->diff_bytes(dst, src, top, size);
@@ -218,7 +232,7 @@
                         const AVFrame *pict, int *got_packet)
 {
     PNGEncContext *s = avctx->priv_data;
-    AVFrame * const p= &s->picture;
+    const AVFrame * const p = pict;
     int bit_depth, color_type, y, len, row_size, ret, is_progressive;
     int bits_per_pixel, pass_row_size, enc_row_size;
     int64_t max_packet_size;
@@ -228,10 +242,6 @@
     uint8_t *progressive_buf = NULL;
     uint8_t *top_buf = NULL;
 
-    *p = *pict;
-    p->pict_type= AV_PICTURE_TYPE_I;
-    p->key_frame= 1;
-
     is_progressive = !!(avctx->flags & CODEC_FLAG_INTERLACED_DCT);
     switch(avctx->pix_fmt) {
     case AV_PIX_FMT_RGBA64BE:
@@ -454,8 +464,13 @@
         avctx->bits_per_coded_sample = 8;
     }
 
-    avcodec_get_frame_defaults(&s->picture);
-    avctx->coded_frame= &s->picture;
+    avctx->coded_frame = av_frame_alloc();
+    if (!avctx->coded_frame)
+        return AVERROR(ENOMEM);
+
+    avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I;
+    avctx->coded_frame->key_frame = 1;
+
     ff_dsputil_init(&s->dsp, avctx);
 
     s->filter_type = av_clip(avctx->prediction_method, PNG_FILTER_VALUE_NONE, PNG_FILTER_VALUE_MIXED);
@@ -472,6 +487,12 @@
     return 0;
 }
 
+static av_cold int png_enc_close(AVCodecContext *avctx)
+{
+    av_frame_free(&avctx->coded_frame);
+    return 0;
+}
+
 #define OFFSET(x) offsetof(PNGEncContext, x)
 #define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM
 static const AVOption options[] = {
@@ -494,6 +515,7 @@
     .id             = AV_CODEC_ID_PNG,
     .priv_data_size = sizeof(PNGEncContext),
     .init           = png_enc_init,
+    .close          = png_enc_close,
     .encode2        = encode_frame,
     .capabilities   = CODEC_CAP_FRAME_THREADS | CODEC_CAP_INTRA_ONLY,
     .pix_fmts       = (const enum AVPixelFormat[]){

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/pnmenc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/pnmenc.c Changed

@@ -22,13 +22,11 @@
 #include "libavutil/pixdesc.h"
 #include "avcodec.h"
 #include "internal.h"
-#include "pnm.h"
-
 
 static int pnm_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
                             const AVFrame *p, int *got_packet)
 {
-    PNMContext *s     = avctx->priv_data;
+    uint8_t *bytestream, *bytestream_start, *bytestream_end;
     int i, h, h1, c, n, linesize, ret;
     uint8_t *ptr, *ptr1, *ptr2;
 
@@ -37,9 +35,9 @@
                                                        avctx->height) + 200)) < 0)
         return ret;
 
-    s->bytestream_start =
-    s->bytestream       = pkt->data;
-    s->bytestream_end   = pkt->data + pkt->size;
+    bytestream_start =
+    bytestream       = pkt->data;
+    bytestream_end   = pkt->data + pkt->size;
 
     h  = avctx->height;
     h1 = h;
@@ -81,22 +79,22 @@
     default:
         return -1;
     }
-    snprintf(s->bytestream, s->bytestream_end - s->bytestream,
+    snprintf(bytestream, bytestream_end - bytestream,
              "P%c\n%d %d\n", c, avctx->width, h1);
-    s->bytestream += strlen(s->bytestream);
+    bytestream += strlen(bytestream);
     if (avctx->pix_fmt != AV_PIX_FMT_MONOWHITE) {
         int maxdepth = (1 << (av_pix_fmt_desc_get(avctx->pix_fmt)->comp[0].depth_minus1 + 1)) - 1;
-        snprintf(s->bytestream, s->bytestream_end - s->bytestream,
+        snprintf(bytestream, bytestream_end - bytestream,
                  "%d\n", maxdepth);
-        s->bytestream += strlen(s->bytestream);
+        bytestream += strlen(bytestream);
     }
 
     ptr      = p->data[0];
     linesize = p->linesize[0];
     for (i = 0; i < h; i++) {
-        memcpy(s->bytestream, ptr, n);
-        s->bytestream += n;
-        ptr           += linesize;
+        memcpy(bytestream, ptr, n);
+        bytestream += n;
+        ptr        += linesize;
     }
 
     if (avctx->pix_fmt == AV_PIX_FMT_YUV420P || avctx->pix_fmt == AV_PIX_FMT_YUV420P16BE) {
@@ -105,21 +103,38 @@
         ptr1 = p->data[1];
         ptr2 = p->data[2];
         for (i = 0; i < h; i++) {
-            memcpy(s->bytestream, ptr1, n);
-            s->bytestream += n;
-            memcpy(s->bytestream, ptr2, n);
-            s->bytestream += n;
+            memcpy(bytestream, ptr1, n);
+            bytestream += n;
+            memcpy(bytestream, ptr2, n);
+            bytestream += n;
                 ptr1 += p->linesize[1];
                 ptr2 += p->linesize[2];
         }
     }
-    pkt->size   = s->bytestream - s->bytestream_start;
+    pkt->size   = bytestream - bytestream_start;
     pkt->flags |= AV_PKT_FLAG_KEY;
     *got_packet = 1;
 
     return 0;
 }
 
+static av_cold int pnm_encode_init(AVCodecContext *avctx)
+{
+    avctx->coded_frame = av_frame_alloc();
+    if (!avctx->coded_frame)
+        return AVERROR(ENOMEM);
+
+    avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I;
+    avctx->coded_frame->key_frame = 1;
+
+    return 0;
+}
+
+static av_cold int pnm_encode_close(AVCodecContext *avctx)
+{
+    av_frame_free(&avctx->coded_frame);
+    return 0;
+}
 
 #if CONFIG_PGM_ENCODER
 AVCodec ff_pgm_encoder = {
@@ -127,7 +142,8 @@
     .long_name      = NULL_IF_CONFIG_SMALL("PGM (Portable GrayMap) image"),
     .type           = AVMEDIA_TYPE_VIDEO,
     .id             = AV_CODEC_ID_PGM,
-    .priv_data_size = sizeof(PNMContext),
+    .init           = pnm_encode_init,
+    .close          = pnm_encode_close,
     .encode2        = pnm_encode_frame,
     .pix_fmts       = (const enum AVPixelFormat[]){
         AV_PIX_FMT_GRAY8, AV_PIX_FMT_GRAY16BE, AV_PIX_FMT_NONE
@@ -141,7 +157,8 @@
     .long_name      = NULL_IF_CONFIG_SMALL("PGMYUV (Portable GrayMap YUV) image"),
     .type           = AVMEDIA_TYPE_VIDEO,
     .id             = AV_CODEC_ID_PGMYUV,
-    .priv_data_size = sizeof(PNMContext),
+    .init           = pnm_encode_init,
+    .close          = pnm_encode_close,
     .encode2        = pnm_encode_frame,
     .pix_fmts       = (const enum AVPixelFormat[]){
         AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV420P16BE, AV_PIX_FMT_NONE
@@ -155,7 +172,8 @@
     .long_name      = NULL_IF_CONFIG_SMALL("PPM (Portable PixelMap) image"),
     .type           = AVMEDIA_TYPE_VIDEO,
     .id             = AV_CODEC_ID_PPM,
-    .priv_data_size = sizeof(PNMContext),
+    .init           = pnm_encode_init,
+    .close          = pnm_encode_close,
     .encode2        = pnm_encode_frame,
     .pix_fmts       = (const enum AVPixelFormat[]){
         AV_PIX_FMT_RGB24, AV_PIX_FMT_RGB48BE, AV_PIX_FMT_NONE
@@ -169,7 +187,8 @@
     .long_name      = NULL_IF_CONFIG_SMALL("PBM (Portable BitMap) image"),
     .type           = AVMEDIA_TYPE_VIDEO,
     .id             = AV_CODEC_ID_PBM,
-    .priv_data_size = sizeof(PNMContext),
+    .init           = pnm_encode_init,
+    .close          = pnm_encode_close,
     .encode2        = pnm_encode_frame,
     .pix_fmts       = (const enum AVPixelFormat[]){ AV_PIX_FMT_MONOWHITE,
                                                   AV_PIX_FMT_NONE },

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/ppc/dsputil_altivec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/ppc/dsputil_altivec.c Changed

@@ -285,10 +285,10 @@
         /* Read potentially unaligned pixels into t1 and t2
            Since we're reading 16 pixels, and actually only want 8,
            mask out the last 8 pixels. The 0s don't change the sum. */
-        vector unsigned char pix1l = vec_ld( 0, pix1);
-        vector unsigned char pix1r = vec_ld(15, pix1);
-        vector unsigned char pix2l = vec_ld( 0, pix2);
-        vector unsigned char pix2r = vec_ld(15, pix2);
+        vector unsigned char pix1l = vec_ld(0, pix1);
+        vector unsigned char pix1r = vec_ld(7, pix1);
+        vector unsigned char pix2l = vec_ld(0, pix2);
+        vector unsigned char pix2r = vec_ld(7, pix2);
         t1 = vec_and(vec_perm(pix1l, pix1r, perm1), permclear);
         t2 = vec_and(vec_perm(pix2l, pix2r, perm2), permclear);
 
@@ -367,10 +367,10 @@
         /* Read potentially unaligned pixels into t1 and t2
            Since we're reading 16 pixels, and actually only want 8,
            mask out the last 8 pixels. The 0s don't change the sum. */
-        vector unsigned char pix1l = vec_ld( 0, pix1);
-        vector unsigned char pix1r = vec_ld(15, pix1);
-        vector unsigned char pix2l = vec_ld( 0, pix2);
-        vector unsigned char pix2r = vec_ld(15, pix2);
+        vector unsigned char pix1l = vec_ld(0, pix1);
+        vector unsigned char pix1r = vec_ld(7, pix1);
+        vector unsigned char pix2l = vec_ld(0, pix2);
+        vector unsigned char pix2r = vec_ld(7, pix2);
         t1 = vec_and(vec_perm(pix1l, pix1r, perm1), permclear);
         t2 = vec_and(vec_perm(pix2l, pix2r, perm2), permclear);
 
@@ -489,8 +489,8 @@
         // Read potentially unaligned pixels.
         // We're reading 16 pixels, and actually only want 8,
         // but we simply ignore the extras.
-        vector unsigned char pixl = vec_ld( 0, pixels);
-        vector unsigned char pixr = vec_ld(15, pixels);
+        vector unsigned char pixl = vec_ld(0, pixels);
+        vector unsigned char pixr = vec_ld(7, pixels);
         bytes = vec_perm(pixl, pixr, perm);
 
         // convert the bytes into shorts

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/ppc/h264dsp.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/ppc/h264dsp.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/proresdsp.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/proresdsp.c Changed

@@ -20,9 +20,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "config.h"
 #include "libavutil/attributes.h"
 #include "libavutil/common.h"
-#include "dct.h"
 #include "dsputil.h"
 #include "proresdsp.h"
 #include "simple_idct.h"
@@ -31,9 +31,8 @@
 #define CLIP_MIN (1 << (PRORES_BITS_PER_SAMPLE - 8))           ///< minimum value for clipping resulting pixels
 #define CLIP_MAX (1 << PRORES_BITS_PER_SAMPLE) - CLIP_MIN - 1  ///< maximum value for clipping resulting pixels
 
-#define CLIP_AND_BIAS(x) (av_clip((x) + BIAS, CLIP_MIN, CLIP_MAX))
+#define CLIP(x) (av_clip((x), CLIP_MIN, CLIP_MAX))
 
-#if CONFIG_PRORES_DECODER | CONFIG_PRORES_LGPL_DECODER
 /**
  * Add bias value, clamp and output pixels of a slice
  */
@@ -45,7 +44,7 @@
         for (x = 0; x < 8; x++) {
             src_offset = (y << 3) + x;
 
-            dst[dst_offset + x] = CLIP_AND_BIAS(in[src_offset]);
+            dst[dst_offset + x] = CLIP(in[src_offset]);
         }
     }
 }
@@ -55,38 +54,15 @@
     ff_prores_idct(block, qmat);
     put_pixels(out, linesize >> 1, block);
 }
-#endif
-
-#if CONFIG_PRORES_KS_ENCODER
-static void prores_fdct_c(const uint16_t *src, int linesize, int16_t *block)
-{
-    int x, y;
-    const uint16_t *tsrc = src;
-
-    for (y = 0; y < 8; y++) {
-        for (x = 0; x < 8; x++)
-            block[y * 8 + x] = tsrc[x];
-        tsrc += linesize >> 1;
-    }
-    ff_jpeg_fdct_islow_10(block);
-}
-#endif
 
 av_cold void ff_proresdsp_init(ProresDSPContext *dsp, AVCodecContext *avctx)
 {
-#if CONFIG_PRORES_DECODER | CONFIG_PRORES_LGPL_DECODER
     dsp->idct_put = prores_idct_put_c;
     dsp->idct_permutation_type = FF_NO_IDCT_PERM;
 
-    if (ARCH_X86) ff_proresdsp_x86_init(dsp, avctx);
+    if (ARCH_X86)
+        ff_proresdsp_init_x86(dsp, avctx);
 
     ff_init_scantable_permutation(dsp->idct_permutation,
                                   dsp->idct_permutation_type);
-#endif
-#if CONFIG_PRORES_KS_ENCODER
-    dsp->fdct                 = prores_fdct_c;
-    dsp->dct_permutation_type = FF_NO_IDCT_PERM;
-    ff_init_scantable_permutation(dsp->dct_permutation,
-                                  dsp->dct_permutation_type);
-#endif
 }

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/proresdsp.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/proresdsp.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/proresenc_anatoliy.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/proresenc_anatoliy.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/proresenc_kostya.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/proresenc_kostya.c Changed

@@ -26,11 +26,11 @@
 #include "libavutil/opt.h"
 #include "libavutil/pixdesc.h"
 #include "avcodec.h"
+#include "dct.h"
 #include "dsputil.h"
 #include "put_bits.h"
 #include "bytestream.h"
 #include "internal.h"
-#include "proresdsp.h"
 #include "proresdata.h"
 
 #define CFACTOR_Y422 2
@@ -193,9 +193,11 @@
     int16_t quants[MAX_STORED_Q][64];
     int16_t custom_q[64];
     const uint8_t *quant_mat;
+    const uint8_t *scantable;
 
-    ProresDSPContext dsp;
-    ScanTable  scantable;
+    void (* fdct)(DSPContext *dsp, const uint16_t *src,
+                  int linesize, int16_t *block);
+    DSPContext dsp;
 
     int mb_width, mb_height;
     int mbs_per_slice;
@@ -264,27 +266,27 @@
                        mb_width * sizeof(*emu_buf));
         }
         if (!is_chroma) {
-            ctx->dsp.fdct(esrc, elinesize, blocks);
+            ctx->fdct(&ctx->dsp, esrc, elinesize, blocks);
             blocks += 64;
             if (blocks_per_mb > 2) {
-                ctx->dsp.fdct(esrc + 8, elinesize, blocks);
+                ctx->fdct(&ctx->dsp, esrc + 8, elinesize, blocks);
                 blocks += 64;
             }
-            ctx->dsp.fdct(esrc + elinesize * 4, elinesize, blocks);
+            ctx->fdct(&ctx->dsp, esrc + elinesize * 4, elinesize, blocks);
             blocks += 64;
             if (blocks_per_mb > 2) {
-                ctx->dsp.fdct(esrc + elinesize * 4 + 8, elinesize, blocks);
+                ctx->fdct(&ctx->dsp, esrc + elinesize * 4 + 8, elinesize, blocks);
                 blocks += 64;
             }
         } else {
-            ctx->dsp.fdct(esrc, elinesize, blocks);
+            ctx->fdct(&ctx->dsp, esrc, elinesize, blocks);
             blocks += 64;
-            ctx->dsp.fdct(esrc + elinesize * 4, elinesize, blocks);
+            ctx->fdct(&ctx->dsp, esrc + elinesize * 4, elinesize, blocks);
             blocks += 64;
             if (blocks_per_mb > 2) {
-                ctx->dsp.fdct(esrc + 8, elinesize, blocks);
+                ctx->fdct(&ctx->dsp, esrc + 8, elinesize, blocks);
                 blocks += 64;
-                ctx->dsp.fdct(esrc + elinesize * 4 + 8, elinesize, blocks);
+                ctx->fdct(&ctx->dsp, esrc + elinesize * 4 + 8, elinesize, blocks);
                 blocks += 64;
             }
         }
@@ -429,7 +431,7 @@
 
     encode_dcs(pb, blocks, blocks_per_slice, qmat[0]);
     encode_acs(pb, blocks, blocks_per_slice, plane_size_factor,
-               ctx->scantable.permutated, qmat);
+               ctx->scantable, qmat);
     flush_put_bits(pb);
 
     return (put_bits_count(pb) - saved_pos) >> 3;
@@ -676,7 +678,7 @@
 
     bits  = estimate_dcs(error, td->blocks[plane], blocks_per_slice, qmat[0]);
     bits += estimate_acs(error, td->blocks[plane], blocks_per_slice,
-                         plane_size_factor, ctx->scantable.permutated, qmat);
+                         plane_size_factor, ctx->scantable, qmat);
 
     return FFALIGN(bits, 8);
 }
@@ -1064,6 +1066,20 @@
     return 0;
 }
 
+static void prores_fdct(DSPContext *dsp, const uint16_t *src,
+                        int linesize, int16_t *block)
+{
+    int x, y;
+    const uint16_t *tsrc = src;
+
+    for (y = 0; y < 8; y++) {
+        for (x = 0; x < 8; x++)
+            block[y * 8 + x] = tsrc[x];
+        tsrc += linesize >> 1;
+    }
+    dsp->fdct(block);
+}
+
 static av_cold int encode_init(AVCodecContext *avctx)
 {
     ProresContext *ctx = avctx->priv_data;
@@ -1073,14 +1089,14 @@
     int interlaced = !!(avctx->flags & CODEC_FLAG_INTERLACED_DCT);
 
     avctx->bits_per_raw_sample = 10;
-    avctx->coded_frame = avcodec_alloc_frame();
+    avctx->coded_frame = av_frame_alloc();
     if (!avctx->coded_frame)
         return AVERROR(ENOMEM);
 
-    ff_proresdsp_init(&ctx->dsp, avctx);
-    ff_init_scantable(ctx->dsp.dct_permutation, &ctx->scantable,
-                      interlaced ? ff_prores_interlaced_scan
-                                 : ff_prores_progressive_scan);
+    ctx->fdct      = prores_fdct;
+    ctx->scantable = interlaced ? ff_prores_interlaced_scan
+                                : ff_prores_progressive_scan;
+    ff_dsputil_init(&ctx->dsp, avctx);
 
     mps = ctx->mbs_per_slice;
     if (mps & (mps - 1)) {

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/pthread.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/pthread.c Changed

@@ -29,1052 +29,10 @@
  * @see doc/multithreading.txt
  */
 
-#include "config.h"
-
 #include "avcodec.h"
 #include "internal.h"
+#include "pthread_internal.h"
 #include "thread.h"
-#include "libavutil/avassert.h"
-#include "libavutil/common.h"
-#include "libavutil/cpu.h"
-#include "libavutil/internal.h"
-
-#if HAVE_PTHREADS
-#include <pthread.h>
-#elif HAVE_W32THREADS
-#include "compat/w32pthreads.h"
-#elif HAVE_OS2THREADS
-#include "compat/os2threads.h"
-#endif
-
-typedef int (action_func)(AVCodecContext *c, void *arg);
-typedef int (action_func2)(AVCodecContext *c, void *arg, int jobnr, int threadnr);
-
-typedef struct ThreadContext {
-    pthread_t *workers;
-    action_func *func;
-    action_func2 *func2;
-    void *args;
-    int *rets;
-    int rets_count;
-    int job_count;
-    int job_size;
-
-    pthread_cond_t last_job_cond;
-    pthread_cond_t current_job_cond;
-    pthread_mutex_t current_job_lock;
-    unsigned current_execute;
-    int current_job;
-    int done;
-
-    int *entries;
-    int entries_count;
-    int thread_count;
-    pthread_cond_t *progress_cond;
-    pthread_mutex_t *progress_mutex;
-} ThreadContext;
-
-/**
- * Context used by codec threads and stored in their AVCodecContext thread_opaque.
- */
-typedef struct PerThreadContext {
-    struct FrameThreadContext *parent;
-
-    pthread_t      thread;
-    int            thread_init;
-    pthread_cond_t input_cond;      ///< Used to wait for a new packet from the main thread.
-    pthread_cond_t progress_cond;   ///< Used by child threads to wait for progress to change.
-    pthread_cond_t output_cond;     ///< Used by the main thread to wait for frames to finish.
-
-    pthread_mutex_t mutex;          ///< Mutex used to protect the contents of the PerThreadContext.
-    pthread_mutex_t progress_mutex; ///< Mutex used to protect frame progress values and progress_cond.
-
-    AVCodecContext *avctx;          ///< Context used to decode packets passed to this thread.
-
-    AVPacket       avpkt;           ///< Input packet (for decoding) or output (for encoding).
-    uint8_t       *buf;             ///< backup storage for packet data when the input packet is not refcounted
-    int            allocated_buf_size; ///< Size allocated for buf
-
-    AVFrame frame;                  ///< Output frame (for decoding) or input (for encoding).
-    int     got_frame;              ///< The output of got_picture_ptr from the last avcodec_decode_video() call.
-    int     result;                 ///< The result of the last codec decode/encode() call.
-
-    enum {
-        STATE_INPUT_READY,          ///< Set when the thread is awaiting a packet.
-        STATE_SETTING_UP,           ///< Set before the codec has called ff_thread_finish_setup().
-        STATE_GET_BUFFER,           /**<
-                                     * Set when the codec calls get_buffer().
-                                     * State is returned to STATE_SETTING_UP afterwards.
-                                     */
-        STATE_GET_FORMAT,           /**<
-                                     * Set when the codec calls get_format().
-                                     * State is returned to STATE_SETTING_UP afterwards.
-                                     */
-        STATE_SETUP_FINISHED        ///< Set after the codec has called ff_thread_finish_setup().
-    } state;
-
-    /**
-     * Array of frames passed to ff_thread_release_buffer().
-     * Frames are released after all threads referencing them are finished.
-     */
-    AVFrame *released_buffers;
-    int  num_released_buffers;
-    int      released_buffers_allocated;
-
-    AVFrame *requested_frame;       ///< AVFrame the codec passed to get_buffer()
-    int      requested_flags;       ///< flags passed to get_buffer() for requested_frame
-
-    const enum AVPixelFormat *available_formats; ///< Format array for get_format()
-    enum AVPixelFormat result_format;            ///< get_format() result
-} PerThreadContext;
-
-/**
- * Context stored in the client AVCodecContext thread_opaque.
- */
-typedef struct FrameThreadContext {
-    PerThreadContext *threads;     ///< The contexts for each thread.
-    PerThreadContext *prev_thread; ///< The last thread submit_packet() was called on.
-
-    pthread_mutex_t buffer_mutex;  ///< Mutex used to protect get/release_buffer().
-
-    int next_decoding;             ///< The next context to submit a packet to.
-    int next_finished;             ///< The next context to return output from.
-
-    int delaying;                  /**<
-                                    * Set for the first N packets, where N is the number of threads.
-                                    * While it is set, ff_thread_en/decode_frame won't return any results.
-                                    */
-
-    int die;                       ///< Set when threads should exit.
-} FrameThreadContext;
-
-
-/* H264 slice threading seems to be buggy with more than 16 threads,
- * limit the number of threads to 16 for automatic detection */
-#define MAX_AUTO_THREADS 16
-
-static void* attribute_align_arg worker(void *v)
-{
-    AVCodecContext *avctx = v;
-    ThreadContext *c = avctx->thread_opaque;
-    unsigned last_execute = 0;
-    int our_job = c->job_count;
-    int thread_count = avctx->thread_count;
-    int self_id;
-
-    pthread_mutex_lock(&c->current_job_lock);
-    self_id = c->current_job++;
-    for (;;){
-        while (our_job >= c->job_count) {
-            if (c->current_job == thread_count + c->job_count)
-                pthread_cond_signal(&c->last_job_cond);
-
-            while (last_execute == c->current_execute && !c->done)
-                pthread_cond_wait(&c->current_job_cond, &c->current_job_lock);
-            last_execute = c->current_execute;
-            our_job = self_id;
-
-            if (c->done) {
-                pthread_mutex_unlock(&c->current_job_lock);
-                return NULL;
-            }
-        }
-        pthread_mutex_unlock(&c->current_job_lock);
-
-        c->rets[our_job%c->rets_count] = c->func ? c->func(avctx, (char*)c->args + our_job*c->job_size):
-                                                   c->func2(avctx, c->args, our_job, self_id);
-
-        pthread_mutex_lock(&c->current_job_lock);
-        our_job = c->current_job++;
-    }
-}
-
-static av_always_inline void avcodec_thread_park_workers(ThreadContext *c, int thread_count)
-{
-    while (c->current_job != thread_count + c->job_count)
-        pthread_cond_wait(&c->last_job_cond, &c->current_job_lock);
-    pthread_mutex_unlock(&c->current_job_lock);
-}
-
-static void thread_free(AVCodecContext *avctx)
-{
-    ThreadContext *c = avctx->thread_opaque;
-    int i;
-
-    pthread_mutex_lock(&c->current_job_lock);
-    c->done = 1;
-    pthread_cond_broadcast(&c->current_job_cond);
-    pthread_mutex_unlock(&c->current_job_lock);
-
-    for (i=0; i<avctx->thread_count; i++)
-         pthread_join(c->workers[i], NULL);
-
-    pthread_mutex_destroy(&c->current_job_lock);
-    pthread_cond_destroy(&c->current_job_cond);
-    pthread_cond_destroy(&c->last_job_cond);
-    av_free(c->workers);
-    av_freep(&avctx->thread_opaque);
-}
-
-static int avcodec_thread_execute(AVCodecContext *avctx, action_func* func, void *arg, int *ret, int job_count, int job_size)
-{
-    ThreadContext *c= avctx->thread_opaque;
-    int dummy_ret;
-
-    if (!(avctx->active_thread_type&FF_THREAD_SLICE) || avctx->thread_count <= 1)
-        return avcodec_default_execute(avctx, func, arg, ret, job_count, job_size);
-
-    if (job_count <= 0)
-        return 0;
-
-    pthread_mutex_lock(&c->current_job_lock);
-
-    c->current_job = avctx->thread_count;
-    c->job_count = job_count;
-    c->job_size = job_size;
-    c->args = arg;
-    c->func = func;
-    if (ret) {
-        c->rets = ret;
-        c->rets_count = job_count;
-    } else {
-        c->rets = &dummy_ret;
-        c->rets_count = 1;
-    }
-    c->current_execute++;
-    pthread_cond_broadcast(&c->current_job_cond);
-
-    avcodec_thread_park_workers(c, avctx->thread_count);
-
-    return 0;
-}
-
-static int avcodec_thread_execute2(AVCodecContext *avctx, action_func2* func2, void *arg, int *ret, int job_count)
-{
-    ThreadContext *c= avctx->thread_opaque;
-    c->func2 = func2;
-    return avcodec_thread_execute(avctx, NULL, arg, ret, job_count, 0);
-}
-
-static int thread_init_internal(AVCodecContext *avctx)
-{
-    int i;
-    ThreadContext *c;
-    int thread_count = avctx->thread_count;
-
-    if (!thread_count) {
-        int nb_cpus = av_cpu_count();
-        if  (avctx->height)
-            nb_cpus = FFMIN(nb_cpus, (avctx->height+15)/16);
-        // use number of cores + 1 as thread count if there is more than one
-        if (nb_cpus > 1)
-            thread_count = avctx->thread_count = FFMIN(nb_cpus + 1, MAX_AUTO_THREADS);
-        else
-            thread_count = avctx->thread_count = 1;
-    }
-
-    if (thread_count <= 1) {
-        avctx->active_thread_type = 0;
-        return 0;
-    }
-
-    c = av_mallocz(sizeof(ThreadContext));
-    if (!c)
-        return -1;
-
-    c->workers = av_mallocz(sizeof(pthread_t)*thread_count);
-    if (!c->workers) {
-        av_free(c);
-        return -1;
-    }
-
-    avctx->thread_opaque = c;
-    c->current_job = 0;
-    c->job_count = 0;
-    c->job_size = 0;
-    c->done = 0;
-    pthread_cond_init(&c->current_job_cond, NULL);
-    pthread_cond_init(&c->last_job_cond, NULL);
-    pthread_mutex_init(&c->current_job_lock, NULL);
-    pthread_mutex_lock(&c->current_job_lock);
-    for (i=0; i<thread_count; i++) {
-        if(pthread_create(&c->workers[i], NULL, worker, avctx)) {
-           avctx->thread_count = i;
-           pthread_mutex_unlock(&c->current_job_lock);
-           ff_thread_free(avctx);
-           return -1;
-        }
-    }
-
-    avcodec_thread_park_workers(c, thread_count);
-
-    avctx->execute = avcodec_thread_execute;
-    avctx->execute2 = avcodec_thread_execute2;
-    return 0;
-}
-
-#define THREAD_SAFE_CALLBACKS(avctx) \
-((avctx)->thread_safe_callbacks || (!(avctx)->get_buffer && (avctx)->get_buffer2 == avcodec_default_get_buffer2))
-
-/**
- * Codec worker thread.
- *
- * Automatically calls ff_thread_finish_setup() if the codec does
- * not provide an update_thread_context method, or if the codec returns
- * before calling it.
- */
-static attribute_align_arg void *frame_worker_thread(void *arg)
-{
-    PerThreadContext *p = arg;
-    FrameThreadContext *fctx = p->parent;
-    AVCodecContext *avctx = p->avctx;
-    const AVCodec *codec = avctx->codec;
-
-    pthread_mutex_lock(&p->mutex);
-    while (1) {
-            while (p->state == STATE_INPUT_READY && !fctx->die)
-                pthread_cond_wait(&p->input_cond, &p->mutex);
-
-        if (fctx->die) break;
-
-        if (!codec->update_thread_context && THREAD_SAFE_CALLBACKS(avctx))
-            ff_thread_finish_setup(avctx);
-
-        avcodec_get_frame_defaults(&p->frame);
-        p->got_frame = 0;
-        p->result = codec->decode(avctx, &p->frame, &p->got_frame, &p->avpkt);
-
-        /* many decoders assign whole AVFrames, thus overwriting extended_data;
-         * make sure it's set correctly */
-        p->frame.extended_data = p->frame.data;
-
-        if (p->state == STATE_SETTING_UP) ff_thread_finish_setup(avctx);
-
-        pthread_mutex_lock(&p->progress_mutex);
-#if 0 //BUFREF-FIXME
-        for (i = 0; i < MAX_BUFFERS; i++)
-            if (p->progress_used[i] && (p->got_frame || p->result<0 || avctx->codec_id != AV_CODEC_ID_H264)) {
-                p->progress[i][0] = INT_MAX;
-                p->progress[i][1] = INT_MAX;
-            }
-#endif
-        p->state = STATE_INPUT_READY;
-
-        pthread_cond_broadcast(&p->progress_cond);
-        pthread_cond_signal(&p->output_cond);
-        pthread_mutex_unlock(&p->progress_mutex);
-    }
-    pthread_mutex_unlock(&p->mutex);
-
-    return NULL;
-}
-
-/**
- * Update the next thread's AVCodecContext with values from the reference thread's context.
- *
- * @param dst The destination context.
- * @param src The source context.
- * @param for_user 0 if the destination is a codec thread, 1 if the destination is the user's thread
- */
-static int update_context_from_thread(AVCodecContext *dst, AVCodecContext *src, int for_user)
-{
-    int err = 0;
-
-    if (dst != src) {
-        dst->time_base = src->time_base;
-        dst->width     = src->width;
-        dst->height    = src->height;
-        dst->pix_fmt   = src->pix_fmt;
-
-        dst->coded_width  = src->coded_width;
-        dst->coded_height = src->coded_height;
-
-        dst->has_b_frames = src->has_b_frames;
-        dst->idct_algo    = src->idct_algo;
-
-        dst->bits_per_coded_sample = src->bits_per_coded_sample;
-        dst->sample_aspect_ratio   = src->sample_aspect_ratio;
-        dst->dtg_active_format     = src->dtg_active_format;
-
-        dst->profile = src->profile;
-        dst->level   = src->level;
-
-        dst->bits_per_raw_sample = src->bits_per_raw_sample;
-        dst->ticks_per_frame     = src->ticks_per_frame;
-        dst->color_primaries     = src->color_primaries;
-
-        dst->color_trc   = src->color_trc;
-        dst->colorspace  = src->colorspace;
-        dst->color_range = src->color_range;
-        dst->chroma_sample_location = src->chroma_sample_location;
-
-        dst->hwaccel = src->hwaccel;
-        dst->hwaccel_context = src->hwaccel_context;
-
-        dst->channels       = src->channels;
-        dst->sample_rate    = src->sample_rate;
-        dst->sample_fmt     = src->sample_fmt;
-        dst->channel_layout = src->channel_layout;
-    }
-
-    if (for_user) {
-        dst->delay       = src->thread_count - 1;
-        dst->coded_frame = src->coded_frame;
-    } else {
-        if (dst->codec->update_thread_context)
-            err = dst->codec->update_thread_context(dst, src);
-    }
-
-    return err;
-}
-
-/**
- * Update the next thread's AVCodecContext with values set by the user.
- *
- * @param dst The destination context.
- * @param src The source context.
- * @return 0 on success, negative error code on failure
- */
-static int update_context_from_user(AVCodecContext *dst, AVCodecContext *src)
-{
-#define copy_fields(s, e) memcpy(&dst->s, &src->s, (char*)&dst->e - (char*)&dst->s);
-    dst->flags          = src->flags;
-
-    dst->draw_horiz_band= src->draw_horiz_band;
-    dst->get_buffer2    = src->get_buffer2;
-#if FF_API_GET_BUFFER
-FF_DISABLE_DEPRECATION_WARNINGS
-    dst->get_buffer     = src->get_buffer;
-    dst->release_buffer = src->release_buffer;
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
-
-    dst->opaque   = src->opaque;
-    dst->debug    = src->debug;
-    dst->debug_mv = src->debug_mv;
-
-    dst->slice_flags = src->slice_flags;
-    dst->flags2      = src->flags2;
-
-    copy_fields(skip_loop_filter, subtitle_header);
-
-    dst->frame_number     = src->frame_number;
-    dst->reordered_opaque = src->reordered_opaque;
-    dst->thread_safe_callbacks = src->thread_safe_callbacks;
-
-    if (src->slice_count && src->slice_offset) {
-        if (dst->slice_count < src->slice_count) {
-            int *tmp = av_realloc(dst->slice_offset, src->slice_count *
-                                  sizeof(*dst->slice_offset));
-            if (!tmp) {
-                av_free(dst->slice_offset);
-                return AVERROR(ENOMEM);
-            }
-            dst->slice_offset = tmp;
-        }
-        memcpy(dst->slice_offset, src->slice_offset,
-               src->slice_count * sizeof(*dst->slice_offset));
-    }
-    dst->slice_count = src->slice_count;
-    return 0;
-#undef copy_fields
-}
-
-/// Releases the buffers that this decoding thread was the last user of.
-static void release_delayed_buffers(PerThreadContext *p)
-{
-    FrameThreadContext *fctx = p->parent;
-
-    while (p->num_released_buffers > 0) {
-        AVFrame *f;
-
-        pthread_mutex_lock(&fctx->buffer_mutex);
-
-        // fix extended data in case the caller screwed it up
-        av_assert0(p->avctx->codec_type == AVMEDIA_TYPE_VIDEO ||
-                   p->avctx->codec_type == AVMEDIA_TYPE_AUDIO);
-        f = &p->released_buffers[--p->num_released_buffers];
-        f->extended_data = f->data;
-        av_frame_unref(f);
-
-        pthread_mutex_unlock(&fctx->buffer_mutex);
-    }
-}
-
-static int submit_packet(PerThreadContext *p, AVPacket *avpkt)
-{
-    FrameThreadContext *fctx = p->parent;
-    PerThreadContext *prev_thread = fctx->prev_thread;
-    const AVCodec *codec = p->avctx->codec;
-
-    if (!avpkt->size && !(codec->capabilities & CODEC_CAP_DELAY)) return 0;
-
-    pthread_mutex_lock(&p->mutex);
-
-    release_delayed_buffers(p);
-
-    if (prev_thread) {
-        int err;
-        if (prev_thread->state == STATE_SETTING_UP) {
-            pthread_mutex_lock(&prev_thread->progress_mutex);
-            while (prev_thread->state == STATE_SETTING_UP)
-                pthread_cond_wait(&prev_thread->progress_cond, &prev_thread->progress_mutex);
-            pthread_mutex_unlock(&prev_thread->progress_mutex);
-        }
-
-        err = update_context_from_thread(p->avctx, prev_thread->avctx, 0);
-        if (err) {
-            pthread_mutex_unlock(&p->mutex);
-            return err;
-        }
-    }
-
-    av_buffer_unref(&p->avpkt.buf);
-    p->avpkt = *avpkt;
-    if (avpkt->buf)
-        p->avpkt.buf = av_buffer_ref(avpkt->buf);
-    else {
-        av_fast_malloc(&p->buf, &p->allocated_buf_size, avpkt->size + FF_INPUT_BUFFER_PADDING_SIZE);
-        p->avpkt.data = p->buf;
-        memcpy(p->buf, avpkt->data, avpkt->size);
-        memset(p->buf + avpkt->size, 0, FF_INPUT_BUFFER_PADDING_SIZE);
-    }
-
-    p->state = STATE_SETTING_UP;
-    pthread_cond_signal(&p->input_cond);
-    pthread_mutex_unlock(&p->mutex);
-
-    /*
-     * If the client doesn't have a thread-safe get_buffer(),
-     * then decoding threads call back to the main thread,
-     * and it calls back to the client here.
-     */
-
-FF_DISABLE_DEPRECATION_WARNINGS
-    if (!p->avctx->thread_safe_callbacks && (
-         p->avctx->get_format != avcodec_default_get_format ||
-#if FF_API_GET_BUFFER
-         p->avctx->get_buffer ||
-#endif
-         p->avctx->get_buffer2 != avcodec_default_get_buffer2)) {
-FF_ENABLE_DEPRECATION_WARNINGS
-        while (p->state != STATE_SETUP_FINISHED && p->state != STATE_INPUT_READY) {
-            int call_done = 1;
-            pthread_mutex_lock(&p->progress_mutex);
-            while (p->state == STATE_SETTING_UP)
-                pthread_cond_wait(&p->progress_cond, &p->progress_mutex);
-
-            switch (p->state) {
-            case STATE_GET_BUFFER:
-                p->result = ff_get_buffer(p->avctx, p->requested_frame, p->requested_flags);
-                break;
-            case STATE_GET_FORMAT:
-                p->result_format = p->avctx->get_format(p->avctx, p->available_formats);
-                break;
-            default:
-                call_done = 0;
-                break;
-            }
-            if (call_done) {
-                p->state  = STATE_SETTING_UP;
-                pthread_cond_signal(&p->progress_cond);
-            }
-            pthread_mutex_unlock(&p->progress_mutex);
-        }
-    }
-
-    fctx->prev_thread = p;
-    fctx->next_decoding++;
-
-    return 0;
-}
-
-int ff_thread_decode_frame(AVCodecContext *avctx,
-                           AVFrame *picture, int *got_picture_ptr,
-                           AVPacket *avpkt)
-{
-    FrameThreadContext *fctx = avctx->thread_opaque;
-    int finished = fctx->next_finished;
-    PerThreadContext *p;
-    int err;
-
-    /*
-     * Submit a packet to the next decoding thread.
-     */
-
-    p = &fctx->threads[fctx->next_decoding];
-    err = update_context_from_user(p->avctx, avctx);
-    if (err) return err;
-    err = submit_packet(p, avpkt);
-    if (err) return err;
-
-    /*
-     * If we're still receiving the initial packets, don't return a frame.
-     */
-
-    if (fctx->next_decoding > (avctx->thread_count-1-(avctx->codec_id == AV_CODEC_ID_FFV1)))
-        fctx->delaying = 0;
-
-    if (fctx->delaying) {
-        *got_picture_ptr=0;
-        if (avpkt->size)
-            return avpkt->size;
-    }
-
-    /*
-     * Return the next available frame from the oldest thread.
-     * If we're at the end of the stream, then we have to skip threads that
-     * didn't output a frame, because we don't want to accidentally signal
-     * EOF (avpkt->size == 0 && *got_picture_ptr == 0).
-     */
-
-    do {
-        p = &fctx->threads[finished++];
-
-        if (p->state != STATE_INPUT_READY) {
-            pthread_mutex_lock(&p->progress_mutex);
-            while (p->state != STATE_INPUT_READY)
-                pthread_cond_wait(&p->output_cond, &p->progress_mutex);
-            pthread_mutex_unlock(&p->progress_mutex);
-        }
-
-        av_frame_move_ref(picture, &p->frame);
-        *got_picture_ptr = p->got_frame;
-        picture->pkt_dts = p->avpkt.dts;
-
-        /*
-         * A later call with avkpt->size == 0 may loop over all threads,
-         * including this one, searching for a frame to return before being
-         * stopped by the "finished != fctx->next_finished" condition.
-         * Make sure we don't mistakenly return the same frame again.
-         */
-        p->got_frame = 0;
-
-        if (finished >= avctx->thread_count) finished = 0;
-    } while (!avpkt->size && !*got_picture_ptr && finished != fctx->next_finished);
-
-    update_context_from_thread(avctx, p->avctx, 1);
-
-    if (fctx->next_decoding >= avctx->thread_count) fctx->next_decoding = 0;
-
-    fctx->next_finished = finished;
-
-    /* return the size of the consumed packet if no error occurred */
-    return (p->result >= 0) ? avpkt->size : p->result;
-}
-
-void ff_thread_report_progress(ThreadFrame *f, int n, int field)
-{
-    PerThreadContext *p;
-    volatile int *progress = f->progress ? (int*)f->progress->data : NULL;
-
-    if (!progress || progress[field] >= n) return;
-
-    p = f->owner->thread_opaque;
-
-    if (f->owner->debug&FF_DEBUG_THREADS)
-        av_log(f->owner, AV_LOG_DEBUG, "%p finished %d field %d\n", progress, n, field);
-
-    pthread_mutex_lock(&p->progress_mutex);
-    progress[field] = n;
-    pthread_cond_broadcast(&p->progress_cond);
-    pthread_mutex_unlock(&p->progress_mutex);
-}
-
-void ff_thread_await_progress(ThreadFrame *f, int n, int field)
-{
-    PerThreadContext *p;
-    volatile int *progress = f->progress ? (int*)f->progress->data : NULL;
-
-    if (!progress || progress[field] >= n) return;
-
-    p = f->owner->thread_opaque;
-
-    if (f->owner->debug&FF_DEBUG_THREADS)
-        av_log(f->owner, AV_LOG_DEBUG, "thread awaiting %d field %d from %p\n", n, field, progress);
-
-    pthread_mutex_lock(&p->progress_mutex);
-    while (progress[field] < n)
-        pthread_cond_wait(&p->progress_cond, &p->progress_mutex);
-    pthread_mutex_unlock(&p->progress_mutex);
-}
-
-void ff_thread_finish_setup(AVCodecContext *avctx) {
-    PerThreadContext *p = avctx->thread_opaque;
-
-    if (!(avctx->active_thread_type&FF_THREAD_FRAME)) return;
-
-    if(p->state == STATE_SETUP_FINISHED){
-        av_log(avctx, AV_LOG_WARNING, "Multiple ff_thread_finish_setup() calls\n");
-    }
-
-    pthread_mutex_lock(&p->progress_mutex);
-    p->state = STATE_SETUP_FINISHED;
-    pthread_cond_broadcast(&p->progress_cond);
-    pthread_mutex_unlock(&p->progress_mutex);
-}
-
-/// Waits for all threads to finish.
-static void park_frame_worker_threads(FrameThreadContext *fctx, int thread_count)
-{
-    int i;
-
-    for (i = 0; i < thread_count; i++) {
-        PerThreadContext *p = &fctx->threads[i];
-
-        if (p->state != STATE_INPUT_READY) {
-            pthread_mutex_lock(&p->progress_mutex);
-            while (p->state != STATE_INPUT_READY)
-                pthread_cond_wait(&p->output_cond, &p->progress_mutex);
-            pthread_mutex_unlock(&p->progress_mutex);
-        }
-        p->got_frame = 0;
-    }
-}
-
-static void frame_thread_free(AVCodecContext *avctx, int thread_count)
-{
-    FrameThreadContext *fctx = avctx->thread_opaque;
-    const AVCodec *codec = avctx->codec;
-    int i;
-
-    park_frame_worker_threads(fctx, thread_count);
-
-    if (fctx->prev_thread && fctx->prev_thread != fctx->threads)
-        if (update_context_from_thread(fctx->threads->avctx, fctx->prev_thread->avctx, 0) < 0) {
-            av_log(avctx, AV_LOG_ERROR, "Final thread update failed\n");
-            fctx->prev_thread->avctx->internal->is_copy = fctx->threads->avctx->internal->is_copy;
-            fctx->threads->avctx->internal->is_copy = 1;
-        }
-
-    fctx->die = 1;
-
-    for (i = 0; i < thread_count; i++) {
-        PerThreadContext *p = &fctx->threads[i];
-
-        pthread_mutex_lock(&p->mutex);
-        pthread_cond_signal(&p->input_cond);
-        pthread_mutex_unlock(&p->mutex);
-
-        if (p->thread_init)
-            pthread_join(p->thread, NULL);
-        p->thread_init=0;
-
-        if (codec->close)
-            codec->close(p->avctx);
-
-        avctx->codec = NULL;
-
-        release_delayed_buffers(p);
-        av_frame_unref(&p->frame);
-    }
-
-    for (i = 0; i < thread_count; i++) {
-        PerThreadContext *p = &fctx->threads[i];
-
-        pthread_mutex_destroy(&p->mutex);
-        pthread_mutex_destroy(&p->progress_mutex);
-        pthread_cond_destroy(&p->input_cond);
-        pthread_cond_destroy(&p->progress_cond);
-        pthread_cond_destroy(&p->output_cond);
-        av_buffer_unref(&p->avpkt.buf);
-        av_freep(&p->buf);
-        av_freep(&p->released_buffers);
-
-        if (i) {
-            av_freep(&p->avctx->priv_data);
-            av_freep(&p->avctx->internal);
-            av_freep(&p->avctx->slice_offset);
-        }
-
-        av_freep(&p->avctx);
-    }
-
-    av_freep(&fctx->threads);
-    pthread_mutex_destroy(&fctx->buffer_mutex);
-    av_freep(&avctx->thread_opaque);
-}
-
-static int frame_thread_init(AVCodecContext *avctx)
-{
-    int thread_count = avctx->thread_count;
-    const AVCodec *codec = avctx->codec;
-    AVCodecContext *src = avctx;
-    FrameThreadContext *fctx;
-    int i, err = 0;
-
-    if (!thread_count) {
-        int nb_cpus = av_cpu_count();
-        if ((avctx->debug & (FF_DEBUG_VIS_QP | FF_DEBUG_VIS_MB_TYPE)) || avctx->debug_mv)
-            nb_cpus = 1;
-        // use number of cores + 1 as thread count if there is more than one
-        if (nb_cpus > 1)
-            thread_count = avctx->thread_count = FFMIN(nb_cpus + 1, MAX_AUTO_THREADS);
-        else
-            thread_count = avctx->thread_count = 1;
-    }
-
-    if (thread_count <= 1) {
-        avctx->active_thread_type = 0;
-        return 0;
-    }
-
-    avctx->thread_opaque = fctx = av_mallocz(sizeof(FrameThreadContext));
-
-    fctx->threads = av_mallocz(sizeof(PerThreadContext) * thread_count);
-    pthread_mutex_init(&fctx->buffer_mutex, NULL);
-    fctx->delaying = 1;
-
-    for (i = 0; i < thread_count; i++) {
-        AVCodecContext *copy = av_malloc(sizeof(AVCodecContext));
-        PerThreadContext *p  = &fctx->threads[i];
-
-        pthread_mutex_init(&p->mutex, NULL);
-        pthread_mutex_init(&p->progress_mutex, NULL);
-        pthread_cond_init(&p->input_cond, NULL);
-        pthread_cond_init(&p->progress_cond, NULL);
-        pthread_cond_init(&p->output_cond, NULL);
-
-        p->parent = fctx;
-        p->avctx  = copy;
-
-        if (!copy) {
-            err = AVERROR(ENOMEM);
-            goto error;
-        }
-
-        *copy = *src;
-        copy->thread_opaque = p;
-        copy->pkt = &p->avpkt;
-
-        if (!i) {
-            src = copy;
-
-            if (codec->init)
-                err = codec->init(copy);
-
-            update_context_from_thread(avctx, copy, 1);
-        } else {
-            copy->priv_data = av_malloc(codec->priv_data_size);
-            if (!copy->priv_data) {
-                err = AVERROR(ENOMEM);
-                goto error;
-            }
-            memcpy(copy->priv_data, src->priv_data, codec->priv_data_size);
-            copy->internal = av_malloc(sizeof(AVCodecInternal));
-            if (!copy->internal) {
-                err = AVERROR(ENOMEM);
-                goto error;
-            }
-            *copy->internal = *src->internal;
-            copy->internal->is_copy = 1;
-
-            if (codec->init_thread_copy)
-                err = codec->init_thread_copy(copy);
-        }
-
-        if (err) goto error;
-
-        err = AVERROR(pthread_create(&p->thread, NULL, frame_worker_thread, p));
-        p->thread_init= !err;
-        if(!p->thread_init)
-            goto error;
-    }
-
-    return 0;
-
-error:
-    frame_thread_free(avctx, i+1);
-
-    return err;
-}
-
-void ff_thread_flush(AVCodecContext *avctx)
-{
-    int i;
-    FrameThreadContext *fctx = avctx->thread_opaque;
-
-    if (!avctx->thread_opaque) return;
-
-    park_frame_worker_threads(fctx, avctx->thread_count);
-    if (fctx->prev_thread) {
-        if (fctx->prev_thread != &fctx->threads[0])
-            update_context_from_thread(fctx->threads[0].avctx, fctx->prev_thread->avctx, 0);
-        if (avctx->codec->flush)
-            avctx->codec->flush(fctx->threads[0].avctx);
-    }
-
-    fctx->next_decoding = fctx->next_finished = 0;
-    fctx->delaying = 1;
-    fctx->prev_thread = NULL;
-    for (i = 0; i < avctx->thread_count; i++) {
-        PerThreadContext *p = &fctx->threads[i];
-        // Make sure decode flush calls with size=0 won't return old frames
-        p->got_frame = 0;
-        av_frame_unref(&p->frame);
-
-        release_delayed_buffers(p);
-    }
-}
-
-int ff_thread_can_start_frame(AVCodecContext *avctx)
-{
-    PerThreadContext *p = avctx->thread_opaque;
-    if ((avctx->active_thread_type&FF_THREAD_FRAME) && p->state != STATE_SETTING_UP &&
-        (avctx->codec->update_thread_context || !THREAD_SAFE_CALLBACKS(avctx))) {
-        return 0;
-    }
-    return 1;
-}
-
-static int thread_get_buffer_internal(AVCodecContext *avctx, ThreadFrame *f, int flags)
-{
-    PerThreadContext *p = avctx->thread_opaque;
-    int err;
-
-    f->owner = avctx;
-
-    ff_init_buffer_info(avctx, f->f);
-
-    if (!(avctx->active_thread_type & FF_THREAD_FRAME))
-        return ff_get_buffer(avctx, f->f, flags);
-
-    if (p->state != STATE_SETTING_UP &&
-        (avctx->codec->update_thread_context || !THREAD_SAFE_CALLBACKS(avctx))) {
-        av_log(avctx, AV_LOG_ERROR, "get_buffer() cannot be called after ff_thread_finish_setup()\n");
-        return -1;
-    }
-
-    if (avctx->internal->allocate_progress) {
-        int *progress;
-        f->progress = av_buffer_alloc(2 * sizeof(int));
-        if (!f->progress) {
-            return AVERROR(ENOMEM);
-        }
-        progress = (int*)f->progress->data;
-
-        progress[0] = progress[1] = -1;
-    }
-
-    pthread_mutex_lock(&p->parent->buffer_mutex);
-
-FF_DISABLE_DEPRECATION_WARNINGS
-    if (avctx->thread_safe_callbacks || (
-#if FF_API_GET_BUFFER
-        !avctx->get_buffer &&
-#endif
-        avctx->get_buffer2 == avcodec_default_get_buffer2)) {
-FF_ENABLE_DEPRECATION_WARNINGS
-        err = ff_get_buffer(avctx, f->f, flags);
-    } else {
-        pthread_mutex_lock(&p->progress_mutex);
-        p->requested_frame = f->f;
-        p->requested_flags = flags;
-        p->state = STATE_GET_BUFFER;
-        pthread_cond_broadcast(&p->progress_cond);
-
-        while (p->state != STATE_SETTING_UP)
-            pthread_cond_wait(&p->progress_cond, &p->progress_mutex);
-
-        err = p->result;
-
-        pthread_mutex_unlock(&p->progress_mutex);
-
-    }
-    if (!THREAD_SAFE_CALLBACKS(avctx) && !avctx->codec->update_thread_context)
-        ff_thread_finish_setup(avctx);
-
-    if (err)
-        av_buffer_unref(&f->progress);
-
-    pthread_mutex_unlock(&p->parent->buffer_mutex);
-
-    return err;
-}
-
-enum AVPixelFormat ff_thread_get_format(AVCodecContext *avctx, const enum AVPixelFormat *fmt)
-{
-    enum AVPixelFormat res;
-    PerThreadContext *p = avctx->thread_opaque;
-    if (!(avctx->active_thread_type & FF_THREAD_FRAME) || avctx->thread_safe_callbacks ||
-        avctx->get_format == avcodec_default_get_format)
-        return avctx->get_format(avctx, fmt);
-    if (p->state != STATE_SETTING_UP) {
-        av_log(avctx, AV_LOG_ERROR, "get_format() cannot be called after ff_thread_finish_setup()\n");
-        return -1;
-    }
-    pthread_mutex_lock(&p->progress_mutex);
-    p->available_formats = fmt;
-    p->state = STATE_GET_FORMAT;
-    pthread_cond_broadcast(&p->progress_cond);
-
-    while (p->state != STATE_SETTING_UP)
-        pthread_cond_wait(&p->progress_cond, &p->progress_mutex);
-
-    res = p->result_format;
-
-    pthread_mutex_unlock(&p->progress_mutex);
-
-    return res;
-}
-
-int ff_thread_get_buffer(AVCodecContext *avctx, ThreadFrame *f, int flags)
-{
-    int ret = thread_get_buffer_internal(avctx, f, flags);
-    if (ret < 0)
-        av_log(avctx, AV_LOG_ERROR, "thread_get_buffer() failed\n");
-    return ret;
-}
-
-void ff_thread_release_buffer(AVCodecContext *avctx, ThreadFrame *f)
-{
-    PerThreadContext *p = avctx->thread_opaque;
-    FrameThreadContext *fctx;
-    AVFrame *dst, *tmp;
-FF_DISABLE_DEPRECATION_WARNINGS
-    int can_direct_free = !(avctx->active_thread_type & FF_THREAD_FRAME) ||
-                          avctx->thread_safe_callbacks                   ||
-                          (
-#if FF_API_GET_BUFFER
-                           !avctx->get_buffer &&
-#endif
-                           avctx->get_buffer2 == avcodec_default_get_buffer2);
-FF_ENABLE_DEPRECATION_WARNINGS
-
-    if (!f->f->data[0])
-        return;
-
-    if (avctx->debug & FF_DEBUG_BUFFERS)
-        av_log(avctx, AV_LOG_DEBUG, "thread_release_buffer called on pic %p\n", f);
-
-    av_buffer_unref(&f->progress);
-    f->owner    = NULL;
-
-    if (can_direct_free) {
-        av_frame_unref(f->f);
-        return;
-    }
-
-    fctx = p->parent;
-    pthread_mutex_lock(&fctx->buffer_mutex);
-
-    if (p->num_released_buffers + 1 >= INT_MAX / sizeof(*p->released_buffers))
-        goto fail;
-    tmp = av_fast_realloc(p->released_buffers, &p->released_buffers_allocated,
-                          (p->num_released_buffers + 1) *
-                          sizeof(*p->released_buffers));
-    if (!tmp)
-        goto fail;
-    p->released_buffers = tmp;
-
-    dst = &p->released_buffers[p->num_released_buffers];
-    av_frame_move_ref(dst, f->f);
-
-    p->num_released_buffers++;
-
-fail:
-    pthread_mutex_unlock(&fctx->buffer_mutex);
-}
 
 /**
  * Set the threading algorithms used.
@@ -1111,16 +69,12 @@
 
 int ff_thread_init(AVCodecContext *avctx)
 {
-#if HAVE_W32THREADS
-    w32thread_init();
-#endif
-
     validate_thread_parameters(avctx);
 
     if (avctx->active_thread_type&FF_THREAD_SLICE)
-        return thread_init_internal(avctx);
+        return ff_slice_thread_init(avctx);
     else if (avctx->active_thread_type&FF_THREAD_FRAME)
-        return frame_thread_init(avctx);
+        return ff_frame_thread_init(avctx);
 
     return 0;
 }
@@ -1128,66 +82,7 @@
 void ff_thread_free(AVCodecContext *avctx)
 {
     if (avctx->active_thread_type&FF_THREAD_FRAME)
-        frame_thread_free(avctx, avctx->thread_count);
+        ff_frame_thread_free(avctx, avctx->thread_count);
     else
-        thread_free(avctx);
-}
-
-void ff_thread_report_progress2(AVCodecContext *avctx, int field, int thread, int n)
-{
-    ThreadContext *p = avctx->thread_opaque;
-    int *entries = p->entries;
-
-    pthread_mutex_lock(&p->progress_mutex[thread]);
-    entries[field] +=n;
-    pthread_cond_signal(&p->progress_cond[thread]);
-    pthread_mutex_unlock(&p->progress_mutex[thread]);
-}
-
-void ff_thread_await_progress2(AVCodecContext *avctx, int field, int thread, int shift)
-{
-    ThreadContext *p  = avctx->thread_opaque;
-    int *entries      = p->entries;
-
-    if (!entries || !field) return;
-
-    thread = thread ? thread - 1 : p->thread_count - 1;
-
-    pthread_mutex_lock(&p->progress_mutex[thread]);
-    while ((entries[field - 1] - entries[field]) < shift){
-        pthread_cond_wait(&p->progress_cond[thread], &p->progress_mutex[thread]);
-    }
-    pthread_mutex_unlock(&p->progress_mutex[thread]);
-}
-
-int ff_alloc_entries(AVCodecContext *avctx, int count)
-{
-    int i;
-
-    if (avctx->active_thread_type & FF_THREAD_SLICE)  {
-        ThreadContext *p = avctx->thread_opaque;
-        p->thread_count  = avctx->thread_count;
-        p->entries       = av_mallocz(count * sizeof(int));
-
-        if (!p->entries) {
-            return AVERROR(ENOMEM);
-        }
-
-        p->entries_count  = count;
-        p->progress_mutex = av_malloc(p->thread_count * sizeof(pthread_mutex_t));
-        p->progress_cond  = av_malloc(p->thread_count * sizeof(pthread_cond_t));
-
-        for (i = 0; i < p->thread_count; i++) {
-            pthread_mutex_init(&p->progress_mutex[i], NULL);
-            pthread_cond_init(&p->progress_cond[i], NULL);
-        }
-    }
-
-    return 0;
-}
-
-void ff_reset_entries(AVCodecContext *avctx)
-{
-    ThreadContext *p = avctx->thread_opaque;
-    memset(p->entries, 0, p->entries_count * sizeof(int));
+        ff_slice_thread_free(avctx);
 }

omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/pthread_frame.c Added

@@ -0,0 +1,909 @@
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * Frame multithreading support functions
+ * @see doc/multithreading.txt
+ */
+
+#include "config.h"
+
+#include <stdint.h>
+
+#if HAVE_PTHREADS
+#include <pthread.h>
+#elif HAVE_W32THREADS
+#include "compat/w32pthreads.h"
+#elif HAVE_OS2THREADS
+#include "compat/os2threads.h"
+#endif
+
+#include "avcodec.h"
+#include "internal.h"
+#include "pthread_internal.h"
+#include "thread.h"
+
+#include "libavutil/avassert.h"
+#include "libavutil/buffer.h"
+#include "libavutil/common.h"
+#include "libavutil/cpu.h"
+#include "libavutil/frame.h"
+#include "libavutil/log.h"
+#include "libavutil/mem.h"
+
+/**
+ * Context used by codec threads and stored in their AVCodecInternal thread_ctx.
+ */
+typedef struct PerThreadContext {
+    struct FrameThreadContext *parent;
+
+    pthread_t      thread;
+    int            thread_init;
+    pthread_cond_t input_cond;      ///< Used to wait for a new packet from the main thread.
+    pthread_cond_t progress_cond;   ///< Used by child threads to wait for progress to change.
+    pthread_cond_t output_cond;     ///< Used by the main thread to wait for frames to finish.
+
+    pthread_mutex_t mutex;          ///< Mutex used to protect the contents of the PerThreadContext.
+    pthread_mutex_t progress_mutex; ///< Mutex used to protect frame progress values and progress_cond.
+
+    AVCodecContext *avctx;          ///< Context used to decode packets passed to this thread.
+
+    AVPacket       avpkt;           ///< Input packet (for decoding) or output (for encoding).
+    uint8_t       *buf;             ///< backup storage for packet data when the input packet is not refcounted
+    int            allocated_buf_size; ///< Size allocated for buf
+
+    AVFrame *frame;                 ///< Output frame (for decoding) or input (for encoding).
+    int     got_frame;              ///< The output of got_picture_ptr from the last avcodec_decode_video() call.
+    int     result;                 ///< The result of the last codec decode/encode() call.
+
+    enum {
+        STATE_INPUT_READY,          ///< Set when the thread is awaiting a packet.
+        STATE_SETTING_UP,           ///< Set before the codec has called ff_thread_finish_setup().
+        STATE_GET_BUFFER,           /**<
+                                     * Set when the codec calls get_buffer().
+                                     * State is returned to STATE_SETTING_UP afterwards.
+                                     */
+        STATE_GET_FORMAT,           /**<
+                                     * Set when the codec calls get_format().
+                                     * State is returned to STATE_SETTING_UP afterwards.
+                                     */
+        STATE_SETUP_FINISHED        ///< Set after the codec has called ff_thread_finish_setup().
+    } state;
+
+    /**
+     * Array of frames passed to ff_thread_release_buffer().
+     * Frames are released after all threads referencing them are finished.
+     */
+    AVFrame *released_buffers;
+    int  num_released_buffers;
+    int      released_buffers_allocated;
+
+    AVFrame *requested_frame;       ///< AVFrame the codec passed to get_buffer()
+    int      requested_flags;       ///< flags passed to get_buffer() for requested_frame
+
+    const enum AVPixelFormat *available_formats; ///< Format array for get_format()
+    enum AVPixelFormat result_format;            ///< get_format() result
+} PerThreadContext;
+
+/**
+ * Context stored in the client AVCodecInternal thread_ctx.
+ */
+typedef struct FrameThreadContext {
+    PerThreadContext *threads;     ///< The contexts for each thread.
+    PerThreadContext *prev_thread; ///< The last thread submit_packet() was called on.
+
+    pthread_mutex_t buffer_mutex;  ///< Mutex used to protect get/release_buffer().
+
+    int next_decoding;             ///< The next context to submit a packet to.
+    int next_finished;             ///< The next context to return output from.
+
+    int delaying;                  /**<
+                                    * Set for the first N packets, where N is the number of threads.
+                                    * While it is set, ff_thread_en/decode_frame won't return any results.
+                                    */
+
+    int die;                       ///< Set when threads should exit.
+} FrameThreadContext;
+
+#define THREAD_SAFE_CALLBACKS(avctx) \
+((avctx)->thread_safe_callbacks || (!(avctx)->get_buffer && (avctx)->get_buffer2 == avcodec_default_get_buffer2))
+
+/**
+ * Codec worker thread.
+ *
+ * Automatically calls ff_thread_finish_setup() if the codec does
+ * not provide an update_thread_context method, or if the codec returns
+ * before calling it.
+ */
+static attribute_align_arg void *frame_worker_thread(void *arg)
+{
+    PerThreadContext *p = arg;
+    FrameThreadContext *fctx = p->parent;
+    AVCodecContext *avctx = p->avctx;
+    const AVCodec *codec = avctx->codec;
+
+    pthread_mutex_lock(&p->mutex);
+    while (1) {
+            while (p->state == STATE_INPUT_READY && !fctx->die)
+                pthread_cond_wait(&p->input_cond, &p->mutex);
+
+        if (fctx->die) break;
+
+        if (!codec->update_thread_context && THREAD_SAFE_CALLBACKS(avctx))
+            ff_thread_finish_setup(avctx);
+
+        av_frame_unref(p->frame);
+        p->got_frame = 0;
+        p->result = codec->decode(avctx, p->frame, &p->got_frame, &p->avpkt);
+
+        if ((p->result < 0 || !p->got_frame) && p->frame->buf[0]) {
+            if (avctx->internal->allocate_progress)
+                av_log(avctx, AV_LOG_ERROR, "A frame threaded decoder did not "
+                       "free the frame on failure. This is a bug, please report it.\n");
+            av_frame_unref(p->frame);
+        }
+
+        if (p->state == STATE_SETTING_UP) ff_thread_finish_setup(avctx);
+
+        pthread_mutex_lock(&p->progress_mutex);
+#if 0 //BUFREF-FIXME
+        for (i = 0; i < MAX_BUFFERS; i++)
+            if (p->progress_used[i] && (p->got_frame || p->result<0 || avctx->codec_id != AV_CODEC_ID_H264)) {
+                p->progress[i][0] = INT_MAX;
+                p->progress[i][1] = INT_MAX;
+            }
+#endif
+        p->state = STATE_INPUT_READY;
+
+        pthread_cond_broadcast(&p->progress_cond);
+        pthread_cond_signal(&p->output_cond);
+        pthread_mutex_unlock(&p->progress_mutex);
+    }
+    pthread_mutex_unlock(&p->mutex);
+
+    return NULL;
+}
+
+/**
+ * Update the next thread's AVCodecContext with values from the reference thread's context.
+ *
+ * @param dst The destination context.
+ * @param src The source context.
+ * @param for_user 0 if the destination is a codec thread, 1 if the destination is the user's thread
+ */
+static int update_context_from_thread(AVCodecContext *dst, AVCodecContext *src, int for_user)
+{
+    int err = 0;
+
+    if (dst != src) {
+        dst->time_base = src->time_base;
+        dst->width     = src->width;
+        dst->height    = src->height;
+        dst->pix_fmt   = src->pix_fmt;
+
+        dst->coded_width  = src->coded_width;
+        dst->coded_height = src->coded_height;
+
+        dst->has_b_frames = src->has_b_frames;
+        dst->idct_algo    = src->idct_algo;
+
+        dst->bits_per_coded_sample = src->bits_per_coded_sample;
+        dst->sample_aspect_ratio   = src->sample_aspect_ratio;
+        dst->dtg_active_format     = src->dtg_active_format;
+
+        dst->profile = src->profile;
+        dst->level   = src->level;
+
+        dst->bits_per_raw_sample = src->bits_per_raw_sample;
+        dst->ticks_per_frame     = src->ticks_per_frame;
+        dst->color_primaries     = src->color_primaries;
+
+        dst->color_trc   = src->color_trc;
+        dst->colorspace  = src->colorspace;
+        dst->color_range = src->color_range;
+        dst->chroma_sample_location = src->chroma_sample_location;
+
+        dst->hwaccel = src->hwaccel;
+        dst->hwaccel_context = src->hwaccel_context;
+
+        dst->channels       = src->channels;
+        dst->sample_rate    = src->sample_rate;
+        dst->sample_fmt     = src->sample_fmt;
+        dst->channel_layout = src->channel_layout;
+    }
+
+    if (for_user) {
+        dst->delay       = src->thread_count - 1;
+        dst->coded_frame = src->coded_frame;
+    } else {
+        if (dst->codec->update_thread_context)
+            err = dst->codec->update_thread_context(dst, src);
+    }
+
+    return err;
+}
+
+/**
+ * Update the next thread's AVCodecContext with values set by the user.
+ *
+ * @param dst The destination context.
+ * @param src The source context.
+ * @return 0 on success, negative error code on failure
+ */
+static int update_context_from_user(AVCodecContext *dst, AVCodecContext *src)
+{
+#define copy_fields(s, e) memcpy(&dst->s, &src->s, (char*)&dst->e - (char*)&dst->s);
+    dst->flags          = src->flags;
+
+    dst->draw_horiz_band= src->draw_horiz_band;
+    dst->get_buffer2    = src->get_buffer2;
+#if FF_API_GET_BUFFER
+FF_DISABLE_DEPRECATION_WARNINGS
+    dst->get_buffer     = src->get_buffer;
+    dst->release_buffer = src->release_buffer;
+FF_ENABLE_DEPRECATION_WARNINGS
+#endif
+
+    dst->opaque   = src->opaque;
+    dst->debug    = src->debug;
+    dst->debug_mv = src->debug_mv;
+
+    dst->slice_flags = src->slice_flags;
+    dst->flags2      = src->flags2;
+
+    copy_fields(skip_loop_filter, subtitle_header);
+
+    dst->frame_number     = src->frame_number;
+    dst->reordered_opaque = src->reordered_opaque;
+    dst->thread_safe_callbacks = src->thread_safe_callbacks;
+
+    if (src->slice_count && src->slice_offset) {
+        if (dst->slice_count < src->slice_count) {
+            int *tmp = av_realloc(dst->slice_offset, src->slice_count *
+                                  sizeof(*dst->slice_offset));
+            if (!tmp) {
+                av_free(dst->slice_offset);
+                return AVERROR(ENOMEM);
+            }
+            dst->slice_offset = tmp;
+        }
+        memcpy(dst->slice_offset, src->slice_offset,
+               src->slice_count * sizeof(*dst->slice_offset));
+    }
+    dst->slice_count = src->slice_count;
+    return 0;
+#undef copy_fields
+}
+
+/// Releases the buffers that this decoding thread was the last user of.
+static void release_delayed_buffers(PerThreadContext *p)
+{
+    FrameThreadContext *fctx = p->parent;
+
+    while (p->num_released_buffers > 0) {
+        AVFrame *f;
+
+        pthread_mutex_lock(&fctx->buffer_mutex);
+
+        // fix extended data in case the caller screwed it up
+        av_assert0(p->avctx->codec_type == AVMEDIA_TYPE_VIDEO ||
+                   p->avctx->codec_type == AVMEDIA_TYPE_AUDIO);
+        f = &p->released_buffers[--p->num_released_buffers];
+        f->extended_data = f->data;
+        av_frame_unref(f);
+
+        pthread_mutex_unlock(&fctx->buffer_mutex);
+    }
+}
+
+static int submit_packet(PerThreadContext *p, AVPacket *avpkt)
+{
+    FrameThreadContext *fctx = p->parent;
+    PerThreadContext *prev_thread = fctx->prev_thread;
+    const AVCodec *codec = p->avctx->codec;
+    int ret;
+
+    if (!avpkt->size && !(codec->capabilities & CODEC_CAP_DELAY)) return 0;
+
+    pthread_mutex_lock(&p->mutex);
+
+    release_delayed_buffers(p);
+
+    if (prev_thread) {
+        int err;
+        if (prev_thread->state == STATE_SETTING_UP) {
+            pthread_mutex_lock(&prev_thread->progress_mutex);
+            while (prev_thread->state == STATE_SETTING_UP)
+                pthread_cond_wait(&prev_thread->progress_cond, &prev_thread->progress_mutex);
+            pthread_mutex_unlock(&prev_thread->progress_mutex);
+        }
+
+        err = update_context_from_thread(p->avctx, prev_thread->avctx, 0);
+        if (err) {
+            pthread_mutex_unlock(&p->mutex);
+            return err;
+        }
+    }
+
+    av_packet_free_side_data(&p->avpkt);
+    av_buffer_unref(&p->avpkt.buf);
+    p->avpkt = *avpkt;
+    if (avpkt->buf)
+        p->avpkt.buf = av_buffer_ref(avpkt->buf);
+    else {
+        av_fast_malloc(&p->buf, &p->allocated_buf_size, avpkt->size + FF_INPUT_BUFFER_PADDING_SIZE);
+        if (!p->buf) {
+            pthread_mutex_unlock(&p->mutex);
+            return AVERROR(ENOMEM);
+        }
+        p->avpkt.data = p->buf;
+        memcpy(p->buf, avpkt->data, avpkt->size);
+        memset(p->buf + avpkt->size, 0, FF_INPUT_BUFFER_PADDING_SIZE);
+    }
+    if ((ret = av_copy_packet_side_data(&p->avpkt, avpkt)) < 0)
+        return ret;
+
+    p->state = STATE_SETTING_UP;
+    pthread_cond_signal(&p->input_cond);
+    pthread_mutex_unlock(&p->mutex);
+
+    /*
+     * If the client doesn't have a thread-safe get_buffer(),
+     * then decoding threads call back to the main thread,
+     * and it calls back to the client here.
+     */
+
+FF_DISABLE_DEPRECATION_WARNINGS
+    if (!p->avctx->thread_safe_callbacks && (
+         p->avctx->get_format != avcodec_default_get_format ||
+#if FF_API_GET_BUFFER
+         p->avctx->get_buffer ||
+#endif
+         p->avctx->get_buffer2 != avcodec_default_get_buffer2)) {
+FF_ENABLE_DEPRECATION_WARNINGS
+        while (p->state != STATE_SETUP_FINISHED && p->state != STATE_INPUT_READY) {
+            int call_done = 1;
+            pthread_mutex_lock(&p->progress_mutex);
+            while (p->state == STATE_SETTING_UP)
+                pthread_cond_wait(&p->progress_cond, &p->progress_mutex);
+
+            switch (p->state) {
+            case STATE_GET_BUFFER:
+                p->result = ff_get_buffer(p->avctx, p->requested_frame, p->requested_flags);
+                break;
+            case STATE_GET_FORMAT:
+                p->result_format = p->avctx->get_format(p->avctx, p->available_formats);
+                break;
+            default:
+                call_done = 0;
+                break;
+            }
+            if (call_done) {
+                p->state  = STATE_SETTING_UP;
+                pthread_cond_signal(&p->progress_cond);
+            }
+            pthread_mutex_unlock(&p->progress_mutex);
+        }
+    }
+
+    fctx->prev_thread = p;
+    fctx->next_decoding++;
+
+    return 0;
+}
+
+int ff_thread_decode_frame(AVCodecContext *avctx,
+                           AVFrame *picture, int *got_picture_ptr,
+                           AVPacket *avpkt)
+{
+    FrameThreadContext *fctx = avctx->internal->thread_ctx;
+    int finished = fctx->next_finished;
+    PerThreadContext *p;
+    int err;
+
+    /*
+     * Submit a packet to the next decoding thread.
+     */
+
+    p = &fctx->threads[fctx->next_decoding];
+    err = update_context_from_user(p->avctx, avctx);
+    if (err) return err;
+    err = submit_packet(p, avpkt);
+    if (err) return err;
+
+    /*
+     * If we're still receiving the initial packets, don't return a frame.
+     */
+
+    if (fctx->next_decoding > (avctx->thread_count-1-(avctx->codec_id == AV_CODEC_ID_FFV1)))
+        fctx->delaying = 0;
+
+    if (fctx->delaying) {
+        *got_picture_ptr=0;
+        if (avpkt->size)
+            return avpkt->size;
+    }
+
+    /*
+     * Return the next available frame from the oldest thread.
+     * If we're at the end of the stream, then we have to skip threads that
+     * didn't output a frame, because we don't want to accidentally signal
+     * EOF (avpkt->size == 0 && *got_picture_ptr == 0).
+     */
+
+    do {
+        p = &fctx->threads[finished++];
+
+        if (p->state != STATE_INPUT_READY) {
+            pthread_mutex_lock(&p->progress_mutex);
+            while (p->state != STATE_INPUT_READY)
+                pthread_cond_wait(&p->output_cond, &p->progress_mutex);
+            pthread_mutex_unlock(&p->progress_mutex);
+        }
+
+        av_frame_move_ref(picture, p->frame);
+        *got_picture_ptr = p->got_frame;
+        picture->pkt_dts = p->avpkt.dts;
+
+        /*
+         * A later call with avkpt->size == 0 may loop over all threads,
+         * including this one, searching for a frame to return before being
+         * stopped by the "finished != fctx->next_finished" condition.
+         * Make sure we don't mistakenly return the same frame again.
+         */
+        p->got_frame = 0;
+
+        if (finished >= avctx->thread_count) finished = 0;
+    } while (!avpkt->size && !*got_picture_ptr && finished != fctx->next_finished);
+
+    update_context_from_thread(avctx, p->avctx, 1);
+
+    if (fctx->next_decoding >= avctx->thread_count) fctx->next_decoding = 0;
+
+    fctx->next_finished = finished;
+
+    /* return the size of the consumed packet if no error occurred */
+    return (p->result >= 0) ? avpkt->size : p->result;
+}
+
+void ff_thread_report_progress(ThreadFrame *f, int n, int field)
+{
+    PerThreadContext *p;
+    volatile int *progress = f->progress ? (int*)f->progress->data : NULL;
+
+    if (!progress || progress[field] >= n) return;
+
+    p = f->owner->internal->thread_ctx;
+
+    if (f->owner->debug&FF_DEBUG_THREADS)
+        av_log(f->owner, AV_LOG_DEBUG, "%p finished %d field %d\n", progress, n, field);
+
+    pthread_mutex_lock(&p->progress_mutex);
+    progress[field] = n;
+    pthread_cond_broadcast(&p->progress_cond);
+    pthread_mutex_unlock(&p->progress_mutex);
+}
+
+void ff_thread_await_progress(ThreadFrame *f, int n, int field)
+{
+    PerThreadContext *p;
+    volatile int *progress = f->progress ? (int*)f->progress->data : NULL;
+
+    if (!progress || progress[field] >= n) return;
+
+    p = f->owner->internal->thread_ctx;
+
+    if (f->owner->debug&FF_DEBUG_THREADS)
+        av_log(f->owner, AV_LOG_DEBUG, "thread awaiting %d field %d from %p\n", n, field, progress);
+
+    pthread_mutex_lock(&p->progress_mutex);
+    while (progress[field] < n)
+        pthread_cond_wait(&p->progress_cond, &p->progress_mutex);
+    pthread_mutex_unlock(&p->progress_mutex);
+}
+
+void ff_thread_finish_setup(AVCodecContext *avctx) {
+    PerThreadContext *p = avctx->internal->thread_ctx;
+
+    if (!(avctx->active_thread_type&FF_THREAD_FRAME)) return;
+
+    if(p->state == STATE_SETUP_FINISHED){
+        av_log(avctx, AV_LOG_WARNING, "Multiple ff_thread_finish_setup() calls\n");
+    }
+
+    pthread_mutex_lock(&p->progress_mutex);
+    p->state = STATE_SETUP_FINISHED;
+    pthread_cond_broadcast(&p->progress_cond);
+    pthread_mutex_unlock(&p->progress_mutex);
+}
+
+/// Waits for all threads to finish.
+static void park_frame_worker_threads(FrameThreadContext *fctx, int thread_count)
+{
+    int i;
+
+    for (i = 0; i < thread_count; i++) {
+        PerThreadContext *p = &fctx->threads[i];
+
+        if (p->state != STATE_INPUT_READY) {
+            pthread_mutex_lock(&p->progress_mutex);
+            while (p->state != STATE_INPUT_READY)
+                pthread_cond_wait(&p->output_cond, &p->progress_mutex);
+            pthread_mutex_unlock(&p->progress_mutex);
+        }
+        p->got_frame = 0;
+    }
+}
+
+void ff_frame_thread_free(AVCodecContext *avctx, int thread_count)
+{
+    FrameThreadContext *fctx = avctx->internal->thread_ctx;
+    const AVCodec *codec = avctx->codec;
+    int i;
+
+    park_frame_worker_threads(fctx, thread_count);
+
+    if (fctx->prev_thread && fctx->prev_thread != fctx->threads)
+        if (update_context_from_thread(fctx->threads->avctx, fctx->prev_thread->avctx, 0) < 0) {
+            av_log(avctx, AV_LOG_ERROR, "Final thread update failed\n");
+            fctx->prev_thread->avctx->internal->is_copy = fctx->threads->avctx->internal->is_copy;
+            fctx->threads->avctx->internal->is_copy = 1;
+        }
+
+    fctx->die = 1;
+
+    for (i = 0; i < thread_count; i++) {
+        PerThreadContext *p = &fctx->threads[i];
+
+        pthread_mutex_lock(&p->mutex);
+        pthread_cond_signal(&p->input_cond);
+        pthread_mutex_unlock(&p->mutex);
+
+        if (p->thread_init)
+            pthread_join(p->thread, NULL);
+        p->thread_init=0;
+
+        if (codec->close)
+            codec->close(p->avctx);
+
+        avctx->codec = NULL;
+
+        release_delayed_buffers(p);
+        av_frame_free(&p->frame);
+    }
+
+    for (i = 0; i < thread_count; i++) {
+        PerThreadContext *p = &fctx->threads[i];
+
+        pthread_mutex_destroy(&p->mutex);
+        pthread_mutex_destroy(&p->progress_mutex);
+        pthread_cond_destroy(&p->input_cond);
+        pthread_cond_destroy(&p->progress_cond);
+        pthread_cond_destroy(&p->output_cond);
+        av_packet_free_side_data(&p->avpkt);
+        av_buffer_unref(&p->avpkt.buf);
+        av_freep(&p->buf);
+        av_freep(&p->released_buffers);
+
+        if (i) {
+            av_freep(&p->avctx->priv_data);
+            av_freep(&p->avctx->slice_offset);
+        }
+
+        av_freep(&p->avctx->internal);
+        av_freep(&p->avctx);
+    }
+
+    av_freep(&fctx->threads);
+    pthread_mutex_destroy(&fctx->buffer_mutex);
+    av_freep(&avctx->internal->thread_ctx);
+}
+
+int ff_frame_thread_init(AVCodecContext *avctx)
+{
+    int thread_count = avctx->thread_count;
+    const AVCodec *codec = avctx->codec;
+    AVCodecContext *src = avctx;
+    FrameThreadContext *fctx;
+    int i, err = 0;
+
+#if HAVE_W32THREADS
+    w32thread_init();
+#endif
+
+    if (!thread_count) {
+        int nb_cpus = av_cpu_count();
+        if ((avctx->debug & (FF_DEBUG_VIS_QP | FF_DEBUG_VIS_MB_TYPE)) || avctx->debug_mv)
+            nb_cpus = 1;
+        // use number of cores + 1 as thread count if there is more than one
+        if (nb_cpus > 1)
+            thread_count = avctx->thread_count = FFMIN(nb_cpus + 1, MAX_AUTO_THREADS);
+        else
+            thread_count = avctx->thread_count = 1;
+    }
+
+    if (thread_count <= 1) {
+        avctx->active_thread_type = 0;
+        return 0;
+    }
+
+    avctx->internal->thread_ctx = fctx = av_mallocz(sizeof(FrameThreadContext));
+
+    fctx->threads = av_mallocz(sizeof(PerThreadContext) * thread_count);
+    pthread_mutex_init(&fctx->buffer_mutex, NULL);
+    fctx->delaying = 1;
+
+    for (i = 0; i < thread_count; i++) {
+        AVCodecContext *copy = av_malloc(sizeof(AVCodecContext));
+        PerThreadContext *p  = &fctx->threads[i];
+
+        pthread_mutex_init(&p->mutex, NULL);
+        pthread_mutex_init(&p->progress_mutex, NULL);
+        pthread_cond_init(&p->input_cond, NULL);
+        pthread_cond_init(&p->progress_cond, NULL);
+        pthread_cond_init(&p->output_cond, NULL);
+
+        p->frame = av_frame_alloc();
+        if (!p->frame) {
+            err = AVERROR(ENOMEM);
+            av_freep(&copy);
+            goto error;
+        }
+
+        p->parent = fctx;
+        p->avctx  = copy;
+
+        if (!copy) {
+            err = AVERROR(ENOMEM);
+            goto error;
+        }
+
+        *copy = *src;
+
+        copy->internal = av_malloc(sizeof(AVCodecInternal));
+        if (!copy->internal) {
+            err = AVERROR(ENOMEM);
+            goto error;
+        }
+        *copy->internal = *src->internal;
+        copy->internal->thread_ctx = p;
+        copy->internal->pkt = &p->avpkt;
+
+        if (!i) {
+            src = copy;
+
+            if (codec->init)
+                err = codec->init(copy);
+
+            update_context_from_thread(avctx, copy, 1);
+        } else {
+            copy->priv_data = av_malloc(codec->priv_data_size);
+            if (!copy->priv_data) {
+                err = AVERROR(ENOMEM);
+                goto error;
+            }
+            memcpy(copy->priv_data, src->priv_data, codec->priv_data_size);
+            copy->internal->is_copy = 1;
+
+            if (codec->init_thread_copy)
+                err = codec->init_thread_copy(copy);
+        }
+
+        if (err) goto error;
+
+        err = AVERROR(pthread_create(&p->thread, NULL, frame_worker_thread, p));
+        p->thread_init= !err;
+        if(!p->thread_init)
+            goto error;
+    }
+
+    return 0;
+
+error:
+    ff_frame_thread_free(avctx, i+1);
+
+    return err;
+}
+
+void ff_thread_flush(AVCodecContext *avctx)
+{
+    int i;
+    FrameThreadContext *fctx = avctx->internal->thread_ctx;
+
+    if (!fctx) return;
+
+    park_frame_worker_threads(fctx, avctx->thread_count);
+    if (fctx->prev_thread) {
+        if (fctx->prev_thread != &fctx->threads[0])
+            update_context_from_thread(fctx->threads[0].avctx, fctx->prev_thread->avctx, 0);
+    }
+
+    fctx->next_decoding = fctx->next_finished = 0;
+    fctx->delaying = 1;
+    fctx->prev_thread = NULL;
+    for (i = 0; i < avctx->thread_count; i++) {
+        PerThreadContext *p = &fctx->threads[i];
+        // Make sure decode flush calls with size=0 won't return old frames
+        p->got_frame = 0;
+        av_frame_unref(p->frame);
+
+        release_delayed_buffers(p);
+
+        if (avctx->codec->flush)
+            avctx->codec->flush(p->avctx);
+    }
+}
+
+int ff_thread_can_start_frame(AVCodecContext *avctx)
+{
+    PerThreadContext *p = avctx->internal->thread_ctx;
+    if ((avctx->active_thread_type&FF_THREAD_FRAME) && p->state != STATE_SETTING_UP &&
+        (avctx->codec->update_thread_context || !THREAD_SAFE_CALLBACKS(avctx))) {
+        return 0;
+    }
+    return 1;
+}
+
+static int thread_get_buffer_internal(AVCodecContext *avctx, ThreadFrame *f, int flags)
+{
+    PerThreadContext *p = avctx->internal->thread_ctx;
+    int err;
+
+    f->owner = avctx;
+
+    ff_init_buffer_info(avctx, f->f);
+
+    if (!(avctx->active_thread_type & FF_THREAD_FRAME))
+        return ff_get_buffer(avctx, f->f, flags);
+
+    if (p->state != STATE_SETTING_UP &&
+        (avctx->codec->update_thread_context || !THREAD_SAFE_CALLBACKS(avctx))) {
+        av_log(avctx, AV_LOG_ERROR, "get_buffer() cannot be called after ff_thread_finish_setup()\n");
+        return -1;
+    }
+
+    if (avctx->internal->allocate_progress) {
+        int *progress;
+        f->progress = av_buffer_alloc(2 * sizeof(int));
+        if (!f->progress) {
+            return AVERROR(ENOMEM);
+        }
+        progress = (int*)f->progress->data;
+
+        progress[0] = progress[1] = -1;
+    }
+
+    pthread_mutex_lock(&p->parent->buffer_mutex);
+FF_DISABLE_DEPRECATION_WARNINGS
+    if (avctx->thread_safe_callbacks || (
+#if FF_API_GET_BUFFER
+        !avctx->get_buffer &&
+#endif
+        avctx->get_buffer2 == avcodec_default_get_buffer2)) {
+FF_ENABLE_DEPRECATION_WARNINGS
+        err = ff_get_buffer(avctx, f->f, flags);
+    } else {
+        pthread_mutex_lock(&p->progress_mutex);
+        p->requested_frame = f->f;
+        p->requested_flags = flags;
+        p->state = STATE_GET_BUFFER;
+        pthread_cond_broadcast(&p->progress_cond);
+
+        while (p->state != STATE_SETTING_UP)
+            pthread_cond_wait(&p->progress_cond, &p->progress_mutex);
+
+        err = p->result;
+
+        pthread_mutex_unlock(&p->progress_mutex);
+
+    }
+    if (!THREAD_SAFE_CALLBACKS(avctx) && !avctx->codec->update_thread_context)
+        ff_thread_finish_setup(avctx);
+
+    if (err)
+        av_buffer_unref(&f->progress);
+
+    pthread_mutex_unlock(&p->parent->buffer_mutex);
+
+    return err;
+}
+
+enum AVPixelFormat ff_thread_get_format(AVCodecContext *avctx, const enum AVPixelFormat *fmt)
+{
+    enum AVPixelFormat res;
+    PerThreadContext *p = avctx->internal->thread_ctx;
+    if (!(avctx->active_thread_type & FF_THREAD_FRAME) || avctx->thread_safe_callbacks ||
+        avctx->get_format == avcodec_default_get_format)
+        return avctx->get_format(avctx, fmt);
+    if (p->state != STATE_SETTING_UP) {
+        av_log(avctx, AV_LOG_ERROR, "get_format() cannot be called after ff_thread_finish_setup()\n");
+        return -1;
+    }
+    pthread_mutex_lock(&p->progress_mutex);
+    p->available_formats = fmt;
+    p->state = STATE_GET_FORMAT;
+    pthread_cond_broadcast(&p->progress_cond);
+
+    while (p->state != STATE_SETTING_UP)
+        pthread_cond_wait(&p->progress_cond, &p->progress_mutex);
+
+    res = p->result_format;
+
+    pthread_mutex_unlock(&p->progress_mutex);
+
+    return res;
+}
+
+int ff_thread_get_buffer(AVCodecContext *avctx, ThreadFrame *f, int flags)
+{
+    int ret = thread_get_buffer_internal(avctx, f, flags);
+    if (ret < 0)
+        av_log(avctx, AV_LOG_ERROR, "thread_get_buffer() failed\n");
+    return ret;
+}
+
+void ff_thread_release_buffer(AVCodecContext *avctx, ThreadFrame *f)
+{
+    PerThreadContext *p = avctx->internal->thread_ctx;
+    FrameThreadContext *fctx;
+    AVFrame *dst, *tmp;
+FF_DISABLE_DEPRECATION_WARNINGS
+    int can_direct_free = !(avctx->active_thread_type & FF_THREAD_FRAME) ||
+                          avctx->thread_safe_callbacks                   ||
+                          (
+#if FF_API_GET_BUFFER
+                           !avctx->get_buffer &&
+#endif
+                           avctx->get_buffer2 == avcodec_default_get_buffer2);
+FF_ENABLE_DEPRECATION_WARNINGS
+
+    if (!f->f->buf[0])
+        return;
+
+    if (avctx->debug & FF_DEBUG_BUFFERS)
+        av_log(avctx, AV_LOG_DEBUG, "thread_release_buffer called on pic %p\n", f);
+
+    av_buffer_unref(&f->progress);
+    f->owner    = NULL;
+
+    if (can_direct_free) {
+        av_frame_unref(f->f);
+        return;
+    }
+
+    fctx = p->parent;
+    pthread_mutex_lock(&fctx->buffer_mutex);
+
+    if (p->num_released_buffers + 1 >= INT_MAX / sizeof(*p->released_buffers))
+        goto fail;
+    tmp = av_fast_realloc(p->released_buffers, &p->released_buffers_allocated,
+                          (p->num_released_buffers + 1) *
+                          sizeof(*p->released_buffers));
+    if (!tmp)
+        goto fail;
+    p->released_buffers = tmp;
+
+    dst = &p->released_buffers[p->num_released_buffers];
+    av_frame_move_ref(dst, f->f);
+
+    p->num_released_buffers++;
+
+fail:
+    pthread_mutex_unlock(&fctx->buffer_mutex);
+}

omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/pthread_internal.h Added

@@ -0,0 +1,34 @@
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_PTHREAD_INTERNAL_H
+#define AVCODEC_PTHREAD_INTERNAL_H
+
+#include "avcodec.h"
+
+/* H264 slice threading seems to be buggy with more than 16 threads,
+ * limit the number of threads to 16 for automatic detection */
+#define MAX_AUTO_THREADS 16
+
+int ff_slice_thread_init(AVCodecContext *avctx);
+void ff_slice_thread_free(AVCodecContext *avctx);
+
+int ff_frame_thread_init(AVCodecContext *avctx);
+void ff_frame_thread_free(AVCodecContext *avctx, int thread_count);
+
+#endif // AVCODEC_PTHREAD_INTERNAL_H

omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/pthread_slice.c Added

@@ -0,0 +1,292 @@
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * Slice multithreading support functions
+ * @see doc/multithreading.txt
+ */
+
+#include "config.h"
+
+#if HAVE_PTHREADS
+#include <pthread.h>
+#elif HAVE_W32THREADS
+#include "compat/w32pthreads.h"
+#elif HAVE_OS2THREADS
+#include "compat/os2threads.h"
+#endif
+
+#include "avcodec.h"
+#include "internal.h"
+#include "pthread_internal.h"
+#include "thread.h"
+
+#include "libavutil/common.h"
+#include "libavutil/cpu.h"
+#include "libavutil/mem.h"
+
+typedef int (action_func)(AVCodecContext *c, void *arg);
+typedef int (action_func2)(AVCodecContext *c, void *arg, int jobnr, int threadnr);
+
+typedef struct SliceThreadContext {
+    pthread_t *workers;
+    action_func *func;
+    action_func2 *func2;
+    void *args;
+    int *rets;
+    int rets_count;
+    int job_count;
+    int job_size;
+
+    pthread_cond_t last_job_cond;
+    pthread_cond_t current_job_cond;
+    pthread_mutex_t current_job_lock;
+    unsigned current_execute;
+    int current_job;
+    int done;
+
+    int *entries;
+    int entries_count;
+    int thread_count;
+    pthread_cond_t *progress_cond;
+    pthread_mutex_t *progress_mutex;
+} SliceThreadContext;
+
+static void* attribute_align_arg worker(void *v)
+{
+    AVCodecContext *avctx = v;
+    SliceThreadContext *c = avctx->internal->thread_ctx;
+    unsigned last_execute = 0;
+    int our_job = c->job_count;
+    int thread_count = avctx->thread_count;
+    int self_id;
+
+    pthread_mutex_lock(&c->current_job_lock);
+    self_id = c->current_job++;
+    for (;;){
+        while (our_job >= c->job_count) {
+            if (c->current_job == thread_count + c->job_count)
+                pthread_cond_signal(&c->last_job_cond);
+
+            while (last_execute == c->current_execute && !c->done)
+                pthread_cond_wait(&c->current_job_cond, &c->current_job_lock);
+            last_execute = c->current_execute;
+            our_job = self_id;
+
+            if (c->done) {
+                pthread_mutex_unlock(&c->current_job_lock);
+                return NULL;
+            }
+        }
+        pthread_mutex_unlock(&c->current_job_lock);
+
+        c->rets[our_job%c->rets_count] = c->func ? c->func(avctx, (char*)c->args + our_job*c->job_size):
+                                                   c->func2(avctx, c->args, our_job, self_id);
+
+        pthread_mutex_lock(&c->current_job_lock);
+        our_job = c->current_job++;
+    }
+}
+
+void ff_slice_thread_free(AVCodecContext *avctx)
+{
+    SliceThreadContext *c = avctx->internal->thread_ctx;
+    int i;
+
+    pthread_mutex_lock(&c->current_job_lock);
+    c->done = 1;
+    pthread_cond_broadcast(&c->current_job_cond);
+    pthread_mutex_unlock(&c->current_job_lock);
+
+    for (i=0; i<avctx->thread_count; i++)
+         pthread_join(c->workers[i], NULL);
+
+    pthread_mutex_destroy(&c->current_job_lock);
+    pthread_cond_destroy(&c->current_job_cond);
+    pthread_cond_destroy(&c->last_job_cond);
+    av_free(c->workers);
+    av_freep(&avctx->internal->thread_ctx);
+}
+
+static av_always_inline void thread_park_workers(SliceThreadContext *c, int thread_count)
+{
+    while (c->current_job != thread_count + c->job_count)
+        pthread_cond_wait(&c->last_job_cond, &c->current_job_lock);
+    pthread_mutex_unlock(&c->current_job_lock);
+}
+
+static int thread_execute(AVCodecContext *avctx, action_func* func, void *arg, int *ret, int job_count, int job_size)
+{
+    SliceThreadContext *c = avctx->internal->thread_ctx;
+    int dummy_ret;
+
+    if (!(avctx->active_thread_type&FF_THREAD_SLICE) || avctx->thread_count <= 1)
+        return avcodec_default_execute(avctx, func, arg, ret, job_count, job_size);
+
+    if (job_count <= 0)
+        return 0;
+
+    pthread_mutex_lock(&c->current_job_lock);
+
+    c->current_job = avctx->thread_count;
+    c->job_count = job_count;
+    c->job_size = job_size;
+    c->args = arg;
+    c->func = func;
+    if (ret) {
+        c->rets = ret;
+        c->rets_count = job_count;
+    } else {
+        c->rets = &dummy_ret;
+        c->rets_count = 1;
+    }
+    c->current_execute++;
+    pthread_cond_broadcast(&c->current_job_cond);
+
+    thread_park_workers(c, avctx->thread_count);
+
+    return 0;
+}
+
+static int thread_execute2(AVCodecContext *avctx, action_func2* func2, void *arg, int *ret, int job_count)
+{
+    SliceThreadContext *c = avctx->internal->thread_ctx;
+    c->func2 = func2;
+    return thread_execute(avctx, NULL, arg, ret, job_count, 0);
+}
+
+int ff_slice_thread_init(AVCodecContext *avctx)
+{
+    int i;
+    SliceThreadContext *c;
+    int thread_count = avctx->thread_count;
+
+#if HAVE_W32THREADS
+    w32thread_init();
+#endif
+
+    if (!thread_count) {
+        int nb_cpus = av_cpu_count();
+        if  (avctx->height)
+            nb_cpus = FFMIN(nb_cpus, (avctx->height+15)/16);
+        // use number of cores + 1 as thread count if there is more than one
+        if (nb_cpus > 1)
+            thread_count = avctx->thread_count = FFMIN(nb_cpus + 1, MAX_AUTO_THREADS);
+        else
+            thread_count = avctx->thread_count = 1;
+    }
+
+    if (thread_count <= 1) {
+        avctx->active_thread_type = 0;
+        return 0;
+    }
+
+    c = av_mallocz(sizeof(SliceThreadContext));
+    if (!c)
+        return -1;
+
+    c->workers = av_mallocz(sizeof(pthread_t)*thread_count);
+    if (!c->workers) {
+        av_free(c);
+        return -1;
+    }
+
+    avctx->internal->thread_ctx = c;
+    c->current_job = 0;
+    c->job_count = 0;
+    c->job_size = 0;
+    c->done = 0;
+    pthread_cond_init(&c->current_job_cond, NULL);
+    pthread_cond_init(&c->last_job_cond, NULL);
+    pthread_mutex_init(&c->current_job_lock, NULL);
+    pthread_mutex_lock(&c->current_job_lock);
+    for (i=0; i<thread_count; i++) {
+        if(pthread_create(&c->workers[i], NULL, worker, avctx)) {
+           avctx->thread_count = i;
+           pthread_mutex_unlock(&c->current_job_lock);
+           ff_thread_free(avctx);
+           return -1;
+        }
+    }
+
+    thread_park_workers(c, thread_count);
+
+    avctx->execute = thread_execute;
+    avctx->execute2 = thread_execute2;
+    return 0;
+}
+
+void ff_thread_report_progress2(AVCodecContext *avctx, int field, int thread, int n)
+{
+    SliceThreadContext *p = avctx->internal->thread_ctx;
+    int *entries = p->entries;
+
+    pthread_mutex_lock(&p->progress_mutex[thread]);
+    entries[field] +=n;
+    pthread_cond_signal(&p->progress_cond[thread]);
+    pthread_mutex_unlock(&p->progress_mutex[thread]);
+}
+
+void ff_thread_await_progress2(AVCodecContext *avctx, int field, int thread, int shift)
+{
+    SliceThreadContext *p  = avctx->internal->thread_ctx;
+    int *entries      = p->entries;
+
+    if (!entries || !field) return;
+
+    thread = thread ? thread - 1 : p->thread_count - 1;
+
+    pthread_mutex_lock(&p->progress_mutex[thread]);
+    while ((entries[field - 1] - entries[field]) < shift){
+        pthread_cond_wait(&p->progress_cond[thread], &p->progress_mutex[thread]);
+    }
+    pthread_mutex_unlock(&p->progress_mutex[thread]);
+}
+
+int ff_alloc_entries(AVCodecContext *avctx, int count)
+{
+    int i;
+
+    if (avctx->active_thread_type & FF_THREAD_SLICE)  {
+        SliceThreadContext *p = avctx->internal->thread_ctx;
+        p->thread_count  = avctx->thread_count;
+        p->entries       = av_mallocz(count * sizeof(int));
+
+        if (!p->entries) {
+            return AVERROR(ENOMEM);
+        }
+
+        p->entries_count  = count;
+        p->progress_mutex = av_malloc(p->thread_count * sizeof(pthread_mutex_t));
+        p->progress_cond  = av_malloc(p->thread_count * sizeof(pthread_cond_t));
+
+        for (i = 0; i < p->thread_count; i++) {
+            pthread_mutex_init(&p->progress_mutex[i], NULL);
+            pthread_cond_init(&p->progress_cond[i], NULL);
+        }
+    }
+
+    return 0;
+}
+
+void ff_reset_entries(AVCodecContext *avctx)
+{
+    SliceThreadContext *p = avctx->internal->thread_ctx;
+    memset(p->entries, 0, p->entries_count * sizeof(int));
+}

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/ptx.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/ptx.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/qcelpdata.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/qcelpdata.h Changed

@@ -66,7 +66,7 @@
 } QCELPFrame;
 
 /**
- * pre-calculated table for hammsinc function
+ * Pre-calculated table for hammsinc function.
  * Only half of the table is needed because of symmetry.
  *
  * TIA/EIA/IS-733 2.4.5.2-2/3
@@ -82,7 +82,7 @@
 #define QCELP_OF(variable, bit, len) {offsetof(QCELPFrame, variable), bit, len}
 
 /**
- * bitmap unpacking tables for RATE_FULL
+ * Bitmap unpacking tables for RATE_FULL
  *
  * TIA/EIA/IS-733 Table 2.4.7.1-1
  */
@@ -169,7 +169,7 @@
 };
 
 /**
- * bitmap unpacking tables for RATE_HALF
+ * Bitmap unpacking tables for RATE_HALF
  *
  * TIA/EIA/IS-733 Table 2.4.7.2-1
  */
@@ -211,7 +211,7 @@
 };
 
 /**
- * bitmap unpacking tables for RATE_QUARTER
+ * Bitmap unpacking tables for RATE_QUARTER
  *
  * TIA/EIA/IS-733 Table 2.4.7.3-1
  */
@@ -232,7 +232,7 @@
 };
 
 /**
- * bitmap unpacking tables for RATE_OCTAVE
+ * Bitmap unpacking tables for RATE_OCTAVE
  *
  * trick: CBSEED is written into QCELPContext.cbsign[15],
  * which is not used for RATE_OCTAVE.
@@ -262,7 +262,7 @@
 };
 
 /**
- * position of the bitmapping data for each packet type in
+ * Bitmapping data position for each packet type in
  * the QCELPContext
  */
 static const QCELPBitmap * const qcelp_unpacking_bitmaps_per_rate[5] = {
@@ -420,12 +420,12 @@
 };
 
 /**
- * the final gain scalefactor before clipping into a usable output float
+ * The final gain scalefactor before clipping into a usable output float
  */
 #define QCELP_SCALE 8192.
 
 /**
- * table for computing Ga (decoded linear codebook gain magnitude)
+ * Table for computing Ga (decoded linear codebook gain magnitude)
  *
  * @note The table could fit in int16_t in x*8 form, but it seems
  *       to be slower on x86
@@ -452,7 +452,7 @@
  1000.000/QCELP_SCALE};
 
 /**
- * circular codebook for rate 1 frames in x*100 form
+ * Circular codebook for rate 1 frames in x*100 form
  *
  * TIA/EIA/IS-733 2.4.6.1-2
  */
@@ -477,7 +477,7 @@
 #define QCELP_RATE_FULL_CODEBOOK_RATIO .01
 
 /**
- * circular codebook for rate 1/2 frames in x*2 form
+ * Circular codebook for rate 1/2 frames in x*2 form
  *
  * TIA/EIA/IS-733 2.4.6.1-1
  */
@@ -511,7 +511,7 @@
 #define QCELP_SQRT1887 1.373681186
 
 /**
- * table for impulse response of BPF used to filter
+ * Table for impulse response of BPF used to filter
  * the white excitation for bitrate 1/4 synthesis
  *
  * Only half the tables are needed because of symmetry.
@@ -526,14 +526,14 @@
 
 /**
  * This spread factor is used, for bitrate 1/8 and I_F_Q,
- * to force the LSP frequencies to be at least 80 Hz apart.
+ * to force LSP frequencies to be at least 80 Hz apart.
  *
  * TIA/EIA/IS-733 2.4.3.3.2
  */
 #define QCELP_LSP_SPREAD_FACTOR 0.02
 
 /**
- * predictor coefficient for the conversion of LSP codes
+ * Predictor coefficient for the conversion of LSP codes
  * to LSP frequencies for 1/8 and I_F_Q
  *
  * TIA/EIA/IS-733 2.4.3.2.7-2
@@ -541,7 +541,7 @@
 #define QCELP_LSP_OCTAVE_PREDICTOR 29.0/32
 
 /**
- * initial coefficient to perform bandwidth expansion on LPC
+ * Initial coefficient to perform bandwidth expansion on LPC
  *
  * @note: 0.9883 looks like an approximation of 253/256.
  *

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/qcelpdec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/qcelpdec.c Changed

@@ -319,7 +319,8 @@
             tmp_gain = gain[i] * QCELP_RATE_FULL_CODEBOOK_RATIO;
             cindex   = -q->frame.cindex[i];
             for (j = 0; j < 10; j++)
-                *cdn_vector++ = tmp_gain * qcelp_rate_full_codebook[cindex++ & 127];
+                *cdn_vector++ = tmp_gain *
+                                qcelp_rate_full_codebook[cindex++ & 127];
         }
         break;
     case RATE_HALF:
@@ -327,7 +328,8 @@
             tmp_gain = gain[i] * QCELP_RATE_HALF_CODEBOOK_RATIO;
             cindex   = -q->frame.cindex[i];
             for (j = 0; j < 40; j++)
-                *cdn_vector++ = tmp_gain * qcelp_rate_half_codebook[cindex++ & 127];
+                *cdn_vector++ = tmp_gain *
+                                qcelp_rate_half_codebook[cindex++ & 127];
         }
         break;
     case RATE_QUARTER:
@@ -372,7 +374,8 @@
         for (i = 0; i < 4; i++) {
             tmp_gain = gain[i] * QCELP_RATE_FULL_CODEBOOK_RATIO;
             for (j = 0; j < 40; j++)
-                *cdn_vector++ = tmp_gain * qcelp_rate_full_codebook[cbseed++ & 127];
+                *cdn_vector++ = tmp_gain *
+                                qcelp_rate_full_codebook[cbseed++ & 127];
         }
         break;
     case SILENCE:
@@ -433,7 +436,8 @@
             for (v_len = v_in + 40; v_in < v_len; v_in++) {
                 if (pfrac[i]) { // If it is a fractional lag...
                     for (j = 0, *v_out = 0.0; j < 4; j++)
-                        *v_out += qcelp_hammsinc_table[j] * (v_lag[j - 4] + v_lag[3 - j]);
+                        *v_out += qcelp_hammsinc_table[j] *
+                                  (v_lag[j - 4] + v_lag[3 - j]);
                 } else
                     *v_out = *v_lag;
 
@@ -509,7 +513,8 @@
 
         apply_gain_ctrl(cdn_vector, v_synthesis_filtered, v_pre_filtered);
     } else {
-        memcpy(q->pitch_synthesis_filter_mem, cdn_vector + 17, 143 * sizeof(float));
+        memcpy(q->pitch_synthesis_filter_mem,
+               cdn_vector + 17, 143 * sizeof(float));
         memcpy(q->pitch_pre_filter_mem, cdn_vector + 17, 143 * sizeof(float));
         memset(q->pitch_gain, 0, sizeof(q->pitch_gain));
         memset(q->pitch_lag,  0, sizeof(q->pitch_lag));
@@ -628,7 +633,7 @@
         (*buf)++;
     } else if ((bitrate = buf_size2bitrate(buf_size + 1)) >= 0) {
         av_log(avctx, AV_LOG_WARNING,
-               "Bitrate byte is missing, guessing the bitrate from packet size.\n");
+               "Bitrate byte missing, guessing bitrate from packet size.\n");
     } else
         return I_F_Q;
 
@@ -698,7 +703,7 @@
     outbuffer = (float *)frame->data[0];
 
     if ((q->bitrate = determine_bitrate(avctx, buf_size, &buf)) == I_F_Q) {
-        warn_insufficient_frame_quality(avctx, "bitrate cannot be determined.");
+        warn_insufficient_frame_quality(avctx, "Bitrate cannot be determined.");
         goto erasure;
     }
 
@@ -766,7 +771,8 @@
     formant_mem = q->formant_mem + 10;
     for (i = 0; i < 4; i++) {
         interpolate_lpc(q, quantized_lspf, lpc, i);
-        ff_celp_lp_synthesis_filterf(formant_mem, lpc, outbuffer + i * 40, 40, 10);
+        ff_celp_lp_synthesis_filterf(formant_mem, lpc,
+                                     outbuffer + i * 40, 40, 10);
         formant_mem += 40;
     }

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/qdm2.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/qdm2.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/qpeg.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/qpeg.c Changed

@@ -30,7 +30,7 @@
 
 typedef struct QpegContext{
     AVCodecContext *avctx;
-    AVFrame pic, ref;
+    AVFrame *pic, *ref;
     uint32_t pal[256];
     GetByteContext buffer;
 } QpegContext;
@@ -110,7 +110,7 @@
  { 0x00, 0x20, 0x18, 0x08, 0x18, 0x10, 0x20, 0x10, 0x08, 0x10, 0x20, 0x20, 0x08, 0x10, 0x18, 0x04};
 
 /* Decodes delta frames */
-static void qpeg_decode_inter(QpegContext *qctx, uint8_t *dst,
+static void av_noinline qpeg_decode_inter(QpegContext *qctx, uint8_t *dst,
                               int stride, int width, int height,
                               int delta, const uint8_t *ctable,
                               uint8_t *refdata)
@@ -255,8 +255,8 @@
 {
     uint8_t ctable[128];
     QpegContext * const a = avctx->priv_data;
-    AVFrame *  p = &a->pic;
-    AVFrame * ref= &a->ref;
+    AVFrame * const p = a->pic;
+    AVFrame * const ref = a->ref;
     uint8_t* outdata;
     int delta, ret;
     const uint8_t *pal = av_packet_get_side_data(avpkt, AV_PKT_DATA_PALETTE, NULL);
@@ -273,26 +273,26 @@
 
     if ((ret = ff_get_buffer(avctx, p, AV_GET_BUFFER_FLAG_REF)) < 0)
         return ret;
-    outdata = a->pic.data[0];
+    outdata = p->data[0];
     bytestream2_skip(&a->buffer, 4);
     bytestream2_get_buffer(&a->buffer, ctable, 128);
     bytestream2_skip(&a->buffer, 1);
 
     delta = bytestream2_get_byte(&a->buffer);
     if(delta == 0x10) {
-        qpeg_decode_intra(a, outdata, a->pic.linesize[0], avctx->width, avctx->height);
+        qpeg_decode_intra(a, outdata, p->linesize[0], avctx->width, avctx->height);
     } else {
-        qpeg_decode_inter(a, outdata, a->pic.linesize[0], avctx->width, avctx->height, delta, ctable, a->ref.data[0]);
+        qpeg_decode_inter(a, outdata, p->linesize[0], avctx->width, avctx->height, delta, ctable, ref->data[0]);
     }
 
     /* make the palette available on the way out */
     if (pal) {
-        a->pic.palette_has_changed = 1;
+        p->palette_has_changed = 1;
         memcpy(a->pal, pal, AVPALETTE_SIZE);
     }
-    memcpy(a->pic.data[1], a->pal, AVPALETTE_SIZE);
+    memcpy(p->data[1], a->pal, AVPALETTE_SIZE);
 
-    if ((ret = av_frame_ref(data, &a->pic)) < 0)
+    if ((ret = av_frame_ref(data, p)) < 0)
         return ret;
 
     *got_frame      = 1;
@@ -312,28 +312,30 @@
         a->pal[i] = 0xFFU<<24 | AV_RL32(pal_src+4*i);
 }
 
-static av_cold int decode_init(AVCodecContext *avctx){
+static av_cold int decode_end(AVCodecContext *avctx)
+{
     QpegContext * const a = avctx->priv_data;
 
-    avcodec_get_frame_defaults(&a->pic);
-    avcodec_get_frame_defaults(&a->ref);
-    a->avctx = avctx;
-    avctx->pix_fmt= AV_PIX_FMT_PAL8;
-
-    decode_flush(avctx);
-
-    avcodec_get_frame_defaults(&a->pic);
+    av_frame_free(&a->pic);
+    av_frame_free(&a->ref);
 
     return 0;
 }
 
-static av_cold int decode_end(AVCodecContext *avctx){
+static av_cold int decode_init(AVCodecContext *avctx){
     QpegContext * const a = avctx->priv_data;
-    AVFrame * const p = &a->pic;
-    AVFrame * const ref= &a->ref;
 
-    av_frame_unref(p);
-    av_frame_unref(ref);
+    a->avctx = avctx;
+    avctx->pix_fmt= AV_PIX_FMT_PAL8;
+
+    decode_flush(avctx);
+
+    a->pic = av_frame_alloc();
+    a->ref = av_frame_alloc();
+    if (!a->pic || !a->ref) {
+        decode_end(avctx);
+        return AVERROR(ENOMEM);
+    }
 
     return 0;
 }

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/qtrleenc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/qtrleenc.c Changed

@@ -36,7 +36,6 @@
 
 typedef struct QtrleEncContext {
     AVCodecContext *avctx;
-    AVFrame frame;
     int pixel_size;
     AVPicture previous_frame;
     unsigned int max_buf_size;
@@ -61,6 +60,19 @@
     uint8_t* skip_table;
 } QtrleEncContext;
 
+static av_cold int qtrle_encode_end(AVCodecContext *avctx)
+{
+    QtrleEncContext *s = avctx->priv_data;
+
+    av_frame_free(&avctx->coded_frame);
+
+    avpicture_free(&s->previous_frame);
+    av_free(s->rlecode_table);
+    av_free(s->length_table);
+    av_free(s->skip_table);
+    return 0;
+}
+
 static av_cold int qtrle_encode_init(AVCodecContext *avctx)
 {
     QtrleEncContext *s = avctx->priv_data;
@@ -108,7 +120,13 @@
                       + 15                                            /* header + footer */
                       + s->avctx->height*2                            /* skip code+rle end */
                       + s->logical_width/MAX_RLE_BULK + 1             /* rle codes */;
-    avctx->coded_frame = &s->frame;
+
+    avctx->coded_frame = av_frame_alloc();
+    if (!avctx->coded_frame) {
+        qtrle_encode_end(avctx);
+        return AVERROR(ENOMEM);
+    }
+
     return 0;
 }
 
@@ -197,7 +215,7 @@
             }
         }
 
-        if (!s->frame.key_frame && !memcmp(this_line, prev_line, s->pixel_size))
+        if (!s->avctx->coded_frame->key_frame && !memcmp(this_line, prev_line, s->pixel_size))
             skipcount = FFMIN(skipcount + 1, MAX_RLE_SKIP);
         else
             skipcount = 0;
@@ -308,7 +326,7 @@
     int end_line = s->avctx->height;
     uint8_t *orig_buf = buf;
 
-    if (!s->frame.key_frame) {
+    if (!s->avctx->coded_frame->key_frame) {
         unsigned line_size = s->logical_width * s->pixel_size;
         for (start_line = 0; start_line < s->avctx->height; start_line++)
             if (memcmp(p->data[0] + start_line*p->linesize[0],
@@ -346,11 +364,9 @@
                               const AVFrame *pict, int *got_packet)
 {
     QtrleEncContext * const s = avctx->priv_data;
-    AVFrame * const p = &s->frame;
+    AVFrame * const p = avctx->coded_frame;
     int ret;
 
-    *p = *pict;
-
     if ((ret = ff_alloc_packet2(avctx, pkt, s->max_buf_size)) < 0)
         return ret;
 
@@ -367,7 +383,8 @@
     pkt->size = encode_frame(s, pict, pkt->data);
 
     /* save the current frame */
-    av_picture_copy(&s->previous_frame, (AVPicture *)p, avctx->pix_fmt, avctx->width, avctx->height);
+    av_picture_copy(&s->previous_frame, (const AVPicture *)pict,
+                    avctx->pix_fmt, avctx->width, avctx->height);
 
     if (p->key_frame)
         pkt->flags |= AV_PKT_FLAG_KEY;
@@ -376,17 +393,6 @@
     return 0;
 }
 
-static av_cold int qtrle_encode_end(AVCodecContext *avctx)
-{
-    QtrleEncContext *s = avctx->priv_data;
-
-    avpicture_free(&s->previous_frame);
-    av_free(s->rlecode_table);
-    av_free(s->length_table);
-    av_free(s->skip_table);
-    return 0;
-}
-
 AVCodec ff_qtrle_encoder = {
     .name           = "qtrle",
     .long_name      = NULL_IF_CONFIG_SMALL("QuickTime Animation (RLE) video"),

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/r210enc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/r210enc.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/ra144.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/ra144.c Changed

@@ -1681,12 +1681,9 @@
 }
 
 /** inverse root mean square */
-int ff_irms(const int16_t *data)
+int ff_irms(DSPContext *dsp, const int16_t *data)
 {
-    unsigned int i, sum = 0;
-
-    for (i=0; i < BLOCKSIZE; i++)
-        sum += data[i] * data[i];
+    unsigned int sum = dsp->scalarproduct_int16(data, data, BLOCKSIZE);
 
     if (sum == 0)
         return 0; /* OOPS - division by zero */
@@ -1698,14 +1695,13 @@
                            int cba_idx, int cb1_idx, int cb2_idx,
                            int gval, int gain)
 {
-    int16_t buffer_a[BLOCKSIZE];
     int16_t *block;
     int m[3];
 
     if (cba_idx) {
         cba_idx += BLOCKSIZE/2 - 1;
-        ff_copy_and_dup(buffer_a, ractx->adapt_cb, cba_idx);
-        m[0] = (ff_irms(buffer_a) * gval) >> 12;
+        ff_copy_and_dup(ractx->buffer_a, ractx->adapt_cb, cba_idx);
+        m[0] = (ff_irms(&ractx->dsp, ractx->buffer_a) * gval) >> 12;
     } else {
         m[0] = 0;
     }
@@ -1716,7 +1712,7 @@
 
     block = ractx->adapt_cb + BUFFERSIZE - BLOCKSIZE;
 
-    add_wav(block, gain, cba_idx, m, cba_idx? buffer_a: NULL,
+    add_wav(block, gain, cba_idx, m, cba_idx? ractx->buffer_a: NULL,
             ff_cb1_vects[cb1_idx], ff_cb2_vects[cb2_idx]);
 
     memcpy(ractx->curr_sblock, ractx->curr_sblock + BLOCKSIZE,

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/ra144.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/ra144.h Changed

@@ -25,6 +25,7 @@
 #include <stdint.h>
 #include "lpc.h"
 #include "audio_frame_queue.h"
+#include "dsputil.h"
 
 #define NBLOCKS         4       ///< number of subblocks within a block
 #define BLOCKSIZE       40      ///< subblock size in 16-bit words
@@ -35,6 +36,7 @@
 
 typedef struct RA144Context {
     AVCodecContext *avctx;
+    DSPContext dsp;
     LPCContext lpc_ctx;
     AudioFrameQueue afq;
     int last_frame;
@@ -57,6 +59,8 @@
     /** Adaptive codebook, its size is two units bigger to avoid a
      *  buffer overflow. */
     int16_t adapt_cb[146+2];
+
+    DECLARE_ALIGNED(16, int16_t, buffer_a)[FFALIGN(BLOCKSIZE,16)];
 } RA144Context;
 
 void ff_copy_and_dup(int16_t *target, const int16_t *source, int offset);
@@ -68,7 +72,7 @@
 int ff_interp(RA144Context *ractx, int16_t *out, int a, int copyold,
               int energy);
 unsigned int ff_rescale_rms(unsigned int rms, unsigned int energy);
-int ff_irms(const int16_t *data);
+int ff_irms(DSPContext *dsp, const int16_t *data/*align 16*/);
 void ff_subblock_synthesis(RA144Context *ractx, const int16_t *lpc_coefs,
                            int cba_idx, int cb1_idx, int cb2_idx,
                            int gval, int gain);

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/ra144dec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/ra144dec.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/ra144enc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/ra144enc.c Changed

@@ -61,6 +61,7 @@
     ractx->lpc_coef[0] = ractx->lpc_tables[0];
     ractx->lpc_coef[1] = ractx->lpc_tables[1];
     ractx->avctx = avctx;
+    ff_dsputil_init(&ractx->dsp, avctx);
     ret = ff_lpc_init(&ractx->lpc_ctx, avctx->frame_size, LPC_ORDER,
                       FF_LPC_TYPE_LEVINSON);
     if (ret < 0)
@@ -334,7 +335,6 @@
     float data[BLOCKSIZE] = { 0 }, work[LPC_ORDER + BLOCKSIZE];
     float coefs[LPC_ORDER];
     float zero[BLOCKSIZE], cba[BLOCKSIZE], cb1[BLOCKSIZE], cb2[BLOCKSIZE];
-    int16_t cba_vect[BLOCKSIZE];
     int cba_idx, cb1_idx, cb2_idx, gain;
     int i, n;
     unsigned m[3];
@@ -373,8 +373,8 @@
          */
         memcpy(cba, work + LPC_ORDER, sizeof(cba));
 
-        ff_copy_and_dup(cba_vect, ractx->adapt_cb, cba_idx + BLOCKSIZE / 2 - 1);
-        m[0] = (ff_irms(cba_vect) * rms) >> 12;
+        ff_copy_and_dup(ractx->buffer_a, ractx->adapt_cb, cba_idx + BLOCKSIZE / 2 - 1);
+        m[0] = (ff_irms(&ractx->dsp, ractx->buffer_a) * rms) >> 12;
     }
     fixed_cb_search(work + LPC_ORDER, coefs, data, cba_idx, &cb1_idx, &cb2_idx);
     for (i = 0; i < BLOCKSIZE; i++) {

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/ratecontrol.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/ratecontrol.c Changed

@@ -46,7 +46,7 @@
 {
     snprintf(s->avctx->stats_out, 256,
              "in:%d out:%d type:%d q:%d itex:%d ptex:%d mv:%d misc:%d "
-             "fcode:%d bcode:%d mc-var:%d var:%d icount:%d skipcount:%d hbits:%d;\n",
+             "fcode:%d bcode:%d mc-var:%"PRId64" var:%"PRId64" icount:%d skipcount:%d hbits:%d;\n",
              s->current_picture_ptr->f.display_picture_number,
              s->current_picture_ptr->f.coded_picture_number,
              s->pict_type,
@@ -206,7 +206,7 @@
             assert(picture_number < rcc->num_entries);
             rce = &rcc->entry[picture_number];
 
-            e += sscanf(p, " in:%*d out:%*d type:%d q:%f itex:%d ptex:%d mv:%d misc:%d fcode:%d bcode:%d mc-var:%d var:%d icount:%d skipcount:%d hbits:%d",
+            e += sscanf(p, " in:%*d out:%*d type:%d q:%f itex:%d ptex:%d mv:%d misc:%d fcode:%d bcode:%d mc-var:%"SCNd64" var:%"SCNd64" icount:%d skipcount:%d hbits:%d",
                         &rce->pict_type, &rce->qscale, &rce->i_tex_bits, &rce->p_tex_bits,
                         &rce->mv_bits, &rce->misc_bits,
                         &rce->f_code, &rce->b_code,
@@ -753,7 +753,7 @@
     RateControlEntry local_rce, *rce;
     double bits;
     double rate_factor;
-    int var;
+    int64_t var;
     const int pict_type = s->pict_type;
     Picture * const pic = &s->current_picture;
     emms_c();
@@ -769,8 +769,9 @@
     fps = get_fps(s->avctx);
     /* update predictors */
     if (picture_number > 2 && !dry_run) {
-        const int last_var = s->last_pict_type == AV_PICTURE_TYPE_I ? rcc->last_mb_var_sum
-                                                                    : rcc->last_mc_mb_var_sum;
+        const int64_t last_var =
+            s->last_pict_type == AV_PICTURE_TYPE_I ? rcc->last_mb_var_sum
+                                                   : rcc->last_mc_mb_var_sum;
         av_assert1(s->frame_bits >= s->stuffing_bits);
         update_predictor(&rcc->pred[s->last_pict_type],
                          rcc->last_qscale,
@@ -817,7 +818,7 @@
             assert(pict_type == rce->new_pict_type);
 
         q = rce->new_qscale / br_compensation;
-        av_dlog(s, "%f %f %f last:%d var:%d type:%d//\n", q, rce->new_qscale,
+        av_dlog(s, "%f %f %f last:%d var:%"PRId64" type:%d//\n", q, rce->new_qscale,
                 br_compensation, s->frame_bits, var, pict_type);
     } else {
         rce->pict_type     =
@@ -879,7 +880,7 @@
     if (s->avctx->debug & FF_DEBUG_RC) {
         av_log(s->avctx, AV_LOG_DEBUG,
                "%c qp:%d<%2.1f<%d %d want:%d total:%d comp:%f st_q:%2.2f "
-               "size:%d var:%d/%d br:%d fps:%d\n",
+               "size:%d var:%"PRId64"/%"PRId64" br:%d fps:%d\n",
                av_get_picture_type_char(pict_type),
                qmin, q, qmax, picture_number,
                (int)wanted_bits / 1000, (int)s->total_bits / 1000,

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/ratecontrol.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/ratecontrol.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/raw.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/raw.c Changed

@@ -178,6 +178,22 @@
     { AV_PIX_FMT_GBRP16LE,     MKTAG('G', '3', 00 , 16 ) },
     { AV_PIX_FMT_GBRP16BE,     MKTAG(16 , 00 , '3', 'G') },
 
+    { AV_PIX_FMT_XYZ12LE,      MKTAG('X', 'Y', 'Z' , 36 ) },
+    { AV_PIX_FMT_XYZ12BE,      MKTAG(36 , 'Z' , 'Y', 'X') },
+
+    { AV_PIX_FMT_BAYER_BGGR8,    MKTAG(0xBA, 'B', 'G', 8   ) },
+    { AV_PIX_FMT_BAYER_BGGR16LE, MKTAG(0xBA, 'B', 'G', 16  ) },
+    { AV_PIX_FMT_BAYER_BGGR16BE, MKTAG(16  , 'G', 'B', 0xBA) },
+    { AV_PIX_FMT_BAYER_RGGB8,    MKTAG(0xBA, 'R', 'G', 8   ) },
+    { AV_PIX_FMT_BAYER_RGGB16LE, MKTAG(0xBA, 'R', 'G', 16  ) },
+    { AV_PIX_FMT_BAYER_RGGB16BE, MKTAG(16  , 'G', 'R', 0xBA) },
+    { AV_PIX_FMT_BAYER_GBRG8,    MKTAG(0xBA, 'G', 'B', 8   ) },
+    { AV_PIX_FMT_BAYER_GBRG16LE, MKTAG(0xBA, 'G', 'B', 16  ) },
+    { AV_PIX_FMT_BAYER_GBRG16BE, MKTAG(16,   'B', 'G', 0xBA) },
+    { AV_PIX_FMT_BAYER_GRBG8,    MKTAG(0xBA, 'G', 'R', 8   ) },
+    { AV_PIX_FMT_BAYER_GRBG16LE, MKTAG(0xBA, 'G', 'R', 16  ) },
+    { AV_PIX_FMT_BAYER_GRBG16BE, MKTAG(16,   'R', 'G', 0xBA) },
+
     /* quicktime */
     { AV_PIX_FMT_YUV420P, MKTAG('R', '4', '2', '0') }, /* Radius DV YUV PAL */
     { AV_PIX_FMT_YUV411P, MKTAG('R', '4', '1', '1') }, /* Radius DV YUV NTSC */

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/rawdec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/rawdec.c Changed

@@ -25,6 +25,7 @@
  */
 
 #include "avcodec.h"
+#include "internal.h"
 #include "raw.h"
 #include "libavutil/avassert.h"
 #include "libavutil/buffer.h"
@@ -40,6 +41,7 @@
     int flip;
     int is_2_4_bpp; // 2 or 4 bpp raw in avi/mov
     int is_yuv2;
+    int is_lt_16bpp; // 16bpp pixfmt and bits_per_coded_sample < 16
     int tff;
 } RawVideoContext;
 
@@ -81,17 +83,6 @@
     { AV_PIX_FMT_NONE,      0 },
 };
 
-enum AVPixelFormat avpriv_find_pix_fmt(const PixelFormatTag *tags,
-                                       unsigned int fourcc)
-{
-    while (tags->pix_fmt >= 0) {
-        if (tags->fourcc == fourcc)
-            return tags->pix_fmt;
-        tags++;
-    }
-    return AV_PIX_FMT_NONE;
-}
-
 #if LIBAVCODEC_VERSION_MAJOR < 55
 enum AVPixelFormat ff_find_pix_fmt(const PixelFormatTag *tags, unsigned int fourcc)
 {
@@ -141,6 +132,7 @@
                                                  FFALIGN(avctx->width, 16),
                                                  avctx->height);
     } else {
+        context->is_lt_16bpp = av_get_bits_per_pixel(desc) == 16 && avctx->bits_per_coded_sample && avctx->bits_per_coded_sample < 16;
         context->frame_size = avpicture_get_size(avctx->pix_fmt, avctx->width,
                                                  avctx->height);
     }
@@ -174,7 +166,7 @@
     int buf_size                   = avpkt->size;
     int linesize_align             = 4;
     int res, len;
-    int need_copy                  = !avpkt->buf || context->is_2_4_bpp || context->is_yuv2;
+    int need_copy                  = !avpkt->buf || context->is_2_4_bpp || context->is_yuv2 || context->is_lt_16bpp;
 
     AVFrame   *frame   = data;
     AVPicture *picture = data;
@@ -182,9 +174,9 @@
     frame->pict_type        = AV_PICTURE_TYPE_I;
     frame->key_frame        = 1;
     frame->reordered_opaque = avctx->reordered_opaque;
-    frame->pkt_pts          = avctx->pkt->pts;
-    av_frame_set_pkt_pos     (frame, avctx->pkt->pos);
-    av_frame_set_pkt_duration(frame, avctx->pkt->duration);
+    frame->pkt_pts          = avctx->internal->pkt->pts;
+    av_frame_set_pkt_pos     (frame, avctx->internal->pkt->pos);
+    av_frame_set_pkt_duration(frame, avctx->internal->pkt->duration);
 
     if (context->tff >= 0) {
         frame->interlaced_frame = 1;
@@ -223,6 +215,17 @@
             linesize_align = 16;
         }
         buf = dst;
+    } else if (context->is_lt_16bpp) {
+        int i;
+        uint8_t *dst = frame->buf[0]->data;
+        if (desc->flags & AV_PIX_FMT_FLAG_BE) {
+            for (i = 0; i + 1 < buf_size; i += 2)
+                AV_WB16(dst + i, AV_RB16(buf + i) << (16 - avctx->bits_per_coded_sample));
+        } else {
+            for (i = 0; i + 1 < buf_size; i += 2)
+                AV_WL16(dst + i, AV_RL16(buf + i) << (16 - avctx->bits_per_coded_sample));
+        }
+        buf = dst;
     } else if (need_copy) {
         memcpy(frame->buf[0]->data, buf, buf_size);
         buf = frame->buf[0]->data;

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/rawenc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/rawenc.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/roqvideo.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/roqvideo.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/roqvideodec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/roqvideodec.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/roqvideoenc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/roqvideoenc.c Changed

@@ -57,6 +57,7 @@
 #include <string.h>
 
 #include "libavutil/attributes.h"
+#include "libavutil/opt.h"
 #include "roqvideo.h"
 #include "bytestream.h"
 #include "elbg.h"
@@ -69,7 +70,7 @@
  * Maximum number of generated 4x4 codebooks. Can't be 256 to workaround a
  * Quake 3 bug.
  */
-#define MAX_CBS_4x4 255
+#define MAX_CBS_4x4 256
 
 #define MAX_CBS_2x2 256 ///< Maximum number of 2x2 codebooks.
 
@@ -540,7 +541,7 @@
     int i, j, idx=0;
 
     /* Make remaps for the final codebook usage */
-    for (i=0; i<MAX_CBS_4x4; i++) {
+    for (i=0; i<(enc->quake3_compat ? MAX_CBS_4x4-1 : MAX_CBS_4x4); i++) {
         if (tempData->codebooks.usedCB4[i]) {
             tempData->i2f4[i] = idx;
             tempData->f2i4[idx] = i;
@@ -806,8 +807,8 @@
     else
         closest_cb = tempdata->closest_cb2;
 
-    ff_init_elbg(points, 6*c_size, inputCount, codebook, cbsize, 1, closest_cb, &enc->randctx);
-    ff_do_elbg(points, 6*c_size, inputCount, codebook, cbsize, 1, closest_cb, &enc->randctx);
+    avpriv_init_elbg(points, 6*c_size, inputCount, codebook, cbsize, 1, closest_cb, &enc->randctx);
+    avpriv_do_elbg(points, 6*c_size, inputCount, codebook, cbsize, 1, closest_cb, &enc->randctx);
 
     if (size == 4)
         av_free(closest_cb);
@@ -847,9 +848,9 @@
     }
 
     /* Create 4x4 codebooks */
-    generate_codebook(enc, tempData, points, max, results4, 4, MAX_CBS_4x4);
+    generate_codebook(enc, tempData, points, max, results4, 4, (enc->quake3_compat ? MAX_CBS_4x4-1 : MAX_CBS_4x4));
 
-    codebooks->numCB4 = MAX_CBS_4x4;
+    codebooks->numCB4 = (enc->quake3_compat ? MAX_CBS_4x4-1 : MAX_CBS_4x4);
 
     tempData->closest_cb2 = av_malloc(max*4*sizeof(int));
 
@@ -901,10 +902,10 @@
         gather_data_for_cel(tempData->cel_evals + i, enc, tempData);
 
     /* Quake 3 can't handle chunks bigger than 65535 bytes */
-    if (tempData->mainChunkSize/8 > 65535) {
+    if (tempData->mainChunkSize/8 > 65535 && enc->quake3_compat) {
         av_log(enc->avctx, AV_LOG_ERROR,
-               "Warning, generated a frame too big (%d > 65535), "
-               "try using a smaller qscale value.\n",
+               "Warning, generated a frame too big for Quake (%d > 65535), "
+               "now switching to a bigger qscale value.\n",
                tempData->mainChunkSize/8);
         enc->lambda *= 1.5;
         tempData->mainChunkSize = 0;
@@ -962,7 +963,7 @@
     enc->framesSinceKeyframe = 0;
     if ((avctx->width & 0xf) || (avctx->height & 0xf)) {
         av_log(avctx, AV_LOG_ERROR, "Dimensions must be divisible by 16\n");
-        return -1;
+        return AVERROR(EINVAL);
     }
 
     if (((avctx->width)&(avctx->width-1))||((avctx->height)&(avctx->height-1)))
@@ -1073,6 +1074,20 @@
     return 0;
 }
 
+#define OFFSET(x) offsetof(RoqContext, x)
+#define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM
+static const AVOption options[] = {
+    { "quake3_compat", "Whether to respect known limitations in Quake 3 decoder", OFFSET(quake3_compat), AV_OPT_TYPE_INT, { .i64 = 1 }, 0, 1, VE },
+    { NULL },
+};
+
+static const AVClass roq_class = {
+    .class_name = "RoQ",
+    .item_name  = av_default_item_name,
+    .option     = options,
+    .version    = LIBAVUTIL_VERSION_INT,
+};
+
 AVCodec ff_roq_encoder = {
     .name                 = "roqvideo",
     .long_name            = NULL_IF_CONFIG_SMALL("id RoQ video"),
@@ -1082,7 +1097,7 @@
     .init                 = roq_encode_init,
     .encode2              = roq_encode_frame,
     .close                = roq_encode_end,
-    .supported_framerates = (const AVRational[]){ {30,1}, {0,0} },
     .pix_fmts             = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV444P,
                                                         AV_PIX_FMT_NONE },
+    .priv_class     = &roq_class,
 };

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/rpza.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/rpza.c Changed

@@ -34,23 +34,22 @@
  * pixels shall be stored in native CPU endianness.
  */
 
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "libavutil/internal.h"
-#include "libavutil/intreadwrite.h"
 #include "avcodec.h"
+#include "bytestream.h"
 #include "internal.h"
 
 typedef struct RpzaContext {
 
     AVCodecContext *avctx;
-    AVFrame frame;
-
-    const unsigned char *buf;
-    int size;
+    AVFrame *frame;
 
+    GetByteContext gb;
 } RpzaContext;
 
 #define ADVANCE_BLOCK() \
@@ -72,17 +71,13 @@
 static void rpza_decode_stream(RpzaContext *s)
 {
     int width = s->avctx->width;
-    int stride = s->frame.linesize[0] / 2;
+    int stride = s->frame->linesize[0] / 2;
     int row_inc = stride - 4;
-    int stream_ptr = 0;
     int chunk_size;
-    unsigned char opcode;
-    int n_blocks;
-    unsigned short colorA = 0, colorB;
-    unsigned short color4[4];
-    unsigned char index, idx;
-    unsigned short ta, tb;
-    unsigned short *pixels = (unsigned short *)s->frame.data[0];
+    uint16_t colorA = 0, colorB;
+    uint16_t color4[4];
+    uint16_t ta, tb;
+    uint16_t *pixels = (uint16_t *)s->frame->data[0];
 
     int row_ptr = 0;
     int pixel_ptr = -4;
@@ -91,34 +86,31 @@
     int total_blocks;
 
     /* First byte is always 0xe1. Warn if it's different */
-    if (s->buf[stream_ptr] != 0xe1)
+    if (bytestream2_peek_byte(&s->gb) != 0xe1)
         av_log(s->avctx, AV_LOG_ERROR, "First chunk byte is 0x%02x instead of 0xe1\n",
-            s->buf[stream_ptr]);
+               bytestream2_peek_byte(&s->gb));
 
     /* Get chunk size, ingnoring first byte */
-    chunk_size = AV_RB32(&s->buf[stream_ptr]) & 0x00FFFFFF;
-    stream_ptr += 4;
+    chunk_size = bytestream2_get_be32(&s->gb) & 0x00FFFFFF;
 
     /* If length mismatch use size from MOV file and try to decode anyway */
-    if (chunk_size != s->size)
-        av_log(s->avctx, AV_LOG_ERROR, "MOV chunk size != encoded chunk size; using MOV chunk size\n");
-
-    chunk_size = s->size;
+    if (chunk_size != bytestream2_get_bytes_left(&s->gb) - 4)
+        av_log(s->avctx, AV_LOG_WARNING, "MOV chunk size != encoded chunk size\n");
 
     /* Number of 4x4 blocks in frame. */
     total_blocks = ((s->avctx->width + 3) / 4) * ((s->avctx->height + 3) / 4);
 
     /* Process chunk data */
-    while (stream_ptr < chunk_size) {
-        opcode = s->buf[stream_ptr++]; /* Get opcode */
+    while (bytestream2_get_bytes_left(&s->gb)) {
+        uint8_t opcode = bytestream2_get_byte(&s->gb); /* Get opcode */
 
-        n_blocks = (opcode & 0x1f) + 1; /* Extract block counter from opcode */
+        int n_blocks = (opcode & 0x1f) + 1; /* Extract block counter from opcode */
 
         /* If opcode MSbit is 0, we need more data to decide what to do */
         if ((opcode & 0x80) == 0) {
-            colorA = (opcode << 8) | (s->buf[stream_ptr++]);
+            colorA = (opcode << 8) | bytestream2_get_byte(&s->gb);
             opcode = 0;
-            if ((s->buf[stream_ptr] & 0x80) != 0) {
+            if ((bytestream2_peek_byte(&s->gb) & 0x80) != 0) {
                 /* Must behave as opcode 110xxxxx, using colorA computed
                  * above. Use fake opcode 0x20 to enter switch block at
                  * the right place */
@@ -127,6 +119,8 @@
             }
         }
 
+        n_blocks = FFMIN(n_blocks, total_blocks);
+
         switch (opcode & 0xe0) {
 
         /* Skip blocks */
@@ -138,8 +132,7 @@
 
         /* Fill blocks with one color */
         case 0xa0:
-            colorA = AV_RB16 (&s->buf[stream_ptr]);
-            stream_ptr += 2;
+            colorA = bytestream2_get_be16(&s->gb);
             while (n_blocks--) {
                 ADVANCE_BLOCK()
                 block_ptr = row_ptr + pixel_ptr;
@@ -155,11 +148,9 @@
 
         /* Fill blocks with 4 colors */
         case 0xc0:
-            colorA = AV_RB16 (&s->buf[stream_ptr]);
-            stream_ptr += 2;
+            colorA = bytestream2_get_be16(&s->gb);
         case 0x20:
-            colorB = AV_RB16 (&s->buf[stream_ptr]);
-            stream_ptr += 2;
+            colorB = bytestream2_get_be16(&s->gb);
 
             /* sort out the colors */
             color4[0] = colorB;
@@ -185,15 +176,15 @@
             color4[1] |= ((11 * ta + 21 * tb) >> 5);
             color4[2] |= ((21 * ta + 11 * tb) >> 5);
 
-            if (s->size - stream_ptr < n_blocks * 4)
+            if (bytestream2_get_bytes_left(&s->gb) < n_blocks * 4)
                 return;
             while (n_blocks--) {
                 ADVANCE_BLOCK();
                 block_ptr = row_ptr + pixel_ptr;
                 for (pixel_y = 0; pixel_y < 4; pixel_y++) {
-                    index = s->buf[stream_ptr++];
+                    uint8_t index = bytestream2_get_byteu(&s->gb);
                     for (pixel_x = 0; pixel_x < 4; pixel_x++){
-                        idx = (index >> (2 * (3 - pixel_x))) & 0x03;
+                        uint8_t idx = (index >> (2 * (3 - pixel_x))) & 0x03;
                         pixels[block_ptr] = color4[idx];
                         block_ptr++;
                     }
@@ -204,17 +195,15 @@
 
         /* Fill block with 16 colors */
         case 0x00:
-            if (s->size - stream_ptr < 30)
+            if (bytestream2_get_bytes_left(&s->gb) < 30)
                 return;
             ADVANCE_BLOCK();
             block_ptr = row_ptr + pixel_ptr;
             for (pixel_y = 0; pixel_y < 4; pixel_y++) {
                 for (pixel_x = 0; pixel_x < 4; pixel_x++){
                     /* We already have color of upper left pixel */
-                    if ((pixel_y != 0) || (pixel_x !=0)) {
-                        colorA = AV_RB16 (&s->buf[stream_ptr]);
-                        stream_ptr += 2;
-                    }
+                    if ((pixel_y != 0) || (pixel_x != 0))
+                        colorA = bytestream2_get_be16u(&s->gb);
                     pixels[block_ptr] = colorA;
                     block_ptr++;
                 }
@@ -226,7 +215,7 @@
         default:
             av_log(s->avctx, AV_LOG_ERROR, "Unknown opcode %d in rpza chunk."
                  " Skip remaining %d bytes of chunk data.\n", opcode,
-                 chunk_size - stream_ptr);
+                 bytestream2_get_bytes_left(&s->gb));
             return;
         } /* Opcode switch */
     }
@@ -239,7 +228,9 @@
     s->avctx = avctx;
     avctx->pix_fmt = AV_PIX_FMT_RGB555;
 
-    avcodec_get_frame_defaults(&s->frame);
+    s->frame = av_frame_alloc();
+    if (!s->frame)
+        return AVERROR(ENOMEM);
 
     return 0;
 }
@@ -248,33 +239,30 @@
                              void *data, int *got_frame,
                              AVPacket *avpkt)
 {
-    const uint8_t *buf = avpkt->data;
-    int buf_size = avpkt->size;
     RpzaContext *s = avctx->priv_data;
     int ret;
 
-    s->buf = buf;
-    s->size = buf_size;
+    bytestream2_init(&s->gb, avpkt->data, avpkt->size);
 
-    if ((ret = ff_reget_buffer(avctx, &s->frame)) < 0)
+    if ((ret = ff_reget_buffer(avctx, s->frame)) < 0)
         return ret;
 
     rpza_decode_stream(s);
 
-    if ((ret = av_frame_ref(data, &s->frame)) < 0)
+    if ((ret = av_frame_ref(data, s->frame)) < 0)
         return ret;
 
     *got_frame      = 1;
 
     /* always report that the buffer was completely consumed */
-    return buf_size;
+    return avpkt->size;
 }
 
 static av_cold int rpza_decode_end(AVCodecContext *avctx)
 {
     RpzaContext *s = avctx->priv_data;
 
-    av_frame_unref(&s->frame);
+    av_frame_free(&s->frame);
 
     return 0;
 }

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/rv10.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/rv10.c Changed

@@ -28,6 +28,7 @@
 #include "libavutil/imgutils.h"
 #include "avcodec.h"
 #include "error_resilience.h"
+#include "internal.h"
 #include "mpegvideo.h"
 #include "mpeg4video.h"
 #include "h263.h"
@@ -299,7 +300,7 @@
 {
     MpegEncContext *s = &rv->m;
     int seq, mb_pos, i, ret;
-    int rpr_bits;
+    int rpr_max;
 
     i = get_bits(&s->gb, 2);
     switch(i) {
@@ -340,10 +341,10 @@
     else
         seq = get_bits(&s->gb, 13) << 2;
 
-    rpr_bits = s->avctx->extradata[1] & 7;
-    if (rpr_bits) {
+    rpr_max = s->avctx->extradata[1] & 7;
+    if (rpr_max) {
         int f, new_w, new_h;
-        rpr_bits = FFMIN((rpr_bits >> 1) + 1, 3);
+        int rpr_bits = av_log2(rpr_max) + 1;
 
         f = get_bits(&s->gb, rpr_bits);
 
@@ -374,7 +375,11 @@
                 s->avctx->sample_aspect_ratio = av_mul_q(old_aspect, (AVRational){2, 1});
             if (new_w * s->height == 2 * new_h * s->width)
                 s->avctx->sample_aspect_ratio = av_mul_q(old_aspect, (AVRational){1, 2});
-            avcodec_set_dimensions(s->avctx, new_w, new_h);
+
+            ret = ff_set_dimensions(s->avctx, new_w, new_h);
+            if (ret < 0)
+                return ret;
+
             s->width  = new_w;
             s->height = new_h;
             if ((ret = ff_MPV_common_init(s)) < 0)
@@ -382,7 +387,7 @@
         }
 
         if (s->avctx->debug & FF_DEBUG_PICT_INFO) {
-            av_log(s->avctx, AV_LOG_DEBUG, "F %d/%d\n", f, rpr_bits);
+            av_log(s->avctx, AV_LOG_DEBUG, "F %d/%d/%d\n", f, rpr_bits, rpr_max);
         }
     }
     if (av_image_check_size(s->width, s->height, 0, s->avctx) < 0)
@@ -497,6 +502,7 @@
     if ((ret = ff_MPV_common_init(s)) < 0)
         return ret;
 
+    ff_h263dsp_init(&s->h263dsp);
     ff_h263_decode_init_vlc();
 
     /* init rv vlc */
@@ -724,7 +730,10 @@
             offset + FFMAX(size, size2) > buf_size)
             return AVERROR_INVALIDDATA;
 
-        if (rv10_decode_packet(avctx, buf + offset, size, size2) > 8 * size)
+        if ((ret = rv10_decode_packet(avctx, buf + offset, size, size2)) < 0)
+            return ret;
+
+        if (ret > 8 * size)
             i++;
     }

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/rv30.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/rv30.c Changed

@@ -34,6 +34,7 @@
 
 static int rv30_parse_slice_header(RV34DecContext *r, GetBitContext *gb, SliceInfo *si)
 {
+    AVCodecContext *avctx = r->s.avctx;
     int mb_bits;
     int w = r->s.width, h = r->s.height;
     int mb_size;
@@ -49,13 +50,20 @@
     si->quant = get_bits(gb, 5);
     skip_bits1(gb);
     si->pts = get_bits(gb, 13);
-    rpr = get_bits(gb, r->rpr);
-    if (r->s.avctx->extradata_size < 8 + rpr*2) {
-        av_log(r->s.avctx, AV_LOG_WARNING,
-               "Extradata does not contain selected resolution\n");
-        rpr = 0;
-    }
+    rpr = get_bits(gb, av_log2(r->max_rpr) + 1);
     if(rpr){
+        if (rpr > r->max_rpr) {
+            av_log(avctx, AV_LOG_ERROR, "rpr too large\n");
+            return AVERROR_INVALIDDATA;
+        }
+
+        if (avctx->extradata_size < rpr * 2 + 8) {
+            av_log(avctx, AV_LOG_ERROR,
+                   "Insufficient extradata - need at least %d bytes, got %d\n",
+                   8 + rpr * 2, avctx->extradata_size);
+            return AVERROR(EINVAL);
+        }
+
         w = r->s.avctx->extradata[6 + rpr*2] << 2;
         h = r->s.avctx->extradata[7 + rpr*2] << 2;
     }
@@ -257,12 +265,13 @@
         av_log(avctx, AV_LOG_ERROR, "Extradata is too small.\n");
         return -1;
     }
-    r->rpr = (avctx->extradata[1] & 7) >> 1;
-    r->rpr = FFMIN(r->rpr + 1, 3);
-    if(avctx->extradata_size - 8 < (r->rpr - 1) * 2){
-        av_log(avctx, AV_LOG_ERROR, "Insufficient extradata - need at least %d bytes, got %d\n",
-               6 + r->rpr * 2, avctx->extradata_size);
+
+    r->max_rpr = avctx->extradata[1] & 7;
+    if(avctx->extradata_size < 2*r->max_rpr + 8){
+        av_log(avctx, AV_LOG_WARNING, "Insufficient extradata - need at least %d bytes, got %d\n",
+               2*r->max_rpr + 8, avctx->extradata_size);
     }
+
     r->parse_slice_header = rv30_parse_slice_header;
     r->decode_intra_types = rv30_decode_intra_types;
     r->decode_mb_info     = rv30_decode_mb_info;

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/rv34.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/rv34.c Changed

@@ -724,15 +724,21 @@
         uint8_t *uvbuf = s->edge_emu_buffer + 22 * s->linesize;
 
         srcY -= 2 + 2*s->linesize;
-        s->vdsp.emulated_edge_mc(s->edge_emu_buffer, s->linesize, srcY, s->linesize,
-                                 (width<<3)+6, (height<<3)+6, src_x - 2, src_y - 2,
+        s->vdsp.emulated_edge_mc(s->edge_emu_buffer, srcY,
+                                 s->linesize, s->linesize,
+                                 (width << 3) + 6, (height << 3) + 6,
+                                 src_x - 2, src_y - 2,
                                  s->h_edge_pos, s->v_edge_pos);
         srcY = s->edge_emu_buffer + 2 + 2*s->linesize;
-        s->vdsp.emulated_edge_mc(uvbuf, s->uvlinesize, srcU, s->uvlinesize,
-                                 (width<<2)+1, (height<<2)+1, uvsrc_x, uvsrc_y,
+        s->vdsp.emulated_edge_mc(uvbuf, srcU,
+                                 s->uvlinesize, s->uvlinesize,
+                                 (width << 2) + 1, (height << 2) + 1,
+                                 uvsrc_x, uvsrc_y,
                                  s->h_edge_pos >> 1, s->v_edge_pos >> 1);
-        s->vdsp.emulated_edge_mc(uvbuf + 16, s->uvlinesize, srcV, s->uvlinesize,
-                                 (width<<2)+1, (height<<2)+1, uvsrc_x, uvsrc_y,
+        s->vdsp.emulated_edge_mc(uvbuf + 16, srcV,
+                                 s->uvlinesize, s->uvlinesize,
+                                 (width << 2) + 1, (height << 2) + 1,
+                                 uvsrc_x, uvsrc_y,
                                  s->h_edge_pos >> 1, s->v_edge_pos >> 1);
         srcU = uvbuf;
         srcV = uvbuf + 16;
@@ -1356,11 +1362,11 @@
 {
     r->intra_types_stride = r->s.mb_width * 4 + 4;
 
-    r->cbp_chroma       = av_malloc(r->s.mb_stride * r->s.mb_height *
+    r->cbp_chroma       = av_mallocz(r->s.mb_stride * r->s.mb_height *
                                     sizeof(*r->cbp_chroma));
-    r->cbp_luma         = av_malloc(r->s.mb_stride * r->s.mb_height *
+    r->cbp_luma         = av_mallocz(r->s.mb_stride * r->s.mb_height *
                                     sizeof(*r->cbp_luma));
-    r->deblock_coefs    = av_malloc(r->s.mb_stride * r->s.mb_height *
+    r->deblock_coefs    = av_mallocz(r->s.mb_stride * r->s.mb_height *
                                     sizeof(*r->deblock_coefs));
     r->intra_types_hist = av_malloc(r->intra_types_stride * 4 * 2 *
                                     sizeof(*r->intra_types_hist));
@@ -1483,8 +1489,6 @@
     s->height = avctx->height;
 
     r->s.avctx = avctx;
-    avctx->flags |= CODEC_FLAG_EMU_EDGE;
-    r->s.flags |= CODEC_FLAG_EMU_EDGE;
     avctx->pix_fmt = AV_PIX_FMT_YUV420P;
     avctx->has_b_frames = 1;
     s->low_delay = 0;
@@ -1693,7 +1697,11 @@
                 si.width, si.height);
             s->width  = si.width;
             s->height = si.height;
-            avcodec_set_dimensions(s->avctx, s->width, s->height);
+
+            err = ff_set_dimensions(s->avctx, s->width, s->height);
+            if (err < 0)
+                return err;
+
             if ((err = ff_MPV_common_frame_size_change(s)) < 0)
                 return err;
             if ((err = rv34_decoder_realloc(r)) < 0)

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/rv34.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/rv34.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/rv34dsp.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/rv34dsp.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/rv40dsp.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/rv40dsp.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/s302menc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/s302menc.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/sanm.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/sanm.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/sgidec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/sgidec.c Changed

@@ -27,6 +27,7 @@
 #include "sgi.h"
 
 typedef struct SgiState {
+    AVCodecContext *avctx;
     unsigned int width;
     unsigned int height;
     unsigned int depth;
@@ -39,15 +40,16 @@
  * Expand an RLE row into a channel.
  * @param s the current image state
  * @param out_buf Points to one line after the output buffer.
- * @param out_end end of line in output buffer
+ * @param len length of out_buf in bytes
  * @param pixelstride pixel stride of input buffer
  * @return size of output in bytes, else return error code.
  */
 static int expand_rle_row(SgiState *s, uint8_t *out_buf,
-                          uint8_t *out_end, int pixelstride)
+                          int len, int pixelstride)
 {
     unsigned char pixel, count;
     unsigned char *orig = out_buf;
+    uint8_t *out_end = out_buf + len;
 
     while (out_buf < out_end) {
         if (bytestream2_get_bytes_left(&s->g) < 1)
@@ -58,8 +60,10 @@
         }
 
         /* Check for buffer overflow. */
-        if (out_end - out_buf <= pixelstride * (count - 1))
+        if (out_end - out_buf <= pixelstride * (count - 1)) {
+            av_log(s->avctx, AV_LOG_ERROR, "Invalid pixel count.\n");
             return AVERROR_INVALIDDATA;
+        }
 
         if (pixel & 0x80) {
             while (count--) {
@@ -103,7 +107,7 @@
             dest_row -= s->linesize;
             start_offset = bytestream2_get_be32(&g_table);
             bytestream2_seek(&s->g, start_offset, SEEK_SET);
-            if (expand_rle_row(s, dest_row + z, dest_row + s->width*s->depth,
+            if (expand_rle_row(s, dest_row + z, s->width*s->depth,
                                s->depth) != s->width) {
                 return AVERROR_INVALIDDATA;
             }
@@ -202,9 +206,9 @@
         return AVERROR_INVALIDDATA;
     }
 
-    if (av_image_check_size(s->width, s->height, 0, avctx))
-        return AVERROR_INVALIDDATA;
-    avcodec_set_dimensions(avctx, s->width, s->height);
+    ret = ff_set_dimensions(avctx, s->width, s->height);
+    if (ret < 0)
+        return ret;
 
     if ((ret = ff_get_buffer(avctx, p, 0)) < 0)
         return ret;
@@ -231,6 +235,15 @@
     return avpkt->size;
 }
 
+static av_cold int sgi_decode_init(AVCodecContext *avctx)
+{
+    SgiState *s = avctx->priv_data;
+
+    s->avctx = avctx;
+
+    return 0;
+}
+
 AVCodec ff_sgi_decoder = {
     .name           = "sgi",
     .long_name      = NULL_IF_CONFIG_SMALL("SGI image"),
@@ -238,5 +251,6 @@
     .id             = AV_CODEC_ID_SGI,
     .priv_data_size = sizeof(SgiState),
     .decode         = decode_frame,
+    .init           = sgi_decode_init,
     .capabilities   = CODEC_CAP_DR1,
 };

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/sgienc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/sgienc.c Changed

@@ -34,6 +34,9 @@
         av_log(avctx, AV_LOG_ERROR, "SGI does not support resolutions above 65535x65535\n");
         return -1;
     }
+    avctx->coded_frame = av_frame_alloc();
+    if (!avctx->coded_frame)
+        return AVERROR(ENOMEM);
 
     return 0;
 }
@@ -41,14 +44,14 @@
 static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
                         const AVFrame *frame, int *got_packet)
 {
-    AVFrame * const p = (AVFrame *)frame;
+    const AVFrame * const p = frame;
     uint8_t *offsettab, *lengthtab, *in_buf, *encode_buf, *buf;
     int x, y, z, length, tablesize, ret;
     unsigned int width, height, depth, dimension, bytes_per_channel, pixmax, put_be;
     unsigned char *end_buf;
 
-    p->pict_type = AV_PICTURE_TYPE_I;
-    p->key_frame = 1;
+    avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I;
+    avctx->coded_frame->key_frame = 1;
 
     width  = avctx->width;
     height = avctx->height;
@@ -199,6 +202,12 @@
     return 0;
 }
 
+static av_cold int encode_close(AVCodecContext *avctx)
+{
+    av_frame_free(&avctx->coded_frame);
+    return 0;
+}
+
 AVCodec ff_sgi_encoder = {
     .name           = "sgi",
     .long_name      = NULL_IF_CONFIG_SMALL("SGI image"),
@@ -206,6 +215,7 @@
     .id             = AV_CODEC_ID_SGI,
     .init           = encode_init,
     .encode2        = encode_frame,
+    .close          = encode_close,
     .pix_fmts       = (const enum AVPixelFormat[]){
         AV_PIX_FMT_RGB24, AV_PIX_FMT_RGBA,
         AV_PIX_FMT_RGB48LE, AV_PIX_FMT_RGB48BE,

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/shorten.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/shorten.c Changed

@@ -122,9 +122,7 @@
 
 static int allocate_buffers(ShortenContext *s)
 {
-    int i, chan;
-    int *coeffs;
-    void *tmp_ptr;
+    int i, chan, err;
 
     for (chan = 0; chan < s->channels; chan++) {
         if (FFMAX(1, s->nmean) >= UINT_MAX / sizeof(int32_t)) {
@@ -138,26 +136,21 @@
             return AVERROR_INVALIDDATA;
         }
 
-        tmp_ptr =
-            av_realloc(s->offset[chan], sizeof(int32_t) * FFMAX(1, s->nmean));
-        if (!tmp_ptr)
-            return AVERROR(ENOMEM);
-        s->offset[chan] = tmp_ptr;
+        if ((err = av_reallocp(&s->offset[chan],
+                               sizeof(int32_t) *
+                               FFMAX(1, s->nmean))) < 0)
+            return err;
 
-        tmp_ptr = av_realloc(s->decoded_base[chan], (s->blocksize + s->nwrap) *
-                             sizeof(s->decoded_base[0][0]));
-        if (!tmp_ptr)
-            return AVERROR(ENOMEM);
-        s->decoded_base[chan] = tmp_ptr;
+        if ((err = av_reallocp(&s->decoded_base[chan], (s->blocksize + s->nwrap) *
+                               sizeof(s->decoded_base[0][0]))) < 0)
+            return err;
         for (i = 0; i < s->nwrap; i++)
             s->decoded_base[chan][i] = 0;
         s->decoded[chan] = s->decoded_base[chan] + s->nwrap;
     }
 
-    coeffs = av_realloc(s->coeffs, s->nwrap * sizeof(*s->coeffs));
-    if (!coeffs)
-        return AVERROR(ENOMEM);
-    s->coeffs = coeffs;
+    if ((err = av_reallocp(&s->coeffs, s->nwrap * sizeof(*s->coeffs))) < 0)
+        return err;
 
     return 0;
 }
@@ -439,6 +432,7 @@
             av_log(avctx, AV_LOG_ERROR, "error allocating bitstream buffer\n");
             return AVERROR(ENOMEM);
         }
+        memset(tmp_ptr, 0, s->allocated_bitstream_size);
         s->bitstream = tmp_ptr;
     }

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/simple_idct.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/simple_idct.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/simple_idct_template.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/simple_idct_template.c Changed

@@ -65,13 +65,13 @@
 #elif BIT_DEPTH == 10 || BIT_DEPTH == 12
 
 #if BIT_DEPTH == 10
-#define W1 90901
-#define W2 85627
-#define W3 77062
-#define W4 65535
-#define W5 51491
-#define W6 35468
-#define W7 18081
+#define W1 (22725*4)  // 90901
+#define W2 (21407*4) //  85627
+#define W3 (19265*4) //  77062
+#define W4 (16384*4) //  65535
+#define W5 (12873*4) //  51491
+#define W6 ( 8867*4) //  35468
+#define W7 ( 4520*4) //  18081
 
 #define ROW_SHIFT 15
 #define COL_SHIFT 20
@@ -107,10 +107,10 @@
 #define ROW0_MASK (0xffffLL << 48 * HAVE_BIGENDIAN)
     if (((((uint64_t *)row)[0] & ~ROW0_MASK) | ((uint64_t *)row)[1]) == 0) {
         uint64_t temp;
-        if (DC_SHIFT - extra_shift > 0) {
+        if (DC_SHIFT - extra_shift >= 0) {
             temp = (row[0] << (DC_SHIFT - extra_shift)) & 0xffff;
         } else {
-            temp = (row[0] >> (extra_shift - DC_SHIFT)) & 0xffff;
+            temp = ((row[0] + (1<<(extra_shift - DC_SHIFT-1))) >> (extra_shift - DC_SHIFT)) & 0xffff;
         }
         temp += temp << 16;
         temp += temp << 32;
@@ -124,10 +124,10 @@
           ((uint32_t*)row)[3] |
           row[1])) {
         uint32_t temp;
-        if (DC_SHIFT - extra_shift > 0) {
+        if (DC_SHIFT - extra_shift >= 0) {
             temp = (row[0] << (DC_SHIFT - extra_shift)) & 0xffff;
         } else {
-            temp = (row[0] >> (extra_shift - DC_SHIFT)) & 0xffff;
+            temp = ((row[0] + (1<<(extra_shift - DC_SHIFT-1))) >> (extra_shift - DC_SHIFT)) & 0xffff;
         }
         temp += temp << 16;
         ((uint32_t*)row)[0]=((uint32_t*)row)[1] =
@@ -136,7 +136,7 @@
     }
 #endif
 
-    a0 = (W4 * row[0]) + (1 << (ROW_SHIFT - 1));
+    a0 = (W4 * row[0]) + (1 << (ROW_SHIFT + extra_shift - 1));
     a1 = a0;
     a2 = a0;
     a3 = a0;

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/smacker.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/smacker.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/smc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/smc.c Changed

@@ -46,7 +46,7 @@
 typedef struct SmcContext {
 
     AVCodecContext *avctx;
-    AVFrame frame;
+    AVFrame *frame;
 
     GetByteContext gb;
 
@@ -81,7 +81,7 @@
 {
     int width = s->avctx->width;
     int height = s->avctx->height;
-    int stride = s->frame.linesize[0];
+    int stride = s->frame->linesize[0];
     int i;
     int chunk_size;
     int buf_size = bytestream2_size(&s->gb);
@@ -92,9 +92,9 @@
     unsigned int color_flags_b;
     unsigned int flag_mask;
 
-    unsigned char *pixels = s->frame.data[0];
+    unsigned char *pixels = s->frame->data[0];
 
-    int image_size = height * s->frame.linesize[0];
+    int image_size = height * s->frame->linesize[0];
     int row_ptr = 0;
     int pixel_ptr = 0;
     int pixel_x, pixel_y;
@@ -112,7 +112,7 @@
     int color_octet_index = 0;
 
     /* make the palette available */
-    memcpy(s->frame.data[1], s->pal, AVPALETTE_SIZE);
+    memcpy(s->frame->data[1], s->pal, AVPALETTE_SIZE);
 
     bytestream2_skip(&s->gb, 1);
     chunk_size = bytestream2_get_be24(&s->gb);
@@ -417,7 +417,9 @@
     s->avctx = avctx;
     avctx->pix_fmt = AV_PIX_FMT_PAL8;
 
-    avcodec_get_frame_defaults(&s->frame);
+    s->frame = av_frame_alloc();
+    if (!s->frame)
+        return AVERROR(ENOMEM);
 
     return 0;
 }
@@ -434,18 +436,18 @@
 
     bytestream2_init(&s->gb, buf, buf_size);
 
-    if ((ret = ff_reget_buffer(avctx, &s->frame)) < 0)
+    if ((ret = ff_reget_buffer(avctx, s->frame)) < 0)
         return ret;
 
     if (pal) {
-        s->frame.palette_has_changed = 1;
+        s->frame->palette_has_changed = 1;
         memcpy(s->pal, pal, AVPALETTE_SIZE);
     }
 
     smc_decode_stream(s);
 
     *got_frame      = 1;
-    if ((ret = av_frame_ref(data, &s->frame)) < 0)
+    if ((ret = av_frame_ref(data, s->frame)) < 0)
         return ret;
 
     /* always report that the buffer was completely consumed */
@@ -456,7 +458,7 @@
 {
     SmcContext *s = avctx->priv_data;
 
-    av_frame_unref(&s->frame);
+    av_frame_free(&s->frame);
 
     return 0;
 }

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/snow.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/snow.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/snow.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/snow.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/snowdec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/snowdec.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/snowenc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/snowenc.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/sonic.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/sonic.c Changed

@@ -22,6 +22,8 @@
 #include "get_bits.h"
 #include "golomb.h"
 #include "internal.h"
+#include "rangecoder.h"
+
 
 /**
  * @file
@@ -45,6 +47,8 @@
 #define RIGHT_SIDE 2
 
 typedef struct SonicContext {
+    int version;
+    int minor_version;
     int lossless, decorrelation;
 
     int num_taps, downsampling;
@@ -85,7 +89,94 @@
     return (a>>b)+(a<0);
 }
 
+static av_always_inline av_flatten void put_symbol(RangeCoder *c, uint8_t *state, int v, int is_signed, uint64_t rc_stat[256][2], uint64_t rc_stat2[32][2]){
+    int i;
+
+#define put_rac(C,S,B) \
+do{\
+    if(rc_stat){\
+        rc_stat[*(S)][B]++;\
+        rc_stat2[(S)-state][B]++;\
+    }\
+    put_rac(C,S,B);\
+}while(0)
+
+    if(v){
+        const int a= FFABS(v);
+        const int e= av_log2(a);
+        put_rac(c, state+0, 0);
+        if(e<=9){
+            for(i=0; i<e; i++){
+                put_rac(c, state+1+i, 1);  //1..10
+            }
+            put_rac(c, state+1+i, 0);
+
+            for(i=e-1; i>=0; i--){
+                put_rac(c, state+22+i, (a>>i)&1); //22..31
+            }
+
+            if(is_signed)
+                put_rac(c, state+11 + e, v < 0); //11..21
+        }else{
+            for(i=0; i<e; i++){
+                put_rac(c, state+1+FFMIN(i,9), 1);  //1..10
+            }
+            put_rac(c, state+1+9, 0);
+
+            for(i=e-1; i>=0; i--){
+                put_rac(c, state+22+FFMIN(i,9), (a>>i)&1); //22..31
+            }
+
+            if(is_signed)
+                put_rac(c, state+11 + 10, v < 0); //11..21
+        }
+    }else{
+        put_rac(c, state+0, 1);
+    }
+#undef put_rac
+}
+
+static inline av_flatten int get_symbol(RangeCoder *c, uint8_t *state, int is_signed){
+    if(get_rac(c, state+0))
+        return 0;
+    else{
+        int i, e, a;
+        e= 0;
+        while(get_rac(c, state+1 + FFMIN(e,9))){ //1..10
+            e++;
+        }
+
+        a= 1;
+        for(i=e-1; i>=0; i--){
+            a += a + get_rac(c, state+22 + FFMIN(i,9)); //22..31
+        }
+
+        e= -(is_signed && get_rac(c, state+11 + FFMIN(e, 10))); //11..21
+        return (a^e)-e;
+    }
+}
+
 #if 1
+static inline int intlist_write(RangeCoder *c, uint8_t *state, int *buf, int entries, int base_2_part)
+{
+    int i;
+
+    for (i = 0; i < entries; i++)
+        put_symbol(c, state, buf[i], 1, NULL, NULL);
+
+    return 1;
+}
+
+static inline int intlist_read(RangeCoder *c, uint8_t *state, int *buf, int entries, int base_2_part)
+{
+    int i;
+
+    for (i = 0; i < entries; i++)
+        buf[i] = get_symbol(c, state, 1);
+
+    return 1;
+}
+#elif 1
 static inline int intlist_write(PutBitContext *pb, int *buf, int entries, int base_2_part)
 {
     int i;
@@ -193,7 +284,7 @@
     bits = av_calloc(entries*max, sizeof(*bits));
     if (!bits)
     {
-//        av_free(copy);
+        av_free(copy);
         return AVERROR(ENOMEM);
     }
 
@@ -249,8 +340,8 @@
         if (buf[i])
             put_bits(pb, 1, buf[i] < 0);
 
-//    av_free(bits);
-//    av_free(copy);
+    av_free(bits);
+    av_free(copy);
 
     return 0;
 }
@@ -341,7 +432,7 @@
 
         pos++;
     }
-//    av_free(bits);
+    av_free(bits);
 
     // read signs
     for (i = 0; i < entries; i++)
@@ -499,7 +590,9 @@
 {
     SonicContext *s = avctx->priv_data;
     PutBitContext pb;
-    int i, version = 0;
+    int i;
+
+    s->version = 2;
 
     if (avctx->channels > MAX_CHANNELS)
     {
@@ -571,9 +664,13 @@
         return AVERROR(ENOMEM);
     init_put_bits(&pb, avctx->extradata, 16*8);
 
-    put_bits(&pb, 2, version); // version
-    if (version == 1)
+    put_bits(&pb, 2, s->version); // version
+    if (s->version >= 1)
     {
+        if (s->version >= 2) {
+            put_bits(&pb, 8, s->version);
+            put_bits(&pb, 8, s->minor_version);
+        }
         put_bits(&pb, 2, s->channels);
         put_bits(&pb, 4, code_samplerate(s->samplerate));
     }
@@ -588,8 +685,8 @@
     flush_put_bits(&pb);
     avctx->extradata_size = put_bits_count(&pb)/8;
 
-    av_log(avctx, AV_LOG_INFO, "Sonic: ver: %d ls: %d dr: %d taps: %d block: %d frame: %d downsamp: %d\n",
-        version, s->lossless, s->decorrelation, s->num_taps, s->block_align, s->frame_size, s->downsampling);
+    av_log(avctx, AV_LOG_INFO, "Sonic: ver: %d.%d ls: %d dr: %d taps: %d block: %d frame: %d downsamp: %d\n",
+        s->version, s->minor_version, s->lossless, s->decorrelation, s->num_taps, s->block_align, s->frame_size, s->downsampling);
 
     avctx->frame_size = s->block_align*s->downsampling;
 
@@ -617,15 +714,18 @@
                               const AVFrame *frame, int *got_packet_ptr)
 {
     SonicContext *s = avctx->priv_data;
-    PutBitContext pb;
+    RangeCoder c;
     int i, j, ch, quant = 0, x = 0;
     int ret;
     const short *samples = (const int16_t*)frame->data[0];
+    uint8_t state[32];
 
     if ((ret = ff_alloc_packet2(avctx, avpkt, s->frame_size * 5 + 1000)) < 0)
         return ret;
 
-    init_put_bits(&pb, avpkt->data, avpkt->size);
+    ff_init_range_encoder(&c, avpkt->data, avpkt->size);
+    ff_build_rac_states(&c, 0.05*(1LL<<32), 256-8);
+    memset(state, 128, sizeof(state));
 
     // short -> internal
     for (i = 0; i < s->frame_size; i++)
@@ -671,7 +771,7 @@
     // generate taps
     modified_levinson_durbin(s->window, s->window_size,
                 s->predictor_k, s->num_taps, s->channels, s->tap_quant);
-    if ((ret = intlist_write(&pb, s->predictor_k, s->num_taps, 0)) < 0)
+    if ((ret = intlist_write(&c, state, s->predictor_k, s->num_taps, 0)) < 0)
         return ret;
 
     for (ch = 0; ch < s->channels; ch++)
@@ -701,7 +801,7 @@
         }
 
         energy2 = sqrt(energy2/(s->channels*s->block_align));
-        energy1 = sqrt(2.0)*energy1/(s->channels*s->block_align);
+        energy1 = M_SQRT2*energy1/(s->channels*s->block_align);
 
         // increase bitrate when samples are like a gaussian distribution
         // reduce bitrate when samples are like a two-tailed exponential distribution
@@ -714,7 +814,7 @@
 
         quant = av_clip(quant, 1, 65534);
 
-        set_ue_golomb(&pb, quant);
+        put_symbol(&c, state, quant, 0, NULL, NULL);
 
         quant *= SAMPLE_FACTOR;
     }
@@ -726,16 +826,16 @@
             for (i = 0; i < s->block_align; i++)
                 s->coded_samples[ch][i] = ROUNDED_DIV(s->coded_samples[ch][i], quant);
 
-        if ((ret = intlist_write(&pb, s->coded_samples[ch], s->block_align, 1)) < 0)
+        if ((ret = intlist_write(&c, state, s->coded_samples[ch], s->block_align, 1)) < 0)
             return ret;
     }
 
 //    av_log(avctx, AV_LOG_DEBUG, "used bytes: %d\n", (put_bits_count(&pb)+7)/8);
 
-    flush_put_bits(&pb);
-    avpkt->size = (put_bits_count(&pb)+7)/8;
+    avpkt->size = ff_rac_terminate(&c);
     *got_packet_ptr = 1;
     return 0;
+
 }
 #endif /* CONFIG_SONIC_ENCODER || CONFIG_SONIC_LS_ENCODER */
 
@@ -747,7 +847,7 @@
 {
     SonicContext *s = avctx->priv_data;
     GetBitContext gb;
-    int i, version;
+    int i;
 
     s->channels = avctx->channels;
     s->samplerate = avctx->sample_rate;
@@ -760,14 +860,18 @@
 
     init_get_bits8(&gb, avctx->extradata, avctx->extradata_size);
 
-    version = get_bits(&gb, 2);
-    if (version > 1)
+    s->version = get_bits(&gb, 2);
+    if (s->version >= 2) {
+        s->version       = get_bits(&gb, 8);
+        s->minor_version = get_bits(&gb, 8);
+    }
+    if (s->version != 2)
     {
         av_log(avctx, AV_LOG_ERROR, "Unsupported Sonic version, please report\n");
         return AVERROR_INVALIDDATA;
     }
 
-    if (version == 1)
+    if (s->version >= 1)
     {
         s->channels = get_bits(&gb, 2);
         s->samplerate = samplerate_table[get_bits(&gb, 4)];
@@ -804,8 +908,8 @@
     s->frame_size = s->channels*s->block_align*s->downsampling;
 //    avctx->frame_size = s->block_align;
 
-    av_log(avctx, AV_LOG_INFO, "Sonic: ver: %d ls: %d dr: %d taps: %d block: %d frame: %d downsamp: %d\n",
-        version, s->lossless, s->decorrelation, s->num_taps, s->block_align, s->frame_size, s->downsampling);
+    av_log(avctx, AV_LOG_INFO, "Sonic: ver: %d.%d ls: %d dr: %d taps: %d block: %d frame: %d downsamp: %d\n",
+        s->version, s->minor_version, s->lossless, s->decorrelation, s->num_taps, s->block_align, s->frame_size, s->downsampling);
 
     // generate taps
     s->tap_quant = av_calloc(s->num_taps, sizeof(*s->tap_quant));
@@ -858,7 +962,8 @@
     const uint8_t *buf = avpkt->data;
     int buf_size = avpkt->size;
     SonicContext *s = avctx->priv_data;
-    GetBitContext gb;
+    RangeCoder c;
+    uint8_t state[32];
     int i, quant, ch, j, ret;
     int16_t *samples;
     AVFrame *frame = data;
@@ -872,9 +977,11 @@
 
 //    av_log(NULL, AV_LOG_INFO, "buf_size: %d\n", buf_size);
 
-    init_get_bits8(&gb, buf, buf_size);
+    memset(state, 128, sizeof(state));
+    ff_init_range_decoder(&c, buf, buf_size);
+    ff_build_rac_states(&c, 0.05*(1LL<<32), 256-8);
 
-    intlist_read(&gb, s->predictor_k, s->num_taps, 0);
+    intlist_read(&c, state, s->predictor_k, s->num_taps, 0);
 
     // dequantize
     for (i = 0; i < s->num_taps; i++)
@@ -883,7 +990,7 @@
     if (s->lossless)
         quant = 1;
     else
-        quant = get_ue_golomb(&gb) * SAMPLE_FACTOR;
+        quant = get_symbol(&c, state, 0) * SAMPLE_FACTOR;
 
 //    av_log(NULL, AV_LOG_INFO, "quant: %d\n", quant);
 
@@ -893,7 +1000,7 @@
 
         predictor_init_state(s->predictor_k, s->predictor_state[ch], s->num_taps);
 
-        intlist_read(&gb, s->coded_samples[ch], s->block_align, 1);
+        intlist_read(&c, state, s->coded_samples[ch], s->block_align, 1);
 
         for (i = 0; i < s->block_align; i++)
         {
@@ -938,11 +1045,9 @@
     for (i = 0; i < s->frame_size; i++)
         samples[i] = av_clip_int16(s->int_samples[i]);
 
-    align_get_bits(&gb);
-
     *got_frame_ptr = 1;
 
-    return (get_bits_count(&gb)+7)/8;
+    return buf_size;
 }
 
 AVCodec ff_sonic_decoder = {

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/sp5xdec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/sp5xdec.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/srtenc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/srtenc.c Changed

@@ -22,6 +22,7 @@
 #include <stdarg.h>
 #include "avcodec.h"
 #include "libavutil/avstring.h"
+#include "libavutil/bprint.h"
 #include "ass_split.h"
 #include "ass.h"
 
@@ -31,10 +32,8 @@
 typedef struct {
     AVCodecContext *avctx;
     ASSSplitContext *ass_ctx;
-    char buffer[2048];
-    char *ptr;
-    char *end;
-    char *dialog_start;
+    AVBPrint buffer;
+    unsigned timestamp_end;
     int count;
     char stack[SRT_STACK_SIZE];
     int stack_ptr;
@@ -49,7 +48,7 @@
 {
     va_list vargs;
     va_start(vargs, str);
-    s->ptr += vsnprintf(s->ptr, s->end - s->ptr, str, vargs);
+    av_vbprintf(&s->buffer, str, vargs);
     va_end(vargs);
 }
 
@@ -138,14 +137,14 @@
     SRTContext *s = avctx->priv_data;
     s->avctx = avctx;
     s->ass_ctx = ff_ass_split(avctx->subtitle_header);
+    av_bprint_init(&s->buffer, 0, AV_BPRINT_SIZE_UNLIMITED);
     return s->ass_ctx ? 0 : AVERROR_INVALIDDATA;
 }
 
 static void srt_text_cb(void *priv, const char *text, int len)
 {
     SRTContext *s = priv;
-    av_strlcpy(s->ptr, text, FFMIN(s->end-s->ptr, len+1));
-    s->ptr += len;
+    av_bprint_append_data(&s->buffer, text, len);
 }
 
 static void srt_new_line_cb(void *priv, int forced)
@@ -208,11 +207,19 @@
     char buffer[32];
     int len = snprintf(buffer, sizeof(buffer),
                        "  X1:%03u X2:%03u Y1:%03u Y2:%03u", x1, x2, y1, y2);
-    if (s->end - s->ptr > len) {
-        memmove(s->dialog_start+len, s->dialog_start, s->ptr-s->dialog_start+1);
-        memcpy(s->dialog_start, buffer, len);
-        s->ptr += len;
+    unsigned char *dummy;
+    unsigned room;
+
+    av_bprint_get_buffer(&s->buffer, len, &dummy, &room);
+    if (room >= len) {
+        memmove(s->buffer.str + s->timestamp_end + len,
+                s->buffer.str + s->timestamp_end,
+                s->buffer.len - s->timestamp_end + 1);
+        memcpy(s->buffer.str + s->timestamp_end, buffer, len);
     }
+    /* Increment even if av_bprint_get_buffer() did not return enough room:
+       the bprint structure will be treated as truncated. */
+    s->buffer.len += len;
     }
 }
 
@@ -243,10 +250,9 @@
 {
     SRTContext *s = avctx->priv_data;
     ASSDialog *dialog;
-    int i, len, num;
+    int i, num;
 
-    s->ptr = s->buffer;
-    s->end = s->ptr + sizeof(s->buffer);
+    av_bprint_clear(&s->buffer);
 
     for (i=0; i<sub->num_rects; i++) {
 
@@ -268,7 +274,7 @@
                 es = ec/   1000;  ec -=    1000*es;
                 srt_print(s,"%d\r\n%02d:%02d:%02d,%03d --> %02d:%02d:%02d,%03d\r\n",
                           ++s->count, sh, sm, ss, sc, eh, em, es, ec);
-                s->dialog_start = s->ptr - 2;
+                s->timestamp_end = s->buffer.len - 2;
             }
             s->alignment_applied = 0;
             srt_style_apply(s, dialog->style);
@@ -276,23 +282,25 @@
         }
     }
 
-    if (s->ptr == s->buffer)
+    if (!av_bprint_is_complete(&s->buffer))
+        return AVERROR(ENOMEM);
+    if (!s->buffer.len)
         return 0;
 
-    len = av_strlcpy(buf, s->buffer, bufsize);
-
-    if (len > bufsize-1) {
+    if (s->buffer.len > bufsize) {
         av_log(avctx, AV_LOG_ERROR, "Buffer too small for ASS event.\n");
         return -1;
     }
+    memcpy(buf, s->buffer.str, s->buffer.len);
 
-    return len;
+    return s->buffer.len;
 }
 
 static int srt_encode_close(AVCodecContext *avctx)
 {
     SRTContext *s = avctx->priv_data;
     ff_ass_split_free(s->ass_ctx);
+    av_bprint_finalize(&s->buffer, NULL);
     return 0;
 }

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/sunrast.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/sunrast.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/sunrastenc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/sunrastenc.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/svq1dec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/svq1dec.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/svq1enc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/svq1enc.c Changed

@@ -45,9 +45,8 @@
     AVCodecContext *avctx;
     DSPContext dsp;
     HpelDSPContext hdsp;
-    AVFrame picture;
-    AVFrame current_picture;
-    AVFrame last_picture;
+    AVFrame *current_picture;
+    AVFrame *last_picture;
     PutBitContext pb;
     GetBitContext gb;
 
@@ -264,13 +263,14 @@
                              unsigned char *decoded_plane,
                              int width, int height, int src_stride, int stride)
 {
+    const AVFrame *f = s->avctx->coded_frame;
     int x, y;
     int i;
     int block_width, block_height;
     int level;
     int threshold[6];
     uint8_t *src     = s->scratchbuf + stride * 16;
-    const int lambda = (s->picture.quality * s->picture.quality) >>
+    const int lambda = (f->quality * f->quality) >>
                        (2 * FF_LAMBDA_SHIFT);
 
     /* figure out the acceptable level thresholds in advance */
@@ -281,7 +281,7 @@
     block_width  = (width  + 15) / 16;
     block_height = (height + 15) / 16;
 
-    if (s->picture.pict_type == AV_PICTURE_TYPE_P) {
+    if (f->pict_type == AV_PICTURE_TYPE_P) {
         s->m.avctx                         = s->avctx;
         s->m.current_picture_ptr           = &s->m.current_picture;
         s->m.last_picture_ptr              = &s->m.last_picture;
@@ -297,13 +297,13 @@
         s->m.mb_stride                     = s->m.mb_width + 1;
         s->m.b8_stride                     = 2 * s->m.mb_width + 1;
         s->m.f_code                        = 1;
-        s->m.pict_type                     = s->picture.pict_type;
+        s->m.pict_type                     = f->pict_type;
         s->m.me_method                     = s->avctx->me_method;
         s->m.me.scene_change_score         = 0;
         s->m.flags                         = s->avctx->flags;
         // s->m.out_format                    = FMT_H263;
         // s->m.unrestricted_mv               = 1;
-        s->m.lambda                        = s->picture.quality;
+        s->m.lambda                        = f->quality;
         s->m.qscale                        = s->m.lambda * 139 +
                                              FF_LAMBDA_SCALE * 64 >>
                                              FF_LAMBDA_SHIFT + 7;
@@ -396,13 +396,13 @@
             ff_init_block_index(&s->m);
             ff_update_block_index(&s->m);
 
-            if (s->picture.pict_type == AV_PICTURE_TYPE_I ||
+            if (f->pict_type == AV_PICTURE_TYPE_I ||
                 (s->m.mb_type[x + y * s->m.mb_stride] &
                  CANDIDATE_MB_TYPE_INTRA)) {
                 for (i = 0; i < 6; i++)
                     init_put_bits(&s->reorder_pb[i], reorder_buffer[0][i],
                                   7 * 32);
-                if (s->picture.pict_type == AV_PICTURE_TYPE_P) {
+                if (f->pict_type == AV_PICTURE_TYPE_P) {
                     const uint8_t *vlc = ff_svq1_block_type_vlc[SVQ1_BLOCK_INTRA];
                     put_bits(&s->reorder_pb[5], vlc[1], vlc[0]);
                     score[0] = vlc[1] * lambda;
@@ -418,7 +418,7 @@
 
             best = 0;
 
-            if (s->picture.pict_type == AV_PICTURE_TYPE_P) {
+            if (f->pict_type == AV_PICTURE_TYPE_P) {
                 const uint8_t *vlc = ff_svq1_block_type_vlc[SVQ1_BLOCK_INTER];
                 int mx, my, pred_x, pred_y, dxy;
                 int16_t *motion_ptr;
@@ -498,13 +498,48 @@
     return 0;
 }
 
+static av_cold int svq1_encode_end(AVCodecContext *avctx)
+{
+    SVQ1Context *const s = avctx->priv_data;
+    int i;
+
+    av_log(avctx, AV_LOG_DEBUG, "RD: %f\n",
+           s->rd_total / (double)(avctx->width * avctx->height *
+                                  avctx->frame_number));
+
+    av_freep(&s->m.me.scratchpad);
+    av_freep(&s->m.me.map);
+    av_freep(&s->m.me.score_map);
+    av_freep(&s->mb_type);
+    av_freep(&s->dummy);
+    av_freep(&s->scratchbuf);
+
+    for (i = 0; i < 3; i++) {
+        av_freep(&s->motion_val8[i]);
+        av_freep(&s->motion_val16[i]);
+    }
+
+    av_frame_free(&s->current_picture);
+    av_frame_free(&s->last_picture);
+    av_frame_free(&avctx->coded_frame);
+
+    return 0;
+}
+
 static av_cold int svq1_encode_init(AVCodecContext *avctx)
 {
     SVQ1Context *const s = avctx->priv_data;
 
     ff_dsputil_init(&s->dsp, avctx);
     ff_hpeldsp_init(&s->hdsp, avctx->flags);
-    avctx->coded_frame = &s->picture;
+
+    avctx->coded_frame = av_frame_alloc();
+    s->current_picture = av_frame_alloc();
+    s->last_picture    = av_frame_alloc();
+    if (!avctx->coded_frame || !s->current_picture || !s->last_picture) {
+        svq1_encode_end(avctx);
+        return AVERROR(ENOMEM);
+    }
 
     s->frame_width  = avctx->width;
     s->frame_height = avctx->height;
@@ -536,8 +571,7 @@
                              const AVFrame *pict, int *got_packet)
 {
     SVQ1Context *const s = avctx->priv_data;
-    AVFrame *const p     = &s->picture;
-    AVFrame temp;
+    AVFrame *const p     = avctx->coded_frame;
     int i, ret;
 
     if ((ret = ff_alloc_packet2(avctx, pkt, s->y_block_width * s->y_block_height *
@@ -549,35 +583,33 @@
         return -1;
     }
 
-    if (!s->current_picture.data[0]) {
-        if ((ret = ff_get_buffer(avctx, &s->current_picture, 0))< 0 ||
-            (ret = ff_get_buffer(avctx, &s->last_picture, 0))   < 0) {
+    if (!s->current_picture->data[0]) {
+        if ((ret = ff_get_buffer(avctx, s->current_picture, 0))< 0 ||
+            (ret = ff_get_buffer(avctx, s->last_picture, 0))   < 0) {
             return ret;
         }
-        s->scratchbuf = av_malloc(s->current_picture.linesize[0] * 16 * 2);
+        s->scratchbuf = av_malloc(s->current_picture->linesize[0] * 16 * 2);
     }
 
-    av_frame_move_ref(&temp, &s->current_picture);
-    av_frame_move_ref(&s->current_picture, &s->last_picture);
-    av_frame_move_ref(&s->last_picture, &temp);
+    FFSWAP(AVFrame*, s->current_picture, s->last_picture);
 
     init_put_bits(&s->pb, pkt->data, pkt->size);
 
-    *p           = *pict;
     p->pict_type = avctx->gop_size && avctx->frame_number % avctx->gop_size ?
                    AV_PICTURE_TYPE_P : AV_PICTURE_TYPE_I;
     p->key_frame = p->pict_type == AV_PICTURE_TYPE_I;
+    p->quality   = pict->quality;
 
     svq1_write_header(s, p->pict_type);
     for (i = 0; i < 3; i++)
         if (svq1_encode_plane(s, i,
-                              s->picture.data[i],
-                              s->last_picture.data[i],
-                              s->current_picture.data[i],
+                              pict->data[i],
+                              s->last_picture->data[i],
+                              s->current_picture->data[i],
                               s->frame_width  / (i ? 4 : 1),
                               s->frame_height / (i ? 4 : 1),
-                              s->picture.linesize[i],
-                              s->current_picture.linesize[i]) < 0)
+                              pict->linesize[i],
+                              s->current_picture->linesize[i]) < 0)
             return -1;
 
     // avpriv_align_put_bits(&s->pb);
@@ -594,33 +626,6 @@
     return 0;
 }
 
-static av_cold int svq1_encode_end(AVCodecContext *avctx)
-{
-    SVQ1Context *const s = avctx->priv_data;
-    int i;
-
-    av_log(avctx, AV_LOG_DEBUG, "RD: %f\n",
-           s->rd_total / (double)(avctx->width * avctx->height *
-                                  avctx->frame_number));
-
-    av_freep(&s->m.me.scratchpad);
-    av_freep(&s->m.me.map);
-    av_freep(&s->m.me.score_map);
-    av_freep(&s->mb_type);
-    av_freep(&s->dummy);
-    av_freep(&s->scratchbuf);
-
-    for (i = 0; i < 3; i++) {
-        av_freep(&s->motion_val8[i]);
-        av_freep(&s->motion_val16[i]);
-    }
-
-    av_frame_unref(&s->current_picture);
-    av_frame_unref(&s->last_picture);
-
-    return 0;
-}
-
 AVCodec ff_svq1_encoder = {
     .name           = "svq1",
     .long_name      = NULL_IF_CONFIG_SMALL("Sorenson Vector Quantizer 1 / Sorenson Video 1 / SVQ1"),

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/svq3.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/svq3.c Changed

@@ -158,6 +158,8 @@
     61694, 68745, 77615, 89113, 100253, 109366, 126635, 141533
 };
 
+static int svq3_decode_end(AVCodecContext *avctx);
+
 void ff_svq3_luma_dc_dequant_idct_c(int16_t *output, int16_t *input, int qp)
 {
     const int qmul = svq3_dequant_coeff[qp];
@@ -317,8 +319,8 @@
     src  = pic->f.data[0] + mx + my * h->linesize;
 
     if (emu) {
-        h->vdsp.emulated_edge_mc(h->edge_emu_buffer, h->linesize,
-                                 src, h->linesize,
+        h->vdsp.emulated_edge_mc(h->edge_emu_buffer, src,
+                                 h->linesize, h->linesize,
                                  width + 1, height + 1,
                                  mx, my, s->h_edge_pos, s->v_edge_pos);
         src = h->edge_emu_buffer;
@@ -344,8 +346,8 @@
             src  = pic->f.data[i] + mx + my * h->uvlinesize;
 
             if (emu) {
-                h->vdsp.emulated_edge_mc(h->edge_emu_buffer, h->uvlinesize,
-                                         src, h->uvlinesize,
+                h->vdsp.emulated_edge_mc(h->edge_emu_buffer, src,
+                                         h->uvlinesize, h->uvlinesize,
                                          width + 1, height + 1,
                                          mx, my, (s->h_edge_pos >> 1),
                                          s->v_edge_pos >> 1);
@@ -838,8 +840,8 @@
     skip_bits1(&h->gb);
     skip_bits(&h->gb, 2);
 
-    while (get_bits1(&h->gb))
-        skip_bits(&h->gb, 8);
+    if (skip_1stop_8data_bits(&h->gb) < 0)
+        return AVERROR_INVALIDDATA;
 
     /* reset intra predictors and invalidate motion vector references */
     if (h->mb_x > 0) {
@@ -868,19 +870,18 @@
     unsigned char *extradata_end;
     unsigned int size;
     int marker_found = 0;
+    int ret;
 
     s->cur_pic  = av_mallocz(sizeof(*s->cur_pic));
     s->last_pic = av_mallocz(sizeof(*s->last_pic));
     s->next_pic = av_mallocz(sizeof(*s->next_pic));
     if (!s->next_pic || !s->last_pic || !s->cur_pic) {
-        av_freep(&s->cur_pic);
-        av_freep(&s->last_pic);
-        av_freep(&s->next_pic);
-        return AVERROR(ENOMEM);
+        ret = AVERROR(ENOMEM);
+        goto fail;
     }
 
-    if (ff_h264_decode_init(avctx) < 0)
-        return -1;
+    if ((ret = ff_h264_decode_init(avctx)) < 0)
+        goto fail;
 
     ff_hpeldsp_init(&s->hdsp, avctx->flags);
     h->flags           = avctx->flags;
@@ -915,8 +916,10 @@
         int frame_size_code;
 
         size = AV_RB32(&extradata[4]);
-        if (size > extradata_end - extradata - 8)
-            return AVERROR_INVALIDDATA;
+        if (size > extradata_end - extradata - 8) {
+            ret = AVERROR_INVALIDDATA;
+            goto fail;
+        }
         init_get_bits(&gb, extradata + 8, size * 8);
 
         /* 'frame size code' and optional 'width, height' */
@@ -970,8 +973,10 @@
         /* unknown field */
         skip_bits1(&gb);
 
-        while (get_bits1(&gb))
-            skip_bits(&gb, 8);
+        if (skip_1stop_8data_bits(&gb) < 0) {
+            ret = AVERROR_INVALIDDATA;
+            goto fail;
+        }
 
         s->unknown_flag  = get_bits1(&gb);
         avctx->has_b_frames = !h->low_delay;
@@ -989,8 +994,10 @@
             uint8_t *buf;
 
             if (watermark_height <= 0 ||
-                (uint64_t)watermark_width * 4 > UINT_MAX / watermark_height)
-                return -1;
+                (uint64_t)watermark_width * 4 > UINT_MAX / watermark_height) {
+                ret = -1;
+                goto fail;
+            }
 
             buf = av_malloc(buf_len);
             av_log(avctx, AV_LOG_DEBUG, "watermark size: %dx%d\n",
@@ -1003,7 +1010,8 @@
                 av_log(avctx, AV_LOG_ERROR,
                        "could not uncompress watermark logo\n");
                 av_free(buf);
-                return -1;
+                ret = -1;
+                goto fail;
             }
             s->watermark_key = ff_svq1_packet_checksum(buf, buf_len, 0);
             s->watermark_key = s->watermark_key << 16 | s->watermark_key;
@@ -1013,7 +1021,8 @@
 #else
             av_log(avctx, AV_LOG_ERROR,
                    "this svq3 file contains watermark which need zlib support compiled in\n");
-            return -1;
+            ret = -1;
+            goto fail;
 #endif
         }
     }
@@ -1028,12 +1037,15 @@
     s->h_edge_pos = h->mb_width * 16;
     s->v_edge_pos = h->mb_height * 16;
 
-    if (ff_h264_alloc_tables(h) < 0) {
+    if ((ret = ff_h264_alloc_tables(h)) < 0) {
         av_log(avctx, AV_LOG_ERROR, "svq3 memory allocation failed\n");
-        return AVERROR(ENOMEM);
+        goto fail;
     }
 
     return 0;
+fail:
+    svq3_decode_end(avctx);
+    return ret;
 }
 
 static void free_picture(AVCodecContext *avctx, Picture *pic)
@@ -1125,8 +1137,7 @@
     h->mb_x = h->mb_y = h->mb_xy = 0;
 
     if (s->watermark_key) {
-        av_fast_malloc(&s->buf, &s->buf_size,
-                       buf_size+FF_INPUT_BUFFER_PADDING_SIZE);
+        av_fast_padded_malloc(&s->buf, &s->buf_size, buf_size);
         if (!s->buf)
             return AVERROR(ENOMEM);
         memcpy(s->buf, avpkt->data, buf_size);
@@ -1176,6 +1187,7 @@
     if (h->pict_type != AV_PICTURE_TYPE_I) {
         if (!s->last_pic->f.data[0]) {
             av_log(avctx, AV_LOG_ERROR, "Missing reference frame.\n");
+            av_frame_unref(s->last_pic);
             ret = get_buffer(avctx, s->last_pic);
             if (ret < 0)
                 return ret;
@@ -1188,6 +1200,7 @@
 
         if (h->pict_type == AV_PICTURE_TYPE_B && !s->next_pic->f.data[0]) {
             av_log(avctx, AV_LOG_ERROR, "Missing reference frame.\n");
+            av_frame_unref(s->next_pic);
             ret = get_buffer(avctx, s->next_pic);
             if (ret < 0)
                 return ret;
@@ -1285,9 +1298,10 @@
                     (h->pict_type == AV_PICTURE_TYPE_P && mb_type < 8) ? (mb_type - 1) : -1;
         }
 
-        ff_draw_horiz_band(avctx, NULL, s->cur_pic, s->last_pic->f.data[0] ? s->last_pic : NULL,
-                           16 * h->mb_y, 16, h->picture_structure, 0, 0,
-                           h->low_delay, h->mb_height * 16, h->mb_width * 16);
+        ff_draw_horiz_band(avctx, s->cur_pic,
+                           s->last_pic->f.data[0] ? s->last_pic : NULL,
+                           16 * h->mb_y, 16, h->picture_structure, 0,
+                           h->low_delay);
     }
 
     left = buf_size*8 - get_bits_count(&h->gb);

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/svq3.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/svq3.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/synth_filter.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/synth_filter.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/synth_filter.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/synth_filter.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/takdec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/takdec.c Changed

@@ -690,7 +690,8 @@
         hsize = get_bits_count(gb) / 8;
         if (ff_tak_check_crc(pkt->data, hsize)) {
             av_log(avctx, AV_LOG_ERROR, "CRC error\n");
-            return AVERROR_INVALIDDATA;
+            if (avctx->err_recognition & AV_EF_EXPLODE)
+                return AVERROR_INVALIDDATA;
         }
     }
 
@@ -720,11 +721,9 @@
         return AVERROR_INVALIDDATA;
     }
 
-    if (s->ti.bps != avctx->bits_per_raw_sample) {
-        avctx->bits_per_raw_sample = s->ti.bps;
-        if ((ret = set_bps_params(avctx)) < 0)
-            return ret;
-    }
+    avctx->bits_per_raw_sample = s->ti.bps;
+    if ((ret = set_bps_params(avctx)) < 0)
+        return ret;
     if (s->ti.sample_rate != avctx->sample_rate) {
         avctx->sample_rate = s->ti.sample_rate;
         set_sample_rate_params(avctx);
@@ -865,7 +864,8 @@
         if (ff_tak_check_crc(pkt->data + hsize,
                              get_bits_count(gb) / 8 - hsize)) {
             av_log(avctx, AV_LOG_ERROR, "CRC error\n");
-            return AVERROR_INVALIDDATA;
+            if (avctx->err_recognition & AV_EF_EXPLODE)
+                return AVERROR_INVALIDDATA;
         }
     }

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/targa.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/targa.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/targaenc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/targaenc.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/textdec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/textdec.c Changed

@@ -41,59 +41,20 @@
     { NULL }
 };
 
-static int text_event_to_ass(const AVCodecContext *avctx, AVBPrint *buf,
-                             const char *p, const char *p_end)
-{
-    const TextContext *text = avctx->priv_data;
-
-    for (; p < p_end && *p; p++) {
-
-        /* forced custom line breaks, not accounted as "normal" EOL */
-        if (text->linebreaks && strchr(text->linebreaks, *p)) {
-            av_bprintf(buf, "\\N");
-
-        /* standard ASS escaping so random characters don't get mis-interpreted
-         * as ASS */
-        } else if (!text->keep_ass_markup && strchr("{}\\", *p)) {
-            av_bprintf(buf, "\\%c", *p);
-
-        /* some packets might end abruptly (no \0 at the end, like for example
-         * in some cases of demuxing from a classic video container), some
-         * might be terminated with \n or \r\n which we have to remove (for
-         * consistency with those who haven't), and we also have to deal with
-         * evil cases such as \r at the end of the buffer (and no \0 terminated
-         * character) */
-        } else if (p[0] == '\n') {
-            /* some stuff left so we can insert a line break */
-            if (p < p_end - 1)
-                av_bprintf(buf, "\\N");
-        } else if (p[0] == '\r' && p < p_end - 1 && p[1] == '\n') {
-            /* \r followed by a \n, we can skip it. We don't insert the \N yet
-             * because we don't know if it is followed by more text */
-            continue;
-
-        /* finally, a sane character */
-        } else {
-            av_bprint_chars(buf, *p, 1);
-        }
-    }
-    av_bprintf(buf, "\r\n");
-    return 0;
-}
-
 static int text_decode_frame(AVCodecContext *avctx, void *data,
                              int *got_sub_ptr, AVPacket *avpkt)
 {
     AVBPrint buf;
     AVSubtitle *sub = data;
     const char *ptr = avpkt->data;
+    const TextContext *text = avctx->priv_data;
     const int ts_start     = av_rescale_q(avpkt->pts,      avctx->time_base, (AVRational){1,100});
     const int ts_duration  = avpkt->duration != -1 ?
                              av_rescale_q(avpkt->duration, avctx->time_base, (AVRational){1,100}) : -1;
 
     av_bprint_init(&buf, 0, AV_BPRINT_SIZE_UNLIMITED);
-    if (ptr && avpkt->size > 0 && *ptr &&
-        !text_event_to_ass(avctx, &buf, ptr, ptr + avpkt->size)) {
+    if (ptr && avpkt->size > 0 && *ptr) {
+        ff_ass_bprint_text_event(&buf, ptr, avpkt->size, text->linebreaks, text->keep_ass_markup);
         if (!av_bprint_is_complete(&buf)) {
             av_bprint_finalize(&buf, NULL);
             return AVERROR(ENOMEM);

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/tiertexseqv.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/tiertexseqv.c Changed

@@ -32,7 +32,7 @@
 
 typedef struct SeqVideoContext {
     AVCodecContext *avctx;
-    AVFrame frame;
+    AVFrame *frame;
 } SeqVideoContext;
 
 
@@ -93,14 +93,14 @@
             src = seq_unpack_rle_block(src, src_end, block, sizeof(block));
             for (b = 0; b < 8; b++) {
                 memcpy(dst, &block[b * 8], 8);
-                dst += seq->frame.linesize[0];
+                dst += seq->frame->linesize[0];
             }
             break;
         case 2:
             src = seq_unpack_rle_block(src, src_end, block, sizeof(block));
             for (i = 0; i < 8; i++) {
                 for (b = 0; b < 8; b++)
-                    dst[b * seq->frame.linesize[0]] = block[i * 8 + b];
+                    dst[b * seq->frame->linesize[0]] = block[i * 8 + b];
                 ++dst;
             }
             break;
@@ -117,7 +117,7 @@
         for (b = 0; b < 8; b++) {
             for (i = 0; i < 8; i++)
                 dst[i] = color_table[get_bits(&gb, bits)];
-            dst += seq->frame.linesize[0];
+            dst += seq->frame->linesize[0];
         }
     }
 
@@ -137,7 +137,7 @@
     for (i = 0; i < 8; i++) {
         memcpy(dst, src, 8);
         src += 8;
-        dst += seq->frame.linesize[0];
+        dst += seq->frame->linesize[0];
     }
 
     return src;
@@ -154,7 +154,7 @@
         if (src_end - src < 2)
             return NULL;
         pos = *src++;
-        offset = ((pos >> 3) & 7) * seq->frame.linesize[0] + (pos & 7);
+        offset = ((pos >> 3) & 7) * seq->frame->linesize[0] + (pos & 7);
         dst[offset] = *src++;
     } while (!(pos & 0x80));
 
@@ -173,7 +173,7 @@
     flags = *data++;
 
     if (flags & 1) {
-        palette = (uint32_t *)seq->frame.data[1];
+        palette = (uint32_t *)seq->frame->data[1];
         if (data_end - data < 256 * 3)
             return AVERROR_INVALIDDATA;
         for (i = 0; i < 256; i++) {
@@ -181,7 +181,7 @@
                 c[j] = (*data << 2) | (*data >> 4);
             palette[i] = 0xFFU << 24 | AV_RB24(c);
         }
-        seq->frame.palette_has_changed = 1;
+        seq->frame->palette_has_changed = 1;
     }
 
     if (flags & 2) {
@@ -190,7 +190,7 @@
         init_get_bits(&gb, data, 128 * 8); data += 128;
         for (y = 0; y < 128; y += 8)
             for (x = 0; x < 256; x += 8) {
-                dst = &seq->frame.data[0][y * seq->frame.linesize[0] + x];
+                dst = &seq->frame->data[0][y * seq->frame->linesize[0] + x];
                 op = get_bits(&gb, 2);
                 switch (op) {
                 case 1:
@@ -217,7 +217,9 @@
     seq->avctx = avctx;
     avctx->pix_fmt = AV_PIX_FMT_PAL8;
 
-    avcodec_get_frame_defaults(&seq->frame);
+    seq->frame = av_frame_alloc();
+    if (!seq->frame)
+        return AVERROR(ENOMEM);
 
     return 0;
 }
@@ -232,13 +234,13 @@
 
     SeqVideoContext *seq = avctx->priv_data;
 
-    if ((ret = ff_reget_buffer(avctx, &seq->frame)) < 0)
+    if ((ret = ff_reget_buffer(avctx, seq->frame)) < 0)
         return ret;
 
     if (seqvideo_decode(seq, buf, buf_size))
         return AVERROR_INVALIDDATA;
 
-    if ((ret = av_frame_ref(data, &seq->frame)) < 0)
+    if ((ret = av_frame_ref(data, seq->frame)) < 0)
         return ret;
     *got_frame       = 1;
 
@@ -249,7 +251,7 @@
 {
     SeqVideoContext *seq = avctx->priv_data;
 
-    av_frame_unref(&seq->frame);
+    av_frame_free(&seq->frame);
 
     return 0;
 }

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/tiff.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/tiff.c Changed

@@ -79,6 +79,7 @@
             av_freep(&s->geotags[i].val);
     }
     av_freep(&s->geotags);
+    s->geotag_count = 0;
 }
 
 #define RET_GEOKEY(TYPE, array, element)\
@@ -194,7 +195,7 @@
     char *ap, *ap0;
     uint64_t component_len;
     if (!sep) sep = ", ";
-    component_len = 15LL + strlen(sep);
+    component_len = 24LL + strlen(sep);
     if (count >= (INT_MAX - 1)/component_len)
         return NULL;
     ap = av_malloc(component_len * count + 1);
@@ -203,7 +204,7 @@
     ap0   = ap;
     ap[0] = '\0';
     for (i = 0; i < count; i++) {
-        unsigned l = snprintf(ap, component_len, "%f%s", dp[i], sep);
+        unsigned l = snprintf(ap, component_len, "%.15g%s", dp[i], sep);
         if(l >= component_len) {
             av_free(ap0);
             return NULL;
@@ -546,9 +547,9 @@
         return AVERROR_INVALIDDATA;
     }
     if (s->width != s->avctx->width || s->height != s->avctx->height) {
-        if ((ret = av_image_check_size(s->width, s->height, 0, s->avctx)) < 0)
+        ret = ff_set_dimensions(s->avctx, s->width, s->height);
+        if (ret < 0)
             return ret;
-        avcodec_set_dimensions(s->avctx, s->width, s->height);
     }
     if ((ret = ff_thread_get_buffer(s->avctx, frame, 0)) < 0)
         return ret;

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/tiff_common.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/tiff_common.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/tiffenc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/tiffenc.c Changed

@@ -52,7 +52,6 @@
 typedef struct TiffEncoderContext {
     AVClass *class;                         ///< for private options
     AVCodecContext *avctx;
-    AVFrame picture;
 
     int width;                              ///< picture width
     int height;                             ///< picture height
@@ -195,9 +194,9 @@
     }
 }
 
-static void pack_yuv(TiffEncoderContext *s, uint8_t *dst, int lnum)
+static void pack_yuv(TiffEncoderContext *s, const AVFrame *p,
+                     uint8_t *dst, int lnum)
 {
-    AVFrame *p = &s->picture;
     int i, j, k;
     int w       = (s->width - 1) / s->subsampling[0] + 1;
     uint8_t *pu = &p->data[1][lnum / s->subsampling[1] * p->linesize[1]];
@@ -223,24 +222,12 @@
     }
 }
 
-static av_cold int encode_init(AVCodecContext *avctx)
-{
-    TiffEncoderContext *s = avctx->priv_data;
-
-    avctx->coded_frame            = &s->picture;
-    avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I;
-    avctx->coded_frame->key_frame = 1;
-    s->avctx = avctx;
-
-    return 0;
-}
-
 static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
                         const AVFrame *pict, int *got_packet)
 {
     const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(avctx->pix_fmt);
     TiffEncoderContext *s = avctx->priv_data;
-    AVFrame *const p = &s->picture;
+    const AVFrame *const p = pict;
     int i;
     uint8_t *ptr;
     uint8_t *offset;
@@ -252,8 +239,6 @@
     int is_yuv = 0, alpha = 0;
     int shift_h, shift_v;
 
-    *p = *pict;
-
     s->width          = avctx->width;
     s->height         = avctx->height;
     s->subsampling[0] = 1;
@@ -373,7 +358,7 @@
         zn               = 0;
         for (j = 0; j < s->rps; j++) {
             if (is_yuv) {
-                pack_yuv(s, s->yuv_line, j);
+                pack_yuv(s, p, s->yuv_line, j);
                 memcpy(zbuf + zn, s->yuv_line, bytes_per_row);
                 j += s->subsampling[1] - 1;
             } else
@@ -409,7 +394,7 @@
             s->strip_offsets[i / s->rps] = ptr - pkt->data;
         }
         if (is_yuv) {
-            pack_yuv(s, s->yuv_line, i);
+            pack_yuv(s, p, s->yuv_line, i);
             ret = encode_strip(s, s->yuv_line, ptr, bytes_per_row, s->compr);
             i  += s->subsampling[1] - 1;
         } else
@@ -497,10 +482,26 @@
     return ret < 0 ? ret : 0;
 }
 
+static av_cold int encode_init(AVCodecContext *avctx)
+{
+    TiffEncoderContext *s = avctx->priv_data;
+
+    avctx->coded_frame = av_frame_alloc();
+    if (!avctx->coded_frame)
+        return AVERROR(ENOMEM);
+
+    avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I;
+    avctx->coded_frame->key_frame = 1;
+    s->avctx = avctx;
+
+    return 0;
+}
+
 static av_cold int encode_close(AVCodecContext *avctx)
 {
     TiffEncoderContext *s = avctx->priv_data;
 
+    av_frame_free(&avctx->coded_frame);
     av_freep(&s->strip_sizes);
     av_freep(&s->strip_offsets);
     av_freep(&s->yuv_line);
@@ -536,8 +537,8 @@
     .id             = AV_CODEC_ID_TIFF,
     .priv_data_size = sizeof(TiffEncoderContext),
     .init           = encode_init,
-    .encode2        = encode_frame,
     .close          = encode_close,
+    .encode2        = encode_frame,
     .pix_fmts       = (const enum AVPixelFormat[]) {
         AV_PIX_FMT_RGB24, AV_PIX_FMT_PAL8, AV_PIX_FMT_GRAY8,
         AV_PIX_FMT_GRAY8A, AV_PIX_FMT_GRAY16LE,

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/truemotion1.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/truemotion1.c Changed

@@ -44,7 +44,7 @@
 
 typedef struct TrueMotion1Context {
     AVCodecContext *avctx;
-    AVFrame frame;
+    AVFrame *frame;
 
     const uint8_t *buf;
     int size;
@@ -317,12 +317,17 @@
     const uint8_t *sel_vector_table;
 
     header.header_size = ((s->buf[0] >> 5) | (s->buf[0] << 3)) & 0x7f;
-    if (s->buf[0] < 0x10 || header.header_size >= s->size)
+    if (s->buf[0] < 0x10)
     {
         av_log(s->avctx, AV_LOG_ERROR, "invalid header size (%d)\n", s->buf[0]);
         return AVERROR_INVALIDDATA;
     }
 
+    if (header.header_size + 1 > s->size) {
+        av_log(s->avctx, AV_LOG_ERROR, "Input packet too small.\n");
+        return AVERROR_INVALIDDATA;
+    }
+
     /* unscramble the header bytes with a XOR operation */
     for (i = 1; i < header.header_size; i++)
         header_buffer[i - 1] = s->buf[i] ^ s->buf[i + 1];
@@ -397,15 +402,16 @@
         new_pix_fmt = AV_PIX_FMT_RGB555; // RGB565 is supported as well
 
     s->w >>= width_shift;
-    if ((ret = av_image_check_size(s->w, s->h, 0, s->avctx)) < 0)
-        return ret;
 
     if (s->w != s->avctx->width || s->h != s->avctx->height ||
         new_pix_fmt != s->avctx->pix_fmt) {
-        av_frame_unref(&s->frame);
+        av_frame_unref(s->frame);
         s->avctx->sample_aspect_ratio = (AVRational){ 1 << width_shift, 1 };
         s->avctx->pix_fmt = new_pix_fmt;
-        avcodec_set_dimensions(s->avctx, s->w, s->h);
+
+        if ((ret = ff_set_dimensions(s->avctx, s->w, s->h)) < 0)
+            return ret;
+
         av_fast_malloc(&s->vert_pred, &s->vert_pred_size, s->avctx->width * sizeof(unsigned int));
         if (!s->vert_pred)
             return AVERROR(ENOMEM);
@@ -470,7 +476,9 @@
 //    else
 //        avctx->pix_fmt = AV_PIX_FMT_RGB555;
 
-    avcodec_get_frame_defaults(&s->frame);
+    s->frame = av_frame_alloc();
+    if (!s->frame)
+        return AVERROR(ENOMEM);
 
     /* there is a vertical predictor for each pixel in a line; each vertical
      * predictor is 0 to start with */
@@ -516,11 +524,16 @@
     index = s->index_stream[index_stream_index++] * 4; \
 }
 
+#define INC_INDEX                                                   \
+do {                                                                \
+    if (index >= 1023) {                                            \
+        av_log(s->avctx, AV_LOG_ERROR, "Invalid index value.\n");   \
+        return;                                                     \
+    }                                                               \
+    index++;                                                        \
+} while (0)
+
 #define APPLY_C_PREDICTOR() \
-    if(index > 1023){\
-        av_log(s->avctx, AV_LOG_ERROR, " index %d went out of bounds\n", index); \
-        return; \
-    }\
     predictor_pair = s->c_predictor_table[index]; \
     horiz_pred += (predictor_pair >> 1); \
     if (predictor_pair & 1) { \
@@ -532,16 +545,12 @@
             if (predictor_pair & 1) \
                 GET_NEXT_INDEX() \
             else \
-                index++; \
+                INC_INDEX; \
         } \
     } else \
-        index++;
+        INC_INDEX;
 
 #define APPLY_C_PREDICTOR_24() \
-    if(index > 1023){\
-        av_log(s->avctx, AV_LOG_ERROR, " index %d went out of bounds\n", index); \
-        return; \
-    }\
     predictor_pair = s->c_predictor_table[index]; \
     horiz_pred += (predictor_pair >> 1); \
     if (predictor_pair & 1) { \
@@ -553,17 +562,13 @@
             if (predictor_pair & 1) \
                 GET_NEXT_INDEX() \
             else \
-                index++; \
+                INC_INDEX; \
         } \
     } else \
-        index++;
+        INC_INDEX;
 
 
 #define APPLY_Y_PREDICTOR() \
-    if(index > 1023){\
-        av_log(s->avctx, AV_LOG_ERROR, " index %d went out of bounds\n", index); \
-        return; \
-    }\
     predictor_pair = s->y_predictor_table[index]; \
     horiz_pred += (predictor_pair >> 1); \
     if (predictor_pair & 1) { \
@@ -575,16 +580,12 @@
             if (predictor_pair & 1) \
                 GET_NEXT_INDEX() \
             else \
-                index++; \
+                INC_INDEX; \
         } \
     } else \
-        index++;
+        INC_INDEX;
 
 #define APPLY_Y_PREDICTOR_24() \
-    if(index > 1023){\
-        av_log(s->avctx, AV_LOG_ERROR, " index %d went out of bounds\n", index); \
-        return; \
-    }\
     predictor_pair = s->y_predictor_table[index]; \
     horiz_pred += (predictor_pair >> 1); \
     if (predictor_pair & 1) { \
@@ -596,10 +597,10 @@
             if (predictor_pair & 1) \
                 GET_NEXT_INDEX() \
             else \
-                index++; \
+                INC_INDEX; \
         } \
     } else \
-        index++;
+        INC_INDEX;
 
 #define OUTPUT_PIXEL_PAIR() \
     *current_pixel_pair = *vert_pred + horiz_pred; \
@@ -613,7 +614,7 @@
     unsigned int horiz_pred;
     unsigned int *vert_pred;
     unsigned int *current_pixel_pair;
-    unsigned char *current_line = s->frame.data[0];
+    unsigned char *current_line = s->frame->data[0];
     int keyframe = s->flags & FLAG_KEYFRAME;
 
     /* these variables are for managing the stream of macroblock change bits */
@@ -727,7 +728,7 @@
         if (((y + 1) & 3) == 0)
             mb_change_bits += s->mb_change_bits_row_size;
 
-        current_line += s->frame.linesize[0];
+        current_line += s->frame->linesize[0];
     }
 }
 
@@ -739,7 +740,7 @@
     unsigned int horiz_pred;
     unsigned int *vert_pred;
     unsigned int *current_pixel_pair;
-    unsigned char *current_line = s->frame.data[0];
+    unsigned char *current_line = s->frame->data[0];
     int keyframe = s->flags & FLAG_KEYFRAME;
 
     /* these variables are for managing the stream of macroblock change bits */
@@ -853,7 +854,7 @@
         if (((y + 1) & 3) == 0)
             mb_change_bits += s->mb_change_bits_row_size;
 
-        current_line += s->frame.linesize[0];
+        current_line += s->frame->linesize[0];
     }
 }
 
@@ -872,7 +873,7 @@
     if ((ret = truemotion1_decode_header(s)) < 0)
         return ret;
 
-    if ((ret = ff_reget_buffer(avctx, &s->frame)) < 0)
+    if ((ret = ff_reget_buffer(avctx, s->frame)) < 0)
         return ret;
 
     if (compression_types[s->compression].algorithm == ALGO_RGB24H) {
@@ -881,7 +882,7 @@
         truemotion1_decode_16bit(s);
     }
 
-    if ((ret = av_frame_ref(data, &s->frame)) < 0)
+    if ((ret = av_frame_ref(data, s->frame)) < 0)
         return ret;
 
     *got_frame      = 1;
@@ -894,7 +895,7 @@
 {
     TrueMotion1Context *s = avctx->priv_data;
 
-    av_frame_unref(&s->frame);
+    av_frame_free(&s->frame);
     av_freep(&s->vert_pred);
 
     return 0;

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/truemotion2.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/truemotion2.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/tscc2.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/tscc2.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/tta.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/tta.c Changed

@@ -30,6 +30,7 @@
 #define BITSTREAM_READER_LE
 #include <limits.h>
 #include "ttadata.h"
+#include "ttadsp.h"
 #include "avcodec.h"
 #include "get_bits.h"
 #include "thread.h"
@@ -56,39 +57,9 @@
     uint8_t crc_pass[8];
     uint8_t *pass;
     TTAChannel *ch_ctx;
+    TTADSPContext dsp;
 } TTAContext;
 
-static inline void ttafilter_process(TTAFilter *c, int32_t *in)
-{
-    register int32_t *dl = c->dl, *qm = c->qm, *dx = c->dx, sum = c->round;
-
-    if (c->error < 0) {
-        qm[0] -= dx[0]; qm[1] -= dx[1]; qm[2] -= dx[2]; qm[3] -= dx[3];
-        qm[4] -= dx[4]; qm[5] -= dx[5]; qm[6] -= dx[6]; qm[7] -= dx[7];
-    } else if (c->error > 0) {
-        qm[0] += dx[0]; qm[1] += dx[1]; qm[2] += dx[2]; qm[3] += dx[3];
-        qm[4] += dx[4]; qm[5] += dx[5]; qm[6] += dx[6]; qm[7] += dx[7];
-    }
-
-    sum += dl[0] * qm[0] + dl[1] * qm[1] + dl[2] * qm[2] + dl[3] * qm[3] +
-           dl[4] * qm[4] + dl[5] * qm[5] + dl[6] * qm[6] + dl[7] * qm[7];
-
-    dx[0] = dx[1]; dx[1] = dx[2]; dx[2] = dx[3]; dx[3] = dx[4];
-    dl[0] = dl[1]; dl[1] = dl[2]; dl[2] = dl[3]; dl[3] = dl[4];
-
-    dx[4] = ((dl[4] >> 30) | 1);
-    dx[5] = ((dl[5] >> 30) | 2) & ~1;
-    dx[6] = ((dl[6] >> 30) | 2) & ~1;
-    dx[7] = ((dl[7] >> 30) | 4) & ~3;
-
-    c->error = *in;
-    *in += (sum >> c->shift);
-
-    dl[4] = -dl[5]; dl[5] = -dl[6];
-    dl[6] = *in - dl[7]; dl[7] = *in;
-    dl[5] += dl[6]; dl[4] += dl[5];
-}
-
 static const int64_t tta_channel_layouts[7] = {
     AV_CH_LAYOUT_STEREO,
     AV_CH_LAYOUT_STEREO|AV_CH_LOW_FREQUENCY,
@@ -234,6 +205,8 @@
         return AVERROR_INVALIDDATA;
     }
 
+    ff_ttadsp_init(&s->dsp);
+
     return allocate_buffers(avctx);
 }
 
@@ -251,7 +224,8 @@
     int32_t *p;
 
     if (avctx->err_recognition & AV_EF_CRCCHECK) {
-        if (buf_size < 4 || tta_check_crc(s, buf, buf_size - 4))
+        if (buf_size < 4 ||
+            (tta_check_crc(s, buf, buf_size - 4) && avctx->err_recognition & AV_EF_EXPLODE))
             return AVERROR_INVALIDDATA;
     }
 
@@ -334,7 +308,8 @@
         *p = 1 + ((value >> 1) ^ ((value & 1) - 1));
 
         // run hybrid filter
-        ttafilter_process(filter, p);
+        s->dsp.ttafilter_process_dec(filter->qm, filter->dx, filter->dl, &filter->error, p,
+                                     filter->shift, filter->round);
 
         // fixed order prediction
 #define PRED(x, k) (int32_t)((((uint64_t)x << k) - x) >> k)

omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/ttadsp.c Added

@@ -0,0 +1,57 @@
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "ttadsp.h"
+
+static void ttafilter_process_dec_c(int32_t *qm, int32_t *dx, int32_t *dl,
+                                    int32_t *error, int32_t *in, int32_t shift,
+                                    int32_t round) {
+    if (*error < 0) {
+        qm[0] -= dx[0]; qm[1] -= dx[1]; qm[2] -= dx[2]; qm[3] -= dx[3];
+        qm[4] -= dx[4]; qm[5] -= dx[5]; qm[6] -= dx[6]; qm[7] -= dx[7];
+    } else if (*error > 0) {
+        qm[0] += dx[0]; qm[1] += dx[1]; qm[2] += dx[2]; qm[3] += dx[3];
+        qm[4] += dx[4]; qm[5] += dx[5]; qm[6] += dx[6]; qm[7] += dx[7];
+    }
+
+    round +=    dl[0] * qm[0] + dl[1] * qm[1] + dl[2] * qm[2] + dl[3] * qm[3] +
+                dl[4] * qm[4] + dl[5] * qm[5] + dl[6] * qm[6] + dl[7] * qm[7];
+
+    dx[0] = dx[1]; dx[1] = dx[2]; dx[2] = dx[3]; dx[3] = dx[4];
+    dl[0] = dl[1]; dl[1] = dl[2]; dl[2] = dl[3]; dl[3] = dl[4];
+
+    dx[4] = ((dl[4] >> 30) | 1);
+    dx[5] = ((dl[5] >> 30) | 2) & ~1;
+    dx[6] = ((dl[6] >> 30) | 2) & ~1;
+    dx[7] = ((dl[7] >> 30) | 4) & ~3;
+
+    *error = *in;
+    *in += (round >> shift);
+
+    dl[4] = -dl[5]; dl[5] = -dl[6];
+    dl[6] = *in - dl[7]; dl[7] = *in;
+    dl[5] += dl[6]; dl[4] += dl[5];
+}
+
+av_cold void ff_ttadsp_init(TTADSPContext *c)
+{
+    c->ttafilter_process_dec = ttafilter_process_dec_c;
+
+    if (ARCH_X86)
+        ff_ttadsp_init_x86(c);
+}

omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/ttadsp.h Added

@@ -0,0 +1,34 @@
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_TTADSP_H
+#define AVCODEC_TTADSP_H
+
+#include <stdint.h>
+#include "ttadata.h"
+
+typedef struct TTADSPContext {
+    void (*ttafilter_process_dec)(int32_t *qm, int32_t *dx, int32_t *dl,
+                                  int32_t *error, int32_t *in, int32_t shift,
+                                  int32_t round);
+} TTADSPContext;
+
+void ff_ttadsp_init(TTADSPContext *c);
+void ff_ttadsp_init_x86(TTADSPContext *c);
+
+#endif /* AVCODEC_TTADSP_H */

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/twinvq.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/twinvq.c Changed

@@ -215,7 +215,7 @@
                      enum TwinVQFrameType ftype, float *out)
 {
     const TwinVQModeTab   *mtab =  tctx->mtab;
-    const TwinVQFrameData *bits = &tctx->bits;
+    const TwinVQFrameData *bits = &tctx->bits[tctx->cur_frame];
     int i, j;
     int sub        = mtab->fmode[ftype].sub;
     float step     = TWINVQ_AMP_MAX     / ((1 << TWINVQ_GAIN_BITS)     - 1);
@@ -376,11 +376,12 @@
 }
 
 static void imdct_output(TwinVQContext *tctx, enum TwinVQFrameType ftype,
-                         int wtype, float **out)
+                         int wtype, float **out, int offset)
 {
     const TwinVQModeTab *mtab = tctx->mtab;
     float *prev_buf           = tctx->prev_frame + tctx->last_block_pos[0];
     int size1, size2, i;
+    float *out1, *out2;
 
     for (i = 0; i < tctx->avctx->channels; i++)
         imdct_and_window(tctx, ftype, wtype,
@@ -394,15 +395,17 @@
     size2 = tctx->last_block_pos[0];
     size1 = mtab->size - size2;
 
-    memcpy(&out[0][0],     prev_buf,         size1 * sizeof(out[0][0]));
-    memcpy(&out[0][size1], tctx->curr_frame, size2 * sizeof(out[0][0]));
+    out1 = &out[0][0] + offset;
+    memcpy(out1,         prev_buf,         size1 * sizeof(*out1));
+    memcpy(out1 + size1, tctx->curr_frame, size2 * sizeof(*out1));
 
     if (tctx->avctx->channels == 2) {
-        memcpy(&out[1][0], &prev_buf[2 * mtab->size],
-               size1 * sizeof(out[1][0]));
-        memcpy(&out[1][size1], &tctx->curr_frame[2 * mtab->size],
-               size2 * sizeof(out[1][0]));
-        tctx->fdsp.butterflies_float(out[0], out[1], mtab->size);
+        out2 = &out[1][0] + offset;
+        memcpy(out2, &prev_buf[2 * mtab->size],
+               size1 * sizeof(*out2));
+        memcpy(out2 + size1, &tctx->curr_frame[2 * mtab->size],
+               size2 * sizeof(*out2));
+        tctx->fdsp.butterflies_float(out1, out2, mtab->size);
     }
 }
 
@@ -410,7 +413,7 @@
                                      enum TwinVQFrameType ftype)
 {
     const TwinVQModeTab *mtab = tctx->mtab;
-    TwinVQFrameData *bits     = &tctx->bits;
+    TwinVQFrameData *bits     = &tctx->bits[tctx->cur_frame];
     int channels              = tctx->avctx->channels;
     int sub        = mtab->fmode[ftype].sub;
     int block_size = mtab->size / sub;
@@ -483,7 +486,7 @@
 
     /* get output buffer */
     if (tctx->discarded_packets >= 2) {
-        frame->nb_samples = mtab->size;
+        frame->nb_samples = mtab->size * tctx->frames_per_packet;
         if ((ret = ff_get_buffer(avctx, frame, 0)) < 0)
             return ret;
         out = (float **)frame->extended_data;
@@ -498,11 +501,17 @@
     if ((ret = tctx->read_bitstream(avctx, tctx, buf, buf_size)) < 0)
         return ret;
 
-    read_and_decode_spectrum(tctx, tctx->spectrum, tctx->bits.ftype);
+    for (tctx->cur_frame = 0; tctx->cur_frame < tctx->frames_per_packet;
+         tctx->cur_frame++) {
+        read_and_decode_spectrum(tctx, tctx->spectrum,
+                                 tctx->bits[tctx->cur_frame].ftype);
 
-    imdct_output(tctx, tctx->bits.ftype, tctx->bits.window_type, out);
+        imdct_output(tctx, tctx->bits[tctx->cur_frame].ftype,
+                     tctx->bits[tctx->cur_frame].window_type, out,
+                     tctx->cur_frame * mtab->size);
 
-    FFSWAP(float *, tctx->curr_frame, tctx->prev_frame);
+        FFSWAP(float *, tctx->curr_frame, tctx->prev_frame);
+    }
 
     if (tctx->discarded_packets < 2) {
         tctx->discarded_packets++;
@@ -512,7 +521,10 @@
 
     *got_frame_ptr = 1;
 
-    return ret;
+    // VQF can deliver packets 1 byte greater than block align
+    if (buf_size == avctx->block_align + 1)
+        return buf_size;
+    return avctx->block_align;
 }
 
 /**
@@ -692,7 +704,7 @@
             TWINVQ_WINDOW_TYPE_BITS +
             mtab->fmode[i].sub * (bse_bits[i] + n_ch * TWINVQ_SUB_GAIN_BITS);
 
-    if (tctx->codec == TWINVQ_CODEC_METASOUND) {
+    if (tctx->codec == TWINVQ_CODEC_METASOUND && !tctx->is_6kbps) {
         bsize_no_main_cb[1] += 2;
         bsize_no_main_cb[2] += 2;
     }
@@ -762,6 +774,20 @@
     tctx->avctx       = avctx;
     avctx->sample_fmt = AV_SAMPLE_FMT_FLTP;
 
+    if (!avctx->block_align) {
+        avctx->block_align = tctx->frame_size + 7 >> 3;
+    } else if (avctx->block_align * 8 < tctx->frame_size) {
+        av_log(avctx, AV_LOG_ERROR, "Block align is %d bits, expected %d\n",
+               avctx->block_align * 8, tctx->frame_size);
+        return AVERROR_INVALIDDATA;
+    }
+    tctx->frames_per_packet = avctx->block_align * 8 / tctx->frame_size;
+    if (tctx->frames_per_packet > TWINVQ_MAX_FRAMES_PER_PACKET) {
+        av_log(avctx, AV_LOG_ERROR, "Too many frames per packet (%d)\n",
+               tctx->frames_per_packet);
+        return AVERROR_INVALIDDATA;
+    }
+
     avpriv_float_dsp_init(&tctx->fdsp, avctx->flags & CODEC_FLAG_BITEXACT);
     if ((ret = init_mdct_win(tctx))) {
         av_log(avctx, AV_LOG_ERROR, "Error initializing MDCT\n");

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/twinvq.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/twinvq.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/twinvqdec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/twinvqdec.c Changed

@@ -251,7 +251,7 @@
 static int twinvq_read_bitstream(AVCodecContext *avctx, TwinVQContext *tctx,
                                  const uint8_t *buf, int buf_size)
 {
-    TwinVQFrameData     *bits = &tctx->bits;
+    TwinVQFrameData     *bits = &tctx->bits[0];
     const TwinVQModeTab *mtab = tctx->mtab;
     int channels              = tctx->avctx->channels;
     int sub;
@@ -268,7 +268,7 @@
         return AVERROR_INVALIDDATA;
     }
 
-    bits->ftype = ff_twinvq_wtype_to_ftype_table[tctx->bits.window_type];
+    bits->ftype = ff_twinvq_wtype_to_ftype_table[tctx->bits[0].window_type];
 
     sub = mtab->fmode[bits->ftype].sub;
 
@@ -396,13 +396,18 @@
         return -1;
     }
 
-    avctx->block_align = (avctx->bit_rate * tctx->mtab->size
-                                          / avctx->sample_rate + 15) / 8;
-
     tctx->codec          = TWINVQ_CODEC_VQF;
     tctx->read_bitstream = twinvq_read_bitstream;
     tctx->dec_bark_env   = dec_bark_env;
     tctx->decode_ppc     = decode_ppc;
+    tctx->frame_size     = avctx->bit_rate * tctx->mtab->size
+                                           / avctx->sample_rate + 8;
+    tctx->is_6kbps       = 0;
+    if (avctx->block_align && avctx->block_align * 8 / tctx->frame_size > 1) {
+        av_log(avctx, AV_LOG_ERROR,
+               "VQF TwinVQ should have only one frame per packet\n");
+        return AVERROR_INVALIDDATA;
+    }
 
     return ff_twinvq_decode_init(avctx);
 }

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/txd.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/txd.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/ulti.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/ulti.c Changed

@@ -37,7 +37,7 @@
 typedef struct UltimotionDecodeContext {
     AVCodecContext *avctx;
     int width, height, blocks;
-    AVFrame frame;
+    AVFrame *frame;
     const uint8_t *ulti_codebook;
     GetByteContext gb;
 } UltimotionDecodeContext;
@@ -51,19 +51,19 @@
     s->height = avctx->height;
     s->blocks = (s->width / 8) * (s->height / 8);
     avctx->pix_fmt = AV_PIX_FMT_YUV410P;
-    avctx->coded_frame = &s->frame;
-    avctx->coded_frame = (AVFrame*) &s->frame;
     s->ulti_codebook = ulti_codebook;
-    avcodec_get_frame_defaults(&s->frame);
+
+    s->frame = av_frame_alloc();
+    if (!s->frame)
+        return AVERROR(ENOMEM);
 
     return 0;
 }
 
 static av_cold int ulti_decode_end(AVCodecContext *avctx){
     UltimotionDecodeContext *s = avctx->priv_data;
-    AVFrame *pic = &s->frame;
 
-    av_frame_unref(pic);
+    av_frame_free(&s->frame);
 
     return 0;
 }
@@ -227,7 +227,7 @@
     int skip;
     int tmp;
 
-    if ((ret = ff_reget_buffer(avctx, &s->frame)) < 0)
+    if ((ret = ff_reget_buffer(avctx, s->frame)) < 0)
         return ret;
 
     bytestream2_init(&s->gb, buf, buf_size);
@@ -368,7 +368,7 @@
                         Luma[14] = (tmp >> 6) & 0x3F;
                         Luma[15] = tmp & 0x3F;
 
-                        ulti_convert_yuv(&s->frame, tx, ty, Luma, chroma);
+                        ulti_convert_yuv(s->frame, tx, ty, Luma, chroma);
                     } else {
                         if (bytestream2_get_bytes_left(&s->gb) < 4)
                             goto err;
@@ -380,20 +380,20 @@
                             Y[1] = tmp & 0x3F;
                             Y[2] = bytestream2_get_byteu(&s->gb) & 0x3F;
                             Y[3] = bytestream2_get_byteu(&s->gb) & 0x3F;
-                            ulti_grad(&s->frame, tx, ty, Y, chroma, angle); //draw block
+                            ulti_grad(s->frame, tx, ty, Y, chroma, angle); //draw block
                         } else { // some patterns
                             int f0, f1;
                             f0 = bytestream2_get_byteu(&s->gb);
                             f1 = tmp;
                             Y[0] = bytestream2_get_byteu(&s->gb) & 0x3F;
                             Y[1] = bytestream2_get_byteu(&s->gb) & 0x3F;
-                            ulti_pattern(&s->frame, tx, ty, f1, f0, Y[0], Y[1], chroma);
+                            ulti_pattern(s->frame, tx, ty, f1, f0, Y[0], Y[1], chroma);
                         }
                     }
                     break;
                 }
                 if(code != 3)
-                    ulti_grad(&s->frame, tx, ty, Y, chroma, angle); // draw block
+                    ulti_grad(s->frame, tx, ty, Y, chroma, angle); // draw block
             }
             blocks++;
                 x += 8;
@@ -405,7 +405,7 @@
     }
 
     *got_frame = 1;
-    if ((ret = av_frame_ref(data, &s->frame)) < 0)
+    if ((ret = av_frame_ref(data, s->frame)) < 0)
         return ret;
 
     return buf_size;

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/utils.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/utils.c Changed

@@ -46,6 +46,7 @@
 #include "thread.h"
 #include "frame_thread_encoder.h"
 #include "internal.h"
+#include "raw.h"
 #include "bytestream.h"
 #include "version.h"
 #include <stdlib.h>
@@ -117,24 +118,23 @@
 static void *codec_mutex;
 static void *avformat_mutex;
 
-void *av_fast_realloc(void *ptr, unsigned int *size, size_t min_size)
-{
-    if (min_size < *size)
-        return ptr;
-
-    min_size = FFMAX(17 * min_size / 16 + 32, min_size);
-
-    ptr = av_realloc(ptr, min_size);
-    /* we could set this to the unmodified min_size but this is safer
-     * if the user lost the ptr and uses NULL now
-     */
-    if (!ptr)
-        min_size = 0;
+#if CONFIG_RAISE_MAJOR
+#    define LIBNAME "LIBAVCODEC_155"
+#else
+#    define LIBNAME "LIBAVCODEC_55"
+#endif
 
-    *size = min_size;
+#if FF_API_FAST_MALLOC && CONFIG_SHARED && HAVE_SYMVER
+FF_SYMVER(void*, av_fast_realloc, (void *ptr, unsigned int *size, size_t min_size), LIBNAME)
+{
+    return av_fast_realloc(ptr, size, min_size);
+}
 
-    return ptr;
+FF_SYMVER(void, av_fast_malloc, (void *ptr, unsigned int *size, size_t min_size), LIBNAME)
+{
+    av_fast_malloc(ptr, size, min_size);
 }
+#endif
 
 static inline int ff_fast_malloc(void *ptr, unsigned int *size, size_t min_size, int zero_realloc)
 {
@@ -150,11 +150,6 @@
     return 1;
 }
 
-void av_fast_malloc(void *ptr, unsigned int *size, size_t min_size)
-{
-    ff_fast_malloc(ptr, size, min_size, 0);
-}
-
 void av_fast_padded_malloc(void *ptr, unsigned int *size, size_t min_size)
 {
     uint8_t **p = ptr;
@@ -181,6 +176,7 @@
 
 /* encoder management */
 static AVCodec *first_avcodec = NULL;
+static AVCodec **last_avcodec = &first_avcodec;
 
 AVCodec *av_codec_next(const AVCodec *c)
 {
@@ -216,33 +212,68 @@
 {
     AVCodec **p;
     avcodec_init();
-    p = &first_avcodec;
+    p = last_avcodec;
     codec->next = NULL;
-    while(avpriv_atomic_ptr_cas((void * volatile *)p, NULL, codec))
+
+    while(*p || avpriv_atomic_ptr_cas((void * volatile *)p, NULL, codec))
         p = &(*p)->next;
+    last_avcodec = &codec->next;
 
     if (codec->init_static_data)
         codec->init_static_data(codec);
 }
 
+#if FF_API_EMU_EDGE
 unsigned avcodec_get_edge_width(void)
 {
     return EDGE_WIDTH;
 }
+#endif
 
+#if FF_API_SET_DIMENSIONS
 void avcodec_set_dimensions(AVCodecContext *s, int width, int height)
 {
+    int ret = ff_set_dimensions(s, width, height);
+    if (ret < 0) {
+        av_log(s, AV_LOG_WARNING, "Failed to set dimensions %d %d\n", width, height);
+    }
+}
+#endif
+
+int ff_set_dimensions(AVCodecContext *s, int width, int height)
+{
+    int ret = av_image_check_size(width, height, 0, s);
+
+    if (ret < 0)
+        width = height = 0;
+
     s->coded_width  = width;
     s->coded_height = height;
     s->width        = FF_CEIL_RSHIFT(width,  s->lowres);
     s->height       = FF_CEIL_RSHIFT(height, s->lowres);
+
+    return ret;
 }
 
-#if HAVE_NEON || ARCH_PPC || HAVE_MMX
-#   define STRIDE_ALIGN 16
-#else
-#   define STRIDE_ALIGN 8
-#endif
+int ff_side_data_update_matrix_encoding(AVFrame *frame,
+                                        enum AVMatrixEncoding matrix_encoding)
+{
+    AVFrameSideData *side_data;
+    enum AVMatrixEncoding *data;
+
+    side_data = av_frame_get_side_data(frame, AV_FRAME_DATA_MATRIXENCODING);
+    if (!side_data)
+        side_data = av_frame_new_side_data(frame, AV_FRAME_DATA_MATRIXENCODING,
+                                           sizeof(enum AVMatrixEncoding));
+
+    if (!side_data)
+        return AVERROR(ENOMEM);
+
+    data  = (enum AVMatrixEncoding*)side_data->data;
+    *data = matrix_encoding;
+
+    return 0;
+}
 
 void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height,
                                int linesize_align[AV_NUM_DATA_POINTERS])
@@ -280,6 +311,12 @@
     case AV_PIX_FMT_YUV420P14BE:
     case AV_PIX_FMT_YUV420P16LE:
     case AV_PIX_FMT_YUV420P16BE:
+    case AV_PIX_FMT_YUVA420P9LE:
+    case AV_PIX_FMT_YUVA420P9BE:
+    case AV_PIX_FMT_YUVA420P10LE:
+    case AV_PIX_FMT_YUVA420P10BE:
+    case AV_PIX_FMT_YUVA420P16LE:
+    case AV_PIX_FMT_YUVA420P16BE:
     case AV_PIX_FMT_YUV422P9LE:
     case AV_PIX_FMT_YUV422P9BE:
     case AV_PIX_FMT_YUV422P10LE:
@@ -290,6 +327,12 @@
     case AV_PIX_FMT_YUV422P14BE:
     case AV_PIX_FMT_YUV422P16LE:
     case AV_PIX_FMT_YUV422P16BE:
+    case AV_PIX_FMT_YUVA422P9LE:
+    case AV_PIX_FMT_YUVA422P9BE:
+    case AV_PIX_FMT_YUVA422P10LE:
+    case AV_PIX_FMT_YUVA422P10BE:
+    case AV_PIX_FMT_YUVA422P16LE:
+    case AV_PIX_FMT_YUVA422P16BE:
     case AV_PIX_FMT_YUV444P9LE:
     case AV_PIX_FMT_YUV444P9BE:
     case AV_PIX_FMT_YUV444P10LE:
@@ -300,18 +343,6 @@
     case AV_PIX_FMT_YUV444P14BE:
     case AV_PIX_FMT_YUV444P16LE:
     case AV_PIX_FMT_YUV444P16BE:
-    case AV_PIX_FMT_YUVA420P9LE:
-    case AV_PIX_FMT_YUVA420P9BE:
-    case AV_PIX_FMT_YUVA420P10LE:
-    case AV_PIX_FMT_YUVA420P10BE:
-    case AV_PIX_FMT_YUVA420P16LE:
-    case AV_PIX_FMT_YUVA420P16BE:
-    case AV_PIX_FMT_YUVA422P9LE:
-    case AV_PIX_FMT_YUVA422P9BE:
-    case AV_PIX_FMT_YUVA422P10LE:
-    case AV_PIX_FMT_YUVA422P10BE:
-    case AV_PIX_FMT_YUVA422P16LE:
-    case AV_PIX_FMT_YUVA422P16BE:
     case AV_PIX_FMT_YUVA444P9LE:
     case AV_PIX_FMT_YUVA444P9BE:
     case AV_PIX_FMT_YUVA444P10LE:
@@ -715,11 +746,11 @@
 
 int ff_init_buffer_info(AVCodecContext *avctx, AVFrame *frame)
 {
-    if (avctx->pkt) {
-        frame->pkt_pts = avctx->pkt->pts;
-        av_frame_set_pkt_pos     (frame, avctx->pkt->pos);
-        av_frame_set_pkt_duration(frame, avctx->pkt->duration);
-        av_frame_set_pkt_size    (frame, avctx->pkt->size);
+    if (avctx->internal->pkt) {
+        frame->pkt_pts = avctx->internal->pkt->pts;
+        av_frame_set_pkt_pos     (frame, avctx->internal->pkt->pos);
+        av_frame_set_pkt_duration(frame, avctx->internal->pkt->duration);
+        av_frame_set_pkt_size    (frame, avctx->internal->pkt->size);
     } else {
         frame->pkt_pts = AV_NOPTS_VALUE;
         av_frame_set_pkt_pos     (frame, -1);
@@ -730,10 +761,7 @@
 
     switch (avctx->codec->type) {
     case AVMEDIA_TYPE_VIDEO:
-        frame->width  = FFMAX(avctx->width,  FF_CEIL_RSHIFT(avctx->coded_width,  avctx->lowres));
-        frame->height = FFMAX(avctx->height, FF_CEIL_RSHIFT(avctx->coded_height, avctx->lowres));
-        if (frame->format < 0)
-            frame->format              = avctx->pix_fmt;
+        frame->format              = avctx->pix_fmt;
         if (!frame->sample_aspect_ratio.num)
             frame->sample_aspect_ratio = avctx->sample_aspect_ratio;
         if (av_frame_get_colorspace(frame) == AVCOL_SPC_UNSPECIFIED)
@@ -780,6 +808,7 @@
 typedef struct CompatReleaseBufPriv {
     AVCodecContext avctx;
     AVFrame frame;
+    uint8_t avframe_padding[1024]; // hack to allow linking to a avutil with larger AVFrame
 } CompatReleaseBufPriv;
 
 static void compat_free_buffer(void *opaque, uint8_t *data)
@@ -800,6 +829,7 @@
 
 static int get_buffer_internal(AVCodecContext *avctx, AVFrame *frame, int flags)
 {
+    int override_dimensions = 1;
     int ret;
 
     if (avctx->codec_type == AVMEDIA_TYPE_VIDEO) {
@@ -808,6 +838,13 @@
             return AVERROR(EINVAL);
         }
     }
+    if (avctx->codec_type == AVMEDIA_TYPE_VIDEO) {
+        if (frame->width <= 0 || frame->height <= 0) {
+            frame->width  = FFMAX(avctx->width,  FF_CEIL_RSHIFT(avctx->coded_width,  avctx->lowres));
+            frame->height = FFMAX(avctx->height, FF_CEIL_RSHIFT(avctx->coded_height, avctx->lowres));
+            override_dimensions = 0;
+        }
+    }
     if ((ret = ff_init_buffer_info(avctx, frame)) < 0)
         return ret;
 
@@ -930,7 +967,7 @@
 
     ret = avctx->get_buffer2(avctx, frame, flags);
 
-    if (avctx->codec_type == AVMEDIA_TYPE_VIDEO) {
+    if (avctx->codec_type == AVMEDIA_TYPE_VIDEO && !override_dimensions) {
         frame->width  = avctx->width;
         frame->height = avctx->height;
     }
@@ -948,7 +985,7 @@
 
 static int reget_buffer_internal(AVCodecContext *avctx, AVFrame *frame)
 {
-    AVFrame tmp;
+    AVFrame *tmp;
     int ret;
 
     av_assert0(avctx->codec_type == AVMEDIA_TYPE_VIDEO);
@@ -964,21 +1001,26 @@
     if (!frame->data[0])
         return ff_get_buffer(avctx, frame, AV_GET_BUFFER_FLAG_REF);
 
-    if (av_frame_is_writable(frame))
+    if (av_frame_is_writable(frame)) {
+        frame->pkt_pts = avctx->internal->pkt ? avctx->internal->pkt->pts : AV_NOPTS_VALUE;
+        frame->reordered_opaque = avctx->reordered_opaque;
         return 0;
+    }
+
+    tmp = av_frame_alloc();
+    if (!tmp)
+        return AVERROR(ENOMEM);
 
-    av_frame_move_ref(&tmp, frame);
+    av_frame_move_ref(tmp, frame);
 
     ret = ff_get_buffer(avctx, frame, AV_GET_BUFFER_FLAG_REF);
     if (ret < 0) {
-        av_frame_unref(&tmp);
+        av_frame_free(&tmp);
         return ret;
     }
 
-    av_image_copy(frame->data, frame->linesize, tmp.data, tmp.linesize,
-                  frame->format, frame->width, frame->height);
-
-    av_frame_unref(&tmp);
+    av_frame_copy(frame, tmp);
+    av_frame_free(&tmp);
 
     return 0;
 }
@@ -1030,6 +1072,17 @@
     return 0;
 }
 
+enum AVPixelFormat avpriv_find_pix_fmt(const PixelFormatTag *tags,
+                                       unsigned int fourcc)
+{
+    while (tags->pix_fmt >= 0) {
+        if (tags->fourcc == fourcc)
+            return tags->pix_fmt;
+        tags++;
+    }
+    return AV_PIX_FMT_NONE;
+}
+
 static int is_hwaccel_pix_fmt(enum AVPixelFormat pix_fmt)
 {
     const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt);
@@ -1043,6 +1096,7 @@
     return fmt[0];
 }
 
+#if FF_API_AVFRAME_LAVC
 void avcodec_get_frame_defaults(AVFrame *frame)
 {
 #if LIBAVCODEC_VERSION_MAJOR >= 55
@@ -1053,53 +1107,25 @@
 #endif
 
     memset(frame, 0, sizeof(AVFrame));
-
-    frame->pts                   =
-    frame->pkt_dts               =
-    frame->pkt_pts               = AV_NOPTS_VALUE;
-    av_frame_set_best_effort_timestamp(frame, AV_NOPTS_VALUE);
-    av_frame_set_pkt_duration         (frame, 0);
-    av_frame_set_pkt_pos              (frame, -1);
-    av_frame_set_pkt_size             (frame, -1);
-    frame->key_frame           = 1;
-    frame->sample_aspect_ratio = (AVRational) {0, 1 };
-    frame->format              = -1; /* unknown */
-    frame->extended_data       = frame->data;
-    av_frame_set_colorspace(frame, AVCOL_SPC_UNSPECIFIED);
+    av_frame_unref(frame);
 }
 
 AVFrame *avcodec_alloc_frame(void)
 {
-    AVFrame *frame = av_malloc(sizeof(AVFrame));
-
-    if (frame == NULL)
-        return NULL;
-
-    frame->extended_data = NULL;
-    avcodec_get_frame_defaults(frame);
-
-    return frame;
+    return av_frame_alloc();
 }
 
 void avcodec_free_frame(AVFrame **frame)
 {
-    AVFrame *f;
-
-    if (!frame || !*frame)
-        return;
-
-    f = *frame;
-
-    if (f->extended_data != f->data)
-        av_freep(&f->extended_data);
-
-    av_freep(frame);
+    av_frame_free(frame);
 }
+#endif
 
 MAKE_ACCESSORS(AVCodecContext, codec, AVRational, pkt_timebase)
 MAKE_ACCESSORS(AVCodecContext, codec, const AVCodecDescriptor *, codec_descriptor)
 MAKE_ACCESSORS(AVCodecContext, codec, int, lowres)
 MAKE_ACCESSORS(AVCodecContext, codec, int, seek_preroll)
+MAKE_ACCESSORS(AVCodecContext, codec, uint16_t*, chroma_intra_matrix)
 
 int av_codec_get_max_lowres(const AVCodec *codec)
 {
@@ -1135,13 +1161,6 @@
     return bit_rate;
 }
 
-#if FF_API_AVCODEC_OPEN
-int attribute_align_arg avcodec_open(AVCodecContext *avctx, AVCodec *codec)
-{
-    return avcodec_open2(avctx, codec, NULL);
-}
-#endif
-
 int attribute_align_arg ff_codec_open2_recursive(AVCodecContext *avctx, const AVCodec *codec, AVDictionary **options)
 {
     int ret = 0;
@@ -1196,6 +1215,12 @@
         goto free_and_end;
     }
 
+    avctx->internal->to_free = av_frame_alloc();
+    if (!avctx->internal->to_free) {
+        ret = AVERROR(ENOMEM);
+        goto free_and_end;
+    }
+
     if (codec->priv_data_size > 0) {
         if (!avctx->priv_data) {
             avctx->priv_data = av_mallocz(codec->priv_data_size);
@@ -1216,20 +1241,22 @@
     if ((ret = av_opt_set_dict(avctx, &tmp)) < 0)
         goto free_and_end;
 
-    // only call avcodec_set_dimensions() for non H.264/VP6F codecs so as not to overwrite previously setup dimensions
+    // only call ff_set_dimensions() for non H.264/VP6F codecs so as not to overwrite previously setup dimensions
     if (!(avctx->coded_width && avctx->coded_height && avctx->width && avctx->height &&
           (avctx->codec_id == AV_CODEC_ID_H264 || avctx->codec_id == AV_CODEC_ID_VP6F))) {
     if (avctx->coded_width && avctx->coded_height)
-        avcodec_set_dimensions(avctx, avctx->coded_width, avctx->coded_height);
+        ret = ff_set_dimensions(avctx, avctx->coded_width, avctx->coded_height);
     else if (avctx->width && avctx->height)
-        avcodec_set_dimensions(avctx, avctx->width, avctx->height);
+        ret = ff_set_dimensions(avctx, avctx->width, avctx->height);
+    if (ret < 0)
+        goto free_and_end;
     }
 
     if ((avctx->coded_width || avctx->coded_height || avctx->width || avctx->height)
         && (  av_image_check_size(avctx->coded_width, avctx->coded_height, 0, avctx) < 0
            || av_image_check_size(avctx->width,       avctx->height,       0, avctx) < 0)) {
         av_log(avctx, AV_LOG_WARNING, "Ignoring invalid width/height values\n");
-        avcodec_set_dimensions(avctx, 0, 0);
+        ff_set_dimensions(avctx, 0, 0);
     }
 
     /* if the decoder init function was already called previously,
@@ -1490,8 +1517,10 @@
 free_and_end:
     av_dict_free(&tmp);
     av_freep(&avctx->priv_data);
-    if (avctx->internal)
+    if (avctx->internal) {
+        av_frame_free(&avctx->internal->to_free);
         av_freep(&avctx->internal->pool);
+    }
     av_freep(&avctx->internal);
     avctx->codec = NULL;
     goto end;
@@ -1562,7 +1591,7 @@
     AVFrame *frame = NULL;
     int ret;
 
-    if (!(frame = avcodec_alloc_frame()))
+    if (!(frame = av_frame_alloc()))
         return AVERROR(ENOMEM);
 
     frame->format         = src->format;
@@ -1599,7 +1628,7 @@
                                               const AVFrame *frame,
                                               int *got_packet_ptr)
 {
-    AVFrame tmp;
+    AVFrame *extended_frame = NULL;
     AVFrame *padded_frame = NULL;
     int ret;
     AVPacket user_pkt = *avpkt;
@@ -1624,9 +1653,13 @@
         }
         av_log(avctx, AV_LOG_WARNING, "extended_data is not set.\n");
 
-        tmp = *frame;
-        tmp.extended_data = tmp.data;
-        frame = &tmp;
+        extended_frame = av_frame_alloc();
+        if (!extended_frame)
+            return AVERROR(ENOMEM);
+
+        memcpy(extended_frame, frame, sizeof(AVFrame));
+        extended_frame->extended_data = extended_frame->data;
+        frame = extended_frame;
     }
 
     /* check for valid frame size */
@@ -1634,14 +1667,15 @@
         if (avctx->codec->capabilities & CODEC_CAP_SMALL_LAST_FRAME) {
             if (frame->nb_samples > avctx->frame_size) {
                 av_log(avctx, AV_LOG_ERROR, "more samples than frame size (avcodec_encode_audio2)\n");
-                return AVERROR(EINVAL);
+                ret = AVERROR(EINVAL);
+                goto end;
             }
         } else if (!(avctx->codec->capabilities & CODEC_CAP_VARIABLE_FRAME_SIZE)) {
             if (frame->nb_samples < avctx->frame_size &&
                 !avctx->internal->last_audio_frame) {
                 ret = pad_last_frame(avctx, &padded_frame, frame);
                 if (ret < 0)
-                    return ret;
+                    goto end;
 
                 frame = padded_frame;
                 avctx->internal->last_audio_frame = 1;
@@ -1713,6 +1747,7 @@
 
 end:
     av_frame_free(&padded_frame);
+    av_free(extended_frame);
 
     return ret;
 }
@@ -1723,7 +1758,6 @@
                                              const short *samples)
 {
     AVPacket pkt;
-    AVFrame frame0 = { { 0 } };
     AVFrame *frame;
     int ret, samples_size, got_packet;
 
@@ -1732,8 +1766,9 @@
     pkt.size = buf_size;
 
     if (samples) {
-        frame = &frame0;
-        avcodec_get_frame_defaults(frame);
+        frame = av_frame_alloc();
+        if (!frame)
+            return AVERROR(ENOMEM);
 
         if (avctx->frame_size) {
             frame->nb_samples = avctx->frame_size;
@@ -1744,13 +1779,16 @@
             if (!av_get_bits_per_sample(avctx->codec_id)) {
                 av_log(avctx, AV_LOG_ERROR, "avcodec_encode_audio() does not "
                                             "support this codec\n");
+                av_frame_free(&frame);
                 return AVERROR(EINVAL);
             }
             nb_samples = (int64_t)buf_size * 8 /
                          (av_get_bits_per_sample(avctx->codec_id) *
                           avctx->channels);
-            if (nb_samples >= INT_MAX)
+            if (nb_samples >= INT_MAX) {
+                av_frame_free(&frame);
                 return AVERROR(EINVAL);
+            }
             frame->nb_samples = nb_samples;
         }
 
@@ -1762,8 +1800,10 @@
         if ((ret = avcodec_fill_audio_frame(frame, avctx->channels,
                                             avctx->sample_fmt,
                                             (const uint8_t *)samples,
-                                            samples_size, 1)) < 0)
+                                            samples_size, 1)) < 0) {
+            av_frame_free(&frame);
             return ret;
+        }
 
         /* fabricate frame pts from sample count.
          * this is needed because the avcodec_encode_audio() API does not have
@@ -1790,6 +1830,7 @@
     if (frame && frame->extended_data != frame->data)
         av_freep(&frame->extended_data);
 
+    av_frame_free(&frame);
     return ret ? ret : pkt.size;
 }
 
@@ -1940,11 +1981,15 @@
     if (dts != AV_NOPTS_VALUE) {
         ctx->pts_correction_num_faulty_dts += dts <= ctx->pts_correction_last_dts;
         ctx->pts_correction_last_dts = dts;
-    }
+    } else if (reordered_pts != AV_NOPTS_VALUE)
+        ctx->pts_correction_last_dts = reordered_pts;
+
     if (reordered_pts != AV_NOPTS_VALUE) {
         ctx->pts_correction_num_faulty_pts += reordered_pts <= ctx->pts_correction_last_pts;
         ctx->pts_correction_last_pts = reordered_pts;
-    }
+    } else if(dts != AV_NOPTS_VALUE)
+        ctx->pts_correction_last_pts = dts;
+
     if ((ctx->pts_correction_num_faulty_pts<=ctx->pts_correction_num_faulty_dts || dts == AV_NOPTS_VALUE)
        && reordered_pts != AV_NOPTS_VALUE)
         pts = reordered_pts;
@@ -1954,76 +1999,119 @@
     return pts;
 }
 
-static void apply_param_change(AVCodecContext *avctx, AVPacket *avpkt)
+static int apply_param_change(AVCodecContext *avctx, AVPacket *avpkt)
 {
-    int size = 0;
+    int size = 0, ret;
     const uint8_t *data;
     uint32_t flags;
 
-    if (!(avctx->codec->capabilities & CODEC_CAP_PARAM_CHANGE))
-        return;
-
     data = av_packet_get_side_data(avpkt, AV_PKT_DATA_PARAM_CHANGE, &size);
-    if (!data || size < 4)
-        return;
+    if (!data)
+        return 0;
+
+    if (!(avctx->codec->capabilities & CODEC_CAP_PARAM_CHANGE)) {
+        av_log(avctx, AV_LOG_ERROR, "This decoder does not support parameter "
+               "changes, but PARAM_CHANGE side data was sent to it.\n");
+        return AVERROR(EINVAL);
+    }
+
+    if (size < 4)
+        goto fail;
+
     flags = bytestream_get_le32(&data);
     size -= 4;
-    if (size < 4) /* Required for any of the changes */
-        return;
+
     if (flags & AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_COUNT) {
+        if (size < 4)
+            goto fail;
         avctx->channels = bytestream_get_le32(&data);
         size -= 4;
     }
     if (flags & AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_LAYOUT) {
         if (size < 8)
-            return;
+            goto fail;
         avctx->channel_layout = bytestream_get_le64(&data);
         size -= 8;
     }
-    if (size < 4)
-        return;
     if (flags & AV_SIDE_DATA_PARAM_CHANGE_SAMPLE_RATE) {
+        if (size < 4)
+            goto fail;
         avctx->sample_rate = bytestream_get_le32(&data);
         size -= 4;
     }
     if (flags & AV_SIDE_DATA_PARAM_CHANGE_DIMENSIONS) {
         if (size < 8)
-            return;
+            goto fail;
         avctx->width  = bytestream_get_le32(&data);
         avctx->height = bytestream_get_le32(&data);
-        avcodec_set_dimensions(avctx, avctx->width, avctx->height);
         size -= 8;
+        ret = ff_set_dimensions(avctx, avctx->width, avctx->height);
+        if (ret < 0)
+            return ret;
     }
+
+    return 0;
+fail:
+    av_log(avctx, AV_LOG_ERROR, "PARAM_CHANGE side data too small.\n");
+    return AVERROR_INVALIDDATA;
 }
 
 static int add_metadata_from_side_data(AVCodecContext *avctx, AVFrame *frame)
 {
-    int size, ret = 0;
+    int size;
     const uint8_t *side_metadata;
-    const uint8_t *end;
 
-    side_metadata = av_packet_get_side_data(avctx->pkt,
+    AVDictionary **frame_md = avpriv_frame_get_metadatap(frame);
+
+    side_metadata = av_packet_get_side_data(avctx->internal->pkt,
                                             AV_PKT_DATA_STRINGS_METADATA, &size);
-    if (!side_metadata)
-        goto end;
-    end = side_metadata + size;
-    if (size && end[-1])
-        return AVERROR_INVALIDDATA;
-    while (side_metadata < end) {
-        const uint8_t *key = side_metadata;
-        const uint8_t *val = side_metadata + strlen(key) + 1;
-        int ret;
+    return av_packet_unpack_dictionary(side_metadata, size, frame_md);
+}
 
-        if (val >= end)
-            return AVERROR_INVALIDDATA;
+static int unrefcount_frame(AVCodecInternal *avci, AVFrame *frame)
+{
+    int ret;
 
-        ret = av_dict_set(avpriv_frame_get_metadatap(frame), key, val, 0);
-        if (ret < 0)
-            break;
-        side_metadata = val + strlen(val) + 1;
-    }
-end:
-    return ret;
+    /* move the original frame to our backup */
+    av_frame_unref(avci->to_free);
+    av_frame_move_ref(avci->to_free, frame);
+
+    /* now copy everything except the AVBufferRefs back
+     * note that we make a COPY of the side data, so calling av_frame_free() on
+     * the caller's frame will work properly */
+    ret = av_frame_copy_props(frame, avci->to_free);
+    if (ret < 0)
+        return ret;
+
+    memcpy(frame->data,     avci->to_free->data,     sizeof(frame->data));
+    memcpy(frame->linesize, avci->to_free->linesize, sizeof(frame->linesize));
+    if (avci->to_free->extended_data != avci->to_free->data) {
+        int planes = av_frame_get_channels(avci->to_free);
+        int size   = planes * sizeof(*frame->extended_data);
+
+        if (!size) {
+            av_frame_unref(frame);
+            return AVERROR_BUG;
+        }
+
+        frame->extended_data = av_malloc(size);
+        if (!frame->extended_data) {
+            av_frame_unref(frame);
+            return AVERROR(ENOMEM);
+        }
+        memcpy(frame->extended_data, avci->to_free->extended_data,
+               size);
+    } else
+        frame->extended_data = frame->data;
+
+    frame->format         = avci->to_free->format;
+    frame->width          = avci->to_free->width;
+    frame->height         = avci->to_free->height;
+    frame->channel_layout = avci->to_free->channel_layout;
+    frame->nb_samples     = avci->to_free->nb_samples;
+    av_frame_set_channels(frame, av_frame_get_channels(avci->to_free));
+
+    return 0;
 }
 
 int attribute_align_arg avcodec_decode_video2(AVCodecContext *avctx, AVFrame *picture,
@@ -2046,15 +2134,18 @@
     if ((avctx->coded_width || avctx->coded_height) && av_image_check_size(avctx->coded_width, avctx->coded_height, 0, avctx))
         return AVERROR(EINVAL);
 
-    avcodec_get_frame_defaults(picture);
-
-    if (!avctx->refcounted_frames)
-        av_frame_unref(&avci->to_free);
+    av_frame_unref(picture);
 
     if ((avctx->codec->capabilities & CODEC_CAP_DELAY) || avpkt->size || (avctx->active_thread_type & FF_THREAD_FRAME)) {
         int did_split = av_packet_split_side_data(&tmp);
-        apply_param_change(avctx, &tmp);
-        avctx->pkt = &tmp;
+        ret = apply_param_change(avctx, &tmp);
+        if (ret < 0) {
+            av_log(avctx, AV_LOG_ERROR, "Error applying parameter changes.\n");
+            if (avctx->err_recognition & AV_EF_EXPLODE)
+                goto fail;
+        }
+
+        avctx->internal->pkt = &tmp;
         if (HAVE_THREADS && avctx->active_thread_type & FF_THREAD_FRAME)
             ret = ff_thread_decode_frame(avctx, picture, got_picture_ptr,
                                          &tmp);
@@ -2077,23 +2168,21 @@
         }
         add_metadata_from_side_data(avctx, picture);
 
+fail:
         emms_c(); //needed to avoid an emms_c() call before every return;
 
-        avctx->pkt = NULL;
+        avctx->internal->pkt = NULL;
         if (did_split) {
             av_packet_free_side_data(&tmp);
             if(ret == tmp.size)
                 ret = avpkt->size;
         }
 
-        if (ret < 0 && picture->data[0])
-            av_frame_unref(picture);
-
         if (*got_picture_ptr) {
             if (!avctx->refcounted_frames) {
-                avci->to_free = *picture;
-                avci->to_free.extended_data = avci->to_free.data;
-                memset(picture->buf, 0, sizeof(picture->buf));
+                int err = unrefcount_frame(avci, picture);
+                if (err < 0)
+                    return err;
             }
 
             avctx->frame_number++;
@@ -2101,13 +2190,14 @@
                                                guess_correct_pts(avctx,
                                                                  picture->pkt_pts,
                                                                  picture->pkt_dts));
-        }
+        } else
+            av_frame_unref(picture);
     } else
         ret = 0;
 
     /* many decoders assign whole AVFrames, thus overwriting extended_data;
      * make sure it's set correctly */
-    picture->extended_data = picture->data;
+    av_assert0(!picture->extended_data || picture->extended_data == picture->data);
 
     return ret;
 }
@@ -2117,9 +2207,11 @@
                                               int *frame_size_ptr,
                                               AVPacket *avpkt)
 {
-    AVFrame frame = { { 0 } };
+    AVFrame *frame = av_frame_alloc();
     int ret, got_frame = 0;
 
+    if (!frame)
+        return AVERROR(ENOMEM);
     if (avctx->get_buffer != avcodec_default_get_buffer) {
         av_log(avctx, AV_LOG_ERROR, "Custom get_buffer() for use with"
                                     "avcodec_decode_audio3() detected. Overriding with avcodec_default_get_buffer\n");
@@ -2129,26 +2221,27 @@
         avctx->release_buffer = avcodec_default_release_buffer;
     }
 
-    ret = avcodec_decode_audio4(avctx, &frame, &got_frame, avpkt);
+    ret = avcodec_decode_audio4(avctx, frame, &got_frame, avpkt);
 
     if (ret >= 0 && got_frame) {
         int ch, plane_size;
         int planar    = av_sample_fmt_is_planar(avctx->sample_fmt);
         int data_size = av_samples_get_buffer_size(&plane_size, avctx->channels,
-                                                   frame.nb_samples,
+                                                   frame->nb_samples,
                                                    avctx->sample_fmt, 1);
         if (*frame_size_ptr < data_size) {
             av_log(avctx, AV_LOG_ERROR, "output buffer size is too small for "
                                         "the current frame (%d < %d)\n", *frame_size_ptr, data_size);
+            av_frame_free(&frame);
             return AVERROR(EINVAL);
         }
 
-        memcpy(samples, frame.extended_data[0], plane_size);
+        memcpy(samples, frame->extended_data[0], plane_size);
 
         if (planar && avctx->channels > 1) {
             uint8_t *out = ((uint8_t *)samples) + plane_size;
             for (ch = 1; ch < avctx->channels; ch++) {
-                memcpy(out, frame.extended_data[ch], plane_size);
+                memcpy(out, frame->extended_data[ch], plane_size);
                 out += plane_size;
             }
         }
@@ -2156,6 +2249,7 @@
     } else {
         *frame_size_ptr = 0;
     }
+    av_frame_free(&frame);
     return ret;
 }
 
@@ -2167,7 +2261,6 @@
                                               const AVPacket *avpkt)
 {
     AVCodecInternal *avci = avctx->internal;
-    int planar, channels;
     int ret = 0;
 
     *got_frame_ptr = 0;
@@ -2183,10 +2276,7 @@
         return AVERROR(EINVAL);
     }
 
-    avcodec_get_frame_defaults(frame);
-
-    if (!avctx->refcounted_frames)
-        av_frame_unref(&avci->to_free);
+    av_frame_unref(frame);
 
     if ((avctx->codec->capabilities & CODEC_CAP_DELAY) || avpkt->size || (avctx->active_thread_type & FF_THREAD_FRAME)) {
         uint8_t *side;
@@ -2195,9 +2285,14 @@
         // copy to ensure we do not change avpkt
         AVPacket tmp = *avpkt;
         int did_split = av_packet_split_side_data(&tmp);
-        apply_param_change(avctx, &tmp);
+        ret = apply_param_change(avctx, &tmp);
+        if (ret < 0) {
+            av_log(avctx, AV_LOG_ERROR, "Error applying parameter changes.\n");
+            if (avctx->err_recognition & AV_EF_EXPLODE)
+                goto fail;
+        }
 
-        avctx->pkt = &tmp;
+        avctx->internal->pkt = &tmp;
         if (HAVE_THREADS && avctx->active_thread_type & FF_THREAD_FRAME)
             ret = ff_thread_decode_frame(avctx, frame, got_frame_ptr, &tmp);
         else {
@@ -2221,7 +2316,7 @@
                 frame->sample_rate = avctx->sample_rate;
         }
 
-        side= av_packet_get_side_data(avctx->pkt, AV_PKT_DATA_SKIP_SAMPLES, &side_size);
+        side= av_packet_get_side_data(avctx->internal->pkt, AV_PKT_DATA_SKIP_SAMPLES, &side_size);
         if(side && side_size>=10) {
             avctx->internal->skip_samples = AV_RL32(side);
             av_log(avctx, AV_LOG_DEBUG, "skip %d samples due to side data\n",
@@ -2275,8 +2370,8 @@
                 frame->nb_samples -= discard_padding;
             }
         }
-
-        avctx->pkt = NULL;
+fail:
+        avctx->internal->pkt = NULL;
         if (did_split) {
             av_packet_free_side_data(&tmp);
             if(ret == tmp.size)
@@ -2285,28 +2380,14 @@
 
         if (ret >= 0 && *got_frame_ptr) {
             if (!avctx->refcounted_frames) {
-                avci->to_free = *frame;
-                avci->to_free.extended_data = avci->to_free.data;
-                memset(frame->buf, 0, sizeof(frame->buf));
-                frame->extended_buf    = NULL;
-                frame->nb_extended_buf = 0;
+                int err = unrefcount_frame(avci, frame);
+                if (err < 0)
+                    return err;
             }
-        } else if (frame->data[0])
+        } else
             av_frame_unref(frame);
     }
 
-    /* many decoders assign whole AVFrames, thus overwriting extended_data;
-     * make sure it's set correctly; assume decoders that actually use
-     * extended_data are doing it correctly */
-    if (*got_frame_ptr) {
-        planar   = av_sample_fmt_is_planar(frame->format);
-        channels = av_frame_get_channels(frame);
-        if (!(planar && channels > AV_NUM_DATA_POINTERS))
-            frame->extended_data = frame->data;
-    } else {
-        frame->extended_data = NULL;
-    }
-
     return ret;
 }
 
@@ -2413,12 +2494,22 @@
         int did_split = av_packet_split_side_data(&tmp);
         //apply_param_change(avctx, &tmp);
 
+        if (did_split) {
+            /* FFMIN() prevents overflow in case the packet wasn't allocated with
+             * proper padding.
+             * If the side data is smaller than the buffer padding size, the
+             * remaining bytes should have already been filled with zeros by the
+             * original packet allocation anyway. */
+            memset(tmp.data + tmp.size, 0,
+                   FFMIN(avpkt->size - tmp.size, FF_INPUT_BUFFER_PADDING_SIZE));
+        }
+
         pkt_recoded = tmp;
         ret = recode_subtitle(avctx, &pkt_recoded, &tmp);
         if (ret < 0) {
             *got_sub_ptr = 0;
         } else {
-            avctx->pkt = &pkt_recoded;
+            avctx->internal->pkt = &pkt_recoded;
 
             if (avctx->pkt_timebase.den && avpkt->pts != AV_NOPTS_VALUE)
                 sub->pts = av_rescale_q(avpkt->pts,
@@ -2455,7 +2546,7 @@
                 sub->format = 0;
             else if (avctx->codec_descriptor->props & AV_CODEC_PROP_TEXT_SUB)
                 sub->format = 1;
-            avctx->pkt = NULL;
+            avctx->internal->pkt = NULL;
         }
 
         if (did_split) {
@@ -2522,15 +2613,14 @@
             ff_frame_thread_encoder_free(avctx);
             ff_lock_avcodec(avctx);
         }
-        if (HAVE_THREADS && avctx->thread_opaque)
+        if (HAVE_THREADS && avctx->internal->thread_ctx)
             ff_thread_free(avctx);
         if (avctx->codec && avctx->codec->close)
             avctx->codec->close(avctx);
         avctx->coded_frame = NULL;
         avctx->internal->byte_buffer_size = 0;
         av_freep(&avctx->internal->byte_buffer);
-        if (!avctx->refcounted_frames)
-            av_frame_unref(&avctx->internal->to_free);
+        av_frame_free(&avctx->internal->to_free);
         for (i = 0; i < FF_ARRAY_ELEMS(pool->pools); i++)
             av_buffer_pool_uninit(&pool->pools[i]);
         av_freep(&avctx->internal->pool);
@@ -2563,6 +2653,7 @@
         case AV_CODEC_ID_ESCAPE130_DEPRECATED : return AV_CODEC_ID_ESCAPE130;
         case AV_CODEC_ID_G2M_DEPRECATED : return AV_CODEC_ID_G2M;
         case AV_CODEC_ID_WEBP_DEPRECATED: return AV_CODEC_ID_WEBP;
+        case AV_CODEC_ID_HEVC_DEPRECATED: return AV_CODEC_ID_HEVC;
         default                         : return id;
     }
 }
@@ -2851,7 +2942,7 @@
     avctx->pts_correction_last_dts = INT64_MIN;
 
     if (!avctx->refcounted_frames)
-        av_frame_unref(&avctx->internal->to_free);
+        av_frame_unref(avctx->internal->to_free);
 }
 
 int av_get_exact_bits_per_sample(enum AVCodecID codec_id)
@@ -3167,13 +3258,15 @@
 #endif /* FF_API_MISSING_SAMPLE */
 
 static AVHWAccel *first_hwaccel = NULL;
+static AVHWAccel **last_hwaccel = &first_hwaccel;
 
 void av_register_hwaccel(AVHWAccel *hwaccel)
 {
-    AVHWAccel **p = &first_hwaccel;
+    AVHWAccel **p = last_hwaccel;
     hwaccel->next = NULL;
-    while(avpriv_atomic_ptr_cas((void * volatile *)p, NULL, hwaccel))
+    while(*p || avpriv_atomic_ptr_cas((void * volatile *)p, NULL, hwaccel))
         p = &(*p)->next;
+    last_hwaccel = &hwaccel->next;
 }
 
 AVHWAccel *av_hwaccel_next(AVHWAccel *hwaccel)
@@ -3181,8 +3274,11 @@
     return hwaccel ? hwaccel->next : first_hwaccel;
 }
 
-AVHWAccel *ff_find_hwaccel(enum AVCodecID codec_id, enum AVPixelFormat pix_fmt)
+AVHWAccel *ff_find_hwaccel(AVCodecContext *avctx)
 {
+    enum AVCodecID codec_id = avctx->codec->id;
+    enum AVPixelFormat pix_fmt = avctx->pix_fmt;
+
     AVHWAccel *hwaccel = NULL;
 
     while ((hwaccel = av_hwaccel_next(hwaccel)))

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/utvideoenc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/utvideoenc.c Changed

@@ -58,7 +58,7 @@
 static av_cold int utvideo_encode_init(AVCodecContext *avctx)
 {
     UtvideoContext *c = avctx->priv_data;
-    int i;
+    int i, subsampled_height;
     uint32_t original_format;
 
     c->avctx           = avctx;
@@ -83,7 +83,10 @@
             return AVERROR_INVALIDDATA;
         }
         c->planes        = 3;
-        avctx->codec_tag = MKTAG('U', 'L', 'Y', '0');
+        if (avctx->colorspace == AVCOL_SPC_BT709)
+            avctx->codec_tag = MKTAG('U', 'L', 'H', '0');
+        else
+            avctx->codec_tag = MKTAG('U', 'L', 'Y', '0');
         original_format  = UTVIDEO_420;
         break;
     case AV_PIX_FMT_YUV422P:
@@ -93,7 +96,10 @@
             return AVERROR_INVALIDDATA;
         }
         c->planes        = 3;
-        avctx->codec_tag = MKTAG('U', 'L', 'Y', '2');
+        if (avctx->colorspace == AVCOL_SPC_BT709)
+            avctx->codec_tag = MKTAG('U', 'L', 'H', '2');
+        else
+            avctx->codec_tag = MKTAG('U', 'L', 'Y', '2');
         original_format  = UTVIDEO_422;
         break;
     default:
@@ -126,7 +132,27 @@
         return AVERROR_OPTION_NOT_FOUND;
     }
 
-    avctx->coded_frame = avcodec_alloc_frame();
+    /*
+     * Check the asked slice count for obviously invalid
+     * values (> 256 or negative).
+     */
+    if (avctx->slices > 256 || avctx->slices < 0) {
+        av_log(avctx, AV_LOG_ERROR,
+               "Slice count %d is not supported in Ut Video (theoretical range is 0-256).\n",
+               avctx->slices);
+        return AVERROR(EINVAL);
+    }
+
+    /* Check that the slice count is not larger than the subsampled height */
+    subsampled_height = avctx->height >> av_pix_fmt_desc_get(avctx->pix_fmt)->log2_chroma_h;
+    if (avctx->slices > subsampled_height) {
+        av_log(avctx, AV_LOG_ERROR,
+               "Slice count %d is larger than the subsampling-applied height %d.\n",
+               avctx->slices, subsampled_height);
+        return AVERROR(EINVAL);
+    }
+
+    avctx->coded_frame = av_frame_alloc();
 
     if (!avctx->coded_frame) {
         av_log(avctx, AV_LOG_ERROR, "Could not allocate frame.\n");
@@ -175,9 +201,19 @@
 
     /*
      * Set how many slices are going to be used.
-     * Set one slice for now.
+     * By default uses multiple slices depending on the subsampled height.
+     * This enables multithreading in the official decoder.
      */
-    c->slices = 1;
+    if (!avctx->slices) {
+        c->slices = subsampled_height / 120;
+
+        if (!c->slices)
+            c->slices = 1;
+        else if (c->slices > 256)
+            c->slices = 256;
+    } else {
+        c->slices = avctx->slices;
+    }
 
     /* Set compression mode */
     c->compression = COMP_HUFF;
@@ -363,6 +399,7 @@
     uint32_t offset = 0, slice_len = 0;
     int      i, sstart, send = 0;
     int      symbol;
+    int      ret;
 
     /* Do prediction / make planes */
     switch (c->frame_pred) {
@@ -429,7 +466,8 @@
     }
 
     /* Calculate huffman lengths */
-    ff_huff_gen_len_table(lengths, counts);
+    if ((ret = ff_huff_gen_len_table(lengths, counts, 256)) < 0)
+        return ret;
 
     /*
      * Write the plane's header into the output packet:
@@ -456,7 +494,7 @@
          * get the offset in bits and convert to bytes.
          */
         offset += write_huff_codes(dst + sstart * width, c->slice_bits,
-                                   width * (send - sstart), width,
+                                   width * height + 4, width,
                                    send - sstart, he) >> 3;
 
         slice_len = offset - slice_len;
@@ -513,8 +551,7 @@
 
     bytestream2_init_writer(&pb, dst, pkt->size);
 
-    av_fast_malloc(&c->slice_bits, &c->slice_bits_size,
-                   width * height + FF_INPUT_BUFFER_PADDING_SIZE);
+    av_fast_padded_malloc(&c->slice_bits, &c->slice_bits_size, width * height + 4);
 
     if (!c->slice_bits) {
         av_log(avctx, AV_LOG_ERROR, "Cannot allocate temporary buffer 2.\n");

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/v210enc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/v210enc.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/v308enc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/v308enc.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/v408enc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/v408enc.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/v410enc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/v410enc.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/vaapi_h264.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/vaapi_h264.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/vaapi_mpeg2.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/vaapi_mpeg2.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/vaapi_mpeg4.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/vaapi_mpeg4.c Changed

@@ -22,9 +22,10 @@
 
 #include "vaapi_internal.h"
 #include "h263.h"
+#include "mpeg4video.h"
 
 /** Reconstruct bitstream intra_dc_vlc_thr */
-static int mpeg4_get_intra_dc_vlc_thr(MpegEncContext *s)
+static int mpeg4_get_intra_dc_vlc_thr(Mpeg4DecContext *s)
 {
     switch (s->intra_dc_threshold) {
     case 99: return 0;
@@ -41,7 +42,8 @@
 
 static int vaapi_mpeg4_start_frame(AVCodecContext *avctx, av_unused const uint8_t *buffer, av_unused uint32_t size)
 {
-    MpegEncContext * const s = avctx->priv_data;
+    Mpeg4DecContext *ctx = avctx->priv_data;
+    MpegEncContext * const s = &ctx->m;
     struct vaapi_context * const vactx = avctx->hwaccel_context;
     VAPictureParameterBufferMPEG4 *pic_param;
     VAIQMatrixBufferMPEG4 *iq_matrix;
@@ -64,24 +66,24 @@
     pic_param->vol_fields.bits.chroma_format            = CHROMA_420;
     pic_param->vol_fields.bits.interlaced               = !s->progressive_sequence;
     pic_param->vol_fields.bits.obmc_disable             = 1;
-    pic_param->vol_fields.bits.sprite_enable            = s->vol_sprite_usage;
+    pic_param->vol_fields.bits.sprite_enable            = ctx->vol_sprite_usage;
     pic_param->vol_fields.bits.sprite_warping_accuracy  = s->sprite_warping_accuracy;
     pic_param->vol_fields.bits.quant_type               = s->mpeg_quant;
     pic_param->vol_fields.bits.quarter_sample           = s->quarter_sample;
     pic_param->vol_fields.bits.data_partitioned         = s->data_partitioning;
-    pic_param->vol_fields.bits.reversible_vlc           = s->rvlc;
-    pic_param->vol_fields.bits.resync_marker_disable    = !s->resync_marker;
-    pic_param->no_of_sprite_warping_points              = s->num_sprite_warping_points;
-    for (i = 0; i < s->num_sprite_warping_points && i < 3; i++) {
-        pic_param->sprite_trajectory_du[i]              = s->sprite_traj[i][0];
-        pic_param->sprite_trajectory_dv[i]              = s->sprite_traj[i][1];
+    pic_param->vol_fields.bits.reversible_vlc           = ctx->rvlc;
+    pic_param->vol_fields.bits.resync_marker_disable    = !ctx->resync_marker;
+    pic_param->no_of_sprite_warping_points              = ctx->num_sprite_warping_points;
+    for (i = 0; i < ctx->num_sprite_warping_points && i < 3; i++) {
+        pic_param->sprite_trajectory_du[i]              = ctx->sprite_traj[i][0];
+        pic_param->sprite_trajectory_dv[i]              = ctx->sprite_traj[i][1];
     }
     pic_param->quant_precision                          = s->quant_precision;
     pic_param->vop_fields.value                         = 0; /* reset all bits */
     pic_param->vop_fields.bits.vop_coding_type          = s->pict_type - AV_PICTURE_TYPE_I;
     pic_param->vop_fields.bits.backward_reference_vop_coding_type = s->pict_type == AV_PICTURE_TYPE_B ? s->next_picture.f.pict_type - AV_PICTURE_TYPE_I : 0;
     pic_param->vop_fields.bits.vop_rounding_type        = s->no_rounding;
-    pic_param->vop_fields.bits.intra_dc_vlc_thr         = mpeg4_get_intra_dc_vlc_thr(s);
+    pic_param->vop_fields.bits.intra_dc_vlc_thr         = mpeg4_get_intra_dc_vlc_thr(ctx);
     pic_param->vop_fields.bits.top_field_first          = s->top_field_first;
     pic_param->vop_fields.bits.alternate_vertical_scan_flag = s->alternate_scan;
     pic_param->vop_fcode_forward                        = s->f_code;

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/vaapi_vc1.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/vaapi_vc1.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/vc1.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/vc1.c Changed

@@ -47,21 +47,6 @@
  * @{
  */
 
-/**
- * Imode types
- * @{
- */
-enum Imode {
-    IMODE_RAW,
-    IMODE_NORM2,
-    IMODE_DIFF2,
-    IMODE_NORM6,
-    IMODE_DIFF6,
-    IMODE_ROWSKIP,
-    IMODE_COLSKIP
-};
-/** @} */ //imode defines
-
 /** Decode rows by checking if they are skipped
  * @param plane Buffer to store decoded bits
  * @param[in] width Width of this buffer
@@ -137,12 +122,16 @@
     case IMODE_NORM2:
         if ((height * width) & 1) {
             *planep++ = get_bits1(gb);
-            offset    = 1;
+            y = offset = 1;
+            if (offset == width) {
+                offset = 0;
+                planep += stride - width;
+            }
         }
         else
-            offset = 0;
+            y = offset = 0;
         // decode bitplane as one long line
-        for (y = offset; y < height * width; y += 2) {
+        for (; y < height * width; y += 2) {
             code = get_vlc2(gb, ff_vc1_norm2_vlc.table, VC1_NORM2_VLC_BITS, 1);
             *planep++ = code & 1;
             offset++;
@@ -304,6 +293,7 @@
         v->zz_4x8 = ff_vc1_adv_progressive_4x8_zz;
         return decode_sequence_header_adv(v, gb);
     } else {
+        v->chromaformat = 1;
         v->zz_8x4 = ff_wmv2_scantableA;
         v->zz_4x8 = ff_wmv2_scantableB;
         v->res_y411   = get_bits1(gb);
@@ -367,7 +357,7 @@
 
     v->overlap         = get_bits1(gb); //common
 
-    v->s.resync_marker = get_bits1(gb);
+    v->resync_marker   = get_bits1(gb);
     v->rangered        = get_bits1(gb);
     if (v->rangered && v->profile == PROFILE_SIMPLE) {
         av_log(avctx, AV_LOG_INFO,
@@ -409,7 +399,7 @@
            "DQuant=%i, Quantizer mode=%i, Max B frames=%i\n",
            v->profile, v->frmrtq_postproc, v->bitrtq_postproc,
            v->s.loop_filter, v->multires, v->fastuvmc, v->extended_mv,
-           v->rangered, v->vstransform, v->overlap, v->s.resync_marker,
+           v->rangered, v->vstransform, v->overlap, v->resync_marker,
            v->dquant, v->quantizer_mode, avctx->max_b_frames);
     return 0;
 }
@@ -607,26 +597,40 @@
             C = A;                                            \
         } else {                                              \
             DEF;                                              \
-            memcpy(&tmp, &L  , sizeof(tmp));                  \
-            memcpy(&L  , &N  , sizeof(tmp));                  \
-            memcpy(&N  , &tmp, sizeof(tmp));                  \
+            memcpy(&tmp, L   , sizeof(tmp));                  \
+            memcpy(L   , N   , sizeof(tmp));                  \
+            memcpy(N   , &tmp, sizeof(tmp));                  \
             C = N;                                            \
         }                                                     \
     } while(0)
 
-    ROTATE(int tmp,             v->last_use_ic, v->next_use_ic, v->curr_use_ic, v->aux_use_ic);
+    ROTATE(int tmp,             &v->last_use_ic, &v->next_use_ic, v->curr_use_ic, &v->aux_use_ic);
     ROTATE(uint8_t tmp[2][256], v->last_luty,   v->next_luty,   v->curr_luty,   v->aux_luty);
     ROTATE(uint8_t tmp[2][256], v->last_lutuv,  v->next_lutuv,  v->curr_lutuv,  v->aux_lutuv);
 
     INIT_LUT(32, 0, v->curr_luty[0], v->curr_lutuv[0], 0);
     INIT_LUT(32, 0, v->curr_luty[1], v->curr_lutuv[1], 0);
-    v->curr_use_ic = 0;
+    *v->curr_use_ic = 0;
+}
+
+static int read_bfraction(VC1Context *v, GetBitContext* gb) {
+    int bfraction_lut_index = get_vlc2(gb, ff_vc1_bfraction_vlc.table, VC1_BFRACTION_VLC_BITS, 1);
+
+    if (bfraction_lut_index == 21 || bfraction_lut_index < 0) {
+        av_log(v->s.avctx, AV_LOG_ERROR, "bfraction invalid\n");
+        return AVERROR_INVALIDDATA;
+    }
+    v->bfraction_lut_index = bfraction_lut_index;
+    v->bfraction           = ff_vc1_bfraction_lut[v->bfraction_lut_index];
+    return 0;
 }
 
 int ff_vc1_parse_frame_header(VC1Context *v, GetBitContext* gb)
 {
     int pqindex, lowquant, status;
 
+    v->field_mode = 0;
+    v->fcm = 0;
     if (v->finterpflag)
         v->interpfrm = get_bits1(gb);
     if (!v->s.avctx->codec)
@@ -654,8 +658,8 @@
 
     v->bi_type = 0;
     if (v->s.pict_type == AV_PICTURE_TYPE_B) {
-        v->bfraction_lut_index = get_vlc2(gb, ff_vc1_bfraction_vlc.table, VC1_BFRACTION_VLC_BITS, 1);
-        v->bfraction           = ff_vc1_bfraction_lut[v->bfraction_lut_index];
+        if (read_bfraction(v, gb) < 0)
+            return AVERROR_INVALIDDATA;
         if (v->bfraction == 0) {
             v->s.pict_type = AV_PICTURE_TYPE_BI;
         }
@@ -847,7 +851,7 @@
     int mbmodetab, imvtab, icbptab, twomvbptab, fourmvbptab; /* useful only for debugging */
     int field_mode, fcm;
 
-    v->numref=0;
+    v->numref          = 0;
     v->p_frame_skipped = 0;
     if (v->second_field) {
         if(v->fcm!=2 || v->field_mode!=1)
@@ -875,12 +879,17 @@
     v->field_mode = field_mode;
     v->fcm = fcm;
 
+    av_assert0(    v->s.mb_height == v->s.height + 15 >> 4
+                || v->s.mb_height == FFALIGN(v->s.height + 15 >> 4, 2));
     if (v->field_mode) {
+        v->s.mb_height = FFALIGN(v->s.height + 15 >> 4, 2);
         v->fptype = get_bits(gb, 3);
         v->s.pict_type = (v->fptype & 2) ? AV_PICTURE_TYPE_P : AV_PICTURE_TYPE_I;
         if (v->fptype & 4) // B-picture
             v->s.pict_type = (v->fptype & 2) ? AV_PICTURE_TYPE_BI : AV_PICTURE_TYPE_B;
+
     } else {
+        v->s.mb_height = v->s.height + 15 >> 4;
         switch (get_unary(gb, 0, 4)) {
         case 0:
             v->s.pict_type = AV_PICTURE_TYPE_P;
@@ -933,8 +942,8 @@
                 v->refdist += get_unary(gb, 0, 16);
         }
         if ((v->s.pict_type == AV_PICTURE_TYPE_B) || (v->s.pict_type == AV_PICTURE_TYPE_BI)) {
-            v->bfraction_lut_index = get_vlc2(gb, ff_vc1_bfraction_vlc.table, VC1_BFRACTION_VLC_BITS, 1);
-            v->bfraction           = ff_vc1_bfraction_lut[v->bfraction_lut_index];
+            if (read_bfraction(v, gb) < 0)
+                return AVERROR_INVALIDDATA;
             v->frfd = (v->bfraction * v->refdist) >> 8;
             v->brfd = v->refdist - v->frfd - 1;
             if (v->brfd < 0)
@@ -946,8 +955,8 @@
         if (v->finterpflag)
             v->interpfrm = get_bits1(gb);
         if (v->s.pict_type == AV_PICTURE_TYPE_B) {
-            v->bfraction_lut_index = get_vlc2(gb, ff_vc1_bfraction_vlc.table, VC1_BFRACTION_VLC_BITS, 1);
-            v->bfraction           = ff_vc1_bfraction_lut[v->bfraction_lut_index];
+            if (read_bfraction(v, gb) < 0)
+                return AVERROR_INVALIDDATA;
             if (v->bfraction == 0) {
                 v->s.pict_type = AV_PICTURE_TYPE_BI; /* XXX: should not happen here */
             }
@@ -1108,7 +1117,7 @@
                         INIT_LUT(v->lumscale2, v->lumshift2, v->curr_luty[v->cur_field_type^1], v->curr_lutuv[v->cur_field_type^1], 0);
                         INIT_LUT(v->lumscale , v->lumshift , v->last_luty[v->cur_field_type  ], v->last_lutuv[v->cur_field_type  ], 1);
                     }
-                    v->next_use_ic = v->curr_use_ic = 1;
+                    v->next_use_ic = *v->curr_use_ic = 1;
                 } else {
                     INIT_LUT(v->lumscale , v->lumshift , v->last_luty[0], v->last_lutuv[0], 1);
                     INIT_LUT(v->lumscale2, v->lumshift2, v->last_luty[1], v->last_lutuv[1], 1);
@@ -1191,8 +1200,8 @@
         break;
     case AV_PICTURE_TYPE_B:
         if (v->fcm == ILACE_FRAME) {
-            v->bfraction_lut_index = get_vlc2(gb, ff_vc1_bfraction_vlc.table, VC1_BFRACTION_VLC_BITS, 1);
-            v->bfraction           = ff_vc1_bfraction_lut[v->bfraction_lut_index];
+            if (read_bfraction(v, gb) < 0)
+                return AVERROR_INVALIDDATA;
             if (v->bfraction == 0) {
                 return -1;
             }

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/vc1.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/vc1.h Changed

@@ -175,6 +175,21 @@
     ILACE_FIELD         ///<  in the bitstream is reported as 11b
 };
 
+/**
+ * Imode types
+ * @{
+ */
+enum Imode {
+    IMODE_RAW,
+    IMODE_NORM2,
+    IMODE_DIFF2,
+    IMODE_NORM6,
+    IMODE_DIFF6,
+    IMODE_ROWSKIP,
+    IMODE_COLSKIP
+};
+/** @} */ //imode defines
+
 /** The VC1 Context
  * @todo Change size wherever another size is more efficient
  * Many members are only used for Advanced Profile
@@ -300,7 +315,7 @@
     uint8_t  aux_luty[2][256],  aux_lutuv[2][256];  ///< lookup tables used for intensity compensation
     uint8_t next_luty[2][256], next_lutuv[2][256];  ///< lookup tables used for intensity compensation
     uint8_t (*curr_luty)[256]  ,(*curr_lutuv)[256];
-    int last_use_ic, curr_use_ic, next_use_ic, aux_use_ic;
+    int last_use_ic, *curr_use_ic, next_use_ic, aux_use_ic;
     int rnd;                        ///< rounding control
 
     /** Frame decoding info for S/M profiles only */
@@ -378,7 +393,7 @@
     //@{
     int new_sprite;
     int two_sprites;
-    AVFrame sprite_output_frame;
+    AVFrame *sprite_output_frame;
     int output_width, output_height, sprite_width, sprite_height;
     uint8_t* sr_rows[2][2];      ///< Sprite resizer line cache
     //@}
@@ -399,6 +414,7 @@
     int end_mb_x;                ///< Horizontal macroblock limit (used only by mss2)
 
     int parse_only;              ///< Context is used within parser
+    int resync_marker;           ///< could this stream contain resync markers
 } VC1Context;
 
 /** Find VC-1 marker in buffer

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/vc1dec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/vc1dec.c Changed

@@ -59,20 +59,6 @@
  * @{
  */
 
-/**
- * Imode types
- * @{
- */
-enum Imode {
-    IMODE_RAW,
-    IMODE_NORM2,
-    IMODE_DIFF2,
-    IMODE_NORM6,
-    IMODE_DIFF6,
-    IMODE_ROWSKIP,
-    IMODE_COLSKIP
-};
-/** @} */ //imode defines
 
 static void init_block_index(VC1Context *v)
 {
@@ -391,7 +377,7 @@
             srcV = s->current_picture.f.data[2];
             luty  = v->curr_luty;
             lutuv = v->curr_lutuv;
-            use_ic = v->curr_use_ic;
+            use_ic = *v->curr_use_ic;
         } else {
             srcY = s->last_picture.f.data[0];
             srcU = s->last_picture.f.data[1];
@@ -454,17 +440,21 @@
         uint8_t *uvbuf = s->edge_emu_buffer + 19 * s->linesize;
 
         srcY -= s->mspel * (1 + s->linesize);
-        s->vdsp.emulated_edge_mc(s->edge_emu_buffer, s->linesize,
-                                 srcY, s->linesize,
+        s->vdsp.emulated_edge_mc(s->edge_emu_buffer, srcY,
+                                 s->linesize, s->linesize,
                                  17 + s->mspel * 2, 17 + s->mspel * 2,
                                  src_x - s->mspel, src_y - s->mspel,
                                  s->h_edge_pos, v_edge_pos);
         srcY = s->edge_emu_buffer;
-        s->vdsp.emulated_edge_mc(uvbuf, s->uvlinesize, srcU, s->uvlinesize,
-                                 8 + 1, 8 + 1, uvsrc_x, uvsrc_y,
+        s->vdsp.emulated_edge_mc(uvbuf, srcU,
+                                 s->uvlinesize, s->uvlinesize,
+                                 8 + 1, 8 + 1,
+                                 uvsrc_x, uvsrc_y,
                                  s->h_edge_pos >> 1, v_edge_pos >> 1);
-        s->vdsp.emulated_edge_mc(uvbuf + 16, s->uvlinesize, srcV, s->uvlinesize,
-                                 8 + 1, 8 + 1, uvsrc_x, uvsrc_y,
+        s->vdsp.emulated_edge_mc(uvbuf + 16, srcV,
+                                 s->uvlinesize, s->uvlinesize,
+                                 8 + 1, 8 + 1,
+                                 uvsrc_x, uvsrc_y,
                                  s->h_edge_pos >> 1, v_edge_pos >> 1);
         srcU = uvbuf;
         srcV = uvbuf + 16;
@@ -581,7 +571,7 @@
         if (v->field_mode && (v->cur_field_type != v->ref_field_type[dir]) && v->second_field) {
             srcY = s->current_picture.f.data[0];
             luty = v->curr_luty;
-            use_ic = v->curr_use_ic;
+            use_ic = *v->curr_use_ic;
         } else {
             srcY = s->last_picture.f.data[0];
             luty = v->last_luty;
@@ -700,7 +690,8 @@
         || (unsigned)(src_y - (s->mspel << fieldmv)) > v_edge_pos - (my & 3) - ((8 + s->mspel * 2) << fieldmv)) {
         srcY -= s->mspel * (1 + (s->linesize << fieldmv));
         /* check emulate edge stride and offset */
-        s->vdsp.emulated_edge_mc(s->edge_emu_buffer, s->linesize, srcY, s->linesize,
+        s->vdsp.emulated_edge_mc(s->edge_emu_buffer, srcY,
+                                 s->linesize, s->linesize,
                                  9 + s->mspel * 2, (9 + s->mspel * 2) << fieldmv,
                                  src_x - s->mspel, src_y - (s->mspel << fieldmv),
                                  s->h_edge_pos, v_edge_pos);
@@ -882,7 +873,7 @@
             srcU = s->current_picture.f.data[1];
             srcV = s->current_picture.f.data[2];
             lutuv = v->curr_lutuv;
-            use_ic = v->curr_use_ic;
+            use_ic = *v->curr_use_ic;
         } else {
             srcU = s->last_picture.f.data[1];
             srcV = s->last_picture.f.data[2];
@@ -915,11 +906,13 @@
         || s->h_edge_pos < 18 || v_edge_pos < 18
         || (unsigned)uvsrc_x > (s->h_edge_pos >> 1) - 9
         || (unsigned)uvsrc_y > (v_edge_pos    >> 1) - 9) {
-        s->vdsp.emulated_edge_mc(s->edge_emu_buffer, s->uvlinesize, srcU,
-                                 s->uvlinesize, 8 + 1, 8 + 1, uvsrc_x, uvsrc_y,
+        s->vdsp.emulated_edge_mc(s->edge_emu_buffer, srcU,
+                                 s->uvlinesize, s->uvlinesize,
+                                 8 + 1, 8 + 1, uvsrc_x, uvsrc_y,
                                  s->h_edge_pos >> 1, v_edge_pos >> 1);
-        s->vdsp.emulated_edge_mc(s->edge_emu_buffer + 16, s->uvlinesize, srcV,
-                                 s->uvlinesize, 8 + 1, 8 + 1, uvsrc_x, uvsrc_y,
+        s->vdsp.emulated_edge_mc(s->edge_emu_buffer + 16, srcV,
+                                 s->uvlinesize, s->uvlinesize,
+                                 8 + 1, 8 + 1, uvsrc_x, uvsrc_y,
                                  s->h_edge_pos >> 1, v_edge_pos >> 1);
         srcU = s->edge_emu_buffer;
         srcV = s->edge_emu_buffer + 16;
@@ -1036,12 +1029,14 @@
             || s->h_edge_pos < 10 || v_edge_pos < (5 << fieldmv)
             || (unsigned)uvsrc_x > (s->h_edge_pos >> 1) - 5
             || (unsigned)uvsrc_y > v_edge_pos - (5 << fieldmv)) {
-            s->vdsp.emulated_edge_mc(s->edge_emu_buffer, s->uvlinesize, srcU,
-                                     s->uvlinesize, 5, (5 << fieldmv), uvsrc_x,
-                                     uvsrc_y, s->h_edge_pos >> 1, v_edge_pos);
-            s->vdsp.emulated_edge_mc(s->edge_emu_buffer + 16, s->uvlinesize, srcV,
-                                     s->uvlinesize, 5, (5 << fieldmv), uvsrc_x,
-                                     uvsrc_y, s->h_edge_pos >> 1, v_edge_pos);
+            s->vdsp.emulated_edge_mc(s->edge_emu_buffer, srcU,
+                                     s->uvlinesize, s->uvlinesize,
+                                     5, (5 << fieldmv), uvsrc_x, uvsrc_y,
+                                     s->h_edge_pos >> 1, v_edge_pos);
+            s->vdsp.emulated_edge_mc(s->edge_emu_buffer + 16, srcV,
+                                     s->uvlinesize, s->uvlinesize,
+                                     5, (5 << fieldmv), uvsrc_x, uvsrc_y,
+                                     s->h_edge_pos >> 1, v_edge_pos);
             srcU = s->edge_emu_buffer;
             srcV = s->edge_emu_buffer + 16;
 
@@ -1968,16 +1963,21 @@
         uint8_t *uvbuf = s->edge_emu_buffer + 19 * s->linesize;
 
         srcY -= s->mspel * (1 + s->linesize);
-        s->vdsp.emulated_edge_mc(s->edge_emu_buffer, s->linesize, srcY, s->linesize,
+        s->vdsp.emulated_edge_mc(s->edge_emu_buffer, srcY,
+                                 s->linesize, s->linesize,
                                  17 + s->mspel * 2, 17 + s->mspel * 2,
                                  src_x - s->mspel, src_y - s->mspel,
                                  s->h_edge_pos, v_edge_pos);
         srcY = s->edge_emu_buffer;
-        s->vdsp.emulated_edge_mc(uvbuf, s->uvlinesize, srcU, s->uvlinesize,
-                                 8 + 1, 8 + 1, uvsrc_x, uvsrc_y,
+        s->vdsp.emulated_edge_mc(uvbuf, srcU,
+                                 s->uvlinesize, s->uvlinesize,
+                                 8 + 1, 8 + 1,
+                                 uvsrc_x, uvsrc_y,
                                  s->h_edge_pos >> 1, v_edge_pos >> 1);
-        s->vdsp.emulated_edge_mc(uvbuf + 16, s->uvlinesize, srcV, s->uvlinesize,
-                                 8 + 1, 8 + 1, uvsrc_x, uvsrc_y,
+        s->vdsp.emulated_edge_mc(uvbuf + 16, srcV,
+                                 s->uvlinesize, s->uvlinesize,
+                                 8 + 1, 8 + 1,
+                                 uvsrc_x, uvsrc_y,
                                  s->h_edge_pos >> 1, v_edge_pos >> 1);
         srcU = uvbuf;
         srcV = uvbuf + 16;
@@ -2113,6 +2113,8 @@
     int r_x, r_y;
     const uint8_t *is_intra = v->mb_type[0];
 
+    av_assert0(!v->field_mode);
+
     r_x = v->range_x;
     r_y = v->range_y;
     /* scale MV difference to be quad-pel */
@@ -2125,13 +2127,15 @@
     xy = s->block_index[0];
 
     if (s->mb_intra) {
-        s->current_picture.motion_val[0][xy + v->blocks_off][0] =
-        s->current_picture.motion_val[0][xy + v->blocks_off][1] =
-        s->current_picture.motion_val[1][xy + v->blocks_off][0] =
-        s->current_picture.motion_val[1][xy + v->blocks_off][1] = 0;
+        s->current_picture.motion_val[0][xy][0] =
+        s->current_picture.motion_val[0][xy][1] =
+        s->current_picture.motion_val[1][xy][0] =
+        s->current_picture.motion_val[1][xy][1] = 0;
         return;
     }
-    if (!v->field_mode) {
+        if (direct && s->next_picture_ptr->field_picture)
+            av_log(s->avctx, AV_LOG_WARNING, "Mixed frame/field direct mode not supported\n");
+
         s->mv[0][0][0] = scale_mv(s->next_picture.motion_val[1][xy][0], v->bfraction, 0, s->quarter_sample);
         s->mv[0][0][1] = scale_mv(s->next_picture.motion_val[1][xy][1], v->bfraction, 0, s->quarter_sample);
         s->mv[1][0][0] = scale_mv(s->next_picture.motion_val[1][xy][0], v->bfraction, 1, s->quarter_sample);
@@ -2142,12 +2146,11 @@
         s->mv[0][0][1] = av_clip(s->mv[0][0][1], -60 - (s->mb_y << 6), (s->mb_height << 6) - 4 - (s->mb_y << 6));
         s->mv[1][0][0] = av_clip(s->mv[1][0][0], -60 - (s->mb_x << 6), (s->mb_width  << 6) - 4 - (s->mb_x << 6));
         s->mv[1][0][1] = av_clip(s->mv[1][0][1], -60 - (s->mb_y << 6), (s->mb_height << 6) - 4 - (s->mb_y << 6));
-    }
     if (direct) {
-        s->current_picture.motion_val[0][xy + v->blocks_off][0] = s->mv[0][0][0];
-        s->current_picture.motion_val[0][xy + v->blocks_off][1] = s->mv[0][0][1];
-        s->current_picture.motion_val[1][xy + v->blocks_off][0] = s->mv[1][0][0];
-        s->current_picture.motion_val[1][xy + v->blocks_off][1] = s->mv[1][0][1];
+        s->current_picture.motion_val[0][xy][0] = s->mv[0][0][0];
+        s->current_picture.motion_val[0][xy][1] = s->mv[0][0][1];
+        s->current_picture.motion_val[1][xy][0] = s->mv[1][0][0];
+        s->current_picture.motion_val[1][xy][1] = s->mv[1][0][1];
         return;
     }
 
@@ -4342,6 +4345,10 @@
             if (bmvtype == BMV_TYPE_DIRECT) {
                 dmv_x[0] = dmv_y[0] = pred_flag[0] = 0;
                 dmv_x[1] = dmv_y[1] = pred_flag[0] = 0;
+                if (!s->next_picture_ptr->field_picture) {
+                    av_log(s->avctx, AV_LOG_ERROR, "Mixed field/frame direct mode not supported\n");
+                    return;
+                }
             }
             vc1_pred_b_mv_intfi(v, 0, dmv_x, dmv_y, 1, pred_flag);
             vc1_b_mc(v, dmv_x, dmv_y, (bmvtype == BMV_TYPE_DIRECT), bmvtype);
@@ -4449,6 +4456,8 @@
         direct = v->direct_mb_plane[mb_pos];
 
     if (direct) {
+        if (s->next_picture_ptr->field_picture)
+            av_log(s->avctx, AV_LOG_WARNING, "Mixed frame/field direct mode not supported\n");
         s->mv[0][0][0] = s->current_picture.motion_val[0][s->block_index[0]][0] = scale_mv(s->next_picture.motion_val[1][s->block_index[0]][0], v->bfraction, 0, s->quarter_sample);
         s->mv[0][0][1] = s->current_picture.motion_val[0][s->block_index[0]][1] = scale_mv(s->next_picture.motion_val[1][s->block_index[0]][1], v->bfraction, 0, s->quarter_sample);
         s->mv[1][0][0] = s->current_picture.motion_val[1][s->block_index[0]][0] = scale_mv(s->next_picture.motion_val[1][s->block_index[0]][0], v->bfraction, 1, s->quarter_sample);
@@ -5274,7 +5283,7 @@
         c[6] = 1 << 16;
 }
 
-static void vc1_parse_sprites(VC1Context *v, GetBitContext* gb, SpriteData* sd)
+static int vc1_parse_sprites(VC1Context *v, GetBitContext* gb, SpriteData* sd)
 {
     AVCodecContext *avctx = v->s.avctx;
     int sprite, i;
@@ -5318,7 +5327,7 @@
         sd->effect_pcount2 = get_bits(gb, 16);
         if (sd->effect_pcount2 > 10) {
             av_log(avctx, AV_LOG_ERROR, "Too many effect parameters\n");
-            return;
+            return AVERROR_INVALIDDATA;
         } else if (sd->effect_pcount2) {
             i = -1;
             av_log(avctx, AV_LOG_DEBUG, "Effect params 2: ");
@@ -5335,10 +5344,14 @@
         av_log(avctx, AV_LOG_DEBUG, "Effect flag set\n");
 
     if (get_bits_count(gb) >= gb->size_in_bits +
-       (avctx->codec_id == AV_CODEC_ID_WMV3IMAGE ? 64 : 0))
+       (avctx->codec_id == AV_CODEC_ID_WMV3IMAGE ? 64 : 0)) {
         av_log(avctx, AV_LOG_ERROR, "Buffer overrun\n");
+        return AVERROR_INVALIDDATA;
+    }
     if (get_bits_count(gb) < gb->size_in_bits - 8)
         av_log(avctx, AV_LOG_WARNING, "Buffer not fully read\n");
+
+    return 0;
 }
 
 static void vc1_draw_sprites(VC1Context *v, SpriteData* sd)
@@ -5350,7 +5363,7 @@
     int ysub[2];
     MpegEncContext *s = &v->s;
 
-    for (i = 0; i < 2; i++) {
+    for (i = 0; i <= v->two_sprites; i++) {
         xoff[i] = av_clip(sd->coefs[i][2], 0, v->sprite_width-1 << 16);
         xadv[i] = sd->coefs[i][0];
         if (xadv[i] != 1<<16 || (v->sprite_width << 16) - (v->output_width << 16) - xoff[i])
@@ -5365,8 +5378,8 @@
         int width = v->output_width>>!!plane;
 
         for (row = 0; row < v->output_height>>!!plane; row++) {
-            uint8_t *dst = v->sprite_output_frame.data[plane] +
-                           v->sprite_output_frame.linesize[plane] * row;
+            uint8_t *dst = v->sprite_output_frame->data[plane] +
+                           v->sprite_output_frame->linesize[plane] * row;
 
             for (sprite = 0; sprite <= v->two_sprites; sprite++) {
                 uint8_t *iplane = s->current_picture.f.data[plane];
@@ -5428,7 +5441,7 @@
         }
 
         if (!plane) {
-            for (i = 0; i < 2; i++) {
+            for (i = 0; i <= v->two_sprites; i++) {
                 xoff[i] >>= 1;
                 yoff[i] >>= 1;
             }
@@ -5445,7 +5458,11 @@
     AVCodecContext *avctx = s->avctx;
     SpriteData sd;
 
-    vc1_parse_sprites(v, gb, &sd);
+    memset(&sd, 0, sizeof(sd));
+
+    ret = vc1_parse_sprites(v, gb, &sd);
+    if (ret < 0)
+        return ret;
 
     if (!s->current_picture.f.data[0]) {
         av_log(avctx, AV_LOG_ERROR, "Got no sprites\n");
@@ -5457,8 +5474,8 @@
         v->two_sprites = 0;
     }
 
-    av_frame_unref(&v->sprite_output_frame);
-    if ((ret = ff_get_buffer(avctx, &v->sprite_output_frame, 0)) < 0)
+    av_frame_unref(v->sprite_output_frame);
+    if ((ret = ff_get_buffer(avctx, v->sprite_output_frame, 0)) < 0)
         return ret;
 
     vc1_draw_sprites(v, &sd);
@@ -5490,14 +5507,15 @@
 {
     MpegEncContext *s = &v->s;
     int i;
+    int mb_height = FFALIGN(s->mb_height, 2);
 
     /* Allocate mb bitplanes */
-    v->mv_type_mb_plane = av_malloc (s->mb_stride * s->mb_height);
-    v->direct_mb_plane  = av_malloc (s->mb_stride * s->mb_height);
-    v->forward_mb_plane = av_malloc (s->mb_stride * s->mb_height);
-    v->fieldtx_plane    = av_mallocz(s->mb_stride * s->mb_height);
-    v->acpred_plane     = av_malloc (s->mb_stride * s->mb_height);
-    v->over_flags_plane = av_malloc (s->mb_stride * s->mb_height);
+    v->mv_type_mb_plane = av_malloc (s->mb_stride * mb_height);
+    v->direct_mb_plane  = av_malloc (s->mb_stride * mb_height);
+    v->forward_mb_plane = av_malloc (s->mb_stride * mb_height);
+    v->fieldtx_plane    = av_mallocz(s->mb_stride * mb_height);
+    v->acpred_plane     = av_malloc (s->mb_stride * mb_height);
+    v->over_flags_plane = av_malloc (s->mb_stride * mb_height);
 
     v->n_allocated_blks = s->mb_width + 2;
     v->block            = av_malloc(sizeof(*v->block) * v->n_allocated_blks);
@@ -5507,24 +5525,24 @@
     v->ttblk            = v->ttblk_base + s->mb_stride;
     v->is_intra_base    = av_mallocz(sizeof(v->is_intra_base[0]) * 2 * s->mb_stride);
     v->is_intra         = v->is_intra_base + s->mb_stride;
-    v->luma_mv_base     = av_malloc(sizeof(v->luma_mv_base[0]) * 2 * s->mb_stride);
+    v->luma_mv_base     = av_mallocz(sizeof(v->luma_mv_base[0]) * 2 * s->mb_stride);
     v->luma_mv          = v->luma_mv_base + s->mb_stride;
 
     /* allocate block type info in that way so it could be used with s->block_index[] */
-    v->mb_type_base = av_malloc(s->b8_stride * (s->mb_height * 2 + 1) + s->mb_stride * (s->mb_height + 1) * 2);
+    v->mb_type_base = av_malloc(s->b8_stride * (mb_height * 2 + 1) + s->mb_stride * (mb_height + 1) * 2);
     v->mb_type[0]   = v->mb_type_base + s->b8_stride + 1;
-    v->mb_type[1]   = v->mb_type_base + s->b8_stride * (s->mb_height * 2 + 1) + s->mb_stride + 1;
-    v->mb_type[2]   = v->mb_type[1] + s->mb_stride * (s->mb_height + 1);
+    v->mb_type[1]   = v->mb_type_base + s->b8_stride * (mb_height * 2 + 1) + s->mb_stride + 1;
+    v->mb_type[2]   = v->mb_type[1] + s->mb_stride * (mb_height + 1);
 
     /* allocate memory to store block level MV info */
-    v->blk_mv_type_base = av_mallocz(     s->b8_stride * (s->mb_height * 2 + 1) + s->mb_stride * (s->mb_height + 1) * 2);
+    v->blk_mv_type_base = av_mallocz(     s->b8_stride * (mb_height * 2 + 1) + s->mb_stride * (mb_height + 1) * 2);
     v->blk_mv_type      = v->blk_mv_type_base + s->b8_stride + 1;
-    v->mv_f_base        = av_mallocz(2 * (s->b8_stride * (s->mb_height * 2 + 1) + s->mb_stride * (s->mb_height + 1) * 2));
+    v->mv_f_base        = av_mallocz(2 * (s->b8_stride * (mb_height * 2 + 1) + s->mb_stride * (mb_height + 1) * 2));
     v->mv_f[0]          = v->mv_f_base + s->b8_stride + 1;
-    v->mv_f[1]          = v->mv_f[0] + (s->b8_stride * (s->mb_height * 2 + 1) + s->mb_stride * (s->mb_height + 1) * 2);
-    v->mv_f_next_base   = av_mallocz(2 * (s->b8_stride * (s->mb_height * 2 + 1) + s->mb_stride * (s->mb_height + 1) * 2));
+    v->mv_f[1]          = v->mv_f[0] + (s->b8_stride * (mb_height * 2 + 1) + s->mb_stride * (mb_height + 1) * 2);
+    v->mv_f_next_base   = av_mallocz(2 * (s->b8_stride * (mb_height * 2 + 1) + s->mb_stride * (mb_height + 1) * 2));
     v->mv_f_next[0]     = v->mv_f_next_base + s->b8_stride + 1;
-    v->mv_f_next[1]     = v->mv_f_next[0] + (s->b8_stride * (s->mb_height * 2 + 1) + s->mb_stride * (s->mb_height + 1) * 2);
+    v->mv_f_next[1]     = v->mv_f_next[0] + (s->b8_stride * (mb_height * 2 + 1) + s->mb_stride * (mb_height + 1) * 2);
 
     /* Init coded blocks info */
     if (v->profile == PROFILE_ADVANCED) {
@@ -5597,10 +5615,8 @@
         avctx->pix_fmt = avctx->get_format(avctx, avctx->codec->pix_fmts);
     else
         avctx->pix_fmt = AV_PIX_FMT_GRAY8;
-    avctx->hwaccel = ff_find_hwaccel(avctx->codec->id, avctx->pix_fmt);
+    avctx->hwaccel = ff_find_hwaccel(avctx);
     v->s.avctx = avctx;
-    avctx->flags |= CODEC_FLAG_EMU_EDGE;
-    v->s.flags   |= CODEC_FLAG_EMU_EDGE;
 
     if ((ret = ff_vc1_init_common(v)) < 0)
         return ret;
@@ -5685,6 +5701,10 @@
         v->res_sprite = (avctx->codec_id == AV_CODEC_ID_VC1IMAGE);
     }
 
+    v->sprite_output_frame = av_frame_alloc();
+    if (!v->sprite_output_frame)
+        return AVERROR(ENOMEM);
+
     avctx->profile = v->profile;
     if (v->profile == PROFILE_ADVANCED)
         avctx->level = v->level;
@@ -5731,7 +5751,7 @@
     VC1Context *v = avctx->priv_data;
     int i;
 
-    av_frame_unref(&v->sprite_output_frame);
+    av_frame_free(&v->sprite_output_frame);
 
     for (i = 0; i < 4; i++)
         av_freep(&v->sr_rows[i >> 1][i & 1]);
@@ -5845,7 +5865,7 @@
                                   buf_size3 << 3);
                     /* assuming that the field marker is at the exact middle,
                        hope it's correct */
-                    slices[n_slices].mby_start = s->mb_height >> 1;
+                    slices[n_slices].mby_start = s->mb_height + 1 >> 1;
                     n_slices1 = n_slices - 1; // index of the last slice of the first field
                     n_slices++;
                     break;
@@ -5896,7 +5916,7 @@
                 buf_size3 = vc1_unescape_buffer(divider + 4, buf + buf_size - divider - 4, slices[n_slices].buf);
                 init_get_bits(&slices[n_slices].gb, slices[n_slices].buf,
                               buf_size3 << 3);
-                slices[n_slices].mby_start = s->mb_height >> 1;
+                slices[n_slices].mby_start = s->mb_height + 1 >> 1;
                 n_slices1 = n_slices - 1;
                 n_slices++;
             }
@@ -5950,15 +5970,6 @@
         }
     }
 
-    /* We need to set current_picture_ptr before reading the header,
-     * otherwise we cannot store anything in there. */
-    if (s->current_picture_ptr == NULL || s->current_picture_ptr->f.data[0]) {
-        int i = ff_find_unused_picture(s, 0);
-        if (i < 0)
-            goto err;
-        s->current_picture_ptr = &s->picture[i];
-    }
-
     // do parse frame header
     v->pic_header_flag = 0;
     v->first_pic_header_flag = 1;
@@ -5987,18 +5998,6 @@
         goto err;
     }
 
-    // process pulldown flags
-    s->current_picture_ptr->f.repeat_pict = 0;
-    // Pulldown flags are only valid when 'broadcast' has been set.
-    // So ticks_per_frame will be 2
-    if (v->rff) {
-        // repeat field
-        s->current_picture_ptr->f.repeat_pict = 1;
-    } else if (v->rptfrm) {
-        // repeat frames
-        s->current_picture_ptr->f.repeat_pict = v->rptfrm * 2;
-    }
-
     // for skipping the frame
     s->current_picture.f.pict_type = s->pict_type;
     s->current_picture.f.key_frame = s->pict_type == AV_PICTURE_TYPE_I;
@@ -6024,9 +6023,22 @@
         goto err;
     }
 
+    v->s.current_picture_ptr->field_picture = v->field_mode;
     v->s.current_picture_ptr->f.interlaced_frame = (v->fcm != PROGRESSIVE);
     v->s.current_picture_ptr->f.top_field_first  = v->tff;
 
+    // process pulldown flags
+    s->current_picture_ptr->f.repeat_pict = 0;
+    // Pulldown flags are only valid when 'broadcast' has been set.
+    // So ticks_per_frame will be 2
+    if (v->rff) {
+        // repeat field
+        s->current_picture_ptr->f.repeat_pict = 1;
+    } else if (v->rptfrm) {
+        // repeat frames
+        s->current_picture_ptr->f.repeat_pict = v->rptfrm * 2;
+    }
+
     s->me.qpel_put = s->dsp.put_qpel_pixels_tab;
     s->me.qpel_avg = s->dsp.avg_qpel_pixels_tab;
 
@@ -6102,6 +6114,7 @@
                     continue;
                 }
                 v->second_field = 1;
+                av_assert0((s->mb_height & 1) == 0);
                 v->blocks_off   = s->b8_stride * (s->mb_height&~1);
                 v->mb_off       = s->mb_stride * s->mb_height >> 1;
             } else {
@@ -6186,7 +6199,7 @@
         if (vc1_decode_sprites(v, &s->gb))
             goto err;
 #endif
-        if ((ret = av_frame_ref(pict, &v->sprite_output_frame)) < 0)
+        if ((ret = av_frame_ref(pict, v->sprite_output_frame)) < 0)
             goto err;
         *got_frame = 1;
     } else {
@@ -6194,12 +6207,11 @@
             if ((ret = av_frame_ref(pict, &s->current_picture_ptr->f)) < 0)
                 goto err;
             ff_print_debug_info(s, s->current_picture_ptr, pict);
+            *got_frame = 1;
         } else if (s->last_picture_ptr != NULL) {
             if ((ret = av_frame_ref(pict, &s->last_picture_ptr->f)) < 0)
                 goto err;
             ff_print_debug_info(s, s->last_picture_ptr, pict);
-        }
-        if (s->last_picture_ptr || s->low_delay) {
             *got_frame = 1;
         }
     }

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/vc1dsp.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/vc1dsp.c Changed

@@ -20,7 +20,7 @@
  */
 
 /**
-* @file
+ * @file
  * VC-1 and WMV3 decoder
  *
  */
@@ -31,68 +31,65 @@
 #include "rnd_avg.h"
 #include "vc1dsp.h"
 
-
-/** Apply overlap transform to horizontal edge
-*/
-static void vc1_v_overlap_c(uint8_t* src, int stride)
+/* Apply overlap transform to horizontal edge */
+static void vc1_v_overlap_c(uint8_t *src, int stride)
 {
     int i;
     int a, b, c, d;
     int d1, d2;
     int rnd = 1;
-    for(i = 0; i < 8; i++) {
-        a = src[-2*stride];
-        b = src[-stride];
-        c = src[0];
-        d = src[stride];
+    for (i = 0; i < 8; i++) {
+        a  = src[-2 * stride];
+        b  = src[-stride];
+        c  = src[0];
+        d  = src[stride];
         d1 = (a - d + 3 + rnd) >> 3;
         d2 = (a - d + b - c + 4 - rnd) >> 3;
 
-        src[-2*stride] = a - d1;
-        src[-stride] = av_clip_uint8(b - d2);
-        src[0] = av_clip_uint8(c + d2);
-        src[stride] = d + d1;
+        src[-2 * stride] = a - d1;
+        src[-stride]     = av_clip_uint8(b - d2);
+        src[0]           = av_clip_uint8(c + d2);
+        src[stride]      = d + d1;
         src++;
         rnd = !rnd;
     }
 }
 
-/** Apply overlap transform to vertical edge
-*/
-static void vc1_h_overlap_c(uint8_t* src, int stride)
+/* Apply overlap transform to vertical edge */
+static void vc1_h_overlap_c(uint8_t *src, int stride)
 {
     int i;
     int a, b, c, d;
     int d1, d2;
     int rnd = 1;
-    for(i = 0; i < 8; i++) {
-        a = src[-2];
-        b = src[-1];
-        c = src[0];
-        d = src[1];
+    for (i = 0; i < 8; i++) {
+        a  = src[-2];
+        b  = src[-1];
+        c  = src[0];
+        d  = src[1];
         d1 = (a - d + 3 + rnd) >> 3;
         d2 = (a - d + b - c + 4 - rnd) >> 3;
 
         src[-2] = a - d1;
         src[-1] = av_clip_uint8(b - d2);
-        src[0] = av_clip_uint8(c + d2);
-        src[1] = d + d1;
-        src += stride;
-        rnd = !rnd;
+        src[0]  = av_clip_uint8(c + d2);
+        src[1]  = d + d1;
+        src    += stride;
+        rnd     = !rnd;
     }
 }
 
-static void vc1_v_s_overlap_c(int16_t *top,  int16_t *bottom)
+static void vc1_v_s_overlap_c(int16_t *top, int16_t *bottom)
 {
     int i;
     int a, b, c, d;
     int d1, d2;
     int rnd1 = 4, rnd2 = 3;
-    for(i = 0; i < 8; i++) {
-        a = top[48];
-        b = top[56];
-        c = bottom[0];
-        d = bottom[8];
+    for (i = 0; i < 8; i++) {
+        a  = top[48];
+        b  = top[56];
+        c  = bottom[0];
+        d  = bottom[8];
         d1 = a - d;
         d2 = a - d + b - c;
 
@@ -114,11 +111,11 @@
     int a, b, c, d;
     int d1, d2;
     int rnd1 = 4, rnd2 = 3;
-    for(i = 0; i < 8; i++) {
-        a = left[6];
-        b = left[7];
-        c = right[0];
-        d = right[1];
+    for (i = 0; i < 8; i++) {
+        a  = left[6];
+        b  = left[7];
+        c  = right[0];
+        d  = right[1];
         d1 = a - d;
         d2 = a - d + b - c;
 
@@ -128,9 +125,9 @@
         right[1] = ((d << 3) + d1 + rnd2) >> 3;
 
         right += 8;
-        left += 8;
-        rnd2 = 7 - rnd2;
-        rnd1 = 7 - rnd1;
+        left  += 8;
+        rnd2   = 7 - rnd2;
+        rnd1   = 7 - rnd1;
     }
 }
 
@@ -142,31 +139,38 @@
  * @return whether other 3 pairs should be filtered or not
  * @see 8.6
  */
-static av_always_inline int vc1_filter_line(uint8_t* src, int stride, int pq){
-    int a0 = (2*(src[-2*stride] - src[ 1*stride]) - 5*(src[-1*stride] - src[ 0*stride]) + 4) >> 3;
+static av_always_inline int vc1_filter_line(uint8_t *src, int stride, int pq)
+{
+    int a0 = (2 * (src[-2 * stride] - src[1 * stride]) -
+              5 * (src[-1 * stride] - src[0 * stride]) + 4) >> 3;
     int a0_sign = a0 >> 31;        /* Store sign */
+
     a0 = (a0 ^ a0_sign) - a0_sign; /* a0 = FFABS(a0); */
-    if(a0 < pq){
-        int a1 = FFABS((2*(src[-4*stride] - src[-1*stride]) - 5*(src[-3*stride] - src[-2*stride]) + 4) >> 3);
-        int a2 = FFABS((2*(src[ 0*stride] - src[ 3*stride]) - 5*(src[ 1*stride] - src[ 2*stride]) + 4) >> 3);
-        if(a1 < a0 || a2 < a0){
-            int clip = src[-1*stride] - src[ 0*stride];
+    if (a0 < pq) {
+        int a1 = FFABS((2 * (src[-4 * stride] - src[-1 * stride]) -
+                        5 * (src[-3 * stride] - src[-2 * stride]) + 4) >> 3);
+        int a2 = FFABS((2 * (src[ 0 * stride] - src[ 3 * stride]) -
+                        5 * (src[ 1 * stride] - src[ 2 * stride]) + 4) >> 3);
+        if (a1 < a0 || a2 < a0) {
+            int clip      = src[-1 * stride] - src[0 * stride];
             int clip_sign = clip >> 31;
-            clip = ((clip ^ clip_sign) - clip_sign)>>1;
-            if(clip){
-                int a3 = FFMIN(a1, a2);
-                int d = 5 * (a3 - a0);
+
+            clip = ((clip ^ clip_sign) - clip_sign) >> 1;
+            if (clip) {
+                int a3     = FFMIN(a1, a2);
+                int d      = 5 * (a3 - a0);
                 int d_sign = (d >> 31);
-                d = ((d ^ d_sign) - d_sign) >> 3;
+
+                d       = ((d ^ d_sign) - d_sign) >> 3;
                 d_sign ^= a0_sign;
 
-                if( d_sign ^ clip_sign )
+                if (d_sign ^ clip_sign)
                     d = 0;
-                else{
+                else {
                     d = FFMIN(d, clip);
-                    d = (d ^ d_sign) - d_sign;          /* Restore sign */
-                    src[-1*stride] = av_clip_uint8(src[-1*stride] - d);
-                    src[ 0*stride] = av_clip_uint8(src[ 0*stride] + d);
+                    d = (d ^ d_sign) - d_sign; /* Restore sign */
+                    src[-1 * stride] = av_clip_uint8(src[-1 * stride] - d);
+                    src[ 0 * stride] = av_clip_uint8(src[ 0 * stride] + d);
                 }
                 return 1;
             }
@@ -184,17 +188,18 @@
  * @param pq block quantizer
  * @see 8.6
  */
-static inline void vc1_loop_filter(uint8_t* src, int step, int stride, int len, int pq)
+static inline void vc1_loop_filter(uint8_t *src, int step, int stride,
+                                   int len, int pq)
 {
     int i;
     int filt3;
 
-    for(i = 0; i < len; i += 4){
-        filt3 = vc1_filter_line(src + 2*step, stride, pq);
-        if(filt3){
-            vc1_filter_line(src + 0*step, stride, pq);
-            vc1_filter_line(src + 1*step, stride, pq);
-            vc1_filter_line(src + 3*step, stride, pq);
+    for (i = 0; i < len; i += 4) {
+        filt3 = vc1_filter_line(src + 2 * step, stride, pq);
+        if (filt3) {
+            vc1_filter_line(src + 0 * step, stride, pq);
+            vc1_filter_line(src + 1 * step, stride, pq);
+            vc1_filter_line(src + 3 * step, stride, pq);
         }
         src += step * 4;
     }
@@ -230,15 +235,16 @@
     vc1_loop_filter(src, stride, 1, 16, pq);
 }
 
-/** Do inverse transform on 8x8 block
-*/
+/* Do inverse transform on 8x8 block */
 static void vc1_inv_trans_8x8_dc_c(uint8_t *dest, int linesize, int16_t *block)
 {
     int i;
     int dc = block[0];
+
     dc = (3 * dc +  1) >> 1;
     dc = (3 * dc + 16) >> 5;
-    for(i = 0; i < 8; i++){
+
+    for (i = 0; i < 8; i++) {
         dest[0] = av_clip_uint8(dest[0] + dc);
         dest[1] = av_clip_uint8(dest[1] + dc);
         dest[2] = av_clip_uint8(dest[2] + dc);
@@ -254,12 +260,12 @@
 static void vc1_inv_trans_8x8_c(int16_t block[64])
 {
     int i;
-    register int t1,t2,t3,t4,t5,t6,t7,t8;
+    register int t1, t2, t3, t4, t5, t6, t7, t8;
     int16_t *src, *dst, temp[64];
 
     src = block;
     dst = temp;
-    for(i = 0; i < 8; i++){
+    for (i = 0; i < 8; i++) {
         t1 = 12 * (src[ 0] + src[32]) + 4;
         t2 = 12 * (src[ 0] - src[32]) + 4;
         t3 = 16 * src[16] +  6 * src[48];
@@ -290,7 +296,7 @@
 
     src = temp;
     dst = block;
-    for(i = 0; i < 8; i++){
+    for (i = 0; i < 8; i++) {
         t1 = 12 * (src[ 0] + src[32]) + 64;
         t2 = 12 * (src[ 0] - src[32]) + 64;
         t3 = 16 * src[16] +  6 * src[48];
@@ -320,15 +326,16 @@
     }
 }
 
-/** Do inverse transform on 8x4 part of block
-*/
+/* Do inverse transform on 8x4 part of block */
 static void vc1_inv_trans_8x4_dc_c(uint8_t *dest, int linesize, int16_t *block)
 {
     int i;
     int dc = block[0];
-    dc = ( 3 * dc +  1) >> 1;
+
+    dc =  (3 * dc +  1) >> 1;
     dc = (17 * dc + 64) >> 7;
-    for(i = 0; i < 4; i++){
+
+    for (i = 0; i < 4; i++) {
         dest[0] = av_clip_uint8(dest[0] + dc);
         dest[1] = av_clip_uint8(dest[1] + dc);
         dest[2] = av_clip_uint8(dest[2] + dc);
@@ -344,12 +351,13 @@
 static void vc1_inv_trans_8x4_c(uint8_t *dest, int linesize, int16_t *block)
 {
     int i;
-    register int t1,t2,t3,t4,t5,t6,t7,t8;
+    register int t1, t2, t3, t4, t5, t6, t7, t8;
     int16_t *src, *dst;
 
     src = block;
     dst = block;
-    for(i = 0; i < 4; i++){
+
+    for (i = 0; i < 4; i++) {
         t1 = 12 * (src[0] + src[4]) + 4;
         t2 = 12 * (src[0] - src[4]) + 4;
         t3 = 16 * src[2] +  6 * src[6];
@@ -379,31 +387,32 @@
     }
 
     src = block;
-    for(i = 0; i < 8; i++){
+    for (i = 0; i < 8; i++) {
         t1 = 17 * (src[ 0] + src[16]) + 64;
         t2 = 17 * (src[ 0] - src[16]) + 64;
         t3 = 22 * src[ 8] + 10 * src[24];
         t4 = 22 * src[24] - 10 * src[ 8];
 
-        dest[0*linesize] = av_clip_uint8(dest[0*linesize] + ((t1 + t3) >> 7));
-        dest[1*linesize] = av_clip_uint8(dest[1*linesize] + ((t2 - t4) >> 7));
-        dest[2*linesize] = av_clip_uint8(dest[2*linesize] + ((t2 + t4) >> 7));
-        dest[3*linesize] = av_clip_uint8(dest[3*linesize] + ((t1 - t3) >> 7));
+        dest[0 * linesize] = av_clip_uint8(dest[0 * linesize] + ((t1 + t3) >> 7));
+        dest[1 * linesize] = av_clip_uint8(dest[1 * linesize] + ((t2 - t4) >> 7));
+        dest[2 * linesize] = av_clip_uint8(dest[2 * linesize] + ((t2 + t4) >> 7));
+        dest[3 * linesize] = av_clip_uint8(dest[3 * linesize] + ((t1 - t3) >> 7));
 
-        src ++;
+        src++;
         dest++;
     }
 }
 
-/** Do inverse transform on 4x8 parts of block
-*/
+/* Do inverse transform on 4x8 parts of block */
 static void vc1_inv_trans_4x8_dc_c(uint8_t *dest, int linesize, int16_t *block)
 {
     int i;
     int dc = block[0];
+
     dc = (17 * dc +  4) >> 3;
     dc = (12 * dc + 64) >> 7;
-    for(i = 0; i < 8; i++){
+
+    for (i = 0; i < 8; i++) {
         dest[0] = av_clip_uint8(dest[0] + dc);
         dest[1] = av_clip_uint8(dest[1] + dc);
         dest[2] = av_clip_uint8(dest[2] + dc);
@@ -415,12 +424,13 @@
 static void vc1_inv_trans_4x8_c(uint8_t *dest, int linesize, int16_t *block)
 {
     int i;
-    register int t1,t2,t3,t4,t5,t6,t7,t8;
+    register int t1, t2, t3, t4, t5, t6, t7, t8;
     int16_t *src, *dst;
 
     src = block;
     dst = block;
-    for(i = 0; i < 8; i++){
+
+    for (i = 0; i < 8; i++) {
         t1 = 17 * (src[0] + src[2]) + 4;
         t2 = 17 * (src[0] - src[2]) + 4;
         t3 = 22 * src[1] + 10 * src[3];
@@ -436,7 +446,7 @@
     }
 
     src = block;
-    for(i = 0; i < 4; i++){
+    for (i = 0; i < 4; i++) {
         t1 = 12 * (src[ 0] + src[32]) + 64;
         t2 = 12 * (src[ 0] - src[32]) + 64;
         t3 = 16 * src[16] +  6 * src[48];
@@ -452,29 +462,30 @@
         t3 =  9 * src[ 8] - 16 * src[24] +  4 * src[40] + 15 * src[56];
         t4 =  4 * src[ 8] -  9 * src[24] + 15 * src[40] - 16 * src[56];
 
-        dest[0*linesize] = av_clip_uint8(dest[0*linesize] + ((t5 + t1) >> 7));
-        dest[1*linesize] = av_clip_uint8(dest[1*linesize] + ((t6 + t2) >> 7));
-        dest[2*linesize] = av_clip_uint8(dest[2*linesize] + ((t7 + t3) >> 7));
-        dest[3*linesize] = av_clip_uint8(dest[3*linesize] + ((t8 + t4) >> 7));
-        dest[4*linesize] = av_clip_uint8(dest[4*linesize] + ((t8 - t4 + 1) >> 7));
-        dest[5*linesize] = av_clip_uint8(dest[5*linesize] + ((t7 - t3 + 1) >> 7));
-        dest[6*linesize] = av_clip_uint8(dest[6*linesize] + ((t6 - t2 + 1) >> 7));
-        dest[7*linesize] = av_clip_uint8(dest[7*linesize] + ((t5 - t1 + 1) >> 7));
+        dest[0 * linesize] = av_clip_uint8(dest[0 * linesize] + ((t5 + t1)     >> 7));
+        dest[1 * linesize] = av_clip_uint8(dest[1 * linesize] + ((t6 + t2)     >> 7));
+        dest[2 * linesize] = av_clip_uint8(dest[2 * linesize] + ((t7 + t3)     >> 7));
+        dest[3 * linesize] = av_clip_uint8(dest[3 * linesize] + ((t8 + t4)     >> 7));
+        dest[4 * linesize] = av_clip_uint8(dest[4 * linesize] + ((t8 - t4 + 1) >> 7));
+        dest[5 * linesize] = av_clip_uint8(dest[5 * linesize] + ((t7 - t3 + 1) >> 7));
+        dest[6 * linesize] = av_clip_uint8(dest[6 * linesize] + ((t6 - t2 + 1) >> 7));
+        dest[7 * linesize] = av_clip_uint8(dest[7 * linesize] + ((t5 - t1 + 1) >> 7));
 
-        src ++;
+        src++;
         dest++;
     }
 }
 
-/** Do inverse transform on 4x4 part of block
-*/
+/* Do inverse transform on 4x4 part of block */
 static void vc1_inv_trans_4x4_dc_c(uint8_t *dest, int linesize, int16_t *block)
 {
     int i;
     int dc = block[0];
+
     dc = (17 * dc +  4) >> 3;
     dc = (17 * dc + 64) >> 7;
-    for(i = 0; i < 4; i++){
+
+    for (i = 0; i < 4; i++) {
         dest[0] = av_clip_uint8(dest[0] + dc);
         dest[1] = av_clip_uint8(dest[1] + dc);
         dest[2] = av_clip_uint8(dest[2] + dc);
@@ -486,12 +497,12 @@
 static void vc1_inv_trans_4x4_c(uint8_t *dest, int linesize, int16_t *block)
 {
     int i;
-    register int t1,t2,t3,t4;
+    register int t1, t2, t3, t4;
     int16_t *src, *dst;
 
     src = block;
     dst = block;
-    for(i = 0; i < 4; i++){
+    for (i = 0; i < 4; i++) {
         t1 = 17 * (src[0] + src[2]) + 4;
         t2 = 17 * (src[0] - src[2]) + 4;
         t3 = 22 * src[1] + 10 * src[3];
@@ -507,117 +518,128 @@
     }
 
     src = block;
-    for(i = 0; i < 4; i++){
-        t1 = 17 * (src[ 0] + src[16]) + 64;
-        t2 = 17 * (src[ 0] - src[16]) + 64;
-        t3 = 22 * src[ 8] + 10 * src[24];
-        t4 = 22 * src[24] - 10 * src[ 8];
+    for (i = 0; i < 4; i++) {
+        t1 = 17 * (src[0] + src[16]) + 64;
+        t2 = 17 * (src[0] - src[16]) + 64;
+        t3 = 22 * src[8] + 10 * src[24];
+        t4 = 22 * src[24] - 10 * src[8];
 
-        dest[0*linesize] = av_clip_uint8(dest[0*linesize] + ((t1 + t3) >> 7));
-        dest[1*linesize] = av_clip_uint8(dest[1*linesize] + ((t2 - t4) >> 7));
-        dest[2*linesize] = av_clip_uint8(dest[2*linesize] + ((t2 + t4) >> 7));
-        dest[3*linesize] = av_clip_uint8(dest[3*linesize] + ((t1 - t3) >> 7));
+        dest[0 * linesize] = av_clip_uint8(dest[0 * linesize] + ((t1 + t3) >> 7));
+        dest[1 * linesize] = av_clip_uint8(dest[1 * linesize] + ((t2 - t4) >> 7));
+        dest[2 * linesize] = av_clip_uint8(dest[2 * linesize] + ((t2 + t4) >> 7));
+        dest[3 * linesize] = av_clip_uint8(dest[3 * linesize] + ((t1 - t3) >> 7));
 
-        src ++;
+        src++;
         dest++;
     }
 }
 
 /* motion compensation functions */
-/** Filter in case of 2 filters */
-#define VC1_MSPEL_FILTER_16B(DIR, TYPE)                                 \
-static av_always_inline int vc1_mspel_ ## DIR ## _filter_16bits(const TYPE *src, int stride, int mode) \
-{                                                                       \
-    switch(mode){                                                       \
-    case 0: /* no shift - should not occur */                           \
-        return 0;                                                       \
-    case 1: /* 1/4 shift */                                             \
-        return -4*src[-stride] + 53*src[0] + 18*src[stride] - 3*src[stride*2]; \
-    case 2: /* 1/2 shift */                                             \
-        return -src[-stride] + 9*src[0] + 9*src[stride] - src[stride*2]; \
-    case 3: /* 3/4 shift */                                             \
-        return -3*src[-stride] + 18*src[0] + 53*src[stride] - 4*src[stride*2]; \
-    }                                                                   \
-    return 0; /* should not occur */                                    \
+
+/* Filter in case of 2 filters */
+#define VC1_MSPEL_FILTER_16B(DIR, TYPE)                                       \
+static av_always_inline int vc1_mspel_ ## DIR ## _filter_16bits(const TYPE *src, \
+                                                                int stride,   \
+                                                                int mode)     \
+{                                                                             \
+    switch(mode) {                                                            \
+    case 0: /* no shift - should not occur */                                 \
+        return 0;                                                             \
+    case 1: /* 1/4 shift */                                                   \
+        return -4 * src[-stride] + 53 * src[0] +                              \
+               18 * src[stride]  -  3 * src[stride * 2];                      \
+    case 2: /* 1/2 shift */                                                   \
+        return -1 * src[-stride] +  9 * src[0] +                              \
+                9 * src[stride]  -  1 * src[stride * 2];                      \
+    case 3: /* 3/4 shift */                                                   \
+        return -3 * src[-stride] + 18 * src[0] +                              \
+               53 * src[stride]  -  4 * src[stride * 2];                      \
+    }                                                                         \
+    return 0; /* should not occur */                                          \
 }
 
 VC1_MSPEL_FILTER_16B(ver, uint8_t)
 VC1_MSPEL_FILTER_16B(hor, int16_t)
 
-
-/** Filter used to interpolate fractional pel values
- */
-static av_always_inline int vc1_mspel_filter(const uint8_t *src, int stride, int mode, int r)
+/* Filter used to interpolate fractional pel values */
+static av_always_inline int vc1_mspel_filter(const uint8_t *src, int stride,
+                                             int mode, int r)
 {
-    switch(mode){
-    case 0: //no shift
+    switch (mode) {
+    case 0: // no shift
         return src[0];
     case 1: // 1/4 shift
-        return (-4*src[-stride] + 53*src[0] + 18*src[stride] - 3*src[stride*2] + 32 - r) >> 6;
+        return (-4 * src[-stride] + 53 * src[0] +
+                18 * src[stride]  -  3 * src[stride * 2] + 32 - r) >> 6;
     case 2: // 1/2 shift
-        return (-src[-stride] + 9*src[0] + 9*src[stride] - src[stride*2] + 8 - r) >> 4;
+        return (-1 * src[-stride] +  9 * src[0] +
+                 9 * src[stride]  -  1 * src[stride * 2] + 8 - r) >> 4;
     case 3: // 3/4 shift
-        return (-3*src[-stride] + 18*src[0] + 53*src[stride] - 4*src[stride*2] + 32 - r) >> 6;
+        return (-3 * src[-stride] + 18 * src[0] +
+                53 * src[stride]  -  4 * src[stride * 2] + 32 - r) >> 6;
     }
-    return 0; //should not occur
-}
-
-/** Function used to do motion compensation with bicubic interpolation
- */
-#define VC1_MSPEL_MC(OP, OP4, OPNAME)\
-static av_always_inline void OPNAME ## vc1_mspel_mc(uint8_t *dst, const uint8_t *src, ptrdiff_t stride, int hmode, int vmode, int rnd)\
-{\
-    int     i, j;\
-\
-    if (vmode) { /* Horizontal filter to apply */\
-        int r;\
-\
-        if (hmode) { /* Vertical filter to apply, output to tmp */\
-            static const int shift_value[] = { 0, 5, 1, 5 };\
-            int              shift = (shift_value[hmode]+shift_value[vmode])>>1;\
-            int16_t          tmp[11*8], *tptr = tmp;\
-\
-            r = (1<<(shift-1)) + rnd-1;\
-\
-            src -= 1;\
-            for(j = 0; j < 8; j++) {\
-                for(i = 0; i < 11; i++)\
-                    tptr[i] = (vc1_mspel_ver_filter_16bits(src + i, stride, vmode)+r)>>shift;\
-                src += stride;\
-                tptr += 11;\
-            }\
-\
-            r = 64-rnd;\
-            tptr = tmp+1;\
-            for(j = 0; j < 8; j++) {\
-                for(i = 0; i < 8; i++)\
-                    OP(dst[i], (vc1_mspel_hor_filter_16bits(tptr + i, 1, hmode)+r)>>7);\
-                dst += stride;\
-                tptr += 11;\
-            }\
-\
-            return;\
-        }\
-        else { /* No horizontal filter, output 8 lines to dst */\
-            r = 1-rnd;\
-\
-            for(j = 0; j < 8; j++) {\
-                for(i = 0; i < 8; i++)\
-                    OP(dst[i], vc1_mspel_filter(src + i, stride, vmode, r));\
-                src += stride;\
-                dst += stride;\
-            }\
-            return;\
-        }\
-    }\
-\
-    /* Horizontal mode with no vertical mode */\
-    for(j = 0; j < 8; j++) {\
-        for(i = 0; i < 8; i++)\
-            OP(dst[i], vc1_mspel_filter(src + i, 1, hmode, rnd));\
-        dst += stride;\
-        src += stride;\
-    }\
+    return 0; // should not occur
+}
+
+/* Function used to do motion compensation with bicubic interpolation */
+#define VC1_MSPEL_MC(OP, OP4, OPNAME)                                         \
+static av_always_inline void OPNAME ## vc1_mspel_mc(uint8_t *dst,             \
+                                                    const uint8_t *src,       \
+                                                    ptrdiff_t stride,         \
+                                                    int hmode,                \
+                                                    int vmode,                \
+                                                    int rnd)                  \
+{                                                                             \
+    int i, j;                                                                 \
+                                                                              \
+    if (vmode) { /* Horizontal filter to apply */                             \
+        int r;                                                                \
+                                                                              \
+        if (hmode) { /* Vertical filter to apply, output to tmp */            \
+            static const int shift_value[] = { 0, 5, 1, 5 };                  \
+            int shift = (shift_value[hmode] + shift_value[vmode]) >> 1;       \
+            int16_t tmp[11 * 8], *tptr = tmp;                                 \
+                                                                              \
+            r = (1 << (shift - 1)) + rnd - 1;                                 \
+                                                                              \
+            src -= 1;                                                         \
+            for (j = 0; j < 8; j++) {                                         \
+                for (i = 0; i < 11; i++)                                      \
+                    tptr[i] = (vc1_mspel_ver_filter_16bits(src + i, stride, vmode) + r) >> shift; \
+                src  += stride;                                               \
+                tptr += 11;                                                   \
+            }                                                                 \
+                                                                              \
+            r    = 64 - rnd;                                                  \
+            tptr = tmp + 1;                                                   \
+            for (j = 0; j < 8; j++) {                                         \
+                for (i = 0; i < 8; i++)                                       \
+                    OP(dst[i], (vc1_mspel_hor_filter_16bits(tptr + i, 1, hmode) + r) >> 7); \
+                dst  += stride;                                               \
+                tptr += 11;                                                   \
+            }                                                                 \
+                                                                              \
+            return;                                                           \
+        } else { /* No horizontal filter, output 8 lines to dst */            \
+            r = 1 - rnd;                                                      \
+                                                                              \
+            for (j = 0; j < 8; j++) {                                         \
+                for (i = 0; i < 8; i++)                                       \
+                    OP(dst[i], vc1_mspel_filter(src + i, stride, vmode, r));  \
+                src += stride;                                                \
+                dst += stride;                                                \
+            }                                                                 \
+            return;                                                           \
+        }                                                                     \
+    }                                                                         \
+                                                                              \
+    /* Horizontal mode with no vertical mode */                               \
+    for (j = 0; j < 8; j++) {                                                 \
+        for (i = 0; i < 8; i++)                                               \
+            OP(dst[i], vc1_mspel_filter(src + i, 1, hmode, rnd));             \
+        dst += stride;                                                        \
+        src += stride;                                                        \
+    }                                                                         \
 }\
 static void OPNAME ## pixels8x8_c(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int rnd){\
     int i;\
@@ -639,18 +661,18 @@
 
 /* pixel functions - really are entry points to vc1_mspel_mc */
 
-#define PUT_VC1_MSPEL(a, b)\
-static void put_vc1_mspel_mc ## a ## b ##_c(uint8_t *dst,               \
-                                            const uint8_t *src,         \
-                                            ptrdiff_t stride, int rnd)  \
-{                                                                       \
-    put_vc1_mspel_mc(dst, src, stride, a, b, rnd);                      \
-}                                                                       \
-static void avg_vc1_mspel_mc ## a ## b ##_c(uint8_t *dst,               \
-                                            const uint8_t *src,         \
-                                            ptrdiff_t stride, int rnd)  \
-{                                                                       \
-    avg_vc1_mspel_mc(dst, src, stride, a, b, rnd);                      \
+#define PUT_VC1_MSPEL(a, b)                                                   \
+static void put_vc1_mspel_mc ## a ## b ## _c(uint8_t *dst,                    \
+                                             const uint8_t *src,              \
+                                             ptrdiff_t stride, int rnd)       \
+{                                                                             \
+    put_vc1_mspel_mc(dst, src, stride, a, b, rnd);                            \
+}                                                                             \
+static void avg_vc1_mspel_mc ## a ## b ## _c(uint8_t *dst,                    \
+                                             const uint8_t *src,              \
+                                             ptrdiff_t stride, int rnd)       \
+{                                                                             \
+    avg_vc1_mspel_mc(dst, src, stride, a, b, rnd);                            \
 }
 
 PUT_VC1_MSPEL(1, 0)
@@ -672,110 +694,128 @@
 PUT_VC1_MSPEL(2, 3)
 PUT_VC1_MSPEL(3, 3)
 
-static void put_no_rnd_vc1_chroma_mc8_c(uint8_t *dst/*align 8*/, uint8_t *src/*align 1*/, int stride, int h, int x, int y){
-    const int A=(8-x)*(8-y);
-    const int B=(  x)*(8-y);
-    const int C=(8-x)*(  y);
-    const int D=(  x)*(  y);
+#define chroma_mc(a) \
+    ((A * src[a] + B * src[a + 1] + \
+      C * src[stride + a] + D * src[stride + a + 1] + 32 - 4) >> 6)
+static void put_no_rnd_vc1_chroma_mc8_c(uint8_t *dst /* align 8 */,
+                                        uint8_t *src /* align 1 */,
+                                        int stride, int h, int x, int y)
+{
+    const int A = (8 - x) * (8 - y);
+    const int B =     (x) * (8 - y);
+    const int C = (8 - x) *     (y);
+    const int D =     (x) *     (y);
     int i;
 
-    av_assert2(x<8 && y<8 && x>=0 && y>=0);
-
-    for(i=0; i<h; i++)
-    {
-        dst[0] = (A*src[0] + B*src[1] + C*src[stride+0] + D*src[stride+1] + 32 - 4) >> 6;
-        dst[1] = (A*src[1] + B*src[2] + C*src[stride+1] + D*src[stride+2] + 32 - 4) >> 6;
-        dst[2] = (A*src[2] + B*src[3] + C*src[stride+2] + D*src[stride+3] + 32 - 4) >> 6;
-        dst[3] = (A*src[3] + B*src[4] + C*src[stride+3] + D*src[stride+4] + 32 - 4) >> 6;
-        dst[4] = (A*src[4] + B*src[5] + C*src[stride+4] + D*src[stride+5] + 32 - 4) >> 6;
-        dst[5] = (A*src[5] + B*src[6] + C*src[stride+5] + D*src[stride+6] + 32 - 4) >> 6;
-        dst[6] = (A*src[6] + B*src[7] + C*src[stride+6] + D*src[stride+7] + 32 - 4) >> 6;
-        dst[7] = (A*src[7] + B*src[8] + C*src[stride+7] + D*src[stride+8] + 32 - 4) >> 6;
-        dst+= stride;
-        src+= stride;
+    av_assert2(x < 8 && y < 8 && x >= 0 && y >= 0);
+
+    for (i = 0; i < h; i++) {
+        dst[0] = chroma_mc(0);
+        dst[1] = chroma_mc(1);
+        dst[2] = chroma_mc(2);
+        dst[3] = chroma_mc(3);
+        dst[4] = chroma_mc(4);
+        dst[5] = chroma_mc(5);
+        dst[6] = chroma_mc(6);
+        dst[7] = chroma_mc(7);
+        dst += stride;
+        src += stride;
     }
 }
 
-static void put_no_rnd_vc1_chroma_mc4_c(uint8_t *dst, uint8_t *src, int stride, int h, int x, int y){
-    const int A=(8-x)*(8-y);
-    const int B=(  x)*(8-y);
-    const int C=(8-x)*(  y);
-    const int D=(  x)*(  y);
+static void put_no_rnd_vc1_chroma_mc4_c(uint8_t *dst, uint8_t *src,
+                                        int stride, int h, int x, int y)
+{
+    const int A = (8 - x) * (8 - y);
+    const int B =     (x) * (8 - y);
+    const int C = (8 - x) *     (y);
+    const int D =     (x) *     (y);
     int i;
 
-    av_assert2(x<8 && y<8 && x>=0 && y>=0);
+    av_assert2(x < 8 && y < 8 && x >= 0 && y >= 0);
 
-    for(i=0; i<h; i++)
-    {
-        dst[0] = (A*src[0] + B*src[1] + C*src[stride+0] + D*src[stride+1] + 32 - 4) >> 6;
-        dst[1] = (A*src[1] + B*src[2] + C*src[stride+1] + D*src[stride+2] + 32 - 4) >> 6;
-        dst[2] = (A*src[2] + B*src[3] + C*src[stride+2] + D*src[stride+3] + 32 - 4) >> 6;
-        dst[3] = (A*src[3] + B*src[4] + C*src[stride+3] + D*src[stride+4] + 32 - 4) >> 6;
-        dst+= stride;
-        src+= stride;
+    for (i = 0; i < h; i++) {
+        dst[0] = chroma_mc(0);
+        dst[1] = chroma_mc(1);
+        dst[2] = chroma_mc(2);
+        dst[3] = chroma_mc(3);
+        dst += stride;
+        src += stride;
     }
 }
 
-#define avg2(a,b) ((a+b+1)>>1)
-static void avg_no_rnd_vc1_chroma_mc8_c(uint8_t *dst/*align 8*/, uint8_t *src/*align 1*/, int stride, int h, int x, int y){
-    const int A=(8-x)*(8-y);
-    const int B=(  x)*(8-y);
-    const int C=(8-x)*(  y);
-    const int D=(  x)*(  y);
+#define avg2(a, b) (((a) + (b) + 1) >> 1)
+static void avg_no_rnd_vc1_chroma_mc8_c(uint8_t *dst /* align 8 */,
+                                        uint8_t *src /* align 1 */,
+                                        int stride, int h, int x, int y)
+{
+    const int A = (8 - x) * (8 - y);
+    const int B =     (x) * (8 - y);
+    const int C = (8 - x) *     (y);
+    const int D =     (x) *     (y);
     int i;
 
-    av_assert2(x<8 && y<8 && x>=0 && y>=0);
-
-    for(i=0; i<h; i++)
-    {
-        dst[0] = avg2(dst[0], ((A*src[0] + B*src[1] + C*src[stride+0] + D*src[stride+1] + 32 - 4) >> 6));
-        dst[1] = avg2(dst[1], ((A*src[1] + B*src[2] + C*src[stride+1] + D*src[stride+2] + 32 - 4) >> 6));
-        dst[2] = avg2(dst[2], ((A*src[2] + B*src[3] + C*src[stride+2] + D*src[stride+3] + 32 - 4) >> 6));
-        dst[3] = avg2(dst[3], ((A*src[3] + B*src[4] + C*src[stride+3] + D*src[stride+4] + 32 - 4) >> 6));
-        dst[4] = avg2(dst[4], ((A*src[4] + B*src[5] + C*src[stride+4] + D*src[stride+5] + 32 - 4) >> 6));
-        dst[5] = avg2(dst[5], ((A*src[5] + B*src[6] + C*src[stride+5] + D*src[stride+6] + 32 - 4) >> 6));
-        dst[6] = avg2(dst[6], ((A*src[6] + B*src[7] + C*src[stride+6] + D*src[stride+7] + 32 - 4) >> 6));
-        dst[7] = avg2(dst[7], ((A*src[7] + B*src[8] + C*src[stride+7] + D*src[stride+8] + 32 - 4) >> 6));
-        dst+= stride;
-        src+= stride;
+    av_assert2(x < 8 && y < 8 && x >= 0 && y >= 0);
+
+    for (i = 0; i < h; i++) {
+        dst[0] = avg2(dst[0], chroma_mc(0));
+        dst[1] = avg2(dst[1], chroma_mc(1));
+        dst[2] = avg2(dst[2], chroma_mc(2));
+        dst[3] = avg2(dst[3], chroma_mc(3));
+        dst[4] = avg2(dst[4], chroma_mc(4));
+        dst[5] = avg2(dst[5], chroma_mc(5));
+        dst[6] = avg2(dst[6], chroma_mc(6));
+        dst[7] = avg2(dst[7], chroma_mc(7));
+        dst += stride;
+        src += stride;
     }
 }
 
-static void avg_no_rnd_vc1_chroma_mc4_c(uint8_t *dst/*align 8*/, uint8_t *src/*align 1*/, int stride, int h, int x, int y){
-    const int A=(8-x)*(8-y);
-    const int B=(  x)*(8-y);
-    const int C=(8-x)*(  y);
-    const int D=(  x)*(  y);
+static void avg_no_rnd_vc1_chroma_mc4_c(uint8_t *dst /* align 8 */,
+                                        uint8_t *src /* align 1 */,
+                                        int stride, int h, int x, int y)
+{
+    const int A = (8 - x) * (8 - y);
+    const int B = (    x) * (8 - y);
+    const int C = (8 - x) * (    y);
+    const int D = (    x) * (    y);
     int i;
 
-    av_assert2(x<8 && y<8 && x>=0 && y>=0);
+    av_assert2(x < 8 && y < 8 && x >= 0 && y >= 0);
 
-    for(i=0; i<h; i++)
-    {
-        dst[0] = avg2(dst[0], ((A*src[0] + B*src[1] + C*src[stride+0] + D*src[stride+1] + 32 - 4) >> 6));
-        dst[1] = avg2(dst[1], ((A*src[1] + B*src[2] + C*src[stride+1] + D*src[stride+2] + 32 - 4) >> 6));
-        dst[2] = avg2(dst[2], ((A*src[2] + B*src[3] + C*src[stride+2] + D*src[stride+3] + 32 - 4) >> 6));
-        dst[3] = avg2(dst[3], ((A*src[3] + B*src[4] + C*src[stride+3] + D*src[stride+4] + 32 - 4) >> 6));
-        dst+= stride;
-        src+= stride;
+    for (i = 0; i < h; i++) {
+        dst[0] = avg2(dst[0], chroma_mc(0));
+        dst[1] = avg2(dst[1], chroma_mc(1));
+        dst[2] = avg2(dst[2], chroma_mc(2));
+        dst[3] = avg2(dst[3], chroma_mc(3));
+        dst += stride;
+        src += stride;
     }
 }
 
 #if CONFIG_WMV3IMAGE_DECODER || CONFIG_VC1IMAGE_DECODER
 
-static void sprite_h_c(uint8_t *dst, const uint8_t *src, int offset, int advance, int count)
+static void sprite_h_c(uint8_t *dst, const uint8_t *src, int offset,
+                       int advance, int count)
 {
     while (count--) {
-        int a = src[(offset >> 16)    ];
+        int a = src[(offset >> 16)];
         int b = src[(offset >> 16) + 1];
-        *dst++ = a + ((b - a) * (offset&0xFFFF) >> 16);
+        *dst++  = a + ((b - a) * (offset & 0xFFFF) >> 16);
         offset += advance;
     }
 }
 
-static av_always_inline void sprite_v_template(uint8_t *dst, const uint8_t *src1a, const uint8_t *src1b, int offset1,
-                                            int two_sprites, const uint8_t *src2a, const uint8_t *src2b, int offset2,
-                                            int alpha, int scaled, int width)
+static av_always_inline void sprite_v_template(uint8_t *dst,
+                                               const uint8_t *src1a,
+                                               const uint8_t *src1b,
+                                               int offset1,
+                                               int two_sprites,
+                                               const uint8_t *src2a,
+                                               const uint8_t *src2b,
+                                               int offset2,
+                                               int alpha, int scaled,
+                                               int width)
 {
     int a1, b1, a2, b2;
     while (width--) {
@@ -796,61 +836,80 @@
     }
 }
 
-static void sprite_v_single_c(uint8_t *dst, const uint8_t *src1a, const uint8_t *src1b, int offset, int width)
+static void sprite_v_single_c(uint8_t *dst, const uint8_t *src1a,
+                              const uint8_t *src1b,
+                              int offset, int width)
 {
     sprite_v_template(dst, src1a, src1b, offset, 0, NULL, NULL, 0, 0, 1, width);
 }
 
-static void sprite_v_double_noscale_c(uint8_t *dst, const uint8_t *src1a, const uint8_t *src2a, int alpha, int width)
+static void sprite_v_double_noscale_c(uint8_t *dst, const uint8_t *src1a,
+                                      const uint8_t *src2a,
+                                      int alpha, int width)
 {
     sprite_v_template(dst, src1a, NULL, 0, 1, src2a, NULL, 0, alpha, 0, width);
 }
 
-static void sprite_v_double_onescale_c(uint8_t *dst, const uint8_t *src1a, const uint8_t *src1b, int offset1,
-                                                     const uint8_t *src2a, int alpha, int width)
-{
-    sprite_v_template(dst, src1a, src1b, offset1, 1, src2a, NULL, 0, alpha, 1, width);
-}
-
-static void sprite_v_double_twoscale_c(uint8_t *dst, const uint8_t *src1a, const uint8_t *src1b, int offset1,
-                                                     const uint8_t *src2a, const uint8_t *src2b, int offset2,
+static void sprite_v_double_onescale_c(uint8_t *dst,
+                                       const uint8_t *src1a,
+                                       const uint8_t *src1b,
+                                       int offset1,
+                                       const uint8_t *src2a,
                                        int alpha, int width)
 {
-    sprite_v_template(dst, src1a, src1b, offset1, 1, src2a, src2b, offset2, alpha, 2, width);
+    sprite_v_template(dst, src1a, src1b, offset1, 1, src2a, NULL, 0, alpha, 1,
+                      width);
+}
+
+static void sprite_v_double_twoscale_c(uint8_t *dst,
+                                       const uint8_t *src1a,
+                                       const uint8_t *src1b,
+                                       int offset1,
+                                       const uint8_t *src2a,
+                                       const uint8_t *src2b,
+                                       int offset2,
+                                       int alpha,
+                                       int width)
+{
+    sprite_v_template(dst, src1a, src1b, offset1, 1, src2a, src2b, offset2,
+                      alpha, 2, width);
 }
 
-#endif
+#endif /* CONFIG_WMV3IMAGE_DECODER || CONFIG_VC1IMAGE_DECODER */
 
-av_cold void ff_vc1dsp_init(VC1DSPContext* dsp) {
-    dsp->vc1_inv_trans_8x8 = vc1_inv_trans_8x8_c;
-    dsp->vc1_inv_trans_4x8 = vc1_inv_trans_4x8_c;
-    dsp->vc1_inv_trans_8x4 = vc1_inv_trans_8x4_c;
-    dsp->vc1_inv_trans_4x4 = vc1_inv_trans_4x4_c;
+av_cold void ff_vc1dsp_init(VC1DSPContext *dsp)
+{
+    dsp->vc1_inv_trans_8x8    = vc1_inv_trans_8x8_c;
+    dsp->vc1_inv_trans_4x8    = vc1_inv_trans_4x8_c;
+    dsp->vc1_inv_trans_8x4    = vc1_inv_trans_8x4_c;
+    dsp->vc1_inv_trans_4x4    = vc1_inv_trans_4x4_c;
     dsp->vc1_inv_trans_8x8_dc = vc1_inv_trans_8x8_dc_c;
     dsp->vc1_inv_trans_4x8_dc = vc1_inv_trans_4x8_dc_c;
     dsp->vc1_inv_trans_8x4_dc = vc1_inv_trans_8x4_dc_c;
     dsp->vc1_inv_trans_4x4_dc = vc1_inv_trans_4x4_dc_c;
-    dsp->vc1_h_overlap = vc1_h_overlap_c;
-    dsp->vc1_v_overlap = vc1_v_overlap_c;
-    dsp->vc1_h_s_overlap = vc1_h_s_overlap_c;
-    dsp->vc1_v_s_overlap = vc1_v_s_overlap_c;
-    dsp->vc1_v_loop_filter4 = vc1_v_loop_filter4_c;
-    dsp->vc1_h_loop_filter4 = vc1_h_loop_filter4_c;
-    dsp->vc1_v_loop_filter8 = vc1_v_loop_filter8_c;
-    dsp->vc1_h_loop_filter8 = vc1_h_loop_filter8_c;
-    dsp->vc1_v_loop_filter16 = vc1_v_loop_filter16_c;
-    dsp->vc1_h_loop_filter16 = vc1_h_loop_filter16_c;
-
-    dsp->put_vc1_mspel_pixels_tab[ 0] = put_pixels8x8_c;
-    dsp->put_vc1_mspel_pixels_tab[ 1] = put_vc1_mspel_mc10_c;
-    dsp->put_vc1_mspel_pixels_tab[ 2] = put_vc1_mspel_mc20_c;
-    dsp->put_vc1_mspel_pixels_tab[ 3] = put_vc1_mspel_mc30_c;
-    dsp->put_vc1_mspel_pixels_tab[ 4] = put_vc1_mspel_mc01_c;
-    dsp->put_vc1_mspel_pixels_tab[ 5] = put_vc1_mspel_mc11_c;
-    dsp->put_vc1_mspel_pixels_tab[ 6] = put_vc1_mspel_mc21_c;
-    dsp->put_vc1_mspel_pixels_tab[ 7] = put_vc1_mspel_mc31_c;
-    dsp->put_vc1_mspel_pixels_tab[ 8] = put_vc1_mspel_mc02_c;
-    dsp->put_vc1_mspel_pixels_tab[ 9] = put_vc1_mspel_mc12_c;
+
+    dsp->vc1_h_overlap        = vc1_h_overlap_c;
+    dsp->vc1_v_overlap        = vc1_v_overlap_c;
+    dsp->vc1_h_s_overlap      = vc1_h_s_overlap_c;
+    dsp->vc1_v_s_overlap      = vc1_v_s_overlap_c;
+
+    dsp->vc1_v_loop_filter4   = vc1_v_loop_filter4_c;
+    dsp->vc1_h_loop_filter4   = vc1_h_loop_filter4_c;
+    dsp->vc1_v_loop_filter8   = vc1_v_loop_filter8_c;
+    dsp->vc1_h_loop_filter8   = vc1_h_loop_filter8_c;
+    dsp->vc1_v_loop_filter16  = vc1_v_loop_filter16_c;
+    dsp->vc1_h_loop_filter16  = vc1_h_loop_filter16_c;
+
+    dsp->put_vc1_mspel_pixels_tab[0]  = put_pixels8x8_c;
+    dsp->put_vc1_mspel_pixels_tab[1]  = put_vc1_mspel_mc10_c;
+    dsp->put_vc1_mspel_pixels_tab[2]  = put_vc1_mspel_mc20_c;
+    dsp->put_vc1_mspel_pixels_tab[3]  = put_vc1_mspel_mc30_c;
+    dsp->put_vc1_mspel_pixels_tab[4]  = put_vc1_mspel_mc01_c;
+    dsp->put_vc1_mspel_pixels_tab[5]  = put_vc1_mspel_mc11_c;
+    dsp->put_vc1_mspel_pixels_tab[6]  = put_vc1_mspel_mc21_c;
+    dsp->put_vc1_mspel_pixels_tab[7]  = put_vc1_mspel_mc31_c;
+    dsp->put_vc1_mspel_pixels_tab[8]  = put_vc1_mspel_mc02_c;
+    dsp->put_vc1_mspel_pixels_tab[9]  = put_vc1_mspel_mc12_c;
     dsp->put_vc1_mspel_pixels_tab[10] = put_vc1_mspel_mc22_c;
     dsp->put_vc1_mspel_pixels_tab[11] = put_vc1_mspel_mc32_c;
     dsp->put_vc1_mspel_pixels_tab[12] = put_vc1_mspel_mc03_c;
@@ -858,16 +917,16 @@
     dsp->put_vc1_mspel_pixels_tab[14] = put_vc1_mspel_mc23_c;
     dsp->put_vc1_mspel_pixels_tab[15] = put_vc1_mspel_mc33_c;
 
-    dsp->avg_vc1_mspel_pixels_tab[ 0] = avg_pixels8x8_c;
-    dsp->avg_vc1_mspel_pixels_tab[ 1] = avg_vc1_mspel_mc10_c;
-    dsp->avg_vc1_mspel_pixels_tab[ 2] = avg_vc1_mspel_mc20_c;
-    dsp->avg_vc1_mspel_pixels_tab[ 3] = avg_vc1_mspel_mc30_c;
-    dsp->avg_vc1_mspel_pixels_tab[ 4] = avg_vc1_mspel_mc01_c;
-    dsp->avg_vc1_mspel_pixels_tab[ 5] = avg_vc1_mspel_mc11_c;
-    dsp->avg_vc1_mspel_pixels_tab[ 6] = avg_vc1_mspel_mc21_c;
-    dsp->avg_vc1_mspel_pixels_tab[ 7] = avg_vc1_mspel_mc31_c;
-    dsp->avg_vc1_mspel_pixels_tab[ 8] = avg_vc1_mspel_mc02_c;
-    dsp->avg_vc1_mspel_pixels_tab[ 9] = avg_vc1_mspel_mc12_c;
+    dsp->avg_vc1_mspel_pixels_tab[0]  = avg_pixels8x8_c;
+    dsp->avg_vc1_mspel_pixels_tab[1]  = avg_vc1_mspel_mc10_c;
+    dsp->avg_vc1_mspel_pixels_tab[2]  = avg_vc1_mspel_mc20_c;
+    dsp->avg_vc1_mspel_pixels_tab[3]  = avg_vc1_mspel_mc30_c;
+    dsp->avg_vc1_mspel_pixels_tab[4]  = avg_vc1_mspel_mc01_c;
+    dsp->avg_vc1_mspel_pixels_tab[5]  = avg_vc1_mspel_mc11_c;
+    dsp->avg_vc1_mspel_pixels_tab[6]  = avg_vc1_mspel_mc21_c;
+    dsp->avg_vc1_mspel_pixels_tab[7]  = avg_vc1_mspel_mc31_c;
+    dsp->avg_vc1_mspel_pixels_tab[8]  = avg_vc1_mspel_mc02_c;
+    dsp->avg_vc1_mspel_pixels_tab[9]  = avg_vc1_mspel_mc12_c;
     dsp->avg_vc1_mspel_pixels_tab[10] = avg_vc1_mspel_mc22_c;
     dsp->avg_vc1_mspel_pixels_tab[11] = avg_vc1_mspel_mc32_c;
     dsp->avg_vc1_mspel_pixels_tab[12] = avg_vc1_mspel_mc03_c;
@@ -875,19 +934,23 @@
     dsp->avg_vc1_mspel_pixels_tab[14] = avg_vc1_mspel_mc23_c;
     dsp->avg_vc1_mspel_pixels_tab[15] = avg_vc1_mspel_mc33_c;
 
-    dsp->put_no_rnd_vc1_chroma_pixels_tab[0]= put_no_rnd_vc1_chroma_mc8_c;
-    dsp->avg_no_rnd_vc1_chroma_pixels_tab[0]= avg_no_rnd_vc1_chroma_mc8_c;
+    dsp->put_no_rnd_vc1_chroma_pixels_tab[0] = put_no_rnd_vc1_chroma_mc8_c;
+    dsp->avg_no_rnd_vc1_chroma_pixels_tab[0] = avg_no_rnd_vc1_chroma_mc8_c;
     dsp->put_no_rnd_vc1_chroma_pixels_tab[1] = put_no_rnd_vc1_chroma_mc4_c;
     dsp->avg_no_rnd_vc1_chroma_pixels_tab[1] = avg_no_rnd_vc1_chroma_mc4_c;
 
 #if CONFIG_WMV3IMAGE_DECODER || CONFIG_VC1IMAGE_DECODER
-    dsp->sprite_h = sprite_h_c;
-    dsp->sprite_v_single = sprite_v_single_c;
-    dsp->sprite_v_double_noscale = sprite_v_double_noscale_c;
+    dsp->sprite_h                 = sprite_h_c;
+    dsp->sprite_v_single          = sprite_v_single_c;
+    dsp->sprite_v_double_noscale  = sprite_v_double_noscale_c;
     dsp->sprite_v_double_onescale = sprite_v_double_onescale_c;
     dsp->sprite_v_double_twoscale = sprite_v_double_twoscale_c;
-#endif
+#endif /* CONFIG_WMV3IMAGE_DECODER || CONFIG_VC1IMAGE_DECODER */
 
+    if (ARCH_AARCH64)
+        ff_vc1dsp_init_aarch64(dsp);
+    if (ARCH_ARM)
+        ff_vc1dsp_init_arm(dsp);
     if (ARCH_PPC)
         ff_vc1dsp_init_ppc(dsp);
     if (ARCH_X86)

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/vc1dsp.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/vc1dsp.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/vda.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/vda.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/vda_h264.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/vda_h264.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/vda_h264_dec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/vda_h264_dec.c Changed

@@ -56,6 +56,15 @@
     int h264_initialized;
     struct vda_context vda_ctx;
     enum AVPixelFormat pix_fmt;
+
+    /* for backing-up fields set by user.
+     * we have to gain full control of such fields here */
+    void *hwaccel_context;
+    enum AVPixelFormat (*get_format)(struct AVCodecContext *s, const enum AVPixelFormat * fmt);
+    int (*get_buffer2)(struct AVCodecContext *s, AVFrame *frame, int flags);
+#if FF_API_GET_BUFFER
+    int (*get_buffer)(struct AVCodecContext *c, AVFrame *pic);
+#endif
 } VDADecoderContext;
 
 static enum AVPixelFormat get_format(struct AVCodecContext *avctx,
@@ -90,6 +99,32 @@
     return 0;
 }
 
+static inline void set_context(AVCodecContext *avctx)
+{
+    VDADecoderContext *ctx = avctx->priv_data;
+    ctx->hwaccel_context = avctx->hwaccel_context;
+    avctx->hwaccel_context = &ctx->vda_ctx;
+    ctx->get_format = avctx->get_format;
+    avctx->get_format = get_format;
+    ctx->get_buffer2 = avctx->get_buffer2;
+    avctx->get_buffer2 = get_buffer2;
+#if FF_API_GET_BUFFER
+    ctx->get_buffer = avctx->get_buffer;
+    avctx->get_buffer = NULL;
+#endif
+}
+
+static inline void restore_context(AVCodecContext *avctx)
+{
+    VDADecoderContext *ctx = avctx->priv_data;
+    avctx->hwaccel_context = ctx->hwaccel_context;
+    avctx->get_format = ctx->get_format;
+    avctx->get_buffer2 = ctx->get_buffer2;
+#if FF_API_GET_BUFFER
+    avctx->get_buffer = ctx->get_buffer;
+#endif
+}
+
 static int vdadec_decode(AVCodecContext *avctx,
         void *data, int *got_frame, AVPacket *avpkt)
 {
@@ -97,7 +132,9 @@
     AVFrame *pic = data;
     int ret;
 
+    set_context(avctx);
     ret = ff_h264_decoder.decode(avctx, data, got_frame, avpkt);
+    restore_context(avctx);
     if (*got_frame) {
         AVBufferRef *buffer = pic->buf[0];
         VDABufferContext *context = av_buffer_get_opaque(buffer);
@@ -130,8 +167,11 @@
     /* release buffers and decoder */
     ff_vda_destroy_decoder(&ctx->vda_ctx);
     /* close H.264 decoder */
-    if (ctx->h264_initialized)
+    if (ctx->h264_initialized) {
+        set_context(avctx);
         ff_h264_decoder.close(avctx);
+        restore_context(avctx);
+    }
     return 0;
 }
 
@@ -140,7 +180,7 @@
     VDADecoderContext *ctx = avctx->priv_data;
     struct vda_context *vda_ctx = &ctx->vda_ctx;
     OSStatus status;
-    int ret;
+    int ret, i;
 
     ctx->h264_initialized = 0;
 
@@ -184,24 +224,27 @@
                 "Failed to init VDA decoder: %d.\n", status);
         goto failed;
     }
-    avctx->hwaccel_context = vda_ctx;
-
-    /* changes callback functions */
-    avctx->get_format = get_format;
-    avctx->get_buffer2 = get_buffer2;
-#if FF_API_GET_BUFFER
-    // force the old get_buffer to be empty
-    avctx->get_buffer = NULL;
-#endif
 
     /* init H.264 decoder */
+    set_context(avctx);
     ret = ff_h264_decoder.init(avctx);
+    restore_context(avctx);
     if (ret < 0) {
         av_log(avctx, AV_LOG_ERROR, "Failed to open H.264 decoder.\n");
         goto failed;
     }
     ctx->h264_initialized = 1;
 
+    for (i = 0; i < MAX_SPS_COUNT; i++) {
+        SPS *sps = ctx->h264ctx.sps_buffers[i];
+        if (sps && (sps->bit_depth_luma != 8 ||
+                sps->chroma_format_idc == 2 ||
+                sps->chroma_format_idc == 3)) {
+            av_log(avctx, AV_LOG_ERROR, "Format is not supported.\n");
+            goto failed;
+        }
+    }
+
     return 0;
 
 failed:
@@ -211,7 +254,9 @@
 
 static void vdadec_flush(AVCodecContext *avctx)
 {
-    return ff_h264_decoder.flush(avctx);
+    set_context(avctx);
+    ff_h264_decoder.flush(avctx);
+    restore_context(avctx);
 }
 
 AVCodec ff_h264_vda_decoder = {

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/vdpau.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/vdpau.c Changed

@@ -40,7 +40,7 @@
 
 AVVDPAUContext *av_alloc_vdpaucontext(void)
 {
-    return av_mallocz(sizeof(AVVDPAUContext));
+    return av_vdpau_alloc_context();
 }
 
 MAKE_ACCESSORS(AVVDPAUContext, vdpau_hwaccel, AVVDPAU_Render2, render2)
@@ -69,6 +69,15 @@
     struct vdpau_picture_context *pic_ctx = pic->hwaccel_picture_private;
     VdpVideoSurface surf = ff_vdpau_get_surface_id(pic);
 
+#if FF_API_BUFS_VDPAU
+FF_DISABLE_DEPRECATION_WARNINGS
+    hwctx->info = pic_ctx->info;
+    hwctx->bitstream_buffers = pic_ctx->bitstream_buffers;
+    hwctx->bitstream_buffers_used = pic_ctx->bitstream_buffers_used;
+    hwctx->bitstream_buffers_allocated = pic_ctx->bitstream_buffers_allocated;
+FF_ENABLE_DEPRECATION_WARNINGS
+#endif
+
     if (!hwctx->render) {
         res = hwctx->render2(avctx, &pic->f, (void *)&pic_ctx->info,
                              pic_ctx->bitstream_buffers_used, pic_ctx->bitstream_buffers);
@@ -79,6 +88,14 @@
     ff_mpeg_draw_horiz_band(s, 0, s->avctx->height);
     av_freep(&pic_ctx->bitstream_buffers);
 
+#if FF_API_BUFS_VDPAU
+FF_DISABLE_DEPRECATION_WARNINGS
+    hwctx->bitstream_buffers = NULL;
+    hwctx->bitstream_buffers_used = 0;
+    hwctx->bitstream_buffers_allocated = 0;
+FF_ENABLE_DEPRECATION_WARNINGS
+#endif
+
     return res;
 }
 #endif
@@ -345,7 +362,7 @@
     render->info.vc1.range_mapuv        = v->range_mapuv;
     /* Specific to simple/main profile only */
     render->info.vc1.multires           = v->multires;
-    render->info.vc1.syncmarker         = v->s.resync_marker;
+    render->info.vc1.syncmarker         = v->resync_marker;
     render->info.vc1.rangered           = v->rangered | (v->rangeredfrm << 1);
     render->info.vc1.maxbframes         = v->s.max_b_frames;
 
@@ -383,9 +400,10 @@
 #endif /* (CONFIG_VC1_VDPAU_DECODER */
 
 #if CONFIG_MPEG4_VDPAU_DECODER
-void ff_vdpau_mpeg4_decode_picture(MpegEncContext *s, const uint8_t *buf,
+void ff_vdpau_mpeg4_decode_picture(Mpeg4DecContext *ctx, const uint8_t *buf,
                                    int buf_size)
 {
+    MpegEncContext *s = &ctx->m;
     struct vdpau_render_state *render, *last, *next;
     int i;
 
@@ -403,7 +421,7 @@
     render->info.mpeg4.vop_coding_type                   = 0;
     render->info.mpeg4.vop_fcode_forward                 = s->f_code;
     render->info.mpeg4.vop_fcode_backward                = s->b_code;
-    render->info.mpeg4.resync_marker_disable             = !s->resync_marker;
+    render->info.mpeg4.resync_marker_disable             = !ctx->resync_marker;
     render->info.mpeg4.interlaced                        = !s->progressive_sequence;
     render->info.mpeg4.quant_type                        = s->mpeg_quant;
     render->info.mpeg4.quarter_sample                    = s->quarter_sample;
@@ -438,4 +456,52 @@
 }
 #endif /* CONFIG_MPEG4_VDPAU_DECODER */
 
+int av_vdpau_get_profile(AVCodecContext *avctx, VdpDecoderProfile *profile)
+{
+#define PROFILE(prof)       \
+do {                        \
+    *profile = prof;        \
+    return 0;               \
+} while (0)
+
+    switch (avctx->codec_id) {
+    case AV_CODEC_ID_MPEG1VIDEO:               PROFILE(VDP_DECODER_PROFILE_MPEG1);
+    case AV_CODEC_ID_MPEG2VIDEO:
+        switch (avctx->profile) {
+        case FF_PROFILE_MPEG2_MAIN:            PROFILE(VDP_DECODER_PROFILE_MPEG2_MAIN);
+        case FF_PROFILE_MPEG2_SIMPLE:          PROFILE(VDP_DECODER_PROFILE_MPEG2_SIMPLE);
+        default:                               return AVERROR(EINVAL);
+        }
+    case AV_CODEC_ID_H263:                     PROFILE(VDP_DECODER_PROFILE_MPEG4_PART2_ASP);
+    case AV_CODEC_ID_MPEG4:
+        switch (avctx->profile) {
+        case FF_PROFILE_MPEG4_SIMPLE:          PROFILE(VDP_DECODER_PROFILE_MPEG4_PART2_SP);
+        case FF_PROFILE_MPEG4_ADVANCED_SIMPLE: PROFILE(VDP_DECODER_PROFILE_MPEG4_PART2_ASP);
+        default:                               return AVERROR(EINVAL);
+        }
+    case AV_CODEC_ID_H264:
+        switch (avctx->profile) {
+        case FF_PROFILE_H264_CONSTRAINED_BASELINE:
+        case FF_PROFILE_H264_BASELINE:         PROFILE(VDP_DECODER_PROFILE_H264_BASELINE);
+        case FF_PROFILE_H264_MAIN:             PROFILE(VDP_DECODER_PROFILE_H264_MAIN);
+        case FF_PROFILE_H264_HIGH:             PROFILE(VDP_DECODER_PROFILE_H264_HIGH);
+        default:                               return AVERROR(EINVAL);
+        }
+    case AV_CODEC_ID_WMV3:
+    case AV_CODEC_ID_VC1:
+        switch (avctx->profile) {
+        case FF_PROFILE_VC1_SIMPLE:            PROFILE(VDP_DECODER_PROFILE_VC1_SIMPLE);
+        case FF_PROFILE_VC1_MAIN:              PROFILE(VDP_DECODER_PROFILE_VC1_MAIN);
+        case FF_PROFILE_VC1_ADVANCED:          PROFILE(VDP_DECODER_PROFILE_VC1_ADVANCED);
+        default:                               return AVERROR(EINVAL);
+        }
+    }
+    return AVERROR(EINVAL);
+}
+
+AVVDPAUContext *av_vdpau_alloc_context(void)
+{
+    return av_mallocz(sizeof(AVVDPAUContext));
+}
+
 /* @}*/

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/vdpau.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/vdpau.h Changed

@@ -54,12 +54,8 @@
 #include "libavutil/avconfig.h"
 #include "libavutil/attributes.h"
 
-#ifndef FF_API_CAP_VDPAU
-#define FF_API_CAP_VDPAU 1
-#endif
-#ifndef FF_API_BUFS_VDPAU
-#define FF_API_BUFS_VDPAU 1
-#endif
+#include "avcodec.h"
+#include "version.h"
 
 #if FF_API_BUFS_VDPAU
 union AVVDPAUPictureInfo {
@@ -86,6 +82,10 @@
  * during initialization or through each AVCodecContext.get_buffer()
  * function call. In any case, they must be valid prior to calling
  * decoding functions.
+ *
+ * The size of this structure is not a part of the public ABI and must not
+ * be used outside of libavcodec. Use av_vdpau_alloc_context() to allocate an
+ * AVVDPAUContext.
  */
 typedef struct AVVDPAUContext {
     /**
@@ -149,6 +149,26 @@
 AVVDPAU_Render2 av_vdpau_hwaccel_get_render2(const AVVDPAUContext *);
 void av_vdpau_hwaccel_set_render2(AVVDPAUContext *, AVVDPAU_Render2);
 
+/**
+ * Allocate an AVVDPAUContext.
+ *
+ * @return Newly-allocated AVVDPAUContext or NULL on failure.
+ */
+AVVDPAUContext *av_vdpau_alloc_context(void);
+
+/**
+ * Get a decoder profile that should be used for initializing a VDPAU decoder.
+ * Should be called from the AVCodecContext.get_format() callback.
+ *
+ * @param avctx the codec context being used for decoding the stream
+ * @param profile a pointer into which the result will be written on success.
+ *                The contents of profile are undefined if this function returns
+ *                an error.
+ *
+ * @return 0 on success (non-negative), a negative AVERROR on failure.
+ */
+int av_vdpau_get_profile(AVCodecContext *avctx, VdpDecoderProfile *profile);
+
 #if FF_API_CAP_VDPAU
 /** @brief The videoSurface is used for rendering. */
 #define FF_VDPAU_STATE_USED_FOR_RENDER 1

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/vdpau_h264.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/vdpau_h264.c Changed

@@ -195,6 +195,15 @@
     struct vdpau_picture_context *pic_ctx = pic->hwaccel_picture_private;
     VdpVideoSurface surf = ff_vdpau_get_surface_id(pic);
 
+#if FF_API_BUFS_VDPAU
+FF_DISABLE_DEPRECATION_WARNINGS
+    hwctx->info = pic_ctx->info;
+    hwctx->bitstream_buffers = pic_ctx->bitstream_buffers;
+    hwctx->bitstream_buffers_used = pic_ctx->bitstream_buffers_used;
+    hwctx->bitstream_buffers_allocated = pic_ctx->bitstream_buffers_allocated;
+FF_ENABLE_DEPRECATION_WARNINGS
+#endif
+
     if (!hwctx->render) {
         res = hwctx->render2(avctx, &pic->f, (void *)&pic_ctx->info,
                              pic_ctx->bitstream_buffers_used, pic_ctx->bitstream_buffers);
@@ -205,6 +214,14 @@
     ff_h264_draw_horiz_band(h, 0, h->avctx->height);
     av_freep(&pic_ctx->bitstream_buffers);
 
+#if FF_API_BUFS_VDPAU
+FF_DISABLE_DEPRECATION_WARNINGS
+    hwctx->bitstream_buffers = NULL;
+    hwctx->bitstream_buffers_used = 0;
+    hwctx->bitstream_buffers_allocated = 0;
+FF_ENABLE_DEPRECATION_WARNINGS
+#endif
+
     return res;
 }

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/vdpau_internal.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/vdpau_internal.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/vdpau_mpeg4.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/vdpau_mpeg4.c Changed

@@ -24,13 +24,15 @@
 #include <vdpau/vdpau.h>
 
 #include "avcodec.h"
+#include "mpeg4video.h"
 #include "vdpau.h"
 #include "vdpau_internal.h"
 
 static int vdpau_mpeg4_start_frame(AVCodecContext *avctx,
                                    const uint8_t *buffer, uint32_t size)
 {
-    MpegEncContext * const s = avctx->priv_data;
+    Mpeg4DecContext *ctx = avctx->priv_data;
+    MpegEncContext * const s = &ctx->m;
     Picture *pic             = s->current_picture_ptr;
     struct vdpau_picture_context *pic_ctx = pic->hwaccel_picture_private;
     VdpPictureInfoMPEG4Part2 *info = &pic_ctx->info.mpeg4;
@@ -62,7 +64,7 @@
     info->vop_time_increment_resolution     = s->avctx->time_base.den;
     info->vop_fcode_forward                 = s->f_code;
     info->vop_fcode_backward                = s->b_code;
-    info->resync_marker_disable             = !s->resync_marker;
+    info->resync_marker_disable             = !ctx->resync_marker;
     info->interlaced                        = !s->progressive_sequence;
     info->quant_type                        = s->mpeg_quant;
     info->quarter_sample                    = s->quarter_sample;

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/vdpau_vc1.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/vdpau_vc1.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/version.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/version.h Changed

@@ -26,11 +26,11 @@
  * Libavcodec version macros.
  */
 
-#include "libavutil/avutil.h"
+#include "libavutil/version.h"
 
 #define LIBAVCODEC_VERSION_MAJOR 55
-#define LIBAVCODEC_VERSION_MINOR  39
-#define LIBAVCODEC_VERSION_MICRO 100
+#define LIBAVCODEC_VERSION_MINOR  52
+#define LIBAVCODEC_VERSION_MICRO 102
 
 #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
                                                LIBAVCODEC_VERSION_MINOR, \
@@ -51,19 +51,9 @@
 #ifndef FF_API_REQUEST_CHANNELS
 #define FF_API_REQUEST_CHANNELS (LIBAVCODEC_VERSION_MAJOR < 56)
 #endif
-#ifndef FF_API_ALLOC_CONTEXT
-#define FF_API_ALLOC_CONTEXT    (LIBAVCODEC_VERSION_MAJOR < 55)
-#endif
-#ifndef FF_API_AVCODEC_OPEN
-#define FF_API_AVCODEC_OPEN     (LIBAVCODEC_VERSION_MAJOR < 55)
-#endif
 #ifndef FF_API_OLD_DECODE_AUDIO
 #define FF_API_OLD_DECODE_AUDIO (LIBAVCODEC_VERSION_MAJOR < 56)
 #endif
-#ifndef FF_API_OLD_TIMECODE
-#define FF_API_OLD_TIMECODE (LIBAVCODEC_VERSION_MAJOR < 55)
-#endif
-
 #ifndef FF_API_OLD_ENCODE_AUDIO
 #define FF_API_OLD_ENCODE_AUDIO (LIBAVCODEC_VERSION_MAJOR < 56)
 #endif
@@ -73,8 +63,11 @@
 #ifndef FF_API_CODEC_ID
 #define FF_API_CODEC_ID          (LIBAVCODEC_VERSION_MAJOR < 56)
 #endif
+#ifndef FF_API_AUDIO_CONVERT
+#define FF_API_AUDIO_CONVERT     (LIBAVCODEC_VERSION_MAJOR < 56)
+#endif
 #ifndef FF_API_AVCODEC_RESAMPLE
-#define FF_API_AVCODEC_RESAMPLE  (LIBAVCODEC_VERSION_MAJOR < 56)
+#define FF_API_AVCODEC_RESAMPLE  FF_API_AUDIO_CONVERT
 #endif
 #ifndef FF_API_DEINTERLACE
 #define FF_API_DEINTERLACE       (LIBAVCODEC_VERSION_MAJOR < 56)
@@ -100,5 +93,53 @@
 #ifndef FF_API_VOXWARE
 #define FF_API_VOXWARE           (LIBAVCODEC_VERSION_MAJOR < 56)
 #endif
+#ifndef FF_API_SET_DIMENSIONS
+#define FF_API_SET_DIMENSIONS    (LIBAVCODEC_VERSION_MAJOR < 56)
+#endif
+#ifndef FF_API_DEBUG_MV
+#define FF_API_DEBUG_MV          (LIBAVCODEC_VERSION_MAJOR < 56)
+#endif
+#ifndef FF_API_AC_VLC
+#define FF_API_AC_VLC            (LIBAVCODEC_VERSION_MAJOR < 56)
+#endif
+#ifndef FF_API_OLD_MSMPEG4
+#define FF_API_OLD_MSMPEG4       (LIBAVCODEC_VERSION_MAJOR < 56)
+#endif
+#ifndef FF_API_ASPECT_EXTENDED
+#define FF_API_ASPECT_EXTENDED   (LIBAVCODEC_VERSION_MAJOR < 56)
+#endif
+#ifndef FF_API_THREAD_OPAQUE
+#define FF_API_THREAD_OPAQUE     (LIBAVCODEC_VERSION_MAJOR < 56)
+#endif
+#ifndef FF_API_CODEC_PKT
+#define FF_API_CODEC_PKT         (LIBAVCODEC_VERSION_MAJOR < 56)
+#endif
+#ifndef FF_API_ARCH_ALPHA
+#define FF_API_ARCH_ALPHA        (LIBAVCODEC_VERSION_MAJOR < 56)
+#endif
+#ifndef FF_API_XVMC
+#define FF_API_XVMC              (LIBAVCODEC_VERSION_MAJOR < 56)
+#endif
+#ifndef FF_API_ERROR_RATE
+#define FF_API_ERROR_RATE        (LIBAVCODEC_VERSION_MAJOR < 56)
+#endif
+#ifndef FF_API_QSCALE_TYPE
+#define FF_API_QSCALE_TYPE       (LIBAVCODEC_VERSION_MAJOR < 56)
+#endif
+#ifndef FF_API_MB_TYPE
+#define FF_API_MB_TYPE           (LIBAVCODEC_VERSION_MAJOR < 56)
+#endif
+#ifndef FF_API_MAX_BFRAMES
+#define FF_API_MAX_BFRAMES       (LIBAVCODEC_VERSION_MAJOR < 56)
+#endif
+#ifndef FF_API_FAST_MALLOC
+#define FF_API_FAST_MALLOC       (LIBAVCODEC_VERSION_MAJOR < 56)
+#endif
+#ifndef FF_API_NEG_LINESIZES
+#define FF_API_NEG_LINESIZES     (LIBAVCODEC_VERSION_MAJOR < 56)
+#endif
+#ifndef FF_API_EMU_EDGE
+#define FF_API_EMU_EDGE          (LIBAVCODEC_VERSION_MAJOR < 56)
+#endif
 
 #endif /* AVCODEC_VERSION_H */

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/videodsp.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/videodsp.h Changed

@@ -30,8 +30,8 @@
 #include <stdint.h>
 
 #define EMULATED_EDGE(depth) \
-void ff_emulated_edge_mc_ ## depth(uint8_t *dst, ptrdiff_t dst_stride, \
-                                   const uint8_t *src, ptrdiff_t src_stride, \
+void ff_emulated_edge_mc_ ## depth(uint8_t *dst, const uint8_t *src, \
+                                   ptrdiff_t dst_stride, ptrdiff_t src_stride, \
                                    int block_w, int block_h,\
                                    int src_x, int src_y, int w, int h);
 
@@ -47,8 +47,10 @@
      * @param dst_stride number of bytes between 2 vertically adjacent samples
      *                   in destination buffer
      * @param src source buffer
-     * @param src_stride number of bytes between 2 vertically adjacent samples
-     *                   in source buffer
+     * @param dst_linesize number of bytes between 2 vertically adjacent
+     *                     samples in the destination buffer
+     * @param src_linesize number of bytes between 2 vertically adjacent
+     *                     samples in both the source buffer
      * @param block_w width of block
      * @param block_h height of block
      * @param src_x x coordinate of the top left sample of the block in the
@@ -58,8 +60,9 @@
      * @param w width of the source buffer
      * @param h height of the source buffer
      */
-    void (*emulated_edge_mc)(uint8_t *dst, ptrdiff_t dst_stride,
-                             const uint8_t *src, ptrdiff_t src_stride,
+    void (*emulated_edge_mc)(uint8_t *dst, const uint8_t *src,
+                             ptrdiff_t dst_linesize,
+                             ptrdiff_t src_linesize,
                              int block_w, int block_h,
                              int src_x, int src_y, int w, int h);

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/videodsp_template.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/videodsp_template.c Changed

@@ -20,8 +20,9 @@
  */
 
 #include "bit_depth_template.c"
-void FUNC(ff_emulated_edge_mc)(uint8_t *buf, ptrdiff_t buf_stride,
-                               const uint8_t *src, ptrdiff_t src_stride,
+void FUNC(ff_emulated_edge_mc)(uint8_t *buf, const uint8_t *src,
+                               ptrdiff_t buf_linesize,
+                               ptrdiff_t src_linesize,
                                int block_w, int block_h,
                                int src_x, int src_y, int w, int h)
 {
@@ -32,12 +33,12 @@
         return;
 
     if (src_y >= h) {
-        src -= src_y * src_stride;
-        src += (h - 1) * src_stride;
+        src -= src_y * src_linesize;
+        src += (h - 1) * src_linesize;
         src_y = h - 1;
     } else if (src_y <= -block_h) {
-        src -= src_y * src_stride;
-        src += (1 - block_h) * src_stride;
+        src -= src_y * src_linesize;
+        src += (1 - block_h) * src_linesize;
         src_y = 1 - block_h;
     }
     if (src_x >= w) {
@@ -56,30 +57,30 @@
     av_assert2(start_x < end_x && block_w);
 
     w    = end_x - start_x;
-    src += start_y * src_stride + start_x * sizeof(pixel);
+    src += start_y * src_linesize + start_x * sizeof(pixel);
     buf += start_x * sizeof(pixel);
 
     // top
     for (y = 0; y < start_y; y++) {
         memcpy(buf, src, w * sizeof(pixel));
-        buf += buf_stride;
+        buf += buf_linesize;
     }
 
     // copy existing part
     for (; y < end_y; y++) {
         memcpy(buf, src, w * sizeof(pixel));
-        src += src_stride;
-        buf += buf_stride;
+        src += src_linesize;
+        buf += buf_linesize;
     }
 
     // bottom
-    src -= src_stride;
+    src -= src_linesize;
     for (; y < block_h; y++) {
         memcpy(buf, src, w * sizeof(pixel));
-        buf += buf_stride;
+        buf += buf_linesize;
     }
 
-    buf -= block_h * buf_stride + start_x * sizeof(pixel);
+    buf -= block_h * buf_linesize + start_x * sizeof(pixel);
     while (block_h--) {
         pixel *bufp = (pixel *) buf;
 
@@ -92,6 +93,6 @@
         for (x = end_x; x < block_w; x++) {
             bufp[x] = bufp[end_x - 1];
         }
-        buf += buf_stride;
+        buf += buf_linesize;
     }
 }

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/vmdav.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/vmdav.c Changed

@@ -61,7 +61,7 @@
 typedef struct VmdVideoContext {
 
     AVCodecContext *avctx;
-    AVFrame prev_frame;
+    AVFrame *prev_frame;
 
     const unsigned char *buf;
     int size;
@@ -76,7 +76,7 @@
 #define QUEUE_SIZE 0x1000
 #define QUEUE_MASK 0x0FFF
 
-static void lz_unpack(const unsigned char *src, int src_len,
+static int lz_unpack(const unsigned char *src, int src_len,
                       unsigned char *dest, int dest_len)
 {
     unsigned char *d;
@@ -97,7 +97,7 @@
     dataleft = bytestream2_get_le32(&gb);
     memset(queue, 0x20, QUEUE_SIZE);
     if (bytestream2_get_bytes_left(&gb) < 4)
-        return;
+        return AVERROR_INVALIDDATA;
     if (bytestream2_peek_le32(&gb) == 0x56781234) {
         bytestream2_skipu(&gb, 4);
         qpos = 0x111;
@@ -111,7 +111,7 @@
         tag = bytestream2_get_byteu(&gb);
         if ((tag == 0xFF) && (dataleft > 8)) {
             if (d_end - d < 8 || bytestream2_get_bytes_left(&gb) < 8)
-                return;
+                return AVERROR_INVALIDDATA;
             for (i = 0; i < 8; i++) {
                 queue[qpos++] = *d++ = bytestream2_get_byteu(&gb);
                 qpos &= QUEUE_MASK;
@@ -123,7 +123,7 @@
                     break;
                 if (tag & 0x01) {
                     if (d_end - d < 1 || bytestream2_get_bytes_left(&gb) < 1)
-                        return;
+                        return AVERROR_INVALIDDATA;
                     queue[qpos++] = *d++ = bytestream2_get_byteu(&gb);
                     qpos &= QUEUE_MASK;
                     dataleft--;
@@ -135,7 +135,7 @@
                         chainlen = bytestream2_get_byte(&gb) + 0xF + 3;
                     }
                     if (d_end - d < chainlen)
-                        return;
+                        return AVERROR_INVALIDDATA;
                     for (j = 0; j < chainlen; j++) {
                         *d = queue[chainofs++ & QUEUE_MASK];
                         queue[qpos++] = *d++;
@@ -147,6 +147,7 @@
             }
         }
     }
+    return d - dest;
 }
 static int rle_unpack(const unsigned char *src, unsigned char *dest,
                       int src_count, int src_size, int dest_len)
@@ -244,11 +245,11 @@
 
     /* if only a certain region will be updated, copy the entire previous
      * frame before the decode */
-    if (s->prev_frame.data[0] &&
+    if (s->prev_frame->data[0] &&
         (frame_x || frame_y || (frame_width != s->avctx->width) ||
         (frame_height != s->avctx->height))) {
 
-        memcpy(frame->data[0], s->prev_frame.data[0],
+        memcpy(frame->data[0], s->prev_frame->data[0],
             s->avctx->height * frame->linesize[0]);
     }
 
@@ -279,19 +280,22 @@
         return AVERROR_INVALIDDATA;
     meth = bytestream2_get_byteu(&gb);
     if (meth & 0x80) {
+        int size;
         if (!s->unpack_buffer_size) {
             av_log(s->avctx, AV_LOG_ERROR,
                    "Trying to unpack LZ-compressed frame with no LZ buffer\n");
             return AVERROR_INVALIDDATA;
         }
-        lz_unpack(gb.buffer, bytestream2_get_bytes_left(&gb),
-                  s->unpack_buffer, s->unpack_buffer_size);
+        size = lz_unpack(gb.buffer, bytestream2_get_bytes_left(&gb),
+                         s->unpack_buffer, s->unpack_buffer_size);
+        if (size < 0)
+            return size;
         meth &= 0x7F;
-        bytestream2_init(&gb, s->unpack_buffer, s->unpack_buffer_size);
+        bytestream2_init(&gb, s->unpack_buffer, size);
     }
 
     dp = &frame->data[0][frame_y * frame->linesize[0] + frame_x];
-    pp = &s->prev_frame.data[0][frame_y * s->prev_frame.linesize[0] + frame_x];
+    pp = &s->prev_frame->data[0][frame_y * s->prev_frame->linesize[0] + frame_x];
     switch (meth) {
     case 1:
         for (i = 0; i < frame_height; i++) {
@@ -307,7 +311,7 @@
                     ofs += len;
                 } else {
                     /* interframe pixel copy */
-                    if (ofs + len + 1 > frame_width || !s->prev_frame.data[0])
+                    if (ofs + len + 1 > frame_width || !s->prev_frame->data[0])
                         return AVERROR_INVALIDDATA;
                     memcpy(&dp[ofs], &pp[ofs], len + 1);
                     ofs += len + 1;
@@ -320,7 +324,7 @@
                 return AVERROR_INVALIDDATA;
             }
             dp += frame->linesize[0];
-            pp += s->prev_frame.linesize[0];
+            pp += s->prev_frame->linesize[0];
         }
         break;
 
@@ -328,7 +332,7 @@
         for (i = 0; i < frame_height; i++) {
             bytestream2_get_buffer(&gb, dp, frame_width);
             dp += frame->linesize[0];
-            pp += s->prev_frame.linesize[0];
+            pp += s->prev_frame->linesize[0];
         }
         break;
 
@@ -353,7 +357,7 @@
                     }
                 } else {
                     /* interframe pixel copy */
-                    if (ofs + len + 1 > frame_width || !s->prev_frame.data[0])
+                    if (ofs + len + 1 > frame_width || !s->prev_frame->data[0])
                         return AVERROR_INVALIDDATA;
                     memcpy(&dp[ofs], &pp[ofs], len + 1);
                     ofs += len + 1;
@@ -366,13 +370,24 @@
                 return AVERROR_INVALIDDATA;
             }
             dp += frame->linesize[0];
-            pp += s->prev_frame.linesize[0];
+            pp += s->prev_frame->linesize[0];
         }
         break;
     }
     return 0;
 }
 
+static av_cold int vmdvideo_decode_end(AVCodecContext *avctx)
+{
+    VmdVideoContext *s = avctx->priv_data;
+
+    av_frame_free(&s->prev_frame);
+    av_freep(&s->unpack_buffer);
+    s->unpack_buffer_size = 0;
+
+    return 0;
+}
+
 static av_cold int vmdvideo_decode_init(AVCodecContext *avctx)
 {
     VmdVideoContext *s = avctx->priv_data;
@@ -412,7 +427,11 @@
         palette32[i] |= palette32[i] >> 6 & 0x30303;
     }
 
-    avcodec_get_frame_defaults(&s->prev_frame);
+    s->prev_frame = av_frame_alloc();
+    if (!s->prev_frame) {
+        vmdvideo_decode_end(avctx);
+        return AVERROR(ENOMEM);
+    }
 
     return 0;
 }
@@ -443,8 +462,8 @@
     memcpy(frame->data[1], s->palette, PALETTE_COUNT * 4);
 
     /* shuffle frames */
-    av_frame_unref(&s->prev_frame);
-    if ((ret = av_frame_ref(&s->prev_frame, frame)) < 0)
+    av_frame_unref(s->prev_frame);
+    if ((ret = av_frame_ref(s->prev_frame, frame)) < 0)
         return ret;
 
     *got_frame      = 1;
@@ -453,17 +472,6 @@
     return buf_size;
 }
 
-static av_cold int vmdvideo_decode_end(AVCodecContext *avctx)
-{
-    VmdVideoContext *s = avctx->priv_data;
-
-    av_frame_unref(&s->prev_frame);
-    av_free(s->unpack_buffer);
-
-    return 0;
-}
-
-
 /*
  * Audio Decoder
  */

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/vmnc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/vmnc.c Changed

@@ -57,7 +57,7 @@
  */
 typedef struct VmncContext {
     AVCodecContext *avctx;
-    AVFrame *frame;
+    AVFrame *pic;
 
     int bpp;
     int bpp2;
@@ -291,6 +291,11 @@
                         fg = vmnc_get_pixel(gb, bpp, c->bigendian);
                     xy = bytestream2_get_byte(gb);
                     wh = bytestream2_get_byte(gb);
+                    if (   (xy >> 4) + (wh >> 4) + 1 > w - i
+                        || (xy & 0xF) + (wh & 0xF)+1 > h - j) {
+                        av_log(c->avctx, AV_LOG_ERROR, "Rectangle outside picture\n");
+                        return AVERROR_INVALIDDATA;
+                    }
                     paint_rect(dst2, xy >> 4, xy & 0xF,
                                (wh>>4)+1, (wh & 0xF)+1, fg, bpp, stride);
                 }
@@ -320,15 +325,14 @@
     GetByteContext *gb = &c->gb;
     uint8_t *outptr;
     int dx, dy, w, h, depth, enc, chunks, res, size_left, ret;
-    AVFrame *frame = c->frame;
 
-    if ((ret = ff_reget_buffer(avctx, frame)) < 0)
+    if ((ret = ff_reget_buffer(avctx, c->pic)) < 0)
         return ret;
 
     bytestream2_init(gb, buf, buf_size);
 
-    frame->key_frame = 0;
-    frame->pict_type = AV_PICTURE_TYPE_P;
+    c->pic->key_frame = 0;
+    c->pic->pict_type = AV_PICTURE_TYPE_P;
 
     // restore screen after cursor
     if (c->screendta) {
@@ -350,11 +354,11 @@
             dy = 0;
         }
         if ((w > 0) && (h > 0)) {
-            outptr = frame->data[0] + dx * c->bpp2 + dy * frame->linesize[0];
+            outptr = c->pic->data[0] + dx * c->bpp2 + dy * c->pic->linesize[0];
             for (i = 0; i < h; i++) {
                 memcpy(outptr, c->screendta + i * c->cur_w * c->bpp2,
                        w * c->bpp2);
-                outptr += frame->linesize[0];
+                outptr += c->pic->linesize[0];
             }
         }
     }
@@ -370,7 +374,7 @@
         w   = bytestream2_get_be16(gb);
         h   = bytestream2_get_be16(gb);
         enc = bytestream2_get_be32(gb);
-        outptr = frame->data[0] + dx * c->bpp2 + dy * frame->linesize[0];
+        outptr = c->pic->data[0] + dx * c->bpp2 + dy * c->pic->linesize[0];
         size_left = bytestream2_get_bytes_left(gb);
         switch (enc) {
         case MAGIC_WMVd: // cursor
@@ -424,8 +428,8 @@
             bytestream2_skip(gb, 4);
             break;
         case MAGIC_WMVi: // ServerInitialization struct
-            frame->key_frame = 1;
-            frame->pict_type = AV_PICTURE_TYPE_I;
+            c->pic->key_frame = 1;
+            c->pic->pict_type = AV_PICTURE_TYPE_I;
             depth = bytestream2_get_byte(gb);
             if (depth != c->bpp) {
                 av_log(avctx, AV_LOG_INFO,
@@ -460,7 +464,7 @@
                 return AVERROR_INVALIDDATA;
             }
             paint_raw(outptr, w, h, gb, c->bpp2, c->bigendian,
-                      frame->linesize[0]);
+                      c->pic->linesize[0]);
             break;
         case 0x00000005: // HexTile encoded rectangle
             if ((dx + w > c->width) || (dy + h > c->height)) {
@@ -469,7 +473,7 @@
                        w, h, dx, dy, c->width, c->height);
                 return AVERROR_INVALIDDATA;
             }
-            res = decode_hextile(c, outptr, gb, w, h, frame->linesize[0]);
+            res = decode_hextile(c, outptr, gb, w, h, c->pic->linesize[0]);
             if (res < 0)
                 return res;
             break;
@@ -498,18 +502,18 @@
             dy = 0;
         }
         if ((w > 0) && (h > 0)) {
-            outptr = frame->data[0] + dx * c->bpp2 + dy * frame->linesize[0];
+            outptr = c->pic->data[0] + dx * c->bpp2 + dy * c->pic->linesize[0];
             for (i = 0; i < h; i++) {
                 memcpy(c->screendta + i * c->cur_w * c->bpp2, outptr,
                        w * c->bpp2);
-                outptr += frame->linesize[0];
+                outptr += c->pic->linesize[0];
             }
-            outptr = frame->data[0];
-            put_cursor(outptr, frame->linesize[0], c, c->cur_x, c->cur_y);
+            outptr = c->pic->data[0];
+            put_cursor(outptr, c->pic->linesize[0], c, c->cur_x, c->cur_y);
         }
     }
     *got_frame = 1;
-    if ((ret = av_frame_ref(data, frame)) < 0)
+    if ((ret = av_frame_ref(data, c->pic)) < 0)
         return ret;
 
     /* always report that the buffer was completely consumed */
@@ -541,8 +545,8 @@
         return AVERROR_INVALIDDATA;
     }
 
-    c->frame = av_frame_alloc();
-    if (!c->frame)
+    c->pic = av_frame_alloc();
+    if (!c->pic)
         return AVERROR(ENOMEM);
 
     return 0;
@@ -552,7 +556,7 @@
 {
     VmncContext * const c = avctx->priv_data;
 
-    av_frame_free(&c->frame);
+    av_frame_free(&c->pic);
 
     av_freep(&c->curbits);
     av_freep(&c->curmask);

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/vorbis_parser.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/vorbis_parser.c Changed

@@ -201,8 +201,8 @@
     return 0;
 }
 
-int avpriv_vorbis_parse_frame(VorbisParseContext *s, const uint8_t *buf,
-                              int buf_size)
+int avpriv_vorbis_parse_frame_flags(VorbisParseContext *s, const uint8_t *buf,
+                                    int buf_size, int *flags)
 {
     int duration = 0;
 
@@ -211,6 +211,22 @@
         int previous_blocksize = s->previous_blocksize;
 
         if (buf[0] & 1) {
+            /* If the user doesn't care about special packets, it's a bad one. */
+            if (!flags)
+                goto bad_packet;
+
+            /* Set the flag for which kind of special packet it is. */
+            if (buf[0] == 1)
+                *flags |= VORBIS_FLAG_HEADER;
+            else if (buf[0] == 3)
+                *flags |= VORBIS_FLAG_COMMENT;
+            else
+                goto bad_packet;
+
+            /* Special packets have no duration. */
+            return 0;
+
+bad_packet:
             av_log(s->avctx, AV_LOG_ERROR, "Invalid packet\n");
             return AVERROR_INVALIDDATA;
         }
@@ -234,6 +250,12 @@
     return duration;
 }
 
+int avpriv_vorbis_parse_frame(VorbisParseContext *s, const uint8_t *buf,
+                              int buf_size)
+{
+    return avpriv_vorbis_parse_frame_flags(s, buf, buf_size, NULL);
+}
+
 void avpriv_vorbis_parse_reset(VorbisParseContext *s)
 {
     if (s->valid_extradata)

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/vorbis_parser.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/vorbis_parser.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/vp3.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/vp3.c Changed

@@ -1549,10 +1549,11 @@
                             uint8_t *temp= s->edge_emu_buffer;
                             if(stride<0) temp -= 8*stride;
 
-                            s->vdsp.emulated_edge_mc(temp, stride,
-                                                     motion_source, stride,
+                            s->vdsp.emulated_edge_mc(temp, motion_source,
+                                                     stride, stride,
                                                      9, 9, src_x, src_y,
-                                                     plane_width, plane_height);
+                                                     plane_width,
+                                                     plane_height);
                             motion_source= temp;
                         }
                     }
@@ -1704,10 +1705,10 @@
     ff_vp3dsp_init(&s->vp3dsp, avctx->flags);
 
     for (i = 0; i < 64; i++) {
-#define T(x) (x >> 3) | ((x & 7) << 3)
-        s->idct_permutation[i] = T(i);
-        s->idct_scantable[i] = T(ff_zigzag_direct[i]);
-#undef T
+#define TRANSPOSE(x) (x >> 3) | ((x & 7) << 3)
+        s->idct_permutation[i] = TRANSPOSE(i);
+        s->idct_scantable[i]   = TRANSPOSE(ff_zigzag_direct[i]);
+#undef TRANSPOSE
     }
 
     /* initialize to an impossible value which will force a recalculation
@@ -2196,6 +2197,7 @@
     Vp3DecodeContext *s = avctx->priv_data;
     int visible_width, visible_height, colorspace;
     int offset_x = 0, offset_y = 0;
+    int ret;
     AVRational fps, aspect;
 
     s->theora = get_bits_long(gb, 24);
@@ -2212,12 +2214,6 @@
     visible_width  = s->width  = get_bits(gb, 16) << 4;
     visible_height = s->height = get_bits(gb, 16) << 4;
 
-    if(av_image_check_size(s->width, s->height, 0, avctx)){
-        av_log(avctx, AV_LOG_ERROR, "Invalid dimensions (%dx%d)\n", s->width, s->height);
-        s->width= s->height= 0;
-        return -1;
-    }
-
     if (s->theora >= 0x030200) {
         visible_width  = get_bits_long(gb, 24);
         visible_height = get_bits_long(gb, 24);
@@ -2268,9 +2264,11 @@
     if (   visible_width  <= s->width  && visible_width  > s->width-16
         && visible_height <= s->height && visible_height > s->height-16
         && !offset_x && (offset_y == s->height - visible_height))
-        avcodec_set_dimensions(avctx, visible_width, visible_height);
+        ret = ff_set_dimensions(avctx, visible_width, visible_height);
     else
-        avcodec_set_dimensions(avctx, s->width, s->height);
+        ret = ff_set_dimensions(avctx, s->width, s->height);
+    if (ret < 0)
+        return ret;
 
     if (colorspace == 1) {
         avctx->color_primaries = AVCOL_PRI_BT470M;

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/vp5.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/vp5.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/vp56.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/vp56.c Changed

@@ -339,11 +339,12 @@
 
     if (x<0 || x+12>=s->plane_width[plane] ||
         y<0 || y+12>=s->plane_height[plane]) {
-        s->vdsp.emulated_edge_mc(s->edge_emu_buffer, stride,
-                            src + s->block_offset[b] + (dy-2)*stride + (dx-2),
-                            stride, 12, 12, x, y,
-                            s->plane_width[plane],
-                            s->plane_height[plane]);
+        s->vdsp.emulated_edge_mc(s->edge_emu_buffer,
+                                 src + s->block_offset[b] + (dy-2)*stride + (dx-2),
+                                 stride, stride,
+                                 12, 12, x, y,
+                                 s->plane_width[plane],
+                                 s->plane_height[plane]);
         src_block = s->edge_emu_buffer;
         src_offset = 2 + 2*stride;
     } else if (deblock_filtering) {
@@ -470,7 +471,7 @@
     s->mb_height = (avctx->coded_height+15) / 16;
 
     if (s->mb_width > 1000 || s->mb_height > 1000) {
-        avcodec_set_dimensions(avctx, 0, 0);
+        ff_set_dimensions(avctx, 0, 0);
         av_log(avctx, AV_LOG_ERROR, "picture too big\n");
         return -1;
     }
@@ -699,9 +700,9 @@
     ff_vp3dsp_init(&s->vp3dsp, avctx->flags);
     ff_vp56dsp_init(&s->vp56dsp, avctx->codec->id);
     for (i = 0; i < 64; i++) {
-#define T(x) (x >> 3) | ((x & 7) << 3)
-        s->idct_scantable[i] = T(ff_zigzag_direct[i]);
-#undef T
+#define TRANSPOSE(x) (x >> 3) | ((x & 7) << 3)
+        s->idct_scantable[i] = TRANSPOSE(ff_zigzag_direct[i]);
+#undef TRANSPOSE
     }
 
     for (i = 0; i < FF_ARRAY_ELEMS(s->frames); i++) {

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/vp6.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/vp6.c Changed

@@ -32,6 +32,7 @@
 #include "avcodec.h"
 #include "get_bits.h"
 #include "huffman.h"
+#include "internal.h"
 
 #include "vp56.h"
 #include "vp56data.h"
@@ -92,7 +93,10 @@
                 s->avctx->coded_width  = 16 * cols;
                 s->avctx->coded_height = 16 * rows;
             } else {
-                avcodec_set_dimensions(s->avctx, 16 * cols, 16 * rows);
+                int ret = ff_set_dimensions(s->avctx, 16 * cols, 16 * rows);
+                if (ret < 0)
+                    return ret;
+
                 if (s->avctx->extradata_size == 1) {
                     s->avctx->width  -= s->avctx->extradata[0] >> 4;
                     s->avctx->height -= s->avctx->extradata[0] & 0x0F;
@@ -154,7 +158,7 @@
         buf_size -= coeff_offset;
         if (buf_size < 0) {
             if (s->frames[VP56_FRAME_CURRENT]->key_frame)
-                avcodec_set_dimensions(s->avctx, 0, 0);
+                ff_set_dimensions(s->avctx, 0, 0);
             return AVERROR_INVALIDDATA;
         }
         if (s->use_huffman) {

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/vp8.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/vp8.c Changed

@@ -113,16 +113,15 @@
 static int update_dimensions(VP8Context *s, int width, int height)
 {
     AVCodecContext *avctx = s->avctx;
-    int i;
+    int i, ret;
 
     if (width  != s->avctx->width || ((width+15)/16 != s->mb_width || (height+15)/16 != s->mb_height) && s->macroblocks_base ||
         height != s->avctx->height) {
-        if (av_image_check_size(width, height, 0, s->avctx))
-            return AVERROR_INVALIDDATA;
-
         vp8_decode_flush_impl(s->avctx, 1);
 
-        avcodec_set_dimensions(s->avctx, width, height);
+        ret = ff_set_dimensions(s->avctx, width, height);
+        if (ret < 0)
+            return ret;
     }
 
     s->mb_width  = (s->avctx->coded_width +15) / 16;
@@ -665,7 +664,7 @@
 {
     uint8_t *intra4x4 = mb->intra4x4_pred_mode_mb;
 
-    if (layout == 1) {
+    if (layout) {
         VP8Macroblock *mb_top = mb - s->mb_width - 1;
         memcpy(mb->intra4x4_pred_mode_top, mb_top->intra4x4_pred_mode_top, 4);
     }
@@ -673,7 +672,7 @@
         int x, y;
         uint8_t* top;
         uint8_t* const left = s->intra4x4_pred_mode_left;
-        if (layout == 1)
+        if (layout)
             top = mb->intra4x4_pred_mode_top;
         else
             top = s->intra4x4_pred_mode_top + 4 * mb_x;
@@ -715,7 +714,7 @@
             decode_intra4x4_modes(s, c, mb, mb_x, 1, layout);
         } else {
             const uint32_t modes = vp8_pred4x4_mode[mb->mode] * 0x01010101u;
-            if (s->mb_layout == 1)
+            if (s->mb_layout)
                 AV_WN32A(mb->intra4x4_pred_mode_top, modes);
             else
                 AV_WN32A(s->intra4x4_pred_mode_top + 4 * mb_x, modes);
@@ -961,16 +960,6 @@
 }
 
 static av_always_inline
-int check_intra_pred8x8_mode(int mode, int mb_x, int mb_y)
-{
-    if (mode == DC_PRED8x8) {
-        return check_dc_pred8x8_mode(mode, mb_x, mb_y);
-    } else {
-        return mode;
-    }
-}
-
-static av_always_inline
 int check_intra_pred8x8_mode_emuedge(int mode, int mb_x, int mb_y)
 {
     switch (mode) {
@@ -1034,23 +1023,18 @@
 void intra_predict(VP8Context *s, VP8ThreadData *td, uint8_t *dst[3],
                    VP8Macroblock *mb, int mb_x, int mb_y)
 {
-    AVCodecContext *avctx = s->avctx;
     int x, y, mode, nnz;
     uint32_t tr;
 
     // for the first row, we need to run xchg_mb_border to init the top edge to 127
     // otherwise, skip it if we aren't going to deblock
-    if (!(avctx->flags & CODEC_FLAG_EMU_EDGE && !mb_y) && (s->deblock_filter || !mb_y) && td->thread_nr == 0)
+    if (mb_y && (s->deblock_filter || !mb_y) && td->thread_nr == 0)
         xchg_mb_border(s->top_border[mb_x+1], dst[0], dst[1], dst[2],
                        s->linesize, s->uvlinesize, mb_x, mb_y, s->mb_width,
                        s->filter.simple, 1);
 
     if (mb->mode < MODE_I4x4) {
-        if (avctx->flags & CODEC_FLAG_EMU_EDGE) { // tested
-            mode = check_intra_pred8x8_mode_emuedge(mb->mode, mb_x, mb_y);
-        } else {
-            mode = check_intra_pred8x8_mode(mb->mode, mb_x, mb_y);
-        }
+        mode = check_intra_pred8x8_mode_emuedge(mb->mode, mb_x, mb_y);
         s->hpc.pred16x16[mode](dst[0], s->linesize);
     } else {
         uint8_t *ptr = dst[0];
@@ -1063,7 +1047,7 @@
 
         // if we're on the right edge of the frame, said edge is extended
         // from the top macroblock
-        if (!(!mb_y && avctx->flags & CODEC_FLAG_EMU_EDGE) &&
+        if (mb_y &&
             mb_x == s->mb_width-1) {
             tr = tr_right[-1]*0x01010101u;
             tr_right = (uint8_t *)&tr;
@@ -1079,41 +1063,37 @@
                 uint8_t *dst = ptr+4*x;
                 DECLARE_ALIGNED(4, uint8_t, copy_dst)[5*8];
 
-                if ((y == 0 || x == 3) && mb_y == 0 && avctx->flags & CODEC_FLAG_EMU_EDGE) {
+                if ((y == 0 || x == 3) && mb_y == 0) {
                     topright = tr_top;
                 } else if (x == 3)
                     topright = tr_right;
 
-                if (avctx->flags & CODEC_FLAG_EMU_EDGE) { // mb_x+x or mb_y+y is a hack but works
-                    mode = check_intra_pred4x4_mode_emuedge(intra4x4[x], mb_x + x, mb_y + y, &copy);
-                    if (copy) {
-                        dst = copy_dst + 12;
-                        linesize = 8;
-                        if (!(mb_y + y)) {
-                            copy_dst[3] = 127U;
-                            AV_WN32A(copy_dst+4, 127U * 0x01010101U);
-                        } else {
-                            AV_COPY32(copy_dst+4, ptr+4*x-s->linesize);
-                            if (!(mb_x + x)) {
-                                copy_dst[3] = 129U;
-                            } else {
-                                copy_dst[3] = ptr[4*x-s->linesize-1];
-                            }
-                        }
+                mode = check_intra_pred4x4_mode_emuedge(intra4x4[x], mb_x + x, mb_y + y, &copy);
+                if (copy) {
+                    dst = copy_dst + 12;
+                    linesize = 8;
+                    if (!(mb_y + y)) {
+                        copy_dst[3] = 127U;
+                        AV_WN32A(copy_dst+4, 127U * 0x01010101U);
+                    } else {
+                        AV_COPY32(copy_dst+4, ptr+4*x-s->linesize);
                         if (!(mb_x + x)) {
-                            copy_dst[11] =
-                            copy_dst[19] =
-                            copy_dst[27] =
-                            copy_dst[35] = 129U;
+                            copy_dst[3] = 129U;
                         } else {
-                            copy_dst[11] = ptr[4*x              -1];
-                            copy_dst[19] = ptr[4*x+s->linesize  -1];
-                            copy_dst[27] = ptr[4*x+s->linesize*2-1];
-                            copy_dst[35] = ptr[4*x+s->linesize*3-1];
+                            copy_dst[3] = ptr[4*x-s->linesize-1];
                         }
                     }
-                } else {
-                    mode = intra4x4[x];
+                    if (!(mb_x + x)) {
+                        copy_dst[11] =
+                        copy_dst[19] =
+                        copy_dst[27] =
+                        copy_dst[35] = 129U;
+                    } else {
+                        copy_dst[11] = ptr[4*x              -1];
+                        copy_dst[19] = ptr[4*x+s->linesize  -1];
+                        copy_dst[27] = ptr[4*x+s->linesize*2-1];
+                        copy_dst[35] = ptr[4*x+s->linesize*3-1];
+                    }
                 }
                 s->hpc.pred4x4[mode](dst, topright, linesize);
                 if (copy) {
@@ -1138,15 +1118,11 @@
         }
     }
 
-    if (avctx->flags & CODEC_FLAG_EMU_EDGE) {
-        mode = check_intra_pred8x8_mode_emuedge(mb->chroma_pred_mode, mb_x, mb_y);
-    } else {
-        mode = check_intra_pred8x8_mode(mb->chroma_pred_mode, mb_x, mb_y);
-    }
+    mode = check_intra_pred8x8_mode_emuedge(mb->chroma_pred_mode, mb_x, mb_y);
     s->hpc.pred8x8[mode](dst[1], s->uvlinesize);
     s->hpc.pred8x8[mode](dst[2], s->uvlinesize);
 
-    if (!(avctx->flags & CODEC_FLAG_EMU_EDGE && !mb_y) && (s->deblock_filter || !mb_y) && td->thread_nr == 0)
+    if (mb_y && (s->deblock_filter || !mb_y) && td->thread_nr == 0)
         xchg_mb_border(s->top_border[mb_x+1], dst[0], dst[1], dst[2],
                        s->linesize, s->uvlinesize, mb_x, mb_y, s->mb_width,
                        s->filter.simple, 0);
@@ -1186,6 +1162,7 @@
 
     if (AV_RN32A(mv)) {
         int src_linesize = linesize;
+
         int mx = (mv->x << 1)&7, mx_idx = subpel_idx[0][mx];
         int my = (mv->y << 1)&7, my_idx = subpel_idx[0][my];
 
@@ -1197,13 +1174,14 @@
         src += y_off * linesize + x_off;
         if (x_off < mx_idx || x_off >= width  - block_w - subpel_idx[2][mx] ||
             y_off < my_idx || y_off >= height - block_h - subpel_idx[2][my]) {
-            s->vdsp.emulated_edge_mc(td->edge_emu_buffer, 32,
-                                     src - my_idx * linesize - mx_idx, linesize,
+            s->vdsp.emulated_edge_mc(td->edge_emu_buffer,
+                                     src - my_idx * linesize - mx_idx,
+                                     EDGE_EMU_LINESIZE, linesize,
                                      block_w + subpel_idx[1][mx],
                                      block_h + subpel_idx[1][my],
                                      x_off - mx_idx, y_off - my_idx, width, height);
-            src = td->edge_emu_buffer + mx_idx + 32 * my_idx;
-            src_linesize = 32;
+            src = td->edge_emu_buffer + mx_idx + EDGE_EMU_LINESIZE * my_idx;
+            src_linesize = EDGE_EMU_LINESIZE;
         }
         mc_func[my_idx][mx_idx](dst, linesize, src, src_linesize, block_h, mx, my);
     } else {
@@ -1250,21 +1228,23 @@
         ff_thread_await_progress(ref, (3 + y_off + block_h + subpel_idx[2][my]) >> 3, 0);
         if (x_off < mx_idx || x_off >= width  - block_w - subpel_idx[2][mx] ||
             y_off < my_idx || y_off >= height - block_h - subpel_idx[2][my]) {
-            s->vdsp.emulated_edge_mc(td->edge_emu_buffer, 32,
-                                     src1 - my_idx * linesize - mx_idx, linesize,
+            s->vdsp.emulated_edge_mc(td->edge_emu_buffer,
+                                     src1 - my_idx * linesize - mx_idx,
+                                     EDGE_EMU_LINESIZE, linesize,
                                      block_w + subpel_idx[1][mx],
                                      block_h + subpel_idx[1][my],
                                      x_off - mx_idx, y_off - my_idx, width, height);
-            src1 = td->edge_emu_buffer + mx_idx + 32 * my_idx;
-            mc_func[my_idx][mx_idx](dst1, linesize, src1, 32, block_h, mx, my);
+            src1 = td->edge_emu_buffer + mx_idx + EDGE_EMU_LINESIZE * my_idx;
+            mc_func[my_idx][mx_idx](dst1, linesize, src1, EDGE_EMU_LINESIZE, block_h, mx, my);
 
-            s->vdsp.emulated_edge_mc(td->edge_emu_buffer, 32,
-                                     src2 - my_idx * linesize - mx_idx, linesize,
+            s->vdsp.emulated_edge_mc(td->edge_emu_buffer,
+                                     src2 - my_idx * linesize - mx_idx,
+                                     EDGE_EMU_LINESIZE, linesize,
                                      block_w + subpel_idx[1][mx],
                                      block_h + subpel_idx[1][my],
                                      x_off - mx_idx, y_off - my_idx, width, height);
-            src2 = td->edge_emu_buffer + mx_idx + 32 * my_idx;
-            mc_func[my_idx][mx_idx](dst2, linesize, src2, 32, block_h, mx, my);
+            src2 = td->edge_emu_buffer + mx_idx + EDGE_EMU_LINESIZE * my_idx;
+            mc_func[my_idx][mx_idx](dst2, linesize, src2, EDGE_EMU_LINESIZE, block_h, mx, my);
         } else {
             mc_func[my_idx][mx_idx](dst1, linesize, src1, linesize, block_h, mx, my);
             mc_func[my_idx][mx_idx](dst2, linesize, src2, linesize, block_h, mx, my);
@@ -1669,7 +1649,7 @@
     VP8Context *s = avctx->priv_data;
     VP8ThreadData *prev_td, *next_td, *td = &s->thread_data[threadnr];
     int mb_y = td->thread_mb_pos>>16;
-    int i, y, mb_x, mb_xy = mb_y*s->mb_width;
+    int mb_x, mb_xy = mb_y*s->mb_width;
     int num_jobs = s->num_jobs;
     VP8Frame *curframe = s->curframe, *prev_frame = s->prev_frame;
     VP56RangeCoder *c = &s->coeff_partition[mb_y & (s->num_coeff_partitions-1)];
@@ -1697,15 +1677,6 @@
     }
 
     memset(td->left_nnz, 0, sizeof(td->left_nnz));
-    // left edge of 129 for intra prediction
-    if (!(avctx->flags & CODEC_FLAG_EMU_EDGE)) {
-        for (i = 0; i < 3; i++)
-            for (y = 0; y < 16>>!!i; y++)
-                dst[i][y*curframe->tf.f->linesize[i]-1] = 129;
-        if (mb_y == 1) {
-            s->top_border[0][15] = s->top_border[0][23] = s->top_border[0][31] = 129;
-        }
-    }
 
     s->mv_min.x = -MARGIN;
     s->mv_max.x = ((s->mb_width  - 1) << 6) + MARGIN;
@@ -1957,12 +1928,6 @@
     if (!s->mb_layout && s->keyframe)
         memset(s->intra4x4_pred_mode_top, DC_PRED, s->mb_width*4);
 
-    // top edge of 127 for intra prediction
-    if (!(avctx->flags & CODEC_FLAG_EMU_EDGE)) {
-        s->top_border[0][15] = s->top_border[0][23] = 127;
-        s->top_border[0][31] = 127;
-        memset(s->top_border[1], 127, s->mb_width*sizeof(*s->top_border));
-    }
     memset(s->ref_count, 0, sizeof(s->ref_count));
 
 
@@ -2045,7 +2010,7 @@
 
     ff_videodsp_init(&s->vdsp, 8);
     ff_h264_pred_init(&s->hpc, AV_CODEC_ID_VP8, 8, 1);
-    ff_vp8dsp_init(&s->vp8dsp);
+    ff_vp8dsp_init(&s->vp8dsp, 0);
 
     if ((ret = vp8_init_frames(s)) < 0) {
         ff_vp8_decode_free(avctx);
@@ -2106,52 +2071,6 @@
     return 0;
 }
 
-static unsigned apply_padding(unsigned size) { return size + (size & 1); }
-
-static int webp_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
-                             AVPacket *avpkt)
-{
-    const uint8_t *buf = avpkt->data;
-    int buf_size       = avpkt->size;
-    AVPacket pkt       = *avpkt;
-
-    if (buf_size >= 16
-        && AV_RL32(buf   ) == AV_RL32("RIFF")
-        && AV_RL32(buf+ 8) == AV_RL32("WEBP")) {
-        unsigned riff_size = apply_padding(AV_RL32(buf+4)) + 8;
-        buf += 12;   // Skip over main header
-        buf_size -= 12;
-        if (buf_size < 8 || riff_size < 8) {
-            av_log(avctx, AV_LOG_ERROR, "Incomplete header.\n");
-            return AVERROR_INVALIDDATA;
-        }
-        if (AV_RL32(buf) == AV_RL32("VP8L")) {
-            av_log(avctx, AV_LOG_ERROR, "Unsupported WebP lossless format.\n");
-            return AVERROR_PATCHWELCOME;
-        }
-        if (AV_RL32(buf) == AV_RL32("VP8X") && AV_RL32(buf+4) < (unsigned)buf_size) {
-            unsigned size = apply_padding(AV_RL32(buf+4) + 8);
-            buf      += size;
-            buf_size -= size;
-        }
-        if (buf_size >= 8
-            && AV_RL32(buf) == AV_RL32("ALPH") && AV_RL32(buf+4) < (unsigned)buf_size) {
-            unsigned size = apply_padding(AV_RL32(buf+4) + 8);
-            buf      += size;
-            buf_size -= size;
-            av_log(avctx, AV_LOG_WARNING, "Skipping alpha plane\n");
-        }
-        if (buf_size >= 8 && AV_RL32(buf) == AV_RL32("VP8 ")) {
-            buf      += 8;
-            buf_size -= 8;
-        }
-    }
-    pkt.data = buf;
-    pkt.size = buf_size;
-
-    return ff_vp8_decode_frame(avctx, data, data_size, &pkt);
-}
-
 AVCodec ff_vp8_decoder = {
     .name                  = "vp8",
     .long_name             = NULL_IF_CONFIG_SMALL("On2 VP8"),
@@ -2167,17 +2086,3 @@
     .update_thread_context = ONLY_IF_THREADS_ENABLED(vp8_decode_update_thread_context),
 };
 
-// AVCodec ff_webp_decoder = {
-//     .name                  = "webp",
-//     .long_name             = NULL_IF_CONFIG_SMALL("WebP"),
-//     .type                  = AVMEDIA_TYPE_VIDEO,
-//     .id                    = AV_CODEC_ID_WEBP,
-//     .priv_data_size        = sizeof(VP8Context),
-//     .init                  = vp8_decode_init,
-//     .close                 = vp8_decode_free,
-//     .decode                = webp_decode_frame,
-//     .capabilities          = CODEC_CAP_DR1 | CODEC_CAP_FRAME_THREADS | CODEC_CAP_SLICE_THREADS,
-//     .flush                 = vp8_decode_flush,
-//     .init_thread_copy      = ONLY_IF_THREADS_ENABLED(vp8_decode_init_thread_copy),
-//     .update_thread_context = ONLY_IF_THREADS_ENABLED(vp8_decode_update_thread_context),
-// };

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/vp8.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/vp8.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/vp8dsp.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/vp8dsp.c Changed

@@ -1,6 +1,7 @@
 /*
  * Copyright (C) 2010 David Conrad
  * Copyright (C) 2010 Ronald S. Bultje
+ * Copyright (C) 2014 Peter Ross
  *
  * This file is part of FFmpeg.
  *
@@ -28,7 +29,114 @@
 #include "vp8dsp.h"
 #include "libavutil/common.h"
 
+#define MK_IDCT_DC_ADD4_C(name) \
+static void name ## _idct_dc_add4uv_c(uint8_t *dst, int16_t block[4][16], ptrdiff_t stride)\
+{\
+    name ## _idct_dc_add_c(dst+stride*0+0, block[0], stride);\
+    name ## _idct_dc_add_c(dst+stride*0+4, block[1], stride);\
+    name ## _idct_dc_add_c(dst+stride*4+0, block[2], stride);\
+    name ## _idct_dc_add_c(dst+stride*4+4, block[3], stride);\
+}\
+\
+static void name ## _idct_dc_add4y_c(uint8_t *dst, int16_t block[4][16], ptrdiff_t stride)\
+{\
+    name ## _idct_dc_add_c(dst+ 0, block[0], stride);\
+    name ## _idct_dc_add_c(dst+ 4, block[1], stride);\
+    name ## _idct_dc_add_c(dst+ 8, block[2], stride);\
+    name ## _idct_dc_add_c(dst+12, block[3], stride);\
+}
+
+#if CONFIG_VP7_DECODER
+static void vp7_luma_dc_wht_c(int16_t block[4][4][16], int16_t dc[16])
+{
+    int i, a1, b1, c1, d1;
+    int16_t tmp[16];
+
+    for (i = 0; i < 4; i++) {
+        a1 = (dc[i*4+0] + dc[i*4+2]) * 23170;
+        b1 = (dc[i*4+0] - dc[i*4+2]) * 23170;
+        c1 = dc[i*4+1] * 12540 - dc[i*4+3] * 30274;
+        d1 = dc[i*4+1] * 30274 + dc[i*4+3] * 12540;
+        tmp[i*4+0] = (a1 + d1) >> 14;
+        tmp[i*4+3] = (a1 - d1) >> 14;
+        tmp[i*4+1] = (b1 + c1) >> 14;
+        tmp[i*4+2] = (b1 - c1) >> 14;
+    }
+
+    for (i = 0; i < 4; i++) {
+        a1 = (tmp[i + 0] + tmp[i + 8]) * 23170;
+        b1 = (tmp[i + 0] - tmp[i + 8]) * 23170;
+        c1 = tmp[i + 4] * 12540 - tmp[i + 12] * 30274;
+        d1 = tmp[i + 4] * 30274 + tmp[i + 12] * 12540;
+        AV_ZERO64(dc + i*4);
+        block[0][i][0] = (a1 + d1 + 0x20000) >> 18;
+        block[3][i][0] = (a1 - d1 + 0x20000) >> 18;
+        block[1][i][0] = (b1 + c1 + 0x20000) >> 18;
+        block[2][i][0] = (b1 - c1 + 0x20000) >> 18;
+    }
+}
+
+static void vp7_luma_dc_wht_dc_c(int16_t block[4][4][16], int16_t dc[16])
+{
+    int i, val = (23170 * (23170 * dc[0] >> 14) + 0x20000) >> 18;
+    dc[0] = 0;
+
+    for (i = 0; i < 4; i++) {
+        block[i][0][0] = val;
+        block[i][1][0] = val;
+        block[i][2][0] = val;
+        block[i][3][0] = val;
+    }
+}
+
+static void vp7_idct_add_c(uint8_t *dst, int16_t block[16], ptrdiff_t stride)
+{
+    int i, a1, b1, c1, d1;
+    int16_t tmp[16];
+
+    for (i = 0; i < 4; i++) {
+        a1 = (block[i*4+0] + block[i*4+2]) * 23170;
+        b1 = (block[i*4+0] - block[i*4+2]) * 23170;
+        c1 = block[i*4+1] * 12540 - block[i*4+3] * 30274;
+        d1 = block[i*4+1] * 30274 + block[i*4+3] * 12540;
+        AV_ZERO64(block + i*4);
+        tmp[i*4+0] = (a1 + d1) >> 14;
+        tmp[i*4+3] = (a1 - d1) >> 14;
+        tmp[i*4+1] = (b1 + c1) >> 14;
+        tmp[i*4+2] = (b1 - c1) >> 14;
+    }
+
+    for (i = 0; i < 4; i++) {
+        a1 = (tmp[i + 0] + tmp[i + 8]) * 23170;
+        b1 = (tmp[i + 0] - tmp[i + 8]) * 23170;
+        c1 = tmp[i + 4] * 12540 - tmp[i + 12] * 30274;
+        d1 = tmp[i + 4] * 30274 + tmp[i + 12] * 12540;
+        dst[0*stride+i] = av_clip_uint8(dst[0*stride+i] + ((a1 + d1 + 0x20000) >> 18));
+        dst[3*stride+i] = av_clip_uint8(dst[3*stride+i] + ((a1 - d1 + 0x20000) >> 18));
+        dst[1*stride+i] = av_clip_uint8(dst[1*stride+i] + ((b1 + c1 + 0x20000) >> 18));
+        dst[2*stride+i] = av_clip_uint8(dst[2*stride+i] + ((b1 - c1 + 0x20000) >> 18));
+    }
+}
+
+static void vp7_idct_dc_add_c(uint8_t *dst, int16_t block[16], ptrdiff_t stride)
+{
+    int i, dc = (23170 * (23170 * block[0] >> 14) + 0x20000) >> 18;
+    block[0] = 0;
+
+    for (i = 0; i < 4; i++) {
+        dst[0] = av_clip_uint8(dst[0] + dc);
+        dst[1] = av_clip_uint8(dst[1] + dc);
+        dst[2] = av_clip_uint8(dst[2] + dc);
+        dst[3] = av_clip_uint8(dst[3] + dc);
+        dst += stride;
+    }
+}
+
+MK_IDCT_DC_ADD4_C(vp7)
+#endif
+
 // TODO: Maybe add dequant
+#if CONFIG_VP8_DECODER
 static void vp8_luma_dc_wht_c(int16_t block[4][4][16], int16_t dc[16])
 {
     int i, t0, t1, t2, t3;
@@ -50,10 +158,7 @@
         t1 = dc[i*4+1] + dc[i*4+2];
         t2 = dc[i*4+1] - dc[i*4+2];
         t3 = dc[i*4+0] - dc[i*4+3] + 3; // rounding
-        dc[i*4+0] = 0;
-        dc[i*4+1] = 0;
-        dc[i*4+2] = 0;
-        dc[i*4+3] = 0;
+        AV_ZERO64(dc + i*4);
 
         block[i][0][0] = (t0 + t1) >> 3;
         block[i][1][0] = (t3 + t2) >> 3;
@@ -127,21 +232,8 @@
     }
 }
 
-static void vp8_idct_dc_add4uv_c(uint8_t *dst, int16_t block[4][16], ptrdiff_t stride)
-{
-    vp8_idct_dc_add_c(dst+stride*0+0, block[0], stride);
-    vp8_idct_dc_add_c(dst+stride*0+4, block[1], stride);
-    vp8_idct_dc_add_c(dst+stride*4+0, block[2], stride);
-    vp8_idct_dc_add_c(dst+stride*4+4, block[3], stride);
-}
-
-static void vp8_idct_dc_add4y_c(uint8_t *dst, int16_t block[4][16], ptrdiff_t stride)
-{
-    vp8_idct_dc_add_c(dst+ 0, block[0], stride);
-    vp8_idct_dc_add_c(dst+ 4, block[1], stride);
-    vp8_idct_dc_add_c(dst+ 8, block[2], stride);
-    vp8_idct_dc_add_c(dst+12, block[3], stride);
-}
+MK_IDCT_DC_ADD4_C(vp8)
+#endif
 
 // because I like only having two parameters to pass functions...
 #define LOAD_PIXELS\
@@ -156,7 +248,7 @@
 
 #define clip_int8(n) (cm[n+0x80]-0x80)
 
-static av_always_inline void filter_common(uint8_t *p, ptrdiff_t stride, int is4tap)
+static av_always_inline void filter_common(uint8_t *p, ptrdiff_t stride, int is4tap, int vpn)
 {
     LOAD_PIXELS
     int a, f1, f2;
@@ -172,7 +264,11 @@
     // We deviate from the spec here with c(a+3) >> 3
     // since that's what libvpx does.
     f1 = FFMIN(a+4, 127) >> 3;
-    f2 = FFMIN(a+3, 127) >> 3;
+
+    if (vpn == 7)
+        f2 = f1 - ((a & 7) == 4);
+    else
+        f2 = FFMIN(a+3, 127) >> 3;
 
     // Despite what the spec says, we do need to clamp here to
     // be bitexact with libvpx.
@@ -187,7 +283,13 @@
     }
 }
 
-static av_always_inline int simple_limit(uint8_t *p, ptrdiff_t stride, int flim)
+static av_always_inline int vp7_simple_limit(uint8_t *p, ptrdiff_t stride, int flim)
+{
+    LOAD_PIXELS
+    return FFABS(p0-q0) <= flim;
+}
+
+static av_always_inline int vp8_simple_limit(uint8_t *p, ptrdiff_t stride, int flim)
 {
     LOAD_PIXELS
     return 2*FFABS(p0-q0) + (FFABS(p1-q1) >> 1) <= flim;
@@ -197,14 +299,18 @@
  * E - limit at the macroblock edge
  * I - limit for interior difference
  */
-static av_always_inline int normal_limit(uint8_t *p, ptrdiff_t stride, int E, int I)
-{
-    LOAD_PIXELS
-    return simple_limit(p, stride, E)
-        && FFABS(p3-p2) <= I && FFABS(p2-p1) <= I && FFABS(p1-p0) <= I
-        && FFABS(q3-q2) <= I && FFABS(q2-q1) <= I && FFABS(q1-q0) <= I;
+#define NORMAL_LIMIT(vpn) \
+static av_always_inline int vp ## vpn ## _normal_limit(uint8_t *p, ptrdiff_t stride, int E, int I)\
+{\
+    LOAD_PIXELS\
+    return vp ## vpn ## _simple_limit(p, stride, E)\
+        && FFABS(p3-p2) <= I && FFABS(p2-p1) <= I && FFABS(p1-p0) <= I\
+        && FFABS(q3-q2) <= I && FFABS(q2-q1) <= I && FFABS(q1-q0) <= I;\
 }
 
+NORMAL_LIMIT(7)
+NORMAL_LIMIT(8)
+
 // high edge variance
 static av_always_inline int hev(uint8_t *p, ptrdiff_t stride, int thresh)
 {
@@ -234,74 +340,85 @@
     p[ 2*stride] = cm[q2 - a2];
 }
 
-#define LOOP_FILTER(dir, size, stridea, strideb, maybe_inline) \
-static maybe_inline void vp8_ ## dir ## _loop_filter ## size ## _c(uint8_t *dst, ptrdiff_t stride,\
+#define LOOP_FILTER(vpn, dir, size, stridea, strideb, maybe_inline) \
+static maybe_inline void vp ## vpn ## _ ## dir ## _loop_filter ## size ## _c(uint8_t *dst, ptrdiff_t stride,\
                                      int flim_E, int flim_I, int hev_thresh)\
 {\
     int i;\
 \
     for (i = 0; i < size; i++)\
-        if (normal_limit(dst+i*stridea, strideb, flim_E, flim_I)) {\
+        if (vp ## vpn ## _normal_limit(dst+i*stridea, strideb, flim_E, flim_I)) {\
             if (hev(dst+i*stridea, strideb, hev_thresh))\
-                filter_common(dst+i*stridea, strideb, 1);\
+                filter_common(dst+i*stridea, strideb, 1, vpn);\
             else\
                 filter_mbedge(dst+i*stridea, strideb);\
         }\
 }\
 \
-static maybe_inline void vp8_ ## dir ## _loop_filter ## size ## _inner_c(uint8_t *dst, ptrdiff_t stride,\
+static maybe_inline void vp ## vpn ## _ ## dir ## _loop_filter ## size ## _inner_c(uint8_t *dst, ptrdiff_t stride,\
                                       int flim_E, int flim_I, int hev_thresh)\
 {\
     int i;\
 \
     for (i = 0; i < size; i++)\
-        if (normal_limit(dst+i*stridea, strideb, flim_E, flim_I)) {\
+        if (vp ## vpn ## _normal_limit(dst+i*stridea, strideb, flim_E, flim_I)) {\
             int hv = hev(dst+i*stridea, strideb, hev_thresh);\
             if (hv) \
-                filter_common(dst+i*stridea, strideb, 1);\
+                filter_common(dst+i*stridea, strideb, 1, vpn);\
             else \
-                filter_common(dst+i*stridea, strideb, 0);\
+                filter_common(dst+i*stridea, strideb, 0, vpn);\
         }\
 }
 
-LOOP_FILTER(v, 16, 1, stride,)
-LOOP_FILTER(h, 16, stride, 1,)
-
-#define UV_LOOP_FILTER(dir, stridea, strideb) \
-LOOP_FILTER(dir, 8, stridea, strideb, av_always_inline) \
-static void vp8_ ## dir ## _loop_filter8uv_c(uint8_t *dstU, uint8_t *dstV, ptrdiff_t stride,\
+#define UV_LOOP_FILTER(vpn, dir, stridea, strideb) \
+LOOP_FILTER(vpn, dir, 8, stridea, strideb, av_always_inline) \
+static void vp ## vpn ## _ ## dir ## _loop_filter8uv_c(uint8_t *dstU, uint8_t *dstV, ptrdiff_t stride,\
                                       int fE, int fI, int hev_thresh)\
 {\
-  vp8_ ## dir ## _loop_filter8_c(dstU, stride, fE, fI, hev_thresh);\
-  vp8_ ## dir ## _loop_filter8_c(dstV, stride, fE, fI, hev_thresh);\
+  vp ## vpn ## _ ## dir ## _loop_filter8_c(dstU, stride, fE, fI, hev_thresh);\
+  vp ## vpn ## _ ## dir ## _loop_filter8_c(dstV, stride, fE, fI, hev_thresh);\
 }\
-static void vp8_ ## dir ## _loop_filter8uv_inner_c(uint8_t *dstU, uint8_t *dstV, ptrdiff_t stride,\
+static void vp ## vpn ## _ ## dir ## _loop_filter8uv_inner_c(uint8_t *dstU, uint8_t *dstV, ptrdiff_t stride,\
                                       int fE, int fI, int hev_thresh)\
 {\
-  vp8_ ## dir ## _loop_filter8_inner_c(dstU, stride, fE, fI, hev_thresh);\
-  vp8_ ## dir ## _loop_filter8_inner_c(dstV, stride, fE, fI, hev_thresh);\
+  vp ## vpn ## _ ## dir ## _loop_filter8_inner_c(dstU, stride, fE, fI, hev_thresh);\
+  vp ## vpn ## _ ## dir ## _loop_filter8_inner_c(dstV, stride, fE, fI, hev_thresh);\
 }
 
-UV_LOOP_FILTER(v, 1, stride)
-UV_LOOP_FILTER(h, stride, 1)
-
-static void vp8_v_loop_filter_simple_c(uint8_t *dst, ptrdiff_t stride, int flim)
-{
-    int i;
-
-    for (i = 0; i < 16; i++)
-        if (simple_limit(dst+i, stride, flim))
-            filter_common(dst+i, stride, 1);
+#define LOOP_FILTER_SIMPLE(vpn) \
+static void vp ## vpn ## _v_loop_filter_simple_c(uint8_t *dst, ptrdiff_t stride, int flim)\
+{\
+    int i;\
+\
+    for (i = 0; i < 16; i++)\
+        if (vp ## vpn ## _simple_limit(dst+i, stride, flim))\
+            filter_common(dst+i, stride, 1, vpn);\
+}\
+\
+static void vp ## vpn ## _h_loop_filter_simple_c(uint8_t *dst, ptrdiff_t stride, int flim)\
+{\
+    int i;\
+\
+    for (i = 0; i < 16; i++)\
+        if (vp ## vpn ## _simple_limit(dst+i*stride, 1, flim))\
+            filter_common(dst+i*stride, 1, 1, vpn);\
 }
 
-static void vp8_h_loop_filter_simple_c(uint8_t *dst, ptrdiff_t stride, int flim)
-{
-    int i;
-
-    for (i = 0; i < 16; i++)
-        if (simple_limit(dst+i*stride, 1, flim))
-            filter_common(dst+i*stride, 1, 1);
-}
+#if CONFIG_VP7_DECODER
+LOOP_FILTER(7, v, 16, 1, stride,)
+LOOP_FILTER(7, h, 16, stride, 1,)
+UV_LOOP_FILTER(7, v, 1, stride)
+UV_LOOP_FILTER(7, h, stride, 1)
+LOOP_FILTER_SIMPLE(7)
+#endif
+
+#if CONFIG_VP8_DECODER
+LOOP_FILTER(8, v, 16, 1, stride,)
+LOOP_FILTER(8, h, 16, stride, 1,)
+UV_LOOP_FILTER(8, v, 1, stride)
+UV_LOOP_FILTER(8, h, stride, 1)
+LOOP_FILTER_SIMPLE(8)
+#endif
 
 static const uint8_t subpel_filters[7][6] = {
     { 0,   6, 123,  12,   1,   0 },
@@ -491,27 +608,35 @@
     dsp->put_vp8_bilinear_pixels_tab[IDX][2][1] = put_vp8_bilinear ## SIZE ## _hv_c; \
     dsp->put_vp8_bilinear_pixels_tab[IDX][2][2] = put_vp8_bilinear ## SIZE ## _hv_c
 
-av_cold void ff_vp8dsp_init(VP8DSPContext *dsp)
+av_cold void ff_vp8dsp_init(VP8DSPContext *dsp, int vp7)
 {
-    dsp->vp8_luma_dc_wht    = vp8_luma_dc_wht_c;
-    dsp->vp8_luma_dc_wht_dc = vp8_luma_dc_wht_dc_c;
-    dsp->vp8_idct_add       = vp8_idct_add_c;
-    dsp->vp8_idct_dc_add    = vp8_idct_dc_add_c;
-    dsp->vp8_idct_dc_add4y  = vp8_idct_dc_add4y_c;
-    dsp->vp8_idct_dc_add4uv = vp8_idct_dc_add4uv_c;
-
-    dsp->vp8_v_loop_filter16y = vp8_v_loop_filter16_c;
-    dsp->vp8_h_loop_filter16y = vp8_h_loop_filter16_c;
-    dsp->vp8_v_loop_filter8uv = vp8_v_loop_filter8uv_c;
-    dsp->vp8_h_loop_filter8uv = vp8_h_loop_filter8uv_c;
-
-    dsp->vp8_v_loop_filter16y_inner = vp8_v_loop_filter16_inner_c;
-    dsp->vp8_h_loop_filter16y_inner = vp8_h_loop_filter16_inner_c;
-    dsp->vp8_v_loop_filter8uv_inner = vp8_v_loop_filter8uv_inner_c;
-    dsp->vp8_h_loop_filter8uv_inner = vp8_h_loop_filter8uv_inner_c;
-
-    dsp->vp8_v_loop_filter_simple = vp8_v_loop_filter_simple_c;
-    dsp->vp8_h_loop_filter_simple = vp8_h_loop_filter_simple_c;
+#if CONFIG_VP7_DECODER && CONFIG_VP8_DECODER
+#define VPX(f) vp7 ? vp7_ ## f : vp8_ ## f
+#elif CONFIG_VP7_DECODER
+#define VPX(f) vp7_ ## f
+#else // CONFIG_VP8_DECODER
+#define VPX(f) vp8_ ## f
+#endif
+
+    dsp->vp8_luma_dc_wht    = VPX(luma_dc_wht_c);
+    dsp->vp8_luma_dc_wht_dc = VPX(luma_dc_wht_dc_c);
+    dsp->vp8_idct_add       = VPX(idct_add_c);
+    dsp->vp8_idct_dc_add    = VPX(idct_dc_add_c);
+    dsp->vp8_idct_dc_add4y  = VPX(idct_dc_add4y_c);
+    dsp->vp8_idct_dc_add4uv = VPX(idct_dc_add4uv_c);
+
+    dsp->vp8_v_loop_filter16y = VPX(v_loop_filter16_c);
+    dsp->vp8_h_loop_filter16y = VPX(h_loop_filter16_c);
+    dsp->vp8_v_loop_filter8uv = VPX(v_loop_filter8uv_c);
+    dsp->vp8_h_loop_filter8uv = VPX(h_loop_filter8uv_c);
+
+    dsp->vp8_v_loop_filter16y_inner = VPX(v_loop_filter16_inner_c);
+    dsp->vp8_h_loop_filter16y_inner = VPX(h_loop_filter16_inner_c);
+    dsp->vp8_v_loop_filter8uv_inner = VPX(v_loop_filter8uv_inner_c);
+    dsp->vp8_h_loop_filter8uv_inner = VPX(h_loop_filter8uv_inner_c);
+
+    dsp->vp8_v_loop_filter_simple = VPX(v_loop_filter_simple_c);
+    dsp->vp8_h_loop_filter_simple = VPX(h_loop_filter_simple_c);
 
     VP8_MC_FUNC(0, 16);
     VP8_MC_FUNC(1, 8);
@@ -522,9 +647,9 @@
     VP8_BILINEAR_MC_FUNC(2, 4);
 
     if (ARCH_ARM)
-        ff_vp8dsp_init_arm(dsp);
+        ff_vp8dsp_init_arm(dsp, vp7);
     if (ARCH_PPC)
         ff_vp8dsp_init_ppc(dsp);
     if (ARCH_X86)
-        ff_vp8dsp_init_x86(dsp);
+        ff_vp8dsp_init_x86(dsp, vp7);
 }

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/vp8dsp.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/vp8dsp.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/vp9.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/vp9.c Changed

@@ -24,6 +24,7 @@
 #include "avcodec.h"
 #include "get_bits.h"
 #include "internal.h"
+#include "thread.h"
 #include "videodsp.h"
 #include "vp56.h"
 #include "vp9.h"
@@ -68,6 +69,13 @@
     int8_t ref[2];
 };
 
+typedef struct VP9Frame {
+    ThreadFrame tf;
+    AVBufferRef *extradata;
+    uint8_t *segmentation_map;
+    struct VP9mvrefPair *mv;
+} VP9Frame;
+
 struct VP9Filter {
     uint8_t level[8 * 8];
     uint8_t /* bit=col */ mask[2 /* 0=y, 1=uv */][2 /* 0=col, 1=row */]
@@ -80,10 +88,8 @@
     VP56mv mv[4 /* b_idx */][2 /* ref */];
     enum BlockSize bs;
     enum TxfmMode tx, uvtx;
-
-    int row, row7, col, col7;
-    uint8_t *dst[3];
-    ptrdiff_t y_stride, uv_stride;
+    enum BlockLevel bl;
+    enum BlockPartition bp;
 } VP9Block;
 
 typedef struct VP9Context {
@@ -93,12 +99,16 @@
     VP56RangeCoder c;
     VP56RangeCoder *c_b;
     unsigned c_b_size;
-    VP9Block b;
+    VP9Block *b_base, *b;
+    int pass, uses_2pass, last_uses_2pass;
+    int row, row7, col, col7;
+    uint8_t *dst[3];
+    ptrdiff_t y_stride, uv_stride;
 
     // bitstream header
     uint8_t profile;
     uint8_t keyframe, last_keyframe;
-    uint8_t invisible, last_invisible;
+    uint8_t invisible;
     uint8_t use_last_frame_mvs;
     uint8_t errorres;
     uint8_t colorspace;
@@ -116,7 +126,10 @@
     uint8_t refidx[3];
     uint8_t signbias[3];
     uint8_t varcompref[2];
-    AVFrame *refs[8], *f, *fb[10];
+    ThreadFrame refs[8], next_refs[8];
+#define CUR_FRAME 0
+#define LAST_FRAME 1
+    VP9Frame frames[2];
 
     struct {
         uint8_t level;
@@ -197,33 +210,42 @@
     enum CompPredMode comppredmode;
 
     // contextual (left/above) cache
-    uint8_t left_partition_ctx[8], *above_partition_ctx;
-    uint8_t left_mode_ctx[16], *above_mode_ctx;
+    DECLARE_ALIGNED(16, uint8_t, left_y_nnz_ctx)[16];
+    DECLARE_ALIGNED(16, uint8_t, left_mode_ctx)[16];
+    DECLARE_ALIGNED(16, VP56mv, left_mv_ctx)[16][2];
+    DECLARE_ALIGNED(8, uint8_t, left_uv_nnz_ctx)[2][8];
+    DECLARE_ALIGNED(8, uint8_t, left_partition_ctx)[8];
+    DECLARE_ALIGNED(8, uint8_t, left_skip_ctx)[8];
+    DECLARE_ALIGNED(8, uint8_t, left_txfm_ctx)[8];
+    DECLARE_ALIGNED(8, uint8_t, left_segpred_ctx)[8];
+    DECLARE_ALIGNED(8, uint8_t, left_intra_ctx)[8];
+    DECLARE_ALIGNED(8, uint8_t, left_comp_ctx)[8];
+    DECLARE_ALIGNED(8, uint8_t, left_ref_ctx)[8];
+    DECLARE_ALIGNED(8, uint8_t, left_filter_ctx)[8];
+    uint8_t *above_partition_ctx;
+    uint8_t *above_mode_ctx;
     // FIXME maybe merge some of the below in a flags field?
-    uint8_t left_y_nnz_ctx[16], *above_y_nnz_ctx;
-    uint8_t left_uv_nnz_ctx[2][8], *above_uv_nnz_ctx[2];
-    uint8_t left_skip_ctx[8], *above_skip_ctx; // 1bit
-    uint8_t left_txfm_ctx[8], *above_txfm_ctx; // 2bit
-    uint8_t left_segpred_ctx[8], *above_segpred_ctx; // 1bit
-    uint8_t left_intra_ctx[8], *above_intra_ctx; // 1bit
-    uint8_t left_comp_ctx[8], *above_comp_ctx; // 1bit
-    uint8_t left_ref_ctx[8], *above_ref_ctx; // 2bit
-    uint8_t left_filter_ctx[8], *above_filter_ctx;
-    VP56mv left_mv_ctx[16][2], (*above_mv_ctx)[2];
+    uint8_t *above_y_nnz_ctx;
+    uint8_t *above_uv_nnz_ctx[2];
+    uint8_t *above_skip_ctx; // 1bit
+    uint8_t *above_txfm_ctx; // 2bit
+    uint8_t *above_segpred_ctx; // 1bit
+    uint8_t *above_intra_ctx; // 1bit
+    uint8_t *above_comp_ctx; // 1bit
+    uint8_t *above_ref_ctx; // 2bit
+    uint8_t *above_filter_ctx;
+    VP56mv (*above_mv_ctx)[2];
 
     // whole-frame cache
     uint8_t *intra_pred_data[3];
-    uint8_t *segmentation_map;
-    struct VP9mvrefPair *mv[2];
     struct VP9Filter *lflvl;
     DECLARE_ALIGNED(32, uint8_t, edge_emu_buffer)[71*80];
 
     // block reconstruction intermediates
-    DECLARE_ALIGNED(32, int16_t, block)[4096];
-    DECLARE_ALIGNED(32, int16_t, uvblock)[2][1024];
-    uint8_t eob[256];
-    uint8_t uveob[2][64];
-    VP56mv min_mv, max_mv;
+    int block_alloc_using_2pass;
+    int16_t *block_base, *block, *uvblock_base[2], *uvblock[2];
+    uint8_t *eob_base, *uveob_base[2], *eob, *uveob[2];
+    struct { int x, y; } min_mv, max_mv;
     DECLARE_ALIGNED(32, uint8_t, tmp_y)[64*64];
     DECLARE_ALIGNED(32, uint8_t, tmp_uv)[2][32*32];
 } VP9Context;
@@ -238,12 +260,62 @@
     }
 };
 
+static int vp9_alloc_frame(AVCodecContext *ctx, VP9Frame *f)
+{
+    VP9Context *s = ctx->priv_data;
+    int ret, sz;
+
+    if ((ret = ff_thread_get_buffer(ctx, &f->tf, AV_GET_BUFFER_FLAG_REF)) < 0)
+        return ret;
+    sz = 64 * s->sb_cols * s->sb_rows;
+    if (!(f->extradata = av_buffer_allocz(sz * (1 + sizeof(struct VP9mvrefPair))))) {
+        ff_thread_release_buffer(ctx, &f->tf);
+        return AVERROR(ENOMEM);
+    }
+
+    f->segmentation_map = f->extradata->data;
+    f->mv = (struct VP9mvrefPair *) (f->extradata->data + sz);
+
+    // retain segmentation map if it doesn't update
+    if (s->segmentation.enabled && !s->segmentation.update_map &&
+        !s->intraonly && !s->keyframe) {
+        memcpy(f->segmentation_map, s->frames[LAST_FRAME].segmentation_map, sz);
+    }
+
+    return 0;
+}
+
+static void vp9_unref_frame(AVCodecContext *ctx, VP9Frame *f)
+{
+    ff_thread_release_buffer(ctx, &f->tf);
+    av_buffer_unref(&f->extradata);
+}
+
+static int vp9_ref_frame(AVCodecContext *ctx, VP9Frame *dst, VP9Frame *src)
+{
+    int res;
+
+    if ((res = ff_thread_ref_frame(&dst->tf, &src->tf)) < 0) {
+        return res;
+    } else if (!(dst->extradata = av_buffer_ref(src->extradata))) {
+        vp9_unref_frame(ctx, dst);
+        return AVERROR(ENOMEM);
+    }
+
+    dst->segmentation_map = src->segmentation_map;
+    dst->mv = src->mv;
+
+    return 0;
+}
+
 static int update_size(AVCodecContext *ctx, int w, int h)
 {
     VP9Context *s = ctx->priv_data;
     uint8_t *p;
 
-    if (s->above_partition_ctx && w == ctx->width && h == ctx->height)
+    av_assert0(w > 0 && h > 0);
+
+    if (s->intra_pred_data[0] && w == ctx->width && h == ctx->height)
         return 0;
 
     ctx->width  = w;
@@ -254,33 +326,70 @@
     s->rows     = (h + 7) >> 3;
 
 #define assign(var, type, n) var = (type) p; p += s->sb_cols * n * sizeof(*var)
-    av_free(s->above_partition_ctx);
-    p = av_malloc(s->sb_cols * (240 + sizeof(*s->lflvl) + 16 * sizeof(*s->above_mv_ctx) +
-                                64 * s->sb_rows * (1 + sizeof(*s->mv[0]) * 2)));
+    av_freep(&s->intra_pred_data[0]);
+    p = av_malloc(s->sb_cols * (240 + sizeof(*s->lflvl) + 16 * sizeof(*s->above_mv_ctx)));
     if (!p)
         return AVERROR(ENOMEM);
+    assign(s->intra_pred_data[0],  uint8_t *,             64);
+    assign(s->intra_pred_data[1],  uint8_t *,             32);
+    assign(s->intra_pred_data[2],  uint8_t *,             32);
+    assign(s->above_y_nnz_ctx,     uint8_t *,             16);
+    assign(s->above_mode_ctx,      uint8_t *,             16);
+    assign(s->above_mv_ctx,        VP56mv(*)[2],          16);
     assign(s->above_partition_ctx, uint8_t *,              8);
     assign(s->above_skip_ctx,      uint8_t *,              8);
     assign(s->above_txfm_ctx,      uint8_t *,              8);
-    assign(s->above_mode_ctx,      uint8_t *,             16);
-    assign(s->above_y_nnz_ctx,     uint8_t *,             16);
     assign(s->above_uv_nnz_ctx[0], uint8_t *,              8);
     assign(s->above_uv_nnz_ctx[1], uint8_t *,              8);
-    assign(s->intra_pred_data[0],  uint8_t *,             64);
-    assign(s->intra_pred_data[1],  uint8_t *,             32);
-    assign(s->intra_pred_data[2],  uint8_t *,             32);
     assign(s->above_segpred_ctx,   uint8_t *,              8);
     assign(s->above_intra_ctx,     uint8_t *,              8);
     assign(s->above_comp_ctx,      uint8_t *,              8);
     assign(s->above_ref_ctx,       uint8_t *,              8);
     assign(s->above_filter_ctx,    uint8_t *,              8);
     assign(s->lflvl,               struct VP9Filter *,     1);
-    assign(s->above_mv_ctx,        VP56mv(*)[2],          16);
-    assign(s->segmentation_map,    uint8_t *,             64 * s->sb_rows);
-    assign(s->mv[0],               struct VP9mvrefPair *, 64 * s->sb_rows);
-    assign(s->mv[1],               struct VP9mvrefPair *, 64 * s->sb_rows);
 #undef assign
 
+    // these will be re-allocated a little later
+    av_freep(&s->b_base);
+    av_freep(&s->block_base);
+
+    return 0;
+}
+
+static int update_block_buffers(AVCodecContext *ctx)
+{
+    VP9Context *s = ctx->priv_data;
+
+    if (s->b_base && s->block_base && s->block_alloc_using_2pass == s->uses_2pass)
+        return 0;
+
+    av_free(s->b_base);
+    av_free(s->block_base);
+    if (s->uses_2pass) {
+        int sbs = s->sb_cols * s->sb_rows;
+
+        s->b_base = av_malloc(sizeof(VP9Block) * s->cols * s->rows);
+        s->block_base = av_mallocz((64 * 64 + 128) * sbs * 3);
+        if (!s->b_base || !s->block_base)
+            return AVERROR(ENOMEM);
+        s->uvblock_base[0] = s->block_base + sbs * 64 * 64;
+        s->uvblock_base[1] = s->uvblock_base[0] + sbs * 32 * 32;
+        s->eob_base = (uint8_t *) (s->uvblock_base[1] + sbs * 32 * 32);
+        s->uveob_base[0] = s->eob_base + 256 * sbs;
+        s->uveob_base[1] = s->uveob_base[0] + 64 * sbs;
+    } else {
+        s->b_base = av_malloc(sizeof(VP9Block));
+        s->block_base = av_mallocz((64 * 64 + 128) * 3);
+        if (!s->b_base || !s->block_base)
+            return AVERROR(ENOMEM);
+        s->uvblock_base[0] = s->block_base + 64 * 64;
+        s->uvblock_base[1] = s->uvblock_base[0] + 32 * 32;
+        s->eob_base = (uint8_t *) (s->uvblock_base[1] + 32 * 32);
+        s->uveob_base[0] = s->eob_base + 256;
+        s->uveob_base[1] = s->uveob_base[0] + 64;
+    }
+    s->block_alloc_using_2pass = s->uses_2pass;
+
     return 0;
 }
 
@@ -359,11 +468,12 @@
 {
     VP9Context *s = ctx->priv_data;
     int c, i, j, k, l, m, n, w, h, max, size2, res, sharp;
+    int last_invisible;
     const uint8_t *data2;
 
     /* general header */
     if ((res = init_get_bits8(&s->gb, data, size)) < 0) {
-        av_log(ctx, AV_LOG_ERROR, "Failed to intialize bitstream reader\n");
+        av_log(ctx, AV_LOG_ERROR, "Failed to initialize bitstream reader\n");
         return res;
     }
     if (get_bits(&s->gb, 2) != 0x2) { // frame marker
@@ -379,13 +489,13 @@
         *ref = get_bits(&s->gb, 3);
         return 0;
     }
+    s->last_uses_2pass = s->uses_2pass;
     s->last_keyframe  = s->keyframe;
     s->keyframe       = !get_bits1(&s->gb);
-    s->last_invisible = s->invisible;
+    last_invisible    = s->invisible;
     s->invisible      = !get_bits1(&s->gb);
     s->errorres       = get_bits1(&s->gb);
-    // FIXME disable this upon resolution change
-    s->use_last_frame_mvs = !s->errorres && !s->last_invisible;
+    s->use_last_frame_mvs = !s->errorres && !last_invisible;
     if (s->keyframe) {
         if (get_bits_long(&s->gb, 24) != VP9_SYNCCODE) { // synccode
             av_log(ctx, AV_LOG_ERROR, "Invalid sync code\n");
@@ -424,24 +534,30 @@
             s->signbias[1]    = get_bits1(&s->gb);
             s->refidx[2]      = get_bits(&s->gb, 3);
             s->signbias[2]    = get_bits1(&s->gb);
-            if (!s->refs[s->refidx[0]] || !s->refs[s->refidx[1]] ||
-                !s->refs[s->refidx[2]]) {
+            if (!s->refs[s->refidx[0]].f->data[0] ||
+                !s->refs[s->refidx[1]].f->data[0] ||
+                !s->refs[s->refidx[2]].f->data[0]) {
                 av_log(ctx, AV_LOG_ERROR, "Not all references are available\n");
                 return AVERROR_INVALIDDATA;
             }
             if (get_bits1(&s->gb)) {
-                w = s->refs[s->refidx[0]]->width;
-                h = s->refs[s->refidx[0]]->height;
+                w = s->refs[s->refidx[0]].f->width;
+                h = s->refs[s->refidx[0]].f->height;
             } else if (get_bits1(&s->gb)) {
-                w = s->refs[s->refidx[1]]->width;
-                h = s->refs[s->refidx[1]]->height;
+                w = s->refs[s->refidx[1]].f->width;
+                h = s->refs[s->refidx[1]].f->height;
             } else if (get_bits1(&s->gb)) {
-                w = s->refs[s->refidx[2]]->width;
-                h = s->refs[s->refidx[2]]->height;
+                w = s->refs[s->refidx[2]].f->width;
+                h = s->refs[s->refidx[2]].f->height;
             } else {
                 w = get_bits(&s->gb, 16) + 1;
                 h = get_bits(&s->gb, 16) + 1;
             }
+            // Note that in this code, "CUR_FRAME" is actually before we
+            // have formally allocated a frame, and thus actually represents
+            // the _last_ frame
+            s->use_last_frame_mvs &= s->frames[CUR_FRAME].tf.f->width == w &&
+                                     s->frames[CUR_FRAME].tf.f->height == h;
             if (get_bits1(&s->gb)) // display size
                 skip_bits(&s->gb, 32);
             s->highprecisionmvs = get_bits1(&s->gb);
@@ -505,10 +621,19 @@
             for (i = 0; i < 7; i++)
                 s->prob.seg[i] = get_bits1(&s->gb) ?
                                  get_bits(&s->gb, 8) : 255;
-            if ((s->segmentation.temporal = get_bits1(&s->gb)))
+            if ((s->segmentation.temporal = get_bits1(&s->gb))) {
                 for (i = 0; i < 3; i++)
                     s->prob.segpred[i] = get_bits1(&s->gb) ?
                                          get_bits(&s->gb, 8) : 255;
+            }
+        }
+        if ((!s->segmentation.update_map || s->segmentation.temporal) &&
+            (w != s->frames[CUR_FRAME].tf.f->width ||
+             h != s->frames[CUR_FRAME].tf.f->height)) {
+            av_log(ctx, AV_LOG_ERROR,
+                   "Reference segmap (temp=%d,update=%d) enabled on size-change!\n",
+                   s->segmentation.temporal, s->segmentation.update_map);
+            return AVERROR_INVALIDDATA;
         }
 
         if (get_bits1(&s->gb)) {
@@ -857,8 +982,8 @@
         [BS_4x4]   = {{  0, -1 }, { -1,  0 }, { -1, -1 }, {  0, -2 },
                       { -2,  0 }, { -1, -2 }, { -2, -1 }, { -2, -2 }},
     };
-    VP9Block *const b = &s->b;
-    int row = b->row, col = b->col, row7 = b->row7;
+    VP9Block *b = s->b;
+    int row = s->row, col = s->col, row7 = s->row7;
     const int8_t (*p)[2] = mv_ref_blk_off[b->bs];
 #define INVALID_MV 0x80008000U
     uint32_t mem = INVALID_MV;
@@ -918,7 +1043,7 @@
     } while (0)
 
         if (row > 0) {
-            struct VP9mvrefPair *mv = &s->mv[0][(row - 1) * s->sb_cols * 8 + col];
+            struct VP9mvrefPair *mv = &s->frames[CUR_FRAME].mv[(row - 1) * s->sb_cols * 8 + col];
             if (mv->ref[0] == ref) {
                 RETURN_MV(s->above_mv_ctx[2 * col + (sb & 1)][0]);
             } else if (mv->ref[1] == ref) {
@@ -926,7 +1051,7 @@
             }
         }
         if (col > s->tiling.tile_col_start) {
-            struct VP9mvrefPair *mv = &s->mv[0][row * s->sb_cols * 8 + col - 1];
+            struct VP9mvrefPair *mv = &s->frames[CUR_FRAME].mv[row * s->sb_cols * 8 + col - 1];
             if (mv->ref[0] == ref) {
                 RETURN_MV(s->left_mv_ctx[2 * row7 + (sb >> 1)][0]);
             } else if (mv->ref[1] == ref) {
@@ -943,7 +1068,7 @@
         int c = p[i][0] + col, r = p[i][1] + row;
 
         if (c >= s->tiling.tile_col_start && c < s->cols && r >= 0 && r < s->rows) {
-            struct VP9mvrefPair *mv = &s->mv[0][r * s->sb_cols * 8 + c];
+            struct VP9mvrefPair *mv = &s->frames[CUR_FRAME].mv[r * s->sb_cols * 8 + c];
 
             if (mv->ref[0] == ref) {
                 RETURN_MV(mv->mv[0]);
@@ -955,8 +1080,10 @@
 
     // MV at this position in previous frame, using same reference frame
     if (s->use_last_frame_mvs) {
-        struct VP9mvrefPair *mv = &s->mv[1][row * s->sb_cols * 8 + col];
+        struct VP9mvrefPair *mv = &s->frames[LAST_FRAME].mv[row * s->sb_cols * 8 + col];
 
+        if (!s->last_uses_2pass)
+            ff_thread_await_progress(&s->frames[LAST_FRAME].tf, row >> 3, 0);
         if (mv->ref[0] == ref) {
             RETURN_MV(mv->mv[0]);
         } else if (mv->ref[1] == ref) {
@@ -979,12 +1106,15 @@
         int c = p[i][0] + col, r = p[i][1] + row;
 
         if (c >= s->tiling.tile_col_start && c < s->cols && r >= 0 && r < s->rows) {
-            struct VP9mvrefPair *mv = &s->mv[0][r * s->sb_cols * 8 + c];
+            struct VP9mvrefPair *mv = &s->frames[CUR_FRAME].mv[r * s->sb_cols * 8 + c];
 
             if (mv->ref[0] != ref && mv->ref[0] >= 0) {
                 RETURN_SCALE_MV(mv->mv[0], s->signbias[mv->ref[0]] != s->signbias[ref]);
             }
-            if (mv->ref[1] != ref && mv->ref[1] >= 0) {
+            if (mv->ref[1] != ref && mv->ref[1] >= 0 &&
+                // BUG - libvpx has this condition regardless of whether
+                // we used the first ref MV and pre-scaling
+                AV_RN32A(&mv->mv[0]) != AV_RN32A(&mv->mv[1])) {
                 RETURN_SCALE_MV(mv->mv[1], s->signbias[mv->ref[1]] != s->signbias[ref]);
             }
         }
@@ -992,12 +1122,16 @@
 
     // MV at this position in previous frame, using different reference frame
     if (s->use_last_frame_mvs) {
-        struct VP9mvrefPair *mv = &s->mv[1][row * s->sb_cols * 8 + col];
+        struct VP9mvrefPair *mv = &s->frames[LAST_FRAME].mv[row * s->sb_cols * 8 + col];
 
+        // no need to await_progress, because we already did that above
         if (mv->ref[0] != ref && mv->ref[0] >= 0) {
             RETURN_SCALE_MV(mv->mv[0], s->signbias[mv->ref[0]] != s->signbias[ref]);
         }
-        if (mv->ref[1] != ref && mv->ref[1] >= 0) {
+        if (mv->ref[1] != ref && mv->ref[1] >= 0 &&
+            // BUG - libvpx has this condition regardless of whether
+            // we used the first ref MV and pre-scaling
+            AV_RN32A(&mv->mv[0]) != AV_RN32A(&mv->mv[1])) {
             RETURN_SCALE_MV(mv->mv[1], s->signbias[mv->ref[1]] != s->signbias[ref]);
         }
     }
@@ -1064,10 +1198,10 @@
 static void fill_mv(VP9Context *s,
                     VP56mv *mv, int mode, int sb)
 {
-    VP9Block *const b = &s->b;
+    VP9Block *b = s->b;
 
     if (mode == ZEROMV) {
-        memset(mv, 0, sizeof(*mv) * 2);
+        AV_ZERO64(mv);
     } else {
         int hp;
 
@@ -1134,6 +1268,52 @@
     }
 }
 
+static av_always_inline void setctx_2d(uint8_t *ptr, int w, int h,
+                                       ptrdiff_t stride, int v)
+{
+    switch (w) {
+    case 1:
+        do {
+            *ptr = v;
+            ptr += stride;
+        } while (--h);
+        break;
+    case 2: {
+        int v16 = v * 0x0101;
+        do {
+            AV_WN16A(ptr, v16);
+            ptr += stride;
+        } while (--h);
+        break;
+    }
+    case 4: {
+        uint32_t v32 = v * 0x01010101;
+        do {
+            AV_WN32A(ptr, v32);
+            ptr += stride;
+        } while (--h);
+        break;
+    }
+    case 8: {
+#if HAVE_FAST_64BIT
+        uint64_t v64 = v * 0x0101010101010101ULL;
+        do {
+            AV_WN64A(ptr, v64);
+            ptr += stride;
+        } while (--h);
+#else
+        uint32_t v32 = v * 0x01010101;
+        do {
+            AV_WN32A(ptr,     v32);
+            AV_WN32A(ptr + 4, v32);
+            ptr += stride;
+        } while (--h);
+#endif
+        break;
+    }
+    }
+}
+
 static void decode_mode(AVCodecContext *ctx)
 {
     static const uint8_t left_ctx[N_BS_SIZES] = {
@@ -1147,28 +1327,31 @@
         TX_16X16, TX_8X8, TX_8X8, TX_8X8, TX_4X4, TX_4X4, TX_4X4
     };
     VP9Context *s = ctx->priv_data;
-    VP9Block *const b = &s->b;
-    int row = b->row, col = b->col, row7 = b->row7;
+    VP9Block *b = s->b;
+    int row = s->row, col = s->col, row7 = s->row7;
     enum TxfmMode max_tx = max_tx_for_bl_bp[b->bs];
     int w4 = FFMIN(s->cols - col, bwh_tab[1][b->bs][0]);
     int h4 = FFMIN(s->rows - row, bwh_tab[1][b->bs][1]), y;
     int have_a = row > 0, have_l = col > s->tiling.tile_col_start;
+    int vref, filter_id;
 
     if (!s->segmentation.enabled) {
         b->seg_id = 0;
     } else if (s->keyframe || s->intraonly) {
-        b->seg_id = s->segmentation.update_map ?
-            vp8_rac_get_tree(&s->c, vp9_segmentation_tree, s->prob.seg) : 0;
+        b->seg_id = vp8_rac_get_tree(&s->c, vp9_segmentation_tree, s->prob.seg);
     } else if (!s->segmentation.update_map ||
                (s->segmentation.temporal &&
                 vp56_rac_get_prob_branchy(&s->c,
                     s->prob.segpred[s->above_segpred_ctx[col] +
                                     s->left_segpred_ctx[row7]]))) {
         int pred = 8, x;
+        uint8_t *refsegmap = s->frames[LAST_FRAME].segmentation_map;
 
+        if (!s->last_uses_2pass)
+            ff_thread_await_progress(&s->frames[LAST_FRAME].tf, row >> 3, 0);
         for (y = 0; y < h4; y++)
             for (x = 0; x < w4; x++)
-                pred = FFMIN(pred, s->segmentation_map[(y + row) * 8 * s->sb_cols + x + col]);
+                pred = FFMIN(pred, refsegmap[(y + row) * 8 * s->sb_cols + x + col]);
         av_assert1(pred < 8);
         b->seg_id = pred;
 
@@ -1181,10 +1364,10 @@
         memset(&s->above_segpred_ctx[col], 0, w4);
         memset(&s->left_segpred_ctx[row7], 0, h4);
     }
-    if ((s->segmentation.enabled && s->segmentation.update_map) || s->keyframe) {
-        for (y = 0; y < h4; y++)
-            memset(&s->segmentation_map[(y + row) * 8 * s->sb_cols + col],
-                   b->seg_id, w4);
+    if (s->segmentation.enabled &&
+        (s->segmentation.update_map || s->keyframe || s->intraonly)) {
+        setctx_2d(&s->frames[CUR_FRAME].segmentation_map[row * 8 * s->sb_cols + col],
+                  w4, h4, 8 * s->sb_cols, b->seg_id);
     }
 
     b->skip = s->segmentation.enabled &&
@@ -1642,9 +1825,10 @@
                 c = 3;
             }
 
-            b->filter = vp8_rac_get_tree(&s->c, vp9_filter_tree,
+            filter_id = vp8_rac_get_tree(&s->c, vp9_filter_tree,
                                          s->prob.p.filter[c]);
-            s->counts.filter[c][b->filter]++;
+            s->counts.filter[c][filter_id]++;
+            b->filter = vp9_filter_lut[filter_id];
         } else {
             b->filter = s->filtermode;
         }
@@ -1701,27 +1885,80 @@
             AV_COPY32(&b->mv[2][1], &b->mv[0][1]);
             AV_COPY32(&b->mv[3][1], &b->mv[0][1]);
         }
+
+        vref = b->ref[b->comp ? s->signbias[s->varcompref[0]] : 0];
+    }
+
+#if HAVE_FAST_64BIT
+#define SPLAT_CTX(var, val, n) \
+    switch (n) { \
+    case 1:  var = val;                                    break; \
+    case 2:  AV_WN16A(&var, val *             0x0101);     break; \
+    case 4:  AV_WN32A(&var, val *         0x01010101);     break; \
+    case 8:  AV_WN64A(&var, val * 0x0101010101010101ULL);  break; \
+    case 16: { \
+        uint64_t v64 = val * 0x0101010101010101ULL; \
+        AV_WN64A(              &var,     v64); \
+        AV_WN64A(&((uint8_t *) &var)[8], v64); \
+        break; \
+    } \
+    }
+#else
+#define SPLAT_CTX(var, val, n) \
+    switch (n) { \
+    case 1:  var = val;                         break; \
+    case 2:  AV_WN16A(&var, val *     0x0101);  break; \
+    case 4:  AV_WN32A(&var, val * 0x01010101);  break; \
+    case 8: { \
+        uint32_t v32 = val * 0x01010101; \
+        AV_WN32A(              &var,     v32); \
+        AV_WN32A(&((uint8_t *) &var)[4], v32); \
+        break; \
+    } \
+    case 16: { \
+        uint32_t v32 = val * 0x01010101; \
+        AV_WN32A(              &var,      v32); \
+        AV_WN32A(&((uint8_t *) &var)[4],  v32); \
+        AV_WN32A(&((uint8_t *) &var)[8],  v32); \
+        AV_WN32A(&((uint8_t *) &var)[12], v32); \
+        break; \
+    } \
+    }
+#endif
+
+    switch (bwh_tab[1][b->bs][0]) {
+#define SET_CTXS(dir, off, n) \
+    do { \
+        SPLAT_CTX(s->dir##_skip_ctx[off],      b->skip,          n); \
+        SPLAT_CTX(s->dir##_txfm_ctx[off],      b->tx,            n); \
+        SPLAT_CTX(s->dir##_partition_ctx[off], dir##_ctx[b->bs], n); \
+        if (!s->keyframe && !s->intraonly) { \
+            SPLAT_CTX(s->dir##_intra_ctx[off], b->intra,   n); \
+            SPLAT_CTX(s->dir##_comp_ctx[off],  b->comp,    n); \
+            SPLAT_CTX(s->dir##_mode_ctx[off],  b->mode[3], n); \
+            if (!b->intra) { \
+                SPLAT_CTX(s->dir##_ref_ctx[off], vref, n); \
+                if (s->filtermode == FILTER_SWITCHABLE) { \
+                    SPLAT_CTX(s->dir##_filter_ctx[off], filter_id, n); \
+                } \
+            } \
+        } \
+    } while (0)
+    case 1: SET_CTXS(above, col, 1); break;
+    case 2: SET_CTXS(above, col, 2); break;
+    case 4: SET_CTXS(above, col, 4); break;
+    case 8: SET_CTXS(above, col, 8); break;
+    }
+    switch (bwh_tab[1][b->bs][1]) {
+    case 1: SET_CTXS(left, row7, 1); break;
+    case 2: SET_CTXS(left, row7, 2); break;
+    case 4: SET_CTXS(left, row7, 4); break;
+    case 8: SET_CTXS(left, row7, 8); break;
     }
+#undef SPLAT_CTX
+#undef SET_CTXS
 
-    // FIXME this can probably be optimized
-    memset(&s->above_skip_ctx[col], b->skip, w4);
-    memset(&s->left_skip_ctx[row7], b->skip, h4);
-    memset(&s->above_txfm_ctx[col], b->tx, w4);
-    memset(&s->left_txfm_ctx[row7], b->tx, h4);
-    memset(&s->above_partition_ctx[col], above_ctx[b->bs], w4);
-    memset(&s->left_partition_ctx[row7], left_ctx[b->bs], h4);
     if (!s->keyframe && !s->intraonly) {
-        memset(&s->above_intra_ctx[col], b->intra, w4);
-        memset(&s->left_intra_ctx[row7], b->intra, h4);
-        memset(&s->above_comp_ctx[col], b->comp, w4);
-        memset(&s->left_comp_ctx[row7], b->comp, h4);
-        memset(&s->above_mode_ctx[col], b->mode[3], w4);
-        memset(&s->left_mode_ctx[row7], b->mode[3], h4);
-        if (s->filtermode == FILTER_SWITCHABLE && !b->intra ) {
-            memset(&s->above_filter_ctx[col], b->filter, w4);
-            memset(&s->left_filter_ctx[row7], b->filter, h4);
-            b->filter = vp9_filter_lut[b->filter];
-        }
         if (b->bs > BS_8x8) {
             int mv0 = AV_RN32A(&b->mv[3][0]), mv1 = AV_RN32A(&b->mv[3][1]);
 
@@ -1745,48 +1982,42 @@
                 AV_WN32A(&s->left_mv_ctx[row7 * 2 + n][1], mv1);
             }
         }
-
-        if (!b->intra) { // FIXME write 0xff or -1 if intra, so we can use this
-                         // as a direct check in above branches
-            int vref = b->ref[b->comp ? s->signbias[s->varcompref[0]] : 0];
-
-            memset(&s->above_ref_ctx[col], vref, w4);
-            memset(&s->left_ref_ctx[row7], vref, h4);
-        }
     }
 
     // FIXME kinda ugly
     for (y = 0; y < h4; y++) {
         int x, o = (row + y) * s->sb_cols * 8 + col;
+        struct VP9mvrefPair *mv = &s->frames[CUR_FRAME].mv[o];
 
         if (b->intra) {
             for (x = 0; x < w4; x++) {
-                s->mv[0][o + x].ref[0] =
-                s->mv[0][o + x].ref[1] = -1;
+                mv[x].ref[0] =
+                mv[x].ref[1] = -1;
             }
         } else if (b->comp) {
             for (x = 0; x < w4; x++) {
-                s->mv[0][o + x].ref[0] = b->ref[0];
-                s->mv[0][o + x].ref[1] = b->ref[1];
-                AV_COPY32(&s->mv[0][o + x].mv[0], &b->mv[3][0]);
-                AV_COPY32(&s->mv[0][o + x].mv[1], &b->mv[3][1]);
+                mv[x].ref[0] = b->ref[0];
+                mv[x].ref[1] = b->ref[1];
+                AV_COPY32(&mv[x].mv[0], &b->mv[3][0]);
+                AV_COPY32(&mv[x].mv[1], &b->mv[3][1]);
             }
         } else {
             for (x = 0; x < w4; x++) {
-                s->mv[0][o + x].ref[0] = b->ref[0];
-                s->mv[0][o + x].ref[1] = -1;
-                AV_COPY32(&s->mv[0][o + x].mv[0], &b->mv[3][0]);
+                mv[x].ref[0] = b->ref[0];
+                mv[x].ref[1] = -1;
+                AV_COPY32(&mv[x].mv[0], &b->mv[3][0]);
             }
         }
     }
 }
 
-// FIXME remove tx argument, and merge cnt/eob arguments?
-static int decode_coeffs_b(VP56RangeCoder *c, int16_t *coef, int n_coeffs,
-                           enum TxfmMode tx, unsigned (*cnt)[6][3],
-                           unsigned (*eob)[6][2], uint8_t (*p)[6][11],
-                           int nnz, const int16_t *scan, const int16_t (*nb)[2],
-                           const int16_t *band_counts, const int16_t *qmul)
+// FIXME merge cnt/eob arguments?
+static av_always_inline int
+decode_coeffs_b_generic(VP56RangeCoder *c, int16_t *coef, int n_coeffs,
+                        int is_tx32x32, unsigned (*cnt)[6][3],
+                        unsigned (*eob)[6][2], uint8_t (*p)[6][11],
+                        int nnz, const int16_t *scan, const int16_t (*nb)[2],
+                        const int16_t *band_counts, const int16_t *qmul)
 {
     int i = 0, band = 0, band_left = band_counts[band];
     uint8_t *tp = p[0][nnz];
@@ -1836,49 +2067,49 @@
                 if (!vp56_rac_get_prob_branchy(c, tp[7])) {
                     val = 5 + vp56_rac_get_prob(c, 159);
                 } else {
-                    val = 7 + (vp56_rac_get_prob(c, 165) << 1) +
-                               vp56_rac_get_prob(c, 145);
+                    val  = 7 + (vp56_rac_get_prob(c, 165) << 1);
+                    val +=      vp56_rac_get_prob(c, 145);
                 }
             } else { // cat 3-6
                 cache[rc] = 5;
                 if (!vp56_rac_get_prob_branchy(c, tp[8])) {
                     if (!vp56_rac_get_prob_branchy(c, tp[9])) {
-                        val = 11 + (vp56_rac_get_prob(c, 173) << 2) +
-                                   (vp56_rac_get_prob(c, 148) << 1) +
-                                    vp56_rac_get_prob(c, 140);
+                        val  = 11 + (vp56_rac_get_prob(c, 173) << 2);
+                        val +=      (vp56_rac_get_prob(c, 148) << 1);
+                        val +=       vp56_rac_get_prob(c, 140);
                     } else {
-                        val = 19 + (vp56_rac_get_prob(c, 176) << 3) +
-                                   (vp56_rac_get_prob(c, 155) << 2) +
-                                   (vp56_rac_get_prob(c, 140) << 1) +
-                                    vp56_rac_get_prob(c, 135);
+                        val  = 19 + (vp56_rac_get_prob(c, 176) << 3);
+                        val +=      (vp56_rac_get_prob(c, 155) << 2);
+                        val +=      (vp56_rac_get_prob(c, 140) << 1);
+                        val +=       vp56_rac_get_prob(c, 135);
                     }
                 } else if (!vp56_rac_get_prob_branchy(c, tp[10])) {
-                    val = 35 + (vp56_rac_get_prob(c, 180) << 4) +
-                               (vp56_rac_get_prob(c, 157) << 3) +
-                               (vp56_rac_get_prob(c, 141) << 2) +
-                               (vp56_rac_get_prob(c, 134) << 1) +
-                                vp56_rac_get_prob(c, 130);
+                    val  = 35 + (vp56_rac_get_prob(c, 180) << 4);
+                    val +=      (vp56_rac_get_prob(c, 157) << 3);
+                    val +=      (vp56_rac_get_prob(c, 141) << 2);
+                    val +=      (vp56_rac_get_prob(c, 134) << 1);
+                    val +=       vp56_rac_get_prob(c, 130);
                 } else {
-                    val = 67 + (vp56_rac_get_prob(c, 254) << 13) +
-                               (vp56_rac_get_prob(c, 254) << 12) +
-                               (vp56_rac_get_prob(c, 254) << 11) +
-                               (vp56_rac_get_prob(c, 252) << 10) +
-                               (vp56_rac_get_prob(c, 249) << 9) +
-                               (vp56_rac_get_prob(c, 243) << 8) +
-                               (vp56_rac_get_prob(c, 230) << 7) +
-                               (vp56_rac_get_prob(c, 196) << 6) +
-                               (vp56_rac_get_prob(c, 177) << 5) +
-                               (vp56_rac_get_prob(c, 153) << 4) +
-                               (vp56_rac_get_prob(c, 140) << 3) +
-                               (vp56_rac_get_prob(c, 133) << 2) +
-                               (vp56_rac_get_prob(c, 130) << 1) +
-                                vp56_rac_get_prob(c, 129);
+                    val  = 67 + (vp56_rac_get_prob(c, 254) << 13);
+                    val +=      (vp56_rac_get_prob(c, 254) << 12);
+                    val +=      (vp56_rac_get_prob(c, 254) << 11);
+                    val +=      (vp56_rac_get_prob(c, 252) << 10);
+                    val +=      (vp56_rac_get_prob(c, 249) << 9);
+                    val +=      (vp56_rac_get_prob(c, 243) << 8);
+                    val +=      (vp56_rac_get_prob(c, 230) << 7);
+                    val +=      (vp56_rac_get_prob(c, 196) << 6);
+                    val +=      (vp56_rac_get_prob(c, 177) << 5);
+                    val +=      (vp56_rac_get_prob(c, 153) << 4);
+                    val +=      (vp56_rac_get_prob(c, 140) << 3);
+                    val +=      (vp56_rac_get_prob(c, 133) << 2);
+                    val +=      (vp56_rac_get_prob(c, 130) << 1);
+                    val +=       vp56_rac_get_prob(c, 129);
                 }
             }
         }
         if (!--band_left)
             band_left = band_counts[++band];
-        if (tx == TX_32X32) // FIXME slow
+        if (is_tx32x32)
             coef[rc] = ((vp8_rac_get(c) ? -val : val) * qmul[!!i]) / 2;
         else
             coef[rc] = (vp8_rac_get(c) ? -val : val) * qmul[!!i];
@@ -1889,23 +2120,42 @@
     return i;
 }
 
-static int decode_coeffs(AVCodecContext *ctx)
+static int decode_coeffs_b(VP56RangeCoder *c, int16_t *coef, int n_coeffs,
+                           unsigned (*cnt)[6][3], unsigned (*eob)[6][2],
+                           uint8_t (*p)[6][11], int nnz, const int16_t *scan,
+                           const int16_t (*nb)[2], const int16_t *band_counts,
+                           const int16_t *qmul)
+{
+    return decode_coeffs_b_generic(c, coef, n_coeffs, 0, cnt, eob, p,
+                                   nnz, scan, nb, band_counts, qmul);
+}
+
+static int decode_coeffs_b32(VP56RangeCoder *c, int16_t *coef, int n_coeffs,
+                             unsigned (*cnt)[6][3], unsigned (*eob)[6][2],
+                             uint8_t (*p)[6][11], int nnz, const int16_t *scan,
+                             const int16_t (*nb)[2], const int16_t *band_counts,
+                             const int16_t *qmul)
+{
+    return decode_coeffs_b_generic(c, coef, n_coeffs, 1, cnt, eob, p,
+                                   nnz, scan, nb, band_counts, qmul);
+}
+
+static void decode_coeffs(AVCodecContext *ctx)
 {
     VP9Context *s = ctx->priv_data;
-    VP9Block *const b = &s->b;
-    int row = b->row, col = b->col;
+    VP9Block *b = s->b;
+    int row = s->row, col = s->col;
     uint8_t (*p)[6][11] = s->prob.coef[b->tx][0 /* y */][!b->intra];
     unsigned (*c)[6][3] = s->counts.coef[b->tx][0 /* y */][!b->intra];
     unsigned (*e)[6][2] = s->counts.eob[b->tx][0 /* y */][!b->intra];
     int w4 = bwh_tab[1][b->bs][0] << 1, h4 = bwh_tab[1][b->bs][1] << 1;
     int end_x = FFMIN(2 * (s->cols - col), w4);
     int end_y = FFMIN(2 * (s->rows - row), h4);
-    int n, pl, x, y, step1d = 1 << b->tx, step = 1 << (b->tx * 2);
-    int uvstep1d = 1 << b->uvtx, uvstep = 1 << (b->uvtx * 2), res;
+    int n, pl, x, y, res;
     int16_t (*qmul)[2] = s->segmentation.feat[b->seg_id].qmul;
     int tx = 4 * s->lossless + b->tx;
-    const int16_t **yscans = vp9_scans[tx];
-    const int16_t (**ynbs)[2] = vp9_scans_nb[tx];
+    const int16_t * const *yscans = vp9_scans[tx];
+    const int16_t (* const *ynbs)[2] = vp9_scans_nb[tx];
     const int16_t *uvscan = vp9_scans[b->uvtx][DCT_DCT];
     const int16_t (*uvnb)[2] = vp9_scans_nb[b->uvtx][DCT_DCT];
     uint8_t *a = &s->above_y_nnz_ctx[col * 2];
@@ -1919,38 +2169,97 @@
     const int16_t *y_band_counts = band_counts[b->tx];
     const int16_t *uv_band_counts = band_counts[b->uvtx];
 
-    /* y tokens */
-    if (b->tx > TX_4X4) { // FIXME slow
-        for (y = 0; y < end_y; y += step1d)
-            for (x = 1; x < step1d; x++)
-                l[y] |= l[y + x];
-        for (x = 0; x < end_x; x += step1d)
-            for (y = 1; y < step1d; y++)
-                a[x] |= a[x + y];
+#define MERGE(la, end, step, rd) \
+    for (n = 0; n < end; n += step) \
+        la[n] = !!rd(&la[n])
+#define MERGE_CTX(step, rd) \
+    do { \
+        MERGE(l, end_y, step, rd); \
+        MERGE(a, end_x, step, rd); \
+    } while (0)
+
+#define DECODE_Y_COEF_LOOP(step, mode_index, v) \
+    for (n = 0, y = 0; y < end_y; y += step) { \
+        for (x = 0; x < end_x; x += step, n += step * step) { \
+            enum TxfmType txtp = vp9_intra_txfm_type[b->mode[mode_index]]; \
+            res = decode_coeffs_b##v(&s->c, s->block + 16 * n, 16 * step * step, \
+                                     c, e, p, a[x] + l[y], yscans[txtp], \
+                                     ynbs[txtp], y_band_counts, qmul[0]); \
+            a[x] = l[y] = !!res; \
+            if (step >= 4) { \
+                AV_WN16A(&s->eob[n], res); \
+            } else { \
+                s->eob[n] = res; \
+            } \
+        } \
     }
-    for (n = 0, y = 0; y < end_y; y += step1d) {
-        for (x = 0; x < end_x; x += step1d, n += step) {
-            enum TxfmType txtp = vp9_intra_txfm_type[b->mode[b->tx == TX_4X4 &&
-                                                             b->bs > BS_8x8 ?
-                                                             n : 0]];
-            int nnz = a[x] + l[y];
-            if ((res = decode_coeffs_b(&s->c, s->block + 16 * n, 16 * step,
-                                       b->tx, c, e, p, nnz, yscans[txtp],
-                                       ynbs[txtp], y_band_counts, qmul[0])) < 0)
-                return res;
-            a[x] = l[y] = !!res;
-            if (b->tx > TX_8X8) {
-                AV_WN16A(&s->eob[n], res);
-            } else {
-                s->eob[n] = res;
-            }
-        }
+
+#define SPLAT(la, end, step, cond) \
+    if (step == 2) { \
+        for (n = 1; n < end; n += step) \
+            la[n] = la[n - 1]; \
+    } else if (step == 4) { \
+        if (cond) { \
+            for (n = 0; n < end; n += step) \
+                AV_WN32A(&la[n], la[n] * 0x01010101); \
+        } else { \
+            for (n = 0; n < end; n += step) \
+                memset(&la[n + 1], la[n], FFMIN(end - n - 1, 3)); \
+        } \
+    } else /* step == 8 */ { \
+        if (cond) { \
+            if (HAVE_FAST_64BIT) { \
+                for (n = 0; n < end; n += step) \
+                    AV_WN64A(&la[n], la[n] * 0x0101010101010101ULL); \
+            } else { \
+                for (n = 0; n < end; n += step) { \
+                    uint32_t v32 = la[n] * 0x01010101; \
+                    AV_WN32A(&la[n],     v32); \
+                    AV_WN32A(&la[n + 4], v32); \
+                } \
+            } \
+        } else { \
+            for (n = 0; n < end; n += step) \
+                memset(&la[n + 1], la[n], FFMIN(end - n - 1, 7)); \
+        } \
     }
-    if (b->tx > TX_4X4) { // FIXME slow
-        for (y = 0; y < end_y; y += step1d)
-            memset(&l[y + 1], l[y], FFMIN(end_y - y - 1, step1d - 1));
-        for (x = 0; x < end_x; x += step1d)
-            memset(&a[x + 1], a[x], FFMIN(end_x - x - 1, step1d - 1));
+#define SPLAT_CTX(step) \
+    do { \
+        SPLAT(a, end_x, step, end_x == w4); \
+        SPLAT(l, end_y, step, end_y == h4); \
+    } while (0)
+
+    /* y tokens */
+    switch (b->tx) {
+    case TX_4X4:
+        DECODE_Y_COEF_LOOP(1, b->bs > BS_8x8 ? n : 0,);
+        break;
+    case TX_8X8:
+        MERGE_CTX(2, AV_RN16A);
+        DECODE_Y_COEF_LOOP(2, 0,);
+        SPLAT_CTX(2);
+        break;
+    case TX_16X16:
+        MERGE_CTX(4, AV_RN32A);
+        DECODE_Y_COEF_LOOP(4, 0,);
+        SPLAT_CTX(4);
+        break;
+    case TX_32X32:
+        MERGE_CTX(8, AV_RN64A);
+        DECODE_Y_COEF_LOOP(8, 0, 32);
+        SPLAT_CTX(8);
+        break;
+    }
+
+#define DECODE_UV_COEF_LOOP(step) \
+    for (n = 0, y = 0; y < end_y; y += step) { \
+        for (x = 0; x < end_x; x += step, n += step * step) { \
+            res = decode_coeffs_b(&s->c, s->uvblock[pl] + 16 * n, \
+                                  16 * step * step, c, e, p, a[x] + l[y], \
+                                  uvscan, uvnb, uv_band_counts, qmul[1]); \
+            a[x] = l[y] = !!res; \
+            s->uveob[pl][n] = res; \
+        } \
     }
 
     p = s->prob.coef[b->uvtx][1 /* uv */][!b->intra];
@@ -1963,39 +2272,33 @@
     for (pl = 0; pl < 2; pl++) {
         a = &s->above_uv_nnz_ctx[pl][col];
         l = &s->left_uv_nnz_ctx[pl][row & 7];
-        if (b->uvtx > TX_4X4) { // FIXME slow
-            for (y = 0; y < end_y; y += uvstep1d)
-                for (x = 1; x < uvstep1d; x++)
-                    l[y] |= l[y + x];
-            for (x = 0; x < end_x; x += uvstep1d)
-                for (y = 1; y < uvstep1d; y++)
-                    a[x] |= a[x + y];
-        }
-        for (n = 0, y = 0; y < end_y; y += uvstep1d) {
-            for (x = 0; x < end_x; x += uvstep1d, n += uvstep) {
-                int nnz = a[x] + l[y];
-                if ((res = decode_coeffs_b(&s->c, s->uvblock[pl] + 16 * n,
-                                           16 * uvstep, b->uvtx, c, e, p, nnz,
-                                           uvscan, uvnb, uv_band_counts,
-                                           qmul[1])) < 0)
-                    return res;
-                a[x] = l[y] = !!res;
-                if (b->uvtx > TX_8X8) {
-                    AV_WN16A(&s->uveob[pl][n], res);
-                } else {
-                    s->uveob[pl][n] = res;
-                }
-            }
-        }
-        if (b->uvtx > TX_4X4) { // FIXME slow
-            for (y = 0; y < end_y; y += uvstep1d)
-                memset(&l[y + 1], l[y], FFMIN(end_y - y - 1, uvstep1d - 1));
-            for (x = 0; x < end_x; x += uvstep1d)
-                memset(&a[x + 1], a[x], FFMIN(end_x - x - 1, uvstep1d - 1));
+        switch (b->uvtx) {
+        case TX_4X4:
+            DECODE_UV_COEF_LOOP(1);
+            break;
+        case TX_8X8:
+            MERGE_CTX(2, AV_RN16A);
+            DECODE_UV_COEF_LOOP(2);
+            SPLAT_CTX(2);
+            break;
+        case TX_16X16:
+            MERGE_CTX(4, AV_RN32A);
+            DECODE_UV_COEF_LOOP(4);
+            SPLAT_CTX(4);
+            break;
+        case TX_32X32:
+            MERGE_CTX(8, AV_RN64A);
+            // a 64x64 (max) uv block can ever only contain 1 tx32x32 block
+            // so there is no need to loop
+            res = decode_coeffs_b32(&s->c, s->uvblock[pl],
+                                    1024, c, e, p, a[0] + l[0],
+                                    uvscan, uvnb, uv_band_counts, qmul[1]);
+            a[0] = l[0] = !!res;
+            AV_WN16A(&s->uveob[pl][0], res);
+            SPLAT_CTX(8);
+            break;
         }
     }
-
-    return 0;
 }
 
 static av_always_inline int check_intra_mode(VP9Context *s, int mode, uint8_t **a,
@@ -2119,11 +2422,11 @@
 
             if (n_px_need <= n_px_have) {
                 for (i = 0; i < n_px_need; i++)
-                    l[i] = dst[i * stride - 1];
+                    l[n_px_need - 1 - i] = dst[i * stride - 1];
             } else {
                 for (i = 0; i < n_px_have; i++)
-                    l[i] = dst[i * stride - 1];
-                memset(&l[i], l[i - 1], n_px_need - n_px_have);
+                    l[n_px_need - 1 - i] = dst[i * stride - 1];
+                memset(l, l[n_px_need - n_px_have], n_px_need - n_px_have);
             }
         } else {
             memset(l, 129, 4 << tx);
@@ -2136,15 +2439,17 @@
 static void intra_recon(AVCodecContext *ctx, ptrdiff_t y_off, ptrdiff_t uv_off)
 {
     VP9Context *s = ctx->priv_data;
-    VP9Block *const b = &s->b;
-    int row = b->row, col = b->col;
+    VP9Block *b = s->b;
+    int row = s->row, col = s->col;
     int w4 = bwh_tab[1][b->bs][0] << 1, step1d = 1 << b->tx, n;
     int h4 = bwh_tab[1][b->bs][1] << 1, x, y, step = 1 << (b->tx * 2);
     int end_x = FFMIN(2 * (s->cols - col), w4);
     int end_y = FFMIN(2 * (s->rows - row), h4);
     int tx = 4 * s->lossless + b->tx, uvtx = b->uvtx + 4 * s->lossless;
     int uvstep1d = 1 << b->uvtx, p;
-    uint8_t *dst = b->dst[0], *dst_r = s->f->data[0] + y_off;
+    uint8_t *dst = s->dst[0], *dst_r = s->frames[CUR_FRAME].tf.f->data[0] + y_off;
+    LOCAL_ALIGNED_16(uint8_t, a_buf, [48]);
+    LOCAL_ALIGNED_16(uint8_t, l, [32]);
 
     for (n = 0, y = 0; y < end_y; y += step1d) {
         uint8_t *ptr = dst, *ptr_r = dst_r;
@@ -2152,21 +2457,21 @@
                                ptr_r += 4 * step1d, n += step) {
             int mode = b->mode[b->bs > BS_8x8 && b->tx == TX_4X4 ?
                                y * 2 + x : 0];
-            LOCAL_ALIGNED_16(uint8_t, a_buf, [48]);
-            uint8_t *a = &a_buf[16], l[32];
+            uint8_t *a = &a_buf[16];
             enum TxfmType txtp = vp9_intra_txfm_type[mode];
             int eob = b->skip ? 0 : b->tx > TX_8X8 ? AV_RN16A(&s->eob[n]) : s->eob[n];
 
-            mode = check_intra_mode(s, mode, &a, ptr_r, s->f->linesize[0],
-                                    ptr, b->y_stride, l,
+            mode = check_intra_mode(s, mode, &a, ptr_r,
+                                    s->frames[CUR_FRAME].tf.f->linesize[0],
+                                    ptr, s->y_stride, l,
                                     col, x, w4, row, y, b->tx, 0);
-            s->dsp.intra_pred[b->tx][mode](ptr, b->y_stride, l, a);
+            s->dsp.intra_pred[b->tx][mode](ptr, s->y_stride, l, a);
             if (eob)
-                s->dsp.itxfm_add[tx][txtp](ptr, b->y_stride,
+                s->dsp.itxfm_add[tx][txtp](ptr, s->y_stride,
                                            s->block + 16 * n, eob);
         }
-        dst_r += 4 * s->f->linesize[0] * step1d;
-        dst   += 4 * b->y_stride       * step1d;
+        dst_r += 4 * step1d * s->frames[CUR_FRAME].tf.f->linesize[0];
+        dst   += 4 * step1d * s->y_stride;
     }
 
     // U/V
@@ -2176,27 +2481,27 @@
     end_y >>= 1;
     step = 1 << (b->uvtx * 2);
     for (p = 0; p < 2; p++) {
-        dst   = b->dst[1 + p];
-        dst_r = s->f->data[1 + p] + uv_off;
+        dst   = s->dst[1 + p];
+        dst_r = s->frames[CUR_FRAME].tf.f->data[1 + p] + uv_off;
         for (n = 0, y = 0; y < end_y; y += uvstep1d) {
             uint8_t *ptr = dst, *ptr_r = dst_r;
             for (x = 0; x < end_x; x += uvstep1d, ptr += 4 * uvstep1d,
                                    ptr_r += 4 * uvstep1d, n += step) {
                 int mode = b->uvmode;
-                LOCAL_ALIGNED_16(uint8_t, a_buf, [48]);
-                uint8_t *a = &a_buf[16], l[32];
+                uint8_t *a = &a_buf[16];
                 int eob = b->skip ? 0 : b->uvtx > TX_8X8 ? AV_RN16A(&s->uveob[p][n]) : s->uveob[p][n];
 
-                mode = check_intra_mode(s, mode, &a, ptr_r, s->f->linesize[1],
-                                        ptr, b->uv_stride, l,
+                mode = check_intra_mode(s, mode, &a, ptr_r,
+                                        s->frames[CUR_FRAME].tf.f->linesize[1],
+                                        ptr, s->uv_stride, l,
                                         col, x, w4, row, y, b->uvtx, p + 1);
-                s->dsp.intra_pred[b->uvtx][mode](ptr, b->uv_stride, l, a);
+                s->dsp.intra_pred[b->uvtx][mode](ptr, s->uv_stride, l, a);
                 if (eob)
-                    s->dsp.itxfm_add[uvtx][DCT_DCT](ptr, b->uv_stride,
+                    s->dsp.itxfm_add[uvtx][DCT_DCT](ptr, s->uv_stride,
                                                     s->uvblock[p] + 16 * n, eob);
             }
-            dst_r += 4 * uvstep1d * s->f->linesize[1];
-            dst   += 4 * uvstep1d * b->uv_stride;
+            dst_r += 4 * uvstep1d * s->frames[CUR_FRAME].tf.f->linesize[1];
+            dst   += 4 * uvstep1d * s->uv_stride;
         }
     }
 }
@@ -2204,10 +2509,11 @@
 static av_always_inline void mc_luma_dir(VP9Context *s, vp9_mc_func (*mc)[2],
                                          uint8_t *dst, ptrdiff_t dst_stride,
                                          const uint8_t *ref, ptrdiff_t ref_stride,
+                                         ThreadFrame *ref_frame,
                                          ptrdiff_t y, ptrdiff_t x, const VP56mv *mv,
                                          int bw, int bh, int w, int h)
 {
-    int mx = mv->x, my = mv->y;
+    int mx = mv->x, my = mv->y, th;
 
     y += my >> 3;
     x += mx >> 3;
@@ -2215,11 +2521,15 @@
     mx &= 7;
     my &= 7;
     // FIXME bilinear filter only needs 0/1 pixels, not 3/4
+    // we use +7 because the last 7 pixels of each sbrow can be changed in
+    // the longest loopfilter of the next sbrow
+    th = (y + bh + 4 * !!my + 7) >> 6;
+    ff_thread_await_progress(ref_frame, FFMAX(th, 0), 0);
     if (x < !!mx * 3 || y < !!my * 3 ||
         x + !!mx * 4 > w - bw || y + !!my * 4 > h - bh) {
-        s->vdsp.emulated_edge_mc(s->edge_emu_buffer, 80,
+        s->vdsp.emulated_edge_mc(s->edge_emu_buffer,
                                  ref - !!my * 3 * ref_stride - !!mx * 3,
-                                 ref_stride,
+                                 80, ref_stride,
                                  bw + !!mx * 7, bh + !!my * 7,
                                  x - !!mx * 3, y - !!my * 3, w, h);
         ref = s->edge_emu_buffer + !!my * 3 * 80 + !!mx * 3;
@@ -2233,10 +2543,11 @@
                                            ptrdiff_t dst_stride,
                                            const uint8_t *ref_u, ptrdiff_t src_stride_u,
                                            const uint8_t *ref_v, ptrdiff_t src_stride_v,
+                                           ThreadFrame *ref_frame,
                                            ptrdiff_t y, ptrdiff_t x, const VP56mv *mv,
                                            int bw, int bh, int w, int h)
 {
-    int mx = mv->x, my = mv->y;
+    int mx = mv->x, my = mv->y, th;
 
     y += my >> 4;
     x += mx >> 4;
@@ -2245,17 +2556,23 @@
     mx &= 15;
     my &= 15;
     // FIXME bilinear filter only needs 0/1 pixels, not 3/4
+    // we use +7 because the last 7 pixels of each sbrow can be changed in
+    // the longest loopfilter of the next sbrow
+    th = (y + bh + 4 * !!my + 7) >> 5;
+    ff_thread_await_progress(ref_frame, FFMAX(th, 0), 0);
     if (x < !!mx * 3 || y < !!my * 3 ||
         x + !!mx * 4 > w - bw || y + !!my * 4 > h - bh) {
-        s->vdsp.emulated_edge_mc(s->edge_emu_buffer, 80,
-                                 ref_u - !!my * 3 * src_stride_u - !!mx * 3, src_stride_u,
+        s->vdsp.emulated_edge_mc(s->edge_emu_buffer,
+                                 ref_u - !!my * 3 * src_stride_u - !!mx * 3,
+                                 80, src_stride_u,
                                  bw + !!mx * 7, bh + !!my * 7,
                                  x - !!mx * 3, y - !!my * 3, w, h);
         ref_u = s->edge_emu_buffer + !!my * 3 * 80 + !!mx * 3;
         mc[!!mx][!!my](dst_u, dst_stride, ref_u, 80, bh, mx, my);
 
-        s->vdsp.emulated_edge_mc(s->edge_emu_buffer, 80,
-                                 ref_v - !!my * 3 * src_stride_v - !!mx * 3, src_stride_v,
+        s->vdsp.emulated_edge_mc(s->edge_emu_buffer,
+                                 ref_v - !!my * 3 * src_stride_v - !!mx * 3,
+                                 80, src_stride_v,
                                  bw + !!mx * 7, bh + !!my * 7,
                                  x - !!mx * 3, y - !!my * 3, w, h);
         ref_v = s->edge_emu_buffer + !!my * 3 * 80 + !!mx * 3;
@@ -2273,98 +2590,105 @@
         { 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4, 4, 4 },
     };
     VP9Context *s = ctx->priv_data;
-    VP9Block *const b = &s->b;
-    int row = b->row, col = b->col;
-    AVFrame *ref1 = s->refs[s->refidx[b->ref[0]]];
-    AVFrame *ref2 = b->comp ? s->refs[s->refidx[b->ref[1]]] : NULL;
-    int w = ctx->width, h = ctx->height;
-    ptrdiff_t ls_y = b->y_stride, ls_uv = b->uv_stride;
+    VP9Block *b = s->b;
+    int row = s->row, col = s->col;
+    ThreadFrame *tref1 = &s->refs[s->refidx[b->ref[0]]], *tref2;
+    AVFrame *ref1 = tref1->f, *ref2;
+    int w1 = ref1->width, h1 = ref1->height, w2, h2;
+    ptrdiff_t ls_y = s->y_stride, ls_uv = s->uv_stride;
+
+    if (b->comp) {
+        tref2 = &s->refs[s->refidx[b->ref[1]]];
+        ref2 = tref2->f;
+        w2 = ref2->width;
+        h2 = ref2->height;
+    }
 
     // y inter pred
     if (b->bs > BS_8x8) {
         if (b->bs == BS_8x4) {
-            mc_luma_dir(s, s->dsp.mc[3][b->filter][0], b->dst[0], ls_y,
-                        ref1->data[0], ref1->linesize[0],
-                        row << 3, col << 3, &b->mv[0][0], 8, 4, w, h);
+            mc_luma_dir(s, s->dsp.mc[3][b->filter][0], s->dst[0], ls_y,
+                        ref1->data[0], ref1->linesize[0], tref1,
+                        row << 3, col << 3, &b->mv[0][0], 8, 4, w1, h1);
             mc_luma_dir(s, s->dsp.mc[3][b->filter][0],
-                        b->dst[0] + 4 * ls_y, ls_y,
-                        ref1->data[0], ref1->linesize[0],
-                        (row << 3) + 4, col << 3, &b->mv[2][0], 8, 4, w, h);
+                        s->dst[0] + 4 * ls_y, ls_y,
+                        ref1->data[0], ref1->linesize[0], tref1,
+                        (row << 3) + 4, col << 3, &b->mv[2][0], 8, 4, w1, h1);
 
             if (b->comp) {
-                mc_luma_dir(s, s->dsp.mc[3][b->filter][1], b->dst[0], ls_y,
-                            ref2->data[0], ref2->linesize[0],
-                            row << 3, col << 3, &b->mv[0][1], 8, 4, w, h);
+                mc_luma_dir(s, s->dsp.mc[3][b->filter][1], s->dst[0], ls_y,
+                            ref2->data[0], ref2->linesize[0], tref2,
+                            row << 3, col << 3, &b->mv[0][1], 8, 4, w2, h2);
                 mc_luma_dir(s, s->dsp.mc[3][b->filter][1],
-                            b->dst[0] + 4 * ls_y, ls_y,
-                            ref2->data[0], ref2->linesize[0],
-                            (row << 3) + 4, col << 3, &b->mv[2][1], 8, 4, w, h);
+                            s->dst[0] + 4 * ls_y, ls_y,
+                            ref2->data[0], ref2->linesize[0], tref2,
+                            (row << 3) + 4, col << 3, &b->mv[2][1], 8, 4, w2, h2);
             }
         } else if (b->bs == BS_4x8) {
-            mc_luma_dir(s, s->dsp.mc[4][b->filter][0], b->dst[0], ls_y,
-                        ref1->data[0], ref1->linesize[0],
-                        row << 3, col << 3, &b->mv[0][0], 4, 8, w, h);
-            mc_luma_dir(s, s->dsp.mc[4][b->filter][0], b->dst[0] + 4, ls_y,
-                        ref1->data[0], ref1->linesize[0],
-                        row << 3, (col << 3) + 4, &b->mv[1][0], 4, 8, w, h);
+            mc_luma_dir(s, s->dsp.mc[4][b->filter][0], s->dst[0], ls_y,
+                        ref1->data[0], ref1->linesize[0], tref1,
+                        row << 3, col << 3, &b->mv[0][0], 4, 8, w1, h1);
+            mc_luma_dir(s, s->dsp.mc[4][b->filter][0], s->dst[0] + 4, ls_y,
+                        ref1->data[0], ref1->linesize[0], tref1,
+                        row << 3, (col << 3) + 4, &b->mv[1][0], 4, 8, w1, h1);
 
             if (b->comp) {
-                mc_luma_dir(s, s->dsp.mc[4][b->filter][1], b->dst[0], ls_y,
-                            ref2->data[0], ref2->linesize[0],
-                            row << 3, col << 3, &b->mv[0][1], 4, 8, w, h);
-                mc_luma_dir(s, s->dsp.mc[4][b->filter][1], b->dst[0] + 4, ls_y,
-                            ref2->data[0], ref2->linesize[0],
-                            row << 3, (col << 3) + 4, &b->mv[1][1], 4, 8, w, h);
+                mc_luma_dir(s, s->dsp.mc[4][b->filter][1], s->dst[0], ls_y,
+                            ref2->data[0], ref2->linesize[0], tref2,
+                            row << 3, col << 3, &b->mv[0][1], 4, 8, w2, h2);
+                mc_luma_dir(s, s->dsp.mc[4][b->filter][1], s->dst[0] + 4, ls_y,
+                            ref2->data[0], ref2->linesize[0], tref2,
+                            row << 3, (col << 3) + 4, &b->mv[1][1], 4, 8, w2, h2);
             }
         } else {
             av_assert2(b->bs == BS_4x4);
 
             // FIXME if two horizontally adjacent blocks have the same MV,
             // do a w8 instead of a w4 call
-            mc_luma_dir(s, s->dsp.mc[4][b->filter][0], b->dst[0], ls_y,
-                        ref1->data[0], ref1->linesize[0],
-                        row << 3, col << 3, &b->mv[0][0], 4, 4, w, h);
-            mc_luma_dir(s, s->dsp.mc[4][b->filter][0], b->dst[0] + 4, ls_y,
-                        ref1->data[0], ref1->linesize[0],
-                        row << 3, (col << 3) + 4, &b->mv[1][0], 4, 4, w, h);
+            mc_luma_dir(s, s->dsp.mc[4][b->filter][0], s->dst[0], ls_y,
+                        ref1->data[0], ref1->linesize[0], tref1,
+                        row << 3, col << 3, &b->mv[0][0], 4, 4, w1, h1);
+            mc_luma_dir(s, s->dsp.mc[4][b->filter][0], s->dst[0] + 4, ls_y,
+                        ref1->data[0], ref1->linesize[0], tref1,
+                        row << 3, (col << 3) + 4, &b->mv[1][0], 4, 4, w1, h1);
             mc_luma_dir(s, s->dsp.mc[4][b->filter][0],
-                        b->dst[0] + 4 * ls_y, ls_y,
-                        ref1->data[0], ref1->linesize[0],
-                        (row << 3) + 4, col << 3, &b->mv[2][0], 4, 4, w, h);
+                        s->dst[0] + 4 * ls_y, ls_y,
+                        ref1->data[0], ref1->linesize[0], tref1,
+                        (row << 3) + 4, col << 3, &b->mv[2][0], 4, 4, w1, h1);
             mc_luma_dir(s, s->dsp.mc[4][b->filter][0],
-                        b->dst[0] + 4 * ls_y + 4, ls_y,
-                        ref1->data[0], ref1->linesize[0],
-                        (row << 3) + 4, (col << 3) + 4, &b->mv[3][0], 4, 4, w, h);
+                        s->dst[0] + 4 * ls_y + 4, ls_y,
+                        ref1->data[0], ref1->linesize[0], tref1,
+                        (row << 3) + 4, (col << 3) + 4, &b->mv[3][0], 4, 4, w1, h1);
 
             if (b->comp) {
-                mc_luma_dir(s, s->dsp.mc[4][b->filter][1], b->dst[0], ls_y,
-                            ref2->data[0], ref2->linesize[0],
-                            row << 3, col << 3, &b->mv[0][1], 4, 4, w, h);
-                mc_luma_dir(s, s->dsp.mc[4][b->filter][1], b->dst[0] + 4, ls_y,
-                            ref2->data[0], ref2->linesize[0],
-                            row << 3, (col << 3) + 4, &b->mv[1][1], 4, 4, w, h);
+                mc_luma_dir(s, s->dsp.mc[4][b->filter][1], s->dst[0], ls_y,
+                            ref2->data[0], ref2->linesize[0], tref2,
+                            row << 3, col << 3, &b->mv[0][1], 4, 4, w2, h2);
+                mc_luma_dir(s, s->dsp.mc[4][b->filter][1], s->dst[0] + 4, ls_y,
+                            ref2->data[0], ref2->linesize[0], tref2,
+                            row << 3, (col << 3) + 4, &b->mv[1][1], 4, 4, w2, h2);
                 mc_luma_dir(s, s->dsp.mc[4][b->filter][1],
-                            b->dst[0] + 4 * ls_y, ls_y,
-                            ref2->data[0], ref2->linesize[0],
-                            (row << 3) + 4, col << 3, &b->mv[2][1], 4, 4, w, h);
+                            s->dst[0] + 4 * ls_y, ls_y,
+                            ref2->data[0], ref2->linesize[0], tref2,
+                            (row << 3) + 4, col << 3, &b->mv[2][1], 4, 4, w2, h2);
                 mc_luma_dir(s, s->dsp.mc[4][b->filter][1],
-                            b->dst[0] + 4 * ls_y + 4, ls_y,
-                            ref2->data[0], ref2->linesize[0],
-                            (row << 3) + 4, (col << 3) + 4, &b->mv[3][1], 4, 4, w, h);
+                            s->dst[0] + 4 * ls_y + 4, ls_y,
+                            ref2->data[0], ref2->linesize[0], tref2,
+                            (row << 3) + 4, (col << 3) + 4, &b->mv[3][1], 4, 4, w2, h2);
             }
         }
     } else {
         int bwl = bwlog_tab[0][b->bs];
         int bw = bwh_tab[0][b->bs][0] * 4, bh = bwh_tab[0][b->bs][1] * 4;
 
-        mc_luma_dir(s, s->dsp.mc[bwl][b->filter][0], b->dst[0], ls_y,
-                    ref1->data[0], ref1->linesize[0],
-                    row << 3, col << 3, &b->mv[0][0],bw, bh, w, h);
+        mc_luma_dir(s, s->dsp.mc[bwl][b->filter][0], s->dst[0], ls_y,
+                    ref1->data[0], ref1->linesize[0], tref1,
+                    row << 3, col << 3, &b->mv[0][0],bw, bh, w1, h1);
 
         if (b->comp)
-            mc_luma_dir(s, s->dsp.mc[bwl][b->filter][1], b->dst[0], ls_y,
-                        ref2->data[0], ref2->linesize[0],
-                        row << 3, col << 3, &b->mv[0][1], bw, bh, w, h);
+            mc_luma_dir(s, s->dsp.mc[bwl][b->filter][1], s->dst[0], ls_y,
+                        ref2->data[0], ref2->linesize[0], tref2,
+                        row << 3, col << 3, &b->mv[0][1], bw, bh, w2, h2);
     }
 
     // uv inter pred
@@ -2373,8 +2697,12 @@
         int bw = bwh_tab[1][b->bs][0] * 4, bh = bwh_tab[1][b->bs][1] * 4;
         VP56mv mvuv;
 
-        w = (w + 1) >> 1;
-        h = (h + 1) >> 1;
+        w1 = (w1 + 1) >> 1;
+        h1 = (h1 + 1) >> 1;
+        if (b->comp) {
+            w2 = (w2 + 1) >> 1;
+            h2 = (h2 + 1) >> 1;
+        }
         if (b->bs > BS_8x8) {
             mvuv.x = ROUNDED_DIV(b->mv[0][0].x + b->mv[1][0].x + b->mv[2][0].x + b->mv[3][0].x, 4);
             mvuv.y = ROUNDED_DIV(b->mv[0][0].y + b->mv[1][0].y + b->mv[2][0].y + b->mv[3][0].y, 4);
@@ -2383,10 +2711,10 @@
         }
 
         mc_chroma_dir(s, s->dsp.mc[bwl][b->filter][0],
-                      b->dst[1], b->dst[2], ls_uv,
+                      s->dst[1], s->dst[2], ls_uv,
                       ref1->data[1], ref1->linesize[1],
-                      ref1->data[2], ref1->linesize[2],
-                      row << 2, col << 2, &mvuv, bw, bh, w, h);
+                      ref1->data[2], ref1->linesize[2], tref1,
+                      row << 2, col << 2, &mvuv, bw, bh, w1, h1);
 
         if (b->comp) {
             if (b->bs > BS_8x8) {
@@ -2396,10 +2724,10 @@
                 mvuv = b->mv[0][1];
             }
             mc_chroma_dir(s, s->dsp.mc[bwl][b->filter][1],
-                          b->dst[1], b->dst[2], ls_uv,
+                          s->dst[1], s->dst[2], ls_uv,
                           ref2->data[1], ref2->linesize[1],
-                          ref2->data[2], ref2->linesize[2],
-                          row << 2, col << 2, &mvuv, bw, bh, w, h);
+                          ref2->data[2], ref2->linesize[2], tref2,
+                          row << 2, col << 2, &mvuv, bw, bh, w2, h2);
         }
     }
 
@@ -2412,7 +2740,7 @@
         int end_y = FFMIN(2 * (s->rows - row), h4);
         int tx = 4 * s->lossless + b->tx, uvtx = b->uvtx + 4 * s->lossless;
         int uvstep1d = 1 << b->uvtx, p;
-        uint8_t *dst = b->dst[0];
+        uint8_t *dst = s->dst[0];
 
         // y itxfm add
         for (n = 0, y = 0; y < end_y; y += step1d) {
@@ -2421,10 +2749,10 @@
                 int eob = b->tx > TX_8X8 ? AV_RN16A(&s->eob[n]) : s->eob[n];
 
                 if (eob)
-                    s->dsp.itxfm_add[tx][DCT_DCT](ptr, b->y_stride,
+                    s->dsp.itxfm_add[tx][DCT_DCT](ptr, s->y_stride,
                                                   s->block + 16 * n, eob);
             }
-            dst += 4 * b->y_stride * step1d;
+            dst += 4 * s->y_stride * step1d;
         }
 
         // uv itxfm add
@@ -2434,17 +2762,17 @@
         end_y >>= 1;
         step = 1 << (b->uvtx * 2);
         for (p = 0; p < 2; p++) {
-            dst = b->dst[p + 1];
+            dst = s->dst[p + 1];
             for (n = 0, y = 0; y < end_y; y += uvstep1d) {
                 uint8_t *ptr = dst;
                 for (x = 0; x < end_x; x += uvstep1d, ptr += 4 * uvstep1d, n += step) {
                     int eob = b->uvtx > TX_8X8 ? AV_RN16A(&s->uveob[p][n]) : s->uveob[p][n];
 
                     if (eob)
-                        s->dsp.itxfm_add[uvtx][DCT_DCT](ptr, b->uv_stride,
+                        s->dsp.itxfm_add[uvtx][DCT_DCT](ptr, s->uv_stride,
                                                         s->uvblock[p] + 16 * n, eob);
                 }
-                dst += 4 * uvstep1d * b->uv_stride;
+                dst += 4 * uvstep1d * s->uv_stride;
             }
         }
     }
@@ -2583,64 +2911,100 @@
     }
 }
 
-static int decode_b(AVCodecContext *ctx, int row, int col,
-                    struct VP9Filter *lflvl, ptrdiff_t yoff, ptrdiff_t uvoff,
-                    enum BlockLevel bl, enum BlockPartition bp)
+static void decode_b(AVCodecContext *ctx, int row, int col,
+                     struct VP9Filter *lflvl, ptrdiff_t yoff, ptrdiff_t uvoff,
+                     enum BlockLevel bl, enum BlockPartition bp)
 {
     VP9Context *s = ctx->priv_data;
-    VP9Block *const b = &s->b;
+    VP9Block *b = s->b;
     enum BlockSize bs = bl * 3 + bp;
-    int res, y, w4 = bwh_tab[1][bs][0], h4 = bwh_tab[1][bs][1], lvl;
+    int w4 = bwh_tab[1][bs][0], h4 = bwh_tab[1][bs][1], lvl;
     int emu[2];
+    AVFrame *f = s->frames[CUR_FRAME].tf.f;
 
-    b->row = row;
-    b->row7 = row & 7;
-    b->col = col;
-    b->col7 = col & 7;
+    s->row = row;
+    s->row7 = row & 7;
+    s->col = col;
+    s->col7 = col & 7;
     s->min_mv.x = -(128 + col * 64);
     s->min_mv.y = -(128 + row * 64);
     s->max_mv.x = 128 + (s->cols - col - w4) * 64;
     s->max_mv.y = 128 + (s->rows - row - h4) * 64;
-    b->bs = bs;
-    decode_mode(ctx);
-    b->uvtx = b->tx - (w4 * 2 == (1 << b->tx) || h4 * 2 == (1 << b->tx));
+    if (s->pass < 2) {
+        b->bs = bs;
+        b->bl = bl;
+        b->bp = bp;
+        decode_mode(ctx);
+        b->uvtx = b->tx - (w4 * 2 == (1 << b->tx) || h4 * 2 == (1 << b->tx));
+
+        if (!b->skip) {
+            decode_coeffs(ctx);
+        } else {
+            int row7 = s->row7;
+
+#define SPLAT_ZERO_CTX(v, n) \
+    switch (n) { \
+    case 1:  v = 0;          break; \
+    case 2:  AV_ZERO16(&v);  break; \
+    case 4:  AV_ZERO32(&v);  break; \
+    case 8:  AV_ZERO64(&v);  break; \
+    case 16: AV_ZERO128(&v); break; \
+    }
+#define SPLAT_ZERO_YUV(dir, var, off, n) \
+    do { \
+        SPLAT_ZERO_CTX(s->dir##_y_##var[off * 2], n * 2); \
+        SPLAT_ZERO_CTX(s->dir##_uv_##var[0][off], n); \
+        SPLAT_ZERO_CTX(s->dir##_uv_##var[1][off], n); \
+    } while (0)
 
-    if (!b->skip) {
-        if ((res = decode_coeffs(ctx)) < 0)
-            return res;
-    } else {
-        int pl;
+            switch (w4) {
+            case 1: SPLAT_ZERO_YUV(above, nnz_ctx, col, 1); break;
+            case 2: SPLAT_ZERO_YUV(above, nnz_ctx, col, 2); break;
+            case 4: SPLAT_ZERO_YUV(above, nnz_ctx, col, 4); break;
+            case 8: SPLAT_ZERO_YUV(above, nnz_ctx, col, 8); break;
+            }
+            switch (h4) {
+            case 1: SPLAT_ZERO_YUV(left, nnz_ctx, row7, 1); break;
+            case 2: SPLAT_ZERO_YUV(left, nnz_ctx, row7, 2); break;
+            case 4: SPLAT_ZERO_YUV(left, nnz_ctx, row7, 4); break;
+            case 8: SPLAT_ZERO_YUV(left, nnz_ctx, row7, 8); break;
+            }
+        }
+        if (s->pass == 1) {
+            s->b++;
+            s->block += w4 * h4 * 64;
+            s->uvblock[0] += w4 * h4 * 16;
+            s->uvblock[1] += w4 * h4 * 16;
+            s->eob += 4 * w4 * h4;
+            s->uveob[0] += w4 * h4;
+            s->uveob[1] += w4 * h4;
 
-        memset(&s->above_y_nnz_ctx[col * 2], 0, w4 * 2);
-        memset(&s->left_y_nnz_ctx[(row & 7) << 1], 0, h4 * 2);
-        for (pl = 0; pl < 2; pl++) {
-            memset(&s->above_uv_nnz_ctx[pl][col], 0, w4);
-            memset(&s->left_uv_nnz_ctx[pl][row & 7], 0, h4);
+            return;
         }
     }
 
     // emulated overhangs if the stride of the target buffer can't hold. This
     // allows to support emu-edge and so on even if we have large block
     // overhangs
-    emu[0] = (col + w4) * 8 > s->f->linesize[0] ||
-             (row + h4) > s->rows + 2 * !(ctx->flags & CODEC_FLAG_EMU_EDGE);
-    emu[1] = (col + w4) * 4 > s->f->linesize[1] ||
-             (row + h4) > s->rows + 2 * !(ctx->flags & CODEC_FLAG_EMU_EDGE);
+    emu[0] = (col + w4) * 8 > f->linesize[0] ||
+             (row + h4) > s->rows;
+    emu[1] = (col + w4) * 4 > f->linesize[1] ||
+             (row + h4) > s->rows;
     if (emu[0]) {
-        b->dst[0] = s->tmp_y;
-        b->y_stride = 64;
+        s->dst[0] = s->tmp_y;
+        s->y_stride = 64;
     } else {
-        b->dst[0] = s->f->data[0] + yoff;
-        b->y_stride = s->f->linesize[0];
+        s->dst[0] = f->data[0] + yoff;
+        s->y_stride = f->linesize[0];
     }
     if (emu[1]) {
-        b->dst[1] = s->tmp_uv[0];
-        b->dst[2] = s->tmp_uv[1];
-        b->uv_stride = 32;
-    } else {
-        b->dst[1] = s->f->data[1] + uvoff;
-        b->dst[2] = s->f->data[2] + uvoff;
-        b->uv_stride = s->f->linesize[1];
+        s->dst[1] = s->tmp_uv[0];
+        s->dst[2] = s->tmp_uv[1];
+        s->uv_stride = 32;
+    } else {
+        s->dst[1] = f->data[1] + uvoff;
+        s->dst[2] = f->data[2] + uvoff;
+        s->uv_stride = f->linesize[1];
     }
     if (b->intra) {
         intra_recon(ctx, yoff, uvoff);
@@ -2655,7 +3019,7 @@
 
             av_assert2(n <= 4);
             if (w & bw) {
-                s->dsp.mc[n][0][0][0][0](s->f->data[0] + yoff + o, s->f->linesize[0],
+                s->dsp.mc[n][0][0][0][0](f->data[0] + yoff + o, f->linesize[0],
                                          s->tmp_y + o, 64, h, 0, 0);
                 o += bw;
             }
@@ -2669,9 +3033,9 @@
 
             av_assert2(n <= 4);
             if (w & bw) {
-                s->dsp.mc[n][0][0][0][0](s->f->data[1] + uvoff + o, s->f->linesize[1],
+                s->dsp.mc[n][0][0][0][0](f->data[1] + uvoff + o, f->linesize[1],
                                          s->tmp_uv[0] + o, 32, h, 0, 0);
-                s->dsp.mc[n][0][0][0][0](s->f->data[2] + uvoff + o, s->f->linesize[2],
+                s->dsp.mc[n][0][0][0][0](f->data[2] + uvoff + o, f->linesize[2],
                                          s->tmp_uv[1] + o, 32, h, 0, 0);
                 o += bw;
             }
@@ -2683,12 +3047,11 @@
         (lvl = s->segmentation.feat[b->seg_id].lflvl[b->intra ? 0 : b->ref[0] + 1]
                                                     [b->mode[3] != ZEROMV]) > 0) {
         int x_end = FFMIN(s->cols - col, w4), y_end = FFMIN(s->rows - row, h4);
-        int skip_inter = !b->intra && b->skip;
+        int skip_inter = !b->intra && b->skip, col7 = s->col7, row7 = s->row7;
 
-        for (y = 0; y < h4; y++)
-            memset(&lflvl->level[((row & 7) + y) * 8 + (col & 7)], lvl, w4);
-        mask_edges(lflvl, 0, row & 7, col & 7, x_end, y_end, 0, 0, b->tx, skip_inter);
-        mask_edges(lflvl, 1, row & 7, col & 7, x_end, y_end,
+        setctx_2d(&lflvl->level[row7 * 8 + col7], w4, h4, 8, lvl);
+        mask_edges(lflvl, 0, row7, col7, x_end, y_end, 0, 0, b->tx, skip_inter);
+        mask_edges(lflvl, 1, row7, col7, x_end, y_end,
                    s->cols & 1 && col + w4 >= s->cols ? s->cols & 7 : 0,
                    s->rows & 1 && row + h4 >= s->rows ? s->rows & 7 : 0,
                    b->uvtx, skip_inter);
@@ -2708,95 +3071,146 @@
         }
     }
 
-    return 0;
+    if (s->pass == 2) {
+        s->b++;
+        s->block += w4 * h4 * 64;
+        s->uvblock[0] += w4 * h4 * 16;
+        s->uvblock[1] += w4 * h4 * 16;
+        s->eob += 4 * w4 * h4;
+        s->uveob[0] += w4 * h4;
+        s->uveob[1] += w4 * h4;
+    }
 }
 
-static int decode_sb(AVCodecContext *ctx, int row, int col, struct VP9Filter *lflvl,
-                     ptrdiff_t yoff, ptrdiff_t uvoff, enum BlockLevel bl)
+static void decode_sb(AVCodecContext *ctx, int row, int col, struct VP9Filter *lflvl,
+                      ptrdiff_t yoff, ptrdiff_t uvoff, enum BlockLevel bl)
 {
     VP9Context *s = ctx->priv_data;
     int c = ((s->above_partition_ctx[col] >> (3 - bl)) & 1) |
-            (((s->left_partition_ctx[row & 0x7] >> (3 - bl)) & 1) << 1), res;
+            (((s->left_partition_ctx[row & 0x7] >> (3 - bl)) & 1) << 1);
     const uint8_t *p = s->keyframe ? vp9_default_kf_partition_probs[bl][c] :
                                      s->prob.p.partition[bl][c];
     enum BlockPartition bp;
     ptrdiff_t hbs = 4 >> bl;
+    AVFrame *f = s->frames[CUR_FRAME].tf.f;
+    ptrdiff_t y_stride = f->linesize[0], uv_stride = f->linesize[1];
 
     if (bl == BL_8X8) {
         bp = vp8_rac_get_tree(&s->c, vp9_partition_tree, p);
-        res = decode_b(ctx, row, col, lflvl, yoff, uvoff, bl, bp);
-    } else if (col + hbs < s->cols) {
-        if (row + hbs < s->rows) {
+        decode_b(ctx, row, col, lflvl, yoff, uvoff, bl, bp);
+    } else if (col + hbs < s->cols) { // FIXME why not <=?
+        if (row + hbs < s->rows) { // FIXME why not <=?
             bp = vp8_rac_get_tree(&s->c, vp9_partition_tree, p);
             switch (bp) {
             case PARTITION_NONE:
-                res = decode_b(ctx, row, col, lflvl, yoff, uvoff, bl, bp);
+                decode_b(ctx, row, col, lflvl, yoff, uvoff, bl, bp);
                 break;
             case PARTITION_H:
-                if (!(res = decode_b(ctx, row, col, lflvl, yoff, uvoff, bl, bp))) {
-                    yoff  += hbs * 8 * s->f->linesize[0];
-                    uvoff += hbs * 4 * s->f->linesize[1];
-                    res = decode_b(ctx, row + hbs, col, lflvl, yoff, uvoff, bl, bp);
-                }
+                decode_b(ctx, row, col, lflvl, yoff, uvoff, bl, bp);
+                yoff  += hbs * 8 * y_stride;
+                uvoff += hbs * 4 * uv_stride;
+                decode_b(ctx, row + hbs, col, lflvl, yoff, uvoff, bl, bp);
                 break;
             case PARTITION_V:
-                if (!(res = decode_b(ctx, row, col, lflvl, yoff, uvoff, bl, bp))) {
-                    yoff  += hbs * 8;
-                    uvoff += hbs * 4;
-                    res = decode_b(ctx, row, col + hbs, lflvl, yoff, uvoff, bl, bp);
-                }
+                decode_b(ctx, row, col, lflvl, yoff, uvoff, bl, bp);
+                yoff  += hbs * 8;
+                uvoff += hbs * 4;
+                decode_b(ctx, row, col + hbs, lflvl, yoff, uvoff, bl, bp);
                 break;
             case PARTITION_SPLIT:
-                if (!(res = decode_sb(ctx, row, col, lflvl, yoff, uvoff, bl + 1))) {
-                    if (!(res = decode_sb(ctx, row, col + hbs, lflvl,
-                                          yoff + 8 * hbs, uvoff + 4 * hbs, bl + 1))) {
-                        yoff  += hbs * 8 * s->f->linesize[0];
-                        uvoff += hbs * 4 * s->f->linesize[1];
-                        if (!(res = decode_sb(ctx, row + hbs, col, lflvl,
-                                              yoff, uvoff, bl + 1)))
-                            res = decode_sb(ctx, row + hbs, col + hbs, lflvl,
-                                            yoff + 8 * hbs, uvoff + 4 * hbs, bl + 1);
-                    }
-                }
+                decode_sb(ctx, row, col, lflvl, yoff, uvoff, bl + 1);
+                decode_sb(ctx, row, col + hbs, lflvl,
+                          yoff + 8 * hbs, uvoff + 4 * hbs, bl + 1);
+                yoff  += hbs * 8 * y_stride;
+                uvoff += hbs * 4 * uv_stride;
+                decode_sb(ctx, row + hbs, col, lflvl, yoff, uvoff, bl + 1);
+                decode_sb(ctx, row + hbs, col + hbs, lflvl,
+                          yoff + 8 * hbs, uvoff + 4 * hbs, bl + 1);
                 break;
+            default:
+                av_assert0(0);
             }
         } else if (vp56_rac_get_prob_branchy(&s->c, p[1])) {
             bp = PARTITION_SPLIT;
-            if (!(res = decode_sb(ctx, row, col, lflvl, yoff, uvoff, bl + 1)))
-                res = decode_sb(ctx, row, col + hbs, lflvl,
-                                yoff + 8 * hbs, uvoff + 4 * hbs, bl + 1);
+            decode_sb(ctx, row, col, lflvl, yoff, uvoff, bl + 1);
+            decode_sb(ctx, row, col + hbs, lflvl,
+                      yoff + 8 * hbs, uvoff + 4 * hbs, bl + 1);
         } else {
             bp = PARTITION_H;
-            res = decode_b(ctx, row, col, lflvl, yoff, uvoff, bl, bp);
+            decode_b(ctx, row, col, lflvl, yoff, uvoff, bl, bp);
         }
-    } else if (row + hbs < s->rows) {
+    } else if (row + hbs < s->rows) { // FIXME why not <=?
         if (vp56_rac_get_prob_branchy(&s->c, p[2])) {
             bp = PARTITION_SPLIT;
-            if (!(res = decode_sb(ctx, row, col, lflvl, yoff, uvoff, bl + 1))) {
-                yoff  += hbs * 8 * s->f->linesize[0];
-                uvoff += hbs * 4 * s->f->linesize[1];
-                res = decode_sb(ctx, row + hbs, col, lflvl,
-                                yoff, uvoff, bl + 1);
-            }
+            decode_sb(ctx, row, col, lflvl, yoff, uvoff, bl + 1);
+            yoff  += hbs * 8 * y_stride;
+            uvoff += hbs * 4 * uv_stride;
+            decode_sb(ctx, row + hbs, col, lflvl, yoff, uvoff, bl + 1);
         } else {
             bp = PARTITION_V;
-            res = decode_b(ctx, row, col, lflvl, yoff, uvoff, bl, bp);
+            decode_b(ctx, row, col, lflvl, yoff, uvoff, bl, bp);
         }
     } else {
         bp = PARTITION_SPLIT;
-        res = decode_sb(ctx, row, col, lflvl, yoff, uvoff, bl + 1);
+        decode_sb(ctx, row, col, lflvl, yoff, uvoff, bl + 1);
     }
     s->counts.partition[bl][c][bp]++;
+}
+
+static void decode_sb_mem(AVCodecContext *ctx, int row, int col, struct VP9Filter *lflvl,
+                          ptrdiff_t yoff, ptrdiff_t uvoff, enum BlockLevel bl)
+{
+    VP9Context *s = ctx->priv_data;
+    VP9Block *b = s->b;
+    ptrdiff_t hbs = 4 >> bl;
+    AVFrame *f = s->frames[CUR_FRAME].tf.f;
+    ptrdiff_t y_stride = f->linesize[0], uv_stride = f->linesize[1];
 
-    return res;
+    if (bl == BL_8X8) {
+        av_assert2(b->bl == BL_8X8);
+        decode_b(ctx, row, col, lflvl, yoff, uvoff, b->bl, b->bp);
+    } else if (s->b->bl == bl) {
+        decode_b(ctx, row, col, lflvl, yoff, uvoff, b->bl, b->bp);
+        if (b->bp == PARTITION_H && row + hbs < s->rows) {
+            yoff  += hbs * 8 * y_stride;
+            uvoff += hbs * 4 * uv_stride;
+            decode_b(ctx, row + hbs, col, lflvl, yoff, uvoff, b->bl, b->bp);
+        } else if (b->bp == PARTITION_V && col + hbs < s->cols) {
+            yoff  += hbs * 8;
+            uvoff += hbs * 4;
+            decode_b(ctx, row, col + hbs, lflvl, yoff, uvoff, b->bl, b->bp);
+        }
+    } else {
+        decode_sb_mem(ctx, row, col, lflvl, yoff, uvoff, bl + 1);
+        if (col + hbs < s->cols) { // FIXME why not <=?
+            if (row + hbs < s->rows) {
+                decode_sb_mem(ctx, row, col + hbs, lflvl, yoff + 8 * hbs,
+                              uvoff + 4 * hbs, bl + 1);
+                yoff  += hbs * 8 * y_stride;
+                uvoff += hbs * 4 * uv_stride;
+                decode_sb_mem(ctx, row + hbs, col, lflvl, yoff, uvoff, bl + 1);
+                decode_sb_mem(ctx, row + hbs, col + hbs, lflvl,
+                                    yoff + 8 * hbs, uvoff + 4 * hbs, bl + 1);
+            } else {
+                yoff  += hbs * 8;
+                uvoff += hbs * 4;
+                decode_sb_mem(ctx, row, col + hbs, lflvl, yoff, uvoff, bl + 1);
+            }
+        } else if (row + hbs < s->rows) {
+            yoff  += hbs * 8 * y_stride;
+            uvoff += hbs * 4 * uv_stride;
+            decode_sb_mem(ctx, row + hbs, col, lflvl, yoff, uvoff, bl + 1);
+        }
+    }
 }
 
 static void loopfilter_sb(AVCodecContext *ctx, struct VP9Filter *lflvl,
                           int row, int col, ptrdiff_t yoff, ptrdiff_t uvoff)
 {
     VP9Context *s = ctx->priv_data;
-    uint8_t *dst = s->f->data[0] + yoff, *lvl = lflvl->level;
-    ptrdiff_t ls_y = s->f->linesize[0], ls_uv = s->f->linesize[1];
+    AVFrame *f = s->frames[CUR_FRAME].tf.f;
+    uint8_t *dst = f->data[0] + yoff, *lvl = lflvl->level;
+    ptrdiff_t ls_y = f->linesize[0], ls_uv = f->linesize[1];
     int y, x, p;
 
     // FIXME in how far can we interleave the v/h loopfilter calls? E.g.
@@ -2873,7 +3287,7 @@
     //                                          block1
     // filter edges between rows, Y plane (e.g. ------)
     //                                          block2
-    dst = s->f->data[0] + yoff;
+    dst = f->data[0] + yoff;
     lvl = lflvl->level;
     for (y = 0; y < 8; y++, dst += 8 * ls_y, lvl += 8) {
         uint8_t *ptr = dst, *l = lvl, *vmask = lflvl->mask[0][1][y];
@@ -2937,7 +3351,7 @@
     // same principle but for U/V planes
     for (p = 0; p < 2; p++) {
         lvl = lflvl->level;
-        dst = s->f->data[1 + p] + uvoff;
+        dst = f->data[1 + p] + uvoff;
         for (y = 0; y < 8; y += 4, dst += 16 * ls_uv, lvl += 32) {
             uint8_t *ptr = dst, *l = lvl, *hmask1 = lflvl->mask[1][0][y];
             uint8_t *hmask2 = lflvl->mask[1][0][y + 2];
@@ -2982,7 +3396,7 @@
             }
         }
         lvl = lflvl->level;
-        dst = s->f->data[1 + p] + uvoff;
+        dst = f->data[1 + p] + uvoff;
         for (y = 0; y < 8; y++, dst += 4 * ls_uv) {
             uint8_t *ptr = dst, *l = lvl, *vmask = lflvl->mask[1][1][y];
             unsigned vm = vmask[0] | vmask[1] | vmask[2];
@@ -3275,22 +3689,57 @@
     }
 }
 
-static int vp9_decode_frame(AVCodecContext *ctx, void *out_pic,
-                            int *got_frame, const uint8_t *data, int size)
+static void free_buffers(VP9Context *s)
+{
+    av_freep(&s->intra_pred_data[0]);
+    av_freep(&s->b_base);
+    av_freep(&s->block_base);
+}
+
+static av_cold int vp9_decode_free(AVCodecContext *ctx)
+{
+    VP9Context *s = ctx->priv_data;
+    int i;
+
+    for (i = 0; i < 2; i++) {
+        if (s->frames[i].tf.f->data[0])
+            vp9_unref_frame(ctx, &s->frames[i]);
+        av_frame_free(&s->frames[i].tf.f);
+    }
+    for (i = 0; i < 8; i++) {
+        if (s->refs[i].f->data[0])
+            ff_thread_release_buffer(ctx, &s->refs[i]);
+        av_frame_free(&s->refs[i].f);
+        if (s->next_refs[i].f->data[0])
+            ff_thread_release_buffer(ctx, &s->next_refs[i]);
+        av_frame_free(&s->next_refs[i].f);
+    }
+    free_buffers(s);
+    av_freep(&s->c_b);
+    s->c_b_size = 0;
+
+    return 0;
+}
+
+
+static int vp9_decode_frame(AVCodecContext *ctx, void *frame,
+                            int *got_frame, AVPacket *pkt)
 {
+    const uint8_t *data = pkt->data;
+    int size = pkt->size;
     VP9Context *s = ctx->priv_data;
     int res, tile_row, tile_col, i, ref, row, col;
-    ptrdiff_t yoff = 0, uvoff = 0;
-    //AVFrame *prev_frame = s->f; // for segmentation map
+    ptrdiff_t yoff, uvoff, ls_y, ls_uv;
+    AVFrame *f;
 
     if ((res = decode_frame_header(ctx, data, size, &ref)) < 0) {
         return res;
     } else if (res == 0) {
-        if (!s->refs[ref]) {
+        if (!s->refs[ref].f->data[0]) {
             av_log(ctx, AV_LOG_ERROR, "Requested reference %d not available\n", ref);
             return AVERROR_INVALIDDATA;
         }
-        if ((res = av_frame_ref(out_pic, s->refs[ref])) < 0)
+        if ((res = av_frame_ref(frame, s->refs[ref].f)) < 0)
             return res;
         *got_frame = 1;
         return 0;
@@ -3298,28 +3747,33 @@
     data += res;
     size -= res;
 
-    // discard old references
-    for (i = 0; i < 10; i++) {
-        AVFrame *f = s->fb[i];
-        if (f->data[0] && f != s->f &&
-            f != s->refs[0] && f != s->refs[1] &&
-            f != s->refs[2] && f != s->refs[3] &&
-            f != s->refs[4] && f != s->refs[5] &&
-            f != s->refs[6] && f != s->refs[7])
-            av_frame_unref(f);
-    }
-
-    // find unused reference
-    for (i = 0; i < 10; i++)
-        if (!s->fb[i]->data[0])
-            break;
-    av_assert0(i < 10);
-    s->f = s->fb[i];
-    if ((res = ff_get_buffer(ctx, s->f,
-                             s->refreshrefmask ? AV_GET_BUFFER_FLAG_REF : 0)) < 0)
+    if (s->frames[LAST_FRAME].tf.f->data[0])
+        vp9_unref_frame(ctx, &s->frames[LAST_FRAME]);
+    if (!s->keyframe && s->frames[CUR_FRAME].tf.f->data[0] &&
+        (res = vp9_ref_frame(ctx, &s->frames[LAST_FRAME], &s->frames[CUR_FRAME])) < 0)
+        return res;
+    if (s->frames[CUR_FRAME].tf.f->data[0])
+        vp9_unref_frame(ctx, &s->frames[CUR_FRAME]);
+    if ((res = vp9_alloc_frame(ctx, &s->frames[CUR_FRAME])) < 0)
         return res;
-    s->f->key_frame = s->keyframe;
-    s->f->pict_type = s->keyframe ? AV_PICTURE_TYPE_I : AV_PICTURE_TYPE_P;
+    f = s->frames[CUR_FRAME].tf.f;
+    f->key_frame = s->keyframe;
+    f->pict_type = s->keyframe ? AV_PICTURE_TYPE_I : AV_PICTURE_TYPE_P;
+    ls_y = f->linesize[0];
+    ls_uv =f->linesize[1];
+
+    // ref frame setup
+    for (i = 0; i < 8; i++) {
+        if (s->next_refs[i].f->data[0])
+            ff_thread_release_buffer(ctx, &s->next_refs[i]);
+        if (s->refreshrefmask & (1 << i)) {
+            res = ff_thread_ref_frame(&s->next_refs[i], &s->frames[CUR_FRAME].tf);
+        } else {
+            res = ff_thread_ref_frame(&s->next_refs[i], &s->refs[i]);
+        }
+        if (res < 0)
+            return res;
+    }
 
     // main tile decode loop
     memset(s->above_partition_ctx, 0, s->cols);
@@ -3333,120 +3787,167 @@
     memset(s->above_uv_nnz_ctx[0], 0, s->sb_cols * 8);
     memset(s->above_uv_nnz_ctx[1], 0, s->sb_cols * 8);
     memset(s->above_segpred_ctx, 0, s->cols);
-    for (tile_row = 0; tile_row < s->tiling.tile_rows; tile_row++) {
-        set_tile_offset(&s->tiling.tile_row_start, &s->tiling.tile_row_end,
-                        tile_row, s->tiling.log2_tile_rows, s->sb_rows);
-        for (tile_col = 0; tile_col < s->tiling.tile_cols; tile_col++) {
-            unsigned tile_size;
-
-            if (tile_col == s->tiling.tile_cols - 1 &&
-                tile_row == s->tiling.tile_rows - 1) {
-                tile_size = size;
-            } else {
-                tile_size = AV_RB32(data);
-                data += 4;
-                size -= 4;
-            }
-            if (tile_size > size)
-                return AVERROR_INVALIDDATA;
-            ff_vp56_init_range_decoder(&s->c_b[tile_col], data, tile_size);
-            if (vp56_rac_get_prob_branchy(&s->c_b[tile_col], 128)) // marker bit
-                return AVERROR_INVALIDDATA;
-            data += tile_size;
-            size -= tile_size;
+    s->pass = s->uses_2pass =
+        ctx->active_thread_type == FF_THREAD_FRAME && s->refreshctx && !s->parallelmode;
+    if ((res = update_block_buffers(ctx)) < 0) {
+        av_log(ctx, AV_LOG_ERROR,
+               "Failed to allocate block buffers\n");
+        return res;
+    }
+    if (s->refreshctx && s->parallelmode) {
+        int j, k, l, m;
+
+        for (i = 0; i < 4; i++) {
+            for (j = 0; j < 2; j++)
+                for (k = 0; k < 2; k++)
+                    for (l = 0; l < 6; l++)
+                        for (m = 0; m < 6; m++)
+                            memcpy(s->prob_ctx[s->framectxid].coef[i][j][k][l][m],
+                                   s->prob.coef[i][j][k][l][m], 3);
+            if (s->txfmmode == i)
+                break;
         }
+        s->prob_ctx[s->framectxid].p = s->prob.p;
+        ff_thread_finish_setup(ctx);
+    }
 
-        for (row = s->tiling.tile_row_start;
-             row < s->tiling.tile_row_end;
-             row += 8, yoff += s->f->linesize[0] * 64,
-             uvoff += s->f->linesize[1] * 32) {
-            struct VP9Filter *lflvl_ptr = s->lflvl;
-            ptrdiff_t yoff2 = yoff, uvoff2 = uvoff;
-
-            for (tile_col = 0; tile_col < s->tiling.tile_cols; tile_col++) {
-                set_tile_offset(&s->tiling.tile_col_start, &s->tiling.tile_col_end,
-                                tile_col, s->tiling.log2_tile_cols, s->sb_cols);
-
-                memset(s->left_partition_ctx, 0, 8);
-                memset(s->left_skip_ctx, 0, 8);
-                if (s->keyframe || s->intraonly) {
-                    memset(s->left_mode_ctx, DC_PRED, 16);
-                } else {
-                    memset(s->left_mode_ctx, NEARESTMV, 8);
+    do {
+        yoff = uvoff = 0;
+        s->b = s->b_base;
+        s->block = s->block_base;
+        s->uvblock[0] = s->uvblock_base[0];
+        s->uvblock[1] = s->uvblock_base[1];
+        s->eob = s->eob_base;
+        s->uveob[0] = s->uveob_base[0];
+        s->uveob[1] = s->uveob_base[1];
+
+        for (tile_row = 0; tile_row < s->tiling.tile_rows; tile_row++) {
+            set_tile_offset(&s->tiling.tile_row_start, &s->tiling.tile_row_end,
+                            tile_row, s->tiling.log2_tile_rows, s->sb_rows);
+            if (s->pass != 2) {
+                for (tile_col = 0; tile_col < s->tiling.tile_cols; tile_col++) {
+                    unsigned tile_size;
+
+                    if (tile_col == s->tiling.tile_cols - 1 &&
+                        tile_row == s->tiling.tile_rows - 1) {
+                        tile_size = size;
+                    } else {
+                        tile_size = AV_RB32(data);
+                        data += 4;
+                        size -= 4;
+                    }
+                    if (tile_size > size) {
+                        ff_thread_report_progress(&s->frames[CUR_FRAME].tf, INT_MAX, 0);
+                        return AVERROR_INVALIDDATA;
+                    }
+                    ff_vp56_init_range_decoder(&s->c_b[tile_col], data, tile_size);
+                    if (vp56_rac_get_prob_branchy(&s->c_b[tile_col], 128)) { // marker bit
+                        ff_thread_report_progress(&s->frames[CUR_FRAME].tf, INT_MAX, 0);
+                        return AVERROR_INVALIDDATA;
+                    }
+                    data += tile_size;
+                    size -= tile_size;
                 }
-                memset(s->left_y_nnz_ctx, 0, 16);
-                memset(s->left_uv_nnz_ctx, 0, 16);
-                memset(s->left_segpred_ctx, 0, 8);
-
-                memcpy(&s->c, &s->c_b[tile_col], sizeof(s->c));
-                for (col = s->tiling.tile_col_start;
-                     col < s->tiling.tile_col_end;
-                     col += 8, yoff2 += 64, uvoff2 += 32, lflvl_ptr++) {
-                    // FIXME integrate with lf code (i.e. zero after each
-                    // use, similar to invtxfm coefficients, or similar)
-                    memset(lflvl_ptr->mask, 0, sizeof(lflvl_ptr->mask));
-
-                    if ((res = decode_sb(ctx, row, col, lflvl_ptr,
-                                         yoff2, uvoff2, BL_64X64)) < 0)
-                        return res;
-                }
-                memcpy(&s->c_b[tile_col], &s->c, sizeof(s->c));
-            }
-
-            // backup pre-loopfilter reconstruction data for intra
-            // prediction of next row of sb64s
-            if (row + 8 < s->rows) {
-                memcpy(s->intra_pred_data[0],
-                       s->f->data[0] + yoff + 63 * s->f->linesize[0],
-                       8 * s->cols);
-                memcpy(s->intra_pred_data[1],
-                       s->f->data[1] + uvoff + 31 * s->f->linesize[1],
-                       4 * s->cols);
-                memcpy(s->intra_pred_data[2],
-                       s->f->data[2] + uvoff + 31 * s->f->linesize[2],
-                       4 * s->cols);
-            }
-
-            // loopfilter one row
-            if (s->filter.level) {
-                yoff2 = yoff;
-                uvoff2 = uvoff;
-                lflvl_ptr = s->lflvl;
-                for (col = 0; col < s->cols;
-                     col += 8, yoff2 += 64, uvoff2 += 32, lflvl_ptr++) {
-                    loopfilter_sb(ctx, lflvl_ptr, row, col, yoff2, uvoff2);
+            }
+
+            for (row = s->tiling.tile_row_start; row < s->tiling.tile_row_end;
+                 row += 8, yoff += ls_y * 64, uvoff += ls_uv * 32) {
+                struct VP9Filter *lflvl_ptr = s->lflvl;
+                ptrdiff_t yoff2 = yoff, uvoff2 = uvoff;
+
+                for (tile_col = 0; tile_col < s->tiling.tile_cols; tile_col++) {
+                    set_tile_offset(&s->tiling.tile_col_start, &s->tiling.tile_col_end,
+                                    tile_col, s->tiling.log2_tile_cols, s->sb_cols);
+
+                    if (s->pass != 2) {
+                        memset(s->left_partition_ctx, 0, 8);
+                        memset(s->left_skip_ctx, 0, 8);
+                        if (s->keyframe || s->intraonly) {
+                            memset(s->left_mode_ctx, DC_PRED, 16);
+                        } else {
+                            memset(s->left_mode_ctx, NEARESTMV, 8);
+                        }
+                        memset(s->left_y_nnz_ctx, 0, 16);
+                        memset(s->left_uv_nnz_ctx, 0, 16);
+                        memset(s->left_segpred_ctx, 0, 8);
+
+                        memcpy(&s->c, &s->c_b[tile_col], sizeof(s->c));
+                    }
+
+                    for (col = s->tiling.tile_col_start;
+                         col < s->tiling.tile_col_end;
+                         col += 8, yoff2 += 64, uvoff2 += 32, lflvl_ptr++) {
+                        // FIXME integrate with lf code (i.e. zero after each
+                        // use, similar to invtxfm coefficients, or similar)
+                        if (s->pass != 1) {
+                            memset(lflvl_ptr->mask, 0, sizeof(lflvl_ptr->mask));
+                        }
+
+                        if (s->pass == 2) {
+                            decode_sb_mem(ctx, row, col, lflvl_ptr,
+                                          yoff2, uvoff2, BL_64X64);
+                        } else {
+                            decode_sb(ctx, row, col, lflvl_ptr,
+                                      yoff2, uvoff2, BL_64X64);
+                        }
+                    }
+                    if (s->pass != 2) {
+                        memcpy(&s->c_b[tile_col], &s->c, sizeof(s->c));
+                    }
+                }
+
+                if (s->pass == 1) {
+                    continue;
                 }
+
+                // backup pre-loopfilter reconstruction data for intra
+                // prediction of next row of sb64s
+                if (row + 8 < s->rows) {
+                    memcpy(s->intra_pred_data[0],
+                           f->data[0] + yoff + 63 * ls_y,
+                           8 * s->cols);
+                    memcpy(s->intra_pred_data[1],
+                           f->data[1] + uvoff + 31 * ls_uv,
+                           4 * s->cols);
+                    memcpy(s->intra_pred_data[2],
+                           f->data[2] + uvoff + 31 * ls_uv,
+                           4 * s->cols);
+                }
+
+                // loopfilter one row
+                if (s->filter.level) {
+                    yoff2 = yoff;
+                    uvoff2 = uvoff;
+                    lflvl_ptr = s->lflvl;
+                    for (col = 0; col < s->cols;
+                         col += 8, yoff2 += 64, uvoff2 += 32, lflvl_ptr++) {
+                        loopfilter_sb(ctx, lflvl_ptr, row, col, yoff2, uvoff2);
+                    }
+                }
+
+                // FIXME maybe we can make this more finegrained by running the
+                // loopfilter per-block instead of after each sbrow
+                // In fact that would also make intra pred left preparation easier?
+                ff_thread_report_progress(&s->frames[CUR_FRAME].tf, row >> 3, 0);
             }
         }
-    }
-
-    // bw adaptivity (or in case of parallel decoding mode, fw adaptivity
-    // probability maintenance between frames)
-    if (s->refreshctx) {
-        if (s->parallelmode) {
-            int i, j, k, l, m;
 
-            for (i = 0; i < 4; i++)
-                for (j = 0; j < 2; j++)
-                    for (k = 0; k < 2; k++)
-                        for (l = 0; l < 6; l++)
-                            for (m = 0; m < 6; m++)
-                                memcpy(s->prob_ctx[s->framectxid].coef[i][j][k][l][m],
-                                       s->prob.coef[i][j][k][l][m], 3);
-            s->prob_ctx[s->framectxid].p = s->prob.p;
-        } else {
+        if (s->pass < 2 && s->refreshctx && !s->parallelmode) {
             adapt_probs(s);
+            ff_thread_finish_setup(ctx);
         }
-    }
-    FFSWAP(struct VP9mvrefPair *, s->mv[0], s->mv[1]);
+    } while (s->pass++ == 1);
+    ff_thread_report_progress(&s->frames[CUR_FRAME].tf, INT_MAX, 0);
 
     // ref frame setup
-    for (i = 0; i < 8; i++)
-        if (s->refreshrefmask & (1 << i))
-            s->refs[i] = s->f;
+    for (i = 0; i < 8; i++) {
+        if (s->refs[i].f->data[0])
+            ff_thread_release_buffer(ctx, &s->refs[i]);
+        ff_thread_ref_frame(&s->refs[i], &s->next_refs[i]);
+    }
 
     if (!s->invisible) {
-        if ((res = av_frame_ref(out_pic, s->f)) < 0)
+        if ((res = av_frame_ref(frame, s->frames[CUR_FRAME].tf.f)) < 0)
             return res;
         *got_frame = 1;
     }
@@ -3454,125 +3955,113 @@
     return 0;
 }
 
-static int vp9_decode_packet(AVCodecContext *avctx, void *out_pic,
-                             int *got_frame, AVPacket *avpkt)
-{
-    const uint8_t *data = avpkt->data;
-    int size = avpkt->size, marker, res;
-
-    // read superframe index - this is a collection of individual frames that
-    // together lead to one visible frame
-    av_assert1(size > 0); // without CODEC_CAP_DELAY, this is implied
-    marker = data[size - 1];
-    if ((marker & 0xe0) == 0xc0) {
-        int nbytes = 1 + ((marker >> 3) & 0x3);
-        int n_frames = 1 + (marker & 0x7), idx_sz = 2 + n_frames * nbytes;
-
-        if (size >= idx_sz && data[size - idx_sz] == marker) {
-            const uint8_t *idx = data + size + 1 - idx_sz;
-            switch (nbytes) {
-#define case_n(a, rd) \
-                case a: \
-                    while (n_frames--) { \
-                        int sz = rd; \
-                        idx += a; \
-                        if (sz > size) { \
-                            av_log(avctx, AV_LOG_ERROR, \
-                                   "Superframe packet size too big: %d > %d\n", \
-                                   sz, size); \
-                            return AVERROR_INVALIDDATA; \
-                        } \
-                        res = vp9_decode_frame(avctx, out_pic, got_frame, \
-                                               data, sz); \
-                        if (res < 0) \
-                            return res; \
-                        data += sz; \
-                        size -= sz; \
-                    } \
-                    break;
-                case_n(1, *idx);
-                case_n(2, AV_RL16(idx));
-                case_n(3, AV_RL24(idx));
-                case_n(4, AV_RL32(idx));
-            }
-            return avpkt->size;
-        }
-    }
-    // if we get here, there was no valid superframe index, i.e. this is just
-    // one whole single frame - decode it as such from the complete input buf
-    if ((res = vp9_decode_frame(avctx, out_pic, got_frame, data, size)) < 0)
-        return res;
-    return avpkt->size;
-}
-
 static void vp9_decode_flush(AVCodecContext *ctx)
 {
     VP9Context *s = ctx->priv_data;
     int i;
 
-    for (i = 0; i < 10; i++)
-        if (s->fb[i]->data[0])
-            av_frame_unref(s->fb[i]);
+    for (i = 0; i < 2; i++)
+        vp9_unref_frame(ctx, &s->frames[i]);
     for (i = 0; i < 8; i++)
-        s->refs[i] = NULL;
-    s->f = NULL;
+        ff_thread_release_buffer(ctx, &s->refs[i]);
 }
 
-static av_cold int vp9_decode_init(AVCodecContext *ctx)
+static int init_frames(AVCodecContext *ctx)
 {
     VP9Context *s = ctx->priv_data;
     int i;
 
-    ctx->pix_fmt = AV_PIX_FMT_YUV420P;
-    ff_vp9dsp_init(&s->dsp);
-    ff_videodsp_init(&s->vdsp, 8);
-    for (i = 0; i < 10; i++) {
-        s->fb[i] = av_frame_alloc();
-        if (!s->fb[i]) {
+    for (i = 0; i < 2; i++) {
+        s->frames[i].tf.f = av_frame_alloc();
+        if (!s->frames[i].tf.f) {
+            vp9_decode_free(ctx);
+            av_log(ctx, AV_LOG_ERROR, "Failed to allocate frame buffer %d\n", i);
+            return AVERROR(ENOMEM);
+        }
+    }
+    for (i = 0; i < 8; i++) {
+        s->refs[i].f = av_frame_alloc();
+        s->next_refs[i].f = av_frame_alloc();
+        if (!s->refs[i].f || !s->next_refs[i].f) {
+            vp9_decode_free(ctx);
             av_log(ctx, AV_LOG_ERROR, "Failed to allocate frame buffer %d\n", i);
             return AVERROR(ENOMEM);
         }
     }
-    s->filter.sharpness = -1;
 
     return 0;
 }
 
-static av_cold int vp9_decode_free(AVCodecContext *ctx)
+static av_cold int vp9_decode_init(AVCodecContext *ctx)
 {
     VP9Context *s = ctx->priv_data;
-    int i;
 
-    for (i = 0; i < 10; i++) {
-        if (s->fb[i]->data[0])
-            av_frame_unref(s->fb[i]);
-        av_frame_free(&s->fb[i]);
-    }
-    av_freep(&s->above_partition_ctx);
-    s->above_skip_ctx = s->above_txfm_ctx = s->above_mode_ctx = NULL;
-    s->above_y_nnz_ctx = s->above_uv_nnz_ctx[0] = s->above_uv_nnz_ctx[1] = NULL;
-    s->intra_pred_data[0] = s->intra_pred_data[1] = s->intra_pred_data[2] = NULL;
-    s->above_segpred_ctx = s->above_intra_ctx = s->above_comp_ctx = NULL;
-    s->above_ref_ctx = s->above_filter_ctx = NULL;
-    s->above_mv_ctx = NULL;
-    s->segmentation_map = NULL;
-    s->mv[0] = s->mv[1] = NULL;
-    s->lflvl = NULL;
-    av_freep(&s->c_b);
-    s->c_b_size = 0;
+    ctx->internal->allocate_progress = 1;
+    ctx->pix_fmt = AV_PIX_FMT_YUV420P;
+    ff_vp9dsp_init(&s->dsp);
+    ff_videodsp_init(&s->vdsp, 8);
+    s->filter.sharpness = -1;
+
+    return init_frames(ctx);
+}
+
+static av_cold int vp9_decode_init_thread_copy(AVCodecContext *avctx)
+{
+    return init_frames(avctx);
+}
+
+static int vp9_decode_update_thread_context(AVCodecContext *dst, const AVCodecContext *src)
+{
+    int i, res;
+    VP9Context *s = dst->priv_data, *ssrc = src->priv_data;
+
+    // detect size changes in other threads
+    if (s->intra_pred_data[0] &&
+        (!ssrc->intra_pred_data[0] || s->cols != ssrc->cols || s->rows != ssrc->rows)) {
+        free_buffers(s);
+    }
+
+    for (i = 0; i < 2; i++) {
+        if (s->frames[i].tf.f->data[0])
+            vp9_unref_frame(dst, &s->frames[i]);
+        if (ssrc->frames[i].tf.f->data[0]) {
+            if ((res = vp9_ref_frame(dst, &s->frames[i], &ssrc->frames[i])) < 0)
+                return res;
+        }
+    }
+    for (i = 0; i < 8; i++) {
+        if (s->refs[i].f->data[0])
+            ff_thread_release_buffer(dst, &s->refs[i]);
+        if (ssrc->next_refs[i].f->data[0]) {
+            if ((res = ff_thread_ref_frame(&s->refs[i], &ssrc->next_refs[i])) < 0)
+                return res;
+        }
+    }
+
+    s->invisible = ssrc->invisible;
+    s->keyframe = ssrc->keyframe;
+    s->uses_2pass = ssrc->uses_2pass;
+    memcpy(&s->prob_ctx, &ssrc->prob_ctx, sizeof(s->prob_ctx));
+    memcpy(&s->lf_delta, &ssrc->lf_delta, sizeof(s->lf_delta));
+    if (ssrc->segmentation.enabled) {
+        memcpy(&s->segmentation.feat, &ssrc->segmentation.feat,
+               sizeof(s->segmentation.feat));
+    }
 
     return 0;
 }
 
 AVCodec ff_vp9_decoder = {
-  .name                  = "vp9",
-  .long_name             = NULL_IF_CONFIG_SMALL("Google VP9"),
-  .type                  = AVMEDIA_TYPE_VIDEO,
-  .id                    = AV_CODEC_ID_VP9,
-  .priv_data_size        = sizeof(VP9Context),
-  .init                  = vp9_decode_init,
-  .close                 = vp9_decode_free,
-  .decode                = vp9_decode_packet,
-  .capabilities          = CODEC_CAP_DR1,
-  .flush                 = vp9_decode_flush,
+    .name                  = "vp9",
+    .long_name             = NULL_IF_CONFIG_SMALL("Google VP9"),
+    .type                  = AVMEDIA_TYPE_VIDEO,
+    .id                    = AV_CODEC_ID_VP9,
+    .priv_data_size        = sizeof(VP9Context),
+    .init                  = vp9_decode_init,
+    .close                 = vp9_decode_free,
+    .decode                = vp9_decode_frame,
+    .capabilities          = CODEC_CAP_DR1 | CODEC_CAP_FRAME_THREADS,
+    .flush                 = vp9_decode_flush,
+    .init_thread_copy      = ONLY_IF_THREADS_ENABLED(vp9_decode_init_thread_copy),
+    .update_thread_context = ONLY_IF_THREADS_ENABLED(vp9_decode_update_thread_context),
 };

omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/vp9_parser.c Added

@@ -0,0 +1,118 @@
+/*
+ * Copyright (C) 2008 Michael Niedermayer
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "libavutil/intreadwrite.h"
+#include "parser.h"
+
+typedef struct VP9ParseContext {
+    int n_frames; // 1-8
+    int size[8];
+} VP9ParseContext;
+
+static void parse_frame(AVCodecParserContext *ctx, const uint8_t *buf, int size)
+{
+    if (buf[0] & 0x4) {
+        ctx->pict_type = AV_PICTURE_TYPE_P;
+        ctx->key_frame = 0;
+    } else {
+        ctx->pict_type = AV_PICTURE_TYPE_I;
+        ctx->key_frame = 1;
+    }
+}
+
+static int parse(AVCodecParserContext *ctx,
+                 AVCodecContext *avctx,
+                 const uint8_t **out_data, int *out_size,
+                 const uint8_t *data, int size)
+{
+    VP9ParseContext *s = ctx->priv_data;
+    int marker;
+
+    if (size <= 0) {
+        *out_size = 0;
+        *out_data = data;
+
+        return 0;
+    }
+
+    if (s->n_frames > 0) {
+        *out_data = data;
+        *out_size = s->size[--s->n_frames];
+        parse_frame(ctx, *out_data, *out_size);
+
+        return s->n_frames > 0 ? *out_size : size /* i.e. include idx tail */;
+    }
+
+    marker = data[size - 1];
+    if ((marker & 0xe0) == 0xc0) {
+        int nbytes = 1 + ((marker >> 3) & 0x3);
+        int n_frames = 1 + (marker & 0x7), idx_sz = 2 + n_frames * nbytes;
+
+        if (size >= idx_sz && data[size - idx_sz] == marker) {
+            const uint8_t *idx = data + size + 1 - idx_sz;
+            int first = 1;
+
+            switch (nbytes) {
+#define case_n(a, rd) \
+            case a: \
+                while (n_frames--) { \
+                    unsigned sz = rd; \
+                    idx += a; \
+                    if (sz > size) { \
+                        s->n_frames = 0; \
+                        av_log(avctx, AV_LOG_ERROR, \
+                               "Superframe packet size too big: %u > %d\n", \
+                               sz, size); \
+                        return size; \
+                    } \
+                    if (first) { \
+                        first = 0; \
+                        *out_data = data; \
+                        *out_size = sz; \
+                        s->n_frames = n_frames; \
+                    } else { \
+                        s->size[n_frames] = sz; \
+                    } \
+                    data += sz; \
+                    size -= sz; \
+                } \
+                parse_frame(ctx, *out_data, *out_size); \
+                return *out_size
+
+                case_n(1, *idx);
+                case_n(2, AV_RL16(idx));
+                case_n(3, AV_RL24(idx));
+                case_n(4, AV_RL32(idx));
+            }
+        }
+    }
+
+    *out_data = data;
+    *out_size = size;
+    parse_frame(ctx, data, size);
+
+    return size;
+}
+
+AVCodecParser ff_vp9_parser = {
+    .codec_ids      = { AV_CODEC_ID_VP9 },
+    .priv_data_size = sizeof(VP9ParseContext),
+    .parser_parse   = parse,
+};

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/vp9data.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/vp9data.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/vp9dsp.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/vp9dsp.c Changed

@@ -84,10 +84,10 @@
 static void hor_4x4_c(uint8_t *dst, ptrdiff_t stride,
                       const uint8_t *left, const uint8_t *top)
 {
-    AV_WN32A(dst + stride * 0, left[0] * 0x01010101U);
-    AV_WN32A(dst + stride * 1, left[1] * 0x01010101U);
-    AV_WN32A(dst + stride * 2, left[2] * 0x01010101U);
-    AV_WN32A(dst + stride * 3, left[3] * 0x01010101U);
+    AV_WN32A(dst + stride * 0, left[3] * 0x01010101U);
+    AV_WN32A(dst + stride * 1, left[2] * 0x01010101U);
+    AV_WN32A(dst + stride * 2, left[1] * 0x01010101U);
+    AV_WN32A(dst + stride * 3, left[0] * 0x01010101U);
 }
 
 static void hor_8x8_c(uint8_t *dst, ptrdiff_t stride,
@@ -96,7 +96,7 @@
     int y;
 
     for (y = 0; y < 8; y++) {
-        AV_WN64A(dst, left[y] * 0x0101010101010101ULL);
+        AV_WN64A(dst, left[7 - y] * 0x0101010101010101ULL);
         dst += stride;
     }
 }
@@ -107,7 +107,7 @@
     int y;
 
     for (y = 0; y < 16; y++) {
-        uint64_t p8 = left[y] * 0x0101010101010101ULL;
+        uint64_t p8 = left[15 - y] * 0x0101010101010101ULL;
 
         AV_WN64A(dst + 0, p8);
         AV_WN64A(dst + 8, p8);
@@ -121,7 +121,7 @@
     int y;
 
     for (y = 0; y < 32; y++) {
-        uint64_t p8 = left[y] * 0x0101010101010101ULL;
+        uint64_t p8 = left[31 - y] * 0x0101010101010101ULL;
 
         AV_WN64A(dst +  0, p8);
         AV_WN64A(dst +  8, p8);
@@ -137,7 +137,7 @@
     int y, tl = top[-1];
 
     for (y = 0; y < 4; y++) {
-        int l_m_tl = left[y] - tl;
+        int l_m_tl = left[3 - y] - tl;
 
         dst[0] = av_clip_uint8(top[0] + l_m_tl);
         dst[1] = av_clip_uint8(top[1] + l_m_tl);
@@ -153,7 +153,7 @@
     int y, tl = top[-1];
 
     for (y = 0; y < 8; y++) {
-        int l_m_tl = left[y] - tl;
+        int l_m_tl = left[7 - y] - tl;
 
         dst[0] = av_clip_uint8(top[0] + l_m_tl);
         dst[1] = av_clip_uint8(top[1] + l_m_tl);
@@ -173,7 +173,7 @@
     int y, tl = top[-1];
 
     for (y = 0; y < 16; y++) {
-        int l_m_tl = left[y] - tl;
+        int l_m_tl = left[15 - y] - tl;
 
         dst[ 0] = av_clip_uint8(top[ 0] + l_m_tl);
         dst[ 1] = av_clip_uint8(top[ 1] + l_m_tl);
@@ -201,7 +201,7 @@
     int y, tl = top[-1];
 
     for (y = 0; y < 32; y++) {
-        int l_m_tl = left[y] - tl;
+        int l_m_tl = left[31 - y] - tl;
 
         dst[ 0] = av_clip_uint8(top[ 0] + l_m_tl);
         dst[ 1] = av_clip_uint8(top[ 1] + l_m_tl);
@@ -613,7 +613,7 @@
                                  const uint8_t *left, const uint8_t *top)
 {
     int tl = top[-1], a0 = top[0], a1 = top[1], a2 = top[2], a3 = top[3],
-        l0 = left[0], l1 = left[1], l2 = left[2], l3 = left[3];
+        l0 = left[3], l1 = left[2], l2 = left[1], l3 = left[0];
 
     DST(0,3) = (l1 + l2 * 2 + l3 + 2) >> 2;
     DST(0,2) = DST(1,3) = (l0 + l1 * 2 + l2 + 2) >> 2;
@@ -632,11 +632,11 @@
     uint8_t v[size + size - 1]; \
 \
     for (i = 0; i < size - 2; i++) { \
-        v[i           ] = (left[size - 1 - i] + left[size - 2 - i] * 2 + left[size - 3 - i] + 2) >> 2; \
-        v[size + 1 + i] = (top[i]             + top[i + 1]         * 2 + top[i + 2]         + 2) >> 2; \
+        v[i           ] = (left[i] + left[i + 1] * 2 + left[i + 2] + 2) >> 2; \
+        v[size + 1 + i] = (top[i]  + top[i + 1]  * 2 + top[i + 2]  + 2) >> 2; \
     } \
-    v[size - 2] = (left[1] + left[0] * 2 + top[-1] + 2) >> 2; \
-    v[size - 1] = (left[0] + top[-1] * 2 + top[ 0] + 2) >> 2; \
+    v[size - 2] = (left[size - 2] + left[size - 1] * 2 + top[-1] + 2) >> 2; \
+    v[size - 1] = (left[size - 1] + top[-1] * 2 + top[ 0] + 2) >> 2; \
     v[size    ] = (top[-1] + top[0]  * 2 + top[ 1] + 2) >> 2; \
 \
     for (j = 0; j < size; j++) \
@@ -651,7 +651,7 @@
                              const uint8_t *left, const uint8_t *top)
 {
     int tl = top[-1], a0 = top[0], a1 = top[1], a2 = top[2], a3 = top[3],
-        l0 = left[0], l1 = left[1], l2 = left[2];
+        l0 = left[3], l1 = left[2], l2 = left[1];
 
     DST(0,3) = (l0 + l1 * 2 + l2 + 2) >> 2;
     DST(0,2) = (tl + l0 * 2 + l1 + 2) >> 2;
@@ -673,14 +673,14 @@
     uint8_t ve[size + size/2 - 1], vo[size + size/2 - 1]; \
 \
     for (i = 0; i < size/2 - 2; i++) { \
-        vo[i] = (left[size - 4 - i*2] + left[size - 3 - i*2] * 2 + left[size - 2 - i*2] + 2) >> 2; \
-        ve[i] = (left[size - 5 - i*2] + left[size - 4 - i*2] * 2 + left[size - 3 - i*2] + 2) >> 2; \
+        vo[i] = (left[i*2 + 3] + left[i*2 + 2] * 2 + left[i*2 + 1] + 2) >> 2; \
+        ve[i] = (left[i*2 + 4] + left[i*2 + 3] * 2 + left[i*2 + 2] + 2) >> 2; \
     } \
-    vo[size/2 - 2] = (left[0] + left[1] * 2 + left[2] + 2) >> 2; \
-    ve[size/2 - 2] = (top[-1] + left[0] * 2 + left[1] + 2) >> 2; \
+    vo[size/2 - 2] = (left[size - 1] + left[size - 2] * 2 + left[size - 3] + 2) >> 2; \
+    ve[size/2 - 2] = (top[-1] + left[size - 1] * 2 + left[size - 2] + 2) >> 2; \
 \
     ve[size/2 - 1] = (top[-1] + top[0] + 1) >> 1; \
-    vo[size/2 - 1] = (left[0] + top[-1] * 2 + top[0] + 2) >> 2; \
+    vo[size/2 - 1] = (left[size - 1] + top[-1] * 2 + top[0] + 2) >> 2; \
     for (i = 0; i < size - 1; i++) { \
         ve[size/2 + i] = (top[i] + top[i + 1] + 1) >> 1; \
         vo[size/2 + i] = (top[i - 1] + top[i] * 2 + top[i + 1] + 2) >> 2; \
@@ -699,7 +699,7 @@
 static void hor_down_4x4_c(uint8_t *dst, ptrdiff_t stride,
                            const uint8_t *left, const uint8_t *top)
 {
-    int l0 = left[0], l1 = left[1], l2 = left[2], l3 = left[3],
+    int l0 = left[3], l1 = left[2], l2 = left[1], l3 = left[0],
         tl = top[-1], a0 = top[0], a1 = top[1], a2 = top[2];
 
     DST(2,0) = (tl + a0 * 2 + a1 + 2) >> 2;
@@ -722,14 +722,14 @@
     uint8_t v[size * 3 - 2]; \
 \
     for (i = 0; i < size - 2; i++) { \
-        v[i*2       ] = (left[size - 2 - i] + left[size - 1 - i] + 1) >> 1; \
-        v[i*2    + 1] = (left[size - 3 - i] + left[size - 2 - i] * 2 + left[size - 1 - i] + 2) >> 2; \
+        v[i*2       ] = (left[i + 1] + left[i + 0] + 1) >> 1; \
+        v[i*2    + 1] = (left[i + 2] + left[i + 1] * 2 + left[i + 0] + 2) >> 2; \
         v[size*2 + i] = (top[i - 1] + top[i] * 2 + top[i + 1] + 2) >> 2; \
     } \
-    v[size*2 - 2] = (top[-1] + left[0] + 1) >> 1; \
-    v[size*2 - 4] = (left[0] + left[1] + 1) >> 1; \
-    v[size*2 - 1] = (top[0]  + top[-1] * 2 + left[0] + 2) >> 2; \
-    v[size*2 - 3] = (top[-1] + left[0] * 2 + left[1] + 2) >> 2; \
+    v[size*2 - 2] = (top[-1] + left[size - 1] + 1) >> 1; \
+    v[size*2 - 4] = (left[size - 1] + left[size - 2] + 1) >> 1; \
+    v[size*2 - 1] = (top[0]  + top[-1] * 2 + left[size - 1] + 2) >> 2; \
+    v[size*2 - 3] = (top[-1] + left[size - 1] * 2 + left[size - 2] + 2) >> 2; \
 \
     for (j = 0; j < size; j++) \
         memcpy(dst + j*stride, v + size*2 - 2 - j*2, size); \
@@ -786,7 +786,7 @@
 static void hor_up_4x4_c(uint8_t *dst, ptrdiff_t stride,
                          const uint8_t *left, const uint8_t *top)
 {
-    int l0 = left[0], l1 = left[1], l2 = left[2], l3 = left[3];
+    int l0 = left[3], l1 = left[2], l2 = left[1], l3 = left[0];
 
     DST(0,0) = (l0 + l1 + 1) >> 1;
     DST(1,0) = (l0 + l1 * 2 + l2 + 2) >> 2;
@@ -805,17 +805,17 @@
     uint8_t v[size*2 - 2]; \
 \
     for (i = 0; i < size - 2; i++) { \
-        v[i*2    ] = (left[i] + left[i + 1] + 1) >> 1; \
-        v[i*2 + 1] = (left[i] + left[i + 1] * 2 + left[i + 2] + 2) >> 2; \
+        v[i*2    ] = (left[size - i - 1] + left[size - i - 2] + 1) >> 1; \
+        v[i*2 + 1] = (left[size - i - 1] + left[size - i - 2] * 2 + left[size - i - 3] + 2) >> 2; \
     } \
-    v[size*2 - 4] = (left[size - 2] + left[size - 1] + 1) >> 1; \
-    v[size*2 - 3] = (left[size - 2] + left[size - 1] * 3 + 2) >> 2; \
+    v[size*2 - 4] = (left[1] + left[0] + 1) >> 1; \
+    v[size*2 - 3] = (left[1] + left[0] * 3 + 2) >> 2; \
 \
     for (j = 0; j < size / 2; j++) \
         memcpy(dst + j*stride, v + j*2, size); \
     for (j = size / 2; j < size; j++) { \
         memcpy(dst + j*stride, v + j*2, size*2 - 2 - j*2); \
-        memset(dst + j*stride + size*2 - 2 - j*2, left[size - 1], \
+        memset(dst + j*stride + size*2 - 2 - j*2, left[0], \
                2 + j*2 - size); \
     } \
 }
@@ -853,13 +853,29 @@
 #undef init_intra_pred
 }
 
-#define itxfm_wrapper(type_a, type_b, sz, bits) \
+#define itxfm_wrapper(type_a, type_b, sz, bits, has_dconly) \
 static void type_a##_##type_b##_##sz##x##sz##_add_c(uint8_t *dst, \
                                                     ptrdiff_t stride, \
                                                     int16_t *block, int eob) \
 { \
     int i, j; \
     int16_t tmp[sz * sz], out[sz]; \
+\
+    if (has_dconly && eob == 1) { \
+        const int t  = (((block[0] * 11585 + (1 << 13)) >> 14) \
+                                   * 11585 + (1 << 13)) >> 14; \
+        block[0] = 0; \
+        for (i = 0; i < sz; i++) { \
+            for (j = 0; j < sz; j++) \
+                dst[j * stride] = av_clip_uint8(dst[j * stride] + \
+                                                (bits ? \
+                                                 (t + (1 << (bits - 1))) >> bits : \
+                                                 t)); \
+            dst++; \
+        } \
+        return; \
+    } \
+\
     for (i = 0; i < sz; i++) \
         type_a##sz##_1d(block + i, sz, tmp + i * sz, 0); \
     memset(block, 0, sz * sz * sizeof(*block)); \
@@ -875,10 +891,10 @@
 }
 
 #define itxfm_wrap(sz, bits) \
-itxfm_wrapper(idct,  idct,  sz, bits) \
-itxfm_wrapper(iadst, idct,  sz, bits) \
-itxfm_wrapper(idct,  iadst, sz, bits) \
-itxfm_wrapper(iadst, iadst, sz, bits)
+itxfm_wrapper(idct,  idct,  sz, bits, 1) \
+itxfm_wrapper(iadst, idct,  sz, bits, 0) \
+itxfm_wrapper(idct,  iadst, sz, bits, 0) \
+itxfm_wrapper(iadst, iadst, sz, bits, 0)
 
 #define IN(x) in[x * stride]
 
@@ -1397,7 +1413,7 @@
     out[31] = t0   - t31;
 }
 
-itxfm_wrapper(idct, idct, 32, 6)
+itxfm_wrapper(idct, idct, 32, 6, 1)
 
 static av_always_inline void iwht4_1d(const int16_t *in, ptrdiff_t stride,
                                       int16_t *out, int pass)
@@ -1430,7 +1446,7 @@
     out[3] = t3;
 }
 
-itxfm_wrapper(iwht, iwht, 4, 0)
+itxfm_wrapper(iwht, iwht, 4, 0, 0)
 
 #undef IN
 #undef itxfm_wrapper
@@ -1460,8 +1476,7 @@
 #undef init_idct
 }
 
-static av_always_inline void loop_filter(uint8_t *dst,  ptrdiff_t stride,
-                                         int E, int I, int H,
+static av_always_inline void loop_filter(uint8_t *dst, int E, int I, int H,
                                          ptrdiff_t stridea, ptrdiff_t strideb,
                                          int wd)
 {
@@ -1573,7 +1588,7 @@
                                            ptrdiff_t stride, \
                                            int E, int I, int H) \
 { \
-    loop_filter(dst, stride, E, I, H, stridea, strideb, wd); \
+    loop_filter(dst, E, I, H, stridea, strideb, wd); \
 }
 
 #define lf_8_fns(wd) \

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/vqavideo.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/vqavideo.c Changed

@@ -179,7 +179,7 @@
     /* allocate decode buffer */
     s->decode_buffer_size = (s->width / s->vector_width) *
         (s->height / s->vector_height) * 2;
-    s->decode_buffer = av_malloc(s->decode_buffer_size);
+    s->decode_buffer = av_mallocz(s->decode_buffer_size);
     if (!s->decode_buffer)
         goto fail;
 
@@ -238,7 +238,7 @@
 
         /* 0x80 means that frame is finished */
         if (opcode == 0x80)
-            return 0;
+            break;
 
         if (dest_index >= dest_size) {
             av_log(s->avctx, AV_LOG_ERROR, "decode_format80 problem: dest_index (%d) exceeded dest_size (%d)\n",
@@ -303,9 +303,11 @@
      * codebook entry; it is not important for compressed codebooks because
      * not every entry needs to be filled */
     if (check_size)
-        if (dest_index < dest_size)
+        if (dest_index < dest_size) {
             av_log(s->avctx, AV_LOG_ERROR, "decode_format80 problem: decode finished with dest_index (%d) < dest_size (%d)\n",
                 dest_index, dest_size);
+            memset(dest + dest_index, 0, dest_size - dest_index);
+        }
 
     return 0; // let's display what we decoded anyway
 }

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/wavpack.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/wavpack.c Changed

@@ -487,6 +487,13 @@
     } while (!last && count < s->samples);
 
     wv_reset_saved_context(s);
+
+    if (last && count < s->samples) {
+        int size = av_get_bytes_per_sample(type);
+        memset((uint8_t*)dst_l + count*size, 0, (s->samples-count)*size);
+        memset((uint8_t*)dst_r + count*size, 0, (s->samples-count)*size);
+    }
+
     if ((s->avctx->err_recognition & AV_EF_CRCCHECK) &&
         wv_check_crc(s, crc, crc_extra_bits))
         return AVERROR_INVALIDDATA;
@@ -548,9 +555,17 @@
     } while (!last && count < s->samples);
 
     wv_reset_saved_context(s);
-    if ((s->avctx->err_recognition & AV_EF_CRCCHECK) &&
-        wv_check_crc(s, crc, crc_extra_bits))
-        return AVERROR_INVALIDDATA;
+
+    if (last && count < s->samples) {
+        int size = av_get_bytes_per_sample(type);
+        memset((uint8_t*)dst + count*size, 0, (s->samples-count)*size);
+    }
+
+    if (s->avctx->err_recognition & AV_EF_CRCCHECK) {
+        int ret = wv_check_crc(s, crc, crc_extra_bits);
+        if (ret < 0 && s->avctx->err_recognition & AV_EF_EXPLODE)
+            return ret;
+    }
 
     return 0;
 }
@@ -845,7 +860,8 @@
         case WP_ID_DATA:
             s->sc.offset = bytestream2_tell(&gb);
             s->sc.size   = size * 8;
-            init_get_bits(&s->gb, gb.buffer, size * 8);
+            if ((ret = init_get_bits8(&s->gb, gb.buffer, size)) < 0)
+                return ret;
             s->data_size = size * 8;
             bytestream2_skip(&gb, size);
             got_bs       = 1;
@@ -859,7 +875,8 @@
             }
             s->extra_sc.offset = bytestream2_tell(&gb);
             s->extra_sc.size   = size * 8;
-            init_get_bits(&s->gb_extra_bits, gb.buffer, size * 8);
+            if ((ret = init_get_bits8(&s->gb_extra_bits, gb.buffer, size)) < 0)
+                return ret;
             s->crc_extra_bits  = get_bits_long(&s->gb_extra_bits, 32);
             bytestream2_skip(&gb, size);
             s->got_extra_bits  = 1;

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/webp.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/webp.c Changed

@@ -31,16 +31,20 @@
  * Lossless decoder
  * Compressed alpha for lossy
  *
+ * @author James Almer <jamrial@gmail.com>
+ * Exif metadata
+ *
  * Unimplemented:
  *   - Animation
  *   - ICC profile
- *   - Exif and XMP metadata
+ *   - XMP metadata
  */
 
 #define BITSTREAM_READER_LE
 #include "libavutil/imgutils.h"
 #include "avcodec.h"
 #include "bytestream.h"
+#include "exif.h"
 #include "internal.h"
 #include "get_bits.h"
 #include "thread.h"
@@ -191,6 +195,8 @@
     enum AlphaFilter alpha_filter;      /* filtering method for alpha chunk */
     uint8_t *alpha_data;                /* alpha chunk data */
     int alpha_data_size;                /* alpha chunk data size */
+    int has_exif;                       /* set after an EXIF chunk has been processed */
+    AVDictionary *exif_metadata;        /* EXIF chunk data */
     int width;                          /* image width */
     int height;                         /* image height */
     int lossless;                       /* indicates lossless or lossy */
@@ -277,10 +283,26 @@
 static int huff_reader_build_canonical(HuffReader *r, int *code_lengths,
                                        int alphabet_size)
 {
-    int len, sym, code, ret;
+    int len = 0, sym, code = 0, ret;
     int max_code_length = 0;
     uint16_t *codes;
 
+    /* special-case 1 symbol since the vlc reader cannot handle it */
+    for (sym = 0; sym < alphabet_size; sym++) {
+        if (code_lengths[sym] > 0) {
+            len++;
+            code = sym;
+            if (len > 1)
+                break;
+        }
+    }
+    if (len == 1) {
+        r->nb_symbols = 1;
+        r->simple_symbols[0] = code;
+        r->simple = 1;
+        return 0;
+    }
+
     for (sym = 0; sym < alphabet_size; sym++)
         max_code_length = FFMAX(max_code_length, code_lengths[sym]);
 
@@ -1085,10 +1107,10 @@
                    s->width, w);
         }
         s->height = h;
-        ret = av_image_check_size(s->width, s->height, 0, avctx);
+
+        ret = ff_set_dimensions(avctx, s->width, s->height);
         if (ret < 0)
             return ret;
-        avcodec_set_dimensions(avctx, s->width, s->height);
 
         s->has_alpha = get_bits1(&s->gb);
 
@@ -1129,10 +1151,8 @@
     if (is_alpha_chunk)
         s->image[IMAGE_ROLE_ARGB].is_alpha_primary = 1;
     ret = decode_entropy_coded_image(s, IMAGE_ROLE_ARGB, w, h);
-    if (ret < 0) {
-        av_frame_free(&p);
+    if (ret < 0)
         goto free_and_return;
-    }
 
     /* apply transformations */
     for (i = s->nb_transforms - 1; i >= 0; i--) {
@@ -1150,10 +1170,8 @@
             ret = apply_color_indexing_transform(s);
             break;
         }
-        if (ret < 0) {
-            av_frame_free(&p);
+        if (ret < 0)
             goto free_and_return;
-        }
     }
 
     *got_frame   = 1;
@@ -1314,6 +1332,7 @@
     s->height    = 0;
     *got_frame   = 0;
     s->has_alpha = 0;
+    s->has_exif  = 0;
     bytestream2_init(&gb, avpkt->data, avpkt->size);
 
     if (bytestream2_get_bytes_left(&gb) < 12)
@@ -1333,6 +1352,7 @@
         return AVERROR_INVALIDDATA;
     }
 
+    av_dict_free(&s->exif_metadata);
     while (bytestream2_get_bytes_left(&gb) > 0) {
         char chunk_str[5] = { 0 };
 
@@ -1406,10 +1426,44 @@
 
             break;
         }
+        case MKTAG('E', 'X', 'I', 'F'): {
+            int le, ifd_offset, exif_offset = bytestream2_tell(&gb);
+            GetByteContext exif_gb;
+
+            if (s->has_exif) {
+                av_log(avctx, AV_LOG_VERBOSE, "Ignoring extra EXIF chunk\n");
+                goto exif_end;
+            }
+            if (!(vp8x_flags & VP8X_FLAG_EXIF_METADATA))
+                av_log(avctx, AV_LOG_WARNING,
+                       "EXIF chunk present, but Exif bit not set in the "
+                       "VP8X header\n");
+
+            s->has_exif = 1;
+            bytestream2_init(&exif_gb, avpkt->data + exif_offset,
+                             avpkt->size - exif_offset);
+            if (ff_tdecode_header(&exif_gb, &le, &ifd_offset) < 0) {
+                av_log(avctx, AV_LOG_ERROR, "invalid TIFF header "
+                       "in Exif data\n");
+                goto exif_end;
+            }
+
+            bytestream2_seek(&exif_gb, ifd_offset, SEEK_SET);
+            if (ff_exif_decode_ifd(avctx, &exif_gb, le, 0, &s->exif_metadata) < 0) {
+                av_log(avctx, AV_LOG_ERROR, "error decoding Exif data\n");
+                goto exif_end;
+            }
+
+            av_dict_copy(avpriv_frame_get_metadatap(data), s->exif_metadata, 0);
+
+exif_end:
+            av_dict_free(&s->exif_metadata);
+            bytestream2_skip(&gb, chunk_size);
+            break;
+        }
         case MKTAG('I', 'C', 'C', 'P'):
         case MKTAG('A', 'N', 'I', 'M'):
         case MKTAG('A', 'N', 'M', 'F'):
-        case MKTAG('E', 'X', 'I', 'F'):
         case MKTAG('X', 'M', 'P', ' '):
             AV_WL32(chunk_str, chunk_type);
             av_log(avctx, AV_LOG_VERBOSE, "skipping unsupported chunk: %s\n",

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/wmalosslessdec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/wmalosslessdec.c Changed

@@ -127,8 +127,8 @@
 
     int8_t  mclms_order;
     int8_t  mclms_scaling;
-    int16_t mclms_coeffs[128];
-    int16_t mclms_coeffs_cur[4];
+    int16_t mclms_coeffs[WMALL_MAX_CHANNELS * WMALL_MAX_CHANNELS * 32];
+    int16_t mclms_coeffs_cur[WMALL_MAX_CHANNELS * WMALL_MAX_CHANNELS];
     int16_t mclms_prevvalues[WMALL_MAX_CHANNELS * 2 * 32];
     int16_t mclms_updates[WMALL_MAX_CHANNELS * 2 * 32];
     int     mclms_recent;
@@ -348,11 +348,11 @@
             if (num_samples[c] == min_channel_len) {
                 if (fixed_channel_layout || channels_for_cur_subframe == 1 ||
                    (min_channel_len == s->samples_per_frame - s->min_samples_per_subframe)) {
-                    contains_subframe[c] = in_use = 1;
+                    contains_subframe[c] = 1;
                 } else {
-                    if (get_bits1(&s->gb))
-                        contains_subframe[c] = in_use = 1;
+                    contains_subframe[c] = get_bits1(&s->gb);
                 }
+                in_use |= contains_subframe[c];
             } else
                 contains_subframe[c] = 0;
         }
@@ -652,10 +652,10 @@
     if (s->mclms_recent == 0) {
         memcpy(&s->mclms_prevvalues[order * num_channels],
                s->mclms_prevvalues,
-               2 * order * num_channels);
+               sizeof(int16_t) * order * num_channels);
         memcpy(&s->mclms_updates[order * num_channels],
                s->mclms_updates,
-               2 * order * num_channels);
+               sizeof(int16_t) * order * num_channels);
         s->mclms_recent = num_channels * order;
     }
 }
@@ -1038,9 +1038,10 @@
         len = get_bits(gb, s->log2_frame_size);
 
     /* decode tile information */
-    if (decode_tilehdr(s)) {
+    if ((ret = decode_tilehdr(s))) {
         s->packet_loss = 1;
-        return 0;
+        av_frame_unref(s->frame);
+        return ret;
     }
 
     /* read drc info */
@@ -1075,8 +1076,11 @@
 
     /* decode all subframes */
     while (!s->parsed_all_subframes) {
+        int decoded_samples = s->channel[0].decoded_samples;
         if (decode_subframe(s) < 0) {
             s->packet_loss = 1;
+            if (s->frame->nb_samples)
+                s->frame->nb_samples = decoded_samples;
             return 0;
         }
     }

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/wmv2.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/wmv2.c Changed

@@ -117,15 +117,17 @@
     uvlinesize = s->uvlinesize;
     ptr = ref_picture[0] + (src_y * linesize) + src_x;
 
-        if(src_x<1 || src_y<1 || src_x + 17  >= s->h_edge_pos
-                              || src_y + h+1 >= v_edge_pos){
-            s->vdsp.emulated_edge_mc(s->edge_emu_buffer, s->linesize,
-                                     ptr - 1 - s->linesize, s->linesize, 19, 19,
-                                     src_x-1, src_y-1,
-                                     s->h_edge_pos, s->v_edge_pos);
-            ptr= s->edge_emu_buffer + 1 + s->linesize;
-            emu=1;
-        }
+    if(src_x<1 || src_y<1 || src_x + 17  >= s->h_edge_pos
+                          || src_y + h+1 >= v_edge_pos){
+        s->vdsp.emulated_edge_mc(s->edge_emu_buffer,
+                                 ptr - 1 - s->linesize,
+                                 s->linesize, s->linesize,
+                                 19, 19,
+                                 src_x - 1, src_y - 1,
+                                 s->h_edge_pos, s->v_edge_pos);
+        ptr= s->edge_emu_buffer + 1 + s->linesize;
+        emu=1;
+    }
 
     s->dsp.put_mspel_pixels_tab[dxy](dest_y             , ptr             , linesize);
     s->dsp.put_mspel_pixels_tab[dxy](dest_y+8           , ptr+8           , linesize);
@@ -161,18 +163,22 @@
     offset = (src_y * uvlinesize) + src_x;
     ptr = ref_picture[1] + offset;
     if(emu){
-        s->vdsp.emulated_edge_mc(s->edge_emu_buffer, s->uvlinesize,
-                                 ptr, s->uvlinesize, 9, 9, src_x, src_y,
-                                 s->h_edge_pos>>1, s->v_edge_pos>>1);
+        s->vdsp.emulated_edge_mc(s->edge_emu_buffer, ptr,
+                                 s->uvlinesize, s->uvlinesize,
+                                 9, 9,
+                                 src_x, src_y,
+                                 s->h_edge_pos >> 1, s->v_edge_pos >> 1);
         ptr= s->edge_emu_buffer;
     }
     pix_op[1][dxy](dest_cb, ptr, uvlinesize, h >> 1);
 
     ptr = ref_picture[2] + offset;
     if(emu){
-        s->vdsp.emulated_edge_mc(s->edge_emu_buffer, s->uvlinesize,
-                                 ptr, s->uvlinesize, 9, 9, src_x, src_y,
-                                 s->h_edge_pos>>1, s->v_edge_pos>>1);
+        s->vdsp.emulated_edge_mc(s->edge_emu_buffer, ptr,
+                                 s->uvlinesize, s->uvlinesize,
+                                 9, 9,
+                                 src_x, src_y,
+                                 s->h_edge_pos >> 1, s->v_edge_pos >> 1);
         ptr= s->edge_emu_buffer;
     }
     pix_op[1][dxy](dest_cr, ptr, uvlinesize, h >> 1);

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/wmv2enc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/wmv2enc.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/wnv1.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/wnv1.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/x86/Makefile -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/x86/Makefile Changed

@@ -4,6 +4,7 @@
 OBJS-$(CONFIG_AAC_DECODER)             += x86/sbrdsp_init.o
 OBJS-$(CONFIG_AC3DSP)                  += x86/ac3dsp_init.o
 OBJS-$(CONFIG_CAVS_DECODER)            += x86/cavsdsp.o
+OBJS-$(CONFIG_DCA_DECODER)             += x86/dcadsp_init.o
 OBJS-$(CONFIG_DCT)                     += x86/dct_init.o
 OBJS-$(CONFIG_DNXHD_ENCODER)           += x86/dnxhdenc.o
 OBJS-$(CONFIG_DSPUTIL)                 += x86/dsputil_init.o            \
@@ -12,11 +13,15 @@
                                           x86/fdct.o                    \
                                           x86/motion_est.o
 OBJS-$(CONFIG_FFT)                     += x86/fft_init.o
+OBJS-$(CONFIG_FLAC_DECODER)            += x86/flacdsp_init.o
+OBJS-$(CONFIG_FLAC_ENCODER)            += x86/flacdsp_init.o
+OBJS-$(CONFIG_H263DSP)                 += x86/h263dsp_init.o
 OBJS-$(CONFIG_H264CHROMA)              += x86/h264chroma_init.o
 OBJS-$(CONFIG_H264DSP)                 += x86/h264dsp_init.o
 OBJS-$(CONFIG_H264PRED)                += x86/h264_intrapred_init.o
 OBJS-$(CONFIG_H264QPEL)                += x86/h264_qpel.o
 OBJS-$(CONFIG_HPELDSP)                 += x86/hpeldsp_init.o
+OBJS-$(CONFIG_LLVIDDSP)                += x86/lossless_videodsp_init.o
 OBJS-$(CONFIG_LPC)                     += x86/lpc.o
 OBJS-$(CONFIG_MLP_DECODER)             += x86/mlpdsp.o
 OBJS-$(CONFIG_MPEGAUDIODSP)            += x86/mpegaudiodsp.o
@@ -29,6 +34,7 @@
 OBJS-$(CONFIG_RV40_DECODER)            += x86/rv34dsp_init.o            \
                                           x86/rv40dsp_init.o
 OBJS-$(CONFIG_V210_DECODER)            += x86/v210-init.o
+OBJS-$(CONFIG_TTA_DECODER)             += x86/ttadsp_init.o
 OBJS-$(CONFIG_TRUEHD_DECODER)          += x86/mlpdsp.o
 OBJS-$(CONFIG_VC1_DECODER)             += x86/vc1dsp_init.o
 OBJS-$(CONFIG_VIDEODSP)                += x86/videodsp_init.o
@@ -59,6 +65,7 @@
 
 YASM-OBJS-$(CONFIG_AAC_DECODER)        += x86/sbrdsp.o
 YASM-OBJS-$(CONFIG_AC3DSP)             += x86/ac3dsp.o
+YASM-OBJS-$(CONFIG_DCA_DECODER)        += x86/dcadsp.o
 YASM-OBJS-$(CONFIG_DCT)                += x86/dct32.o
 YASM-OBJS-$(CONFIG_DIRAC_DECODER)      += x86/diracdsp_mmx.o x86/diracdsp_yasm.o\
                                           x86/dwt_yasm.o
@@ -68,8 +75,8 @@
                                           x86/qpel.o
 YASM-OBJS-$(CONFIG_ENCODERS)           += x86/dsputilenc.o
 YASM-OBJS-$(CONFIG_FFT)                += x86/fft.o
-YASM-OBJS-$(CONFIG_H263_DECODER)       += x86/h263_loopfilter.o
-YASM-OBJS-$(CONFIG_H263_ENCODER)       += x86/h263_loopfilter.o
+YASM-OBJS-$(CONFIG_FLAC_DECODER)       += x86/flacdsp.o
+YASM-OBJS-$(CONFIG_H263DSP)            += x86/h263_loopfilter.o
 YASM-OBJS-$(CONFIG_H264CHROMA)         += x86/h264_chromamc.o           \
                                           x86/h264_chromamc_10bit.o
 YASM-OBJS-$(CONFIG_H264DSP)            += x86/h264_deblock.o            \
@@ -86,6 +93,7 @@
                                           x86/qpel.o
 YASM-OBJS-$(CONFIG_HPELDSP)            += x86/fpel.o                    \
                                           x86/hpeldsp.o
+YASM-OBJS-$(CONFIG_LLVIDDSP)           += x86/lossless_videodsp.o
 YASM-OBJS-$(CONFIG_MPEGAUDIODSP)       += x86/imdct36.o
 YASM-OBJS-$(CONFIG_PNG_DECODER)        += x86/pngdsp.o
 YASM-OBJS-$(CONFIG_PRORES_DECODER)     += x86/proresdsp.o
@@ -93,12 +101,17 @@
 YASM-OBJS-$(CONFIG_RV30_DECODER)       += x86/rv34dsp.o
 YASM-OBJS-$(CONFIG_RV40_DECODER)       += x86/rv34dsp.o                 \
                                           x86/rv40dsp.o
+YASM-OBJS-$(CONFIG_TTA_DECODER)        += x86/ttadsp.o
 YASM-OBJS-$(CONFIG_V210_DECODER)       += x86/v210.o
 YASM-OBJS-$(CONFIG_VC1_DECODER)        += x86/vc1dsp.o
 YASM-OBJS-$(CONFIG_VIDEODSP)           += x86/videodsp.o
 YASM-OBJS-$(CONFIG_VORBIS_DECODER)     += x86/vorbisdsp.o
 YASM-OBJS-$(CONFIG_VP3DSP)             += x86/vp3dsp.o
 YASM-OBJS-$(CONFIG_VP6_DECODER)        += x86/vp6dsp.o
-YASM-OBJS-$(CONFIG_VP8_DECODER)        += x86/vp8dsp.o
-YASM-OBJS-$(CONFIG_VP9_DECODER)        += x86/vp9dsp.o
+YASM-OBJS-$(CONFIG_VP8_DECODER)        += x86/vp8dsp.o                  \
+                                          x86/vp8dsp_loopfilter.o
+YASM-OBJS-$(CONFIG_VP9_DECODER)        += x86/vp9intrapred.o            \
+                                          x86/vp9itxfm.o                \
+                                          x86/vp9lpf.o                  \
+                                          x86/vp9mc.o
 YASM-OBJS-$(CONFIG_WEBP_DECODER)       += x86/vp8dsp.o

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/x86/ac3dsp_init.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/x86/ac3dsp_init.c Changed

@@ -19,6 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/attributes.h"
 #include "libavutil/mem.h"
 #include "libavutil/x86/asm.h"
 #include "libavutil/x86/cpu.h"
@@ -51,6 +52,19 @@
 void ff_ac3_extract_exponents_sse2 (uint8_t *exp, int32_t *coef, int nb_coefs);
 void ff_ac3_extract_exponents_ssse3(uint8_t *exp, int32_t *coef, int nb_coefs);
 
+void ff_apply_window_int16_round_mmxext(int16_t *output, const int16_t *input,
+                                        const int16_t *window, unsigned int len);
+void ff_apply_window_int16_round_sse2(int16_t *output, const int16_t *input,
+                                      const int16_t *window, unsigned int len);
+void ff_apply_window_int16_mmxext(int16_t *output, const int16_t *input,
+                                  const int16_t *window, unsigned int len);
+void ff_apply_window_int16_sse2(int16_t *output, const int16_t *input,
+                                const int16_t *window, unsigned int len);
+void ff_apply_window_int16_ssse3(int16_t *output, const int16_t *input,
+                                 const int16_t *window, unsigned int len);
+void ff_apply_window_int16_ssse3_atom(int16_t *output, const int16_t *input,
+                                      const int16_t *window, unsigned int len);
+
 #if ARCH_X86_32 && defined(__INTEL_COMPILER)
 #       undef HAVE_7REGS
 #       define HAVE_7REGS 0
@@ -201,6 +215,11 @@
     if (EXTERNAL_MMXEXT(cpu_flags)) {
         c->ac3_exponent_min = ff_ac3_exponent_min_mmxext;
         c->ac3_max_msb_abs_int16 = ff_ac3_max_msb_abs_int16_mmxext;
+        if (bit_exact) {
+            c->apply_window_int16 = ff_apply_window_int16_mmxext;
+        } else {
+            c->apply_window_int16 = ff_apply_window_int16_round_mmxext;
+        }
     }
     if (EXTERNAL_SSE(cpu_flags)) {
         c->float_to_fixed24 = ff_float_to_fixed24_sse;
@@ -215,11 +234,19 @@
             c->ac3_lshift_int16 = ff_ac3_lshift_int16_sse2;
             c->ac3_rshift_int32 = ff_ac3_rshift_int32_sse2;
         }
+        if (bit_exact) {
+            c->apply_window_int16 = ff_apply_window_int16_sse2;
+        } else if (!(cpu_flags & AV_CPU_FLAG_SSE2SLOW)) {
+            c->apply_window_int16 = ff_apply_window_int16_round_sse2;
+        }
     }
     if (EXTERNAL_SSSE3(cpu_flags)) {
         c->ac3_max_msb_abs_int16 = ff_ac3_max_msb_abs_int16_ssse3;
-        if (!(cpu_flags & AV_CPU_FLAG_ATOM)) {
+        if (cpu_flags & AV_CPU_FLAG_ATOM) {
+            c->apply_window_int16 = ff_apply_window_int16_ssse3_atom;
+        } else {
             c->extract_exponents = ff_ac3_extract_exponents_ssse3;
+            c->apply_window_int16 = ff_apply_window_int16_ssse3;
         }
     }

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/x86/cabac.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/x86/cabac.h Changed

@@ -36,6 +36,18 @@
 
 #if HAVE_INLINE_ASM
 
+#ifndef UNCHECKED_BITSTREAM_READER
+#define UNCHECKED_BITSTREAM_READER !CONFIG_SAFE_BITSTREAM_READER
+#endif
+
+#if UNCHECKED_BITSTREAM_READER
+#define END_CHECK(end) ""
+#else
+#define END_CHECK(end) \
+        "cmp    "end"       , %%"REG_c"                                 \n\t"\
+        "jge    1f                                                      \n\t"
+#endif
+
 #ifdef BROKEN_RELOCATIONS
 #define TABLES_ARG , "r"(tables)
 
@@ -80,7 +92,9 @@
         "test   "lowword"   , "lowword"                                 \n\t"\
         "jnz    2f                                                      \n\t"\
         "mov    "byte"      , %%"REG_c"                                 \n\t"\
+        END_CHECK(end)\
         "add"OPSIZE" $2     , "byte"                                    \n\t"\
+        "1:                                                             \n\t"\
         "movzwl (%%"REG_c") , "tmp"                                     \n\t"\
         "lea    -1("low")   , %%ecx                                     \n\t"\
         "xor    "low"       , %%ecx                                     \n\t"\
@@ -139,7 +153,9 @@
         "test   "lowword"   , "lowword"                                 \n\t"\
         " jnz   2f                                                      \n\t"\
         "mov    "byte"      , %%"REG_c"                                 \n\t"\
+        END_CHECK(end)\
         "add"OPSIZE" $2     , "byte"                                    \n\t"\
+        "1:                                                             \n\t"\
         "movzwl (%%"REG_c")     , "tmp"                                 \n\t"\
         "lea    -1("low")   , %%ecx                                     \n\t"\
         "xor    "low"       , %%ecx                                     \n\t"\
@@ -214,9 +230,16 @@
         "movzwl         (%1), %%edx     \n\t"
         "bswap         %%edx            \n\t"
         "shrl            $15, %%edx     \n\t"
+#if UNCHECKED_BITSTREAM_READER
         "add              $2, %1        \n\t"
         "addl          %%edx, %%eax     \n\t"
         "mov              %1, %c4(%2)   \n\t"
+#else
+        "addl          %%edx, %%eax     \n\t"
+        "cmp         %c5(%2), %1        \n\t"
+        "jge              1f            \n\t"
+        "add"OPSIZE"      $2, %c4(%2)   \n\t"
+#endif
         "1:                             \n\t"
         "movl          %%eax, %c3(%2)   \n\t"

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/x86/cavsdsp.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/x86/cavsdsp.c Changed

omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/x86/dca.h Added

@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2012-2014 Christophe Gisquet <christophe.gisquet@gmail.com>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_X86_DCA_H
+#define AVCODEC_X86_DCA_H
+
+#include "config.h"
+
+#if ARCH_X86_64 && HAVE_SSE2_INLINE
+# include "libavutil/x86/asm.h"
+# include "libavutil/mem.h"
+#include "libavcodec/dcadsp.h"
+
+# define int8x8_fmul_int32 int8x8_fmul_int32
+static inline void int8x8_fmul_int32(av_unused DCADSPContext *dsp,
+                                     float *dst, const int8_t *src, int scale)
+{
+    DECLARE_ALIGNED(16, static const uint32_t, inverse16) = 0x3D800000;
+    __asm__ volatile (
+        "cvtsi2ss        %2, %%xmm0 \n\t"
+        "mulss           %3, %%xmm0 \n\t"
+        "movq          (%1), %%xmm1 \n\t"
+        "punpcklbw   %%xmm1, %%xmm1 \n\t"
+        "movaps      %%xmm1, %%xmm2 \n\t"
+        "punpcklwd   %%xmm1, %%xmm1 \n\t"
+        "punpckhwd   %%xmm2, %%xmm2 \n\t"
+        "psrad          $24, %%xmm1 \n\t"
+        "psrad          $24, %%xmm2 \n\t"
+        "shufps  $0, %%xmm0, %%xmm0 \n\t"
+        "cvtdq2ps    %%xmm1, %%xmm1 \n\t"
+        "cvtdq2ps    %%xmm2, %%xmm2 \n\t"
+        "mulps       %%xmm0, %%xmm1 \n\t"
+        "mulps       %%xmm0, %%xmm2 \n\t"
+        "movaps      %%xmm1,  0(%0) \n\t"
+        "movaps      %%xmm2, 16(%0) \n\t"
+        :: "r"(dst), "r"(src), "m"(scale), "m"(inverse16)
+        XMM_CLOBBERS_ONLY("xmm0", "xmm1", "xmm2")
+    );
+}
+
+#endif /* ARCH_X86_64 && HAVE_SSE2_INLINE */
+
+#endif /* AVCODEC_X86_DCA_H */

omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/x86/dcadsp.asm Added

@@ -0,0 +1,352 @@
+;******************************************************************************
+;* SSE-optimized functions for the DCA decoder
+;* Copyright (C) 2012-2014 Christophe Gisquet <christophe.gisquet@gmail.com>
+;*
+;* This file is part of FFmpeg.
+;*
+;* FFmpeg is free software; you can redistribute it and/or
+;* modify it under the terms of the GNU Lesser General Public
+;* License as published by the Free Software Foundation; either
+;* version 2.1 of the License, or (at your option) any later version.
+;*
+;* FFmpeg is distributed in the hope that it will be useful,
+;* but WITHOUT ANY WARRANTY; without even the implied warranty of
+;* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;* Lesser General Public License for more details.
+;*
+;* You should have received a copy of the GNU Lesser General Public
+;* License along with FFmpeg; if not, write to the Free Software
+;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+;******************************************************************************
+
+%include "libavutil/x86/x86util.asm"
+
+SECTION_RODATA
+pf_inv16:  times 4 dd 0x3D800000 ; 1/16
+
+SECTION_TEXT
+
+; void decode_hf(float dst[DCA_SUBBANDS][8], const int32_t vq_num[DCA_SUBBANDS],
+;                const int8_t hf_vq[1024][32], intptr_t vq_offset,
+;                int32_t scale[DCA_SUBBANDS][2], intptr_t start, intptr_t end)
+
+%macro DECODE_HF 0
+cglobal decode_hf, 6,6,5, dst, num, src, offset, scale, start, end
+    lea       srcq, [srcq + offsetq]
+    shl     startq, 2
+    mov    offsetd, endm
+%define DICT offsetq
+    shl    offsetq, 2
+    mov       endm, offsetq
+.loop:
+%if ARCH_X86_64
+    mov    offsetd, [scaleq + 2 * startq]
+    cvtsi2ss    m0, offsetd
+%else
+    cvtsi2ss    m0, [scaleq + 2 * startq]
+%endif
+    mov    offsetd, [numq + startq]
+    mulss       m0, [pf_inv16]
+    shl       DICT, 5
+    shufps      m0, m0, 0
+%if cpuflag(sse2)
+%if cpuflag(sse4)
+    pmovsxbd    m1, [srcq + DICT + 0]
+    pmovsxbd    m2, [srcq + DICT + 4]
+%else
+    movq        m1, [srcq + DICT]
+    punpcklbw   m1, m1
+    mova        m2, m1
+    punpcklwd   m1, m1
+    punpckhwd   m2, m2
+    psrad       m1, 24
+    psrad       m2, 24
+%endif
+    cvtdq2ps    m1, m1
+    cvtdq2ps    m2, m2
+%else
+    movd       mm0, [srcq + DICT + 0]
+    movd       mm1, [srcq + DICT + 4]
+    punpcklbw  mm0, mm0
+    punpcklbw  mm1, mm1
+    movq       mm2, mm0
+    movq       mm3, mm1
+    punpcklwd  mm0, mm0
+    punpcklwd  mm1, mm1
+    punpckhwd  mm2, mm2
+    punpckhwd  mm3, mm3
+    psrad      mm0, 24
+    psrad      mm1, 24
+    psrad      mm2, 24
+    psrad      mm3, 24
+    cvtpi2ps    m1, mm0
+    cvtpi2ps    m2, mm1
+    cvtpi2ps    m3, mm2
+    cvtpi2ps    m4, mm3
+    shufps      m0, m0, 0
+    shufps      m1, m3, q1010
+    shufps      m2, m4, q1010
+%endif
+    mulps       m1, m0
+    mulps       m2, m0
+    mova [dstq + 8 * startq +  0], m1
+    mova [dstq + 8 * startq + 16], m2
+    add     startq, 4
+    cmp     startq, endm
+    jl       .loop
+.end:
+%if notcpuflag(sse2)
+    emms
+%endif
+    REP_RET
+%endmacro
+
+%if ARCH_X86_32
+INIT_XMM sse
+DECODE_HF
+%endif
+
+INIT_XMM sse2
+DECODE_HF
+
+INIT_XMM sse4
+DECODE_HF
+
+; %1=v0/v1  %2=in1  %3=in2
+%macro FIR_LOOP 2-3
+.loop%1:
+%define va          m1
+%define vb          m2
+%if %1
+%define OFFSET      0
+%else
+%define OFFSET      NUM_COEF*count
+%endif
+; for v0, incrementing and for v1, decrementing
+    mova        va, [cf0q + OFFSET]
+    mova        vb, [cf0q + OFFSET + 4*NUM_COEF]
+%if %0 == 3
+    mova        m4, [cf0q + OFFSET + mmsize]
+    mova        m0, [cf0q + OFFSET + 4*NUM_COEF + mmsize]
+%endif
+    mulps       va, %2
+    mulps       vb, %2
+%if %0 == 3
+    mulps       m4, %3
+    mulps       m0, %3
+    addps       va, m4
+    addps       vb, m0
+%endif
+    ; va = va1 va2 va3 va4
+    ; vb = vb1 vb2 vb3 vb4
+%if %1
+    SWAP        va, vb
+%endif
+    mova        m4, va
+    unpcklps    va, vb ; va3 vb3 va4 vb4
+    unpckhps    m4, vb ; va1 vb1 va2 vb2
+    addps       m4, va ; va1+3 vb1+3 va2+4 vb2+4
+    movhlps     vb, m4 ; va1+3  vb1+3
+    addps       vb, m4 ; va0..4 vb0..4
+    movh    [outq + count], vb
+%if %1
+    sub       cf0q, 8*NUM_COEF
+%endif
+    add      count, 8
+    jl   .loop%1
+%endmacro
+
+; void dca_lfe_fir(float *out, float *in, float *coefs)
+%macro DCA_LFE_FIR 1
+cglobal dca_lfe_fir%1, 3,3,6-%1, out, in, cf0
+%define IN1       m3
+%define IN2       m5
+%define count     inq
+%define NUM_COEF  4*(2-%1)
+%define NUM_OUT   32*(%1+1)
+
+    movu     IN1, [inq + 4 - 1*mmsize]
+    shufps   IN1, IN1, q0123
+%if %1 == 0
+    movu     IN2, [inq + 4 - 2*mmsize]
+    shufps   IN2, IN2, q0123
+%endif
+
+    mov    count, -4*NUM_OUT
+    add     cf0q, 4*NUM_COEF*NUM_OUT
+    add     outq, 4*NUM_OUT
+    ; compute v0 first
+%if %1 == 0
+    FIR_LOOP   0, IN1, IN2
+%else
+    FIR_LOOP   0, IN1
+%endif
+    shufps   IN1, IN1, q0123
+    mov    count, -4*NUM_OUT
+    ; cf1 already correctly positioned
+    add     outq, 4*NUM_OUT          ; outq now at out2
+    sub     cf0q, 8*NUM_COEF
+%if %1 == 0
+    shufps   IN2, IN2, q0123
+    FIR_LOOP   1, IN2, IN1
+%else
+    FIR_LOOP   1, IN1
+%endif
+    RET
+%endmacro
+
+INIT_XMM sse
+DCA_LFE_FIR 0
+DCA_LFE_FIR 1
+
+INIT_XMM sse2
+%macro INNER_LOOP   1
+    ; reading backwards:  ptr1 = synth_buf + j + i; ptr2 = synth_buf + j - i
+    ;~ a += window[i + j]      * (-synth_buf[15 - i + j])
+    ;~ b += window[i + j + 16] * (synth_buf[i + j])
+    pshufd        m5, [ptr2 + j + (15 - 3) * 4], q0123
+    mova          m6, [ptr1 + j]
+%if ARCH_X86_64
+    pshufd       m11, [ptr2 + j + (15 - 3) * 4 - mmsize], q0123
+    mova         m12, [ptr1 + j + mmsize]
+%endif
+    mulps         m6, [win  + %1 + j + 16 * 4]
+    mulps         m5, [win  + %1 + j]
+%if ARCH_X86_64
+    mulps        m12, [win  + %1 + j + mmsize + 16 * 4]
+    mulps        m11, [win  + %1 + j + mmsize]
+%endif
+    addps         m2, m6
+    subps         m1, m5
+%if ARCH_X86_64
+    addps         m8, m12
+    subps         m7, m11
+%endif
+    ;~ c += window[i + j + 32] * (synth_buf[16 + i + j])
+    ;~ d += window[i + j + 48] * (synth_buf[31 - i + j])
+    pshufd        m6, [ptr2 + j + (31 - 3) * 4], q0123
+    mova          m5, [ptr1 + j + 16 * 4]
+%if ARCH_X86_64
+    pshufd       m12, [ptr2 + j + (31 - 3) * 4 - mmsize], q0123
+    mova         m11, [ptr1 + j + mmsize + 16 * 4]
+%endif
+    mulps         m5, [win  + %1 + j + 32 * 4]
+    mulps         m6, [win  + %1 + j + 48 * 4]
+%if ARCH_X86_64
+    mulps        m11, [win  + %1 + j + mmsize + 32 * 4]
+    mulps        m12, [win  + %1 + j + mmsize + 48 * 4]
+%endif
+    addps         m3, m5
+    addps         m4, m6
+%if ARCH_X86_64
+    addps         m9, m11
+    addps        m10, m12
+%endif
+    sub            j, 64 * 4
+%endmacro
+
+; void ff_synth_filter_inner_sse2(float *synth_buf, float synth_buf2[32],
+;                                 const float window[512], float out[32],
+;                                 intptr_t offset, float scale)
+cglobal synth_filter_inner, 0, 6 + 4 * ARCH_X86_64, 7 + 6 * ARCH_X86_64, \
+                              synth_buf, synth_buf2, window, out, off, scale
+%define scale m0
+%if ARCH_X86_32 || WIN64
+    movd       scale, scalem
+; Make sure offset is in a register and not on the stack
+%define OFFQ  r4q
+%else
+%define OFFQ  offq
+%endif
+    pshufd        m0, m0, 0
+    ; prepare inner counter limit 1
+    mov          r5q, 480
+    sub          r5q, offmp
+    and          r5q, -64
+    shl          r5q, 2
+    mov         OFFQ, r5q
+%define i        r5q
+    mov            i, 16 * 4 - (ARCH_X86_64 + 1) * mmsize  ; main loop counter
+
+%define buf2     synth_buf2q
+%if ARCH_X86_32
+    mov         buf2, synth_buf2mp
+%endif
+.mainloop
+    ; m1 = a  m2 = b  m3 = c  m4 = d
+    pxor          m3, m3
+    pxor          m4, m4
+    mova          m1, [buf2 + i]
+    mova          m2, [buf2 + i + 16 * 4]
+%if ARCH_X86_32
+%define ptr1     r0q
+%define ptr2     r1q
+%define win      r2q
+%define j        r3q
+    mov          win, windowm
+    mov         ptr1, synth_bufm
+    add          win, i
+    add         ptr1, i
+%else ; ARCH_X86_64
+%define ptr1     r6q
+%define ptr2     r7q ; must be loaded
+%define win      r8q
+%define j        r9q
+    pxor          m9, m9
+    pxor         m10, m10
+    mova          m7, [buf2 + i + mmsize]
+    mova          m8, [buf2 + i + mmsize + 16 * 4]
+    lea          win, [windowq + i]
+    lea         ptr1, [synth_bufq + i]
+%endif
+    mov         ptr2, synth_bufmp
+    ; prepare the inner loop counter
+    mov            j, OFFQ
+    sub         ptr2, i
+.loop1:
+    INNER_LOOP  0
+    jge       .loop1
+
+    mov            j, 448 * 4
+    sub            j, OFFQ
+    jz          .end
+    sub         ptr1, j
+    sub         ptr2, j
+    add          win, OFFQ ; now at j-64, so define OFFSET
+    sub            j, 64 * 4
+.loop2:
+    INNER_LOOP  64 * 4
+    jge       .loop2
+
+.end:
+%if ARCH_X86_32
+    mov         buf2, synth_buf2m ; needed for next iteration anyway
+    mov         outq, outmp       ; j, which will be set again during it
+%endif
+    ;~ out[i]      = a * scale;
+    ;~ out[i + 16] = b * scale;
+    mulps         m1, scale
+    mulps         m2, scale
+%if ARCH_X86_64
+    mulps         m7, scale
+    mulps         m8, scale
+%endif
+    ;~ synth_buf2[i]      = c;
+    ;~ synth_buf2[i + 16] = d;
+    mova   [buf2 + i +  0 * 4], m3
+    mova   [buf2 + i + 16 * 4], m4
+%if ARCH_X86_64
+    mova   [buf2 + i +  0 * 4 + mmsize], m9
+    mova   [buf2 + i + 16 * 4 + mmsize], m10
+%endif
+    ;~ out[i]      = a;
+    ;~ out[i + 16] = a;
+    mova   [outq + i +  0 * 4], m1
+    mova   [outq + i + 16 * 4], m2
+%if ARCH_X86_64
+    mova   [outq + i +  0 * 4 + mmsize], m7
+    mova   [outq + i + 16 * 4 + mmsize], m8
+%endif
+    sub            i, (ARCH_X86_64 + 1) * mmsize
+    jge    .mainloop
+    RET

omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/x86/dcadsp_init.c Added

@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2012-2014 Christophe Gisquet <christophe.gisquet@gmail.com>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "libavutil/attributes.h"
+#include "libavutil/cpu.h"
+#include "libavutil/x86/cpu.h"
+#include "libavcodec/dcadsp.h"
+
+void ff_decode_hf_sse(float dst[DCA_SUBBANDS][8], const int vq_num[DCA_SUBBANDS],
+                      const int8_t hf_vq[1024][32], intptr_t vq_offset,
+                      int scale[DCA_SUBBANDS][2], intptr_t start, intptr_t end);
+void ff_decode_hf_sse2(float dst[DCA_SUBBANDS][8], const int vq_num[DCA_SUBBANDS],
+                       const int8_t hf_vq[1024][32], intptr_t vq_offset,
+                       int scale[DCA_SUBBANDS][2], intptr_t start, intptr_t end);
+void ff_decode_hf_sse4(float dst[DCA_SUBBANDS][8], const int vq_num[DCA_SUBBANDS],
+                       const int8_t hf_vq[1024][32], intptr_t vq_offset,
+                       int scale[DCA_SUBBANDS][2], intptr_t start, intptr_t end);
+void ff_dca_lfe_fir0_sse(float *out, const float *in, const float *coefs);
+void ff_dca_lfe_fir1_sse(float *out, const float *in, const float *coefs);
+
+av_cold void ff_dcadsp_init_x86(DCADSPContext *s)
+{
+    int cpu_flags = av_get_cpu_flags();
+
+    if (EXTERNAL_SSE(cpu_flags)) {
+#if ARCH_X86_32
+        s->decode_hf = ff_decode_hf_sse;
+#endif
+        s->lfe_fir[0]        = ff_dca_lfe_fir0_sse;
+        s->lfe_fir[1]        = ff_dca_lfe_fir1_sse;
+    }
+
+    if (EXTERNAL_SSE2(cpu_flags)) {
+        s->decode_hf = ff_decode_hf_sse2;
+    }
+
+    if (EXTERNAL_SSE4(cpu_flags)) {
+        s->decode_hf = ff_decode_hf_sse4;
+    }
+}
+
+void ff_synth_filter_inner_sse2(float *synth_buf_ptr, float synth_buf2[32],
+                                const float window[512],
+                                float out[32], intptr_t offset, float scale);
+
+static void synth_filter_sse2(FFTContext *imdct,
+                              float *synth_buf_ptr, int *synth_buf_offset,
+                              float synth_buf2[32], const float window[512],
+                              float out[32], const float in[32], float scale)
+{
+    float *synth_buf= synth_buf_ptr + *synth_buf_offset;
+
+    imdct->imdct_half(imdct, synth_buf, in);
+
+    ff_synth_filter_inner_sse2(synth_buf, synth_buf2, window,
+                               out, *synth_buf_offset, scale);
+
+    *synth_buf_offset = (*synth_buf_offset - 32) & 511;
+}
+
+av_cold void ff_synth_filter_init_x86(SynthFilterContext *s)
+{
+    int cpu_flags = av_get_cpu_flags();
+
+    if (EXTERNAL_SSE2(cpu_flags)) {
+        s->synth_filter_float = synth_filter_sse2;
+    }
+}

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/x86/dsputil.asm -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/x86/dsputil.asm Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/x86/dsputil_init.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/x86/dsputil_init.c Changed

@@ -22,10 +22,12 @@
 #include "config.h"
 #include "libavutil/attributes.h"
 #include "libavutil/cpu.h"
+#include "libavutil/internal.h"
 #include "libavutil/x86/asm.h"
 #include "libavutil/x86/cpu.h"
 #include "libavcodec/dsputil.h"
 #include "libavcodec/simple_idct.h"
+#include "libavcodec/version.h"
 #include "dsputil_x86.h"
 #include "idct_xvid.h"
 
@@ -71,9 +73,6 @@
 #define ff_put_no_rnd_pixels16_mmxext ff_put_pixels16_mmxext
 #define ff_put_no_rnd_pixels8_mmxext ff_put_pixels8_mmxext
 
-void ff_h263_v_loop_filter_mmx(uint8_t *src, int stride, int qscale);
-void ff_h263_h_loop_filter_mmx(uint8_t *src, int stride, int qscale);
-
 int32_t ff_scalarproduct_int16_mmxext(const int16_t *v1, const int16_t *v2,
                                       int order);
 int32_t ff_scalarproduct_int16_sse2(const int16_t *v1, const int16_t *v2,
@@ -88,19 +87,6 @@
                                               const int16_t *v3,
                                               int order, int mul);
 
-void ff_apply_window_int16_round_mmxext(int16_t *output, const int16_t *input,
-                                        const int16_t *window, unsigned int len);
-void ff_apply_window_int16_round_sse2(int16_t *output, const int16_t *input,
-                                      const int16_t *window, unsigned int len);
-void ff_apply_window_int16_mmxext(int16_t *output, const int16_t *input,
-                                  const int16_t *window, unsigned int len);
-void ff_apply_window_int16_sse2(int16_t *output, const int16_t *input,
-                                const int16_t *window, unsigned int len);
-void ff_apply_window_int16_ssse3(int16_t *output, const int16_t *input,
-                                 const int16_t *window, unsigned int len);
-void ff_apply_window_int16_ssse3_atom(int16_t *output, const int16_t *input,
-                                      const int16_t *window, unsigned int len);
-
 void ff_bswap32_buf_ssse3(uint32_t *dst, const uint32_t *src, int w);
 void ff_bswap32_buf_sse2(uint32_t *dst, const uint32_t *src, int w);
 
@@ -556,11 +542,6 @@
 #endif /* HAVE_MMX_INLINE */
 
 #if HAVE_MMX_EXTERNAL
-    if (CONFIG_H263_DECODER || CONFIG_H263_ENCODER) {
-        c->h263_v_loop_filter = ff_h263_v_loop_filter_mmx;
-        c->h263_h_loop_filter = ff_h263_h_loop_filter_mmx;
-    }
-
     c->vector_clip_int32 = ff_vector_clip_int32_mmx;
 #endif /* HAVE_MMX_EXTERNAL */
 }
@@ -593,12 +574,6 @@
 
     c->scalarproduct_int16          = ff_scalarproduct_int16_mmxext;
     c->scalarproduct_and_madd_int16 = ff_scalarproduct_and_madd_int16_mmxext;
-
-    if (avctx->flags & CODEC_FLAG_BITEXACT) {
-        c->apply_window_int16 = ff_apply_window_int16_mmxext;
-    } else {
-        c->apply_window_int16 = ff_apply_window_int16_round_mmxext;
-    }
 #endif /* HAVE_MMXEXT_EXTERNAL */
 }
 
@@ -608,15 +583,16 @@
 #if HAVE_SSE_INLINE
     const int high_bit_depth = avctx->bits_per_raw_sample > 8;
 
+    c->vector_clipf = ff_vector_clipf_sse;
+
+    /* XvMCCreateBlocks() may not allocate 16-byte aligned blocks */
+    if (CONFIG_XVMC && avctx->hwaccel && avctx->hwaccel->decode_mb)
+        return;
+
     if (!high_bit_depth) {
-        if (!(CONFIG_MPEG_XVMC_DECODER && avctx->xvmc_acceleration > 1)) {
-            /* XvMCCreateBlocks() may not allocate 16-byte aligned blocks */
-            c->clear_block  = ff_clear_block_sse;
-            c->clear_blocks = ff_clear_blocks_sse;
-        }
+        c->clear_block  = ff_clear_block_sse;
+        c->clear_blocks = ff_clear_blocks_sse;
     }
-
-    c->vector_clipf = ff_vector_clipf_sse;
 #endif /* HAVE_SSE_INLINE */
 
 #if HAVE_YASM
@@ -648,11 +624,6 @@
     } else {
         c->vector_clip_int32 = ff_vector_clip_int32_sse2;
     }
-    if (avctx->flags & CODEC_FLAG_BITEXACT) {
-        c->apply_window_int16 = ff_apply_window_int16_sse2;
-    } else if (!(cpu_flags & AV_CPU_FLAG_SSE2SLOW)) {
-        c->apply_window_int16 = ff_apply_window_int16_round_sse2;
-    }
     c->bswap_buf = ff_bswap32_buf_sse2;
 #endif /* HAVE_SSE2_EXTERNAL */
 }
@@ -665,10 +636,6 @@
     if (cpu_flags & AV_CPU_FLAG_SSE4) // not really SSE4, just slow on Conroe
         c->add_hfyu_left_prediction = ff_add_hfyu_left_prediction_sse4;
 
-    if (cpu_flags & AV_CPU_FLAG_ATOM)
-        c->apply_window_int16 = ff_apply_window_int16_ssse3_atom;
-    else
-        c->apply_window_int16 = ff_apply_window_int16_ssse3;
     if (!(cpu_flags & (AV_CPU_FLAG_SSE42 | AV_CPU_FLAG_3DNOW))) // cachesplit
         c->scalarproduct_and_madd_int16 = ff_scalarproduct_and_madd_int16_ssse3;
     c->bswap_buf = ff_bswap32_buf_ssse3;

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/x86/dsputil_mmx.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/x86/dsputil_mmx.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/x86/dsputil_x86.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/x86/dsputil_x86.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/x86/dsputilenc_mmx.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/x86/dsputilenc_mmx.c Changed

omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/x86/flacdsp.asm Added

@@ -0,0 +1,74 @@
+;******************************************************************************
+;* FLAC DSP SIMD optimizations
+;*
+;* Copyright (C) 2014 Loren Merritt
+;*
+;* This file is part of FFmpeg.
+;*
+;* FFmpeg is free software; you can redistribute it and/or
+;* modify it under the terms of the GNU Lesser General Public
+;* License as published by the Free Software Foundation; either
+;* version 2.1 of the License, or (at your option) any later version.
+;*
+;* FFmpeg is distributed in the hope that it will be useful,
+;* but WITHOUT ANY WARRANTY; without even the implied warranty of
+;* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;* Lesser General Public License for more details.
+;*
+;* You should have received a copy of the GNU Lesser General Public
+;* License along with FFmpeg; if not, write to the Free Software
+;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+;******************************************************************************
+
+%include "libavutil/x86/x86util.asm"
+
+SECTION .text
+
+%macro LPC_32 1
+INIT_XMM %1
+cglobal flac_lpc_32, 5,6,5, decoded, coeffs, pred_order, qlevel, len, j
+    sub    lend, pred_orderd
+    jle .ret
+    lea    decodedq, [decodedq+pred_orderq*4-8]
+    lea    coeffsq, [coeffsq+pred_orderq*4]
+    neg    pred_orderq
+    movd   m4, qlevelm
+ALIGN 16
+.loop_sample:
+    movd   m0, [decodedq+pred_orderq*4+8]
+    add    decodedq, 8
+    movd   m1, [coeffsq+pred_orderq*4]
+    pxor   m2, m2
+    pxor   m3, m3
+    lea    jq, [pred_orderq+1]
+    test   jq, jq
+    jz .end_order
+.loop_order:
+    PMACSDQL m2, m0, m1, m2, m0
+    movd   m0, [decodedq+jq*4]
+    PMACSDQL m3, m1, m0, m3, m1
+    movd   m1, [coeffsq+jq*4]
+    inc    jq
+    jl .loop_order
+.end_order:
+    PMACSDQL m2, m0, m1, m2, m0
+    psrlq  m2, m4
+    movd   m0, [decodedq]
+    paddd  m0, m2
+    movd   [decodedq], m0
+    sub  lend, 2
+    jl .ret
+    PMACSDQL m3, m1, m0, m3, m1
+    psrlq  m3, m4
+    movd   m1, [decodedq+4]
+    paddd  m1, m3
+    movd   [decodedq+4], m1
+    jg .loop_sample
+.ret:
+    REP_RET
+%endmacro
+
+%if HAVE_XOP_EXTERNAL
+LPC_32 xop
+%endif
+LPC_32 sse4

omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/x86/flacdsp_init.c Added

@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2014 James Almer
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "libavcodec/flacdsp.h"
+#include "libavutil/x86/cpu.h"
+#include "config.h"
+
+void ff_flac_lpc_32_sse4(int32_t *samples, const int coeffs[32], int order,
+                         int qlevel, int len);
+void ff_flac_lpc_32_xop(int32_t *samples, const int coeffs[32], int order,
+                        int qlevel, int len);
+
+av_cold void ff_flacdsp_init_x86(FLACDSPContext *c, enum AVSampleFormat fmt,
+                                 int bps)
+{
+#if HAVE_YASM
+    int cpu_flags = av_get_cpu_flags();
+
+    if (EXTERNAL_SSE4(cpu_flags)) {
+        if (bps > 16 && CONFIG_FLAC_DECODER)
+            c->lpc = ff_flac_lpc_32_sse4;
+    }
+    if (EXTERNAL_XOP(cpu_flags)) {
+        if (bps > 16 && CONFIG_FLAC_DECODER)
+            c->lpc = ff_flac_lpc_32_xop;
+    }
+#endif
+}

omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/x86/h263dsp_init.c Added

@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2013 Diego Biurrun <diego@biurrun.de>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <stdint.h>
+
+#include "libavutil/attributes.h"
+#include "libavutil/cpu.h"
+#include "libavutil/x86/cpu.h"
+#include "libavcodec/h263dsp.h"
+
+void ff_h263_h_loop_filter_mmx(uint8_t *src, int stride, int qscale);
+void ff_h263_v_loop_filter_mmx(uint8_t *src, int stride, int qscale);
+
+av_cold void ff_h263dsp_init_x86(H263DSPContext *c)
+{
+    int cpu_flags = av_get_cpu_flags();
+
+    if (EXTERNAL_MMX(cpu_flags)) {
+        c->h263_h_loop_filter = ff_h263_h_loop_filter_mmx;
+        c->h263_v_loop_filter = ff_h263_v_loop_filter_mmx;
+    }
+}

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/x86/h264_intrapred.asm -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/x86/h264_intrapred.asm Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/x86/h264_intrapred_init.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/x86/h264_intrapred_init.c Changed

@@ -191,7 +191,7 @@
         if (EXTERNAL_MMX(cpu_flags)) {
             h->pred16x16[VERT_PRED8x8         ] = ff_pred16x16_vertical_8_mmx;
             h->pred16x16[HOR_PRED8x8          ] = ff_pred16x16_horizontal_8_mmx;
-            if (chroma_format_idc == 1) {
+            if (chroma_format_idc <= 1) {
                 h->pred8x8  [VERT_PRED8x8     ] = ff_pred8x8_vertical_8_mmx;
                 h->pred8x8  [HOR_PRED8x8      ] = ff_pred8x8_horizontal_8_mmx;
             }
@@ -200,7 +200,7 @@
                 h->pred8x8  [PLANE_PRED8x8    ] = ff_pred8x8_tm_vp8_8_mmx;
                 h->pred4x4  [TM_VP8_PRED      ] = ff_pred4x4_tm_vp8_8_mmx;
             } else {
-                if (chroma_format_idc == 1)
+                if (chroma_format_idc <= 1)
                     h->pred8x8  [PLANE_PRED8x8] = ff_pred8x8_plane_8_mmx;
                 if (codec_id == AV_CODEC_ID_SVQ3) {
                     if (cpu_flags & AV_CPU_FLAG_CMOV)
@@ -216,7 +216,7 @@
         if (EXTERNAL_MMXEXT(cpu_flags)) {
             h->pred16x16[HOR_PRED8x8            ] = ff_pred16x16_horizontal_8_mmxext;
             h->pred16x16[DC_PRED8x8             ] = ff_pred16x16_dc_8_mmxext;
-            if (chroma_format_idc == 1)
+            if (chroma_format_idc <= 1)
                 h->pred8x8[HOR_PRED8x8          ] = ff_pred8x8_horizontal_8_mmxext;
             h->pred8x8l [TOP_DC_PRED            ] = ff_pred8x8l_top_dc_8_mmxext;
             h->pred8x8l [DC_PRED                ] = ff_pred8x8l_dc_8_mmxext;
@@ -241,7 +241,7 @@
                 h->pred4x4  [HOR_UP_PRED        ] = ff_pred4x4_horizontal_up_8_mmxext;
             }
             if (codec_id == AV_CODEC_ID_SVQ3 || codec_id == AV_CODEC_ID_H264) {
-                if (chroma_format_idc == 1) {
+                if (chroma_format_idc <= 1) {
                     h->pred8x8[TOP_DC_PRED8x8   ] = ff_pred8x8_top_dc_8_mmxext;
                     h->pred8x8[DC_PRED8x8       ] = ff_pred8x8_dc_8_mmxext;
                 }
@@ -253,7 +253,7 @@
                 h->pred4x4  [TM_VP8_PRED        ] = ff_pred4x4_tm_vp8_8_mmxext;
                 h->pred4x4  [VERT_PRED          ] = ff_pred4x4_vertical_vp8_8_mmxext;
             } else {
-                if (chroma_format_idc == 1)
+                if (chroma_format_idc <= 1)
                     h->pred8x8  [PLANE_PRED8x8] = ff_pred8x8_plane_8_mmxext;
                 if (codec_id == AV_CODEC_ID_SVQ3) {
                     h->pred16x16[PLANE_PRED8x8  ] = ff_pred16x16_plane_svq3_8_mmxext;
@@ -280,7 +280,7 @@
                 h->pred16x16[PLANE_PRED8x8    ] = ff_pred16x16_tm_vp8_8_sse2;
                 h->pred8x8  [PLANE_PRED8x8    ] = ff_pred8x8_tm_vp8_8_sse2;
             } else {
-                if (chroma_format_idc == 1)
+                if (chroma_format_idc <= 1)
                     h->pred8x8  [PLANE_PRED8x8] = ff_pred8x8_plane_8_sse2;
                 if (codec_id == AV_CODEC_ID_SVQ3) {
                     h->pred16x16[PLANE_PRED8x8] = ff_pred16x16_plane_svq3_8_sse2;
@@ -295,7 +295,7 @@
         if (EXTERNAL_SSSE3(cpu_flags)) {
             h->pred16x16[HOR_PRED8x8          ] = ff_pred16x16_horizontal_8_ssse3;
             h->pred16x16[DC_PRED8x8           ] = ff_pred16x16_dc_8_ssse3;
-            if (chroma_format_idc == 1)
+            if (chroma_format_idc <= 1)
                 h->pred8x8  [HOR_PRED8x8      ] = ff_pred8x8_horizontal_8_ssse3;
             h->pred8x8l [TOP_DC_PRED          ] = ff_pred8x8l_top_dc_8_ssse3;
             h->pred8x8l [DC_PRED              ] = ff_pred8x8l_dc_8_ssse3;
@@ -311,7 +311,7 @@
                 h->pred8x8  [PLANE_PRED8x8    ] = ff_pred8x8_tm_vp8_8_ssse3;
                 h->pred4x4  [TM_VP8_PRED      ] = ff_pred4x4_tm_vp8_8_ssse3;
             } else {
-                if (chroma_format_idc == 1)
+                if (chroma_format_idc <= 1)
                     h->pred8x8  [PLANE_PRED8x8] = ff_pred8x8_plane_8_ssse3;
                 if (codec_id == AV_CODEC_ID_SVQ3) {
                     h->pred16x16[PLANE_PRED8x8] = ff_pred16x16_plane_svq3_8_ssse3;
@@ -327,7 +327,7 @@
             h->pred4x4[DC_PRED             ] = ff_pred4x4_dc_10_mmxext;
             h->pred4x4[HOR_UP_PRED         ] = ff_pred4x4_horizontal_up_10_mmxext;
 
-            if (chroma_format_idc == 1)
+            if (chroma_format_idc <= 1)
                 h->pred8x8[DC_PRED8x8      ] = ff_pred8x8_dc_10_mmxext;
 
             h->pred8x8l[DC_128_PRED        ] = ff_pred8x8l_128_dc_10_mmxext;
@@ -346,7 +346,7 @@
             h->pred4x4[VERT_RIGHT_PRED     ] = ff_pred4x4_vertical_right_10_sse2;
             h->pred4x4[HOR_DOWN_PRED       ] = ff_pred4x4_horizontal_down_10_sse2;
 
-            if (chroma_format_idc == 1) {
+            if (chroma_format_idc <= 1) {
                 h->pred8x8[DC_PRED8x8      ] = ff_pred8x8_dc_10_sse2;
                 h->pred8x8[TOP_DC_PRED8x8  ] = ff_pred8x8_top_dc_10_sse2;
                 h->pred8x8[PLANE_PRED8x8   ] = ff_pred8x8_plane_10_sse2;

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/x86/h264dsp_init.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/x86/h264dsp_init.c Changed

@@ -214,7 +214,7 @@
 #if HAVE_YASM
     int cpu_flags = av_get_cpu_flags();
 
-    if (chroma_format_idc == 1 && EXTERNAL_MMXEXT(cpu_flags))
+    if (chroma_format_idc <= 1 && EXTERNAL_MMXEXT(cpu_flags))
         c->h264_loop_filter_strength = ff_h264_loop_filter_strength_mmxext;
 
     if (bit_depth == 8) {
@@ -226,7 +226,7 @@
 
             c->h264_idct_add16 = ff_h264_idct_add16_8_mmx;
             c->h264_idct8_add4 = ff_h264_idct8_add4_8_mmx;
-            if (chroma_format_idc == 1)
+            if (chroma_format_idc <= 1)
                 c->h264_idct_add8 = ff_h264_idct_add8_8_mmx;
             c->h264_idct_add16intra = ff_h264_idct_add16intra_8_mmx;
             if (cpu_flags & AV_CPU_FLAG_CMOV)
@@ -237,13 +237,13 @@
             c->h264_idct8_dc_add = ff_h264_idct8_dc_add_8_mmxext;
             c->h264_idct_add16   = ff_h264_idct_add16_8_mmxext;
             c->h264_idct8_add4   = ff_h264_idct8_add4_8_mmxext;
-            if (chroma_format_idc == 1)
+            if (chroma_format_idc <= 1)
                 c->h264_idct_add8 = ff_h264_idct_add8_8_mmxext;
             c->h264_idct_add16intra = ff_h264_idct_add16intra_8_mmxext;
 
             c->h264_v_loop_filter_chroma       = ff_deblock_v_chroma_8_mmxext;
             c->h264_v_loop_filter_chroma_intra = ff_deblock_v_chroma_intra_8_mmxext;
-            if (chroma_format_idc == 1) {
+            if (chroma_format_idc <= 1) {
                 c->h264_h_loop_filter_chroma       = ff_deblock_h_chroma_8_mmxext;
                 c->h264_h_loop_filter_chroma_intra = ff_deblock_h_chroma_intra_8_mmxext;
             }
@@ -266,7 +266,7 @@
 
             c->h264_idct_add16 = ff_h264_idct_add16_8_sse2;
             c->h264_idct8_add4 = ff_h264_idct8_add4_8_sse2;
-            if (chroma_format_idc == 1)
+            if (chroma_format_idc <= 1)
                 c->h264_idct_add8 = ff_h264_idct_add8_8_sse2;
             c->h264_idct_add16intra      = ff_h264_idct_add16intra_8_sse2;
             c->h264_luma_dc_dequant_idct = ff_h264_luma_dc_dequant_idct_sse2;
@@ -309,7 +309,7 @@
             c->h264_idct8_dc_add = ff_h264_idct8_dc_add_10_sse2;
 
             c->h264_idct_add16 = ff_h264_idct_add16_10_sse2;
-            if (chroma_format_idc == 1)
+            if (chroma_format_idc <= 1)
                 c->h264_idct_add8 = ff_h264_idct_add8_10_sse2;
             c->h264_idct_add16intra = ff_h264_idct_add16intra_10_sse2;
 #if HAVE_ALIGNED_STACK
@@ -349,7 +349,7 @@
             c->h264_idct8_dc_add = ff_h264_idct8_dc_add_10_avx;
 
             c->h264_idct_add16 = ff_h264_idct_add16_10_avx;
-            if (chroma_format_idc == 1)
+            if (chroma_format_idc <= 1)
                 c->h264_idct_add8 = ff_h264_idct_add8_10_avx;
             c->h264_idct_add16intra = ff_h264_idct_add16intra_10_avx;
 #if HAVE_ALIGNED_STACK

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/x86/hpeldsp.asm -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/x86/hpeldsp.asm Changed

@@ -423,30 +423,30 @@
     mova         m6, [pb_1]
     lea          r4, [r2*2]
     mova         m0, [r1]
-    pavgb        m0, [r1+1]
+    PAVGB        m0, [r1+1]
 .loop:
     mova         m2, [r1+r4]
     mova         m1, [r1+r2]
     psubusb      m2, m6
-    pavgb        m1, [r1+r2+1]
-    pavgb        m2, [r1+r4+1]
+    PAVGB        m1, [r1+r2+1]
+    PAVGB        m2, [r1+r4+1]
     add          r1, r4
-    pavgb        m0, m1
-    pavgb        m1, m2
-    pavgb        m0, [r0]
-    pavgb        m1, [r0+r2]
+    PAVGB        m0, m1
+    PAVGB        m1, m2
+    PAVGB        m0, [r0]
+    PAVGB        m1, [r0+r2]
     mova       [r0], m0
     mova    [r0+r2], m1
     mova         m1, [r1+r2]
     mova         m0, [r1+r4]
-    pavgb        m1, [r1+r2+1]
-    pavgb        m0, [r1+r4+1]
+    PAVGB        m1, [r1+r2+1]
+    PAVGB        m0, [r1+r4+1]
     add          r0, r4
     add          r1, r4
-    pavgb        m2, m1
-    pavgb        m1, m0
-    pavgb        m2, [r0]
-    pavgb        m1, [r0+r2]
+    PAVGB        m2, m1
+    PAVGB        m1, m0
+    PAVGB        m2, [r0]
+    PAVGB        m1, [r0+r2]
     mova       [r0], m2
     mova    [r0+r2], m1
     add          r0, r4

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/x86/hpeldsp_init.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/x86/hpeldsp_init.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/x86/imdct36.asm -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/x86/imdct36.asm Changed

@@ -50,7 +50,7 @@
                dd 1.0, -0.51763809020504152469,  1.0, -1.93185165257813657349
                dd 1.0, -0.55168895948124587824, -1.0,  1.18310079157624925896
                dd 1.0, -0.61038729438072803416, -1.0,  0.87172339781054900991
-               dd 1.0,  0.70710678118654752439,  0.0,  0.0
+               dd 1.0, -0.70710678118654752439,  0.0,  0.0
 
 costabs:  times 4 dd  0.98480773
           times 4 dd  0.93969262
@@ -129,6 +129,19 @@
 %endif
 %endmacro
 
+%macro BUTTERF2 3
+%if cpuflag(sse3)
+    mulps    %1, %1, [ps_cosh_sse3 + %3]
+    PSHUFD   %2, %1, 0xe1
+    addsubps %1, %1, %2
+%else
+    mulps    %1, [ps_cosh + %3]
+    PSHUFD   %2, %1, 0xe1
+    xorps    %1, [ps_p1m1p1m1]
+    addps    %1, %2
+%endif
+%endmacro
+
 %macro STORE 4
     movhlps %2, %1
     movss   [%3       ], %1
@@ -279,11 +292,7 @@
     BUTTERF  m7, m2, 16
     BUTTERF  m3, m6, 32
     BUTTERF  m4, m1, 48
-
-    mulps   m5, m5, [ps_cosh + 64]
-    PSHUFD  m1, m5, 0xe1
-    xorps   m5, m5, [ps_p1m1p1m1]
-    addps   m5, m5, m1
+    BUTTERF2 m5, m1, 64
 
     ; permutates:
     ; m0    0  1  2  3     =>     2  6 10 14   m1
@@ -358,8 +367,10 @@
     RET
 %endmacro
 
+%if ARCH_X86_32
 INIT_XMM sse
 DEFINE_IMDCT
+%endif
 
 INIT_XMM sse2
 DEFINE_IMDCT

omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/x86/lossless_videodsp.asm Added

@@ -0,0 +1,292 @@
+;******************************************************************************
+;* SIMD lossless video DSP utils
+;* Copyright (c) 2008 Loren Merritt
+;* Copyright (c) 2014 Michael Niedermayer
+;*
+;* This file is part of FFmpeg.
+;*
+;* FFmpeg is free software; you can redistribute it and/or
+;* modify it under the terms of the GNU Lesser General Public
+;* License as published by the Free Software Foundation; either
+;* version 2.1 of the License, or (at your option) any later version.
+;*
+;* FFmpeg is distributed in the hope that it will be useful,
+;* but WITHOUT ANY WARRANTY; without even the implied warranty of
+;* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;* Lesser General Public License for more details.
+;*
+;* You should have received a copy of the GNU Lesser General Public
+;* License along with FFmpeg; if not, write to the Free Software
+;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+;******************************************************************************
+
+%include "libavutil/x86/x86util.asm"
+
+SECTION_RODATA
+
+pb_ef: times 8 db 14,15
+pb_67: times 8 db  6, 7
+pb_zzzz2323zzzzabab: db -1,-1,-1,-1, 2, 3, 2, 3,-1,-1,-1,-1,10,11,10,11
+pb_zzzzzzzz67676767: db -1,-1,-1,-1,-1,-1,-1,-1, 6, 7, 6, 7, 6, 7, 6, 7
+
+SECTION_TEXT
+
+%macro INT16_LOOP 2 ; %1 = a/u (aligned/unaligned), %2 = add/sub
+    movd    m4, maskd
+    SPLATW  m4, m4
+    add     wd, wd
+    test    wq, 2*mmsize - 1
+    jz %%.tomainloop
+%%.wordloop:
+    sub     wq, 2
+%ifidn %2, add
+    mov     ax, [srcq+wq]
+    add     ax, [dstq+wq]
+%else
+    mov     ax, [src1q+wq]
+    sub     ax, [src2q+wq]
+%endif
+    and     ax, maskw
+    mov     [dstq+wq], ax
+    test    wq, 2*mmsize - 1
+    jnz %%.wordloop
+%%.tomainloop:
+%ifidn %2, add
+    add     srcq, wq
+%else
+    add     src1q, wq
+    add     src2q, wq
+%endif
+    add     dstq, wq
+    neg     wq
+    jz      %%.end
+%%.loop:
+%ifidn %2, add
+    mov%1   m0, [srcq+wq]
+    mov%1   m1, [dstq+wq]
+    mov%1   m2, [srcq+wq+mmsize]
+    mov%1   m3, [dstq+wq+mmsize]
+%else
+    mov%1   m0, [src1q+wq]
+    mov%1   m1, [src2q+wq]
+    mov%1   m2, [src1q+wq+mmsize]
+    mov%1   m3, [src2q+wq+mmsize]
+%endif
+    p%2w    m0, m1
+    p%2w    m2, m3
+    pand    m0, m4
+    pand    m2, m4
+    mov%1   [dstq+wq]       , m0
+    mov%1   [dstq+wq+mmsize], m2
+    add     wq, 2*mmsize
+    jl %%.loop
+%%.end:
+    RET
+%endmacro
+
+INIT_MMX mmx
+cglobal add_int16, 4,4,5, dst, src, mask, w
+    INT16_LOOP a, add
+
+INIT_XMM sse2
+cglobal add_int16, 4,4,5, dst, src, mask, w
+    test srcq, mmsize-1
+    jnz .unaligned
+    test dstq, mmsize-1
+    jnz .unaligned
+    INT16_LOOP a, add
+.unaligned:
+    INT16_LOOP u, add
+
+INIT_MMX mmx
+cglobal diff_int16, 5,5,5, dst, src1, src2, mask, w
+    INT16_LOOP a, sub
+
+INIT_XMM sse2
+cglobal diff_int16, 5,5,5, dst, src1, src2, mask, w
+    test src1q, mmsize-1
+    jnz .unaligned
+    test src2q, mmsize-1
+    jnz .unaligned
+    test dstq, mmsize-1
+    jnz .unaligned
+    INT16_LOOP a, sub
+.unaligned:
+    INT16_LOOP u, sub
+
+
+%macro ADD_HFYU_LEFT_LOOP_INT16 2 ; %1 = dst alignment (a/u), %2 = src alignment (a/u)
+    add     wd, wd
+    add     srcq, wq
+    add     dstq, wq
+    neg     wq
+%%.loop:
+    mov%2   m1, [srcq+wq]
+    mova    m2, m1
+    pslld   m1, 16
+    paddw   m1, m2
+    mova    m2, m1
+
+    pshufb  m1, m3
+    paddw   m1, m2
+    pshufb  m0, m5
+%if mmsize == 16
+    mova    m2, m1
+    pshufb  m1, m4
+    paddw   m1, m2
+%endif
+    paddw   m0, m1
+    pand    m0, m7
+%ifidn %1, a
+    mova    [dstq+wq], m0
+%else
+    movq    [dstq+wq], m0
+    movhps  [dstq+wq+8], m0
+%endif
+    add     wq, mmsize
+    jl %%.loop
+    mov     eax, mmsize-1
+    sub     eax, wd
+    mov     wd, eax
+    shl     wd, 8
+    lea     eax, [wd+eax-1]
+    movd    m1, eax
+    pshufb  m0, m1
+    movd    eax, m0
+    RET
+%endmacro
+
+; int add_hfyu_left_prediction_int16(uint16_t *dst, const uint16_t *src, unsigned mask, int w, int left)
+INIT_MMX ssse3
+cglobal add_hfyu_left_prediction_int16, 4,4,8, dst, src, mask, w, left
+.skip_prologue:
+    mova    m5, [pb_67]
+    mova    m3, [pb_zzzz2323zzzzabab]
+    movd    m0, leftm
+    psllq   m0, 48
+    movd    m7, maskm
+    SPLATW  m7 ,m7
+    ADD_HFYU_LEFT_LOOP_INT16 a, a
+
+INIT_XMM sse4
+cglobal add_hfyu_left_prediction_int16, 4,4,8, dst, src, mask, w, left
+    mova    m5, [pb_ef]
+    mova    m4, [pb_zzzzzzzz67676767]
+    mova    m3, [pb_zzzz2323zzzzabab]
+    movd    m0, leftm
+    pslldq  m0, 14
+    movd    m7, maskm
+    SPLATW  m7 ,m7
+    test    srcq, 15
+    jnz .src_unaligned
+    test    dstq, 15
+    jnz .dst_unaligned
+    ADD_HFYU_LEFT_LOOP_INT16 a, a
+.dst_unaligned:
+    ADD_HFYU_LEFT_LOOP_INT16 u, a
+.src_unaligned:
+    ADD_HFYU_LEFT_LOOP_INT16 u, u
+
+; void add_hfyu_median_prediction_mmxext(uint8_t *dst, const uint8_t *top, const uint8_t *diff, int mask, int w, int *left, int *left_top)
+INIT_MMX mmxext
+cglobal add_hfyu_median_prediction_int16, 7,7,0, dst, top, diff, mask, w, left, left_top
+    add      wd, wd
+    movd    mm6, maskd
+    SPLATW  mm6, mm6
+    movq    mm0, [topq]
+    movq    mm2, mm0
+    movd    mm4, [left_topq]
+    psllq   mm2, 16
+    movq    mm1, mm0
+    por     mm4, mm2
+    movd    mm3, [leftq]
+    psubw   mm0, mm4 ; t-tl
+    add    dstq, wq
+    add    topq, wq
+    add   diffq, wq
+    neg      wq
+    jmp .skip
+.loop:
+    movq    mm4, [topq+wq]
+    movq    mm0, mm4
+    psllq   mm4, 16
+    por     mm4, mm1
+    movq    mm1, mm0 ; t
+    psubw   mm0, mm4 ; t-tl
+.skip:
+    movq    mm2, [diffq+wq]
+%assign i 0
+%rep 4
+    movq    mm4, mm0
+    paddw   mm4, mm3 ; t-tl+l
+    pand    mm4, mm6
+    movq    mm5, mm3
+    pmaxsw  mm3, mm1
+    pminsw  mm5, mm1
+    pminsw  mm3, mm4
+    pmaxsw  mm3, mm5 ; median
+    paddw   mm3, mm2 ; +residual
+    pand    mm3, mm6
+%if i==0
+    movq    mm7, mm3
+    psllq   mm7, 48
+%else
+    movq    mm4, mm3
+    psrlq   mm7, 16
+    psllq   mm4, 48
+    por     mm7, mm4
+%endif
+%if i<3
+    psrlq   mm0, 16
+    psrlq   mm1, 16
+    psrlq   mm2, 16
+%endif
+%assign i i+1
+%endrep
+    movq [dstq+wq], mm7
+    add      wq, 8
+    jl .loop
+    movzx   r2d, word [dstq-2]
+    mov [leftq], r2d
+    movzx   r2d, word [topq-2]
+    mov [left_topq], r2d
+    RET
+
+cglobal sub_hfyu_median_prediction_int16, 7,7,0, dst, src1, src2, mask, w, left, left_top
+    add      wd, wd
+    movd    mm7, maskd
+    SPLATW  mm7, mm7
+    movq    mm0, [src1q]
+    movq    mm2, [src2q]
+    psllq   mm0, 16
+    psllq   mm2, 16
+    movd    mm6, [left_topq]
+    por     mm0, mm6
+    movd    mm6, [leftq]
+    por     mm2, mm6
+    xor     maskq, maskq
+.loop:
+    movq    mm1, [src1q + maskq]
+    movq    mm3, [src2q + maskq]
+    movq    mm4, mm2
+    psubw   mm2, mm0
+    paddw   mm2, mm1
+    pand    mm2, mm7
+    movq    mm5, mm4
+    pmaxsw  mm4, mm1
+    pminsw  mm1, mm5
+    pminsw  mm4, mm2
+    pmaxsw  mm4, mm1
+    psubw   mm3, mm4
+    pand    mm3, mm7
+    movq    [dstq + maskq], mm3
+    add     maskq, 8
+    movq    mm0, [src1q + maskq - 2]
+    movq    mm2, [src2q + maskq - 2]
+    cmp     maskq, wq
+        jb .loop
+    mov maskd, [src1q + wq - 2]
+    mov [left_topq], maskd
+    mov maskd, [src2q + wq - 2]
+    mov [leftq], maskd
+    RET

omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/x86/lossless_videodsp_init.c Added

@@ -0,0 +1,62 @@
+/*
+ * Lossless video DSP utils
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "../lossless_videodsp.h"
+#include "libavutil/pixdesc.h"
+#include "libavutil/x86/cpu.h"
+
+void ff_add_int16_mmx(uint16_t *dst, const uint16_t *src, unsigned mask, int w);
+void ff_add_int16_sse2(uint16_t *dst, const uint16_t *src, unsigned mask, int w);
+void ff_diff_int16_mmx (uint16_t *dst, const uint16_t *src1, const uint16_t *src2, unsigned mask, int w);
+void ff_diff_int16_sse2(uint16_t *dst, const uint16_t *src1, const uint16_t *src2, unsigned mask, int w);
+int ff_add_hfyu_left_prediction_int16_ssse3(uint16_t *dst, const uint16_t *src, unsigned mask, int w, int acc);
+int ff_add_hfyu_left_prediction_int16_sse4(uint16_t *dst, const uint16_t *src, unsigned mask, int w, int acc);
+void ff_add_hfyu_median_prediction_int16_mmxext(uint16_t *dst, const uint16_t *top, const uint16_t *diff, unsigned mask, int w, int *left, int *left_top);
+void ff_sub_hfyu_median_prediction_int16_mmxext(uint16_t *dst, const uint16_t *src1, const uint16_t *src2, unsigned mask, int w, int *left, int *left_top);
+
+
+void ff_llviddsp_init_x86(LLVidDSPContext *c, AVCodecContext *avctx)
+{
+    int cpu_flags = av_get_cpu_flags();
+    const AVPixFmtDescriptor *pix_desc = av_pix_fmt_desc_get(avctx->pix_fmt);
+
+    if (EXTERNAL_MMX(cpu_flags)) {
+        c->add_int16 = ff_add_int16_mmx;
+        c->diff_int16 = ff_diff_int16_mmx;
+    }
+
+    if (EXTERNAL_MMXEXT(cpu_flags) && pix_desc->comp[0].depth_minus1<15) {
+        c->add_hfyu_median_prediction_int16 = ff_add_hfyu_median_prediction_int16_mmxext;
+        c->sub_hfyu_median_prediction_int16 = ff_sub_hfyu_median_prediction_int16_mmxext;
+    }
+
+    if (EXTERNAL_SSE2(cpu_flags)) {
+        c->add_int16 = ff_add_int16_sse2;
+        c->diff_int16 = ff_diff_int16_sse2;
+    }
+
+    if (EXTERNAL_SSSE3(cpu_flags)) {
+        c->add_hfyu_left_prediction_int16 = ff_add_hfyu_left_prediction_int16_ssse3;
+    }
+
+    if (EXTERNAL_SSE4(cpu_flags)) {
+        c->add_hfyu_left_prediction_int16 = ff_add_hfyu_left_prediction_int16_sse4;
+    }
+}

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/x86/mpegaudiodsp.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/x86/mpegaudiodsp.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/x86/mpegvideo.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/x86/mpegvideo.c Changed

@@ -443,116 +443,6 @@
         );
 }
 
-static void  denoise_dct_mmx(MpegEncContext *s, int16_t *block){
-    const int intra= s->mb_intra;
-    int *sum= s->dct_error_sum[intra];
-    uint16_t *offset= s->dct_offset[intra];
-
-    s->dct_count[intra]++;
-
-    __asm__ volatile(
-        "pxor %%mm7, %%mm7                      \n\t"
-        "1:                                     \n\t"
-        "pxor %%mm0, %%mm0                      \n\t"
-        "pxor %%mm1, %%mm1                      \n\t"
-        "movq (%0), %%mm2                       \n\t"
-        "movq 8(%0), %%mm3                      \n\t"
-        "pcmpgtw %%mm2, %%mm0                   \n\t"
-        "pcmpgtw %%mm3, %%mm1                   \n\t"
-        "pxor %%mm0, %%mm2                      \n\t"
-        "pxor %%mm1, %%mm3                      \n\t"
-        "psubw %%mm0, %%mm2                     \n\t"
-        "psubw %%mm1, %%mm3                     \n\t"
-        "movq %%mm2, %%mm4                      \n\t"
-        "movq %%mm3, %%mm5                      \n\t"
-        "psubusw (%2), %%mm2                    \n\t"
-        "psubusw 8(%2), %%mm3                   \n\t"
-        "pxor %%mm0, %%mm2                      \n\t"
-        "pxor %%mm1, %%mm3                      \n\t"
-        "psubw %%mm0, %%mm2                     \n\t"
-        "psubw %%mm1, %%mm3                     \n\t"
-        "movq %%mm2, (%0)                       \n\t"
-        "movq %%mm3, 8(%0)                      \n\t"
-        "movq %%mm4, %%mm2                      \n\t"
-        "movq %%mm5, %%mm3                      \n\t"
-        "punpcklwd %%mm7, %%mm4                 \n\t"
-        "punpckhwd %%mm7, %%mm2                 \n\t"
-        "punpcklwd %%mm7, %%mm5                 \n\t"
-        "punpckhwd %%mm7, %%mm3                 \n\t"
-        "paddd (%1), %%mm4                      \n\t"
-        "paddd 8(%1), %%mm2                     \n\t"
-        "paddd 16(%1), %%mm5                    \n\t"
-        "paddd 24(%1), %%mm3                    \n\t"
-        "movq %%mm4, (%1)                       \n\t"
-        "movq %%mm2, 8(%1)                      \n\t"
-        "movq %%mm5, 16(%1)                     \n\t"
-        "movq %%mm3, 24(%1)                     \n\t"
-        "add $16, %0                            \n\t"
-        "add $32, %1                            \n\t"
-        "add $16, %2                            \n\t"
-        "cmp %3, %0                             \n\t"
-            " jb 1b                             \n\t"
-        : "+r" (block), "+r" (sum), "+r" (offset)
-        : "r"(block+64)
-    );
-}
-
-static void  denoise_dct_sse2(MpegEncContext *s, int16_t *block){
-    const int intra= s->mb_intra;
-    int *sum= s->dct_error_sum[intra];
-    uint16_t *offset= s->dct_offset[intra];
-
-    s->dct_count[intra]++;
-
-    __asm__ volatile(
-        "pxor %%xmm7, %%xmm7                    \n\t"
-        "1:                                     \n\t"
-        "pxor %%xmm0, %%xmm0                    \n\t"
-        "pxor %%xmm1, %%xmm1                    \n\t"
-        "movdqa (%0), %%xmm2                    \n\t"
-        "movdqa 16(%0), %%xmm3                  \n\t"
-        "pcmpgtw %%xmm2, %%xmm0                 \n\t"
-        "pcmpgtw %%xmm3, %%xmm1                 \n\t"
-        "pxor %%xmm0, %%xmm2                    \n\t"
-        "pxor %%xmm1, %%xmm3                    \n\t"
-        "psubw %%xmm0, %%xmm2                   \n\t"
-        "psubw %%xmm1, %%xmm3                   \n\t"
-        "movdqa %%xmm2, %%xmm4                  \n\t"
-        "movdqa %%xmm3, %%xmm5                  \n\t"
-        "psubusw (%2), %%xmm2                   \n\t"
-        "psubusw 16(%2), %%xmm3                 \n\t"
-        "pxor %%xmm0, %%xmm2                    \n\t"
-        "pxor %%xmm1, %%xmm3                    \n\t"
-        "psubw %%xmm0, %%xmm2                   \n\t"
-        "psubw %%xmm1, %%xmm3                   \n\t"
-        "movdqa %%xmm2, (%0)                    \n\t"
-        "movdqa %%xmm3, 16(%0)                  \n\t"
-        "movdqa %%xmm4, %%xmm6                  \n\t"
-        "movdqa %%xmm5, %%xmm0                  \n\t"
-        "punpcklwd %%xmm7, %%xmm4               \n\t"
-        "punpckhwd %%xmm7, %%xmm6               \n\t"
-        "punpcklwd %%xmm7, %%xmm5               \n\t"
-        "punpckhwd %%xmm7, %%xmm0               \n\t"
-        "paddd (%1), %%xmm4                     \n\t"
-        "paddd 16(%1), %%xmm6                   \n\t"
-        "paddd 32(%1), %%xmm5                   \n\t"
-        "paddd 48(%1), %%xmm0                   \n\t"
-        "movdqa %%xmm4, (%1)                    \n\t"
-        "movdqa %%xmm6, 16(%1)                  \n\t"
-        "movdqa %%xmm5, 32(%1)                  \n\t"
-        "movdqa %%xmm0, 48(%1)                  \n\t"
-        "add $32, %0                            \n\t"
-        "add $64, %1                            \n\t"
-        "add $32, %2                            \n\t"
-        "cmp %3, %0                             \n\t"
-            " jb 1b                             \n\t"
-        : "+r" (block), "+r" (sum), "+r" (offset)
-        : "r"(block+64)
-          XMM_CLOBBERS_ONLY("%xmm0", "%xmm1", "%xmm2", "%xmm3",
-                            "%xmm4", "%xmm5", "%xmm6", "%xmm7")
-    );
-}
-
 #endif /* HAVE_MMX_INLINE */
 
 av_cold void ff_MPV_common_init_x86(MpegEncContext *s)
@@ -568,10 +458,6 @@
         if(!(s->flags & CODEC_FLAG_BITEXACT))
             s->dct_unquantize_mpeg2_intra = dct_unquantize_mpeg2_intra_mmx;
         s->dct_unquantize_mpeg2_inter = dct_unquantize_mpeg2_inter_mmx;
-        s->denoise_dct = denoise_dct_mmx;
-    }
-    if (INLINE_SSE2(cpu_flags)) {
-        s->denoise_dct = denoise_dct_sse2;
     }
 #endif /* HAVE_MMX_INLINE */
 }

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/x86/mpegvideoenc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/x86/mpegvideoenc.c Changed

@@ -28,7 +28,8 @@
 #include "libavcodec/mpegvideo.h"
 #include "dsputil_x86.h"
 
-extern uint16_t ff_inv_zigzag_direct16[64];
+/* not permutated inverse zigzag_direct + 1 for MMX quantizer */
+DECLARE_ALIGNED(16, static uint16_t, inv_zigzag_direct16)[64];
 
 #if HAVE_MMX_INLINE
 #define COMPILE_TEMPLATE_MMXEXT 0
@@ -81,23 +82,143 @@
 #include "mpegvideoenc_template.c"
 #endif /* HAVE_SSSE3_INLINE */
 
+#if HAVE_INLINE_ASM
+static void  denoise_dct_mmx(MpegEncContext *s, int16_t *block){
+    const int intra= s->mb_intra;
+    int *sum= s->dct_error_sum[intra];
+    uint16_t *offset= s->dct_offset[intra];
+
+    s->dct_count[intra]++;
+
+    __asm__ volatile(
+        "pxor %%mm7, %%mm7                      \n\t"
+        "1:                                     \n\t"
+        "pxor %%mm0, %%mm0                      \n\t"
+        "pxor %%mm1, %%mm1                      \n\t"
+        "movq (%0), %%mm2                       \n\t"
+        "movq 8(%0), %%mm3                      \n\t"
+        "pcmpgtw %%mm2, %%mm0                   \n\t"
+        "pcmpgtw %%mm3, %%mm1                   \n\t"
+        "pxor %%mm0, %%mm2                      \n\t"
+        "pxor %%mm1, %%mm3                      \n\t"
+        "psubw %%mm0, %%mm2                     \n\t"
+        "psubw %%mm1, %%mm3                     \n\t"
+        "movq %%mm2, %%mm4                      \n\t"
+        "movq %%mm3, %%mm5                      \n\t"
+        "psubusw (%2), %%mm2                    \n\t"
+        "psubusw 8(%2), %%mm3                   \n\t"
+        "pxor %%mm0, %%mm2                      \n\t"
+        "pxor %%mm1, %%mm3                      \n\t"
+        "psubw %%mm0, %%mm2                     \n\t"
+        "psubw %%mm1, %%mm3                     \n\t"
+        "movq %%mm2, (%0)                       \n\t"
+        "movq %%mm3, 8(%0)                      \n\t"
+        "movq %%mm4, %%mm2                      \n\t"
+        "movq %%mm5, %%mm3                      \n\t"
+        "punpcklwd %%mm7, %%mm4                 \n\t"
+        "punpckhwd %%mm7, %%mm2                 \n\t"
+        "punpcklwd %%mm7, %%mm5                 \n\t"
+        "punpckhwd %%mm7, %%mm3                 \n\t"
+        "paddd (%1), %%mm4                      \n\t"
+        "paddd 8(%1), %%mm2                     \n\t"
+        "paddd 16(%1), %%mm5                    \n\t"
+        "paddd 24(%1), %%mm3                    \n\t"
+        "movq %%mm4, (%1)                       \n\t"
+        "movq %%mm2, 8(%1)                      \n\t"
+        "movq %%mm5, 16(%1)                     \n\t"
+        "movq %%mm3, 24(%1)                     \n\t"
+        "add $16, %0                            \n\t"
+        "add $32, %1                            \n\t"
+        "add $16, %2                            \n\t"
+        "cmp %3, %0                             \n\t"
+            " jb 1b                             \n\t"
+        : "+r" (block), "+r" (sum), "+r" (offset)
+        : "r"(block+64)
+    );
+}
+
+static void  denoise_dct_sse2(MpegEncContext *s, int16_t *block){
+    const int intra= s->mb_intra;
+    int *sum= s->dct_error_sum[intra];
+    uint16_t *offset= s->dct_offset[intra];
+
+    s->dct_count[intra]++;
+
+    __asm__ volatile(
+        "pxor %%xmm7, %%xmm7                    \n\t"
+        "1:                                     \n\t"
+        "pxor %%xmm0, %%xmm0                    \n\t"
+        "pxor %%xmm1, %%xmm1                    \n\t"
+        "movdqa (%0), %%xmm2                    \n\t"
+        "movdqa 16(%0), %%xmm3                  \n\t"
+        "pcmpgtw %%xmm2, %%xmm0                 \n\t"
+        "pcmpgtw %%xmm3, %%xmm1                 \n\t"
+        "pxor %%xmm0, %%xmm2                    \n\t"
+        "pxor %%xmm1, %%xmm3                    \n\t"
+        "psubw %%xmm0, %%xmm2                   \n\t"
+        "psubw %%xmm1, %%xmm3                   \n\t"
+        "movdqa %%xmm2, %%xmm4                  \n\t"
+        "movdqa %%xmm3, %%xmm5                  \n\t"
+        "psubusw (%2), %%xmm2                   \n\t"
+        "psubusw 16(%2), %%xmm3                 \n\t"
+        "pxor %%xmm0, %%xmm2                    \n\t"
+        "pxor %%xmm1, %%xmm3                    \n\t"
+        "psubw %%xmm0, %%xmm2                   \n\t"
+        "psubw %%xmm1, %%xmm3                   \n\t"
+        "movdqa %%xmm2, (%0)                    \n\t"
+        "movdqa %%xmm3, 16(%0)                  \n\t"
+        "movdqa %%xmm4, %%xmm6                  \n\t"
+        "movdqa %%xmm5, %%xmm0                  \n\t"
+        "punpcklwd %%xmm7, %%xmm4               \n\t"
+        "punpckhwd %%xmm7, %%xmm6               \n\t"
+        "punpcklwd %%xmm7, %%xmm5               \n\t"
+        "punpckhwd %%xmm7, %%xmm0               \n\t"
+        "paddd (%1), %%xmm4                     \n\t"
+        "paddd 16(%1), %%xmm6                   \n\t"
+        "paddd 32(%1), %%xmm5                   \n\t"
+        "paddd 48(%1), %%xmm0                   \n\t"
+        "movdqa %%xmm4, (%1)                    \n\t"
+        "movdqa %%xmm6, 16(%1)                  \n\t"
+        "movdqa %%xmm5, 32(%1)                  \n\t"
+        "movdqa %%xmm0, 48(%1)                  \n\t"
+        "add $32, %0                            \n\t"
+        "add $64, %1                            \n\t"
+        "add $32, %2                            \n\t"
+        "cmp %3, %0                             \n\t"
+            " jb 1b                             \n\t"
+        : "+r" (block), "+r" (sum), "+r" (offset)
+        : "r"(block+64)
+          XMM_CLOBBERS_ONLY("%xmm0", "%xmm1", "%xmm2", "%xmm3",
+                            "%xmm4", "%xmm5", "%xmm6", "%xmm7")
+    );
+}
+#endif /* HAVE_INLINE_ASM */
+
 av_cold void ff_dct_encode_init_x86(MpegEncContext *s)
 {
     const int dct_algo = s->avctx->dct_algo;
+    int i;
+
+    for (i = 0; i < 64; i++)
+        inv_zigzag_direct16[ff_zigzag_direct[i]] = i + 1;
 
     if (dct_algo == FF_DCT_AUTO || dct_algo == FF_DCT_MMX) {
 #if HAVE_MMX_INLINE
         int cpu_flags = av_get_cpu_flags();
-        if (INLINE_MMX(cpu_flags))
+        if (INLINE_MMX(cpu_flags)) {
             s->dct_quantize = dct_quantize_MMX;
+            s->denoise_dct  = denoise_dct_mmx;
+        }
 #endif
 #if HAVE_MMXEXT_INLINE
         if (INLINE_MMXEXT(cpu_flags))
             s->dct_quantize = dct_quantize_MMXEXT;
 #endif
 #if HAVE_SSE2_INLINE
-        if (INLINE_SSE2(cpu_flags))
+        if (INLINE_SSE2(cpu_flags)) {
             s->dct_quantize = dct_quantize_SSE2;
+            s->denoise_dct  = denoise_dct_sse2;
+        }
 #endif
 #if HAVE_SSSE3_INLINE
         if (INLINE_SSSE3(cpu_flags))

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/x86/mpegvideoenc_template.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/x86/mpegvideoenc_template.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/x86/proresdsp_init.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/x86/proresdsp_init.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/x86/rv34dsp_init.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/x86/rv34dsp_init.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/x86/rv40dsp.asm -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/x86/rv40dsp.asm Changed

omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/x86/ttadsp.asm Added

@@ -0,0 +1,119 @@
+;******************************************************************************
+;* TTA DSP SIMD optimizations
+;*
+;* Copyright (C) 2014 James Almer
+;*
+;* This file is part of FFmpeg.
+;*
+;* FFmpeg is free software; you can redistribute it and/or
+;* modify it under the terms of the GNU Lesser General Public
+;* License as published by the Free Software Foundation; either
+;* version 2.1 of the License, or (at your option) any later version.
+;*
+;* FFmpeg is distributed in the hope that it will be useful,
+;* but WITHOUT ANY WARRANTY; without even the implied warranty of
+;* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;* Lesser General Public License for more details.
+;*
+;* You should have received a copy of the GNU Lesser General Public
+;* License along with FFmpeg; if not, write to the Free Software
+;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+;******************************************************************************
+
+%include "libavutil/x86/x86util.asm"
+
+SECTION_RODATA
+
+pd_n0113: dd ~0, ~1, ~1, ~3
+pd_1224:  dd 1, 2, 2, 4
+
+SECTION .text
+
+%macro TTA_FILTER 2
+INIT_XMM %1
+cglobal ttafilter_process_dec, 5,5,%2, qm, dx, dl, error, in, shift, round
+    mova       m2, [qmq       ]
+    mova       m3, [qmq + 0x10]
+    mova       m4, [dxq       ]
+    mova       m5, [dxq + 0x10]
+
+    movd       m6, [errorq]         ; if (filter->error < 0) {
+    SPLATD     m6                   ;     for (int i = 0; i < 8; i++)
+    psignd     m0, m4, m6           ;         filter->qm[i] -= filter->dx[i];
+    psignd     m1, m5, m6           ; } else if (filter->error > 0) {
+    paddd      m2, m0               ;     for (int i = 0; i < 8; i++)
+    paddd      m3, m1               ;         filter->qm[i] += filter->dx[i];
+    mova       [qmq       ], m2     ; }
+    mova       [qmq + 0x10], m3     ;
+
+    mova       m0, [dlq       ]
+    mova       m1, [dlq + 0x10]
+
+%if cpuflag(sse4)
+    pmulld     m2, m0
+    pmulld     m3, m1
+%else
+    pshufd     m6, m0, 0xb1
+    pshufd     m7, m2, 0xb1
+    pmuludq    m6, m7
+    pshufd     m6, m6, 0xd8
+    pmuludq    m2, m0
+    pshufd     m2, m2, 0xd8
+    punpckldq  m2, m6
+
+    pshufd     m6, m1, 0xb1
+    pshufd     m7, m3, 0xb1
+    pmuludq    m6, m7
+    pshufd     m6, m6, 0xd8
+    pmuludq    m3, m1
+    pshufd     m3, m3, 0xd8
+    punpckldq  m3, m6
+%endif
+    ; Using horizontal add (phaddd) seems to be slower than shuffling stuff around
+    paddd      m2, m3               ; int sum = filter->round +
+                                    ;           filter->dl[0] * filter->qm[0] +
+    punpckhqdq m3, m2, m2           ;           filter->dl[1] * filter->qm[1] +
+    paddd      m2, m3               ;           filter->dl[2] * filter->qm[2] +
+                                    ;           filter->dl[3] * filter->qm[3] +
+    movd       m6, roundm           ;           filter->dl[4] * filter->qm[4] +
+    paddd      m6, m2               ;           filter->dl[5] * filter->qm[5] +
+    pshufd     m2, m2, 0x1          ;           filter->dl[6] * filter->qm[6] +
+    paddd      m6, m2               ;           filter->dl[7] * filter->qm[7];
+
+    palignr    m5, m4, 4            ; filter->dx[0] = filter->dx[1]; filter->dx[1] = filter->dx[2];
+                                    ; filter->dx[2] = filter->dx[3]; filter->dx[3] = filter->dx[4];
+
+    palignr    m2, m1, m0, 4        ; filter->dl[0] = filter->dl[1]; filter->dl[1] = filter->dl[2];
+                                    ; filter->dl[2] = filter->dl[3]; filter->dl[3] = filter->dl[4];
+
+    psrad      m4, m1, 30           ; filter->dx[4] = ((filter->dl[4] >> 30) | 1);
+    por        m4, [pd_1224 ]       ; filter->dx[5] = ((filter->dl[5] >> 30) | 2) & ~1;
+    pand       m4, [pd_n0113]       ; filter->dx[6] = ((filter->dl[6] >> 30) | 2) & ~1;
+                                    ; filter->dx[7] = ((filter->dl[7] >> 30) | 4) & ~3;
+
+    mova       [dlq       ], m2
+    mova       [dxq       ], m5
+    mova       [dxq + 0x10], m4
+    movd       m0, [inq]            ; filter->error = *in;
+    movd       [errorq], m0         ;
+
+    movd       m2, shiftm           ; *in += (sum >> filter->shift);
+    psrad      m6, m2               ;
+    paddd      m0, m6               ;
+    movd       [inq], m0            ;
+
+    psrldq     m1, 4                ;
+    pslldq     m0, 12               ; filter->dl[4] = -filter->dl[5];
+    pshufd     m0, m0, 0xf0         ; filter->dl[5] = -filter->dl[6];
+    psubd      m0, m1               ; filter->dl[6] = *in - filter->dl[7];
+    psrldq     m1, m0, 4            ; filter->dl[7] = *in;
+    pshufd     m1, m1, 0xf4         ; filter->dl[5] += filter->dl[6];
+    paddd      m0, m1               ; filter->dl[4] += filter->dl[5];
+    psrldq     m1, 4                ;
+    paddd      m0, m1               ;
+    mova       [dlq + 0x10], m0     ;
+    RET
+%endmacro
+
+TTA_FILTER ssse3, 8
+TTA_FILTER sse4,  7

omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/x86/ttadsp_init.c Added

@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2014 James Almer
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "libavcodec/ttadsp.h"
+#include "libavutil/x86/cpu.h"
+#include "config.h"
+
+void ff_ttafilter_process_dec_ssse3(int32_t *qm, int32_t *dx, int32_t *dl,
+                                    int32_t *error, int32_t *in, int32_t shift,
+                                    int32_t round);
+void ff_ttafilter_process_dec_sse4(int32_t *qm, int32_t *dx, int32_t *dl,
+                                   int32_t *error, int32_t *in, int32_t shift,
+                                   int32_t round);
+
+av_cold void ff_ttadsp_init_x86(TTADSPContext *c)
+{
+#if HAVE_YASM
+    int cpu_flags = av_get_cpu_flags();
+
+    if (EXTERNAL_SSSE3(cpu_flags))
+        c->ttafilter_process_dec = ff_ttafilter_process_dec_ssse3;
+    if (EXTERNAL_SSE4(cpu_flags))
+        c->ttafilter_process_dec = ff_ttafilter_process_dec_sse4;
+#endif
+}

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/x86/vc1dsp_init.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/x86/vc1dsp_init.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/x86/videodsp_init.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/x86/videodsp_init.c Changed

@@ -129,8 +129,9 @@
 };
 extern emu_edge_hvar_func ff_emu_edge_hvar_sse2;
 
-static av_always_inline void emulated_edge_mc(uint8_t *dst, ptrdiff_t dst_stride,
-                                              const uint8_t *src, ptrdiff_t src_stride,
+static av_always_inline void emulated_edge_mc(uint8_t *dst, const uint8_t *src,
+                                              ptrdiff_t dst_stride,
+                                              ptrdiff_t src_stride,
                                               x86_reg block_w, x86_reg block_h,
                                               x86_reg src_x, x86_reg src_y,
                                               x86_reg w, x86_reg h,
@@ -141,7 +142,7 @@
 {
     x86_reg start_y, start_x, end_y, end_x, src_y_add = 0, p;
 
-    if(!w || !h)
+    if (!w || !h)
         return;
 
     if (src_y >= h) {
@@ -203,34 +204,38 @@
 }
 
 #if ARCH_X86_32
-static av_noinline void emulated_edge_mc_mmx(uint8_t *buf, ptrdiff_t buf_stride,
-                                             const uint8_t *src, ptrdiff_t src_stride,
+static av_noinline void emulated_edge_mc_mmx(uint8_t *buf, const uint8_t *src,
+                                             ptrdiff_t buf_stride,
+                                             ptrdiff_t src_stride,
                                              int block_w, int block_h,
                                              int src_x, int src_y, int w, int h)
 {
-    emulated_edge_mc(buf, buf_stride, src, src_stride, block_w, block_h,
+    emulated_edge_mc(buf, src, buf_stride, src_stride, block_w, block_h,
                      src_x, src_y, w, h, vfixtbl_mmx, &ff_emu_edge_vvar_mmx,
                      hfixtbl_mmx, &ff_emu_edge_hvar_mmx);
 }
 
-static av_noinline void emulated_edge_mc_sse(uint8_t *buf, ptrdiff_t buf_stride,
-                                             const uint8_t *src, ptrdiff_t src_stride,
+static av_noinline void emulated_edge_mc_sse(uint8_t *buf, const uint8_t *src,
+                                             ptrdiff_t buf_stride,
+                                             ptrdiff_t src_stride,
                                              int block_w, int block_h,
                                              int src_x, int src_y, int w, int h)
 {
-    emulated_edge_mc(buf, buf_stride, src, src_stride, block_w, block_h,
+    emulated_edge_mc(buf, src, buf_stride, src_stride, block_w, block_h,
                      src_x, src_y, w, h, vfixtbl_sse, &ff_emu_edge_vvar_sse,
                      hfixtbl_mmx, &ff_emu_edge_hvar_mmx);
 }
 #endif
 
-static av_noinline void emulated_edge_mc_sse2(uint8_t *buf, ptrdiff_t buf_stride,
-                                              const uint8_t *src, ptrdiff_t src_stride,
+static av_noinline void emulated_edge_mc_sse2(uint8_t *buf, const uint8_t *src,
+                                              ptrdiff_t buf_stride,
+                                              ptrdiff_t src_stride,
                                               int block_w, int block_h,
-                                              int src_x, int src_y, int w, int h)
+                                              int src_x, int src_y, int w,
+                                              int h)
 {
-    emulated_edge_mc(buf, buf_stride, src, src_stride, block_w, block_h, src_x,
-                     src_y, w, h, vfixtbl_sse, &ff_emu_edge_vvar_sse,
+    emulated_edge_mc(buf, src, buf_stride, src_stride, block_w, block_h,
+                     src_x, src_y, w, h, vfixtbl_sse, &ff_emu_edge_vvar_sse,
                      hfixtbl_sse2, &ff_emu_edge_hvar_sse2);
 }
 #endif /* HAVE_YASM */

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/x86/vp6dsp_init.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/x86/vp6dsp_init.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/x86/vp8dsp.asm -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/x86/vp8dsp.asm Changed

@@ -143,27 +143,13 @@
 filter_h6_shuf2: db 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6,  7, 7,  8,  8,  9
 filter_h6_shuf3: db 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8,  9, 9, 10, 10, 11
 
-pw_27:    times 8 dw 27
-pw_63:    times 8 dw 63
 pw_256:   times 8 dw 256
 pw_20091: times 4 dw 20091
 pw_17734: times 4 dw 17734
 
-pb_4:     times 16 db 4
-pb_F8:    times 16 db 0xF8
-pb_FE:    times 16 db 0xFE
-pb_27_63: times 8 db 27, 63
-pb_18_63: times 8 db 18, 63
-pb_9_63:  times 8 db  9, 63
-
-cextern pb_1
 cextern pw_3
-cextern pb_3
 cextern pw_4
-cextern pw_9
-cextern pw_18
 cextern pw_64
-cextern pb_80
 
 SECTION .text
 
@@ -1237,1544 +1223,3 @@
 %endif
 INIT_MMX sse
 VP8_DC_WHT
-
-;-----------------------------------------------------------------------------
-; void vp8_h/v_loop_filter_simple_<opt>(uint8_t *dst, int stride, int flim);
-;-----------------------------------------------------------------------------
-
-; macro called with 7 mm register indexes as argument, and 4 regular registers
-;
-; first 4 mm registers will carry the transposed pixel data
-; the other three are scratchspace (one would be sufficient, but this allows
-; for more spreading/pipelining and thus faster execution on OOE CPUs)
-;
-; first two regular registers are buf+4*stride and buf+5*stride
-; third is -stride, fourth is +stride
-%macro READ_8x4_INTERLEAVED 11
-    ; interleave 8 (A-H) rows of 4 pixels each
-    movd          m%1, [%8+%10*4]   ; A0-3
-    movd          m%5, [%9+%10*4]   ; B0-3
-    movd          m%2, [%8+%10*2]   ; C0-3
-    movd          m%6, [%8+%10]     ; D0-3
-    movd          m%3, [%8]         ; E0-3
-    movd          m%7, [%9]         ; F0-3
-    movd          m%4, [%9+%11]     ; G0-3
-    punpcklbw     m%1, m%5          ; A/B interleaved
-    movd          m%5, [%9+%11*2]   ; H0-3
-    punpcklbw     m%2, m%6          ; C/D interleaved
-    punpcklbw     m%3, m%7          ; E/F interleaved
-    punpcklbw     m%4, m%5          ; G/H interleaved
-%endmacro
-
-; macro called with 7 mm register indexes as argument, and 5 regular registers
-; first 11 mean the same as READ_8x4_TRANSPOSED above
-; fifth regular register is scratchspace to reach the bottom 8 rows, it
-; will be set to second regular register + 8*stride at the end
-%macro READ_16x4_INTERLEAVED 12
-    ; transpose 16 (A-P) rows of 4 pixels each
-    lea           %12, [r0+8*r2]
-
-    ; read (and interleave) those addressable by %8 (=r0), A/C/D/E/I/K/L/M
-    movd          m%1, [%8+%10*4]   ; A0-3
-    movd          m%3, [%12+%10*4]  ; I0-3
-    movd          m%2, [%8+%10*2]   ; C0-3
-    movd          m%4, [%12+%10*2]  ; K0-3
-    movd          m%6, [%8+%10]     ; D0-3
-    movd          m%5, [%12+%10]    ; L0-3
-    movd          m%7, [%12]        ; M0-3
-    add           %12, %11
-    punpcklbw     m%1, m%3          ; A/I
-    movd          m%3, [%8]         ; E0-3
-    punpcklbw     m%2, m%4          ; C/K
-    punpcklbw     m%6, m%5          ; D/L
-    punpcklbw     m%3, m%7          ; E/M
-    punpcklbw     m%2, m%6          ; C/D/K/L interleaved
-
-    ; read (and interleave) those addressable by %9 (=r4), B/F/G/H/J/N/O/P
-    movd         m%5, [%9+%10*4]   ; B0-3
-    movd         m%4, [%12+%10*4]  ; J0-3
-    movd         m%7, [%9]         ; F0-3
-    movd         m%6, [%12]        ; N0-3
-    punpcklbw    m%5, m%4          ; B/J
-    punpcklbw    m%7, m%6          ; F/N
-    punpcklbw    m%1, m%5          ; A/B/I/J interleaved
-    punpcklbw    m%3, m%7          ; E/F/M/N interleaved
-    movd         m%4, [%9+%11]     ; G0-3
-    movd         m%6, [%12+%11]    ; O0-3
-    movd         m%5, [%9+%11*2]   ; H0-3
-    movd         m%7, [%12+%11*2]  ; P0-3
-    punpcklbw    m%4, m%6          ; G/O
-    punpcklbw    m%5, m%7          ; H/P
-    punpcklbw    m%4, m%5          ; G/H/O/P interleaved
-%endmacro
-
-; write 4 mm registers of 2 dwords each
-; first four arguments are mm register indexes containing source data
-; last four are registers containing buf+4*stride, buf+5*stride,
-; -stride and +stride
-%macro WRITE_4x2D 8
-    ; write out (2 dwords per register)
-    movd    [%5+%7*4], m%1
-    movd    [%5+%7*2], m%2
-    movd         [%5], m%3
-    movd      [%6+%8], m%4
-    punpckhdq     m%1, m%1
-    punpckhdq     m%2, m%2
-    punpckhdq     m%3, m%3
-    punpckhdq     m%4, m%4
-    movd    [%6+%7*4], m%1
-    movd      [%5+%7], m%2
-    movd         [%6], m%3
-    movd    [%6+%8*2], m%4
-%endmacro
-
-; write 4 xmm registers of 4 dwords each
-; arguments same as WRITE_2x4D, but with an extra register, so that the 5 regular
-; registers contain buf+4*stride, buf+5*stride, buf+12*stride, -stride and +stride
-; we add 1*stride to the third regular registry in the process
-; the 10th argument is 16 if it's a Y filter (i.e. all regular registers cover the
-; same memory region), or 8 if they cover two separate buffers (third one points to
-; a different memory region than the first two), allowing for more optimal code for
-; the 16-width case
-%macro WRITE_4x4D 10
-    ; write out (4 dwords per register), start with dwords zero
-    movd    [%5+%8*4], m%1
-    movd         [%5], m%2
-    movd    [%7+%8*4], m%3
-    movd         [%7], m%4
-
-    ; store dwords 1
-    psrldq        m%1, 4
-    psrldq        m%2, 4
-    psrldq        m%3, 4
-    psrldq        m%4, 4
-    movd    [%6+%8*4], m%1
-    movd         [%6], m%2
-%if %10 == 16
-    movd    [%6+%9*4], m%3
-%endif
-    movd      [%7+%9], m%4
-
-    ; write dwords 2
-    psrldq        m%1, 4
-    psrldq        m%2, 4
-%if %10 == 8
-    movd    [%5+%8*2], m%1
-    movd          %5d, m%3
-%endif
-    psrldq        m%3, 4
-    psrldq        m%4, 4
-%if %10 == 16
-    movd    [%5+%8*2], m%1
-%endif
-    movd      [%6+%9], m%2
-    movd    [%7+%8*2], m%3
-    movd    [%7+%9*2], m%4
-    add            %7, %9
-
-    ; store dwords 3
-    psrldq        m%1, 4
-    psrldq        m%2, 4
-    psrldq        m%3, 4
-    psrldq        m%4, 4
-%if %10 == 8
-    mov     [%7+%8*4], %5d
-    movd    [%6+%8*2], m%1
-%else
-    movd      [%5+%8], m%1
-%endif
-    movd    [%6+%9*2], m%2
-    movd    [%7+%8*2], m%3
-    movd    [%7+%9*2], m%4
-%endmacro
-
-; write 4 or 8 words in the mmx/xmm registers as 8 lines
-; 1 and 2 are the registers to write, this can be the same (for SSE2)
-; for pre-SSE4:
-; 3 is a general-purpose register that we will clobber
-; for SSE4:
-; 3 is a pointer to the destination's 5th line
-; 4 is a pointer to the destination's 4th line
-; 5/6 is -stride and +stride
-%macro WRITE_2x4W 6
-    movd            %3d, %1
-    punpckhdq        %1, %1
-    mov       [%4+%5*4], %3w
-    shr              %3, 16
-    add              %4, %6
-    mov       [%4+%5*4], %3w
-
-    movd            %3d, %1
-    add              %4, %5
-    mov       [%4+%5*2], %3w
-    shr              %3, 16
-    mov       [%4+%5  ], %3w
-
-    movd            %3d, %2
-    punpckhdq        %2, %2
-    mov       [%4     ], %3w
-    shr              %3, 16
-    mov       [%4+%6  ], %3w
-
-    movd            %3d, %2
-    add              %4, %6
-    mov       [%4+%6  ], %3w
-    shr              %3, 16
-    mov       [%4+%6*2], %3w
-    add              %4, %5
-%endmacro
-
-%macro WRITE_8W 5
-%if cpuflag(sse4)
-    pextrw    [%3+%4*4], %1, 0
-    pextrw    [%2+%4*4], %1, 1
-    pextrw    [%3+%4*2], %1, 2
-    pextrw    [%3+%4  ], %1, 3
-    pextrw    [%3     ], %1, 4
-    pextrw    [%2     ], %1, 5
-    pextrw    [%2+%5  ], %1, 6
-    pextrw    [%2+%5*2], %1, 7
-%else
-    movd            %2d, %1
-    psrldq           %1, 4
-    mov       [%3+%4*4], %2w
-    shr              %2, 16
-    add              %3, %5
-    mov       [%3+%4*4], %2w
-
-    movd            %2d, %1
-    psrldq           %1, 4
-    add              %3, %4
-    mov       [%3+%4*2], %2w
-    shr              %2, 16
-    mov       [%3+%4  ], %2w
-
-    movd            %2d, %1
-    psrldq           %1, 4
-    mov       [%3     ], %2w
-    shr              %2, 16
-    mov       [%3+%5  ], %2w
-
-    movd            %2d, %1
-    add              %3, %5
-    mov       [%3+%5  ], %2w
-    shr              %2, 16
-    mov       [%3+%5*2], %2w
-%endif
-%endmacro
-
-%macro SIMPLE_LOOPFILTER 2
-cglobal vp8_%1_loop_filter_simple, 3, %2, 8, dst, stride, flim, cntr
-%if mmsize == 8 ; mmx/mmxext
-    mov         cntrq, 2
-%endif
-%if cpuflag(ssse3)
-    pxor           m0, m0
-%endif
-    SPLATB_REG     m7, flim, m0     ; splat "flim" into register
-
-    ; set up indexes to address 4 rows
-%if mmsize == 8
-    DEFINE_ARGS dst1, mstride, stride, cntr, dst2
-%else
-    DEFINE_ARGS dst1, mstride, stride, dst3, dst2
-%endif
-    mov       strideq, mstrideq
-    neg      mstrideq
-%ifidn %1, h
-    lea         dst1q, [dst1q+4*strideq-2]
-%endif
-
-%if mmsize == 8 ; mmx / mmxext
-.next8px:
-%endif
-%ifidn %1, v
-    ; read 4 half/full rows of pixels
-    mova           m0, [dst1q+mstrideq*2]    ; p1
-    mova           m1, [dst1q+mstrideq]      ; p0
-    mova           m2, [dst1q]               ; q0
-    mova           m3, [dst1q+ strideq]      ; q1
-%else ; h
-    lea         dst2q, [dst1q+ strideq]
-
-%if mmsize == 8 ; mmx/mmxext
-    READ_8x4_INTERLEAVED  0, 1, 2, 3, 4, 5, 6, dst1q, dst2q, mstrideq, strideq
-%else ; sse2
-    READ_16x4_INTERLEAVED 0, 1, 2, 3, 4, 5, 6, dst1q, dst2q, mstrideq, strideq, dst3q
-%endif
-    TRANSPOSE4x4W         0, 1, 2, 3, 4
-%endif
-
-    ; simple_limit
-    mova           m5, m2           ; m5=backup of q0
-    mova           m6, m1           ; m6=backup of p0
-    psubusb        m1, m2           ; p0-q0
-    psubusb        m2, m6           ; q0-p0
-    por            m1, m2           ; FFABS(p0-q0)
-    paddusb        m1, m1           ; m1=FFABS(p0-q0)*2
-
-    mova           m4, m3
-    mova           m2, m0
-    psubusb        m3, m0           ; q1-p1
-    psubusb        m0, m4           ; p1-q1
-    por            m3, m0           ; FFABS(p1-q1)
-    mova           m0, [pb_80]
-    pxor           m2, m0
-    pxor           m4, m0
-    psubsb         m2, m4           ; m2=p1-q1 (signed) backup for below
-    pand           m3, [pb_FE]
-    psrlq          m3, 1            ; m3=FFABS(p1-q1)/2, this can be used signed
-    paddusb        m3, m1
-    psubusb        m3, m7
-    pxor           m1, m1
-    pcmpeqb        m3, m1           ; abs(p0-q0)*2+abs(p1-q1)/2<=flim mask(0xff/0x0)
-
-    ; filter_common (use m2/p1-q1, m4=q0, m6=p0, m5/q0-p0 and m3/mask)
-    mova           m4, m5
-    pxor           m5, m0
-    pxor           m0, m6
-    psubsb         m5, m0           ; q0-p0 (signed)
-    paddsb         m2, m5
-    paddsb         m2, m5
-    paddsb         m2, m5           ; a=(p1-q1) + 3*(q0-p0)
-    pand           m2, m3           ; apply filter mask (m3)
-
-    mova           m3, [pb_F8]
-    mova           m1, m2
-    paddsb         m2, [pb_4]       ; f1<<3=a+4
-    paddsb         m1, [pb_3]       ; f2<<3=a+3
-    pand           m2, m3
-    pand           m1, m3           ; cache f2<<3
-
-    pxor           m0, m0
-    pxor           m3, m3
-    pcmpgtb        m0, m2           ; which values are <0?
-    psubb          m3, m2           ; -f1<<3
-    psrlq          m2, 3            ; +f1
-    psrlq          m3, 3            ; -f1
-    pand           m3, m0
-    pandn          m0, m2
-    psubusb        m4, m0
-    paddusb        m4, m3           ; q0-f1
-
-    pxor           m0, m0
-    pxor           m3, m3
-    pcmpgtb        m0, m1           ; which values are <0?
-    psubb          m3, m1           ; -f2<<3
-    psrlq          m1, 3            ; +f2
-    psrlq          m3, 3            ; -f2
-    pand           m3, m0
-    pandn          m0, m1
-    paddusb        m6, m0
-    psubusb        m6, m3           ; p0+f2
-
-    ; store
-%ifidn %1, v
-    mova      [dst1q], m4
-    mova [dst1q+mstrideq], m6
-%else ; h
-    inc        dst1q
-    SBUTTERFLY    bw, 6, 4, 0
-
-%if mmsize == 16 ; sse2
-%if cpuflag(sse4)
-    inc         dst2q
-%endif
-    WRITE_8W       m6, dst2q, dst1q, mstrideq, strideq
-    lea         dst2q, [dst3q+mstrideq+1]
-%if cpuflag(sse4)
-    inc         dst3q
-%endif
-    WRITE_8W       m4, dst3q, dst2q, mstrideq, strideq
-%else ; mmx/mmxext
-    WRITE_2x4W     m6, m4, dst2q, dst1q, mstrideq, strideq
-%endif
-%endif
-
-%if mmsize == 8 ; mmx/mmxext
-    ; next 8 pixels
-%ifidn %1, v
-    add         dst1q, 8            ; advance 8 cols = pixels
-%else ; h
-    lea         dst1q, [dst1q+strideq*8-1]  ; advance 8 rows = lines
-%endif
-    dec         cntrq
-    jg .next8px
-    REP_RET
-%else ; sse2
-    RET
-%endif
-%endmacro
-
-%if ARCH_X86_32
-INIT_MMX mmx
-SIMPLE_LOOPFILTER v, 4
-SIMPLE_LOOPFILTER h, 5
-INIT_MMX mmxext
-SIMPLE_LOOPFILTER v, 4
-SIMPLE_LOOPFILTER h, 5
-%endif
-
-INIT_XMM sse2
-SIMPLE_LOOPFILTER v, 3
-SIMPLE_LOOPFILTER h, 5
-INIT_XMM ssse3
-SIMPLE_LOOPFILTER v, 3
-SIMPLE_LOOPFILTER h, 5
-INIT_XMM sse4
-SIMPLE_LOOPFILTER h, 5
-
-;-----------------------------------------------------------------------------
-; void vp8_h/v_loop_filter<size>_inner_<opt>(uint8_t *dst, [uint8_t *v,] int stride,
-;                                            int flimE, int flimI, int hev_thr);
-;-----------------------------------------------------------------------------
-
-%macro INNER_LOOPFILTER 2
-%define stack_size 0
-%ifndef m8   ; stack layout: [0]=E, [1]=I, [2]=hev_thr
-%ifidn %1, v ;               [3]=hev() result
-%define stack_size mmsize * -4
-%else ; h    ; extra storage space for transposes
-%define stack_size mmsize * -5
-%endif
-%endif
-
-%if %2 == 8 ; chroma
-cglobal vp8_%1_loop_filter8uv_inner, 6, 6, 13, stack_size, dst, dst8, stride, flimE, flimI, hevthr
-%else ; luma
-cglobal vp8_%1_loop_filter16y_inner, 5, 5, 13, stack_size, dst, stride, flimE, flimI, hevthr
-%endif
-
-%if cpuflag(ssse3)
-    pxor             m7, m7
-%endif
-
-%ifndef m8
-    ; splat function arguments
-    SPLATB_REG       m0, flimEq, m7   ; E
-    SPLATB_REG       m1, flimIq, m7   ; I
-    SPLATB_REG       m2, hevthrq, m7  ; hev_thresh
-
-%define m_flimE    [rsp]
-%define m_flimI    [rsp+mmsize]
-%define m_hevthr   [rsp+mmsize*2]
-%define m_maskres  [rsp+mmsize*3]
-%define m_p0backup [rsp+mmsize*3]
-%define m_q0backup [rsp+mmsize*4]
-
-    mova        m_flimE, m0
-    mova        m_flimI, m1
-    mova       m_hevthr, m2
-%else
-%define m_flimE    m9
-%define m_flimI    m10
-%define m_hevthr   m11
-%define m_maskres  m12
-%define m_p0backup m12
-%define m_q0backup m8
-
-    ; splat function arguments
-    SPLATB_REG  m_flimE, flimEq, m7   ; E
-    SPLATB_REG  m_flimI, flimIq, m7   ; I
-    SPLATB_REG m_hevthr, hevthrq, m7  ; hev_thresh
-%endif
-
-%if %2 == 8 ; chroma
-    DEFINE_ARGS dst1, dst8, mstride, stride, dst2
-%elif mmsize == 8
-    DEFINE_ARGS dst1, mstride, stride, dst2, cntr
-    mov           cntrq, 2
-%else
-    DEFINE_ARGS dst1, mstride, stride, dst2, dst8
-%endif
-    mov         strideq, mstrideq
-    neg        mstrideq
-%ifidn %1, h
-    lea           dst1q, [dst1q+strideq*4-4]
-%if %2 == 8 ; chroma
-    lea           dst8q, [dst8q+strideq*4-4]
-%endif
-%endif
-
-%if mmsize == 8
-.next8px:
-%endif
-    ; read
-    lea           dst2q, [dst1q+strideq]
-%ifidn %1, v
-%if %2 == 8 && mmsize == 16
-%define movrow movh
-%else
-%define movrow mova
-%endif
-    movrow           m0, [dst1q+mstrideq*4] ; p3
-    movrow           m1, [dst2q+mstrideq*4] ; p2
-    movrow           m2, [dst1q+mstrideq*2] ; p1
-    movrow           m5, [dst2q]            ; q1
-    movrow           m6, [dst2q+ strideq*1] ; q2
-    movrow           m7, [dst2q+ strideq*2] ; q3
-%if mmsize == 16 && %2 == 8
-    movhps           m0, [dst8q+mstrideq*4]
-    movhps           m2, [dst8q+mstrideq*2]
-    add           dst8q, strideq
-    movhps           m1, [dst8q+mstrideq*4]
-    movhps           m5, [dst8q]
-    movhps           m6, [dst8q+ strideq  ]
-    movhps           m7, [dst8q+ strideq*2]
-    add           dst8q, mstrideq
-%endif
-%elif mmsize == 8 ; mmx/mmxext (h)
-    ; read 8 rows of 8px each
-    movu             m0, [dst1q+mstrideq*4]
-    movu             m1, [dst2q+mstrideq*4]
-    movu             m2, [dst1q+mstrideq*2]
-    movu             m3, [dst1q+mstrideq  ]
-    movu             m4, [dst1q]
-    movu             m5, [dst2q]
-    movu             m6, [dst2q+ strideq  ]
-
-    ; 8x8 transpose
-    TRANSPOSE4x4B     0, 1, 2, 3, 7
-    mova     m_q0backup, m1
-    movu             m7, [dst2q+ strideq*2]
-    TRANSPOSE4x4B     4, 5, 6, 7, 1
-    SBUTTERFLY       dq, 0, 4, 1     ; p3/p2
-    SBUTTERFLY       dq, 2, 6, 1     ; q0/q1
-    SBUTTERFLY       dq, 3, 7, 1     ; q2/q3
-    mova             m1, m_q0backup
-    mova     m_q0backup, m2          ; store q0
-    SBUTTERFLY       dq, 1, 5, 2     ; p1/p0
-    mova     m_p0backup, m5          ; store p0
-    SWAP              1, 4
-    SWAP              2, 4
-    SWAP              6, 3
-    SWAP              5, 3
-%else ; sse2 (h)
-%if %2 == 16
-    lea           dst8q, [dst1q+ strideq*8]
-%endif
-
-    ; read 16 rows of 8px each, interleave
-    movh             m0, [dst1q+mstrideq*4]
-    movh             m1, [dst8q+mstrideq*4]
-    movh             m2, [dst1q+mstrideq*2]
-    movh             m5, [dst8q+mstrideq*2]
-    movh             m3, [dst1q+mstrideq  ]
-    movh             m6, [dst8q+mstrideq  ]
-    movh             m4, [dst1q]
-    movh             m7, [dst8q]
-    punpcklbw        m0, m1          ; A/I
-    punpcklbw        m2, m5          ; C/K
-    punpcklbw        m3, m6          ; D/L
-    punpcklbw        m4, m7          ; E/M
-
-    add           dst8q, strideq
-    movh             m1, [dst2q+mstrideq*4]
-    movh             m6, [dst8q+mstrideq*4]
-    movh             m5, [dst2q]
-    movh             m7, [dst8q]
-    punpcklbw        m1, m6          ; B/J
-    punpcklbw        m5, m7          ; F/N
-    movh             m6, [dst2q+ strideq  ]
-    movh             m7, [dst8q+ strideq  ]
-    punpcklbw        m6, m7          ; G/O
-
-    ; 8x16 transpose
-    TRANSPOSE4x4B     0, 1, 2, 3, 7
-%ifdef m8
-    SWAP              1, 8
-%else
-    mova     m_q0backup, m1
-%endif
-    movh             m7, [dst2q+ strideq*2]
-    movh             m1, [dst8q+ strideq*2]
-    punpcklbw        m7, m1          ; H/P
-    TRANSPOSE4x4B     4, 5, 6, 7, 1
-    SBUTTERFLY       dq, 0, 4, 1     ; p3/p2
-    SBUTTERFLY       dq, 2, 6, 1     ; q0/q1
-    SBUTTERFLY       dq, 3, 7, 1     ; q2/q3
-%ifdef m8
-    SWAP              1, 8
-    SWAP              2, 8
-%else
-    mova             m1, m_q0backup
-    mova     m_q0backup, m2          ; store q0
-%endif
-    SBUTTERFLY       dq, 1, 5, 2     ; p1/p0
-%ifdef m12
-    SWAP              5, 12
-%else
-    mova     m_p0backup, m5          ; store p0
-%endif
-    SWAP              1, 4
-    SWAP              2, 4
-    SWAP              6, 3
-    SWAP              5, 3
-%endif
-
-    ; normal_limit for p3-p2, p2-p1, q3-q2 and q2-q1
-    mova             m4, m1
-    SWAP              4, 1
-    psubusb          m4, m0          ; p2-p3
-    psubusb          m0, m1          ; p3-p2
-    por              m0, m4          ; abs(p3-p2)
-
-    mova             m4, m2
-    SWAP              4, 2
-    psubusb          m4, m1          ; p1-p2
-    psubusb          m1, m2          ; p2-p1
-    por              m1, m4          ; abs(p2-p1)
-
-    mova             m4, m6
-    SWAP              4, 6
-    psubusb          m4, m7          ; q2-q3
-    psubusb          m7, m6          ; q3-q2
-    por              m7, m4          ; abs(q3-q2)
-
-    mova             m4, m5
-    SWAP              4, 5
-    psubusb          m4, m6          ; q1-q2
-    psubusb          m6, m5          ; q2-q1
-    por              m6, m4          ; abs(q2-q1)
-
-%if notcpuflag(mmxext)
-    mova             m4, m_flimI
-    pxor             m3, m3
-    psubusb          m0, m4
-    psubusb          m1, m4
-    psubusb          m7, m4
-    psubusb          m6, m4
-    pcmpeqb          m0, m3          ; abs(p3-p2) <= I
-    pcmpeqb          m1, m3          ; abs(p2-p1) <= I
-    pcmpeqb          m7, m3          ; abs(q3-q2) <= I
-    pcmpeqb          m6, m3          ; abs(q2-q1) <= I
-    pand             m0, m1
-    pand             m7, m6
-    pand             m0, m7
-%else ; mmxext/sse2
-    pmaxub           m0, m1
-    pmaxub           m6, m7
-    pmaxub           m0, m6
-%endif
-
-    ; normal_limit and high_edge_variance for p1-p0, q1-q0
-    SWAP              7, 3           ; now m7 is zero
-%ifidn %1, v
-    movrow           m3, [dst1q+mstrideq  ] ; p0
-%if mmsize == 16 && %2 == 8
-    movhps           m3, [dst8q+mstrideq  ]
-%endif
-%elifdef m12
-    SWAP              3, 12
-%else
-    mova             m3, m_p0backup
-%endif
-
-    mova             m1, m2
-    SWAP              1, 2
-    mova             m6, m3
-    SWAP              3, 6
-    psubusb          m1, m3          ; p1-p0
-    psubusb          m6, m2          ; p0-p1
-    por              m1, m6          ; abs(p1-p0)
-%if notcpuflag(mmxext)
-    mova             m6, m1
-    psubusb          m1, m4
-    psubusb          m6, m_hevthr
-    pcmpeqb          m1, m7          ; abs(p1-p0) <= I
-    pcmpeqb          m6, m7          ; abs(p1-p0) <= hev_thresh
-    pand             m0, m1
-    mova      m_maskres, m6
-%else ; mmxext/sse2
-    pmaxub           m0, m1          ; max_I
-    SWAP              1, 4           ; max_hev_thresh
-%endif
-
-    SWAP              6, 4           ; now m6 is I
-%ifidn %1, v
-    movrow           m4, [dst1q]     ; q0
-%if mmsize == 16 && %2 == 8
-    movhps           m4, [dst8q]
-%endif
-%elifdef m8
-    SWAP              4, 8
-%else
-    mova             m4, m_q0backup
-%endif
-    mova             m1, m4
-    SWAP              1, 4
-    mova             m7, m5
-    SWAP              7, 5
-    psubusb          m1, m5          ; q0-q1
-    psubusb          m7, m4          ; q1-q0
-    por              m1, m7          ; abs(q1-q0)
-%if notcpuflag(mmxext)
-    mova             m7, m1
-    psubusb          m1, m6
-    psubusb          m7, m_hevthr
-    pxor             m6, m6
-    pcmpeqb          m1, m6          ; abs(q1-q0) <= I
-    pcmpeqb          m7, m6          ; abs(q1-q0) <= hev_thresh
-    mova             m6, m_maskres
-    pand             m0, m1          ; abs([pq][321]-[pq][210]) <= I
-    pand             m6, m7
-%else ; mmxext/sse2
-    pxor             m7, m7
-    pmaxub           m0, m1
-    pmaxub           m6, m1
-    psubusb          m0, m_flimI
-    psubusb          m6, m_hevthr
-    pcmpeqb          m0, m7          ; max(abs(..)) <= I
-    pcmpeqb          m6, m7          ; !(max(abs..) > thresh)
-%endif
-%ifdef m12
-    SWAP              6, 12
-%else
-    mova      m_maskres, m6          ; !(abs(p1-p0) > hev_t || abs(q1-q0) > hev_t)
-%endif
-
-    ; simple_limit
-    mova             m1, m3
-    SWAP              1, 3
-    mova             m6, m4          ; keep copies of p0/q0 around for later use
-    SWAP              6, 4
-    psubusb          m1, m4          ; p0-q0
-    psubusb          m6, m3          ; q0-p0
-    por              m1, m6          ; abs(q0-p0)
-    paddusb          m1, m1          ; m1=2*abs(q0-p0)
-
-    mova             m7, m2
-    SWAP              7, 2
-    mova             m6, m5
-    SWAP              6, 5
-    psubusb          m7, m5          ; p1-q1
-    psubusb          m6, m2          ; q1-p1
-    por              m7, m6          ; abs(q1-p1)
-    pxor             m6, m6
-    pand             m7, [pb_FE]
-    psrlq            m7, 1           ; abs(q1-p1)/2
-    paddusb          m7, m1          ; abs(q0-p0)*2+abs(q1-p1)/2
-    psubusb          m7, m_flimE
-    pcmpeqb          m7, m6          ; abs(q0-p0)*2+abs(q1-p1)/2 <= E
-    pand             m0, m7          ; normal_limit result
-
-    ; filter_common; at this point, m2-m5=p1-q1 and m0 is filter_mask
-%ifdef m8 ; x86-64 && sse2
-    mova             m8, [pb_80]
-%define m_pb_80 m8
-%else ; x86-32 or mmx/mmxext
-%define m_pb_80 [pb_80]
-%endif
-    mova             m1, m4
-    mova             m7, m3
-    pxor             m1, m_pb_80
-    pxor             m7, m_pb_80
-    psubsb           m1, m7          ; (signed) q0-p0
-    mova             m6, m2
-    mova             m7, m5
-    pxor             m6, m_pb_80
-    pxor             m7, m_pb_80
-    psubsb           m6, m7          ; (signed) p1-q1
-    mova             m7, m_maskres
-    pandn            m7, m6
-    paddsb           m7, m1
-    paddsb           m7, m1
-    paddsb           m7, m1          ; 3*(q0-p0)+is4tap?(p1-q1)
-
-    pand             m7, m0
-    mova             m1, [pb_F8]
-    mova             m6, m7
-    paddsb           m7, [pb_3]
-    paddsb           m6, [pb_4]
-    pand             m7, m1
-    pand             m6, m1
-
-    pxor             m1, m1
-    pxor             m0, m0
-    pcmpgtb          m1, m7
-    psubb            m0, m7
-    psrlq            m7, 3           ; +f2
-    psrlq            m0, 3           ; -f2
-    pand             m0, m1
-    pandn            m1, m7
-    psubusb          m3, m0
-    paddusb          m3, m1          ; p0+f2
-
-    pxor             m1, m1
-    pxor             m0, m0
-    pcmpgtb          m0, m6
-    psubb            m1, m6
-    psrlq            m6, 3           ; +f1
-    psrlq            m1, 3           ; -f1
-    pand             m1, m0
-    pandn            m0, m6
-    psubusb          m4, m0
-    paddusb          m4, m1          ; q0-f1
-
-%ifdef m12
-    SWAP              6, 12
-%else
-    mova             m6, m_maskres
-%endif
-%if notcpuflag(mmxext)
-    mova             m7, [pb_1]
-%else ; mmxext/sse2
-    pxor             m7, m7
-%endif
-    pand             m0, m6
-    pand             m1, m6
-%if notcpuflag(mmxext)
-    paddusb          m0, m7
-    pand             m1, [pb_FE]
-    pandn            m7, m0
-    psrlq            m1, 1
-    psrlq            m7, 1
-    SWAP              0, 7
-%else ; mmxext/sse2
-    psubusb          m1, [pb_1]
-    pavgb            m0, m7          ; a
-    pavgb            m1, m7          ; -a
-%endif
-    psubusb          m5, m0
-    psubusb          m2, m1
-    paddusb          m5, m1          ; q1-a
-    paddusb          m2, m0          ; p1+a
-
-    ; store
-%ifidn %1, v
-    movrow [dst1q+mstrideq*2], m2
-    movrow [dst1q+mstrideq  ], m3
-    movrow      [dst1q], m4
-    movrow [dst1q+ strideq  ], m5
-%if mmsize == 16 && %2 == 8
-    movhps [dst8q+mstrideq*2], m2
-    movhps [dst8q+mstrideq  ], m3
-    movhps      [dst8q], m4
-    movhps [dst8q+ strideq  ], m5
-%endif
-%else ; h
-    add           dst1q, 2
-    add           dst2q, 2
-
-    ; 4x8/16 transpose
-    TRANSPOSE4x4B     2, 3, 4, 5, 6
-
-%if mmsize == 8 ; mmx/mmxext (h)
-    WRITE_4x2D        2, 3, 4, 5, dst1q, dst2q, mstrideq, strideq
-%else ; sse2 (h)
-    lea           dst8q, [dst8q+mstrideq  +2]
-    WRITE_4x4D        2, 3, 4, 5, dst1q, dst2q, dst8q, mstrideq, strideq, %2
-%endif
-%endif
-
-%if mmsize == 8
-%if %2 == 8 ; chroma
-%ifidn %1, h
-    sub           dst1q, 2
-%endif
-    cmp           dst1q, dst8q
-    mov           dst1q, dst8q
-    jnz .next8px
-%else
-%ifidn %1, h
-    lea           dst1q, [dst1q+ strideq*8-2]
-%else ; v
-    add           dst1q, 8
-%endif
-    dec           cntrq
-    jg .next8px
-%endif
-    REP_RET
-%else ; mmsize == 16
-    RET
-%endif
-%endmacro
-
-%if ARCH_X86_32
-INIT_MMX mmx
-INNER_LOOPFILTER v, 16
-INNER_LOOPFILTER h, 16
-INNER_LOOPFILTER v,  8
-INNER_LOOPFILTER h,  8
-
-INIT_MMX mmxext
-INNER_LOOPFILTER v, 16
-INNER_LOOPFILTER h, 16
-INNER_LOOPFILTER v,  8
-INNER_LOOPFILTER h,  8
-%endif
-
-INIT_XMM sse2
-INNER_LOOPFILTER v, 16
-INNER_LOOPFILTER h, 16
-INNER_LOOPFILTER v,  8
-INNER_LOOPFILTER h,  8
-
-INIT_XMM ssse3
-INNER_LOOPFILTER v, 16
-INNER_LOOPFILTER h, 16
-INNER_LOOPFILTER v,  8
-INNER_LOOPFILTER h,  8
-
-;-----------------------------------------------------------------------------
-; void vp8_h/v_loop_filter<size>_mbedge_<opt>(uint8_t *dst, [uint8_t *v,] int stride,
-;                                            int flimE, int flimI, int hev_thr);
-;-----------------------------------------------------------------------------
-
-%macro MBEDGE_LOOPFILTER 2
-%define stack_size 0
-%ifndef m8       ; stack layout: [0]=E, [1]=I, [2]=hev_thr
-%if mmsize == 16 ;               [3]=hev() result
-                 ;               [4]=filter tmp result
-                 ;               [5]/[6] = p2/q2 backup
-                 ;               [7]=lim_res sign result
-%define stack_size mmsize * -7
-%else ; 8        ; extra storage space for transposes
-%define stack_size mmsize * -8
-%endif
-%endif
-
-%if %2 == 8 ; chroma
-cglobal vp8_%1_loop_filter8uv_mbedge, 6, 6, 15, stack_size, dst1, dst8, stride, flimE, flimI, hevthr
-%else ; luma
-cglobal vp8_%1_loop_filter16y_mbedge, 5, 5, 15, stack_size, dst1, stride, flimE, flimI, hevthr
-%endif
-
-%if cpuflag(ssse3)
-    pxor             m7, m7
-%endif
-
-%ifndef m8
-    ; splat function arguments
-    SPLATB_REG       m0, flimEq, m7   ; E
-    SPLATB_REG       m1, flimIq, m7   ; I
-    SPLATB_REG       m2, hevthrq, m7  ; hev_thresh
-
-%define m_flimE    [rsp]
-%define m_flimI    [rsp+mmsize]
-%define m_hevthr   [rsp+mmsize*2]
-%define m_maskres  [rsp+mmsize*3]
-%define m_limres   [rsp+mmsize*4]
-%define m_p0backup [rsp+mmsize*3]
-%define m_q0backup [rsp+mmsize*4]
-%define m_p2backup [rsp+mmsize*5]
-%define m_q2backup [rsp+mmsize*6]
-%if mmsize == 16
-%define m_limsign  [rsp]
-%else
-%define m_limsign  [rsp+mmsize*7]
-%endif
-
-    mova        m_flimE, m0
-    mova        m_flimI, m1
-    mova       m_hevthr, m2
-%else ; sse2 on x86-64
-%define m_flimE    m9
-%define m_flimI    m10
-%define m_hevthr   m11
-%define m_maskres  m12
-%define m_limres   m8
-%define m_p0backup m12
-%define m_q0backup m8
-%define m_p2backup m13
-%define m_q2backup m14
-%define m_limsign  m9
-
-    ; splat function arguments
-    SPLATB_REG  m_flimE, flimEq, m7   ; E
-    SPLATB_REG  m_flimI, flimIq, m7   ; I
-    SPLATB_REG m_hevthr, hevthrq, m7  ; hev_thresh
-%endif
-
-%if %2 == 8 ; chroma
-    DEFINE_ARGS dst1, dst8, mstride, stride, dst2
-%elif mmsize == 8
-    DEFINE_ARGS dst1, mstride, stride, dst2, cntr
-    mov           cntrq, 2
-%else
-    DEFINE_ARGS dst1, mstride, stride, dst2, dst8
-%endif
-    mov         strideq, mstrideq
-    neg        mstrideq
-%ifidn %1, h
-    lea           dst1q, [dst1q+strideq*4-4]
-%if %2 == 8 ; chroma
-    lea           dst8q, [dst8q+strideq*4-4]
-%endif
-%endif
-
-%if mmsize == 8
-.next8px:
-%endif
-    ; read
-    lea           dst2q, [dst1q+ strideq  ]
-%ifidn %1, v
-%if %2 == 8 && mmsize == 16
-%define movrow movh
-%else
-%define movrow mova
-%endif
-    movrow           m0, [dst1q+mstrideq*4] ; p3
-    movrow           m1, [dst2q+mstrideq*4] ; p2
-    movrow           m2, [dst1q+mstrideq*2] ; p1
-    movrow           m5, [dst2q]            ; q1
-    movrow           m6, [dst2q+ strideq  ] ; q2
-    movrow           m7, [dst2q+ strideq*2] ; q3
-%if mmsize == 16 && %2 == 8
-    movhps           m0, [dst8q+mstrideq*4]
-    movhps           m2, [dst8q+mstrideq*2]
-    add           dst8q, strideq
-    movhps           m1, [dst8q+mstrideq*4]
-    movhps           m5, [dst8q]
-    movhps           m6, [dst8q+ strideq  ]
-    movhps           m7, [dst8q+ strideq*2]
-    add           dst8q, mstrideq
-%endif
-%elif mmsize == 8 ; mmx/mmxext (h)
-    ; read 8 rows of 8px each
-    movu             m0, [dst1q+mstrideq*4]
-    movu             m1, [dst2q+mstrideq*4]
-    movu             m2, [dst1q+mstrideq*2]
-    movu             m3, [dst1q+mstrideq  ]
-    movu             m4, [dst1q]
-    movu             m5, [dst2q]
-    movu             m6, [dst2q+ strideq  ]
-
-    ; 8x8 transpose
-    TRANSPOSE4x4B     0, 1, 2, 3, 7
-    mova     m_q0backup, m1
-    movu             m7, [dst2q+ strideq*2]
-    TRANSPOSE4x4B     4, 5, 6, 7, 1
-    SBUTTERFLY       dq, 0, 4, 1     ; p3/p2
-    SBUTTERFLY       dq, 2, 6, 1     ; q0/q1
-    SBUTTERFLY       dq, 3, 7, 1     ; q2/q3
-    mova             m1, m_q0backup
-    mova     m_q0backup, m2          ; store q0
-    SBUTTERFLY       dq, 1, 5, 2     ; p1/p0
-    mova     m_p0backup, m5          ; store p0
-    SWAP              1, 4
-    SWAP              2, 4
-    SWAP              6, 3
-    SWAP              5, 3
-%else ; sse2 (h)
-%if %2 == 16
-    lea           dst8q, [dst1q+ strideq*8  ]
-%endif
-
-    ; read 16 rows of 8px each, interleave
-    movh             m0, [dst1q+mstrideq*4]
-    movh             m1, [dst8q+mstrideq*4]
-    movh             m2, [dst1q+mstrideq*2]
-    movh             m5, [dst8q+mstrideq*2]
-    movh             m3, [dst1q+mstrideq  ]
-    movh             m6, [dst8q+mstrideq  ]
-    movh             m4, [dst1q]
-    movh             m7, [dst8q]
-    punpcklbw        m0, m1          ; A/I
-    punpcklbw        m2, m5          ; C/K
-    punpcklbw        m3, m6          ; D/L
-    punpcklbw        m4, m7          ; E/M
-
-    add           dst8q, strideq
-    movh             m1, [dst2q+mstrideq*4]
-    movh             m6, [dst8q+mstrideq*4]
-    movh             m5, [dst2q]
-    movh             m7, [dst8q]
-    punpcklbw        m1, m6          ; B/J
-    punpcklbw        m5, m7          ; F/N
-    movh             m6, [dst2q+ strideq  ]
-    movh             m7, [dst8q+ strideq  ]
-    punpcklbw        m6, m7          ; G/O
-
-    ; 8x16 transpose
-    TRANSPOSE4x4B     0, 1, 2, 3, 7
-%ifdef m8
-    SWAP              1, 8
-%else
-    mova     m_q0backup, m1
-%endif
-    movh             m7, [dst2q+ strideq*2]
-    movh             m1, [dst8q+ strideq*2]
-    punpcklbw        m7, m1          ; H/P
-    TRANSPOSE4x4B     4, 5, 6, 7, 1
-    SBUTTERFLY       dq, 0, 4, 1     ; p3/p2
-    SBUTTERFLY       dq, 2, 6, 1     ; q0/q1
-    SBUTTERFLY       dq, 3, 7, 1     ; q2/q3
-%ifdef m8
-    SWAP              1, 8
-    SWAP              2, 8
-%else
-    mova             m1, m_q0backup
-    mova     m_q0backup, m2          ; store q0
-%endif
-    SBUTTERFLY       dq, 1, 5, 2     ; p1/p0
-%ifdef m12
-    SWAP              5, 12
-%else
-    mova     m_p0backup, m5          ; store p0
-%endif
-    SWAP              1, 4
-    SWAP              2, 4
-    SWAP              6, 3
-    SWAP              5, 3
-%endif
-
-    ; normal_limit for p3-p2, p2-p1, q3-q2 and q2-q1
-    mova             m4, m1
-    SWAP              4, 1
-    psubusb          m4, m0          ; p2-p3
-    psubusb          m0, m1          ; p3-p2
-    por              m0, m4          ; abs(p3-p2)
-
-    mova             m4, m2
-    SWAP              4, 2
-    psubusb          m4, m1          ; p1-p2
-    mova     m_p2backup, m1
-    psubusb          m1, m2          ; p2-p1
-    por              m1, m4          ; abs(p2-p1)
-
-    mova             m4, m6
-    SWAP              4, 6
-    psubusb          m4, m7          ; q2-q3
-    psubusb          m7, m6          ; q3-q2
-    por              m7, m4          ; abs(q3-q2)
-
-    mova             m4, m5
-    SWAP              4, 5
-    psubusb          m4, m6          ; q1-q2
-    mova     m_q2backup, m6
-    psubusb          m6, m5          ; q2-q1
-    por              m6, m4          ; abs(q2-q1)
-
-%if notcpuflag(mmxext)
-    mova             m4, m_flimI
-    pxor             m3, m3
-    psubusb          m0, m4
-    psubusb          m1, m4
-    psubusb          m7, m4
-    psubusb          m6, m4
-    pcmpeqb          m0, m3          ; abs(p3-p2) <= I
-    pcmpeqb          m1, m3          ; abs(p2-p1) <= I
-    pcmpeqb          m7, m3          ; abs(q3-q2) <= I
-    pcmpeqb          m6, m3          ; abs(q2-q1) <= I
-    pand             m0, m1
-    pand             m7, m6
-    pand             m0, m7
-%else ; mmxext/sse2
-    pmaxub           m0, m1
-    pmaxub           m6, m7
-    pmaxub           m0, m6
-%endif
-
-    ; normal_limit and high_edge_variance for p1-p0, q1-q0
-    SWAP              7, 3           ; now m7 is zero
-%ifidn %1, v
-    movrow           m3, [dst1q+mstrideq  ] ; p0
-%if mmsize == 16 && %2 == 8
-    movhps           m3, [dst8q+mstrideq  ]
-%endif
-%elifdef m12
-    SWAP              3, 12
-%else
-    mova             m3, m_p0backup
-%endif
-
-    mova             m1, m2
-    SWAP              1, 2
-    mova             m6, m3
-    SWAP              3, 6
-    psubusb          m1, m3          ; p1-p0
-    psubusb          m6, m2          ; p0-p1
-    por              m1, m6          ; abs(p1-p0)
-%if notcpuflag(mmxext)
-    mova             m6, m1
-    psubusb          m1, m4
-    psubusb          m6, m_hevthr
-    pcmpeqb          m1, m7          ; abs(p1-p0) <= I
-    pcmpeqb          m6, m7          ; abs(p1-p0) <= hev_thresh
-    pand             m0, m1
-    mova      m_maskres, m6
-%else ; mmxext/sse2
-    pmaxub           m0, m1          ; max_I
-    SWAP              1, 4           ; max_hev_thresh
-%endif
-
-    SWAP              6, 4           ; now m6 is I
-%ifidn %1, v
-    movrow           m4, [dst1q]     ; q0
-%if mmsize == 16 && %2 == 8
-    movhps           m4, [dst8q]
-%endif
-%elifdef m8
-    SWAP              4, 8
-%else
-    mova             m4, m_q0backup
-%endif
-    mova             m1, m4
-    SWAP              1, 4
-    mova             m7, m5
-    SWAP              7, 5
-    psubusb          m1, m5          ; q0-q1
-    psubusb          m7, m4          ; q1-q0
-    por              m1, m7          ; abs(q1-q0)
-%if notcpuflag(mmxext)
-    mova             m7, m1
-    psubusb          m1, m6
-    psubusb          m7, m_hevthr
-    pxor             m6, m6
-    pcmpeqb          m1, m6          ; abs(q1-q0) <= I
-    pcmpeqb          m7, m6          ; abs(q1-q0) <= hev_thresh
-    mova             m6, m_maskres
-    pand             m0, m1          ; abs([pq][321]-[pq][210]) <= I
-    pand             m6, m7
-%else ; mmxext/sse2
-    pxor             m7, m7
-    pmaxub           m0, m1
-    pmaxub           m6, m1
-    psubusb          m0, m_flimI
-    psubusb          m6, m_hevthr
-    pcmpeqb          m0, m7          ; max(abs(..)) <= I
-    pcmpeqb          m6, m7          ; !(max(abs..) > thresh)
-%endif
-%ifdef m12
-    SWAP              6, 12
-%else
-    mova      m_maskres, m6          ; !(abs(p1-p0) > hev_t || abs(q1-q0) > hev_t)
-%endif
-
-    ; simple_limit
-    mova             m1, m3
-    SWAP              1, 3
-    mova             m6, m4          ; keep copies of p0/q0 around for later use
-    SWAP              6, 4
-    psubusb          m1, m4          ; p0-q0
-    psubusb          m6, m3          ; q0-p0
-    por              m1, m6          ; abs(q0-p0)
-    paddusb          m1, m1          ; m1=2*abs(q0-p0)
-
-    mova             m7, m2
-    SWAP              7, 2
-    mova             m6, m5
-    SWAP              6, 5
-    psubusb          m7, m5          ; p1-q1
-    psubusb          m6, m2          ; q1-p1
-    por              m7, m6          ; abs(q1-p1)
-    pxor             m6, m6
-    pand             m7, [pb_FE]
-    psrlq            m7, 1           ; abs(q1-p1)/2
-    paddusb          m7, m1          ; abs(q0-p0)*2+abs(q1-p1)/2
-    psubusb          m7, m_flimE
-    pcmpeqb          m7, m6          ; abs(q0-p0)*2+abs(q1-p1)/2 <= E
-    pand             m0, m7          ; normal_limit result
-
-    ; filter_common; at this point, m2-m5=p1-q1 and m0 is filter_mask
-%ifdef m8 ; x86-64 && sse2
-    mova             m8, [pb_80]
-%define m_pb_80 m8
-%else ; x86-32 or mmx/mmxext
-%define m_pb_80 [pb_80]
-%endif
-    mova             m1, m4
-    mova             m7, m3
-    pxor             m1, m_pb_80
-    pxor             m7, m_pb_80
-    psubsb           m1, m7          ; (signed) q0-p0
-    mova             m6, m2
-    mova             m7, m5
-    pxor             m6, m_pb_80
-    pxor             m7, m_pb_80
-    psubsb           m6, m7          ; (signed) p1-q1
-    mova             m7, m_maskres
-    paddsb           m6, m1
-    paddsb           m6, m1
-    paddsb           m6, m1
-    pand             m6, m0
-%ifdef m8
-    mova       m_limres, m6          ; 3*(qp-p0)+(p1-q1) masked for filter_mbedge
-    pand       m_limres, m7
-%else
-    mova             m0, m6
-    pand             m0, m7
-    mova       m_limres, m0
-%endif
-    pandn            m7, m6          ; 3*(q0-p0)+(p1-q1) masked for filter_common
-
-    mova             m1, [pb_F8]
-    mova             m6, m7
-    paddsb           m7, [pb_3]
-    paddsb           m6, [pb_4]
-    pand             m7, m1
-    pand             m6, m1
-
-    pxor             m1, m1
-    pxor             m0, m0
-    pcmpgtb          m1, m7
-    psubb            m0, m7
-    psrlq            m7, 3           ; +f2
-    psrlq            m0, 3           ; -f2
-    pand             m0, m1
-    pandn            m1, m7
-    psubusb          m3, m0
-    paddusb          m3, m1          ; p0+f2
-
-    pxor             m1, m1
-    pxor             m0, m0
-    pcmpgtb          m0, m6
-    psubb            m1, m6
-    psrlq            m6, 3           ; +f1
-    psrlq            m1, 3           ; -f1
-    pand             m1, m0
-    pandn            m0, m6
-    psubusb          m4, m0
-    paddusb          m4, m1          ; q0-f1
-
-    ; filter_mbedge (m2-m5 = p1-q1; lim_res carries w)
-%if cpuflag(ssse3)
-    mova             m7, [pb_1]
-%else
-    mova             m7, [pw_63]
-%endif
-%ifdef m8
-    SWAP              1, 8
-%else
-    mova             m1, m_limres
-%endif
-    pxor             m0, m0
-    mova             m6, m1
-    pcmpgtb          m0, m1         ; which are negative
-%if cpuflag(ssse3)
-    punpcklbw        m6, m7         ; interleave with "1" for rounding
-    punpckhbw        m1, m7
-%else
-    punpcklbw        m6, m0         ; signed byte->word
-    punpckhbw        m1, m0
-%endif
-    mova      m_limsign, m0
-%if cpuflag(ssse3)
-    mova             m7, [pb_27_63]
-%ifndef m8
-    mova       m_limres, m1
-%endif
-%ifdef m10
-    SWAP              0, 10         ; don't lose lim_sign copy
-%endif
-    mova             m0, m7
-    pmaddubsw        m7, m6
-    SWAP              6, 7
-    pmaddubsw        m0, m1
-    SWAP              1, 0
-%ifdef m10
-    SWAP              0, 10
-%else
-    mova             m0, m_limsign
-%endif
-%else
-    mova      m_maskres, m6         ; backup for later in filter
-    mova       m_limres, m1
-    pmullw          m6, [pw_27]
-    pmullw          m1, [pw_27]
-    paddw           m6, m7
-    paddw           m1, m7
-%endif
-    psraw           m6, 7
-    psraw           m1, 7
-    packsswb        m6, m1          ; a0
-    pxor            m1, m1
-    psubb           m1, m6
-    pand            m1, m0          ; -a0
-    pandn           m0, m6          ; +a0
-%if cpuflag(ssse3)
-    mova            m6, [pb_18_63]  ; pipelining
-%endif
-    psubusb         m3, m1
-    paddusb         m4, m1
-    paddusb         m3, m0          ; p0+a0
-    psubusb         m4, m0          ; q0-a0
-
-%if cpuflag(ssse3)
-    SWAP             6, 7
-%ifdef m10
-    SWAP             1, 10
-%else
-    mova            m1, m_limres
-%endif
-    mova            m0, m7
-    pmaddubsw       m7, m6
-    SWAP             6, 7
-    pmaddubsw       m0, m1
-    SWAP             1, 0
-%ifdef m10
-    SWAP             0, 10
-%endif
-    mova            m0, m_limsign
-%else
-    mova            m6, m_maskres
-    mova            m1, m_limres
-    pmullw          m6, [pw_18]
-    pmullw          m1, [pw_18]
-    paddw           m6, m7
-    paddw           m1, m7
-%endif
-    mova            m0, m_limsign
-    psraw           m6, 7
-    psraw           m1, 7
-    packsswb        m6, m1          ; a1
-    pxor            m1, m1
-    psubb           m1, m6
-    pand            m1, m0          ; -a1
-    pandn           m0, m6          ; +a1
-%if cpuflag(ssse3)
-    mova            m6, [pb_9_63]
-%endif
-    psubusb         m2, m1
-    paddusb         m5, m1
-    paddusb         m2, m0          ; p1+a1
-    psubusb         m5, m0          ; q1-a1
-
-%if cpuflag(ssse3)
-    SWAP             6, 7
-%ifdef m10
-    SWAP             1, 10
-%else
-    mova            m1, m_limres
-%endif
-    mova            m0, m7
-    pmaddubsw       m7, m6
-    SWAP             6, 7
-    pmaddubsw       m0, m1
-    SWAP             1, 0
-%else
-%ifdef m8
-    SWAP             6, 12
-    SWAP             1, 8
-%else
-    mova            m6, m_maskres
-    mova            m1, m_limres
-%endif
-    pmullw          m6, [pw_9]
-    pmullw          m1, [pw_9]
-    paddw           m6, m7
-    paddw           m1, m7
-%endif
-%ifdef m9
-    SWAP             7, 9
-%else
-    mova            m7, m_limsign
-%endif
-    psraw           m6, 7
-    psraw           m1, 7
-    packsswb        m6, m1          ; a1
-    pxor            m0, m0
-    psubb           m0, m6
-    pand            m0, m7          ; -a1
-    pandn           m7, m6          ; +a1
-%ifdef m8
-    SWAP             1, 13
-    SWAP             6, 14
-%else
-    mova            m1, m_p2backup
-    mova            m6, m_q2backup
-%endif
-    psubusb         m1, m0
-    paddusb         m6, m0
-    paddusb         m1, m7          ; p1+a1
-    psubusb         m6, m7          ; q1-a1
-
-    ; store
-%ifidn %1, v
-    movrow [dst2q+mstrideq*4], m1
-    movrow [dst1q+mstrideq*2], m2
-    movrow [dst1q+mstrideq  ], m3
-    movrow     [dst1q], m4
-    movrow     [dst2q], m5
-    movrow [dst2q+ strideq  ], m6
-%if mmsize == 16 && %2 == 8
-    add           dst8q, mstrideq
-    movhps [dst8q+mstrideq*2], m1
-    movhps [dst8q+mstrideq  ], m2
-    movhps     [dst8q], m3
-    add          dst8q, strideq
-    movhps     [dst8q], m4
-    movhps [dst8q+ strideq  ], m5
-    movhps [dst8q+ strideq*2], m6
-%endif
-%else ; h
-    inc          dst1q
-    inc          dst2q
-
-    ; 4x8/16 transpose
-    TRANSPOSE4x4B    1, 2, 3, 4, 0
-    SBUTTERFLY      bw, 5, 6, 0
-
-%if mmsize == 8 ; mmx/mmxext (h)
-    WRITE_4x2D       1, 2, 3, 4, dst1q, dst2q, mstrideq, strideq
-    add          dst1q, 4
-    WRITE_2x4W      m5, m6, dst2q, dst1q, mstrideq, strideq
-%else ; sse2 (h)
-    lea          dst8q, [dst8q+mstrideq+1]
-    WRITE_4x4D       1, 2, 3, 4, dst1q, dst2q, dst8q, mstrideq, strideq, %2
-    lea          dst1q, [dst2q+mstrideq+4]
-    lea          dst8q, [dst8q+mstrideq+4]
-%if cpuflag(sse4)
-    add          dst2q, 4
-%endif
-    WRITE_8W        m5, dst2q, dst1q,  mstrideq, strideq
-%if cpuflag(sse4)
-    lea          dst2q, [dst8q+ strideq  ]
-%endif
-    WRITE_8W        m6, dst2q, dst8q, mstrideq, strideq
-%endif
-%endif
-
-%if mmsize == 8
-%if %2 == 8 ; chroma
-%ifidn %1, h
-    sub          dst1q, 5
-%endif
-    cmp          dst1q, dst8q
-    mov          dst1q, dst8q
-    jnz .next8px
-%else
-%ifidn %1, h
-    lea          dst1q, [dst1q+ strideq*8-5]
-%else ; v
-    add          dst1q, 8
-%endif
-    dec          cntrq
-    jg .next8px
-%endif
-    REP_RET
-%else ; mmsize == 16
-    RET
-%endif
-%endmacro
-
-%if ARCH_X86_32
-INIT_MMX mmx
-MBEDGE_LOOPFILTER v, 16
-MBEDGE_LOOPFILTER h, 16
-MBEDGE_LOOPFILTER v,  8
-MBEDGE_LOOPFILTER h,  8
-
-INIT_MMX mmxext
-MBEDGE_LOOPFILTER v, 16
-MBEDGE_LOOPFILTER h, 16
-MBEDGE_LOOPFILTER v,  8
-MBEDGE_LOOPFILTER h,  8
-%endif
-
-INIT_XMM sse2
-MBEDGE_LOOPFILTER v, 16
-MBEDGE_LOOPFILTER h, 16
-MBEDGE_LOOPFILTER v,  8
-MBEDGE_LOOPFILTER h,  8
-
-INIT_XMM ssse3
-MBEDGE_LOOPFILTER v, 16
-MBEDGE_LOOPFILTER h, 16
-MBEDGE_LOOPFILTER v,  8
-MBEDGE_LOOPFILTER h,  8
-
-INIT_XMM sse4
-MBEDGE_LOOPFILTER h, 16
-MBEDGE_LOOPFILTER h,  8

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/x86/vp8dsp_init.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/x86/vp8dsp_init.c Changed

@@ -20,6 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/attributes.h"
 #include "libavutil/cpu.h"
 #include "libavutil/mem.h"
 #include "libavutil/x86/asm.h"
@@ -314,18 +315,22 @@
     c->put_vp8_bilinear_pixels_tab[IDX][2][2] = ff_put_vp8_bilinear ## SIZE ## _hv_ ## OPT
 
 
-av_cold void ff_vp8dsp_init_x86(VP8DSPContext* c)
+av_cold void ff_vp8dsp_init_x86(VP8DSPContext* c, int vp7)
 {
 #if HAVE_YASM
     int cpu_flags = av_get_cpu_flags();
 
     if (EXTERNAL_MMX(cpu_flags)) {
+        if (!vp7) {
         c->vp8_idct_dc_add    = ff_vp8_idct_dc_add_mmx;
         c->vp8_idct_dc_add4uv = ff_vp8_idct_dc_add4uv_mmx;
+        }
 #if ARCH_X86_32
+        if (!vp7) {
         c->vp8_idct_dc_add4y  = ff_vp8_idct_dc_add4y_mmx;
         c->vp8_idct_add       = ff_vp8_idct_add_mmx;
         c->vp8_luma_dc_wht    = ff_vp8_luma_dc_wht_mmx;
+        }
         c->put_vp8_epel_pixels_tab[0][0][0]     =
         c->put_vp8_bilinear_pixels_tab[0][0][0] = ff_put_vp8_pixels16_mmx;
 #endif
@@ -333,6 +338,7 @@
         c->put_vp8_bilinear_pixels_tab[1][0][0] = ff_put_vp8_pixels8_mmx;
 
 #if ARCH_X86_32
+        if (!vp7) {
         c->vp8_v_loop_filter_simple = ff_vp8_v_loop_filter_simple_mmx;
         c->vp8_h_loop_filter_simple = ff_vp8_h_loop_filter_simple_mmx;
 
@@ -345,6 +351,7 @@
         c->vp8_h_loop_filter16y       = ff_vp8_h_loop_filter16y_mbedge_mmx;
         c->vp8_v_loop_filter8uv       = ff_vp8_v_loop_filter8uv_mbedge_mmx;
         c->vp8_h_loop_filter8uv       = ff_vp8_h_loop_filter8uv_mbedge_mmx;
+        }
 #endif
     }
 
@@ -359,6 +366,7 @@
         VP8_BILINEAR_MC_FUNC(0, 16, mmxext);
         VP8_BILINEAR_MC_FUNC(1,  8, mmxext);
 
+        if (!vp7) {
         c->vp8_v_loop_filter_simple   = ff_vp8_v_loop_filter_simple_mmxext;
         c->vp8_h_loop_filter_simple   = ff_vp8_h_loop_filter_simple_mmxext;
 
@@ -371,12 +379,15 @@
         c->vp8_h_loop_filter16y       = ff_vp8_h_loop_filter16y_mbedge_mmxext;
         c->vp8_v_loop_filter8uv       = ff_vp8_v_loop_filter8uv_mbedge_mmxext;
         c->vp8_h_loop_filter8uv       = ff_vp8_h_loop_filter8uv_mbedge_mmxext;
+        }
 #endif
     }
 
     if (EXTERNAL_SSE(cpu_flags)) {
+        if (!vp7) {
         c->vp8_idct_add                         = ff_vp8_idct_add_sse;
         c->vp8_luma_dc_wht                      = ff_vp8_luma_dc_wht_sse;
+        }
         c->put_vp8_epel_pixels_tab[0][0][0]     =
         c->put_vp8_bilinear_pixels_tab[0][0][0] = ff_put_vp8_pixels16_sse;
     }
@@ -387,6 +398,7 @@
         VP8_BILINEAR_MC_FUNC(0, 16, sse2);
         VP8_BILINEAR_MC_FUNC(1, 8, sse2);
 
+        if (!vp7) {
         c->vp8_v_loop_filter_simple = ff_vp8_v_loop_filter_simple_sse2;
 
         c->vp8_v_loop_filter16y_inner = ff_vp8_v_loop_filter16y_inner_sse2;
@@ -394,9 +406,11 @@
 
         c->vp8_v_loop_filter16y       = ff_vp8_v_loop_filter16y_mbedge_sse2;
         c->vp8_v_loop_filter8uv       = ff_vp8_v_loop_filter8uv_mbedge_sse2;
+        }
     }
 
     if (EXTERNAL_SSE2(cpu_flags)) {
+        if (!vp7) {
         c->vp8_idct_dc_add4y          = ff_vp8_idct_dc_add4y_sse2;
 
         c->vp8_h_loop_filter_simple = ff_vp8_h_loop_filter_simple_sse2;
@@ -406,6 +420,7 @@
 
         c->vp8_h_loop_filter16y       = ff_vp8_h_loop_filter16y_mbedge_sse2;
         c->vp8_h_loop_filter8uv       = ff_vp8_h_loop_filter8uv_mbedge_sse2;
+        }
     }
 
     if (EXTERNAL_SSSE3(cpu_flags)) {
@@ -416,6 +431,7 @@
         VP8_BILINEAR_MC_FUNC(1, 8, ssse3);
         VP8_BILINEAR_MC_FUNC(2, 4, ssse3);
 
+        if (!vp7) {
         c->vp8_v_loop_filter_simple = ff_vp8_v_loop_filter_simple_ssse3;
         c->vp8_h_loop_filter_simple = ff_vp8_h_loop_filter_simple_ssse3;
 
@@ -428,14 +444,17 @@
         c->vp8_h_loop_filter16y       = ff_vp8_h_loop_filter16y_mbedge_ssse3;
         c->vp8_v_loop_filter8uv       = ff_vp8_v_loop_filter8uv_mbedge_ssse3;
         c->vp8_h_loop_filter8uv       = ff_vp8_h_loop_filter8uv_mbedge_ssse3;
+        }
     }
 
     if (EXTERNAL_SSE4(cpu_flags)) {
+        if (!vp7) {
         c->vp8_idct_dc_add                  = ff_vp8_idct_dc_add_sse4;
 
         c->vp8_h_loop_filter_simple   = ff_vp8_h_loop_filter_simple_sse4;
         c->vp8_h_loop_filter16y       = ff_vp8_h_loop_filter16y_mbedge_sse4;
         c->vp8_h_loop_filter8uv       = ff_vp8_h_loop_filter8uv_mbedge_sse4;
+        }
     }
 #endif /* HAVE_YASM */
 }

omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/x86/vp8dsp_loopfilter.asm Added

@@ -0,0 +1,1584 @@
+;******************************************************************************
+;* VP8 MMXEXT optimizations
+;* Copyright (c) 2010 Ronald S. Bultje <rsbultje@gmail.com>
+;* Copyright (c) 2010 Jason Garrett-Glaser <darkshikari@gmail.com>
+;*
+;* This file is part of FFmpeg.
+;*
+;* FFmpeg is free software; you can redistribute it and/or
+;* modify it under the terms of the GNU Lesser General Public
+;* License as published by the Free Software Foundation; either
+;* version 2.1 of the License, or (at your option) any later version.
+;*
+;* FFmpeg is distributed in the hope that it will be useful,
+;* but WITHOUT ANY WARRANTY; without even the implied warranty of
+;* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;* Lesser General Public License for more details.
+;*
+;* You should have received a copy of the GNU Lesser General Public
+;* License along with FFmpeg; if not, write to the Free Software
+;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+;******************************************************************************
+
+%include "libavutil/x86/x86util.asm"
+
+SECTION_RODATA
+
+pw_27:    times 8 dw 27
+pw_63:    times 8 dw 63
+
+pb_4:     times 16 db 4
+pb_F8:    times 16 db 0xF8
+pb_FE:    times 16 db 0xFE
+pb_27_63: times 8 db 27, 63
+pb_18_63: times 8 db 18, 63
+pb_9_63:  times 8 db  9, 63
+
+cextern pb_1
+cextern pb_3
+cextern pw_9
+cextern pw_18
+cextern pb_80
+
+SECTION .text
+
+;-----------------------------------------------------------------------------
+; void vp8_h/v_loop_filter_simple_<opt>(uint8_t *dst, int stride, int flim);
+;-----------------------------------------------------------------------------
+
+; macro called with 7 mm register indexes as argument, and 4 regular registers
+;
+; first 4 mm registers will carry the transposed pixel data
+; the other three are scratchspace (one would be sufficient, but this allows
+; for more spreading/pipelining and thus faster execution on OOE CPUs)
+;
+; first two regular registers are buf+4*stride and buf+5*stride
+; third is -stride, fourth is +stride
+%macro READ_8x4_INTERLEAVED 11
+    ; interleave 8 (A-H) rows of 4 pixels each
+    movd          m%1, [%8+%10*4]   ; A0-3
+    movd          m%5, [%9+%10*4]   ; B0-3
+    movd          m%2, [%8+%10*2]   ; C0-3
+    movd          m%6, [%8+%10]     ; D0-3
+    movd          m%3, [%8]         ; E0-3
+    movd          m%7, [%9]         ; F0-3
+    movd          m%4, [%9+%11]     ; G0-3
+    punpcklbw     m%1, m%5          ; A/B interleaved
+    movd          m%5, [%9+%11*2]   ; H0-3
+    punpcklbw     m%2, m%6          ; C/D interleaved
+    punpcklbw     m%3, m%7          ; E/F interleaved
+    punpcklbw     m%4, m%5          ; G/H interleaved
+%endmacro
+
+; macro called with 7 mm register indexes as argument, and 5 regular registers
+; first 11 mean the same as READ_8x4_TRANSPOSED above
+; fifth regular register is scratchspace to reach the bottom 8 rows, it
+; will be set to second regular register + 8*stride at the end
+%macro READ_16x4_INTERLEAVED 12
+    ; transpose 16 (A-P) rows of 4 pixels each
+    lea           %12, [r0+8*r2]
+
+    ; read (and interleave) those addressable by %8 (=r0), A/C/D/E/I/K/L/M
+    movd          m%1, [%8+%10*4]   ; A0-3
+    movd          m%3, [%12+%10*4]  ; I0-3
+    movd          m%2, [%8+%10*2]   ; C0-3
+    movd          m%4, [%12+%10*2]  ; K0-3
+    movd          m%6, [%8+%10]     ; D0-3
+    movd          m%5, [%12+%10]    ; L0-3
+    movd          m%7, [%12]        ; M0-3
+    add           %12, %11
+    punpcklbw     m%1, m%3          ; A/I
+    movd          m%3, [%8]         ; E0-3
+    punpcklbw     m%2, m%4          ; C/K
+    punpcklbw     m%6, m%5          ; D/L
+    punpcklbw     m%3, m%7          ; E/M
+    punpcklbw     m%2, m%6          ; C/D/K/L interleaved
+
+    ; read (and interleave) those addressable by %9 (=r4), B/F/G/H/J/N/O/P
+    movd         m%5, [%9+%10*4]   ; B0-3
+    movd         m%4, [%12+%10*4]  ; J0-3
+    movd         m%7, [%9]         ; F0-3
+    movd         m%6, [%12]        ; N0-3
+    punpcklbw    m%5, m%4          ; B/J
+    punpcklbw    m%7, m%6          ; F/N
+    punpcklbw    m%1, m%5          ; A/B/I/J interleaved
+    punpcklbw    m%3, m%7          ; E/F/M/N interleaved
+    movd         m%4, [%9+%11]     ; G0-3
+    movd         m%6, [%12+%11]    ; O0-3
+    movd         m%5, [%9+%11*2]   ; H0-3
+    movd         m%7, [%12+%11*2]  ; P0-3
+    punpcklbw    m%4, m%6          ; G/O
+    punpcklbw    m%5, m%7          ; H/P
+    punpcklbw    m%4, m%5          ; G/H/O/P interleaved
+%endmacro
+
+; write 4 mm registers of 2 dwords each
+; first four arguments are mm register indexes containing source data
+; last four are registers containing buf+4*stride, buf+5*stride,
+; -stride and +stride
+%macro WRITE_4x2D 8
+    ; write out (2 dwords per register)
+    movd    [%5+%7*4], m%1
+    movd    [%5+%7*2], m%2
+    movd         [%5], m%3
+    movd      [%6+%8], m%4
+    punpckhdq     m%1, m%1
+    punpckhdq     m%2, m%2
+    punpckhdq     m%3, m%3
+    punpckhdq     m%4, m%4
+    movd    [%6+%7*4], m%1
+    movd      [%5+%7], m%2
+    movd         [%6], m%3
+    movd    [%6+%8*2], m%4
+%endmacro
+
+; write 4 xmm registers of 4 dwords each
+; arguments same as WRITE_2x4D, but with an extra register, so that the 5 regular
+; registers contain buf+4*stride, buf+5*stride, buf+12*stride, -stride and +stride
+; we add 1*stride to the third regular registry in the process
+; the 10th argument is 16 if it's a Y filter (i.e. all regular registers cover the
+; same memory region), or 8 if they cover two separate buffers (third one points to
+; a different memory region than the first two), allowing for more optimal code for
+; the 16-width case
+%macro WRITE_4x4D 10
+    ; write out (4 dwords per register), start with dwords zero
+    movd    [%5+%8*4], m%1
+    movd         [%5], m%2
+    movd    [%7+%8*4], m%3
+    movd         [%7], m%4
+
+    ; store dwords 1
+    psrldq        m%1, 4
+    psrldq        m%2, 4
+    psrldq        m%3, 4
+    psrldq        m%4, 4
+    movd    [%6+%8*4], m%1
+    movd         [%6], m%2
+%if %10 == 16
+    movd    [%6+%9*4], m%3
+%endif
+    movd      [%7+%9], m%4
+
+    ; write dwords 2
+    psrldq        m%1, 4
+    psrldq        m%2, 4
+%if %10 == 8
+    movd    [%5+%8*2], m%1
+    movd          %5d, m%3
+%endif
+    psrldq        m%3, 4
+    psrldq        m%4, 4
+%if %10 == 16
+    movd    [%5+%8*2], m%1
+%endif
+    movd      [%6+%9], m%2
+    movd    [%7+%8*2], m%3
+    movd    [%7+%9*2], m%4
+    add            %7, %9
+
+    ; store dwords 3
+    psrldq        m%1, 4
+    psrldq        m%2, 4
+    psrldq        m%3, 4
+    psrldq        m%4, 4
+%if %10 == 8
+    mov     [%7+%8*4], %5d
+    movd    [%6+%8*2], m%1
+%else
+    movd      [%5+%8], m%1
+%endif
+    movd    [%6+%9*2], m%2
+    movd    [%7+%8*2], m%3
+    movd    [%7+%9*2], m%4
+%endmacro
+
+; write 4 or 8 words in the mmx/xmm registers as 8 lines
+; 1 and 2 are the registers to write, this can be the same (for SSE2)
+; for pre-SSE4:
+; 3 is a general-purpose register that we will clobber
+; for SSE4:
+; 3 is a pointer to the destination's 5th line
+; 4 is a pointer to the destination's 4th line
+; 5/6 is -stride and +stride
+%macro WRITE_2x4W 6
+    movd            %3d, %1
+    punpckhdq        %1, %1
+    mov       [%4+%5*4], %3w
+    shr              %3, 16
+    add              %4, %6
+    mov       [%4+%5*4], %3w
+
+    movd            %3d, %1
+    add              %4, %5
+    mov       [%4+%5*2], %3w
+    shr              %3, 16
+    mov       [%4+%5  ], %3w
+
+    movd            %3d, %2
+    punpckhdq        %2, %2
+    mov       [%4     ], %3w
+    shr              %3, 16
+    mov       [%4+%6  ], %3w
+
+    movd            %3d, %2
+    add              %4, %6
+    mov       [%4+%6  ], %3w
+    shr              %3, 16
+    mov       [%4+%6*2], %3w
+    add              %4, %5
+%endmacro
+
+%macro WRITE_8W 5
+%if cpuflag(sse4)
+    pextrw    [%3+%4*4], %1, 0
+    pextrw    [%2+%4*4], %1, 1
+    pextrw    [%3+%4*2], %1, 2
+    pextrw    [%3+%4  ], %1, 3
+    pextrw    [%3     ], %1, 4
+    pextrw    [%2     ], %1, 5
+    pextrw    [%2+%5  ], %1, 6
+    pextrw    [%2+%5*2], %1, 7
+%else
+    movd            %2d, %1
+    psrldq           %1, 4
+    mov       [%3+%4*4], %2w
+    shr              %2, 16
+    add              %3, %5
+    mov       [%3+%4*4], %2w
+
+    movd            %2d, %1
+    psrldq           %1, 4
+    add              %3, %4
+    mov       [%3+%4*2], %2w
+    shr              %2, 16
+    mov       [%3+%4  ], %2w
+
+    movd            %2d, %1
+    psrldq           %1, 4
+    mov       [%3     ], %2w
+    shr              %2, 16
+    mov       [%3+%5  ], %2w
+
+    movd            %2d, %1
+    add              %3, %5
+    mov       [%3+%5  ], %2w
+    shr              %2, 16
+    mov       [%3+%5*2], %2w
+%endif
+%endmacro
+
+%macro SIMPLE_LOOPFILTER 2
+cglobal vp8_%1_loop_filter_simple, 3, %2, 8, dst, stride, flim, cntr
+%if mmsize == 8 ; mmx/mmxext
+    mov         cntrq, 2
+%endif
+%if cpuflag(ssse3)
+    pxor           m0, m0
+%endif
+    SPLATB_REG     m7, flim, m0     ; splat "flim" into register
+
+    ; set up indexes to address 4 rows
+%if mmsize == 8
+    DEFINE_ARGS dst1, mstride, stride, cntr, dst2
+%else
+    DEFINE_ARGS dst1, mstride, stride, dst3, dst2
+%endif
+    mov       strideq, mstrideq
+    neg      mstrideq
+%ifidn %1, h
+    lea         dst1q, [dst1q+4*strideq-2]
+%endif
+
+%if mmsize == 8 ; mmx / mmxext
+.next8px:
+%endif
+%ifidn %1, v
+    ; read 4 half/full rows of pixels
+    mova           m0, [dst1q+mstrideq*2]    ; p1
+    mova           m1, [dst1q+mstrideq]      ; p0
+    mova           m2, [dst1q]               ; q0
+    mova           m3, [dst1q+ strideq]      ; q1
+%else ; h
+    lea         dst2q, [dst1q+ strideq]
+
+%if mmsize == 8 ; mmx/mmxext
+    READ_8x4_INTERLEAVED  0, 1, 2, 3, 4, 5, 6, dst1q, dst2q, mstrideq, strideq
+%else ; sse2
+    READ_16x4_INTERLEAVED 0, 1, 2, 3, 4, 5, 6, dst1q, dst2q, mstrideq, strideq, dst3q
+%endif
+    TRANSPOSE4x4W         0, 1, 2, 3, 4
+%endif
+
+    ; simple_limit
+    mova           m5, m2           ; m5=backup of q0
+    mova           m6, m1           ; m6=backup of p0
+    psubusb        m1, m2           ; p0-q0
+    psubusb        m2, m6           ; q0-p0
+    por            m1, m2           ; FFABS(p0-q0)
+    paddusb        m1, m1           ; m1=FFABS(p0-q0)*2
+
+    mova           m4, m3
+    mova           m2, m0
+    psubusb        m3, m0           ; q1-p1
+    psubusb        m0, m4           ; p1-q1
+    por            m3, m0           ; FFABS(p1-q1)
+    mova           m0, [pb_80]
+    pxor           m2, m0
+    pxor           m4, m0
+    psubsb         m2, m4           ; m2=p1-q1 (signed) backup for below
+    pand           m3, [pb_FE]
+    psrlq          m3, 1            ; m3=FFABS(p1-q1)/2, this can be used signed
+    paddusb        m3, m1
+    psubusb        m3, m7
+    pxor           m1, m1
+    pcmpeqb        m3, m1           ; abs(p0-q0)*2+abs(p1-q1)/2<=flim mask(0xff/0x0)
+
+    ; filter_common (use m2/p1-q1, m4=q0, m6=p0, m5/q0-p0 and m3/mask)
+    mova           m4, m5
+    pxor           m5, m0
+    pxor           m0, m6
+    psubsb         m5, m0           ; q0-p0 (signed)
+    paddsb         m2, m5
+    paddsb         m2, m5
+    paddsb         m2, m5           ; a=(p1-q1) + 3*(q0-p0)
+    pand           m2, m3           ; apply filter mask (m3)
+
+    mova           m3, [pb_F8]
+    mova           m1, m2
+    paddsb         m2, [pb_4]       ; f1<<3=a+4
+    paddsb         m1, [pb_3]       ; f2<<3=a+3
+    pand           m2, m3
+    pand           m1, m3           ; cache f2<<3
+
+    pxor           m0, m0
+    pxor           m3, m3
+    pcmpgtb        m0, m2           ; which values are <0?
+    psubb          m3, m2           ; -f1<<3
+    psrlq          m2, 3            ; +f1
+    psrlq          m3, 3            ; -f1
+    pand           m3, m0
+    pandn          m0, m2
+    psubusb        m4, m0
+    paddusb        m4, m3           ; q0-f1
+
+    pxor           m0, m0
+    pxor           m3, m3
+    pcmpgtb        m0, m1           ; which values are <0?
+    psubb          m3, m1           ; -f2<<3
+    psrlq          m1, 3            ; +f2
+    psrlq          m3, 3            ; -f2
+    pand           m3, m0
+    pandn          m0, m1
+    paddusb        m6, m0
+    psubusb        m6, m3           ; p0+f2
+
+    ; store
+%ifidn %1, v
+    mova      [dst1q], m4
+    mova [dst1q+mstrideq], m6
+%else ; h
+    inc        dst1q
+    SBUTTERFLY    bw, 6, 4, 0
+
+%if mmsize == 16 ; sse2
+%if cpuflag(sse4)
+    inc         dst2q
+%endif
+    WRITE_8W       m6, dst2q, dst1q, mstrideq, strideq
+    lea         dst2q, [dst3q+mstrideq+1]
+%if cpuflag(sse4)
+    inc         dst3q
+%endif
+    WRITE_8W       m4, dst3q, dst2q, mstrideq, strideq
+%else ; mmx/mmxext
+    WRITE_2x4W     m6, m4, dst2q, dst1q, mstrideq, strideq
+%endif
+%endif
+
+%if mmsize == 8 ; mmx/mmxext
+    ; next 8 pixels
+%ifidn %1, v
+    add         dst1q, 8            ; advance 8 cols = pixels
+%else ; h
+    lea         dst1q, [dst1q+strideq*8-1]  ; advance 8 rows = lines
+%endif
+    dec         cntrq
+    jg .next8px
+    REP_RET
+%else ; sse2
+    RET
+%endif
+%endmacro
+
+%if ARCH_X86_32
+INIT_MMX mmx
+SIMPLE_LOOPFILTER v, 4
+SIMPLE_LOOPFILTER h, 5
+INIT_MMX mmxext
+SIMPLE_LOOPFILTER v, 4
+SIMPLE_LOOPFILTER h, 5
+%endif
+
+INIT_XMM sse2
+SIMPLE_LOOPFILTER v, 3
+SIMPLE_LOOPFILTER h, 5
+INIT_XMM ssse3
+SIMPLE_LOOPFILTER v, 3
+SIMPLE_LOOPFILTER h, 5
+INIT_XMM sse4
+SIMPLE_LOOPFILTER h, 5
+
+;-----------------------------------------------------------------------------
+; void vp8_h/v_loop_filter<size>_inner_<opt>(uint8_t *dst, [uint8_t *v,] int stride,
+;                                            int flimE, int flimI, int hev_thr);
+;-----------------------------------------------------------------------------
+
+%macro INNER_LOOPFILTER 2
+%define stack_size 0
+%ifndef m8   ; stack layout: [0]=E, [1]=I, [2]=hev_thr
+%ifidn %1, v ;               [3]=hev() result
+%define stack_size mmsize * -4
+%else ; h    ; extra storage space for transposes
+%define stack_size mmsize * -5
+%endif
+%endif
+
+%if %2 == 8 ; chroma
+cglobal vp8_%1_loop_filter8uv_inner, 6, 6, 13, stack_size, dst, dst8, stride, flimE, flimI, hevthr
+%else ; luma
+cglobal vp8_%1_loop_filter16y_inner, 5, 5, 13, stack_size, dst, stride, flimE, flimI, hevthr
+%endif
+
+%if cpuflag(ssse3)
+    pxor             m7, m7
+%endif
+
+%ifndef m8
+    ; splat function arguments
+    SPLATB_REG       m0, flimEq, m7   ; E
+    SPLATB_REG       m1, flimIq, m7   ; I
+    SPLATB_REG       m2, hevthrq, m7  ; hev_thresh
+
+%define m_flimE    [rsp]
+%define m_flimI    [rsp+mmsize]
+%define m_hevthr   [rsp+mmsize*2]
+%define m_maskres  [rsp+mmsize*3]
+%define m_p0backup [rsp+mmsize*3]
+%define m_q0backup [rsp+mmsize*4]
+
+    mova        m_flimE, m0
+    mova        m_flimI, m1
+    mova       m_hevthr, m2
+%else
+%define m_flimE    m9
+%define m_flimI    m10
+%define m_hevthr   m11
+%define m_maskres  m12
+%define m_p0backup m12
+%define m_q0backup m8
+
+    ; splat function arguments
+    SPLATB_REG  m_flimE, flimEq, m7   ; E
+    SPLATB_REG  m_flimI, flimIq, m7   ; I
+    SPLATB_REG m_hevthr, hevthrq, m7  ; hev_thresh
+%endif
+
+%if %2 == 8 ; chroma
+    DEFINE_ARGS dst1, dst8, mstride, stride, dst2
+%elif mmsize == 8
+    DEFINE_ARGS dst1, mstride, stride, dst2, cntr
+    mov           cntrq, 2
+%else
+    DEFINE_ARGS dst1, mstride, stride, dst2, dst8
+%endif
+    mov         strideq, mstrideq
+    neg        mstrideq
+%ifidn %1, h
+    lea           dst1q, [dst1q+strideq*4-4]
+%if %2 == 8 ; chroma
+    lea           dst8q, [dst8q+strideq*4-4]
+%endif
+%endif
+
+%if mmsize == 8
+.next8px:
+%endif
+    ; read
+    lea           dst2q, [dst1q+strideq]
+%ifidn %1, v
+%if %2 == 8 && mmsize == 16
+%define movrow movh
+%else
+%define movrow mova
+%endif
+    movrow           m0, [dst1q+mstrideq*4] ; p3
+    movrow           m1, [dst2q+mstrideq*4] ; p2
+    movrow           m2, [dst1q+mstrideq*2] ; p1
+    movrow           m5, [dst2q]            ; q1
+    movrow           m6, [dst2q+ strideq*1] ; q2
+    movrow           m7, [dst2q+ strideq*2] ; q3
+%if mmsize == 16 && %2 == 8
+    movhps           m0, [dst8q+mstrideq*4]
+    movhps           m2, [dst8q+mstrideq*2]
+    add           dst8q, strideq
+    movhps           m1, [dst8q+mstrideq*4]
+    movhps           m5, [dst8q]
+    movhps           m6, [dst8q+ strideq  ]
+    movhps           m7, [dst8q+ strideq*2]
+    add           dst8q, mstrideq
+%endif
+%elif mmsize == 8 ; mmx/mmxext (h)
+    ; read 8 rows of 8px each
+    movu             m0, [dst1q+mstrideq*4]
+    movu             m1, [dst2q+mstrideq*4]
+    movu             m2, [dst1q+mstrideq*2]
+    movu             m3, [dst1q+mstrideq  ]
+    movu             m4, [dst1q]
+    movu             m5, [dst2q]
+    movu             m6, [dst2q+ strideq  ]
+
+    ; 8x8 transpose
+    TRANSPOSE4x4B     0, 1, 2, 3, 7
+    mova     m_q0backup, m1
+    movu             m7, [dst2q+ strideq*2]
+    TRANSPOSE4x4B     4, 5, 6, 7, 1
+    SBUTTERFLY       dq, 0, 4, 1     ; p3/p2
+    SBUTTERFLY       dq, 2, 6, 1     ; q0/q1
+    SBUTTERFLY       dq, 3, 7, 1     ; q2/q3
+    mova             m1, m_q0backup
+    mova     m_q0backup, m2          ; store q0
+    SBUTTERFLY       dq, 1, 5, 2     ; p1/p0
+    mova     m_p0backup, m5          ; store p0
+    SWAP              1, 4
+    SWAP              2, 4
+    SWAP              6, 3
+    SWAP              5, 3
+%else ; sse2 (h)
+%if %2 == 16
+    lea           dst8q, [dst1q+ strideq*8]
+%endif
+
+    ; read 16 rows of 8px each, interleave
+    movh             m0, [dst1q+mstrideq*4]
+    movh             m1, [dst8q+mstrideq*4]
+    movh             m2, [dst1q+mstrideq*2]
+    movh             m5, [dst8q+mstrideq*2]
+    movh             m3, [dst1q+mstrideq  ]
+    movh             m6, [dst8q+mstrideq  ]
+    movh             m4, [dst1q]
+    movh             m7, [dst8q]
+    punpcklbw        m0, m1          ; A/I
+    punpcklbw        m2, m5          ; C/K
+    punpcklbw        m3, m6          ; D/L
+    punpcklbw        m4, m7          ; E/M
+
+    add           dst8q, strideq
+    movh             m1, [dst2q+mstrideq*4]
+    movh             m6, [dst8q+mstrideq*4]
+    movh             m5, [dst2q]
+    movh             m7, [dst8q]
+    punpcklbw        m1, m6          ; B/J
+    punpcklbw        m5, m7          ; F/N
+    movh             m6, [dst2q+ strideq  ]
+    movh             m7, [dst8q+ strideq  ]
+    punpcklbw        m6, m7          ; G/O
+
+    ; 8x16 transpose
+    TRANSPOSE4x4B     0, 1, 2, 3, 7
+%ifdef m8
+    SWAP              1, 8
+%else
+    mova     m_q0backup, m1
+%endif
+    movh             m7, [dst2q+ strideq*2]
+    movh             m1, [dst8q+ strideq*2]
+    punpcklbw        m7, m1          ; H/P
+    TRANSPOSE4x4B     4, 5, 6, 7, 1
+    SBUTTERFLY       dq, 0, 4, 1     ; p3/p2
+    SBUTTERFLY       dq, 2, 6, 1     ; q0/q1
+    SBUTTERFLY       dq, 3, 7, 1     ; q2/q3
+%ifdef m8
+    SWAP              1, 8
+    SWAP              2, 8
+%else
+    mova             m1, m_q0backup
+    mova     m_q0backup, m2          ; store q0
+%endif
+    SBUTTERFLY       dq, 1, 5, 2     ; p1/p0
+%ifdef m12
+    SWAP              5, 12
+%else
+    mova     m_p0backup, m5          ; store p0
+%endif
+    SWAP              1, 4
+    SWAP              2, 4
+    SWAP              6, 3
+    SWAP              5, 3
+%endif
+
+    ; normal_limit for p3-p2, p2-p1, q3-q2 and q2-q1
+    mova             m4, m1
+    SWAP              4, 1
+    psubusb          m4, m0          ; p2-p3
+    psubusb          m0, m1          ; p3-p2
+    por              m0, m4          ; abs(p3-p2)
+
+    mova             m4, m2
+    SWAP              4, 2
+    psubusb          m4, m1          ; p1-p2
+    psubusb          m1, m2          ; p2-p1
+    por              m1, m4          ; abs(p2-p1)
+
+    mova             m4, m6
+    SWAP              4, 6
+    psubusb          m4, m7          ; q2-q3
+    psubusb          m7, m6          ; q3-q2
+    por              m7, m4          ; abs(q3-q2)
+
+    mova             m4, m5
+    SWAP              4, 5
+    psubusb          m4, m6          ; q1-q2
+    psubusb          m6, m5          ; q2-q1
+    por              m6, m4          ; abs(q2-q1)
+
+%if notcpuflag(mmxext)
+    mova             m4, m_flimI
+    pxor             m3, m3
+    psubusb          m0, m4
+    psubusb          m1, m4
+    psubusb          m7, m4
+    psubusb          m6, m4
+    pcmpeqb          m0, m3          ; abs(p3-p2) <= I
+    pcmpeqb          m1, m3          ; abs(p2-p1) <= I
+    pcmpeqb          m7, m3          ; abs(q3-q2) <= I
+    pcmpeqb          m6, m3          ; abs(q2-q1) <= I
+    pand             m0, m1
+    pand             m7, m6
+    pand             m0, m7
+%else ; mmxext/sse2
+    pmaxub           m0, m1
+    pmaxub           m6, m7
+    pmaxub           m0, m6
+%endif
+
+    ; normal_limit and high_edge_variance for p1-p0, q1-q0
+    SWAP              7, 3           ; now m7 is zero
+%ifidn %1, v
+    movrow           m3, [dst1q+mstrideq  ] ; p0
+%if mmsize == 16 && %2 == 8
+    movhps           m3, [dst8q+mstrideq  ]
+%endif
+%elifdef m12
+    SWAP              3, 12
+%else
+    mova             m3, m_p0backup
+%endif
+
+    mova             m1, m2
+    SWAP              1, 2
+    mova             m6, m3
+    SWAP              3, 6
+    psubusb          m1, m3          ; p1-p0
+    psubusb          m6, m2          ; p0-p1
+    por              m1, m6          ; abs(p1-p0)
+%if notcpuflag(mmxext)
+    mova             m6, m1
+    psubusb          m1, m4
+    psubusb          m6, m_hevthr
+    pcmpeqb          m1, m7          ; abs(p1-p0) <= I
+    pcmpeqb          m6, m7          ; abs(p1-p0) <= hev_thresh
+    pand             m0, m1
+    mova      m_maskres, m6
+%else ; mmxext/sse2
+    pmaxub           m0, m1          ; max_I
+    SWAP              1, 4           ; max_hev_thresh
+%endif
+
+    SWAP              6, 4           ; now m6 is I
+%ifidn %1, v
+    movrow           m4, [dst1q]     ; q0
+%if mmsize == 16 && %2 == 8
+    movhps           m4, [dst8q]
+%endif
+%elifdef m8
+    SWAP              4, 8
+%else
+    mova             m4, m_q0backup
+%endif
+    mova             m1, m4
+    SWAP              1, 4
+    mova             m7, m5
+    SWAP              7, 5
+    psubusb          m1, m5          ; q0-q1
+    psubusb          m7, m4          ; q1-q0
+    por              m1, m7          ; abs(q1-q0)
+%if notcpuflag(mmxext)
+    mova             m7, m1
+    psubusb          m1, m6
+    psubusb          m7, m_hevthr
+    pxor             m6, m6
+    pcmpeqb          m1, m6          ; abs(q1-q0) <= I
+    pcmpeqb          m7, m6          ; abs(q1-q0) <= hev_thresh
+    mova             m6, m_maskres
+    pand             m0, m1          ; abs([pq][321]-[pq][210]) <= I
+    pand             m6, m7
+%else ; mmxext/sse2
+    pxor             m7, m7
+    pmaxub           m0, m1
+    pmaxub           m6, m1
+    psubusb          m0, m_flimI
+    psubusb          m6, m_hevthr
+    pcmpeqb          m0, m7          ; max(abs(..)) <= I
+    pcmpeqb          m6, m7          ; !(max(abs..) > thresh)
+%endif
+%ifdef m12
+    SWAP              6, 12
+%else
+    mova      m_maskres, m6          ; !(abs(p1-p0) > hev_t || abs(q1-q0) > hev_t)
+%endif
+
+    ; simple_limit
+    mova             m1, m3
+    SWAP              1, 3
+    mova             m6, m4          ; keep copies of p0/q0 around for later use
+    SWAP              6, 4
+    psubusb          m1, m4          ; p0-q0
+    psubusb          m6, m3          ; q0-p0
+    por              m1, m6          ; abs(q0-p0)
+    paddusb          m1, m1          ; m1=2*abs(q0-p0)
+
+    mova             m7, m2
+    SWAP              7, 2
+    mova             m6, m5
+    SWAP              6, 5
+    psubusb          m7, m5          ; p1-q1
+    psubusb          m6, m2          ; q1-p1
+    por              m7, m6          ; abs(q1-p1)
+    pxor             m6, m6
+    pand             m7, [pb_FE]
+    psrlq            m7, 1           ; abs(q1-p1)/2
+    paddusb          m7, m1          ; abs(q0-p0)*2+abs(q1-p1)/2
+    psubusb          m7, m_flimE
+    pcmpeqb          m7, m6          ; abs(q0-p0)*2+abs(q1-p1)/2 <= E
+    pand             m0, m7          ; normal_limit result
+
+    ; filter_common; at this point, m2-m5=p1-q1 and m0 is filter_mask
+%ifdef m8 ; x86-64 && sse2
+    mova             m8, [pb_80]
+%define m_pb_80 m8
+%else ; x86-32 or mmx/mmxext
+%define m_pb_80 [pb_80]
+%endif
+    mova             m1, m4
+    mova             m7, m3
+    pxor             m1, m_pb_80
+    pxor             m7, m_pb_80
+    psubsb           m1, m7          ; (signed) q0-p0
+    mova             m6, m2
+    mova             m7, m5
+    pxor             m6, m_pb_80
+    pxor             m7, m_pb_80
+    psubsb           m6, m7          ; (signed) p1-q1
+    mova             m7, m_maskres
+    pandn            m7, m6
+    paddsb           m7, m1
+    paddsb           m7, m1
+    paddsb           m7, m1          ; 3*(q0-p0)+is4tap?(p1-q1)
+
+    pand             m7, m0
+    mova             m1, [pb_F8]
+    mova             m6, m7
+    paddsb           m7, [pb_3]
+    paddsb           m6, [pb_4]
+    pand             m7, m1
+    pand             m6, m1
+
+    pxor             m1, m1
+    pxor             m0, m0
+    pcmpgtb          m1, m7
+    psubb            m0, m7
+    psrlq            m7, 3           ; +f2
+    psrlq            m0, 3           ; -f2
+    pand             m0, m1
+    pandn            m1, m7
+    psubusb          m3, m0
+    paddusb          m3, m1          ; p0+f2
+
+    pxor             m1, m1
+    pxor             m0, m0
+    pcmpgtb          m0, m6
+    psubb            m1, m6
+    psrlq            m6, 3           ; +f1
+    psrlq            m1, 3           ; -f1
+    pand             m1, m0
+    pandn            m0, m6
+    psubusb          m4, m0
+    paddusb          m4, m1          ; q0-f1
+
+%ifdef m12
+    SWAP              6, 12
+%else
+    mova             m6, m_maskres
+%endif
+%if notcpuflag(mmxext)
+    mova             m7, [pb_1]
+%else ; mmxext/sse2
+    pxor             m7, m7
+%endif
+    pand             m0, m6
+    pand             m1, m6
+%if notcpuflag(mmxext)
+    paddusb          m0, m7
+    pand             m1, [pb_FE]
+    pandn            m7, m0
+    psrlq            m1, 1
+    psrlq            m7, 1
+    SWAP              0, 7
+%else ; mmxext/sse2
+    psubusb          m1, [pb_1]
+    pavgb            m0, m7          ; a
+    pavgb            m1, m7          ; -a
+%endif
+    psubusb          m5, m0
+    psubusb          m2, m1
+    paddusb          m5, m1          ; q1-a
+    paddusb          m2, m0          ; p1+a
+
+    ; store
+%ifidn %1, v
+    movrow [dst1q+mstrideq*2], m2
+    movrow [dst1q+mstrideq  ], m3
+    movrow      [dst1q], m4
+    movrow [dst1q+ strideq  ], m5
+%if mmsize == 16 && %2 == 8
+    movhps [dst8q+mstrideq*2], m2
+    movhps [dst8q+mstrideq  ], m3
+    movhps      [dst8q], m4
+    movhps [dst8q+ strideq  ], m5
+%endif
+%else ; h
+    add           dst1q, 2
+    add           dst2q, 2
+
+    ; 4x8/16 transpose
+    TRANSPOSE4x4B     2, 3, 4, 5, 6
+
+%if mmsize == 8 ; mmx/mmxext (h)
+    WRITE_4x2D        2, 3, 4, 5, dst1q, dst2q, mstrideq, strideq
+%else ; sse2 (h)
+    lea           dst8q, [dst8q+mstrideq  +2]
+    WRITE_4x4D        2, 3, 4, 5, dst1q, dst2q, dst8q, mstrideq, strideq, %2
+%endif
+%endif
+
+%if mmsize == 8
+%if %2 == 8 ; chroma
+%ifidn %1, h
+    sub           dst1q, 2
+%endif
+    cmp           dst1q, dst8q
+    mov           dst1q, dst8q
+    jnz .next8px
+%else
+%ifidn %1, h
+    lea           dst1q, [dst1q+ strideq*8-2]
+%else ; v
+    add           dst1q, 8
+%endif
+    dec           cntrq
+    jg .next8px
+%endif
+    REP_RET
+%else ; mmsize == 16
+    RET
+%endif
+%endmacro
+
+%if ARCH_X86_32
+INIT_MMX mmx
+INNER_LOOPFILTER v, 16
+INNER_LOOPFILTER h, 16
+INNER_LOOPFILTER v,  8
+INNER_LOOPFILTER h,  8
+
+INIT_MMX mmxext
+INNER_LOOPFILTER v, 16
+INNER_LOOPFILTER h, 16
+INNER_LOOPFILTER v,  8
+INNER_LOOPFILTER h,  8
+%endif
+
+INIT_XMM sse2
+INNER_LOOPFILTER v, 16
+INNER_LOOPFILTER h, 16
+INNER_LOOPFILTER v,  8
+INNER_LOOPFILTER h,  8
+
+INIT_XMM ssse3
+INNER_LOOPFILTER v, 16
+INNER_LOOPFILTER h, 16
+INNER_LOOPFILTER v,  8
+INNER_LOOPFILTER h,  8
+
+;-----------------------------------------------------------------------------
+; void vp8_h/v_loop_filter<size>_mbedge_<opt>(uint8_t *dst, [uint8_t *v,] int stride,
+;                                            int flimE, int flimI, int hev_thr);
+;-----------------------------------------------------------------------------
+
+%macro MBEDGE_LOOPFILTER 2
+%define stack_size 0
+%ifndef m8       ; stack layout: [0]=E, [1]=I, [2]=hev_thr
+%if mmsize == 16 ;               [3]=hev() result
+                 ;               [4]=filter tmp result
+                 ;               [5]/[6] = p2/q2 backup
+                 ;               [7]=lim_res sign result
+%define stack_size mmsize * -7
+%else ; 8        ; extra storage space for transposes
+%define stack_size mmsize * -8
+%endif
+%endif
+
+%if %2 == 8 ; chroma
+cglobal vp8_%1_loop_filter8uv_mbedge, 6, 6, 15, stack_size, dst1, dst8, stride, flimE, flimI, hevthr
+%else ; luma
+cglobal vp8_%1_loop_filter16y_mbedge, 5, 5, 15, stack_size, dst1, stride, flimE, flimI, hevthr
+%endif
+
+%if cpuflag(ssse3)
+    pxor             m7, m7
+%endif
+
+%ifndef m8
+    ; splat function arguments
+    SPLATB_REG       m0, flimEq, m7   ; E
+    SPLATB_REG       m1, flimIq, m7   ; I
+    SPLATB_REG       m2, hevthrq, m7  ; hev_thresh
+
+%define m_flimE    [rsp]
+%define m_flimI    [rsp+mmsize]
+%define m_hevthr   [rsp+mmsize*2]
+%define m_maskres  [rsp+mmsize*3]
+%define m_limres   [rsp+mmsize*4]
+%define m_p0backup [rsp+mmsize*3]
+%define m_q0backup [rsp+mmsize*4]
+%define m_p2backup [rsp+mmsize*5]
+%define m_q2backup [rsp+mmsize*6]
+%if mmsize == 16
+%define m_limsign  [rsp]
+%else
+%define m_limsign  [rsp+mmsize*7]
+%endif
+
+    mova        m_flimE, m0
+    mova        m_flimI, m1
+    mova       m_hevthr, m2
+%else ; sse2 on x86-64
+%define m_flimE    m9
+%define m_flimI    m10
+%define m_hevthr   m11
+%define m_maskres  m12
+%define m_limres   m8
+%define m_p0backup m12
+%define m_q0backup m8
+%define m_p2backup m13
+%define m_q2backup m14
+%define m_limsign  m9
+
+    ; splat function arguments
+    SPLATB_REG  m_flimE, flimEq, m7   ; E
+    SPLATB_REG  m_flimI, flimIq, m7   ; I
+    SPLATB_REG m_hevthr, hevthrq, m7  ; hev_thresh
+%endif
+
+%if %2 == 8 ; chroma
+    DEFINE_ARGS dst1, dst8, mstride, stride, dst2
+%elif mmsize == 8
+    DEFINE_ARGS dst1, mstride, stride, dst2, cntr
+    mov           cntrq, 2
+%else
+    DEFINE_ARGS dst1, mstride, stride, dst2, dst8
+%endif
+    mov         strideq, mstrideq
+    neg        mstrideq
+%ifidn %1, h
+    lea           dst1q, [dst1q+strideq*4-4]
+%if %2 == 8 ; chroma
+    lea           dst8q, [dst8q+strideq*4-4]
+%endif
+%endif
+
+%if mmsize == 8
+.next8px:
+%endif
+    ; read
+    lea           dst2q, [dst1q+ strideq  ]
+%ifidn %1, v
+%if %2 == 8 && mmsize == 16
+%define movrow movh
+%else
+%define movrow mova
+%endif
+    movrow           m0, [dst1q+mstrideq*4] ; p3
+    movrow           m1, [dst2q+mstrideq*4] ; p2
+    movrow           m2, [dst1q+mstrideq*2] ; p1
+    movrow           m5, [dst2q]            ; q1
+    movrow           m6, [dst2q+ strideq  ] ; q2
+    movrow           m7, [dst2q+ strideq*2] ; q3
+%if mmsize == 16 && %2 == 8
+    movhps           m0, [dst8q+mstrideq*4]
+    movhps           m2, [dst8q+mstrideq*2]
+    add           dst8q, strideq
+    movhps           m1, [dst8q+mstrideq*4]
+    movhps           m5, [dst8q]
+    movhps           m6, [dst8q+ strideq  ]
+    movhps           m7, [dst8q+ strideq*2]
+    add           dst8q, mstrideq
+%endif
+%elif mmsize == 8 ; mmx/mmxext (h)
+    ; read 8 rows of 8px each
+    movu             m0, [dst1q+mstrideq*4]
+    movu             m1, [dst2q+mstrideq*4]
+    movu             m2, [dst1q+mstrideq*2]
+    movu             m3, [dst1q+mstrideq  ]
+    movu             m4, [dst1q]
+    movu             m5, [dst2q]
+    movu             m6, [dst2q+ strideq  ]
+
+    ; 8x8 transpose
+    TRANSPOSE4x4B     0, 1, 2, 3, 7
+    mova     m_q0backup, m1
+    movu             m7, [dst2q+ strideq*2]
+    TRANSPOSE4x4B     4, 5, 6, 7, 1
+    SBUTTERFLY       dq, 0, 4, 1     ; p3/p2
+    SBUTTERFLY       dq, 2, 6, 1     ; q0/q1
+    SBUTTERFLY       dq, 3, 7, 1     ; q2/q3
+    mova             m1, m_q0backup
+    mova     m_q0backup, m2          ; store q0
+    SBUTTERFLY       dq, 1, 5, 2     ; p1/p0
+    mova     m_p0backup, m5          ; store p0
+    SWAP              1, 4
+    SWAP              2, 4
+    SWAP              6, 3
+    SWAP              5, 3
+%else ; sse2 (h)
+%if %2 == 16
+    lea           dst8q, [dst1q+ strideq*8  ]
+%endif
+
+    ; read 16 rows of 8px each, interleave
+    movh             m0, [dst1q+mstrideq*4]
+    movh             m1, [dst8q+mstrideq*4]
+    movh             m2, [dst1q+mstrideq*2]
+    movh             m5, [dst8q+mstrideq*2]
+    movh             m3, [dst1q+mstrideq  ]
+    movh             m6, [dst8q+mstrideq  ]
+    movh             m4, [dst1q]
+    movh             m7, [dst8q]
+    punpcklbw        m0, m1          ; A/I
+    punpcklbw        m2, m5          ; C/K
+    punpcklbw        m3, m6          ; D/L
+    punpcklbw        m4, m7          ; E/M
+
+    add           dst8q, strideq
+    movh             m1, [dst2q+mstrideq*4]
+    movh             m6, [dst8q+mstrideq*4]
+    movh             m5, [dst2q]
+    movh             m7, [dst8q]
+    punpcklbw        m1, m6          ; B/J
+    punpcklbw        m5, m7          ; F/N
+    movh             m6, [dst2q+ strideq  ]
+    movh             m7, [dst8q+ strideq  ]
+    punpcklbw        m6, m7          ; G/O
+
+    ; 8x16 transpose
+    TRANSPOSE4x4B     0, 1, 2, 3, 7
+%ifdef m8
+    SWAP              1, 8
+%else
+    mova     m_q0backup, m1
+%endif
+    movh             m7, [dst2q+ strideq*2]
+    movh             m1, [dst8q+ strideq*2]
+    punpcklbw        m7, m1          ; H/P
+    TRANSPOSE4x4B     4, 5, 6, 7, 1
+    SBUTTERFLY       dq, 0, 4, 1     ; p3/p2
+    SBUTTERFLY       dq, 2, 6, 1     ; q0/q1
+    SBUTTERFLY       dq, 3, 7, 1     ; q2/q3
+%ifdef m8
+    SWAP              1, 8
+    SWAP              2, 8
+%else
+    mova             m1, m_q0backup
+    mova     m_q0backup, m2          ; store q0
+%endif
+    SBUTTERFLY       dq, 1, 5, 2     ; p1/p0
+%ifdef m12
+    SWAP              5, 12
+%else
+    mova     m_p0backup, m5          ; store p0
+%endif
+    SWAP              1, 4
+    SWAP              2, 4
+    SWAP              6, 3
+    SWAP              5, 3
+%endif
+
+    ; normal_limit for p3-p2, p2-p1, q3-q2 and q2-q1
+    mova             m4, m1
+    SWAP              4, 1
+    psubusb          m4, m0          ; p2-p3
+    psubusb          m0, m1          ; p3-p2
+    por              m0, m4          ; abs(p3-p2)
+
+    mova             m4, m2
+    SWAP              4, 2
+    psubusb          m4, m1          ; p1-p2
+    mova     m_p2backup, m1
+    psubusb          m1, m2          ; p2-p1
+    por              m1, m4          ; abs(p2-p1)
+
+    mova             m4, m6
+    SWAP              4, 6
+    psubusb          m4, m7          ; q2-q3
+    psubusb          m7, m6          ; q3-q2
+    por              m7, m4          ; abs(q3-q2)
+
+    mova             m4, m5
+    SWAP              4, 5
+    psubusb          m4, m6          ; q1-q2
+    mova     m_q2backup, m6
+    psubusb          m6, m5          ; q2-q1
+    por              m6, m4          ; abs(q2-q1)
+
+%if notcpuflag(mmxext)
+    mova             m4, m_flimI
+    pxor             m3, m3
+    psubusb          m0, m4
+    psubusb          m1, m4
+    psubusb          m7, m4
+    psubusb          m6, m4
+    pcmpeqb          m0, m3          ; abs(p3-p2) <= I
+    pcmpeqb          m1, m3          ; abs(p2-p1) <= I
+    pcmpeqb          m7, m3          ; abs(q3-q2) <= I
+    pcmpeqb          m6, m3          ; abs(q2-q1) <= I
+    pand             m0, m1
+    pand             m7, m6
+    pand             m0, m7
+%else ; mmxext/sse2
+    pmaxub           m0, m1
+    pmaxub           m6, m7
+    pmaxub           m0, m6
+%endif
+
+    ; normal_limit and high_edge_variance for p1-p0, q1-q0
+    SWAP              7, 3           ; now m7 is zero
+%ifidn %1, v
+    movrow           m3, [dst1q+mstrideq  ] ; p0
+%if mmsize == 16 && %2 == 8
+    movhps           m3, [dst8q+mstrideq  ]
+%endif
+%elifdef m12
+    SWAP              3, 12
+%else
+    mova             m3, m_p0backup
+%endif
+
+    mova             m1, m2
+    SWAP              1, 2
+    mova             m6, m3
+    SWAP              3, 6
+    psubusb          m1, m3          ; p1-p0
+    psubusb          m6, m2          ; p0-p1
+    por              m1, m6          ; abs(p1-p0)
+%if notcpuflag(mmxext)
+    mova             m6, m1
+    psubusb          m1, m4
+    psubusb          m6, m_hevthr
+    pcmpeqb          m1, m7          ; abs(p1-p0) <= I
+    pcmpeqb          m6, m7          ; abs(p1-p0) <= hev_thresh
+    pand             m0, m1
+    mova      m_maskres, m6
+%else ; mmxext/sse2
+    pmaxub           m0, m1          ; max_I
+    SWAP              1, 4           ; max_hev_thresh
+%endif
+
+    SWAP              6, 4           ; now m6 is I
+%ifidn %1, v
+    movrow           m4, [dst1q]     ; q0
+%if mmsize == 16 && %2 == 8
+    movhps           m4, [dst8q]
+%endif
+%elifdef m8
+    SWAP              4, 8
+%else
+    mova             m4, m_q0backup
+%endif
+    mova             m1, m4
+    SWAP              1, 4
+    mova             m7, m5
+    SWAP              7, 5
+    psubusb          m1, m5          ; q0-q1
+    psubusb          m7, m4          ; q1-q0
+    por              m1, m7          ; abs(q1-q0)
+%if notcpuflag(mmxext)
+    mova             m7, m1
+    psubusb          m1, m6
+    psubusb          m7, m_hevthr
+    pxor             m6, m6
+    pcmpeqb          m1, m6          ; abs(q1-q0) <= I
+    pcmpeqb          m7, m6          ; abs(q1-q0) <= hev_thresh
+    mova             m6, m_maskres
+    pand             m0, m1          ; abs([pq][321]-[pq][210]) <= I
+    pand             m6, m7
+%else ; mmxext/sse2
+    pxor             m7, m7
+    pmaxub           m0, m1
+    pmaxub           m6, m1
+    psubusb          m0, m_flimI
+    psubusb          m6, m_hevthr
+    pcmpeqb          m0, m7          ; max(abs(..)) <= I
+    pcmpeqb          m6, m7          ; !(max(abs..) > thresh)
+%endif
+%ifdef m12
+    SWAP              6, 12
+%else
+    mova      m_maskres, m6          ; !(abs(p1-p0) > hev_t || abs(q1-q0) > hev_t)
+%endif
+
+    ; simple_limit
+    mova             m1, m3
+    SWAP              1, 3
+    mova             m6, m4          ; keep copies of p0/q0 around for later use
+    SWAP              6, 4
+    psubusb          m1, m4          ; p0-q0
+    psubusb          m6, m3          ; q0-p0
+    por              m1, m6          ; abs(q0-p0)
+    paddusb          m1, m1          ; m1=2*abs(q0-p0)
+
+    mova             m7, m2
+    SWAP              7, 2
+    mova             m6, m5
+    SWAP              6, 5
+    psubusb          m7, m5          ; p1-q1
+    psubusb          m6, m2          ; q1-p1
+    por              m7, m6          ; abs(q1-p1)
+    pxor             m6, m6
+    pand             m7, [pb_FE]
+    psrlq            m7, 1           ; abs(q1-p1)/2
+    paddusb          m7, m1          ; abs(q0-p0)*2+abs(q1-p1)/2
+    psubusb          m7, m_flimE
+    pcmpeqb          m7, m6          ; abs(q0-p0)*2+abs(q1-p1)/2 <= E
+    pand             m0, m7          ; normal_limit result
+
+    ; filter_common; at this point, m2-m5=p1-q1 and m0 is filter_mask
+%ifdef m8 ; x86-64 && sse2
+    mova             m8, [pb_80]
+%define m_pb_80 m8
+%else ; x86-32 or mmx/mmxext
+%define m_pb_80 [pb_80]
+%endif
+    mova             m1, m4
+    mova             m7, m3
+    pxor             m1, m_pb_80
+    pxor             m7, m_pb_80
+    psubsb           m1, m7          ; (signed) q0-p0
+    mova             m6, m2
+    mova             m7, m5
+    pxor             m6, m_pb_80
+    pxor             m7, m_pb_80
+    psubsb           m6, m7          ; (signed) p1-q1
+    mova             m7, m_maskres
+    paddsb           m6, m1
+    paddsb           m6, m1
+    paddsb           m6, m1
+    pand             m6, m0
+%ifdef m8
+    mova       m_limres, m6          ; 3*(qp-p0)+(p1-q1) masked for filter_mbedge
+    pand       m_limres, m7
+%else
+    mova             m0, m6
+    pand             m0, m7
+    mova       m_limres, m0
+%endif
+    pandn            m7, m6          ; 3*(q0-p0)+(p1-q1) masked for filter_common
+
+    mova             m1, [pb_F8]
+    mova             m6, m7
+    paddsb           m7, [pb_3]
+    paddsb           m6, [pb_4]
+    pand             m7, m1
+    pand             m6, m1
+
+    pxor             m1, m1
+    pxor             m0, m0
+    pcmpgtb          m1, m7
+    psubb            m0, m7
+    psrlq            m7, 3           ; +f2
+    psrlq            m0, 3           ; -f2
+    pand             m0, m1
+    pandn            m1, m7
+    psubusb          m3, m0
+    paddusb          m3, m1          ; p0+f2
+
+    pxor             m1, m1
+    pxor             m0, m0
+    pcmpgtb          m0, m6
+    psubb            m1, m6
+    psrlq            m6, 3           ; +f1
+    psrlq            m1, 3           ; -f1
+    pand             m1, m0
+    pandn            m0, m6
+    psubusb          m4, m0
+    paddusb          m4, m1          ; q0-f1
+
+    ; filter_mbedge (m2-m5 = p1-q1; lim_res carries w)
+%if cpuflag(ssse3)
+    mova             m7, [pb_1]
+%else
+    mova             m7, [pw_63]
+%endif
+%ifdef m8
+    SWAP              1, 8
+%else
+    mova             m1, m_limres
+%endif
+    pxor             m0, m0
+    mova             m6, m1
+    pcmpgtb          m0, m1         ; which are negative
+%if cpuflag(ssse3)
+    punpcklbw        m6, m7         ; interleave with "1" for rounding
+    punpckhbw        m1, m7
+%else
+    punpcklbw        m6, m0         ; signed byte->word
+    punpckhbw        m1, m0
+%endif
+    mova      m_limsign, m0
+%if cpuflag(ssse3)
+    mova             m7, [pb_27_63]
+%ifndef m8
+    mova       m_limres, m1
+%endif
+%ifdef m10
+    SWAP              0, 10         ; don't lose lim_sign copy
+%endif
+    mova             m0, m7
+    pmaddubsw        m7, m6
+    SWAP              6, 7
+    pmaddubsw        m0, m1
+    SWAP              1, 0
+%ifdef m10
+    SWAP              0, 10
+%else
+    mova             m0, m_limsign
+%endif
+%else
+    mova      m_maskres, m6         ; backup for later in filter
+    mova       m_limres, m1
+    pmullw          m6, [pw_27]
+    pmullw          m1, [pw_27]
+    paddw           m6, m7
+    paddw           m1, m7
+%endif
+    psraw           m6, 7
+    psraw           m1, 7
+    packsswb        m6, m1          ; a0
+    pxor            m1, m1
+    psubb           m1, m6
+    pand            m1, m0          ; -a0
+    pandn           m0, m6          ; +a0
+%if cpuflag(ssse3)
+    mova            m6, [pb_18_63]  ; pipelining
+%endif
+    psubusb         m3, m1
+    paddusb         m4, m1
+    paddusb         m3, m0          ; p0+a0
+    psubusb         m4, m0          ; q0-a0
+
+%if cpuflag(ssse3)
+    SWAP             6, 7
+%ifdef m10
+    SWAP             1, 10
+%else
+    mova            m1, m_limres
+%endif
+    mova            m0, m7
+    pmaddubsw       m7, m6
+    SWAP             6, 7
+    pmaddubsw       m0, m1
+    SWAP             1, 0
+%ifdef m10
+    SWAP             0, 10
+%endif
+    mova            m0, m_limsign
+%else
+    mova            m6, m_maskres
+    mova            m1, m_limres
+    pmullw          m6, [pw_18]
+    pmullw          m1, [pw_18]
+    paddw           m6, m7
+    paddw           m1, m7
+%endif
+    mova            m0, m_limsign
+    psraw           m6, 7
+    psraw           m1, 7
+    packsswb        m6, m1          ; a1
+    pxor            m1, m1
+    psubb           m1, m6
+    pand            m1, m0          ; -a1
+    pandn           m0, m6          ; +a1
+%if cpuflag(ssse3)
+    mova            m6, [pb_9_63]
+%endif
+    psubusb         m2, m1
+    paddusb         m5, m1
+    paddusb         m2, m0          ; p1+a1
+    psubusb         m5, m0          ; q1-a1
+
+%if cpuflag(ssse3)
+    SWAP             6, 7
+%ifdef m10
+    SWAP             1, 10
+%else
+    mova            m1, m_limres
+%endif
+    mova            m0, m7
+    pmaddubsw       m7, m6
+    SWAP             6, 7
+    pmaddubsw       m0, m1
+    SWAP             1, 0
+%else
+%ifdef m8
+    SWAP             6, 12
+    SWAP             1, 8
+%else
+    mova            m6, m_maskres
+    mova            m1, m_limres
+%endif
+    pmullw          m6, [pw_9]
+    pmullw          m1, [pw_9]
+    paddw           m6, m7
+    paddw           m1, m7
+%endif
+%ifdef m9
+    SWAP             7, 9
+%else
+    mova            m7, m_limsign
+%endif
+    psraw           m6, 7
+    psraw           m1, 7
+    packsswb        m6, m1          ; a1
+    pxor            m0, m0
+    psubb           m0, m6
+    pand            m0, m7          ; -a1
+    pandn           m7, m6          ; +a1
+%ifdef m8
+    SWAP             1, 13
+    SWAP             6, 14
+%else
+    mova            m1, m_p2backup
+    mova            m6, m_q2backup
+%endif
+    psubusb         m1, m0
+    paddusb         m6, m0
+    paddusb         m1, m7          ; p1+a1
+    psubusb         m6, m7          ; q1-a1
+
+    ; store
+%ifidn %1, v
+    movrow [dst2q+mstrideq*4], m1
+    movrow [dst1q+mstrideq*2], m2
+    movrow [dst1q+mstrideq  ], m3
+    movrow     [dst1q], m4
+    movrow     [dst2q], m5
+    movrow [dst2q+ strideq  ], m6
+%if mmsize == 16 && %2 == 8
+    add           dst8q, mstrideq
+    movhps [dst8q+mstrideq*2], m1
+    movhps [dst8q+mstrideq  ], m2
+    movhps     [dst8q], m3
+    add          dst8q, strideq
+    movhps     [dst8q], m4
+    movhps [dst8q+ strideq  ], m5
+    movhps [dst8q+ strideq*2], m6
+%endif
+%else ; h
+    inc          dst1q
+    inc          dst2q
+
+    ; 4x8/16 transpose
+    TRANSPOSE4x4B    1, 2, 3, 4, 0
+    SBUTTERFLY      bw, 5, 6, 0
+
+%if mmsize == 8 ; mmx/mmxext (h)
+    WRITE_4x2D       1, 2, 3, 4, dst1q, dst2q, mstrideq, strideq
+    add          dst1q, 4
+    WRITE_2x4W      m5, m6, dst2q, dst1q, mstrideq, strideq
+%else ; sse2 (h)
+    lea          dst8q, [dst8q+mstrideq+1]
+    WRITE_4x4D       1, 2, 3, 4, dst1q, dst2q, dst8q, mstrideq, strideq, %2
+    lea          dst1q, [dst2q+mstrideq+4]
+    lea          dst8q, [dst8q+mstrideq+4]
+%if cpuflag(sse4)
+    add          dst2q, 4
+%endif
+    WRITE_8W        m5, dst2q, dst1q,  mstrideq, strideq
+%if cpuflag(sse4)
+    lea          dst2q, [dst8q+ strideq  ]
+%endif
+    WRITE_8W        m6, dst2q, dst8q, mstrideq, strideq
+%endif
+%endif
+
+%if mmsize == 8
+%if %2 == 8 ; chroma
+%ifidn %1, h
+    sub          dst1q, 5
+%endif
+    cmp          dst1q, dst8q
+    mov          dst1q, dst8q
+    jnz .next8px
+%else
+%ifidn %1, h
+    lea          dst1q, [dst1q+ strideq*8-5]
+%else ; v
+    add          dst1q, 8
+%endif
+    dec          cntrq
+    jg .next8px
+%endif
+    REP_RET
+%else ; mmsize == 16
+    RET
+%endif
+%endmacro
+
+%if ARCH_X86_32
+INIT_MMX mmx
+MBEDGE_LOOPFILTER v, 16
+MBEDGE_LOOPFILTER h, 16
+MBEDGE_LOOPFILTER v,  8
+MBEDGE_LOOPFILTER h,  8
+
+INIT_MMX mmxext
+MBEDGE_LOOPFILTER v, 16
+MBEDGE_LOOPFILTER h, 16
+MBEDGE_LOOPFILTER v,  8
+MBEDGE_LOOPFILTER h,  8
+%endif
+
+INIT_XMM sse2
+MBEDGE_LOOPFILTER v, 16
+MBEDGE_LOOPFILTER h, 16
+MBEDGE_LOOPFILTER v,  8
+MBEDGE_LOOPFILTER h,  8
+
+INIT_XMM ssse3
+MBEDGE_LOOPFILTER v, 16
+MBEDGE_LOOPFILTER h, 16
+MBEDGE_LOOPFILTER v,  8
+MBEDGE_LOOPFILTER h,  8
+
+INIT_XMM sse4
+MBEDGE_LOOPFILTER h, 16
+MBEDGE_LOOPFILTER h,  8

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/x86/vp9dsp_init.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/x86/vp9dsp_init.c Changed

@@ -20,9 +20,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/attributes.h"
 #include "libavutil/cpu.h"
 #include "libavutil/mem.h"
 #include "libavutil/x86/asm.h"
+#include "libavutil/x86/cpu.h"
 #include "libavcodec/vp9dsp.h"
 
 #if HAVE_YASM
@@ -36,8 +38,8 @@
 fpel_func(put, 16, sse);
 fpel_func(put, 32, sse);
 fpel_func(put, 64, sse);
-fpel_func(avg,  4, sse);
-fpel_func(avg,  8, sse);
+fpel_func(avg,  4, mmxext);
+fpel_func(avg,  8, mmxext);
 fpel_func(avg, 16, sse2);
 fpel_func(avg, 32, sse2);
 fpel_func(avg, 64, sse2);
@@ -55,6 +57,9 @@
 
 mc_funcs(4);
 mc_funcs(8);
+#if ARCH_X86_64
+mc_funcs(16);
+#endif
 
 #undef mc_funcs
 #undef mc_func
@@ -77,7 +82,9 @@
 mc_rep_func(put, sz, hsz, v, ssse3); \
 mc_rep_func(avg, sz, hsz, v, ssse3)
 
+#if ARCH_X86_32
 mc_rep_funcs(16, 8);
+#endif
 mc_rep_funcs(32, 16);
 mc_rep_funcs(64, 32);
 
@@ -150,6 +157,94 @@
 #undef filters_8tap_1d_fn3
 #undef filter_8tap_1d_fn
 
+#define itxfm_func(typea, typeb, size, opt) \
+void ff_vp9_##typea##_##typeb##_##size##x##size##_add_##opt(uint8_t *dst, ptrdiff_t stride, \
+                                                            int16_t *block, int eob)
+#define itxfm_funcs(size, opt) \
+itxfm_func(idct,  idct,  size, opt); \
+itxfm_func(iadst, idct,  size, opt); \
+itxfm_func(idct,  iadst, size, opt); \
+itxfm_func(iadst, iadst, size, opt)
+
+itxfm_funcs(4, ssse3);
+itxfm_funcs(8, ssse3);
+itxfm_funcs(8, avx);
+itxfm_funcs(16, ssse3);
+itxfm_funcs(16, avx);
+itxfm_func(idct, idct, 32, ssse3);
+itxfm_func(idct, idct, 32, avx);
+itxfm_func(iwht, iwht, 4, mmx);
+
+#undef itxfm_func
+#undef itxfm_funcs
+
+#define lpf_funcs(size1, size2, opt) \
+void ff_vp9_loop_filter_v_##size1##_##size2##_##opt(uint8_t *dst, ptrdiff_t stride, \
+                                                    int E, int I, int H); \
+void ff_vp9_loop_filter_h_##size1##_##size2##_##opt(uint8_t *dst, ptrdiff_t stride, \
+                                                    int E, int I, int H)
+
+lpf_funcs(16, 16, sse2);
+lpf_funcs(16, 16, ssse3);
+lpf_funcs(16, 16, avx);
+lpf_funcs(44, 16, sse2);
+lpf_funcs(44, 16, ssse3);
+lpf_funcs(44, 16, avx);
+lpf_funcs(84, 16, sse2);
+lpf_funcs(84, 16, ssse3);
+lpf_funcs(84, 16, avx);
+lpf_funcs(48, 16, sse2);
+lpf_funcs(48, 16, ssse3);
+lpf_funcs(48, 16, avx);
+lpf_funcs(88, 16, sse2);
+lpf_funcs(88, 16, ssse3);
+lpf_funcs(88, 16, avx);
+
+#undef lpf_funcs
+
+#define ipred_func(size, type, opt) \
+void ff_vp9_ipred_##type##_##size##x##size##_##opt(uint8_t *dst, ptrdiff_t stride, \
+                                                   const uint8_t *l, const uint8_t *a)
+
+#define ipred_funcs(type, opt) \
+ipred_func(4, type, opt); \
+ipred_func(8, type, opt); \
+ipred_func(16, type, opt); \
+ipred_func(32, type, opt)
+
+ipred_funcs(dc, ssse3);
+ipred_funcs(dc_left, ssse3);
+ipred_funcs(dc_top, ssse3);
+
+#undef ipred_funcs
+
+ipred_func(8, v, mmx);
+ipred_func(16, v, sse2);
+ipred_func(32, v, sse2);
+
+#define ipred_func_set(size, type, opt1, opt2) \
+ipred_func(size, type, opt1); \
+ipred_func(size, type, opt2)
+
+#define ipred_funcs(type, opt1, opt2) \
+ipred_func(4, type, opt1); \
+ipred_func_set(8, type, opt1, opt2); \
+ipred_func_set(16, type, opt1, opt2); \
+ipred_func_set(32, type, opt1, opt2)
+
+ipred_funcs(h, ssse3, avx);
+ipred_funcs(tm, ssse3, avx);
+ipred_funcs(dl, ssse3, avx);
+ipred_funcs(dr, ssse3, avx);
+ipred_funcs(hu, ssse3, avx);
+ipred_funcs(hd, ssse3, avx);
+ipred_funcs(vl, ssse3, avx);
+ipred_funcs(vr, ssse3, avx);
+
+#undef ipred_funcs
+#undef ipred_func_set
+#undef ipred_func
+
 #endif /* HAVE_YASM */
 
 av_cold void ff_vp9dsp_init_x86(VP9DSPContext *dsp)
@@ -163,7 +258,6 @@
     dsp->mc[idx1][FILTER_8TAP_SHARP  ][idx2][0][0] = \
     dsp->mc[idx1][FILTER_BILINEAR    ][idx2][0][0] = ff_##type##sz##_##opt
 
-
 #define init_subpel1(idx1, idx2, idxh, idxv, sz, dir, type, opt) \
     dsp->mc[idx1][FILTER_8TAP_SMOOTH ][idx2][idxh][idxv] = type##_8tap_smooth_##sz##dir##_##opt; \
     dsp->mc[idx1][FILTER_8TAP_REGULAR][idx2][idxh][idxv] = type##_8tap_regular_##sz##dir##_##opt; \
@@ -181,28 +275,117 @@
     init_subpel2(idx, 0, 1, v, type, opt); \
     init_subpel2(idx, 1, 0, h, type, opt)
 
-    if (cpu_flags & AV_CPU_FLAG_MMX) {
+#define init_lpf(opt) do { \
+    if (ARCH_X86_64) { \
+        dsp->loop_filter_16[0] = ff_vp9_loop_filter_h_16_16_##opt; \
+        dsp->loop_filter_16[1] = ff_vp9_loop_filter_v_16_16_##opt; \
+        dsp->loop_filter_mix2[0][0][0] = ff_vp9_loop_filter_h_44_16_##opt; \
+        dsp->loop_filter_mix2[0][0][1] = ff_vp9_loop_filter_v_44_16_##opt; \
+        dsp->loop_filter_mix2[0][1][0] = ff_vp9_loop_filter_h_48_16_##opt; \
+        dsp->loop_filter_mix2[0][1][1] = ff_vp9_loop_filter_v_48_16_##opt; \
+        dsp->loop_filter_mix2[1][0][0] = ff_vp9_loop_filter_h_84_16_##opt; \
+        dsp->loop_filter_mix2[1][0][1] = ff_vp9_loop_filter_v_84_16_##opt; \
+        dsp->loop_filter_mix2[1][1][0] = ff_vp9_loop_filter_h_88_16_##opt; \
+        dsp->loop_filter_mix2[1][1][1] = ff_vp9_loop_filter_v_88_16_##opt; \
+    } \
+} while (0)
+
+#define init_ipred(tx, sz, opt) do { \
+    dsp->intra_pred[tx][HOR_PRED]             = ff_vp9_ipred_h_##sz##x##sz##_##opt; \
+    dsp->intra_pred[tx][DIAG_DOWN_LEFT_PRED]  = ff_vp9_ipred_dl_##sz##x##sz##_##opt; \
+    dsp->intra_pred[tx][DIAG_DOWN_RIGHT_PRED] = ff_vp9_ipred_dr_##sz##x##sz##_##opt; \
+    dsp->intra_pred[tx][HOR_DOWN_PRED]        = ff_vp9_ipred_hd_##sz##x##sz##_##opt; \
+    dsp->intra_pred[tx][VERT_LEFT_PRED]       = ff_vp9_ipred_vl_##sz##x##sz##_##opt; \
+    dsp->intra_pred[tx][HOR_UP_PRED]          = ff_vp9_ipred_hu_##sz##x##sz##_##opt; \
+    if (ARCH_X86_64 || tx != TX_32X32) { \
+        dsp->intra_pred[tx][VERT_RIGHT_PRED]      = ff_vp9_ipred_vr_##sz##x##sz##_##opt; \
+        dsp->intra_pred[tx][TM_VP8_PRED]          = ff_vp9_ipred_tm_##sz##x##sz##_##opt; \
+    } \
+} while (0)
+#define init_dc_ipred(tx, sz, opt) do { \
+    init_ipred(tx, sz, opt); \
+    dsp->intra_pred[tx][DC_PRED]              = ff_vp9_ipred_dc_##sz##x##sz##_##opt; \
+    dsp->intra_pred[tx][LEFT_DC_PRED]         = ff_vp9_ipred_dc_left_##sz##x##sz##_##opt; \
+    dsp->intra_pred[tx][TOP_DC_PRED]          = ff_vp9_ipred_dc_top_##sz##x##sz##_##opt; \
+} while (0)
+
+    if (EXTERNAL_MMX(cpu_flags)) {
         init_fpel(4, 0,  4, put, mmx);
         init_fpel(3, 0,  8, put, mmx);
+        dsp->itxfm_add[4 /* lossless */][DCT_DCT] =
+        dsp->itxfm_add[4 /* lossless */][ADST_DCT] =
+        dsp->itxfm_add[4 /* lossless */][DCT_ADST] =
+        dsp->itxfm_add[4 /* lossless */][ADST_ADST] = ff_vp9_iwht_iwht_4x4_add_mmx;
+        dsp->intra_pred[TX_8X8][VERT_PRED] = ff_vp9_ipred_v_8x8_mmx;
+    }
+
+    if (EXTERNAL_MMXEXT(cpu_flags)) {
+        init_fpel(4, 1,  4, avg, mmxext);
+        init_fpel(3, 1,  8, avg, mmxext);
     }
 
-    if (cpu_flags & AV_CPU_FLAG_SSE) {
+    if (EXTERNAL_SSE(cpu_flags)) {
         init_fpel(2, 0, 16, put, sse);
         init_fpel(1, 0, 32, put, sse);
         init_fpel(0, 0, 64, put, sse);
-        init_fpel(4, 1,  4, avg, sse);
-        init_fpel(3, 1,  8, avg, sse);
     }
 
-    if (cpu_flags & AV_CPU_FLAG_SSE2) {
+    if (EXTERNAL_SSE2(cpu_flags)) {
         init_fpel(2, 1, 16, avg, sse2);
         init_fpel(1, 1, 32, avg, sse2);
         init_fpel(0, 1, 64, avg, sse2);
+        init_lpf(sse2);
+        dsp->intra_pred[TX_16X16][VERT_PRED] = ff_vp9_ipred_v_16x16_sse2;
+        dsp->intra_pred[TX_32X32][VERT_PRED] = ff_vp9_ipred_v_32x32_sse2;
     }
 
-    if (cpu_flags & AV_CPU_FLAG_SSSE3) {
+    if (EXTERNAL_SSSE3(cpu_flags)) {
         init_subpel3(0, put, ssse3);
         init_subpel3(1, avg, ssse3);
+        dsp->itxfm_add[TX_4X4][DCT_DCT] = ff_vp9_idct_idct_4x4_add_ssse3;
+        dsp->itxfm_add[TX_4X4][ADST_DCT]  = ff_vp9_idct_iadst_4x4_add_ssse3;
+        dsp->itxfm_add[TX_4X4][DCT_ADST]  = ff_vp9_iadst_idct_4x4_add_ssse3;
+        dsp->itxfm_add[TX_4X4][ADST_ADST] = ff_vp9_iadst_iadst_4x4_add_ssse3;
+        if (ARCH_X86_64) {
+            dsp->itxfm_add[TX_8X8][DCT_DCT] = ff_vp9_idct_idct_8x8_add_ssse3;
+            dsp->itxfm_add[TX_8X8][ADST_DCT]  = ff_vp9_idct_iadst_8x8_add_ssse3;
+            dsp->itxfm_add[TX_8X8][DCT_ADST]  = ff_vp9_iadst_idct_8x8_add_ssse3;
+            dsp->itxfm_add[TX_8X8][ADST_ADST] = ff_vp9_iadst_iadst_8x8_add_ssse3;
+            dsp->itxfm_add[TX_16X16][DCT_DCT]   = ff_vp9_idct_idct_16x16_add_ssse3;
+            dsp->itxfm_add[TX_16X16][ADST_DCT]  = ff_vp9_idct_iadst_16x16_add_ssse3;
+            dsp->itxfm_add[TX_16X16][DCT_ADST]  = ff_vp9_iadst_idct_16x16_add_ssse3;
+            dsp->itxfm_add[TX_16X16][ADST_ADST] = ff_vp9_iadst_iadst_16x16_add_ssse3;
+            dsp->itxfm_add[TX_32X32][ADST_ADST] =
+            dsp->itxfm_add[TX_32X32][ADST_DCT] =
+            dsp->itxfm_add[TX_32X32][DCT_ADST] =
+            dsp->itxfm_add[TX_32X32][DCT_DCT] = ff_vp9_idct_idct_32x32_add_ssse3;
+        }
+        init_lpf(ssse3);
+        init_dc_ipred(TX_4X4,    4, ssse3);
+        init_dc_ipred(TX_8X8,    8, ssse3);
+        init_dc_ipred(TX_16X16, 16, ssse3);
+        init_dc_ipred(TX_32X32, 32, ssse3);
+    }
+
+    if (EXTERNAL_AVX(cpu_flags)) {
+        if (ARCH_X86_64) {
+            dsp->itxfm_add[TX_8X8][DCT_DCT] = ff_vp9_idct_idct_8x8_add_avx;
+            dsp->itxfm_add[TX_8X8][ADST_DCT]  = ff_vp9_idct_iadst_8x8_add_avx;
+            dsp->itxfm_add[TX_8X8][DCT_ADST]  = ff_vp9_iadst_idct_8x8_add_avx;
+            dsp->itxfm_add[TX_8X8][ADST_ADST] = ff_vp9_iadst_iadst_8x8_add_avx;
+            dsp->itxfm_add[TX_16X16][DCT_DCT] = ff_vp9_idct_idct_16x16_add_avx;
+            dsp->itxfm_add[TX_16X16][ADST_DCT]  = ff_vp9_idct_iadst_16x16_add_avx;
+            dsp->itxfm_add[TX_16X16][DCT_ADST]  = ff_vp9_iadst_idct_16x16_add_avx;
+            dsp->itxfm_add[TX_16X16][ADST_ADST] = ff_vp9_iadst_iadst_16x16_add_avx;
+            dsp->itxfm_add[TX_32X32][ADST_ADST] =
+            dsp->itxfm_add[TX_32X32][ADST_DCT] =
+            dsp->itxfm_add[TX_32X32][DCT_ADST] =
+            dsp->itxfm_add[TX_32X32][DCT_DCT] = ff_vp9_idct_idct_32x32_add_avx;
+        }
+        init_lpf(avx);
+        init_ipred(TX_8X8,    8, avx);
+        init_ipred(TX_16X16, 16, avx);
+        init_ipred(TX_32X32, 32, avx);
     }
 
 #undef init_fpel

omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/x86/vp9intrapred.asm Added

@@ -0,0 +1,1405 @@
+;******************************************************************************
+;* VP9 Intra prediction SIMD optimizations
+;*
+;* Copyright (c) 2013 Ronald S. Bultje <rsbultje gmail com>
+;*
+;* Parts based on:
+;* H.264 intra prediction asm optimizations
+;* Copyright (c) 2010 Jason Garrett-Glaser
+;* Copyright (c) 2010 Holger Lubitz
+;* Copyright (c) 2010 Loren Merritt
+;* Copyright (c) 2010 Ronald S. Bultje
+;*
+;* This file is part of FFmpeg.
+;*
+;* FFmpeg is free software; you can redistribute it and/or
+;* modify it under the terms of the GNU Lesser General Public
+;* License as published by the Free Software Foundation; either
+;* version 2.1 of the License, or (at your option) any later version.
+;*
+;* FFmpeg is distributed in the hope that it will be useful,
+;* but WITHOUT ANY WARRANTY; without even the implied warranty of
+;* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;* Lesser General Public License for more details.
+;*
+;* You should have received a copy of the GNU Lesser General Public
+;* License along with FFmpeg; if not, write to the Free Software
+;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+;******************************************************************************
+
+%include "libavutil/x86/x86util.asm"
+
+SECTION_RODATA
+
+pw_m256: times 8 dw -256
+pw_m255: times 8 dw -255
+pw_512:  times 8 dw  512
+pw_1024: times 8 dw 1024
+pw_2048: times 8 dw 2048
+pw_4096: times 8 dw 4096
+pw_8192: times 8 dw 8192
+
+pb_4x3_4x2_4x1_4x0: times 4 db 3
+                    times 4 db 2
+                    times 4 db 1
+                    times 4 db 0
+pb_8x1_8x0:   times 8 db 1
+              times 8 db 0
+pb_8x3_8x2:   times 8 db 3
+              times 8 db 2
+pb_0to5_2x7:  db 0, 1, 2, 3, 4, 5, 7, 7
+              times 8 db -1
+pb_0to6_9x7:  db 0, 1, 2, 3, 4, 5, 6
+              times 9 db 7
+pb_1to6_10x7: db 1, 2, 3, 4, 5, 6
+              times 10 db 7
+pb_2to6_3x7:
+pb_2to6_11x7: db 2, 3, 4, 5, 6
+              times 11 db 7
+pb_1toE_2xF:  db 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 15
+pb_2toE_3xF:  db 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 15, 15
+pb_13456_3xm1: db 1, 3, 4, 5, 6
+               times 3 db -1
+pb_6012_4xm1: db 6, 0, 1, 2
+              times 4 db -1
+pb_6xm1_246_8toE: times 6 db -1
+                  db 2, 4, 6, 8, 9, 10, 11, 12, 13, 14
+pb_6xm1_BDF_0to6: times 6 db -1
+                  db 11, 13, 15, 0, 1, 2, 3, 4, 5, 6
+pb_02468ACE_13579BDF: db 0, 2, 4, 6, 8, 10, 12, 14, 1, 3, 5, 7, 9, 11, 13, 15
+pb_7to1_9x0:  db 7, 6, 5, 4
+pb_3to1_5x0:  db 3, 2, 1
+              times 9 db 0
+pb_Fto0:      db 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0
+
+pb_2:  times 16 db 2
+pb_15: times 16 db 15
+
+cextern pb_1
+cextern pb_3
+
+SECTION .text
+
+; dc_NxN(uint8_t *dst, ptrdiff_t stride, const uint8_t *l, const uint8_t *a)
+
+INIT_MMX ssse3
+cglobal vp9_ipred_dc_4x4, 4, 4, 0, dst, stride, l, a
+    movd                    m0, [lq]
+    punpckldq               m0, [aq]
+    pxor                    m1, m1
+    psadbw                  m0, m1
+    pmulhrsw                m0, [pw_4096]
+    pshufb                  m0, m1
+    movd      [dstq+strideq*0], m0
+    movd      [dstq+strideq*1], m0
+    lea                   dstq, [dstq+strideq*2]
+    movd      [dstq+strideq*0], m0
+    movd      [dstq+strideq*1], m0
+    RET
+
+INIT_MMX ssse3
+cglobal vp9_ipred_dc_8x8, 4, 4, 0, dst, stride, l, a
+    movq                    m0, [lq]
+    movq                    m1, [aq]
+    DEFINE_ARGS dst, stride, stride3
+    lea               stride3q, [strideq*3]
+    pxor                    m2, m2
+    psadbw                  m0, m2
+    psadbw                  m1, m2
+    paddw                   m0, m1
+    pmulhrsw                m0, [pw_2048]
+    pshufb                  m0, m2
+    movq      [dstq+strideq*0], m0
+    movq      [dstq+strideq*1], m0
+    movq      [dstq+strideq*2], m0
+    movq      [dstq+stride3q ], m0
+    lea                   dstq, [dstq+strideq*4]
+    movq      [dstq+strideq*0], m0
+    movq      [dstq+strideq*1], m0
+    movq      [dstq+strideq*2], m0
+    movq      [dstq+stride3q ], m0
+    RET
+
+INIT_XMM ssse3
+cglobal vp9_ipred_dc_16x16, 4, 4, 3, dst, stride, l, a
+    mova                    m0, [lq]
+    mova                    m1, [aq]
+    DEFINE_ARGS dst, stride, stride3, cnt
+    lea               stride3q, [strideq*3]
+    pxor                    m2, m2
+    psadbw                  m0, m2
+    psadbw                  m1, m2
+    paddw                   m0, m1
+    movhlps                 m1, m0
+    paddw                   m0, m1
+    pmulhrsw                m0, [pw_1024]
+    pshufb                  m0, m2
+    mov                   cntd, 4
+.loop:
+    mova      [dstq+strideq*0], m0
+    mova      [dstq+strideq*1], m0
+    mova      [dstq+strideq*2], m0
+    mova      [dstq+stride3q ], m0
+    lea                   dstq, [dstq+strideq*4]
+    dec                   cntd
+    jg .loop
+    RET
+
+INIT_XMM ssse3
+cglobal vp9_ipred_dc_32x32, 4, 4, 5, dst, stride, l, a
+    mova                    m0, [lq]
+    mova                    m1, [lq+16]
+    mova                    m2, [aq]
+    mova                    m3, [aq+16]
+    DEFINE_ARGS dst, stride, stride3, cnt
+    lea               stride3q, [strideq*3]
+    pxor                    m4, m4
+    psadbw                  m0, m4
+    psadbw                  m1, m4
+    psadbw                  m2, m4
+    psadbw                  m3, m4
+    paddw                   m0, m1
+    paddw                   m2, m3
+    paddw                   m0, m2
+    movhlps                 m1, m0
+    paddw                   m0, m1
+    pmulhrsw                m0, [pw_512]
+    pshufb                  m0, m4
+    mov                   cntd, 8
+.loop:
+    mova   [dstq+strideq*0+ 0], m0
+    mova   [dstq+strideq*0+16], m0
+    mova   [dstq+strideq*1+ 0], m0
+    mova   [dstq+strideq*1+16], m0
+    mova   [dstq+strideq*2+ 0], m0
+    mova   [dstq+strideq*2+16], m0
+    mova   [dstq+stride3q + 0], m0
+    mova   [dstq+stride3q +16], m0
+    lea                   dstq, [dstq+strideq*4]
+    dec                   cntd
+    jg .loop
+    RET
+
+; dc_top/left_NxN(uint8_t *dst, ptrdiff_t stride, const uint8_t *l, const uint8_t *a)
+
+%macro DC_1D_FUNCS 2 ; dir (top or left), arg (a or l)
+INIT_MMX ssse3
+cglobal vp9_ipred_dc_%1_4x4, 4, 4, 0, dst, stride, l, a
+    movd                    m0, [%2q]
+    pxor                    m1, m1
+    psadbw                  m0, m1
+    pmulhrsw                m0, [pw_8192]
+    pshufb                  m0, m1
+    movd      [dstq+strideq*0], m0
+    movd      [dstq+strideq*1], m0
+    lea                   dstq, [dstq+strideq*2]
+    movd      [dstq+strideq*0], m0
+    movd      [dstq+strideq*1], m0
+    RET
+
+INIT_MMX ssse3
+cglobal vp9_ipred_dc_%1_8x8, 4, 4, 0, dst, stride, l, a
+    movq                    m0, [%2q]
+    DEFINE_ARGS dst, stride, stride3
+    lea               stride3q, [strideq*3]
+    pxor                    m1, m1
+    psadbw                  m0, m1
+    pmulhrsw                m0, [pw_4096]
+    pshufb                  m0, m1
+    movq      [dstq+strideq*0], m0
+    movq      [dstq+strideq*1], m0
+    movq      [dstq+strideq*2], m0
+    movq      [dstq+stride3q ], m0
+    lea                   dstq, [dstq+strideq*4]
+    movq      [dstq+strideq*0], m0
+    movq      [dstq+strideq*1], m0
+    movq      [dstq+strideq*2], m0
+    movq      [dstq+stride3q ], m0
+    RET
+
+INIT_XMM ssse3
+cglobal vp9_ipred_dc_%1_16x16, 4, 4, 3, dst, stride, l, a
+    mova                    m0, [%2q]
+    DEFINE_ARGS dst, stride, stride3, cnt
+    lea               stride3q, [strideq*3]
+    pxor                    m2, m2
+    psadbw                  m0, m2
+    movhlps                 m1, m0
+    paddw                   m0, m1
+    pmulhrsw                m0, [pw_2048]
+    pshufb                  m0, m2
+    mov                   cntd, 4
+.loop:
+    mova      [dstq+strideq*0], m0
+    mova      [dstq+strideq*1], m0
+    mova      [dstq+strideq*2], m0
+    mova      [dstq+stride3q ], m0
+    lea                   dstq, [dstq+strideq*4]
+    dec                   cntd
+    jg .loop
+    RET
+
+INIT_XMM ssse3
+cglobal vp9_ipred_dc_%1_32x32, 4, 4, 3, dst, stride, l, a
+    mova                    m0, [%2q]
+    mova                    m1, [%2q+16]
+    DEFINE_ARGS dst, stride, stride3, cnt
+    lea               stride3q, [strideq*3]
+    pxor                    m2, m2
+    psadbw                  m0, m2
+    psadbw                  m1, m2
+    paddw                   m0, m1
+    movhlps                 m1, m0
+    paddw                   m0, m1
+    pmulhrsw                m0, [pw_1024]
+    pshufb                  m0, m2
+    mov                   cntd, 8
+.loop:
+    mova   [dstq+strideq*0+ 0], m0
+    mova   [dstq+strideq*0+16], m0
+    mova   [dstq+strideq*1+ 0], m0
+    mova   [dstq+strideq*1+16], m0
+    mova   [dstq+strideq*2+ 0], m0
+    mova   [dstq+strideq*2+16], m0
+    mova   [dstq+stride3q + 0], m0
+    mova   [dstq+stride3q +16], m0
+    lea                   dstq, [dstq+strideq*4]
+    dec                   cntd
+    jg .loop
+    RET
+%endmacro
+
+DC_1D_FUNCS top,  a
+DC_1D_FUNCS left, l
+
+; v
+
+INIT_MMX mmx
+cglobal vp9_ipred_v_8x8, 4, 4, 0, dst, stride, l, a
+    movq                    m0, [aq]
+    DEFINE_ARGS dst, stride, stride3
+    lea               stride3q, [strideq*3]
+    movq      [dstq+strideq*0], m0
+    movq      [dstq+strideq*1], m0
+    movq      [dstq+strideq*2], m0
+    movq      [dstq+stride3q ], m0
+    lea                   dstq, [dstq+strideq*4]
+    movq      [dstq+strideq*0], m0
+    movq      [dstq+strideq*1], m0
+    movq      [dstq+strideq*2], m0
+    movq      [dstq+stride3q ], m0
+    RET
+
+INIT_XMM sse2
+cglobal vp9_ipred_v_16x16, 4, 4, 1, dst, stride, l, a
+    mova                    m0, [aq]
+    DEFINE_ARGS dst, stride, stride3, cnt
+    lea               stride3q, [strideq*3]
+    mov                   cntd, 4
+.loop:
+    mova      [dstq+strideq*0], m0
+    mova      [dstq+strideq*1], m0
+    mova      [dstq+strideq*2], m0
+    mova      [dstq+stride3q ], m0
+    lea                   dstq, [dstq+strideq*4]
+    dec                   cntd
+    jg .loop
+    RET
+
+INIT_XMM sse2
+cglobal vp9_ipred_v_32x32, 4, 4, 2, dst, stride, l, a
+    mova                    m0, [aq]
+    mova                    m1, [aq+16]
+    DEFINE_ARGS dst, stride, stride3, cnt
+    lea               stride3q, [strideq*3]
+    mov                   cntd, 8
+.loop:
+    mova   [dstq+strideq*0+ 0], m0
+    mova   [dstq+strideq*0+16], m1
+    mova   [dstq+strideq*1+ 0], m0
+    mova   [dstq+strideq*1+16], m1
+    mova   [dstq+strideq*2+ 0], m0
+    mova   [dstq+strideq*2+16], m1
+    mova   [dstq+stride3q + 0], m0
+    mova   [dstq+stride3q +16], m1
+    lea                   dstq, [dstq+strideq*4]
+    dec                   cntd
+    jg .loop
+    RET
+
+; h
+
+INIT_XMM ssse3
+cglobal vp9_ipred_h_4x4, 3, 4, 1, dst, stride, l, stride3
+    movd                    m0, [lq]
+    pshufb                  m0, [pb_4x3_4x2_4x1_4x0]
+    lea               stride3q, [strideq*3]
+    movd      [dstq+strideq*0], m0
+    psrldq                  m0, 4
+    movd      [dstq+strideq*1], m0
+    psrldq                  m0, 4
+    movd      [dstq+strideq*2], m0
+    psrldq                  m0, 4
+    movd      [dstq+stride3q ], m0
+    RET
+
+%macro H_XMM_FUNCS 1
+INIT_XMM %1
+cglobal vp9_ipred_h_8x8, 3, 5, 4, dst, stride, l, stride3, cnt
+    mova                    m2, [pb_8x1_8x0]
+    mova                    m3, [pb_8x3_8x2]
+    lea               stride3q, [strideq*3]
+    mov                   cntq, 1
+.loop:
+    movd                    m0, [lq+cntq*4]
+    pshufb                  m1, m0, m3
+    pshufb                  m0, m2
+    movq      [dstq+strideq*0], m1
+    movhps    [dstq+strideq*1], m1
+    movq      [dstq+strideq*2], m0
+    movhps    [dstq+stride3q ], m0
+    lea                   dstq, [dstq+strideq*4]
+    dec                   cntq
+    jge .loop
+    RET
+
+INIT_XMM %1
+cglobal vp9_ipred_h_16x16, 3, 5, 8, dst, stride, l, stride3, cnt
+    mova                    m5, [pb_1]
+    mova                    m6, [pb_2]
+    mova                    m7, [pb_3]
+    pxor                    m4, m4
+    lea               stride3q, [strideq*3]
+    mov                   cntq, 3
+.loop:
+    movd                    m3, [lq+cntq*4]
+    pshufb                  m0, m3, m7
+    pshufb                  m1, m3, m6
+    mova      [dstq+strideq*0], m0
+    mova      [dstq+strideq*1], m1
+    pshufb                  m2, m3, m5
+    pshufb                  m3, m4
+    mova      [dstq+strideq*2], m2
+    mova      [dstq+stride3q ], m3
+    lea                   dstq, [dstq+strideq*4]
+    dec                   cntq
+    jge .loop
+    RET
+
+INIT_XMM %1
+cglobal vp9_ipred_h_32x32, 3, 5, 8, dst, stride, l, stride3, cnt
+    mova                    m5, [pb_1]
+    mova                    m6, [pb_2]
+    mova                    m7, [pb_3]
+    pxor                    m4, m4
+    lea               stride3q, [strideq*3]
+    mov                   cntq, 7
+.loop:
+    movd                    m3, [lq+cntq*4]
+    pshufb                  m0, m3, m7
+    pshufb                  m1, m3, m6
+    mova   [dstq+strideq*0+ 0], m0
+    mova   [dstq+strideq*0+16], m0
+    mova   [dstq+strideq*1+ 0], m1
+    mova   [dstq+strideq*1+16], m1
+    pshufb                  m2, m3, m5
+    pshufb                  m3, m4
+    mova   [dstq+strideq*2+ 0], m2
+    mova   [dstq+strideq*2+16], m2
+    mova   [dstq+stride3q + 0], m3
+    mova   [dstq+stride3q +16], m3
+    lea                   dstq, [dstq+strideq*4]
+    dec                   cntq
+    jge .loop
+    RET
+%endmacro
+
+H_XMM_FUNCS ssse3
+H_XMM_FUNCS avx
+
+; tm
+
+INIT_MMX ssse3
+cglobal vp9_ipred_tm_4x4, 4, 4, 0, dst, stride, l, a
+    pxor                    m1, m1
+    pinsrw                  m2, [aq-1], 0
+    movd                    m0, [aq]
+    DEFINE_ARGS dst, stride, l, cnt
+    mova                    m3, [pw_m256]
+    mova                    m4, [pw_m255]
+    pshufb                  m2, m3
+    punpcklbw               m0, m1
+    psubw                   m0, m2
+    mov                   cntq, 1
+.loop:
+    pinsrw                  m2, [lq+cntq*2], 0
+    pshufb                  m1, m2, m4
+    pshufb                  m2, m3
+    paddw                   m1, m0
+    paddw                   m2, m0
+    packuswb                m1, m1
+    packuswb                m2, m2
+    movd      [dstq+strideq*0], m1
+    movd      [dstq+strideq*1], m2
+    lea                   dstq, [dstq+strideq*2]
+    dec                   cntq
+    jge .loop
+    RET
+
+%macro TM_XMM_FUNCS 1
+INIT_XMM %1
+cglobal vp9_ipred_tm_8x8, 4, 4, 5, dst, stride, l, a
+    pxor                    m1, m1
+    pinsrw                  m2, [aq-1], 0
+    movh                    m0, [aq]
+    DEFINE_ARGS dst, stride, l, cnt
+    mova                    m3, [pw_m256]
+    mova                    m4, [pw_m255]
+    pshufb                  m2, m3
+    punpcklbw               m0, m1
+    psubw                   m0, m2
+    mov                   cntq, 3
+.loop:
+    pinsrw                  m2, [lq+cntq*2], 0
+    pshufb                  m1, m2, m4
+    pshufb                  m2, m3
+    paddw                   m1, m0
+    paddw                   m2, m0
+    packuswb                m1, m2
+    movh      [dstq+strideq*0], m1
+    movhps    [dstq+strideq*1], m1
+    lea                   dstq, [dstq+strideq*2]
+    dec                   cntq
+    jge .loop
+    RET
+
+INIT_XMM %1
+cglobal vp9_ipred_tm_16x16, 4, 4, 8, dst, stride, l, a
+    pxor                    m3, m3
+    pinsrw                  m2, [aq-1], 0
+    mova                    m0, [aq]
+    DEFINE_ARGS dst, stride, l, cnt
+    mova                    m4, [pw_m256]
+    mova                    m5, [pw_m255]
+    pshufb                  m2, m4
+    punpckhbw               m1, m0, m3
+    punpcklbw               m0, m3
+    psubw                   m1, m2
+    psubw                   m0, m2
+    mov                   cntq, 7
+.loop:
+    pinsrw                  m7, [lq+cntq*2], 0
+    pshufb                  m3, m7, m5
+    pshufb                  m7, m4
+    paddw                   m2, m3, m0
+    paddw                   m3, m1
+    paddw                   m6, m7, m0
+    paddw                   m7, m1
+    packuswb                m2, m3
+    packuswb                m6, m7
+    mova      [dstq+strideq*0], m2
+    mova      [dstq+strideq*1], m6
+    lea                   dstq, [dstq+strideq*2]
+    dec                   cntq
+    jge .loop
+    RET
+
+%if ARCH_X86_64
+INIT_XMM %1
+cglobal vp9_ipred_tm_32x32, 4, 4, 14, dst, stride, l, a
+    pxor                    m5, m5
+    pinsrw                  m4, [aq-1], 0
+    mova                    m0, [aq]
+    mova                    m2, [aq+16]
+    DEFINE_ARGS dst, stride, l, cnt
+    mova                    m8, [pw_m256]
+    mova                    m9, [pw_m255]
+    pshufb                  m4, m8
+    punpckhbw               m1, m0,  m5
+    punpckhbw               m3, m2,  m5
+    punpcklbw               m0, m5
+    punpcklbw               m2, m5
+    psubw                   m1, m4
+    psubw                   m0, m4
+    psubw                   m3, m4
+    psubw                   m2, m4
+    mov                   cntq, 15
+.loop:
+    pinsrw                 m13, [lq+cntq*2], 0
+    pshufb                  m7, m13, m9
+    pshufb                 m13, m8
+    paddw                   m4, m7,  m0
+    paddw                   m5, m7,  m1
+    paddw                   m6, m7,  m2
+    paddw                   m7, m3
+    paddw                  m10, m13, m0
+    paddw                  m11, m13, m1
+    paddw                  m12, m13, m2
+    paddw                  m13, m3
+    packuswb                m4, m5
+    packuswb                m6, m7
+    packuswb               m10, m11
+    packuswb               m12, m13
+    mova   [dstq+strideq*0+ 0], m4
+    mova   [dstq+strideq*0+16], m6
+    mova   [dstq+strideq*1+ 0], m10
+    mova   [dstq+strideq*1+16], m12
+    lea                   dstq, [dstq+strideq*2]
+    dec                   cntq
+    jge .loop
+    RET
+%endif
+%endmacro
+
+TM_XMM_FUNCS ssse3
+TM_XMM_FUNCS avx
+
+; dl
+
+%macro LOWPASS 4 ; left [dst], center, right, tmp
+    pxor                   m%4, m%1, m%3
+    pand                   m%4, [pb_1]
+    pavgb                  m%1, m%3
+    psubusb                m%1, m%4
+    pavgb                  m%1, m%2
+%endmacro
+
+INIT_MMX ssse3
+cglobal vp9_ipred_dl_4x4, 4, 4, 0, dst, stride, l, a
+    movq                    m1, [aq]
+    pshufb                  m0, m1, [pb_0to5_2x7]
+    pshufb                  m2, m1, [pb_2to6_3x7]
+    psrlq                   m1, 8
+    LOWPASS                  0, 1, 2, 3
+
+    pshufw                  m1, m0, q3321
+    movd      [dstq+strideq*0], m0
+    movd      [dstq+strideq*2], m1
+    psrlq                   m0, 8
+    psrlq                   m1, 8
+    add                   dstq, strideq
+    movd      [dstq+strideq*0], m0
+    movd      [dstq+strideq*2], m1
+    RET
+
+%macro DL_XMM_FUNCS 1
+INIT_XMM %1
+cglobal vp9_ipred_dl_8x8, 4, 4, 4, dst, stride, stride5, a
+    movq                    m0, [aq]
+    lea               stride5q, [strideq*5]
+    pshufb                  m1, m0, [pb_1to6_10x7]
+    psrldq                  m2, m1, 1
+    shufps                  m0, m1, q3210
+    LOWPASS                  0, 1, 2, 3
+
+    pshufd                  m1, m0, q3321
+    movq      [dstq+strideq*0], m0
+    movq      [dstq+strideq*4], m1
+    psrldq                  m0, 1
+    psrldq                  m1, 1
+    movq      [dstq+strideq*1], m0
+    movq      [dstq+stride5q ], m1
+    lea                   dstq, [dstq+strideq*2]
+    psrldq                  m0, 1
+    psrldq                  m1, 1
+    movq      [dstq+strideq*0], m0
+    movq      [dstq+strideq*4], m1
+    psrldq                  m0, 1
+    psrldq                  m1, 1
+    movq      [dstq+strideq*1], m0
+    movq      [dstq+stride5q ], m1
+    RET
+
+INIT_XMM %1
+cglobal vp9_ipred_dl_16x16, 4, 4, 6, dst, stride, l, a
+    mova                    m5, [pb_1toE_2xF]
+    mova                    m0, [aq]
+    pshufb                  m1, m0, m5
+    pshufb                  m2, m1, m5
+    pshufb                  m4, m0, [pb_15]
+    LOWPASS                  0, 1, 2, 3
+    DEFINE_ARGS dst, stride, cnt, stride9
+    lea               stride9q, [strideq*3]
+    mov                   cntd, 4
+    lea               stride9q, [stride9q*3]
+
+.loop:
+    movhlps                 m4, m0
+    mova      [dstq+strideq*0], m0
+    pshufb                  m0, m5
+    mova      [dstq+strideq*8], m4
+    movhlps                 m4, m0
+    mova      [dstq+strideq*1], m0
+    pshufb                  m0, m5
+    mova      [dstq+stride9q ], m4
+    lea                   dstq, [dstq+strideq*2]
+    dec                   cntd
+    jg .loop
+    RET
+
+INIT_XMM %1
+cglobal vp9_ipred_dl_32x32, 4, 5, 8, dst, stride, cnt, a, dst16
+    mova                    m5, [pb_1toE_2xF]
+    mova                    m0, [aq]
+    mova                    m1, [aq+16]
+    palignr                 m2, m1, m0, 1
+    palignr                 m3, m1, m0, 2
+    LOWPASS                  0, 2, 3, 4
+    pshufb                  m2, m1, m5
+    pshufb                  m3, m2, m5
+    pshufb                  m6, m1, [pb_15]
+    LOWPASS                  1, 2, 3, 4
+    mova                    m7, m6
+    lea                 dst16q, [dstq  +strideq*8]
+    mov                   cntd, 8
+    lea                 dst16q, [dst16q+strideq*8]
+.loop:
+    movhlps                 m7, m1
+    mova [dstq  +strideq*0+ 0], m0
+    mova [dstq  +strideq*0+16], m1
+    movhps [dstq+strideq*8+ 0], m0
+    movq [dstq  +strideq*8+ 8], m1
+    mova [dstq  +strideq*8+16], m7
+    mova [dst16q+strideq*0+ 0], m1
+    mova [dst16q+strideq*0+16], m6
+    mova [dst16q+strideq*8+ 0], m7
+    mova [dst16q+strideq*8+16], m6
+%if cpuflag(avx)
+    vpalignr                m0, m1, m0, 1
+    pshufb                  m1, m5
+%else
+    palignr                 m2, m1, m0, 1
+    pshufb                  m1, m5
+    mova                    m0, m2
+%endif
+    add                   dstq, strideq
+    add                 dst16q, strideq
+    dec                   cntd
+    jg .loop
+    RET
+%endmacro
+
+DL_XMM_FUNCS ssse3
+DL_XMM_FUNCS avx
+
+; dr
+
+INIT_MMX ssse3
+cglobal vp9_ipred_dr_4x4, 4, 4, 0, dst, stride, l, a
+    movd                    m0, [lq]
+    punpckldq               m0, [aq-1]
+    movd                    m1, [aq+3]
+    DEFINE_ARGS dst, stride, stride3
+    lea               stride3q, [strideq*3]
+    palignr                 m1, m0, 1
+    psrlq                   m2, m1, 8
+    LOWPASS                  0, 1, 2, 3
+
+    movd      [dstq+stride3q ], m0
+    psrlq                   m0, 8
+    movd      [dstq+strideq*2], m0
+    psrlq                   m0, 8
+    movd      [dstq+strideq*1], m0
+    psrlq                   m0, 8
+    movd      [dstq+strideq*0], m0
+    RET
+
+%macro DR_XMM_FUNCS 1
+INIT_XMM %1
+cglobal vp9_ipred_dr_8x8, 4, 4, 4, dst, stride, l, a
+    movq                    m1, [lq]
+    movhps                  m1, [aq-1]
+    movd                    m2, [aq+7]
+    DEFINE_ARGS dst, stride, stride3
+    lea               stride3q, [strideq*3]
+    pslldq                  m0, m1, 1
+    palignr                 m2, m1, 1
+    LOWPASS                  0, 1, 2, 3
+
+    movhps    [dstq+strideq*0], m0
+    pslldq                  m0, 1
+    movhps    [dstq+strideq*1], m0
+    pslldq                  m0, 1
+    movhps    [dstq+strideq*2], m0
+    pslldq                  m0, 1
+    movhps    [dstq+stride3q ], m0
+    pslldq                  m0, 1
+    lea                   dstq, [dstq+strideq*4]
+    movhps    [dstq+strideq*0], m0
+    pslldq                  m0, 1
+    movhps    [dstq+strideq*1], m0
+    pslldq                  m0, 1
+    movhps    [dstq+strideq*2], m0
+    pslldq                  m0, 1
+    movhps    [dstq+stride3q ], m0
+    RET
+
+INIT_XMM %1
+cglobal vp9_ipred_dr_16x16, 4, 4, 6, dst, stride, l, a
+    mova                    m1, [lq]
+    movu                    m2, [aq-1]
+    movd                    m4, [aq+15]
+    DEFINE_ARGS dst, stride, stride9, cnt
+    lea               stride9q, [strideq *3]
+    mov                   cntd, 4
+    lea               stride9q, [stride9q*3]
+    palignr                 m4, m2, 1
+    palignr                 m3, m2, m1, 15
+    LOWPASS                  3,  2, 4, 5
+    pslldq                  m0, m1, 1
+    palignr                 m2, m1, 1
+    LOWPASS                  0,  1, 2, 4
+
+.loop:
+    mova    [dstq+strideq*0  ], m3
+    movhps  [dstq+strideq*8+0], m0
+    movq    [dstq+strideq*8+8], m3
+    palignr                 m3, m0, 15
+    pslldq                  m0, 1
+    mova    [dstq+strideq*1  ], m3
+    movhps  [dstq+stride9q +0], m0
+    movq    [dstq+stride9q +8], m3
+    palignr                 m3, m0, 15
+    pslldq                  m0, 1
+    lea                   dstq, [dstq+strideq*2]
+    dec                   cntd
+    jg .loop
+    RET
+
+INIT_XMM %1
+cglobal vp9_ipred_dr_32x32, 4, 4, 8, dst, stride, l, a
+    mova                    m1, [lq]
+    mova                    m2, [lq+16]
+    movu                    m3, [aq-1]
+    movu                    m4, [aq+15]
+    movd                    m5, [aq+31]
+    DEFINE_ARGS dst, stride, stride8, cnt
+    lea               stride8q, [strideq*8]
+    palignr                 m5, m4, 1
+    palignr                 m6, m4, m3, 15
+    LOWPASS                  5,  4,  6,  7
+    palignr                 m4, m3, 1
+    palignr                 m6, m3, m2, 15
+    LOWPASS                  4,  3,  6,  7
+    palignr                 m3, m2, 1
+    palignr                 m6, m2, m1, 15
+    LOWPASS                  3,  2,  6,  7
+    palignr                 m2, m1, 1
+    pslldq                  m0, m1, 1
+    LOWPASS                  2,  1,  0,  6
+    mov                   cntd, 16
+
+    ; out=m2/m3/m4/m5
+.loop:
+    mova  [dstq+stride8q*0+ 0], m4
+    mova  [dstq+stride8q*0+16], m5
+    mova  [dstq+stride8q*2+ 0], m3
+    mova  [dstq+stride8q*2+16], m4
+    palignr                 m5, m4, 15
+    palignr                 m4, m3, 15
+    palignr                 m3, m2, 15
+    pslldq                  m2, 1
+    add                   dstq, strideq
+    dec                   cntd
+    jg .loop
+    RET
+%endmacro
+
+DR_XMM_FUNCS ssse3
+DR_XMM_FUNCS avx
+
+; vl
+
+INIT_MMX ssse3
+cglobal vp9_ipred_vl_4x4, 4, 4, 0, dst, stride, l, a
+    movq                    m0, [aq]
+    psrlq                   m1, m0, 8
+    psrlq                   m2, m1, 8
+    LOWPASS                  2,  1, 0, 3
+    pavgb                   m1, m0
+    movq      [dstq+strideq*0], m1
+    movq      [dstq+strideq*1], m2
+    lea                   dstq, [dstq+strideq*2]
+    psrlq                   m1, 8
+    psrlq                   m2, 8
+    movq      [dstq+strideq*0], m1
+    movq      [dstq+strideq*1], m2
+    RET
+
+%macro VL_XMM_FUNCS 1
+INIT_XMM %1
+cglobal vp9_ipred_vl_8x8, 4, 4, 4, dst, stride, l, a
+    movq                    m0, [aq]
+    pshufb                  m0, [pb_0to6_9x7]
+    DEFINE_ARGS dst, stride, stride3
+    lea               stride3q, [strideq*3]
+    psrldq                  m1, m0, 1
+    psrldq                  m2, m0, 2
+    LOWPASS                  2,  1,  0,  3
+    pavgb                   m1, m0
+
+    movq      [dstq+strideq*0], m1
+    movq      [dstq+strideq*1], m2
+    psrldq                  m1, 1
+    psrldq                  m2, 1
+    movq      [dstq+strideq*2], m1
+    movq      [dstq+stride3q ], m2
+    lea                   dstq, [dstq+strideq*4]
+    psrldq                  m1, 1
+    psrldq                  m2, 1
+    movq      [dstq+strideq*0], m1
+    movq      [dstq+strideq*1], m2
+    psrldq                  m1, 1
+    psrldq                  m2, 1
+    movq      [dstq+strideq*2], m1
+    movq      [dstq+stride3q ], m2
+    RET
+
+INIT_XMM %1
+cglobal vp9_ipred_vl_16x16, 4, 4, 5, dst, stride, l, a
+    mova                    m0, [aq]
+    mova                    m4, [pb_1toE_2xF]
+    DEFINE_ARGS dst, stride, stride3, cnt
+    lea               stride3q, [strideq*3]
+    pshufb                  m1, m0, m4
+    pshufb                  m2, m1, m4
+    LOWPASS                  2,  1,  0, 3
+    pavgb                   m1, m0
+    mov                   cntd, 4
+.loop:
+    mova      [dstq+strideq*0], m1
+    mova      [dstq+strideq*1], m2
+    pshufb                  m1, m4
+    pshufb                  m2, m4
+    mova      [dstq+strideq*2], m1
+    mova      [dstq+stride3q ], m2
+    pshufb                  m1, m4
+    pshufb                  m2, m4
+    lea                   dstq, [dstq+strideq*4]
+    dec                   cntd
+    jg .loop
+    RET
+
+INIT_XMM %1
+cglobal vp9_ipred_vl_32x32, 4, 4, 7, dst, stride, l, a
+    mova                    m0, [aq]
+    mova                    m5, [aq+16]
+    mova                    m4, [pb_1toE_2xF]
+    DEFINE_ARGS dst, stride, dst16, cnt
+    palignr                 m2, m5, m0, 1
+    palignr                 m3, m5, m0, 2
+    lea                 dst16q, [dstq  +strideq*8]
+    LOWPASS                  3,  2,  0, 6
+    pavgb                   m2, m0
+    pshufb                  m0, m5, m4
+    pshufb                  m1, m0, m4
+    lea                 dst16q, [dst16q+strideq*8]
+    LOWPASS                  1,  0,  5, 6
+    pavgb                   m0, m5
+    pshufb                  m5, [pb_15]
+    mov                   cntd, 8
+
+.loop:
+%macro %%write 3
+    mova    [dstq+stride%1+ 0], %2
+    mova    [dstq+stride%1+16], %3
+    movhps  [dst16q+stride%1 ], %2
+    movu  [dst16q+stride%1+ 8], %3
+    movq  [dst16q+stride%1+24], m5
+%if cpuflag(avx)
+    palignr                 %2, %3, %2, 1
+    pshufb                  %3, m4
+%else
+    palignr                 m6, %3, %2, 1
+    pshufb                  %3, m4
+    mova                    %2, m6
+%endif
+%endmacro
+
+    %%write                q*0, m2, m0
+    %%write                q*1, m3, m1
+    lea                   dstq, [dstq  +strideq*2]
+    lea                 dst16q, [dst16q+strideq*2]
+    dec                   cntd
+    jg .loop
+    RET
+%endmacro
+
+VL_XMM_FUNCS ssse3
+VL_XMM_FUNCS avx
+
+; vr
+
+INIT_MMX ssse3
+cglobal vp9_ipred_vr_4x4, 4, 4, 0, dst, stride, l, a
+    movq                    m1, [aq-1]
+    punpckldq               m2, [lq]
+    movd                    m0, [aq]
+    DEFINE_ARGS dst, stride, stride3
+    lea               stride3q, [strideq*3]
+    pavgb                   m0, m1
+    palignr                 m1, m2, 5
+    psrlq                   m2, m1, 8
+    psllq                   m3, m1, 8
+    LOWPASS                  2,  1, 3, 4
+
+    ; ABCD <- for the following predictor:
+    ; EFGH
+    ; IABC  | m0 contains ABCDxxxx
+    ; JEFG  | m2 contains xJIEFGHx
+
+    punpckldq               m0, m2
+    pshufb                  m2, [pb_13456_3xm1]
+    movd      [dstq+strideq*0], m0
+    pshufb                  m0, [pb_6012_4xm1]
+    movd      [dstq+stride3q ], m2
+    psrlq                   m2, 8
+    movd      [dstq+strideq*2], m0
+    movd      [dstq+strideq*1], m2
+    RET
+
+%macro VR_XMM_FUNCS 1
+INIT_XMM %1
+cglobal vp9_ipred_vr_8x8, 4, 4, 5, dst, stride, l, a
+    movu                    m1, [aq-1]
+    movhps                  m2, [lq]
+    movq                    m0, [aq]
+    DEFINE_ARGS dst, stride, stride3
+    lea               stride3q, [strideq*3]
+    pavgb                   m0, m1
+    palignr                 m1, m2, 9
+    pslldq                  m2, m1, 1
+    pslldq                  m3, m1, 2
+    LOWPASS                  1,  2, 3, 4
+
+    ; ABCDEFGH <- for the following predictor:
+    ; IJKLMNOP
+    ; QABCDEFG  | m0 contains ABCDEFGHxxxxxxxx
+    ; RIJKLMNO  | m1 contains xxVUTSRQIJKLMNOP
+    ; SQABCDEF
+    ; TRIJKLMN
+    ; USQABCDE
+    ; VTRIJKLM
+
+    punpcklqdq              m0, m1 ; ABCDEFGHxxVUTSRQ
+    movq      [dstq+strideq*0], m0
+    pshufb                  m0, [pb_6xm1_BDF_0to6] ; xxxxxxUSQABCDEFG
+    movhps    [dstq+strideq*1], m1
+    pshufb                  m1, [pb_6xm1_246_8toE] ; xxxxxxVTRIJKLMNO
+    movhps    [dstq+strideq*2], m0
+    pslldq                  m0, 1
+    movhps    [dstq+stride3q ], m1
+    lea                   dstq, [dstq+strideq*4]
+    pslldq                  m1, 1
+    movhps    [dstq+strideq*0], m0
+    pslldq                  m0, 1
+    movhps    [dstq+strideq*1], m1
+    pslldq                  m1, 1
+    movhps    [dstq+strideq*2], m0
+    movhps    [dstq+stride3q ], m1
+    RET
+
+INIT_XMM %1
+cglobal vp9_ipred_vr_16x16, 4, 4, 6, dst, stride, l, a
+    mova                    m0, [aq]
+    movu                    m1, [aq-1]
+    mova                    m2, [lq]
+    DEFINE_ARGS dst, stride, stride3, cnt
+    lea               stride3q, [strideq*3]
+    palignr                 m3, m1, m2, 15
+    LOWPASS                  3,  1,  0,  4
+    pavgb                   m0, m1
+    palignr                 m1, m2,  1
+    pslldq                  m4, m2,  1
+    LOWPASS                  1,  2,  4,  5
+    pshufb                  m1, [pb_02468ACE_13579BDF]
+    mov                   cntd, 4
+
+.loop:
+    movlhps                 m2, m1
+    mova      [dstq+strideq*0], m0
+    mova      [dstq+strideq*1], m3
+    palignr                 m4, m0, m1, 15
+    palignr                 m5, m3, m2, 15
+    mova      [dstq+strideq*2], m4
+    mova      [dstq+stride3q ], m5
+    lea                   dstq, [dstq+strideq*4]
+    palignr                 m0, m1, 14
+    palignr                 m3, m2, 14
+    pslldq                  m1, 2
+    dec                   cntd
+    jg .loop
+    RET
+
+%if ARCH_X86_64
+INIT_XMM %1
+cglobal vp9_ipred_vr_32x32, 4, 4, 9, dst, stride, l, a
+    mova                    m0, [aq]
+    mova                    m2, [aq+16]
+    movu                    m1, [aq-1]
+    palignr                 m3, m2, m0, 15
+    palignr                 m4, m2, m0, 14
+    LOWPASS                  4,  3,  2,  5
+    pavgb                   m3, m2
+    mova                    m2, [lq+16]
+    palignr                 m5, m1, m2, 15
+    LOWPASS                  5,  1,  0,  6
+    pavgb                   m0, m1
+    mova                    m6, [lq]
+    palignr                 m1, m2,  1
+    palignr                 m7, m2, m6, 15
+    LOWPASS                  1,  2,  7,  8
+    palignr                 m2, m6,  1
+    pslldq                  m7, m6,  1
+    LOWPASS                  2,  6,  7,  8
+    pshufb                  m1, [pb_02468ACE_13579BDF]
+    pshufb                  m2, [pb_02468ACE_13579BDF]
+    DEFINE_ARGS dst, stride, dst16, cnt
+    lea                 dst16q, [dstq  +strideq*8]
+    lea                 dst16q, [dst16q+strideq*8]
+    SBUTTERFLY             qdq,  2,  1,  6
+    mov                   cntd, 8
+
+.loop:
+    ; even lines (0, 2, 4, ...): m1 | m0, m3
+    ;  odd lines (1, 3, 5, ...): m2 | m5, m4
+%macro %%write 4
+    mova    [dstq+stride%1+ 0], %3
+    mova    [dstq+stride%1+16], %4
+    movhps  [dst16q+stride%1 ], %2
+    movu  [dst16q+stride%1+ 8], %3
+    movq  [dst16q+stride%1+24], %4
+    palignr                 %4, %3, 15
+    palignr                 %3, %2, 15
+    pslldq                  %2,  1
+%endmacro
+
+    %%write                q*0, m1, m0, m3
+    %%write                q*1, m2, m5, m4
+    lea                   dstq, [dstq  +strideq*2]
+    lea                 dst16q, [dst16q+strideq*2]
+    dec                   cntd
+    jg .loop
+    RET
+%endif
+%endmacro
+
+VR_XMM_FUNCS ssse3
+VR_XMM_FUNCS avx
+
+; hd
+
+INIT_MMX ssse3
+cglobal vp9_ipred_hd_4x4, 4, 4, 0, dst, stride, l, a
+    movd                    m0, [lq]
+    punpckldq               m0, [aq-1]
+    DEFINE_ARGS dst, stride, stride3
+    lea               stride3q, [strideq*3]
+    psrlq                   m1, m0, 8
+    psrlq                   m2, m1, 8
+    LOWPASS                  2,  1, 0,  3
+    pavgb                   m1, m0
+
+    ; DHIJ <- for the following predictor:
+    ; CGDH
+    ; BFCG  | m1 contains ABCDxxxx
+    ; AEBF  | m2 contains EFGHIJxx
+
+    punpcklbw               m1, m2
+    punpckhdq               m0, m1, m2
+
+    ; m1 contains AEBFCGDH
+    ; m0 contains CGDHIJxx
+
+    movd      [dstq+stride3q ], m1
+    movd      [dstq+strideq*1], m0
+    psrlq                   m1, 16
+    psrlq                   m0, 16
+    movd      [dstq+strideq*2], m1
+    movd      [dstq+strideq*0], m0
+    RET
+
+%macro HD_XMM_FUNCS 1
+INIT_XMM %1
+cglobal vp9_ipred_hd_8x8, 4, 4, 4, dst, stride, l, a
+    movq                    m0, [lq]
+    movhps                  m0, [aq-1]
+    DEFINE_ARGS dst, stride, stride3, dst4
+    lea               stride3q, [strideq*3]
+    lea                  dst4q, [dstq+strideq*4]
+    psrldq                  m1, m0, 1
+    psrldq                  m2, m1, 1
+    LOWPASS                  2,  1,  0,  3
+    pavgb                   m1, m0
+
+    ; HPQRSTUV <- for the following predictor
+    ; GOHPQRST
+    ; FNGOHPQR  | m1 contains ABCDEFGHxxxxxxxx
+    ; EMFNGOHP  | m2 contains IJKLMNOPQRSTUVxx
+    ; DLEMFNGO
+    ; CKDLEMFN
+    ; BJCKDLEM
+    ; AIBJCKDL
+
+    punpcklbw               m1, m2
+    movhlps                 m2, m2
+
+    ; m1 contains AIBJCKDLEMFNGOHP
+    ; m2 contains QRSTUVxxxxxxxxxx
+
+    movhps   [dstq +stride3q ], m1
+    movq     [dst4q+stride3q ], m1
+    palignr                 m3, m2, m1, 2
+    movhps   [dstq +strideq*2], m3
+    movq     [dst4q+strideq*2], m3
+    palignr                 m3, m2, m1, 4
+    movhps   [dstq +strideq*1], m3
+    movq     [dst4q+strideq*1], m3
+    palignr                 m2, m1, 6
+    movhps   [dstq +strideq*0], m2
+    movq     [dst4q+strideq*0], m2
+    RET
+
+INIT_XMM %1
+cglobal vp9_ipred_hd_16x16, 4, 6, 7, dst, stride, l, a
+    mova                    m0, [lq]
+    movu                    m3, [aq-1]
+    DEFINE_ARGS dst, stride, stride4, dst4, dst8, dst12
+    lea               stride4q, [strideq*4]
+    lea                  dst4q, [dstq +stride4q]
+    lea                  dst8q, [dst4q+stride4q]
+    lea                 dst12q, [dst8q+stride4q]
+    psrldq                  m4, m3,  1
+    psrldq                  m5, m3,  2
+    LOWPASS                  5,  4,  3,  6
+    palignr                 m1, m3, m0,  1
+    palignr                 m2, m3, m0,  2
+    LOWPASS                  2,  1,  0,  6
+    pavgb                   m1, m0
+    SBUTTERFLY              bw,  1,  2,  6
+
+    ; I PROBABLY INVERTED L0 ad L16 here
+    ; m1, m2, m5
+.loop:
+    sub               stride4q, strideq
+    movhps [dstq +stride4q +0], m2
+    movq   [dstq +stride4q +8], m5
+    mova   [dst4q+stride4q   ], m2
+    movhps [dst8q+stride4q +0], m1
+    movq   [dst8q+stride4q +8], m2
+    mova  [dst12q+stride4q   ], m1
+%if cpuflag(avx)
+    palignr                 m1, m2, m1, 2
+    palignr                 m2, m5, m2, 2
+%else
+    palignr                 m3, m2, m1, 2
+    palignr                 m0, m5, m2, 2
+    mova                    m1, m3
+    mova                    m2, m0
+%endif
+    psrldq                  m5, 2
+    jg .loop
+    RET
+
+INIT_XMM %1
+cglobal vp9_ipred_hd_32x32, 4, 6, 8, dst, stride, l, a
+    mova                    m0, [lq]
+    mova                    m1, [lq+16]
+    movu                    m2, [aq-1]
+    movu                    m3, [aq+15]
+    DEFINE_ARGS dst, stride, stride8, dst8, dst16, dst24
+    lea               stride8q, [strideq*8]
+    lea                  dst8q, [dstq  +stride8q]
+    lea                 dst16q, [dst8q +stride8q]
+    lea                 dst24q, [dst16q+stride8q]
+    psrldq                  m4, m3,  1
+    psrldq                  m5, m3,  2
+    LOWPASS                  5,  4,  3,  6
+    palignr                 m4, m3, m2,  2
+    palignr                 m3, m2,  1
+    LOWPASS                  4,  3,  2,  6
+    palignr                 m3, m2, m1,  2
+    palignr                 m2, m1,  1
+    LOWPASS                  3,  2,  1,  6
+    pavgb                   m2, m1
+    palignr                 m6, m1, m0,  1
+    palignr                 m1, m0,  2
+    LOWPASS                  1,  6,  0,  7
+    pavgb                   m0, m1
+    SBUTTERFLY              bw,  2,  3,  6
+    SBUTTERFLY              bw,  0,  1,  6
+
+    ; m0, m1, m2, m3, m4, m5
+.loop:
+    sub               stride8q, strideq
+    mova  [dstq  +stride8q+ 0], m3
+    mova  [dstq  +stride8q+16], m4
+    mova  [dst8q +stride8q+ 0], m2
+    mova  [dst8q +stride8q+16], m3
+    mova  [dst16q+stride8q+ 0], m1
+    mova  [dst16q+stride8q+16], m2
+    mova  [dst24q+stride8q+ 0], m0
+    mova  [dst24q+stride8q+16], m1
+%if cpuflag(avx)
+    palignr                 m0, m1, m0, 2
+    palignr                 m1, m2, m1, 2
+    palignr                 m2, m3, m2, 2
+    palignr                 m3, m4, m3, 2
+    palignr                 m4, m5, m4, 2
+    psrldq                  m5, 2
+%else
+    psrldq                  m6, m5, 2
+    palignr                 m5, m4, 2
+    palignr                 m4, m3, 2
+    palignr                 m3, m2, 2
+    palignr                 m2, m1, 2
+    palignr                 m1, m0, 2
+    mova                    m0, m1
+    mova                    m1, m2
+    mova                    m2, m3
+    mova                    m3, m4
+    mova                    m4, m5
+    mova                    m5, m6
+%endif
+    jg .loop
+    RET
+%endmacro
+
+HD_XMM_FUNCS ssse3
+HD_XMM_FUNCS avx
+
+INIT_MMX ssse3
+cglobal vp9_ipred_hu_4x4, 3, 3, 0, dst, stride, l
+    movd                    m0, [lq]
+    pshufb                  m0, [pb_3to1_5x0]
+    psrlq                   m1, m0, 8
+    psrlq                   m2, m1, 8
+    LOWPASS                  2,  1, 0, 3
+    pavgb                   m1, m0
+    DEFINE_ARGS dst, stride, stride3
+    lea               stride3q, [strideq*3]
+    SBUTTERFLY              bw,  1, 2, 0
+    palignr                 m2, m1, 2
+    movd      [dstq+strideq*0], m1
+    movd      [dstq+strideq*1], m2
+    punpckhdq               m1, m1
+    punpckhdq               m2, m2
+    movd      [dstq+strideq*2], m1
+    movd      [dstq+stride3q ], m2
+    RET
+
+%macro HU_XMM_FUNCS 1
+INIT_XMM %1
+cglobal vp9_ipred_hu_8x8, 3, 4, 4, dst, stride, l
+    movq                    m0, [lq]
+    pshufb                  m0, [pb_7to1_9x0]
+    psrldq                  m1, m0, 1
+    psrldq                  m2, m1, 1
+    LOWPASS                  2,  1, 0, 3
+    pavgb                   m1, m0
+    DEFINE_ARGS dst, stride, stride3, dst4
+    lea               stride3q, [strideq*3]
+    lea                  dst4q, [dstq+strideq*4]
+    SBUTTERFLY              bw,  1, 2, 0
+    movq     [dstq +strideq*0], m1
+    movhps   [dst4q+strideq*0], m1
+    palignr                 m0, m2, m1, 2
+    movq     [dstq +strideq*1], m0
+    movhps   [dst4q+strideq*1], m0
+    palignr                 m0, m2, m1, 4
+    movq     [dstq +strideq*2], m0
+    movhps   [dst4q+strideq*2], m0
+    palignr                 m2, m1, 6
+    movq     [dstq +stride3q ], m2
+    movhps   [dst4q+stride3q ], m2
+    RET
+
+INIT_XMM %1
+cglobal vp9_ipred_hu_16x16, 3, 4, 5, dst, stride, l
+    mova                    m0, [lq]
+    pshufb                  m0, [pb_Fto0]
+    mova                    m3, [pb_2toE_3xF]
+    pshufb                  m1, m0, [pb_1toE_2xF]
+    pshufb                  m2, m0, m3
+    LOWPASS                  2,  1,  0,  4
+    pavgb                   m1, m0
+    DEFINE_ARGS dst, stride, stride9, cnt
+    lea                stride9q, [strideq *3]
+    mov                   cntd,  4
+    lea                stride9q, [stride9q*3]
+    SBUTTERFLY              bw,  1,  2,  0
+
+.loop:
+    mova      [dstq+strideq*0], m1
+    mova      [dstq+strideq*8], m2
+    palignr                 m0, m2, m1, 2
+    pshufb                  m2, m3
+    mova      [dstq+strideq*1], m0
+    mova      [dstq+stride9q ], m2
+    palignr                 m1, m2, m0, 2
+    pshufb                  m2, m3
+    lea                   dstq, [dstq+strideq*2]
+    dec                   cntd
+    jg .loop
+    RET
+
+INIT_XMM %1
+cglobal vp9_ipred_hu_32x32, 3, 7, 7, dst, stride, l
+    mova                    m0, [lq]
+    mova                    m1, [lq+16]
+    mova                    m2, [pb_Fto0]
+    mova                    m4, [pb_2toE_3xF]
+    pshufb                  m0, m2
+    pshufb                  m1, m2
+    palignr                 m2, m0, m1,  1
+    palignr                 m3, m0, m1,  2
+    LOWPASS                  3,  2,  1,  5
+    pavgb                   m2, m1
+    pshufb                  m1, m0, m4
+    pshufb                  m5, m0, [pb_1toE_2xF]
+    LOWPASS                  1,  5,  0,  6
+    pavgb                   m0, m5
+    DEFINE_ARGS dst, stride, cnt, stride0, dst8, dst16, dst24
+    mov                   cntd,  8
+    xor               stride0q, stride0q
+    lea                  dst8q, [dstq  +strideq*8]
+    lea                 dst16q, [dst8q +strideq*8]
+    lea                 dst24q, [dst16q+strideq*8]
+    SBUTTERFLY              bw,  0,  1,  5
+    SBUTTERFLY              bw,  2,  3,  5
+    pshufb                  m6, m1, [pb_15]
+
+.loop:
+    mova  [dstq  +stride0q+ 0], m2
+    mova  [dstq  +stride0q+16], m3
+    mova  [dst8q +stride0q+ 0], m3
+    mova  [dst8q +stride0q+16], m0
+    mova  [dst16q+stride0q+ 0], m0
+    mova  [dst16q+stride0q+16], m1
+    mova  [dst24q+stride0q+ 0], m1
+    mova  [dst24q+stride0q+16], m6
+%if cpuflag(avx)
+    palignr                 m2, m3, m2, 2
+    palignr                 m3, m0, m3, 2
+    palignr                 m0, m1, m0, 2
+    pshufb                  m1, m4
+%else
+    pshufb                  m5, m1, m4
+    palignr                 m1, m0, 2
+    palignr                 m0, m3, 2
+    palignr                 m3, m2, 2
+    mova                    m2, m3
+    mova                    m3, m0
+    mova                    m0, m1
+    mova                    m1, m5
+%endif
+    add               stride0q, strideq
+    dec                   cntd
+    jg .loop
+    RET
+%endmacro
+
+HU_XMM_FUNCS ssse3
+HU_XMM_FUNCS avx
+
+; FIXME 127, 128, 129 ?

omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/x86/vp9itxfm.asm Added

@@ -0,0 +1,1669 @@
+;******************************************************************************
+;* VP9 IDCT SIMD optimizations
+;*
+;* Copyright (C) 2013 Clément Bœsch <u pkh me>
+;* Copyright (C) 2013 Ronald S. Bultje <rsbultje gmail com>
+;*
+;* This file is part of FFmpeg.
+;*
+;* FFmpeg is free software; you can redistribute it and/or
+;* modify it under the terms of the GNU Lesser General Public
+;* License as published by the Free Software Foundation; either
+;* version 2.1 of the License, or (at your option) any later version.
+;*
+;* FFmpeg is distributed in the hope that it will be useful,
+;* but WITHOUT ANY WARRANTY; without even the implied warranty of
+;* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;* Lesser General Public License for more details.
+;*
+;* You should have received a copy of the GNU Lesser General Public
+;* License along with FFmpeg; if not, write to the Free Software
+;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+;******************************************************************************
+
+%include "libavutil/x86/x86util.asm"
+
+SECTION_RODATA
+
+pw_11585x2:  times 8 dw 23170
+pw_m11585x2: times 8 dw -23170
+
+%macro VP9_IDCT_COEFFS 2-3 0
+pw_%1x2:    times 8 dw  %1*2
+pw_m%1x2:   times 8 dw -%1*2
+pw_%2x2:    times 8 dw  %2*2
+pw_m%2x2:   times 8 dw -%2*2
+pw_m%1_%2:  times 4 dw -%1,  %2
+pw_%2_%1:   times 4 dw  %2,  %1
+pw_m%2_m%1: times 4 dw -%2, -%1
+%if %3 == 1
+pw_m%2_%1:  times 4 dw -%2,  %1
+pw_%1_%2:   times 4 dw  %1,  %2
+%endif
+%endmacro
+
+VP9_IDCT_COEFFS 15137,  6270, 1
+VP9_IDCT_COEFFS 16069,  3196, 1
+VP9_IDCT_COEFFS  9102, 13623, 1
+VP9_IDCT_COEFFS 16305,  1606
+VP9_IDCT_COEFFS 10394, 12665
+VP9_IDCT_COEFFS 14449,  7723
+VP9_IDCT_COEFFS  4756, 15679
+VP9_IDCT_COEFFS 16364,   804
+VP9_IDCT_COEFFS 11003, 12140
+VP9_IDCT_COEFFS 14811,  7005
+VP9_IDCT_COEFFS  5520, 15426
+VP9_IDCT_COEFFS 15893,  3981
+VP9_IDCT_COEFFS  8423, 14053
+VP9_IDCT_COEFFS 13160,  9760
+VP9_IDCT_COEFFS  2404, 16207
+
+pw_5283_13377: times 4 dw 5283, 13377
+pw_9929_13377: times 4 dw 9929, 13377
+pw_15212_m13377: times 4 dw 15212, -13377
+pw_15212_9929: times 4 dw 15212, 9929
+pw_m5283_m15212: times 4 dw -5283, -15212
+pw_13377x2: times 8 dw 13377*2
+
+pd_8192: times 4 dd 8192
+pw_2048: times 8 dw 2048
+pw_1024: times 8 dw 1024
+pw_512:  times 8 dw 512
+pw_m1:   times 8 dw -1
+
+SECTION .text
+
+; (a*x + b*y + round) >> shift
+%macro VP9_MULSUB_2W_2X 5 ; dst1, dst2/src, round, coefs1, coefs2
+    pmaddwd            m%1, m%2, %4
+    pmaddwd            m%2,  %5
+    paddd              m%1,  %3
+    paddd              m%2,  %3
+    psrad              m%1,  14
+    psrad              m%2,  14
+%endmacro
+
+%macro VP9_MULSUB_2W_4X 7 ; dst1, dst2, coef1, coef2, rnd, tmp1/src, tmp2
+    VP9_MULSUB_2W_2X    %7,  %6,  %5, [pw_m%3_%4], [pw_%4_%3]
+    VP9_MULSUB_2W_2X    %1,  %2,  %5, [pw_m%3_%4], [pw_%4_%3]
+    packssdw           m%1, m%7
+    packssdw           m%2, m%6
+%endmacro
+
+%macro VP9_UNPACK_MULSUB_2W_4X 7-9 ; dst1, dst2, (src1, src2,) coef1, coef2, rnd, tmp1, tmp2
+%if %0 == 7
+    punpckhwd          m%6, m%2, m%1
+    punpcklwd          m%2, m%1
+    VP9_MULSUB_2W_4X   %1, %2, %3, %4, %5, %6, %7
+%else
+    punpckhwd          m%8, m%4, m%3
+    punpcklwd          m%2, m%4, m%3
+    VP9_MULSUB_2W_4X   %1, %2, %5, %6, %7, %8, %9
+%endif
+%endmacro
+
+%macro VP9_UNPACK_MULSUB_2D_4X 6 ; dst1 [src1], dst2 [src2], dst3, dst4, mul1, mul2
+    punpckhwd          m%4, m%2, m%1
+    punpcklwd          m%2, m%1
+    pmaddwd            m%3, m%4, [pw_m%5_%6]
+    pmaddwd            m%4, [pw_%6_%5]
+    pmaddwd            m%1, m%2, [pw_m%5_%6]
+    pmaddwd            m%2, [pw_%6_%5]
+%endmacro
+
+%macro VP9_RND_SH_SUMSUB_BA 6 ; dst1 [src1], dst2 [src2], src3, src4, tmp, round
+    SUMSUB_BA            d, %1, %2, %5
+    SUMSUB_BA            d, %3, %4, %5
+    paddd              m%1, %6
+    paddd              m%2, %6
+    paddd              m%3, %6
+    paddd              m%4, %6
+    psrad              m%1, 14
+    psrad              m%2, 14
+    psrad              m%3, 14
+    psrad              m%4, 14
+    packssdw           m%1, m%3
+    packssdw           m%2, m%4
+%endmacro
+
+%macro VP9_STORE_2X 5-6 dstq ; reg1, reg2, tmp1, tmp2, zero, dst
+    movh               m%3, [%6]
+    movh               m%4, [%6+strideq]
+    punpcklbw          m%3, m%5
+    punpcklbw          m%4, m%5
+    paddw              m%3, m%1
+    paddw              m%4, m%2
+    packuswb           m%3, m%5
+    packuswb           m%4, m%5
+    movh              [%6], m%3
+    movh      [%6+strideq], m%4
+%endmacro
+
+%macro ZERO_BLOCK 4 ; mem, stride, nnzcpl, zero_reg
+%assign %%y 0
+%rep %3
+%assign %%x 0
+%rep %3*2/mmsize
+    mova      [%1+%%y+%%x], %4
+%assign %%x (%%x+mmsize)
+%endrep
+%assign %%y (%%y+%2)
+%endrep
+%endmacro
+
+;-------------------------------------------------------------------------------------------
+; void vp9_iwht_iwht_4x4_add_<opt>(uint8_t *dst, ptrdiff_t stride, int16_t *block, int eob);
+;-------------------------------------------------------------------------------------------
+
+%macro VP9_IWHT4_1D 0
+    SWAP                 1, 2, 3
+    paddw               m0, m2
+    psubw               m3, m1
+    psubw               m4, m0, m3
+    psraw               m4, 1
+    psubw               m5, m4, m1
+    SWAP                 5, 1
+    psubw               m4, m2
+    SWAP                 4, 2
+    psubw               m0, m1
+    paddw               m3, m2
+    SWAP                 3, 2, 1
+%endmacro
+
+INIT_MMX mmx
+cglobal vp9_iwht_iwht_4x4_add, 3, 3, 0, dst, stride, block, eob
+    mova                m0, [blockq+0*8]
+    mova                m1, [blockq+1*8]
+    mova                m2, [blockq+2*8]
+    mova                m3, [blockq+3*8]
+    psraw               m0, 2
+    psraw               m1, 2
+    psraw               m2, 2
+    psraw               m3, 2
+
+    VP9_IWHT4_1D
+    TRANSPOSE4x4W        0, 1, 2, 3, 4
+    VP9_IWHT4_1D
+
+    pxor                m4, m4
+    VP9_STORE_2X         0, 1, 5, 6, 4
+    lea               dstq, [dstq+strideq*2]
+    VP9_STORE_2X         2, 3, 5, 6, 4
+    ZERO_BLOCK      blockq, 8, 4, m4
+    RET
+
+;-------------------------------------------------------------------------------------------
+; void vp9_idct_idct_4x4_add_<opt>(uint8_t *dst, ptrdiff_t stride, int16_t *block, int eob);
+;-------------------------------------------------------------------------------------------
+
+%macro VP9_IDCT4_1D_FINALIZE 0
+    SUMSUB_BA            w, 3, 2, 4                         ; m3=t3+t0, m2=-t3+t0
+    SUMSUB_BA            w, 1, 0, 4                         ; m1=t2+t1, m0=-t2+t1
+    SWAP                 0, 3, 2                            ; 3102 -> 0123
+%endmacro
+
+%macro VP9_IDCT4_1D 0
+    SUMSUB_BA            w, 2, 0, 4                         ; m2=IN(0)+IN(2) m0=IN(0)-IN(2)
+    pmulhrsw            m2, m6                              ; m2=t0
+    pmulhrsw            m0, m6                              ; m0=t1
+    VP9_UNPACK_MULSUB_2W_4X 1, 3, 15137, 6270, m7, 4, 5     ; m1=t2, m3=t3
+    VP9_IDCT4_1D_FINALIZE
+%endmacro
+
+; 2x2 top left corner
+%macro VP9_IDCT4_2x2_1D 0
+    pmulhrsw            m0, m5                              ; m0=t1
+    mova                m2, m0                              ; m2=t0
+    mova                m3, m1
+    pmulhrsw            m1, m6                              ; m1=t2
+    pmulhrsw            m3, m7                              ; m3=t3
+    VP9_IDCT4_1D_FINALIZE
+%endmacro
+
+%macro VP9_IDCT4_WRITEOUT 0
+    mova                m5, [pw_2048]
+    pmulhrsw            m0, m5              ; (x*2048 + (1<<14))>>15 <=> (x+8)>>4
+    pmulhrsw            m1, m5
+    VP9_STORE_2X         0,  1,  6,  7,  4
+    lea               dstq, [dstq+2*strideq]
+    pmulhrsw            m2, m5
+    pmulhrsw            m3, m5
+    VP9_STORE_2X         2,  3,  6,  7,  4
+%endmacro
+
+INIT_MMX ssse3
+cglobal vp9_idct_idct_4x4_add, 4,4,0, dst, stride, block, eob
+
+    cmp eobd, 4 ; 2x2 or smaller
+    jg .idctfull
+
+    cmp eobd, 1 ; faster path for when only DC is set
+    jne .idct2x2
+
+    movd                m0, [blockq]
+    mova                m5, [pw_11585x2]
+    pmulhrsw            m0, m5
+    pmulhrsw            m0, m5
+    pshufw              m0, m0, 0
+    pxor                m4, m4
+    movh          [blockq], m4
+    pmulhrsw            m0, [pw_2048]       ; (x*2048 + (1<<14))>>15 <=> (x+8)>>4
+    VP9_STORE_2X         0,  0,  6,  7,  4
+    lea               dstq, [dstq+2*strideq]
+    VP9_STORE_2X         0,  0,  6,  7,  4
+    RET
+
+; faster path for when only top left 2x2 block is set
+.idct2x2:
+    movd                m0, [blockq+0]
+    movd                m1, [blockq+8]
+    mova                m5, [pw_11585x2]
+    mova                m6, [pw_6270x2]
+    mova                m7, [pw_15137x2]
+    VP9_IDCT4_2x2_1D
+    TRANSPOSE4x4W  0, 1, 2, 3, 4
+    VP9_IDCT4_2x2_1D
+    pxor                m4, m4  ; used for the block reset, and VP9_STORE_2X
+    movh       [blockq+ 0], m4
+    movh       [blockq+ 8], m4
+    VP9_IDCT4_WRITEOUT
+    RET
+
+.idctfull: ; generic full 4x4 idct/idct
+    mova                m0, [blockq+ 0]
+    mova                m1, [blockq+ 8]
+    mova                m2, [blockq+16]
+    mova                m3, [blockq+24]
+    mova                m6, [pw_11585x2]
+    mova                m7, [pd_8192]       ; rounding
+    VP9_IDCT4_1D
+    TRANSPOSE4x4W  0, 1, 2, 3, 4
+    VP9_IDCT4_1D
+    pxor                m4, m4  ; used for the block reset, and VP9_STORE_2X
+    mova       [blockq+ 0], m4
+    mova       [blockq+ 8], m4
+    mova       [blockq+16], m4
+    mova       [blockq+24], m4
+    VP9_IDCT4_WRITEOUT
+    RET
+
+;-------------------------------------------------------------------------------------------
+; void vp9_iadst_iadst_4x4_add_<opt>(uint8_t *dst, ptrdiff_t stride, int16_t *block, int eob);
+;-------------------------------------------------------------------------------------------
+
+%macro VP9_IADST4_1D 0
+    movq2dq           xmm0, m0
+    movq2dq           xmm1, m1
+    movq2dq           xmm2, m2
+    movq2dq           xmm3, m3
+    paddw               m3, m0
+    punpcklwd         xmm0, xmm1
+    punpcklwd         xmm2, xmm3
+    pmaddwd           xmm1, xmm0, [pw_5283_13377]
+    pmaddwd           xmm4, xmm0, [pw_9929_13377]
+    pmaddwd           xmm0, [pw_15212_m13377]
+    pmaddwd           xmm3, xmm2, [pw_15212_9929]
+    pmaddwd           xmm2, [pw_m5283_m15212]
+    psubw               m3, m2
+    paddd             xmm0, xmm2
+    paddd             xmm3, [pd_8192]
+    paddd             xmm2, [pd_8192]
+    paddd             xmm1, xmm3
+    paddd             xmm0, xmm3
+    paddd             xmm4, xmm2
+    psrad             xmm1, 14
+    psrad             xmm0, 14
+    psrad             xmm4, 14
+    pmulhrsw            m3, [pw_13377x2]        ; out2
+    packssdw          xmm0, xmm0
+    packssdw          xmm1, xmm1
+    packssdw          xmm4, xmm4
+    movdq2q             m0, xmm0                ; out3
+    movdq2q             m1, xmm1                ; out0
+    movdq2q             m2, xmm4                ; out1
+    SWAP                 0, 1, 2, 3
+%endmacro
+
+%macro IADST4_FN 5
+INIT_MMX %5
+cglobal vp9_%1_%3_4x4_add, 3, 3, 8, dst, stride, block, eob
+    mova                m0, [blockq+ 0]
+    mova                m1, [blockq+ 8]
+    mova                m2, [blockq+16]
+    mova                m3, [blockq+24]
+    mova                m6, [pw_11585x2]
+    mova                m7, [pd_8192]       ; rounding
+    VP9_%2_1D
+    TRANSPOSE4x4W  0, 1, 2, 3, 4
+    VP9_%4_1D
+    pxor                m4, m4  ; used for the block reset, and VP9_STORE_2X
+    mova       [blockq+ 0], m4
+    mova       [blockq+ 8], m4
+    mova       [blockq+16], m4
+    mova       [blockq+24], m4
+    VP9_IDCT4_WRITEOUT
+    RET
+%endmacro
+
+IADST4_FN idct,  IDCT4,  iadst, IADST4, ssse3
+IADST4_FN iadst, IADST4, idct,  IDCT4,  ssse3
+IADST4_FN iadst, IADST4, iadst, IADST4, ssse3
+
+%if ARCH_X86_64 ; TODO: 32-bit? (32-bit limited to 8 xmm reg, we use more)
+
+;-------------------------------------------------------------------------------------------
+; void vp9_idct_idct_8x8_add_<opt>(uint8_t *dst, ptrdiff_t stride, int16_t *block, int eob);
+;-------------------------------------------------------------------------------------------
+
+%macro VP9_IDCT8_1D_FINALIZE 0
+    SUMSUB_BA            w,  3, 10, 4                       ;  m3=t0+t7, m10=t0-t7
+    SUMSUB_BA            w,  1,  2, 4                       ;  m1=t1+t6,  m2=t1-t6
+    SUMSUB_BA            w, 11,  0, 4                       ; m11=t2+t5,  m0=t2-t5
+    SUMSUB_BA            w,  9,  8, 4                       ;  m9=t3+t4,  m8=t3-t4
+    SWAP                11, 10, 2
+    SWAP                 3,  9, 0
+%endmacro
+
+%macro VP9_IDCT8_1D 0
+    SUMSUB_BA            w, 8, 0, 4                         ; m8=IN(0)+IN(4) m0=IN(0)-IN(4)
+    pmulhrsw            m8, m12                             ; m8=t0a
+    pmulhrsw            m0, m12                             ; m0=t1a
+    VP9_UNPACK_MULSUB_2W_4X 2, 10, 15137,  6270, m7, 4, 5   ; m2=t2a, m10=t3a
+    VP9_UNPACK_MULSUB_2W_4X 1, 11, 16069,  3196, m7, 4, 5   ; m1=t4a, m11=t7a
+    VP9_UNPACK_MULSUB_2W_4X 9,  3,  9102, 13623, m7, 4, 5   ; m9=t5a,  m3=t6a
+    SUMSUB_BA            w, 10,  8, 4                       ; m10=t0a+t3a (t0),  m8=t0a-t3a (t3)
+    SUMSUB_BA            w,  2,  0, 4                       ;  m2=t1a+t2a (t1),  m0=t1a-t2a (t2)
+    SUMSUB_BA            w,  9,  1, 4                       ;  m9=t4a+t5a (t4),  m1=t4a-t5a (t5a)
+    SUMSUB_BA            w,  3, 11, 4                       ;  m3=t7a+t6a (t7), m11=t7a-t6a (t6a)
+    SUMSUB_BA            w,  1, 11, 4                       ;  m1=t6a+t5a (t6), m11=t6a-t5a (t5)
+    pmulhrsw            m1, m12                             ; m1=t6
+    pmulhrsw           m11, m12                             ; m11=t5
+    VP9_IDCT8_1D_FINALIZE
+%endmacro
+
+%macro VP9_IDCT8_4x4_1D 0
+    pmulhrsw            m0, m12                             ; m0=t1a/t0a
+    pmulhrsw           m10, m2, [pw_15137x2]                ; m10=t3a
+    pmulhrsw            m2, [pw_6270x2]                     ; m2=t2a
+    pmulhrsw           m11, m1, [pw_16069x2]                ; m11=t7a
+    pmulhrsw            m1, [pw_3196x2]                     ; m1=t4a
+    pmulhrsw            m9, m3, [pw_9102x2]                 ; m9=-t5a
+    pmulhrsw            m3, [pw_13623x2]                    ; m3=t6a
+    psubw               m8, m0, m10                         ; m8=t0a-t3a (t3)
+    paddw              m10, m0                              ; m10=t0a+t3a (t0)
+    SUMSUB_BA            w,  2,  0, 4                       ;  m2=t1a+t2a (t1),  m0=t1a-t2a (t2)
+    SUMSUB_BA            w,  9,  1, 4                       ;  m1=t4a+t5a (t4),  m9=t4a-t5a (t5a)
+    SWAP                 1,  9
+    SUMSUB_BA            w,  3, 11, 4                       ;  m3=t7a+t6a (t7), m11=t7a-t6a (t6a)
+    SUMSUB_BA            w,  1, 11, 4                       ;  m1=t6a+t5a (t6), m11=t6a-t5a (t5)
+    pmulhrsw            m1, m12                             ; m1=t6
+    pmulhrsw           m11, m12                             ; m11=t5
+    VP9_IDCT8_1D_FINALIZE
+%endmacro
+
+; TODO: a lot of t* copies can probably be removed and merged with
+; following SUMSUBs from VP9_IDCT8_1D_FINALIZE with AVX
+%macro VP9_IDCT8_2x2_1D 0
+    pmulhrsw            m0, m12                             ;  m0=t0
+    mova                m3, m1
+    pmulhrsw            m1, m6                              ;  m1=t4
+    pmulhrsw            m3, m7                              ;  m3=t7
+    mova                m2, m0                              ;  m2=t1
+    mova               m10, m0                              ; m10=t2
+    mova                m8, m0                              ;  m8=t3
+    mova               m11, m3                              ; t5 = t7a ...
+    mova                m9, m3                              ; t6 = t7a ...
+    psubw              m11, m1                              ; t5 = t7a - t4a
+    paddw               m9, m1                              ; t6 = t7a + t4a
+    pmulhrsw           m11, m12                             ; m11=t5
+    pmulhrsw            m9, m12                             ;  m9=t6
+    SWAP                 0, 10
+    SWAP                 9,  1
+    VP9_IDCT8_1D_FINALIZE
+%endmacro
+
+%macro VP9_IDCT8_WRITEOUT 0
+    mova                m5, [pw_1024]
+    pmulhrsw            m0, m5              ; (x*1024 + (1<<14))>>15 <=> (x+16)>>5
+    pmulhrsw            m1, m5
+    VP9_STORE_2X         0,  1,  6,  7,  4
+    lea               dstq, [dstq+2*strideq]
+    pmulhrsw            m2, m5
+    pmulhrsw            m3, m5
+    VP9_STORE_2X         2,  3,  6,  7,  4
+    lea               dstq, [dstq+2*strideq]
+    pmulhrsw            m8, m5
+    pmulhrsw            m9, m5
+    VP9_STORE_2X         8,  9,  6,  7,  4
+    lea               dstq, [dstq+2*strideq]
+    pmulhrsw           m10, m5
+    pmulhrsw           m11, m5
+    VP9_STORE_2X        10, 11,  6,  7,  4
+%endmacro
+
+%macro VP9_IDCT_IDCT_8x8_ADD_XMM 1
+INIT_XMM %1
+cglobal vp9_idct_idct_8x8_add, 4,4,13, dst, stride, block, eob
+
+    mova               m12, [pw_11585x2]    ; often used
+
+    cmp eobd, 12 ; top left half or less
+    jg .idctfull
+
+    cmp eobd, 3  ; top left corner or less
+    jg .idcthalf
+
+    cmp eobd, 1 ; faster path for when only DC is set
+    jne .idcttopleftcorner
+
+    movd                m0, [blockq]
+    pmulhrsw            m0, m12
+    pmulhrsw            m0, m12
+    SPLATW              m0, m0, 0
+    pxor                m4, m4
+    movd          [blockq], m4
+    mova                m5, [pw_1024]
+    pmulhrsw            m0, m5              ; (x*1024 + (1<<14))>>15 <=> (x+16)>>5
+    VP9_STORE_2X         0,  0,  6,  7,  4
+    lea               dstq, [dstq+2*strideq]
+    VP9_STORE_2X         0,  0,  6,  7,  4
+    lea               dstq, [dstq+2*strideq]
+    VP9_STORE_2X         0,  0,  6,  7,  4
+    lea               dstq, [dstq+2*strideq]
+    VP9_STORE_2X         0,  0,  6,  7,  4
+    RET
+
+; faster path for when only left corner is set (3 input: DC, right to DC, below
+; to DC). Note: also working with a 2x2 block
+.idcttopleftcorner:
+    movd                m0, [blockq+0]
+    movd                m1, [blockq+16]
+    mova                m6, [pw_3196x2]
+    mova                m7, [pw_16069x2]
+    VP9_IDCT8_2x2_1D
+    TRANSPOSE8x8W  0, 1, 2, 3, 8, 9, 10, 11, 4
+    VP9_IDCT8_2x2_1D
+    pxor                m4, m4  ; used for the block reset, and VP9_STORE_2X
+    movd       [blockq+ 0], m4
+    movd       [blockq+16], m4
+    VP9_IDCT8_WRITEOUT
+    RET
+
+.idcthalf:
+    movh                m0, [blockq + 0]
+    movh                m1, [blockq +16]
+    movh                m2, [blockq +32]
+    movh                m3, [blockq +48]
+    VP9_IDCT8_4x4_1D
+    TRANSPOSE8x8W  0, 1, 2, 3, 8, 9, 10, 11, 4
+    VP9_IDCT8_4x4_1D
+    pxor                m4, m4
+    movh       [blockq+ 0], m4
+    movh       [blockq+16], m4
+    movh       [blockq+32], m4
+    movh       [blockq+48], m4
+    VP9_IDCT8_WRITEOUT
+    RET
+
+.idctfull: ; generic full 8x8 idct/idct
+    mova                m0, [blockq+  0]    ; IN(0)
+    mova                m1, [blockq+ 16]    ; IN(1)
+    mova                m2, [blockq+ 32]    ; IN(2)
+    mova                m3, [blockq+ 48]    ; IN(3)
+    mova                m8, [blockq+ 64]    ; IN(4)
+    mova                m9, [blockq+ 80]    ; IN(5)
+    mova               m10, [blockq+ 96]    ; IN(6)
+    mova               m11, [blockq+112]    ; IN(7)
+    mova                m7, [pd_8192]       ; rounding
+    VP9_IDCT8_1D
+    TRANSPOSE8x8W  0, 1, 2, 3, 8, 9, 10, 11, 4
+    VP9_IDCT8_1D
+
+    pxor                m4, m4  ; used for the block reset, and VP9_STORE_2X
+    ZERO_BLOCK      blockq, 16, 8, m4
+    VP9_IDCT8_WRITEOUT
+    RET
+%endmacro
+
+VP9_IDCT_IDCT_8x8_ADD_XMM ssse3
+VP9_IDCT_IDCT_8x8_ADD_XMM avx
+
+;---------------------------------------------------------------------------------------------
+; void vp9_iadst_iadst_8x8_add_<opt>(uint8_t *dst, ptrdiff_t stride, int16_t *block, int eob);
+;---------------------------------------------------------------------------------------------
+
+%macro VP9_IADST8_1D 0 ; input/output=m0/1/2/3/8/9/10/11
+    VP9_UNPACK_MULSUB_2D_4X 11,  0,  4,  5, 16305,  1606    ; m11/4=t1[d], m0/5=t0[d]
+    VP9_UNPACK_MULSUB_2D_4X  3,  8,  6, 13, 10394, 12665    ; m3/6=t5[d], m8/13=t4[d]
+    VP9_RND_SH_SUMSUB_BA     8,  0, 13,  5, 14, m7          ; m8=t0[w], m0=t4[w]
+    VP9_RND_SH_SUMSUB_BA     3, 11,  6,  4, 14, m7          ; m3=t1[w], m11=t5[w]
+
+    VP9_UNPACK_MULSUB_2D_4X  9,  2,  4,  5, 14449,  7723    ; m9/4=t3[d], m2/5=t2[d]
+    VP9_UNPACK_MULSUB_2D_4X  1, 10,  6, 13,  4756, 15679    ; m1/6=t7[d], m10/13=t6[d]
+    VP9_RND_SH_SUMSUB_BA    10,  2, 13,  5, 14, m7          ; m10=t2[w], m2=t6[w]
+    VP9_RND_SH_SUMSUB_BA     1,  9,  6,  4, 14, m7          ; m1=t3[w], m9=t7[w]
+
+    ; m8=t0, m3=t1, m10=t2, m1=t3, m0=t4, m11=t5, m2=t6, m9=t7
+
+    VP9_UNPACK_MULSUB_2D_4X  0, 11,  4,  5, 15137,  6270    ; m0/4=t5[d], m11/5=t4[d]
+    VP9_UNPACK_MULSUB_2D_4X  9,  2,  6, 13,  6270, 15137    ; m9/6=t6[d], m2/13=t7[d]
+    VP9_RND_SH_SUMSUB_BA     9, 11,  6,  5, 14, m7
+    psignw                  m9, [pw_m1]                     ; m9=out1[w], m11=t6[w]
+    VP9_RND_SH_SUMSUB_BA     2,  0, 13,  4, 14, m7          ; m2=out6[w], m0=t7[w]
+
+    SUMSUB_BA                w, 10,  8, 14                  ; m10=out0[w], m8=t2[w]
+    SUMSUB_BA                w,  1,  3, 14
+    psignw                  m1, [pw_m1]                     ; m1=out7[w], m3=t3[w]
+
+    ; m10=out0, m9=out1, m8=t2, m3=t3, m11=t6, m0=t7, m2=out6, m1=out7
+
+    SUMSUB_BA                w,  3,  8,  4
+    SUMSUB_BA                w,  0, 11,  5
+    pmulhrsw                m3, m12
+    pmulhrsw               m11, m12
+    pmulhrsw                m8, m12                         ; out4
+    pmulhrsw                m0, m12                         ; out2
+    psignw                  m3, [pw_m1]                     ; out3
+    psignw                 m11, [pw_m1]                     ; out5
+
+    ; m10=out0, m9=out1, m0=out2, m3=out3, m8=out4, m11=out5, m2=out6, m1=out7
+
+    SWAP                     0, 10, 2
+    SWAP                    11,  1, 9
+%endmacro
+
+%macro IADST8_FN 5
+INIT_XMM %5
+cglobal vp9_%1_%3_8x8_add, 3, 3, 15, dst, stride, block, eob
+    mova                m0, [blockq+  0]    ; IN(0)
+    mova                m1, [blockq+ 16]    ; IN(1)
+    mova                m2, [blockq+ 32]    ; IN(2)
+    mova                m3, [blockq+ 48]    ; IN(3)
+    mova                m8, [blockq+ 64]    ; IN(4)
+    mova                m9, [blockq+ 80]    ; IN(5)
+    mova               m10, [blockq+ 96]    ; IN(6)
+    mova               m11, [blockq+112]    ; IN(7)
+
+    mova               m12, [pw_11585x2]    ; often used
+    mova                m7, [pd_8192]       ; rounding
+    VP9_%2_1D
+    TRANSPOSE8x8W  0, 1, 2, 3, 8, 9, 10, 11, 4
+    VP9_%4_1D
+
+    pxor                m4, m4  ; used for the block reset, and VP9_STORE_2X
+    ZERO_BLOCK      blockq, 16, 8, m4
+    VP9_IDCT8_WRITEOUT
+    RET
+%endmacro
+
+IADST8_FN idct,  IDCT8,  iadst, IADST8, ssse3
+IADST8_FN idct,  IDCT8,  iadst, IADST8, avx
+IADST8_FN iadst, IADST8, idct,  IDCT8,  ssse3
+IADST8_FN iadst, IADST8, idct,  IDCT8,  avx
+IADST8_FN iadst, IADST8, iadst, IADST8, ssse3
+IADST8_FN iadst, IADST8, iadst, IADST8, avx
+
+;---------------------------------------------------------------------------------------------
+; void vp9_idct_idct_16x16_add_<opt>(uint8_t *dst, ptrdiff_t stride, int16_t *block, int eob);
+;---------------------------------------------------------------------------------------------
+
+; at the end of this macro, m7 is stored in stack_scratch
+; everything else (t0-6 and t8-15) is stored in m0-6 and m8-15
+; the following sumsubs have not been done yet:
+;    SUMSUB_BA            w,  6,  9, 15      ; t6, t9
+;    SUMSUB_BA            w,  7,  8, 15      ; t7, t8
+%macro VP9_IDCT16_1D_START 4 ; src, nnzc, stride, stack_scratch
+%if %2 <= 4
+    mova                m3, [%1+ 1*%3]      ; IN(1)
+    mova               m12, [%1+ 2*%3]      ; IN(2)
+    mova                m0, [%1+ 3*%3]      ; IN(3)
+
+    pmulhrsw           m15, m12, [pw_16069x2]       ; t6-7
+    pmulhrsw           m12, [pw_3196x2]             ; t4-5
+    pmulhrsw            m4, m3,  [pw_16305x2]       ; t14-15
+    pmulhrsw            m3, [pw_1606x2]             ; t8-9
+    pmulhrsw            m7, m0,  [pw_m4756x2]       ; t10-11
+    pmulhrsw            m0, [pw_15679x2]            ; t12-13
+
+    ; m8=t0, m9=t1, m10=t2, m11=t3, m12=t4, m14=t5, m13=t6, m15=t7
+    ; m3=t8, m5=t9, m1=t10, m7=t11, m0=t12, m6=t13, m2=t14, m4=t15
+
+    paddw              m14, m15, m12
+    psubw              m13, m15, m12
+    pmulhrsw           m13, [pw_11585x2]            ; t5
+    pmulhrsw           m14, [pw_11585x2]            ; t6
+
+    VP9_UNPACK_MULSUB_2W_4X 2, 5, 4, 3, 15137,  6270, [pd_8192], 10, 11 ; t9,  t14
+    VP9_UNPACK_MULSUB_2W_4X 6, 1, 0, 7, 6270, m15137, [pd_8192], 10, 11 ; t10, t13
+
+    ; m15=t0, m14=t1, m13=t2, m12=t3, m11=t4, m10=t5, m9=t6, m8=t7
+    ; m7=t8, m6=t9, m2=t10, m3=t11, m4=t12, m5=t13, m1=t14, m0=t15
+%else
+    mova                m5, [%1+ 1*%3]     ; IN(1)
+    mova               m14, [%1+ 2*%3]     ; IN(2)
+    mova                m6, [%1+ 3*%3]     ; IN(3)
+    mova                m9, [%1+ 4*%3]     ; IN(4)
+    mova                m7, [%1+ 5*%3]     ; IN(5)
+    mova               m15, [%1+ 6*%3]     ; IN(6)
+    mova                m4, [%1+ 7*%3]     ; IN(7)
+%if %2 <= 8
+    pmulhrsw            m8, m9,  [pw_15137x2]       ; t3
+    pmulhrsw            m9, [pw_6270x2]             ; t2
+    pmulhrsw           m13, m14, [pw_16069x2]       ; t7
+    pmulhrsw           m14, [pw_3196x2]             ; t4
+    pmulhrsw           m12, m15, [pw_m9102x2]       ; t5
+    pmulhrsw           m15, [pw_13623x2]            ; t6
+    pmulhrsw            m2, m5,  [pw_16305x2]       ; t15
+    pmulhrsw            m5, [pw_1606x2]             ; t8
+    pmulhrsw            m3, m4,  [pw_m10394x2]      ; t9
+    pmulhrsw            m4, [pw_12665x2]            ; t14
+    pmulhrsw            m0, m7,  [pw_14449x2]       ; t13
+    pmulhrsw            m7, [pw_7723x2]             ; t10
+    pmulhrsw            m1, m6,  [pw_m4756x2]       ; t11
+    pmulhrsw            m6, [pw_15679x2]            ; t12
+%else
+    mova                m3, [%1+ 9*%3]     ; IN(9)
+    mova               m12, [%1+10*%3]     ; IN(10)
+    mova                m0, [%1+11*%3]     ; IN(11)
+    mova                m8, [%1+12*%3]     ; IN(12)
+    mova                m1, [%1+13*%3]     ; IN(13)
+    mova               m13, [%1+14*%3]     ; IN(14)
+    mova                m2, [%1+15*%3]     ; IN(15)
+
+    ; m10=in0, m5=in1, m14=in2, m6=in3, m9=in4, m7=in5, m15=in6, m4=in7
+    ; m11=in8, m3=in9, m12=in10 m0=in11, m8=in12, m1=in13, m13=in14, m2=in15
+
+    VP9_UNPACK_MULSUB_2W_4X   9,   8, 15137,  6270, [pd_8192], 10, 11 ; t2,  t3
+    VP9_UNPACK_MULSUB_2W_4X  14,  13, 16069,  3196, [pd_8192], 10, 11 ; t4,  t7
+    VP9_UNPACK_MULSUB_2W_4X  12,  15,  9102, 13623, [pd_8192], 10, 11 ; t5,  t6
+    VP9_UNPACK_MULSUB_2W_4X   5,   2, 16305,  1606, [pd_8192], 10, 11 ; t8,  t15
+    VP9_UNPACK_MULSUB_2W_4X   3,   4, 10394, 12665, [pd_8192], 10, 11 ; t9,  t14
+    VP9_UNPACK_MULSUB_2W_4X   7,   0, 14449,  7723, [pd_8192], 10, 11 ; t10, t13
+    VP9_UNPACK_MULSUB_2W_4X   1,   6,  4756, 15679, [pd_8192], 10, 11 ; t11, t12
+%endif
+
+    ; m11=t0, m10=t1, m9=t2, m8=t3, m14=t4, m12=t5, m15=t6, m13=t7
+    ; m5=t8, m3=t9, m7=t10, m1=t11, m6=t12, m0=t13, m4=t14, m2=t15
+
+    SUMSUB_BA            w, 12, 14, 10      ; t4,  t5
+    SUMSUB_BA            w, 15, 13, 10      ; t7,  t6
+    SUMSUB_BA            w,  3,  5, 10      ; t8,  t9
+    SUMSUB_BA            w,  7,  1, 10      ; t11, t10
+    SUMSUB_BA            w,  0,  6, 10      ; t12, t13
+    SUMSUB_BA            w,  4,  2, 10      ; t15, t14
+
+    ; m8=t0, m9=t1, m10=t2, m11=t3, m12=t4, m14=t5, m13=t6, m15=t7
+    ; m3=t8, m5=t9, m1=t10, m7=t11, m0=t12, m6=t13, m2=t14, m4=t15
+
+    SUMSUB_BA            w, 14, 13, 10
+    pmulhrsw           m13, [pw_11585x2]                              ; t5
+    pmulhrsw           m14, [pw_11585x2]                              ; t6
+    VP9_UNPACK_MULSUB_2W_4X   2,   5, 15137,  6270, [pd_8192], 10, 11 ; t9,  t14
+    VP9_UNPACK_MULSUB_2W_4X   6,   1, 6270, m15137, [pd_8192], 10, 11 ; t10, t13
+%endif
+
+    ; m8=t0, m9=t1, m10=t2, m11=t3, m12=t4, m13=t5, m14=t6, m15=t7
+    ; m3=t8, m2=t9, m6=t10, m7=t11, m0=t12, m1=t13, m5=t14, m4=t15
+
+    SUMSUB_BA            w,  7,  3, 10      ; t8,  t11
+    SUMSUB_BA            w,  6,  2, 10      ; t9,  t10
+    SUMSUB_BA            w,  0,  4, 10      ; t15, t12
+    SUMSUB_BA            w,  1,  5, 10      ; t14. t13
+
+    ; m15=t0, m14=t1, m13=t2, m12=t3, m11=t4, m10=t5, m9=t6, m8=t7
+    ; m7=t8, m6=t9, m2=t10, m3=t11, m4=t12, m5=t13, m1=t14, m0=t15
+
+    SUMSUB_BA            w,  2,  5, 10
+    SUMSUB_BA            w,  3,  4, 10
+    pmulhrsw            m5, [pw_11585x2]    ; t10
+    pmulhrsw            m4, [pw_11585x2]    ; t11
+    pmulhrsw            m3, [pw_11585x2]    ; t12
+    pmulhrsw            m2, [pw_11585x2]    ; t13
+
+    ; backup first register
+    mova              [%4], m7
+
+    ; m15=t0, m14=t1, m13=t2, m12=t3, m11=t4, m10=t5, m9=t6, m8=t7
+    ; m7=t8, m6=t9, m5=t10, m4=t11, m3=t12, m2=t13, m1=t14, m0=t15
+
+    ; from load/start
+%if %2 <= 4
+    mova               m11, [%1+ 0*%3]      ; IN(0)
+    pmulhrsw           m11, [pw_11585x2]    ; t0-t3
+
+    psubw               m8, m11, m15
+    paddw              m15, m11
+    psubw               m9, m11, m14
+    paddw              m14, m11
+    psubw              m10, m11, m13
+    paddw              m13, m11
+%else
+    mova               m10, [%1+ 0*%3]      ; IN(0)
+%if %2 <= 8
+    pmulhrsw           m10, [pw_11585x2]    ; t0 and t1
+    psubw              m11, m10, m8
+    paddw               m8, m10
+%else
+    mova               m11, [%1+ 8*%3]      ; IN(8)
+
+    ; from 3 stages back
+    SUMSUB_BA            w, 11, 10, 7
+    pmulhrsw           m11, [pw_11585x2]    ; t0
+    pmulhrsw           m10, [pw_11585x2]    ; t1
+
+    ; from 2 stages back
+    SUMSUB_BA            w,  8, 11, 7       ; t0,  t3
+%endif
+    SUMSUB_BA            w,  9, 10, 7       ; t1,  t2
+
+    ; from 1 stage back
+    SUMSUB_BA            w, 15,  8, 7       ; t0,  t7
+    SUMSUB_BA            w, 14,  9, 7       ; t1,  t6
+    SUMSUB_BA            w, 13, 10, 7       ; t2,  t5
+%endif
+    SUMSUB_BA            w, 12, 11, 7       ; t3,  t4
+
+    SUMSUB_BA            w,  0, 15, 7       ; t0, t15
+    SUMSUB_BA            w,  1, 14, 7       ; t1, t14
+    SUMSUB_BA            w,  2, 13, 7       ; t2, t13
+    SUMSUB_BA            w,  3, 12, 7       ; t3, t12
+    SUMSUB_BA            w,  4, 11, 7       ; t4, t11
+    SUMSUB_BA            w,  5, 10, 7       ; t5, t10
+%endmacro
+
+%macro VP9_IDCT16_1D 2-3 16 ; src, pass, nnzc
+    VP9_IDCT16_1D_START %1, %3, 32, tmpq+32
+
+%if %2 == 1
+    ; backup a different register
+    mova         [tmpq+16], m15
+    mova                m7, [tmpq+32]
+
+    SUMSUB_BA            w,  6,  9, 15      ; t6, t9
+    SUMSUB_BA            w,  7,  8, 15      ; t7, t8
+
+    TRANSPOSE8x8W        0, 1, 2, 3, 4, 5, 6, 7, 15
+    mova        [tmpq+  0], m0
+    mova        [tmpq+ 32], m1
+    mova        [tmpq+ 64], m2
+    mova        [tmpq+ 96], m3
+    mova        [tmpq+128], m4
+    mova        [tmpq+160], m5
+    mova        [tmpq+192], m6
+    mova        [tmpq+224], m7
+
+    mova               m15, [tmpq+16]
+    TRANSPOSE8x8W        8, 9, 10, 11, 12, 13, 14, 15, 0
+    mova        [tmpq+ 16], m8
+    mova        [tmpq+ 48], m9
+    mova        [tmpq+ 80], m10
+    mova        [tmpq+112], m11
+    mova        [tmpq+144], m12
+    mova        [tmpq+176], m13
+    mova        [tmpq+208], m14
+    mova        [tmpq+240], m15
+%else ; %2 == 2
+    ; backup more registers
+    mova         [tmpq+64], m8
+    mova         [tmpq+96], m9
+
+    pxor                m7, m7
+    pmulhrsw            m0, [pw_512]
+    pmulhrsw            m1, [pw_512]
+    VP9_STORE_2X         0,  1,  8,  9,  7
+    lea               dstq, [dstq+strideq*2]
+    pmulhrsw            m2, [pw_512]
+    pmulhrsw            m3, [pw_512]
+    VP9_STORE_2X         2,  3,  8,  9,  7
+    lea               dstq, [dstq+strideq*2]
+    pmulhrsw            m4, [pw_512]
+    pmulhrsw            m5, [pw_512]
+    VP9_STORE_2X         4,  5,  8,  9,  7
+    lea               dstq, [dstq+strideq*2]
+
+    ; restore from cache
+    SWAP                 0, 7               ; move zero from m7 to m0
+    mova                m7, [tmpq+32]
+    mova                m8, [tmpq+64]
+    mova                m9, [tmpq+96]
+
+    SUMSUB_BA            w,  6,  9, 1       ; t6, t9
+    SUMSUB_BA            w,  7,  8, 1       ; t7, t8
+
+    pmulhrsw            m6, [pw_512]
+    pmulhrsw            m7, [pw_512]
+    VP9_STORE_2X         6,  7,  1,  2,  0
+    lea               dstq, [dstq+strideq*2]
+    pmulhrsw            m8, [pw_512]
+    pmulhrsw            m9, [pw_512]
+    VP9_STORE_2X         8,  9,  1,  2,  0
+    lea               dstq, [dstq+strideq*2]
+    pmulhrsw           m10, [pw_512]
+    pmulhrsw           m11, [pw_512]
+    VP9_STORE_2X        10, 11,  1,  2,  0
+    lea               dstq, [dstq+strideq*2]
+    pmulhrsw           m12, [pw_512]
+    pmulhrsw           m13, [pw_512]
+    VP9_STORE_2X        12, 13,  1,  2,  0
+    lea               dstq, [dstq+strideq*2]
+    pmulhrsw           m14, [pw_512]
+    pmulhrsw           m15, [pw_512]
+    VP9_STORE_2X        14, 15,  1,  2,  0
+%endif ; %2 == 1/2
+%endmacro
+
+%macro VP9_STORE_2XFULL 6-7 strideq; dc, tmp1, tmp2, tmp3, tmp4, zero, stride
+    mova               m%3, [dstq]
+    mova               m%5, [dstq+%7]
+    punpcklbw          m%2, m%3, m%6
+    punpckhbw          m%3, m%6
+    punpcklbw          m%4, m%5, m%6
+    punpckhbw          m%5, m%6
+    paddw              m%2, m%1
+    paddw              m%3, m%1
+    paddw              m%4, m%1
+    paddw              m%5, m%1
+    packuswb           m%2, m%3
+    packuswb           m%4, m%5
+    mova            [dstq], m%2
+    mova         [dstq+%7], m%4
+%endmacro
+
+%macro VP9_IDCT_IDCT_16x16_ADD_XMM 1
+INIT_XMM %1
+cglobal vp9_idct_idct_16x16_add, 4, 6, 16, 512, dst, stride, block, eob
+    ; 2x2=eob=3, 4x4=eob=10
+    cmp eobd, 38
+    jg .idctfull
+    cmp eobd, 1 ; faster path for when only DC is set
+    jne .idct8x8
+
+    ; dc-only
+    movd                m0, [blockq]
+    mova                m1, [pw_11585x2]
+    pmulhrsw            m0, m1
+    pmulhrsw            m0, m1
+    SPLATW              m0, m0, q0000
+    pmulhrsw            m0, [pw_512]
+    pxor                m5, m5
+    movd          [blockq], m5
+%rep 7
+    VP9_STORE_2XFULL    0, 1, 2, 3, 4, 5
+    lea               dstq, [dstq+2*strideq]
+%endrep
+    VP9_STORE_2XFULL    0, 1, 2, 3, 4, 5
+    RET
+
+    DEFINE_ARGS dst, stride, block, cnt, dst_bak, tmp
+.idct8x8:
+    mov               tmpq, rsp
+    VP9_IDCT16_1D   blockq, 1, 8
+
+    mov               cntd, 2
+    mov           dst_bakq, dstq
+.loop2_8x8:
+    VP9_IDCT16_1D     tmpq, 2, 8
+    lea               dstq, [dst_bakq+8]
+    add               tmpq, 16
+    dec               cntd
+    jg .loop2_8x8
+
+    ; at the end of the loop, m0 should still be zero
+    ; use that to zero out block coefficients
+    ZERO_BLOCK      blockq, 32, 8, m0
+    RET
+
+.idctfull:
+    mov               cntd, 2
+    mov               tmpq, rsp
+.loop1_full:
+    VP9_IDCT16_1D   blockq, 1
+    add             blockq, 16
+    add               tmpq, 256
+    dec               cntd
+    jg .loop1_full
+    sub             blockq, 32
+
+    mov               cntd, 2
+    mov               tmpq, rsp
+    mov           dst_bakq, dstq
+.loop2_full:
+    VP9_IDCT16_1D     tmpq, 2
+    lea               dstq, [dst_bakq+8]
+    add               tmpq, 16
+    dec               cntd
+    jg .loop2_full
+
+    ; at the end of the loop, m0 should still be zero
+    ; use that to zero out block coefficients
+    ZERO_BLOCK      blockq, 32, 16, m0
+    RET
+%endmacro
+
+VP9_IDCT_IDCT_16x16_ADD_XMM ssse3
+VP9_IDCT_IDCT_16x16_ADD_XMM avx
+
+;---------------------------------------------------------------------------------------------
+; void vp9_iadst_iadst_16x16_add_<opt>(uint8_t *dst, ptrdiff_t stride, int16_t *block, int eob);
+;---------------------------------------------------------------------------------------------
+
+%macro VP9_IADST16_1D 2 ; src, pass
+%assign %%str 16*%2
+    mova                m0, [%1+ 0*32]  ; in0
+    mova                m1, [%1+15*32]  ; in15
+    mova                m8, [%1+ 7*32]  ; in7
+    mova                m9, [%1+ 8*32]  ; in8
+
+    VP9_UNPACK_MULSUB_2D_4X  1,  0,  2,  3, 16364,   804    ; m1/2=t1[d], m0/3=t0[d]
+    VP9_UNPACK_MULSUB_2D_4X  8,  9, 11, 10, 11003, 12140    ; m8/11=t9[d], m9/10=t8[d]
+    VP9_RND_SH_SUMSUB_BA     9,  0, 10,  3,  4, [pd_8192]   ; m9=t0[w], m0=t8[w]
+    VP9_RND_SH_SUMSUB_BA     8,  1, 11,  2,  4, [pd_8192]   ; m8=t1[w], m1=t9[w]
+
+    mova               m11, [%1+ 2*32]  ; in2
+    mova               m10, [%1+13*32]  ; in13
+    mova                m3, [%1+ 5*32]  ; in5
+    mova                m2, [%1+10*32]  ; in10
+
+    VP9_UNPACK_MULSUB_2D_4X 10, 11,  6,  7, 15893,  3981    ; m10/6=t3[d], m11/7=t2[d]
+    VP9_UNPACK_MULSUB_2D_4X  3,  2,  4,  5,  8423, 14053    ; m3/4=t11[d], m2/5=t10[d]
+    VP9_RND_SH_SUMSUB_BA     2, 11,  5,  7, 12, [pd_8192]   ; m2=t2[w], m11=t10[w]
+    VP9_RND_SH_SUMSUB_BA     3, 10,  4,  6, 12, [pd_8192]   ; m3=t3[w], m10=t11[w]
+
+    mova   [tmpq+ 0*%%str], m9          ; make some scratch space (t0:m9->r0)
+    mova                m4, [%1+ 4*32]  ; in4
+    mova                m5, [%1+11*32]  ; in11
+    mova               m12, [%1+ 3*32]  ; in3
+    mova               m13, [%1+12*32]  ; in12
+
+    VP9_UNPACK_MULSUB_2D_4X  5,  4,  7,  6, 14811,  7005    ; m5/7=t5[d], m4/6=t4[d]
+    VP9_UNPACK_MULSUB_2D_4X 12, 13, 14, 15,  5520, 15426    ; m12/14=t13[d], m13/15=t12[d]
+    VP9_RND_SH_SUMSUB_BA    13,  4, 15,  6,  9, [pd_8192]   ; m13=t4[w], m4=t12[w]
+    VP9_RND_SH_SUMSUB_BA    12,  5, 14,  7,  9, [pd_8192]   ; m12=t5[w], m5=t13[w]
+
+    mova   [tmpq+ 2*%%str], m8          ; t1:m9->r2
+    mova   [tmpq+ 3*%%str], m2          ; t2:m2->r3
+    mova   [tmpq+ 4*%%str], m3          ; t3:m3->r4
+    mova   [tmpq+ 5*%%str], m13         ; t4:m13->r5
+    mova                m2, [%1+ 6*32]  ; in6
+    mova                m3, [%1+ 9*32]  ; in9
+    mova                m8, [%1+ 1*32]  ; in1
+    mova                m9, [%1+14*32]  ; in14
+
+    VP9_UNPACK_MULSUB_2D_4X  3,  2,  7,  6, 13160,  9760    ; m3/7=t7[d], m2/6=t6[d]
+    VP9_UNPACK_MULSUB_2D_4X  8,  9, 13, 14,  2404, 16207    ; m8/13=t15[d], m9/14=t14[d]
+    VP9_RND_SH_SUMSUB_BA     9,  2, 14,  6, 15, [pd_8192]   ; m9=t6[w], m2=t14[w]
+    VP9_RND_SH_SUMSUB_BA     8,  3, 13,  7, 15, [pd_8192]   ; m8=t7[w], m3=t15[w]
+
+    ; r0=t0, r2=t1, r3=t2, r4=t3, r5=t4, m12=t5, m9=t6, m8=t7
+    ; m0=t8, m1=t9, m11=t10, m10=t11, m4=t12, m5=t13, m2=t14, m3=t15
+
+    ; handle t8-15 first
+    VP9_UNPACK_MULSUB_2D_4X  0,  1,  6,  7, 16069,  3196    ; m1/7=t8[d], m0/6=t9[d]
+    VP9_UNPACK_MULSUB_2D_4X  5,  4, 13, 14,  3196, 16069    ; m5/13=t12[d], m4/14=t13[d]
+    VP9_RND_SH_SUMSUB_BA     5,  1, 13,  7, 15, [pd_8192]   ; m5=t8[w], m1=t12[w]
+    VP9_RND_SH_SUMSUB_BA     4,  0, 14,  6, 15, [pd_8192]   ; m4=t9[w], m0=t13[w]
+
+    VP9_UNPACK_MULSUB_2D_4X 11, 10,  6,  7,  9102, 13623    ; m11/6=t11[d], m10/7=t10[d]
+    VP9_UNPACK_MULSUB_2D_4X  3,  2, 13, 14, 13623,  9102    ; m3/13=t14[d], m2/14=t15[d]
+    VP9_RND_SH_SUMSUB_BA     3, 10, 13,  7, 15, [pd_8192]   ; m3=t10[w], m10=t14[w]
+    VP9_RND_SH_SUMSUB_BA     2, 11, 14,  6, 15, [pd_8192]   ; m2=t11[w], m11=t15[w]
+
+    ; m5=t8, m4=t9, m3=t10, m2=t11, m1=t12, m0=t13, m10=t14, m11=t15
+
+    VP9_UNPACK_MULSUB_2D_4X  1,  0,  6,  7, 15137,  6270    ; m1/6=t13[d], m0/7=t12[d]
+    VP9_UNPACK_MULSUB_2D_4X 11, 10, 13, 14,  6270, 15137    ; m11/13=t14[d], m10/14=t15[d]
+    VP9_RND_SH_SUMSUB_BA    11,  0, 13,  7, 15, [pd_8192]   ; m11=out2[w], m0=t14[w]
+    VP9_RND_SH_SUMSUB_BA    10,  1, 14,  6, 15, [pd_8192]
+    psignw                 m10, [pw_m1]                     ; m10=out13[w], m1=t15[w]
+
+    SUMSUB_BA                w,  3,  5, 15
+    psignw                  m3, [pw_m1]                     ; m3=out1[w], m5=t10[w]
+    SUMSUB_BA                w,  2,  4, 15                  ; m2=out14[w], m4=t11[w]
+
+    SUMSUB_BA                w,  5,  4, 15
+    pmulhrsw                m5, [pw_11585x2]                ; m5=out6[w]
+    pmulhrsw                m4, [pw_11585x2]                ; m4=out9[w]
+    SUMSUB_BA                w,  1,  0, 15
+    pmulhrsw                m1, [pw_m11585x2]               ; m1=out5[w]
+    pmulhrsw                m0, [pw_11585x2]                ; m0=out10[w]
+
+    ; m3=out1, m11=out2, m1=out5, m5=out6, m4=out9, m0=out10, m10=out13, m2=out14
+
+    mova                    m6, [tmpq+ 0*%%str]
+    mova                    m7, [tmpq+ 2*%%str]
+    mova                   m13, [tmpq+ 3*%%str]
+    mova                   m14, [tmpq+ 4*%%str]
+    mova                   m15, [tmpq+ 5*%%str]
+    mova       [tmpq+ 8*%%str], m5
+    mova       [tmpq+ 9*%%str], m4
+    mova       [tmpq+10*%%str], m0
+    mova       [tmpq+11*%%str], m10
+    mova       [tmpq+12*%%str], m2
+
+    ; m6=t0, m7=t1, m13=t2, m14=t3, m15=t4, m12=t5, m9=t6, m8=t7
+    ; m3=out1, m11=out2, m1=out5, r8=out6, r9=out9, r10=out10, r11=out13, r12=out14
+
+    SUMSUB_BA                w, 15,  6,  0                  ; m15=t0[w], m6=t4[w]
+    SUMSUB_BA                w, 12,  7,  0                  ; m12=t1[w], m7=t5[w]
+    SUMSUB_BA                w,  9, 13,  0                  ; m9=t2[w], m13=t6[w]
+    SUMSUB_BA                w,  8, 14,  0                  ; m8=t3[w], m14=t7[w]
+
+    VP9_UNPACK_MULSUB_2D_4X  6,  7,  0,  2, 15137,  6270    ; m6/0=t5[d], m7/2=t4[d]
+    VP9_UNPACK_MULSUB_2D_4X 14, 13,  4,  5,  6270, 15137    ; m14/4=t6[d], m13/5=t7[d]
+    VP9_RND_SH_SUMSUB_BA    14,  7,  4,  2, 10, [pd_8192]
+    psignw                 m14, [pw_m1]                     ; m14=out3[w], m7=t6[w]
+    VP9_RND_SH_SUMSUB_BA    13,  6,  5,  0, 10, [pd_8192]   ; m13=out12[w], m6=t7[w]
+    SUMSUB_BA                w,  9, 15, 10                  ; m9=out0[w], m15=t2[w]
+    SUMSUB_BA                w,  8, 12, 10
+    psignw                  m8, [pw_m1]                     ; m8=out15[w], m12=t3[w]
+
+    SUMSUB_BA                w, 12, 15, 10
+    pmulhrsw               m12, [pw_m11585x2]               ; m12=out7[w]
+    pmulhrsw               m15, [pw_11585x2]                ; m15=out8[w]
+    SUMSUB_BA                w,  7,  6, 10
+    pmulhrsw                m7, [pw_11585x2]                ; m7=out4[w]
+    pmulhrsw                m6, [pw_11585x2]                ; m6=out11[w]
+
+    ; m9=out0, m14=out3, m7=out4, m12=out7, m15=out8, m6=out11, m13=out12, m8=out15
+    ; m3=out1, m11=out2, m1=out5, r8=out6, r9=out9, r10=out10, r11=out13, r12=out14
+
+%if %2 == 1
+    mova                    m0, [tmpq+ 8*%%str]
+    TRANSPOSE8x8W            9, 3, 11, 14, 7, 1, 0, 12, 2
+    mova          [tmpq+ 0*16], m9
+    mova          [tmpq+ 2*16], m3
+    mova          [tmpq+ 4*16], m11
+    mova          [tmpq+ 6*16], m14
+    mova                    m9, [tmpq+ 9*%%str]
+    mova                    m3, [tmpq+10*%%str]
+    mova                   m11, [tmpq+11*%%str]
+    mova                   m14, [tmpq+12*%%str]
+    mova          [tmpq+ 8*16], m7
+    mova          [tmpq+10*16], m1
+    mova          [tmpq+12*16], m0
+    mova          [tmpq+14*16], m12
+
+    TRANSPOSE8x8W           15, 9, 3, 6, 13, 11, 14, 8, 2
+    mova          [tmpq+ 1*16], m15
+    mova          [tmpq+ 3*16], m9
+    mova          [tmpq+ 5*16], m3
+    mova          [tmpq+ 7*16], m6
+    mova          [tmpq+ 9*16], m13
+    mova          [tmpq+11*16], m11
+    mova          [tmpq+13*16], m14
+    mova          [tmpq+15*16], m8
+%else
+    mova                    m5, [tmpq+ 8*%%str]
+    pxor                    m0, m0
+
+    pmulhrsw                m9, [pw_512]
+    pmulhrsw                m3, [pw_512]
+    VP9_STORE_2X             9,  3, 2, 4, 0
+    lea                   dstq, [dstq+strideq*2]
+    pmulhrsw               m11, [pw_512]
+    pmulhrsw               m14, [pw_512]
+    VP9_STORE_2X            11, 14, 2, 4, 0
+    lea                   dstq, [dstq+strideq*2]
+    pmulhrsw                m7, [pw_512]
+    pmulhrsw                m1, [pw_512]
+    VP9_STORE_2X             7,  1, 2, 4, 0
+    lea                   dstq, [dstq+strideq*2]
+    pmulhrsw                m5, [pw_512]
+    pmulhrsw               m12, [pw_512]
+    VP9_STORE_2X             5, 12, 2, 4, 0
+    lea                   dstq, [dstq+strideq*2]
+
+    mova                    m9, [tmpq+ 9*%%str]
+    mova                    m3, [tmpq+10*%%str]
+    mova                   m11, [tmpq+11*%%str]
+    mova                   m14, [tmpq+12*%%str]
+
+    pmulhrsw               m15, [pw_512]
+    pmulhrsw                m9, [pw_512]
+    VP9_STORE_2X            15,  9, 2, 4, 0
+    lea                   dstq, [dstq+strideq*2]
+    pmulhrsw                m3, [pw_512]
+    pmulhrsw                m6, [pw_512]
+    VP9_STORE_2X             3,  6, 2, 4, 0
+    lea                   dstq, [dstq+strideq*2]
+    pmulhrsw               m13, [pw_512]
+    pmulhrsw               m11, [pw_512]
+    VP9_STORE_2X            13, 11, 2, 4, 0
+    lea                   dstq, [dstq+strideq*2]
+    pmulhrsw               m14, [pw_512]
+    pmulhrsw                m8, [pw_512]
+    VP9_STORE_2X            14,  8, 2, 4, 0
+%endif
+%endmacro
+
+%macro IADST16_FN 5
+INIT_XMM %5
+cglobal vp9_%1_%3_16x16_add, 3, 6, 16, 512, dst, stride, block, cnt, dst_bak, tmp
+    mov               cntd, 2
+    mov               tmpq, rsp
+.loop1_full:
+    VP9_%2_1D       blockq, 1
+    add             blockq, 16
+    add               tmpq, 256
+    dec               cntd
+    jg .loop1_full
+    sub             blockq, 32
+
+    mov               cntd, 2
+    mov               tmpq, rsp
+    mov           dst_bakq, dstq
+.loop2_full:
+    VP9_%4_1D         tmpq, 2
+    lea               dstq, [dst_bakq+8]
+    add               tmpq, 16
+    dec               cntd
+    jg .loop2_full
+
+    ; at the end of the loop, m0 should still be zero
+    ; use that to zero out block coefficients
+    ZERO_BLOCK      blockq, 32, 16, m0
+    RET
+%endmacro
+
+IADST16_FN idct,  IDCT16,  iadst, IADST16, ssse3
+IADST16_FN idct,  IDCT16,  iadst, IADST16, avx
+IADST16_FN iadst, IADST16, idct,  IDCT16,  ssse3
+IADST16_FN iadst, IADST16, idct,  IDCT16,  avx
+IADST16_FN iadst, IADST16, iadst, IADST16, ssse3
+IADST16_FN iadst, IADST16, iadst, IADST16, avx
+
+;---------------------------------------------------------------------------------------------
+; void vp9_idct_idct_32x32_add_<opt>(uint8_t *dst, ptrdiff_t stride, int16_t *block, int eob);
+;---------------------------------------------------------------------------------------------
+
+%macro VP9_IDCT32_1D 2-3 32 ; src, pass, nnzc
+%assign %%str 16*%2*%2
+    ; first do t0-15, this can be done identical to idct16x16
+    VP9_IDCT16_1D_START %1, %3/2, 64*2, tmpq+ 4*%%str
+
+    ; backup a different register
+    mova    [tmpq+30*%%str], m15    ; t15
+    mova                m7, [tmpq+ 4*%%str]
+
+    SUMSUB_BA            w,  6,  9, 15      ; t6, t9
+    SUMSUB_BA            w,  7,  8, 15      ; t7, t8
+
+    ; store everything on stack to make space available for t16-31
+    ; we store interleaved with the output of the second half (t16-31)
+    ; so we don't need to allocate extra stack space
+    mova    [tmpq+ 0*%%str], m0     ; t0
+    mova    [tmpq+ 4*%%str], m1     ; t1
+    mova    [tmpq+ 8*%%str], m2     ; t2
+    mova    [tmpq+12*%%str], m3     ; t3
+    mova    [tmpq+16*%%str], m4     ; t4
+    mova    [tmpq+20*%%str], m5     ; t5
+    mova    [tmpq+24*%%str], m6     ; t6
+    mova    [tmpq+28*%%str], m7     ; t7
+    mova    [tmpq+ 2*%%str], m8     ; t8
+    mova    [tmpq+ 6*%%str], m9     ; t9
+    mova    [tmpq+10*%%str], m10    ; t10
+    mova    [tmpq+14*%%str], m11    ; t11
+    mova    [tmpq+18*%%str], m12    ; t12
+    mova    [tmpq+22*%%str], m13    ; t13
+    mova    [tmpq+26*%%str], m14    ; t14
+
+    ; then, secondly, do t16-31
+%if %3 <= 8
+    mova                 m4, [%1+ 1*64]
+    mova                 m3, [%1+ 3*64]
+    mova                 m0, [%1+ 5*64]
+    mova                 m7, [%1+ 7*64]
+
+    pmulhrsw            m11,  m4, [pw_16364x2] ;t31
+    pmulhrsw             m4, [pw_804x2] ;t16
+    pmulhrsw             m8,  m7, [pw_m5520x2] ;t19
+    pmulhrsw             m7, [pw_15426x2] ;t28
+    pmulhrsw            m15,  m0, [pw_15893x2] ;t27
+    pmulhrsw             m0, [pw_3981x2] ;t20
+    pmulhrsw            m12,  m3, [pw_m2404x2] ;t23
+    pmulhrsw             m3, [pw_16207x2] ;t24
+
+    ; m4=t16/17, m8=t18/19, m0=t20/21, m12=t22/23,
+    ; m3=t24/25, m15=t26/27, m7=t28/29, m11=t30/31
+
+    VP9_UNPACK_MULSUB_2W_4X   5, 10, 11,  4, 16069,  3196, [pd_8192], 6,  9 ; t17, t30
+    VP9_UNPACK_MULSUB_2W_4X   9,  6,  7,  8, 3196, m16069, [pd_8192], 1, 14 ; t18, t29
+    ; from 1 stage forward
+    SUMSUB_BA                 w,  8,  4,  1
+    ; temporary storage
+    mova    [tmpq+17*%%str], m8             ; t16
+    mova    [tmpq+21*%%str], m4             ; t19
+    VP9_UNPACK_MULSUB_2W_4X   1, 14, 15,  0,  9102, 13623, [pd_8192], 4,  8 ; t21, t26
+    VP9_UNPACK_MULSUB_2W_4X  13,  2,  3, 12, 13623, m9102, [pd_8192], 4,  8 ; t22, t25
+
+    ; m4=t16, m5=t17, m9=t18, m8=t19, m0=t20, m1=t21, m13=t22, m12=t23,
+    ; m3=t24, m2=t25, m14=t26, m15=t27, m7=t28, m6=t29, m10=t30, m11=t31
+%else
+    mova                m10, [%1+ 1*64]
+    mova                m13, [%1+ 3*64]
+    mova                m14, [%1+ 5*64]
+    mova                 m9, [%1+ 7*64]
+    mova                 m8, [%1+ 9*64]
+    mova                m15, [%1+11*64]
+    mova                m12, [%1+13*64]
+    mova                m11, [%1+15*64]
+%if %3 <= 16
+    pmulhrsw             m5, m10, [pw_16364x2]
+    pmulhrsw            m10, [pw_804x2]
+    pmulhrsw             m4, m11, [pw_m11003x2]
+    pmulhrsw            m11, [pw_12140x2]
+    pmulhrsw             m7,  m8, [pw_14811x2]
+    pmulhrsw             m8, [pw_7005x2]
+    pmulhrsw             m6,  m9, [pw_m5520x2]
+    pmulhrsw             m9, [pw_15426x2]
+    pmulhrsw             m1, m14, [pw_15893x2]
+    pmulhrsw            m14, [pw_3981x2]
+    pmulhrsw             m0, m15, [pw_m8423x2]
+    pmulhrsw            m15, [pw_14053x2]
+%else
+    mova                 m4, [%1+17*64]
+    mova                 m0, [%1+21*64]
+    mova                 m7, [%1+23*64]
+    mova                 m6, [%1+25*64]
+    mova                 m1, [%1+27*64]
+    mova                 m5, [%1+31*64]
+
+    ; m10=in1, m4=in17, m8=in9, m6=in25, m14=in5, m0=in21, m12=in13, m2=in29,
+    ; m13=in3, m3=in19, m15=in11, m1=in27, m9=in7, m7=in23, m11=in15, m5=in31
+
+    VP9_UNPACK_MULSUB_2W_4X  10,  5, 16364,   804, [pd_8192], 2, 3 ; t16, t31
+    VP9_UNPACK_MULSUB_2W_4X   4, 11, 11003, 12140, [pd_8192], 2, 3 ; t17, t30
+    VP9_UNPACK_MULSUB_2W_4X   8,  7, 14811,  7005, [pd_8192], 2, 3 ; t18, t29
+    VP9_UNPACK_MULSUB_2W_4X   6,  9,  5520, 15426, [pd_8192], 2, 3 ; t19, t28
+    VP9_UNPACK_MULSUB_2W_4X  14,  1, 15893,  3981, [pd_8192], 2, 3 ; t20, t27
+    VP9_UNPACK_MULSUB_2W_4X   0, 15,  8423, 14053, [pd_8192], 2, 3 ; t21, t26
+%endif
+
+    ; from 1 stage forward
+    SUMSUB_BA             w,  4, 10,  2
+    SUMSUB_BA             w,  8,  6,  2
+    ; from 2 stages forward
+    SUMSUB_BA             w,  8,  4,  2
+    ; temporary storage
+    mova    [tmpq+17*%%str], m8             ; t16
+    mova    [tmpq+21*%%str], m4             ; t19
+%if %3 <= 16
+    pmulhrsw             m3, m12, [pw_13160x2]
+    pmulhrsw            m12, [pw_9760x2]
+    pmulhrsw             m2, m13, [pw_m2404x2]
+    pmulhrsw            m13, [pw_16207x2]
+%else
+    mova                 m2, [%1+29*64]
+    mova                 m3, [%1+19*64]
+    VP9_UNPACK_MULSUB_2W_4X  12,  3, 13160,  9760, [pd_8192], 4, 8 ; t22, t25
+    VP9_UNPACK_MULSUB_2W_4X   2, 13,  2404, 16207, [pd_8192], 4, 8 ; t23, t24
+%endif
+
+    ; m10=t16, m4=t17, m8=t18, m6=t19, m14=t20, m0=t21, m12=t22, m2=t23,
+    ; m13=t24, m3=t25, m15=t26, m1=t27, m9=t28, m7=t29, m11=t30, m5=t31
+
+    SUMSUB_BA             w,  0, 14,  4
+    SUMSUB_BA             w, 12,  2,  4
+    SUMSUB_BA             w,  3, 13,  4
+    SUMSUB_BA             w, 15,  1,  4
+    SUMSUB_BA             w,  7,  9,  4
+    SUMSUB_BA             w, 11,  5,  4
+
+    ; m4=t16, m10=t17, m6=t18, m8=t19, m0=t20, m14=t21, m2=t22, m12=t23,
+    ; m3=t24, m13=t25, m1=t26, m15=t27, m7=t28, m9=t29, m5=t30, m11=t31
+
+    VP9_UNPACK_MULSUB_2W_4X   5, 10, 16069,  3196, [pd_8192], 4, 8 ; t17, t30
+    VP9_UNPACK_MULSUB_2W_4X   9,  6, 3196, m16069, [pd_8192], 4, 8 ; t18, t29
+    VP9_UNPACK_MULSUB_2W_4X   1, 14,  9102, 13623, [pd_8192], 4, 8 ; t21, t26
+    VP9_UNPACK_MULSUB_2W_4X  13,  2, 13623, m9102, [pd_8192], 4, 8 ; t22, t25
+%endif
+
+    ; m4=t16, m5=t17, m9=t18, m8=t19, m0=t20, m1=t21, m13=t22, m12=t23,
+    ; m3=t24, m2=t25, m14=t26, m15=t27, m7=t28, m6=t29, m10=t30, m11=t31
+
+    SUMSUB_BA             w,  9,  5,  4
+    SUMSUB_BA             w,  1, 13,  4
+    SUMSUB_BA             w,  0, 12,  4
+    SUMSUB_BA             w, 15,  3,  4
+    SUMSUB_BA             w, 14,  2,  4
+    SUMSUB_BA             w,  6, 10,  4
+    SUMSUB_BA             w,  7, 11,  4
+
+    ; m8[s]=t16, m9=t17, m5=t18, m4[s]=t19, m12=t20, m13=t21, m1=t22, m0=t23,
+    ; m15=t24, m14=t25, m2=t26, m3=t27, m11=t28, m10=t29, m6=t30, m7=t31
+
+    mova                 m8, [tmpq+17*%%str] ; t16
+    ; from 2 stages forward
+    SUMSUB_BA             w,  0,  8,  4
+    SUMSUB_BA             w, 15,  7,  4
+    ; from 3 stages forward
+    SUMSUB_BA             w,  8,  7,  4
+    pmulhrsw             m7, [pw_11585x2]
+    pmulhrsw             m8, [pw_11585x2]
+    ; store t16/t23
+    mova    [tmpq+ 1*%%str], m0     ; t16
+    mova    [tmpq+29*%%str], m7     ; t23
+
+    mova                 m4, [tmpq+21*%%str] ; t19
+    VP9_UNPACK_MULSUB_2W_4X  10,  5, 15137,  6270, [pd_8192], 0, 7 ; t18, t29
+    VP9_UNPACK_MULSUB_2W_4X  11,  4, 15137,  6270, [pd_8192], 0, 7 ; t19, t28
+    VP9_UNPACK_MULSUB_2W_4X   3, 12, 6270, m15137, [pd_8192], 0, 7 ; t20, t27
+    VP9_UNPACK_MULSUB_2W_4X   2, 13, 6270, m15137, [pd_8192], 0, 7 ; t21, t26
+
+    ; m8=t16, m9=t17, m10=t18, m11=t19, m3=t20, m2=t21, m1=t22, m0=t23,
+    ; m15=t24, m14=t25, m13=t26, m12=t27, m4=t28, m5=t29, m6=t30, m7=t31
+
+    SUMSUB_BA             w,  1,  9,  0
+    SUMSUB_BA             w,  2, 10,  0
+    SUMSUB_BA             w,  3, 11,  0
+    SUMSUB_BA             w, 12,  4,  0
+    SUMSUB_BA             w, 13,  5,  0
+    SUMSUB_BA             w, 14,  6,  0
+
+    ; m0=t16, m1=t17, m2=t18, m3=t19, m11=t20, m10=t21, m9=t22, m8=t23,
+    ; m7=t24, m6=t25, m5=t26, m4=t27, m12=t28, m13=t29, m14=t30, m15=t31
+
+    SUMSUB_BA             w,  9,  6,  0
+    SUMSUB_BA             w, 10,  5,  0
+    SUMSUB_BA             w, 11,  4,  0
+
+    pmulhrsw             m6, [pw_11585x2]
+    pmulhrsw             m9, [pw_11585x2]
+    pmulhrsw             m5, [pw_11585x2]
+    pmulhrsw            m10, [pw_11585x2]
+    pmulhrsw             m4, [pw_11585x2]
+    pmulhrsw            m11, [pw_11585x2]
+
+    ; m0=t16, m1=t17, m2=t18, m3=t19, m4=t20, m5=t21, m6=t22, m7=t23,
+    ; m8=t24, m9=t25, m10=t26, m11=t27, m12=t28, m13=t29, m14=t30, m15=t31
+
+    ; store t17-19 (and t20-22 for pass 1) - keep t24-31 in registers for
+    ; final sumsub in pass 1, or keep t20-22 and t24-31 in registers for
+    ; final sumsub of pass 2
+    mova    [tmpq+ 5*%%str], m1     ; t17
+    mova    [tmpq+ 9*%%str], m2     ; t18
+    mova    [tmpq+13*%%str], m3     ; t19
+
+    ; then do final pass to sumsub+store the two halves
+%if %2 == 1
+    mova    [tmpq+17*%%str], m4     ; t20
+    mova    [tmpq+21*%%str], m5     ; t21
+    mova    [tmpq+25*%%str], m6     ; t22
+
+    mova                 m0, [tmpq+ 0*%%str] ; t0
+    mova                 m1, [tmpq+ 4*%%str] ; t1
+    mova                 m2, [tmpq+ 8*%%str] ; t2
+    mova                 m3, [tmpq+12*%%str] ; t3
+    mova                 m4, [tmpq+16*%%str] ; t4
+    mova                 m5, [tmpq+20*%%str] ; t5
+    mova                 m6, [tmpq+24*%%str] ; t6
+
+    SUMSUB_BA             w, 15,  0, 7
+    mova    [tmpq+ 3*%%str], m0              ; t15
+    mova                 m7, [tmpq+28*%%str] ; t7
+    SUMSUB_BA             w, 14,  1, 0
+    SUMSUB_BA             w, 13,  2, 0
+    SUMSUB_BA             w, 12,  3, 0
+    SUMSUB_BA             w, 11,  4, 0
+    SUMSUB_BA             w, 10,  5, 0
+    SUMSUB_BA             w,  9,  6, 0
+    SUMSUB_BA             w,  8,  7, 0
+
+    TRANSPOSE8x8W        15, 14, 13, 12, 11, 10, 9, 8, 0
+    mova    [tmpq+ 0*%%str], m15
+    mova    [tmpq+ 4*%%str], m14
+    mova    [tmpq+ 8*%%str], m13
+    mova    [tmpq+12*%%str], m12
+    mova    [tmpq+16*%%str], m11
+    mova    [tmpq+20*%%str], m10
+    mova    [tmpq+24*%%str], m9
+    mova    [tmpq+28*%%str], m8
+
+    mova                  m0, [tmpq+ 3*%%str] ; t15
+    TRANSPOSE8x8W          7, 6, 5, 4, 3, 2, 1, 0, 8
+    mova    [tmpq+ 3*%%str], m7
+    mova    [tmpq+ 7*%%str], m6
+    mova    [tmpq+11*%%str], m5
+    mova    [tmpq+15*%%str], m4
+    mova    [tmpq+19*%%str], m3
+    mova    [tmpq+23*%%str], m2
+    mova    [tmpq+27*%%str], m1
+    mova    [tmpq+31*%%str], m0
+
+    mova                m15, [tmpq+ 2*%%str] ; t8
+    mova                m14, [tmpq+ 6*%%str] ; t9
+    mova                m13, [tmpq+10*%%str] ; t10
+    mova                m12, [tmpq+14*%%str] ; t11
+    mova                m11, [tmpq+18*%%str] ; t12
+    mova                m10, [tmpq+22*%%str] ; t13
+    mova                 m9, [tmpq+26*%%str] ; t14
+    mova                 m8, [tmpq+30*%%str] ; t15
+    mova                 m7, [tmpq+ 1*%%str] ; t16
+    mova                 m6, [tmpq+ 5*%%str] ; t17
+    mova                 m5, [tmpq+ 9*%%str] ; t18
+    mova                 m4, [tmpq+13*%%str] ; t19
+    mova                 m3, [tmpq+17*%%str] ; t20
+    mova                 m2, [tmpq+21*%%str] ; t21
+    mova                 m1, [tmpq+25*%%str] ; t22
+
+    SUMSUB_BA             w,  7,  8, 0
+    mova    [tmpq+ 2*%%str], m8
+    mova                 m0, [tmpq+29*%%str] ; t23
+    SUMSUB_BA             w,  6,  9, 8
+    SUMSUB_BA             w,  5, 10, 8
+    SUMSUB_BA             w,  4, 11, 8
+    SUMSUB_BA             w,  3, 12, 8
+    SUMSUB_BA             w,  2, 13, 8
+    SUMSUB_BA             w,  1, 14, 8
+    SUMSUB_BA             w,  0, 15, 8
+
+    TRANSPOSE8x8W         0, 1, 2, 3, 4, 5, 6, 7, 8
+    mova    [tmpq+ 1*%%str], m0
+    mova    [tmpq+ 5*%%str], m1
+    mova    [tmpq+ 9*%%str], m2
+    mova    [tmpq+13*%%str], m3
+    mova    [tmpq+17*%%str], m4
+    mova    [tmpq+21*%%str], m5
+    mova    [tmpq+25*%%str], m6
+    mova    [tmpq+29*%%str], m7
+
+    mova                 m8, [tmpq+ 2*%%str]
+    TRANSPOSE8x8W         8, 9, 10, 11, 12, 13, 14, 15, 0
+    mova    [tmpq+ 2*%%str], m8
+    mova    [tmpq+ 6*%%str], m9
+    mova    [tmpq+10*%%str], m10
+    mova    [tmpq+14*%%str], m11
+    mova    [tmpq+18*%%str], m12
+    mova    [tmpq+22*%%str], m13
+    mova    [tmpq+26*%%str], m14
+    mova    [tmpq+30*%%str], m15
+%else
+    ; t0-7 is in [tmpq+{0,4,8,12,16,20,24,28}*%%str]
+    ; t8-15 is in [tmpq+{2,6,10,14,18,22,26,30}*%%str]
+    ; t16-19 and t23 is in [tmpq+{1,5,9,13,29}*%%str]
+    ; t20-22 is in m4-6
+    ; t24-31 is in m8-15
+    pxor                m7, m7
+
+%macro %%STORE_2X2 7-8 1 ; src[1-4], tmp[1-2], zero, inc_dst_ptrs
+    SUMSUB_BA            w, %4, %1, %5
+    SUMSUB_BA            w, %3, %2, %5
+    pmulhrsw           m%4, [pw_512]
+    pmulhrsw           m%3, [pw_512]
+    VP9_STORE_2X        %4, %3, %5, %6, %7
+%if %8 == 1
+    add               dstq, stride2q
+%endif
+    pmulhrsw           m%2, [pw_512]
+    pmulhrsw           m%1, [pw_512]
+    VP9_STORE_2X        %2, %1, %5, %6, %7, dst_endq
+%if %8 == 1
+    sub           dst_endq, stride2q
+%endif
+%endmacro
+
+    ; store t0-1 and t30-31
+    mova                m0, [tmpq+ 0*%%str]
+    mova                m1, [tmpq+ 4*%%str]
+    %%STORE_2X2          0,  1, 14, 15, 2, 3, 7
+
+    ; store t2-3 and t28-29
+    mova                m0, [tmpq+ 8*%%str]
+    mova                m1, [tmpq+12*%%str]
+    %%STORE_2X2          0,  1, 12, 13, 2, 3, 7
+
+    ; store t4-5 and t26-27
+    mova                m0, [tmpq+16*%%str]
+    mova                m1, [tmpq+20*%%str]
+    %%STORE_2X2          0,  1, 10, 11, 2, 3, 7
+
+    ; store t6-7 and t24-25
+    mova                m0, [tmpq+24*%%str]
+    mova                m1, [tmpq+28*%%str]
+    %%STORE_2X2          0,  1,  8,  9, 2, 3, 7
+
+    ; store t8-9 and t22-23
+    mova                m0, [tmpq+ 2*%%str]
+    mova                m1, [tmpq+ 6*%%str]
+    mova                m8, [tmpq+29*%%str]
+    %%STORE_2X2          0,  1,  6,  8, 2, 3, 7
+
+    ; store t10-11 and t20-21
+    mova                m0, [tmpq+10*%%str]
+    mova                m1, [tmpq+14*%%str]
+    %%STORE_2X2          0,  1,  4,  5, 2, 3, 7
+
+    ; store t12-13 and t18-19
+    mova                m0, [tmpq+18*%%str]
+    mova                m1, [tmpq+22*%%str]
+    mova                m5, [tmpq+13*%%str]
+    mova                m4, [tmpq+ 9*%%str]
+    %%STORE_2X2          0,  1,  4,  5, 2, 3, 7
+
+    ; store t14-17
+    mova                m0, [tmpq+26*%%str]
+    mova                m1, [tmpq+30*%%str]
+    mova                m5, [tmpq+ 5*%%str]
+    mova                m4, [tmpq+ 1*%%str]
+    %%STORE_2X2          0,  1,  4,  5, 2, 3, 7, 0
+%endif
+%endmacro
+
+%macro VP9_IDCT_IDCT_32x32_ADD_XMM 1
+INIT_XMM %1
+cglobal vp9_idct_idct_32x32_add, 4, 9, 16, 2048, dst, stride, block, eob
+    cmp eobd, 135
+    jg .idctfull
+    cmp eobd, 34
+    jg .idct16x16
+    cmp eobd, 1
+    jg .idct8x8
+
+    ; dc-only case
+    movd                m0, [blockq]
+    mova                m1, [pw_11585x2]
+    pmulhrsw            m0, m1
+    pmulhrsw            m0, m1
+    SPLATW              m0, m0, q0000
+    pmulhrsw            m0, [pw_512]
+    pxor                m5, m5
+    movd          [blockq], m5
+    DEFINE_ARGS        dst, stride, block, cnt
+%rep 31
+    VP9_STORE_2XFULL    0, 1, 2, 3, 4, 5, mmsize
+    add               dstq, strideq
+%endrep
+    VP9_STORE_2XFULL    0, 1, 2, 3, 4, 5, mmsize
+    RET
+
+    DEFINE_ARGS dst_bak, stride, block, cnt, dst, stride30, dst_end, stride2, tmp
+.idct8x8:
+    mov               tmpq, rsp
+    VP9_IDCT32_1D   blockq, 1, 8
+
+    mov          stride30q, strideq         ; stride
+    lea           stride2q, [strideq*2]     ; stride*2
+    shl          stride30q, 5               ; stride*32
+    mov               cntd, 4
+    sub          stride30q, stride2q        ; stride*30
+.loop2_8x8:
+    mov               dstq, dst_bakq
+    lea           dst_endq, [dst_bakq+stride30q]
+    VP9_IDCT32_1D     tmpq, 2, 8
+    add           dst_bakq, 8
+    add               tmpq, 16
+    dec               cntd
+    jg .loop2_8x8
+
+    ; at the end of the loop, m7 should still be zero
+    ; use that to zero out block coefficients
+    ZERO_BLOCK      blockq, 64,  8, m7
+    RET
+
+.idct16x16:
+    mov               cntd, 2
+    mov               tmpq, rsp
+.loop1_16x16:
+    VP9_IDCT32_1D   blockq, 1, 16
+    add             blockq, 16
+    add               tmpq, 512
+    dec               cntd
+    jg .loop1_16x16
+    sub             blockq, 32
+
+    mov          stride30q, strideq         ; stride
+    lea           stride2q, [strideq*2]     ; stride*2
+    shl          stride30q, 5               ; stride*32
+    mov               cntd, 4
+    mov               tmpq, rsp
+    sub          stride30q, stride2q        ; stride*30
+.loop2_16x16:
+    mov               dstq, dst_bakq
+    lea           dst_endq, [dst_bakq+stride30q]
+    VP9_IDCT32_1D     tmpq, 2, 16
+    add           dst_bakq, 8
+    add               tmpq, 16
+    dec               cntd
+    jg .loop2_16x16
+
+    ; at the end of the loop, m7 should still be zero
+    ; use that to zero out block coefficients
+    ZERO_BLOCK      blockq, 64, 16, m7
+    RET
+
+.idctfull:
+    mov               cntd, 4
+    mov               tmpq, rsp
+.loop1_full:
+    VP9_IDCT32_1D   blockq, 1
+    add             blockq, 16
+    add               tmpq, 512
+    dec               cntd
+    jg .loop1_full
+    sub             blockq, 64
+
+    mov          stride30q, strideq         ; stride
+    lea           stride2q, [strideq*2]     ; stride*2
+    shl          stride30q, 5               ; stride*32
+    mov               cntd, 4
+    mov               tmpq, rsp
+    sub          stride30q, stride2q        ; stride*30
+.loop2_full:
+    mov               dstq, dst_bakq
+    lea           dst_endq, [dst_bakq+stride30q]
+    VP9_IDCT32_1D     tmpq, 2
+    add           dst_bakq, 8
+    add               tmpq, 16
+    dec               cntd
+    jg .loop2_full
+
+    ; at the end of the loop, m7 should still be zero
+    ; use that to zero out block coefficients
+    ZERO_BLOCK      blockq, 64, 32, m7
+    RET
+%endmacro
+
+VP9_IDCT_IDCT_32x32_ADD_XMM ssse3
+VP9_IDCT_IDCT_32x32_ADD_XMM avx
+
+%endif ; x86-64

omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/x86/vp9lpf.asm Added

@@ -0,0 +1,823 @@
+;******************************************************************************
+;* VP9 loop filter SIMD optimizations
+;*
+;* Copyright (C) 2013-2014 Clément Bœsch <u pkh me>
+;*
+;* This file is part of FFmpeg.
+;*
+;* FFmpeg is free software; you can redistribute it and/or
+;* modify it under the terms of the GNU Lesser General Public
+;* License as published by the Free Software Foundation; either
+;* version 2.1 of the License, or (at your option) any later version.
+;*
+;* FFmpeg is distributed in the hope that it will be useful,
+;* but WITHOUT ANY WARRANTY; without even the implied warranty of
+;* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;* Lesser General Public License for more details.
+;*
+;* You should have received a copy of the GNU Lesser General Public
+;* License along with FFmpeg; if not, write to the Free Software
+;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+;******************************************************************************
+
+%if ARCH_X86_64
+
+%include "libavutil/x86/x86util.asm"
+
+SECTION_RODATA
+
+cextern pb_3
+cextern pb_80
+
+pb_4:   times 16 db 0x04
+pb_10:  times 16 db 0x10
+pb_40:  times 16 db 0x40
+pb_81:  times 16 db 0x81
+pb_f8:  times 16 db 0xf8
+pb_fe:  times 16 db 0xfe
+
+pw_4:   times  8 dw 4
+pw_8:   times  8 dw 8
+
+; with mix functions, two 8-bit thresholds are stored in a 16-bit storage,
+; the following mask is used to splat both in the same register
+mask_mix: times 8 db 0
+          times 8 db 1
+
+mask_mix84: times 8 db 0xff
+            times 8 db 0x00
+mask_mix48: times 8 db 0x00
+            times 8 db 0xff
+
+SECTION .text
+
+; %1 = abs(%2-%3)
+%macro ABSSUB 4 ; dst, src1 (RO), src2 (RO), tmp
+    psubusb             %1, %3, %2
+    psubusb             %4, %2, %3
+    por                 %1, %4
+%endmacro
+
+; %1 = %1<=%2
+%macro CMP_LTE 3-4 ; src/dst, cmp, tmp, pb_80
+%if %0 == 4
+    pxor                %1, %4
+%endif
+    pcmpgtb             %3, %2, %1          ; cmp > src?
+    pcmpeqb             %1, %2              ; cmp == src? XXX: avoid this with a -1/+1 well placed?
+    por                 %1, %3              ; cmp >= src?
+%endmacro
+
+; %1 = abs(%2-%3) <= %4
+%macro ABSSUB_CMP 6-7 [pb_80]; dst, src1, src2, cmp, tmp1, tmp2, [pb_80]
+    ABSSUB              %1, %2, %3, %6      ; dst = abs(src1-src2)
+    CMP_LTE             %1, %4, %6, %7      ; dst <= cmp
+%endmacro
+
+%macro MASK_APPLY 4 ; %1=new_data/dst %2=old_data %3=mask %4=tmp
+    pand                %1, %3              ; new &= mask
+    pandn               %4, %3, %2          ; tmp = ~mask & old
+    por                 %1, %4              ; new&mask | old&~mask
+%endmacro
+
+%macro FILTER_SUBx2_ADDx2 8 ; %1=dst %2=h/l %3=cache %4=sub1 %5=sub2 %6=add1 %7=add2 %8=rshift
+    punpck%2bw          %3, %4, m0
+    psubw               %1, %3
+    punpck%2bw          %3, %5, m0
+    psubw               %1, %3
+    punpck%2bw          %3, %6, m0
+    paddw               %1, %3
+    punpck%2bw          %3, %7, m0
+    paddw               %1, %3
+    mova                %3, %1
+    psraw               %1, %8
+%endmacro
+
+%macro FILTER_INIT 7-8 ; tmp1, tmp2, cacheL, cacheH, dstp, filterid, [source]
+    FILTER%6_INIT       %1, l, %3
+    FILTER%6_INIT       %2, h, %4
+    packuswb            %1, %2
+%if %0 == 8
+    MASK_APPLY          %1, %8, %7, %2
+%else
+    MASK_APPLY          %1, %5, %7, %2
+%endif
+    mova                %5, %1
+%endmacro
+
+%macro FILTER_UPDATE 11-14 ; tmp1, tmp2, cacheL, cacheH, dstp, -, -, +, +, rshift, [source], [preload reg + value]
+%if %0 == 13 ; no source + preload
+    mova                %12, %13
+%elif %0 == 14 ; source + preload
+    mova                %13, %14
+%endif
+    FILTER_SUBx2_ADDx2  %1, l, %3, %6, %7, %8, %9, %10
+    FILTER_SUBx2_ADDx2  %2, h, %4, %6, %7, %8, %9, %10
+    packuswb            %1, %2
+%if %0 == 12 || %0 == 14
+    MASK_APPLY          %1, %12, %11, %2
+%else
+    MASK_APPLY          %1, %5, %11, %2
+%endif
+    mova                %5, %1
+%endmacro
+
+%macro SRSHIFT3B_2X 4 ; reg1, reg2, [pb_10], tmp
+    mova                %4, [pb_f8]
+    pand                %1, %4
+    pand                %2, %4
+    psrlq               %1, 3
+    psrlq               %2, 3
+    pxor                %1, %3
+    pxor                %2, %3
+    psubb               %1, %3
+    psubb               %2, %3
+%endmacro
+
+%macro EXTRACT_POS_NEG 3 ; i8, neg, pos
+    pxor                %3, %3
+    pxor                %2, %2
+    pcmpgtb             %3, %1                          ; i8 < 0 mask
+    psubb               %2, %1                          ; neg values (only the originally - will be kept)
+    pand                %2, %3                          ; negative values of i8 (but stored as +)
+    pandn               %3, %1                          ; positive values of i8
+%endmacro
+
+; clip_u8(u8 + i8)
+%macro SIGN_ADD 5 ; dst, u8, i8, tmp1, tmp2
+    EXTRACT_POS_NEG     %3, %4, %5
+    psubusb             %1, %2, %4                      ; sub the negatives
+    paddusb             %1, %5                          ; add the positives
+%endmacro
+
+; clip_u8(u8 - i8)
+%macro SIGN_SUB 5 ; dst, u8, i8, tmp1, tmp2
+    EXTRACT_POS_NEG     %3, %4, %5
+    psubusb             %1, %2, %5                      ; sub the positives
+    paddusb             %1, %4                          ; add the negatives
+%endmacro
+
+%macro FILTER6_INIT 3 ; %1=dst %2=h/l %3=cache
+    punpck%2bw          %3, m14, m0                     ; p3: B->W
+    mova                %1, %3                          ; p3
+    paddw               %1, %3                          ; p3*2
+    paddw               %1, %3                          ; p3*3
+    punpck%2bw          %3, m15, m0                     ; p2: B->W
+    paddw               %1, %3                          ; p3*3 + p2
+    paddw               %1, %3                          ; p3*3 + p2*2
+    punpck%2bw          %3, m10, m0                     ; p1: B->W
+    paddw               %1, %3                          ; p3*3 + p2*2 + p1
+    punpck%2bw          %3, m11, m0                     ; p0: B->W
+    paddw               %1, %3                          ; p3*3 + p2*2 + p1 + p0
+    punpck%2bw          %3, m12, m0                     ; q0: B->W
+    paddw               %1, %3                          ; p3*3 + p2*2 + p1 + p0 + q0
+    paddw               %1, [pw_4]                      ; p3*3 + p2*2 + p1 + p0 + q0 + 4
+    mova                %3, %1                          ; base for next line (cache)
+    psraw               %1, 3                           ; (p3*3 + p2*2 + p1 + p0 + q0 + 4) >> 3
+%endmacro
+
+%macro FILTER14_INIT 3 ; %1=dst %2=h/l %3=cache
+    punpck%2bw          %1, m2, m0                      ; p7: B->W
+    mova                %3, %1
+    psllw               %1, 3                           ; p7*8
+    psubw               %1, %3                          ; p7*7
+    punpck%2bw          %3, m3, m0                      ; p6: B->W
+    paddw               %1, %3                          ; p7*7 + p6
+    paddw               %1, %3                          ; p7*7 + p6*2
+    punpck%2bw          %3, m8, m0                      ; p5: B->W
+    paddw               %1, %3                          ; p7*7 + p6*2 + p5
+    punpck%2bw          %3, m9, m0                      ; p4: B->W
+    paddw               %1, %3                          ; p7*7 + p6*2 + p5 + p4
+    punpck%2bw          %3, m14, m0                     ; p3: B->W
+    paddw               %1, %3                          ; p7*7 + p6*2 + p5 + p4 + p3
+    punpck%2bw          %3, m15, m0                     ; p2: B->W
+    paddw               %1, %3                          ; p7*7 + p6*2 + p5 + .. + p2
+    punpck%2bw          %3, m10, m0                     ; p1: B->W
+    paddw               %1, %3                          ; p7*7 + p6*2 + p5 + .. + p1
+    punpck%2bw          %3, m11, m0                     ; p0: B->W
+    paddw               %1, %3                          ; p7*7 + p6*2 + p5 + .. + p0
+    punpck%2bw          %3, m12, m0                     ; q0: B->W
+    paddw               %1, %3                          ; p7*7 + p6*2 + p5 + .. + p0 + q0
+    paddw               %1, [pw_8]                      ; p7*7 + p6*2 + p5 + .. + p0 + q0 + 8
+    mova                %3, %1                          ; base for next line (cache)
+    psraw               %1, 4                           ; (p7*7 + p6*2 + p5 + .. + p0 + q0 + 8) >> 4
+%endmacro
+
+%macro TRANSPOSE16x16B 17
+    mova %17, m%16
+    SBUTTERFLY bw,  %1,  %2,  %16
+    SBUTTERFLY bw,  %3,  %4,  %16
+    SBUTTERFLY bw,  %5,  %6,  %16
+    SBUTTERFLY bw,  %7,  %8,  %16
+    SBUTTERFLY bw,  %9,  %10, %16
+    SBUTTERFLY bw,  %11, %12, %16
+    SBUTTERFLY bw,  %13, %14, %16
+    mova m%16,  %17
+    mova  %17, m%14
+    SBUTTERFLY bw,  %15, %16, %14
+    SBUTTERFLY wd,  %1,  %3,  %14
+    SBUTTERFLY wd,  %2,  %4,  %14
+    SBUTTERFLY wd,  %5,  %7,  %14
+    SBUTTERFLY wd,  %6,  %8,  %14
+    SBUTTERFLY wd,  %9,  %11, %14
+    SBUTTERFLY wd,  %10, %12, %14
+    SBUTTERFLY wd,  %13, %15, %14
+    mova m%14,  %17
+    mova  %17, m%12
+    SBUTTERFLY wd,  %14, %16, %12
+    SBUTTERFLY dq,  %1,  %5,  %12
+    SBUTTERFLY dq,  %2,  %6,  %12
+    SBUTTERFLY dq,  %3,  %7,  %12
+    SBUTTERFLY dq,  %4,  %8,  %12
+    SBUTTERFLY dq,  %9,  %13, %12
+    SBUTTERFLY dq,  %10, %14, %12
+    SBUTTERFLY dq,  %11, %15, %12
+    mova m%12, %17
+    mova  %17, m%8
+    SBUTTERFLY dq,  %12, %16, %8
+    SBUTTERFLY qdq, %1,  %9,  %8
+    SBUTTERFLY qdq, %2,  %10, %8
+    SBUTTERFLY qdq, %3,  %11, %8
+    SBUTTERFLY qdq, %4,  %12, %8
+    SBUTTERFLY qdq, %5,  %13, %8
+    SBUTTERFLY qdq, %6,  %14, %8
+    SBUTTERFLY qdq, %7,  %15, %8
+    mova m%8, %17
+    mova %17, m%1
+    SBUTTERFLY qdq, %8,  %16, %1
+    mova m%1, %17
+    SWAP %2,  %9
+    SWAP %3,  %5
+    SWAP %4,  %13
+    SWAP %6,  %11
+    SWAP %8,  %15
+    SWAP %12, %14
+%endmacro
+
+; transpose 16 half lines (high part) to 8 full centered lines
+%macro TRANSPOSE16x8B 16
+    punpcklbw   m%1,  m%2
+    punpcklbw   m%3,  m%4
+    punpcklbw   m%5,  m%6
+    punpcklbw   m%7,  m%8
+    punpcklbw   m%9,  m%10
+    punpcklbw   m%11, m%12
+    punpcklbw   m%13, m%14
+    punpcklbw   m%15, m%16
+    SBUTTERFLY  wd,  %1,  %3,  %2
+    SBUTTERFLY  wd,  %5,  %7,  %2
+    SBUTTERFLY  wd,  %9,  %11, %2
+    SBUTTERFLY  wd,  %13, %15, %2
+    SBUTTERFLY  dq,  %1,  %5,  %2
+    SBUTTERFLY  dq,  %3,  %7,  %2
+    SBUTTERFLY  dq,  %9,  %13, %2
+    SBUTTERFLY  dq,  %11, %15, %2
+    SBUTTERFLY  qdq, %1,  %9,  %2
+    SBUTTERFLY  qdq, %3,  %11, %2
+    SBUTTERFLY  qdq, %5,  %13, %2
+    SBUTTERFLY  qdq, %7,  %15, %2
+    SWAP %5, %1
+    SWAP %6, %9
+    SWAP %7, %1
+    SWAP %8, %13
+    SWAP %9, %3
+    SWAP %10, %11
+    SWAP %11, %1
+    SWAP %12, %15
+%endmacro
+
+%macro DEFINE_REAL_P7_TO_Q7 0-1 0
+%define P7 dst1q + 2*mstrideq  + %1
+%define P6 dst1q +   mstrideq  + %1
+%define P5 dst1q               + %1
+%define P4 dst1q +    strideq  + %1
+%define P3 dstq  + 4*mstrideq  + %1
+%define P2 dstq  +   mstride3q + %1
+%define P1 dstq  + 2*mstrideq  + %1
+%define P0 dstq  +   mstrideq  + %1
+%define Q0 dstq                + %1
+%define Q1 dstq  +   strideq   + %1
+%define Q2 dstq  + 2*strideq   + %1
+%define Q3 dstq  +   stride3q  + %1
+%define Q4 dstq  + 4*strideq   + %1
+%define Q5 dst2q + mstrideq    + %1
+%define Q6 dst2q               + %1
+%define Q7 dst2q +  strideq    + %1
+%endmacro
+
+%macro SPLATB_MASK 2
+%if cpuflag(ssse3)
+    pshufb     %1, %2
+%else
+    punpcklbw  %1, %1
+    punpcklqdq %1, %1
+    pshuflw    %1, %1, 0
+    pshufhw    %1, %1, 0x55
+%endif
+%endmacro
+
+%macro LOOPFILTER 2 ; %1=v/h %2=size1
+    lea mstrideq, [strideq]
+    neg mstrideq
+
+    lea stride3q, [strideq+2*strideq]
+    mov mstride3q, stride3q
+    neg mstride3q
+
+%ifidn %1, h
+%if %2 > 16
+%define movx movh
+    lea dstq, [dstq + 8*strideq - 4]
+%else
+%define movx movu
+    lea dstq, [dstq + 8*strideq - 8] ; go from top center (h pos) to center left (v pos)
+%endif
+%endif
+
+    lea dst1q, [dstq + 2*mstride3q]                         ; dst1q = &dst[stride * -6]
+    lea dst2q, [dstq + 2* stride3q]                         ; dst2q = &dst[stride * +6]
+
+    DEFINE_REAL_P7_TO_Q7
+
+%ifidn %1, h
+    movx                    m0, [P7]
+    movx                    m1, [P6]
+    movx                    m2, [P5]
+    movx                    m3, [P4]
+    movx                    m4, [P3]
+    movx                    m5, [P2]
+    movx                    m6, [P1]
+    movx                    m7, [P0]
+    movx                    m8, [Q0]
+    movx                    m9, [Q1]
+    movx                   m10, [Q2]
+    movx                   m11, [Q3]
+    movx                   m12, [Q4]
+    movx                   m13, [Q5]
+    movx                   m14, [Q6]
+    movx                   m15, [Q7]
+%define P7 rsp +   0
+%define P6 rsp +  16
+%define P5 rsp +  32
+%define P4 rsp +  48
+%define P3 rsp +  64
+%define P2 rsp +  80
+%define P1 rsp +  96
+%define P0 rsp + 112
+%define Q0 rsp + 128
+%define Q1 rsp + 144
+%define Q2 rsp + 160
+%define Q3 rsp + 176
+%define Q4 rsp + 192
+%define Q5 rsp + 208
+%define Q6 rsp + 224
+%define Q7 rsp + 240
+
+%if %2 == 16
+    TRANSPOSE16x16B 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, [rsp]
+    mova           [P7],  m0
+    mova           [P6],  m1
+    mova           [P5],  m2
+    mova           [P4],  m3
+%else
+    TRANSPOSE16x8B 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
+%endif
+    mova           [P3],  m4
+    mova           [P2],  m5
+    mova           [P1],  m6
+    mova           [P0],  m7
+    mova           [Q0],  m8
+    mova           [Q1],  m9
+    mova           [Q2], m10
+    mova           [Q3], m11
+%if %2 == 16
+    mova           [Q4], m12
+    mova           [Q5], m13
+    mova           [Q6], m14
+    mova           [Q7], m15
+%endif
+%endif
+
+    ; calc fm mask
+%if %2 == 16
+%if cpuflag(ssse3)
+    pxor                m0, m0
+%endif
+    SPLATB_REG          m2, I, m0                       ; I I I I ...
+    SPLATB_REG          m3, E, m0                       ; E E E E ...
+%else
+%if cpuflag(ssse3)
+    mova                m0, [mask_mix]
+%endif
+    movd                m2, Id
+    movd                m3, Ed
+    SPLATB_MASK         m2, m0
+    SPLATB_MASK         m3, m0
+%endif
+    mova                m0, [pb_80]
+    pxor                m2, m0
+    pxor                m3, m0
+%ifidn %1, v
+    mova                m8, [P3]
+    mova                m9, [P2]
+    mova               m10, [P1]
+    mova               m11, [P0]
+    mova               m12, [Q0]
+    mova               m13, [Q1]
+    mova               m14, [Q2]
+    mova               m15, [Q3]
+%else
+    SWAP                 8,  4, 12
+    SWAP                 9,  5, 13
+    SWAP                10,  6, 14
+    SWAP                11,  7, 15
+%endif
+    ABSSUB_CMP          m5,  m8,  m9, m2, m6, m7, m0    ; m5 = abs(p3-p2) <= I
+    ABSSUB_CMP          m1,  m9, m10, m2, m6, m7, m0    ; m1 = abs(p2-p1) <= I
+    pand                m5, m1
+    ABSSUB_CMP          m1, m10, m11, m2, m6, m7, m0    ; m1 = abs(p1-p0) <= I
+    pand                m5, m1
+    ABSSUB_CMP          m1, m12, m13, m2, m6, m7, m0    ; m1 = abs(q1-q0) <= I
+    pand                m5, m1
+    ABSSUB_CMP          m1, m13, m14, m2, m6, m7, m0    ; m1 = abs(q2-q1) <= I
+    pand                m5, m1
+    ABSSUB_CMP          m1, m14, m15, m2, m6, m7, m0    ; m1 = abs(q3-q2) <= I
+    pand                m5, m1
+    ABSSUB              m1, m11, m12, m7                ; abs(p0-q0)
+    paddusb             m1, m1                          ; abs(p0-q0) * 2
+    ABSSUB              m2, m10, m13, m7                ; abs(p1-q1)
+    pand                m2, [pb_fe]                     ; drop lsb so shift can work
+    psrlq               m2, 1                           ; abs(p1-q1)/2
+    paddusb             m1, m2                          ; abs(p0-q0)*2 + abs(p1-q1)/2
+    pxor                m1, m0
+    pcmpgtb             m4, m3, m1                      ; E > X?
+    pcmpeqb             m3, m1                          ; E == X?
+    por                 m3, m4                          ; E >= X?
+    pand                m3, m5                          ; fm final value
+
+    ; (m3: fm, m8..15: p3 p2 p1 p0 q0 q1 q2 q3)
+    ; calc flat8in (if not 44_16) and hev masks
+    mova                m6, [pb_81]                     ; [1 1 1 1 ...] ^ 0x80
+%if %2 != 44
+    ABSSUB_CMP          m2, m8, m11, m6, m4, m5         ; abs(p3 - p0) <= 1
+    mova                m8, [pb_80]
+    ABSSUB_CMP          m1, m9, m11, m6, m4, m5, m8     ; abs(p2 - p0) <= 1
+    pand                m2, m1
+    ABSSUB              m4, m10, m11, m5                ; abs(p1 - p0)
+%if %2 == 16
+%if cpuflag(ssse3)
+    pxor                m0, m0
+%endif
+    SPLATB_REG          m7, H, m0                       ; H H H H ...
+%else
+    movd                m7, Hd
+    SPLATB_MASK         m7, [mask_mix]
+%endif
+    pxor                m7, m8
+    pxor                m4, m8
+    pcmpgtb             m0, m4, m7                      ; abs(p1 - p0) > H (1/2 hev condition)
+    CMP_LTE             m4, m6, m5                      ; abs(p1 - p0) <= 1
+    pand                m2, m4                          ; (flat8in)
+    ABSSUB              m4, m13, m12, m1                ; abs(q1 - q0)
+    pxor                m4, m8
+    pcmpgtb             m5, m4, m7                      ; abs(q1 - q0) > H (2/2 hev condition)
+    por                 m0, m5                          ; hev final value
+    CMP_LTE             m4, m6, m5                      ; abs(q1 - q0) <= 1
+    pand                m2, m4                          ; (flat8in)
+    ABSSUB_CMP          m1, m14, m12, m6, m4, m5, m8    ; abs(q2 - q0) <= 1
+    pand                m2, m1
+    ABSSUB_CMP          m1, m15, m12, m6, m4, m5, m8    ; abs(q3 - q0) <= 1
+    pand                m2, m1                          ; flat8in final value
+%if %2 == 84 || %2 == 48
+    pand                m2, [mask_mix%2]
+%endif
+%else
+    mova                m6, [pb_80]
+    movd                m7, Hd
+    SPLATB_MASK         m7, [mask_mix]
+    pxor                m7, m6
+    ABSSUB              m4, m10, m11, m1                ; abs(p1 - p0)
+    pxor                m4, m6
+    pcmpgtb             m0, m4, m7                      ; abs(p1 - p0) > H (1/2 hev condition)
+    ABSSUB              m4, m13, m12, m1                ; abs(q1 - q0)
+    pxor                m4, m6
+    pcmpgtb             m5, m4, m7                      ; abs(q1 - q0) > H (2/2 hev condition)
+    por                 m0, m5                          ; hev final value
+%endif
+
+%if %2 == 16
+    ; (m0: hev, m2: flat8in, m3: fm, m6: pb_81, m9..15: p2 p1 p0 q0 q1 q2 q3)
+    ; calc flat8out mask
+    mova                m8, [P7]
+    mova                m9, [P6]
+    ABSSUB_CMP          m1, m8, m11, m6, m4, m5         ; abs(p7 - p0) <= 1
+    ABSSUB_CMP          m7, m9, m11, m6, m4, m5         ; abs(p6 - p0) <= 1
+    pand                m1, m7
+    mova                m8, [P5]
+    mova                m9, [P4]
+    ABSSUB_CMP          m7, m8, m11, m6, m4, m5         ; abs(p5 - p0) <= 1
+    pand                m1, m7
+    ABSSUB_CMP          m7, m9, m11, m6, m4, m5         ; abs(p4 - p0) <= 1
+    pand                m1, m7
+    mova                m14, [Q4]
+    mova                m15, [Q5]
+    ABSSUB_CMP          m7, m14, m12, m6, m4, m5        ; abs(q4 - q0) <= 1
+    pand                m1, m7
+    ABSSUB_CMP          m7, m15, m12, m6, m4, m5        ; abs(q5 - q0) <= 1
+    pand                m1, m7
+    mova                m14, [Q6]
+    mova                m15, [Q7]
+    ABSSUB_CMP          m7, m14, m12, m6, m4, m5        ; abs(q4 - q0) <= 1
+    pand                m1, m7
+    ABSSUB_CMP          m7, m15, m12, m6, m4, m5        ; abs(q5 - q0) <= 1
+    pand                m1, m7                          ; flat8out final value
+%endif
+
+    ; if (fm) {
+    ;     if (out && in) filter_14()
+    ;     else if (in)   filter_6()
+    ;     else if (hev)  filter_2()
+    ;     else           filter_4()
+    ; }
+    ;
+    ; f14:                                                                            fm &  out &  in
+    ; f6:  fm & ~f14 & in        => fm & ~(out & in) & in                          => fm & ~out &  in
+    ; f2:  fm & ~f14 & ~f6 & hev => fm & ~(out & in) & ~(~out & in) & hev          => fm &  ~in &  hev
+    ; f4:  fm & ~f14 & ~f6 & ~f2 => fm & ~(out & in) & ~(~out & in) & ~(~in & hev) => fm &  ~in & ~hev
+
+    ; (m0: hev, [m1: flat8out], [m2: flat8in], m3: fm, m8..15: p5 p4 p1 p0 q0 q1 q6 q7)
+    ; filter2()
+%if %2 != 44
+    mova                m6, [pb_80]                     ; already in m6 if 44_16
+%endif
+    pxor                m15, m12, m6                    ; q0 ^ 0x80
+    pxor                m14, m11, m6                    ; p0 ^ 0x80
+    psubsb              m15, m14                        ; (signed) q0 - p0
+    pxor                m4, m10, m6                     ; p1 ^ 0x80
+    pxor                m5, m13, m6                     ; q1 ^ 0x80
+    psubsb              m4, m5                          ; (signed) p1 - q1
+    paddsb              m4, m15                         ;   (q0 - p0) + (p1 - q1)
+    paddsb              m4, m15                         ; 2*(q0 - p0) + (p1 - q1)
+    paddsb              m4, m15                         ; 3*(q0 - p0) + (p1 - q1)
+    paddsb              m6, m4, [pb_4]                  ; m6: f1 = clip(f + 4, 127)
+    paddsb              m4, [pb_3]                      ; m4: f2 = clip(f + 3, 127)
+    mova                m14, [pb_10]                    ; will be reused in filter4()
+    SRSHIFT3B_2X        m6, m4, m14, m7                 ; f1 and f2 sign byte shift by 3
+    SIGN_SUB            m7, m12, m6, m5, m9             ; m7 = q0 - f1
+    SIGN_ADD            m8, m11, m4, m5, m9             ; m8 = p0 + f2
+%if %2 != 44
+    pandn               m6, m2, m3                      ;  ~mask(in) & mask(fm)
+    pand                m6, m0                          ; (~mask(in) & mask(fm)) & mask(hev)
+%else
+    pand                m6, m3, m0
+%endif
+    MASK_APPLY          m7, m12, m6, m5                 ; m7 = filter2(q0) & mask / we write it in filter4()
+    MASK_APPLY          m8, m11, m6, m5                 ; m8 = filter2(p0) & mask / we write it in filter4()
+
+    ; (m0: hev, [m1: flat8out], [m2: flat8in], m3: fm, m7..m8: q0' p0', m10..13: p1 p0 q0 q1, m14: pb_10, m15: q0-p0)
+    ; filter4()
+    mova                m4, m15
+    paddsb              m15, m4                         ; 2 * (q0 - p0)
+    paddsb              m15, m4                         ; 3 * (q0 - p0)
+    paddsb              m6, m15, [pb_4]                 ; m6:  f1 = clip(f + 4, 127)
+    paddsb              m15, [pb_3]                     ; m15: f2 = clip(f + 3, 127)
+    SRSHIFT3B_2X        m6, m15, m14, m9                ; f1 and f2 sign byte shift by 3
+%if %2 != 44
+%define p0tmp m7
+%define q0tmp m9
+    pandn               m5, m2, m3                      ;               ~mask(in) & mask(fm)
+    pandn               m0, m5                          ; ~mask(hev) & (~mask(in) & mask(fm))
+%else
+%define p0tmp m1
+%define q0tmp m2
+    pandn               m0, m3
+%endif
+    SIGN_SUB            q0tmp, m12, m6, m4, m14         ; q0 - f1
+    MASK_APPLY          q0tmp, m7, m0, m5               ; filter4(q0) & mask
+    mova                [Q0], q0tmp
+    SIGN_ADD            p0tmp, m11, m15, m4, m14        ; p0 + f2
+    MASK_APPLY          p0tmp, m8, m0, m5               ; filter4(p0) & mask
+    mova                [P0], p0tmp
+    paddb               m6, [pb_80]                     ;
+    pxor                m8, m8                          ;   f=(f1+1)>>1
+    pavgb               m6, m8                          ;
+    psubb               m6, [pb_40]                     ;
+    SIGN_ADD            m7, m10, m6, m8, m9             ; p1 + f
+    SIGN_SUB            m4, m13, m6, m8, m9             ; q1 - f
+    MASK_APPLY          m7, m10, m0, m14                ; m7 = filter4(p1)
+    MASK_APPLY          m4, m13, m0, m14                ; m4 = filter4(q1)
+    mova                [P1], m7
+    mova                [Q1], m4
+
+    ; ([m1: flat8out], m2: flat8in, m3: fm, m10..13: p1 p0 q0 q1)
+    ; filter6()
+%if %2 != 44
+    pxor                m0, m0
+%if %2 > 16
+    pand                m3, m2
+%else
+    pand                m2, m3                          ;               mask(fm) & mask(in)
+    pandn               m3, m1, m2                      ; ~mask(out) & (mask(fm) & mask(in))
+%endif
+    mova               m14, [P3]
+    mova               m15, [P2]
+    mova                m8, [Q2]
+    mova                m9, [Q3]
+    FILTER_INIT         m4, m5, m6, m7, [P2], 6,                     m3, m15    ; [p2]
+    FILTER_UPDATE       m6, m7, m4, m5, [P1], m14, m15, m10, m13, 3, m3         ; [p1] -p3 -p2 +p1 +q1
+    FILTER_UPDATE       m4, m5, m6, m7, [P0], m14, m10, m11,  m8, 3, m3         ; [p0] -p3 -p1 +p0 +q2
+    FILTER_UPDATE       m6, m7, m4, m5, [Q0], m14, m11, m12,  m9, 3, m3         ; [q0] -p3 -p0 +q0 +q3
+    FILTER_UPDATE       m4, m5, m6, m7, [Q1], m15, m12, m13,  m9, 3, m3         ; [q1] -p2 -q0 +q1 +q3
+    FILTER_UPDATE       m6, m7, m4, m5, [Q2], m10, m13,  m8,  m9, 3, m3,  m8    ; [q2] -p1 -q1 +q2 +q3
+%endif
+
+    ; (m0: 0, [m1: flat8out], m2: fm & flat8in, m8..15: q2 q3 p1 p0 q0 q1 p3 p2)
+    ; filter14()
+    ;
+    ;                            m2  m3  m8  m9 m14 m15 m10 m11 m12 m13
+    ;
+    ;                                    q2  q3  p3  p2  p1  p0  q0  q1
+    ; p6  -7                     p7  p6  p5  p4   .   .   .   .   .
+    ; p5  -6  -p7 -p6 +p5 +q1     .   .   .                           .
+    ; p4  -5  -p7 -p5 +p4 +q2     .       .   .                      q2
+    ; p3  -4  -p7 -p4 +p3 +q3     .           .   .                  q3
+    ; p2  -3  -p7 -p3 +p2 +q4     .               .   .              q4
+    ; p1  -2  -p7 -p2 +p1 +q5     .                   .   .          q5
+    ; p0  -1  -p7 -p1 +p0 +q6     .                       .   .      q6
+    ; q0  +0  -p7 -p0 +q0 +q7     .                           .   .  q7
+    ; q1  +1  -p6 -q0 +q1 +q7    q1   .                           .   .
+    ; q2  +2  -p5 -q1 +q2 +q7     .  q2   .                           .
+    ; q3  +3  -p4 -q2 +q3 +q7         .  q3   .                       .
+    ; q4  +4  -p3 -q3 +q4 +q7             .  q4   .                   .
+    ; q5  +5  -p2 -q4 +q5 +q7                 .  q5   .               .
+    ; q6  +6  -p1 -q5 +q6 +q7                     .  q6   .           .
+
+%if %2 == 16
+    pand            m1, m2                                                              ; mask(out) & (mask(fm) & mask(in))
+    mova            m2, [P7]
+    mova            m3, [P6]
+    mova            m8, [P5]
+    mova            m9, [P4]
+    FILTER_INIT     m4, m5, m6, m7, [P6],  14,                   m1,  m3
+    FILTER_UPDATE   m6, m7, m4, m5, [P5],  m2,  m3,  m8, m13, 4, m1,  m8                ; [p5] -p7 -p6 +p5 +q1
+    FILTER_UPDATE   m4, m5, m6, m7, [P4],  m2,  m8,  m9, m13, 4, m1,  m9, m13, [Q2]     ; [p4] -p7 -p5 +p4 +q2
+    FILTER_UPDATE   m6, m7, m4, m5, [P3],  m2,  m9, m14, m13, 4, m1, m14, m13, [Q3]     ; [p3] -p7 -p4 +p3 +q3
+    FILTER_UPDATE   m4, m5, m6, m7, [P2],  m2, m14, m15, m13, 4, m1,      m13, [Q4]     ; [p2] -p7 -p3 +p2 +q4
+    FILTER_UPDATE   m6, m7, m4, m5, [P1],  m2, m15, m10, m13, 4, m1,      m13, [Q5]     ; [p1] -p7 -p2 +p1 +q5
+    FILTER_UPDATE   m4, m5, m6, m7, [P0],  m2, m10, m11, m13, 4, m1,      m13, [Q6]     ; [p0] -p7 -p1 +p0 +q6
+    FILTER_UPDATE   m6, m7, m4, m5, [Q0],  m2, m11, m12, m13, 4, m1,      m13, [Q7]     ; [q0] -p7 -p0 +q0 +q7
+    FILTER_UPDATE   m4, m5, m6, m7, [Q1],  m3, m12,  m2, m13, 4, m1,       m2, [Q1]     ; [q1] -p6 -q0 +q1 +q7
+    FILTER_UPDATE   m6, m7, m4, m5, [Q2],  m8,  m2,  m3, m13, 4, m1,       m3, [Q2]     ; [q2] -p5 -q1 +q2 +q7
+    FILTER_UPDATE   m4, m5, m6, m7, [Q3],  m9,  m3,  m8, m13, 4, m1,  m8,  m8, [Q3]     ; [q3] -p4 -q2 +q3 +q7
+    FILTER_UPDATE   m6, m7, m4, m5, [Q4], m14,  m8,  m9, m13, 4, m1,  m9,  m9, [Q4]     ; [q4] -p3 -q3 +q4 +q7
+    FILTER_UPDATE   m4, m5, m6, m7, [Q5], m15,  m9, m14, m13, 4, m1, m14, m14, [Q5]     ; [q5] -p2 -q4 +q5 +q7
+    FILTER_UPDATE   m6, m7, m4, m5, [Q6], m10, m14, m15, m13, 4, m1, m15, m15, [Q6]     ; [q6] -p1 -q5 +q6 +q7
+%endif
+
+%ifidn %1, h
+%if %2 == 16
+    mova                    m0, [P7]
+    mova                    m1, [P6]
+    mova                    m2, [P5]
+    mova                    m3, [P4]
+    mova                    m4, [P3]
+    mova                    m5, [P2]
+    mova                    m6, [P1]
+    mova                    m7, [P0]
+    mova                    m8, [Q0]
+    mova                    m9, [Q1]
+    mova                   m10, [Q2]
+    mova                   m11, [Q3]
+    mova                   m12, [Q4]
+    mova                   m13, [Q5]
+    mova                   m14, [Q6]
+    mova                   m15, [Q7]
+    TRANSPOSE16x16B 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, [rsp]
+    DEFINE_REAL_P7_TO_Q7
+    movu  [P7],  m0
+    movu  [P6],  m1
+    movu  [P5],  m2
+    movu  [P4],  m3
+    movu  [P3],  m4
+    movu  [P2],  m5
+    movu  [P1],  m6
+    movu  [P0],  m7
+    movu  [Q0],  m8
+    movu  [Q1],  m9
+    movu  [Q2], m10
+    movu  [Q3], m11
+    movu  [Q4], m12
+    movu  [Q5], m13
+    movu  [Q6], m14
+    movu  [Q7], m15
+%elif %2 == 44
+    SWAP 0, 7   ; m0 = p1
+    SWAP 3, 4   ; m3 = q1
+    DEFINE_REAL_P7_TO_Q7 2
+    SBUTTERFLY  bw, 0, 1, 8
+    SBUTTERFLY  bw, 2, 3, 8
+    SBUTTERFLY  wd, 0, 2, 8
+    SBUTTERFLY  wd, 1, 3, 8
+    SBUTTERFLY  dq, 0, 4, 8
+    SBUTTERFLY  dq, 1, 5, 8
+    SBUTTERFLY  dq, 2, 6, 8
+    SBUTTERFLY  dq, 3, 7, 8
+    movd  [P7], m0
+    punpckhqdq m0, m8
+    movd  [P6], m0
+    movd  [Q0], m1
+    punpckhqdq  m1, m9
+    movd  [Q1], m1
+    movd  [P3], m2
+    punpckhqdq  m2, m10
+    movd  [P2], m2
+    movd  [Q4], m3
+    punpckhqdq m3, m11
+    movd  [Q5], m3
+    movd  [P5], m4
+    punpckhqdq m4, m12
+    movd  [P4], m4
+    movd  [Q2], m5
+    punpckhqdq m5, m13
+    movd  [Q3], m5
+    movd  [P1], m6
+    punpckhqdq m6, m14
+    movd  [P0], m6
+    movd  [Q6], m7
+    punpckhqdq m7, m8
+    movd  [Q7], m7
+%else
+    ; the following code do a transpose of 8 full lines to 16 half
+    ; lines (high part). It is inlined to avoid the need of a staging area
+    mova                    m0, [P3]
+    mova                    m1, [P2]
+    mova                    m2, [P1]
+    mova                    m3, [P0]
+    mova                    m4, [Q0]
+    mova                    m5, [Q1]
+    mova                    m6, [Q2]
+    mova                    m7, [Q3]
+    DEFINE_REAL_P7_TO_Q7
+    SBUTTERFLY  bw,  0,  1, 8
+    SBUTTERFLY  bw,  2,  3, 8
+    SBUTTERFLY  bw,  4,  5, 8
+    SBUTTERFLY  bw,  6,  7, 8
+    SBUTTERFLY  wd,  0,  2, 8
+    SBUTTERFLY  wd,  1,  3, 8
+    SBUTTERFLY  wd,  4,  6, 8
+    SBUTTERFLY  wd,  5,  7, 8
+    SBUTTERFLY  dq,  0,  4, 8
+    SBUTTERFLY  dq,  1,  5, 8
+    SBUTTERFLY  dq,  2,  6, 8
+    SBUTTERFLY  dq,  3,  7, 8
+    movh  [P7], m0
+    punpckhqdq m0, m8
+    movh  [P6], m0
+    movh  [Q0], m1
+    punpckhqdq  m1, m9
+    movh  [Q1], m1
+    movh  [P3], m2
+    punpckhqdq  m2, m10
+    movh  [P2], m2
+    movh  [Q4], m3
+    punpckhqdq m3, m11
+    movh  [Q5], m3
+    movh  [P5], m4
+    punpckhqdq m4, m12
+    movh  [P4], m4
+    movh  [Q2], m5
+    punpckhqdq m5, m13
+    movh  [Q3], m5
+    movh  [P1], m6
+    punpckhqdq m6, m14
+    movh  [P0], m6
+    movh  [Q6], m7
+    punpckhqdq m7, m8
+    movh  [Q7], m7
+%endif
+%endif
+
+    RET
+%endmacro
+
+%macro LPF_16_VH 2
+INIT_XMM %2
+cglobal vp9_loop_filter_v_%1_16, 5,10,16,      dst, stride, E, I, H, mstride, dst1, dst2, stride3, mstride3
+    LOOPFILTER v, %1
+cglobal vp9_loop_filter_h_%1_16, 5,10,16, 256, dst, stride, E, I, H, mstride, dst1, dst2, stride3, mstride3
+    LOOPFILTER h, %1
+%endmacro
+
+%macro LPF_16_VH_ALL_OPTS 1
+LPF_16_VH %1, sse2
+LPF_16_VH %1, ssse3
+LPF_16_VH %1, avx
+%endmacro
+
+LPF_16_VH_ALL_OPTS 16
+LPF_16_VH_ALL_OPTS 44
+LPF_16_VH_ALL_OPTS 48
+LPF_16_VH_ALL_OPTS 84
+LPF_16_VH_ALL_OPTS 88
+
+%endif ; x86-64

omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/x86/vp9mc.asm Added

@@ -0,0 +1,396 @@
+;******************************************************************************
+;* VP9 MC SIMD optimizations
+;*
+;* Copyright (c) 2013 Ronald S. Bultje <rsbultje gmail com>
+;*
+;* This file is part of FFmpeg.
+;*
+;* FFmpeg is free software; you can redistribute it and/or
+;* modify it under the terms of the GNU Lesser General Public
+;* License as published by the Free Software Foundation; either
+;* version 2.1 of the License, or (at your option) any later version.
+;*
+;* FFmpeg is distributed in the hope that it will be useful,
+;* but WITHOUT ANY WARRANTY; without even the implied warranty of
+;* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;* Lesser General Public License for more details.
+;*
+;* You should have received a copy of the GNU Lesser General Public
+;* License along with FFmpeg; if not, write to the Free Software
+;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+;******************************************************************************
+
+%include "libavutil/x86/x86util.asm"
+
+SECTION_RODATA
+
+; FIXME share with vp8dsp.asm
+pw_256:   times 8 dw 256
+
+%macro F8_TAPS 8
+times 8 db %1, %2
+times 8 db %3, %4
+times 8 db %5, %6
+times 8 db %7, %8
+%endmacro
+; int8_t ff_filters_ssse3[3][15][4][16]
+const filters_ssse3 ; smooth
+                    F8_TAPS -3, -1,  32,  64,  38,   1, -3,  0
+                    F8_TAPS -2, -2,  29,  63,  41,   2, -3,  0
+                    F8_TAPS -2, -2,  26,  63,  43,   4, -4,  0
+                    F8_TAPS -2, -3,  24,  62,  46,   5, -4,  0
+                    F8_TAPS -2, -3,  21,  60,  49,   7, -4,  0
+                    F8_TAPS -1, -4,  18,  59,  51,   9, -4,  0
+                    F8_TAPS -1, -4,  16,  57,  53,  12, -4, -1
+                    F8_TAPS -1, -4,  14,  55,  55,  14, -4, -1
+                    F8_TAPS -1, -4,  12,  53,  57,  16, -4, -1
+                    F8_TAPS  0, -4,   9,  51,  59,  18, -4, -1
+                    F8_TAPS  0, -4,   7,  49,  60,  21, -3, -2
+                    F8_TAPS  0, -4,   5,  46,  62,  24, -3, -2
+                    F8_TAPS  0, -4,   4,  43,  63,  26, -2, -2
+                    F8_TAPS  0, -3,   2,  41,  63,  29, -2, -2
+                    F8_TAPS  0, -3,   1,  38,  64,  32, -1, -3
+                    ; regular
+                    F8_TAPS  0,  1,  -5, 126,   8,  -3,  1,  0
+                    F8_TAPS -1,  3, -10, 122,  18,  -6,  2,  0
+                    F8_TAPS -1,  4, -13, 118,  27,  -9,  3, -1
+                    F8_TAPS -1,  4, -16, 112,  37, -11,  4, -1
+                    F8_TAPS -1,  5, -18, 105,  48, -14,  4, -1
+                    F8_TAPS -1,  5, -19,  97,  58, -16,  5, -1
+                    F8_TAPS -1,  6, -19,  88,  68, -18,  5, -1
+                    F8_TAPS -1,  6, -19,  78,  78, -19,  6, -1
+                    F8_TAPS -1,  5, -18,  68,  88, -19,  6, -1
+                    F8_TAPS -1,  5, -16,  58,  97, -19,  5, -1
+                    F8_TAPS -1,  4, -14,  48, 105, -18,  5, -1
+                    F8_TAPS -1,  4, -11,  37, 112, -16,  4, -1
+                    F8_TAPS -1,  3,  -9,  27, 118, -13,  4, -1
+                    F8_TAPS  0,  2,  -6,  18, 122, -10,  3, -1
+                    F8_TAPS  0,  1,  -3,   8, 126,  -5,  1,  0
+                    ; sharp
+                    F8_TAPS -1,  3,  -7, 127,   8,  -3,  1,  0
+                    F8_TAPS -2,  5, -13, 125,  17,  -6,  3, -1
+                    F8_TAPS -3,  7, -17, 121,  27, -10,  5, -2
+                    F8_TAPS -4,  9, -20, 115,  37, -13,  6, -2
+                    F8_TAPS -4, 10, -23, 108,  48, -16,  8, -3
+                    F8_TAPS -4, 10, -24, 100,  59, -19,  9, -3
+                    F8_TAPS -4, 11, -24,  90,  70, -21, 10, -4
+                    F8_TAPS -4, 11, -23,  80,  80, -23, 11, -4
+                    F8_TAPS -4, 10, -21,  70,  90, -24, 11, -4
+                    F8_TAPS -3,  9, -19,  59, 100, -24, 10, -4
+                    F8_TAPS -3,  8, -16,  48, 108, -23, 10, -4
+                    F8_TAPS -2,  6, -13,  37, 115, -20,  9, -4
+                    F8_TAPS -2,  5, -10,  27, 121, -17,  7, -3
+                    F8_TAPS -1,  3,  -6,  17, 125, -13,  5, -2
+                    F8_TAPS  0,  1,  -3,   8, 127,  -7,  3, -1
+
+SECTION .text
+
+%macro filter_h_fn 1
+%assign %%px mmsize/2
+cglobal %1_8tap_1d_h_ %+ %%px, 6, 6, 11, dst, dstride, src, sstride, h, filtery
+    mova        m6, [pw_256]
+    mova        m7, [filteryq+ 0]
+%if ARCH_X86_64 && mmsize > 8
+    mova        m8, [filteryq+16]
+    mova        m9, [filteryq+32]
+    mova       m10, [filteryq+48]
+%endif
+.loop:
+    movh        m0, [srcq-3]
+    movh        m1, [srcq-2]
+    movh        m2, [srcq-1]
+    movh        m3, [srcq+0]
+    movh        m4, [srcq+1]
+    movh        m5, [srcq+2]
+    punpcklbw   m0, m1
+    punpcklbw   m2, m3
+    movh        m1, [srcq+3]
+    movh        m3, [srcq+4]
+    add       srcq, sstrideq
+    punpcklbw   m4, m5
+    punpcklbw   m1, m3
+    pmaddubsw   m0, m7
+%if ARCH_X86_64 && mmsize > 8
+    pmaddubsw   m2, m8
+    pmaddubsw   m4, m9
+    pmaddubsw   m1, m10
+%else
+    pmaddubsw   m2, [filteryq+16]
+    pmaddubsw   m4, [filteryq+32]
+    pmaddubsw   m1, [filteryq+48]
+%endif
+    paddw       m0, m2
+    paddw       m4, m1
+    paddsw      m0, m4
+    pmulhrsw    m0, m6
+%ifidn %1, avg
+    movh        m1, [dstq]
+%endif
+    packuswb    m0, m0
+%ifidn %1, avg
+    pavgb       m0, m1
+%endif
+    movh    [dstq], m0
+    add       dstq, dstrideq
+    dec         hd
+    jg .loop
+    RET
+%endmacro
+
+INIT_MMX ssse3
+filter_h_fn put
+filter_h_fn avg
+
+INIT_XMM ssse3
+filter_h_fn put
+filter_h_fn avg
+
+%if ARCH_X86_64
+%macro filter_hx2_fn 1
+%assign %%px mmsize
+cglobal %1_8tap_1d_h_ %+ %%px, 6, 6, 14, dst, dstride, src, sstride, h, filtery
+    mova       m13, [pw_256]
+    mova        m8, [filteryq+ 0]
+    mova        m9, [filteryq+16]
+    mova       m10, [filteryq+32]
+    mova       m11, [filteryq+48]
+.loop:
+    movu        m0, [srcq-3]
+    movu        m1, [srcq-2]
+    movu        m2, [srcq-1]
+    movu        m3, [srcq+0]
+    movu        m4, [srcq+1]
+    movu        m5, [srcq+2]
+    movu        m6, [srcq+3]
+    movu        m7, [srcq+4]
+    add       srcq, sstrideq
+    SBUTTERFLY  bw, 0, 1, 12
+    SBUTTERFLY  bw, 2, 3, 12
+    SBUTTERFLY  bw, 4, 5, 12
+    SBUTTERFLY  bw, 6, 7, 12
+    pmaddubsw   m0, m8
+    pmaddubsw   m1, m8
+    pmaddubsw   m2, m9
+    pmaddubsw   m3, m9
+    pmaddubsw   m4, m10
+    pmaddubsw   m5, m10
+    pmaddubsw   m6, m11
+    pmaddubsw   m7, m11
+    paddw       m0, m2
+    paddw       m1, m3
+    paddw       m4, m6
+    paddw       m5, m7
+    paddsw      m0, m4
+    paddsw      m1, m5
+    pmulhrsw    m0, m13
+    pmulhrsw    m1, m13
+    packuswb    m0, m1
+%ifidn %1, avg
+    pavgb       m0, [dstq]
+%endif
+    mova    [dstq], m0
+    add       dstq, dstrideq
+    dec         hd
+    jg .loop
+    RET
+%endmacro
+
+INIT_XMM ssse3
+filter_hx2_fn put
+filter_hx2_fn avg
+
+%endif ; ARCH_X86_64
+
+%macro filter_v_fn 1
+%assign %%px mmsize/2
+%if ARCH_X86_64
+cglobal %1_8tap_1d_v_ %+ %%px, 6, 8, 11, dst, dstride, src, sstride, h, filtery, src4, sstride3
+%else
+cglobal %1_8tap_1d_v_ %+ %%px, 4, 7, 11, dst, dstride, src, sstride, filtery, src4, sstride3
+    mov   filteryq, r5mp
+%define hd r4mp
+%endif
+    mova        m6, [pw_256]
+    lea  sstride3q, [sstrideq*3]
+    lea      src4q, [srcq+sstrideq]
+    sub       srcq, sstride3q
+    mova        m7, [filteryq+ 0]
+%if ARCH_X86_64 && mmsize > 8
+    mova        m8, [filteryq+16]
+    mova        m9, [filteryq+32]
+    mova       m10, [filteryq+48]
+%endif
+.loop:
+    ; FIXME maybe reuse loads from previous rows, or just
+    ; more generally unroll this to prevent multiple loads of
+    ; the same data?
+    movh        m0, [srcq]
+    movh        m1, [srcq+sstrideq]
+    movh        m2, [srcq+sstrideq*2]
+    movh        m3, [srcq+sstride3q]
+    movh        m4, [src4q]
+    movh        m5, [src4q+sstrideq]
+    punpcklbw   m0, m1
+    punpcklbw   m2, m3
+    movh        m1, [src4q+sstrideq*2]
+    movh        m3, [src4q+sstride3q]
+    add       srcq, sstrideq
+    add      src4q, sstrideq
+    punpcklbw   m4, m5
+    punpcklbw   m1, m3
+    pmaddubsw   m0, m7
+%if ARCH_X86_64 && mmsize > 8
+    pmaddubsw   m2, m8
+    pmaddubsw   m4, m9
+    pmaddubsw   m1, m10
+%else
+    pmaddubsw   m2, [filteryq+16]
+    pmaddubsw   m4, [filteryq+32]
+    pmaddubsw   m1, [filteryq+48]
+%endif
+    paddw       m0, m2
+    paddw       m4, m1
+    paddsw      m0, m4
+    pmulhrsw    m0, m6
+%ifidn %1, avg
+    movh        m1, [dstq]
+%endif
+    packuswb    m0, m0
+%ifidn %1, avg
+    pavgb       m0, m1
+%endif
+    movh    [dstq], m0
+    add       dstq, dstrideq
+    dec         hd
+    jg .loop
+    RET
+%endmacro
+
+INIT_MMX ssse3
+filter_v_fn put
+filter_v_fn avg
+
+INIT_XMM ssse3
+filter_v_fn put
+filter_v_fn avg
+
+%if ARCH_X86_64
+
+%macro filter_vx2_fn 1
+%assign %%px mmsize
+cglobal %1_8tap_1d_v_ %+ %%px, 6, 8, 14, dst, dstride, src, sstride, h, filtery, src4, sstride3
+    mova       m13, [pw_256]
+    lea  sstride3q, [sstrideq*3]
+    lea      src4q, [srcq+sstrideq]
+    sub       srcq, sstride3q
+    mova        m8, [filteryq+ 0]
+    mova        m9, [filteryq+16]
+    mova       m10, [filteryq+32]
+    mova       m11, [filteryq+48]
+.loop:
+    ; FIXME maybe reuse loads from previous rows, or just
+    ; more generally unroll this to prevent multiple loads of
+    ; the same data?
+    movu        m0, [srcq]
+    movu        m1, [srcq+sstrideq]
+    movu        m2, [srcq+sstrideq*2]
+    movu        m3, [srcq+sstride3q]
+    movu        m4, [src4q]
+    movu        m5, [src4q+sstrideq]
+    movu        m6, [src4q+sstrideq*2]
+    movu        m7, [src4q+sstride3q]
+    add       srcq, sstrideq
+    add      src4q, sstrideq
+    SBUTTERFLY  bw, 0, 1, 12
+    SBUTTERFLY  bw, 2, 3, 12
+    SBUTTERFLY  bw, 4, 5, 12
+    SBUTTERFLY  bw, 6, 7, 12
+    pmaddubsw   m0, m8
+    pmaddubsw   m1, m8
+    pmaddubsw   m2, m9
+    pmaddubsw   m3, m9
+    pmaddubsw   m4, m10
+    pmaddubsw   m5, m10
+    pmaddubsw   m6, m11
+    pmaddubsw   m7, m11
+    paddw       m0, m2
+    paddw       m1, m3
+    paddw       m4, m6
+    paddw       m5, m7
+    paddsw      m0, m4
+    paddsw      m1, m5
+    pmulhrsw    m0, m13
+    pmulhrsw    m1, m13
+    packuswb    m0, m1
+%ifidn %1, avg
+    pavgb       m0, [dstq]
+%endif
+    mova    [dstq], m0
+    add       dstq, dstrideq
+    dec         hd
+    jg .loop
+    RET
+%endmacro
+
+INIT_XMM ssse3
+filter_vx2_fn put
+filter_vx2_fn avg
+
+%endif ; ARCH_X86_64
+
+%macro fpel_fn 6
+%if %2 == 4
+%define %%srcfn movh
+%define %%dstfn movh
+%else
+%define %%srcfn movu
+%define %%dstfn mova
+%endif
+
+%if %2 <= 16
+cglobal %1%2, 5, 7, 4, dst, dstride, src, sstride, h, dstride3, sstride3
+    lea  sstride3q, [sstrideq*3]
+    lea  dstride3q, [dstrideq*3]
+%else
+cglobal %1%2, 5, 5, 4, dst, dstride, src, sstride, h
+%endif
+.loop:
+    %%srcfn     m0, [srcq]
+    %%srcfn     m1, [srcq+s%3]
+    %%srcfn     m2, [srcq+s%4]
+    %%srcfn     m3, [srcq+s%5]
+    lea       srcq, [srcq+sstrideq*%6]
+%ifidn %1, avg
+    pavgb       m0, [dstq]
+    pavgb       m1, [dstq+d%3]
+    pavgb       m2, [dstq+d%4]
+    pavgb       m3, [dstq+d%5]
+%endif
+    %%dstfn [dstq], m0
+    %%dstfn [dstq+d%3], m1
+    %%dstfn [dstq+d%4], m2
+    %%dstfn [dstq+d%5], m3
+    lea       dstq, [dstq+dstrideq*%6]
+    sub         hd, %6
+    jnz .loop
+    RET
+%endmacro
+
+%define d16 16
+%define s16 16
+INIT_MMX mmx
+fpel_fn put, 4,  strideq, strideq*2, stride3q, 4
+fpel_fn put, 8,  strideq, strideq*2, stride3q, 4
+INIT_MMX mmxext
+fpel_fn avg, 4,  strideq, strideq*2, stride3q, 4
+fpel_fn avg, 8,  strideq, strideq*2, stride3q, 4
+INIT_XMM sse
+fpel_fn put, 16, strideq, strideq*2, stride3q, 4
+fpel_fn put, 32, mmsize,  strideq,   strideq+mmsize, 2
+fpel_fn put, 64, mmsize,  mmsize*2,  mmsize*3, 1
+INIT_XMM sse2
+fpel_fn avg, 16, strideq, strideq*2, stride3q, 4
+fpel_fn avg, 32, mmsize,  strideq,   strideq+mmsize, 2
+fpel_fn avg, 64, mmsize,  mmsize*2,  mmsize*3, 1
+%undef s16
+%undef d16

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/xan.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/xan.c Changed

@@ -71,7 +71,18 @@
 
 } XanContext;
 
-static av_cold int xan_decode_end(AVCodecContext *avctx);
+static av_cold int xan_decode_end(AVCodecContext *avctx)
+{
+    XanContext *s = avctx->priv_data;
+
+    av_frame_free(&s->last_frame);
+
+    av_freep(&s->buffer1);
+    av_freep(&s->buffer2);
+    av_freep(&s->palettes);
+
+    return 0;
+}
 
 static av_cold int xan_decode_init(AVCodecContext *avctx)
 {
@@ -92,6 +103,7 @@
         av_freep(&s->buffer1);
         return AVERROR(ENOMEM);
     }
+
     s->last_frame = av_frame_alloc();
     if (!s->last_frame) {
         xan_decode_end(avctx);
@@ -111,12 +123,11 @@
     uint8_t val = ival;
     uint8_t *dest_end = dest + dest_len;
     uint8_t *dest_start = dest;
+    int ret;
     GetBitContext gb;
 
-    if (ptr_len < 0)
-        return AVERROR_INVALIDDATA;
-
-    init_get_bits(&gb, ptr, ptr_len * 8);
+    if ((ret = init_get_bits8(&gb, ptr, ptr_len)) < 0)
+        return ret;
 
     while (val != 0x16) {
         unsigned idx = val - 0x17 + get_bits1(&gb) * byte;
@@ -624,19 +635,6 @@
     return buf_size;
 }
 
-static av_cold int xan_decode_end(AVCodecContext *avctx)
-{
-    XanContext *s = avctx->priv_data;
-
-    av_frame_free(&s->last_frame);
-
-    av_freep(&s->buffer1);
-    av_freep(&s->buffer2);
-    av_freep(&s->palettes);
-
-    return 0;
-}
-
 AVCodec ff_xan_wc3_decoder = {
     .name           = "xan_wc3",
     .long_name      = NULL_IF_CONFIG_SMALL("Wing Commander III / Xan"),

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/xfaceenc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/xfaceenc.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/xsubenc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/xsubenc.c Changed

@@ -142,7 +142,7 @@
         av_log(avctx, AV_LOG_WARNING, "No more than 4 subtitle colors supported (%d found.)\n", h->rects[0]->nb_colors);
 
     // TODO: Palette swapping if color zero is not transparent
-    if (((uint32_t *)h->rects[0]->pict.data[1])[0] & 0xff)
+    if (((uint32_t *)h->rects[0]->pict.data[1])[0] & 0xff000000)
         av_log(avctx, AV_LOG_WARNING, "Color index 0 is not transparent. Transparency will be messed up.\n");
 
     if (make_tc(startTime, start_tc) || make_tc(endTime, end_tc)) {
@@ -166,8 +166,8 @@
     bytestream_put_le16(&hdr, height);
     bytestream_put_le16(&hdr, h->rects[0]->x);
     bytestream_put_le16(&hdr, h->rects[0]->y);
-    bytestream_put_le16(&hdr, h->rects[0]->x + width);
-    bytestream_put_le16(&hdr, h->rects[0]->y + height);
+    bytestream_put_le16(&hdr, h->rects[0]->x + width -1);
+    bytestream_put_le16(&hdr, h->rects[0]->y + height -1);
 
     rlelenptr = hdr; // Will store length of first field here later.
     hdr+=2;
@@ -206,6 +206,8 @@
     if (!avctx->codec_tag)
         avctx->codec_tag = MKTAG('D','X','S','B');
 
+    avctx->bits_per_coded_sample = 4;
+
     return 0;
 }

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/xvmc.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/xvmc.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/xvmc_internal.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/xvmc_internal.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/xxan.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/xxan.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/y41penc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/y41penc.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/yuv4enc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/yuv4enc.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/zerocodec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/zerocodec.c Changed

@@ -23,7 +23,7 @@
 #include "libavutil/common.h"
 
 typedef struct {
-    AVFrame  previous_frame;
+    AVFrame  *previous_frame;
     z_stream zstream;
 } ZeroCodecContext;
 
@@ -32,7 +32,7 @@
 {
     ZeroCodecContext *zc = avctx->priv_data;
     AVFrame *pic         = data;
-    AVFrame *prev_pic    = &zc->previous_frame;
+    AVFrame *prev_pic    = zc->previous_frame;
     z_stream *zstream    = &zc->zstream;
     uint8_t *prev        = prev_pic->data[0];
     uint8_t *dst;
@@ -91,8 +91,8 @@
         dst  -= pic->linesize[0];
     }
 
-    av_frame_unref(&zc->previous_frame);
-    if ((ret = av_frame_ref(&zc->previous_frame, pic)) < 0)
+    av_frame_unref(zc->previous_frame);
+    if ((ret = av_frame_ref(zc->previous_frame, pic)) < 0)
         return ret;
 
     *got_frame = 1;
@@ -104,7 +104,7 @@
 {
     ZeroCodecContext *zc = avctx->priv_data;
 
-    av_frame_unref(&zc->previous_frame);
+    av_frame_free(&zc->previous_frame);
 
     inflateEnd(&zc->zstream);
 
@@ -130,6 +130,12 @@
         return AVERROR(ENOMEM);
     }
 
+    zc->previous_frame = av_frame_alloc();
+    if (!zc->previous_frame) {
+        zerocodec_decode_close(avctx);
+        return AVERROR(ENOMEM);
+    }
+
     return 0;
 }

omxplayer-2014.02.11.tar.gz/ffmpeg/libavcodec/zmbvenc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavcodec/zmbvenc.c Changed

@@ -44,6 +44,7 @@
  */
 typedef struct ZmbvEncContext {
     AVCodecContext *avctx;
+
     int range;
     uint8_t *comp_buf, *work_buf;
     uint8_t pal[768];
@@ -119,7 +120,7 @@
                         const AVFrame *pict, int *got_packet)
 {
     ZmbvEncContext * const c = avctx->priv_data;
-    AVFrame * const p = (AVFrame *)pict;
+    const AVFrame * const p = pict;
     uint8_t *src, *prev, *buf;
     uint32_t *palptr;
     int keyframe, chpal;
@@ -132,8 +133,8 @@
     c->curfrm++;
     if(c->curfrm == c->keyint)
         c->curfrm = 0;
-    p->pict_type= keyframe ? AV_PICTURE_TYPE_I : AV_PICTURE_TYPE_P;
-    p->key_frame= keyframe;
+    avctx->coded_frame->pict_type = keyframe ? AV_PICTURE_TYPE_I : AV_PICTURE_TYPE_P;
+    avctx->coded_frame->key_frame = keyframe;
     chpal = !keyframe && memcmp(p->data[1], c->pal2, 1024);
 
     palptr = (uint32_t*)p->data[1];
@@ -248,6 +249,20 @@
     return 0;
 }
 
+static av_cold int encode_end(AVCodecContext *avctx)
+{
+    ZmbvEncContext * const c = avctx->priv_data;
+
+    av_freep(&c->comp_buf);
+    av_freep(&c->work_buf);
+
+    deflateEnd(&c->zstream);
+    av_freep(&c->prev);
+
+    av_frame_free(&avctx->coded_frame);
+
+    return 0;
+}
 
 /**
  * Init zmbv encoder
@@ -309,23 +324,11 @@
         return -1;
     }
 
-    return 0;
-}
-
-
-
-/**
- * Uninit zmbv encoder
- */
-static av_cold int encode_end(AVCodecContext *avctx)
-{
-    ZmbvEncContext * const c = avctx->priv_data;
-
-    av_freep(&c->comp_buf);
-    av_freep(&c->work_buf);
-
-    deflateEnd(&c->zstream);
-    av_freep(&c->prev);
+    avctx->coded_frame = av_frame_alloc();
+    if (!avctx->coded_frame) {
+        encode_end(avctx);
+        return AVERROR(ENOMEM);
+    }
 
     return 0;
 }

omxplayer-2014.02.11.tar.gz/ffmpeg/libavdevice/Makefile -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavdevice/Makefile Changed

@@ -10,8 +10,6 @@
 OBJS    = alldevices.o                                                  \
           avdevice.o                                                    \
 
-OBJS-$(HAVE_MSVCRT) += file_open.o
-
 # input/output devices
 OBJS-$(CONFIG_ALSA_INDEV)                += alsa-audio-common.o \
                                             alsa-audio-dec.o timefilter.o
@@ -19,6 +17,7 @@
                                             alsa-audio-enc.o
 OBJS-$(CONFIG_BKTR_INDEV)                += bktr.o
 OBJS-$(CONFIG_CACA_OUTDEV)               += caca.o
+OBJS-$(CONFIG_DECKLINK_OUTDEV)           += decklink_enc.o decklink_enc_c.o
 OBJS-$(CONFIG_DSHOW_INDEV)               += dshow.o dshow_enummediatypes.o \
                                             dshow_enumpins.o dshow_filter.o \
                                             dshow_pin.o dshow_common.o
@@ -31,6 +30,7 @@
 OBJS-$(CONFIG_JACK_INDEV)                += jack_audio.o timefilter.o
 OBJS-$(CONFIG_LAVFI_INDEV)               += lavfi.o
 OBJS-$(CONFIG_OPENAL_INDEV)              += openal-dec.o
+OBJS-$(CONFIG_OPENGL_OUTDEV)             += opengl_enc.o
 OBJS-$(CONFIG_OSS_INDEV)                 += oss_audio.o
 OBJS-$(CONFIG_OSS_OUTDEV)                += oss_audio.o
 OBJS-$(CONFIG_PULSE_INDEV)               += pulse_audio_dec.o \
@@ -51,6 +51,12 @@
 OBJS-$(CONFIG_LIBCDIO_INDEV)             += libcdio.o
 OBJS-$(CONFIG_LIBDC1394_INDEV)           += libdc1394.o
 
+OBJS-$(HAVE_LIBC_MSVCRT)                 += file_open.o
+
+# Windows resource file
+SLIBOBJS-$(HAVE_GNU_WINDRES)             += avdeviceres.o
+
+SKIPHEADERS-$(CONFIG_DECKLINK)           += decklink_enc.h
 SKIPHEADERS-$(CONFIG_DSHOW_INDEV)        += dshow_capture.h
 SKIPHEADERS-$(CONFIG_LIBPULSE)           += pulse_audio_common.h
 SKIPHEADERS-$(CONFIG_V4L2_INDEV)         += v4l2-common.h

omxplayer-2014.02.11.tar.gz/ffmpeg/libavdevice/alldevices.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavdevice/alldevices.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavdevice/alsa-audio-enc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavdevice/alsa-audio-enc.c Changed

@@ -47,12 +47,17 @@
 static av_cold int audio_write_header(AVFormatContext *s1)
 {
     AlsaData *s = s1->priv_data;
-    AVStream *st;
+    AVStream *st = NULL;
     unsigned int sample_rate;
     enum AVCodecID codec_id;
     int res;
 
+    if (s1->nb_streams != 1 || s1->streams[0]->codec->codec_type != AVMEDIA_TYPE_AUDIO) {
+        av_log(s1, AV_LOG_ERROR, "Only a single audio stream is supported.\n");
+        return AVERROR(EINVAL);
+    }
     st = s1->streams[0];
+
     sample_rate = st->codec->sample_rate;
     codec_id    = st->codec->codec_id;
     res = ff_alsa_open(s1, SND_PCM_STREAM_PLAYBACK, &sample_rate,
@@ -80,6 +85,10 @@
     uint8_t *buf = pkt->data;
 
     size /= s->frame_size;
+    if (pkt->dts != AV_NOPTS_VALUE)
+        s->timestamp = pkt->dts;
+    s->timestamp += pkt->duration ? pkt->duration : size;
+
     if (s->reorder_func) {
         if (size > s->reorder_buf_size)
             if (ff_alsa_extend_reorder_buf(s, size))
@@ -104,6 +113,24 @@
     return 0;
 }
 
+static int audio_write_frame(AVFormatContext *s1, int stream_index,
+                             AVFrame **frame, unsigned flags)
+{
+    AlsaData *s = s1->priv_data;
+    AVPacket pkt;
+
+    /* ff_alsa_open() should have accepted only supported formats */
+    if ((flags & AV_WRITE_UNCODED_FRAME_QUERY))
+        return av_sample_fmt_is_planar(s1->streams[stream_index]->codec->sample_fmt) ?
+               AVERROR(EINVAL) : 0;
+    /* set only used fields */
+    pkt.data     = (*frame)->data[0];
+    pkt.size     = (*frame)->nb_samples * s->frame_size;
+    pkt.dts      = (*frame)->pkt_dts;
+    pkt.duration = av_frame_get_pkt_duration(*frame);
+    return audio_write_packet(s1, &pkt);
+}
+
 static void
 audio_get_output_timestamp(AVFormatContext *s1, int stream,
     int64_t *dts, int64_t *wall)
@@ -112,7 +139,7 @@
     snd_pcm_sframes_t delay = 0;
     *wall = av_gettime();
     snd_pcm_delay(s->h, &delay);
-    *dts = s1->streams[0]->cur_dts - delay;
+    *dts = s->timestamp - delay;
 }
 
 AVOutputFormat ff_alsa_muxer = {
@@ -124,6 +151,7 @@
     .write_header   = audio_write_header,
     .write_packet   = audio_write_packet,
     .write_trailer  = ff_alsa_close,
+    .write_uncoded_frame = audio_write_frame,
     .get_output_timestamp = audio_get_output_timestamp,
     .flags          = AVFMT_NOFILE,
 };

omxplayer-2014.02.11.tar.gz/ffmpeg/libavdevice/alsa-audio.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavdevice/alsa-audio.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavdevice/avdevice.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavdevice/avdevice.c Changed

@@ -36,3 +36,60 @@
 #define LICENSE_PREFIX "libavdevice license: "
     return LICENSE_PREFIX FFMPEG_LICENSE + sizeof(LICENSE_PREFIX) - 1;
 }
+
+int avdevice_app_to_dev_control_message(struct AVFormatContext *s, enum AVAppToDevMessageType type,
+                                        void *data, size_t data_size)
+{
+    if (!s->oformat || !s->oformat->control_message)
+        return AVERROR(ENOSYS);
+    return s->oformat->control_message(s, type, data, data_size);
+}
+
+int avdevice_dev_to_app_control_message(struct AVFormatContext *s, enum AVDevToAppMessageType type,
+                                        void *data, size_t data_size)
+{
+    if (!s->control_message_cb)
+        return AVERROR(ENOSYS);
+    return s->control_message_cb(s, type, data, data_size);
+}
+
+int avdevice_list_devices(AVFormatContext *s, AVDeviceInfoList **device_list)
+{
+    av_assert0(s);
+    av_assert0(device_list);
+    av_assert0(s->oformat || s->iformat);
+    if ((s->oformat && !s->oformat->get_device_list) ||
+        (s->iformat && !s->iformat->get_device_list)) {
+        *device_list = NULL;
+        return AVERROR(ENOSYS);
+    }
+    *device_list = av_mallocz(sizeof(AVDeviceInfoList));
+    if (!(*device_list))
+        return AVERROR(ENOMEM);
+    if (s->oformat)
+        return s->oformat->get_device_list(s, *device_list);
+    return s->iformat->get_device_list(s, *device_list);
+}
+
+void avdevice_free_list_devices(AVDeviceInfoList **device_list)
+{
+    AVDeviceInfoList *list;
+    AVDeviceInfo *dev;
+    int i;
+
+    av_assert0(device_list);
+    list = *device_list;
+    if (!list)
+        return;
+
+    for (i = 0; i < list->nb_devices; i++) {
+        dev = list->devices[i];
+        if (dev) {
+            av_free(dev->device_name);
+            av_free(dev->device_description);
+            av_free(dev);
+        }
+    }
+    av_free(list->devices);
+    av_freep(device_list);
+}

omxplayer-2014.02.11.tar.gz/ffmpeg/libavdevice/avdevice.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavdevice/avdevice.h Changed

@@ -66,4 +66,168 @@
  */
 void avdevice_register_all(void);
 
+typedef struct AVDeviceRect {
+    int x;      /**< x coordinate of top left corner */
+    int y;      /**< y coordinate of top left corner */
+    int width;  /**< width */
+    int height; /**< height */
+} AVDeviceRect;
+
+/**
+ * Message types used by avdevice_app_to_dev_control_message().
+ */
+enum AVAppToDevMessageType {
+    /**
+     * Dummy message.
+     */
+    AV_APP_TO_DEV_NONE = MKBETAG('N','O','N','E'),
+
+    /**
+     * Window size change message.
+     *
+     * Message is sent to the device every time the application changes the size
+     * of the window device renders to.
+     * Message should also be sent right after window is created.
+     *
+     * data: AVDeviceRect: new window size.
+     */
+    AV_APP_TO_DEV_WINDOW_SIZE = MKBETAG('G','E','O','M'),
+
+    /**
+     * Repaint request message.
+     *
+     * Message is sent to the device when window have to be rapainted.
+     *
+     * data: AVDeviceRect: area required to be repainted.
+     *       NULL: whole area is required to be repainted.
+     */
+    AV_APP_TO_DEV_WINDOW_REPAINT = MKBETAG('R','E','P','A')
+};
+
+/**
+ * Message types used by avdevice_dev_to_app_control_message().
+ */
+enum AVDevToAppMessageType {
+    /**
+     * Dummy message.
+     */
+    AV_DEV_TO_APP_NONE = MKBETAG('N','O','N','E'),
+
+    /**
+     * Create window buffer message.
+     *
+     * Device requests to create a window buffer. Exact meaning is device-
+     * and application-dependent. Message is sent before rendering first
+     * frame and all one-shot initializations should be done here.
+     * Application is allowed to ignore preferred window buffer size.
+     *
+     * @note: Application is obligated to inform about window buffer size
+     *        with AV_APP_TO_DEV_WINDOW_SIZE message.
+     *
+     * data: AVDeviceRect: preferred size of the window buffer.
+     *       NULL: no preferred size of the window buffer.
+     */
+    AV_DEV_TO_APP_CREATE_WINDOW_BUFFER = MKBETAG('B','C','R','E'),
+
+    /**
+     * Prepare window buffer message.
+     *
+     * Device requests to prepare a window buffer for rendering.
+     * Exact meaning is device- and application-dependent.
+     * Message is sent before rendering of each frame.
+     *
+     * data: NULL.
+     */
+    AV_DEV_TO_APP_PREPARE_WINDOW_BUFFER = MKBETAG('B','P','R','E'),
+
+    /**
+     * Display window buffer message.
+     *
+     * Device requests to display a window buffer.
+     * Message is sent when new frame is ready to be displyed.
+     * Usually buffers need to be swapped in handler of this message.
+     *
+     * data: NULL.
+     */
+    AV_DEV_TO_APP_DISPLAY_WINDOW_BUFFER = MKBETAG('B','D','I','S'),
+
+    /**
+     * Destroy window buffer message.
+     *
+     * Device requests to destroy a window buffer.
+     * Message is sent when device is about to be destroyed and window
+     * buffer is not required anymore.
+     *
+     * data: NULL.
+     */
+    AV_DEV_TO_APP_DESTROY_WINDOW_BUFFER = MKBETAG('B','D','E','S')
+};
+
+/**
+ * Send control message from application to device.
+ *
+ * @param s         device context.
+ * @param type      message type.
+ * @param data      message data. Exact type depends on message type.
+ * @param data_size size of message data.
+ * @return >= 0 on success, negative on error.
+ *         AVERROR(ENOSYS) when device doesn't implement handler of the message.
+ */
+int avdevice_app_to_dev_control_message(struct AVFormatContext *s,
+                                        enum AVAppToDevMessageType type,
+                                        void *data, size_t data_size);
+
+/**
+ * Send control message from device to application.
+ *
+ * @param s         device context.
+ * @param type      message type.
+ * @param data      message data. Can be NULL.
+ * @param data_size size of message data.
+ * @return >= 0 on success, negative on error.
+ *         AVERROR(ENOSYS) when application doesn't implement handler of the message.
+ */
+int avdevice_dev_to_app_control_message(struct AVFormatContext *s,
+                                        enum AVDevToAppMessageType type,
+                                        void *data, size_t data_size);
+
+/**
+ * Structure describes basic parameters of the device.
+ */
+typedef struct AVDeviceInfo {
+    char *device_name;                   /**< device name, format depends on device */
+    char *device_description;            /**< human friendly name */
+} AVDeviceInfo;
+
+/**
+ * List of devices.
+ */
+typedef struct AVDeviceInfoList {
+    AVDeviceInfo **devices;              /**< list of autodetected devices */
+    int nb_devices;                      /**< number of autodetected devices */
+    int default_device;                  /**< index of default device or -1 if no default */
+} AVDeviceInfoList;
+
+/**
+ * List devices.
+ *
+ * Returns available device names and their parameters.
+ *
+ * @note: Some devices may accept system-dependent device names that cannot be
+ *        autodetected. The list returned by this function cannot be assumed to
+ *        be always completed.
+ *
+ * @param s                device context.
+ * @param[out] device_list list of autodetected devices.
+ * @return count of autodetected devices, negative on error.
+ */
+int avdevice_list_devices(struct AVFormatContext *s, AVDeviceInfoList **device_list);
+
+/**
+ * Convinient function to free result of avdevice_list_devices().
+ *
+ * @param devices device list to be freed.
+ */
+void avdevice_free_list_devices(AVDeviceInfoList **device_list);
+
 #endif /* AVDEVICE_AVDEVICE_H */

omxplayer-2014.03.28.tar.gz/ffmpeg/libavdevice/avdeviceres.rc Added

@@ -0,0 +1,55 @@
+/*
+ * Windows resource file for libavdevice
+ *
+ * Copyright (C) 2012 James Almer
+ * Copyright (C) 2013 Tiancheng "Timothy" Gu
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <windows.h>
+#include "libavdevice/version.h"
+#include "libavutil/ffversion.h"
+#include "config.h"
+
+1 VERSIONINFO
+FILEVERSION     LIBAVDEVICE_VERSION_MAJOR, LIBAVDEVICE_VERSION_MINOR, LIBAVDEVICE_VERSION_MICRO, 0
+PRODUCTVERSION  LIBAVDEVICE_VERSION_MAJOR, LIBAVDEVICE_VERSION_MINOR, LIBAVDEVICE_VERSION_MICRO, 0
+FILEFLAGSMASK   VS_FFI_FILEFLAGSMASK
+FILEOS          VOS_NT_WINDOWS32
+FILETYPE        VFT_DLL
+{
+    BLOCK "StringFileInfo"
+    {
+        BLOCK "040904B0"
+        {
+            VALUE "CompanyName",      "FFmpeg Project"
+            VALUE "FileDescription",  "FFmpeg device handling library"
+            VALUE "FileVersion",      AV_STRINGIFY(LIBAVDEVICE_VERSION)
+            VALUE "InternalName",     "libavdevice"
+            VALUE "LegalCopyright",   "Copyright (C) 2000-" AV_STRINGIFY(CONFIG_THIS_YEAR) " FFmpeg Project"
+            VALUE "OriginalFilename", "avdevice" BUILDSUF "-" AV_STRINGIFY(LIBAVDEVICE_VERSION_MAJOR) SLIBSUF
+            VALUE "ProductName",      "FFmpeg"
+            VALUE "ProductVersion",   FFMPEG_VERSION
+        }
+    }
+
+    BLOCK "VarFileInfo"
+    {
+        VALUE "Translation", 0x0409, 0x04B0
+    }
+}

omxplayer-2014.03.28.tar.gz/ffmpeg/libavdevice/decklink_enc.cpp Added

@@ -0,0 +1,588 @@
+/*
+ * Blackmagic DeckLink output
+ * Copyright (c) 2013-2014 Ramiro Polla
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <DeckLinkAPI.h>
+#ifdef _WIN32
+#include <DeckLinkAPI_i.c>
+typedef unsigned long buffercount_type;
+#else
+#include <DeckLinkAPIDispatch.cpp>
+typedef uint32_t buffercount_type;
+#endif
+
+#include <pthread.h>
+#include <semaphore.h>
+
+extern "C" {
+#include "libavformat/avformat.h"
+#include "libavformat/internal.h"
+#include "libavutil/imgutils.h"
+}
+
+#include "decklink_enc.h"
+
+class decklink_callback;
+
+struct decklink_ctx {
+    /* DeckLink SDK interfaces */
+    IDeckLink *dl;
+    IDeckLinkOutput *dlo;
+    decklink_callback *callback;
+
+    /* DeckLink mode information */
+    IDeckLinkDisplayModeIterator *itermode;
+    BMDTimeValue bmd_tb_den;
+    BMDTimeValue bmd_tb_num;
+    BMDDisplayMode bmd_mode;
+    int bmd_width;
+    int bmd_height;
+
+    /* Streams present */
+    int audio;
+    int video;
+
+    /* Status */
+    int playback_started;
+    int64_t last_pts;
+
+    /* Options */
+    int list_devices;
+    int list_formats;
+    double preroll;
+
+    int frames_preroll;
+    int frames_buffer;
+
+    sem_t semaphore;
+
+    int channels;
+};
+
+/* DeckLink callback class declaration */
+class decklink_frame : public IDeckLinkVideoFrame
+{
+public:
+    decklink_frame(struct decklink_ctx *ctx, AVFrame *avframe, long width,
+                   long height, void *buffer) :
+                   _ctx(ctx), _avframe(avframe), _width(width),
+                   _height(height), _buffer(buffer), _refs(0) { }
+
+    virtual long           STDMETHODCALLTYPE GetWidth      (void)          { return _width; }
+    virtual long           STDMETHODCALLTYPE GetHeight     (void)          { return _height; }
+    virtual long           STDMETHODCALLTYPE GetRowBytes   (void)          { return _width<<1; }
+    virtual BMDPixelFormat STDMETHODCALLTYPE GetPixelFormat(void)          { return bmdFormat8BitYUV; }
+    virtual BMDFrameFlags  STDMETHODCALLTYPE GetFlags      (void)          { return bmdVideoOutputFlagDefault; }
+    virtual HRESULT        STDMETHODCALLTYPE GetBytes      (void **buffer) { *buffer = _buffer; return S_OK; }
+
+    virtual HRESULT STDMETHODCALLTYPE GetTimecode     (BMDTimecodeFormat format, IDeckLinkTimecode **timecode) { return S_FALSE; }
+    virtual HRESULT STDMETHODCALLTYPE GetAncillaryData(IDeckLinkVideoFrameAncillary **ancillary)               { return S_FALSE; }
+
+    virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid, LPVOID *ppv) { return E_NOINTERFACE; }
+    virtual ULONG   STDMETHODCALLTYPE AddRef(void)                            { return ++_refs; }
+    virtual ULONG   STDMETHODCALLTYPE Release(void)                           { if (!--_refs) delete this; return _refs; }
+
+    struct decklink_ctx *_ctx;
+    AVFrame *_avframe;
+
+private:
+    long  _width;
+    long  _height;
+    void *_buffer;
+    int   _refs;
+};
+
+class decklink_callback : public IDeckLinkVideoOutputCallback
+{
+public:
+    virtual HRESULT STDMETHODCALLTYPE ScheduledFrameCompleted(IDeckLinkVideoFrame *_frame, BMDOutputFrameCompletionResult result)
+    {
+        decklink_frame *frame = static_cast<decklink_frame *>(_frame);
+        struct decklink_ctx *ctx = frame->_ctx;
+        AVFrame *avframe = frame->_avframe;
+
+        av_frame_free(&avframe);
+
+        sem_post(&ctx->semaphore);
+
+        return S_OK;
+    }
+    virtual HRESULT STDMETHODCALLTYPE ScheduledPlaybackHasStopped(void)       { return S_OK; }
+    virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid, LPVOID *ppv) { return E_NOINTERFACE; }
+    virtual ULONG   STDMETHODCALLTYPE AddRef(void)                            { return 1; }
+    virtual ULONG   STDMETHODCALLTYPE Release(void)                           { return 1; }
+};
+
+#ifdef _WIN32
+static IDeckLinkIterator *CreateDeckLinkIteratorInstance(void)
+{
+    IDeckLinkIterator *iter;
+
+    if (CoInitialize(NULL) != S_OK) {
+        av_log(NULL, AV_LOG_ERROR, "COM initialization failed.\n");
+        return NULL;
+    }
+
+    if (CoCreateInstance(CLSID_CDeckLinkIterator, NULL, CLSCTX_ALL,
+                         IID_IDeckLinkIterator, (void**) &iter) != S_OK) {
+        av_log(NULL, AV_LOG_ERROR, "DeckLink drivers not installed.\n");
+        return NULL;
+    }
+
+    return iter;
+}
+#endif
+
+/* free() is needed for a string returned by the DeckLink SDL. */
+#undef free
+
+#ifdef _WIN32
+static char *dup_wchar_to_utf8(wchar_t *w)
+{
+    char *s = NULL;
+    int l = WideCharToMultiByte(CP_UTF8, 0, w, -1, 0, 0, 0, 0);
+    s = (char *) av_malloc(l);
+    if (s)
+        WideCharToMultiByte(CP_UTF8, 0, w, -1, s, l, 0, 0);
+    return s;
+}
+#define DECKLINK_STR    OLECHAR *
+#define DECKLINK_STRDUP dup_wchar_to_utf8
+#else
+#define DECKLINK_STR    const char *
+#define DECKLINK_STRDUP av_strdup
+#endif
+
+static HRESULT IDeckLink_GetDisplayName(IDeckLink *This, const char **displayName)
+{
+    DECKLINK_STR tmpDisplayName;
+    HRESULT hr = This->GetDisplayName(&tmpDisplayName);
+    if (hr != S_OK)
+        return hr;
+    *displayName = DECKLINK_STRDUP(tmpDisplayName);
+    free((void *) tmpDisplayName);
+    return hr;
+}
+
+static int decklink_set_format(struct decklink_ctx *ctx,
+                               int width, int height,
+                               int tb_num, int tb_den)
+{
+    BMDDisplayModeSupport support;
+    IDeckLinkDisplayMode *mode;
+
+    if (tb_num == 1) {
+        tb_num *= 1000;
+        tb_den *= 1000;
+    }
+    ctx->bmd_mode = bmdModeUnknown;
+    while ((ctx->bmd_mode == bmdModeUnknown) && ctx->itermode->Next(&mode) == S_OK) {
+        BMDTimeValue bmd_tb_num, bmd_tb_den;
+        int bmd_width  = mode->GetWidth();
+        int bmd_height = mode->GetHeight();
+
+        mode->GetFrameRate(&bmd_tb_num, &bmd_tb_den);
+
+        if (bmd_width == width && bmd_height == height &&
+            bmd_tb_num == tb_num && bmd_tb_den == tb_den) {
+            ctx->bmd_mode   = mode->GetDisplayMode();
+            ctx->bmd_width  = bmd_width;
+            ctx->bmd_height = bmd_height;
+            ctx->bmd_tb_den = bmd_tb_den;
+            ctx->bmd_tb_num = bmd_tb_num;
+        }
+
+        mode->Release();
+    }
+    if (ctx->bmd_mode == bmdModeUnknown)
+        return -1;
+    if (ctx->dlo->DoesSupportVideoMode(ctx->bmd_mode, bmdFormat8BitYUV,
+                                       bmdVideoOutputFlagDefault,
+                                       &support, NULL) != S_OK)
+        return -1;
+    if (support == bmdDisplayModeSupported)
+        return 0;
+
+    return -1;
+}
+
+static int decklink_setup_video(AVFormatContext *avctx, AVStream *st)
+{
+    struct decklink_cctx *cctx = (struct decklink_cctx *) avctx->priv_data;
+    struct decklink_ctx *ctx = (struct decklink_ctx *) cctx->ctx;
+    AVCodecContext *c = st->codec;
+
+    if (ctx->video) {
+        av_log(avctx, AV_LOG_ERROR, "Only one video stream is supported!\n");
+        return -1;
+    }
+
+    if (c->pix_fmt != AV_PIX_FMT_UYVY422) {
+        av_log(avctx, AV_LOG_ERROR, "Unsupported pixel format!"
+               " Only AV_PIX_FMT_UYVY422 is supported.\n");
+        return -1;
+    }
+    if (decklink_set_format(ctx, c->width, c->height,
+                            c->time_base.num, c->time_base.den)) {
+        av_log(avctx, AV_LOG_ERROR, "Unsupported video size or framerate!"
+               " Check available formats with -list_formats 1.\n");
+        return -1;
+    }
+    if (ctx->dlo->EnableVideoOutput(ctx->bmd_mode,
+                                    bmdVideoOutputFlagDefault) != S_OK) {
+        av_log(avctx, AV_LOG_ERROR, "Could not enable video output!\n");
+        return -1;
+    }
+
+    /* Set callback. */
+    ctx->callback = new decklink_callback();
+    ctx->dlo->SetScheduledFrameCompletionCallback(ctx->callback);
+
+    /* Start video semaphore. */
+    ctx->frames_preroll = c->time_base.den * ctx->preroll;
+    if (c->time_base.den > 1000)
+        ctx->frames_preroll /= 1000;
+
+    /* Buffer twice as many frames as the preroll. */
+    ctx->frames_buffer = ctx->frames_preroll * 2;
+    ctx->frames_buffer = FFMIN(ctx->frames_buffer, 60);
+    sem_init(&ctx->semaphore, 0, ctx->frames_buffer);
+
+    /* The device expects the framerate to be fixed. */
+    avpriv_set_pts_info(st, 64, c->time_base.num, c->time_base.den);
+
+    ctx->video = 1;
+
+    return 0;
+}
+
+static int decklink_setup_audio(AVFormatContext *avctx, AVStream *st)
+{
+    struct decklink_cctx *cctx = (struct decklink_cctx *) avctx->priv_data;
+    struct decklink_ctx *ctx = (struct decklink_ctx *) cctx->ctx;
+    AVCodecContext *c = st->codec;
+
+    if (ctx->audio) {
+        av_log(avctx, AV_LOG_ERROR, "Only one audio stream is supported!\n");
+        return -1;
+    }
+    if (c->sample_rate != 48000) {
+        av_log(avctx, AV_LOG_ERROR, "Unsupported sample rate!"
+               " Only 48kHz is supported.\n");
+        return -1;
+    }
+    if (c->channels != 2 && c->channels != 8) {
+        av_log(avctx, AV_LOG_ERROR, "Unsupported number of channels!"
+               " Only stereo and 7.1 are supported.\n");
+        return -1;
+    }
+    if (ctx->dlo->EnableAudioOutput(bmdAudioSampleRate48kHz,
+                                    bmdAudioSampleType16bitInteger,
+                                    c->channels,
+                                    bmdAudioOutputStreamTimestamped) != S_OK) {
+        av_log(avctx, AV_LOG_ERROR, "Could not enable audio output!\n");
+        return -1;
+    }
+    if (ctx->dlo->BeginAudioPreroll() != S_OK) {
+        av_log(avctx, AV_LOG_ERROR, "Could not begin audio preroll!\n");
+        return -1;
+    }
+
+    /* The device expects the sample rate to be fixed. */
+    avpriv_set_pts_info(st, 64, 1, c->sample_rate);
+    ctx->channels = c->channels;
+
+    ctx->audio = 1;
+
+    return 0;
+}
+
+av_cold int ff_decklink_write_trailer(AVFormatContext *avctx)
+{
+    struct decklink_cctx *cctx = (struct decklink_cctx *) avctx->priv_data;
+    struct decklink_ctx *ctx = (struct decklink_ctx *) cctx->ctx;
+
+    if (ctx->playback_started) {
+        BMDTimeValue actual;
+        ctx->dlo->StopScheduledPlayback(ctx->last_pts * ctx->bmd_tb_num,
+                                        &actual, ctx->bmd_tb_den);
+        ctx->dlo->DisableVideoOutput();
+        if (ctx->audio)
+            ctx->dlo->DisableAudioOutput();
+    }
+
+    if (ctx->dlo)
+        ctx->dlo->Release();
+    if (ctx->dl)
+        ctx->dl->Release();
+
+    if (ctx->callback)
+        delete ctx->callback;
+
+    sem_destroy(&ctx->semaphore);
+
+    av_freep(&cctx->ctx);
+
+    return 0;
+}
+
+static int decklink_write_video_packet(AVFormatContext *avctx, AVPacket *pkt)
+{
+    struct decklink_cctx *cctx = (struct decklink_cctx *) avctx->priv_data;
+    struct decklink_ctx *ctx = (struct decklink_ctx *) cctx->ctx;
+    AVPicture *avpicture = (AVPicture *) pkt->data;
+    AVFrame *avframe, *tmp;
+    decklink_frame *frame;
+    buffercount_type buffered;
+    HRESULT hr;
+
+    /* HACK while av_uncoded_frame() isn't implemented */
+    int ret;
+
+    tmp = av_frame_alloc();
+    if (!tmp)
+        return AVERROR(ENOMEM);
+    tmp->format = AV_PIX_FMT_UYVY422;
+    tmp->width  = ctx->bmd_width;
+    tmp->height = ctx->bmd_height;
+    ret = av_frame_get_buffer(tmp, 32);
+    if (ret < 0) {
+        av_frame_free(&tmp);
+        return ret;
+    }
+    av_image_copy(tmp->data, tmp->linesize, (const uint8_t **) avpicture->data,
+                  avpicture->linesize, (AVPixelFormat) tmp->format, tmp->width,
+                  tmp->height);
+    avframe = av_frame_clone(tmp);
+    av_frame_free(&tmp);
+    if (!avframe) {
+        av_log(avctx, AV_LOG_ERROR, "Could not clone video frame.\n");
+        return AVERROR(EIO);
+    }
+    /* end HACK */
+
+    frame = new decklink_frame(ctx, avframe, ctx->bmd_width, ctx->bmd_height,
+                               (void *) avframe->data[0]);
+    if (!frame) {
+        av_log(avctx, AV_LOG_ERROR, "Could not create new frame.\n");
+        return AVERROR(EIO);
+    }
+
+    /* Always keep at most one second of frames buffered. */
+    sem_wait(&ctx->semaphore);
+
+    /* Schedule frame for playback. */
+    hr = ctx->dlo->ScheduleVideoFrame((struct IDeckLinkVideoFrame *) frame,
+                                      pkt->pts * ctx->bmd_tb_num,
+                                      ctx->bmd_tb_num, ctx->bmd_tb_den);
+    if (hr != S_OK) {
+        av_log(avctx, AV_LOG_ERROR, "Could not schedule video frame."
+                " error %08x.\n", (uint32_t) hr);
+        frame->Release();
+        return AVERROR(EIO);
+    }
+
+    ctx->dlo->GetBufferedVideoFrameCount(&buffered);
+    av_log(avctx, AV_LOG_DEBUG, "Buffered video frames: %d.\n", (int) buffered);
+    if (pkt->pts > 2 && buffered <= 2)
+        av_log(avctx, AV_LOG_WARNING, "There are not enough buffered video frames."
+               " Video may misbehave!\n");
+
+    /* Preroll video frames. */
+    if (!ctx->playback_started && pkt->pts > ctx->frames_preroll) {
+        av_log(avctx, AV_LOG_DEBUG, "Ending audio preroll.\n");
+        if (ctx->audio && ctx->dlo->EndAudioPreroll() != S_OK) {
+            av_log(avctx, AV_LOG_ERROR, "Could not end audio preroll!\n");
+            return AVERROR(EIO);
+        }
+        av_log(avctx, AV_LOG_DEBUG, "Starting scheduled playback.\n");
+        if (ctx->dlo->StartScheduledPlayback(0, ctx->bmd_tb_den, 1.0) != S_OK) {
+            av_log(avctx, AV_LOG_ERROR, "Could not start scheduled playback!\n");
+            return AVERROR(EIO);
+        }
+        ctx->playback_started = 1;
+    }
+
+    return 0;
+}
+
+static int decklink_write_audio_packet(AVFormatContext *avctx, AVPacket *pkt)
+{
+    struct decklink_cctx *cctx = (struct decklink_cctx *) avctx->priv_data;
+    struct decklink_ctx *ctx = (struct decklink_ctx *) cctx->ctx;
+    int sample_count = pkt->size / (ctx->channels << 1);
+    buffercount_type buffered;
+
+    ctx->dlo->GetBufferedAudioSampleFrameCount(&buffered);
+    if (pkt->pts > 1 && !buffered)
+        av_log(avctx, AV_LOG_WARNING, "There's no buffered audio."
+               " Audio will misbehave!\n");
+
+    if (ctx->dlo->ScheduleAudioSamples(pkt->data, sample_count, pkt->pts,
+                                       bmdAudioSampleRate48kHz, NULL) != S_OK) {
+        av_log(avctx, AV_LOG_ERROR, "Could not schedule audio samples.\n");
+        return AVERROR(EIO);
+    }
+
+    return 0;
+}
+
+extern "C" {
+
+av_cold int ff_decklink_write_header(AVFormatContext *avctx)
+{
+    struct decklink_cctx *cctx = (struct decklink_cctx *) avctx->priv_data;
+    struct decklink_ctx *ctx;
+    IDeckLinkIterator *iter;
+    IDeckLink *dl = NULL;
+    unsigned int n;
+
+    ctx = (struct decklink_ctx *) av_mallocz(sizeof(struct decklink_ctx));
+    if (!ctx)
+        return AVERROR(ENOMEM);
+    ctx->list_devices = cctx->list_devices;
+    ctx->list_formats = cctx->list_formats;
+    ctx->preroll      = cctx->preroll;
+    cctx->ctx = ctx;
+
+    iter = CreateDeckLinkIteratorInstance();
+    if (!iter) {
+        av_log(avctx, AV_LOG_ERROR, "Could not create DeckLink iterator\n");
+        return AVERROR(EIO);
+    }
+
+    /* List available devices. */
+    if (ctx->list_devices) {
+        av_log(avctx, AV_LOG_INFO, "Blackmagic DeckLink devices:\n");
+        while (iter->Next(&dl) == S_OK) {
+            const char *displayName;
+            IDeckLink_GetDisplayName(dl, &displayName);
+            av_log(avctx, AV_LOG_INFO, "\t'%s'\n", displayName);
+            av_free((void *) displayName);
+            dl->Release();
+        }
+        iter->Release();
+        return AVERROR_EXIT;
+    }
+
+    /* Open device. */
+    while (iter->Next(&dl) == S_OK) {
+        const char *displayName;
+        IDeckLink_GetDisplayName(dl, &displayName);
+        if (!strcmp(avctx->filename, displayName)) {
+            av_free((void *) displayName);
+            ctx->dl = dl;
+            break;
+        }
+        av_free((void *) displayName);
+        dl->Release();
+    }
+    iter->Release();
+    if (!ctx->dl) {
+        av_log(avctx, AV_LOG_ERROR, "Could not open '%s'\n", avctx->filename);
+        return AVERROR(EIO);
+    }
+
+    /* Get output device. */
+    if (ctx->dl->QueryInterface(IID_IDeckLinkOutput, (void **) &ctx->dlo) != S_OK) {
+        av_log(avctx, AV_LOG_ERROR, "Could not open output device from '%s'\n",
+               avctx->filename);
+        ctx->dl->Release();
+        return AVERROR(EIO);
+    }
+
+    if (ctx->dlo->GetDisplayModeIterator(&ctx->itermode) != S_OK) {
+        av_log(avctx, AV_LOG_ERROR, "Could not get Display Mode Iterator\n");
+        ctx->dl->Release();
+        return AVERROR(EIO);
+    }
+
+    /* List supported formats. */
+    if (ctx->list_formats) {
+        IDeckLinkDisplayMode *mode;
+
+        av_log(avctx, AV_LOG_INFO, "Supported formats for '%s':\n",
+               avctx->filename);
+        while (ctx->itermode->Next(&mode) == S_OK) {
+            BMDTimeValue tb_num, tb_den;
+            mode->GetFrameRate(&tb_num, &tb_den);
+            av_log(avctx, AV_LOG_INFO, "\t%ldx%ld at %d/%d fps",
+                   mode->GetWidth(), mode->GetHeight(),
+                   (int) tb_den, (int) tb_num);
+            switch (mode->GetFieldDominance()) {
+            case bmdLowerFieldFirst:
+            av_log(avctx, AV_LOG_INFO, " (interlaced, lower field first)"); break;
+            case bmdUpperFieldFirst:
+            av_log(avctx, AV_LOG_INFO, " (interlaced, upper field first)"); break;
+            }
+            av_log(avctx, AV_LOG_INFO, "\n");
+            mode->Release();
+        }
+
+        ctx->itermode->Release();
+        ctx->dlo->Release();
+        ctx->dl->Release();
+        return AVERROR_EXIT;
+    }
+
+    /* Setup streams. */
+    for (n = 0; n < avctx->nb_streams; n++) {
+        AVStream *st = avctx->streams[n];
+        AVCodecContext *c = st->codec;
+        if        (c->codec_type == AVMEDIA_TYPE_AUDIO) {
+            if (decklink_setup_audio(avctx, st))
+                goto error;
+        } else if (c->codec_type == AVMEDIA_TYPE_VIDEO) {
+            if (decklink_setup_video(avctx, st))
+                goto error;
+        } else {
+            av_log(avctx, AV_LOG_ERROR, "Unsupported stream type.\n");
+            goto error;
+        }
+    }
+    ctx->itermode->Release();
+
+    return 0;
+
+error:
+
+    ctx->dlo->Release();
+    ctx->dl->Release();
+
+    return AVERROR(EIO);
+}
+
+int ff_decklink_write_packet(AVFormatContext *avctx, AVPacket *pkt)
+{
+    struct decklink_cctx *cctx = (struct decklink_cctx *) avctx->priv_data;
+    struct decklink_ctx *ctx = (struct decklink_ctx *) cctx->ctx;
+    AVStream *st = avctx->streams[pkt->stream_index];
+
+    ctx->last_pts = FFMAX(ctx->last_pts, pkt->pts);
+
+    if      (st->codec->codec_type == AVMEDIA_TYPE_VIDEO)
+        return decklink_write_video_packet(avctx, pkt);
+    else if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO)
+        return decklink_write_audio_packet(avctx, pkt);
+
+    return AVERROR(EIO);
+}
+
+} /* extern "C" */

omxplayer-2014.03.28.tar.gz/ffmpeg/libavdevice/decklink_enc.h Added

@@ -0,0 +1,43 @@
+/*
+ * Blackmagic DeckLink output
+ * Copyright (c) 2013-2014 Ramiro Polla
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+struct decklink_cctx {
+    const AVClass *cclass;
+
+    void *ctx;
+
+    /* Options */
+    int list_devices;
+    int list_formats;
+    double preroll;
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int ff_decklink_write_header(AVFormatContext *avctx);
+int ff_decklink_write_packet(AVFormatContext *avctx, AVPacket *pkt);
+int ff_decklink_write_trailer(AVFormatContext *avctx);
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif

omxplayer-2014.03.28.tar.gz/ffmpeg/libavdevice/decklink_enc_c.c Added

@@ -0,0 +1,55 @@
+/*
+ * Blackmagic DeckLink output
+ * Copyright (c) 2013-2014 Ramiro Polla
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "libavformat/avformat.h"
+#include "libavutil/opt.h"
+
+#include "decklink_enc.h"
+
+#define OFFSET(x) offsetof(struct decklink_cctx, x)
+#define ENC AV_OPT_FLAG_ENCODING_PARAM
+static const AVOption options[] = {
+    { "list_devices", "list available devices"  , OFFSET(list_devices), AV_OPT_TYPE_INT   , { .i64 = 0   }, 0, 1, ENC },
+    { "list_formats", "list supported formats"  , OFFSET(list_formats), AV_OPT_TYPE_INT   , { .i64 = 0   }, 0, 1, ENC },
+    { "preroll"     , "video preroll in seconds", OFFSET(preroll     ), AV_OPT_TYPE_DOUBLE, { .dbl = 0.5 }, 0, 5, ENC },
+    { NULL },
+};
+
+static const AVClass decklink_muxer_class = {
+    .class_name = "Blackmagic DeckLink muxer",
+    .item_name  = av_default_item_name,
+    .option     = options,
+    .version    = LIBAVUTIL_VERSION_INT,
+};
+
+AVOutputFormat ff_decklink_muxer = {
+    .name           = "decklink",
+    .long_name      = NULL_IF_CONFIG_SMALL("Blackmagic DeckLink output"),
+    .audio_codec    = AV_CODEC_ID_PCM_S16LE,
+    .video_codec    = AV_CODEC_ID_RAWVIDEO,
+    .subtitle_codec = AV_CODEC_ID_NONE,
+    .flags          = AVFMT_NOFILE | AVFMT_RAWPICTURE,
+    .priv_class     = &decklink_muxer_class,
+    .priv_data_size = sizeof(struct decklink_cctx),
+    .write_header   = ff_decklink_write_header,
+    .write_packet   = ff_decklink_write_packet,
+    .write_trailer  = ff_decklink_write_trailer,
+};

omxplayer-2014.02.11.tar.gz/ffmpeg/libavdevice/dshow.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavdevice/dshow.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavdevice/fbdev_common.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavdevice/fbdev_common.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavdevice/fbdev_common.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavdevice/fbdev_common.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavdevice/fbdev_enc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavdevice/fbdev_enc.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavdevice/iec61883.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavdevice/iec61883.c Changed

@@ -102,7 +102,7 @@
     DVPacket *packet;
     int ret;
 
-#ifdef THREADS
+#if THREADS
     pthread_mutex_lock(&dv->mutex);
 #endif
 
@@ -139,7 +139,7 @@
     ret = 0;
 
 exit:
-#ifdef THREADS
+#if THREADS
     pthread_cond_broadcast(&dv->cond);
     pthread_mutex_unlock(&dv->mutex);
 #endif
@@ -151,7 +151,7 @@
     struct iec61883_data *dv = (struct iec61883_data *)opaque;
     int result;
 
-#ifdef THREADS
+#if THREADS
     while (dv->thread_loop)
 #endif
     {
@@ -168,7 +168,7 @@
             raw1394_loop_iterate(dv->raw1394);
         } else if (dv->receiving) {
             av_log(NULL, AV_LOG_ERROR, "No more input data available\n");
-#ifdef THREADS
+#if THREADS
             pthread_mutex_lock(&dv->mutex);
             dv->eof = 1;
             pthread_cond_broadcast(&dv->cond);
@@ -413,7 +413,7 @@
      * Try to parse frames from queue
      */
 
-#ifdef THREADS
+#if THREADS
     pthread_mutex_lock(&dv->mutex);
     while ((size = dv->parse_queue(dv, pkt)) == -1)
         if (!dv->eof)

omxplayer-2014.02.11.tar.gz/ffmpeg/libavdevice/lavfi.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavdevice/lavfi.c Changed

omxplayer-2014.03.28.tar.gz/ffmpeg/libavdevice/opengl_enc.c Added

@@ -0,0 +1,1290 @@
+/*
+ * Copyright (c) 2014 Lukasz Marek
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+//TODO: support for more formats
+//TODO: support for more systems.
+//TODO: implement X11, Windows, Mac OS native default window. SDL 1.2 doesn't allow to render to custom thread.
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <stddef.h>
+
+#include "config.h"
+
+#if HAVE_OPENGL_GL3_H
+#include <OpenGL/gl3.h>
+#elif HAVE_ES2_GL_H
+#include <ES2/gl.h>
+#else
+#include <GL/gl.h>
+#include <GL/glext.h>
+#endif
+#if HAVE_GLXGETPROCADDRESS
+#include <GL/glx.h>
+#endif
+#if HAVE_WINDOWS_H
+#include <windows.h>
+#endif
+
+#if HAVE_SDL
+#include <SDL.h>
+#endif
+
+#include "libavutil/common.h"
+#include "libavutil/pixdesc.h"
+#include "libavutil/log.h"
+#include "libavutil/opt.h"
+#include "libavutil/avassert.h"
+#include "libavutil/avstring.h"
+#include "libavformat/avformat.h"
+#include "libavformat/internal.h"
+#include "libavdevice/avdevice.h"
+#include "opengl_enc_shaders.h"
+
+#ifndef APIENTRY
+#define APIENTRY
+#endif
+
+/* FF_GL_RED_COMPONENT is used for plannar pixel types.
+ * Only red component is sampled in shaders.
+ * On some platforms GL_RED is not availabe and GL_LUMINANCE have to be used,
+ * but since OpenGL 3.0 GL_LUMINANCE is deprecated.
+ * GL_RED produces RGBA = value, 0, 0, 1.
+ * GL_LUMINANCE produces RGBA = value, value, value, 1.
+ * Note: GL_INTENSITY may also be used which produce RGBA = value, value, value, value. */
+#if defined(GL_RED)
+#define FF_GL_RED_COMPONENT GL_RED
+#elif defined(GL_LUMINANCE)
+#define FF_GL_RED_COMPONENT GL_LUMINANCE
+#else
+#define FF_GL_RED_COMPONENT 0x1903; //GL_RED
+#endif
+
+/* Constants not defined for iOS */
+#define FF_GL_UNSIGNED_BYTE_3_3_2 0x8032
+#define FF_GL_UNSIGNED_BYTE_2_3_3_REV 0x8362
+#define FF_GL_UNSIGNED_SHORT_1_5_5_5_REV 0x8366
+#define FF_GL_UNPACK_ROW_LENGTH          0x0CF2
+
+/* MinGW exposes only OpenGL 1.1 API */
+#define FF_GL_ARRAY_BUFFER                0x8892
+#define FF_GL_ELEMENT_ARRAY_BUFFER        0x8893
+#define FF_GL_STATIC_DRAW                 0x88E4
+#define FF_GL_FRAGMENT_SHADER             0x8B30
+#define FF_GL_VERTEX_SHADER               0x8B31
+#define FF_GL_COMPILE_STATUS              0x8B81
+#define FF_GL_LINK_STATUS                 0x8B82
+#define FF_GL_INFO_LOG_LENGTH             0x8B84
+typedef void   (APIENTRY *FF_PFNGLACTIVETEXTUREPROC) (GLenum texture);
+typedef void   (APIENTRY *FF_PFNGLGENBUFFERSPROC) (GLsizei n, GLuint *buffers);
+typedef void   (APIENTRY *FF_PFNGLDELETEBUFFERSPROC) (GLsizei n, const GLuint *buffers);
+typedef void   (APIENTRY *FF_PFNGLBUFFERDATAPROC) (GLenum target, ptrdiff_t size, const GLvoid *data, GLenum usage);
+typedef void   (APIENTRY *FF_PFNGLBINDBUFFERPROC) (GLenum target, GLuint buffer);
+typedef GLint  (APIENTRY *FF_PFNGLGETATTRIBLOCATIONPROC) (GLuint program, const char *name);
+typedef void   (APIENTRY *FF_PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index);
+typedef void   (APIENTRY *FF_PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, uintptr_t pointer);
+typedef GLint  (APIENTRY *FF_PFNGLGETUNIFORMLOCATIONPROC) (GLuint program, const char *name);
+typedef void   (APIENTRY *FF_PFNGLUNIFORM1FPROC) (GLint location, GLfloat v0);
+typedef void   (APIENTRY *FF_PFNGLUNIFORM1IPROC) (GLint location, GLint v0);
+typedef void   (APIENTRY *FF_PFNGLUNIFORMMATRIX4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef GLuint (APIENTRY *FF_PFNGLCREATEPROGRAMPROC) (void);
+typedef void   (APIENTRY *FF_PFNGLDELETEPROGRAMPROC) (GLuint program);
+typedef void   (APIENTRY *FF_PFNGLUSEPROGRAMPROC) (GLuint program);
+typedef void   (APIENTRY *FF_PFNGLLINKPROGRAMPROC) (GLuint program);
+typedef void   (APIENTRY *FF_PFNGLGETPROGRAMIVPROC) (GLuint program, GLenum pname, GLint *params);
+typedef void   (APIENTRY *FF_PFNGLGETPROGRAMINFOLOGPROC) (GLuint program, GLsizei bufSize, GLsizei *length, char *infoLog);
+typedef void   (APIENTRY *FF_PFNGLATTACHSHADERPROC) (GLuint program, GLuint shader);
+typedef GLuint (APIENTRY *FF_PFNGLCREATESHADERPROC) (GLenum type);
+typedef void   (APIENTRY *FF_PFNGLDELETESHADERPROC) (GLuint shader);
+typedef void   (APIENTRY *FF_PFNGLCOMPILESHADERPROC) (GLuint shader);
+typedef void   (APIENTRY *FF_PFNGLSHADERSOURCEPROC) (GLuint shader, GLsizei count, const char* *string, const GLint *length);
+typedef void   (APIENTRY *FF_PFNGLGETSHADERIVPROC) (GLuint shader, GLenum pname, GLint *params);
+typedef void   (APIENTRY *FF_PFNGLGETSHADERINFOLOGPROC) (GLuint shader, GLsizei bufSize, GLsizei *length, char *infoLog);
+
+typedef struct FFOpenGLFunctions {
+    FF_PFNGLACTIVETEXTUREPROC glActiveTexture;                     //Require GL ARB multitexture
+    FF_PFNGLGENBUFFERSPROC glGenBuffers;                           //Require GL_ARB_vertex_buffer_object
+    FF_PFNGLDELETEBUFFERSPROC glDeleteBuffers;                     //Require GL_ARB_vertex_buffer_object
+    FF_PFNGLBUFFERDATAPROC glBufferData;                           //Require GL_ARB_vertex_buffer_object
+    FF_PFNGLBINDBUFFERPROC glBindBuffer;                           //Require GL_ARB_vertex_buffer_object
+    FF_PFNGLGETATTRIBLOCATIONPROC glGetAttribLocation;             //Require GL_ARB_vertex_shader
+    FF_PFNGLENABLEVERTEXATTRIBARRAYPROC glEnableVertexAttribArray; //Require GL_ARB_vertex_shader
+    FF_PFNGLVERTEXATTRIBPOINTERPROC glVertexAttribPointer;         //Require GL_ARB_vertex_shader
+    FF_PFNGLGETUNIFORMLOCATIONPROC glGetUniformLocation;           //Require GL_ARB_shader_objects
+    FF_PFNGLUNIFORM1FPROC glUniform1f;                             //Require GL_ARB_shader_objects
+    FF_PFNGLUNIFORM1IPROC glUniform1i;                             //Require GL_ARB_shader_objects
+    FF_PFNGLUNIFORMMATRIX4FVPROC glUniformMatrix4fv;               //Require GL_ARB_shader_objects
+    FF_PFNGLCREATEPROGRAMPROC glCreateProgram;                     //Require GL_ARB_shader_objects
+    FF_PFNGLDELETEPROGRAMPROC glDeleteProgram;                     //Require GL_ARB_shader_objects
+    FF_PFNGLUSEPROGRAMPROC glUseProgram;                           //Require GL_ARB_shader_objects
+    FF_PFNGLLINKPROGRAMPROC glLinkProgram;                         //Require GL_ARB_shader_objects
+    FF_PFNGLGETPROGRAMIVPROC glGetProgramiv;                       //Require GL_ARB_shader_objects
+    FF_PFNGLGETPROGRAMINFOLOGPROC glGetProgramInfoLog;             //Require GL_ARB_shader_objects
+    FF_PFNGLATTACHSHADERPROC glAttachShader;                       //Require GL_ARB_shader_objects
+    FF_PFNGLCREATESHADERPROC glCreateShader;                       //Require GL_ARB_shader_objects
+    FF_PFNGLDELETESHADERPROC glDeleteShader;                       //Require GL_ARB_shader_objects
+    FF_PFNGLCOMPILESHADERPROC glCompileShader;                     //Require GL_ARB_shader_objects
+    FF_PFNGLSHADERSOURCEPROC glShaderSource;                       //Require GL_ARB_shader_objects
+    FF_PFNGLGETSHADERIVPROC glGetShaderiv;                         //Require GL_ARB_shader_objects
+    FF_PFNGLGETSHADERINFOLOGPROC glGetShaderInfoLog;               //Require GL_ARB_shader_objects
+} FFOpenGLFunctions;
+
+#define OPENGL_ERROR_CHECK(ctx) \
+{\
+    GLenum err_code; \
+    if ((err_code = glGetError()) != GL_NO_ERROR) { \
+        av_log(ctx, AV_LOG_ERROR, "OpenGL error occurred in '%s', line %d: %d\n", __FUNCTION__, __LINE__, err_code); \
+        goto fail; \
+    } \
+}\
+
+typedef struct OpenGLVertexInfo
+{
+    float x, y, z;    ///<Position
+    float s0, t0;     ///<Texture coords
+} OpenGLVertexInfo;
+
+/* defines 2 triangles to display */
+static GLushort g_index[6] =
+{
+    0, 1, 2,
+    0, 3, 2,
+};
+
+typedef struct OpenGLContext {
+    AVClass *class;                    ///< class for private options
+
+#if HAVE_SDL
+    SDL_Surface *surface;
+#endif
+    FFOpenGLFunctions glprocs;
+
+    uint8_t background[4];             ///< Background color
+    int no_window;                     ///< 0 for create default window
+    char *window_title;                ///< Title of the window
+
+    /* OpenGL implementation limits */
+    GLint max_texture_size;            ///< Maximum texture size
+    GLint max_viewport_width;          ///< Maximum viewport size
+    GLint max_viewport_height;         ///< Maximum viewport size
+    int non_pow_2_textures;            ///< 1 when non power of 2 textures are supported
+    int unpack_subimage;               ///< 1 when GL_EXT_unpack_subimage is available
+
+    /* Current OpenGL configuration */
+    GLuint program;                    ///< Shader program
+    GLuint vertex_shader;              ///< Vertex shader
+    GLuint fragment_shader;            ///< Fragment shader for current pix_pmt
+    GLuint texture_name[4];            ///< Textures' IDs
+    GLuint index_buffer;               ///< Index buffer
+    GLuint vertex_buffer;              ///< Vertex buffer
+    OpenGLVertexInfo vertex[4];        ///< VBO
+    GLint projection_matrix_location;  ///< Uniforms' locations
+    GLint model_view_matrix_location;
+    GLint color_map_location;
+    GLint chroma_div_w_location;
+    GLint chroma_div_h_location;
+    GLint texture_location[4];
+    GLint position_attrib;             ///< Attibutes' locations
+    GLint texture_coords_attrib;
+
+    GLfloat projection_matrix[16];     ///< Projection matrix
+    GLfloat model_view_matrix[16];     ///< Modev view matrix
+    GLfloat color_map[16];             ///< RGBA color map matrix
+    GLfloat chroma_div_w;              ///< Chroma subsampling w ratio
+    GLfloat chroma_div_h;              ///< Chroma subsampling h ratio
+
+    /* Stream information */
+    GLenum format;
+    GLenum type;
+    int width;                         ///< Stream width
+    int height;                        ///< Stream height
+    enum AVPixelFormat pix_fmt;        ///< Stream pixel format
+    int picture_width;                 ///< Rendered width
+    int picture_height;                ///< Rendered height
+    int window_width;
+    int window_height;
+} OpenGLContext;
+
+static const struct OpenGLFormatDesc {
+    enum AVPixelFormat fixel_format;
+    const char * const * fragment_shader;
+    GLenum format;
+    GLenum type;
+} opengl_format_desc[] = {
+    { AV_PIX_FMT_YUV420P,    &FF_OPENGL_FRAGMENT_SHADER_YUV_PLANAR,  FF_GL_RED_COMPONENT, GL_UNSIGNED_BYTE },
+    { AV_PIX_FMT_YUV444P,    &FF_OPENGL_FRAGMENT_SHADER_YUV_PLANAR,  FF_GL_RED_COMPONENT, GL_UNSIGNED_BYTE },
+    { AV_PIX_FMT_YUV422P,    &FF_OPENGL_FRAGMENT_SHADER_YUV_PLANAR,  FF_GL_RED_COMPONENT, GL_UNSIGNED_BYTE },
+    { AV_PIX_FMT_YUV410P,    &FF_OPENGL_FRAGMENT_SHADER_YUV_PLANAR,  FF_GL_RED_COMPONENT, GL_UNSIGNED_BYTE },
+    { AV_PIX_FMT_YUV411P,    &FF_OPENGL_FRAGMENT_SHADER_YUV_PLANAR,  FF_GL_RED_COMPONENT, GL_UNSIGNED_BYTE },
+    { AV_PIX_FMT_YUV440P,    &FF_OPENGL_FRAGMENT_SHADER_YUV_PLANAR,  FF_GL_RED_COMPONENT, GL_UNSIGNED_BYTE },
+    { AV_PIX_FMT_YUV420P16,  &FF_OPENGL_FRAGMENT_SHADER_YUV_PLANAR,  FF_GL_RED_COMPONENT, GL_UNSIGNED_SHORT },
+    { AV_PIX_FMT_YUV422P16,  &FF_OPENGL_FRAGMENT_SHADER_YUV_PLANAR,  FF_GL_RED_COMPONENT, GL_UNSIGNED_SHORT },
+    { AV_PIX_FMT_YUV444P16,  &FF_OPENGL_FRAGMENT_SHADER_YUV_PLANAR,  FF_GL_RED_COMPONENT, GL_UNSIGNED_SHORT },
+    { AV_PIX_FMT_YUVA420P,   &FF_OPENGL_FRAGMENT_SHADER_YUVA_PLANAR, FF_GL_RED_COMPONENT, GL_UNSIGNED_BYTE },
+    { AV_PIX_FMT_YUVA444P,   &FF_OPENGL_FRAGMENT_SHADER_YUVA_PLANAR, FF_GL_RED_COMPONENT, GL_UNSIGNED_BYTE },
+    { AV_PIX_FMT_YUVA422P,   &FF_OPENGL_FRAGMENT_SHADER_YUVA_PLANAR, FF_GL_RED_COMPONENT, GL_UNSIGNED_BYTE },
+    { AV_PIX_FMT_YUVA420P16, &FF_OPENGL_FRAGMENT_SHADER_YUVA_PLANAR, FF_GL_RED_COMPONENT, GL_UNSIGNED_SHORT },
+    { AV_PIX_FMT_YUVA422P16, &FF_OPENGL_FRAGMENT_SHADER_YUVA_PLANAR, FF_GL_RED_COMPONENT, GL_UNSIGNED_SHORT },
+    { AV_PIX_FMT_YUVA444P16, &FF_OPENGL_FRAGMENT_SHADER_YUVA_PLANAR, FF_GL_RED_COMPONENT, GL_UNSIGNED_SHORT },
+    { AV_PIX_FMT_RGB24,      &FF_OPENGL_FRAGMENT_SHADER_RGB_PACKET,  GL_RGB, GL_UNSIGNED_BYTE },
+    { AV_PIX_FMT_BGR24,      &FF_OPENGL_FRAGMENT_SHADER_RGB_PACKET,  GL_RGB, GL_UNSIGNED_BYTE },
+    { AV_PIX_FMT_0RGB,       &FF_OPENGL_FRAGMENT_SHADER_RGB_PACKET,  GL_RGBA, GL_UNSIGNED_BYTE },
+    { AV_PIX_FMT_RGB0,       &FF_OPENGL_FRAGMENT_SHADER_RGB_PACKET,  GL_RGBA, GL_UNSIGNED_BYTE },
+    { AV_PIX_FMT_0BGR,       &FF_OPENGL_FRAGMENT_SHADER_RGB_PACKET,  GL_RGBA, GL_UNSIGNED_BYTE },
+    { AV_PIX_FMT_BGR0,       &FF_OPENGL_FRAGMENT_SHADER_RGB_PACKET,  GL_RGBA, GL_UNSIGNED_BYTE },
+    { AV_PIX_FMT_RGB565,     &FF_OPENGL_FRAGMENT_SHADER_RGB_PACKET,  GL_RGB, GL_UNSIGNED_SHORT_5_6_5 },
+    { AV_PIX_FMT_BGR565,     &FF_OPENGL_FRAGMENT_SHADER_RGB_PACKET,  GL_RGB, GL_UNSIGNED_SHORT_5_6_5 },
+    { AV_PIX_FMT_RGB555,     &FF_OPENGL_FRAGMENT_SHADER_RGB_PACKET,  GL_RGBA, FF_GL_UNSIGNED_SHORT_1_5_5_5_REV },
+    { AV_PIX_FMT_BGR555,     &FF_OPENGL_FRAGMENT_SHADER_RGB_PACKET,  GL_RGBA, FF_GL_UNSIGNED_SHORT_1_5_5_5_REV },
+    { AV_PIX_FMT_RGB8,       &FF_OPENGL_FRAGMENT_SHADER_RGB_PACKET,  GL_RGB, FF_GL_UNSIGNED_BYTE_3_3_2 },
+    { AV_PIX_FMT_BGR8,       &FF_OPENGL_FRAGMENT_SHADER_RGB_PACKET,  GL_RGB, FF_GL_UNSIGNED_BYTE_2_3_3_REV },
+    { AV_PIX_FMT_RGB48,      &FF_OPENGL_FRAGMENT_SHADER_RGB_PACKET,  GL_RGB, GL_UNSIGNED_SHORT },
+    { AV_PIX_FMT_ARGB,       &FF_OPENGL_FRAGMENT_SHADER_RGBA_PACKET, GL_RGBA, GL_UNSIGNED_BYTE },
+    { AV_PIX_FMT_RGBA,       &FF_OPENGL_FRAGMENT_SHADER_RGBA_PACKET, GL_RGBA, GL_UNSIGNED_BYTE },
+    { AV_PIX_FMT_ABGR,       &FF_OPENGL_FRAGMENT_SHADER_RGBA_PACKET, GL_RGBA, GL_UNSIGNED_BYTE },
+    { AV_PIX_FMT_BGRA,       &FF_OPENGL_FRAGMENT_SHADER_RGBA_PACKET, GL_RGBA, GL_UNSIGNED_BYTE },
+    { AV_PIX_FMT_RGBA64,     &FF_OPENGL_FRAGMENT_SHADER_RGBA_PACKET, GL_RGBA, GL_UNSIGNED_SHORT },
+    { AV_PIX_FMT_BGRA64,     &FF_OPENGL_FRAGMENT_SHADER_RGBA_PACKET, GL_RGBA, GL_UNSIGNED_SHORT },
+    { AV_PIX_FMT_GBRP,       &FF_OPENGL_FRAGMENT_SHADER_RGB_PLANAR,  FF_GL_RED_COMPONENT, GL_UNSIGNED_BYTE },
+    { AV_PIX_FMT_GBRP16,     &FF_OPENGL_FRAGMENT_SHADER_RGB_PLANAR,  FF_GL_RED_COMPONENT, GL_UNSIGNED_SHORT },
+    { AV_PIX_FMT_GBRAP,      &FF_OPENGL_FRAGMENT_SHADER_RGBA_PLANAR, FF_GL_RED_COMPONENT, GL_UNSIGNED_BYTE },
+    { AV_PIX_FMT_GBRAP16,    &FF_OPENGL_FRAGMENT_SHADER_RGBA_PLANAR, FF_GL_RED_COMPONENT, GL_UNSIGNED_SHORT },
+    { AV_PIX_FMT_GRAY8,      &FF_OPENGL_FRAGMENT_SHADER_GRAY,        FF_GL_RED_COMPONENT, GL_UNSIGNED_BYTE },
+    { AV_PIX_FMT_GRAY16,     &FF_OPENGL_FRAGMENT_SHADER_GRAY,        FF_GL_RED_COMPONENT, GL_UNSIGNED_SHORT },
+    { AV_PIX_FMT_NONE,       NULL }
+};
+
+static av_cold int opengl_prepare_vertex(AVFormatContext *s);
+static int opengl_draw(AVFormatContext *h, void *intput, int repaint, int is_pkt);
+static av_cold int opengl_init_context(OpenGLContext *opengl);
+
+static av_cold void opengl_deinit_context(OpenGLContext *opengl)
+{
+    glDeleteTextures(4, opengl->texture_name);
+    opengl->texture_name[0] = opengl->texture_name[1] =
+    opengl->texture_name[2] = opengl->texture_name[3] = 0;
+    if (opengl->glprocs.glUseProgram)
+        opengl->glprocs.glUseProgram(0);
+    if (opengl->glprocs.glDeleteProgram) {
+        opengl->glprocs.glDeleteProgram(opengl->program);
+        opengl->program = 0;
+    }
+    if (opengl->glprocs.glDeleteShader) {
+        opengl->glprocs.glDeleteShader(opengl->vertex_shader);
+        opengl->glprocs.glDeleteShader(opengl->fragment_shader);
+        opengl->vertex_shader = opengl->fragment_shader = 0;
+    }
+    if (opengl->glprocs.glBindBuffer) {
+        opengl->glprocs.glBindBuffer(FF_GL_ARRAY_BUFFER, 0);
+        opengl->glprocs.glBindBuffer(FF_GL_ELEMENT_ARRAY_BUFFER, 0);
+    }
+    if (opengl->glprocs.glDeleteBuffers) {
+        opengl->glprocs.glDeleteBuffers(2, &opengl->index_buffer);
+        opengl->vertex_buffer = opengl->index_buffer = 0;
+    }
+}
+
+static int opengl_resize(AVFormatContext *h, int width, int height)
+{
+    int ret = 0;
+    OpenGLContext *opengl = h->priv_data;
+    opengl->window_width = width;
+    opengl->window_height = height;
+    /* max_viewport_width == 0 means write_header was not called yet. */
+    if (opengl->max_viewport_width) {
+        if (opengl->no_window &&
+            (ret = avdevice_dev_to_app_control_message(h, AV_DEV_TO_APP_PREPARE_WINDOW_BUFFER, NULL , 0)) < 0) {
+            av_log(opengl, AV_LOG_ERROR, "Application failed to prepare window buffer.\n");
+            goto end;
+        }
+        if ((ret = opengl_prepare_vertex(h)) < 0)
+            goto end;
+        ret = opengl_draw(h, NULL, 1, 0);
+    }
+  end:
+    return ret;
+}
+
+static int opengl_control_message(AVFormatContext *h, int type, void *data, size_t data_size)
+{
+    OpenGLContext *opengl = h->priv_data;
+    switch(type) {
+    case AV_APP_TO_DEV_WINDOW_SIZE:
+        if (data) {
+            AVDeviceRect *message = data;
+            return opengl_resize(h, message->width, message->height);
+        }
+        return AVERROR(EINVAL);
+    case AV_APP_TO_DEV_WINDOW_REPAINT:
+        return opengl_resize(h, opengl->window_width, opengl->window_height);
+    }
+    return AVERROR(ENOSYS);
+}
+
+#if HAVE_SDL
+static int opengl_sdl_recreate_window(OpenGLContext *opengl, int width, int height)
+{
+    opengl->surface = SDL_SetVideoMode(width, height,
+                                       32, SDL_OPENGL | SDL_RESIZABLE);
+    if (!opengl->surface) {
+        av_log(opengl, AV_LOG_ERROR, "Unable to set video mode: %s\n", SDL_GetError());
+        return AVERROR_EXTERNAL;
+    }
+    SDL_GL_SetAttribute(SDL_GL_RED_SIZE, 8);
+    SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE, 8);
+    SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE, 8);
+    SDL_GL_SetAttribute(SDL_GL_ALPHA_SIZE, 8);
+    SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
+    return 0;
+}
+
+static int opengl_sdl_process_events(AVFormatContext *h)
+{
+    int ret;
+    OpenGLContext *opengl = h->priv_data;
+    SDL_Event event;
+    SDL_PumpEvents();
+    while (SDL_PeepEvents(&event, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0) {
+        switch (event.type) {
+        case SDL_QUIT:
+            return AVERROR(EIO);
+        case SDL_KEYDOWN:
+            switch (event.key.keysym.sym) {
+            case SDLK_ESCAPE:
+            case SDLK_q:
+                return AVERROR(EIO);
+            }
+            return 0;
+        case SDL_VIDEORESIZE: {
+            char buffer[100];
+            int reinit;
+            AVDeviceRect message;
+            /* clean up old context because SDL_SetVideoMode may lose its state. */
+            SDL_VideoDriverName(buffer, sizeof(buffer));
+            reinit = !av_strncasecmp(buffer, "quartz", sizeof(buffer));
+            if (reinit) {
+                opengl_deinit_context(opengl);
+            }
+            if ((ret = opengl_sdl_recreate_window(opengl, event.resize.w, event.resize.h)) < 0)
+                return ret;
+            if (reinit && (ret = opengl_init_context(opengl)) < 0)
+                return ret;
+            message.width = opengl->surface->w;
+            message.height = opengl->surface->h;
+            return opengl_control_message(h, AV_APP_TO_DEV_WINDOW_SIZE, &message, sizeof(AVDeviceRect));
+            }
+        }
+    }
+    return 0;
+}
+
+static int av_cold opengl_sdl_create_window(AVFormatContext *h)
+{
+    int ret;
+    char buffer[100];
+    OpenGLContext *opengl = h->priv_data;
+    AVDeviceRect message;
+    if (SDL_Init(SDL_INIT_VIDEO)) {
+        av_log(opengl, AV_LOG_ERROR, "Unable to initialize SDL: %s\n", SDL_GetError());
+        return AVERROR_EXTERNAL;
+    }
+    if ((ret = opengl_sdl_recreate_window(opengl, opengl->width, opengl->height)) < 0)
+        return ret;
+    av_log(opengl, AV_LOG_INFO, "SDL driver: '%s'.\n", SDL_VideoDriverName(buffer, sizeof(buffer)));
+    message.width = opengl->surface->w;
+    message.height = opengl->surface->h;
+    SDL_WM_SetCaption(opengl->window_title, NULL);
+    opengl_control_message(h, AV_APP_TO_DEV_WINDOW_SIZE, &message, sizeof(AVDeviceRect));
+    return 0;
+}
+
+static int av_cold opengl_sdl_load_procedures(OpenGLContext *opengl)
+{
+    FFOpenGLFunctions *procs = &opengl->glprocs;
+
+#define LOAD_OPENGL_FUN(name, type) \
+    procs->name = (type)SDL_GL_GetProcAddress(#name); \
+    if (!procs->name) { \
+        av_log(opengl, AV_LOG_ERROR, "Cannot load OpenGL function: '%s'\n", #name); \
+        return AVERROR(ENOSYS); \
+    }
+
+    LOAD_OPENGL_FUN(glActiveTexture, FF_PFNGLACTIVETEXTUREPROC)
+    LOAD_OPENGL_FUN(glGenBuffers, FF_PFNGLGENBUFFERSPROC)
+    LOAD_OPENGL_FUN(glDeleteBuffers, FF_PFNGLDELETEBUFFERSPROC)
+    LOAD_OPENGL_FUN(glBufferData, FF_PFNGLBUFFERDATAPROC)
+    LOAD_OPENGL_FUN(glBindBuffer, FF_PFNGLBINDBUFFERPROC)
+    LOAD_OPENGL_FUN(glGetAttribLocation, FF_PFNGLGETATTRIBLOCATIONPROC)
+    LOAD_OPENGL_FUN(glGetUniformLocation, FF_PFNGLGETUNIFORMLOCATIONPROC)
+    LOAD_OPENGL_FUN(glUniform1f, FF_PFNGLUNIFORM1FPROC)
+    LOAD_OPENGL_FUN(glUniform1i, FF_PFNGLUNIFORM1IPROC)
+    LOAD_OPENGL_FUN(glUniformMatrix4fv, FF_PFNGLUNIFORMMATRIX4FVPROC)
+    LOAD_OPENGL_FUN(glCreateProgram, FF_PFNGLCREATEPROGRAMPROC)
+    LOAD_OPENGL_FUN(glDeleteProgram, FF_PFNGLDELETEPROGRAMPROC)
+    LOAD_OPENGL_FUN(glUseProgram, FF_PFNGLUSEPROGRAMPROC)
+    LOAD_OPENGL_FUN(glLinkProgram, FF_PFNGLLINKPROGRAMPROC)
+    LOAD_OPENGL_FUN(glGetProgramiv, FF_PFNGLGETPROGRAMIVPROC)
+    LOAD_OPENGL_FUN(glGetProgramInfoLog, FF_PFNGLGETPROGRAMINFOLOGPROC)
+    LOAD_OPENGL_FUN(glAttachShader, FF_PFNGLATTACHSHADERPROC)
+    LOAD_OPENGL_FUN(glCreateShader, FF_PFNGLCREATESHADERPROC)
+    LOAD_OPENGL_FUN(glDeleteShader, FF_PFNGLDELETESHADERPROC)
+    LOAD_OPENGL_FUN(glCompileShader, FF_PFNGLCOMPILESHADERPROC)
+    LOAD_OPENGL_FUN(glShaderSource, FF_PFNGLSHADERSOURCEPROC)
+    LOAD_OPENGL_FUN(glGetShaderiv, FF_PFNGLGETSHADERIVPROC)
+    LOAD_OPENGL_FUN(glGetShaderInfoLog, FF_PFNGLGETSHADERINFOLOGPROC)
+    LOAD_OPENGL_FUN(glEnableVertexAttribArray, FF_PFNGLENABLEVERTEXATTRIBARRAYPROC)
+    LOAD_OPENGL_FUN(glVertexAttribPointer, FF_PFNGLVERTEXATTRIBPOINTERPROC)
+
+    return 0;
+
+#undef LOAD_OPENGL_FUN
+}
+#endif /* HAVE_SDL */
+
+#if defined(__APPLE__)
+static int av_cold opengl_load_procedures(OpenGLContext *opengl)
+{
+    FFOpenGLFunctions *procs = &opengl->glprocs;
+
+#if HAVE_SDL
+    if (!opengl->no_window)
+        return opengl_sdl_load_procedures(opengl);
+#endif
+
+    procs->glActiveTexture = glActiveTexture;
+    procs->glGenBuffers = glGenBuffers;
+    procs->glDeleteBuffers = glDeleteBuffers;
+    procs->glBufferData = glBufferData;
+    procs->glBindBuffer = glBindBuffer;
+    procs->glGetAttribLocation = glGetAttribLocation;
+    procs->glGetUniformLocation = glGetUniformLocation;
+    procs->glUniform1f = glUniform1f;
+    procs->glUniform1i = glUniform1i;
+    procs->glUniformMatrix4fv = glUniformMatrix4fv;
+    procs->glCreateProgram = glCreateProgram;
+    procs->glDeleteProgram = glDeleteProgram;
+    procs->glUseProgram = glUseProgram;
+    procs->glLinkProgram = glLinkProgram;
+    procs->glGetProgramiv = glGetProgramiv;
+    procs->glGetProgramInfoLog = glGetProgramInfoLog;
+    procs->glAttachShader = glAttachShader;
+    procs->glCreateShader = glCreateShader;
+    procs->glDeleteShader = glDeleteShader;
+    procs->glCompileShader = glCompileShader;
+    procs->glShaderSource = glShaderSource;
+    procs->glGetShaderiv = glGetShaderiv;
+    procs->glGetShaderInfoLog = glGetShaderInfoLog;
+    procs->glEnableVertexAttribArray = glEnableVertexAttribArray;
+    procs->glVertexAttribPointer = (FF_PFNGLVERTEXATTRIBPOINTERPROC) glVertexAttribPointer;
+    return 0;
+}
+#else
+static int av_cold opengl_load_procedures(OpenGLContext *opengl)
+{
+    FFOpenGLFunctions *procs = &opengl->glprocs;
+
+#if HAVE_GLXGETPROCADDRESS
+#define SelectedGetProcAddress glXGetProcAddress
+#elif HAVE_WGLGETPROCADDRESS
+#define SelectedGetProcAddress wglGetProcAddress
+#endif
+
+#define LOAD_OPENGL_FUN(name, type) \
+    procs->name = (type)SelectedGetProcAddress(#name); \
+    if (!procs->name) { \
+        av_log(opengl, AV_LOG_ERROR, "Cannot load OpenGL function: '%s'\n", #name); \
+        return AVERROR(ENOSYS); \
+    }
+
+#if HAVE_SDL
+    if (!opengl->no_window)
+        return opengl_sdl_load_procedures(opengl);
+#endif
+
+    LOAD_OPENGL_FUN(glActiveTexture, FF_PFNGLACTIVETEXTUREPROC)
+    LOAD_OPENGL_FUN(glGenBuffers, FF_PFNGLGENBUFFERSPROC)
+    LOAD_OPENGL_FUN(glDeleteBuffers, FF_PFNGLDELETEBUFFERSPROC)
+    LOAD_OPENGL_FUN(glBufferData, FF_PFNGLBUFFERDATAPROC)
+    LOAD_OPENGL_FUN(glBindBuffer, FF_PFNGLBINDBUFFERPROC)
+    LOAD_OPENGL_FUN(glGetAttribLocation, FF_PFNGLGETATTRIBLOCATIONPROC)
+    LOAD_OPENGL_FUN(glGetUniformLocation, FF_PFNGLGETUNIFORMLOCATIONPROC)
+    LOAD_OPENGL_FUN(glUniform1f, FF_PFNGLUNIFORM1FPROC)
+    LOAD_OPENGL_FUN(glUniform1i, FF_PFNGLUNIFORM1IPROC)
+    LOAD_OPENGL_FUN(glUniformMatrix4fv, FF_PFNGLUNIFORMMATRIX4FVPROC)
+    LOAD_OPENGL_FUN(glCreateProgram, FF_PFNGLCREATEPROGRAMPROC)
+    LOAD_OPENGL_FUN(glDeleteProgram, FF_PFNGLDELETEPROGRAMPROC)
+    LOAD_OPENGL_FUN(glUseProgram, FF_PFNGLUSEPROGRAMPROC)
+    LOAD_OPENGL_FUN(glLinkProgram, FF_PFNGLLINKPROGRAMPROC)
+    LOAD_OPENGL_FUN(glGetProgramiv, FF_PFNGLGETPROGRAMIVPROC)
+    LOAD_OPENGL_FUN(glGetProgramInfoLog, FF_PFNGLGETPROGRAMINFOLOGPROC)
+    LOAD_OPENGL_FUN(glAttachShader, FF_PFNGLATTACHSHADERPROC)
+    LOAD_OPENGL_FUN(glCreateShader, FF_PFNGLCREATESHADERPROC)
+    LOAD_OPENGL_FUN(glDeleteShader, FF_PFNGLDELETESHADERPROC)
+    LOAD_OPENGL_FUN(glCompileShader, FF_PFNGLCOMPILESHADERPROC)
+    LOAD_OPENGL_FUN(glShaderSource, FF_PFNGLSHADERSOURCEPROC)
+    LOAD_OPENGL_FUN(glGetShaderiv, FF_PFNGLGETSHADERIVPROC)
+    LOAD_OPENGL_FUN(glGetShaderInfoLog, FF_PFNGLGETSHADERINFOLOGPROC)
+    LOAD_OPENGL_FUN(glEnableVertexAttribArray, FF_PFNGLENABLEVERTEXATTRIBARRAYPROC)
+    LOAD_OPENGL_FUN(glVertexAttribPointer, FF_PFNGLVERTEXATTRIBPOINTERPROC)
+
+    return 0;
+
+#undef SelectedGetProcAddress
+#undef LOAD_OPENGL_FUN
+}
+#endif
+
+static void opengl_make_identity(float matrix[16])
+{
+    memset(matrix, 0, 16 * sizeof(float));
+    matrix[0] = matrix[5] = matrix[10] = matrix[15] = 1.0f;
+}
+
+static void opengl_make_ortho(float matrix[16], float left, float right,
+                              float bottom, float top, float nearZ, float farZ)
+{
+    float ral = right + left;
+    float rsl = right - left;
+    float tab = top + bottom;
+    float tsb = top - bottom;
+    float fan = farZ + nearZ;
+    float fsn = farZ - nearZ;
+
+    memset(matrix, 0, 16 * sizeof(float));
+    matrix[0] = 2.0f / rsl;
+    matrix[5] = 2.0f / tsb;
+    matrix[10] = -2.0f / fsn;
+    matrix[12] = -ral / rsl;
+    matrix[13] = -tab / tsb;
+    matrix[14] = -fan / fsn;
+    matrix[15] = 1.0f;
+}
+
+static av_cold int opengl_read_limits(OpenGLContext *opengl)
+{
+    static const struct{
+        const char *extention;
+        int major;
+        int minor;
+    } required_extensions[] = {
+        { "GL_ARB_multitexture",         1, 3 },
+        { "GL_ARB_vertex_buffer_object", 1, 5 }, //GLX_ARB_vertex_buffer_object
+        { "GL_ARB_vertex_shader",        2, 0 },
+        { "GL_ARB_fragment_shader",      2, 0 },
+        { "GL_ARB_shader_objects",       2, 0 },
+        { NULL,                          0, 0 }
+    };
+    int i, major, minor;
+    const char *extensions, *version;
+
+    version = glGetString(GL_VERSION);
+    extensions = glGetString(GL_EXTENSIONS);
+
+    av_log(opengl, AV_LOG_DEBUG, "OpenGL version: %s\n", version);
+    sscanf(version, "%d.%d", &major, &minor);
+
+    for (i = 0; required_extensions[i].extention; i++) {
+        if (major < required_extensions[i].major &&
+            (major == required_extensions[i].major && minor < required_extensions[i].minor) &&
+            !strstr(extensions, required_extensions[i].extention)) {
+            av_log(opengl, AV_LOG_ERROR, "Required extension %s is not supported.\n",
+                   required_extensions[i].extention);
+            av_log(opengl, AV_LOG_DEBUG, "Supported extensions are: %s\n", extensions);
+            return AVERROR(ENOSYS);
+        }
+    }
+    glGetIntegerv(GL_MAX_TEXTURE_SIZE, &opengl->max_texture_size);
+    glGetIntegerv(GL_MAX_VIEWPORT_DIMS, &opengl->max_viewport_width);
+    opengl->non_pow_2_textures = major >= 2 || strstr(extensions, "GL_ARB_texture_non_power_of_two");
+#if defined(GL_ES_VERSION_2_0)
+    opengl->unpack_subimage = !!strstr(extensions, "GL_EXT_unpack_subimage");
+#else
+    opengl->unpack_subimage = 1;
+#endif
+
+    av_log(opengl, AV_LOG_DEBUG, "Non Power of 2 textures support: %s\n", opengl->non_pow_2_textures ? "Yes" : "No");
+    av_log(opengl, AV_LOG_DEBUG, "Unpack Subimage extension support: %s\n", opengl->unpack_subimage ? "Yes" : "No");
+    av_log(opengl, AV_LOG_DEBUG, "Max texture size: %dx%d\n", opengl->max_texture_size, opengl->max_texture_size);
+    av_log(opengl, AV_LOG_DEBUG, "Max viewport size: %dx%d\n",
+           opengl->max_viewport_width, opengl->max_viewport_height);
+
+    OPENGL_ERROR_CHECK(opengl);
+    return 0;
+  fail:
+    return AVERROR_EXTERNAL;
+}
+
+static const char* opengl_get_fragment_shader_code(enum AVPixelFormat format)
+{
+    int i;
+    for (i = 0; i < FF_ARRAY_ELEMS(opengl_format_desc); i++) {
+        if (opengl_format_desc[i].fixel_format == format)
+            return *opengl_format_desc[i].fragment_shader;
+    }
+    return NULL;
+}
+
+static int opengl_type_size(GLenum type)
+{
+    switch(type) {
+    case GL_UNSIGNED_SHORT:
+    case FF_GL_UNSIGNED_SHORT_1_5_5_5_REV:
+    case GL_UNSIGNED_SHORT_5_6_5:
+        return 2;
+    case GL_UNSIGNED_BYTE:
+    case FF_GL_UNSIGNED_BYTE_3_3_2:
+    case FF_GL_UNSIGNED_BYTE_2_3_3_REV:
+    default:
+        break;
+    }
+    return 1;
+}
+
+static av_cold void opengl_get_texture_params(OpenGLContext *opengl)
+{
+    int i;
+    for (i = 0; i < FF_ARRAY_ELEMS(opengl_format_desc); i++) {
+        if (opengl_format_desc[i].fixel_format == opengl->pix_fmt) {
+            opengl->format = opengl_format_desc[i].format;
+            opengl->type = opengl_format_desc[i].type;
+            break;
+        }
+    }
+}
+
+static void opengl_compute_display_area(AVFormatContext *s)
+{
+    AVRational sar, dar; /* sample and display aspect ratios */
+    OpenGLContext *opengl = s->priv_data;
+    AVStream *st = s->streams[0];
+    AVCodecContext *encctx = st->codec;
+
+    /* compute overlay width and height from the codec context information */
+    sar = st->sample_aspect_ratio.num ? st->sample_aspect_ratio : (AVRational){ 1, 1 };
+    dar = av_mul_q(sar, (AVRational){ encctx->width, encctx->height });
+
+    /* we suppose the screen has a 1/1 sample aspect ratio */
+    /* fit in the window */
+    if (av_cmp_q(dar, (AVRational){ opengl->window_width, opengl->window_height }) > 0) {
+        /* fit in width */
+        opengl->picture_width = opengl->window_width;
+        opengl->picture_height = av_rescale(opengl->picture_width, dar.den, dar.num);
+    } else {
+        /* fit in height */
+        opengl->picture_height = opengl->window_height;
+        opengl->picture_width = av_rescale(opengl->picture_height, dar.num, dar.den);
+    }
+}
+
+static av_cold void opengl_get_texture_size(OpenGLContext *opengl, int in_width, int in_height,
+                                            int *out_width, int *out_height)
+{
+    if (opengl->non_pow_2_textures) {
+        *out_width = in_width;
+        *out_height = in_height;
+    } else {
+        int max = FFMIN(FFMAX(in_width, in_height), opengl->max_texture_size);
+        unsigned power_of_2 = 1;
+        while (power_of_2 < max)
+            power_of_2 *= 2;
+        *out_height = power_of_2;
+        *out_width = power_of_2;
+        av_log(opengl, AV_LOG_DEBUG, "Texture size calculated from %dx%d into %dx%d\n",
+               in_width, in_height, *out_width, *out_height);
+    }
+}
+
+static av_cold void opengl_fill_color_map(OpenGLContext *opengl)
+{
+    const AVPixFmtDescriptor *desc;
+    int shift;
+    enum AVPixelFormat pix_fmt = opengl->pix_fmt;
+
+    /* We need order of components, not exact position, some minor HACKs here */
+    if (pix_fmt == AV_PIX_FMT_RGB565 || pix_fmt == AV_PIX_FMT_BGR555 ||
+        pix_fmt == AV_PIX_FMT_BGR8   || pix_fmt == AV_PIX_FMT_RGB8)
+        pix_fmt = AV_PIX_FMT_RGB24;
+    else if (pix_fmt == AV_PIX_FMT_BGR565 || pix_fmt == AV_PIX_FMT_RGB555)
+        pix_fmt = AV_PIX_FMT_BGR24;
+
+    desc = av_pix_fmt_desc_get(pix_fmt);
+    if (!(desc->flags & AV_PIX_FMT_FLAG_RGB))
+        return;
+
+#define FILL_COMPONENT(i) { \
+        shift = desc->comp[i].depth_minus1 >> 3; \
+        opengl->color_map[(i << 2) + ((desc->comp[i].offset_plus1 - 1) >> shift)] = 1.0; \
+    }
+
+    memset(opengl->color_map, 0, sizeof(opengl->color_map));
+    FILL_COMPONENT(0);
+    FILL_COMPONENT(1);
+    FILL_COMPONENT(2);
+    if (desc->flags & AV_PIX_FMT_FLAG_ALPHA)
+        FILL_COMPONENT(3);
+
+#undef FILL_COMPONENT
+}
+
+static av_cold GLuint opengl_load_shader(OpenGLContext *opengl, GLenum type, const char *source)
+{
+    GLuint shader = opengl->glprocs.glCreateShader(type);
+    GLint result;
+    if (!shader) {
+        av_log(opengl, AV_LOG_ERROR, "glCreateShader() failed\n");
+        return 0;
+    }
+    opengl->glprocs.glShaderSource(shader, 1, &source, NULL);
+    opengl->glprocs.glCompileShader(shader);
+
+    opengl->glprocs.glGetShaderiv(shader, FF_GL_COMPILE_STATUS, &result);
+    if (!result) {
+        char *log;
+        opengl->glprocs.glGetShaderiv(shader, FF_GL_INFO_LOG_LENGTH, &result);
+        if (result) {
+            if ((log = av_malloc(result))) {
+                opengl->glprocs.glGetShaderInfoLog(shader, result, NULL, log);
+                av_log(opengl, AV_LOG_ERROR, "Compile error: %s\n", log);
+                av_free(log);
+            }
+        }
+        goto fail;
+    }
+    OPENGL_ERROR_CHECK(opengl);
+    return shader;
+  fail:
+    opengl->glprocs.glDeleteShader(shader);
+    return 0;
+}
+
+static av_cold int opengl_compile_shaders(OpenGLContext *opengl, enum AVPixelFormat pix_fmt)
+{
+    GLint result;
+    const char *fragment_shader_code = opengl_get_fragment_shader_code(pix_fmt);
+
+    if (!fragment_shader_code) {
+        av_log(opengl, AV_LOG_ERROR, "Provided pixel format '%s' is not supported\n",
+               av_get_pix_fmt_name(pix_fmt));
+        return AVERROR(EINVAL);
+    }
+
+    opengl->vertex_shader = opengl_load_shader(opengl, FF_GL_VERTEX_SHADER,
+                                               FF_OPENGL_VERTEX_SHADER);
+    if (!opengl->vertex_shader) {
+        av_log(opengl, AV_LOG_ERROR, "Vertex shader loading failed.\n");
+        goto fail;
+    }
+    opengl->fragment_shader = opengl_load_shader(opengl, FF_GL_FRAGMENT_SHADER,
+                                                 fragment_shader_code);
+    if (!opengl->fragment_shader) {
+        av_log(opengl, AV_LOG_ERROR, "Fragment shader loading failed.\n");
+        goto fail;
+    }
+
+    opengl->program = opengl->glprocs.glCreateProgram();
+    if (!opengl->program)
+        goto fail;
+
+    opengl->glprocs.glAttachShader(opengl->program, opengl->vertex_shader);
+    opengl->glprocs.glAttachShader(opengl->program, opengl->fragment_shader);
+    opengl->glprocs.glLinkProgram(opengl->program);
+
+    opengl->glprocs.glGetProgramiv(opengl->program, FF_GL_LINK_STATUS, &result);
+    if (!result) {
+        char *log;
+        opengl->glprocs.glGetProgramiv(opengl->program, FF_GL_INFO_LOG_LENGTH, &result);
+        if (result) {
+            log = av_malloc(result);
+            if (!log)
+                goto fail;
+            opengl->glprocs.glGetProgramInfoLog(opengl->program, result, NULL, log);
+            av_log(opengl, AV_LOG_ERROR, "Link error: %s\n", log);
+            av_free(log);
+        }
+        goto fail;
+    }
+
+    opengl->position_attrib = opengl->glprocs.glGetAttribLocation(opengl->program, "a_position");
+    opengl->texture_coords_attrib = opengl->glprocs.glGetAttribLocation(opengl->program, "a_textureCoords");
+    opengl->projection_matrix_location = opengl->glprocs.glGetUniformLocation(opengl->program, "u_projectionMatrix");
+    opengl->model_view_matrix_location = opengl->glprocs.glGetUniformLocation(opengl->program, "u_modelViewMatrix");
+    opengl->color_map_location = opengl->glprocs.glGetUniformLocation(opengl->program, "u_colorMap");
+    opengl->texture_location[0] = opengl->glprocs.glGetUniformLocation(opengl->program, "u_texture0");
+    opengl->texture_location[1] = opengl->glprocs.glGetUniformLocation(opengl->program, "u_texture1");
+    opengl->texture_location[2] = opengl->glprocs.glGetUniformLocation(opengl->program, "u_texture2");
+    opengl->texture_location[3] = opengl->glprocs.glGetUniformLocation(opengl->program, "u_texture3");
+    opengl->chroma_div_w_location = opengl->glprocs.glGetUniformLocation(opengl->program, "u_chroma_div_w");
+    opengl->chroma_div_h_location = opengl->glprocs.glGetUniformLocation(opengl->program, "u_chroma_div_h");
+
+    OPENGL_ERROR_CHECK(opengl);
+    return 0;
+  fail:
+    opengl->glprocs.glDeleteShader(opengl->vertex_shader);
+    opengl->glprocs.glDeleteShader(opengl->fragment_shader);
+    opengl->glprocs.glDeleteProgram(opengl->program);
+    opengl->fragment_shader = opengl->vertex_shader = opengl->program = 0;
+    return AVERROR_EXTERNAL;
+}
+
+static av_cold int opengl_configure_texture(OpenGLContext *opengl, GLuint texture,
+                                            GLsizei width, GLsizei height)
+{
+    if (texture) {
+        int new_width, new_height;
+        opengl_get_texture_size(opengl, width, height, &new_width, &new_height);
+        glBindTexture(GL_TEXTURE_2D, texture);
+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+        glTexImage2D(GL_TEXTURE_2D, 0, opengl->format, new_width, new_height, 0,
+                     opengl->format, opengl->type, NULL);
+        OPENGL_ERROR_CHECK(NULL);
+    }
+    return 0;
+  fail:
+    return AVERROR_EXTERNAL;
+}
+
+static av_cold int opengl_prepare_vertex(AVFormatContext *s)
+{
+    OpenGLContext *opengl = s->priv_data;
+    int tex_w, tex_h;
+
+    if (opengl->window_width > opengl->max_viewport_width || opengl->window_height > opengl->max_viewport_height) {
+        opengl->window_width = FFMAX(opengl->window_width, opengl->max_viewport_width);
+        opengl->window_height = FFMAX(opengl->window_height, opengl->max_viewport_height);
+        av_log(opengl, AV_LOG_WARNING, "Too big viewport requested, limited to %dx%d", opengl->window_width, opengl->window_height);
+    }
+    glViewport(0, 0, opengl->window_width, opengl->window_height);
+    opengl_make_ortho(opengl->projection_matrix,
+                      - (float)opengl->window_width  / 2.0f, (float)opengl->window_width  / 2.0f,
+                      - (float)opengl->window_height / 2.0f, (float)opengl->window_height / 2.0f,
+                      1.0f, -1.0f);
+    opengl_make_identity(opengl->model_view_matrix);
+
+    opengl_compute_display_area(s);
+
+    opengl->vertex[0].z = opengl->vertex[1].z = opengl->vertex[2].z = opengl->vertex[3].z = 0.0f;
+    opengl->vertex[0].x = opengl->vertex[1].x = - (float)opengl->picture_width / 2.0f;
+    opengl->vertex[2].x = opengl->vertex[3].x =   (float)opengl->picture_width / 2.0f;
+    opengl->vertex[1].y = opengl->vertex[2].y = - (float)opengl->picture_height / 2.0f;
+    opengl->vertex[0].y = opengl->vertex[3].y =   (float)opengl->picture_height / 2.0f;
+
+    opengl_get_texture_size(opengl, opengl->width, opengl->height, &tex_w, &tex_h);
+
+    opengl->vertex[0].s0 = 0.0f;
+    opengl->vertex[0].t0 = 0.0f;
+    opengl->vertex[1].s0 = 0.0f;
+    opengl->vertex[1].t0 = (float)opengl->height / (float)tex_h;
+    opengl->vertex[2].s0 = (float)opengl->width  / (float)tex_w;
+    opengl->vertex[2].t0 = (float)opengl->height / (float)tex_h;
+    opengl->vertex[3].s0 = (float)opengl->width  / (float)tex_w;
+    opengl->vertex[3].t0 = 0.0f;
+
+    opengl->glprocs.glBindBuffer(FF_GL_ARRAY_BUFFER, opengl->vertex_buffer);
+    opengl->glprocs.glBufferData(FF_GL_ARRAY_BUFFER, sizeof(opengl->vertex), opengl->vertex, FF_GL_STATIC_DRAW);
+    opengl->glprocs.glBindBuffer(FF_GL_ARRAY_BUFFER, 0);
+    OPENGL_ERROR_CHECK(opengl);
+    return 0;
+  fail:
+    return AVERROR_EXTERNAL;
+}
+
+static int opengl_prepare(OpenGLContext *opengl)
+{
+    int i;
+    opengl->glprocs.glUseProgram(opengl->program);
+    opengl->glprocs.glUniformMatrix4fv(opengl->projection_matrix_location, 1, GL_FALSE, opengl->projection_matrix);
+    opengl->glprocs.glUniformMatrix4fv(opengl->model_view_matrix_location, 1, GL_FALSE, opengl->model_view_matrix);
+    for (i = 0; i < 4; i++)
+        if (opengl->texture_location[i] != -1) {
+            opengl->glprocs.glActiveTexture(GL_TEXTURE0 + i);
+            glBindTexture(GL_TEXTURE_2D, opengl->texture_name[i]);
+            opengl->glprocs.glUniform1i(opengl->texture_location[i], i);
+        }
+    if (opengl->color_map_location != -1)
+        opengl->glprocs.glUniformMatrix4fv(opengl->color_map_location, 1, GL_FALSE, opengl->color_map);
+    if (opengl->chroma_div_h_location != -1)
+        opengl->glprocs.glUniform1f(opengl->chroma_div_h_location, opengl->chroma_div_h);
+    if (opengl->chroma_div_w_location != -1)
+        opengl->glprocs.glUniform1f(opengl->chroma_div_w_location, opengl->chroma_div_w);
+
+    OPENGL_ERROR_CHECK(opengl);
+    return 0;
+  fail:
+    return AVERROR_EXTERNAL;
+}
+
+static int opengl_create_window(AVFormatContext *h)
+{
+    OpenGLContext *opengl = h->priv_data;
+    int ret;
+
+    if (!opengl->no_window) {
+#if HAVE_SDL
+        if ((ret = opengl_sdl_create_window(h)) < 0) {
+            av_log(opengl, AV_LOG_ERROR, "Cannot create default SDL window.\n");
+            return ret;
+        }
+#else
+        av_log(opengl, AV_LOG_ERROR, "FFmpeg is compiled without SDL. Cannot create default window.\n");
+        return AVERROR(ENOSYS);
+#endif
+    } else {
+        if ((ret = avdevice_dev_to_app_control_message(h, AV_DEV_TO_APP_CREATE_WINDOW_BUFFER, NULL , 0)) < 0) {
+            av_log(opengl, AV_LOG_ERROR, "Application failed to create window buffer.\n");
+            return ret;
+        }
+        if ((ret = avdevice_dev_to_app_control_message(h, AV_DEV_TO_APP_PREPARE_WINDOW_BUFFER, NULL , 0)) < 0) {
+            av_log(opengl, AV_LOG_ERROR, "Application failed to prepare window buffer.\n");
+            return ret;
+        }
+    }
+    return 0;
+}
+
+static int opengl_release_window(AVFormatContext *h)
+{
+    int ret;
+    OpenGLContext *opengl = h->priv_data;
+    if (!opengl->no_window) {
+#if HAVE_SDL
+        SDL_Quit();
+#endif
+    } else if ((ret = avdevice_dev_to_app_control_message(h, AV_DEV_TO_APP_DESTROY_WINDOW_BUFFER, NULL , 0)) < 0) {
+        av_log(opengl, AV_LOG_ERROR, "Application failed to release window buffer.\n");
+        return ret;
+    }
+    return 0;
+}
+
+static av_cold int opengl_write_trailer(AVFormatContext *h)
+{
+    OpenGLContext *opengl = h->priv_data;
+
+    if (opengl->no_window &&
+        avdevice_dev_to_app_control_message(h, AV_DEV_TO_APP_PREPARE_WINDOW_BUFFER, NULL , 0) < 0)
+        av_log(opengl, AV_LOG_ERROR, "Application failed to prepare window buffer.\n");
+
+    opengl_deinit_context(opengl);
+    opengl_release_window(h);
+
+    return 0;
+}
+
+static av_cold int opengl_init_context(OpenGLContext *opengl)
+{
+    int i, ret;
+    const AVPixFmtDescriptor *desc;
+
+    if ((ret = opengl_compile_shaders(opengl, opengl->pix_fmt)) < 0)
+        goto fail;
+
+    desc = av_pix_fmt_desc_get(opengl->pix_fmt);
+    av_assert0(desc->nb_components > 0 && desc->nb_components <= 4);
+    glGenTextures(desc->nb_components, opengl->texture_name);
+
+    opengl->glprocs.glGenBuffers(2, &opengl->index_buffer);
+    if (!opengl->index_buffer || !opengl->vertex_buffer) {
+        av_log(opengl, AV_LOG_ERROR, "Buffer generation failed.\n");
+        ret = AVERROR_EXTERNAL;
+        goto fail;
+    }
+
+    opengl_configure_texture(opengl, opengl->texture_name[0], opengl->width, opengl->height);
+    if (desc->nb_components > 1) {
+        int has_alpha = desc->flags & AV_PIX_FMT_FLAG_ALPHA;
+        int num_planes = desc->nb_components - (has_alpha ? 1 : 0);
+        if (opengl->non_pow_2_textures) {
+            opengl->chroma_div_w = 1.0f;
+            opengl->chroma_div_h = 1.0f;
+        } else {
+            opengl->chroma_div_w = 1 << desc->log2_chroma_w;
+            opengl->chroma_div_h = 1 << desc->log2_chroma_h;
+        }
+        for (i = 1; i < num_planes; i++)
+            if (opengl->non_pow_2_textures)
+                opengl_configure_texture(opengl, opengl->texture_name[i],
+                        FF_CEIL_RSHIFT(opengl->width, desc->log2_chroma_w),
+                        FF_CEIL_RSHIFT(opengl->height, desc->log2_chroma_h));
+            else
+                opengl_configure_texture(opengl, opengl->texture_name[i], opengl->width, opengl->height);
+        if (has_alpha)
+            opengl_configure_texture(opengl, opengl->texture_name[3], opengl->width, opengl->height);
+    }
+
+    opengl->glprocs.glBindBuffer(FF_GL_ELEMENT_ARRAY_BUFFER, opengl->index_buffer);
+    opengl->glprocs.glBufferData(FF_GL_ELEMENT_ARRAY_BUFFER, sizeof(g_index), g_index, FF_GL_STATIC_DRAW);
+    opengl->glprocs.glBindBuffer(FF_GL_ELEMENT_ARRAY_BUFFER, 0);
+
+    glEnable(GL_BLEND);
+    glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+
+    glClearColor((float)opengl->background[0] / 255.0f, (float)opengl->background[1] / 255.0f,
+                 (float)opengl->background[2] / 255.0f, 1.0f);
+
+    ret = AVERROR_EXTERNAL;
+    OPENGL_ERROR_CHECK(opengl);
+
+    return 0;
+  fail:
+    return ret;
+}
+
+static av_cold int opengl_write_header(AVFormatContext *h)
+{
+    OpenGLContext *opengl = h->priv_data;
+    AVStream *st;
+    int ret;
+
+    if (h->nb_streams != 1 ||
+        h->streams[0]->codec->codec_type != AVMEDIA_TYPE_VIDEO ||
+        h->streams[0]->codec->codec_id != AV_CODEC_ID_RAWVIDEO) {
+        av_log(opengl, AV_LOG_ERROR, "Only a single video stream is supported.\n");
+        return AVERROR(EINVAL);
+    }
+    st = h->streams[0];
+    opengl->width = st->codec->width;
+    opengl->height = st->codec->height;
+    opengl->pix_fmt = st->codec->pix_fmt;
+
+    if (!opengl->window_title && !opengl->no_window)
+        opengl->window_title = av_strdup(h->filename);
+
+    if ((ret = opengl_create_window(h)))
+        goto fail;
+
+    if ((ret = opengl_read_limits(opengl)) < 0)
+        goto fail;
+
+    if (opengl->width > opengl->max_texture_size || opengl->height > opengl->max_texture_size) {
+        av_log(opengl, AV_LOG_ERROR, "Too big picture %dx%d, max supported size is %dx%d\n",
+               opengl->width, opengl->height, opengl->max_texture_size, opengl->max_texture_size);
+        ret = AVERROR(EINVAL);
+        goto fail;
+    }
+
+    if ((ret = opengl_load_procedures(opengl)) < 0)
+        goto fail;
+
+    opengl_fill_color_map(opengl);
+    opengl_get_texture_params(opengl);
+
+    if ((ret = opengl_init_context(opengl)) < 0)
+        goto fail;
+
+    if ((ret = opengl_prepare_vertex(h)) < 0)
+        goto fail;
+
+    glClear(GL_COLOR_BUFFER_BIT);
+
+#if HAVE_SDL
+    if (!opengl->no_window)
+        SDL_GL_SwapBuffers();
+#endif
+    if (opengl->no_window &&
+        (ret = avdevice_dev_to_app_control_message(h, AV_DEV_TO_APP_DISPLAY_WINDOW_BUFFER, NULL , 0)) < 0) {
+        av_log(opengl, AV_LOG_ERROR, "Application failed to display window buffer.\n");
+        goto fail;
+    }
+
+    ret = AVERROR_EXTERNAL;
+    OPENGL_ERROR_CHECK(opengl);
+    return 0;
+
+  fail:
+    opengl_write_trailer(h);
+    return ret;
+}
+
+static uint8_t* opengl_get_plane_pointer(OpenGLContext *opengl, AVPacket *pkt, int comp_index,
+                                         const AVPixFmtDescriptor *desc)
+{
+    uint8_t *data = pkt->data;
+    int wordsize = opengl_type_size(opengl->type);
+    int width_chroma = FF_CEIL_RSHIFT(opengl->width, desc->log2_chroma_w);
+    int height_chroma = FF_CEIL_RSHIFT(opengl->height, desc->log2_chroma_h);
+    int plane = desc->comp[comp_index].plane;
+
+    switch(plane) {
+    case 0:
+        break;
+    case 1:
+        data += opengl->width * opengl->height * wordsize;
+        break;
+    case 2:
+        data += opengl->width * opengl->height * wordsize;
+        data += width_chroma * height_chroma * wordsize;
+        break;
+    case 3:
+        data += opengl->width * opengl->height * wordsize;
+        data += 2 * width_chroma * height_chroma * wordsize;
+        break;
+    default:
+        return NULL;
+    }
+    return data;
+}
+
+#define LOAD_TEXTURE_DATA(comp_index, sub)                                                  \
+{                                                                                           \
+    int width = sub ? FF_CEIL_RSHIFT(opengl->width, desc->log2_chroma_w) : opengl->width;   \
+    int height = sub ? FF_CEIL_RSHIFT(opengl->height, desc->log2_chroma_h): opengl->height; \
+    uint8_t *data;                                                                          \
+    int plane = desc->comp[comp_index].plane;                                               \
+                                                                                            \
+    glBindTexture(GL_TEXTURE_2D, opengl->texture_name[comp_index]);                         \
+    if (!is_pkt) {                                                                          \
+        GLint length = ((AVFrame *)input)->linesize[plane];                                 \
+        int bytes_per_pixel = opengl_type_size(opengl->type);                               \
+        if (!(desc->flags & AV_PIX_FMT_FLAG_PLANAR))                                        \
+            bytes_per_pixel *= desc->nb_components;                                         \
+        data = ((AVFrame *)input)->data[plane];                                             \
+        if (!(length % bytes_per_pixel) &&                                                  \
+            (opengl->unpack_subimage || ((length / bytes_per_pixel) == width))) {           \
+            length /= bytes_per_pixel;                                                      \
+            if (length != width)                                                            \
+                glPixelStorei(FF_GL_UNPACK_ROW_LENGTH, length);                             \
+            glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, width, height,                          \
+                            opengl->format, opengl->type, data);                            \
+            if (length != width)                                                            \
+                glPixelStorei(FF_GL_UNPACK_ROW_LENGTH, 0);                                  \
+        } else {                                                                            \
+            int h;                                                                          \
+            for (h = 0; h < height; h++) {                                                  \
+                glTexSubImage2D(GL_TEXTURE_2D, 0, 0, h, width, 1,                           \
+                                opengl->format, opengl->type, data);                        \
+                data += length;                                                             \
+            }                                                                               \
+        }                                                                                   \
+    } else {                                                                                \
+        data = opengl_get_plane_pointer(opengl, input, comp_index, desc);                   \
+        glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, width, height,                              \
+                        opengl->format, opengl->type, data);                                \
+    }                                                                                       \
+}
+
+static int opengl_draw(AVFormatContext *h, void *input, int repaint, int is_pkt)
+{
+    OpenGLContext *opengl = h->priv_data;
+    enum AVPixelFormat pix_fmt = h->streams[0]->codec->pix_fmt;
+    const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt);
+    int ret;
+
+#if HAVE_SDL
+    if (!opengl->no_window && (ret = opengl_sdl_process_events(h)) < 0)
+        goto fail;
+#endif
+    if (opengl->no_window &&
+        (ret = avdevice_dev_to_app_control_message(h, AV_DEV_TO_APP_PREPARE_WINDOW_BUFFER, NULL , 0)) < 0) {
+        av_log(opengl, AV_LOG_ERROR, "Application failed to prepare window buffer.\n");
+        goto fail;
+    }
+
+    glClear(GL_COLOR_BUFFER_BIT);
+
+    if (!repaint) {
+        LOAD_TEXTURE_DATA(0, 0)
+        if (desc->flags & AV_PIX_FMT_FLAG_PLANAR) {
+            LOAD_TEXTURE_DATA(1, 1)
+            LOAD_TEXTURE_DATA(2, 1)
+            if (desc->flags & AV_PIX_FMT_FLAG_ALPHA)
+                LOAD_TEXTURE_DATA(3, 0)
+        }
+    }
+    ret = AVERROR_EXTERNAL;
+    OPENGL_ERROR_CHECK(opengl);
+
+    if ((ret = opengl_prepare(opengl)) < 0)
+        goto fail;
+
+    opengl->glprocs.glBindBuffer(FF_GL_ARRAY_BUFFER, opengl->vertex_buffer);
+    opengl->glprocs.glBindBuffer(FF_GL_ELEMENT_ARRAY_BUFFER, opengl->index_buffer);
+    opengl->glprocs.glVertexAttribPointer(opengl->position_attrib, 3, GL_FLOAT, GL_FALSE, sizeof(OpenGLVertexInfo), 0);
+    opengl->glprocs.glEnableVertexAttribArray(opengl->position_attrib);
+    opengl->glprocs.glVertexAttribPointer(opengl->texture_coords_attrib, 2, GL_FLOAT, GL_FALSE, sizeof(OpenGLVertexInfo), 12);
+    opengl->glprocs.glEnableVertexAttribArray(opengl->texture_coords_attrib);
+
+    glDrawElements(GL_TRIANGLES, FF_ARRAY_ELEMS(g_index), GL_UNSIGNED_SHORT, 0);
+
+    ret = AVERROR_EXTERNAL;
+    OPENGL_ERROR_CHECK(opengl);
+
+#if HAVE_SDL
+    if (!opengl->no_window)
+        SDL_GL_SwapBuffers();
+#endif
+    if (opengl->no_window &&
+        (ret = avdevice_dev_to_app_control_message(h, AV_DEV_TO_APP_DISPLAY_WINDOW_BUFFER, NULL , 0)) < 0) {
+        av_log(opengl, AV_LOG_ERROR, "Application failed to display window buffer.\n");
+        goto fail;
+    }
+
+    return 0;
+  fail:
+    return ret;
+}
+
+static int opengl_write_packet(AVFormatContext *h, AVPacket *pkt)
+{
+    return opengl_draw(h, pkt, 0, 1);
+}
+
+static int opengl_write_frame(AVFormatContext *h, int stream_index,
+                              AVFrame **frame, unsigned flags)
+{
+    if ((flags & AV_WRITE_UNCODED_FRAME_QUERY))
+        return 0;
+    return opengl_draw(h, *frame, 0, 0);
+}
+
+#define OFFSET(x) offsetof(OpenGLContext, x)
+#define ENC AV_OPT_FLAG_ENCODING_PARAM
+static const AVOption options[] = {
+    { "background",   "set background color",   OFFSET(background),   AV_OPT_TYPE_COLOR,  {.str = "black"}, CHAR_MIN, CHAR_MAX, ENC },
+    { "no_window",    "disable default window", OFFSET(no_window),    AV_OPT_TYPE_INT,    {.i64 = 0}, INT_MIN, INT_MAX, ENC },
+    { "window_title", "set window title",       OFFSET(window_title), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, ENC },
+    { NULL }
+};
+
+static const AVClass opengl_class = {
+    .class_name = "opengl outdev",
+    .item_name  = av_default_item_name,
+    .option     = options,
+    .version    = LIBAVUTIL_VERSION_INT,
+};
+
+AVOutputFormat ff_opengl_muxer = {
+    .name           = "opengl",
+    .long_name      = NULL_IF_CONFIG_SMALL("OpenGL output"),
+    .priv_data_size = sizeof(OpenGLContext),
+    .audio_codec    = AV_CODEC_ID_NONE,
+    .video_codec    = AV_CODEC_ID_RAWVIDEO,
+    .write_header   = opengl_write_header,
+    .write_packet   = opengl_write_packet,
+    .write_uncoded_frame = opengl_write_frame,
+    .write_trailer  = opengl_write_trailer,
+    .control_message = opengl_control_message,
+    .flags          = AVFMT_NOFILE | AVFMT_VARIABLE_FPS | AVFMT_NOTIMESTAMPS,
+    .priv_class     = &opengl_class,
+};

omxplayer-2014.03.28.tar.gz/ffmpeg/libavdevice/opengl_enc_shaders.h Added

@@ -0,0 +1,188 @@
+/*
+ * Copyright (c) 2014 Lukasz Marek
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVDEVICE_OPENGL_SHADERS_H
+#define AVDEVICE_OPENGL_SHADERS_H
+
+#include "libavutil/pixfmt.h"
+
+static const char * const FF_OPENGL_VERTEX_SHADER =
+    "uniform mat4 u_projectionMatrix;"
+    "uniform mat4 u_modelViewMatrix;"
+
+    "attribute vec4 a_position;"
+    "attribute vec2 a_textureCoords;"
+
+    "varying vec2 texture_coordinate;"
+
+    "void main()"
+    "{"
+        "gl_Position = u_projectionMatrix * (a_position * u_modelViewMatrix);"
+        "texture_coordinate = a_textureCoords;"
+    "}";
+
+/**
+ * Fragment shader for packet RGBA formats.
+ */
+static const char * const FF_OPENGL_FRAGMENT_SHADER_RGBA_PACKET =
+#if defined(GL_ES_VERSION_2_0)
+    "precision mediump float;"
+#endif
+    "uniform sampler2D u_texture0;"
+    "uniform mat4 u_colorMap;"
+
+    "varying vec2 texture_coordinate;"
+
+    "void main()"
+    "{"
+        "gl_FragColor = texture2D(u_texture0, texture_coordinate) * u_colorMap;"
+    "}";
+
+/**
+ * Fragment shader for packet RGB formats.
+ */
+static const char * const FF_OPENGL_FRAGMENT_SHADER_RGB_PACKET =
+#if defined(GL_ES_VERSION_2_0)
+    "precision mediump float;"
+#endif
+    "uniform sampler2D u_texture0;"
+    "uniform mat4 u_colorMap;"
+
+    "varying vec2 texture_coordinate;"
+
+    "void main()"
+    "{"
+        "gl_FragColor = vec4((texture2D(u_texture0, texture_coordinate) * u_colorMap).rgb, 1.0);"
+    "}";
+
+/**
+ * Fragment shader for planar RGBA formats.
+ */
+static const char * const FF_OPENGL_FRAGMENT_SHADER_RGBA_PLANAR =
+#if defined(GL_ES_VERSION_2_0)
+    "precision mediump float;"
+#endif
+    "uniform sampler2D u_texture0;"
+    "uniform sampler2D u_texture1;"
+    "uniform sampler2D u_texture2;"
+    "uniform sampler2D u_texture3;"
+
+    "varying vec2 texture_coordinate;"
+
+    "void main()"
+    "{"
+        "gl_FragColor = vec4(texture2D(u_texture0, texture_coordinate).r,"
+                            "texture2D(u_texture1, texture_coordinate).r,"
+                            "texture2D(u_texture2, texture_coordinate).r,"
+                            "texture2D(u_texture3, texture_coordinate).r);"
+    "}";
+
+/**
+ * Fragment shader for planar RGB formats.
+ */
+static const char * const FF_OPENGL_FRAGMENT_SHADER_RGB_PLANAR =
+#if defined(GL_ES_VERSION_2_0)
+    "precision mediump float;"
+#endif
+    "uniform sampler2D u_texture0;"
+    "uniform sampler2D u_texture1;"
+    "uniform sampler2D u_texture2;"
+
+    "varying vec2 texture_coordinate;"
+
+    "void main()"
+    "{"
+        "gl_FragColor = vec4(texture2D(u_texture0, texture_coordinate).r,"
+                            "texture2D(u_texture1, texture_coordinate).r,"
+                            "texture2D(u_texture2, texture_coordinate).r,"
+                            "1.0);"
+    "}";
+
+/**
+ * Fragment shader for planar YUV formats.
+ */
+static const char * const  FF_OPENGL_FRAGMENT_SHADER_YUV_PLANAR =
+#if defined(GL_ES_VERSION_2_0)
+    "precision mediump float;"
+#endif
+    "uniform sampler2D u_texture0;"
+    "uniform sampler2D u_texture1;"
+    "uniform sampler2D u_texture2;"
+    "uniform float u_chroma_div_w;"
+    "uniform float u_chroma_div_h;"
+
+    "varying vec2 texture_coordinate;"
+
+    "void main()"
+    "{"
+        "vec3 yuv;"
+
+        "yuv.r = texture2D(u_texture0, texture_coordinate).r - 0.0625;"
+        "yuv.g = texture2D(u_texture1, vec2(texture_coordinate.x / u_chroma_div_w, texture_coordinate.y / u_chroma_div_h)).r - 0.5;"
+        "yuv.b = texture2D(u_texture2, vec2(texture_coordinate.x / u_chroma_div_w, texture_coordinate.y / u_chroma_div_h)).r - 0.5;"
+
+        "gl_FragColor = clamp(vec4(mat3(1.1643,  1.16430, 1.1643,"
+                                       "0.0,    -0.39173, 2.0170,"
+                                       "1.5958, -0.81290, 0.0) * yuv, 1.0), 0.0, 1.0);"
+
+    "}";
+
+/**
+ * Fragment shader for planar YUVA formats.
+ */
+static const char * const FF_OPENGL_FRAGMENT_SHADER_YUVA_PLANAR =
+#if defined(GL_ES_VERSION_2_0)
+    "precision mediump float;"
+#endif
+    "uniform sampler2D u_texture0;"
+    "uniform sampler2D u_texture1;"
+    "uniform sampler2D u_texture2;"
+    "uniform sampler2D u_texture3;"
+    "uniform float u_chroma_div_w;"
+    "uniform float u_chroma_div_h;"
+
+    "varying vec2 texture_coordinate;"
+
+    "void main()"
+    "{"
+        "vec3 yuv;"
+
+        "yuv.r = texture2D(u_texture0, texture_coordinate).r - 0.0625;"
+        "yuv.g = texture2D(u_texture1, vec2(texture_coordinate.x / u_chroma_div_w, texture_coordinate.y / u_chroma_div_h)).r - 0.5;"
+        "yuv.b = texture2D(u_texture2, vec2(texture_coordinate.x / u_chroma_div_w, texture_coordinate.y / u_chroma_div_h)).r - 0.5;"
+
+        "gl_FragColor = clamp(vec4(mat3(1.1643,  1.16430, 1.1643,"
+                                       "0.0,    -0.39173, 2.0170,"
+                                       "1.5958, -0.81290, 0.0) * yuv, texture2D(u_texture3, texture_coordinate).r), 0.0, 1.0);"
+    "}";
+
+static const char * const FF_OPENGL_FRAGMENT_SHADER_GRAY =
+#if defined(GL_ES_VERSION_2_0)
+    "precision mediump float;"
+#endif
+    "uniform sampler2D u_texture0;"
+    "varying vec2 texture_coordinate;"
+    "void main()"
+    "{"
+        "float c = texture2D(u_texture0, texture_coordinate).r;"
+        "gl_FragColor = vec4(c, c, c, 1.0);"
+    "}";
+
+#endif /* AVDEVICE_OPENGL_SHADERS_H */

omxplayer-2014.02.11.tar.gz/ffmpeg/libavdevice/pulse_audio_common.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavdevice/pulse_audio_common.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavdevice/pulse_audio_common.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavdevice/pulse_audio_common.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavdevice/pulse_audio_dec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavdevice/pulse_audio_dec.c Changed

@@ -54,10 +54,10 @@
     PulseData *pd = s->priv_data;
     AVStream *st;
     char *device = NULL;
-    int ret;
+    int ret, sample_bytes;
     enum AVCodecID codec_id =
         s->audio_codec_id == AV_CODEC_ID_NONE ? DEFAULT_CODEC_ID : s->audio_codec_id;
-    const pa_sample_spec ss = { codec_id_to_pulse_format(codec_id),
+    const pa_sample_spec ss = { ff_codec_id_to_pulse_format(codec_id),
                                 pd->sample_rate,
                                 pd->channels };
 
@@ -90,11 +90,17 @@
     st->codec->codec_id    = codec_id;
     st->codec->sample_rate = pd->sample_rate;
     st->codec->channels    = pd->channels;
-    avpriv_set_pts_info(st, 64, 1, 1000000);  /* 64 bits pts in us */
+    avpriv_set_pts_info(st, 64, 1, pd->sample_rate);  /* 64 bits pts in us */
 
     pd->pts = AV_NOPTS_VALUE;
-    pd->frame_duration = (pd->frame_size * 1000000LL * 8) /
-        (pd->sample_rate * pd->channels * av_get_bits_per_sample(codec_id));
+    sample_bytes = (av_get_bits_per_sample(codec_id) >> 3) * pd->channels;
+
+    if (pd->frame_size % sample_bytes) {
+        av_log(s, AV_LOG_WARNING, "frame_size %i is not divisible by %i "
+            "(channels * bytes_per_sample) \n", pd->frame_size, sample_bytes);
+    }
+
+    pd->frame_duration = pd->frame_size / sample_bytes;
 
     return 0;
 }
@@ -103,7 +109,6 @@
 {
     PulseData *pd  = s->priv_data;
     int res;
-    pa_usec_t latency;
 
     if (av_new_packet(pkt, pd->frame_size) < 0) {
         return AVERROR(ENOMEM);
@@ -116,13 +121,15 @@
         return AVERROR(EIO);
     }
 
-    if ((latency = pa_simple_get_latency(pd->s, &res)) == (pa_usec_t) -1) {
-        av_log(s, AV_LOG_ERROR, "pa_simple_get_latency() failed: %s\n",
-               pa_strerror(res));
-        return AVERROR(EIO);
-    }
-
     if (pd->pts == AV_NOPTS_VALUE) {
+        pa_usec_t latency;
+
+        if ((latency = pa_simple_get_latency(pd->s, &res)) == (pa_usec_t) -1) {
+            av_log(s, AV_LOG_ERROR, "pa_simple_get_latency() failed: %s\n",
+                   pa_strerror(res));
+            return AVERROR(EIO);
+        }
+
         pd->pts = -latency;
     }

omxplayer-2014.02.11.tar.gz/ffmpeg/libavdevice/pulse_audio_enc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavdevice/pulse_audio_enc.c Changed

@@ -35,6 +35,8 @@
     const char *device;
     pa_simple *pa;
     int64_t timestamp;
+    int buffer_size;
+    int buffer_duration;
 } PulseData;
 
 static av_cold int pulse_write_header(AVFormatContext *h)
@@ -59,7 +61,20 @@
             stream_name = "Playback";
     }
 
-    ss.format = codec_id_to_pulse_format(st->codec->codec_id);
+    if (s->buffer_duration) {
+        int64_t bytes = s->buffer_duration;
+        bytes *= st->codec->channels * st->codec->sample_rate *
+                 av_get_bytes_per_sample(st->codec->sample_fmt);
+        bytes /= 1000;
+        attr.tlength = FFMAX(s->buffer_size, av_clip64(bytes, 0, UINT32_MAX - 1));
+        av_log(s, AV_LOG_DEBUG,
+               "Buffer duration: %ums recalculated into %"PRId64" bytes buffer.\n",
+               s->buffer_duration, bytes);
+        av_log(s, AV_LOG_DEBUG, "Real buffer length is %u bytes\n", attr.tlength);
+    } else if (s->buffer_size)
+        attr.tlength = s->buffer_size;
+
+    ss.format = ff_codec_id_to_pulse_format(st->codec->codec_id);
     ss.rate = st->codec->sample_rate;
     ss.channels = st->codec->channels;
 
@@ -102,7 +117,7 @@
             av_log(s, AV_LOG_ERROR, "pa_simple_flush failed: %s\n", pa_strerror(error));
             return AVERROR(EIO);
         }
-        return 0;
+        return 1;
     }
 
     if (pkt->dts != AV_NOPTS_VALUE)
@@ -142,6 +157,8 @@
     { "name",          "set application name",   OFFSET(name),        AV_OPT_TYPE_STRING, {.str = LIBAVFORMAT_IDENT},  0, 0, E },
     { "stream_name",   "set stream description", OFFSET(stream_name), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, E },
     { "device",        "set device name",        OFFSET(device),      AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, E },
+    { "buffer_size",   "set buffer size in bytes", OFFSET(buffer_size), AV_OPT_TYPE_INT,  {.i64 = 0}, 0, INT_MAX, E },
+    { "buffer_duration", "set buffer duration in millisecs", OFFSET(buffer_duration), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX, E },
     { NULL }
 };

omxplayer-2014.02.11.tar.gz/ffmpeg/libavdevice/sdl.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavdevice/sdl.c Changed

@@ -24,10 +24,13 @@
  */
 
 #include <SDL.h>
+#include <SDL_thread.h>
+
 #include "libavutil/avstring.h"
 #include "libavutil/opt.h"
 #include "libavutil/parseutils.h"
 #include "libavutil/pixdesc.h"
+#include "libavutil/time.h"
 #include "avdevice.h"
 
 typedef struct {
@@ -38,10 +41,17 @@
     char *icon_title;
     int window_width,  window_height;  /**< size of the window */
     int window_fullscreen;
-    int overlay_width, overlay_height; /**< size of the video in the window */
-    int overlay_x, overlay_y;
+
+    SDL_Rect overlay_rect;
     int overlay_fmt;
+
     int sdl_was_already_inited;
+    SDL_Thread *event_thread;
+    SDL_mutex *mutex;
+    SDL_cond *init_cond;
+    int init_ret; /* return code used to signal initialization errors */
+    int inited;
+    int quit;
 } SDLContext;
 
 static const struct sdl_overlay_pix_fmt_entry {
@@ -57,27 +67,174 @@
 {
     SDLContext *sdl = s->priv_data;
 
-    av_freep(&sdl->window_title);
-    av_freep(&sdl->icon_title);
+    sdl->quit = 1;
 
-    if (sdl->overlay) {
+    if (sdl->overlay)
         SDL_FreeYUVOverlay(sdl->overlay);
-        sdl->overlay = NULL;
-    }
+    sdl->overlay = NULL;
+    if (sdl->event_thread)
+        SDL_WaitThread(sdl->event_thread, NULL);
+    sdl->event_thread = NULL;
+    if (sdl->mutex)
+        SDL_DestroyMutex(sdl->mutex);
+    sdl->mutex = NULL;
+    if (sdl->init_cond)
+        SDL_DestroyCond(sdl->init_cond);
+    sdl->init_cond = NULL;
+
     if (!sdl->sdl_was_already_inited)
         SDL_Quit();
 
     return 0;
 }
 
+static void compute_overlay_rect(AVFormatContext *s)
+{
+    AVRational sar, dar; /* sample and display aspect ratios */
+    SDLContext *sdl = s->priv_data;
+    AVStream *st = s->streams[0];
+    AVCodecContext *encctx = st->codec;
+    SDL_Rect *overlay_rect = &sdl->overlay_rect;
+
+    /* compute overlay width and height from the codec context information */
+    sar = st->sample_aspect_ratio.num ? st->sample_aspect_ratio : (AVRational){ 1, 1 };
+    dar = av_mul_q(sar, (AVRational){ encctx->width, encctx->height });
+
+    /* we suppose the screen has a 1/1 sample aspect ratio */
+    if (sdl->window_width && sdl->window_height) {
+        /* fit in the window */
+        if (av_cmp_q(dar, (AVRational){ sdl->window_width, sdl->window_height }) > 0) {
+            /* fit in width */
+            overlay_rect->w = sdl->window_width;
+            overlay_rect->h = av_rescale(overlay_rect->w, dar.den, dar.num);
+        } else {
+            /* fit in height */
+            overlay_rect->h = sdl->window_height;
+            overlay_rect->w = av_rescale(overlay_rect->h, dar.num, dar.den);
+        }
+    } else {
+        if (sar.num > sar.den) {
+            overlay_rect->w = encctx->width;
+            overlay_rect->h = av_rescale(overlay_rect->w, dar.den, dar.num);
+        } else {
+            overlay_rect->h = encctx->height;
+            overlay_rect->w = av_rescale(overlay_rect->h, dar.num, dar.den);
+        }
+        sdl->window_width  = overlay_rect->w;
+        sdl->window_height = overlay_rect->h;
+    }
+
+    overlay_rect->x = (sdl->window_width  - overlay_rect->w) / 2;
+    overlay_rect->y = (sdl->window_height - overlay_rect->h) / 2;
+}
+
+#define SDL_BASE_FLAGS (SDL_SWSURFACE|SDL_RESIZABLE)
+
+static int event_thread(void *arg)
+{
+    AVFormatContext *s = arg;
+    SDLContext *sdl = s->priv_data;
+    int flags = SDL_BASE_FLAGS | (sdl->window_fullscreen ? SDL_FULLSCREEN : 0);
+    AVStream *st = s->streams[0];
+    AVCodecContext *encctx = st->codec;
+
+    /* initialization */
+    if (SDL_Init(SDL_INIT_VIDEO) != 0) {
+        av_log(s, AV_LOG_ERROR, "Unable to initialize SDL: %s\n", SDL_GetError());
+        sdl->init_ret = AVERROR(EINVAL);
+        goto init_end;
+    }
+
+    SDL_WM_SetCaption(sdl->window_title, sdl->icon_title);
+    sdl->surface = SDL_SetVideoMode(sdl->window_width, sdl->window_height,
+                                    24, flags);
+    if (!sdl->surface) {
+        av_log(sdl, AV_LOG_ERROR, "Unable to set video mode: %s\n", SDL_GetError());
+        sdl->init_ret = AVERROR(EINVAL);
+        goto init_end;
+    }
+
+    sdl->overlay = SDL_CreateYUVOverlay(encctx->width, encctx->height,
+                                        sdl->overlay_fmt, sdl->surface);
+    if (!sdl->overlay || sdl->overlay->pitches[0] < encctx->width) {
+        av_log(s, AV_LOG_ERROR,
+               "SDL does not support an overlay with size of %dx%d pixels\n",
+               encctx->width, encctx->height);
+        sdl->init_ret = AVERROR(EINVAL);
+        goto init_end;
+    }
+
+    sdl->init_ret = 0;
+    av_log(s, AV_LOG_VERBOSE, "w:%d h:%d fmt:%s -> w:%d h:%d\n",
+           encctx->width, encctx->height, av_get_pix_fmt_name(encctx->pix_fmt),
+           sdl->overlay_rect.w, sdl->overlay_rect.h);
+
+init_end:
+    SDL_LockMutex(sdl->mutex);
+    sdl->inited = 1;
+    SDL_UnlockMutex(sdl->mutex);
+    SDL_CondSignal(sdl->init_cond);
+
+    if (sdl->init_ret < 0)
+        return sdl->init_ret;
+
+    /* event loop */
+    while (!sdl->quit) {
+        int ret;
+        SDL_Event event;
+        SDL_PumpEvents();
+        ret = SDL_PeepEvents(&event, 1, SDL_GETEVENT, SDL_ALLEVENTS);
+        if (ret < 0) {
+            av_log(s, AV_LOG_ERROR, "Error when getting SDL event: %s\n", SDL_GetError());
+            continue;
+        }
+        if (ret == 0) {
+            SDL_Delay(10);
+            continue;
+        }
+
+        switch (event.type) {
+        case SDL_KEYDOWN:
+            switch (event.key.keysym.sym) {
+            case SDLK_ESCAPE:
+            case SDLK_q:
+                sdl->quit = 1;
+                break;
+            }
+            break;
+        case SDL_QUIT:
+            sdl->quit = 1;
+            break;
+
+        case SDL_VIDEORESIZE:
+            sdl->window_width  = event.resize.w;
+            sdl->window_height = event.resize.h;
+
+            SDL_LockMutex(sdl->mutex);
+            sdl->surface = SDL_SetVideoMode(sdl->window_width, sdl->window_height, 24, SDL_BASE_FLAGS);
+            if (!sdl->surface) {
+                av_log(s, AV_LOG_ERROR, "Failed to set SDL video mode: %s\n", SDL_GetError());
+                sdl->quit = 1;
+            } else {
+                compute_overlay_rect(s);
+            }
+            SDL_UnlockMutex(sdl->mutex);
+            break;
+
+        default:
+            break;
+        }
+    }
+
+    return 0;
+}
+
 static int sdl_write_header(AVFormatContext *s)
 {
     SDLContext *sdl = s->priv_data;
     AVStream *st = s->streams[0];
     AVCodecContext *encctx = st->codec;
-    AVRational sar, dar; /* sample and display aspect ratios */
     int i, ret;
-    int flags = SDL_SWSURFACE | sdl->window_fullscreen ? SDL_FULLSCREEN : 0;
 
     if (!sdl->window_title)
         sdl->window_title = av_strdup(s->filename);
@@ -92,12 +249,6 @@
         goto fail;
     }
 
-    if (SDL_Init(SDL_INIT_VIDEO) != 0) {
-        av_log(s, AV_LOG_ERROR, "Unable to initialize SDL: %s\n", SDL_GetError());
-        ret = AVERROR(EINVAL);
-        goto fail;
-    }
-
     if (   s->nb_streams > 1
         || encctx->codec_type != AVMEDIA_TYPE_VIDEO
         || encctx->codec_id   != AV_CODEC_ID_RAWVIDEO) {
@@ -122,57 +273,37 @@
     }
 
     /* compute overlay width and height from the codec context information */
-    sar = st->sample_aspect_ratio.num ? st->sample_aspect_ratio : (AVRational){ 1, 1 };
-    dar = av_mul_q(sar, (AVRational){ encctx->width, encctx->height });
+    compute_overlay_rect(s);
 
-    /* we suppose the screen has a 1/1 sample aspect ratio */
-    if (sdl->window_width && sdl->window_height) {
-        /* fit in the window */
-        if (av_cmp_q(dar, (AVRational){ sdl->window_width, sdl->window_height }) > 0) {
-            /* fit in width */
-            sdl->overlay_width  = sdl->window_width;
-            sdl->overlay_height = av_rescale(sdl->overlay_width, dar.den, dar.num);
-        } else {
-            /* fit in height */
-            sdl->overlay_height = sdl->window_height;
-            sdl->overlay_width  = av_rescale(sdl->overlay_height, dar.num, dar.den);
-        }
-    } else {
-        if (sar.num > sar.den) {
-            sdl->overlay_width  = encctx->width;
-            sdl->overlay_height = av_rescale(sdl->overlay_width, dar.den, dar.num);
-        } else {
-            sdl->overlay_height = encctx->height;
-            sdl->overlay_width  = av_rescale(sdl->overlay_height, dar.num, dar.den);
-        }
-        sdl->window_width  = sdl->overlay_width;
-        sdl->window_height = sdl->overlay_height;
+    sdl->init_cond = SDL_CreateCond();
+    if (!sdl->init_cond) {
+        av_log(s, AV_LOG_ERROR, "Could not create SDL condition variable: %s\n", SDL_GetError());
+        ret = AVERROR_EXTERNAL;
+        goto fail;
     }
-    sdl->overlay_x = (sdl->window_width  - sdl->overlay_width ) / 2;
-    sdl->overlay_y = (sdl->window_height - sdl->overlay_height) / 2;
-
-    SDL_WM_SetCaption(sdl->window_title, sdl->icon_title);
-    sdl->surface = SDL_SetVideoMode(sdl->window_width, sdl->window_height,
-                                    24, flags);
-    if (!sdl->surface) {
-        av_log(s, AV_LOG_ERROR, "Unable to set video mode: %s\n", SDL_GetError());
-        ret = AVERROR(EINVAL);
+    sdl->mutex = SDL_CreateMutex();
+    if (!sdl->mutex) {
+        av_log(s, AV_LOG_ERROR, "Could not create SDL mutex: %s\n", SDL_GetError());
+        ret = AVERROR_EXTERNAL;
         goto fail;
     }
-
-    sdl->overlay = SDL_CreateYUVOverlay(encctx->width, encctx->height,
-                                        sdl->overlay_fmt, sdl->surface);
-    if (!sdl->overlay || sdl->overlay->pitches[0] < encctx->width) {
-        av_log(s, AV_LOG_ERROR,
-               "SDL does not support an overlay with size of %dx%d pixels\n",
-               encctx->width, encctx->height);
-        ret = AVERROR(EINVAL);
+    sdl->event_thread = SDL_CreateThread(event_thread, s);
+    if (!sdl->event_thread) {
+        av_log(s, AV_LOG_ERROR, "Could not create SDL event thread: %s\n", SDL_GetError());
+        ret = AVERROR_EXTERNAL;
         goto fail;
     }
 
-    av_log(s, AV_LOG_VERBOSE, "w:%d h:%d fmt:%s sar:%d/%d -> w:%d h:%d\n",
-           encctx->width, encctx->height, av_get_pix_fmt_name(encctx->pix_fmt), sar.num, sar.den,
-           sdl->overlay_width, sdl->overlay_height);
+    /* wait until the video system has been inited */
+    SDL_LockMutex(sdl->mutex);
+    while (!sdl->inited) {
+        SDL_CondWait(sdl->init_cond, sdl->mutex);
+    }
+    SDL_UnlockMutex(sdl->mutex);
+    if (sdl->init_ret < 0) {
+        ret = sdl->init_ret;
+        goto fail;
+    }
     return 0;
 
 fail:
@@ -184,12 +315,16 @@
 {
     SDLContext *sdl = s->priv_data;
     AVCodecContext *encctx = s->streams[0]->codec;
-    SDL_Rect rect = { sdl->overlay_x, sdl->overlay_y, sdl->overlay_width, sdl->overlay_height };
     AVPicture pict;
     int i;
 
+    if (sdl->quit) {
+        sdl_write_trailer(s);
+        return AVERROR(EIO);
+    }
     avpicture_fill(&pict, pkt->data, encctx->pix_fmt, encctx->width, encctx->height);
 
+    SDL_LockMutex(sdl->mutex);
     SDL_FillRect(sdl->surface, &sdl->surface->clip_rect,
                  SDL_MapRGB(sdl->surface->format, 0, 0, 0));
     SDL_LockYUVOverlay(sdl->overlay);
@@ -197,10 +332,13 @@
         sdl->overlay->pixels [i] = pict.data    [i];
         sdl->overlay->pitches[i] = pict.linesize[i];
     }
-    SDL_DisplayYUVOverlay(sdl->overlay, &rect);
+    SDL_DisplayYUVOverlay(sdl->overlay, &sdl->overlay_rect);
     SDL_UnlockYUVOverlay(sdl->overlay);
 
-    SDL_UpdateRect(sdl->surface, rect.x, rect.y, rect.w, rect.h);
+    SDL_UpdateRect(sdl->surface,
+                   sdl->overlay_rect.x, sdl->overlay_rect.y,
+                   sdl->overlay_rect.w, sdl->overlay_rect.h);
+    SDL_UnlockMutex(sdl->mutex);
 
     return 0;
 }
@@ -208,10 +346,10 @@
 #define OFFSET(x) offsetof(SDLContext,x)
 
 static const AVOption options[] = {
-    { "window_title", "set SDL window title",           OFFSET(window_title), AV_OPT_TYPE_STRING, {.str = NULL }, 0, 0, AV_OPT_FLAG_ENCODING_PARAM },
-    { "icon_title",   "set SDL iconified window title", OFFSET(icon_title)  , AV_OPT_TYPE_STRING, {.str = NULL }, 0, 0, AV_OPT_FLAG_ENCODING_PARAM },
-    { "window_size",  "set SDL window forced size",     OFFSET(window_width), AV_OPT_TYPE_IMAGE_SIZE,{.str=NULL}, 0, 0, AV_OPT_FLAG_ENCODING_PARAM },
-    { "window_fullscreen", "set SDL window fullscreen", OFFSET(window_fullscreen), AV_OPT_TYPE_INT,{.i64=0}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM },
+    { "window_title", "set SDL window title",           OFFSET(window_title), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, AV_OPT_FLAG_ENCODING_PARAM },
+    { "icon_title",   "set SDL iconified window title", OFFSET(icon_title)  , AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, AV_OPT_FLAG_ENCODING_PARAM },
+    { "window_size",  "set SDL window forced size",     OFFSET(window_width), AV_OPT_TYPE_IMAGE_SIZE, { .str = NULL }, 0, 0, AV_OPT_FLAG_ENCODING_PARAM },
+    { "window_fullscreen", "set SDL window fullscreen", OFFSET(window_fullscreen), AV_OPT_TYPE_INT, { .i64 = 0 }, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM },
     { NULL },
 };

omxplayer-2014.02.11.tar.gz/ffmpeg/libavdevice/timefilter.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavdevice/timefilter.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavdevice/v4l2-common.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavdevice/v4l2-common.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavdevice/v4l2.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavdevice/v4l2.c Changed

@@ -447,18 +447,20 @@
         return 0;
     }
 #if HAVE_CLOCK_GETTIME && defined(CLOCK_MONOTONIC)
-    now = av_gettime_monotonic();
-    if (s->ts_mode == V4L_TS_MONO2ABS ||
-        (ts <= now + 1 * AV_TIME_BASE && ts >= now - 10 * AV_TIME_BASE)) {
-        AVRational tb = {AV_TIME_BASE, 1};
-        int64_t period = av_rescale_q(1, tb, ctx->streams[0]->avg_frame_rate);
-        av_log(ctx, AV_LOG_INFO, "Detected monotonic timestamps, converting\n");
-        /* microseconds instead of seconds, MHz instead of Hz */
-        s->timefilter = ff_timefilter_new(1, period, 1.0E-6);
-        if (!s->timefilter)
-            return AVERROR(ENOMEM);
-        s->ts_mode = V4L_TS_CONVERT_READY;
-        return 0;
+    if (ctx->streams[0]->avg_frame_rate.num) {
+        now = av_gettime_monotonic();
+        if (s->ts_mode == V4L_TS_MONO2ABS ||
+            (ts <= now + 1 * AV_TIME_BASE && ts >= now - 10 * AV_TIME_BASE)) {
+            AVRational tb = {AV_TIME_BASE, 1};
+            int64_t period = av_rescale_q(1, tb, ctx->streams[0]->avg_frame_rate);
+            av_log(ctx, AV_LOG_INFO, "Detected monotonic timestamps, converting\n");
+            /* microseconds instead of seconds, MHz instead of Hz */
+            s->timefilter = ff_timefilter_new(1, period, 1.0E-6);
+            if (!s->timefilter)
+                return AVERROR(ENOMEM);
+            s->ts_mode = V4L_TS_CONVERT_READY;
+            return 0;
+        }
     }
 #endif
     av_log(ctx, AV_LOG_ERROR, "Unknown timestamps\n");
@@ -742,9 +744,12 @@
                    "The driver does not allow to change time per frame\n");
         }
     }
-    s1->streams[0]->avg_frame_rate.num = tpf->denominator;
-    s1->streams[0]->avg_frame_rate.den = tpf->numerator;
-    s1->streams[0]->r_frame_rate = s1->streams[0]->avg_frame_rate;
+    if (tpf->denominator > 0 && tpf->numerator > 0) {
+        s1->streams[0]->avg_frame_rate.num = tpf->denominator;
+        s1->streams[0]->avg_frame_rate.den = tpf->numerator;
+        s1->streams[0]->r_frame_rate = s1->streams[0]->avg_frame_rate;
+    } else
+        av_log(s1, AV_LOG_WARNING, "Time per frame unknown\n");
 
     return 0;
 }
@@ -866,6 +871,9 @@
 
     avpriv_set_pts_info(st, 64, 1, 1000000); /* 64 bits pts in us */
 
+    if ((res = v4l2_set_parameters(s1)) < 0)
+        return res;
+
     if (s->pixel_format) {
         AVCodec *codec = avcodec_find_decoder_by_name(s->pixel_format);
 
@@ -917,9 +925,6 @@
 
     s->frame_format = desired_format;
 
-    if ((res = v4l2_set_parameters(s1)) < 0)
-        return res;
-
     st->codec->pix_fmt = avpriv_fmt_v4l2ff(desired_format, codec_id);
     s->frame_size =
         avpicture_get_size(st->codec->pix_fmt, s->width, s->height);
@@ -946,7 +951,8 @@
         st->codec->codec_tag = MKTAG('Y', 'V', 'U', '9');
     st->codec->width = s->width;
     st->codec->height = s->height;
-    st->codec->bit_rate = s->frame_size * av_q2d(st->avg_frame_rate) * 8;
+    if (st->avg_frame_rate.den)
+        st->codec->bit_rate = s->frame_size * av_q2d(st->avg_frame_rate) * 8;
 
     return 0;
 }

omxplayer-2014.02.11.tar.gz/ffmpeg/libavdevice/version.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavdevice/version.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavdevice/xv.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavdevice/xv.c Changed

@@ -35,6 +35,8 @@
 
 #include "libavutil/opt.h"
 #include "libavutil/pixdesc.h"
+#include "libavutil/imgutils.h"
+#include "libavformat/internal.h"
 #include "avdevice.h"
 
 typedef struct {
@@ -50,18 +52,58 @@
     char *display_name;
 
     XvImage* yuv_image;
+    enum AVPixelFormat image_format;
     int image_width, image_height;
     XShmSegmentInfo yuv_shminfo;
     int xv_port;
 } XVContext;
 
+typedef struct XVTagFormatMap
+{
+    int tag;
+    enum AVPixelFormat format;
+} XVTagFormatMap;
+
+static XVTagFormatMap tag_codec_map[] = {
+    { MKTAG('I','4','2','0'), AV_PIX_FMT_YUV420P },
+    { MKTAG('U','Y','V','Y'), AV_PIX_FMT_UYVY422 },
+    { MKTAG('Y','U','Y','2'), AV_PIX_FMT_YUYV422 },
+    { 0,                      AV_PIX_FMT_NONE }
+};
+
+static int xv_get_tag_from_format(enum AVPixelFormat format)
+{
+    XVTagFormatMap *m = tag_codec_map;
+    int i;
+    for (i = 0; m->tag; m = &tag_codec_map[++i]) {
+        if (m->format == format)
+            return m->tag;
+    }
+    return 0;
+}
+
+static int xv_write_trailer(AVFormatContext *s)
+{
+    XVContext *xv = s->priv_data;
+    if (xv->display) {
+        XShmDetach(xv->display, &xv->yuv_shminfo);
+        if (xv->yuv_image)
+            shmdt(xv->yuv_image->data);
+        XFree(xv->yuv_image);
+        if (xv->gc)
+            XFreeGC(xv->display, xv->gc);
+        XCloseDisplay(xv->display);
+    }
+    return 0;
+}
+
 static int xv_write_header(AVFormatContext *s)
 {
     XVContext *xv = s->priv_data;
     unsigned int num_adaptors;
     XvAdaptorInfo *ai;
     XvImageFormatValues *fv;
-    int num_formats = 0, j;
+    int num_formats = 0, j, tag, ret;
     AVCodecContext *encctx = s->streams[0]->codec;
 
     if (   s->nb_streams > 1
@@ -71,6 +113,14 @@
         return AVERROR(EINVAL);
     }
 
+    if (!(tag = xv_get_tag_from_format(encctx->pix_fmt))) {
+        av_log(s, AV_LOG_ERROR,
+               "Unsupported pixel format '%s', only yuv420p, uyvy422, yuyv422 are currently supported\n",
+               av_get_pix_fmt_name(encctx->pix_fmt));
+        return AVERROR_PATCHWELCOME;
+    }
+    xv->image_format = encctx->pix_fmt;
+
     xv->display = XOpenDisplay(xv->display_name);
     if (!xv->display) {
         av_log(s, AV_LOG_ERROR, "Could not open the X11 display '%s'\n", xv->display_name);
@@ -80,36 +130,47 @@
     xv->image_width  = encctx->width;
     xv->image_height = encctx->height;
     if (!xv->window_width && !xv->window_height) {
+        AVRational sar = encctx->sample_aspect_ratio;
         xv->window_width  = encctx->width;
         xv->window_height = encctx->height;
+        if (sar.num) {
+            if (sar.num > sar.den)
+                xv->window_width = av_rescale(xv->window_width, sar.num, sar.den);
+            if (sar.num < sar.den)
+                xv->window_height = av_rescale(xv->window_height, sar.den, sar.num);
+        }
     }
     xv->window = XCreateSimpleWindow(xv->display, DefaultRootWindow(xv->display),
                                      xv->window_x, xv->window_y,
                                      xv->window_width, xv->window_height,
                                      0, 0, 0);
     if (!xv->window_title) {
-        if (!(xv->window_title = av_strdup(s->filename)))
-            return AVERROR(ENOMEM);
+        if (!(xv->window_title = av_strdup(s->filename))) {
+            ret = AVERROR(ENOMEM);
+            goto fail;
+        }
     }
     XStoreName(xv->display, xv->window, xv->window_title);
     XMapWindow(xv->display, xv->window);
 
-    if (XvQueryAdaptors(xv->display, DefaultRootWindow(xv->display), &num_adaptors, &ai) != Success)
-        return AVERROR_EXTERNAL;
-    xv->xv_port = ai[0].base_id;
-
-    if (encctx->pix_fmt != AV_PIX_FMT_YUV420P) {
-        av_log(s, AV_LOG_ERROR,
-               "Unsupported pixel format '%s', only yuv420p is currently supported\n",
-               av_get_pix_fmt_name(encctx->pix_fmt));
-        return AVERROR_PATCHWELCOME;
+    if (XvQueryAdaptors(xv->display, DefaultRootWindow(xv->display), &num_adaptors, &ai) != Success) {
+        ret = AVERROR_EXTERNAL;
+        goto fail;
     }
+    if (!num_adaptors) {
+        av_log(s, AV_LOG_ERROR, "No X-Video adaptors present\n");
+        return AVERROR(ENODEV);
+    }
+    xv->xv_port = ai[0].base_id;
+    XvFreeAdaptorInfo(ai);
 
     fv = XvListImageFormats(xv->display, xv->xv_port, &num_formats);
-    if (!fv)
-        return AVERROR_EXTERNAL;
+    if (!fv) {
+        ret = AVERROR_EXTERNAL;
+        goto fail;
+    }
     for (j = 0; j < num_formats; j++) {
-        if (fv[j].id == MKTAG('I','4','2','0')) {
+        if (fv[j].id == tag) {
             break;
         }
     }
@@ -117,15 +178,16 @@
 
     if (j >= num_formats) {
         av_log(s, AV_LOG_ERROR,
-               "Device does not support pixel format yuv420p, aborting\n");
-        return AVERROR(EINVAL);
+               "Device does not support pixel format %s, aborting\n",
+               av_get_pix_fmt_name(encctx->pix_fmt));
+        ret = AVERROR(EINVAL);
+        goto fail;
     }
 
     xv->gc = XCreateGC(xv->display, xv->window, 0, 0);
     xv->image_width  = encctx->width;
     xv->image_height = encctx->height;
-    xv->yuv_image = XvShmCreateImage(xv->display, xv->xv_port,
-                                     MKTAG('I','4','2','0'), 0,
+    xv->yuv_image = XvShmCreateImage(xv->display, xv->xv_port, tag, 0,
                                      xv->image_width, xv->image_height, &xv->yuv_shminfo);
     xv->yuv_shminfo.shmid = shmget(IPC_PRIVATE, xv->yuv_image->data_size,
                                    IPC_CREAT | 0777);
@@ -138,32 +200,24 @@
     shmctl(xv->yuv_shminfo.shmid, IPC_RMID, 0);
 
     return 0;
+  fail:
+    xv_write_trailer(s);
+    return ret;
 }
 
-static int xv_write_packet(AVFormatContext *s, AVPacket *pkt)
+static int write_picture(AVFormatContext *s, AVPicture *pict)
 {
     XVContext *xv = s->priv_data;
     XvImage *img = xv->yuv_image;
     XWindowAttributes window_attrs;
-    AVPicture pict;
-    AVCodecContext *ctx = s->streams[0]->codec;
-    int y, h;
-
-    h = img->height / 2;
-
-    avpicture_fill(&pict, pkt->data, ctx->pix_fmt, ctx->width, ctx->height);
-    for (y = 0; y < img->height; y++) {
-        memcpy(&img->data[img->offsets[0] + (y * img->pitches[0])],
-               &pict.data[0][y * pict.linesize[0]], img->pitches[0]);
-    }
-
-    for (y = 0; y < h; ++y) {
-        memcpy(&img->data[img->offsets[1] + (y * img->pitches[1])],
-               &pict.data[1][y * pict.linesize[1]], img->pitches[1]);
-        memcpy(&img->data[img->offsets[2] + (y * img->pitches[2])],
-               &pict.data[2][y * pict.linesize[2]], img->pitches[2]);
-    }
+    uint8_t *data[3] = {
+        img->data + img->offsets[0],
+        img->data + img->offsets[1],
+        img->data + img->offsets[2]
+    };
 
+    av_image_copy(data, img->pitches, (const uint8_t **)pict->data, pict->linesize,
+                  xv->image_format, img->width, img->height);
     XGetWindowAttributes(xv->display, xv->window, &window_attrs);
     if (XvShmPutImage(xv->display, xv->xv_port, xv->window, xv->gc,
                       xv->yuv_image, 0, 0, xv->image_width, xv->image_height, 0, 0,
@@ -174,15 +228,22 @@
     return 0;
 }
 
-static int xv_write_trailer(AVFormatContext *s)
+static int xv_write_packet(AVFormatContext *s, AVPacket *pkt)
 {
-    XVContext *xv = s->priv_data;
+    AVPicture pict;
+    AVCodecContext *ctx = s->streams[0]->codec;
 
-    XShmDetach(xv->display, &xv->yuv_shminfo);
-    shmdt(xv->yuv_image->data);
-    XFree(xv->yuv_image);
-    XCloseDisplay(xv->display);
-    return 0;
+    avpicture_fill(&pict, pkt->data, ctx->pix_fmt, ctx->width, ctx->height);
+    return write_picture(s, &pict);
+}
+
+static int xv_write_frame(AVFormatContext *s, int stream_index, AVFrame **frame,
+                          unsigned flags)
+{
+    /* xv_write_header() should have accepted only supported formats */
+    if ((flags & AV_WRITE_UNCODED_FRAME_QUERY))
+        return 0;
+    return write_picture(s, (AVPicture *)*frame);
 }
 
 #define OFFSET(x) offsetof(XVContext, x)
@@ -211,6 +272,7 @@
     .video_codec    = AV_CODEC_ID_RAWVIDEO,
     .write_header   = xv_write_header,
     .write_packet   = xv_write_packet,
+    .write_uncoded_frame = xv_write_frame,
     .write_trailer  = xv_write_trailer,
     .flags          = AVFMT_NOFILE | AVFMT_VARIABLE_FPS | AVFMT_NOTIMESTAMPS,
     .priv_class     = &xv_class,

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/Makefile -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/Makefile Changed

@@ -9,6 +9,7 @@
 FFLIBS-$(CONFIG_ATEMPO_FILTER)               += avcodec
 FFLIBS-$(CONFIG_DECIMATE_FILTER)             += avcodec
 FFLIBS-$(CONFIG_DESHAKE_FILTER)              += avcodec
+FFLIBS-$(CONFIG_ELBG_FILTER)                 += avcodec
 FFLIBS-$(CONFIG_MCDEINT_FILTER)              += avcodec
 FFLIBS-$(CONFIG_MOVIE_FILTER)                += avformat avcodec
 FFLIBS-$(CONFIG_MP_FILTER)                   += avcodec
@@ -21,6 +22,8 @@
 FFLIBS-$(CONFIG_SHOWSPECTRUM_FILTER)         += avcodec
 FFLIBS-$(CONFIG_SMARTBLUR_FILTER)            += swscale
 FFLIBS-$(CONFIG_SUBTITLES_FILTER)            += avformat avcodec
+EBUR128LIBS-$(CONFIG_SWRESAMPLE)              = swresample
+FFLIBS-$(CONFIG_EBUR128_FILTER)              += $(EBUR128LIBS-yes)
 
 HEADERS = asrc_abuffer.h                                                \
           avcodec.h                                                     \
@@ -48,12 +51,11 @@
 
 
 OBJS-$(CONFIG_AVCODEC)                       += avcodec.o
-OBJS-$(CONFIG_AVFORMAT)                      += lavfutils.o
-OBJS-$(CONFIG_SWSCALE)                       += lswsutils.o
 
 OBJS-$(CONFIG_ACONVERT_FILTER)               += af_aconvert.o
 OBJS-$(CONFIG_ADELAY_FILTER)                 += af_adelay.o
 OBJS-$(CONFIG_AECHO_FILTER)                  += af_aecho.o
+OBJS-$(CONFIG_AEVAL_FILTER)                  += aeval.o
 OBJS-$(CONFIG_AFADE_FILTER)                  += af_afade.o
 OBJS-$(CONFIG_AFORMAT_FILTER)                += af_aformat.o
 OBJS-$(CONFIG_AINTERLEAVE_FILTER)            += f_interleave.o
@@ -101,7 +103,7 @@
 OBJS-$(CONFIG_VOLUME_FILTER)                 += af_volume.o
 OBJS-$(CONFIG_VOLUMEDETECT_FILTER)           += af_volumedetect.o
 
-OBJS-$(CONFIG_AEVALSRC_FILTER)               += asrc_aevalsrc.o
+OBJS-$(CONFIG_AEVALSRC_FILTER)               += aeval.o
 OBJS-$(CONFIG_ANULLSRC_FILTER)               += asrc_anullsrc.o
 OBJS-$(CONFIG_FLITE_FILTER)                  += asrc_flite.o
 OBJS-$(CONFIG_SINE_FILTER)                   += asrc_sine.o
@@ -125,11 +127,13 @@
 OBJS-$(CONFIG_CURVES_FILTER)                 += vf_curves.o
 OBJS-$(CONFIG_DCTDNOIZ_FILTER)               += vf_dctdnoiz.o
 OBJS-$(CONFIG_DECIMATE_FILTER)               += vf_decimate.o
+OBJS-$(CONFIG_DEJUDDER_FILTER)               += vf_dejudder.o
 OBJS-$(CONFIG_DELOGO_FILTER)                 += vf_delogo.o
 OBJS-$(CONFIG_DESHAKE_FILTER)                += vf_deshake.o
 OBJS-$(CONFIG_DRAWBOX_FILTER)                += vf_drawbox.o
 OBJS-$(CONFIG_DRAWGRID_FILTER)               += vf_drawbox.o
 OBJS-$(CONFIG_DRAWTEXT_FILTER)               += vf_drawtext.o
+OBJS-$(CONFIG_ELBG_FILTER)                   += vf_elbg.o
 OBJS-$(CONFIG_EDGEDETECT_FILTER)             += vf_edgedetect.o
 OBJS-$(CONFIG_EXTRACTPLANES_FILTER)          += vf_extractplanes.o
 OBJS-$(CONFIG_FADE_FILTER)                   += vf_fade.o
@@ -139,6 +143,7 @@
 OBJS-$(CONFIG_FORMAT_FILTER)                 += vf_format.o
 OBJS-$(CONFIG_FRAMESTEP_FILTER)              += vf_framestep.o
 OBJS-$(CONFIG_FPS_FILTER)                    += vf_fps.o
+OBJS-$(CONFIG_FRAMEPACK_FILTER)              += vf_framepack.o
 OBJS-$(CONFIG_FREI0R_FILTER)                 += vf_frei0r.o
 OBJS-$(CONFIG_GEQ_FILTER)                    += vf_geq.o
 OBJS-$(CONFIG_GRADFUN_FILTER)                += vf_gradfun.o
@@ -247,6 +252,9 @@
 OBJS-$(CONFIG_AMOVIE_FILTER)                 += src_movie.o
 OBJS-$(CONFIG_MOVIE_FILTER)                  += src_movie.o
 
+# Windows resource file
+SLIBOBJS-$(HAVE_GNU_WINDRES)                 += avfilterres.o
+
 SKIPHEADERS-$(CONFIG_LIBVIDSTAB)             += vidstabutils.h
 SKIPHEADERS-$(CONFIG_OPENCL)                 += opencl_internal.h deshake_opencl_kernel.h unsharp_opencl_kernel.h

omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/aeval.c Added

@@ -0,0 +1,466 @@
+/*
+ * Copyright (c) 2011 Stefano Sabatini
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * eval audio source
+ */
+
+#include "libavutil/avassert.h"
+#include "libavutil/avstring.h"
+#include "libavutil/channel_layout.h"
+#include "libavutil/eval.h"
+#include "libavutil/opt.h"
+#include "libavutil/parseutils.h"
+#include "avfilter.h"
+#include "audio.h"
+#include "internal.h"
+
+static const char * const var_names[] = {
+    "ch",           ///< the value of the current channel
+    "n",            ///< number of frame
+    "nb_in_channels",
+    "nb_out_channels",
+    "t",            ///< timestamp expressed in seconds
+    "s",            ///< sample rate
+    NULL
+};
+
+enum var_name {
+    VAR_CH,
+    VAR_N,
+    VAR_NB_IN_CHANNELS,
+    VAR_NB_OUT_CHANNELS,
+    VAR_T,
+    VAR_S,
+    VAR_VARS_NB
+};
+
+typedef struct {
+    const AVClass *class;
+    char *sample_rate_str;
+    int sample_rate;
+    int64_t chlayout;
+    char *chlayout_str;
+    int nb_channels;            ///< number of output channels
+    int nb_in_channels;         ///< number of input channels
+    int same_chlayout;          ///< set output as input channel layout
+    int64_t pts;
+    AVExpr **expr;
+    char *exprs;
+    int nb_samples;             ///< number of samples per requested frame
+    int64_t duration;
+    uint64_t n;
+    double var_values[VAR_VARS_NB];
+    double *channel_values;
+    int64_t out_channel_layout;
+} EvalContext;
+
+static double val(void *priv, double ch)
+{
+    EvalContext *eval = priv;
+    return eval->channel_values[FFMIN((int)ch, eval->nb_in_channels-1)];
+}
+
+static double (* const aeval_func1[])(void *, double) = { val, NULL };
+static const char * const aeval_func1_names[] = { "val", NULL };
+
+#define OFFSET(x) offsetof(EvalContext, x)
+#define FLAGS AV_OPT_FLAG_AUDIO_PARAM|AV_OPT_FLAG_FILTERING_PARAM
+
+static const AVOption aevalsrc_options[]= {
+    { "exprs",       "set the '|'-separated list of channels expressions", OFFSET(exprs), AV_OPT_TYPE_STRING, {.str = NULL}, .flags = FLAGS },
+    { "nb_samples",  "set the number of samples per requested frame", OFFSET(nb_samples),      AV_OPT_TYPE_INT,    {.i64 = 1024},    0,        INT_MAX, FLAGS },
+    { "n",           "set the number of samples per requested frame", OFFSET(nb_samples),      AV_OPT_TYPE_INT,    {.i64 = 1024},    0,        INT_MAX, FLAGS },
+    { "sample_rate", "set the sample rate",                           OFFSET(sample_rate_str), AV_OPT_TYPE_STRING, {.str = "44100"}, CHAR_MIN, CHAR_MAX, FLAGS },
+    { "s",           "set the sample rate",                           OFFSET(sample_rate_str), AV_OPT_TYPE_STRING, {.str = "44100"}, CHAR_MIN, CHAR_MAX, FLAGS },
+    { "duration",    "set audio duration", OFFSET(duration), AV_OPT_TYPE_DURATION, {.i64 = -1}, -1, INT64_MAX, FLAGS },
+    { "d",           "set audio duration", OFFSET(duration), AV_OPT_TYPE_DURATION, {.i64 = -1}, -1, INT64_MAX, FLAGS },
+    { "channel_layout", "set channel layout", OFFSET(chlayout_str), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, FLAGS },
+    { "c",              "set channel layout", OFFSET(chlayout_str), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, FLAGS },
+    { NULL }
+};
+
+AVFILTER_DEFINE_CLASS(aevalsrc);
+
+static int parse_channel_expressions(AVFilterContext *ctx,
+                                     int expected_nb_channels)
+{
+    EvalContext *eval = ctx->priv;
+    char *args1 = av_strdup(eval->exprs);
+    char *expr, *last_expr, *buf;
+    double (* const *func1)(void *, double) = NULL;
+    const char * const *func1_names = NULL;
+    int i, ret = 0;
+
+    if (!args1)
+        return AVERROR(ENOMEM);
+
+    if (!eval->exprs) {
+        av_log(ctx, AV_LOG_ERROR, "Channels expressions list is empty\n");
+        return AVERROR(EINVAL);
+    }
+
+    if (!strcmp(ctx->filter->name, "aeval")) {
+        func1 = aeval_func1;
+        func1_names = aeval_func1_names;
+    }
+
+#define ADD_EXPRESSION(expr_) do {                                      \
+        if (!av_dynarray2_add((void **)&eval->expr, &eval->nb_channels, \
+                              sizeof(*eval->expr), NULL)) {             \
+            ret = AVERROR(ENOMEM);                                      \
+            goto end;                                                   \
+        }                                                               \
+        eval->expr[eval->nb_channels-1] = NULL;                         \
+        ret = av_expr_parse(&eval->expr[eval->nb_channels - 1], expr_,  \
+                            var_names, func1_names, func1,              \
+                            NULL, NULL, 0, ctx);                        \
+        if (ret < 0)                                                    \
+            goto end;                                                   \
+    } while (0)
+
+    /* reset expressions */
+    for (i = 0; i < eval->nb_channels; i++) {
+        av_expr_free(eval->expr[i]);
+        eval->expr[i] = NULL;
+    }
+    av_freep(&eval->expr);
+    eval->nb_channels = 0;
+
+    buf = args1;
+    while (expr = av_strtok(buf, "|", &buf)) {
+        ADD_EXPRESSION(expr);
+        last_expr = expr;
+    }
+
+    if (expected_nb_channels > eval->nb_channels)
+        for (i = eval->nb_channels; i < expected_nb_channels; i++)
+            ADD_EXPRESSION(last_expr);
+
+    if (expected_nb_channels > 0 && eval->nb_channels != expected_nb_channels) {
+        av_log(ctx, AV_LOG_ERROR,
+               "Mismatch between the specified number of channel expressions '%d' "
+               "and the number of expected output channels '%d' for the specified channel layout\n",
+               eval->nb_channels, expected_nb_channels);
+        ret = AVERROR(EINVAL);
+        goto end;
+    }
+
+end:
+    av_free(args1);
+    return ret;
+}
+
+static av_cold int init(AVFilterContext *ctx)
+{
+    EvalContext *eval = ctx->priv;
+    int ret = 0;
+
+    if (eval->chlayout_str) {
+        if (!strcmp(eval->chlayout_str, "same") && !strcmp(ctx->filter->name, "aeval")) {
+            eval->same_chlayout = 1;
+        } else {
+            ret = ff_parse_channel_layout(&eval->chlayout, NULL, eval->chlayout_str, ctx);
+            if (ret < 0)
+                return ret;
+
+            ret = parse_channel_expressions(ctx, av_get_channel_layout_nb_channels(eval->chlayout));
+            if (ret < 0)
+                return ret;
+        }
+    } else {
+        /* guess channel layout from nb expressions/channels */
+        if ((ret = parse_channel_expressions(ctx, -1)) < 0)
+            return ret;
+
+        eval->chlayout = av_get_default_channel_layout(eval->nb_channels);
+        if (!eval->chlayout && eval->nb_channels <= 0) {
+            av_log(ctx, AV_LOG_ERROR, "Invalid number of channels '%d' provided\n",
+                   eval->nb_channels);
+            return AVERROR(EINVAL);
+        }
+    }
+
+    if (eval->sample_rate_str)
+        if ((ret = ff_parse_sample_rate(&eval->sample_rate, eval->sample_rate_str, ctx)))
+            return ret;
+    eval->n = 0;
+
+    return ret;
+}
+
+static av_cold void uninit(AVFilterContext *ctx)
+{
+    EvalContext *eval = ctx->priv;
+    int i;
+
+    for (i = 0; i < eval->nb_channels; i++) {
+        av_expr_free(eval->expr[i]);
+        eval->expr[i] = NULL;
+    }
+    av_freep(&eval->expr);
+}
+
+static int config_props(AVFilterLink *outlink)
+{
+    EvalContext *eval = outlink->src->priv;
+    char buf[128];
+
+    outlink->time_base = (AVRational){1, eval->sample_rate};
+    outlink->sample_rate = eval->sample_rate;
+
+    eval->var_values[VAR_S] = eval->sample_rate;
+    eval->var_values[VAR_NB_IN_CHANNELS] = NAN;
+    eval->var_values[VAR_NB_OUT_CHANNELS] = outlink->channels;
+
+    av_get_channel_layout_string(buf, sizeof(buf), 0, eval->chlayout);
+
+    av_log(outlink->src, AV_LOG_VERBOSE,
+           "sample_rate:%d chlayout:%s duration:%"PRId64"\n",
+           eval->sample_rate, buf, eval->duration);
+
+    return 0;
+}
+
+static int query_formats(AVFilterContext *ctx)
+{
+    EvalContext *eval = ctx->priv;
+    static const enum AVSampleFormat sample_fmts[] = { AV_SAMPLE_FMT_DBLP, AV_SAMPLE_FMT_NONE };
+    int64_t chlayouts[] = { eval->chlayout ? eval->chlayout : FF_COUNT2LAYOUT(eval->nb_channels) , -1 };
+    int sample_rates[] = { eval->sample_rate, -1 };
+
+    ff_set_common_formats (ctx, ff_make_format_list(sample_fmts));
+    ff_set_common_channel_layouts(ctx, avfilter_make_format64_list(chlayouts));
+    ff_set_common_samplerates(ctx, ff_make_format_list(sample_rates));
+
+    return 0;
+}
+
+static int request_frame(AVFilterLink *outlink)
+{
+    EvalContext *eval = outlink->src->priv;
+    AVFrame *samplesref;
+    int i, j;
+    int64_t t = av_rescale(eval->n, AV_TIME_BASE, eval->sample_rate);
+
+    if (eval->duration >= 0 && t >= eval->duration)
+        return AVERROR_EOF;
+
+    samplesref = ff_get_audio_buffer(outlink, eval->nb_samples);
+    if (!samplesref)
+        return AVERROR(ENOMEM);
+
+    /* evaluate expression for each single sample and for each channel */
+    for (i = 0; i < eval->nb_samples; i++, eval->n++) {
+        eval->var_values[VAR_N] = eval->n;
+        eval->var_values[VAR_T] = eval->var_values[VAR_N] * (double)1/eval->sample_rate;
+
+        for (j = 0; j < eval->nb_channels; j++) {
+            *((double *) samplesref->extended_data[j] + i) =
+                av_expr_eval(eval->expr[j], eval->var_values, NULL);
+        }
+    }
+
+    samplesref->pts = eval->pts;
+    samplesref->sample_rate = eval->sample_rate;
+    eval->pts += eval->nb_samples;
+
+    return ff_filter_frame(outlink, samplesref);
+}
+
+#if CONFIG_AEVALSRC_FILTER
+static const AVFilterPad aevalsrc_outputs[] = {
+    {
+        .name          = "default",
+        .type          = AVMEDIA_TYPE_AUDIO,
+        .config_props  = config_props,
+        .request_frame = request_frame,
+    },
+    { NULL }
+};
+
+AVFilter ff_asrc_aevalsrc = {
+    .name          = "aevalsrc",
+    .description   = NULL_IF_CONFIG_SMALL("Generate an audio signal generated by an expression."),
+    .query_formats = query_formats,
+    .init          = init,
+    .uninit        = uninit,
+    .priv_size     = sizeof(EvalContext),
+    .inputs        = NULL,
+    .outputs       = aevalsrc_outputs,
+    .priv_class    = &aevalsrc_class,
+};
+
+#endif /* CONFIG_AEVALSRC_FILTER */
+
+#define OFFSET(x) offsetof(EvalContext, x)
+#define FLAGS AV_OPT_FLAG_AUDIO_PARAM|AV_OPT_FLAG_FILTERING_PARAM
+
+static const AVOption aeval_options[]= {
+    { "exprs", "set the '|'-separated list of channels expressions", OFFSET(exprs), AV_OPT_TYPE_STRING, {.str = NULL}, .flags = FLAGS },
+    { "channel_layout", "set channel layout", OFFSET(chlayout_str), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, FLAGS },
+    { "c",              "set channel layout", OFFSET(chlayout_str), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, FLAGS },
+    { NULL }
+};
+
+AVFILTER_DEFINE_CLASS(aeval);
+
+static int aeval_query_formats(AVFilterContext *ctx)
+{
+    AVFilterFormats *formats = NULL;
+    AVFilterChannelLayouts *layouts;
+    AVFilterLink *inlink  = ctx->inputs[0];
+    AVFilterLink *outlink  = ctx->outputs[0];
+    EvalContext *eval = ctx->priv;
+    static const enum AVSampleFormat sample_fmts[] = {
+        AV_SAMPLE_FMT_DBLP, AV_SAMPLE_FMT_NONE
+    };
+
+    // inlink supports any channel layout
+    layouts = ff_all_channel_counts();
+    ff_channel_layouts_ref(layouts, &inlink->out_channel_layouts);
+
+    if (eval->same_chlayout) {
+        layouts = ff_all_channel_counts();
+        if (!layouts)
+            return AVERROR(ENOMEM);
+            ff_set_common_channel_layouts(ctx, layouts);
+    } else {
+        // outlink supports only requested output channel layout
+        layouts = NULL;
+        ff_add_channel_layout(&layouts,
+                              eval->out_channel_layout ? eval->out_channel_layout :
+                              FF_COUNT2LAYOUT(eval->nb_channels));
+        ff_channel_layouts_ref(layouts, &outlink->in_channel_layouts);
+    }
+
+    formats = ff_make_format_list(sample_fmts);
+    if (!formats)
+        return AVERROR(ENOMEM);
+    ff_set_common_formats(ctx, formats);
+
+    formats = ff_all_samplerates();
+    if (!formats)
+        return AVERROR(ENOMEM);
+    ff_set_common_samplerates(ctx, formats);
+
+    return 0;
+}
+
+static int aeval_config_output(AVFilterLink *outlink)
+{
+    AVFilterContext *ctx = outlink->src;
+    EvalContext *eval = ctx->priv;
+    AVFilterLink *inlink = ctx->inputs[0];
+    int ret;
+
+    if (eval->same_chlayout) {
+        eval->chlayout = inlink->channel_layout;
+
+        if ((ret = parse_channel_expressions(ctx, inlink->channels)) < 0)
+            return ret;
+    }
+
+    eval->n = 0;
+    eval->nb_in_channels = eval->var_values[VAR_NB_IN_CHANNELS] = inlink->channels;
+    eval->var_values[VAR_NB_OUT_CHANNELS] = outlink->channels;
+    eval->var_values[VAR_S] = inlink->sample_rate;
+    eval->var_values[VAR_T] = NAN;
+
+    eval->channel_values = av_realloc_f(eval->channel_values,
+                                        inlink->channels, sizeof(*eval->channel_values));
+    if (!eval->channel_values)
+        return AVERROR(ENOMEM);
+
+    return 0;
+}
+
+#define TS2T(ts, tb) ((ts) == AV_NOPTS_VALUE ? NAN : (double)(ts)*av_q2d(tb))
+
+static int filter_frame(AVFilterLink *inlink, AVFrame *in)
+{
+    EvalContext *eval     = inlink->dst->priv;
+    AVFilterLink *outlink = inlink->dst->outputs[0];
+    int nb_samples        = in->nb_samples;
+    AVFrame *out;
+    double t0;
+    int i, j;
+
+    /* do volume scaling in-place if input buffer is writable */
+    out = ff_get_audio_buffer(outlink, nb_samples);
+    if (!out)
+        return AVERROR(ENOMEM);
+    av_frame_copy_props(out, in);
+
+    t0 = TS2T(in->pts, inlink->time_base);
+
+    /* evaluate expression for each single sample and for each channel */
+    for (i = 0; i < nb_samples; i++, eval->n++) {
+        eval->var_values[VAR_N] = eval->n;
+        eval->var_values[VAR_T] = t0 + i * (double)1/inlink->sample_rate;
+
+        for (j = 0; j < inlink->channels; j++)
+            eval->channel_values[j] = *((double *) in->extended_data[j] + i);
+
+        for (j = 0; j < outlink->channels; j++) {
+            eval->var_values[VAR_CH] = j;
+            *((double *) out->extended_data[j] + i) =
+                av_expr_eval(eval->expr[j], eval->var_values, eval);
+        }
+    }
+
+    av_frame_free(&in);
+    return ff_filter_frame(outlink, out);
+}
+
+#if CONFIG_AEVAL_FILTER
+
+static const AVFilterPad aeval_inputs[] = {
+    {
+        .name           = "default",
+        .type           = AVMEDIA_TYPE_AUDIO,
+        .filter_frame   = filter_frame,
+    },
+    { NULL }
+};
+
+static const AVFilterPad aeval_outputs[] = {
+    {
+        .name          = "default",
+        .type          = AVMEDIA_TYPE_AUDIO,
+        .config_props  = aeval_config_output,
+    },
+    { NULL }
+};
+
+AVFilter ff_af_aeval = {
+    .name          = "aeval",
+    .description   = NULL_IF_CONFIG_SMALL("Filter audio signal according to a specified expression."),
+    .query_formats = aeval_query_formats,
+    .init          = init,
+    .uninit        = uninit,
+    .priv_size     = sizeof(EvalContext),
+    .inputs        = aeval_inputs,
+    .outputs       = aeval_outputs,
+    .priv_class    = &aeval_class,
+};
+
+#endif /* CONFIG_AEVAL_FILTER */

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/af_aconvert.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/af_aconvert.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/af_adelay.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/af_adelay.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/af_aecho.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/af_aecho.c Changed

@@ -16,7 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 
 #include "libavutil/avassert.h"
@@ -285,10 +284,11 @@
     s->echo_samples(s, s->delayptrs, frame->extended_data, out_frame->extended_data,
                     frame->nb_samples, inlink->channels);
 
+    s->next_pts = frame->pts + av_rescale_q(frame->nb_samples, (AVRational){1, inlink->sample_rate}, inlink->time_base);
+
     if (frame != out_frame)
         av_frame_free(&frame);
 
-    s->next_pts = frame->pts + av_rescale_q(frame->nb_samples, (AVRational){1, inlink->sample_rate}, inlink->time_base);
     return ff_filter_frame(ctx->outputs[0], out_frame);
 }
 
@@ -346,7 +346,7 @@
     { NULL }
 };
 
-AVFilter avfilter_af_aecho = {
+AVFilter ff_af_aecho = {
     .name          = "aecho",
     .description   = NULL_IF_CONFIG_SMALL("Add echoing to the audio."),
     .query_formats = query_formats,

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/af_afade.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/af_afade.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/af_aformat.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/af_aformat.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/af_amerge.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/af_amerge.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/af_amix.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/af_amix.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/af_anull.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/af_anull.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/af_apad.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/af_apad.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/af_aphaser.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/af_aphaser.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/af_aresample.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/af_aresample.c Changed

@@ -98,20 +98,23 @@
     ff_channel_layouts_ref(in_layouts,      &inlink->out_channel_layouts);
 
     if(out_rate > 0) {
-        out_samplerates = ff_make_format_list((int[]){ out_rate, -1 });
+        int ratelist[] = { out_rate, -1 };
+        out_samplerates = ff_make_format_list(ratelist);
     } else {
         out_samplerates = ff_all_samplerates();
     }
     ff_formats_ref(out_samplerates, &outlink->in_samplerates);
 
     if(out_format != AV_SAMPLE_FMT_NONE) {
-        out_formats = ff_make_format_list((int[]){ out_format, -1 });
+        int formatlist[] = { out_format, -1 };
+        out_formats = ff_make_format_list(formatlist);
     } else
         out_formats = ff_all_formats(AVMEDIA_TYPE_AUDIO);
     ff_formats_ref(out_formats, &outlink->in_formats);
 
     if(out_layout) {
-        out_layouts = avfilter_make_format64_list((int64_t[]){ out_layout, -1 });
+        int64_t layout_list[] = { out_layout, -1 };
+        out_layouts = avfilter_make_format64_list(layout_list);
     } else
         out_layouts = ff_all_channel_counts();
     ff_channel_layouts_ref(out_layouts, &outlink->in_channel_layouts);
@@ -170,11 +173,18 @@
 {
     AResampleContext *aresample = inlink->dst->priv;
     const int n_in  = insamplesref->nb_samples;
-    int n_out       = n_in * aresample->ratio * 2 + 256;
+    int64_t delay;
+    int n_out       = n_in * aresample->ratio + 32;
     AVFilterLink *const outlink = inlink->dst->outputs[0];
-    AVFrame *outsamplesref = ff_get_audio_buffer(outlink, n_out);
+    AVFrame *outsamplesref;
     int ret;
 
+    delay = swr_get_delay(aresample->swr, outlink->sample_rate);
+    if (delay > 0)
+        n_out += delay;
+
+    outsamplesref = ff_get_audio_buffer(outlink, n_out);
+
     if(!outsamplesref)
         return AVERROR(ENOMEM);
 
@@ -223,10 +233,15 @@
     if (ret == AVERROR_EOF) {
         AVFrame *outsamplesref;
         int n_out = 4096;
+        int64_t pts;
 
         outsamplesref = ff_get_audio_buffer(outlink, n_out);
         if (!outsamplesref)
             return AVERROR(ENOMEM);
+
+        pts = swr_next_pts(aresample->swr, INT64_MIN);
+        pts = ROUNDED_DIV(pts, inlink->sample_rate);
+
         n_out = swr_convert(aresample->swr, outsamplesref->extended_data, n_out, 0, 0);
         if (n_out <= 0) {
             av_frame_free(&outsamplesref);
@@ -235,14 +250,8 @@
 
         outsamplesref->sample_rate = outlink->sample_rate;
         outsamplesref->nb_samples  = n_out;
-#if 0
-        outsamplesref->pts = aresample->next_pts;
-        if(aresample->next_pts != AV_NOPTS_VALUE)
-            aresample->next_pts += av_rescale_q(n_out, (AVRational){1 ,outlink->sample_rate}, outlink->time_base);
-#else
-        outsamplesref->pts = swr_next_pts(aresample->swr, INT64_MIN);
-        outsamplesref->pts = ROUNDED_DIV(outsamplesref->pts, inlink->sample_rate);
-#endif
+
+        outsamplesref->pts = pts;
 
         return ff_filter_frame(outlink, outsamplesref);
     }
@@ -296,7 +305,7 @@
     { NULL }
 };
 
-AVFilter avfilter_af_aresample = {
+AVFilter ff_af_aresample = {
     .name          = "aresample",
     .description   = NULL_IF_CONFIG_SMALL("Resample audio data."),
     .init_dict     = init_dict,

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/af_asetnsamples.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/af_asetnsamples.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/af_asetrate.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/af_asetrate.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/af_ashowinfo.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/af_ashowinfo.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/af_astats.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/af_astats.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/af_astreamsync.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/af_astreamsync.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/af_asyncts.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/af_asyncts.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/af_atempo.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/af_atempo.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/af_biquads.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/af_biquads.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/af_channelmap.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/af_channelmap.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/af_channelsplit.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/af_channelsplit.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/af_compand.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/af_compand.c Changed

@@ -3,6 +3,7 @@
  * Copyright (c) 1999 Nick Bailey
  * Copyright (c) 2007 Rob Sykes <robs@users.sourceforge.net>
  * Copyright (c) 2013 Paul B Mahol
+ * Copyright (c) 2014 Andrew Kelley
  *
  * This file is part of FFmpeg.
  *
@@ -19,15 +20,19 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
+ */
+
+/**
+ * @file
+ * audio compand filter
  */
 
 #include "libavutil/avassert.h"
 #include "libavutil/avstring.h"
 #include "libavutil/opt.h"
 #include "libavutil/samplefmt.h"
-#include "avfilter.h"
 #include "audio.h"
+#include "avfilter.h"
 #include "internal.h"
 
 typedef struct ChanParam {
@@ -43,6 +48,7 @@
 
 typedef struct CompandContext {
     const AVClass *class;
+    int nb_segments;
     char *attacks, *decays, *points;
     CompandSegment *segments;
     ChanParam *channels;
@@ -52,7 +58,7 @@
     double gain_dB;
     double initial_volume;
     double delay;
-    uint8_t **delayptrs;
+    AVFrame *delay_frame;
     int delay_samples;
     int delay_count;
     int delay_index;
@@ -65,13 +71,13 @@
 #define A AV_OPT_FLAG_AUDIO_PARAM|AV_OPT_FLAG_FILTERING_PARAM
 
 static const AVOption compand_options[] = {
-    { "attacks", "set time over which increase of volume is determined", OFFSET(attacks), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 0, A },
-    { "decays", "set time over which decrease of volume is determined", OFFSET(decays), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 0, A },
-    { "points", "set points of transfer function", OFFSET(points), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 0, A },
-    { "soft-knee", "set soft-knee", OFFSET(curve_dB), AV_OPT_TYPE_DOUBLE, {.dbl=0.01}, 0.01, 900, A },
-    { "gain", "set output gain", OFFSET(gain_dB), AV_OPT_TYPE_DOUBLE, {.dbl=0}, -900, 900, A },
-    { "volume", "set initial volume", OFFSET(initial_volume), AV_OPT_TYPE_DOUBLE, {.dbl=0}, -900, 0, A },
-    { "delay", "set delay for samples before sending them to volume adjuster", OFFSET(delay), AV_OPT_TYPE_DOUBLE, {.dbl=0}, 0, 20, A },
+    { "attacks", "set time over which increase of volume is determined", OFFSET(attacks), AV_OPT_TYPE_STRING, { .str = "0.3" }, 0, 0, A },
+    { "decays", "set time over which decrease of volume is determined", OFFSET(decays), AV_OPT_TYPE_STRING, { .str = "0.8" }, 0, 0, A },
+    { "points", "set points of transfer function", OFFSET(points), AV_OPT_TYPE_STRING, { .str = "-70/-70|-60/-20" }, 0, 0, A },
+    { "soft-knee", "set soft-knee", OFFSET(curve_dB), AV_OPT_TYPE_DOUBLE, { .dbl = 0.01 }, 0.01, 900, A },
+    { "gain", "set output gain", OFFSET(gain_dB), AV_OPT_TYPE_DOUBLE, { .dbl = 0 }, -900, 900, A },
+    { "volume", "set initial volume", OFFSET(initial_volume), AV_OPT_TYPE_DOUBLE, { .dbl = 0 }, -900, 0, A },
+    { "delay", "set delay for samples before sending them to volume adjuster", OFFSET(delay), AV_OPT_TYPE_DOUBLE, { .dbl = 0 }, 0, 20, A },
     { NULL }
 };
 
@@ -80,12 +86,7 @@
 static av_cold int init(AVFilterContext *ctx)
 {
     CompandContext *s = ctx->priv;
-
-    if (!s->attacks || !s->decays || !s->points) {
-        av_log(ctx, AV_LOG_ERROR, "Missing attacks and/or decays and/or points.\n");
-        return AVERROR(EINVAL);
-    }
-
+    s->pts            = AV_NOPTS_VALUE;
     return 0;
 }
 
@@ -95,9 +96,7 @@
 
     av_freep(&s->channels);
     av_freep(&s->segments);
-    if (s->delayptrs)
-        av_freep(&s->delayptrs[0]);
-    av_freep(&s->delayptrs);
+    av_frame_free(&s->delay_frame);
 }
 
 static int query_formats(AVFilterContext *ctx)
@@ -133,10 +132,9 @@
 
     *nb_items = 1;
     for (p = item_str; *p; p++) {
-        if (*p == ' ')
+        if (*p == ' ' || *p == '|')
             (*nb_items)++;
     }
-
 }
 
 static void update_volume(ChanParam *cp, double in)
@@ -160,11 +158,10 @@
 
     in_log = log(in_lin);
 
-    for (i = 1;; i++)
-        if (in_log <= s->segments[i + 1].x)
+    for (i = 1; i < s->nb_segments; i++)
+        if (in_log <= s->segments[i].x)
             break;
-
-    cs = &s->segments[i];
+    cs = &s->segments[i - 1];
     in_log -= cs->x;
     out_log = cs->y + in_log * (cs->a * in_log + cs->b);
 
@@ -173,20 +170,28 @@
 
 static int compand_nodelay(AVFilterContext *ctx, AVFrame *frame)
 {
-    CompandContext *s = ctx->priv;
+    CompandContext *s    = ctx->priv;
     AVFilterLink *inlink = ctx->inputs[0];
-    const int channels = inlink->channels;
+    const int channels   = inlink->channels;
     const int nb_samples = frame->nb_samples;
     AVFrame *out_frame;
     int chan, i;
+    int err;
 
     if (av_frame_is_writable(frame)) {
         out_frame = frame;
     } else {
         out_frame = ff_get_audio_buffer(inlink, nb_samples);
-        if (!out_frame)
+        if (!out_frame) {
+            av_frame_free(&frame);
             return AVERROR(ENOMEM);
-        av_frame_copy_props(out_frame, frame);
+        }
+        err = av_frame_copy_props(out_frame, frame);
+        if (err < 0) {
+            av_frame_free(&out_frame);
+            av_frame_free(&frame);
+            return err;
+        }
     }
 
     for (chan = 0; chan < channels; chan++) {
@@ -211,19 +216,25 @@
 
 static int compand_delay(AVFilterContext *ctx, AVFrame *frame)
 {
-    CompandContext *s = ctx->priv;
+    CompandContext *s    = ctx->priv;
     AVFilterLink *inlink = ctx->inputs[0];
     const int channels = inlink->channels;
     const int nb_samples = frame->nb_samples;
     int chan, i, av_uninit(dindex), oindex, av_uninit(count);
-    AVFrame *out_frame = NULL;
+    AVFrame *out_frame   = NULL;
+    int err;
+
+    if (s->pts == AV_NOPTS_VALUE) {
+        s->pts = (frame->pts == AV_NOPTS_VALUE) ? 0 : frame->pts;
+    }
 
     av_assert1(channels > 0); /* would corrupt delay_count and delay_index */
 
     for (chan = 0; chan < channels; chan++) {
-        const double *src = (double *)frame->extended_data[chan];
-        double *dbuf = (double *)s->delayptrs[chan];
-        ChanParam *cp = &s->channels[chan];
+        AVFrame *delay_frame = s->delay_frame;
+        const double *src    = (double *)frame->extended_data[chan];
+        double *dbuf         = (double *)delay_frame->extended_data[chan];
+        ChanParam *cp        = &s->channels[chan];
         double *dst;
 
         count  = s->delay_count;
@@ -235,15 +246,25 @@
             if (count >= s->delay_samples) {
                 if (!out_frame) {
                     out_frame = ff_get_audio_buffer(inlink, nb_samples - i);
-                    if (!out_frame)
+                    if (!out_frame) {
+                        av_frame_free(&frame);
                         return AVERROR(ENOMEM);
-                    av_frame_copy_props(out_frame, frame);
+                    }
+                    err = av_frame_copy_props(out_frame, frame);
+                    if (err < 0) {
+                        av_frame_free(&out_frame);
+                        av_frame_free(&frame);
+                        return err;
+                    }
                     out_frame->pts = s->pts;
-                    s->pts += av_rescale_q(nb_samples - i, (AVRational){1, inlink->sample_rate}, inlink->time_base);
+                    s->pts += av_rescale_q(nb_samples - i,
+                        (AVRational){ 1, inlink->sample_rate },
+                        inlink->time_base);
                 }
 
                 dst = (double *)out_frame->extended_data[chan];
-                dst[oindex++] = av_clipd(dbuf[dindex] * get_volume(s, cp->volume), -1, 1);
+                dst[oindex++] = av_clipd(dbuf[dindex] *
+                        get_volume(s, cp->volume), -1, 1);
             } else {
                 count++;
             }
@@ -263,25 +284,29 @@
 static int compand_drain(AVFilterLink *outlink)
 {
     AVFilterContext *ctx = outlink->src;
-    CompandContext *s = ctx->priv;
-    const int channels = outlink->channels;
+    CompandContext *s    = ctx->priv;
+    const int channels   = outlink->channels;
+    AVFrame *frame       = NULL;
     int chan, i, dindex;
-    AVFrame *frame = NULL;
 
+    /* 2048 is to limit output frame size during drain */
     frame = ff_get_audio_buffer(outlink, FFMIN(2048, s->delay_count));
     if (!frame)
         return AVERROR(ENOMEM);
     frame->pts = s->pts;
-    s->pts += av_rescale_q(frame->nb_samples, (AVRational){1, outlink->sample_rate}, outlink->time_base);
+    s->pts += av_rescale_q(frame->nb_samples,
+            (AVRational){ 1, outlink->sample_rate }, outlink->time_base);
 
     for (chan = 0; chan < channels; chan++) {
-        double *dbuf = (double *)s->delayptrs[chan];
+        AVFrame *delay_frame = s->delay_frame;
+        double *dbuf = (double *)delay_frame->extended_data[chan];
         double *dst = (double *)frame->extended_data[chan];
         ChanParam *cp = &s->channels[chan];
 
         dindex = s->delay_index;
         for (i = 0; i < frame->nb_samples; i++) {
-            dst[i] = av_clipd(dbuf[dindex] * get_volume(s, cp->volume), -1, 1);
+            dst[i] = av_clipd(dbuf[dindex] * get_volume(s, cp->volume),
+                    -1, 1);
             dindex = MOD(dindex + 1, s->delay_samples);
         }
     }
@@ -293,68 +318,91 @@
 
 static int config_output(AVFilterLink *outlink)
 {
-    AVFilterContext *ctx = outlink->src;
-    CompandContext *s = ctx->priv;
+    AVFilterContext *ctx  = outlink->src;
+    CompandContext *s     = ctx->priv;
     const int sample_rate = outlink->sample_rate;
-    double radius = s->curve_dB * M_LN10 / 20;
+    double radius         = s->curve_dB * M_LN10 / 20.0;
+    char *p, *saveptr     = NULL;
+    const int channels    = outlink->channels;
     int nb_attacks, nb_decays, nb_points;
-    char *p, *saveptr = NULL;
     int new_nb_items, num;
     int i;
+    int err;
+
 
     count_items(s->attacks, &nb_attacks);
     count_items(s->decays, &nb_decays);
     count_items(s->points, &nb_points);
 
-    if ((nb_attacks > outlink->channels) || (nb_decays > outlink->channels)) {
-        av_log(ctx, AV_LOG_ERROR, "Number of attacks/decays bigger than number of channels.\n");
+    if (channels <= 0) {
+        av_log(ctx, AV_LOG_ERROR, "Invalid number of channels: %d\n", channels);
+        return AVERROR(EINVAL);
+    }
+
+    if (nb_attacks > channels || nb_decays > channels) {
+        av_log(ctx, AV_LOG_ERROR,
+                "Number of attacks/decays bigger than number of channels.\n");
         return AVERROR(EINVAL);
     }
 
     uninit(ctx);
 
-    s->channels = av_mallocz_array(outlink->channels, sizeof(*s->channels));
-    s->segments = av_mallocz_array((nb_points + 4) * 2, sizeof(*s->segments));
+    s->channels = av_mallocz_array(channels, sizeof(*s->channels));
+    s->nb_segments = (nb_points + 4) * 2;
+    s->segments = av_mallocz_array(s->nb_segments, sizeof(*s->segments));
 
-    if (!s->channels || !s->segments)
+    if (!s->channels || !s->segments) {
+        uninit(ctx);
         return AVERROR(ENOMEM);
+    }
 
     p = s->attacks;
     for (i = 0, new_nb_items = 0; i < nb_attacks; i++) {
-        char *tstr = av_strtok(p, " ", &saveptr);
+        char *tstr = av_strtok(p, " |", &saveptr);
         p = NULL;
         new_nb_items += sscanf(tstr, "%lf", &s->channels[i].attack) == 1;
-        if (s->channels[i].attack < 0)
+        if (s->channels[i].attack < 0) {
+            uninit(ctx);
             return AVERROR(EINVAL);
+        }
     }
     nb_attacks = new_nb_items;
 
     p = s->decays;
     for (i = 0, new_nb_items = 0; i < nb_decays; i++) {
-        char *tstr = av_strtok(p, " ", &saveptr);
+        char *tstr = av_strtok(p, " |", &saveptr);
         p = NULL;
         new_nb_items += sscanf(tstr, "%lf", &s->channels[i].decay) == 1;
-        if (s->channels[i].decay < 0)
+        if (s->channels[i].decay < 0) {
+            uninit(ctx);
             return AVERROR(EINVAL);
+        }
     }
     nb_decays = new_nb_items;
 
     if (nb_attacks != nb_decays) {
-        av_log(ctx, AV_LOG_ERROR, "Number of attacks %d differs from number of decays %d.\n", nb_attacks, nb_decays);
+        av_log(ctx, AV_LOG_ERROR,
+                "Number of attacks %d differs from number of decays %d.\n",
+                nb_attacks, nb_decays);
+        uninit(ctx);
         return AVERROR(EINVAL);
     }
 
 #define S(x) s->segments[2 * ((x) + 1)]
     p = s->points;
     for (i = 0, new_nb_items = 0; i < nb_points; i++) {
-        char *tstr = av_strtok(p, " ", &saveptr);
+        char *tstr = av_strtok(p, " |", &saveptr);
         p = NULL;
         if (sscanf(tstr, "%lf/%lf", &S(i).x, &S(i).y) != 2) {
-            av_log(ctx, AV_LOG_ERROR, "Invalid and/or missing input/output value.\n");
+            av_log(ctx, AV_LOG_ERROR,
+                    "Invalid and/or missing input/output value.\n");
+            uninit(ctx);
             return AVERROR(EINVAL);
         }
         if (i && S(i - 1).x > S(i).x) {
-            av_log(ctx, AV_LOG_ERROR, "Transfer function input values must be increasing.\n");
+            av_log(ctx, AV_LOG_ERROR,
+                    "Transfer function input values must be increasing.\n");
+            uninit(ctx);
             return AVERROR(EINVAL);
         }
         S(i).y -= S(i).x;
@@ -421,11 +469,11 @@
         L(2).x = x;
         L(2).y = y;
 
-        in1 = cx - L(3).x;
+        in1  = cx - L(3).x;
         out1 = cy - L(3).y;
-        in2 = L(2).x - L(3).x;
+        in2  = L(2).x - L(3).x;
         out2 = L(2).y - L(3).y;
-        L(3).a = (out2 / in2 - out1 / in1) / (in2-in1);
+        L(3).a = (out2 / in2 - out1 / in1) / (in2 - in1);
         L(3).b = out1 / in1 - L(3).a * in1;
     }
     L(3).x = 0;
@@ -434,7 +482,7 @@
     s->in_min_lin  = exp(s->segments[1].x);
     s->out_min_lin = exp(s->segments[1].y);
 
-    for (i = 0; i < outlink->channels; i++) {
+    for (i = 0; i < channels; i++) {
         ChanParam *cp = &s->channels[i];
 
         if (cp->attack > 1.0 / sample_rate)
@@ -449,25 +497,34 @@
     }
 
     s->delay_samples = s->delay * sample_rate;
-    if (s->delay_samples > 0) {
-        int ret;
-        if ((ret = av_samples_alloc_array_and_samples(&s->delayptrs, NULL,
-                                                      outlink->channels,
-                                                      s->delay_samples,
-                                                      outlink->format, 0)) < 0)
-            return ret;
-        s->compand = compand_delay;
-        outlink->flags |= FF_LINK_FLAG_REQUEST_LOOP;
-    } else {
+    if (s->delay_samples <= 0) {
         s->compand = compand_nodelay;
+        return 0;
     }
+
+    s->delay_frame = av_frame_alloc();
+    if (!s->delay_frame) {
+        uninit(ctx);
+        return AVERROR(ENOMEM);
+    }
+
+    s->delay_frame->format         = outlink->format;
+    s->delay_frame->nb_samples     = s->delay_samples;
+    s->delay_frame->channel_layout = outlink->channel_layout;
+
+    err = av_frame_get_buffer(s->delay_frame, 32);
+    if (err)
+        return err;
+
+    outlink->flags |= FF_LINK_FLAG_REQUEST_LOOP;
+    s->compand = compand_delay;
     return 0;
 }
 
 static int filter_frame(AVFilterLink *inlink, AVFrame *frame)
 {
     AVFilterContext *ctx = inlink->dst;
-    CompandContext *s = ctx->priv;
+    CompandContext *s    = ctx->priv;
 
     return s->compand(ctx, frame);
 }
@@ -475,7 +532,7 @@
 static int request_frame(AVFilterLink *outlink)
 {
     AVFilterContext *ctx = outlink->src;
-    CompandContext *s = ctx->priv;
+    CompandContext *s    = ctx->priv;
     int ret;
 
     ret = ff_request_frame(ctx->inputs[0]);
@@ -505,14 +562,16 @@
     { NULL }
 };
 
-AVFilter avfilter_af_compand = {
-    .name          = "compand",
-    .description   = NULL_IF_CONFIG_SMALL("Compress or expand audio dynamic range."),
-    .query_formats = query_formats,
-    .priv_size     = sizeof(CompandContext),
-    .priv_class    = &compand_class,
-    .init          = init,
-    .uninit        = uninit,
-    .inputs        = compand_inputs,
-    .outputs       = compand_outputs,
+
+AVFilter ff_af_compand = {
+    .name           = "compand",
+    .description    = NULL_IF_CONFIG_SMALL(
+            "Compress or expand audio dynamic range."),
+    .query_formats  = query_formats,
+    .priv_size      = sizeof(CompandContext),
+    .priv_class     = &compand_class,
+    .init           = init,
+    .uninit         = uninit,
+    .inputs         = compand_inputs,
+    .outputs        = compand_outputs,
 };

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/af_earwax.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/af_earwax.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/af_join.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/af_join.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/af_ladspa.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/af_ladspa.c Changed

@@ -450,9 +450,11 @@
 
             count_ports(desc, &inputs, &outputs);
             av_log(ctx, AV_LOG_INFO, "%lu:%lu %-25s %s\n", inputs, outputs, desc->Label,
-                                     av_x_if_null(desc->Name, "?"));
-            av_log(ctx, AV_LOG_VERBOSE, "Maker: %s\n", av_x_if_null(desc->Maker, "?"));
-            av_log(ctx, AV_LOG_VERBOSE, "Copyright: %s\n", av_x_if_null(desc->Copyright, "?"));
+                   (char *)av_x_if_null(desc->Name, "?"));
+            av_log(ctx, AV_LOG_VERBOSE, "Maker: %s\n",
+                   (char *)av_x_if_null(desc->Maker, "?"));
+            av_log(ctx, AV_LOG_VERBOSE, "Copyright: %s\n",
+                   (char *)av_x_if_null(desc->Copyright, "?"));
         }
         return AVERROR_EXIT;
     } else {
@@ -688,7 +690,7 @@
     { NULL }
 };
 
-AVFilter avfilter_af_ladspa = {
+AVFilter ff_af_ladspa = {
     .name          = "ladspa",
     .description   = NULL_IF_CONFIG_SMALL("Apply LADSPA effect."),
     .priv_size     = sizeof(LADSPAContext),

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/af_pan.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/af_pan.c Changed

@@ -46,7 +46,6 @@
     double gain[MAX_CHANNELS][MAX_CHANNELS];
     int64_t need_renorm;
     int need_renumber;
-    int nb_input_channels;
     int nb_output_channels;
 
     int pure_gains;
@@ -116,10 +115,10 @@
     if (!args)
         return AVERROR(ENOMEM);
     arg = av_strtok(args, "|", &tokenizer);
-    ret = ff_parse_channel_layout(&pan->out_channel_layout, arg, ctx);
+    ret = ff_parse_channel_layout(&pan->out_channel_layout,
+                                  &pan->nb_output_channels, arg, ctx);
     if (ret < 0)
         goto fail;
-    pan->nb_output_channels = av_get_channel_layout_nb_channels(pan->out_channel_layout);
 
     /* parse channel specifications */
     while ((arg = arg0 = av_strtok(NULL, "|", &tokenizer))) {
@@ -239,12 +238,14 @@
     ff_set_common_samplerates(ctx, formats);
 
     // inlink supports any channel layout
-    layouts = ff_all_channel_layouts();
+    layouts = ff_all_channel_counts();
     ff_channel_layouts_ref(layouts, &inlink->out_channel_layouts);
 
     // outlink supports only requested output channel layout
     layouts = NULL;
-    ff_add_channel_layout(&layouts, pan->out_channel_layout);
+    ff_add_channel_layout(&layouts,
+                          pan->out_channel_layout ? pan->out_channel_layout :
+                          FF_COUNT2LAYOUT(pan->nb_output_channels));
     ff_channel_layouts_ref(layouts, &outlink->in_channel_layouts);
     return 0;
 }
@@ -257,7 +258,6 @@
     int i, j, k, r;
     double t;
 
-    pan->nb_input_channels = av_get_channel_layout_nb_channels(link->channel_layout);
     if (pan->need_renumber) {
         // input channels were given by their name: renumber them
         for (i = j = 0; i < MAX_CHANNELS; i++) {
@@ -271,7 +271,7 @@
 
     // sanity check; can't be done in query_formats since the inlink
     // channel layout is unknown at that time
-    if (pan->nb_input_channels > SWR_CH_MAX ||
+    if (link->channels > SWR_CH_MAX ||
         pan->nb_output_channels > SWR_CH_MAX) {
         av_log(ctx, AV_LOG_ERROR,
                "libswresample support a maximum of %d channels. "
@@ -286,6 +286,10 @@
                                   0, ctx);
     if (!pan->swr)
         return AVERROR(ENOMEM);
+    if (!link->channel_layout)
+        av_opt_set_int(pan->swr, "ich", link->channels, 0);
+    if (!pan->out_channel_layout)
+        av_opt_set_int(pan->swr, "och", pan->nb_output_channels, 0);
 
     // gains are pure, init the channel mapping
     if (pan->pure_gains) {
@@ -293,7 +297,7 @@
         // get channel map from the pure gains
         for (i = 0; i < pan->nb_output_channels; i++) {
             int ch_id = -1;
-            for (j = 0; j < pan->nb_input_channels; j++) {
+            for (j = 0; j < link->channels; j++) {
                 if (pan->gain[i][j]) {
                     ch_id = j;
                     break;
@@ -311,7 +315,7 @@
             if (!((pan->need_renorm >> i) & 1))
                 continue;
             t = 0;
-            for (j = 0; j < pan->nb_input_channels; j++)
+            for (j = 0; j < link->channels; j++)
                 t += pan->gain[i][j];
             if (t > -1E-5 && t < 1E-5) {
                 // t is almost 0 but not exactly, this is probably a mistake
@@ -320,7 +324,7 @@
                            "Degenerate coefficients while renormalizing\n");
                 continue;
             }
-            for (j = 0; j < pan->nb_input_channels; j++)
+            for (j = 0; j < link->channels; j++)
                 pan->gain[i][j] /= t;
         }
         av_opt_set_int(pan->swr, "icl", link->channel_layout, 0);
@@ -335,7 +339,7 @@
     // summary
     for (i = 0; i < pan->nb_output_channels; i++) {
         cur = buf;
-        for (j = 0; j < pan->nb_input_channels; j++) {
+        for (j = 0; j < link->channels; j++) {
             r = snprintf(cur, buf + sizeof(buf) - cur, "%s%.3g i%d",
                          j ? " + " : "", pan->gain[i][j], j);
             cur += FFMIN(buf + sizeof(buf) - cur, r);
@@ -366,7 +370,8 @@
 
     if (!outsamples)
         return AVERROR(ENOMEM);
-    swr_convert(pan->swr, outsamples->data, n, (void *)insamples->data, n);
+    swr_convert(pan->swr, outsamples->extended_data, n,
+                (void *)insamples->extended_data, n);
     av_frame_copy_props(outsamples, insamples);
     outsamples->channel_layout = outlink->channel_layout;
     av_frame_set_channels(outsamples, outlink->channels);
@@ -409,7 +414,7 @@
     { NULL }
 };
 
-AVFilter avfilter_af_pan = {
+AVFilter ff_af_pan = {
     .name          = "pan",
     .description   = NULL_IF_CONFIG_SMALL("Remix channels with coefficients (panning)."),
     .priv_size     = sizeof(PanContext),

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/af_replaygain.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/af_replaygain.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/af_resample.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/af_resample.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/af_silencedetect.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/af_silencedetect.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/af_volume.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/af_volume.c Changed

@@ -39,41 +39,75 @@
     "fixed", "float", "double"
 };
 
+static const char *const var_names[] = {
+    "n",                   ///< frame number (starting at zero)
+    "nb_channels",         ///< number of channels
+    "nb_consumed_samples", ///< number of samples consumed by the filter
+    "nb_samples",          ///< number of samples in the current frame
+    "pos",                 ///< position in the file of the frame
+    "pts",                 ///< frame presentation timestamp
+    "sample_rate",         ///< sample rate
+    "startpts",            ///< PTS at start of stream
+    "startt",              ///< time at start of stream
+    "t",                   ///< time in the file of the frame
+    "tb",                  ///< timebase
+    "volume",              ///< last set value
+    NULL
+};
+
 #define OFFSET(x) offsetof(VolumeContext, x)
 #define A AV_OPT_FLAG_AUDIO_PARAM
 #define F AV_OPT_FLAG_FILTERING_PARAM
 
 static const AVOption volume_options[] = {
-    { "volume", "set volume adjustment",
-            OFFSET(volume), AV_OPT_TYPE_DOUBLE, { .dbl = 1.0 }, 0, 0x7fffff, A|F },
+    { "volume", "set volume adjustment expression",
+            OFFSET(volume_expr), AV_OPT_TYPE_STRING, { .str = "1.0" }, .flags = A|F },
     { "precision", "select mathematical precision",
             OFFSET(precision), AV_OPT_TYPE_INT, { .i64 = PRECISION_FLOAT }, PRECISION_FIXED, PRECISION_DOUBLE, A|F, "precision" },
         { "fixed",  "select 8-bit fixed-point",     0, AV_OPT_TYPE_CONST, { .i64 = PRECISION_FIXED  }, INT_MIN, INT_MAX, A|F, "precision" },
         { "float",  "select 32-bit floating-point", 0, AV_OPT_TYPE_CONST, { .i64 = PRECISION_FLOAT  }, INT_MIN, INT_MAX, A|F, "precision" },
         { "double", "select 64-bit floating-point", 0, AV_OPT_TYPE_CONST, { .i64 = PRECISION_DOUBLE }, INT_MIN, INT_MAX, A|F, "precision" },
+    { "eval", "specify when to evaluate expressions", OFFSET(eval_mode), AV_OPT_TYPE_INT, {.i64 = EVAL_MODE_ONCE}, 0, EVAL_MODE_NB-1, .flags = A|F, "eval" },
+         { "once",  "eval volume expression once", 0, AV_OPT_TYPE_CONST, {.i64=EVAL_MODE_ONCE},  .flags = A|F, .unit = "eval" },
+         { "frame", "eval volume expression per-frame",                  0, AV_OPT_TYPE_CONST, {.i64=EVAL_MODE_FRAME}, .flags = A|F, .unit = "eval" },
     { NULL }
 };
 
 AVFILTER_DEFINE_CLASS(volume);
 
-static av_cold int init(AVFilterContext *ctx)
+static int set_expr(AVExpr **pexpr, const char *expr, void *log_ctx)
 {
-    VolumeContext *vol = ctx->priv;
-
-    if (vol->precision == PRECISION_FIXED) {
-        vol->volume_i = (int)(vol->volume * 256 + 0.5);
-        vol->volume   = vol->volume_i / 256.0;
-        av_log(ctx, AV_LOG_VERBOSE, "volume:(%d/256)(%f)(%1.2fdB) precision:fixed\n",
-               vol->volume_i, vol->volume, 20.0*log(vol->volume)/M_LN10);
-    } else {
-        av_log(ctx, AV_LOG_VERBOSE, "volume:(%f)(%1.2fdB) precision:%s\n",
-               vol->volume, 20.0*log(vol->volume)/M_LN10,
-               precision_str[vol->precision]);
+    int ret;
+    AVExpr *old = NULL;
+
+    if (*pexpr)
+        old = *pexpr;
+    ret = av_expr_parse(pexpr, expr, var_names,
+                        NULL, NULL, NULL, NULL, 0, log_ctx);
+    if (ret < 0) {
+        av_log(log_ctx, AV_LOG_ERROR,
+               "Error when evaluating the volume expression '%s'\n", expr);
+        *pexpr = old;
+        return ret;
     }
 
+    av_expr_free(old);
     return 0;
 }
 
+static av_cold int init(AVFilterContext *ctx)
+{
+    VolumeContext *vol = ctx->priv;
+    return set_expr(&vol->volume_pexpr, vol->volume_expr, ctx);
+}
+
+static av_cold void uninit(AVFilterContext *ctx)
+{
+    VolumeContext *vol = ctx->priv;
+    av_expr_free(vol->volume_pexpr);
+    av_opt_free(vol);
+}
+
 static int query_formats(AVFilterContext *ctx)
 {
     VolumeContext *vol = ctx->priv;
@@ -101,7 +135,7 @@
         }
     };
 
-    layouts = ff_all_channel_layouts();
+    layouts = ff_all_channel_counts();
     if (!layouts)
         return AVERROR(ENOMEM);
     ff_set_common_channel_layouts(ctx, layouts);
@@ -199,6 +233,38 @@
         ff_volume_init_x86(vol);
 }
 
+static int set_volume(AVFilterContext *ctx)
+{
+    VolumeContext *vol = ctx->priv;
+
+    vol->volume = av_expr_eval(vol->volume_pexpr, vol->var_values, NULL);
+    if (isnan(vol->volume)) {
+        if (vol->eval_mode == EVAL_MODE_ONCE) {
+            av_log(ctx, AV_LOG_ERROR, "Invalid value NaN for volume\n");
+            return AVERROR(EINVAL);
+        } else {
+            av_log(ctx, AV_LOG_WARNING, "Invalid value NaN for volume, setting to 0\n");
+            vol->volume = 0;
+        }
+    }
+    vol->var_values[VAR_VOLUME] = vol->volume;
+
+    av_log(ctx, AV_LOG_VERBOSE, "n:%f t:%f pts:%f precision:%s ",
+           vol->var_values[VAR_N], vol->var_values[VAR_T], vol->var_values[VAR_PTS],
+           precision_str[vol->precision]);
+
+    if (vol->precision == PRECISION_FIXED) {
+        vol->volume_i = (int)(vol->volume * 256 + 0.5);
+        vol->volume   = vol->volume_i / 256.0;
+        av_log(ctx, AV_LOG_VERBOSE, "volume_i:%d/255 ", vol->volume_i);
+    }
+    av_log(ctx, AV_LOG_VERBOSE, "volume:%f volume_dB:%f\n",
+           vol->volume, 20.0*log(vol->volume)/M_LN10);
+
+    volume_init(vol);
+    return 0;
+}
+
 static int config_output(AVFilterLink *outlink)
 {
     AVFilterContext *ctx = outlink->src;
@@ -206,23 +272,78 @@
     AVFilterLink *inlink = ctx->inputs[0];
 
     vol->sample_fmt = inlink->format;
-    vol->channels   = av_get_channel_layout_nb_channels(inlink->channel_layout);
+    vol->channels   = inlink->channels;
     vol->planes     = av_sample_fmt_is_planar(inlink->format) ? vol->channels : 1;
 
-    volume_init(vol);
+    vol->var_values[VAR_N] =
+    vol->var_values[VAR_NB_CONSUMED_SAMPLES] =
+    vol->var_values[VAR_NB_SAMPLES] =
+    vol->var_values[VAR_POS] =
+    vol->var_values[VAR_PTS] =
+    vol->var_values[VAR_STARTPTS] =
+    vol->var_values[VAR_STARTT] =
+    vol->var_values[VAR_T] =
+    vol->var_values[VAR_VOLUME] = NAN;
+
+    vol->var_values[VAR_NB_CHANNELS] = inlink->channels;
+    vol->var_values[VAR_TB]          = av_q2d(inlink->time_base);
+    vol->var_values[VAR_SAMPLE_RATE] = inlink->sample_rate;
+
+    av_log(inlink->src, AV_LOG_VERBOSE, "tb:%f sample_rate:%f nb_channels:%f\n",
+           vol->var_values[VAR_TB],
+           vol->var_values[VAR_SAMPLE_RATE],
+           vol->var_values[VAR_NB_CHANNELS]);
+
+    return set_volume(ctx);
+}
 
-    return 0;
+static int process_command(AVFilterContext *ctx, const char *cmd, const char *args,
+                           char *res, int res_len, int flags)
+{
+    VolumeContext *vol = ctx->priv;
+    int ret = AVERROR(ENOSYS);
+
+    if (!strcmp(cmd, "volume")) {
+        if ((ret = set_expr(&vol->volume_pexpr, args, ctx)) < 0)
+            return ret;
+        if (vol->eval_mode == EVAL_MODE_ONCE)
+            set_volume(ctx);
+    }
+
+    return ret;
 }
 
+#define D2TS(d)  (isnan(d) ? AV_NOPTS_VALUE : (int64_t)(d))
+#define TS2D(ts) ((ts) == AV_NOPTS_VALUE ? NAN : (double)(ts))
+#define TS2T(ts, tb) ((ts) == AV_NOPTS_VALUE ? NAN : (double)(ts)*av_q2d(tb))
+
 static int filter_frame(AVFilterLink *inlink, AVFrame *buf)
 {
+    AVFilterContext *ctx = inlink->dst;
     VolumeContext *vol    = inlink->dst->priv;
     AVFilterLink *outlink = inlink->dst->outputs[0];
     int nb_samples        = buf->nb_samples;
     AVFrame *out_buf;
+    int64_t pos;
+    int ret;
 
-    if (vol->volume == 1.0 || vol->volume_i == 256)
-        return ff_filter_frame(outlink, buf);
+    if (isnan(vol->var_values[VAR_STARTPTS])) {
+        vol->var_values[VAR_STARTPTS] = TS2D(buf->pts);
+        vol->var_values[VAR_STARTT  ] = TS2T(buf->pts, inlink->time_base);
+    }
+    vol->var_values[VAR_PTS] = TS2D(buf->pts);
+    vol->var_values[VAR_T  ] = TS2T(buf->pts, inlink->time_base);
+    vol->var_values[VAR_N  ] = inlink->frame_count;
+
+    pos = av_frame_get_pkt_pos(buf);
+    vol->var_values[VAR_POS] = pos == -1 ? NAN : pos;
+    if (vol->eval_mode == EVAL_MODE_FRAME)
+        set_volume(ctx);
+
+    if (vol->volume == 1.0 || vol->volume_i == 256) {
+        out_buf = buf;
+        goto end;
+    }
 
     /* do volume scaling in-place if input buffer is writable */
     if (av_frame_is_writable(buf)) {
@@ -231,7 +352,12 @@
         out_buf = ff_get_audio_buffer(inlink, nb_samples);
         if (!out_buf)
             return AVERROR(ENOMEM);
-        av_frame_copy_props(out_buf, buf);
+        ret = av_frame_copy_props(out_buf, buf);
+        if (ret < 0) {
+            av_frame_free(&out_buf);
+            av_frame_free(&buf);
+            return ret;
+        }
     }
 
     if (vol->precision != PRECISION_FIXED || vol->volume_i > 0) {
@@ -266,6 +392,8 @@
     if (buf != out_buf)
         av_frame_free(&buf);
 
+end:
+    vol->var_values[VAR_NB_CONSUMED_SAMPLES] += out_buf->nb_samples;
     return ff_filter_frame(outlink, out_buf);
 }
 
@@ -287,14 +415,16 @@
     { NULL }
 };
 
-AVFilter avfilter_af_volume = {
+AVFilter ff_af_volume = {
     .name           = "volume",
     .description    = NULL_IF_CONFIG_SMALL("Change input volume."),
     .query_formats  = query_formats,
     .priv_size      = sizeof(VolumeContext),
     .priv_class     = &volume_class,
     .init           = init,
+    .uninit         = uninit,
     .inputs         = avfilter_af_volume_inputs,
     .outputs        = avfilter_af_volume_outputs,
     .flags          = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC,
+    .process_command = process_command,
 };

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/af_volume.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/af_volume.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/af_volumedetect.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/af_volumedetect.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/allfilters.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/allfilters.c Changed

@@ -26,15 +26,15 @@
 
 #define REGISTER_FILTER(X, x, y)                                        \
     {                                                                   \
-        extern AVFilter avfilter_##y##_##x;                             \
+        extern AVFilter ff_##y##_##x;                                   \
         if (CONFIG_##X##_FILTER)                                        \
-            avfilter_register(&avfilter_##y##_##x);                     \
+            avfilter_register(&ff_##y##_##x);                           \
     }
 
 #define REGISTER_FILTER_UNCONDITIONAL(x)                                \
     {                                                                   \
-        extern AVFilter avfilter_##x;                                   \
-        avfilter_register(&avfilter_##x);                               \
+        extern AVFilter ff_##x;                                         \
+        avfilter_register(&ff_##x);                                     \
     }
 
 void avfilter_register_all(void)
@@ -50,6 +50,7 @@
 #endif
     REGISTER_FILTER(ADELAY,         adelay,         af);
     REGISTER_FILTER(AECHO,          aecho,          af);
+    REGISTER_FILTER(AEVAL,          aeval,          af);
     REGISTER_FILTER(AFADE,          afade,          af);
     REGISTER_FILTER(AFORMAT,        aformat,        af);
     REGISTER_FILTER(AINTERLEAVE,    ainterleave,    af);
@@ -121,12 +122,14 @@
     REGISTER_FILTER(CURVES,         curves,         vf);
     REGISTER_FILTER(DCTDNOIZ,       dctdnoiz,       vf);
     REGISTER_FILTER(DECIMATE,       decimate,       vf);
+    REGISTER_FILTER(DEJUDDER,       dejudder,       vf);
     REGISTER_FILTER(DELOGO,         delogo,         vf);
     REGISTER_FILTER(DESHAKE,        deshake,        vf);
     REGISTER_FILTER(DRAWBOX,        drawbox,        vf);
     REGISTER_FILTER(DRAWGRID,       drawgrid,       vf);
     REGISTER_FILTER(DRAWTEXT,       drawtext,       vf);
     REGISTER_FILTER(EDGEDETECT,     edgedetect,     vf);
+    REGISTER_FILTER(ELBG,           elbg,           vf);
     REGISTER_FILTER(EXTRACTPLANES,  extractplanes,  vf);
     REGISTER_FILTER(FADE,           fade,           vf);
     REGISTER_FILTER(FIELD,          field,          vf);
@@ -134,6 +137,7 @@
     REGISTER_FILTER(FIELDORDER,     fieldorder,     vf);
     REGISTER_FILTER(FORMAT,         format,         vf);
     REGISTER_FILTER(FPS,            fps,            vf);
+    REGISTER_FILTER(FRAMEPACK,      framepack,      vf);
     REGISTER_FILTER(FRAMESTEP,      framestep,      vf);
     REGISTER_FILTER(FREI0R,         frei0r,         vf);
     REGISTER_FILTER(GEQ,            geq,            vf);

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/asink_anullsink.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/asink_anullsink.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/asrc_anullsrc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/asrc_anullsrc.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/asrc_flite.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/asrc_flite.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/asrc_sine.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/asrc_sine.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/avf_avectorscope.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/avf_avectorscope.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/avf_concat.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/avf_concat.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/avf_showspectrum.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/avf_showspectrum.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012 Clément Bœsch
+ * Copyright (c) 2012-2013 Clément Bœsch
  * Copyright (c) 2013 Rudolf Polzer <divverent@xonotic.org>
  *
  * This file is part of FFmpeg.
@@ -37,6 +37,7 @@
 enum DisplayMode  { COMBINED, SEPARATE, NB_MODES };
 enum DisplayScale { LINEAR, SQRT, CBRT, LOG, NB_SCALES };
 enum ColorMode    { CHANNEL, INTENSITY, NB_CLMODES };
+enum WindowFunc   { WFUNC_NONE, WFUNC_HANN, WFUNC_HAMMING, WFUNC_BLACKMAN, NB_WFUNC };
 
 typedef struct {
     const AVClass *class;
@@ -57,6 +58,7 @@
     int filled;                 ///< number of samples (per channel) filled in current rdft_buffer
     int consumed;               ///< number of samples (per channel) consumed from the input frame
     float *window_func_lut;     ///< Window function LUT
+    enum WindowFunc win_func;
     float *combine_buffer;      ///< color combining buffer (3 * h items)
 } ShowSpectrumContext;
 
@@ -68,17 +70,21 @@
     { "s",    "set video size", OFFSET(w), AV_OPT_TYPE_IMAGE_SIZE, {.str = "640x512"}, 0, 0, FLAGS },
     { "slide", "set sliding mode", OFFSET(sliding), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, FLAGS },
     { "mode", "set channel display mode", OFFSET(mode), AV_OPT_TYPE_INT, {.i64=COMBINED}, COMBINED, NB_MODES-1, FLAGS, "mode" },
-    { "combined", "combined mode", 0, AV_OPT_TYPE_CONST, {.i64=COMBINED}, 0, 0, FLAGS, "mode" },
-    { "separate", "separate mode", 0, AV_OPT_TYPE_CONST, {.i64=SEPARATE}, 0, 0, FLAGS, "mode" },
+        { "combined", "combined mode", 0, AV_OPT_TYPE_CONST, {.i64=COMBINED}, 0, 0, FLAGS, "mode" },
+        { "separate", "separate mode", 0, AV_OPT_TYPE_CONST, {.i64=SEPARATE}, 0, 0, FLAGS, "mode" },
     { "color", "set channel coloring", OFFSET(color_mode), AV_OPT_TYPE_INT, {.i64=CHANNEL}, CHANNEL, NB_CLMODES-1, FLAGS, "color" },
-    { "channel",   "separate color for each channel", 0, AV_OPT_TYPE_CONST, {.i64=CHANNEL},   0, 0, FLAGS, "color" },
-    { "intensity", "intensity based coloring",        0, AV_OPT_TYPE_CONST, {.i64=INTENSITY}, 0, 0, FLAGS, "color" },
+        { "channel",   "separate color for each channel", 0, AV_OPT_TYPE_CONST, {.i64=CHANNEL},   0, 0, FLAGS, "color" },
+        { "intensity", "intensity based coloring",        0, AV_OPT_TYPE_CONST, {.i64=INTENSITY}, 0, 0, FLAGS, "color" },
     { "scale", "set display scale", OFFSET(scale), AV_OPT_TYPE_INT, {.i64=SQRT}, LINEAR, NB_SCALES-1, FLAGS, "scale" },
-    { "sqrt", "square root", 0, AV_OPT_TYPE_CONST, {.i64=SQRT},   0, 0, FLAGS, "scale" },
-    { "cbrt", "cubic root",  0, AV_OPT_TYPE_CONST, {.i64=CBRT},   0, 0, FLAGS, "scale" },
-    { "log",  "logarithmic", 0, AV_OPT_TYPE_CONST, {.i64=LOG},    0, 0, FLAGS, "scale" },
-    { "lin",  "linear",      0, AV_OPT_TYPE_CONST, {.i64=LINEAR}, 0, 0, FLAGS, "scale" },
+        { "sqrt", "square root", 0, AV_OPT_TYPE_CONST, {.i64=SQRT},   0, 0, FLAGS, "scale" },
+        { "cbrt", "cubic root",  0, AV_OPT_TYPE_CONST, {.i64=CBRT},   0, 0, FLAGS, "scale" },
+        { "log",  "logarithmic", 0, AV_OPT_TYPE_CONST, {.i64=LOG},    0, 0, FLAGS, "scale" },
+        { "lin",  "linear",      0, AV_OPT_TYPE_CONST, {.i64=LINEAR}, 0, 0, FLAGS, "scale" },
     { "saturation", "color saturation multiplier", OFFSET(saturation), AV_OPT_TYPE_FLOAT, {.dbl = 1}, -10, 10, FLAGS },
+    { "win_func", "set window function", OFFSET(win_func), AV_OPT_TYPE_INT, {.i64 = WFUNC_HANN}, 0, NB_WFUNC-1, FLAGS, "win_func" },
+        { "hann",     "Hann window",     0, AV_OPT_TYPE_CONST, {.i64 = WFUNC_HANN},     0, 0, FLAGS, "win_func" },
+        { "hamming",  "Hamming window",  0, AV_OPT_TYPE_CONST, {.i64 = WFUNC_HAMMING},  0, 0, FLAGS, "win_func" },
+        { "blackman", "Blackman window", 0, AV_OPT_TYPE_CONST, {.i64 = WFUNC_BLACKMAN}, 0, 0, FLAGS, "win_func" },
     { NULL }
 };
 
@@ -195,14 +201,33 @@
         }
         s->filled = 0;
 
-        /* pre-calc windowing function (hann here) */
+        /* pre-calc windowing function */
         s->window_func_lut =
             av_realloc_f(s->window_func_lut, win_size,
                          sizeof(*s->window_func_lut));
         if (!s->window_func_lut)
             return AVERROR(ENOMEM);
-        for (i = 0; i < win_size; i++)
-            s->window_func_lut[i] = .5f * (1 - cos(2*M_PI*i / (win_size-1)));
+        switch (s->win_func) {
+        case WFUNC_NONE:
+            for (i = 0; i < win_size; i++)
+                s->window_func_lut[i] = 1.;
+            break;
+        case WFUNC_HANN:
+            for (i = 0; i < win_size; i++)
+                s->window_func_lut[i] = .5f * (1 - cos(2*M_PI*i / (win_size-1)));
+            break;
+        case WFUNC_HAMMING:
+            for (i = 0; i < win_size; i++)
+                s->window_func_lut[i] = .54f - .46f * cos(2*M_PI*i / (win_size-1));
+            break;
+        case WFUNC_BLACKMAN: {
+            for (i = 0; i < win_size; i++)
+                s->window_func_lut[i] = .42f - .5f*cos(2*M_PI*i / (win_size-1)) + .08f*cos(4*M_PI*i / (win_size-1));
+            break;
+        }
+        default:
+            av_assert0(0);
+        }
 
         /* prepare the initial picref buffer (black frame) */
         av_frame_free(&s->outpicref);
@@ -490,7 +515,7 @@
     { NULL }
 };
 
-AVFilter avfilter_avf_showspectrum = {
+AVFilter ff_avf_showspectrum = {
     .name          = "showspectrum",
     .description   = NULL_IF_CONFIG_SMALL("Convert input audio to a spectrum video output."),
     .uninit        = uninit,

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/avf_showwaves.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/avf_showwaves.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/avfilter.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/avfilter.c Changed

@@ -456,7 +456,11 @@
 }
 
 static AVFilter *first_filter;
+static AVFilter **last_filter = &first_filter;
 
+#if !FF_API_NOCONST_GET_NAME
+const
+#endif
 AVFilter *avfilter_get_by_name(const char *name)
 {
     const AVFilter *f = NULL;
@@ -473,7 +477,7 @@
 
 int avfilter_register(AVFilter *filter)
 {
-    AVFilter **f = &first_filter;
+    AVFilter **f = last_filter;
     int i;
 
     /* the filter must select generic or internal exclusively */
@@ -487,8 +491,9 @@
 
     filter->next = NULL;
 
-    while(avpriv_atomic_ptr_cas((void * volatile *)f, NULL, filter))
+    while(*f || avpriv_atomic_ptr_cas((void * volatile *)f, NULL, filter))
         f = &(*f)->next;
+    last_filter = &filter->next;
 
     return 0;
 }
@@ -994,7 +999,7 @@
     int (*filter_frame)(AVFilterLink *, AVFrame *);
     AVFilterContext *dstctx = link->dst;
     AVFilterPad *dst = link->dstpad;
-    AVFrame *out;
+    AVFrame *out = NULL;
     int ret;
     AVFilterCommand *cmd= link->dst->command_queue;
     int64_t pts;
@@ -1019,13 +1024,18 @@
         case AVMEDIA_TYPE_AUDIO:
             out = ff_get_audio_buffer(link, frame->nb_samples);
             break;
-        default: return AVERROR(EINVAL);
+        default:
+            ret = AVERROR(EINVAL);
+            goto fail;
         }
         if (!out) {
-            av_frame_free(&frame);
-            return AVERROR(ENOMEM);
+            ret = AVERROR(ENOMEM);
+            goto fail;
         }
-        av_frame_copy_props(out, frame);
+
+        ret = av_frame_copy_props(out, frame);
+        if (ret < 0)
+            goto fail;
 
         switch (link->type) {
         case AVMEDIA_TYPE_VIDEO:
@@ -1038,7 +1048,9 @@
                             av_get_channel_layout_nb_channels(frame->channel_layout),
                             frame->format);
             break;
-        default: return AVERROR(EINVAL);
+        default:
+            ret = AVERROR(EINVAL);
+            goto fail;
         }
 
         av_frame_free(&frame);
@@ -1071,6 +1083,11 @@
     link->frame_requested = 0;
     ff_update_link_current_pts(link, pts);
     return ret;
+
+fail:
+    av_frame_free(&out);
+    av_frame_free(&frame);
+    return ret;
 }
 
 static int ff_filter_frame_needs_framing(AVFilterLink *link, AVFrame *frame)

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/avfilter.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/avfilter.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/avfiltergraph.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/avfiltergraph.c Changed

@@ -654,6 +654,10 @@
             av_log(link->src, AV_LOG_ERROR, "Cannot select channel layout for"
                    " the link between filters %s and %s.\n", link->src->name,
                    link->dst->name);
+            if (!link->in_channel_layouts->all_counts)
+                av_log(link->src, AV_LOG_ERROR, "Unknown channel layouts not "
+                       "supported, try specifying a channel layout using "
+                       "'aformat=channel_layouts=something'.\n");
             return AVERROR(EINVAL);
         }
         link->in_channel_layouts->nb_channel_layouts = 1;
@@ -737,7 +741,8 @@
             if (inlink->type != outlink->type || fmts->nb_channel_layouts == 1)
                 continue;
 
-            if (fmts->all_layouts) {
+            if (fmts->all_layouts &&
+                (!FF_LAYOUT2COUNT(fmt) || fmts->all_counts)) {
                 /* Turn the infinite list into a singleton */
                 fmts->all_layouts = fmts->all_counts  = 0;
                 ff_add_channel_layout(&outlink->in_channel_layouts, fmt);

omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/avfilterres.rc Added

@@ -0,0 +1,55 @@
+/*
+ * Windows resource file for libavfilter
+ *
+ * Copyright (C) 2012 James Almer
+ * Copyright (C) 2013 Tiancheng "Timothy" Gu
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <windows.h>
+#include "libavfilter/version.h"
+#include "libavutil/ffversion.h"
+#include "config.h"
+
+1 VERSIONINFO
+FILEVERSION     LIBAVFILTER_VERSION_MAJOR, LIBAVFILTER_VERSION_MINOR, LIBAVFILTER_VERSION_MICRO, 0
+PRODUCTVERSION  LIBAVFILTER_VERSION_MAJOR, LIBAVFILTER_VERSION_MINOR, LIBAVFILTER_VERSION_MICRO, 0
+FILEFLAGSMASK   VS_FFI_FILEFLAGSMASK
+FILEOS          VOS_NT_WINDOWS32
+FILETYPE        VFT_DLL
+{
+    BLOCK "StringFileInfo"
+    {
+        BLOCK "040904B0"
+        {
+            VALUE "CompanyName",      "FFmpeg Project"
+            VALUE "FileDescription",  "FFmpeg audio/video filtering library"
+            VALUE "FileVersion",      AV_STRINGIFY(LIBAVFILTER_VERSION)
+            VALUE "InternalName",     "libavfilter"
+            VALUE "LegalCopyright",   "Copyright (C) 2000-" AV_STRINGIFY(CONFIG_THIS_YEAR) " FFmpeg Project"
+            VALUE "OriginalFilename", "avfilter" BUILDSUF "-" AV_STRINGIFY(LIBAVFILTER_VERSION_MAJOR) SLIBSUF
+            VALUE "ProductName",      "FFmpeg"
+            VALUE "ProductVersion",   FFMPEG_VERSION
+        }
+    }
+
+    BLOCK "VarFileInfo"
+    {
+        VALUE "Translation", 0x0409, 0x04B0
+    }
+}

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/buffer.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/buffer.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/buffersink.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/buffersink.c Changed

@@ -529,7 +529,7 @@
     { NULL },
 };
 
-AVFilter avfilter_vsink_ffbuffersink = {
+AVFilter ff_vsink_ffbuffersink = {
     .name      = "ffbuffersink",
     .description = NULL_IF_CONFIG_SMALL("Buffer video frames, and make them available to the end of the filter graph."),
     .priv_size = sizeof(BufferSinkContext),
@@ -551,7 +551,7 @@
     { NULL },
 };
 
-AVFilter avfilter_asink_ffabuffersink = {
+AVFilter ff_asink_ffabuffersink = {
     .name      = "ffabuffersink",
     .description = NULL_IF_CONFIG_SMALL("Buffer audio frames, and make them available to the end of the filter graph."),
     .init_opaque = asink_init,
@@ -573,7 +573,7 @@
     { NULL }
 };
 
-AVFilter avfilter_vsink_buffer = {
+AVFilter ff_vsink_buffer = {
     .name        = "buffersink",
     .description = NULL_IF_CONFIG_SMALL("Buffer video frames, and make them available to the end of the filter graph."),
     .priv_size   = sizeof(BufferSinkContext),
@@ -595,7 +595,7 @@
     { NULL }
 };
 
-AVFilter avfilter_asink_abuffer = {
+AVFilter ff_asink_abuffer = {
     .name        = "abuffersink",
     .description = NULL_IF_CONFIG_SMALL("Buffer audio frames, and make them available to the end of the filter graph."),
     .priv_class  = &abuffersink_class,

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/buffersink.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/buffersink.h Changed

@@ -21,11 +21,18 @@
 
 /**
  * @file
+ * @ingroup lavfi_buffersink
  * memory buffer sink API for audio and video
  */
 
 #include "avfilter.h"
 
+/**
+ * @defgroup lavfi_buffersink Buffer sink API
+ * @ingroup lavfi
+ * @{
+ */
+
 #if FF_API_AVFILTERBUFFER
 /**
  * Get an audio/video buffer data from buffer_sink and put it in bufref.
@@ -162,8 +169,12 @@
  * @param frame pointer to an allocated frame that will be filled with data.
  *              The data must be freed using av_frame_unref() / av_frame_free()
  *
- * @return >= 0 in case of success, a negative AVERROR code in case of
- *         failure.
+ * @return
+ *         - >= 0 if a frame was successfully returned.
+ *         - AVERROR(EAGAIN) if no frames are available at this point; more
+ *           input frames must be added to the filtergraph to get more output.
+ *         - AVERROR_EOF if there will be no more output frames on this sink.
+ *         - A different negative AVERROR code in other failure cases.
  */
 int av_buffersink_get_frame(AVFilterContext *ctx, AVFrame *frame);
 
@@ -178,9 +189,16 @@
  *              frame will contain exactly nb_samples audio samples, except at
  *              the end of stream, when it can contain less than nb_samples.
  *
+ * @return The return codes have the same meaning as for
+ *         av_buffersink_get_samples().
+ *
  * @warning do not mix this function with av_buffersink_get_frame(). Use only one or
  * the other with a single sink, not both.
  */
 int av_buffersink_get_samples(AVFilterContext *ctx, AVFrame *frame, int nb_samples);
 
+/**
+ * @}
+ */
+
 #endif /* AVFILTER_BUFFERSINK_H */

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/buffersrc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/buffersrc.c Changed

@@ -58,7 +58,6 @@
     /* audio only */
     int sample_rate;
     enum AVSampleFormat sample_fmt;
-    char               *sample_fmt_str;
     int channels;
     uint64_t channel_layout;
     char    *channel_layout_str;
@@ -121,7 +120,7 @@
 {
     BufferSourceContext *s = ctx->priv;
     AVFrame *copy;
-    int ret;
+    int refcounted, ret;
 
     s->nb_failed_requests = 0;
 
@@ -131,6 +130,8 @@
     } else if (s->eof)
         return AVERROR(EINVAL);
 
+    refcounted = !!frame->buf[0];
+
     if (!(flags & AV_BUFFERSRC_FLAG_NO_CHECK_FORMAT)) {
 
     switch (ctx->outputs[0]->type) {
@@ -158,10 +159,20 @@
 
     if (!(copy = av_frame_alloc()))
         return AVERROR(ENOMEM);
-    av_frame_move_ref(copy, frame);
+
+    if (refcounted) {
+        av_frame_move_ref(copy, frame);
+    } else {
+        ret = av_frame_ref(copy, frame);
+        if (ret < 0) {
+            av_frame_free(&copy);
+            return ret;
+        }
+    }
 
     if ((ret = av_fifo_generic_write(s->fifo, &copy, sizeof(copy), NULL)) < 0) {
-        av_frame_move_ref(frame, copy);
+        if (refcounted)
+            av_frame_move_ref(frame, copy);
         av_frame_free(&copy);
         return ret;
     }
@@ -326,7 +337,7 @@
     { "width",         NULL,                     OFFSET(w),                AV_OPT_TYPE_INT,      { .i64 = 0 }, 0, INT_MAX, V },
     { "video_size",    NULL,                     OFFSET(w),                AV_OPT_TYPE_IMAGE_SIZE,                .flags = V },
     { "height",        NULL,                     OFFSET(h),                AV_OPT_TYPE_INT,      { .i64 = 0 }, 0, INT_MAX, V },
-    { "pix_fmt",       NULL,                     OFFSET(pix_fmt),          AV_OPT_TYPE_PIXEL_FMT,                 .flags = V },
+    { "pix_fmt",       NULL,                     OFFSET(pix_fmt),          AV_OPT_TYPE_PIXEL_FMT, { .i64 = AV_PIX_FMT_NONE }, .min = AV_PIX_FMT_NONE, .max = INT_MAX, .flags = V },
 #if FF_API_OLD_FILTER_OPTS
     /* those 4 are for compatibility with the old option passing system where each filter
      * did its own parsing */
@@ -348,7 +359,7 @@
 static const AVOption abuffer_options[] = {
     { "time_base",      NULL, OFFSET(time_base),           AV_OPT_TYPE_RATIONAL, { .dbl = 0 }, 0, INT_MAX, A },
     { "sample_rate",    NULL, OFFSET(sample_rate),         AV_OPT_TYPE_INT,      { .i64 = 0 }, 0, INT_MAX, A },
-    { "sample_fmt",     NULL, OFFSET(sample_fmt_str),      AV_OPT_TYPE_STRING,             .flags = A },
+    { "sample_fmt",     NULL, OFFSET(sample_fmt),          AV_OPT_TYPE_SAMPLE_FMT, { .i64 = AV_SAMPLE_FMT_NONE }, .min = AV_SAMPLE_FMT_NONE, .max = INT_MAX, .flags = A },
     { "channel_layout", NULL, OFFSET(channel_layout_str),  AV_OPT_TYPE_STRING,             .flags = A },
     { "channels",       NULL, OFFSET(channels),            AV_OPT_TYPE_INT,      { .i64 = 0 }, 0, INT_MAX, A },
     { NULL },
@@ -361,10 +372,8 @@
     BufferSourceContext *s = ctx->priv;
     int ret = 0;
 
-    s->sample_fmt = av_get_sample_fmt(s->sample_fmt_str);
     if (s->sample_fmt == AV_SAMPLE_FMT_NONE) {
-        av_log(ctx, AV_LOG_ERROR, "Invalid sample format %s\n",
-               s->sample_fmt_str);
+        av_log(ctx, AV_LOG_ERROR, "Sample format was not set or was invalid\n");
         return AVERROR(EINVAL);
     }
 
@@ -402,7 +411,7 @@
 
     av_log(ctx, AV_LOG_VERBOSE,
            "tb:%d/%d samplefmt:%s samplerate:%d chlayout:%s\n",
-           s->time_base.num, s->time_base.den, s->sample_fmt_str,
+           s->time_base.num, s->time_base.den, av_get_sample_fmt_name(s->sample_fmt),
            s->sample_rate, s->channel_layout_str);
     s->warning_limit = 100;
 
@@ -511,7 +520,7 @@
     { NULL }
 };
 
-AVFilter avfilter_vsrc_buffer = {
+AVFilter ff_vsrc_buffer = {
     .name      = "buffer",
     .description = NULL_IF_CONFIG_SMALL("Buffer video frames, and make them accessible to the filterchain."),
     .priv_size = sizeof(BufferSourceContext),
@@ -536,7 +545,7 @@
     { NULL }
 };
 
-AVFilter avfilter_asrc_abuffer = {
+AVFilter ff_asrc_abuffer = {
     .name          = "abuffer",
     .description   = NULL_IF_CONFIG_SMALL("Buffer audio frames, and make them accessible to the filterchain."),
     .priv_size     = sizeof(BufferSourceContext),

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/buffersrc.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/buffersrc.h Changed

@@ -22,12 +22,19 @@
 
 /**
  * @file
+ * @ingroup lavfi_buffersrc
  * Memory buffer source API.
  */
 
 #include "libavcodec/avcodec.h"
 #include "avfilter.h"
 
+/**
+ * @defgroup lavfi_buffersrc Buffer source API
+ * @ingroup lavfi
+ * @{
+ */
+
 enum {
 
     /**
@@ -79,8 +86,9 @@
 
 #if FF_API_AVFILTERBUFFER
 /**
- * Add a buffer to the filtergraph s.
+ * Add a buffer to a filtergraph.
  *
+ * @param ctx an instance of the buffersrc filter
  * @param buf buffer containing frame data to be passed down the filtergraph.
  * This function will take ownership of buf, the user must not free it.
  * A NULL buf signals EOF -- i.e. no more frames will be sent to this filter.
@@ -88,13 +96,13 @@
  * @deprecated use av_buffersrc_write_frame() or av_buffersrc_add_frame()
  */
 attribute_deprecated
-int av_buffersrc_buffer(AVFilterContext *s, AVFilterBufferRef *buf);
+int av_buffersrc_buffer(AVFilterContext *ctx, AVFilterBufferRef *buf);
 #endif
 
 /**
  * Add a frame to the buffer source.
  *
- * @param s an instance of the buffersrc filter.
+ * @param ctx   an instance of the buffersrc filter
  * @param frame frame to be added. If the frame is reference counted, this
  * function will make a new reference to it. Otherwise the frame data will be
  * copied.
@@ -104,12 +112,12 @@
  * This function is equivalent to av_buffersrc_add_frame_flags() with the
  * AV_BUFFERSRC_FLAG_KEEP_REF flag.
  */
-int av_buffersrc_write_frame(AVFilterContext *s, const AVFrame *frame);
+int av_buffersrc_write_frame(AVFilterContext *ctx, const AVFrame *frame);
 
 /**
  * Add a frame to the buffer source.
  *
- * @param s an instance of the buffersrc filter.
+ * @param ctx   an instance of the buffersrc filter
  * @param frame frame to be added. If the frame is reference counted, this
  * function will take ownership of the reference(s) and reset the frame.
  * Otherwise the frame data will be copied. If this function returns an error,
@@ -145,4 +153,8 @@
                                  AVFrame *frame, int flags);
 
 
+/**
+ * @}
+ */
+
 #endif /* AVFILTER_BUFFERSRC_H */

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/deshake.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/deshake.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/deshake_opencl.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/deshake_opencl.c Changed

@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2013 Wei Gao <weigao@multicorewareinc.com>
+ * Copyright (C) 2013 Lenny Wang
  *
  * This file is part of FFmpeg.
  *
@@ -29,8 +30,8 @@
 #include "deshake_opencl.h"
 #include "libavutil/opencl_internal.h"
 
-#define MATRIX_SIZE 6
 #define PLANE_NUM 3
+#define ROUND_TO_16(a) ((((a - 1)/16)+1)*16)
 
 int ff_opencl_transform(AVFilterContext *ctx,
                         int width, int height, int cw, int ch,
@@ -39,29 +40,40 @@
                         enum FillMethod fill, AVFrame *in, AVFrame *out)
 {
     int ret = 0;
-    const size_t global_work_size = width * height + 2 * ch * cw;
     cl_int status;
     DeshakeContext *deshake = ctx->priv;
-    FFOpenclParam opencl_param = {0};
-
-    opencl_param.ctx = ctx;
-    opencl_param.kernel = deshake->opencl_ctx.kernel_env.kernel;
-    ret = av_opencl_buffer_write(deshake->opencl_ctx.cl_matrix_y, (uint8_t *)matrix_y, deshake->opencl_ctx.matrix_size * sizeof(cl_float));
-    if (ret < 0)
-        return ret;
-    ret = av_opencl_buffer_write(deshake->opencl_ctx.cl_matrix_uv, (uint8_t *)matrix_uv, deshake->opencl_ctx.matrix_size * sizeof(cl_float));
-    if (ret < 0)
-        return ret;
+    float4 packed_matrix_lu = {matrix_y[0], matrix_y[1], matrix_y[2], matrix_y[5]};
+    float4 packed_matrix_ch = {matrix_uv[0], matrix_uv[1], matrix_uv[2], matrix_uv[5]};
+    size_t global_worksize_lu[2] = {(size_t)ROUND_TO_16(width), (size_t)ROUND_TO_16(height)};
+    size_t global_worksize_ch[2] = {(size_t)ROUND_TO_16(cw), (size_t)(2*ROUND_TO_16(ch))};
+    size_t local_worksize[2] = {16, 16};
+    FFOpenclParam param_lu = {0};
+    FFOpenclParam param_ch = {0};
+    param_lu.ctx = param_ch.ctx = ctx;
+    param_lu.kernel = deshake->opencl_ctx.kernel_luma;
+    param_ch.kernel = deshake->opencl_ctx.kernel_chroma;
 
     if ((unsigned int)interpolate > INTERPOLATE_BIQUADRATIC) {
         av_log(ctx, AV_LOG_ERROR, "Selected interpolate method is invalid\n");
         return AVERROR(EINVAL);
     }
-    ret = ff_opencl_set_parameter(&opencl_param,
+    ret = ff_opencl_set_parameter(&param_lu,
                                   FF_OPENCL_PARAM_INFO(deshake->opencl_ctx.cl_inbuf),
                                   FF_OPENCL_PARAM_INFO(deshake->opencl_ctx.cl_outbuf),
-                                  FF_OPENCL_PARAM_INFO(deshake->opencl_ctx.cl_matrix_y),
-                                  FF_OPENCL_PARAM_INFO(deshake->opencl_ctx.cl_matrix_uv),
+                                  FF_OPENCL_PARAM_INFO(packed_matrix_lu),
+                                  FF_OPENCL_PARAM_INFO(interpolate),
+                                  FF_OPENCL_PARAM_INFO(fill),
+                                  FF_OPENCL_PARAM_INFO(in->linesize[0]),
+                                  FF_OPENCL_PARAM_INFO(out->linesize[0]),
+                                  FF_OPENCL_PARAM_INFO(height),
+                                  FF_OPENCL_PARAM_INFO(width),
+                                  NULL);
+    if (ret < 0)
+        return ret;
+    ret = ff_opencl_set_parameter(&param_ch,
+                                  FF_OPENCL_PARAM_INFO(deshake->opencl_ctx.cl_inbuf),
+                                  FF_OPENCL_PARAM_INFO(deshake->opencl_ctx.cl_outbuf),
+                                  FF_OPENCL_PARAM_INFO(packed_matrix_ch),
                                   FF_OPENCL_PARAM_INFO(interpolate),
                                   FF_OPENCL_PARAM_INFO(fill),
                                   FF_OPENCL_PARAM_INFO(in->linesize[0]),
@@ -75,14 +87,16 @@
                                   NULL);
     if (ret < 0)
         return ret;
-    status = clEnqueueNDRangeKernel(deshake->opencl_ctx.kernel_env.command_queue,
-                                    deshake->opencl_ctx.kernel_env.kernel, 1, NULL,
-                                    &global_work_size, NULL, 0, NULL, NULL);
+    status = clEnqueueNDRangeKernel(deshake->opencl_ctx.command_queue,
+                                    deshake->opencl_ctx.kernel_luma, 2, NULL,
+                                    global_worksize_lu, local_worksize, 0, NULL, NULL);
+    status |= clEnqueueNDRangeKernel(deshake->opencl_ctx.command_queue,
+                                    deshake->opencl_ctx.kernel_chroma, 2, NULL,
+                                    global_worksize_ch, local_worksize, 0, NULL, NULL);
     if (status != CL_SUCCESS) {
         av_log(ctx, AV_LOG_ERROR, "OpenCL run kernel error occurred: %s\n", av_opencl_errstr(status));
         return AVERROR_EXTERNAL;
     }
-    clFinish(deshake->opencl_ctx.kernel_env.command_queue);
     ret = av_opencl_buffer_read_image(out->data, deshake->opencl_ctx.out_plane_size,
                                       deshake->opencl_ctx.plane_num, deshake->opencl_ctx.cl_outbuf,
                                       deshake->opencl_ctx.cl_outbuf_size);
@@ -98,21 +112,31 @@
     ret = av_opencl_init(NULL);
     if (ret < 0)
         return ret;
-    deshake->opencl_ctx.matrix_size = MATRIX_SIZE;
-    deshake->opencl_ctx.plane_num   = PLANE_NUM;
-    ret = av_opencl_buffer_create(&deshake->opencl_ctx.cl_matrix_y,
-        deshake->opencl_ctx.matrix_size*sizeof(cl_float), CL_MEM_READ_ONLY, NULL);
-    if (ret < 0)
-        return ret;
-    ret = av_opencl_buffer_create(&deshake->opencl_ctx.cl_matrix_uv,
-        deshake->opencl_ctx.matrix_size*sizeof(cl_float), CL_MEM_READ_ONLY, NULL);
-    if (ret < 0)
-        return ret;
-    if (!deshake->opencl_ctx.kernel_env.kernel) {
-        ret =  av_opencl_create_kernel(&deshake->opencl_ctx.kernel_env, "avfilter_transform");
-        if (ret < 0) {
-            av_log(ctx, AV_LOG_ERROR, "OpenCL failed to create kernel for name 'avfilter_transform'\n");
-            return ret;
+    deshake->opencl_ctx.plane_num = PLANE_NUM;
+    deshake->opencl_ctx.command_queue = av_opencl_get_command_queue();
+    if (!deshake->opencl_ctx.command_queue) {
+        av_log(ctx, AV_LOG_ERROR, "Unable to get OpenCL command queue in filter 'deshake'\n");
+        return AVERROR(EINVAL);
+    }
+    deshake->opencl_ctx.program = av_opencl_compile("avfilter_transform", NULL);
+    if (!deshake->opencl_ctx.program) {
+        av_log(ctx, AV_LOG_ERROR, "OpenCL failed to compile program 'avfilter_transform'\n");
+        return AVERROR(EINVAL);
+    }
+    if (!deshake->opencl_ctx.kernel_luma) {
+        deshake->opencl_ctx.kernel_luma = clCreateKernel(deshake->opencl_ctx.program,
+                                                         "avfilter_transform_luma", &ret);
+        if (ret != CL_SUCCESS) {
+            av_log(ctx, AV_LOG_ERROR, "OpenCL failed to create kernel 'avfilter_transform_luma'\n");
+            return AVERROR(EINVAL);
+        }
+    }
+    if (!deshake->opencl_ctx.kernel_chroma) {
+        deshake->opencl_ctx.kernel_chroma = clCreateKernel(deshake->opencl_ctx.program,
+                                                           "avfilter_transform_chroma", &ret);
+        if (ret != CL_SUCCESS) {
+            av_log(ctx, AV_LOG_ERROR, "OpenCL failed to create kernel 'avfilter_transform_chroma'\n");
+            return AVERROR(EINVAL);
         }
     }
     return ret;
@@ -123,13 +147,13 @@
     DeshakeContext *deshake = ctx->priv;
     av_opencl_buffer_release(&deshake->opencl_ctx.cl_inbuf);
     av_opencl_buffer_release(&deshake->opencl_ctx.cl_outbuf);
-    av_opencl_buffer_release(&deshake->opencl_ctx.cl_matrix_y);
-    av_opencl_buffer_release(&deshake->opencl_ctx.cl_matrix_uv);
-    av_opencl_release_kernel(&deshake->opencl_ctx.kernel_env);
+    clReleaseKernel(deshake->opencl_ctx.kernel_luma);
+    clReleaseKernel(deshake->opencl_ctx.kernel_chroma);
+    clReleaseProgram(deshake->opencl_ctx.program);
+    deshake->opencl_ctx.command_queue = NULL;
     av_opencl_uninit();
 }
 
-
 int ff_opencl_deshake_process_inout_buf(AVFilterContext *ctx, AVFrame *in, AVFrame *out)
 {
     int ret = 0;

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/deshake_opencl.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/deshake_opencl.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/deshake_opencl_kernel.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/deshake_opencl_kernel.h Changed

@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2013 Wei Gao <weigao@multicorewareinc.com>
+ * Copyright (C) 2013 Lenny Wang
  *
  *
  * This file is part of FFmpeg.
@@ -25,16 +26,16 @@
 #include "libavutil/opencl.h"
 
 const char *ff_kernel_deshake_opencl = AV_OPENCL_KERNEL(
-
-inline unsigned char pixel(global const unsigned char *src, float x, float y,
+inline unsigned char pixel(global const unsigned char *src, int x, int y,
                            int w, int h,int stride, unsigned char def)
 {
-    return (x < 0 || y < 0 || x >= w || y >= h) ? def : src[(int)x + (int)y * stride];
+    return (x < 0 || y < 0 || x >= w || y >= h) ? def : src[x + y * stride];
 }
+
 unsigned char interpolate_nearest(float x, float y, global const unsigned char *src,
                                   int width, int height, int stride, unsigned char def)
 {
-    return pixel(src, (int)(x + 0.5), (int)(y + 0.5), width, height, stride, def);
+    return pixel(src, (int)(x + 0.5f), (int)(y + 0.5f), width, height, stride, def);
 }
 
 unsigned char interpolate_bilinear(float x, float y, global const unsigned char *src,
@@ -42,21 +43,18 @@
 {
     int x_c, x_f, y_c, y_f;
     int v1, v2, v3, v4;
+    x_f = (int)x;
+    y_f = (int)y;
+    x_c = x_f + 1;
+    y_c = y_f + 1;
 
-    if (x < -1 || x > width || y < -1 || y > height) {
+    if (x_f < -1 || x_f > width || y_f < -1 || y_f > height) {
         return def;
     } else {
-        x_f = (int)x;
-        x_c = x_f + 1;
-
-        y_f = (int)y;
-        y_c = y_f + 1;
-
-        v1 = pixel(src, x_c, y_c, width, height, stride, def);
+        v4 = pixel(src, x_f, y_f, width, height, stride, def);
         v2 = pixel(src, x_c, y_f, width, height, stride, def);
         v3 = pixel(src, x_f, y_c, width, height, stride, def);
-        v4 = pixel(src, x_f, y_f, width, height, stride, def);
-
+        v1 = pixel(src, x_c, y_c, width, height, stride, def);
         return (v1*(x - x_f)*(y - y_f) + v2*((x - x_f)*(y_c - y)) +
                 v3*(x_c - x)*(y - y_f) + v4*((x_c - x)*(y_c - y)));
     }
@@ -68,19 +66,18 @@
     int     x_c, x_f, y_c, y_f;
     unsigned char v1,  v2,  v3,  v4;
     float   f1,  f2,  f3,  f4;
+    x_f = (int)x;
+    y_f = (int)y;
+    x_c = x_f + 1;
+    y_c = y_f + 1;
 
-    if (x < - 1 || x > width || y < -1 || y > height)
+    if (x_f < - 1 || x_f > width || y_f < -1 || y_f > height)
         return def;
     else {
-        x_f = (int)x;
-        x_c = x_f + 1;
-        y_f = (int)y;
-        y_c = y_f + 1;
-
-        v1 = pixel(src, x_c, y_c, width, height, stride, def);
+        v4 = pixel(src, x_f, y_f, width, height, stride, def);
         v2 = pixel(src, x_c, y_f, width, height, stride, def);
         v3 = pixel(src, x_f, y_c, width, height, stride, def);
-        v4 = pixel(src, x_f, y_f, width, height, stride, def);
+        v1 = pixel(src, x_c, y_c, width, height, stride, def);
 
         f1 = 1 - sqrt((x_c - x) * (y_c - y));
         f2 = 1 - sqrt((x_c - x) * (y - y_f));
@@ -107,109 +104,120 @@
     return v;
 }
 
-kernel void avfilter_transform(global  unsigned char *src,
-                               global  unsigned char *dst,
-                               global          float *matrix,
-                               global          float *matrix2,
-                                                 int interpolate,
-                                                 int fillmethod,
-                                                 int src_stride_lu,
-                                                 int dst_stride_lu,
-                                                 int src_stride_ch,
-                                                 int dst_stride_ch,
-                                                 int height,
-                                                 int width,
-                                                 int ch,
-                                                 int cw)
+kernel void avfilter_transform_luma(global unsigned char *src,
+                                    global unsigned char *dst,
+                                    float4 matrix,
+                                    int interpolate,
+                                    int fill,
+                                    int src_stride_lu,
+                                    int dst_stride_lu,
+                                    int height,
+                                    int width)
 {
-     int global_id = get_global_id(0);
-
-     global unsigned char *dst_y = dst;
-     global unsigned char *dst_u = dst_y + height * dst_stride_lu;
-     global unsigned char *dst_v = dst_u + ch * dst_stride_ch;
-
-     global unsigned char *src_y = src;
-     global unsigned char *src_u = src_y + height * src_stride_lu;
-     global unsigned char *src_v = src_u + ch * src_stride_ch;
-
-     global unsigned char *tempdst;
-     global unsigned char *tempsrc;
-
-     int x;
-     int y;
-     float x_s;
-     float y_s;
-     int tempsrc_stride;
-     int tempdst_stride;
-     int temp_height;
-     int temp_width;
-     int curpos;
-     unsigned char def = 0;
-     if (global_id < width*height) {
-        y = global_id/width;
-        x = global_id%width;
-        x_s = x * matrix[0] + y * matrix[1] + matrix[2];
-        y_s = x * matrix[3] + y * matrix[4] + matrix[5];
-        tempdst = dst_y;
-        tempsrc = src_y;
-        tempsrc_stride = src_stride_lu;
-        tempdst_stride = dst_stride_lu;
-        temp_height = height;
-        temp_width = width;
-     } else if ((global_id >= width*height)&&(global_id < width*height + ch*cw)) {
-        y = (global_id - width*height)/cw;
-        x = (global_id - width*height)%cw;
-        x_s = x * matrix2[0] + y * matrix2[1] + matrix2[2];
-        y_s = x * matrix2[3] + y * matrix2[4] + matrix2[5];
-        tempdst = dst_u;
-        tempsrc = src_u;
-        tempsrc_stride = src_stride_ch;
-        tempdst_stride = dst_stride_ch;
-        temp_height = ch;
-        temp_width = cw;
-     } else {
-        y = (global_id - width*height - ch*cw)/cw;
-        x = (global_id - width*height - ch*cw)%cw;
-        x_s = x * matrix2[0] + y * matrix2[1] + matrix2[2];
-        y_s = x * matrix2[3] + y * matrix2[4] + matrix2[5];
-        tempdst = dst_v;
-        tempsrc = src_v;
-        tempsrc_stride = src_stride_ch;
-        tempdst_stride = dst_stride_ch;
-        temp_height = ch;
-        temp_width = cw;
-     }
-     curpos = y * tempdst_stride + x;
-     switch (fillmethod) {
-        case 0: //FILL_BLANK
-            def = 0;
-            break;
-        case 1: //FILL_ORIGINAL
-            def = tempsrc[y*tempsrc_stride+x];
-            break;
-        case 2: //FILL_CLAMP
-            y_s = clipf(y_s, 0, temp_height - 1);
-            x_s = clipf(x_s, 0, temp_width - 1);
-            def = tempsrc[(int)y_s * tempsrc_stride + (int)x_s];
-            break;
-        case 3: //FILL_MIRROR
-            y_s = mirror(y_s,temp_height - 1);
-            x_s = mirror(x_s,temp_width - 1);
-            def = tempsrc[(int)y_s * tempsrc_stride + (int)x_s];
-            break;
+    int x = get_global_id(0);
+    int y = get_global_id(1);
+    int idx_dst = y * dst_stride_lu + x;
+    unsigned char def = 0;
+    float x_s = x * matrix.x + y * matrix.y + matrix.z;
+    float y_s = x * (-matrix.y) + y * matrix.x + matrix.w;
+
+    if (x < width && y < height) {
+        switch (fill) {
+            case 0: //FILL_BLANK
+                def = 0;
+                break;
+            case 1: //FILL_ORIGINAL
+                def = src[y*src_stride_lu + x];
+                break;
+            case 2: //FILL_CLAMP
+                y_s = clipf(y_s, 0, height - 1);
+                x_s = clipf(x_s, 0, width - 1);
+                def = src[(int)y_s * src_stride_lu + (int)x_s];
+                break;
+            case 3: //FILL_MIRROR
+                y_s = mirror(y_s, height - 1);
+                x_s = mirror(x_s, width - 1);
+                def = src[(int)y_s * src_stride_lu + (int)x_s];
+                break;
+        }
+        switch (interpolate) {
+            case 0: //INTERPOLATE_NEAREST
+                dst[idx_dst] = interpolate_nearest(x_s, y_s, src, width, height, src_stride_lu, def);
+                break;
+            case 1: //INTERPOLATE_BILINEAR
+                dst[idx_dst] = interpolate_bilinear(x_s, y_s, src, width, height, src_stride_lu, def);
+                break;
+            case 2: //INTERPOLATE_BIQUADRATIC
+                dst[idx_dst] = interpolate_biquadratic(x_s, y_s, src, width, height, src_stride_lu, def);
+                break;
+            default:
+                return;
+        }
     }
-    switch (interpolate) {
-        case 0: //INTERPOLATE_NEAREST
-            tempdst[curpos] = interpolate_nearest(x_s, y_s, tempsrc, temp_width, temp_height, tempsrc_stride, def);
-            break;
-        case 1: //INTERPOLATE_BILINEAR
-            tempdst[curpos] = interpolate_bilinear(x_s, y_s, tempsrc, temp_width, temp_height, tempsrc_stride, def);
-            break;
-        case 2: //INTERPOLATE_BIQUADRATIC
-            tempdst[curpos] = interpolate_biquadratic(x_s, y_s, tempsrc, temp_width, temp_height, tempsrc_stride, def);
-            break;
-        default:
-            return;
+}
+
+kernel void avfilter_transform_chroma(global unsigned char *src,
+                                      global unsigned char *dst,
+                                      float4 matrix,
+                                      int interpolate,
+                                      int fill,
+                                      int src_stride_lu,
+                                      int dst_stride_lu,
+                                      int src_stride_ch,
+                                      int dst_stride_ch,
+                                      int height,
+                                      int width,
+                                      int ch,
+                                      int cw)
+{
+
+    int x = get_global_id(0);
+    int y = get_global_id(1);
+    int pad_ch = get_global_size(1)>>1;
+    global unsigned char *dst_u = dst + height * dst_stride_lu;
+    global unsigned char *src_u = src + height * src_stride_lu;
+    global unsigned char *dst_v = dst_u + ch * dst_stride_ch;
+    global unsigned char *src_v = src_u + ch * src_stride_ch;
+    src = y < pad_ch ? src_u : src_v;
+    dst = y < pad_ch ? dst_u : dst_v;
+    y = select(y - pad_ch, y, y < pad_ch);
+    float x_s = x * matrix.x + y * matrix.y + matrix.z;
+    float y_s = x * (-matrix.y) + y * matrix.x + matrix.w;
+    int idx_dst = y * dst_stride_ch + x;
+    unsigned char def;
+
+    if (x < cw && y < ch) {
+        switch (fill) {
+            case 0: //FILL_BLANK
+                def = 0;
+                break;
+            case 1: //FILL_ORIGINAL
+                def = src[y*src_stride_ch + x];
+                break;
+            case 2: //FILL_CLAMP
+                y_s = clipf(y_s, 0, ch - 1);
+                x_s = clipf(x_s, 0, cw - 1);
+                def = src[(int)y_s * src_stride_ch + (int)x_s];
+                break;
+            case 3: //FILL_MIRROR
+                y_s = mirror(y_s, ch - 1);
+                x_s = mirror(x_s, cw - 1);
+                def = src[(int)y_s * src_stride_ch + (int)x_s];
+                break;
+        }
+        switch (interpolate) {
+            case 0: //INTERPOLATE_NEAREST
+                dst[idx_dst] = interpolate_nearest(x_s, y_s, src, cw, ch, src_stride_ch, def);
+                break;
+            case 1: //INTERPOLATE_BILINEAR
+                dst[idx_dst] = interpolate_bilinear(x_s, y_s, src, cw, ch, src_stride_ch, def);
+                break;
+            case 2: //INTERPOLATE_BIQUADRATIC
+                dst[idx_dst] = interpolate_biquadratic(x_s, y_s, src, cw, ch, src_stride_ch, def);
+                break;
+            default:
+                return;
+        }
     }
 }
 );

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/dualinput.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/dualinput.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/f_ebur128.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/f_ebur128.c Changed

@@ -23,7 +23,6 @@
  * EBU R.128 implementation
  * @see http://tech.ebu.ch/loudness
  * @see https://www.youtube.com/watch?v=iuEtQqC-Sqo "EBU R128 Introduction - Florian Camerer"
- * @todo True Peak
  * @todo implement start/stop/reset through filter command injection
  * @todo support other frequencies to avoid resampling
  */
@@ -37,6 +36,7 @@
 #include "libavutil/xga_font_data.h"
 #include "libavutil/opt.h"
 #include "libavutil/timestamp.h"
+#include "libswresample/swresample.h"
 #include "audio.h"
 #include "avfilter.h"
 #include "formats.h"
@@ -92,6 +92,17 @@
 typedef struct {
     const AVClass *class;           ///< AVClass context for log and options purpose
 
+    /* peak metering */
+    int peak_mode;                  ///< enabled peak modes
+    double *true_peaks;             ///< true peaks per channel
+    double *sample_peaks;           ///< sample peaks per channel
+    double *true_peaks_per_frame;   ///< true peaks in a frame per channel
+#if CONFIG_SWRESAMPLE
+    SwrContext *swr_ctx;            ///< over-sampling context for true peak metering
+    double *swr_buf;                ///< resampled audio data for true peak metering
+    int swr_linesize;
+#endif
+
     /* video  */
     int do_video;                   ///< 1 if video output enabled, 0 otherwise
     int w, h;                       ///< size of the video output
@@ -130,6 +141,12 @@
     int metadata;                   ///< whether or not to inject loudness results in frames
 } EBUR128Context;
 
+enum {
+    PEAK_MODE_NONE          = 0,
+    PEAK_MODE_SAMPLES_PEAKS = 1<<1,
+    PEAK_MODE_TRUE_PEAKS    = 1<<2,
+};
+
 #define OFFSET(x) offsetof(EBUR128Context, x)
 #define A AV_OPT_FLAG_AUDIO_PARAM
 #define V AV_OPT_FLAG_VIDEO_PARAM
@@ -142,7 +159,11 @@
         { "info",    "information logging level", 0, AV_OPT_TYPE_CONST, {.i64 = AV_LOG_INFO},    INT_MIN, INT_MAX, A|V|F, "level" },
         { "verbose", "verbose logging level",     0, AV_OPT_TYPE_CONST, {.i64 = AV_LOG_VERBOSE}, INT_MIN, INT_MAX, A|V|F, "level" },
     { "metadata", "inject metadata in the filtergraph", OFFSET(metadata), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, A|V|F },
-    { NULL }
+    { "peak", "set peak mode", OFFSET(peak_mode), AV_OPT_TYPE_FLAGS, {.i64 = PEAK_MODE_NONE}, 0, INT_MAX, A|F, "mode" },
+        { "none",   "disable any peak mode",   0, AV_OPT_TYPE_CONST, {.i64 = PEAK_MODE_NONE},          INT_MIN, INT_MAX, A|F, "mode" },
+        { "sample", "enable peak-sample mode", 0, AV_OPT_TYPE_CONST, {.i64 = PEAK_MODE_SAMPLES_PEAKS}, INT_MIN, INT_MAX, A|F, "mode" },
+        { "true",   "enable true-peak mode",   0, AV_OPT_TYPE_CONST, {.i64 = PEAK_MODE_TRUE_PEAKS},    INT_MIN, INT_MAX, A|F, "mode" },
+    { NULL },
 };
 
 AVFILTER_DEFINE_CLASS(ebur128);
@@ -326,9 +347,13 @@
     AVFilterContext *ctx = inlink->dst;
     EBUR128Context *ebur128 = ctx->priv;
 
-    /* force 100ms framing in case of metadata injection: the frames must have
-     * a granularity of the window overlap to be accurately exploited */
-    if (ebur128->metadata)
+    /* Force 100ms framing in case of metadata injection: the frames must have
+     * a granularity of the window overlap to be accurately exploited.
+     * As for the true peaks mode, it just simplifies the resampling buffer
+     * allocation and the lookup in it (since sample buffers differ in size, it
+     * can be more complex to integrate in the one-sample loop of
+     * filter_frame()). */
+    if (ebur128->metadata || (ebur128->peak_mode & PEAK_MODE_TRUE_PEAKS))
         inlink->min_samples =
         inlink->max_samples =
         inlink->partial_buf_size = inlink->sample_rate / 10;
@@ -383,11 +408,44 @@
 
     outlink->flags |= FF_LINK_FLAG_REQUEST_LOOP;
 
+#if CONFIG_SWRESAMPLE
+    if (ebur128->peak_mode & PEAK_MODE_TRUE_PEAKS) {
+        int ret;
+
+        ebur128->swr_buf    = av_malloc(19200 * nb_channels * sizeof(double));
+        ebur128->true_peaks = av_calloc(nb_channels, sizeof(*ebur128->true_peaks));
+        ebur128->true_peaks_per_frame = av_calloc(nb_channels, sizeof(*ebur128->true_peaks_per_frame));
+        ebur128->swr_ctx    = swr_alloc();
+        if (!ebur128->swr_buf || !ebur128->true_peaks ||
+            !ebur128->true_peaks_per_frame || !ebur128->swr_ctx)
+            return AVERROR(ENOMEM);
+
+        av_opt_set_int(ebur128->swr_ctx, "in_channel_layout",    outlink->channel_layout, 0);
+        av_opt_set_int(ebur128->swr_ctx, "in_sample_rate",       outlink->sample_rate, 0);
+        av_opt_set_sample_fmt(ebur128->swr_ctx, "in_sample_fmt", outlink->format, 0);
+
+        av_opt_set_int(ebur128->swr_ctx, "out_channel_layout",    outlink->channel_layout, 0);
+        av_opt_set_int(ebur128->swr_ctx, "out_sample_rate",       192000, 0);
+        av_opt_set_sample_fmt(ebur128->swr_ctx, "out_sample_fmt", outlink->format, 0);
+
+        ret = swr_init(ebur128->swr_ctx);
+        if (ret < 0)
+            return ret;
+    }
+#endif
+
+    if (ebur128->peak_mode & PEAK_MODE_SAMPLES_PEAKS) {
+        ebur128->sample_peaks = av_calloc(nb_channels, sizeof(*ebur128->sample_peaks));
+        if (!ebur128->sample_peaks)
+            return AVERROR(ENOMEM);
+    }
+
     return 0;
 }
 
 #define ENERGY(loudness) (pow(10, ((loudness) + 0.691) / 10.))
 #define LOUDNESS(energy) (-0.691 + 10 * log10(energy))
+#define DBFS(energy) (20 * log10(energy))
 
 static struct hist_entry *get_histogram(void)
 {
@@ -416,6 +474,12 @@
             ebur128->loglevel = AV_LOG_INFO;
     }
 
+    if (!CONFIG_SWRESAMPLE && (ebur128->peak_mode & PEAK_MODE_TRUE_PEAKS)) {
+        av_log(ctx, AV_LOG_ERROR,
+               "True-peak mode requires libswresample to be performed\n");
+        return AVERROR(EINVAL);
+    }
+
     // if meter is  +9 scale, scale range is from -18 LU to  +9 LU (or 3*9)
     // if meter is +18 scale, scale range is from -36 LU to +18 LU (or 3*18)
     ebur128->scale_range = 3 * ebur128->meter;
@@ -491,6 +555,26 @@
     const double *samples = (double *)insamples->data[0];
     AVFrame *pic = ebur128->outpicref;
 
+#if CONFIG_SWRESAMPLE
+    if (ebur128->peak_mode & PEAK_MODE_TRUE_PEAKS) {
+        const double *swr_samples = ebur128->swr_buf;
+        int ret = swr_convert(ebur128->swr_ctx, (uint8_t**)&ebur128->swr_buf, 19200,
+                              (const uint8_t **)insamples->data, nb_samples);
+        if (ret < 0)
+            return ret;
+        for (ch = 0; ch < nb_channels; ch++)
+            ebur128->true_peaks_per_frame[ch] = 0.0;
+        for (idx_insample = 0; idx_insample < ret; idx_insample++) {
+            for (ch = 0; ch < nb_channels; ch++) {
+                ebur128->true_peaks[ch] = FFMAX(ebur128->true_peaks[ch], FFABS(*swr_samples));
+                ebur128->true_peaks_per_frame[ch] = FFMAX(ebur128->true_peaks_per_frame[ch],
+                                                          FFABS(*swr_samples));
+                swr_samples++;
+            }
+        }
+    }
+#endif
+
     for (idx_insample = 0; idx_insample < nb_samples; idx_insample++) {
         const int bin_id_400  = ebur128->i400.cache_pos;
         const int bin_id_3000 = ebur128->i3000.cache_pos;
@@ -509,6 +593,9 @@
         for (ch = 0; ch < nb_channels; ch++) {
             double bin;
 
+            if (ebur128->peak_mode & PEAK_MODE_SAMPLES_PEAKS)
+                ebur128->sample_peaks[ch] = FFMAX(ebur128->sample_peaks[ch], FFABS(*samples));
+
             ebur128->x[ch * 3] = *samples++; // set X[i]
 
             if (!ebur128->ch_weighting[ch])
@@ -677,22 +764,53 @@
 
             if (ebur128->metadata) { /* happens only once per filter_frame call */
                 char metabuf[128];
+#define META_PREFIX "lavfi.r128."
+
 #define SET_META(name, var) do {                                            \
     snprintf(metabuf, sizeof(metabuf), "%.3f", var);                        \
-    av_dict_set(&insamples->metadata, "lavfi.r128." name, metabuf, 0);      \
+    av_dict_set(&insamples->metadata, name, metabuf, 0);                    \
+} while (0)
+
+#define SET_META_PEAK(name, ptype) do {                                     \
+    if (ebur128->peak_mode & PEAK_MODE_ ## ptype ## _PEAKS) {               \
+        char key[64];                                                       \
+        for (ch = 0; ch < nb_channels; ch++) {                              \
+            snprintf(key, sizeof(key),                                      \
+                     META_PREFIX AV_STRINGIFY(name) "_peaks_ch%d", ch);     \
+            SET_META(key, ebur128->name##_peaks[ch]);                       \
+        }                                                                   \
+    }                                                                       \
 } while (0)
-                SET_META("M",        loudness_400);
-                SET_META("S",        loudness_3000);
-                SET_META("I",        ebur128->integrated_loudness);
-                SET_META("LRA",      ebur128->loudness_range);
-                SET_META("LRA.low",  ebur128->lra_low);
-                SET_META("LRA.high", ebur128->lra_high);
+
+                SET_META(META_PREFIX "M",        loudness_400);
+                SET_META(META_PREFIX "S",        loudness_3000);
+                SET_META(META_PREFIX "I",        ebur128->integrated_loudness);
+                SET_META(META_PREFIX "LRA",      ebur128->loudness_range);
+                SET_META(META_PREFIX "LRA.low",  ebur128->lra_low);
+                SET_META(META_PREFIX "LRA.high", ebur128->lra_high);
+
+                SET_META_PEAK(sample, SAMPLES);
+                SET_META_PEAK(true,   TRUE);
             }
 
-            av_log(ctx, ebur128->loglevel, "t: %-10s " LOG_FMT "\n",
+            av_log(ctx, ebur128->loglevel, "t: %-10s " LOG_FMT,
                    av_ts2timestr(pts, &outlink->time_base),
                    loudness_400, loudness_3000,
                    ebur128->integrated_loudness, ebur128->loudness_range);
+
+#define PRINT_PEAKS(str, sp, ptype) do {                            \
+    if (ebur128->peak_mode & PEAK_MODE_ ## ptype ## _PEAKS) {       \
+        av_log(ctx, ebur128->loglevel, "  " str ":");               \
+        for (ch = 0; ch < nb_channels; ch++)                        \
+            av_log(ctx, ebur128->loglevel, " %5.1f", DBFS(sp[ch])); \
+        av_log(ctx, ebur128->loglevel, " dBFS");                    \
+    }                                                               \
+} while (0)
+
+            PRINT_PEAKS("SPK", ebur128->sample_peaks, SAMPLES);
+            PRINT_PEAKS("FTPK", ebur128->true_peaks_per_frame, TRUE);
+            PRINT_PEAKS("TPK", ebur128->true_peaks,   TRUE);
+            av_log(ctx, ebur128->loglevel, "\n");
         }
     }
 
@@ -757,13 +875,33 @@
            "    LRA:       %5.1f LU\n"
            "    Threshold: %5.1f LUFS\n"
            "    LRA low:   %5.1f LUFS\n"
-           "    LRA high:  %5.1f LUFS\n",
+           "    LRA high:  %5.1f LUFS",
            ebur128->integrated_loudness, ebur128->i400.rel_threshold,
            ebur128->loudness_range,      ebur128->i3000.rel_threshold,
            ebur128->lra_low, ebur128->lra_high);
 
+#define PRINT_PEAK_SUMMARY(str, sp, ptype) do {                  \
+    int ch;                                                      \
+    double maxpeak;                                              \
+    maxpeak = 0.0;                                               \
+    if (ebur128->peak_mode & PEAK_MODE_ ## ptype ## _PEAKS) {    \
+        for (ch = 0; ch < ebur128->nb_channels; ch++)            \
+            maxpeak = FFMAX(maxpeak, sp[ch]);                    \
+        av_log(ctx, AV_LOG_INFO, "\n\n  " str " peak:\n"         \
+               "    Peak:      %5.1f dBFS",                      \
+               DBFS(maxpeak));                                   \
+    }                                                            \
+} while (0)
+
+    PRINT_PEAK_SUMMARY("Sample", ebur128->sample_peaks, SAMPLES);
+    PRINT_PEAK_SUMMARY("True",   ebur128->true_peaks,   TRUE);
+    av_log(ctx, AV_LOG_INFO, "\n");
+
     av_freep(&ebur128->y_line_ref);
     av_freep(&ebur128->ch_weighting);
+    av_freep(&ebur128->true_peaks);
+    av_freep(&ebur128->sample_peaks);
+    av_freep(&ebur128->true_peaks_per_frame);
     av_freep(&ebur128->i400.histogram);
     av_freep(&ebur128->i3000.histogram);
     for (i = 0; i < ebur128->nb_channels; i++) {
@@ -773,6 +911,10 @@
     for (i = 0; i < ctx->nb_outputs; i++)
         av_freep(&ctx->output_pads[i].name);
     av_frame_free(&ebur128->outpicref);
+#if CONFIG_SWRESAMPLE
+    av_freep(&ebur128->swr_buf);
+    swr_free(&ebur128->swr_ctx);
+#endif
 }
 
 static const AVFilterPad ebur128_inputs[] = {
@@ -785,7 +927,7 @@
     { NULL }
 };
 
-AVFilter avfilter_af_ebur128 = {
+AVFilter ff_af_ebur128 = {
     .name          = "ebur128",
     .description   = NULL_IF_CONFIG_SMALL("EBU R128 scanner."),
     .priv_size     = sizeof(EBUR128Context),

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/f_interleave.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/f_interleave.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/f_perms.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/f_perms.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/f_select.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/f_select.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/f_sendcmd.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/f_sendcmd.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/f_settb.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/f_settb.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/f_zmq.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/f_zmq.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/fifo.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/fifo.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/formats.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/formats.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/graphparser.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/graphparser.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/internal.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/internal.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/lavfutils.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/lavfutils.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/libmpcodecs/vf_uspp.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/libmpcodecs/vf_uspp.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/setpts.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/setpts.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/split.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/split.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/src_movie.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/src_movie.c Changed

@@ -28,6 +28,7 @@
  */
 
 #include <float.h>
+#include <stdint.h>
 
 #include "libavutil/attributes.h"
 #include "libavutil/avstring.h"
@@ -385,10 +386,10 @@
 }
 
 static char *describe_frame_to_str(char *dst, size_t dst_size,
-                                    AVFrame *frame,
-                                    AVFilterLink *link)
+                                   AVFrame *frame, enum AVMediaType frame_type,
+                                   AVFilterLink *link)
 {
-    switch (frame->type) {
+    switch (frame_type) {
     case AVMEDIA_TYPE_VIDEO:
         snprintf(dst, dst_size,
                  "video pts:%s time:%s size:%dx%d aspect:%d/%d",
@@ -404,15 +405,12 @@
                  frame->nb_samples);
                  break;
     default:
-        snprintf(dst, dst_size, "%s BUG", av_get_media_type_string(frame->type));
+        snprintf(dst, dst_size, "%s BUG", av_get_media_type_string(frame_type));
         break;
     }
     return dst;
 }
 
-#define describe_frameref(f, link) \
-    describe_frame_to_str((char[1024]){0}, 1024, f, link)
-
 static int rewind_file(AVFilterContext *ctx)
 {
     MovieContext *movie = ctx->priv;
@@ -451,6 +449,7 @@
 {
     MovieContext *movie = ctx->priv;
     AVPacket *pkt = &movie->pkt;
+    enum AVMediaType frame_type;
     MovieStream *st;
     int ret, got_frame = 0, pkt_out_id;
     AVFilterLink *outlink;
@@ -500,7 +499,8 @@
     if (!movie->frame)
         return AVERROR(ENOMEM);
 
-    switch (st->st->codec->codec_type) {
+    frame_type = st->st->codec->codec_type;
+    switch (frame_type) {
     case AVMEDIA_TYPE_VIDEO:
         ret = avcodec_decode_video2(st->st->codec, movie->frame, &got_frame, pkt);
         break;
@@ -536,10 +536,10 @@
         return 0;
     }
 
+    movie->frame->pts = av_frame_get_best_effort_timestamp(movie->frame);
     av_dlog(ctx, "movie_push_frame(): file:'%s' %s\n", movie->file_name,
-            describe_frameref(movie->frame, outlink));
+            describe_frame_to_str((char[1024]){0}, 1024, movie->frame, frame_type, outlink));
 
-    movie->frame->pts = av_frame_get_best_effort_timestamp(movie->frame);
     ret = ff_filter_frame(outlink, movie->frame);
     movie->frame = NULL;
 
@@ -565,7 +565,7 @@
 
 AVFILTER_DEFINE_CLASS(movie);
 
-AVFilter avfilter_avsrc_movie = {
+AVFilter ff_avsrc_movie = {
     .name          = "movie",
     .description   = NULL_IF_CONFIG_SMALL("Read from a movie source."),
     .priv_size     = sizeof(MovieContext),
@@ -586,7 +586,7 @@
 #define amovie_options movie_options
 AVFILTER_DEFINE_CLASS(amovie);
 
-AVFilter avfilter_avsrc_amovie = {
+AVFilter ff_avsrc_amovie = {
     .name          = "amovie",
     .description   = NULL_IF_CONFIG_SMALL("Read audio from a movie source."),
     .priv_size     = sizeof(MovieContext),

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/trim.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/trim.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/unsharp.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/unsharp.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/unsharp_opencl.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/unsharp_opencl.c Changed

@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2013 Wei Gao <weigao@multicorewareinc.com>
+ * Copyright (C) 2013 Lenny Wang
  *
  * This file is part of FFmpeg.
  *
@@ -28,6 +29,7 @@
 #include "libavutil/opencl_internal.h"
 
 #define PLANE_NUM 3
+#define ROUND_TO_16(a) ((((a- 1)/16)+1)*16)
 
 static inline void add_mask_counter(uint32_t *dst, uint32_t *counter1, uint32_t *counter2, int len)
 {
@@ -135,6 +137,13 @@
     step_x[1] = unsharp->chroma.steps_x;
     step_y[0] = unsharp->luma.steps_y;
     step_y[1] = unsharp->chroma.steps_y;
+
+    /* use default kernel if any matrix dim larger than 8 due to limited local mem size */
+    if (step_x[0]>8 || step_x[1]>8 || step_y[0]>8 || step_y[1]>8)
+        unsharp->opencl_ctx.use_fast_kernels = 0;
+    else
+        unsharp->opencl_ctx.use_fast_kernels = 1;
+
     if (!mask_matrix[0] || !mask_matrix[1]) {
         av_log(ctx, AV_LOG_ERROR, "Luma mask and chroma mask should not be NULL\n");
         return AVERROR(EINVAL);
@@ -153,47 +162,109 @@
     AVFilterLink *link = ctx->inputs[0];
     UnsharpContext *unsharp = ctx->priv;
     cl_int status;
+    FFOpenclParam kernel1 = {0};
+    FFOpenclParam kernel2 = {0};
+    int width = link->w;
+    int height = link->h;
     int cw = FF_CEIL_RSHIFT(link->w, unsharp->hsub);
     int ch = FF_CEIL_RSHIFT(link->h, unsharp->vsub);
-    const size_t global_work_size = link->w * link->h + 2 * ch * cw;
-    FFOpenclParam opencl_param = {0};
+    size_t globalWorkSize1d = width * height + 2 * ch * cw;
+    size_t globalWorkSize2dLuma[2];
+    size_t globalWorkSize2dChroma[2];
+    size_t localWorkSize2d[2] = {16, 16};
 
-    opencl_param.ctx = ctx;
-    opencl_param.kernel = unsharp->opencl_ctx.kernel_env.kernel;
-    ret = ff_opencl_set_parameter(&opencl_param,
-                                  FF_OPENCL_PARAM_INFO(unsharp->opencl_ctx.cl_inbuf),
-                                  FF_OPENCL_PARAM_INFO(unsharp->opencl_ctx.cl_outbuf),
-                                  FF_OPENCL_PARAM_INFO(unsharp->opencl_ctx.cl_luma_mask),
-                                  FF_OPENCL_PARAM_INFO(unsharp->opencl_ctx.cl_chroma_mask),
-                                  FF_OPENCL_PARAM_INFO(unsharp->luma.amount),
-                                  FF_OPENCL_PARAM_INFO(unsharp->chroma.amount),
-                                  FF_OPENCL_PARAM_INFO(unsharp->luma.steps_x),
-                                  FF_OPENCL_PARAM_INFO(unsharp->luma.steps_y),
-                                  FF_OPENCL_PARAM_INFO(unsharp->chroma.steps_x),
-                                  FF_OPENCL_PARAM_INFO(unsharp->chroma.steps_y),
-                                  FF_OPENCL_PARAM_INFO(unsharp->luma.scalebits),
-                                  FF_OPENCL_PARAM_INFO(unsharp->chroma.scalebits),
-                                  FF_OPENCL_PARAM_INFO(unsharp->luma.halfscale),
-                                  FF_OPENCL_PARAM_INFO(unsharp->chroma.halfscale),
-                                  FF_OPENCL_PARAM_INFO(in->linesize[0]),
-                                  FF_OPENCL_PARAM_INFO(in->linesize[1]),
-                                  FF_OPENCL_PARAM_INFO(out->linesize[0]),
-                                  FF_OPENCL_PARAM_INFO(out->linesize[1]),
-                                  FF_OPENCL_PARAM_INFO(link->h),
-                                  FF_OPENCL_PARAM_INFO(link->w),
-                                  FF_OPENCL_PARAM_INFO(ch),
-                                  FF_OPENCL_PARAM_INFO(cw),
-                                  NULL);
-    if (ret < 0)
-        return ret;
-    status = clEnqueueNDRangeKernel(unsharp->opencl_ctx.kernel_env.command_queue,
-                                    unsharp->opencl_ctx.kernel_env.kernel, 1, NULL,
-                                    &global_work_size, NULL, 0, NULL, NULL);
-    if (status != CL_SUCCESS) {
-        av_log(ctx, AV_LOG_ERROR, "OpenCL run kernel error occurred: %s\n", av_opencl_errstr(status));
-        return AVERROR_EXTERNAL;
+    if (unsharp->opencl_ctx.use_fast_kernels) {
+        globalWorkSize2dLuma[0] = (size_t)ROUND_TO_16(width);
+        globalWorkSize2dLuma[1] = (size_t)ROUND_TO_16(height);
+        globalWorkSize2dChroma[0] = (size_t)ROUND_TO_16(cw);
+        globalWorkSize2dChroma[1] = (size_t)(2*ROUND_TO_16(ch));
+
+        kernel1.ctx = ctx;
+        kernel1.kernel = unsharp->opencl_ctx.kernel_luma;
+        ret = ff_opencl_set_parameter(&kernel1,
+                                      FF_OPENCL_PARAM_INFO(unsharp->opencl_ctx.cl_inbuf),
+                                      FF_OPENCL_PARAM_INFO(unsharp->opencl_ctx.cl_outbuf),
+                                      FF_OPENCL_PARAM_INFO(unsharp->opencl_ctx.cl_luma_mask),
+                                      FF_OPENCL_PARAM_INFO(unsharp->luma.amount),
+                                      FF_OPENCL_PARAM_INFO(unsharp->luma.scalebits),
+                                      FF_OPENCL_PARAM_INFO(unsharp->luma.halfscale),
+                                      FF_OPENCL_PARAM_INFO(in->linesize[0]),
+                                      FF_OPENCL_PARAM_INFO(out->linesize[0]),
+                                      FF_OPENCL_PARAM_INFO(width),
+                                      FF_OPENCL_PARAM_INFO(height),
+                                      NULL);
+        if (ret < 0)
+            return ret;
+
+        kernel2.ctx = ctx;
+        kernel2.kernel = unsharp->opencl_ctx.kernel_chroma;
+        ret = ff_opencl_set_parameter(&kernel2,
+                                      FF_OPENCL_PARAM_INFO(unsharp->opencl_ctx.cl_inbuf),
+                                      FF_OPENCL_PARAM_INFO(unsharp->opencl_ctx.cl_outbuf),
+                                      FF_OPENCL_PARAM_INFO(unsharp->opencl_ctx.cl_chroma_mask),
+                                      FF_OPENCL_PARAM_INFO(unsharp->chroma.amount),
+                                      FF_OPENCL_PARAM_INFO(unsharp->chroma.scalebits),
+                                      FF_OPENCL_PARAM_INFO(unsharp->chroma.halfscale),
+                                      FF_OPENCL_PARAM_INFO(in->linesize[0]),
+                                      FF_OPENCL_PARAM_INFO(in->linesize[1]),
+                                      FF_OPENCL_PARAM_INFO(out->linesize[0]),
+                                      FF_OPENCL_PARAM_INFO(out->linesize[1]),
+                                      FF_OPENCL_PARAM_INFO(link->w),
+                                      FF_OPENCL_PARAM_INFO(link->h),
+                                      FF_OPENCL_PARAM_INFO(cw),
+                                      FF_OPENCL_PARAM_INFO(ch),
+                                      NULL);
+        if (ret < 0)
+            return ret;
+        status = clEnqueueNDRangeKernel(unsharp->opencl_ctx.command_queue,
+                                        unsharp->opencl_ctx.kernel_luma, 2, NULL,
+                                        globalWorkSize2dLuma, localWorkSize2d, 0, NULL, NULL);
+        status |=clEnqueueNDRangeKernel(unsharp->opencl_ctx.command_queue,
+                                        unsharp->opencl_ctx.kernel_chroma, 2, NULL,
+                                        globalWorkSize2dChroma, localWorkSize2d, 0, NULL, NULL);
+        if (status != CL_SUCCESS) {
+            av_log(ctx, AV_LOG_ERROR, "OpenCL run kernel error occurred: %s\n", av_opencl_errstr(status));
+            return AVERROR_EXTERNAL;
+        }
+    } else {    /* use default kernel */
+        kernel1.ctx = ctx;
+        kernel1.kernel = unsharp->opencl_ctx.kernel_default;
+
+        ret = ff_opencl_set_parameter(&kernel1,
+                                      FF_OPENCL_PARAM_INFO(unsharp->opencl_ctx.cl_inbuf),
+                                      FF_OPENCL_PARAM_INFO(unsharp->opencl_ctx.cl_outbuf),
+                                      FF_OPENCL_PARAM_INFO(unsharp->opencl_ctx.cl_luma_mask),
+                                      FF_OPENCL_PARAM_INFO(unsharp->opencl_ctx.cl_chroma_mask),
+                                      FF_OPENCL_PARAM_INFO(unsharp->luma.amount),
+                                      FF_OPENCL_PARAM_INFO(unsharp->chroma.amount),
+                                      FF_OPENCL_PARAM_INFO(unsharp->luma.steps_x),
+                                      FF_OPENCL_PARAM_INFO(unsharp->luma.steps_y),
+                                      FF_OPENCL_PARAM_INFO(unsharp->chroma.steps_x),
+                                      FF_OPENCL_PARAM_INFO(unsharp->chroma.steps_y),
+                                      FF_OPENCL_PARAM_INFO(unsharp->luma.scalebits),
+                                      FF_OPENCL_PARAM_INFO(unsharp->chroma.scalebits),
+                                      FF_OPENCL_PARAM_INFO(unsharp->luma.halfscale),
+                                      FF_OPENCL_PARAM_INFO(unsharp->chroma.halfscale),
+                                      FF_OPENCL_PARAM_INFO(in->linesize[0]),
+                                      FF_OPENCL_PARAM_INFO(in->linesize[1]),
+                                      FF_OPENCL_PARAM_INFO(out->linesize[0]),
+                                      FF_OPENCL_PARAM_INFO(out->linesize[1]),
+                                      FF_OPENCL_PARAM_INFO(link->h),
+                                      FF_OPENCL_PARAM_INFO(link->w),
+                                      FF_OPENCL_PARAM_INFO(ch),
+                                      FF_OPENCL_PARAM_INFO(cw),
+                                      NULL);
+        if (ret < 0)
+            return ret;
+        status = clEnqueueNDRangeKernel(unsharp->opencl_ctx.command_queue,
+                                        unsharp->opencl_ctx.kernel_default, 1, NULL,
+                                        &globalWorkSize1d, NULL, 0, NULL, NULL);
+        if (status != CL_SUCCESS) {
+            av_log(ctx, AV_LOG_ERROR, "OpenCL run kernel error occurred: %s\n", av_opencl_errstr(status));
+            return AVERROR_EXTERNAL;
+        }
     }
-    clFinish(unsharp->opencl_ctx.kernel_env.command_queue);
+    clFinish(unsharp->opencl_ctx.command_queue);
     return av_opencl_buffer_read_image(out->data, unsharp->opencl_ctx.out_plane_size,
                                        unsharp->opencl_ctx.plane_num, unsharp->opencl_ctx.cl_outbuf,
                                        unsharp->opencl_ctx.cl_outbuf_size);
@@ -202,6 +273,7 @@
 int ff_opencl_unsharp_init(AVFilterContext *ctx)
 {
     int ret = 0;
+    char build_opts[96];
     UnsharpContext *unsharp = ctx->priv;
     ret = av_opencl_init(NULL);
     if (ret < 0)
@@ -220,11 +292,41 @@
     if (ret < 0)
         return ret;
     unsharp->opencl_ctx.plane_num = PLANE_NUM;
-    if (!unsharp->opencl_ctx.kernel_env.kernel) {
-        ret = av_opencl_create_kernel(&unsharp->opencl_ctx.kernel_env, "unsharp");
-        if (ret < 0) {
-            av_log(ctx, AV_LOG_ERROR, "OpenCL failed to create kernel with name 'unsharp'\n");
-            return ret;
+    unsharp->opencl_ctx.command_queue = av_opencl_get_command_queue();
+    if (!unsharp->opencl_ctx.command_queue) {
+        av_log(ctx, AV_LOG_ERROR, "Unable to get OpenCL command queue in filter 'unsharp'\n");
+        return AVERROR(EINVAL);
+    }
+    snprintf(build_opts, 96, "-D LU_RADIUS_X=%d -D LU_RADIUS_Y=%d -D CH_RADIUS_X=%d -D CH_RADIUS_Y=%d",
+            2*unsharp->luma.steps_x+1, 2*unsharp->luma.steps_y+1, 2*unsharp->chroma.steps_x+1, 2*unsharp->chroma.steps_y+1);
+    unsharp->opencl_ctx.program = av_opencl_compile("unsharp", build_opts);
+    if (!unsharp->opencl_ctx.program) {
+        av_log(ctx, AV_LOG_ERROR, "OpenCL failed to compile program 'unsharp'\n");
+        return AVERROR(EINVAL);
+    }
+    if (unsharp->opencl_ctx.use_fast_kernels) {
+        if (!unsharp->opencl_ctx.kernel_luma) {
+            unsharp->opencl_ctx.kernel_luma = clCreateKernel(unsharp->opencl_ctx.program, "unsharp_luma", &ret);
+            if (ret != CL_SUCCESS) {
+                av_log(ctx, AV_LOG_ERROR, "OpenCL failed to create kernel 'unsharp_luma'\n");
+                return ret;
+            }
+        }
+        if (!unsharp->opencl_ctx.kernel_chroma) {
+            unsharp->opencl_ctx.kernel_chroma = clCreateKernel(unsharp->opencl_ctx.program, "unsharp_chroma", &ret);
+            if (ret < 0) {
+                av_log(ctx, AV_LOG_ERROR, "OpenCL failed to create kernel 'unsharp_chroma'\n");
+                return ret;
+            }
+        }
+    }
+    else {
+        if (!unsharp->opencl_ctx.kernel_default) {
+            unsharp->opencl_ctx.kernel_default = clCreateKernel(unsharp->opencl_ctx.program, "unsharp_default", &ret);
+            if (ret < 0) {
+                av_log(ctx, AV_LOG_ERROR, "OpenCL failed to create kernel 'unsharp_default'\n");
+                return ret;
+            }
         }
     }
     return ret;
@@ -237,7 +339,11 @@
     av_opencl_buffer_release(&unsharp->opencl_ctx.cl_outbuf);
     av_opencl_buffer_release(&unsharp->opencl_ctx.cl_luma_mask);
     av_opencl_buffer_release(&unsharp->opencl_ctx.cl_chroma_mask);
-    av_opencl_release_kernel(&unsharp->opencl_ctx.kernel_env);
+    clReleaseKernel(unsharp->opencl_ctx.kernel_default);
+    clReleaseKernel(unsharp->opencl_ctx.kernel_luma);
+    clReleaseKernel(unsharp->opencl_ctx.kernel_chroma);
+    clReleaseProgram(unsharp->opencl_ctx.program);
+    unsharp->opencl_ctx.command_queue = NULL;
     av_opencl_uninit();
 }

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/unsharp_opencl_kernel.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/unsharp_opencl_kernel.h Changed

@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2013 Wei Gao <weigao@multicorewareinc.com>
+ * Copyright (C) 2013 Lenny Wang
  *
  * This file is part of FFmpeg.
  *
@@ -32,7 +33,156 @@
         return a;
 }
 
-kernel void unsharp(global  unsigned char *src,
+kernel void unsharp_luma(
+                    global unsigned char *src,
+                    global unsigned char *dst,
+                    global int *mask,
+                    int amount,
+                    int scalebits,
+                    int halfscale,
+                    int src_stride,
+                    int dst_stride,
+                    int width,
+                    int height)
+{
+    int2 threadIdx, blockIdx, globalIdx;
+    threadIdx.x = get_local_id(0);
+    threadIdx.y = get_local_id(1);
+    blockIdx.x = get_group_id(0);
+    blockIdx.y = get_group_id(1);
+    globalIdx.x = get_global_id(0);
+    globalIdx.y = get_global_id(1);
+
+    if (!amount) {
+        if (globalIdx.x < width && globalIdx.y < height)
+            dst[globalIdx.x + globalIdx.y*dst_stride] = src[globalIdx.x + globalIdx.y*src_stride];
+        return;
+    }
+
+    local uchar l[32][32];
+    local int lc[LU_RADIUS_X*LU_RADIUS_Y];
+    int indexIx, indexIy, i, j;
+
+    for(i = 0; i <= 1; i++) {
+        indexIy = -8 + (blockIdx.y + i) * 16 + threadIdx.y;
+        indexIy = indexIy < 0 ? 0 : indexIy;
+        indexIy = indexIy >= height ? height - 1: indexIy;
+        for(j = 0; j <= 1; j++) {
+            indexIx = -8 + (blockIdx.x + j) * 16 + threadIdx.x;
+            indexIx = indexIx < 0 ? 0 : indexIx;
+            indexIx = indexIx >= width ? width - 1: indexIx;
+            l[i*16 + threadIdx.y][j*16 + threadIdx.x] = src[indexIy*src_stride + indexIx];
+        }
+    }
+
+    int indexL = threadIdx.y*16 + threadIdx.x;
+    if (indexL < LU_RADIUS_X*LU_RADIUS_Y)
+        lc[indexL] = mask[indexL];
+    barrier(CLK_LOCAL_MEM_FENCE);
+
+    int idx, idy, maskIndex;
+    int sum = 0;
+    int steps_x = LU_RADIUS_X/2;
+    int steps_y = LU_RADIUS_Y/2;
+
+    \n#pragma unroll\n
+    for (i = -steps_y; i <= steps_y; i++) {
+        idy = 8 + i + threadIdx.y;
+        \n#pragma unroll\n
+        for (j = -steps_x; j <= steps_x; j++) {
+            idx = 8 + j + threadIdx.x;
+            maskIndex = (i + steps_y)*LU_RADIUS_X + j + steps_x;
+            sum += (int)l[idy][idx] * lc[maskIndex];
+        }
+    }
+    int temp = (int)l[threadIdx.y + 8][threadIdx.x + 8];
+    int res = temp + (((temp - (int)((sum + halfscale) >> scalebits)) * amount) >> 16);
+    if (globalIdx.x < width && globalIdx.y < height)
+        dst[globalIdx.x + globalIdx.y*dst_stride] = clip_uint8(res);
+}
+
+kernel void unsharp_chroma(
+                    global unsigned char *src_y,
+                    global unsigned char *dst_y,
+                    global int *mask,
+                    int amount,
+                    int scalebits,
+                    int halfscale,
+                    int src_stride_lu,
+                    int src_stride_ch,
+                    int dst_stride_lu,
+                    int dst_stride_ch,
+                    int width,
+                    int height,
+                    int cw,
+                    int ch)
+{
+    global unsigned char *dst_u = dst_y + height * dst_stride_lu;
+    global unsigned char *dst_v = dst_u + ch * dst_stride_ch;
+    global unsigned char *src_u = src_y + height * src_stride_lu;
+    global unsigned char *src_v = src_u + ch * src_stride_ch;
+    int2 threadIdx, blockIdx, globalIdx;
+    threadIdx.x = get_local_id(0);
+    threadIdx.y = get_local_id(1);
+    blockIdx.x = get_group_id(0);
+    blockIdx.y = get_group_id(1);
+    globalIdx.x = get_global_id(0);
+    globalIdx.y = get_global_id(1);
+    int padch = get_global_size(1)/2;
+    global unsigned char *src = globalIdx.y>=padch ? src_v : src_u;
+    global unsigned char *dst = globalIdx.y>=padch ? dst_v : dst_u;
+
+    blockIdx.y = globalIdx.y>=padch ? blockIdx.y - get_num_groups(1)/2 : blockIdx.y;
+    globalIdx.y = globalIdx.y>=padch ? globalIdx.y - padch : globalIdx.y;
+
+    if (!amount) {
+        if (globalIdx.x < cw && globalIdx.y < ch)
+            dst[globalIdx.x + globalIdx.y*dst_stride_ch] = src[globalIdx.x + globalIdx.y*src_stride_ch];
+        return;
+    }
+
+    local uchar l[32][32];
+    local int lc[CH_RADIUS_X*CH_RADIUS_Y];
+    int indexIx, indexIy, i, j;
+    for(i = 0; i <= 1; i++) {
+        indexIy = -8 + (blockIdx.y + i) * 16 + threadIdx.y;
+        indexIy = indexIy < 0 ? 0 : indexIy;
+        indexIy = indexIy >= ch ? ch - 1: indexIy;
+        for(j = 0; j <= 1; j++) {
+            indexIx = -8 + (blockIdx.x + j) * 16 + threadIdx.x;
+            indexIx = indexIx < 0 ? 0 : indexIx;
+            indexIx = indexIx >= cw ? cw - 1: indexIx;
+            l[i*16 + threadIdx.y][j*16 + threadIdx.x] = src[indexIy * src_stride_ch + indexIx];
+        }
+    }
+
+    int indexL = threadIdx.y*16 + threadIdx.x;
+    if (indexL < CH_RADIUS_X*CH_RADIUS_Y)
+        lc[indexL] = mask[indexL];
+    barrier(CLK_LOCAL_MEM_FENCE);
+
+    int idx, idy, maskIndex;
+    int sum = 0;
+    int steps_x = CH_RADIUS_X/2;
+    int steps_y = CH_RADIUS_Y/2;
+
+    \n#pragma unroll\n
+    for (i = -steps_y; i <= steps_y; i++) {
+        idy = 8 + i + threadIdx.y;
+        \n#pragma unroll\n
+        for (j = -steps_x; j <= steps_x; j++) {
+            idx = 8 + j + threadIdx.x;
+            maskIndex = (i + steps_y)*CH_RADIUS_X + j + steps_x;
+            sum += (int)l[idy][idx] * lc[maskIndex];
+        }
+    }
+    int temp = (int)l[threadIdx.y + 8][threadIdx.x + 8];
+    int res = temp + (((temp - (int)((sum + halfscale) >> scalebits)) * amount) >> 16);
+    if (globalIdx.x < cw && globalIdx.y < ch)
+        dst[globalIdx.x + globalIdx.y*dst_stride_ch] = clip_uint8(res);
+}
+
+kernel void unsharp_default(global  unsigned char *src,
                     global  unsigned char *dst,
                     const global  unsigned int *mask_lu,
                     const global  unsigned int *mask_ch,
@@ -131,7 +281,6 @@
         temp_dst[x + y * temp_dst_stride] = temp_src[x + y * temp_src_stride];
     }
 }
-
 );
 
 #endif /* AVFILTER_UNSHARP_OPENCL_KERNEL_H */

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/version.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/version.h Changed

@@ -27,10 +27,10 @@
  * Libavfilter version macros
  */
 
-#include "libavutil/avutil.h"
+#include "libavutil/version.h"
 
-#define LIBAVFILTER_VERSION_MAJOR  3
-#define LIBAVFILTER_VERSION_MINOR  90
+#define LIBAVFILTER_VERSION_MAJOR   4
+#define LIBAVFILTER_VERSION_MINOR   2
 #define LIBAVFILTER_VERSION_MICRO 100
 
 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
@@ -50,40 +50,46 @@
  */
 
 #ifndef FF_API_AVFILTERPAD_PUBLIC
-#define FF_API_AVFILTERPAD_PUBLIC           (LIBAVFILTER_VERSION_MAJOR < 4)
+#define FF_API_AVFILTERPAD_PUBLIC           (LIBAVFILTER_VERSION_MAJOR < 5)
 #endif
 #ifndef FF_API_FOO_COUNT
-#define FF_API_FOO_COUNT                    (LIBAVFILTER_VERSION_MAJOR < 4)
+#define FF_API_FOO_COUNT                    (LIBAVFILTER_VERSION_MAJOR < 5)
 #endif
 #ifndef FF_API_FILL_FRAME
-#define FF_API_FILL_FRAME                   (LIBAVFILTER_VERSION_MAJOR < 4)
+#define FF_API_FILL_FRAME                   (LIBAVFILTER_VERSION_MAJOR < 5)
 #endif
 #ifndef FF_API_BUFFERSRC_BUFFER
-#define FF_API_BUFFERSRC_BUFFER             (LIBAVFILTER_VERSION_MAJOR < 4)
+#define FF_API_BUFFERSRC_BUFFER             (LIBAVFILTER_VERSION_MAJOR < 5)
 #endif
 #ifndef FF_API_AVFILTERBUFFER
-#define FF_API_AVFILTERBUFFER               (LIBAVFILTER_VERSION_MAJOR < 4)
+#define FF_API_AVFILTERBUFFER               (LIBAVFILTER_VERSION_MAJOR < 5)
 #endif
 #ifndef FF_API_OLD_FILTER_OPTS
-#define FF_API_OLD_FILTER_OPTS              (LIBAVFILTER_VERSION_MAJOR < 4)
+#define FF_API_OLD_FILTER_OPTS              (LIBAVFILTER_VERSION_MAJOR < 5)
 #endif
 #ifndef FF_API_ACONVERT_FILTER
-#define FF_API_ACONVERT_FILTER              (LIBAVFILTER_VERSION_MAJOR < 4)
+#define FF_API_ACONVERT_FILTER              (LIBAVFILTER_VERSION_MAJOR < 5)
 #endif
 #ifndef FF_API_AVFILTER_OPEN
-#define FF_API_AVFILTER_OPEN                (LIBAVFILTER_VERSION_MAJOR < 4)
+#define FF_API_AVFILTER_OPEN                (LIBAVFILTER_VERSION_MAJOR < 5)
 #endif
 #ifndef FF_API_AVFILTER_INIT_FILTER
-#define FF_API_AVFILTER_INIT_FILTER         (LIBAVFILTER_VERSION_MAJOR < 4)
+#define FF_API_AVFILTER_INIT_FILTER         (LIBAVFILTER_VERSION_MAJOR < 5)
 #endif
 #ifndef FF_API_OLD_FILTER_REGISTER
-#define FF_API_OLD_FILTER_REGISTER          (LIBAVFILTER_VERSION_MAJOR < 4)
+#define FF_API_OLD_FILTER_REGISTER          (LIBAVFILTER_VERSION_MAJOR < 5)
 #endif
 #ifndef FF_API_OLD_GRAPH_PARSE
-#define FF_API_OLD_GRAPH_PARSE              (LIBAVFILTER_VERSION_MAJOR < 4)
+#define FF_API_OLD_GRAPH_PARSE              (LIBAVFILTER_VERSION_MAJOR < 5)
 #endif
 #ifndef FF_API_DRAWTEXT_OLD_TIMELINE
-#define FF_API_DRAWTEXT_OLD_TIMELINE        (LIBAVFILTER_VERSION_MAJOR < 4)
+#define FF_API_DRAWTEXT_OLD_TIMELINE        (LIBAVFILTER_VERSION_MAJOR < 5)
+#endif
+#ifndef FF_API_NOCONST_GET_NAME
+#define FF_API_NOCONST_GET_NAME             (LIBAVFILTER_VERSION_MAJOR < 5)
+#endif
+#ifndef FF_API_INTERLACE_LOWPASS_SET
+#define FF_API_INTERLACE_LOWPASS_SET        (LIBAVFILTER_VERSION_MAJOR < 5)
 #endif
 
 #endif /* AVFILTER_VERSION_H */

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/vf_alphamerge.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/vf_alphamerge.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/vf_aspect.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/vf_aspect.c Changed

@@ -30,11 +30,32 @@
 #include "libavutil/mathematics.h"
 #include "libavutil/opt.h"
 #include "libavutil/parseutils.h"
+#include "libavutil/pixdesc.h"
 
 #include "avfilter.h"
 #include "internal.h"
 #include "video.h"
 
+static const char *const var_names[] = {
+    "w",
+    "h",
+    "a", "dar",
+    "sar",
+    "hsub",
+    "vsub",
+    NULL
+};
+
+enum var_name {
+    VAR_W,
+    VAR_H,
+    VAR_A, VAR_DAR,
+    VAR_SAR,
+    VAR_HSUB,
+    VAR_VSUB,
+    VARS_NB
+};
+
 typedef struct {
     const AVClass *class;
     AVRational dar;
@@ -43,7 +64,7 @@
 #if FF_API_OLD_FILTER_OPTS
     float aspect_den;
 #endif
-    char *ratio_str;
+    char *ratio_expr;
 } AspectContext;
 
 static av_cold int init(AVFilterContext *ctx)
@@ -52,28 +73,20 @@
     int ret;
 
 #if FF_API_OLD_FILTER_OPTS
-    if (s->ratio_str && s->aspect_den > 0) {
+    if (s->ratio_expr && s->aspect_den > 0) {
         double num;
         av_log(ctx, AV_LOG_WARNING,
                "num:den syntax is deprecated, please use num/den or named options instead\n");
-        ret = av_expr_parse_and_eval(&num, s->ratio_str, NULL, NULL,
+        ret = av_expr_parse_and_eval(&num, s->ratio_expr, NULL, NULL,
                                      NULL, NULL, NULL, NULL, NULL, 0, ctx);
         if (ret < 0) {
-            av_log(ctx, AV_LOG_ERROR, "Unable to parse ratio numerator \"%s\"\n", s->ratio_str);
+            av_log(ctx, AV_LOG_ERROR, "Unable to parse ratio numerator \"%s\"\n", s->ratio_expr);
             return AVERROR(EINVAL);
         }
         s->sar = s->dar = av_d2q(num / s->aspect_den, s->max);
-    } else
-#endif
-    if (s->ratio_str) {
-        ret = av_parse_ratio(&s->sar, s->ratio_str, s->max, 0, ctx);
-        if (ret < 0 || s->sar.num < 0 || s->sar.den <= 0) {
-            av_log(ctx, AV_LOG_ERROR,
-                   "Invalid string '%s' for aspect ratio\n", s->ratio_str);
-            return AVERROR(EINVAL);
-        }
-        s->dar = s->sar;
     }
+#endif
+
     return 0;
 }
 
@@ -97,6 +110,45 @@
     }
 }
 
+static int get_aspect_ratio(AVFilterLink *inlink, AVRational *aspect_ratio)
+{
+    AVFilterContext *ctx = inlink->dst;
+    AspectContext *s = inlink->dst->priv;
+    const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(inlink->format);
+    double var_values[VARS_NB], res;
+    int ret;
+
+    var_values[VAR_W]     = inlink->w;
+    var_values[VAR_H]     = inlink->h;
+    var_values[VAR_A]     = (double) inlink->w / inlink->h;
+    var_values[VAR_SAR]   = inlink->sample_aspect_ratio.num ?
+        (double) inlink->sample_aspect_ratio.num / inlink->sample_aspect_ratio.den : 1;
+    var_values[VAR_DAR]   = var_values[VAR_A] * var_values[VAR_SAR];
+    var_values[VAR_HSUB]  = 1 << desc->log2_chroma_w;
+    var_values[VAR_VSUB]  = 1 << desc->log2_chroma_h;
+
+    /* evaluate new aspect ratio*/
+    ret = av_expr_parse_and_eval(&res, s->ratio_expr,
+                                      var_names, var_values,
+                                      NULL, NULL, NULL, NULL, NULL, 0, ctx);
+    if (ret < 0) {
+        ret = av_parse_ratio(aspect_ratio, s->ratio_expr, s->max, 0, ctx);
+    } else
+        *aspect_ratio = av_d2q(res, s->max);
+
+    if (ret < 0) {
+        av_log(ctx, AV_LOG_ERROR,
+               "Error when evaluating the expression '%s'\n", s->ratio_expr);
+        return ret;
+    }
+    if (aspect_ratio->num < 0 || aspect_ratio->den <= 0) {
+        av_log(ctx, AV_LOG_ERROR,
+                "Invalid string '%s' for aspect ratio\n", s->ratio_expr);
+        return AVERROR(EINVAL);
+    }
+    return 0;
+}
+
 #if CONFIG_SETDAR_FILTER
 
 static int setdar_config_props(AVFilterLink *inlink)
@@ -105,6 +157,16 @@
     AVRational dar;
     AVRational old_dar;
     AVRational old_sar = inlink->sample_aspect_ratio;
+    int ret;
+
+#if FF_API_OLD_FILTER_OPTS
+    if (!(s->ratio_expr && s->aspect_den > 0)) {
+#endif
+    if ((ret = get_aspect_ratio(inlink, &s->dar)))
+        return ret;
+#if FF_API_OLD_FILTER_OPTS
+    }
+#endif
 
     if (s->dar.num && s->dar.den) {
         av_reduce(&s->sar.num, &s->sar.den,
@@ -126,9 +188,9 @@
 }
 
 static const AVOption setdar_options[] = {
-    { "dar",   "set display aspect ratio", OFFSET(ratio_str), AV_OPT_TYPE_STRING, {.str="0"}, .flags=FLAGS },
-    { "ratio", "set display aspect ratio", OFFSET(ratio_str), AV_OPT_TYPE_STRING, {.str="0"}, .flags=FLAGS },
-    { "r",     "set display aspect ratio", OFFSET(ratio_str), AV_OPT_TYPE_STRING, {.str="0"}, .flags=FLAGS },
+    { "dar",   "set display aspect ratio", OFFSET(ratio_expr), AV_OPT_TYPE_STRING, { .str = "0" }, .flags = FLAGS },
+    { "ratio", "set display aspect ratio", OFFSET(ratio_expr), AV_OPT_TYPE_STRING, { .str = "0" }, .flags = FLAGS },
+    { "r",     "set display aspect ratio", OFFSET(ratio_expr), AV_OPT_TYPE_STRING, { .str = "0" }, .flags = FLAGS },
 #if FF_API_OLD_FILTER_OPTS
     { "dar_den", NULL, OFFSET(aspect_den), AV_OPT_TYPE_FLOAT, { .dbl = 0 }, 0, FLT_MAX, FLAGS },
 #endif
@@ -156,7 +218,7 @@
     { NULL }
 };
 
-AVFilter avfilter_vf_setdar = {
+AVFilter ff_vf_setdar = {
     .name        = "setdar",
     .description = NULL_IF_CONFIG_SMALL("Set the frame display aspect ratio."),
     .init        = init,
@@ -175,6 +237,16 @@
     AspectContext *s = inlink->dst->priv;
     AVRational old_sar = inlink->sample_aspect_ratio;
     AVRational old_dar, dar;
+    int ret;
+
+#if FF_API_OLD_FILTER_OPTS
+    if (!(s->ratio_expr && s->aspect_den > 0)) {
+#endif
+    if ((ret = get_aspect_ratio(inlink, &s->sar)))
+        return ret;
+#if FF_API_OLD_FILTER_OPTS
+    }
+#endif
 
     inlink->sample_aspect_ratio = s->sar;
 
@@ -188,9 +260,9 @@
 }
 
 static const AVOption setsar_options[] = {
-    { "sar",   "set sample (pixel) aspect ratio", OFFSET(ratio_str), AV_OPT_TYPE_STRING, {.str="0"}, .flags=FLAGS },
-    { "ratio", "set sample (pixel) aspect ratio", OFFSET(ratio_str), AV_OPT_TYPE_STRING, {.str="0"}, .flags=FLAGS },
-    { "r",     "set sample (pixel) aspect ratio", OFFSET(ratio_str), AV_OPT_TYPE_STRING, {.str="0"}, .flags=FLAGS },
+    { "sar",   "set sample (pixel) aspect ratio", OFFSET(ratio_expr), AV_OPT_TYPE_STRING, { .str = "0" }, .flags = FLAGS },
+    { "ratio", "set sample (pixel) aspect ratio", OFFSET(ratio_expr), AV_OPT_TYPE_STRING, { .str = "0" }, .flags = FLAGS },
+    { "r",     "set sample (pixel) aspect ratio", OFFSET(ratio_expr), AV_OPT_TYPE_STRING, { .str = "0" }, .flags = FLAGS },
 #if FF_API_OLD_FILTER_OPTS
     { "sar_den", NULL, OFFSET(aspect_den), AV_OPT_TYPE_FLOAT, { .dbl = 0 }, 0, FLT_MAX, FLAGS },
 #endif
@@ -218,7 +290,7 @@
     { NULL }
 };
 
-AVFilter avfilter_vf_setsar = {
+AVFilter ff_vf_setsar = {
     .name        = "setsar",
     .description = NULL_IF_CONFIG_SMALL("Set the pixel sample aspect ratio."),
     .init        = init,

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/vf_bbox.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/vf_bbox.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/vf_blackdetect.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/vf_blackdetect.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/vf_blackframe.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/vf_blackframe.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/vf_blend.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/vf_blend.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/vf_boxblur.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/vf_boxblur.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/vf_colorbalance.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/vf_colorbalance.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/vf_colorchannelmixer.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/vf_colorchannelmixer.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/vf_colormatrix.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/vf_colormatrix.c Changed

@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 /**
@@ -164,8 +164,8 @@
 {
     ColorMatrixContext *color = ctx->priv;
 
-    if (color->source == COLOR_MODE_NONE || color->dest == COLOR_MODE_NONE) {
-        av_log(ctx, AV_LOG_ERROR, "Unspecified source or destination color space\n");
+    if (color->dest == COLOR_MODE_NONE) {
+        av_log(ctx, AV_LOG_ERROR, "Unspecified destination color space\n");
         return AVERROR(EINVAL);
     }
 
@@ -174,10 +174,6 @@
         return AVERROR(EINVAL);
     }
 
-    color->mode = color->source * 4 + color->dest;
-
-    calc_coefficients(ctx);
-
     return 0;
 }
 
@@ -346,6 +342,32 @@
     }
     av_frame_copy_props(out, in);
 
+    if (color->source == COLOR_MODE_NONE) {
+        enum AVColorSpace cs = av_frame_get_colorspace(in);
+        enum ColorMode source;
+
+        switch(cs) {
+        case AVCOL_SPC_BT709     : source = COLOR_MODE_BT709     ; break;
+        case AVCOL_SPC_FCC       : source = COLOR_MODE_FCC       ; break;
+        case AVCOL_SPC_SMPTE240M : source = COLOR_MODE_SMPTE240M ; break;
+        case AVCOL_SPC_BT470BG   : source = COLOR_MODE_BT601     ; break;
+        default :
+            av_log(ctx, AV_LOG_ERROR, "Input frame does not specify a supported colorspace, and none has been specified as source either\n");
+            return AVERROR(EINVAL);
+        }
+        color->mode = source * 4 + color->dest;
+    } else
+        color->mode = color->source * 4 + color->dest;
+
+    switch(color->dest) {
+    case COLOR_MODE_BT709    : av_frame_set_colorspace(out, AVCOL_SPC_BT709)    ; break;
+    case COLOR_MODE_FCC      : av_frame_set_colorspace(out, AVCOL_SPC_FCC)      ; break;
+    case COLOR_MODE_SMPTE240M: av_frame_set_colorspace(out, AVCOL_SPC_SMPTE240M); break;
+    case COLOR_MODE_BT601    : av_frame_set_colorspace(out, AVCOL_SPC_BT470BG)  ; break;
+    }
+
+    calc_coefficients(ctx);
+
     if (in->format == AV_PIX_FMT_YUV422P)
         process_frame_yuv422p(color, out, in);
     else if (in->format == AV_PIX_FMT_YUV420P)
@@ -375,7 +397,7 @@
     { NULL }
 };
 
-AVFilter avfilter_vf_colormatrix = {
+AVFilter ff_vf_colormatrix = {
     .name          = "colormatrix",
     .description   = NULL_IF_CONFIG_SMALL("Convert color matrix."),
     .priv_size     = sizeof(ColorMatrixContext),

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/vf_copy.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/vf_copy.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/vf_crop.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/vf_crop.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/vf_cropdetect.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/vf_cropdetect.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/vf_curves.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/vf_curves.c Changed

@@ -69,6 +69,10 @@
     int step;
 } CurvesContext;
 
+typedef struct ThreadData {
+    AVFrame *in, *out;
+} ThreadData;
+
 #define OFFSET(x) offsetof(CurvesContext, x)
 #define FLAGS AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM
 static const AVOption curves_options[] = {
@@ -473,23 +477,46 @@
     return 0;
 }
 
-static int filter_frame(AVFilterLink *inlink, AVFrame *in)
+static int filter_slice(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs)
 {
-    int x, y, direct = 0;
-    AVFilterContext *ctx = inlink->dst;
-    CurvesContext *curves = ctx->priv;
-    AVFilterLink *outlink = ctx->outputs[0];
-    AVFrame *out;
-    uint8_t *dst;
-    const uint8_t *src;
+    int x, y;
+    const CurvesContext *curves = ctx->priv;
+    const ThreadData *td = arg;
+    const AVFrame *in  = td->in;
+    const AVFrame *out = td->out;
+    const int direct = out == in;
     const int step = curves->step;
     const uint8_t r = curves->rgba_map[R];
     const uint8_t g = curves->rgba_map[G];
     const uint8_t b = curves->rgba_map[B];
     const uint8_t a = curves->rgba_map[A];
+    const int slice_start = (in->height *  jobnr   ) / nb_jobs;
+    const int slice_end   = (in->height * (jobnr+1)) / nb_jobs;
+    uint8_t       *dst = out->data[0] + slice_start * out->linesize[0];
+    const uint8_t *src =  in->data[0] + slice_start *  in->linesize[0];
+
+    for (y = slice_start; y < slice_end; y++) {
+        for (x = 0; x < in->width * step; x += step) {
+            dst[x + r] = curves->graph[R][src[x + r]];
+            dst[x + g] = curves->graph[G][src[x + g]];
+            dst[x + b] = curves->graph[B][src[x + b]];
+            if (!direct && step == 4)
+                dst[x + a] = src[x + a];
+        }
+        dst += out->linesize[0];
+        src += in ->linesize[0];
+    }
+    return 0;
+}
+
+static int filter_frame(AVFilterLink *inlink, AVFrame *in)
+{
+    AVFilterContext *ctx = inlink->dst;
+    AVFilterLink *outlink = ctx->outputs[0];
+    AVFrame *out;
+    ThreadData td;
 
     if (av_frame_is_writable(in)) {
-        direct = 1;
         out = in;
     } else {
         out = ff_get_video_buffer(outlink, outlink->w, outlink->h);
@@ -500,22 +527,11 @@
         av_frame_copy_props(out, in);
     }
 
-    dst = out->data[0];
-    src = in ->data[0];
-
-    for (y = 0; y < inlink->h; y++) {
-        for (x = 0; x < inlink->w * step; x += step) {
-            dst[x + r] = curves->graph[R][src[x + r]];
-            dst[x + g] = curves->graph[G][src[x + g]];
-            dst[x + b] = curves->graph[B][src[x + b]];
-            if (!direct && step == 4)
-                dst[x + a] = src[x + a];
-        }
-        dst += out->linesize[0];
-        src += in ->linesize[0];
-    }
+    td.in  = in;
+    td.out = out;
+    ctx->internal->execute(ctx, filter_slice, &td, NULL, FFMIN(outlink->h, ctx->graph->nb_threads));
 
-    if (!direct)
+    if (out != in)
         av_frame_free(&in);
 
     return ff_filter_frame(outlink, out);
@@ -539,7 +555,7 @@
     { NULL }
 };
 
-AVFilter avfilter_vf_curves = {
+AVFilter ff_vf_curves = {
     .name          = "curves",
     .description   = NULL_IF_CONFIG_SMALL("Adjust components curves."),
     .priv_size     = sizeof(CurvesContext),
@@ -548,5 +564,5 @@
     .inputs        = curves_inputs,
     .outputs       = curves_outputs,
     .priv_class    = &curves_class,
-    .flags         = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC,
+    .flags         = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS,
 };

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/vf_dctdnoiz.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/vf_dctdnoiz.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/vf_decimate.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/vf_decimate.c Changed

@@ -43,6 +43,7 @@
     AVFrame **clean_src;    ///< frame queue for the clean source
     int got_frame[2];       ///< frame request flag for each input stream
     double ts_unit;         ///< timestamp units for the output frames
+    int64_t start_pts;      ///< base for output timestamps
     uint32_t eof;           ///< bitmask for end of stream
     int hsub, vsub;         ///< chroma subsampling values
     int depth;
@@ -210,11 +211,14 @@
             av_frame_free(&dm->queue[i].frame);
         } else {
             AVFrame *frame = dm->queue[i].frame;
+            if (frame->pts != AV_NOPTS_VALUE && dm->start_pts == AV_NOPTS_VALUE)
+                dm->start_pts = frame->pts;
             if (dm->ppsrc) {
                 av_frame_free(&frame);
                 frame = dm->clean_src[i];
             }
-            frame->pts = outlink->frame_count * dm->ts_unit;
+            frame->pts = outlink->frame_count * dm->ts_unit +
+                         (dm->start_pts == AV_NOPTS_VALUE ? 0 : dm->start_pts);
             ret = ff_filter_frame(outlink, frame);
             if (ret < 0)
                 break;
@@ -259,7 +263,7 @@
 
 static av_cold int decimate_init(AVFilterContext *ctx)
 {
-    const DecimateContext *dm = ctx->priv;
+    DecimateContext *dm = ctx->priv;
     AVFilterPad pad = {
         .name         = av_strdup("main"),
         .type         = AVMEDIA_TYPE_VIDEO,
@@ -285,6 +289,8 @@
         return AVERROR(EINVAL);
     }
 
+    dm->start_pts = AV_NOPTS_VALUE;
+
     return 0;
 }
 
@@ -384,7 +390,7 @@
     { NULL }
 };
 
-AVFilter avfilter_vf_decimate = {
+AVFilter ff_vf_decimate = {
     .name          = "decimate",
     .description   = NULL_IF_CONFIG_SMALL("Decimate frames (post field matching filter)."),
     .init          = decimate_init,

omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/vf_dejudder.c Added

@@ -0,0 +1,187 @@
+/*
+ * Copyright (c) 2014 Nicholas Robbins
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * remove judder in video stream
+ *
+ * Algorithm:
+ *    - If the old packets had PTS of old_pts[i]. Replace these with new
+ *      value based on the running average of the last n=cycle frames. So
+ *
+ *      new_pts[i] = Sum(k=i-n+1, i, old_pts[k])/n
+ *                        + (old_pts[i]-old_pts[i-n])*(n-1)/2n
+ *
+ *      For any repeating pattern of length n of judder this will produce
+ *      an even progression of PTS's.
+ *
+ *    - In order to avoid calculating this sum ever frame, a running tally
+ *      is maintained in ctx->new_pts. Each frame the new term at the start
+ *      of the sum is added, the one and the end is removed, and the offset
+ *      terms (second line in formula above) are recalculated.
+ *
+ *    - To aid in this a ringbuffer of the last n-2 PTS's is maintained in
+ *      ctx->ringbuff. With the indices of the first two and last two entries
+ *      stored in i1, i2, i3, & i4.
+ *
+ *    - To ensure that the new PTS's are integers, time_base is divided
+ *      by 2n. This removes the division in the new_pts calculation.
+ *
+ *    - frame_rate is also multiplied by 2n to allow the frames to fall
+ *      where they may in what may now be a VFR output. This produces more
+ *      even output then setting frame_rate=1/0 in practice.
+ */
+
+#include "libavutil/opt.h"
+#include "libavutil/mathematics.h"
+#include "avfilter.h"
+#include "internal.h"
+#include "video.h"
+
+typedef struct {
+    const AVClass *class;
+    int64_t *ringbuff;
+    int i1, i2, i3, i4;
+    int64_t new_pts;
+    int start_count;
+
+    /* options */
+    int cycle;
+} DejudderContext;
+
+#define OFFSET(x) offsetof(DejudderContext, x)
+#define FLAGS AV_OPT_FLAG_FILTERING_PARAM | AV_OPT_FLAG_VIDEO_PARAM
+
+static const AVOption dejudder_options[] = {
+    {"cycle", "set the length of the cycle to use for dejuddering",
+        OFFSET(cycle), AV_OPT_TYPE_INT, {.i64 = 4}, 2, 240, .flags = FLAGS},
+    {NULL}
+};
+
+AVFILTER_DEFINE_CLASS(dejudder);
+
+static int config_out_props(AVFilterLink *outlink)
+{
+    AVFilterContext *ctx = outlink->src;
+    DejudderContext *dj = ctx->priv;
+    AVFilterLink *inlink = outlink->src->inputs[0];
+
+    outlink->time_base = av_mul_q(inlink->time_base, av_make_q(1, 2 * dj->cycle));
+    outlink->frame_rate = av_mul_q(inlink->frame_rate, av_make_q(2 * dj->cycle, 1));
+
+    av_log(ctx, AV_LOG_VERBOSE, "cycle:%d\n", dj->cycle);
+
+    return 0;
+}
+
+static av_cold int dejudder_init(AVFilterContext *ctx)
+{
+    DejudderContext *dj = ctx->priv;
+
+    dj->ringbuff = av_mallocz(sizeof(*dj->ringbuff) * (dj->cycle+2));
+    if (!dj->ringbuff)
+        return AVERROR(ENOMEM);
+
+    dj->new_pts = 0;
+    dj->i1 = 0;
+    dj->i2 = 1;
+    dj->i3 = 2;
+    dj->i4 = 3;
+    dj->start_count = dj->cycle + 2;
+
+    return 0;
+}
+
+static av_cold void dejudder_uninit(AVFilterContext *ctx)
+{
+    DejudderContext *dj = ctx->priv;
+
+    av_freep(&(dj->ringbuff));
+}
+
+static int filter_frame(AVFilterLink *inlink, AVFrame *frame)
+{
+    int k;
+    AVFilterContext *ctx  = inlink->dst;
+    AVFilterLink *outlink = ctx->outputs[0];
+    DejudderContext *dj   = ctx->priv;
+    int64_t *judbuff      = dj->ringbuff;
+    int64_t next_pts      = frame->pts;
+    int64_t offset;
+
+    if (next_pts == AV_NOPTS_VALUE)
+        return ff_filter_frame(outlink, frame);
+
+    if (dj->start_count) {
+        dj->start_count--;
+        dj->new_pts = next_pts * 2 * dj->cycle;
+    } else {
+        if (next_pts < judbuff[dj->i2]) {
+            offset = next_pts + judbuff[dj->i3] - judbuff[dj->i4] - judbuff[dj->i1];
+            for (k = 0; k < dj->cycle + 2; k++)
+                judbuff[k] += offset;
+        }
+        dj->new_pts += (dj->cycle - 1) * (judbuff[dj->i3] - judbuff[dj->i1])
+                    + (dj->cycle + 1) * (next_pts - judbuff[dj->i4]);
+    }
+
+    judbuff[dj->i2] = next_pts;
+    dj->i1 = dj->i2;
+    dj->i2 = dj->i3;
+    dj->i3 = dj->i4;
+    dj->i4 = (dj->i4 + 1) % (dj->cycle + 2);
+
+    frame->pts = dj->new_pts;
+
+    for (k = 0; k < dj->cycle + 2; k++)
+        av_log(ctx, AV_LOG_DEBUG, "%"PRId64"\t", judbuff[k]);
+    av_log(ctx, AV_LOG_DEBUG, "next=%"PRId64", new=%"PRId64"\n", next_pts, frame->pts);
+
+    return ff_filter_frame(outlink, frame);
+}
+
+static const AVFilterPad dejudder_inputs[] = {
+    {
+        .name         = "default",
+        .type         = AVMEDIA_TYPE_VIDEO,
+        .filter_frame = filter_frame,
+    },
+    { NULL }
+};
+
+static const AVFilterPad dejudder_outputs[] = {
+    {
+        .name = "default",
+        .type = AVMEDIA_TYPE_VIDEO,
+        .config_props = config_out_props,
+    },
+    { NULL }
+};
+
+AVFilter ff_vf_dejudder = {
+    .name        = "dejudder",
+    .description = NULL_IF_CONFIG_SMALL("Remove judder produced by pullup."),
+    .priv_size   = sizeof(DejudderContext),
+    .priv_class  = &dejudder_class,
+    .inputs      = dejudder_inputs,
+    .outputs     = dejudder_outputs,
+    .init        = dejudder_init,
+    .uninit      = dejudder_uninit,
+};

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/vf_delogo.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/vf_delogo.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/vf_deshake.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/vf_deshake.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/vf_drawbox.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/vf_drawbox.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/vf_drawtext.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/vf_drawtext.c Changed

@@ -26,10 +26,12 @@
  * filter by Gustavo Sverzut Barbieri
  */
 
+#include "config.h"
+#if HAVE_SYS_TIME_H
 #include <sys/time.h>
+#endif
 #include <time.h>
 
-#include "config.h"
 #include "libavutil/avstring.h"
 #include "libavutil/bprint.h"
 #include "libavutil/common.h"
@@ -48,9 +50,9 @@
 #include "video.h"
 
 #include <ft2build.h>
-#include <freetype/config/ftheader.h>
 #include FT_FREETYPE_H
 #include FT_GLYPH_H
+#include FT_STROKER_H
 #if CONFIG_FONTCONFIG
 #include <fontconfig/fontconfig.h>
 #endif
@@ -135,6 +137,7 @@
     int max_glyph_w;                ///< max glyph width
     int max_glyph_h;                ///< max glyph height
     int shadowx, shadowy;
+    int borderw;                    ///< border width
     unsigned int fontsize;          ///< font size to use
 
     short int draw_box;             ///< draw box around text - true or false
@@ -145,10 +148,12 @@
     FFDrawContext dc;
     FFDrawColor fontcolor;          ///< foreground color
     FFDrawColor shadowcolor;        ///< shadow color
+    FFDrawColor bordercolor;        ///< border color
     FFDrawColor boxcolor;           ///< background color
 
     FT_Library library;             ///< freetype font library handle
     FT_Face face;                   ///< freetype font face handle
+    FT_Stroker stroker;             ///< freetype stroker handle
     struct AVTreeNode *glyphs;      ///< rendered glyphs, stored using the UTF-32 char code
     char *x_expr;                   ///< expression for x position
     char *y_expr;                   ///< expression for y position
@@ -179,6 +184,7 @@
     {"textfile",    "set text file",        OFFSET(textfile),           AV_OPT_TYPE_STRING, {.str=NULL},  CHAR_MIN, CHAR_MAX, FLAGS},
     {"fontcolor",   "set foreground color", OFFSET(fontcolor.rgba),     AV_OPT_TYPE_COLOR,  {.str="black"}, CHAR_MIN, CHAR_MAX, FLAGS},
     {"boxcolor",    "set box color",        OFFSET(boxcolor.rgba),      AV_OPT_TYPE_COLOR,  {.str="white"}, CHAR_MIN, CHAR_MAX, FLAGS},
+    {"bordercolor", "set border color",     OFFSET(bordercolor.rgba),   AV_OPT_TYPE_COLOR,  {.str="black"}, CHAR_MIN, CHAR_MAX, FLAGS},
     {"shadowcolor", "set shadow color",     OFFSET(shadowcolor.rgba),   AV_OPT_TYPE_COLOR,  {.str="black"}, CHAR_MIN, CHAR_MAX, FLAGS},
     {"box",         "set box",              OFFSET(draw_box),           AV_OPT_TYPE_INT,    {.i64=0},     0,        1       , FLAGS},
     {"fontsize",    "set font size",        OFFSET(fontsize),           AV_OPT_TYPE_INT,    {.i64=0},     0,        INT_MAX , FLAGS},
@@ -186,6 +192,7 @@
     {"y",           "set y expression",     OFFSET(y_expr),             AV_OPT_TYPE_STRING, {.str="0"},   CHAR_MIN, CHAR_MAX, FLAGS},
     {"shadowx",     "set x",                OFFSET(shadowx),            AV_OPT_TYPE_INT,    {.i64=0},     INT_MIN,  INT_MAX , FLAGS},
     {"shadowy",     "set y",                OFFSET(shadowy),            AV_OPT_TYPE_INT,    {.i64=0},     INT_MIN,  INT_MAX , FLAGS},
+    {"borderw",     "set border width",     OFFSET(borderw),            AV_OPT_TYPE_INT,    {.i64=0},     INT_MIN,  INT_MAX , FLAGS},
     {"tabsize",     "set tab size",         OFFSET(tabsize),            AV_OPT_TYPE_INT,    {.i64=4},     0,        INT_MAX , FLAGS},
     {"basetime",    "set base time",        OFFSET(basetime),           AV_OPT_TYPE_INT64,  {.i64=AV_NOPTS_VALUE}, INT64_MIN, INT64_MAX , FLAGS},
 #if FF_API_DRAWTEXT_OLD_TIMELINE
@@ -207,7 +214,7 @@
     {"start_number", "start frame number for n/frame_num variable", OFFSET(start_number), AV_OPT_TYPE_INT, {.i64=0}, 0, INT_MAX, FLAGS},
 
     /* FT_LOAD_* flags */
-    { "ft_load_flags", "set font loading flags for libfreetype", OFFSET(ft_load_flags), AV_OPT_TYPE_FLAGS, { .i64 = FT_LOAD_DEFAULT | FT_LOAD_RENDER}, 0, INT_MAX, FLAGS, "ft_load_flags" },
+    { "ft_load_flags", "set font loading flags for libfreetype", OFFSET(ft_load_flags), AV_OPT_TYPE_FLAGS, { .i64 = FT_LOAD_DEFAULT }, 0, INT_MAX, FLAGS, "ft_load_flags" },
         { "default",                     NULL, 0, AV_OPT_TYPE_CONST, { .i64 = FT_LOAD_DEFAULT },                     .flags = FLAGS, .unit = "ft_load_flags" },
         { "no_scale",                    NULL, 0, AV_OPT_TYPE_CONST, { .i64 = FT_LOAD_NO_SCALE },                    .flags = FLAGS, .unit = "ft_load_flags" },
         { "no_hinting",                  NULL, 0, AV_OPT_TYPE_CONST, { .i64 = FT_LOAD_NO_HINTING },                  .flags = FLAGS, .unit = "ft_load_flags" },
@@ -246,6 +253,7 @@
     FT_Glyph *glyph;
     uint32_t code;
     FT_Bitmap bitmap; ///< array holding bitmaps of font
+    FT_Bitmap border_bitmap; ///< array holding bitmaps of font border
     FT_BBox bbox;
     int advance;
     int bitmap_left;
@@ -265,6 +273,7 @@
 static int load_glyph(AVFilterContext *ctx, Glyph **glyph_ptr, uint32_t code)
 {
     DrawTextContext *s = ctx->priv;
+    FT_BitmapGlyph bitmapglyph;
     Glyph *glyph;
     struct AVTreeNode *node = NULL;
     int ret;
@@ -285,10 +294,25 @@
         ret = AVERROR(EINVAL);
         goto error;
     }
+    if (s->borderw) {
+        FT_Glyph border_glyph = *glyph->glyph;
+        if (FT_Glyph_StrokeBorder(&border_glyph, s->stroker, 0, 0) ||
+            FT_Glyph_To_Bitmap(&border_glyph, FT_RENDER_MODE_NORMAL, 0, 1)) {
+            ret = AVERROR_EXTERNAL;
+            goto error;
+        }
+        bitmapglyph = (FT_BitmapGlyph) border_glyph;
+        glyph->border_bitmap = bitmapglyph->bitmap;
+    }
+    if (FT_Glyph_To_Bitmap(glyph->glyph, FT_RENDER_MODE_NORMAL, 0, 1)) {
+        ret = AVERROR_EXTERNAL;
+        goto error;
+    }
+    bitmapglyph = (FT_BitmapGlyph) *glyph->glyph;
 
-    glyph->bitmap      = s->face->glyph->bitmap;
-    glyph->bitmap_left = s->face->glyph->bitmap_left;
-    glyph->bitmap_top  = s->face->glyph->bitmap_top;
+    glyph->bitmap      = bitmapglyph->bitmap;
+    glyph->bitmap_left = bitmapglyph->left;
+    glyph->bitmap_top  = bitmapglyph->top;
     glyph->advance     = s->face->glyph->advance.x >> 6;
 
     /* measure text height to calculate text_height (or the maximum text height) */
@@ -485,6 +509,15 @@
         return AVERROR(EINVAL);
     }
 
+    if (s->borderw) {
+        if (FT_Stroker_New(s->library, &s->stroker)) {
+            av_log(ctx, AV_LOG_ERROR, "Coult not init FT stroker\n");
+            return AVERROR_EXTERNAL;
+        }
+        FT_Stroker_Set(s->stroker, s->borderw << 6, FT_STROKER_LINECAP_ROUND,
+                       FT_STROKER_LINEJOIN_ROUND, 0);
+    }
+
     s->use_kerning = FT_HAS_KERNING(s->face);
 
     /* load the fallback glyph with code 0 */
@@ -541,6 +574,7 @@
     s->glyphs = NULL;
 
     FT_Done_Face(s->face);
+    FT_Stroker_Done(s->stroker);
     FT_Done_FreeType(s->library);
 
     av_bprint_finalize(&s->expanded_text, NULL);
@@ -560,6 +594,7 @@
     ff_draw_init(&s->dc, inlink->format, 0);
     ff_draw_color(&s->dc, &s->fontcolor,   s->fontcolor.rgba);
     ff_draw_color(&s->dc, &s->shadowcolor, s->shadowcolor.rgba);
+    ff_draw_color(&s->dc, &s->bordercolor, s->bordercolor.rgba);
     ff_draw_color(&s->dc, &s->boxcolor,    s->boxcolor.rgba);
 
     s->var_values[VAR_w]     = s->var_values[VAR_W]     = s->var_values[VAR_MAIN_W] = inlink->w;
@@ -607,6 +642,8 @@
         int ret;
         uninit(ctx);
         s->reinit = 1;
+        if ((ret = av_set_options_string(ctx, arg, "=", ":")) < 0)
+            return ret;
         if ((ret = init(ctx)) < 0)
             return ret;
         return config_input(ctx->inputs[0]);
@@ -807,7 +844,8 @@
 }
 
 static int draw_glyphs(DrawTextContext *s, AVFrame *frame,
-                       int width, int height, const uint8_t rgbcolor[4], FFDrawColor *color, int x, int y)
+                       int width, int height, const uint8_t rgbcolor[4],
+                       FFDrawColor *color, int x, int y, int borderw)
 {
     char *text = s->expanded_text.str;
     uint32_t code = 0;
@@ -816,6 +854,7 @@
     Glyph *glyph = NULL;
 
     for (i = 0, p = text; *p; i++) {
+        FT_Bitmap bitmap;
         Glyph dummy = { 0 };
         GET_UTF8(code, *p++, continue;);
 
@@ -826,18 +865,20 @@
         dummy.code = code;
         glyph = av_tree_find(s->glyphs, &dummy, (void *)glyph_cmp, NULL);
 
+        bitmap = borderw ? glyph->border_bitmap : glyph->bitmap;
+
         if (glyph->bitmap.pixel_mode != FT_PIXEL_MODE_MONO &&
             glyph->bitmap.pixel_mode != FT_PIXEL_MODE_GRAY)
             return AVERROR(EINVAL);
 
-        x1 = s->positions[i].x+s->x+x;
-        y1 = s->positions[i].y+s->y+y;
+        x1 = s->positions[i].x+s->x+x - borderw;
+        y1 = s->positions[i].y+s->y+y - borderw;
 
         ff_blend_mask(&s->dc, color,
                       frame->data, frame->linesize, width, height,
-                      glyph->bitmap.buffer, glyph->bitmap.pitch,
-                      glyph->bitmap.width, glyph->bitmap.rows,
-                      glyph->bitmap.pixel_mode == FT_PIXEL_MODE_MONO ? 0 : 3,
+                      bitmap.buffer, bitmap.pitch,
+                      bitmap.width, bitmap.rows,
+                      bitmap.pixel_mode == FT_PIXEL_MODE_MONO ? 0 : 3,
                       0, x1, y1);
     }
 
@@ -998,12 +1039,17 @@
 
     if (s->shadowx || s->shadowy) {
         if ((ret = draw_glyphs(s, frame, width, height, s->shadowcolor.rgba,
-                               &s->shadowcolor, s->shadowx, s->shadowy)) < 0)
+                               &s->shadowcolor, s->shadowx, s->shadowy, 0)) < 0)
             return ret;
     }
 
+    if (s->borderw) {
+        if ((ret = draw_glyphs(s, frame, width, height, s->bordercolor.rgba,
+                               &s->bordercolor, 0, 0, s->borderw)) < 0)
+            return ret;
+    }
     if ((ret = draw_glyphs(s, frame, width, height, s->fontcolor.rgba,
-                           &s->fontcolor, 0, 0)) < 0)
+                           &s->fontcolor, 0, 0, 0)) < 0)
         return ret;
 
     return 0;
@@ -1056,7 +1102,7 @@
     { NULL }
 };
 
-AVFilter avfilter_vf_drawtext = {
+AVFilter ff_vf_drawtext = {
     .name          = "drawtext",
     .description   = NULL_IF_CONFIG_SMALL("Draw text on top of video frames using libfreetype library."),
     .priv_size     = sizeof(DrawTextContext),

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/vf_edgedetect.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/vf_edgedetect.c Changed

omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/vf_elbg.c Added

@@ -0,0 +1,212 @@
+/*
+ * Copyright (c) 2013 Stefano Sabatini
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * video quantizer filter based on ELBG
+ */
+
+#include "libavcodec/elbg.h"
+#include "libavutil/opt.h"
+#include "libavutil/pixdesc.h"
+#include "libavutil/random_seed.h"
+
+#include "avfilter.h"
+#include "drawutils.h"
+#include "internal.h"
+#include "video.h"
+
+typedef struct {
+    const AVClass *class;
+    AVLFG lfg;
+    unsigned int lfg_seed;
+    int max_steps_nb;
+    int *codeword;
+    int codeword_length;
+    int *codeword_closest_codebook_idxs;
+    int *codebook;
+    int codebook_length;
+    const AVPixFmtDescriptor *pix_desc;
+    uint8_t rgba_map[4];
+} ELBGContext;
+
+#define OFFSET(x) offsetof(ELBGContext, x)
+#define FLAGS AV_OPT_FLAG_VIDEO_PARAM|AV_OPT_FLAG_FILTERING_PARAM
+
+static const AVOption elbg_options[] = {
+    { "codebook_length", "set codebook length", OFFSET(codebook_length), AV_OPT_TYPE_INT, { .i64 = 256 }, 1, INT_MAX, FLAGS },
+    { "l",               "set codebook length", OFFSET(codebook_length), AV_OPT_TYPE_INT, { .i64 = 256 }, 1, INT_MAX, FLAGS },
+    { "nb_steps", "set max number of steps used to compute the mapping", OFFSET(max_steps_nb), AV_OPT_TYPE_INT, { .i64 = 1 }, 1, INT_MAX, FLAGS },
+    { "n",        "set max number of steps used to compute the mapping", OFFSET(max_steps_nb), AV_OPT_TYPE_INT, { .i64 = 1 }, 1, INT_MAX, FLAGS },
+    { "seed", "set the random seed", OFFSET(lfg_seed), AV_OPT_TYPE_INT, {.i64 = -1}, -1, UINT32_MAX, FLAGS },
+    { "s",    "set the random seed", OFFSET(lfg_seed), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, UINT32_MAX, FLAGS },
+    { NULL }
+};
+
+AVFILTER_DEFINE_CLASS(elbg);
+
+static av_cold int init(AVFilterContext *ctx)
+{
+    ELBGContext *elbg = ctx->priv;
+
+    if (elbg->lfg_seed == -1)
+        elbg->lfg_seed = av_get_random_seed();
+
+    av_lfg_init(&elbg->lfg, elbg->lfg_seed);
+    return 0;
+}
+
+static int query_formats(AVFilterContext *ctx)
+{
+    static const enum PixelFormat pix_fmts[] = {
+        AV_PIX_FMT_ARGB, AV_PIX_FMT_RGBA, AV_PIX_FMT_ABGR, AV_PIX_FMT_BGRA,
+        AV_PIX_FMT_RGB24, AV_PIX_FMT_BGR24,
+        AV_PIX_FMT_NONE
+    };
+
+    ff_set_common_formats(ctx, ff_make_format_list(pix_fmts));
+
+    return 0;
+}
+
+#define NB_COMPONENTS 3
+
+static int config_input(AVFilterLink *inlink)
+{
+    AVFilterContext *ctx = inlink->dst;
+    ELBGContext *elbg = ctx->priv;
+
+    elbg->pix_desc = av_pix_fmt_desc_get(inlink->format);
+    elbg->codeword_length = inlink->w * inlink->h;
+    elbg->codeword = av_realloc_f(elbg->codeword, elbg->codeword_length,
+                                  NB_COMPONENTS * sizeof(*elbg->codeword));
+    if (!elbg->codeword)
+        return AVERROR(ENOMEM);
+
+    elbg->codeword_closest_codebook_idxs =
+        av_realloc_f(elbg->codeword_closest_codebook_idxs, elbg->codeword_length,
+                     sizeof(*elbg->codeword_closest_codebook_idxs));
+    if (!elbg->codeword_closest_codebook_idxs)
+        return AVERROR(ENOMEM);
+
+    elbg->codebook = av_realloc_f(elbg->codebook, elbg->codebook_length,
+                                  NB_COMPONENTS * sizeof(*elbg->codebook));
+    if (!elbg->codebook)
+        return AVERROR(ENOMEM);
+
+    ff_fill_rgba_map(elbg->rgba_map, inlink->format);
+
+    return 0;
+}
+
+#define R 0
+#define G 1
+#define B 2
+
+static int filter_frame(AVFilterLink *inlink, AVFrame *frame)
+{
+    ELBGContext *elbg = inlink->dst->priv;
+    int i, j, k;
+    uint8_t *p, *p0;
+
+    const uint8_t r_idx  = elbg->rgba_map[R];
+    const uint8_t g_idx  = elbg->rgba_map[G];
+    const uint8_t b_idx  = elbg->rgba_map[B];
+
+    /* build the codeword */
+    p0 = frame->data[0];
+    k = 0;
+    for (i = 0; i < inlink->h; i++) {
+        p = p0;
+        for (j = 0; j < inlink->w; j++) {
+            elbg->codeword[k++] = p[r_idx];
+            elbg->codeword[k++] = p[g_idx];
+            elbg->codeword[k++] = p[b_idx];
+            p += elbg->pix_desc->nb_components;
+        }
+        p0 += frame->linesize[0];
+    }
+
+    /* compute the codebook */
+    avpriv_init_elbg(elbg->codeword, NB_COMPONENTS, elbg->codeword_length,
+                     elbg->codebook, elbg->codebook_length, elbg->max_steps_nb,
+                     elbg->codeword_closest_codebook_idxs, &elbg->lfg);
+    avpriv_do_elbg(elbg->codeword, NB_COMPONENTS, elbg->codeword_length,
+                   elbg->codebook, elbg->codebook_length, elbg->max_steps_nb,
+                   elbg->codeword_closest_codebook_idxs, &elbg->lfg);
+
+    /* fill the output with the codebook values */
+    p0 = frame->data[0];
+
+    k = 0;
+    for (i = 0; i < inlink->h; i++) {
+        p = p0;
+        for (j = 0; j < inlink->w; j++) {
+            int cb_idx = NB_COMPONENTS * elbg->codeword_closest_codebook_idxs[k++];
+            p[r_idx] = elbg->codebook[cb_idx];
+            p[g_idx] = elbg->codebook[cb_idx+1];
+            p[b_idx] = elbg->codebook[cb_idx+2];
+            p += elbg->pix_desc->nb_components;
+        }
+        p0 += frame->linesize[0];
+    }
+
+    return ff_filter_frame(inlink->dst->outputs[0], frame);
+}
+
+static av_cold void uninit(AVFilterContext *ctx)
+{
+    ELBGContext *elbg = ctx->priv;
+
+    av_freep(&elbg->codebook);
+    av_freep(&elbg->codeword);
+    av_freep(&elbg->codeword_closest_codebook_idxs);
+}
+
+static const AVFilterPad elbg_inputs[] = {
+    {
+        .name           = "default",
+        .type           = AVMEDIA_TYPE_VIDEO,
+        .config_props   = config_input,
+        .filter_frame   = filter_frame,
+        .needs_writable = 1,
+    },
+    { NULL }
+};
+
+static const AVFilterPad elbg_outputs[] = {
+    {
+        .name = "default",
+        .type = AVMEDIA_TYPE_VIDEO,
+    },
+    { NULL }
+};
+
+AVFilter ff_vf_elbg = {
+    .name          = "elbg",
+    .description   = NULL_IF_CONFIG_SMALL("Apply posterize effect, using the ELBG algorithm."),
+    .priv_size     = sizeof(ELBGContext),
+    .priv_class    = &elbg_class,
+    .query_formats = query_formats,
+    .init          = init,
+    .uninit        = uninit,
+    .inputs        = elbg_inputs,
+    .outputs       = elbg_outputs,
+};

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/vf_extractplanes.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/vf_extractplanes.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/vf_fade.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/vf_fade.c Changed

@@ -25,6 +25,7 @@
  * based heavily on vf_negate.c by Bobby Bingham
  */
 
+#include "libavutil/avassert.h"
 #include "libavutil/avstring.h"
 #include "libavutil/common.h"
 #include "libavutil/eval.h"
@@ -53,7 +54,6 @@
     int type;
     int factor, fade_per_frame;
     int start_frame, nb_frames;
-    unsigned int frame_index;
     int hsub, vsub, bpp;
     unsigned int black_level, black_level_scaled;
     uint8_t is_packed_rgb;
@@ -61,6 +61,8 @@
     int alpha;
     uint64_t start_time, duration;
     enum {VF_FADE_WAITING=0, VF_FADE_FADING, VF_FADE_DONE} fade_state;
+    uint8_t color_rgba[4];  ///< fade color
+    int black_fade;         ///< if color_rgba is black
 } FadeContext;
 
 static av_cold int init(AVFilterContext *ctx)
@@ -89,11 +91,13 @@
                (s->duration / (double)AV_TIME_BASE),s->alpha);
     }
 
+    s->black_fade = !memcmp(s->color_rgba, "\x00\x00\x00\xff", 4);
     return 0;
 }
 
 static int query_formats(AVFilterContext *ctx)
 {
+    const FadeContext *s = ctx->priv;
     static const enum AVPixelFormat pix_fmts[] = {
         AV_PIX_FMT_YUV444P,  AV_PIX_FMT_YUV422P,  AV_PIX_FMT_YUV420P,
         AV_PIX_FMT_YUV411P,  AV_PIX_FMT_YUV410P,
@@ -105,8 +109,17 @@
         AV_PIX_FMT_RGBA,     AV_PIX_FMT_BGRA,
         AV_PIX_FMT_NONE
     };
+    static const enum AVPixelFormat pix_fmts_rgb[] = {
+        AV_PIX_FMT_RGB24,    AV_PIX_FMT_BGR24,
+        AV_PIX_FMT_ARGB,     AV_PIX_FMT_ABGR,
+        AV_PIX_FMT_RGBA,     AV_PIX_FMT_BGRA,
+        AV_PIX_FMT_NONE
+    };
 
-    ff_set_common_formats(ctx, ff_make_format_list(pix_fmts));
+    if (s->black_fade)
+        ff_set_common_formats(ctx, ff_make_format_list(pix_fmts));
+    else
+        ff_set_common_formats(ctx, ff_make_format_list(pix_fmts_rgb));
     return 0;
 }
 
@@ -138,6 +151,47 @@
     return 0;
 }
 
+static av_always_inline void filter_rgb(FadeContext *s, const AVFrame *frame,
+                                        int slice_start, int slice_end,
+                                        int do_alpha, int step)
+{
+    int i, j;
+    const uint8_t r_idx  = s->rgba_map[R];
+    const uint8_t g_idx  = s->rgba_map[G];
+    const uint8_t b_idx  = s->rgba_map[B];
+    const uint8_t a_idx  = s->rgba_map[A];
+    const uint8_t *c = s->color_rgba;
+
+    for (i = slice_start; i < slice_end; i++) {
+        uint8_t *p = frame->data[0] + i * frame->linesize[0];
+        for (j = 0; j < frame->width; j++) {
+#define INTERP(c_name, c_idx) av_clip_uint8(((c[c_idx]<<16) + ((int)p[c_name] - (int)c[c_idx]) * s->factor + (1<<15)) >> 16)
+            p[r_idx] = INTERP(r_idx, 0);
+            p[g_idx] = INTERP(g_idx, 1);
+            p[b_idx] = INTERP(b_idx, 2);
+            if (do_alpha)
+                p[a_idx] = INTERP(a_idx, 3);
+            p += step;
+        }
+    }
+}
+
+static int filter_slice_rgb(AVFilterContext *ctx, void *arg, int jobnr,
+                            int nb_jobs)
+{
+    FadeContext *s = ctx->priv;
+    AVFrame *frame = arg;
+    int slice_start = (frame->height *  jobnr   ) / nb_jobs;
+    int slice_end   = (frame->height * (jobnr+1)) / nb_jobs;
+
+    if      (s->alpha)    filter_rgb(s, frame, slice_start, slice_end, 1, 4);
+    else if (s->bpp == 3) filter_rgb(s, frame, slice_start, slice_end, 0, 3);
+    else if (s->bpp == 4) filter_rgb(s, frame, slice_start, slice_end, 0, 4);
+    else                  av_assert0(0);
+
+    return 0;
+}
+
 static int filter_slice_luma(AVFilterContext *ctx, void *arg, int jobnr,
                              int nb_jobs)
 {
@@ -222,36 +276,36 @@
     // Calculate Fade assuming this is a Fade In
     if (s->fade_state == VF_FADE_WAITING) {
         s->factor=0;
-        if ((frame_timestamp >= (s->start_time/(double)AV_TIME_BASE))
-            && (s->frame_index >= s->start_frame)) {
+        if (frame_timestamp >= s->start_time/(double)AV_TIME_BASE
+            && inlink->frame_count >= s->start_frame) {
             // Time to start fading
             s->fade_state = VF_FADE_FADING;
 
             // Save start time in case we are starting based on frames and fading based on time
-            if ((s->start_time == 0) && (s->start_frame != 0)) {
+            if (s->start_time == 0 && s->start_frame != 0) {
                 s->start_time = frame_timestamp*(double)AV_TIME_BASE;
             }
 
             // Save start frame in case we are starting based on time and fading based on frames
-            if ((s->start_time != 0) && (s->start_frame == 0)) {
-                s->start_frame = s->frame_index;
+            if (s->start_time != 0 && s->start_frame == 0) {
+                s->start_frame = inlink->frame_count;
             }
         }
     }
     if (s->fade_state == VF_FADE_FADING) {
         if (s->duration == 0) {
             // Fading based on frame count
-            s->factor = (s->frame_index - s->start_frame) * s->fade_per_frame;
-            if (s->frame_index > (s->start_frame + s->nb_frames)) {
+            s->factor = (inlink->frame_count - s->start_frame) * s->fade_per_frame;
+            if (inlink->frame_count > s->start_frame + s->nb_frames) {
                 s->fade_state = VF_FADE_DONE;
             }
 
         } else {
             // Fading based on duration
-            s->factor = (frame_timestamp - (s->start_time/(double)AV_TIME_BASE))
+            s->factor = (frame_timestamp - s->start_time/(double)AV_TIME_BASE)
                             * (float) UINT16_MAX / (s->duration/(double)AV_TIME_BASE);
-            if (frame_timestamp > ((s->start_time/(double)AV_TIME_BASE)
-                                    + (s->duration/(double)AV_TIME_BASE))) {
+            if (frame_timestamp > s->start_time/(double)AV_TIME_BASE
+                                  + s->duration/(double)AV_TIME_BASE) {
                 s->fade_state = VF_FADE_DONE;
             }
         }
@@ -263,7 +317,7 @@
     s->factor = av_clip_uint16(s->factor);
 
     // Invert fade_factor if Fading Out
-    if (s->type == 1) {
+    if (s->type == FADE_OUT) {
         s->factor=UINT16_MAX-s->factor;
     }
 
@@ -271,8 +325,11 @@
         if (s->alpha) {
             ctx->internal->execute(ctx, filter_slice_alpha, frame, NULL,
                                 FFMIN(frame->height, ctx->graph->nb_threads));
+        } else if (s->is_packed_rgb && !s->black_fade) {
+            ctx->internal->execute(ctx, filter_slice_rgb, frame, NULL,
+                                   FFMIN(frame->height, ctx->graph->nb_threads));
         } else {
-            /* luma or rgb plane */
+            /* luma, or rgb plane in case of black */
             ctx->internal->execute(ctx, filter_slice_luma, frame, NULL,
                                 FFMIN(frame->height, ctx->graph->nb_threads));
 
@@ -284,8 +341,6 @@
         }
     }
 
-    s->frame_index++;
-
     return ff_filter_frame(inlink->dst->outputs[0], frame);
 }
 
@@ -315,6 +370,8 @@
                                                     OFFSET(duration),    AV_OPT_TYPE_DURATION, {.i64 = 0. }, 0, INT32_MAX, FLAGS },
     { "d",           "Duration of the effect in seconds.",
                                                     OFFSET(duration),    AV_OPT_TYPE_DURATION, {.i64 = 0. }, 0, INT32_MAX, FLAGS },
+    { "color",       "set color",                   OFFSET(color_rgba),  AV_OPT_TYPE_COLOR,    {.str = "black"}, CHAR_MIN, CHAR_MAX, FLAGS },
+    { "c",           "set color",                   OFFSET(color_rgba),  AV_OPT_TYPE_COLOR,    {.str = "black"}, CHAR_MIN, CHAR_MAX, FLAGS },
     { NULL }
 };
 
@@ -339,7 +396,7 @@
     { NULL }
 };
 
-AVFilter avfilter_vf_fade = {
+AVFilter ff_vf_fade = {
     .name          = "fade",
     .description   = NULL_IF_CONFIG_SMALL("Fade in/out input video."),
     .init          = init,

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/vf_field.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/vf_field.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/vf_fieldmatch.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/vf_fieldmatch.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/vf_fieldorder.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/vf_fieldorder.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/vf_format.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/vf_format.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/vf_fps.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/vf_fps.c Changed

@@ -26,6 +26,7 @@
  */
 
 #include <float.h>
+#include <stdint.h>
 
 #include "libavutil/common.h"
 #include "libavutil/fifo.h"
@@ -44,7 +45,6 @@
 
     /* timestamps in input timebase */
     int64_t first_pts;      ///< pts of the first frame that arrived on this filter
-    int64_t pts;            ///< pts of the first frame currently in the fifo
 
     double start_time;      ///< pts, in seconds, of the expected first frame
 
@@ -82,7 +82,6 @@
     if (!(s->fifo = av_fifo_alloc(2*sizeof(AVFrame*))))
         return AVERROR(ENOMEM);
 
-    s->pts          = AV_NOPTS_VALUE;
     s->first_pts    = AV_NOPTS_VALUE;
 
     av_log(ctx, AV_LOG_VERBOSE, "fps=%d/%d\n", s->framerate.num, s->framerate.den);
@@ -178,7 +177,7 @@
 
     s->frames_in++;
     /* discard frames until we get the first timestamp */
-    if (s->pts == AV_NOPTS_VALUE) {
+    if (s->first_pts == AV_NOPTS_VALUE) {
         if (buf->pts != AV_NOPTS_VALUE) {
             ret = write_to_fifo(s->fifo, buf);
             if (ret < 0)
@@ -187,13 +186,13 @@
             if (s->start_time != DBL_MAX && s->start_time != AV_NOPTS_VALUE) {
                 double first_pts = s->start_time * AV_TIME_BASE;
                 first_pts = FFMIN(FFMAX(first_pts, INT64_MIN), INT64_MAX);
-                s->first_pts = s->pts = av_rescale_q(first_pts, AV_TIME_BASE_Q,
+                s->first_pts = av_rescale_q(first_pts, AV_TIME_BASE_Q,
                                                      inlink->time_base);
                 av_log(ctx, AV_LOG_VERBOSE, "Set first pts to (in:%"PRId64" out:%"PRId64")\n",
                        s->first_pts, av_rescale_q(first_pts, AV_TIME_BASE_Q,
                                                   outlink->time_base));
             } else {
-                s->first_pts = s->pts = buf->pts;
+                s->first_pts = buf->pts;
             }
         } else {
             av_log(ctx, AV_LOG_WARNING, "Discarding initial frame(s) with no "
@@ -210,8 +209,8 @@
     }
 
     /* number of output frames */
-    delta = av_rescale_q_rnd(buf->pts - s->pts, inlink->time_base,
-                             outlink->time_base, s->rounding);
+    delta = av_rescale_q_rnd(buf->pts - s->first_pts, inlink->time_base,
+                             outlink->time_base, s->rounding) - s->frames_out ;
 
     if (delta < 1) {
         /* drop the frame and everything buffered except the first */
@@ -266,7 +265,6 @@
     flush_fifo(s->fifo);
 
     ret = write_to_fifo(s->fifo, buf);
-    s->pts = s->first_pts + av_rescale_q(s->frames_out, outlink->time_base, inlink->time_base);
 
     return ret;
 }
@@ -290,7 +288,7 @@
     { NULL }
 };
 
-AVFilter avfilter_vf_fps = {
+AVFilter ff_vf_fps = {
     .name        = "fps",
     .description = NULL_IF_CONFIG_SMALL("Force constant framerate."),
     .init        = init,

omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/vf_framepack.c Added

@@ -0,0 +1,363 @@
+/*
+ * Copyright (c) 2013 Vittorio Giovara
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * Generate a frame packed video, by combining two views in a single surface.
+ */
+
+#include <string.h>
+
+#include "libavutil/imgutils.h"
+#include "libavutil/opt.h"
+#include "libavutil/pixdesc.h"
+#include "libavutil/rational.h"
+#include "libavutil/stereo3d.h"
+
+#include "avfilter.h"
+#include "formats.h"
+#include "internal.h"
+#include "video.h"
+
+#define LEFT  0
+#define RIGHT 1
+
+typedef struct FramepackContext {
+    const AVClass *class;
+
+    const AVPixFmtDescriptor *pix_desc; ///< agreed pixel format
+
+    enum AVStereo3DType format;         ///< frame pack type output
+
+    AVFrame *input_views[2];            ///< input frames
+
+    int64_t double_pts;                 ///< new pts for frameseq mode
+} FramepackContext;
+
+static const enum AVPixelFormat formats_supported[] = {
+    AV_PIX_FMT_YUV420P,  AV_PIX_FMT_YUV422P,  AV_PIX_FMT_YUV444P,
+    AV_PIX_FMT_YUV410P,  AV_PIX_FMT_YUVA420P, AV_PIX_FMT_YUVJ420P,
+    AV_PIX_FMT_YUVJ422P, AV_PIX_FMT_YUVJ444P, AV_PIX_FMT_YUVJ440P,
+    AV_PIX_FMT_NONE
+};
+
+static int query_formats(AVFilterContext *ctx)
+{
+    // this will ensure that formats are the same on all pads
+    ff_set_common_formats(ctx, ff_make_format_list(formats_supported));
+    return 0;
+}
+
+static av_cold void framepack_uninit(AVFilterContext *ctx)
+{
+    FramepackContext *s = ctx->priv;
+
+    // clean any leftover frame
+    av_frame_free(&s->input_views[LEFT]);
+    av_frame_free(&s->input_views[RIGHT]);
+}
+
+static int config_output(AVFilterLink *outlink)
+{
+    AVFilterContext *ctx = outlink->src;
+    FramepackContext *s  = outlink->src->priv;
+
+    int width            = ctx->inputs[LEFT]->w;
+    int height           = ctx->inputs[LEFT]->h;
+    AVRational time_base = ctx->inputs[LEFT]->time_base;
+
+    // check size and fps match on the other input
+    if (width  != ctx->inputs[RIGHT]->w ||
+        height != ctx->inputs[RIGHT]->h) {
+        av_log(ctx, AV_LOG_ERROR,
+               "Left and right sizes differ (%dx%d vs %dx%d).\n",
+               width, height,
+               ctx->inputs[RIGHT]->w, ctx->inputs[RIGHT]->h);
+        return AVERROR_INVALIDDATA;
+    } else if (av_cmp_q(time_base, ctx->inputs[RIGHT]->time_base) != 0) {
+        av_log(ctx, AV_LOG_ERROR,
+               "Left and right framerates differ (%d/%d vs %d/%d).\n",
+               time_base.num, time_base.den,
+               ctx->inputs[RIGHT]->time_base.num,
+               ctx->inputs[RIGHT]->time_base.den);
+        return AVERROR_INVALIDDATA;
+    }
+
+    s->pix_desc = av_pix_fmt_desc_get(outlink->format);
+    if (!s->pix_desc)
+        return AVERROR_BUG;
+
+    // modify output properties as needed
+    switch (s->format) {
+    case AV_STEREO3D_FRAMESEQUENCE:
+        time_base.den *= 2;
+        s->double_pts = AV_NOPTS_VALUE;
+        break;
+    case AV_STEREO3D_COLUMNS:
+    case AV_STEREO3D_SIDEBYSIDE:
+        width *= 2;
+        break;
+    case AV_STEREO3D_LINES:
+    case AV_STEREO3D_TOPBOTTOM:
+        height *= 2;
+        break;
+    default:
+        av_log(ctx, AV_LOG_ERROR, "Unknown packing mode.");
+        return AVERROR_INVALIDDATA;
+    }
+
+    outlink->w         = width;
+    outlink->h         = height;
+    outlink->time_base = time_base;
+
+    return 0;
+}
+
+static void horizontal_frame_pack(FramepackContext *s,
+                                  AVFrame *dst,
+                                  int interleaved)
+{
+    int plane, i;
+    int length = dst->width / 2;
+    int lines  = dst->height;
+
+    for (plane = 0; plane < s->pix_desc->nb_components; plane++) {
+        const uint8_t *leftp  = s->input_views[LEFT]->data[plane];
+        const uint8_t *rightp = s->input_views[RIGHT]->data[plane];
+        uint8_t *dstp         = dst->data[plane];
+
+        if (plane == 1 || plane == 2) {
+            length = -(-(dst->width / 2) >> s->pix_desc->log2_chroma_w);
+            lines  = -(-(dst->height)    >> s->pix_desc->log2_chroma_h);
+        }
+
+        if (interleaved) {
+            for (i = 0; i < lines; i++) {
+                int j;
+                int k = 0;
+
+                for (j = 0; j < length; j++) {
+                    dstp[k++] = leftp[j];
+                    dstp[k++] = rightp[j];
+                }
+
+                dstp   += dst->linesize[plane];
+                leftp  += s->input_views[LEFT]->linesize[plane];
+                rightp += s->input_views[RIGHT]->linesize[plane];
+            }
+        } else {
+            av_image_copy_plane(dst->data[plane], dst->linesize[plane],
+                                leftp, s->input_views[LEFT]->linesize[plane],
+                                length, lines);
+            av_image_copy_plane(dst->data[plane] + length, dst->linesize[plane],
+                                rightp, s->input_views[RIGHT]->linesize[plane],
+                                length, lines);
+        }
+    }
+}
+
+static void vertical_frame_pack(FramepackContext *s,
+                                AVFrame *dst,
+                                int interleaved)
+{
+    int plane, offset;
+    int length = dst->width;
+    int lines  = dst->height / 2;
+
+    for (plane = 0; plane < s->pix_desc->nb_components; plane++) {
+        if (plane == 1 || plane == 2) {
+            length = -(-(dst->width)      >> s->pix_desc->log2_chroma_w);
+            lines  = -(-(dst->height / 2) >> s->pix_desc->log2_chroma_h);
+        }
+
+        offset = interleaved ? dst->linesize[plane] : dst->linesize[plane] * lines;
+
+        av_image_copy_plane(dst->data[plane],
+                            dst->linesize[plane] << interleaved,
+                            s->input_views[LEFT]->data[plane],
+                            s->input_views[LEFT]->linesize[plane],
+                            length, lines);
+        av_image_copy_plane(dst->data[plane] + offset,
+                            dst->linesize[plane] << interleaved,
+                            s->input_views[RIGHT]->data[plane],
+                            s->input_views[RIGHT]->linesize[plane],
+                            length, lines);
+    }
+}
+
+static av_always_inline void spatial_frame_pack(FramepackContext *s, AVFrame *dst)
+{
+    switch (s->format) {
+    case AV_STEREO3D_SIDEBYSIDE:
+        horizontal_frame_pack(s, dst, 0);
+        break;
+    case AV_STEREO3D_COLUMNS:
+        horizontal_frame_pack(s, dst, 1);
+        break;
+    case AV_STEREO3D_TOPBOTTOM:
+        vertical_frame_pack(s, dst, 0);
+        break;
+    case AV_STEREO3D_LINES:
+        vertical_frame_pack(s, dst, 1);
+        break;
+    }
+}
+
+static int filter_frame_left(AVFilterLink *inlink, AVFrame *frame)
+{
+    FramepackContext *s = inlink->dst->priv;
+    s->input_views[LEFT] = frame;
+    return 0;
+}
+
+static int filter_frame_right(AVFilterLink *inlink, AVFrame *frame)
+{
+    FramepackContext *s = inlink->dst->priv;
+    s->input_views[RIGHT] = frame;
+    return 0;
+}
+
+static int request_frame(AVFilterLink *outlink)
+{
+    AVFilterContext *ctx = outlink->src;
+    FramepackContext *s = ctx->priv;
+    AVStereo3D *stereo;
+    int ret, i;
+
+    /* get a frame on the either input, stop as soon as a video ends */
+    for (i = 0; i < 2; i++) {
+        if (!s->input_views[i]) {
+            ret = ff_request_frame(ctx->inputs[i]);
+            if (ret < 0)
+                return ret;
+        }
+    }
+
+    if (s->format == AV_STEREO3D_FRAMESEQUENCE) {
+        if (s->double_pts == AV_NOPTS_VALUE)
+            s->double_pts = s->input_views[LEFT]->pts;
+
+        for (i = 0; i < 2; i++) {
+            // set correct timestamps
+            s->input_views[i]->pts = s->double_pts++;
+
+            // set stereo3d side data
+            stereo = av_stereo3d_create_side_data(s->input_views[i]);
+            if (!stereo)
+                return AVERROR(ENOMEM);
+            stereo->type = s->format;
+
+            // filter the frame and immediately relinquish its pointer
+            ret = ff_filter_frame(outlink, s->input_views[i]);
+            s->input_views[i] = NULL;
+            if (ret < 0)
+                return ret;
+        }
+        return ret;
+    } else {
+        AVFrame *dst = ff_get_video_buffer(outlink, outlink->w, outlink->h);
+        if (!dst)
+            return AVERROR(ENOMEM);
+
+        spatial_frame_pack(s, dst);
+
+        // get any property from the original frame
+        ret = av_frame_copy_props(dst, s->input_views[LEFT]);
+        if (ret < 0) {
+            av_frame_free(&dst);
+            return ret;
+        }
+
+        for (i = 0; i < 2; i++)
+            av_frame_free(&s->input_views[i]);
+
+        // set stereo3d side data
+        stereo = av_stereo3d_create_side_data(dst);
+        if (!stereo) {
+            av_frame_free(&dst);
+            return AVERROR(ENOMEM);
+        }
+        stereo->type = s->format;
+
+        return ff_filter_frame(outlink, dst);
+    }
+}
+
+#define OFFSET(x) offsetof(FramepackContext, x)
+#define V AV_OPT_FLAG_VIDEO_PARAM
+static const AVOption options[] = {
+    { "format", "Frame pack output format", OFFSET(format), AV_OPT_TYPE_INT,
+        { .i64 = AV_STEREO3D_SIDEBYSIDE }, 0, INT_MAX, .flags = V, .unit = "format" },
+    { "sbs", "Views are packed next to each other", 0, AV_OPT_TYPE_CONST,
+        { .i64 = AV_STEREO3D_SIDEBYSIDE }, INT_MIN, INT_MAX, .flags = V, .unit = "format" },
+    { "tab", "Views are packed on top of each other", 0, AV_OPT_TYPE_CONST,
+        { .i64 = AV_STEREO3D_TOPBOTTOM }, INT_MIN, INT_MAX, .flags = V, .unit = "format" },
+    { "frameseq", "Views are one after the other", 0, AV_OPT_TYPE_CONST,
+        { .i64 = AV_STEREO3D_FRAMESEQUENCE }, INT_MIN, INT_MAX, .flags = V, .unit = "format" },
+    { "lines", "Views are interleaved by lines", 0, AV_OPT_TYPE_CONST,
+        { .i64 = AV_STEREO3D_LINES }, INT_MIN, INT_MAX, .flags = V, .unit = "format" },
+    { "columns", "Views are interleaved by columns", 0, AV_OPT_TYPE_CONST,
+        { .i64 = AV_STEREO3D_COLUMNS }, INT_MIN, INT_MAX, .flags = V, .unit = "format" },
+    { NULL },
+};
+
+static const AVClass framepack_class = {
+    .class_name = "framepack",
+    .item_name  = av_default_item_name,
+    .option     = options,
+    .version    = LIBAVUTIL_VERSION_INT,
+};
+
+static const AVFilterPad framepack_inputs[] = {
+    {
+        .name         = "left",
+        .type         = AVMEDIA_TYPE_VIDEO,
+        .filter_frame = filter_frame_left,
+        .needs_fifo   = 1,
+    },
+    {
+        .name         = "right",
+        .type         = AVMEDIA_TYPE_VIDEO,
+        .filter_frame = filter_frame_right,
+        .needs_fifo   = 1,
+    },
+    { NULL }
+};
+
+static const AVFilterPad framepack_outputs[] = {
+    {
+        .name          = "packed",
+        .type          = AVMEDIA_TYPE_VIDEO,
+        .config_props  = config_output,
+        .request_frame = request_frame,
+    },
+    { NULL }
+};
+
+AVFilter ff_vf_framepack = {
+    .name          = "framepack",
+    .description   = NULL_IF_CONFIG_SMALL("Generate a frame packed stereoscopic video."),
+    .priv_size     = sizeof(FramepackContext),
+    .priv_class    = &framepack_class,
+    .query_formats = query_formats,
+    .inputs        = framepack_inputs,
+    .outputs       = framepack_outputs,
+    .uninit        = framepack_uninit,
+};

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/vf_framestep.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/vf_framestep.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/vf_frei0r.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/vf_frei0r.c Changed

@@ -29,6 +29,7 @@
 #include <stdlib.h>
 #include "config.h"
 #include "libavutil/avstring.h"
+#include "libavutil/common.h"
 #include "libavutil/imgutils.h"
 #include "libavutil/internal.h"
 #include "libavutil/mathematics.h"
@@ -80,7 +81,7 @@
     Frei0rContext *s = ctx->priv;
     void *sym = dlsym(s->dl_handle, sym_name);
     if (!sym)
-        av_log(ctx, AV_LOG_ERROR, "Could not find symbol '%s' in loaded module\n", sym_name);
+        av_log(ctx, AV_LOG_ERROR, "Could not find symbol '%s' in loaded module.\n", sym_name);
     return sym;
 }
 
@@ -128,7 +129,7 @@
     return 0;
 
 fail:
-    av_log(ctx, AV_LOG_ERROR, "Invalid value '%s' for parameter '%s'\n",
+    av_log(ctx, AV_LOG_ERROR, "Invalid value '%s' for parameter '%s'.\n",
            param, info.name);
     return AVERROR(EINVAL);
 }
@@ -201,11 +202,11 @@
         default: /* F0R_PARAM_STRING */
             v = s;
             s->get_param_value(s->instance, v, i);
-            av_log(ctx, AV_LOG_DEBUG, "'%s'\n", s);
+            av_log(ctx, AV_LOG_DEBUG, "'%s'", s);
             break;
         }
 #endif
-        av_log(ctx, AV_LOG_VERBOSE, "\n");
+        av_log(ctx, AV_LOG_VERBOSE, ".\n");
     }
 
     return 0;
@@ -216,7 +217,7 @@
     char *path = av_asprintf("%s%s%s", prefix, name, SLIBSUF);
     if (!path)
         return AVERROR(ENOMEM);
-    av_log(ctx, AV_LOG_DEBUG, "Looking for frei0r effect in '%s'\n", path);
+    av_log(ctx, AV_LOG_DEBUG, "Looking for frei0r effect in '%s'.\n", path);
     *handle_ptr = dlopen(path, RTLD_NOW|RTLD_LOCAL);
     av_free(path);
     return 0;
@@ -231,6 +232,13 @@
     f0r_plugin_info_t *pi;
     char *path;
     int ret = 0;
+    int i;
+    static const char* const frei0r_pathlist[] = {
+        "/usr/local/lib/frei0r-1/",
+        "/usr/lib/frei0r-1/",
+        "/usr/local/lib64/frei0r-1/",
+        "/usr/lib64/frei0r-1/"
+    };
 
     if (!dl_name) {
         av_log(ctx, AV_LOG_ERROR, "No filter name provided.\n");
@@ -274,18 +282,13 @@
         if (ret < 0)
             return ret;
     }
-    if (!s->dl_handle) {
-        ret = load_path(ctx, &s->dl_handle, "/usr/local/lib/frei0r-1/", dl_name);
-        if (ret < 0)
-            return ret;
-    }
-    if (!s->dl_handle) {
-        ret = load_path(ctx, &s->dl_handle, "/usr/lib/frei0r-1/", dl_name);
+    for (i = 0; !s->dl_handle && i < FF_ARRAY_ELEMS(frei0r_pathlist); i++) {
+        ret = load_path(ctx, &s->dl_handle, frei0r_pathlist[i], dl_name);
         if (ret < 0)
             return ret;
     }
     if (!s->dl_handle) {
-        av_log(ctx, AV_LOG_ERROR, "Could not find module '%s'\n", dl_name);
+        av_log(ctx, AV_LOG_ERROR, "Could not find module '%s'.\n", dl_name);
         return AVERROR(EINVAL);
     }
 
@@ -301,7 +304,7 @@
         return AVERROR(EINVAL);
 
     if (f0r_init() < 0) {
-        av_log(ctx, AV_LOG_ERROR, "Could not init the frei0r module\n");
+        av_log(ctx, AV_LOG_ERROR, "Could not init the frei0r module.\n");
         return AVERROR(EINVAL);
     }
 
@@ -309,7 +312,7 @@
     pi = &s->plugin_info;
     if (pi->plugin_type != type) {
         av_log(ctx, AV_LOG_ERROR,
-               "Invalid type '%s' for the plugin\n",
+               "Invalid type '%s' for this plugin\n",
                pi->plugin_type == F0R_PLUGIN_TYPE_FILTER ? "filter" :
                pi->plugin_type == F0R_PLUGIN_TYPE_SOURCE ? "source" :
                pi->plugin_type == F0R_PLUGIN_TYPE_MIXER2 ? "mixer2" :
@@ -356,7 +359,7 @@
     if (s->destruct && s->instance)
         s->destruct(s->instance);
     if (!(s->instance = s->construct(inlink->w, inlink->h))) {
-        av_log(ctx, AV_LOG_ERROR, "Impossible to load frei0r instance\n");
+        av_log(ctx, AV_LOG_ERROR, "Impossible to load frei0r instance.\n");
         return AVERROR(EINVAL);
     }
 
@@ -436,7 +439,7 @@
     { NULL }
 };
 
-AVFilter avfilter_vf_frei0r = {
+AVFilter ff_vf_frei0r = {
     .name          = "frei0r",
     .description   = NULL_IF_CONFIG_SMALL("Apply a frei0r effect."),
     .query_formats = query_formats,
@@ -473,7 +476,11 @@
     if (s->destruct && s->instance)
         s->destruct(s->instance);
     if (!(s->instance = s->construct(outlink->w, outlink->h))) {
-        av_log(ctx, AV_LOG_ERROR, "Impossible to load frei0r instance\n");
+        av_log(ctx, AV_LOG_ERROR, "Impossible to load frei0r instance.\n");
+        return AVERROR(EINVAL);
+    }
+    if (!s->params) {
+        av_log(ctx, AV_LOG_ERROR, "frei0r filter parameters not set.\n");
         return AVERROR(EINVAL);
     }
 
@@ -517,7 +524,7 @@
     { NULL }
 };
 
-AVFilter avfilter_vsrc_frei0r_src = {
+AVFilter ff_vsrc_frei0r_src = {
     .name          = "frei0r_src",
     .description   = NULL_IF_CONFIG_SMALL("Generate a frei0r source."),
     .priv_size     = sizeof(Frei0rContext),

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/vf_geq.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/vf_geq.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/vf_gradfun.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/vf_gradfun.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/vf_hflip.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/vf_hflip.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/vf_histeq.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/vf_histeq.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/vf_histogram.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/vf_histogram.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/vf_hqdn3d.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/vf_hqdn3d.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/vf_hue.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/vf_hue.c Changed

@@ -73,6 +73,7 @@
     AVExpr   *brightness_pexpr;
     int      hsub;
     int      vsub;
+    int is_first;
     int32_t hue_sin;
     int32_t hue_cos;
     double   var_values[VAR_NB];
@@ -143,8 +144,8 @@
             new_v = ((s * u) + (c * v) + (1 << 15) + (128 << 16)) >> 16;
 
             /* Prevent a potential overflow */
-            h->lut_u[i][j] = av_clip_uint8_c(new_u);
-            h->lut_v[i][j] = av_clip_uint8_c(new_v);
+            h->lut_u[i][j] = av_clip_uint8(new_u);
+            h->lut_v[i][j] = av_clip_uint8(new_v);
         }
     }
 }
@@ -207,6 +208,7 @@
            "H_expr:%s h_deg_expr:%s s_expr:%s b_expr:%s\n",
            hue->hue_expr, hue->hue_deg_expr, hue->saturation_expr, hue->brightness_expr);
     compute_sin_and_cos(hue);
+    hue->is_first = 1;
 
     return 0;
 }
@@ -351,15 +353,15 @@
     }
 
     av_log(inlink->dst, AV_LOG_DEBUG,
-           "H:%0.1f*PI h:%0.1f s:%0.f b:%0.f t:%0.1f n:%d\n",
+           "H:%0.1f*PI h:%0.1f s:%0.1f b:%0.f t:%0.1f n:%d\n",
            hue->hue/M_PI, hue->hue_deg, hue->saturation, hue->brightness,
            hue->var_values[VAR_T], (int)hue->var_values[VAR_N]);
 
     compute_sin_and_cos(hue);
-    if (old_hue_sin != hue->hue_sin || old_hue_cos != hue->hue_cos)
+    if (hue->is_first || (old_hue_sin != hue->hue_sin || old_hue_cos != hue->hue_cos))
         create_chrominance_lut(hue, hue->hue_cos, hue->hue_sin);
 
-    if (old_brightness != hue->brightness && hue->brightness)
+    if (hue->is_first || (old_brightness != hue->brightness && hue->brightness))
         create_luma_lut(hue);
 
     if (!direct) {
@@ -383,6 +385,8 @@
 
     if (!direct)
         av_frame_free(&inpic);
+
+    hue->is_first = 0;
     return ff_filter_frame(outlink, outpic);
 }
 
@@ -434,7 +438,7 @@
     { NULL }
 };
 
-AVFilter avfilter_vf_hue = {
+AVFilter ff_vf_hue = {
     .name            = "hue",
     .description     = NULL_IF_CONFIG_SMALL("Adjust the hue and saturation of the input video."),
     .priv_size       = sizeof(HueContext),

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/vf_idet.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/vf_idet.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/vf_il.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/vf_il.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/vf_interlace.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/vf_interlace.c Changed

@@ -34,6 +34,7 @@
 #include "formats.h"
 #include "avfilter.h"
 #include "internal.h"
+#include "version.h"
 #include "video.h"
 
 enum ScanMode {
@@ -49,7 +50,9 @@
 typedef struct {
     const AVClass *class;
     enum ScanMode scan;    // top or bottom field first scanning
+#if FF_API_INTERLACE_LOWPASS_SET
     int lowpass;           // enable or disable low pass filterning
+#endif
     AVFrame *cur, *next;   // the two frames from which the new one is obtained
 } InterlaceContext;
 
@@ -62,8 +65,10 @@
         AV_OPT_TYPE_CONST, {.i64 = MODE_TFF }, INT_MIN, INT_MAX, .flags = V, .unit = "scan" },
     { "bff", "bottom field first", 0,
         AV_OPT_TYPE_CONST, {.i64 = MODE_BFF }, INT_MIN, INT_MAX, .flags = V, .unit = "scan" },
-    { "lowpass", "enable vertical low-pass filter", OFFSET(lowpass),
+#if FF_API_INTERLACE_LOWPASS_SET
+    { "lowpass", "(deprecated, this option is always set)", OFFSET(lowpass),
         AV_OPT_TYPE_INT,   {.i64 = 1 },        0, 1, .flags = V },
+#endif
     { NULL }
 };
 
@@ -96,6 +101,11 @@
     AVFilterLink *inlink = outlink->src->inputs[0];
     InterlaceContext *s = ctx->priv;
 
+#if FF_API_INTERLACE_LOWPASS_SET
+    if (!s->lowpass)
+        av_log(ctx, AV_LOG_WARNING, "This option is deprecated and always set.\n");
+#endif
+
     if (inlink->h < 2) {
         av_log(ctx, AV_LOG_ERROR, "input video height is too small\n");
         return AVERROR_INVALIDDATA;
@@ -110,15 +120,14 @@
     outlink->frame_rate.den *= 2;
     outlink->flags |= FF_LINK_FLAG_REQUEST_LOOP;
 
-    av_log(ctx, AV_LOG_VERBOSE, "%s interlacing %s lowpass filter\n",
-           s->scan == MODE_TFF ? "tff" : "bff", (s->lowpass) ? "with" : "without");
+    av_log(ctx, AV_LOG_VERBOSE, "%s interlacing\n",
+           s->scan == MODE_TFF ? "tff" : "bff");
 
     return 0;
 }
 
 static void copy_picture_field(AVFrame *src_frame, AVFrame *dst_frame,
-                               AVFilterLink *inlink, enum FieldType field_type,
-                               int lowpass)
+                               AVFilterLink *inlink, enum FieldType field_type)
 {
     const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(inlink->format);
     int vsub = desc->log2_chroma_h;
@@ -129,6 +138,8 @@
         int linesize = av_image_get_linesize(inlink->format, inlink->w, plane);
         uint8_t *dstp = dst_frame->data[plane];
         const uint8_t *srcp = src_frame->data[plane];
+        int srcp_linesize;
+        int dstp_linesize;
 
         av_assert0(linesize >= 0);
 
@@ -137,29 +148,24 @@
             srcp += src_frame->linesize[plane];
         if (field_type == FIELD_LOWER)
             dstp += dst_frame->linesize[plane];
-        if (lowpass) {
-            int srcp_linesize = src_frame->linesize[plane] * 2;
-            int dstp_linesize = dst_frame->linesize[plane] * 2;
-            for (j = lines; j > 0; j--) {
-                const uint8_t *srcp_above = srcp - src_frame->linesize[plane];
-                const uint8_t *srcp_below = srcp + src_frame->linesize[plane];
-                if (j == lines)
-                    srcp_above = srcp; // there is no line above
-                if (j == 1)
-                    srcp_below = srcp; // there is no line below
-                for (i = 0; i < linesize; i++) {
-                    // this calculation is an integer representation of
-                    // '0.5 * current + 0.25 * above + 0.25 * below'
-                    // '1 +' is for rounding.
-                    dstp[i] = (1 + srcp[i] + srcp[i] + srcp_above[i] + srcp_below[i]) >> 2;
-                }
-                dstp += dstp_linesize;
-                srcp += srcp_linesize;
+
+        srcp_linesize = src_frame->linesize[plane] * 2;
+        dstp_linesize = dst_frame->linesize[plane] * 2;
+        for (j = lines; j > 0; j--) {
+            const uint8_t *srcp_above = srcp - src_frame->linesize[plane];
+            const uint8_t *srcp_below = srcp + src_frame->linesize[plane];
+            if (j == lines)
+                srcp_above = srcp; // there is no line above
+            if (j == 1)
+                srcp_below = srcp; // there is no line below
+            for (i = 0; i < linesize; i++) {
+                // this calculation is an integer representation of
+                // '0.5 * current + 0.25 * above + 0.25 * below'
+                // '1 +' is for rounding.
+                dstp[i] = (1 + srcp[i] + srcp[i] + srcp_above[i] + srcp_below[i]) >> 2;
             }
-        } else {
-            av_image_copy_plane(dstp, dst_frame->linesize[plane] * 2,
-                                srcp, src_frame->linesize[plane] * 2,
-                                linesize, lines);
+            dstp += dstp_linesize;
+            srcp += srcp_linesize;
         }
     }
 }
@@ -184,6 +190,8 @@
         av_log(ctx, AV_LOG_WARNING,
                "video is already interlaced, adjusting framerate only\n");
         out = av_frame_clone(s->cur);
+        if (!out)
+            return AVERROR(ENOMEM);
         out->pts /= 2;  // adjust pts to new framerate
         ret = ff_filter_frame(outlink, out);
         return ret;
@@ -200,11 +208,11 @@
     out->pts             /= 2;  // adjust pts to new framerate
 
     /* copy upper/lower field from cur */
-    copy_picture_field(s->cur, out, inlink, tff ? FIELD_UPPER : FIELD_LOWER, s->lowpass);
+    copy_picture_field(s->cur, out, inlink, tff ? FIELD_UPPER : FIELD_LOWER);
     av_frame_free(&s->cur);
 
     /* copy lower/upper field from next */
-    copy_picture_field(s->next, out, inlink, tff ? FIELD_LOWER : FIELD_UPPER, s->lowpass);
+    copy_picture_field(s->next, out, inlink, tff ? FIELD_LOWER : FIELD_UPPER);
     av_frame_free(&s->next);
 
     ret = ff_filter_frame(outlink, out);
@@ -230,7 +238,7 @@
     { NULL }
 };
 
-AVFilter avfilter_vf_interlace = {
+AVFilter ff_vf_interlace = {
     .name          = "interlace",
     .description   = NULL_IF_CONFIG_SMALL("Convert progressive video into interlaced."),
     .uninit        = uninit,

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/vf_kerndeint.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/vf_kerndeint.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/vf_libopencv.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/vf_libopencv.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/vf_lut.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/vf_lut.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/vf_lut3d.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/vf_lut3d.c Changed

@@ -62,9 +62,7 @@
     char *file;
     uint8_t rgba_map[4];
     int step;
-    int is16bit;
-    struct rgbvec (*interp_8) (const struct LUT3DContext*, uint8_t,  uint8_t,  uint8_t);
-    struct rgbvec (*interp_16)(const struct LUT3DContext*, uint16_t, uint16_t, uint16_t);
+    avfilter_action_func *interp;
     struct rgbvec lut[MAX_LEVEL][MAX_LEVEL][MAX_LEVEL];
     int lutsize;
 #if CONFIG_HALDCLUT_FILTER
@@ -76,6 +74,10 @@
 #endif
 } LUT3DContext;
 
+typedef struct ThreadData {
+    AVFrame *in, *out;
+} ThreadData;
+
 #define OFFSET(x) offsetof(LUT3DContext, x)
 #define FLAGS AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM
 #define COMMON_OPTIONS \
@@ -196,15 +198,44 @@
     return c;
 }
 
-#define DEFINE_INTERP_FUNC(name, nbits)                                     \
-static struct rgbvec interp_##nbits##_##name(const LUT3DContext *lut3d,     \
-                                             uint##nbits##_t r,             \
-                                             uint##nbits##_t g,             \
-                                             uint##nbits##_t b)             \
-{                                                                           \
-    const float scale = (1. / ((1<<nbits) - 1)) * (lut3d->lutsize - 1);     \
-    const struct rgbvec scaled_rgb = {r * scale, g * scale, b * scale};     \
-    return interp_##name(lut3d, &scaled_rgb);                               \
+#define DEFINE_INTERP_FUNC(name, nbits)                                                             \
+static int interp_##nbits##_##name(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs)         \
+{                                                                                                   \
+    int x, y;                                                                                       \
+    const LUT3DContext *lut3d = ctx->priv;                                                          \
+    const ThreadData *td = arg;                                                                     \
+    const AVFrame *in  = td->in;                                                                    \
+    const AVFrame *out = td->out;                                                                   \
+    const int direct = out == in;                                                                   \
+    const int step = lut3d->step;                                                                   \
+    const uint8_t r = lut3d->rgba_map[R];                                                           \
+    const uint8_t g = lut3d->rgba_map[G];                                                           \
+    const uint8_t b = lut3d->rgba_map[B];                                                           \
+    const uint8_t a = lut3d->rgba_map[A];                                                           \
+    const int slice_start = (in->height *  jobnr   ) / nb_jobs;                                     \
+    const int slice_end   = (in->height * (jobnr+1)) / nb_jobs;                                     \
+    uint8_t       *dstrow = out->data[0] + slice_start * out->linesize[0];                          \
+    const uint8_t *srcrow = in ->data[0] + slice_start * in ->linesize[0];                          \
+                                                                                                    \
+    for (y = slice_start; y < slice_end; y++) {                                                     \
+        uint##nbits##_t *dst = (uint##nbits##_t *)dstrow;                                           \
+        const uint##nbits##_t *src = (const uint##nbits##_t *)srcrow;                               \
+        for (x = 0; x < in->width * step; x += step) {                                              \
+            const float scale = (1. / ((1<<nbits) - 1)) * (lut3d->lutsize - 1);                     \
+            const struct rgbvec scaled_rgb = {src[x + r] * scale,                                   \
+                                              src[x + g] * scale,                                   \
+                                              src[x + b] * scale};                                  \
+            struct rgbvec vec = interp_##name(lut3d, &scaled_rgb);                                  \
+            dst[x + r] = av_clip_uint##nbits(vec.r * (float)((1<<nbits) - 1));                      \
+            dst[x + g] = av_clip_uint##nbits(vec.g * (float)((1<<nbits) - 1));                      \
+            dst[x + b] = av_clip_uint##nbits(vec.b * (float)((1<<nbits) - 1));                      \
+            if (!direct && step == 4)                                                               \
+                dst[x + a] = src[x + a];                                                            \
+        }                                                                                           \
+        dstrow += out->linesize[0];                                                                 \
+        srcrow += in ->linesize[0];                                                                 \
+    }                                                                                               \
+    return 0;                                                                                       \
 }
 
 DEFINE_INTERP_FUNC(nearest,     8)
@@ -273,7 +304,7 @@
             for (k = 0; k < size; k++) {
                 for (j = 0; j < size; j++) {
                     for (i = 0; i < size; i++) {
-                        struct rgbvec *vec = &lut3d->lut[k][j][i];
+                        struct rgbvec *vec = &lut3d->lut[i][j][k];
 
                         do {
                             NEXT_LINE(0);
@@ -433,6 +464,7 @@
 
 static int config_input(AVFilterLink *inlink)
 {
+    int is16bit = 0;
     LUT3DContext *lut3d = inlink->dst->priv;
     const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(inlink->format);
 
@@ -441,15 +473,15 @@
     case AV_PIX_FMT_BGR48:
     case AV_PIX_FMT_RGBA64:
     case AV_PIX_FMT_BGRA64:
-        lut3d->is16bit = 1;
+        is16bit = 1;
     }
 
     ff_fill_rgba_map(lut3d->rgba_map, inlink->format);
-    lut3d->step = av_get_padded_bits_per_pixel(desc) >> (3 + lut3d->is16bit);
+    lut3d->step = av_get_padded_bits_per_pixel(desc) >> (3 + is16bit);
 
-#define SET_FUNC(name) do {                                     \
-    if (lut3d->is16bit) lut3d->interp_16 = interp_16_##name;    \
-    else                lut3d->interp_8  = interp_8_##name;     \
+#define SET_FUNC(name) do {                             \
+    if (is16bit) lut3d->interp = interp_16_##name;      \
+    else         lut3d->interp = interp_8_##name;       \
 } while (0)
 
     switch (lut3d->interpolation) {
@@ -463,41 +495,15 @@
     return 0;
 }
 
-#define FILTER(nbits) do {                                                                          \
-    uint8_t       *dstrow = out->data[0];                                                           \
-    const uint8_t *srcrow = in ->data[0];                                                           \
-                                                                                                    \
-    for (y = 0; y < inlink->h; y++) {                                                               \
-        uint##nbits##_t *dst = (uint##nbits##_t *)dstrow;                                           \
-        const uint##nbits##_t *src = (const uint##nbits##_t *)srcrow;                               \
-        for (x = 0; x < inlink->w * step; x += step) {                                              \
-            struct rgbvec vec = lut3d->interp_##nbits(lut3d, src[x + r], src[x + g], src[x + b]);   \
-            dst[x + r] = av_clip_uint##nbits(vec.r * (float)((1<<nbits) - 1));                      \
-            dst[x + g] = av_clip_uint##nbits(vec.g * (float)((1<<nbits) - 1));                      \
-            dst[x + b] = av_clip_uint##nbits(vec.b * (float)((1<<nbits) - 1));                      \
-            if (!direct && step == 4)                                                               \
-                dst[x + a] = src[x + a];                                                            \
-        }                                                                                           \
-        dstrow += out->linesize[0];                                                                 \
-        srcrow += in ->linesize[0];                                                                 \
-    }                                                                                               \
-} while (0)
-
 static AVFrame *apply_lut(AVFilterLink *inlink, AVFrame *in)
 {
-    int x, y, direct = 0;
     AVFilterContext *ctx = inlink->dst;
     LUT3DContext *lut3d = ctx->priv;
     AVFilterLink *outlink = inlink->dst->outputs[0];
     AVFrame *out;
-    const int step = lut3d->step;
-    const uint8_t r = lut3d->rgba_map[R];
-    const uint8_t g = lut3d->rgba_map[G];
-    const uint8_t b = lut3d->rgba_map[B];
-    const uint8_t a = lut3d->rgba_map[A];
+    ThreadData td;
 
     if (av_frame_is_writable(in)) {
-        direct = 1;
         out = in;
     } else {
         out = ff_get_video_buffer(outlink, outlink->w, outlink->h);
@@ -508,10 +514,11 @@
         av_frame_copy_props(out, in);
     }
 
-    if (lut3d->is16bit) FILTER(16);
-    else                FILTER(8);
+    td.in  = in;
+    td.out = out;
+    ctx->internal->execute(ctx, lut3d->interp, &td, NULL, FFMIN(outlink->h, ctx->graph->nb_threads));
 
-    if (!direct)
+    if (out != in)
         av_frame_free(&in);
 
     return out;
@@ -603,7 +610,7 @@
      { NULL }
 };
 
-AVFilter avfilter_vf_lut3d = {
+AVFilter ff_vf_lut3d = {
     .name          = "lut3d",
     .description   = NULL_IF_CONFIG_SMALL("Adjust colors using a 3D LUT."),
     .priv_size     = sizeof(LUT3DContext),
@@ -612,7 +619,7 @@
     .inputs        = lut3d_inputs,
     .outputs       = lut3d_outputs,
     .priv_class    = &lut3d_class,
-    .flags         = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC,
+    .flags         = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS,
 };
 #endif
 
@@ -781,7 +788,7 @@
     { NULL }
 };
 
-AVFilter avfilter_vf_haldclut = {
+AVFilter ff_vf_haldclut = {
     .name          = "haldclut",
     .description   = NULL_IF_CONFIG_SMALL("Adjust colors using a Hald CLUT."),
     .priv_size     = sizeof(LUT3DContext),
@@ -791,6 +798,6 @@
     .inputs        = haldclut_inputs,
     .outputs       = haldclut_outputs,
     .priv_class    = &haldclut_class,
-    .flags         = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL,
+    .flags         = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_SLICE_THREADS,
 };
 #endif

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/vf_mcdeint.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/vf_mcdeint.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/vf_mergeplanes.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/vf_mergeplanes.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/vf_mp.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/vf_mp.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/vf_mpdecimate.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/vf_mpdecimate.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/vf_noise.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/vf_noise.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/vf_null.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/vf_null.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/vf_overlay.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/vf_overlay.c Changed

@@ -69,6 +69,16 @@
     VAR_VARS_NB
 };
 
+enum EOFAction {
+    EOF_ACTION_REPEAT,
+    EOF_ACTION_ENDALL,
+    EOF_ACTION_PASS
+};
+
+static const char *eof_action_str[] = {
+    "repeat", "endall", "pass"
+};
+
 #define MAIN    0
 #define OVERLAY 1
 
@@ -92,7 +102,7 @@
     uint8_t overlay_is_packed_rgb;
     uint8_t overlay_rgba_map[4];
     uint8_t overlay_has_alpha;
-    enum OverlayFormat { OVERLAY_FORMAT_YUV420, OVERLAY_FORMAT_YUV444, OVERLAY_FORMAT_RGB, OVERLAY_FORMAT_NB} format;
+    enum OverlayFormat { OVERLAY_FORMAT_YUV420, OVERLAY_FORMAT_YUV422, OVERLAY_FORMAT_YUV444, OVERLAY_FORMAT_RGB, OVERLAY_FORMAT_NB} format;
     enum EvalMode { EVAL_MODE_INIT, EVAL_MODE_FRAME, EVAL_MODE_NB } eval_mode;
 
     FFDualInputContext dinput;
@@ -103,6 +113,9 @@
 
     double var_values[VAR_VARS_NB];
     char *x_expr, *y_expr;
+
+    enum EOFAction eof_action;  ///< action to take on EOF from source
+
     AVExpr *x_pexpr, *y_pexpr;
 } OverlayContext;
 
@@ -191,6 +204,13 @@
         AV_PIX_FMT_YUVA420P, AV_PIX_FMT_NONE
     };
 
+    static const enum AVPixelFormat main_pix_fmts_yuv422[] = {
+        AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUVA422P, AV_PIX_FMT_NONE
+    };
+    static const enum AVPixelFormat overlay_pix_fmts_yuv422[] = {
+        AV_PIX_FMT_YUVA422P, AV_PIX_FMT_NONE
+    };
+
     static const enum AVPixelFormat main_pix_fmts_yuv444[] = {
         AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUVA444P, AV_PIX_FMT_NONE
     };
@@ -218,6 +238,10 @@
         main_formats    = ff_make_format_list(main_pix_fmts_yuv420);
         overlay_formats = ff_make_format_list(overlay_pix_fmts_yuv420);
         break;
+    case OVERLAY_FORMAT_YUV422:
+        main_formats    = ff_make_format_list(main_pix_fmts_yuv422);
+        overlay_formats = ff_make_format_list(overlay_pix_fmts_yuv422);
+        break;
     case OVERLAY_FORMAT_YUV444:
         main_formats    = ff_make_format_list(main_pix_fmts_yuv444);
         overlay_formats = ff_make_format_list(overlay_pix_fmts_yuv444);
@@ -298,11 +322,12 @@
     }
 
     av_log(ctx, AV_LOG_VERBOSE,
-           "main w:%d h:%d fmt:%s overlay w:%d h:%d fmt:%s\n",
+           "main w:%d h:%d fmt:%s overlay w:%d h:%d fmt:%s eof_action:%s\n",
            ctx->inputs[MAIN]->w, ctx->inputs[MAIN]->h,
            av_get_pix_fmt_name(ctx->inputs[MAIN]->format),
            ctx->inputs[OVERLAY]->w, ctx->inputs[OVERLAY]->h,
-           av_get_pix_fmt_name(ctx->inputs[OVERLAY]->format));
+           av_get_pix_fmt_name(ctx->inputs[OVERLAY]->format),
+           eof_action_str[s->eof_action]);
     return 0;
 }
 
@@ -570,6 +595,15 @@
                "The rgb option is deprecated and is overriding the format option, use format instead\n");
         s->format = OVERLAY_FORMAT_RGB;
     }
+    if (!s->dinput.repeatlast || s->eof_action == EOF_ACTION_PASS) {
+        s->dinput.repeatlast = 0;
+        s->eof_action = EOF_ACTION_PASS;
+    }
+    if (s->dinput.shortest || s->eof_action == EOF_ACTION_ENDALL) {
+        s->dinput.shortest = 1;
+        s->eof_action = EOF_ACTION_ENDALL;
+    }
+
     s->dinput.process = do_blend;
     return 0;
 }
@@ -580,6 +614,12 @@
 static const AVOption overlay_options[] = {
     { "x", "set the x expression", OFFSET(x_expr), AV_OPT_TYPE_STRING, {.str = "0"}, CHAR_MIN, CHAR_MAX, FLAGS },
     { "y", "set the y expression", OFFSET(y_expr), AV_OPT_TYPE_STRING, {.str = "0"}, CHAR_MIN, CHAR_MAX, FLAGS },
+    { "eof_action", "Action to take when encountering EOF from secondary input ",
+        OFFSET(eof_action), AV_OPT_TYPE_INT, { .i64 = EOF_ACTION_REPEAT },
+        EOF_ACTION_REPEAT, EOF_ACTION_PASS, .flags = FLAGS, "eof_action" },
+        { "repeat", "Repeat the previous frame.",   0, AV_OPT_TYPE_CONST, { .i64 = EOF_ACTION_REPEAT }, .flags = FLAGS, "eof_action" },
+        { "endall", "End both streams.",            0, AV_OPT_TYPE_CONST, { .i64 = EOF_ACTION_ENDALL }, .flags = FLAGS, "eof_action" },
+        { "pass",   "Pass through the main input.", 0, AV_OPT_TYPE_CONST, { .i64 = EOF_ACTION_PASS },   .flags = FLAGS, "eof_action" },
     { "eval", "specify when to evaluate expressions", OFFSET(eval_mode), AV_OPT_TYPE_INT, {.i64 = EVAL_MODE_FRAME}, 0, EVAL_MODE_NB-1, FLAGS, "eval" },
          { "init",  "eval expressions once during initialization", 0, AV_OPT_TYPE_CONST, {.i64=EVAL_MODE_INIT},  .flags = FLAGS, .unit = "eval" },
          { "frame", "eval expressions per-frame",                  0, AV_OPT_TYPE_CONST, {.i64=EVAL_MODE_FRAME}, .flags = FLAGS, .unit = "eval" },
@@ -587,6 +627,7 @@
     { "shortest", "force termination when the shortest input terminates", OFFSET(dinput.shortest), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, FLAGS },
     { "format", "set output format", OFFSET(format), AV_OPT_TYPE_INT, {.i64=OVERLAY_FORMAT_YUV420}, 0, OVERLAY_FORMAT_NB-1, FLAGS, "format" },
         { "yuv420", "", 0, AV_OPT_TYPE_CONST, {.i64=OVERLAY_FORMAT_YUV420}, .flags = FLAGS, .unit = "format" },
+        { "yuv422", "", 0, AV_OPT_TYPE_CONST, {.i64=OVERLAY_FORMAT_YUV422}, .flags = FLAGS, .unit = "format" },
         { "yuv444", "", 0, AV_OPT_TYPE_CONST, {.i64=OVERLAY_FORMAT_YUV444}, .flags = FLAGS, .unit = "format" },
         { "rgb",    "", 0, AV_OPT_TYPE_CONST, {.i64=OVERLAY_FORMAT_RGB},    .flags = FLAGS, .unit = "format" },
     { "repeatlast", "repeat overlay of the last overlay frame", OFFSET(dinput.repeatlast), AV_OPT_TYPE_INT, {.i64=1}, 0, 1, FLAGS },
@@ -622,7 +663,7 @@
     { NULL }
 };
 
-AVFilter avfilter_vf_overlay = {
+AVFilter ff_vf_overlay = {
     .name          = "overlay",
     .description   = NULL_IF_CONFIG_SMALL("Overlay a video source on top of the input."),
     .init          = init,

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/vf_owdenoise.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/vf_owdenoise.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/vf_pad.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/vf_pad.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/vf_perspective.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/vf_perspective.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/vf_phase.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/vf_phase.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/vf_pixdesctest.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/vf_pixdesctest.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/vf_pp.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/vf_pp.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/vf_psnr.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/vf_psnr.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/vf_pullup.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/vf_pullup.c Changed

@@ -126,6 +126,22 @@
     return 0;
 }
 
+static void free_field_queue(PullupField *head, PullupField **last)
+{
+    PullupField *f = head;
+    while (f) {
+        av_free(f->diffs);
+        av_free(f->combs);
+        av_free(f->vars);
+        if (f == *last) {
+            av_freep(last);
+            break;
+        }
+        f = f->next;
+        av_freep(&f->prev);
+    };
+}
+
 static PullupField *make_field_queue(PullupContext *s, int len)
 {
     PullupField *head, *f;
@@ -141,13 +157,17 @@
 
     for (; len > 0; len--) {
         f->next = av_mallocz(sizeof(*f->next));
-        if (!f->next)
+        if (!f->next) {
+            free_field_queue(head, &f);
             return NULL;
+        }
 
         f->next->prev = f;
         f = f->next;
-        if (alloc_metrics(s, f) < 0)
+        if (alloc_metrics(s, f) < 0) {
+            free_field_queue(head, &f);
             return NULL;
+        }
     }
 
     f->next = head;
@@ -714,21 +734,9 @@
 static av_cold void uninit(AVFilterContext *ctx)
 {
     PullupContext *s = ctx->priv;
-    PullupField *f;
     int i;
 
-    f = s->head;
-    while (f) {
-        av_free(f->diffs);
-        av_free(f->combs);
-        av_free(f->vars);
-        if (f == s->last) {
-            av_freep(&s->last);
-            break;
-        }
-        f = f->next;
-        av_freep(&f->prev);
-    };
+    free_field_queue(s->head, &s->last);
 
     for (i = 0; i < FF_ARRAY_ELEMS(s->buffers); i++) {
         av_freep(&s->buffers[i].planes[0]);
@@ -756,7 +764,7 @@
     { NULL }
 };
 
-AVFilter avfilter_vf_pullup = {
+AVFilter ff_vf_pullup = {
     .name          = "pullup",
     .description   = NULL_IF_CONFIG_SMALL("Pullup from field sequence to frames."),
     .priv_size     = sizeof(PullupContext),

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/vf_removelogo.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/vf_removelogo.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/vf_rotate.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/vf_rotate.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/vf_sab.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/vf_sab.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/vf_scale.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/vf_scale.c Changed

@@ -51,6 +51,8 @@
     "dar",
     "hsub",
     "vsub",
+    "ohsub",
+    "ovsub",
     NULL
 };
 
@@ -64,6 +66,8 @@
     VAR_DAR,
     VAR_HSUB,
     VAR_VSUB,
+    VAR_OHSUB,
+    VAR_OVSUB,
     VARS_NB
 };
 
@@ -77,6 +81,7 @@
      * New dimensions. Special values are:
      *   0 = original width/height
      *  -1 = keep original aspect
+     *  -N = try to keep aspect but make sure it is divisible by N
      */
     int w, h;
     char *size_str;
@@ -227,10 +232,12 @@
     enum AVPixelFormat outfmt = outlink->format;
     ScaleContext *scale = ctx->priv;
     const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(inlink->format);
+    const AVPixFmtDescriptor *out_desc = av_pix_fmt_desc_get(outlink->format);
     int64_t w, h;
     double var_values[VARS_NB], res;
     char *expr;
     int ret;
+    int factor_w, factor_h;
 
     var_values[VAR_IN_W]  = var_values[VAR_IW] = inlink->w;
     var_values[VAR_IN_H]  = var_values[VAR_IH] = inlink->h;
@@ -242,6 +249,8 @@
     var_values[VAR_DAR]   = var_values[VAR_A] * var_values[VAR_SAR];
     var_values[VAR_HSUB]  = 1 << desc->log2_chroma_w;
     var_values[VAR_VSUB]  = 1 << desc->log2_chroma_h;
+    var_values[VAR_OHSUB] = 1 << out_desc->log2_chroma_w;
+    var_values[VAR_OVSUB] = 1 << out_desc->log2_chroma_h;
 
     /* evaluate width and height */
     av_expr_parse_and_eval(&res, (expr = scale->w_expr),
@@ -263,23 +272,35 @@
     w = scale->w;
     h = scale->h;
 
-    /* sanity check params */
-    if (w <  -1 || h <  -1) {
-        av_log(ctx, AV_LOG_ERROR, "Size values less than -1 are not acceptable.\n");
-        return AVERROR(EINVAL);
+    /* Check if it is requested that the result has to be divisible by a some
+     * factor (w or h = -n with n being the factor). */
+    factor_w = 1;
+    factor_h = 1;
+    if (w < -1) {
+        factor_w = -w;
     }
-    if (w == -1 && h == -1)
+    if (h < -1) {
+        factor_h = -h;
+    }
+
+    if (w < 0 && h < 0)
         scale->w = scale->h = 0;
 
     if (!(w = scale->w))
         w = inlink->w;
     if (!(h = scale->h))
         h = inlink->h;
-    if (w == -1)
-        w = av_rescale(h, inlink->w, inlink->h);
-    if (h == -1)
-        h = av_rescale(w, inlink->h, inlink->w);
 
+    /* Make sure that the result is divisible by the factor we determined
+     * earlier. If no factor was set, it is nothing will happen as the default
+     * factor is 1 */
+    if (w < 0)
+        w = av_rescale(h, inlink->w, inlink->h * factor_w) * factor_w;
+    if (h < 0)
+        h = av_rescale(w, inlink->h, inlink->w * factor_h) * factor_h;
+
+    /* Note that force_original_aspect_ratio may overwrite the previous set
+     * dimensions so that it is not divisible by the set factors anymore. */
     if (scale->force_original_aspect_ratio) {
         int tmp_w = av_rescale(h, inlink->w, inlink->h);
         int tmp_h = av_rescale(w, inlink->h, inlink->w);
@@ -567,7 +588,7 @@
     { NULL }
 };
 
-AVFilter avfilter_vf_scale = {
+AVFilter ff_vf_scale = {
     .name          = "scale",
     .description   = NULL_IF_CONFIG_SMALL("Scale the input video size and/or convert the image format."),
     .init_dict     = init_dict,

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/vf_separatefields.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/vf_separatefields.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/vf_setfield.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/vf_setfield.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/vf_showinfo.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/vf_showinfo.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/vf_smartblur.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/vf_smartblur.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/vf_spp.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/vf_spp.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/vf_stereo3d.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/vf_stereo3d.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/vf_subtitles.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/vf_subtitles.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/vf_super2xsai.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/vf_super2xsai.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/vf_swapuv.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/vf_swapuv.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/vf_telecine.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/vf_telecine.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/vf_thumbnail.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/vf_thumbnail.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/vf_tile.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/vf_tile.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/vf_tinterlace.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/vf_tinterlace.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/vf_transpose.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/vf_transpose.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/vf_unsharp.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/vf_unsharp.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/vf_vflip.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/vf_vflip.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/vf_vidstabdetect.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/vf_vidstabdetect.c Changed

@@ -49,7 +49,7 @@
     {"result",      "path to the file used to write the transforms",                 OFFSET(result),             AV_OPT_TYPE_STRING, {.str = DEFAULT_RESULT_NAME}, .flags = FLAGS},
     {"shakiness",   "how shaky is the video and how quick is the camera?"
                     " 1: little (fast) 10: very strong/quick (slow)",                OFFSETC(shakiness),         AV_OPT_TYPE_INT,    {.i64 = 5},      1,  10, FLAGS},
-    {"accuracy",    "(>=shakiness) 1: low 15: high (slow)",                          OFFSETC(accuracy),          AV_OPT_TYPE_INT,    {.i64 = 9},      1,  15, FLAGS},
+    {"accuracy",    "(>=shakiness) 1: low 15: high (slow)",                          OFFSETC(accuracy),          AV_OPT_TYPE_INT,    {.i64 = 15},     1,  15, FLAGS},
     {"stepsize",    "region around minimum is scanned with 1 pixel resolution",      OFFSETC(stepSize),          AV_OPT_TYPE_INT,    {.i64 = 6},      1,  32, FLAGS},
     {"mincontrast", "below this contrast a field is discarded (0-1)",                OFFSETC(contrastThreshold), AV_OPT_TYPE_DOUBLE, {.dbl = 0.25}, 0.0, 1.0, FLAGS},
     {"show",        "0: draw nothing; 1,2: show fields and transforms",              OFFSETC(show),              AV_OPT_TYPE_INT,    {.i64 = 0},      0,   2, FLAGS},
@@ -135,6 +135,7 @@
     av_log(ctx, AV_LOG_INFO, "      accuracy = %d\n", sd->conf.accuracy);
     av_log(ctx, AV_LOG_INFO, "      stepsize = %d\n", sd->conf.stepSize);
     av_log(ctx, AV_LOG_INFO, "   mincontrast = %f\n", sd->conf.contrastThreshold);
+    av_log(ctx, AV_LOG_INFO, "        tripod = %d\n", sd->conf.virtualTripod);
     av_log(ctx, AV_LOG_INFO, "          show = %d\n", sd->conf.show);
     av_log(ctx, AV_LOG_INFO, "        result = %s\n", sd->result);
 
@@ -151,7 +152,6 @@
     return 0;
 }
 
-
 static int filter_frame(AVFilterLink *inlink, AVFrame *in)
 {
     AVFilterContext *ctx = inlink->dst;
@@ -202,7 +202,7 @@
     { NULL }
 };
 
-AVFilter avfilter_vf_vidstabdetect = {
+AVFilter ff_vf_vidstabdetect = {
     .name          = "vidstabdetect",
     .description   = NULL_IF_CONFIG_SMALL("Extract relative transformations, "
                                           "pass 1 of 2 for stabilization "

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/vf_vidstabtransform.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/vf_vidstabtransform.c Changed

@@ -39,6 +39,7 @@
     VSTransformations trans;    // transformations
     char *input;                // name of transform file
     int tripod;
+    int debug;
 } TransformContext;
 
 #define OFFSET(x) offsetof(TransformContext, x)
@@ -46,29 +47,44 @@
 #define FLAGS AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM
 
 static const AVOption vidstabtransform_options[] = {
-    {"input",     "path to the file storing the transforms",                        OFFSET(input),
+    {"input",     "set path to the file storing the transforms", OFFSET(input),
                    AV_OPT_TYPE_STRING, {.str = DEFAULT_INPUT_NAME}, .flags = FLAGS },
-    {"smoothing", "number of frames*2 + 1 used for lowpass filtering",              OFFSETC(smoothing),
-                   AV_OPT_TYPE_INT,    {.i64 = 10},       1, 1000, FLAGS},
-    {"maxshift",  "maximal number of pixels to translate image",                    OFFSETC(maxShift),
+    {"smoothing", "set number of frames*2 + 1 used for lowpass filtering", OFFSETC(smoothing),
+                   AV_OPT_TYPE_INT,    {.i64 = 15},       0, 1000, FLAGS},
+
+    {"optalgo",   "set camera path optimization algo", OFFSETC(camPathAlgo),
+                   AV_OPT_TYPE_INT,    {.i64 = VSOptimalL1}, VSOptimalL1, VSAvg, FLAGS, "optalgo"},
+    {  "opt",     "global optimization",                                            0, // from version 1.0 on
+                   AV_OPT_TYPE_CONST,  {.i64 = VSOptimalL1 }, 0, 0, FLAGS, "optalgo"},
+    {  "gauss",   "gaussian kernel",                                                0,
+                   AV_OPT_TYPE_CONST,  {.i64 = VSGaussian }, 0, 0, FLAGS,  "optalgo"},
+    {  "avg",     "simple averaging on motion",                                     0,
+                   AV_OPT_TYPE_CONST,  {.i64 = VSAvg },      0, 0, FLAGS,  "optalgo"},
+
+    {"maxshift",  "set maximal number of pixels to translate image", OFFSETC(maxShift),
                    AV_OPT_TYPE_INT,    {.i64 = -1},      -1, 500,  FLAGS},
-    {"maxangle",  "maximal angle in rad to rotate image",                           OFFSETC(maxAngle),
+    {"maxangle",  "set maximal angle in rad to rotate image", OFFSETC(maxAngle),
                    AV_OPT_TYPE_DOUBLE, {.dbl = -1.0},  -1.0, 3.14, FLAGS},
-    {"crop",      "set cropping mode",                                              OFFSETC(crop),
+
+    {"crop",      "set cropping mode", OFFSETC(crop),
                    AV_OPT_TYPE_INT,    {.i64 = 0},        0, 1,    FLAGS, "crop"},
     {  "keep",    "keep border",                                                    0,
                    AV_OPT_TYPE_CONST,  {.i64 = VSKeepBorder }, 0, 0, FLAGS, "crop"},
     {  "black",   "black border",                                                   0,
                    AV_OPT_TYPE_CONST,  {.i64 = VSCropBorder }, 0, 0, FLAGS, "crop"},
-    {"invert",    "1: invert transforms",                                           OFFSETC(invert),
+
+    {"invert",    "invert transforms", OFFSETC(invert),
                    AV_OPT_TYPE_INT,    {.i64 = 0},        0, 1,    FLAGS},
-    {"relative",  "consider transforms as 0: absolute, 1: relative",                OFFSETC(relative),
+    {"relative",  "consider transforms as relative", OFFSETC(relative),
                    AV_OPT_TYPE_INT,    {.i64 = 1},        0, 1,    FLAGS},
-    {"zoom",      "percentage to zoom >0: zoom in, <0 zoom out",                    OFFSETC(zoom),
+    {"zoom",      "set percentage to zoom (>0: zoom in, <0: zoom out", OFFSETC(zoom),
                    AV_OPT_TYPE_DOUBLE, {.dbl = 0},     -100, 100,  FLAGS},
-    {"optzoom",   "0: nothing, 1: determine optimal zoom (added to 'zoom')",        OFFSETC(optZoom),
+    {"optzoom",   "set optimal zoom (0: nothing, 1: optimal static zoom, 2: optimal dynamic zoom)", OFFSETC(optZoom),
                    AV_OPT_TYPE_INT,    {.i64 = 1},        0, 2,    FLAGS},
-    {"interpol",  "type of interpolation",                                          OFFSETC(interpolType),
+    {"zoomspeed", "for adative zoom: percent to zoom maximally each frame",         OFFSETC(zoomSpeed),
+                   AV_OPT_TYPE_DOUBLE, {.dbl = 0.25},     0, 5,    FLAGS},
+
+    {"interpol",  "set type of interpolation", OFFSETC(interpolType),
                    AV_OPT_TYPE_INT,    {.i64 = 2},        0, 3,    FLAGS, "interpol"},
     {  "no",      "no interpolation",                                               0,
                    AV_OPT_TYPE_CONST,  {.i64 = VS_Zero  },  0, 0,  FLAGS, "interpol"},
@@ -78,7 +94,10 @@
                    AV_OPT_TYPE_CONST,  {.i64 = VS_BiLinear},0, 0,  FLAGS, "interpol"},
     {  "bicubic", "bi-cubic",                                                       0,
                    AV_OPT_TYPE_CONST,  {.i64 = VS_BiCubic },0, 0,  FLAGS, "interpol"},
-    {"tripod",    "if 1: virtual tripod mode (equiv. to relative=0:smoothing=0)",   OFFSET(tripod),
+
+    {"tripod",    "enable virtual tripod mode (same as relative=0:smoothing=0)", OFFSET(tripod),
+                   AV_OPT_TYPE_INT,    {.i64 = 0},        0, 1,    FLAGS},
+    {"debug",     "enable debug mode and writer global motions information to file", OFFSET(debug),
                    AV_OPT_TYPE_INT,    {.i64 = 0},        0, 1,    FLAGS},
     {NULL}
 };
@@ -153,12 +172,15 @@
 
     // set values that are not initializes by the options
     tc->conf.modName = "vidstabtransform";
-    tc->conf.verbose =1;
+    tc->conf.verbose = 1 + tc->debug;
     if (tc->tripod) {
-        av_log(ctx, AV_LOG_INFO, "Virtual tripod mode: relative=0, smoothing=0");
+        av_log(ctx, AV_LOG_INFO, "Virtual tripod mode: relative=0, smoothing=0\n");
         tc->conf.relative  = 0;
         tc->conf.smoothing = 0;
     }
+    tc->conf.simpleMotionCalculation = 0;
+    tc->conf.storeTransforms         = tc->debug;
+    tc->conf.smoothZoom              = 0;
 
     if (vsTransformDataInit(td, &tc->conf, &fi_src, &fi_dest) != VS_OK) {
         av_log(ctx, AV_LOG_ERROR, "initialization of vid.stab transform failed, please report a BUG\n");
@@ -169,13 +191,19 @@
     av_log(ctx, AV_LOG_INFO, "Video transformation/stabilization settings (pass 2/2):\n");
     av_log(ctx, AV_LOG_INFO, "    input     = %s\n", tc->input);
     av_log(ctx, AV_LOG_INFO, "    smoothing = %d\n", tc->conf.smoothing);
+    av_log(ctx, AV_LOG_INFO, "    optalgo   = %s\n",
+           tc->conf.camPathAlgo == VSOptimalL1 ? "opt" :
+           (tc->conf.camPathAlgo == VSGaussian ? "gauss" : "avg"));
     av_log(ctx, AV_LOG_INFO, "    maxshift  = %d\n", tc->conf.maxShift);
     av_log(ctx, AV_LOG_INFO, "    maxangle  = %f\n", tc->conf.maxAngle);
     av_log(ctx, AV_LOG_INFO, "    crop      = %s\n", tc->conf.crop ? "Black" : "Keep");
     av_log(ctx, AV_LOG_INFO, "    relative  = %s\n", tc->conf.relative ? "True": "False");
     av_log(ctx, AV_LOG_INFO, "    invert    = %s\n", tc->conf.invert ? "True" : "False");
     av_log(ctx, AV_LOG_INFO, "    zoom      = %f\n", tc->conf.zoom);
-    av_log(ctx, AV_LOG_INFO, "    optzoom   = %s\n", tc->conf.optZoom ? "On" : "Off");
+    av_log(ctx, AV_LOG_INFO, "    optzoom   = %s\n",
+           tc->conf.optZoom == 1 ? "Static (1)" : (tc->conf.optZoom == 2 ? "Dynamic (2)" : "Off (0)"));
+    if (tc->conf.optZoom == 2)
+        av_log(ctx, AV_LOG_INFO, "    zoomspeed = %g\n", tc->conf.zoomSpeed);
     av_log(ctx, AV_LOG_INFO, "    interpol  = %s\n", getInterpolationTypeName(tc->conf.interpolType));
 
     f = fopen(tc->input, "r");
@@ -186,7 +214,7 @@
         VSManyLocalMotions mlms;
         if (vsReadLocalMotionsFile(f, &mlms) == VS_OK) {
             // calculate the actual transforms from the local motions
-            if (vsLocalmotions2TransformsSimple(td, &mlms, &tc->trans) != VS_OK) {
+            if (vsLocalmotions2Transforms(td, &mlms, &tc->trans) != VS_OK) {
                 av_log(ctx, AV_LOG_ERROR, "calculating transformations failed\n");
                 return AVERROR(EINVAL);
             }
@@ -199,7 +227,7 @@
     }
     fclose(f);
 
-    if (vsPreprocessTransforms(td, &tc->trans) != VS_OK ) {
+    if (vsPreprocessTransforms(td, &tc->trans) != VS_OK) {
         av_log(ctx, AV_LOG_ERROR, "error while preprocessing transforms\n");
         return AVERROR(EINVAL);
     }
@@ -276,7 +304,7 @@
     { NULL }
 };
 
-AVFilter avfilter_vf_vidstabtransform = {
+AVFilter ff_vf_vidstabtransform = {
     .name          = "vidstabtransform",
     .description   = NULL_IF_CONFIG_SMALL("Transform the frames, "
                                           "pass 2 of 2 for stabilization "

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/vf_vignette.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/vf_vignette.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/vf_w3fdif.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/vf_w3fdif.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/vf_yadif.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/vf_yadif.c Changed

@@ -2,19 +2,19 @@
  * Copyright (C) 2006-2011 Michael Niedermayer <michaelni@gmx.at>
  *               2010      James Darnley <james.darnley@gmail.com>
  *
- * FFmpeg is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
  * FFmpeg is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License along
- * with FFmpeg; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include "libavutil/avassert.h"
@@ -536,7 +536,7 @@
     { NULL }
 };
 
-AVFilter avfilter_vf_yadif = {
+AVFilter ff_vf_yadif = {
     .name          = "yadif",
     .description   = NULL_IF_CONFIG_SMALL("Deinterlace the input image."),
     .priv_size     = sizeof(YADIFContext),

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/vsink_nullsink.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/vsink_nullsink.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/vsrc_cellauto.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/vsrc_cellauto.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/vsrc_life.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/vsrc_life.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/vsrc_mandelbrot.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/vsrc_mandelbrot.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/vsrc_mptestsrc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/vsrc_mptestsrc.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/vsrc_testsrc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/vsrc_testsrc.c Changed

@@ -258,7 +258,7 @@
     {  NULL }
 };
 
-AVFilter avfilter_vsrc_color = {
+AVFilter ff_vsrc_color = {
     .name            = "color",
     .description     = NULL_IF_CONFIG_SMALL("Provide an uniformly colored input."),
     .priv_class      = &color_class,
@@ -389,7 +389,7 @@
     {  NULL }
 };
 
-AVFilter avfilter_vsrc_haldclutsrc = {
+AVFilter ff_vsrc_haldclutsrc = {
     .name          = "haldclutsrc",
     .description   = NULL_IF_CONFIG_SMALL("Provide an identity Hald CLUT."),
     .priv_class    = &haldclutsrc_class,
@@ -427,7 +427,7 @@
     { NULL },
 };
 
-AVFilter avfilter_vsrc_nullsrc = {
+AVFilter ff_vsrc_nullsrc = {
     .name        = "nullsrc",
     .description = NULL_IF_CONFIG_SMALL("Null video source, return unprocessed video frames."),
     .init        = nullsrc_init,
@@ -660,7 +660,7 @@
     { NULL }
 };
 
-AVFilter avfilter_vsrc_testsrc = {
+AVFilter ff_vsrc_testsrc = {
     .name          = "testsrc",
     .description   = NULL_IF_CONFIG_SMALL("Generate test pattern."),
     .priv_size     = sizeof(TestSourceContext),
@@ -776,7 +776,7 @@
     { NULL }
 };
 
-AVFilter avfilter_vsrc_rgbtestsrc = {
+AVFilter ff_vsrc_rgbtestsrc = {
     .name          = "rgbtestsrc",
     .description   = NULL_IF_CONFIG_SMALL("Generate RGB test pattern."),
     .priv_size     = sizeof(TestSourceContext),
@@ -950,7 +950,7 @@
     return init(ctx);
 }
 
-AVFilter avfilter_vsrc_smptebars = {
+AVFilter ff_vsrc_smptebars = {
     .name          = "smptebars",
     .description   = NULL_IF_CONFIG_SMALL("Generate SMPTE color bars."),
     .priv_size     = sizeof(TestSourceContext),
@@ -1055,7 +1055,7 @@
     return init(ctx);
 }
 
-AVFilter avfilter_vsrc_smptehdbars = {
+AVFilter ff_vsrc_smptehdbars = {
     .name          = "smptehdbars",
     .description   = NULL_IF_CONFIG_SMALL("Generate SMPTE HD color bars."),
     .priv_size     = sizeof(TestSourceContext),

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/x86/vf_gradfun_init.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/x86/vf_gradfun_init.c Changed

@@ -26,10 +26,21 @@
 #include "libavutil/x86/cpu.h"
 #include "libavfilter/gradfun.h"
 
-#if HAVE_YASM
 void ff_gradfun_filter_line_mmxext(intptr_t x, uint8_t *dst, const uint8_t *src,
                                    const uint16_t *dc, int thresh,
                                    const uint16_t *dithers);
+void ff_gradfun_filter_line_ssse3(intptr_t x, uint8_t *dst, const uint8_t *src,
+                                  const uint16_t *dc, int thresh,
+                                  const uint16_t *dithers);
+
+void ff_gradfun_blur_line_movdqa_sse2(intptr_t x, uint16_t *buf,
+                                      const uint16_t *buf1, uint16_t *dc,
+                                      const uint8_t *src1, const uint8_t *src2);
+void ff_gradfun_blur_line_movdqu_sse2(intptr_t x, uint16_t *buf,
+                                      const uint16_t *buf1, uint16_t *dc,
+                                      const uint8_t *src1, const uint8_t *src2);
+
+#if HAVE_YASM
 static void gradfun_filter_line_mmxext(uint8_t *dst, const uint8_t *src,
                                        const uint16_t *dc,
                                        int width, int thresh,
@@ -38,45 +49,44 @@
     intptr_t x;
     if (width & 3) {
         x = width & ~3;
-        ff_gradfun_filter_line_c(dst + x, src + x, dc + x / 2, width - x, thresh, dithers);
+        ff_gradfun_filter_line_c(dst + x, src + x, dc + x / 2,
+                                 width - x, thresh, dithers);
         width = x;
     }
     x = -width;
-    ff_gradfun_filter_line_mmxext(x, dst + width, src + width, dc + width/2,
+    ff_gradfun_filter_line_mmxext(x, dst + width, src + width, dc + width / 2,
                                   thresh, dithers);
 }
 
-void ff_gradfun_filter_line_ssse3(intptr_t x, uint8_t *dst, const uint8_t *src,
-                                  const uint16_t *dc, int thresh,
-                                  const uint16_t *dithers);
-static void gradfun_filter_line_ssse3(uint8_t *dst, const uint8_t *src, const uint16_t *dc, int width, int thresh, const uint16_t *dithers)
+static void gradfun_filter_line_ssse3(uint8_t *dst, const uint8_t *src, const uint16_t *dc,
+                                      int width, int thresh,
+                                      const uint16_t *dithers)
 {
     intptr_t x;
     if (width & 7) {
         // could be 10% faster if I somehow eliminated this
         x = width & ~7;
-        ff_gradfun_filter_line_c(dst + x, src + x, dc + x / 2, width - x, thresh, dithers);
+        ff_gradfun_filter_line_c(dst + x, src + x, dc + x / 2,
+                                 width - x, thresh, dithers);
         width = x;
     }
     x = -width;
-    ff_gradfun_filter_line_ssse3(x, dst + width, src + width, dc + width/2,
+    ff_gradfun_filter_line_ssse3(x, dst + width, src + width, dc + width / 2,
                                  thresh, dithers);
 }
 
-void ff_gradfun_blur_line_movdqa_sse2(intptr_t x, uint16_t *buf, const uint16_t *buf1, uint16_t *dc, const uint8_t *src1, const uint8_t *src2);
-void ff_gradfun_blur_line_movdqu_sse2(intptr_t x, uint16_t *buf, const uint16_t *buf1, uint16_t *dc, const uint8_t *src1, const uint8_t *src2);
-static void gradfun_blur_line_sse2(uint16_t *dc, uint16_t *buf, const uint16_t *buf1, const uint8_t *src, int src_linesize, int width)
+static void gradfun_blur_line_sse2(uint16_t *dc, uint16_t *buf, const uint16_t *buf1,
+                                   const uint8_t *src, int src_linesize, int width)
 {
-    intptr_t x = -2*width;
-    if (((intptr_t) src | src_linesize) & 15) {
+    intptr_t x = -2 * width;
+    if (((intptr_t) src | src_linesize) & 15)
         ff_gradfun_blur_line_movdqu_sse2(x, buf + width, buf1 + width,
                                          dc + width, src + width * 2,
                                          src + width * 2 + src_linesize);
-    } else {
+    else
         ff_gradfun_blur_line_movdqa_sse2(x, buf + width, buf1 + width,
                                          dc + width, src + width * 2,
                                          src + width * 2 + src_linesize);
-    }
 }
 #endif /* HAVE_YASM */

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/x86/vf_hqdn3d_init.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/x86/vf_hqdn3d_init.c Changed

@@ -25,17 +25,25 @@
 #include "libavfilter/vf_hqdn3d.h"
 #include "config.h"
 
-void ff_hqdn3d_row_8_x86(uint8_t *src, uint8_t *dst, uint16_t *line_ant, uint16_t *frame_ant, ptrdiff_t w, int16_t *spatial, int16_t *temporal);
-void ff_hqdn3d_row_9_x86(uint8_t *src, uint8_t *dst, uint16_t *line_ant, uint16_t *frame_ant, ptrdiff_t w, int16_t *spatial, int16_t *temporal);
-void ff_hqdn3d_row_10_x86(uint8_t *src, uint8_t *dst, uint16_t *line_ant, uint16_t *frame_ant, ptrdiff_t w, int16_t *spatial, int16_t *temporal);
-void ff_hqdn3d_row_16_x86(uint8_t *src, uint8_t *dst, uint16_t *line_ant, uint16_t *frame_ant, ptrdiff_t w, int16_t *spatial, int16_t *temporal);
+void ff_hqdn3d_row_8_x86(uint8_t *src, uint8_t *dst, uint16_t *line_ant,
+                         uint16_t *frame_ant, ptrdiff_t w, int16_t *spatial,
+                         int16_t *temporal);
+void ff_hqdn3d_row_9_x86(uint8_t *src, uint8_t *dst, uint16_t *line_ant,
+                         uint16_t *frame_ant, ptrdiff_t w, int16_t *spatial,
+                         int16_t *temporal);
+void ff_hqdn3d_row_10_x86(uint8_t *src, uint8_t *dst, uint16_t *line_ant,
+                          uint16_t *frame_ant, ptrdiff_t w, int16_t *spatial,
+                          int16_t *temporal);
+void ff_hqdn3d_row_16_x86(uint8_t *src, uint8_t *dst, uint16_t *line_ant,
+                          uint16_t *frame_ant, ptrdiff_t w, int16_t *spatial,
+                          int16_t *temporal);
 
 av_cold void ff_hqdn3d_init_x86(HQDN3DContext *hqdn3d)
 {
 #if HAVE_YASM
-    hqdn3d->denoise_row[ 8] = ff_hqdn3d_row_8_x86;
-    hqdn3d->denoise_row[ 9] = ff_hqdn3d_row_9_x86;
+    hqdn3d->denoise_row[8]  = ff_hqdn3d_row_8_x86;
+    hqdn3d->denoise_row[9]  = ff_hqdn3d_row_9_x86;
     hqdn3d->denoise_row[10] = ff_hqdn3d_row_10_x86;
     hqdn3d->denoise_row[16] = ff_hqdn3d_row_16_x86;
-#endif
+#endif /* HAVE_YASM */
 }

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/x86/vf_yadif.asm -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/x86/vf_yadif.asm Changed

@@ -6,19 +6,19 @@
 ;*
 ;* This file is part of FFmpeg.
 ;*
-;* FFmpeg is free software; you can redistribute it and/or modify
-;* it under the terms of the GNU General Public License as published by
-;* the Free Software Foundation; either version 2 of the License, or
-;* (at your option) any later version.
+;* FFmpeg is free software; you can redistribute it and/or
+;* modify it under the terms of the GNU Lesser General Public
+;* License as published by the Free Software Foundation; either
+;* version 2.1 of the License, or (at your option) any later version.
 ;*
 ;* FFmpeg is distributed in the hope that it will be useful,
 ;* but WITHOUT ANY WARRANTY; without even the implied warranty of
-;* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;* GNU General Public License for more details.
+;* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;* Lesser General Public License for more details.
 ;*
-;* You should have received a copy of the GNU General Public License along
-;* with FFmpeg; if not, write to the Free Software Foundation, Inc.,
-;* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+;* You should have received a copy of the GNU Lesser General Public
+;* License along with FFmpeg; if not, write to the Free Software
+;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 ;******************************************************************************
 
 %include "libavutil/x86/x86util.asm"

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/x86/vf_yadif_init.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/x86/vf_yadif_init.c Changed

@@ -3,19 +3,19 @@
  *
  * This file is part of FFmpeg.
  *
- * FFmpeg is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
  * FFmpeg is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License along
- * with FFmpeg; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include "libavutil/attributes.h"

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/x86/yadif-10.asm -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/x86/yadif-10.asm Changed

@@ -7,19 +7,19 @@
 ;*
 ;* This file is part of FFmpeg.
 ;*
-;* FFmpeg is free software; you can redistribute it and/or modify
-;* it under the terms of the GNU General Public License as published by
-;* the Free Software Foundation; either version 2 of the License, or
-;* (at your option) any later version.
+;* FFmpeg is free software; you can redistribute it and/or
+;* modify it under the terms of the GNU Lesser General Public
+;* License as published by the Free Software Foundation; either
+;* version 2.1 of the License, or (at your option) any later version.
 ;*
 ;* FFmpeg is distributed in the hope that it will be useful,
 ;* but WITHOUT ANY WARRANTY; without even the implied warranty of
-;* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;* GNU General Public License for more details.
+;* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;* Lesser General Public License for more details.
 ;*
-;* You should have received a copy of the GNU General Public License along
-;* with FFmpeg; if not, write to the Free Software Foundation, Inc.,
-;* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+;* You should have received a copy of the GNU Lesser General Public
+;* License along with FFmpeg; if not, write to the Free Software
+;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 ;******************************************************************************
 
 %include "libavutil/x86/x86util.asm"

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/x86/yadif-16.asm -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/x86/yadif-16.asm Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavfilter/yadif.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavfilter/yadif.h Changed

@@ -1,19 +1,19 @@
 /*
  * This file is part of FFmpeg.
  *
- * FFmpeg is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
  * FFmpeg is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License along
- * with FFmpeg; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #ifndef AVFILTER_YADIF_H

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/4xm.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/4xm.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/Makefile -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/Makefile Changed

@@ -24,8 +24,6 @@
        url.o                \
        utils.o              \
 
-OBJS-$(HAVE_MSVCRT) += file_open.o
-
 OBJS-$(CONFIG_NETWORK)                   += network.o
 OBJS-$(CONFIG_RIFFDEC)                   += riffdec.o
 OBJS-$(CONFIG_RIFFENC)                   += riffenc.o
@@ -52,7 +50,7 @@
                                             rtpdec_xiph.o               \
                                             srtp.o
 OBJS-$(CONFIG_RTPENC_CHAIN)              += rtpenc_chain.o rtp.o
-OBJS-$(CONFIG_SHARED)                    += log2_tab.o
+OBJS-$(CONFIG_SHARED)                    += log2_tab.o golomb_tab.o
 
 # muxers/demuxers
 OBJS-$(CONFIG_A64_MUXER)                 += a64.o rawenc.o
@@ -64,7 +62,7 @@
 OBJS-$(CONFIG_ADP_DEMUXER)               += adp.o
 OBJS-$(CONFIG_ADX_DEMUXER)               += adxdec.o
 OBJS-$(CONFIG_ADX_MUXER)                 += rawenc.o
-OBJS-$(CONFIG_ADTS_MUXER)                += adtsenc.o apetag.o
+OBJS-$(CONFIG_ADTS_MUXER)                += adtsenc.o apetag.o img2.o
 OBJS-$(CONFIG_AEA_DEMUXER)               += aea.o pcm.o
 OBJS-$(CONFIG_AFC_DEMUXER)               += afc.o
 OBJS-$(CONFIG_AIFF_DEMUXER)              += aiffdec.o pcm.o isom.o \
@@ -166,9 +164,12 @@
 OBJS-$(CONFIG_H263_MUXER)                += rawenc.o
 OBJS-$(CONFIG_H264_DEMUXER)              += h264dec.o rawdec.o
 OBJS-$(CONFIG_H264_MUXER)                += rawenc.o
+OBJS-$(CONFIG_HDS_MUXER)                 += hdsenc.o
 OBJS-$(CONFIG_HEVC_DEMUXER)              += hevcdec.o rawdec.o
+OBJS-$(CONFIG_HEVC_MUXER)                += rawenc.o
 OBJS-$(CONFIG_HLS_DEMUXER)               += hls.o
 OBJS-$(CONFIG_HLS_MUXER)                 += hlsenc.o
+OBJS-$(CONFIG_HNM_DEMUXER)               += hnm.o
 OBJS-$(CONFIG_ICO_DEMUXER)               += icodec.o
 OBJS-$(CONFIG_ICO_MUXER)                 += icoenc.o
 OBJS-$(CONFIG_IDCIN_DEMUXER)             += idcin.o
@@ -202,7 +203,7 @@
 OBJS-$(CONFIG_MATROSKA_DEMUXER)          += matroskadec.o matroska.o  \
                                             isom.o rmsipr.o
 OBJS-$(CONFIG_MATROSKA_MUXER)            += matroskaenc.o matroska.o \
-                                            isom.o avc.o \
+                                            isom.o avc.o hevc.o \
                                             flacenc_header.o avlanguage.o wv.o
 OBJS-$(CONFIG_MD5_MUXER)                 += md5enc.o
 OBJS-$(CONFIG_MGSTS_DEMUXER)             += mgsts.o
@@ -216,7 +217,7 @@
 OBJS-$(CONFIG_MMF_DEMUXER)               += mmf.o
 OBJS-$(CONFIG_MMF_MUXER)                 += mmf.o rawenc.o
 OBJS-$(CONFIG_MOV_DEMUXER)               += mov.o isom.o mov_chan.o
-OBJS-$(CONFIG_MOV_MUXER)                 += movenc.o isom.o avc.o \
+OBJS-$(CONFIG_MOV_MUXER)                 += movenc.o isom.o avc.o hevc.o \
                                             movenchint.o mov_chan.o rtp.o
 OBJS-$(CONFIG_MP2_MUXER)                 += mp3enc.o rawenc.o id3v2enc.o
 OBJS-$(CONFIG_MP3_DEMUXER)               += mp3dec.o
@@ -261,12 +262,15 @@
                                             oggparsespeex.o  \
                                             oggparsetheora.o \
                                             oggparsevorbis.o \
+                                            oggparsevp8.o    \
                                             vorbiscomment.o  \
                                             flac_picture.o
 OBJS-$(CONFIG_OGG_MUXER)                 += oggenc.o \
                                             vorbiscomment.o
 OBJS-$(CONFIG_OMA_DEMUXER)               += omadec.o pcm.o oma.o
 OBJS-$(CONFIG_OMA_MUXER)                 += omaenc.o rawenc.o oma.o id3v2enc.o
+OBJS-$(CONFIG_OPUS_MUXER)                += oggenc.o \
+                                            vorbiscomment.o
 OBJS-$(CONFIG_PAF_DEMUXER)               += paf.o
 OBJS-$(CONFIG_PCM_ALAW_DEMUXER)          += pcmdec.o pcm.o
 OBJS-$(CONFIG_PCM_ALAW_MUXER)            += pcmenc.o rawenc.o
@@ -349,6 +353,7 @@
 OBJS-$(CONFIG_SAP_MUXER)                 += sapenc.o
 OBJS-$(CONFIG_SBG_DEMUXER)               += sbgdec.o
 OBJS-$(CONFIG_SDP_DEMUXER)               += rtsp.o
+OBJS-$(CONFIG_SDR2_DEMUXER)              += sdr2.o
 OBJS-$(CONFIG_SEGAFILM_DEMUXER)          += segafilm.o
 OBJS-$(CONFIG_SEGMENT_MUXER)             += segment.o
 OBJS-$(CONFIG_SHORTEN_DEMUXER)           += rawdec.o
@@ -363,6 +368,8 @@
 OBJS-$(CONFIG_SOX_MUXER)                 += soxenc.o rawenc.o
 OBJS-$(CONFIG_SPDIF_DEMUXER)             += spdif.o spdifdec.o
 OBJS-$(CONFIG_SPDIF_MUXER)               += spdif.o spdifenc.o
+OBJS-$(CONFIG_SPEEX_MUXER)               += oggenc.o \
+                                            vorbiscomment.o
 OBJS-$(CONFIG_SRT_DEMUXER)               += srtdec.o subtitles.o
 OBJS-$(CONFIG_SRT_MUXER)                 += srtenc.o
 OBJS-$(CONFIG_STR_DEMUXER)               += psxstr.o
@@ -382,6 +389,7 @@
 OBJS-$(CONFIG_TTA_DEMUXER)               += tta.o apetag.o img2.o
 OBJS-$(CONFIG_TTY_DEMUXER)               += tty.o sauce.o
 OBJS-$(CONFIG_TXD_DEMUXER)               += txd.o
+OBJS-$(CONFIG_UNCODEDFRAMECRC_MUXER)     += uncodedframecrcenc.o framehash.o
 OBJS-$(CONFIG_VC1_DEMUXER)               += rawdec.o
 OBJS-$(CONFIG_VC1_MUXER)                 += rawenc.o
 OBJS-$(CONFIG_VC1T_DEMUXER)              += vc1test.o
@@ -407,7 +415,7 @@
 OBJS-$(CONFIG_WSVQA_DEMUXER)             += westwood_vqa.o
 OBJS-$(CONFIG_WTV_DEMUXER)               += wtvdec.o wtv_common.o asfdec.o asf.o asfcrypt.o \
                                             avlanguage.o mpegts.o isom.o
-OBJS-$(CONFIG_WTV_MUXER)                 += wtvenc.o wtv_common.o asf.o asfenc.o
+OBJS-$(CONFIG_WTV_MUXER)                 += wtvenc.o wtv_common.o
 OBJS-$(CONFIG_WV_DEMUXER)                += wvdec.o wv.o apetag.o img2.o
 OBJS-$(CONFIG_WV_MUXER)                  += wvenc.o wv.o apetag.o img2.o
 OBJS-$(CONFIG_XA_DEMUXER)                += xa.o
@@ -461,8 +469,14 @@
 OBJS-$(CONFIG_UDP_PROTOCOL)              += udp.o
 OBJS-$(CONFIG_UNIX_PROTOCOL)             += unix.o
 
+OBJS-$(HAVE_LIBC_MSVCRT)                 += file_open.o
+
+# Windows resource file
+SLIBOBJS-$(HAVE_GNU_WINDRES)             += avformatres.o
+
 SKIPHEADERS-$(CONFIG_FFRTMPCRYPT_PROTOCOL) += rtmpdh.h
 SKIPHEADERS-$(CONFIG_NETWORK)            += network.h rtsp.h
+
 TESTPROGS = seek                                                        \
             srtp                                                        \
             url                                                         \

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/ac3dec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/ac3dec.c Changed

@@ -28,7 +28,7 @@
 {
     int max_frames, first_frames = 0, frames;
     const uint8_t *buf, *buf2, *end;
-    AC3HeaderInfo hdr;
+    AC3HeaderInfo *phdr = NULL;
     GetBitContext gbc;
     enum AVCodecID codec_id = AV_CODEC_ID_AC3;
 
@@ -55,27 +55,28 @@
                 init_get_bits(&gbc, buf3, 54);
             }else
                 init_get_bits(&gbc, buf2, 54);
-            if(avpriv_ac3_parse_header(&gbc, &hdr) < 0)
+            if(avpriv_ac3_parse_header2(&gbc, &phdr) < 0)
                 break;
-            if(buf2 + hdr.frame_size > end)
+            if(buf2 + phdr->frame_size > end)
                 break;
             if (buf[0] == 0x77 && buf[1] == 0x0B) {
-                av_assert0(hdr.frame_size <= sizeof(buf3));
-                for(i=8; i<hdr.frame_size; i+=2) {
+                av_assert0(phdr->frame_size <= sizeof(buf3));
+                for(i=8; i<phdr->frame_size; i+=2) {
                     buf3[i  ] = buf[i+1];
                     buf3[i+1] = buf[i  ];
                 }
             }
-            if(av_crc(av_crc_get_table(AV_CRC_16_ANSI), 0, gbc.buffer + 2, hdr.frame_size - 2))
+            if(av_crc(av_crc_get_table(AV_CRC_16_ANSI), 0, gbc.buffer + 2, phdr->frame_size - 2))
                 break;
-            if (hdr.bitstream_id > 10)
+            if (phdr->bitstream_id > 10)
                 codec_id = AV_CODEC_ID_EAC3;
-            buf2 += hdr.frame_size;
+            buf2 += phdr->frame_size;
         }
         max_frames = FFMAX(max_frames, frames);
         if(buf == p->buf)
             first_frames = frames;
     }
+    av_freep(&phdr);
     if(codec_id != expected_codec_id) return 0;
     // keep this in sync with mp3 probe, both need to avoid
     // issues with MPEG-files!

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/adp.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/adp.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/adxdec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/adxdec.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/aiffdec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/aiffdec.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/aiffenc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/aiffenc.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/allformats.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/allformats.c Changed

@@ -45,8 +45,7 @@
     {                                                                   \
         extern URLProtocol ff_##x##_protocol;                           \
         if (CONFIG_##X##_PROTOCOL)                                      \
-            ffurl_register_protocol(&ff_##x##_protocol,                 \
-                                    sizeof(ff_##x##_protocol));         \
+            ffurl_register_protocol(&ff_##x##_protocol);                \
     }
 
 void av_register_all(void)
@@ -135,8 +134,10 @@
     REGISTER_MUXDEMUX(H261,             h261);
     REGISTER_MUXDEMUX(H263,             h263);
     REGISTER_MUXDEMUX(H264,             h264);
-    REGISTER_DEMUXER (HEVC,             hevc);
+    REGISTER_MUXER   (HDS,              hds);
+    REGISTER_MUXDEMUX(HEVC,             hevc);
     REGISTER_MUXDEMUX(HLS,              hls);
+    REGISTER_DEMUXER (HNM,              hnm);
     REGISTER_MUXDEMUX(ICO,              ico);
     REGISTER_DEMUXER (IDCIN,            idcin);
     REGISTER_DEMUXER (IDF,              idf);
@@ -204,6 +205,7 @@
     REGISTER_DEMUXER (NUV,              nuv);
     REGISTER_MUXDEMUX(OGG,              ogg);
     REGISTER_MUXDEMUX(OMA,              oma);
+    REGISTER_MUXER   (OPUS,             opus);
     REGISTER_DEMUXER (PAF,              paf);
     REGISTER_MUXDEMUX(PCM_ALAW,         pcm_alaw);
     REGISTER_MUXDEMUX(PCM_MULAW,        pcm_mulaw);
@@ -247,9 +249,10 @@
     REGISTER_MUXDEMUX(SAP,              sap);
     REGISTER_DEMUXER (SBG,              sbg);
     REGISTER_DEMUXER (SDP,              sdp);
+    REGISTER_DEMUXER (SDR2,             sdr2);
 #if CONFIG_RTPDEC
-    av_register_rtp_dynamic_payload_handlers();
-    av_register_rdt_dynamic_payload_handlers();
+    ff_register_rtp_dynamic_payload_handlers();
+    ff_register_rdt_dynamic_payload_handlers();
 #endif
     REGISTER_DEMUXER (SEGAFILM,         segafilm);
     REGISTER_MUXER   (SEGMENT,          segment);
@@ -263,6 +266,7 @@
     REGISTER_DEMUXER (SOL,              sol);
     REGISTER_MUXDEMUX(SOX,              sox);
     REGISTER_MUXDEMUX(SPDIF,            spdif);
+    REGISTER_MUXER   (SPEEX,            speex);
     REGISTER_MUXDEMUX(SRT,              srt);
     REGISTER_DEMUXER (STR,              str);
     REGISTER_DEMUXER (SUBVIEWER1,       subviewer1);
@@ -281,6 +285,7 @@
     REGISTER_DEMUXER (TTA,              tta);
     REGISTER_DEMUXER (TXD,              txd);
     REGISTER_DEMUXER (TTY,              tty);
+    REGISTER_MUXER   (UNCODEDFRAMECRC,  uncodedframecrc);
     REGISTER_MUXDEMUX(VC1,              vc1);
     REGISTER_MUXDEMUX(VC1T,             vc1t);
     REGISTER_DEMUXER (VIVO,             vivo);

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/apc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/apc.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/ape.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/ape.c Changed

@@ -86,10 +86,14 @@
 
 static int ape_probe(AVProbeData * p)
 {
-    if (p->buf[0] == 'M' && p->buf[1] == 'A' && p->buf[2] == 'C' && p->buf[3] == ' ')
-        return AVPROBE_SCORE_MAX;
+    int version = AV_RL16(p->buf+4);
+    if (AV_RL32(p->buf) != MKTAG('M', 'A', 'C', ' '))
+        return 0;
 
-    return 0;
+    if (version < APE_MIN_VERSION || version > APE_MAX_VERSION)
+        return AVPROBE_SCORE_MAX/4;
+
+    return AVPROBE_SCORE_MAX;
 }
 
 static void ape_dumpinfo(AVFormatContext * s, APEContext * ape_ctx)
@@ -278,18 +282,20 @@
         ape->totalsamples += ape->blocksperframe * (ape->totalframes - 1);
 
     if (ape->seektablelength > 0) {
-        ape->seektable = av_malloc(ape->seektablelength);
+        ape->seektable = av_mallocz(ape->seektablelength);
         if (!ape->seektable)
             return AVERROR(ENOMEM);
         for (i = 0; i < ape->seektablelength / sizeof(uint32_t) && !pb->eof_reached; i++)
             ape->seektable[i] = avio_rl32(pb);
         if (ape->fileversion < 3810) {
-            ape->bittable = av_malloc(ape->totalframes);
+            ape->bittable = av_mallocz(ape->totalframes);
             if (!ape->bittable)
                 return AVERROR(ENOMEM);
             for (i = 0; i < ape->totalframes && !pb->eof_reached; i++)
                 ape->bittable[i] = avio_r8(pb);
         }
+        if (pb->eof_reached)
+            av_log(s, AV_LOG_WARNING, "File truncated\n");
     }
 
     ape->frames[0].pos     = ape->firstframe;
@@ -411,8 +417,10 @@
     AV_WL32(pkt->data    , nblocks);
     AV_WL32(pkt->data + 4, ape->frames[ape->currentframe].skip);
     ret = avio_read(s->pb, pkt->data + extra_size, ape->frames[ape->currentframe].size);
-    if (ret < 0)
+    if (ret < 0) {
+        av_free_packet(pkt);
         return ret;
+    }
 
     pkt->pts = ape->frames[ape->currentframe].pts;
     pkt->stream_index = 0;

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/apetag.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/apetag.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/asf.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/asf.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/asfdec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/asfdec.c Changed

@@ -1122,8 +1122,7 @@
         if (url_feof(pb))
             return AVERROR_EOF;
 
-        if (asf->packet_size_left < FRAME_HEADER_SIZE ||
-            asf->packet_segments < 1) {
+        if (asf->packet_size_left < FRAME_HEADER_SIZE) {
             int ret = asf->packet_size_left + asf->packet_padsize;
 
             assert(ret >= 0);
@@ -1138,7 +1137,7 @@
         }
         if (asf->packet_time_start == 0) {
             if (asf_read_frame_header(s, pb) < 0) {
-                asf->packet_segments = 0;
+                asf->packet_time_start = asf->packet_segments = 0;
                 continue;
             }
             if (asf->stream_index < 0 ||
@@ -1160,6 +1159,16 @@
         asf_st = asf->asf_st;
         av_assert0(asf_st);
 
+        if (!asf_st->frag_offset && asf->packet_frag_offset) {
+            av_dlog(s, "skipping asf data pkt with fragment offset for "
+                    "stream:%d, expected:%d but got %d from pkt)\n",
+                    asf->stream_index, asf_st->frag_offset,
+                    asf->packet_frag_offset);
+            avio_skip(pb, asf->packet_frag_size);
+            asf->packet_size_left -= asf->packet_frag_size;
+            continue;
+        }
+
         if (asf->packet_replic_size == 1) {
             // frag_offset is here used as the beginning timestamp
             asf->packet_frag_timestamp = asf->packet_time_start;
@@ -1192,6 +1201,7 @@
             asf_st->pkt.dts          = asf->packet_frag_timestamp - asf->hdr.preroll;
             asf_st->pkt.stream_index = asf->stream_index;
             asf_st->pkt.pos          = asf_st->packet_pos = asf->packet_pos;
+            asf_st->pkt_clean        = 0;
 
             if (asf_st->pkt.data && asf_st->palette_changed) {
                 uint8_t *pal;
@@ -1232,6 +1242,11 @@
             continue;
         }
 
+        if (asf->packet_frag_offset != asf_st->frag_offset && !asf_st->pkt_clean) {
+            memset(asf_st->pkt.data + asf_st->frag_offset, 0, asf_st->pkt.size - asf_st->frag_offset);
+            asf_st->pkt_clean = 1;
+        }
+
         ret = avio_read(pb, asf_st->pkt.data + asf->packet_frag_offset,
                         asf->packet_frag_size);
         if (ret != asf->packet_frag_size) {
@@ -1349,7 +1364,6 @@
     int i;
 
     asf->packet_size_left      = 0;
-    asf->packet_segments       = 0;
     asf->packet_flags          = 0;
     asf->packet_property       = 0;
     asf->packet_timestamp      = 0;
@@ -1452,30 +1466,30 @@
     return pts;
 }
 
-static void asf_build_simple_index(AVFormatContext *s, int stream_index)
+static int asf_build_simple_index(AVFormatContext *s, int stream_index)
 {
     ff_asf_guid g;
     ASFContext *asf     = s->priv_data;
     int64_t current_pos = avio_tell(s->pb);
+    int ret = 0;
 
-    if(avio_seek(s->pb, asf->data_object_offset + asf->data_object_size, SEEK_SET) < 0) {
-        asf->index_read= -1;
-        return;
+    if((ret = avio_seek(s->pb, asf->data_object_offset + asf->data_object_size, SEEK_SET)) < 0) {
+        return ret;
     }
 
-    ff_get_guid(s->pb, &g);
+    if ((ret = ff_get_guid(s->pb, &g)) < 0)
+        goto end;
 
     /* the data object can be followed by other top-level objects,
      * skip them until the simple index object is reached */
     while (ff_guidcmp(&g, &ff_asf_simple_index_header)) {
         int64_t gsize = avio_rl64(s->pb);
         if (gsize < 24 || url_feof(s->pb)) {
-            avio_seek(s->pb, current_pos, SEEK_SET);
-            asf->index_read= -1;
-            return;
+            goto end;
         }
         avio_skip(s->pb, gsize - 24);
-        ff_get_guid(s->pb, &g);
+        if ((ret = ff_get_guid(s->pb, &g)) < 0)
+            goto end;
     }
 
     {
@@ -1483,7 +1497,8 @@
         int pct, ict;
         int i;
         int64_t av_unused gsize = avio_rl64(s->pb);
-        ff_get_guid(s->pb, &g);
+        if ((ret = ff_get_guid(s->pb, &g)) < 0)
+            goto end;
         itime = avio_rl64(s->pb);
         pct   = avio_rl32(s->pb);
         ict   = avio_rl32(s->pb);
@@ -1506,7 +1521,12 @@
         }
         asf->index_read = ict > 1;
     }
+end:
+//     if (url_feof(s->pb)) {
+//         ret = 0;
+//     }
     avio_seek(s->pb, current_pos, SEEK_SET);
+    return ret;
 }
 
 static int asf_read_seek(AVFormatContext *s, int stream_index,
@@ -1514,6 +1534,7 @@
 {
     ASFContext *asf = s->priv_data;
     AVStream *st    = s->streams[stream_index];
+    int ret = 0;
 
     if (s->packet_size <= 0)
         return -1;
@@ -1527,10 +1548,20 @@
             return ret;
     }
 
-    if (!asf->index_read)
-        asf_build_simple_index(s, stream_index);
+    /* explicitly handle the case of seeking to 0 */
+    if (!pts) {
+        asf_reset_header(s);
+        avio_seek(s->pb, s->data_offset, SEEK_SET);
+        return 0;
+    }
+
+    if (!asf->index_read) {
+        ret = asf_build_simple_index(s, stream_index);
+        if (ret < 0)
+            asf->index_read = -1;
+    }
 
-    if ((asf->index_read > 0 && st->index_entries)) {
+    if (asf->index_read > 0 && st->index_entries) {
         int index = av_index_search_timestamp(st, pts, flags);
         if (index >= 0) {
             /* find the position */

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/asfenc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/asfenc.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/assdec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/assdec.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/astdec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/astdec.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/avformat.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/avformat.h Changed

@@ -173,6 +173,58 @@
  *
  * @defgroup lavf_encoding Muxing
  * @{
+ * Muxers take encoded data in the form of @ref AVPacket "AVPackets" and write
+ * it into files or other output bytestreams in the specified container format.
+ *
+ * The main API functions for muxing are avformat_write_header() for writing the
+ * file header, av_write_frame() / av_interleaved_write_frame() for writing the
+ * packets and av_write_trailer() for finalizing the file.
+ *
+ * At the beginning of the muxing process, the caller must first call
+ * avformat_alloc_context() to create a muxing context. The caller then sets up
+ * the muxer by filling the various fields in this context:
+ *
+ * - The @ref AVFormatContext.oformat "oformat" field must be set to select the
+ *   muxer that will be used.
+ * - Unless the format is of the AVFMT_NOFILE type, the @ref AVFormatContext.pb
+ *   "pb" field must be set to an opened IO context, either returned from
+ *   avio_open2() or a custom one.
+ * - Unless the format is of the AVFMT_NOSTREAMS type, at least one stream must
+ *   be created with the avformat_new_stream() function. The caller should fill
+ *   the @ref AVStream.codec "stream codec context" information, such as the
+ *   codec @ref AVCodecContext.codec_type "type", @ref AVCodecContext.codec_id
+ *   "id" and other parameters (e.g. width / height, the pixel or sample format,
+ *   etc.) as known. The @ref AVCodecContext.time_base "codec timebase" should
+ *   be set to the timebase that the caller desires to use for this stream (note
+ *   that the timebase actually used by the muxer can be different, as will be
+ *   described later).
+ * - The caller may fill in additional information, such as @ref
+ *   AVFormatContext.metadata "global" or @ref AVStream.metadata "per-stream"
+ *   metadata, @ref AVFormatContext.chapters "chapters", @ref
+ *   AVFormatContext.programs "programs", etc. as described in the
+ *   AVFormatContext documentation. Whether such information will actually be
+ *   stored in the output depends on what the container format and the muxer
+ *   support.
+ *
+ * When the muxing context is fully set up, the caller must call
+ * avformat_write_header() to initialize the muxer internals and write the file
+ * header. Whether anything actually is written to the IO context at this step
+ * depends on the muxer, but this function must always be called. Any muxer
+ * private options must be passed in the options parameter to this function.
+ *
+ * The data is then sent to the muxer by repeatedly calling av_write_frame() or
+ * av_interleaved_write_frame() (consult those functions' documentation for
+ * discussion on the difference between them; only one of them may be used with
+ * a single muxing context, they should not be mixed). Do note that the timing
+ * information on the packets sent to the muxer must be in the corresponding
+ * AVStream's timebase. That timebase is set by the muxer (in the
+ * avformat_write_header() step) and may be different from the timebase the
+ * caller set on the codec context.
+ *
+ * Once all the data has been written, the caller must call av_write_trailer()
+ * to flush any buffered packets and finalize the output file, then close the IO
+ * context (if any) and finally free the muxing context with
+ * avformat_free_context().
  * @}
  *
  * @defgroup lavf_io I/O Read/Write
@@ -209,6 +261,7 @@
 
 struct AVFormatContext;
 
+struct AVDeviceInfoList;
 
 /**
  * @defgroup metadata_api Public Metadata API
@@ -290,6 +343,7 @@
  * Allocate and read the payload of a packet and initialize its
  * fields with default values.
  *
+ * @param s    associated IO context
  * @param pkt packet
  * @param size desired payload size
  * @return >0 (read size) if OK, AVERROR_xxx otherwise
@@ -305,6 +359,7 @@
  * when there is no reasonable way to know (an upper bound of)
  * the final size.
  *
+ * @param s    associated IO context
  * @param pkt packet
  * @param size amount of data to read
  * @return >0 (read size) if OK, AVERROR_xxx otherwise, previous data
@@ -338,6 +393,8 @@
 } AVProbeData;
 
 #define AVPROBE_SCORE_RETRY (AVPROBE_SCORE_MAX/4)
+#define AVPROBE_SCORE_STREAM_RETRY (AVPROBE_SCORE_MAX/4-1)
+
 #define AVPROBE_SCORE_EXTENSION  50 ///< score for file extension
 #define AVPROBE_SCORE_MAX       100 ///< maximum score
 
@@ -453,6 +510,27 @@
 
     void (*get_output_timestamp)(struct AVFormatContext *s, int stream,
                                  int64_t *dts, int64_t *wall);
+    /**
+     * Allows sending messages from application to device.
+     */
+    int (*control_message)(struct AVFormatContext *s, int type,
+                           void *data, size_t data_size);
+
+    /**
+     * Write an uncoded AVFrame.
+     *
+     * See av_write_uncoded_frame() for details.
+     *
+     * The library will free *frame afterwards, but the muxer can prevent it
+     * by setting the pointer to NULL.
+     */
+    int (*write_uncoded_frame)(struct AVFormatContext *, int stream_index,
+                               AVFrame **frame, unsigned flags);
+    /**
+     * Returns device list with it properties.
+     * @see avdevice_list_devices() for more details.
+     */
+    int (*get_device_list)(struct AVFormatContext *s, struct AVDeviceInfoList *device_list);
 } AVOutputFormat;
 /**
  * @}
@@ -581,6 +659,12 @@
      * Active streams are all streams that have AVStream.discard < AVDISCARD_ALL.
      */
     int (*read_seek2)(struct AVFormatContext *s, int stream_index, int64_t min_ts, int64_t ts, int64_t max_ts, int flags);
+
+    /**
+     * Returns device list with it properties.
+     * @see avdevice_list_devices() for more details.
+     */
+    int (*get_device_list)(struct AVFormatContext *s, struct AVDeviceInfoList *device_list);
 } AVInputFormat;
 /**
  * @}
@@ -756,6 +840,7 @@
         int64_t last_dts;
         int64_t duration_gcd;
         int duration_count;
+        int64_t rfps_duration_sum;
         double (*duration_error)[2][MAX_STD_TIMEBASES];
         int64_t codec_info_duration;
         int64_t codec_info_duration_fields;
@@ -775,6 +860,11 @@
 
     int pts_wrap_bits; /**< number of bits in pts (used for wrapping control) */
 
+#if FF_API_REFERENCE_DTS
+    /* a hack to keep ABI compatibility for ffmpeg and other applications, which accesses parser even
+     * though it should not */
+    int64_t do_not_use;
+#endif
     // Timestamp generation support:
     /**
      * Timestamp corresponding to the last dts sync point.
@@ -783,7 +873,6 @@
      * a DTS is received from the underlying container. Otherwise set to
      * AV_NOPTS_VALUE by default.
      */
-    int64_t reference_dts;
     int64_t first_dts;
     int64_t cur_dts;
     int64_t last_IP_pts;
@@ -888,6 +977,24 @@
      */
     int pts_wrap_behavior;
 
+    /**
+     * Internal data to prevent doing update_initial_durations() twice
+     */
+    int update_initial_durations_done;
+
+    /**
+     * Internal data to generate dts from pts
+     */
+    int64_t pts_reorder_error[MAX_REORDER_DELAY+1];
+    uint8_t pts_reorder_error_count[MAX_REORDER_DELAY+1];
+
+    /**
+     * Internal data to analyze DTS and detect faulty mpeg streams
+     */
+    int64_t last_dts_for_order_check;
+    uint8_t dts_ordered;
+    uint8_t dts_misordered;
+
 } AVStream;
 
 AVRational av_stream_get_r_frame_rate(const AVStream *s);
@@ -939,6 +1046,13 @@
 
 
 /**
+ * Callback used by devices to communicate with application.
+ */
+typedef int (*av_format_control_message)(struct AVFormatContext *s, int type,
+                                         void *data, size_t data_size);
+
+
+/**
  * The duration of a video can be estimated through various ways, and this enum can be used
  * to know how the duration was estimated.
  */
@@ -948,6 +1062,8 @@
     AVFMT_DURATION_FROM_BITRATE ///< Duration estimated from bitrate (less accurate)
 };
 
+typedef struct AVFormatInternal AVFormatInternal;
+
 /**
  * Format I/O context.
  * New fields can be added to the end with minor version bumps.
@@ -958,32 +1074,41 @@
  */
 typedef struct AVFormatContext {
     /**
-     * A class for logging and AVOptions. Set by avformat_alloc_context().
+     * A class for logging and @ref avoptions. Set by avformat_alloc_context().
      * Exports (de)muxer private options if they exist.
      */
     const AVClass *av_class;
 
     /**
-     * Can only be iformat or oformat, not both at the same time.
+     * The input container format.
      *
-     * decoding: set by avformat_open_input().
-     * encoding: set by the user.
+     * Demuxing only, set by avformat_open_input().
      */
     struct AVInputFormat *iformat;
+
+    /**
+     * The output container format.
+     *
+     * Muxing only, must be set by the caller before avformat_write_header().
+     */
     struct AVOutputFormat *oformat;
 
     /**
      * Format private data. This is an AVOptions-enabled struct
      * if and only if iformat/oformat.priv_class is not NULL.
+     *
+     * - muxing: set by avformat_write_header()
+     * - demuxing: set by avformat_open_input()
      */
     void *priv_data;
 
     /**
      * I/O context.
      *
-     * decoding: either set by the user before avformat_open_input() (then
-     * the user must close it manually) or set by avformat_open_input().
-     * encoding: set by the user.
+     * - demuxing: either set by the user before avformat_open_input() (then
+     *             the user must close it manually) or set by avformat_open_input().
+     * - muxing: set by the user before avformat_write_header(). The caller must
+     *           take care of closing / freeing the IO context.
      *
      * Do NOT set this field if AVFMT_NOFILE flag is set in
      * iformat/oformat.flags. In such a case, the (de)muxer will handle
@@ -995,36 +1120,53 @@
     int ctx_flags; /**< Format-specific flags, see AVFMTCTX_xx */
 
     /**
+     * Number of elements in AVFormatContext.streams.
+     *
+     * Set by avformat_new_stream(), must not be modified by any other code.
+     */
+    unsigned int nb_streams;
+    /**
      * A list of all streams in the file. New streams are created with
      * avformat_new_stream().
      *
-     * decoding: streams are created by libavformat in avformat_open_input().
-     * If AVFMTCTX_NOHEADER is set in ctx_flags, then new streams may also
-     * appear in av_read_frame().
-     * encoding: streams are created by the user before avformat_write_header().
+     * - demuxing: streams are created by libavformat in avformat_open_input().
+     *             If AVFMTCTX_NOHEADER is set in ctx_flags, then new streams may also
+     *             appear in av_read_frame().
+     * - muxing: streams are created by the user before avformat_write_header().
+     *
+     * Freed by libavformat in avformat_free_context().
      */
-    unsigned int nb_streams;
     AVStream **streams;
 
-    char filename[1024]; /**< input or output filename */
+    /**
+     * input or output filename
+     *
+     * - demuxing: set by avformat_open_input()
+     * - muxing: may be set by the caller before avformat_write_header()
+     */
+    char filename[1024];
 
     /**
-     * Decoding: position of the first frame of the component, in
+     * Position of the first frame of the component, in
      * AV_TIME_BASE fractional seconds. NEVER set this value directly:
      * It is deduced from the AVStream values.
+     *
+     * Demuxing only, set by libavformat.
      */
     int64_t start_time;
 
     /**
-     * Decoding: duration of the stream, in AV_TIME_BASE fractional
+     * Duration of the stream, in AV_TIME_BASE fractional
      * seconds. Only set this value if you know none of the individual stream
      * durations and also do not set any of them. This is deduced from the
      * AVStream values if not set.
+     *
+     * Demuxing only, set by libavformat.
      */
     int64_t duration;
 
     /**
-     * Decoding: total stream bitrate in bit/s, 0 if not
+     * Total stream bitrate in bit/s, 0 if not
      * available. Never set it directly if the file_size and the
      * duration are known as FFmpeg can compute it automatically.
      */
@@ -1050,13 +1192,16 @@
 #define AVFMT_FLAG_KEEP_SIDE_DATA 0x40000 ///< Don't merge side data but keep it separate.
 
     /**
-     * decoding: size of data to probe; encoding: unused.
+     * Maximum size of the data read from input for determining
+     * the input container format.
+     * Demuxing only, set by the caller before avformat_open_input().
      */
     unsigned int probesize;
 
     /**
-     * decoding: maximum time (in AV_TIME_BASE units) during which the input should
-     * be analyzed in avformat_find_stream_info().
+     * Maximum duration (in AV_TIME_BASE units) of the data read
+     * from input in avformat_find_stream_info().
+     * Demuxing only, set by the caller before avformat_find_stream_info().
      */
     int max_analyze_duration;
 
@@ -1091,8 +1236,8 @@
      * accurate seeking (depends on demuxer).
      * Demuxers for which a full in-memory index is mandatory will ignore
      * this.
-     * muxing  : unused
-     * demuxing: set by user
+     * - muxing: unused
+     * - demuxing: set by user
      */
     unsigned int max_index_size;
 
@@ -1110,41 +1255,49 @@
      * in the trailer.  To write chapters in the trailer, nb_chapters
      * must be zero when write_header is called and non-zero when
      * write_trailer is called.
-     * muxing  : set by user
-     * demuxing: set by libavformat
+     * - muxing: set by user
+     * - demuxing: set by libavformat
      */
     unsigned int nb_chapters;
     AVChapter **chapters;
 
+    /**
+     * Metadata that applies to the whole file.
+     *
+     * - demuxing: set by libavformat in avformat_open_input()
+     * - muxing: may be set by the caller before avformat_write_header()
+     *
+     * Freed by libavformat in avformat_free_context().
+     */
     AVDictionary *metadata;
 
     /**
      * Start time of the stream in real world time, in microseconds
-     * since the unix epoch (00:00 1st January 1970). That is, pts=0
-     * in the stream was captured at this real world time.
-     * - encoding: Set by user.
-     * - decoding: Unused.
+     * since the Unix epoch (00:00 1st January 1970). That is, pts=0 in the
+     * stream was captured at this real world time.
+     * Muxing only, set by the caller before avformat_write_header().
      */
     int64_t start_time_realtime;
 
     /**
-     * decoding: number of frames used to probe fps
+     * The number of frames used for determining the framerate in
+     * avformat_find_stream_info().
+     * Demuxing only, set by the caller before avformat_find_stream_info().
      */
     int fps_probe_size;
 
     /**
      * Error recognition; higher values will detect more errors but may
      * misdetect some more or less valid parts as errors.
-     * - encoding: unused
-     * - decoding: Set by user.
+     * Demuxing only, set by the caller before avformat_open_input().
      */
     int error_recognition;
 
     /**
      * Custom interrupt callbacks for the I/O layer.
      *
-     * decoding: set by the user before avformat_open_input().
-     * encoding: set by the user before avformat_write_header()
+     * demuxing: set by the user before avformat_open_input().
+     * muxing: set by the user before avformat_write_header()
      * (mainly useful for AVFMT_NOFILE formats). The callback
      * should also be passed to avio_open2() if it's used to
      * open the file.
@@ -1158,6 +1311,24 @@
 #define FF_FDEBUG_TS        0x0001
 
     /**
+     * Maximum buffering duration for interleaving.
+     *
+     * To ensure all the streams are interleaved correctly,
+     * av_interleaved_write_frame() will wait until it has at least one packet
+     * for each stream before actually writing any packets to the output file.
+     * When some streams are "sparse" (i.e. there are large gaps between
+     * successive packets), this can result in excessive buffering.
+     *
+     * This field specifies the maximum difference between the timestamps of the
+     * first and the last packet in the muxing queue, above which libavformat
+     * will output a packet regardless of whether it has queued a packet for all
+     * the streams.
+     *
+     * Muxing only, set by the caller before avformat_write_header().
+     */
+    int64_t max_interleave_delta;
+
+    /**
      * Transport stream id.
      * This will be moved into demuxer private options. Thus no API/ABI compatibility
      */
@@ -1231,14 +1402,14 @@
     /**
      * Correct single timestamp overflows
      * - encoding: unused
-     * - decoding: Set by user via AVOPtions (NO direct access)
+     * - decoding: Set by user via AVOptions (NO direct access)
      */
     unsigned int correct_ts_overflow;
 
     /**
      * Force seeking to any (also non key) frames.
      * - encoding: unused
-     * - decoding: Set by user via AVOPtions (NO direct access)
+     * - decoding: Set by user via AVOptions (NO direct access)
      */
     int seek2any;
 
@@ -1309,6 +1480,12 @@
     AVRational offset_timebase;
 
     /**
+     * An opaque field for libavformat internal usage.
+     * Must not be accessed in any way by callers.
+     */
+    AVFormatInternal *internal;
+
+    /**
      * IO repositioned flag.
      * This is set by avformat when the underlaying IO context read pointer
      * is repositioned, for example when doing byte based seeking.
@@ -1339,6 +1516,31 @@
      * Demuxing: Set by user via av_format_set_subtitle_codec (NO direct access).
      */
     AVCodec *subtitle_codec;
+
+    /**
+     * Number of bytes to be written as padding in a metadata header.
+     * Demuxing: Unused.
+     * Muxing: Set by user via av_format_set_metadata_header_padding.
+     */
+    int metadata_header_padding;
+
+    /**
+     * User data.
+     * This is a place for some private data of the user.
+     * Mostly usable with control_message_cb or any future callbacks in device's context.
+     */
+    void *opaque;
+
+    /**
+     * Callback used by devices to communicate with application.
+     */
+    av_format_control_message control_message_cb;
+
+    /**
+     * Output timestamp offset, in microseconds.
+     * Muxing: set by user via AVOptions (NO direct access)
+     */
+    int64_t output_ts_offset;
 } AVFormatContext;
 
 int av_format_get_probe_score(const AVFormatContext *s);
@@ -1348,6 +1550,12 @@
 void      av_format_set_audio_codec(AVFormatContext *s, AVCodec *c);
 AVCodec * av_format_get_subtitle_codec(const AVFormatContext *s);
 void      av_format_set_subtitle_codec(AVFormatContext *s, AVCodec *c);
+int       av_format_get_metadata_header_padding(const AVFormatContext *s);
+void      av_format_set_metadata_header_padding(AVFormatContext *s, int c);
+void *    av_format_get_opaque(const AVFormatContext *s);
+void      av_format_set_opaque(AVFormatContext *s, void *opaque);
+av_format_control_message av_format_get_control_message_cb(const AVFormatContext *s);
+void      av_format_set_control_message_cb(AVFormatContext *s, av_format_control_message callback);
 
 /**
  * Returns the method used to set ctx->duration.
@@ -1461,6 +1669,7 @@
  * User is required to call avcodec_close() and avformat_free_context() to
  * clean up the allocation by avformat_new_stream().
  *
+ * @param s media file handle
  * @param c If non-NULL, the AVCodecContext corresponding to the new stream
  * will be initialized to use this codec. This is needed for e.g. codec-specific
  * defaults to be set, so codec should be provided if it is known.
@@ -1518,6 +1727,7 @@
 /**
  * Guess the file format.
  *
+ * @param pd        data to be probed
  * @param is_opened Whether the file is already opened; determines whether
  *                  demuxers with or without AVFMT_NOFILE are probed.
  */
@@ -1526,6 +1736,7 @@
 /**
  * Guess the file format.
  *
+ * @param pd        data to be probed
  * @param is_opened Whether the file is already opened; determines whether
  *                  demuxers with or without AVFMT_NOFILE are probed.
  * @param score_max A probe score larger that this is required to accept a
@@ -1729,6 +1940,8 @@
 /**
  * Seek to the keyframe at timestamp.
  * 'timestamp' in 'stream_index'.
+ *
+ * @param s media file handle
  * @param stream_index If stream_index is (-1), a default
  * stream is selected, and timestamp is automatically converted
  * from AV_TIME_BASE units to the stream specific time_base.
@@ -1756,6 +1969,7 @@
  * keyframes (this may not be supported by all demuxers).
  * If flags contain AVSEEK_FLAG_BACKWARD, it is ignored.
  *
+ * @param s media file handle
  * @param stream_index index of the stream which is used as time base reference
  * @param min_ts smallest acceptable timestamp
  * @param ts target timestamp
@@ -1855,50 +2069,109 @@
 /**
  * Write a packet to an output media file.
  *
- * The packet shall contain one audio or video frame.
- * The packet must be correctly interleaved according to the container
- * specification, if not then av_interleaved_write_frame must be used.
+ * This function passes the packet directly to the muxer, without any buffering
+ * or reordering. The caller is responsible for correctly interleaving the
+ * packets if the format requires it. Callers that want libavformat to handle
+ * the interleaving should call av_interleaved_write_frame() instead of this
+ * function.
  *
  * @param s media file handle
- * @param pkt The packet, which contains the stream_index, buf/buf_size,
- *            dts/pts, ...
- *            This can be NULL (at any time, not just at the end), in
- *            order to immediately flush data buffered within the muxer,
- *            for muxers that buffer up data internally before writing it
- *            to the output.
+ * @param pkt The packet containing the data to be written. Note that unlike
+ *            av_interleaved_write_frame(), this function does not take
+ *            ownership of the packet passed to it (though some muxers may make
+ *            an internal reference to the input packet).
+ *            <br>
+ *            This parameter can be NULL (at any time, not just at the end), in
+ *            order to immediately flush data buffered within the muxer, for
+ *            muxers that buffer up data internally before writing it to the
+ *            output.
+ *            <br>
+ *            Packet's @ref AVPacket.stream_index "stream_index" field must be
+ *            set to the index of the corresponding stream in @ref
+ *            AVFormatContext.streams "s->streams". It is very strongly
+ *            recommended that timing information (@ref AVPacket.pts "pts", @ref
+ *            AVPacket.dts "dts", @ref AVPacket.duration "duration") is set to
+ *            correct values.
  * @return < 0 on error, = 0 if OK, 1 if flushed and there is no more data to flush
+ *
+ * @see av_interleaved_write_frame()
  */
 int av_write_frame(AVFormatContext *s, AVPacket *pkt);
 
 /**
  * Write a packet to an output media file ensuring correct interleaving.
  *
- * The packet must contain one audio or video frame.
- * If the packets are already correctly interleaved, the application should
- * call av_write_frame() instead as it is slightly faster. It is also important
- * to keep in mind that completely non-interleaved input will need huge amounts
- * of memory to interleave with this, so it is preferable to interleave at the
- * demuxer level.
+ * This function will buffer the packets internally as needed to make sure the
+ * packets in the output file are properly interleaved in the order of
+ * increasing dts. Callers doing their own interleaving should call
+ * av_write_frame() instead of this function.
  *
  * @param s media file handle
- * @param pkt The packet containing the data to be written. pkt->buf must be set
- * to a valid AVBufferRef describing the packet data. Libavformat takes
- * ownership of this reference and will unref it when it sees fit. The caller
- * must not access the data through this reference after this function returns.
- * This can be NULL (at any time, not just at the end), to flush the
- * interleaving queues.
- * Packet's @ref AVPacket.stream_index "stream_index" field must be set to the
- * index of the corresponding stream in @ref AVFormatContext.streams
- * "s.streams".
- * It is very strongly recommended that timing information (@ref AVPacket.pts
- * "pts", @ref AVPacket.dts "dts" @ref AVPacket.duration "duration") is set to
- * correct values.
- *
- * @return 0 on success, a negative AVERROR on error.
+ * @param pkt The packet containing the data to be written.
+ *            <br>
+ *            If the packet is reference-counted, this function will take
+ *            ownership of this reference and unreference it later when it sees
+ *            fit.
+ *            The caller must not access the data through this reference after
+ *            this function returns. If the packet is not reference-counted,
+ *            libavformat will make a copy.
+ *            <br>
+ *            This parameter can be NULL (at any time, not just at the end), to
+ *            flush the interleaving queues.
+ *            <br>
+ *            Packet's @ref AVPacket.stream_index "stream_index" field must be
+ *            set to the index of the corresponding stream in @ref
+ *            AVFormatContext.streams "s->streams". It is very strongly
+ *            recommended that timing information (@ref AVPacket.pts "pts", @ref
+ *            AVPacket.dts "dts", @ref AVPacket.duration "duration") is set to
+ *            correct values.
+ *
+ * @return 0 on success, a negative AVERROR on error. Libavformat will always
+ *         take care of freeing the packet, even if this function fails.
+ *
+ * @see av_write_frame(), AVFormatContext.max_interleave_delta
  */
 int av_interleaved_write_frame(AVFormatContext *s, AVPacket *pkt);
 
 /**
+ * Write a uncoded frame to an output media file.
+ *
+ * The frame must be correctly interleaved according to the container
+ * specification; if not, then av_interleaved_write_frame() must be used.
+ *
+ * See av_interleaved_write_frame() for details.
+ */
+int av_write_uncoded_frame(AVFormatContext *s, int stream_index,
+                           AVFrame *frame);
+
+/**
+ * Write a uncoded frame to an output media file.
+ *
+ * If the muxer supports it, this function allows to write an AVFrame
+ * structure directly, without encoding it into a packet.
+ * It is mostly useful for devices and similar special muxers that use raw
+ * video or PCM data and will not serialize it into a byte stream.
+ *
+ * To test whether it is possible to use it with a given muxer and stream,
+ * use av_write_uncoded_frame_query().
+ *
+ * The caller gives up ownership of the frame and must not access it
+ * afterwards.
+ *
+ * @return  >=0 for success, a negative code on error
+ */
+int av_interleaved_write_uncoded_frame(AVFormatContext *s, int stream_index,
+                                       AVFrame *frame);
+
+/**
+ * Test whether a muxer supports uncoded frame.
+ *
+ * @return  >=0 if an uncoded frame can be written to that muxer and stream,
+ *          <0 if not
+ */
+int av_write_uncoded_frame_query(AVFormatContext *s, int stream_index);
+
+/**
  * Write the stream trailer to an output media file and free the
  * file private data.
  *
@@ -2021,6 +2294,7 @@
  *
  * @param tags list of supported codec_id-codec_tag pairs, as stored
  * in AVInputFormat.codec_tag and AVOutputFormat.codec_tag
+ * @param tag  codec tag to match to a codec ID
  */
 enum AVCodecID av_codec_get_id(const struct AVCodecTag * const *tags, unsigned int tag);
 
@@ -2030,6 +2304,7 @@
  *
  * @param tags list of supported codec_id-codec_tag pairs, as stored
  * in AVInputFormat.codec_tag and AVOutputFormat.codec_tag
+ * @param id   codec ID to match to a codec tag
  */
 unsigned int av_codec_get_tag(const struct AVCodecTag * const *tags, enum AVCodecID id);
 
@@ -2049,6 +2324,9 @@
 
 /**
  * Get the index for a specific timestamp.
+ *
+ * @param st        stream that the timestamp belongs to
+ * @param timestamp timestamp to retrieve the index for
  * @param flags if AVSEEK_FLAG_BACKWARD then the returned index will correspond
  *                 to the timestamp which is <= the requested one, if backward
  *                 is 0, then it will be >=
@@ -2145,6 +2423,7 @@
  * Return a positive value if the given filename has one of the given
  * extensions, 0 otherwise.
  *
+ * @param filename   file name to check against the given extensions
  * @param extensions a comma-separated list of filename extensions
  */
 int av_match_ext(const char *filename, const char *extensions);
@@ -2152,6 +2431,8 @@
 /**
  * Test if the given container can store a codec.
  *
+ * @param ofmt           container to check for compatibility
+ * @param codec_id       codec to potentially store in container
  * @param std_compliance standards compliance level, one of FF_COMPLIANCE_*
  *
  * @return 1 if codec with ID codec_id can be stored in ofmt, 0 if it cannot.
@@ -2179,6 +2460,14 @@
  * @return the table mapping RIFF FourCCs for audio to AVCodecID.
  */
 const struct AVCodecTag *avformat_get_riff_audio_tags(void);
+/**
+ * @return the table mapping MOV FourCCs for video to libavcodec AVCodecID.
+ */
+const struct AVCodecTag *avformat_get_mov_video_tags(void);
+/**
+ * @return the table mapping MOV FourCCs for audio to AVCodecID.
+ */
+const struct AVCodecTag *avformat_get_mov_audio_tags(void);
 
 /**
  * @}

omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/avformatres.rc Added

@@ -0,0 +1,55 @@
+/*
+ * Windows resource file for libavformat
+ *
+ * Copyright (C) 2012 James Almer
+ * Copyright (C) 2013 Tiancheng "Timothy" Gu
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <windows.h>
+#include "libavformat/version.h"
+#include "libavutil/ffversion.h"
+#include "config.h"
+
+1 VERSIONINFO
+FILEVERSION     LIBAVFORMAT_VERSION_MAJOR, LIBAVFORMAT_VERSION_MINOR, LIBAVFORMAT_VERSION_MICRO, 0
+PRODUCTVERSION  LIBAVFORMAT_VERSION_MAJOR, LIBAVFORMAT_VERSION_MINOR, LIBAVFORMAT_VERSION_MICRO, 0
+FILEFLAGSMASK   VS_FFI_FILEFLAGSMASK
+FILEOS          VOS_NT_WINDOWS32
+FILETYPE        VFT_DLL
+{
+    BLOCK "StringFileInfo"
+    {
+        BLOCK "040904B0"
+        {
+            VALUE "CompanyName",      "FFmpeg Project"
+            VALUE "FileDescription",  "FFmpeg container format library"
+            VALUE "FileVersion",      AV_STRINGIFY(LIBAVFORMAT_VERSION)
+            VALUE "InternalName",     "libavformat"
+            VALUE "LegalCopyright",   "Copyright (C) 2000-" AV_STRINGIFY(CONFIG_THIS_YEAR) " FFmpeg Project"
+            VALUE "OriginalFilename", "avformat" BUILDSUF "-" AV_STRINGIFY(LIBAVFORMAT_VERSION_MAJOR) SLIBSUF
+            VALUE "ProductName",      "FFmpeg"
+            VALUE "ProductVersion",   FFMPEG_VERSION
+        }
+    }
+
+    BLOCK "VarFileInfo"
+    {
+        VALUE "Translation", 0x0409, 0x04B0
+    }
+}

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/avidec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/avidec.c Changed

@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <stdint.h>
+
 #include "libavutil/avassert.h"
 #include "libavutil/avstring.h"
 #include "libavutil/bswap.h"
@@ -111,8 +113,8 @@
 static int guess_ni_flag(AVFormatContext *s);
 
 #define print_tag(str, tag, size)                        \
-    av_dlog(NULL, "%s: tag=%c%c%c%c size=0x%x\n",        \
-            str, tag & 0xff,                             \
+    av_dlog(NULL, "pos:%"PRIX64" %s: tag=%c%c%c%c size=0x%x\n", \
+            avio_tell(pb), str, tag & 0xff,              \
             (tag >> 8) & 0xff,                           \
             (tag >> 16) & 0xff,                          \
             (tag >> 24) & 0xff,                          \
@@ -348,6 +350,7 @@
                 uint16_t size    = avio_rl16(s->pb);
                 const char *name = NULL;
                 char buffer[64]  = { 0 };
+                size = FFMIN(size, tag_end - avio_tell(s->pb));
                 size -= avio_read(s->pb, buffer,
                                   FFMIN(size, sizeof(buffer) - 1));
                 switch (tag) {
@@ -623,6 +626,10 @@
                 if (cur_pos < list_end)
                     size = FFMIN(size, list_end - cur_pos);
                 st = s->streams[stream_index];
+                if (st->codec->codec_type != AVMEDIA_TYPE_UNKNOWN) {
+                    avio_skip(pb, size);
+                    break;
+                }
                 switch (codec_type) {
                 case AVMEDIA_TYPE_VIDEO:
                     if (amv_file_format) {
@@ -648,11 +655,8 @@
                             st->codec->extradata_size = esize - 10 * 4;
                         } else
                             st->codec->extradata_size =  size - 10 * 4;
-                        if (ff_alloc_extradata(st->codec, st->codec->extradata_size))
+                        if (ff_get_extradata(st->codec, pb, st->codec->extradata_size) < 0)
                             return AVERROR(ENOMEM);
-                        avio_read(pb,
-                                  st->codec->extradata,
-                                  st->codec->extradata_size);
                     }
 
                     // FIXME: check if the encoder really did this correctly
@@ -685,6 +689,8 @@
                     /* This is needed to get the pict type which is necessary
                      * for generating correct pts. */
                     st->need_parsing = AVSTREAM_PARSE_HEADERS;
+                    if (st->codec->codec_tag == MKTAG('V', 'S', 'S', 'H'))
+                        st->need_parsing = AVSTREAM_PARSE_FULL;
 
                     if (st->codec->codec_tag == 0 && st->codec->height > 0 &&
                         st->codec->extradata_size < 1U << 30) {
@@ -777,9 +783,8 @@
                 st = s->streams[stream_index];
 
                 if (size<(1<<30)) {
-                    if (ff_alloc_extradata(st->codec, size))
+                    if (ff_get_extradata(st->codec, pb, size) < 0)
                         return AVERROR(ENOMEM);
-                    avio_read(pb, st->codec->extradata, st->codec->extradata_size);
                 }
 
                 if (st->codec->extradata_size & 1) //FIXME check if the encoder really did this correctly
@@ -1306,10 +1311,9 @@
                     size);
             pkt->stream_index = avi->stream_index;
 
-            if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO) {
+            if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO && st->index_entries) {
                 AVIndexEntry *e;
                 int index;
-                av_assert0(st->index_entries);
 
                 index = av_index_search_timestamp(st, ast->frame_offset, 0);
                 e     = &st->index_entries[index];

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/avienc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/avienc.c Changed

@@ -26,6 +26,8 @@
 #include "avi.h"
 #include "avio_internal.h"
 #include "riff.h"
+#include "libavformat/avlanguage.h"
+#include "libavutil/avstring.h"
 #include "libavutil/intreadwrite.h"
 #include "libavutil/dict.h"
 #include "libavutil/avassert.h"
@@ -152,6 +154,7 @@
     AVCodecContext *stream, *video_enc;
     int64_t list1, list2, strh, strf;
     AVDictionaryEntry *t = NULL;
+    int padding;
 
     if (s->nb_streams > AVI_MAX_STREAM_COUNT) {
         av_log(s, AV_LOG_ERROR, "AVI does not support >%d streams\n",
@@ -291,7 +294,7 @@
             // are not (yet) supported.
             if (stream->codec_id != AV_CODEC_ID_XSUB) break;
         case AVMEDIA_TYPE_VIDEO:
-            ff_put_bmp_header(pb, stream, ff_codec_bmp_tags, 0);
+            ff_put_bmp_header(pb, stream, ff_codec_bmp_tags, 0, 0);
             break;
         case AVMEDIA_TYPE_AUDIO:
             if ((ret = ff_put_wav_header(pb, stream)) < 0) {
@@ -309,6 +312,16 @@
             ff_riff_write_info_tag(s->pb, "strn", t->value);
             t = NULL;
         }
+        if(stream->codec_id == AV_CODEC_ID_XSUB
+           && (t = av_dict_get(s->streams[i]->metadata, "language", NULL, 0))) {
+            const char* langstr = av_convert_lang_to(t->value, AV_LANG_ISO639_1);
+            t = NULL;
+            if (langstr) {
+                char* str = av_asprintf("Subtitle - %s-xx;02", langstr);
+                ff_riff_write_info_tag(s->pb, "strn", str);
+                av_free(str);
+            }
+        }
       }
 
         if (pb->seekable) {
@@ -385,11 +398,18 @@
 
     ff_riff_write_info(s);
 
+
+    padding = s->metadata_header_padding;
+    if (padding < 0)
+        padding = 1016;
+
     /* some padding for easier tag editing */
-    list2 = ff_start_tag(pb, "JUNK");
-    for (i = 0; i < 1016; i += 4)
-        avio_wl32(pb, 0);
-    ff_end_tag(pb, list2);
+    if (padding) {
+        list2 = ff_start_tag(pb, "JUNK");
+        for (i = padding; i > 0; i -= 4)
+            avio_wl32(pb, 0);
+        ff_end_tag(pb, list2);
+    }
 
     avi->movi_list = ff_start_tag(pb, "LIST");
     ffio_wfourcc(pb, "movi");
@@ -661,5 +681,4 @@
     .codec_tag         = (const AVCodecTag* const []){
         ff_codec_bmp_tags, ff_codec_wav_tags, 0
     },
-    .flags             = AVFMT_VARIABLE_FPS,
 };

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/avio.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/avio.c Changed

@@ -42,8 +42,10 @@
 static const char *urlcontext_to_name(void *ptr)
 {
     URLContext *h = (URLContext *)ptr;
-    if(h->prot) return h->prot->name;
-    else        return "NULL";
+    if (h->prot)
+        return h->prot->name;
+    else
+        return "NULL";
 }
 
 static void *urlcontext_child_next(void *obj, void *prev)
@@ -68,49 +70,44 @@
         if (p->priv_data_class)
             return p->priv_data_class;
     return NULL;
-
 }
 
-static const AVOption options[] = {{NULL}};
+static const AVOption options[] = { { NULL } };
 const AVClass ffurl_context_class = {
-    .class_name     = "URLContext",
-    .item_name      = urlcontext_to_name,
-    .option         = options,
-    .version        = LIBAVUTIL_VERSION_INT,
-    .child_next     = urlcontext_child_next,
+    .class_name       = "URLContext",
+    .item_name        = urlcontext_to_name,
+    .option           = options,
+    .version          = LIBAVUTIL_VERSION_INT,
+    .child_next       = urlcontext_child_next,
     .child_class_next = urlcontext_child_class_next,
 };
 /*@}*/
 
-
 const char *avio_enum_protocols(void **opaque, int output)
 {
     URLProtocol *p;
     *opaque = ffurl_protocol_next(*opaque);
-    if (!(p = *opaque)) return NULL;
+    if (!(p = *opaque))
+        return NULL;
     if ((output && p->url_write) || (!output && p->url_read))
         return p->name;
     return avio_enum_protocols(opaque, output);
 }
 
-int ffurl_register_protocol(URLProtocol *protocol, int size)
+int ffurl_register_protocol(URLProtocol *protocol)
 {
     URLProtocol **p;
-    if (size < sizeof(URLProtocol)) {
-        URLProtocol* temp = av_mallocz(sizeof(URLProtocol));
-        memcpy(temp, protocol, size);
-        protocol = temp;
-    }
     p = &first_protocol;
-    while (*p != NULL) p = &(*p)->next;
-    *p = protocol;
+    while (*p != NULL)
+        p = &(*p)->next;
+    *p             = protocol;
     protocol->next = NULL;
     return 0;
 }
 
-static int url_alloc_for_protocol (URLContext **puc, struct URLProtocol *up,
-                                   const char *filename, int flags,
-                                   const AVIOInterruptCB *int_cb)
+static int url_alloc_for_protocol(URLContext **puc, struct URLProtocol *up,
+                                  const char *filename, int flags,
+                                  const AVIOInterruptCB *int_cb)
 {
     URLContext *uc;
     int err;
@@ -135,11 +132,11 @@
         goto fail;
     }
     uc->av_class = &ffurl_context_class;
-    uc->filename = (char *) &uc[1];
+    uc->filename = (char *)&uc[1];
     strcpy(uc->filename, filename);
-    uc->prot = up;
-    uc->flags = flags;
-    uc->is_streamed = 0; /* default = not streamed */
+    uc->prot            = up;
+    uc->flags           = flags;
+    uc->is_streamed     = 0; /* default = not streamed */
     uc->max_packet_size = 0; /* default: stream file */
     if (up->priv_data_size) {
         uc->priv_data = av_mallocz(up->priv_data_size);
@@ -150,7 +147,7 @@
         if (up->priv_data_class) {
             int proto_len= strlen(up->name);
             char *start = strchr(uc->filename, ',');
-            *(const AVClass**)uc->priv_data = up->priv_data_class;
+            *(const AVClass **)uc->priv_data = up->priv_data_class;
             av_opt_set_defaults(uc->priv_data);
             if(!strncmp(up->name, uc->filename, proto_len) && uc->filename + proto_len == start){
                 int ret= 0;
@@ -182,7 +179,7 @@
 
     *puc = uc;
     return 0;
- fail:
+fail:
     *puc = NULL;
     if (uc)
         av_freep(&uc->priv_data);
@@ -194,19 +191,22 @@
     return err;
 }
 
-int ffurl_connect(URLContext* uc, AVDictionary **options)
+int ffurl_connect(URLContext *uc, AVDictionary **options)
 {
     int err =
-        uc->prot->url_open2 ? uc->prot->url_open2(uc, uc->filename, uc->flags, options) :
+        uc->prot->url_open2 ? uc->prot->url_open2(uc,
+                                                  uc->filename,
+                                                  uc->flags,
+                                                  options) :
         uc->prot->url_open(uc, uc->filename, uc->flags);
     if (err)
         return err;
     uc->is_connected = 1;
-    //We must be careful here as ffurl_seek() could be slow, for example for http
-    if(   (uc->flags & AVIO_FLAG_WRITE)
-       || !strcmp(uc->prot->name, "file"))
-        if(!uc->is_streamed && ffurl_seek(uc, 0, SEEK_SET) < 0)
-            uc->is_streamed= 1;
+    /* We must be careful here as ffurl_seek() could be slow,
+     * for example for http */
+    if ((uc->flags & AVIO_FLAG_WRITE) || !strcmp(uc->prot->name, "file"))
+        if (!uc->is_streamed && ffurl_seek(uc, 0, SEEK_SET) < 0)
+            uc->is_streamed = 1;
     return 0;
 }
 
@@ -215,24 +215,19 @@
     "ABCDEFGHIJKLMNOPQRSTUVWXYZ"                \
     "0123456789+-."
 
-int ffurl_alloc(URLContext **puc, const char *filename, int flags,
-                const AVIOInterruptCB *int_cb)
+static struct URLProtocol *url_find_protocol(const char *filename)
 {
     URLProtocol *up = NULL;
     char proto_str[128], proto_nested[128], *ptr;
     size_t proto_len = strspn(filename, URL_SCHEME_CHARS);
 
-    if (!first_protocol) {
-        av_log(NULL, AV_LOG_WARNING, "No URL Protocols are registered. "
-                                     "Missing call to av_register_all()?\n");
-    }
-
     if (filename[proto_len] != ':' &&
         (filename[proto_len] != ',' || !strchr(filename + proto_len + 1, ':')) ||
         is_dos_path(filename))
         strcpy(proto_str, "file");
     else
-        av_strlcpy(proto_str, filename, FFMIN(proto_len+1, sizeof(proto_str)));
+        av_strlcpy(proto_str, filename,
+                   FFMIN(proto_len + 1, sizeof(proto_str)));
 
     if ((ptr = strchr(proto_str, ',')))
         *ptr = '\0';
@@ -242,13 +237,31 @@
 
     while (up = ffurl_protocol_next(up)) {
         if (!strcmp(proto_str, up->name))
-            return url_alloc_for_protocol (puc, up, filename, flags, int_cb);
+            break;
         if (up->flags & URL_PROTOCOL_FLAG_NESTED_SCHEME &&
             !strcmp(proto_nested, up->name))
-            return url_alloc_for_protocol (puc, up, filename, flags, int_cb);
+            break;
+    }
+
+    return up;
+}
+
+int ffurl_alloc(URLContext **puc, const char *filename, int flags,
+                const AVIOInterruptCB *int_cb)
+{
+    URLProtocol *p = NULL;
+
+    if (!first_protocol) {
+        av_log(NULL, AV_LOG_WARNING, "No URL Protocols are registered. "
+                                     "Missing call to av_register_all()?\n");
     }
+
+    p = url_find_protocol(filename);
+    if (p)
+       return url_alloc_for_protocol(puc, p, filename, flags, int_cb);
+
     *puc = NULL;
-    if (!strcmp("https", proto_str))
+    if (av_strstart("https:", filename, NULL))
         av_log(NULL, AV_LOG_WARNING, "https protocol not found, recompile with openssl or gnutls enabled.\n");
     return AVERROR_PROTOCOL_NOT_FOUND;
 }
@@ -271,8 +284,11 @@
     return ret;
 }
 
-static inline int retry_transfer_wrapper(URLContext *h, unsigned char *buf, int size, int size_min,
-                                         int (*transfer_func)(URLContext *h, unsigned char *buf, int size))
+static inline int retry_transfer_wrapper(URLContext *h, uint8_t *buf,
+                                         int size, int size_min,
+                                         int (*transfer_func)(URLContext *h,
+                                                              uint8_t *buf,
+                                                              int size))
 {
     int ret, len;
     int fast_retries = 5;
@@ -282,7 +298,7 @@
     while (len < size_min) {
         if (ff_check_interrupt(&h->interrupt_callback))
             return AVERROR_EXIT;
-        ret = transfer_func(h, buf+len, size-len);
+        ret = transfer_func(h, buf + len, size - len);
         if (ret == AVERROR(EINTR))
             continue;
         if (h->flags & AVIO_FLAG_NONBLOCK)
@@ -303,7 +319,7 @@
         } else if (ret < 1)
             return (ret < 0 && ret != AVERROR_EOF) ? ret : len;
         if (ret)
-           fast_retries = FFMAX(fast_retries, 2);
+            fast_retries = FFMAX(fast_retries, 2);
         len += ret;
     }
     return len;
@@ -348,7 +364,8 @@
 {
     URLContext *h= *hh;
     int ret = 0;
-    if (!h) return 0; /* can happen when ffurl_open fails */
+    if (!h)
+        return 0;     /* can happen when ffurl_open fails */
 
     if (h->is_connected && h->prot->url_close)
         ret = h->prot->url_close(h);
@@ -371,6 +388,13 @@
 }
 
 
+const char *avio_find_protocol_name(const char *url)
+{
+    URLProtocol *p = url_find_protocol(url);
+
+    return p ? p->name : NULL;
+}
+
 int avio_check(const char *url, int flags)
 {
     URLContext *h;
@@ -394,8 +418,8 @@
 {
     int64_t pos, size;
 
-    size= ffurl_seek(h, 0, AVSEEK_SIZE);
-    if(size<0){
+    size = ffurl_seek(h, 0, AVSEEK_SIZE);
+    if (size < 0) {
         pos = ffurl_seek(h, 0, SEEK_CUR);
         if ((size = ffurl_seek(h, -1, SEEK_END)) < 0)
             return size;

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/avio.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/avio.h Changed

@@ -151,6 +151,15 @@
 /* unbuffered I/O */
 
 /**
+ * Return the name of the protocol that will handle the passed URL.
+ *
+ * NULL is returned if no protocol could be found for the given URL.
+ *
+ * @return Name of the protocol or NULL.
+ */
+const char *avio_find_protocol_name(const char *url);
+
+/**
  * Return AVIO_FLAG_* access flags corresponding to the access permissions
  * of the resource in url, or a negative value corresponding to an
  * AVERROR code in case of failure. The returned access flags are
@@ -366,6 +375,7 @@
  *
  * @param s Used to return the pointer to the created AVIOContext.
  * In case of failure the pointed to value is set to NULL.
+ * @param url resource to access
  * @param flags flags which control how the resource indicated by url
  * is to be opened
  * @return >= 0 in case of success, a negative value corresponding to an
@@ -381,6 +391,7 @@
  *
  * @param s Used to return the pointer to the created AVIOContext.
  * In case of failure the pointed to value is set to NULL.
+ * @param url resource to access
  * @param flags flags which control how the resource indicated by url
  * is to be opened
  * @param int_cb an interrupt callback to be used at the protocols level
@@ -454,6 +465,8 @@
 /**
  * Pause and resume playing - only meaningful if using a network streaming
  * protocol (e.g. MMS).
+ *
+ * @param h     IO context from which to call the read_pause function pointer
  * @param pause 1 for pause, 0 for resume
  */
 int     avio_pause(AVIOContext *h, int pause);
@@ -461,6 +474,8 @@
 /**
  * Seek to a given timestamp relative to some component stream.
  * Only meaningful if using a network streaming protocol (e.g. MMS.).
+ *
+ * @param h IO context from which to call the seek function pointers
  * @param stream_index The stream index that the timestamp is relative to.
  *        If stream_index is (-1) the timestamp should be in AV_TIME_BASE
  *        units from the beginning of the presentation.

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/aviobuf.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/aviobuf.c Changed

@@ -201,12 +201,14 @@
     int64_t offset1;
     int64_t pos;
     int force = whence & AVSEEK_FORCE;
+    int buffer_size;
     whence &= ~AVSEEK_FORCE;
 
     if(!s)
         return AVERROR(EINVAL);
 
-    pos = s->pos - (s->write_flag ? 0 : (s->buf_end - s->buffer));
+    buffer_size = s->buf_end - s->buffer;
+    pos = s->pos - (s->write_flag ? 0 : buffer_size);
 
     if (whence != SEEK_CUR && whence != SEEK_SET)
         return AVERROR(EINVAL);
@@ -219,7 +221,7 @@
     }
     offset1 = offset - pos;
     if (!s->must_flush && (!s->direct || !s->seek) &&
-        offset1 >= 0 && offset1 <= (s->buf_end - s->buffer)) {
+        offset1 >= 0 && offset1 <= buffer_size) {
         /* can do the seek inside the buffer */
         s->buf_ptr = s->buffer + offset1;
     } else if ((!s->seekable ||
@@ -232,9 +234,20 @@
         if (s->eof_reached)
             return AVERROR_EOF;
         s->buf_ptr = s->buf_end + offset - s->pos;
-    } else {
+    } else if(!s->write_flag && offset1 < 0 && -offset1 < buffer_size>>1 && s->seek && offset > 0) {
         int64_t res;
 
+        pos -= FFMIN(buffer_size>>1, pos);
+        if ((res = s->seek(s->opaque, pos, SEEK_SET)) < 0)
+            return res;
+        s->buf_end =
+        s->buf_ptr = s->buffer;
+        s->pos = pos;
+        s->eof_reached = 0;
+        fill_buffer(s);
+        return avio_seek(s, offset, SEEK_SET | force);
+    } else {
+        int64_t res;
         if (s->write_flag) {
             flush_buffer(s);
             s->must_flush = 1;
@@ -319,15 +332,22 @@
 {
     const uint8_t *q = str;
     int ret = 0;
+    int err = 0;
 
     while (*q) {
         uint32_t ch;
         uint16_t tmp;
 
-        GET_UTF8(ch, *q++, break;)
+        GET_UTF8(ch, *q++, goto invalid;)
         PUT_UTF16(ch, tmp, avio_wl16(s, tmp); ret += 2;)
+        continue;
+invalid:
+        av_log(s, AV_LOG_ERROR, "Invaid UTF8 sequence in avio_put_str16le\n");
+        err = AVERROR(EINVAL);
     }
     avio_wl16(s, 0);
+    if (err)
+        return err;
     ret += 2;
     return ret;
 }
@@ -1029,11 +1049,17 @@
 
 int avio_close_dyn_buf(AVIOContext *s, uint8_t **pbuffer)
 {
-    DynBuffer *d = s->opaque;
+    DynBuffer *d;
     int size;
     static const char padbuf[FF_INPUT_BUFFER_PADDING_SIZE] = {0};
     int padding = 0;
 
+    if (!s) {
+        *pbuffer = NULL;
+        return 0;
+    }
+    d = s->opaque;
+
     /* don't attempt to pad fixed-size packet buffers */
     if (!s->max_packet_size) {
         avio_write(s, padbuf, sizeof(padbuf));

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/avisynth.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/avisynth.c Changed

@@ -1,5 +1,5 @@
 /*
- * Avi/AvxSynth support
+ * AviSynth/AvxSynth support
  * Copyright (c) 2012 AvxSynth Team.
  *
  * This file is part of FFmpeg
@@ -19,51 +19,38 @@
  */
 
 #include "libavutil/internal.h"
+#include "libavcodec/internal.h"
 #include "avformat.h"
 #include "internal.h"
-#include "libavcodec/internal.h"
 
-// Enable function pointer definitions for runtime loading.
+/* Enable function pointer definitions for runtime loading. */
 #define AVSC_NO_DECLSPEC
 
-// Shut up ffmpeg error messages.
-// avisynth_c.h contains inline functions that call these functions.
-#undef malloc
-#undef free
-#undef printf
-
-// Platform-specific directives for AviSynth vs AvxSynth.
+/* Platform-specific directives for AviSynth vs AvxSynth. */
 #ifdef _WIN32
   #include <windows.h>
   #undef EXTERN_C
   #include "compat/avisynth/avisynth_c.h"
   #include "compat/avisynth/avisynth_c_25.h"
   #define AVISYNTH_LIB "avisynth"
+  #define USING_AVISYNTH
 #else
   #include <dlfcn.h>
   #include "compat/avisynth/avxsynth_c.h"
-   #if defined (__APPLE__)
-     #define AVISYNTH_LIB "libavxsynth.dylib"
-   #else
-     #define AVISYNTH_LIB "libavxsynth.so"
-   #endif
+    #if defined (__APPLE__)
+      #define AVISYNTH_LIB "libavxsynth.dylib"
+    #else
+      #define AVISYNTH_LIB "libavxsynth.so"
+    #endif
 
   #define LoadLibrary(x) dlopen(x, RTLD_NOW | RTLD_GLOBAL)
   #define GetProcAddress dlsym
   #define FreeLibrary dlclose
 #endif
 
-// AvxSynth doesn't have these colorspaces, so disable them
-#ifndef _WIN32
-#define avs_is_yv24(vi) 0
-#define avs_is_yv16(vi) 0
-#define avs_is_yv411(vi) 0
-#define avs_is_y8(vi) 0
-#endif
-
-typedef struct {
+typedef struct AviSynthLibrary {
     void *library;
-#define AVSC_DECLARE_FUNC(name) name##_func name
+#define AVSC_DECLARE_FUNC(name) name ## _func name
     AVSC_DECLARE_FUNC(avs_bit_blt);
     AVSC_DECLARE_FUNC(avs_clip_get_error);
     AVSC_DECLARE_FUNC(avs_create_script_environment);
@@ -81,12 +68,12 @@
 #undef AVSC_DECLARE_FUNC
 } AviSynthLibrary;
 
-struct AviSynthContext {
+typedef struct AviSynthContext {
     AVS_ScriptEnvironment *env;
     AVS_Clip *clip;
     const AVS_VideoInfo *vi;
 
-    // avisynth_read_packet_video() iterates over this.
+    /* avisynth_read_packet_video() iterates over this. */
     int n_planes;
     const int *planes;
 
@@ -96,40 +83,37 @@
 
     int error;
 
-    // Linked list pointers.
+    /* Linked list pointers. */
     struct AviSynthContext *next;
-};
-typedef struct AviSynthContext AviSynthContext;
+} AviSynthContext;
 
-static const int avs_planes_packed[1] = {0};
-static const int avs_planes_grey[1] = {AVS_PLANAR_Y};
-static const int avs_planes_yuv[3] = {AVS_PLANAR_Y, AVS_PLANAR_U, AVS_PLANAR_V};
+static const int avs_planes_packed[1] = { 0 };
+static const int avs_planes_grey[1]   = { AVS_PLANAR_Y };
+static const int avs_planes_yuv[3]    = { AVS_PLANAR_Y, AVS_PLANAR_U,
+                                          AVS_PLANAR_V };
 
-// A conflict between C++ global objects, atexit, and dynamic loading requires
-// us to register our own atexit handler to prevent double freeing.
-static AviSynthLibrary *avs_library = NULL;
-static int avs_atexit_called = 0;
+/* A conflict between C++ global objects, atexit, and dynamic loading requires
+ * us to register our own atexit handler to prevent double freeing. */
+static AviSynthLibrary avs_library;
+static int avs_atexit_called        = 0;
 
-// Linked list of AviSynthContexts. An atexit handler destroys this list.
+/* Linked list of AviSynthContexts. An atexit handler destroys this list. */
 static AviSynthContext *avs_ctx_list = NULL;
 
 static av_cold void avisynth_atexit_handler(void);
 
-static av_cold int avisynth_load_library(void) {
-    avs_library = av_mallocz(sizeof(AviSynthLibrary));
-    if (!avs_library)
+static av_cold int avisynth_load_library(void)
+{
+    avs_library.library = LoadLibrary(AVISYNTH_LIB);
+    if (!avs_library.library)
         return AVERROR_UNKNOWN;
 
-    avs_library->library = LoadLibrary(AVISYNTH_LIB);
-    if (!avs_library->library)
-        goto init_fail;
+#define LOAD_AVS_FUNC(name, continue_on_fail)                          \
+        avs_library.name =                                             \
+            (void *)GetProcAddress(avs_library.library, #name);        \
+        if (!continue_on_fail && !avs_library.name)                    \
+            goto fail;
 
-#define LOAD_AVS_FUNC(name, continue_on_fail) \
-{ \
-    avs_library->name = (void*)GetProcAddress(avs_library->library, #name); \
-    if(!continue_on_fail && !avs_library->name) \
-        goto fail; \
-}
     LOAD_AVS_FUNC(avs_bit_blt, 0);
     LOAD_AVS_FUNC(avs_clip_get_error, 0);
     LOAD_AVS_FUNC(avs_create_script_environment, 0);
@@ -150,27 +134,25 @@
     return 0;
 
 fail:
-    FreeLibrary(avs_library->library);
-init_fail:
-    av_freep(&avs_library);
+    FreeLibrary(avs_library.library);
     return AVERROR_UNKNOWN;
 }
 
-// Note that avisynth_context_create and avisynth_context_destroy
-// do not allocate or free the actual context! That is taken care of
-// by libavformat.
-static av_cold int avisynth_context_create(AVFormatContext *s) {
-    AviSynthContext *avs = (AviSynthContext *)s->priv_data;
+/* Note that avisynth_context_create and avisynth_context_destroy
+ * do not allocate or free the actual context! That is taken care of
+ * by libavformat. */
+static av_cold int avisynth_context_create(AVFormatContext *s)
+{
+    AviSynthContext *avs = s->priv_data;
     int ret;
 
-    if (!avs_library) {
+    if (!avs_library.library)
         if (ret = avisynth_load_library())
             return ret;
-    }
 
-    avs->env = avs_library->avs_create_script_environment(3);
-    if (avs_library->avs_get_error) {
-        const char *error = avs_library->avs_get_error(avs->env);
+    avs->env = avs_library.avs_create_script_environment(3);
+    if (avs_library.avs_get_error) {
+        const char *error = avs_library.avs_get_error(avs->env);
         if (error) {
             av_log(s, AV_LOG_ERROR, "%s\n", error);
             return AVERROR_UNKNOWN;
@@ -180,16 +162,17 @@
     if (!avs_ctx_list) {
         avs_ctx_list = avs;
     } else {
-        avs->next = avs_ctx_list;
+        avs->next    = avs_ctx_list;
         avs_ctx_list = avs;
     }
 
     return 0;
 }
 
-static av_cold void avisynth_context_destroy(AviSynthContext *avs) {
+static av_cold void avisynth_context_destroy(AviSynthContext *avs)
+{
     if (avs_atexit_called)
-       return;
+        return;
 
     if (avs == avs_ctx_list) {
         avs_ctx_list = avs->next;
@@ -201,16 +184,17 @@
     }
 
     if (avs->clip) {
-        avs_library->avs_release_clip(avs->clip);
+        avs_library.avs_release_clip(avs->clip);
         avs->clip = NULL;
     }
     if (avs->env) {
-        avs_library->avs_delete_script_environment(avs->env);
+        avs_library.avs_delete_script_environment(avs->env);
         avs->env = NULL;
     }
 }
 
-static av_cold void avisynth_atexit_handler(void) {
+static av_cold void avisynth_atexit_handler(void)
+{
     AviSynthContext *avs = avs_ctx_list;
 
     while (avs) {
@@ -218,45 +202,47 @@
         avisynth_context_destroy(avs);
         avs = next;
     }
-    FreeLibrary(avs_library->library);
-    av_freep(&avs_library);
+    FreeLibrary(avs_library.library);
 
     avs_atexit_called = 1;
 }
 
-// Create AVStream from audio and video data.
-static int avisynth_create_stream_video(AVFormatContext *s, AVStream *st) {
+/* Create AVStream from audio and video data. */
+static int avisynth_create_stream_video(AVFormatContext *s, AVStream *st)
+{
     AviSynthContext *avs = s->priv_data;
     int planar = 0; // 0: packed, 1: YUV, 2: Y8
 
     st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
-    st->codec->codec_id = CODEC_ID_RAWVIDEO;
-    st->codec->width = avs->vi->width;
-    st->codec->height = avs->vi->height;
-
-    st->time_base = (AVRational) {avs->vi->fps_denominator, avs->vi->fps_numerator};
-    st->avg_frame_rate = (AVRational) {avs->vi->fps_numerator, avs->vi->fps_denominator};
-    st->start_time = 0;
-    st->duration = avs->vi->num_frames;
-    st->nb_frames = avs->vi->num_frames;
+    st->codec->codec_id   = AV_CODEC_ID_RAWVIDEO;
+    st->codec->width      = avs->vi->width;
+    st->codec->height     = avs->vi->height;
+
+    st->time_base         = (AVRational) { avs->vi->fps_denominator,
+                                           avs->vi->fps_numerator };
+    st->avg_frame_rate    = (AVRational) { avs->vi->fps_numerator,
+                                           avs->vi->fps_denominator };
+    st->start_time        = 0;
+    st->duration          = avs->vi->num_frames;
+    st->nb_frames         = avs->vi->num_frames;
 
     switch (avs->vi->pixel_type) {
-#ifdef _WIN32
+#ifdef USING_AVISYNTH
     case AVS_CS_YV24:
         st->codec->pix_fmt = AV_PIX_FMT_YUV444P;
-        planar = 1;
+        planar             = 1;
         break;
     case AVS_CS_YV16:
         st->codec->pix_fmt = AV_PIX_FMT_YUV422P;
-        planar = 1;
+        planar             = 1;
         break;
     case AVS_CS_YV411:
         st->codec->pix_fmt = AV_PIX_FMT_YUV411P;
-        planar = 1;
+        planar             = 1;
         break;
     case AVS_CS_Y8:
         st->codec->pix_fmt = AV_PIX_FMT_GRAY8;
-        planar = 2;
+        planar             = 2;
         break;
 #endif
     case AVS_CS_BGR24:
@@ -270,14 +256,15 @@
         break;
     case AVS_CS_YV12:
         st->codec->pix_fmt = AV_PIX_FMT_YUV420P;
-        planar = 1;
+        planar             = 1;
         break;
     case AVS_CS_I420: // Is this even used anywhere?
         st->codec->pix_fmt = AV_PIX_FMT_YUV420P;
-        planar = 1;
+        planar             = 1;
         break;
     default:
-        av_log(s, AV_LOG_ERROR, "unknown AviSynth colorspace %d\n", avs->vi->pixel_type);
+        av_log(s, AV_LOG_ERROR,
+               "unknown AviSynth colorspace %d\n", avs->vi->pixel_type);
         avs->error = 1;
         return AVERROR_UNKNOWN;
     }
@@ -285,52 +272,56 @@
     switch (planar) {
     case 2: // Y8
         avs->n_planes = 1;
-        avs->planes = avs_planes_grey;
+        avs->planes   = avs_planes_grey;
         break;
     case 1: // YUV
         avs->n_planes = 3;
-        avs->planes = avs_planes_yuv;
+        avs->planes   = avs_planes_yuv;
         break;
     default:
         avs->n_planes = 1;
-        avs->planes = avs_planes_packed;
+        avs->planes   = avs_planes_packed;
     }
     return 0;
 }
 
-static int avisynth_create_stream_audio(AVFormatContext *s, AVStream *st) {
+static int avisynth_create_stream_audio(AVFormatContext *s, AVStream *st)
+{
     AviSynthContext *avs = s->priv_data;
 
-    st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
+    st->codec->codec_type  = AVMEDIA_TYPE_AUDIO;
     st->codec->sample_rate = avs->vi->audio_samples_per_second;
-    st->codec->channels = avs->vi->nchannels;
-    st->time_base = (AVRational) {1, avs->vi->audio_samples_per_second};
+    st->codec->channels    = avs->vi->nchannels;
+    st->time_base          = (AVRational) { 1,
+                                            avs->vi->audio_samples_per_second };
 
     switch (avs->vi->sample_type) {
     case AVS_SAMPLE_INT8:
-        st->codec->codec_id = CODEC_ID_PCM_U8;
+        st->codec->codec_id = AV_CODEC_ID_PCM_U8;
         break;
     case AVS_SAMPLE_INT16:
-        st->codec->codec_id = CODEC_ID_PCM_S16LE;
+        st->codec->codec_id = AV_CODEC_ID_PCM_S16LE;
         break;
     case AVS_SAMPLE_INT24:
-        st->codec->codec_id = CODEC_ID_PCM_S24LE;
+        st->codec->codec_id = AV_CODEC_ID_PCM_S24LE;
         break;
     case AVS_SAMPLE_INT32:
-        st->codec->codec_id = CODEC_ID_PCM_S32LE;
+        st->codec->codec_id = AV_CODEC_ID_PCM_S32LE;
         break;
     case AVS_SAMPLE_FLOAT:
-        st->codec->codec_id = CODEC_ID_PCM_F32LE;
+        st->codec->codec_id = AV_CODEC_ID_PCM_F32LE;
         break;
     default:
-        av_log(s, AV_LOG_ERROR, "unknown AviSynth sample type %d\n", avs->vi->sample_type);
+        av_log(s, AV_LOG_ERROR,
+               "unknown AviSynth sample type %d\n", avs->vi->sample_type);
         avs->error = 1;
         return AVERROR_UNKNOWN;
     }
     return 0;
 }
 
-static int avisynth_create_stream(AVFormatContext *s) {
+static int avisynth_create_stream(AVFormatContext *s)
+{
     AviSynthContext *avs = s->priv_data;
     AVStream *st;
     int ret;
@@ -355,11 +346,12 @@
     return 0;
 }
 
-static int avisynth_open_file(AVFormatContext *s) {
-    AviSynthContext *avs = (AviSynthContext *)s->priv_data;
+static int avisynth_open_file(AVFormatContext *s)
+{
+    AviSynthContext *avs = s->priv_data;
     AVS_Value arg, val;
     int ret;
-#ifdef _WIN32
+#ifdef USING_AVISYNTH
     char filename_ansi[MAX_PATH * 4];
     wchar_t filename_wc[MAX_PATH * 4];
 #endif
@@ -367,31 +359,32 @@
     if (ret = avisynth_context_create(s))
         return ret;
 
-#ifdef _WIN32
-    // Convert UTF-8 to ANSI code page
+#ifdef USING_AVISYNTH
+    /* Convert UTF-8 to ANSI code page */
     MultiByteToWideChar(CP_UTF8, 0, s->filename, -1, filename_wc, MAX_PATH * 4);
-    WideCharToMultiByte(CP_THREAD_ACP, 0, filename_wc, -1, filename_ansi, MAX_PATH * 4, NULL, NULL);
+    WideCharToMultiByte(CP_THREAD_ACP, 0, filename_wc, -1, filename_ansi,
+                        MAX_PATH * 4, NULL, NULL);
     arg = avs_new_value_string(filename_ansi);
 #else
     arg = avs_new_value_string(s->filename);
 #endif
-    val = avs_library->avs_invoke(avs->env, "Import", arg, 0);
+    val = avs_library.avs_invoke(avs->env, "Import", arg, 0);
     if (avs_is_error(val)) {
         av_log(s, AV_LOG_ERROR, "%s\n", avs_as_error(val));
         ret = AVERROR_UNKNOWN;
         goto fail;
     }
     if (!avs_is_clip(val)) {
-        av_log(s, AV_LOG_ERROR, "%s\n", "AviSynth script did not return a clip");
+        av_log(s, AV_LOG_ERROR, "AviSynth script did not return a clip\n");
         ret = AVERROR_UNKNOWN;
         goto fail;
     }
 
-    avs->clip = avs_library->avs_take_clip(val, avs->env);
-    avs->vi = avs_library->avs_get_video_info(avs->clip);
+    avs->clip = avs_library.avs_take_clip(val, avs->env);
+    avs->vi   = avs_library.avs_get_video_info(avs->clip);
 
-    // Release the AVS_Value as it will go out of scope.
-    avs_library->avs_release_value(val);
+    /* Release the AVS_Value as it will go out of scope. */
+    avs_library.avs_release_value(val);
 
     if (ret = avisynth_create_stream(s))
         goto fail;
@@ -403,13 +396,15 @@
     return ret;
 }
 
-static void avisynth_next_stream(AVFormatContext *s, AVStream **st, AVPacket *pkt, int *discard) {
+static void avisynth_next_stream(AVFormatContext *s, AVStream **st,
+                                 AVPacket *pkt, int *discard)
+{
     AviSynthContext *avs = s->priv_data;
 
-    pkt->stream_index = avs->curr_stream++;
+    avs->curr_stream++;
     avs->curr_stream %= s->nb_streams;
 
-    *st = s->streams[pkt->stream_index];
+    *st = s->streams[avs->curr_stream];
     if ((*st)->discard == AVDISCARD_ALL)
         *discard = 1;
     else
@@ -418,8 +413,10 @@
     return;
 }
 
-// Copy AviSynth clip data into an AVPacket.
-static int avisynth_read_packet_video(AVFormatContext *s, AVPacket *pkt, int discard) {
+/* Copy AviSynth clip data into an AVPacket. */
+static int avisynth_read_packet_video(AVFormatContext *s, AVPacket *pkt,
+                                      int discard)
+{
     AviSynthContext *avs = s->priv_data;
     AVS_VideoFrame *frame;
     unsigned char *dst_p;
@@ -430,42 +427,49 @@
     if (avs->curr_frame >= avs->vi->num_frames)
         return AVERROR_EOF;
 
-    // This must happen even if the stream is discarded to prevent desync.
+    /* This must happen even if the stream is discarded to prevent desync. */
     n = avs->curr_frame++;
     if (discard)
         return 0;
 
-    pkt->pts = n;
-    pkt->dts = n;
-    pkt->duration = 1;
+#ifdef USING_AVISYNTH
+    /* Define the bpp values for the new AviSynth 2.6 colorspaces.
+     * Since AvxSynth doesn't have these functions, special-case
+     * it in order to avoid implicit declaration errors. */
 
-    // Define the bpp values for the new AviSynth 2.6 colorspaces
-    if (avs_is_yv24(avs->vi)) {
+    if (avs_is_yv24(avs->vi))
         bits = 24;
-    } else if (avs_is_yv16(avs->vi)) {
+    else if (avs_is_yv16(avs->vi))
         bits = 16;
-    } else if (avs_is_yv411(avs->vi)) {
+    else if (avs_is_yv411(avs->vi))
         bits = 12;
-    } else if (avs_is_y8(avs->vi)) {
+    else if (avs_is_y8(avs->vi))
         bits = 8;
-    } else {
+    else
+#endif
         bits = avs_bits_per_pixel(avs->vi);
-    }
 
-    // Without cast to int64_t, calculation overflows at about 9k x 9k resolution.
-    pkt->size = (((int64_t)avs->vi->width * (int64_t)avs->vi->height) * bits) / 8;
+    /* Without the cast to int64_t, calculation overflows at about 9k x 9k
+     * resolution. */
+    pkt->size = (((int64_t)avs->vi->width *
+                  (int64_t)avs->vi->height) * bits) / 8;
     if (!pkt->size)
         return AVERROR_UNKNOWN;
-    pkt->data = av_malloc(pkt->size);
-    if (!pkt->data)
-        return AVERROR_UNKNOWN;
 
-    frame = avs_library->avs_get_frame(avs->clip, n);
-    error = avs_library->avs_clip_get_error(avs->clip);
+    if (av_new_packet(pkt, pkt->size) < 0)
+        return AVERROR(ENOMEM);
+
+    pkt->pts      = n;
+    pkt->dts      = n;
+    pkt->duration = 1;
+    pkt->stream_index = avs->curr_stream;
+
+    frame = avs_library.avs_get_frame(avs->clip, n);
+    error = avs_library.avs_clip_get_error(avs->clip);
     if (error) {
         av_log(s, AV_LOG_ERROR, "%s\n", error);
         avs->error = 1;
-        av_freep(&pkt->data);
+        av_packet_unref(pkt);
         return AVERROR_UNKNOWN;
     }
 
@@ -475,34 +479,37 @@
         src_p = avs_get_read_ptr_p(frame, plane);
         pitch = avs_get_pitch_p(frame, plane);
 
-#ifdef _WIN32
-        if (avs_library->avs_get_version(avs->clip) == 3) {
-            rowsize = avs_get_row_size_p_25(frame, plane);
+#ifdef USING_AVISYNTH
+        if (avs_library.avs_get_version(avs->clip) == 3) {
+            rowsize     = avs_get_row_size_p_25(frame, plane);
             planeheight = avs_get_height_p_25(frame, plane);
         } else {
-            rowsize = avs_get_row_size_p(frame, plane);
+            rowsize     = avs_get_row_size_p(frame, plane);
             planeheight = avs_get_height_p(frame, plane);
         }
 #else
-        rowsize = avs_get_row_size_p(frame, plane);
+        rowsize     = avs_get_row_size_p(frame, plane);
         planeheight = avs_get_height_p(frame, plane);
 #endif
 
-        // Flip RGB video.
+        /* Flip RGB video. */
         if (avs_is_rgb24(avs->vi) || avs_is_rgb(avs->vi)) {
             src_p = src_p + (planeheight - 1) * pitch;
             pitch = -pitch;
         }
 
-        avs_library->avs_bit_blt(avs->env, dst_p, rowsize, src_p, pitch, rowsize, planeheight);
+        avs_library.avs_bit_blt(avs->env, dst_p, rowsize, src_p, pitch,
+                                 rowsize, planeheight);
         dst_p += rowsize * planeheight;
     }
 
-    avs_library->avs_release_video_frame(frame);
+    avs_library.avs_release_video_frame(frame);
     return 0;
 }
 
-static int avisynth_read_packet_audio(AVFormatContext *s, AVPacket *pkt, int discard) {
+static int avisynth_read_packet_audio(AVFormatContext *s, AVPacket *pkt,
+                                      int discard)
+{
     AviSynthContext *avs = s->priv_data;
     AVRational fps, samplerate;
     int samples;
@@ -512,21 +519,22 @@
     if (avs->curr_sample >= avs->vi->num_audio_samples)
         return AVERROR_EOF;
 
-    fps.num = avs->vi->fps_numerator;
-    fps.den = avs->vi->fps_denominator;
+    fps.num        = avs->vi->fps_numerator;
+    fps.den        = avs->vi->fps_denominator;
     samplerate.num = avs->vi->audio_samples_per_second;
     samplerate.den = 1;
 
     if (avs_has_video(avs->vi)) {
         if (avs->curr_frame < avs->vi->num_frames)
-            samples = av_rescale_q(avs->curr_frame, samplerate, fps) - avs->curr_sample;
+            samples = av_rescale_q(avs->curr_frame, samplerate, fps) -
+                      avs->curr_sample;
         else
             samples = av_rescale_q(1, samplerate, fps);
     } else {
         samples = 1000;
     }
 
-    // After seeking, audio may catch up with video.
+    /* After seeking, audio may catch up with video. */
     if (samples <= 0) {
         pkt->size = 0;
         pkt->data = NULL;
@@ -536,35 +544,38 @@
     if (avs->curr_sample + samples > avs->vi->num_audio_samples)
         samples = avs->vi->num_audio_samples - avs->curr_sample;
 
-    // This must happen even if the stream is discarded to prevent desync.
-    n = avs->curr_sample;
+    /* This must happen even if the stream is discarded to prevent desync. */
+    n                 = avs->curr_sample;
     avs->curr_sample += samples;
     if (discard)
         return 0;
 
-    pkt->pts = n;
-    pkt->dts = n;
-    pkt->duration = samples;
-
-    pkt->size = avs_bytes_per_channel_sample(avs->vi) * samples * avs->vi->nchannels;
+    pkt->size = avs_bytes_per_channel_sample(avs->vi) *
+                samples * avs->vi->nchannels;
     if (!pkt->size)
         return AVERROR_UNKNOWN;
-    pkt->data = av_malloc(pkt->size);
-    if (!pkt->data)
-        return AVERROR_UNKNOWN;
 
-    avs_library->avs_get_audio(avs->clip, pkt->data, n, samples);
-    error = avs_library->avs_clip_get_error(avs->clip);
+    if (av_new_packet(pkt, pkt->size) < 0)
+        return AVERROR(ENOMEM);
+
+    pkt->pts      = n;
+    pkt->dts      = n;
+    pkt->duration = samples;
+    pkt->stream_index = avs->curr_stream;
+
+    avs_library.avs_get_audio(avs->clip, pkt->data, n, samples);
+    error = avs_library.avs_clip_get_error(avs->clip);
     if (error) {
         av_log(s, AV_LOG_ERROR, "%s\n", error);
         avs->error = 1;
-        av_freep(&pkt->data);
+        av_packet_unref(pkt);
         return AVERROR_UNKNOWN;
     }
     return 0;
 }
 
-static av_cold int avisynth_read_header(AVFormatContext *s) {
+static av_cold int avisynth_read_header(AVFormatContext *s)
+{
     int ret;
 
     // Calling library must implement a lock for thread-safe opens.
@@ -580,7 +591,8 @@
     return 0;
 }
 
-static int avisynth_read_packet(AVFormatContext *s, AVPacket *pkt) {
+static int avisynth_read_packet(AVFormatContext *s, AVPacket *pkt)
+{
     AviSynthContext *avs = s->priv_data;
     AVStream *st;
     int discard = 0;
@@ -589,9 +601,8 @@
     if (avs->error)
         return AVERROR_UNKNOWN;
 
-    pkt->destruct = av_destruct_packet;
-
-    // If either stream reaches EOF, try to read the other one before giving up.
+    /* If either stream reaches EOF, try to read the other one before
+     * giving up. */
     avisynth_next_stream(s, &st, pkt, &discard);
     if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO) {
         ret = avisynth_read_packet_video(s, pkt, discard);
@@ -599,18 +610,19 @@
             avisynth_next_stream(s, &st, pkt, &discard);
             return avisynth_read_packet_audio(s, pkt, discard);
         }
-        return ret;
     } else {
         ret = avisynth_read_packet_audio(s, pkt, discard);
         if (ret == AVERROR_EOF && avs_has_video(avs->vi)) {
             avisynth_next_stream(s, &st, pkt, &discard);
             return avisynth_read_packet_video(s, pkt, discard);
         }
-        return ret;
     }
+
+    return ret;
 }
 
-static av_cold int avisynth_read_close(AVFormatContext *s) {
+static av_cold int avisynth_read_close(AVFormatContext *s)
+{
     if (avpriv_lock_avformat())
         return AVERROR_UNKNOWN;
 
@@ -619,7 +631,9 @@
     return 0;
 }
 
-static int avisynth_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp, int flags) {
+static int avisynth_read_seek(AVFormatContext *s, int stream_index,
+                              int64_t timestamp, int flags)
+{
     AviSynthContext *avs = s->priv_data;
     AVStream *st;
     AVRational fps, samplerate;
@@ -627,13 +641,16 @@
     if (avs->error)
         return AVERROR_UNKNOWN;
 
-    fps = (AVRational) {avs->vi->fps_numerator, avs->vi->fps_denominator};
-    samplerate = (AVRational) {avs->vi->audio_samples_per_second, 1};
+    fps        = (AVRational) { avs->vi->fps_numerator,
+                                avs->vi->fps_denominator };
+    samplerate = (AVRational) { avs->vi->audio_samples_per_second, 1 };
 
     st = s->streams[stream_index];
     if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO) {
-        // AviSynth frame counts are signed int.
-        if ((timestamp >= avs->vi->num_frames) || (timestamp > INT_MAX) || (timestamp < 0))
+        /* AviSynth frame counts are signed int. */
+        if ((timestamp >= avs->vi->num_frames) ||
+            (timestamp > INT_MAX)              ||
+            (timestamp < 0))
             return AVERROR_EOF;
         avs->curr_frame = timestamp;
         if (avs_has_audio(avs->vi))
@@ -641,9 +658,9 @@
     } else {
         if ((timestamp >= avs->vi->num_audio_samples) || (timestamp < 0))
             return AVERROR_EOF;
-        // Force frame granularity for seeking.
+        /* Force frame granularity for seeking. */
         if (avs_has_video(avs->vi)) {
-            avs->curr_frame = av_rescale_q(timestamp, fps, samplerate);
+            avs->curr_frame  = av_rescale_q(timestamp, fps, samplerate);
             avs->curr_sample = av_rescale_q(avs->curr_frame, samplerate, fps);
         } else {
             avs->curr_sample = timestamp;

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/avr.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/avr.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/bethsoftvid.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/bethsoftvid.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/bink.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/bink.c Changed

@@ -59,8 +59,10 @@
 {
     const uint8_t *b = p->buf;
 
-    if ( b[0] == 'B' && b[1] == 'I' && b[2] == 'K' &&
-        (b[3] == 'b' || b[3] == 'f' || b[3] == 'g' || b[3] == 'h' || b[3] == 'i') &&
+    if (((b[0] == 'B' && b[1] == 'I' && b[2] == 'K' &&
+         (b[3] == 'b' || b[3] == 'f' || b[3] == 'g' || b[3] == 'h' || b[3] == 'i')) ||
+         (b[0] == 'K' && b[1] == 'B' && b[2] == '2' && /* Bink 2 */
+         (b[3] == 'a' || b[3] == 'd' || b[3] == 'f' || b[3] == 'g'))) &&
         AV_RL32(b+8) > 0 &&  // num_frames
         AV_RL32(b+20) > 0 && AV_RL32(b+20) <= BINK_MAX_WIDTH &&
         AV_RL32(b+24) > 0 && AV_RL32(b+24) <= BINK_MAX_HEIGHT &&
@@ -79,6 +81,7 @@
     uint32_t pos, next_pos;
     uint16_t flags;
     int keyframe;
+    int ret;
 
     vst = avformat_new_stream(s, NULL);
     if (!vst)
@@ -116,9 +119,14 @@
 
     vst->codec->codec_type = AVMEDIA_TYPE_VIDEO;
     vst->codec->codec_id   = AV_CODEC_ID_BINKVIDEO;
-    if (ff_alloc_extradata(vst->codec, 4))
+
+    if ((vst->codec->codec_tag & 0xFFFFFF) == MKTAG('K', 'B', '2', 0)) {
+        av_log(s, AV_LOG_WARNING, "Bink 2 video is not implemented\n");
+        vst->codec->codec_id = AV_CODEC_ID_NONE;
+    }
+
+    if (ff_get_extradata(vst->codec, pb, 4) < 0)
         return AVERROR(ENOMEM);
-    avio_read(pb, vst->codec->extradata, 4);
 
     bink->num_audio_tracks = avio_rl32(pb);
 
@@ -177,11 +185,12 @@
             av_log(s, AV_LOG_ERROR, "invalid frame index table\n");
             return AVERROR(EIO);
         }
-        av_add_index_entry(vst, pos, i, next_pos - pos, 0,
-                           keyframe ? AVINDEX_KEYFRAME : 0);
+        if ((ret = av_add_index_entry(vst, pos, i, next_pos - pos, 0,
+                                      keyframe ? AVINDEX_KEYFRAME : 0)) < 0)
+            return ret;
     }
 
-    avio_skip(pb, 4);
+    avio_seek(pb, vst->index_entries[0].pos, SEEK_SET);
 
     bink->current_track = -1;
     return 0;
@@ -280,4 +289,5 @@
     .read_header    = read_header,
     .read_packet    = read_packet,
     .read_seek      = read_seek,
+    .flags          = AVFMT_SHOW_IDS,
 };

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/cafdec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/cafdec.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/cafenc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/cafenc.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/concatdec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/concatdec.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/dfa.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/dfa.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/diracdec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/diracdec.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/dv.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/dv.c Changed

@@ -32,7 +32,7 @@
 #include "avformat.h"
 #include "internal.h"
 #include "libavcodec/dv_profile.h"
-#include "libavcodec/dvdata.h"
+#include "libavcodec/dv.h"
 #include "libavutil/channel_layout.h"
 #include "libavutil/intreadwrite.h"
 #include "libavutil/mathematics.h"
@@ -582,31 +582,37 @@
 
 static int dv_probe(AVProbeData *p)
 {
-    unsigned state, marker_pos = 0;
+    unsigned marker_pos = 0;
     int i;
     int matches           = 0;
+    int firstmatch        = 0;
     int secondary_matches = 0;
 
     if (p->buf_size < 5)
         return 0;
 
-    state = AV_RB32(p->buf);
-    for (i = 4; i < p->buf_size; i++) {
-        if ((state & 0xffffff7f) == 0x1f07003f)
-            matches++;
-        // any section header, also with seq/chan num != 0,
-        // should appear around every 12000 bytes, at least 10 per frame
-        if ((state & 0xff07ff7f) == 0x1f07003f)
-            secondary_matches++;
-        if (state == 0x003f0700 || state == 0xff3f0700)
-            marker_pos = i;
-        if (state == 0xff3f0701 && i - marker_pos == 80)
-            matches++;
-        state = (state << 8) | p->buf[i];
+    for (i = 0; i < p->buf_size-4; i++) {
+        unsigned state = AV_RB32(p->buf+i);
+        if ((state & 0x0007f840) == 0x00070000) {
+            // any section header, also with seq/chan num != 0,
+            // should appear around every 12000 bytes, at least 10 per frame
+            if ((state & 0xff07ff7f) == 0x1f07003f) {
+                secondary_matches++;
+                if ((state & 0xffffff7f) == 0x1f07003f) {
+                    matches++;
+                    if (!i)
+                        firstmatch = 1;
+                }
+            }
+            if (state == 0x003f0700 || state == 0xff3f0700)
+                marker_pos = i;
+            if (state == 0xff3f0701 && i - marker_pos == 80)
+                matches++;
+        }
     }
 
     if (matches && p->buf_size / matches < 1024 * 1024) {
-        if (matches > 4 ||
+        if (matches > 4 || firstmatch ||
             (secondary_matches >= 10 &&
              p->buf_size / secondary_matches < 24000))
             // not max to avoid dv in mov to match

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/dvenc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/dvenc.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/dxa.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/dxa.c Changed

@@ -169,7 +169,10 @@
     }
     avio_seek(s->pb, c->vidpos, SEEK_SET);
     while(!url_feof(s->pb) && c->frames){
-        avio_read(s->pb, buf, 4);
+        if ((ret = avio_read(s->pb, buf, 4)) != 4) {
+            av_log(s, AV_LOG_ERROR, "failed reading chunk type\n");
+            return ret < 0 ? ret : AVERROR_INVALIDDATA;
+        }
         switch(AV_RL32(buf)){
         case MKTAG('N', 'U', 'L', 'L'):
             if(av_new_packet(pkt, 4 + pal_size) < 0)
@@ -187,7 +190,10 @@
             avio_read(s->pb, pal + 4, 768);
             break;
         case MKTAG('F', 'R', 'A', 'M'):
-            avio_read(s->pb, buf + 4, DXA_EXTRA_SIZE - 4);
+            if ((ret = avio_read(s->pb, buf + 4, DXA_EXTRA_SIZE - 4)) != DXA_EXTRA_SIZE - 4) {
+                av_log(s, AV_LOG_ERROR, "failed reading dxa_extra\n");
+                return ret < 0 ? ret : AVERROR_INVALIDDATA;
+            }
             size = AV_RB32(buf + 5);
             if(size > 0xFFFFFF){
                 av_log(s, AV_LOG_ERROR, "Frame size is too big: %d\n", size);

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/electronicarts.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/electronicarts.c Changed

@@ -351,16 +351,21 @@
     int i;
 
     for (i = 0; i < 5 && (!ea->audio_codec || !ea->video_codec); i++) {
-        unsigned int startpos = avio_tell(pb);
+        uint64_t startpos     = avio_tell(pb);
         int err               = 0;
 
         blockid = avio_rl32(pb);
         size    = avio_rl32(pb);
         if (i == 0)
-            ea->big_endian = size > 0x000FFFFF;
+            ea->big_endian = size > av_bswap32(size);
         if (ea->big_endian)
             size = av_bswap32(size);
 
+        if (size < 8) {
+            av_log(s, AV_LOG_ERROR, "chunk size too small\n");
+            return AVERROR_INVALIDDATA;
+        }
+
         switch (blockid) {
         case ISNh_TAG:
             if (avio_rl32(pb) != EACS_TAG) {
@@ -435,6 +440,8 @@
 
 static int ea_probe(AVProbeData *p)
 {
+    unsigned big_endian, size;
+
     switch (AV_RL32(&p->buf[0])) {
     case ISNh_TAG:
     case SCHl_TAG:
@@ -449,7 +456,11 @@
     default:
         return 0;
     }
-    if (AV_RL32(&p->buf[4]) > 0xfffff && AV_RB32(&p->buf[4]) > 0xfffff)
+    size = AV_RL32(&p->buf[4]);
+    big_endian = size > 0x000FFFFF;
+    if (big_endian)
+        size = av_bswap32(size);
+    if (size > 0xfffff || size < 8)
         return 0;
 
     return AVPROBE_SCORE_MAX;

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/ffmdec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/ffmdec.c Changed

@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <stdint.h>
+
 #include "libavutil/intreadwrite.h"
 #include "libavutil/intfloat.h"
 #include "avformat.h"
@@ -278,9 +280,8 @@
             codec->flags2 = avio_rb32(pb);
             codec->debug = avio_rb32(pb);
             if (codec->flags & CODEC_FLAG_GLOBAL_HEADER) {
-                if (ff_alloc_extradata(codec, avio_rb32(pb)))
+                if (ff_get_extradata(codec, pb, avio_rb32(pb)) < 0)
                     return AVERROR(ENOMEM);
-                avio_read(pb, codec->extradata, codec->extradata_size);
             }
             avio_seek(pb, next, SEEK_SET);
             id = avio_rb32(pb);
@@ -466,9 +467,8 @@
             goto fail;
         }
         if (codec->flags & CODEC_FLAG_GLOBAL_HEADER) {
-            if (ff_alloc_extradata(codec, avio_rb32(pb)))
+            if (ff_get_extradata(codec, pb, avio_rb32(pb)) < 0)
                 return AVERROR(ENOMEM);
-            avio_read(pb, codec->extradata, codec->extradata_size);
         }
     }

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/file.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/file.c Changed

@@ -54,7 +54,7 @@
 } FileContext;
 
 static const AVOption file_options[] = {
-    { "truncate", "Truncate existing files on write", offsetof(FileContext, trunc), AV_OPT_TYPE_INT, { .i64 = 1 }, 0, 1, AV_OPT_FLAG_ENCODING_PARAM },
+    { "truncate", "truncate existing files on write", offsetof(FileContext, trunc), AV_OPT_TYPE_INT, { .i64 = 1 }, 0, 1, AV_OPT_FLAG_ENCODING_PARAM },
     { "blocksize", "set I/O operation maximum block size", offsetof(FileContext, blocksize), AV_OPT_TYPE_INT, { .i64 = INT_MAX }, 1, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM },
     { NULL }
 };
@@ -104,25 +104,30 @@
 
 static int file_check(URLContext *h, int mask)
 {
-#if HAVE_ACCESS && defined(R_OK)
     int ret = 0;
-    if (access(h->filename, F_OK) < 0)
+    const char *filename = h->filename;
+    av_strstart(filename, "file:", &filename);
+
+    {
+#if HAVE_ACCESS && defined(R_OK)
+    if (access(filename, F_OK) < 0)
         return AVERROR(errno);
     if (mask&AVIO_FLAG_READ)
-        if (access(h->filename, R_OK) >= 0)
+        if (access(filename, R_OK) >= 0)
             ret |= AVIO_FLAG_READ;
     if (mask&AVIO_FLAG_WRITE)
-        if (access(h->filename, W_OK) >= 0)
+        if (access(filename, W_OK) >= 0)
             ret |= AVIO_FLAG_WRITE;
 #else
     struct stat st;
-    int ret = stat(h->filename, &st);
+    ret = stat(filename, &st);
     if (ret < 0)
         return AVERROR(errno);
 
     ret |= st.st_mode&S_IRUSR ? mask&AVIO_FLAG_READ  : 0;
     ret |= st.st_mode&S_IWUSR ? mask&AVIO_FLAG_WRITE : 0;
 #endif
+    }
     return ret;
 }

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/flac_picture.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/flac_picture.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/flacenc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/flacenc.c Changed

@@ -19,6 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/opt.h"
 #include "libavcodec/flac.h"
 #include "avformat.h"
 #include "avio_internal.h"
@@ -27,6 +28,11 @@
 #include "libavcodec/bytestream.h"
 
 
+typedef struct FlacMuxerContext {
+    const AVClass *class;
+    int write_header;
+} FlacMuxerContext;
+
 static int flac_write_block_padding(AVIOContext *pb, unsigned int n_padding_bytes,
                                     int last_block)
 {
@@ -65,7 +71,12 @@
 static int flac_write_header(struct AVFormatContext *s)
 {
     int ret;
+    int padding = s->metadata_header_padding;
     AVCodecContext *codec = s->streams[0]->codec;
+    FlacMuxerContext *c   = s->priv_data;
+
+    if (!c->write_header)
+        return 0;
 
     if (s->nb_streams > 1) {
         av_log(s, AV_LOG_ERROR, "only one stream is supported\n");
@@ -76,11 +87,17 @@
         return AVERROR(EINVAL);
     }
 
+    if (padding < 0)
+        padding = 8192;
+    /* The FLAC specification states that 24 bits are used to represent the
+     * size of a metadata block so we must clip this value to 2^24-1. */
+    padding = av_clip_c(padding, 0, 16777215);
+
     ret = ff_flac_write_header(s->pb, codec, 0);
     if (ret)
         return ret;
 
-    ret = flac_write_block_comment(s->pb, &s->metadata, 0,
+    ret = flac_write_block_comment(s->pb, &s->metadata, !padding,
                                    codec->flags & CODEC_FLAG_BITEXACT);
     if (ret)
         return ret;
@@ -88,8 +105,9 @@
     /* The command line flac encoder defaults to placing a seekpoint
      * every 10s.  So one might add padding to allow that later
      * but there seems to be no simple way to get the duration here.
-     * So let's try the flac default of 8192 bytes */
-    flac_write_block_padding(s->pb, 8192, 1);
+     * So just add the amount requested by the user. */
+    if (padding)
+        flac_write_block_padding(s->pb, padding, 1);
 
     return ret;
 }
@@ -100,6 +118,10 @@
     uint8_t *streaminfo;
     enum FLACExtradataFormat format;
     int64_t file_size;
+    FlacMuxerContext *c = s->priv_data;
+
+    if (!c->write_header)
+        return 0;
 
     if (!avpriv_flac_is_extradata_valid(s->streams[0]->codec, &format, &streaminfo))
         return -1;
@@ -123,9 +145,22 @@
     return 0;
 }
 
+static const AVOption flacenc_options[] = {
+    { "write_header", "Write the file header", offsetof(FlacMuxerContext, write_header), AV_OPT_TYPE_INT, {.i64 = 1}, 0, 1, AV_OPT_FLAG_ENCODING_PARAM },
+    { NULL },
+};
+
+static const AVClass flac_muxer_class = {
+    .class_name = "flac muxer",
+    .item_name  = av_default_item_name,
+    .option     = flacenc_options,
+    .version    = LIBAVUTIL_VERSION_INT,
+};
+
 AVOutputFormat ff_flac_muxer = {
     .name              = "flac",
     .long_name         = NULL_IF_CONFIG_SMALL("raw FLAC"),
+    .priv_data_size    = sizeof(FlacMuxerContext),
     .mime_type         = "audio/x-flac",
     .extensions        = "flac",
     .audio_codec       = AV_CODEC_ID_FLAC,
@@ -134,4 +169,5 @@
     .write_packet      = flac_write_packet,
     .write_trailer     = flac_write_trailer,
     .flags             = AVFMT_NOTIMESTAMPS,
+    .priv_class        = &flac_muxer_class,
 };

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/flvdec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/flvdec.c Changed

@@ -256,6 +256,7 @@
         return 1;     // 1 byte body size adjustment for flv_read_packet()
     case FLV_CODECID_H264:
         vcodec->codec_id = AV_CODEC_ID_H264;
+        vstream->need_parsing = AVSTREAM_PARSE_HEADERS;
         return 3;     // not 4, reading packet type will consume one byte
     case FLV_CODECID_MPEG4:
         vcodec->codec_id = AV_CODEC_ID_MPEG4;
@@ -614,9 +615,8 @@
 static int flv_get_extradata(AVFormatContext *s, AVStream *st, int size)
 {
     av_free(st->codec->extradata);
-    if (ff_alloc_extradata(st->codec, size))
+    if (ff_get_extradata(st->codec, s->pb, size) < 0)
         return AVERROR(ENOMEM);
-    avio_read(s->pb, st->codec->extradata, st->codec->extradata_size);
     return 0;
 }
 
@@ -916,7 +916,7 @@
             flv->last_channels    =
             channels              = st->codec->channels;
         } else {
-            AVCodecContext ctx;
+            AVCodecContext ctx = {0};
             ctx.sample_rate = sample_rate;
             flv_set_audio_codec(s, st, &ctx, flags & FLV_AUDIO_CODECID_MASK);
             sample_rate = ctx.sample_rate;
@@ -943,6 +943,8 @@
                 dts = AV_NOPTS_VALUE;
         }
         if (type == 0 && (!st->codec->extradata || st->codec->codec_id == AV_CODEC_ID_AAC)) {
+            AVDictionaryEntry *t;
+
             if (st->codec->extradata) {
                 if ((ret = flv_queue_extradata(flv, s->pb, stream_type, size)) < 0)
                     return ret;
@@ -951,8 +953,15 @@
             }
             if ((ret = flv_get_extradata(s, st, size)) < 0)
                 return ret;
+
+            /* Workaround for buggy Omnia A/XE encoder */
+            t = av_dict_get(s->metadata, "Encoder", NULL, 0);
+            if (st->codec->codec_id == AV_CODEC_ID_AAC && t && !strcmp(t->value, "Omnia A/XE"))
+                st->codec->extradata_size = 2;
+
             if (st->codec->codec_id == AV_CODEC_ID_AAC && 0) {
                 MPEG4AudioConfig cfg;
+
                 if (avpriv_mpeg4audio_get_config(&cfg, st->codec->extradata,
                                              st->codec->extradata_size * 8, 1) >= 0) {
                 st->codec->channels       = cfg.channels;

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/flvenc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/flvenc.c Changed

@@ -37,6 +37,7 @@
     { AV_CODEC_ID_FLASHSV,  FLV_CODECID_SCREEN },
     { AV_CODEC_ID_FLASHSV2, FLV_CODECID_SCREEN2 },
     { AV_CODEC_ID_VP6F,     FLV_CODECID_VP6 },
+    { AV_CODEC_ID_VP6,      FLV_CODECID_VP6 },
     { AV_CODEC_ID_VP6A,     FLV_CODECID_VP6A },
     { AV_CODEC_ID_H264,     FLV_CODECID_H264 },
     { AV_CODEC_ID_NONE,     0 }
@@ -232,6 +233,9 @@
             audio_enc = enc;
             if (get_audio_flags(s, enc) < 0)
                 return AVERROR_INVALIDDATA;
+            if (enc->codec_id == AV_CODEC_ID_PCM_S16BE)
+                av_log(s, AV_LOG_WARNING,
+                       "16-bit big-endian audio in flv is valid but most likely unplayable (hardware dependent); use s16le\n");
             break;
         case AVMEDIA_TYPE_DATA:
             if (enc->codec_id != AV_CODEC_ID_TEXT) {
@@ -460,7 +464,7 @@
     int flags = -1, flags_size, ret;
 
     if (enc->codec_id == AV_CODEC_ID_VP6F || enc->codec_id == AV_CODEC_ID_VP6A ||
-        enc->codec_id == AV_CODEC_ID_AAC)
+        enc->codec_id == AV_CODEC_ID_VP6  || enc->codec_id == AV_CODEC_ID_AAC)
         flags_size = 2;
     else if (enc->codec_id == AV_CODEC_ID_H264 || enc->codec_id == AV_CODEC_ID_MPEG4)
         flags_size = 5;
@@ -538,7 +542,7 @@
 
     if (enc->codec_type == AVMEDIA_TYPE_DATA) {
         int data_size;
-        int metadata_size_pos = avio_tell(pb);
+        int64_t metadata_size_pos = avio_tell(pb);
         avio_w8(pb, AMF_DATA_TYPE_STRING);
         put_amf_string(pb, "onTextData");
         avio_w8(pb, AMF_DATA_TYPE_MIXEDARRAY);
@@ -560,6 +564,8 @@
     } else {
         av_assert1(flags>=0);
         avio_w8(pb,flags);
+        if (enc->codec_id == AV_CODEC_ID_VP6)
+            avio_w8(pb,0);
         if (enc->codec_id == AV_CODEC_ID_VP6F || enc->codec_id == AV_CODEC_ID_VP6A) {
             if (enc->extradata_size)
                 avio_w8(pb, enc->extradata[0]);

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/format.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/format.c Changed

@@ -33,6 +33,9 @@
 /** head of registered output format linked list */
 static AVOutputFormat *first_oformat = NULL;
 
+static AVInputFormat **last_iformat = &first_iformat;
+static AVOutputFormat **last_oformat = &first_oformat;
+
 AVInputFormat *av_iformat_next(AVInputFormat *f)
 {
     if (f)
@@ -51,20 +54,22 @@
 
 void av_register_input_format(AVInputFormat *format)
 {
-    AVInputFormat **p = &first_iformat;
+    AVInputFormat **p = last_iformat;
 
     format->next = NULL;
-    while(avpriv_atomic_ptr_cas((void * volatile *)p, NULL, format))
+    while(*p || avpriv_atomic_ptr_cas((void * volatile *)p, NULL, format))
         p = &(*p)->next;
+    last_iformat = &format->next;
 }
 
 void av_register_output_format(AVOutputFormat *format)
 {
-    AVOutputFormat **p = &first_oformat;
+    AVOutputFormat **p = last_oformat;
 
     format->next = NULL;
-    while(avpriv_atomic_ptr_cas((void * volatile *)p, NULL, format))
+    while(*p || avpriv_atomic_ptr_cas((void * volatile *)p, NULL, format))
         p = &(*p)->next;
+    last_oformat = &format->next;
 }
 
 int av_match_ext(const char *filename, const char *extensions)

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/ftp.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/ftp.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/gif.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/gif.c Changed

omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/golomb_tab.c Added

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/gxf.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/gxf.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/gxfenc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/gxfenc.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/h261dec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/h261dec.c Changed

@@ -25,33 +25,30 @@
 
 static int h261_probe(AVProbeData *p)
 {
-    uint32_t code= -1;
     int i;
     int valid_psc=0;
     int invalid_psc=0;
     int next_gn=0;
     int src_fmt=0;
-    GetBitContext gb;
 
-    init_get_bits8(&gb, p->buf, p->buf_size);
+    for(i=0; i<p->buf_size; i++){
+        if ((AV_RB16(&p->buf[i]) - 1) < 0xFFU) {
+            int shift = av_log2_16bit(p->buf[i+1]);
+            uint32_t code = AV_RB64(&p->buf[FFMAX(i-1, 0)]) >> (24+shift);
+            if ((code & 0xffff0000) == 0x10000) {
+                int gn= (code>>12)&0xf;
+                if(!gn)
+                    src_fmt= code&8;
+                if(gn != next_gn) invalid_psc++;
+                else              valid_psc++;
 
-    for(i=0; i<p->buf_size*8; i++){
-        if ((code & 0x01ff0000) || !(code & 0xff00)) {
-            code = (code<<8) + get_bits(&gb, 8);
-            i += 7;
-        } else
-            code = (code<<1) + get_bits1(&gb);
-        if ((code & 0xffff0000) == 0x10000) {
-            int gn= (code>>12)&0xf;
-            if(!gn)
-                src_fmt= code&8;
-            if(gn != next_gn) invalid_psc++;
-            else              valid_psc++;
-
-            if(src_fmt){ // CIF
-                next_gn= (gn+1     )%13;
-            }else{       //QCIF
-                next_gn= (gn+1+!!gn)% 7;
+                if(src_fmt){ // CIF
+                    static const int lut[16]={1,2,3,4,5,6,7,8,9,10,11,12,0,16,16,16};
+                    next_gn = lut[gn];
+                }else{       //QCIF
+                    static const int lut[16]={1,3,16,5,16,0,16,16,16,16,16,16,16,16,16,16};
+                    next_gn = lut[gn];
+                }
             }
         }
     }

omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/hdsenc.c Added

@@ -0,0 +1,607 @@
+/*
+ * Live HDS fragmenter
+ * Copyright (c) 2013 Martin Storsjo
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "config.h"
+#include <float.h>
+#if HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#include "avformat.h"
+#include "internal.h"
+#include "os_support.h"
+
+#include "libavutil/avstring.h"
+#include "libavutil/base64.h"
+#include "libavutil/intreadwrite.h"
+#include "libavutil/mathematics.h"
+#include "libavutil/opt.h"
+
+typedef struct Fragment {
+    char file[1024];
+    int64_t start_time, duration;
+    int n;
+} Fragment;
+
+typedef struct OutputStream {
+    int bitrate;
+    int first_stream;
+    AVFormatContext *ctx;
+    int ctx_inited;
+    uint8_t iobuf[32768];
+    char temp_filename[1024];
+    int64_t frag_start_ts, last_ts;
+    AVIOContext *out;
+    int packets_written;
+    int nb_fragments, fragments_size, fragment_index;
+    Fragment **fragments;
+
+    int has_audio, has_video;
+
+    uint8_t *metadata;
+    int metadata_size;
+
+    uint8_t *extra_packets[2];
+    int extra_packet_sizes[2];
+    int nb_extra_packets;
+} OutputStream;
+
+typedef struct HDSContext {
+    const AVClass *class;  /* Class for private options. */
+    int window_size;
+    int extra_window_size;
+    int min_frag_duration;
+    int remove_at_exit;
+
+    OutputStream *streams;
+    int nb_streams;
+} HDSContext;
+
+static int parse_header(OutputStream *os, const uint8_t *buf, int buf_size)
+{
+    if (buf_size < 13)
+        return AVERROR_INVALIDDATA;
+    if (memcmp(buf, "FLV", 3))
+        return AVERROR_INVALIDDATA;
+    buf      += 13;
+    buf_size -= 13;
+    while (buf_size >= 11 + 4) {
+        int type = buf[0];
+        int size = AV_RB24(&buf[1]) + 11 + 4;
+        if (size > buf_size)
+            return AVERROR_INVALIDDATA;
+        if (type == 8 || type == 9) {
+            if (os->nb_extra_packets >= FF_ARRAY_ELEMS(os->extra_packets))
+                return AVERROR_INVALIDDATA;
+            os->extra_packet_sizes[os->nb_extra_packets] = size;
+            os->extra_packets[os->nb_extra_packets] = av_malloc(size);
+            if (!os->extra_packets[os->nb_extra_packets])
+                return AVERROR(ENOMEM);
+            memcpy(os->extra_packets[os->nb_extra_packets], buf, size);
+            os->nb_extra_packets++;
+        } else if (type == 0x12) {
+            if (os->metadata)
+                return AVERROR_INVALIDDATA;
+            os->metadata_size = size - 11 - 4;
+            os->metadata      = av_malloc(os->metadata_size);
+            if (!os->metadata)
+                return AVERROR(ENOMEM);
+            memcpy(os->metadata, buf + 11, os->metadata_size);
+        }
+        buf      += size;
+        buf_size -= size;
+    }
+    if (!os->metadata)
+        return AVERROR_INVALIDDATA;
+    return 0;
+}
+
+static int hds_write(void *opaque, uint8_t *buf, int buf_size)
+{
+    OutputStream *os = opaque;
+    if (os->out) {
+        avio_write(os->out, buf, buf_size);
+    } else {
+        if (!os->metadata_size) {
+            int ret;
+            // Assuming the IO buffer is large enough to fit the
+            // FLV header and all metadata and extradata packets
+            if ((ret = parse_header(os, buf, buf_size)) < 0)
+                return ret;
+        }
+    }
+    return buf_size;
+}
+
+static void hds_free(AVFormatContext *s)
+{
+    HDSContext *c = s->priv_data;
+    int i, j;
+    if (!c->streams)
+        return;
+    for (i = 0; i < s->nb_streams; i++) {
+        OutputStream *os = &c->streams[i];
+        if (os->out)
+            avio_close(os->out);
+        os->out = NULL;
+        if (os->ctx && os->ctx_inited)
+            av_write_trailer(os->ctx);
+        if (os->ctx && os->ctx->pb)
+            av_free(os->ctx->pb);
+        if (os->ctx)
+            avformat_free_context(os->ctx);
+        av_free(os->metadata);
+        for (j = 0; j < os->nb_extra_packets; j++)
+            av_free(os->extra_packets[j]);
+        for (j = 0; j < os->nb_fragments; j++)
+            av_free(os->fragments[j]);
+        av_free(os->fragments);
+    }
+    av_freep(&c->streams);
+}
+
+static int write_manifest(AVFormatContext *s, int final)
+{
+    HDSContext *c = s->priv_data;
+    AVIOContext *out;
+    char filename[1024], temp_filename[1024];
+    int ret, i;
+    float duration = 0;
+
+    if (c->nb_streams > 0)
+        duration = c->streams[0].last_ts * av_q2d(s->streams[0]->time_base);
+
+    snprintf(filename, sizeof(filename), "%s/index.f4m", s->filename);
+    snprintf(temp_filename, sizeof(temp_filename), "%s/index.f4m.tmp", s->filename);
+    ret = avio_open2(&out, temp_filename, AVIO_FLAG_WRITE,
+                     &s->interrupt_callback, NULL);
+    if (ret < 0) {
+        av_log(s, AV_LOG_ERROR, "Unable to open %s for writing\n", filename);
+        return ret;
+    }
+    avio_printf(out, "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n");
+    avio_printf(out, "<manifest xmlns=\"http://ns.adobe.com/f4m/1.0\">\n");
+    avio_printf(out, "\t<id>%s</id>\n", av_basename(s->filename));
+    avio_printf(out, "\t<streamType>%s</streamType>\n",
+                     final ? "recorded" : "live");
+    avio_printf(out, "\t<deliveryType>streaming</deliveryType>\n");
+    if (final)
+        avio_printf(out, "\t<duration>%f</duration>\n", duration);
+    for (i = 0; i < c->nb_streams; i++) {
+        OutputStream *os = &c->streams[i];
+        int b64_size = AV_BASE64_SIZE(os->metadata_size);
+        char *base64 = av_malloc(b64_size);
+        if (!base64) {
+            avio_close(out);
+            return AVERROR(ENOMEM);
+        }
+        av_base64_encode(base64, b64_size, os->metadata, os->metadata_size);
+
+        avio_printf(out, "\t<bootstrapInfo profile=\"named\" url=\"stream%d.abst\" id=\"bootstrap%d\" />\n", i, i);
+        avio_printf(out, "\t<media bitrate=\"%d\" url=\"stream%d\" bootstrapInfoId=\"bootstrap%d\">\n", os->bitrate/1000, i, i);
+        avio_printf(out, "\t\t<metadata>%s</metadata>\n", base64);
+        avio_printf(out, "\t</media>\n");
+        av_free(base64);
+    }
+    avio_printf(out, "</manifest>\n");
+    avio_flush(out);
+    avio_close(out);
+    if (rename(temp_filename, filename) == -1) {
+        av_log(s, AV_LOG_ERROR, "failed to rename file %s to %s\n", temp_filename, filename);
+        return AVERROR(errno);
+    }
+    return 0;
+}
+
+static void update_size(AVIOContext *out, int64_t pos)
+{
+    int64_t end = avio_tell(out);
+    avio_seek(out, pos, SEEK_SET);
+    avio_wb32(out, end - pos);
+    avio_seek(out, end, SEEK_SET);
+}
+
+/* Note, the .abst files need to be served with the "binary/octet"
+ * mime type, otherwise at least the OSMF player can easily fail
+ * with "stream not found" when polling for the next fragment. */
+static int write_abst(AVFormatContext *s, OutputStream *os, int final)
+{
+    HDSContext *c = s->priv_data;
+    AVIOContext *out;
+    char filename[1024], temp_filename[1024];
+    int i, ret;
+    int64_t asrt_pos, afrt_pos;
+    int start = 0, fragments;
+    int index = s->streams[os->first_stream]->id;
+    int64_t cur_media_time = 0;
+    if (c->window_size)
+        start = FFMAX(os->nb_fragments - c->window_size, 0);
+    fragments = os->nb_fragments - start;
+    if (final)
+        cur_media_time = os->last_ts;
+    else if (os->nb_fragments)
+        cur_media_time = os->fragments[os->nb_fragments - 1]->start_time;
+
+    snprintf(filename, sizeof(filename),
+             "%s/stream%d.abst", s->filename, index);
+    snprintf(temp_filename, sizeof(temp_filename),
+             "%s/stream%d.abst.tmp", s->filename, index);
+    ret = avio_open2(&out, temp_filename, AVIO_FLAG_WRITE,
+                     &s->interrupt_callback, NULL);
+    if (ret < 0) {
+        av_log(s, AV_LOG_ERROR, "Unable to open %s for writing\n", temp_filename);
+        return ret;
+    }
+    avio_wb32(out, 0); // abst size
+    avio_wl32(out, MKTAG('a','b','s','t'));
+    avio_wb32(out, 0); // version + flags
+    avio_wb32(out, os->fragment_index - 1); // BootstrapinfoVersion
+    avio_w8(out, final ? 0 : 0x20); // profile, live, update
+    avio_wb32(out, 1000); // timescale
+    avio_wb64(out, cur_media_time);
+    avio_wb64(out, 0); // SmpteTimeCodeOffset
+    avio_w8(out, 0); // MovieIdentifer (null string)
+    avio_w8(out, 0); // ServerEntryCount
+    avio_w8(out, 0); // QualityEntryCount
+    avio_w8(out, 0); // DrmData (null string)
+    avio_w8(out, 0); // MetaData (null string)
+    avio_w8(out, 1); // SegmentRunTableCount
+    asrt_pos = avio_tell(out);
+    avio_wb32(out, 0); // asrt size
+    avio_wl32(out, MKTAG('a','s','r','t'));
+    avio_wb32(out, 0); // version + flags
+    avio_w8(out, 0); // QualityEntryCount
+    avio_wb32(out, 1); // SegmentRunEntryCount
+    avio_wb32(out, 1); // FirstSegment
+    avio_wb32(out, final ? (os->fragment_index - 1) : 0xffffffff); // FragmentsPerSegment
+    update_size(out, asrt_pos);
+    avio_w8(out, 1); // FragmentRunTableCount
+    afrt_pos = avio_tell(out);
+    avio_wb32(out, 0); // afrt size
+    avio_wl32(out, MKTAG('a','f','r','t'));
+    avio_wb32(out, 0); // version + flags
+    avio_wb32(out, 1000); // timescale
+    avio_w8(out, 0); // QualityEntryCount
+    avio_wb32(out, fragments); // FragmentRunEntryCount
+    for (i = start; i < os->nb_fragments; i++) {
+        avio_wb32(out, os->fragments[i]->n);
+        avio_wb64(out, os->fragments[i]->start_time);
+        avio_wb32(out, os->fragments[i]->duration);
+    }
+    update_size(out, afrt_pos);
+    update_size(out, 0);
+    avio_close(out);
+    if (rename(temp_filename, filename) == -1) {
+        av_log(s, AV_LOG_ERROR, "failed to rename file %s to %s\n", temp_filename, filename);
+        return AVERROR(errno);
+    }
+    return 0;
+}
+
+static int init_file(AVFormatContext *s, OutputStream *os, int64_t start_ts)
+{
+    int ret, i;
+    ret = avio_open2(&os->out, os->temp_filename, AVIO_FLAG_WRITE,
+                     &s->interrupt_callback, NULL);
+    if (ret < 0)
+        return ret;
+    avio_wb32(os->out, 0);
+    avio_wl32(os->out, MKTAG('m','d','a','t'));
+    for (i = 0; i < os->nb_extra_packets; i++) {
+        AV_WB24(os->extra_packets[i] + 4, start_ts);
+        os->extra_packets[i][7] = (start_ts >> 24) & 0x7f;
+        avio_write(os->out, os->extra_packets[i], os->extra_packet_sizes[i]);
+    }
+    return 0;
+}
+
+static void close_file(OutputStream *os)
+{
+    int64_t pos = avio_tell(os->out);
+    avio_seek(os->out, 0, SEEK_SET);
+    avio_wb32(os->out, pos);
+    avio_flush(os->out);
+    avio_close(os->out);
+    os->out = NULL;
+}
+
+static int hds_write_header(AVFormatContext *s)
+{
+    HDSContext *c = s->priv_data;
+    int ret = 0, i;
+    AVOutputFormat *oformat;
+
+    if (mkdir(s->filename, 0777)) {
+        int is_error = errno != EEXIST;
+        av_log(s, is_error ? AV_LOG_ERROR : AV_LOG_VERBOSE, "Failed to create directory %s\n", s->filename);
+        if (is_error) {
+            ret = AVERROR(errno);
+            goto fail;
+        }
+    }
+
+    oformat = av_guess_format("flv", NULL, NULL);
+    if (!oformat) {
+        ret = AVERROR_MUXER_NOT_FOUND;
+        goto fail;
+    }
+
+    c->streams = av_mallocz(sizeof(*c->streams) * s->nb_streams);
+    if (!c->streams) {
+        ret = AVERROR(ENOMEM);
+        goto fail;
+    }
+
+    for (i = 0; i < s->nb_streams; i++) {
+        OutputStream *os = &c->streams[c->nb_streams];
+        AVFormatContext *ctx;
+        AVStream *st = s->streams[i];
+
+        if (!st->codec->bit_rate) {
+            av_log(s, AV_LOG_ERROR, "No bit rate set for stream %d\n", i);
+            ret = AVERROR(EINVAL);
+            goto fail;
+        }
+        if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO) {
+            if (os->has_video) {
+                c->nb_streams++;
+                os++;
+            }
+            os->has_video = 1;
+        } else if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO) {
+            if (os->has_audio) {
+                c->nb_streams++;
+                os++;
+            }
+            os->has_audio = 1;
+        } else {
+            av_log(s, AV_LOG_ERROR, "Unsupported stream type in stream %d\n", i);
+            ret = AVERROR(EINVAL);
+            goto fail;
+        }
+        os->bitrate += s->streams[i]->codec->bit_rate;
+
+        if (!os->ctx) {
+            os->first_stream = i;
+            ctx = avformat_alloc_context();
+            if (!ctx) {
+                ret = AVERROR(ENOMEM);
+                goto fail;
+            }
+            os->ctx = ctx;
+            ctx->oformat = oformat;
+            ctx->interrupt_callback = s->interrupt_callback;
+
+            ctx->pb = avio_alloc_context(os->iobuf, sizeof(os->iobuf),
+                                         AVIO_FLAG_WRITE, os,
+                                         NULL, hds_write, NULL);
+            if (!ctx->pb) {
+                ret = AVERROR(ENOMEM);
+                goto fail;
+            }
+        } else {
+            ctx = os->ctx;
+        }
+        s->streams[i]->id = c->nb_streams;
+
+        if (!(st = avformat_new_stream(ctx, NULL))) {
+            ret = AVERROR(ENOMEM);
+            goto fail;
+        }
+        avcodec_copy_context(st->codec, s->streams[i]->codec);
+        st->sample_aspect_ratio = s->streams[i]->sample_aspect_ratio;
+    }
+    if (c->streams[c->nb_streams].ctx)
+        c->nb_streams++;
+
+    for (i = 0; i < c->nb_streams; i++) {
+        OutputStream *os = &c->streams[i];
+        int j;
+        if ((ret = avformat_write_header(os->ctx, NULL)) < 0) {
+             goto fail;
+        }
+        os->ctx_inited = 1;
+        avio_flush(os->ctx->pb);
+        for (j = 0; j < os->ctx->nb_streams; j++)
+            s->streams[os->first_stream + j]->time_base = os->ctx->streams[j]->time_base;
+
+        snprintf(os->temp_filename, sizeof(os->temp_filename),
+                 "%s/stream%d_temp", s->filename, i);
+        ret = init_file(s, os, 0);
+        if (ret < 0)
+            goto fail;
+
+        if (!os->has_video && c->min_frag_duration <= 0) {
+            av_log(s, AV_LOG_WARNING,
+                   "No video stream in output stream %d and no min frag duration set\n", i);
+            ret = AVERROR(EINVAL);
+        }
+        os->fragment_index = 1;
+        write_abst(s, os, 0);
+    }
+    ret = write_manifest(s, 0);
+
+fail:
+    if (ret)
+        hds_free(s);
+    return ret;
+}
+
+static int add_fragment(OutputStream *os, const char *file,
+                        int64_t start_time, int64_t duration)
+{
+    Fragment *frag;
+    if (duration == 0)
+        duration = 1;
+    if (os->nb_fragments >= os->fragments_size) {
+        int ret;
+        os->fragments_size = (os->fragments_size + 1) * 2;
+        if ((ret = av_reallocp_array(&os->fragments, os->fragments_size,
+                                     sizeof(*os->fragments))) < 0) {
+            os->fragments_size = 0;
+            os->nb_fragments   = 0;
+            return ret;
+        }
+    }
+    frag = av_mallocz(sizeof(*frag));
+    if (!frag)
+        return AVERROR(ENOMEM);
+    av_strlcpy(frag->file, file, sizeof(frag->file));
+    frag->start_time = start_time;
+    frag->duration   = duration;
+    frag->n          = os->fragment_index;
+    os->fragments[os->nb_fragments++] = frag;
+    os->fragment_index++;
+    return 0;
+}
+
+static int hds_flush(AVFormatContext *s, OutputStream *os, int final,
+                     int64_t end_ts)
+{
+    HDSContext *c = s->priv_data;
+    int i, ret = 0;
+    char target_filename[1024];
+    int index = s->streams[os->first_stream]->id;
+
+    if (!os->packets_written)
+        return 0;
+
+    avio_flush(os->ctx->pb);
+    os->packets_written = 0;
+    close_file(os);
+
+    snprintf(target_filename, sizeof(target_filename),
+             "%s/stream%dSeg1-Frag%d", s->filename, index, os->fragment_index);
+    if (rename(os->temp_filename, target_filename) == -1) {
+        av_log(s, AV_LOG_ERROR, "failed to rename file %s to %s\n", os->temp_filename, target_filename);
+        return AVERROR(errno);
+    }
+    add_fragment(os, target_filename, os->frag_start_ts, end_ts - os->frag_start_ts);
+
+    if (!final) {
+        ret = init_file(s, os, end_ts);
+        if (ret < 0)
+            return ret;
+    }
+
+    if (c->window_size || (final && c->remove_at_exit)) {
+        int remove = os->nb_fragments - c->window_size - c->extra_window_size;
+        if (final && c->remove_at_exit)
+            remove = os->nb_fragments;
+        if (remove > 0) {
+            for (i = 0; i < remove; i++) {
+                unlink(os->fragments[i]->file);
+                av_free(os->fragments[i]);
+            }
+            os->nb_fragments -= remove;
+            memmove(os->fragments, os->fragments + remove,
+                    os->nb_fragments * sizeof(*os->fragments));
+        }
+    }
+
+    if (ret >= 0)
+        ret = write_abst(s, os, final);
+    return ret;
+}
+
+static int hds_write_packet(AVFormatContext *s, AVPacket *pkt)
+{
+    HDSContext *c = s->priv_data;
+    AVStream *st = s->streams[pkt->stream_index];
+    OutputStream *os = &c->streams[s->streams[pkt->stream_index]->id];
+    int64_t end_dts = os->fragment_index * (int64_t)c->min_frag_duration;
+    int ret;
+
+    if (st->first_dts == AV_NOPTS_VALUE)
+        st->first_dts = pkt->dts;
+
+    if ((!os->has_video || st->codec->codec_type == AVMEDIA_TYPE_VIDEO) &&
+        av_compare_ts(pkt->dts - st->first_dts, st->time_base,
+                      end_dts, AV_TIME_BASE_Q) >= 0 &&
+        pkt->flags & AV_PKT_FLAG_KEY && os->packets_written) {
+
+        if ((ret = hds_flush(s, os, 0, pkt->dts)) < 0)
+            return ret;
+    }
+
+    // Note, these fragment start timestamps, that represent a whole
+    // OutputStream, assume all streams in it have the same time base.
+    if (!os->packets_written)
+        os->frag_start_ts = pkt->dts;
+    os->last_ts = pkt->dts;
+
+    os->packets_written++;
+    return ff_write_chained(os->ctx, pkt->stream_index - os->first_stream, pkt, s);
+}
+
+static int hds_write_trailer(AVFormatContext *s)
+{
+    HDSContext *c = s->priv_data;
+    int i;
+
+    for (i = 0; i < c->nb_streams; i++)
+        hds_flush(s, &c->streams[i], 1, c->streams[i].last_ts);
+    write_manifest(s, 1);
+
+    if (c->remove_at_exit) {
+        char filename[1024];
+        snprintf(filename, sizeof(filename), "%s/index.f4m", s->filename);
+        unlink(filename);
+        for (i = 0; i < c->nb_streams; i++) {
+            snprintf(filename, sizeof(filename), "%s/stream%d.abst", s->filename, i);
+            unlink(filename);
+        }
+        rmdir(s->filename);
+    }
+
+    hds_free(s);
+    return 0;
+}
+
+#define OFFSET(x) offsetof(HDSContext, x)
+#define E AV_OPT_FLAG_ENCODING_PARAM
+static const AVOption options[] = {
+    { "window_size", "number of fragments kept in the manifest", OFFSET(window_size), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, E },
+    { "extra_window_size", "number of fragments kept outside of the manifest before removing from disk", OFFSET(extra_window_size), AV_OPT_TYPE_INT, { .i64 = 5 }, 0, INT_MAX, E },
+    { "min_frag_duration", "minimum fragment duration (in microseconds)", OFFSET(min_frag_duration), AV_OPT_TYPE_INT64, { .i64 = 10000000 }, 0, INT_MAX, E },
+    { "remove_at_exit", "remove all fragments when finished", OFFSET(remove_at_exit), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, E },
+    { NULL },
+};
+
+static const AVClass hds_class = {
+    .class_name = "HDS muxer",
+    .item_name  = av_default_item_name,
+    .option     = options,
+    .version    = LIBAVUTIL_VERSION_INT,
+};
+
+AVOutputFormat ff_hds_muxer = {
+    .name           = "hds",
+    .long_name      = NULL_IF_CONFIG_SMALL("HDS Muxer"),
+    .priv_data_size = sizeof(HDSContext),
+    .audio_codec    = AV_CODEC_ID_AAC,
+    .video_codec    = AV_CODEC_ID_H264,
+    .flags          = AVFMT_GLOBALHEADER | AVFMT_NOFILE,
+    .write_header   = hds_write_header,
+    .write_packet   = hds_write_packet,
+    .write_trailer  = hds_write_trailer,
+    .priv_class     = &hds_class,
+};

omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/hevc.c Added

@@ -0,0 +1,1140 @@
+/*
+ * Copyright (c) 2014 Tim Walker <tdskywalker@gmail.com>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "libavcodec/get_bits.h"
+#include "libavcodec/golomb.h"
+#include "libavcodec/hevc.h"
+#include "libavutil/intreadwrite.h"
+#include "avc.h"
+#include "avio.h"
+#include "hevc.h"
+
+#define MAX_SPATIAL_SEGMENTATION 4096 // max. value of u(12) field
+
+typedef struct HVCCNALUnitArray {
+    uint8_t  array_completeness;
+    uint8_t  NAL_unit_type;
+    uint16_t numNalus;
+    uint16_t *nalUnitLength;
+    uint8_t  **nalUnit;
+} HVCCNALUnitArray;
+
+typedef struct HEVCDecoderConfigurationRecord {
+    uint8_t  configurationVersion;
+    uint8_t  general_profile_space;
+    uint8_t  general_tier_flag;
+    uint8_t  general_profile_idc;
+    uint32_t general_profile_compatibility_flags;
+    uint64_t general_constraint_indicator_flags;
+    uint8_t  general_level_idc;
+    uint16_t min_spatial_segmentation_idc;
+    uint8_t  parallelismType;
+    uint8_t  chromaFormat;
+    uint8_t  bitDepthLumaMinus8;
+    uint8_t  bitDepthChromaMinus8;
+    uint16_t avgFrameRate;
+    uint8_t  constantFrameRate;
+    uint8_t  numTemporalLayers;
+    uint8_t  temporalIdNested;
+    uint8_t  lengthSizeMinusOne;
+    uint8_t  numOfArrays;
+    HVCCNALUnitArray *array;
+} HEVCDecoderConfigurationRecord;
+
+typedef struct HVCCProfileTierLevel {
+    uint8_t  profile_space;
+    uint8_t  tier_flag;
+    uint8_t  profile_idc;
+    uint32_t profile_compatibility_flags;
+    uint64_t constraint_indicator_flags;
+    uint8_t  level_idc;
+} HVCCProfileTierLevel;
+
+static void hvcc_update_ptl(HEVCDecoderConfigurationRecord *hvcc,
+                            HVCCProfileTierLevel *ptl)
+{
+    /*
+     * The value of general_profile_space in all the parameter sets must be
+     * identical.
+     */
+    hvcc->general_profile_space = ptl->profile_space;
+
+    /*
+     * The level indication general_level_idc must indicate a level of
+     * capability equal to or greater than the highest level indicated for the
+     * highest tier in all the parameter sets.
+     */
+    if (hvcc->general_tier_flag < ptl->tier_flag)
+        hvcc->general_level_idc = ptl->level_idc;
+    else
+        hvcc->general_level_idc = FFMAX(hvcc->general_level_idc, ptl->level_idc);
+
+    /*
+     * The tier indication general_tier_flag must indicate a tier equal to or
+     * greater than the highest tier indicated in all the parameter sets.
+     */
+    hvcc->general_tier_flag = FFMAX(hvcc->general_tier_flag, ptl->tier_flag);
+
+    /*
+     * The profile indication general_profile_idc must indicate a profile to
+     * which the stream associated with this configuration record conforms.
+     *
+     * If the sequence parameter sets are marked with different profiles, then
+     * the stream may need examination to determine which profile, if any, the
+     * entire stream conforms to. If the entire stream is not examined, or the
+     * examination reveals that there is no profile to which the entire stream
+     * conforms, then the entire stream must be split into two or more
+     * sub-streams with separate configuration records in which these rules can
+     * be met.
+     *
+     * Note: set the profile to the highest value for the sake of simplicity.
+     */
+    hvcc->general_profile_idc = FFMAX(hvcc->general_profile_idc, ptl->profile_idc);
+
+    /*
+     * Each bit in general_profile_compatibility_flags may only be set if all
+     * the parameter sets set that bit.
+     */
+    hvcc->general_profile_compatibility_flags &= ptl->profile_compatibility_flags;
+
+    /*
+     * Each bit in general_constraint_indicator_flags may only be set if all
+     * the parameter sets set that bit.
+     */
+    hvcc->general_constraint_indicator_flags &= ptl->constraint_indicator_flags;
+}
+
+static void hvcc_parse_ptl(GetBitContext *gb,
+                           HEVCDecoderConfigurationRecord *hvcc,
+                           unsigned int max_sub_layers_minus1)
+{
+    unsigned int i;
+    HVCCProfileTierLevel general_ptl;
+    uint8_t sub_layer_profile_present_flag[MAX_SUB_LAYERS];
+    uint8_t sub_layer_level_present_flag[MAX_SUB_LAYERS];
+
+    general_ptl.profile_space               = get_bits(gb, 2);
+    general_ptl.tier_flag                   = get_bits1(gb);
+    general_ptl.profile_idc                 = get_bits(gb, 5);
+    general_ptl.profile_compatibility_flags = get_bits_long(gb, 32);
+    general_ptl.constraint_indicator_flags  = get_bits64(gb, 48);
+    general_ptl.level_idc                   = get_bits(gb, 8);
+    hvcc_update_ptl(hvcc, &general_ptl);
+
+    for (i = 0; i < max_sub_layers_minus1; i++) {
+        sub_layer_profile_present_flag[i] = get_bits1(gb);
+        sub_layer_level_present_flag[i]   = get_bits1(gb);
+    }
+
+    if (max_sub_layers_minus1 > 0)
+        for (i = max_sub_layers_minus1; i < 8; i++)
+            skip_bits(gb, 2); // reserved_zero_2bits[i]
+
+    for (i = 0; i < max_sub_layers_minus1; i++) {
+        if (sub_layer_profile_present_flag[i]) {
+            /*
+             * sub_layer_profile_space[i]                     u(2)
+             * sub_layer_tier_flag[i]                         u(1)
+             * sub_layer_profile_idc[i]                       u(5)
+             * sub_layer_profile_compatibility_flag[i][0..31] u(32)
+             * sub_layer_progressive_source_flag[i]           u(1)
+             * sub_layer_interlaced_source_flag[i]            u(1)
+             * sub_layer_non_packed_constraint_flag[i]        u(1)
+             * sub_layer_frame_only_constraint_flag[i]        u(1)
+             * sub_layer_reserved_zero_44bits[i]              u(44)
+             */
+            skip_bits_long(gb, 32);
+            skip_bits_long(gb, 32);
+            skip_bits     (gb, 24);
+        }
+
+        if (sub_layer_level_present_flag[i])
+            skip_bits(gb, 8);
+    }
+}
+
+static void skip_sub_layer_hrd_parameters(GetBitContext *gb,
+                                          unsigned int cpb_cnt_minus1,
+                                          uint8_t sub_pic_hrd_params_present_flag)
+{
+    unsigned int i;
+
+    for (i = 0; i <= cpb_cnt_minus1; i++) {
+        get_ue_golomb_long(gb); // bit_rate_value_minus1
+        get_ue_golomb_long(gb); // cpb_size_value_minus1
+
+        if (sub_pic_hrd_params_present_flag) {
+            get_ue_golomb_long(gb); // cpb_size_du_value_minus1
+            get_ue_golomb_long(gb); // bit_rate_du_value_minus1
+        }
+
+        skip_bits1(gb); // cbr_flag
+    }
+}
+
+static void skip_hrd_parameters(GetBitContext *gb, uint8_t cprms_present_flag,
+                                unsigned int max_sub_layers_minus1)
+{
+    unsigned int i;
+    uint8_t sub_pic_hrd_params_present_flag = 0;
+    uint8_t nal_hrd_parameters_present_flag = 0;
+    uint8_t vcl_hrd_parameters_present_flag = 0;
+
+    if (cprms_present_flag) {
+        nal_hrd_parameters_present_flag = get_bits1(gb);
+        vcl_hrd_parameters_present_flag = get_bits1(gb);
+
+        if (nal_hrd_parameters_present_flag ||
+            vcl_hrd_parameters_present_flag) {
+            sub_pic_hrd_params_present_flag = get_bits1(gb);
+
+            if (sub_pic_hrd_params_present_flag)
+                /*
+                 * tick_divisor_minus2                          u(8)
+                 * du_cpb_removal_delay_increment_length_minus1 u(5)
+                 * sub_pic_cpb_params_in_pic_timing_sei_flag    u(1)
+                 * dpb_output_delay_du_length_minus1            u(5)
+                 */
+                skip_bits(gb, 19);
+
+            /*
+             * bit_rate_scale u(4)
+             * cpb_size_scale u(4)
+             */
+            skip_bits(gb, 8);
+
+            if (sub_pic_hrd_params_present_flag)
+                skip_bits(gb, 4); // cpb_size_du_scale
+
+            /*
+             * initial_cpb_removal_delay_length_minus1 u(5)
+             * au_cpb_removal_delay_length_minus1      u(5)
+             * dpb_output_delay_length_minus1          u(5)
+             */
+            skip_bits(gb, 15);
+        }
+    }
+
+    for (i = 0; i <= max_sub_layers_minus1; i++) {
+        unsigned int cpb_cnt_minus1            = 0;
+        uint8_t low_delay_hrd_flag             = 0;
+        uint8_t fixed_pic_rate_within_cvs_flag = 0;
+        uint8_t fixed_pic_rate_general_flag    = get_bits1(gb);
+
+        if (!fixed_pic_rate_general_flag)
+            fixed_pic_rate_within_cvs_flag = get_bits1(gb);
+
+        if (fixed_pic_rate_within_cvs_flag)
+            get_ue_golomb_long(gb); // elemental_duration_in_tc_minus1
+        else
+            low_delay_hrd_flag = get_bits1(gb);
+
+        if (!low_delay_hrd_flag)
+            cpb_cnt_minus1 = get_ue_golomb_long(gb);
+
+        if (nal_hrd_parameters_present_flag)
+            skip_sub_layer_hrd_parameters(gb, cpb_cnt_minus1,
+                                          sub_pic_hrd_params_present_flag);
+
+        if (vcl_hrd_parameters_present_flag)
+            skip_sub_layer_hrd_parameters(gb, cpb_cnt_minus1,
+                                          sub_pic_hrd_params_present_flag);
+    }
+}
+
+static void skip_timing_info(GetBitContext *gb)
+{
+    skip_bits_long(gb, 32); // num_units_in_tick
+    skip_bits_long(gb, 32); // time_scale
+
+    if (get_bits1(gb))          // poc_proportional_to_timing_flag
+        get_ue_golomb_long(gb); // num_ticks_poc_diff_one_minus1
+}
+
+static void hvcc_parse_vui(GetBitContext *gb,
+                           HEVCDecoderConfigurationRecord *hvcc,
+                           unsigned int max_sub_layers_minus1)
+{
+    unsigned int min_spatial_segmentation_idc;
+
+    if (get_bits1(gb))              // aspect_ratio_info_present_flag
+        if (get_bits(gb, 8) == 255) // aspect_ratio_idc
+            skip_bits_long(gb, 32); // sar_width u(16), sar_height u(16)
+
+    if (get_bits1(gb))  // overscan_info_present_flag
+        skip_bits1(gb); // overscan_appropriate_flag
+
+    if (get_bits1(gb)) {  // video_signal_type_present_flag
+        skip_bits(gb, 4); // video_format u(3), video_full_range_flag u(1)
+
+        if (get_bits1(gb)) // colour_description_present_flag
+            /*
+             * colour_primaries         u(8)
+             * transfer_characteristics u(8)
+             * matrix_coeffs            u(8)
+             */
+            skip_bits(gb, 24);
+    }
+
+    if (get_bits1(gb)) {        // chroma_loc_info_present_flag
+        get_ue_golomb_long(gb); // chroma_sample_loc_type_top_field
+        get_ue_golomb_long(gb); // chroma_sample_loc_type_bottom_field
+    }
+
+    /*
+     * neutral_chroma_indication_flag u(1)
+     * field_seq_flag                 u(1)
+     * frame_field_info_present_flag  u(1)
+     */
+    skip_bits(gb, 3);
+
+    if (get_bits1(gb)) {        // default_display_window_flag
+        get_ue_golomb_long(gb); // def_disp_win_left_offset
+        get_ue_golomb_long(gb); // def_disp_win_right_offset
+        get_ue_golomb_long(gb); // def_disp_win_top_offset
+        get_ue_golomb_long(gb); // def_disp_win_bottom_offset
+    }
+
+    if (get_bits1(gb)) { // vui_timing_info_present_flag
+        skip_timing_info(gb);
+
+        if (get_bits1(gb)) // vui_hrd_parameters_present_flag
+            skip_hrd_parameters(gb, 1, max_sub_layers_minus1);
+    }
+
+    if (get_bits1(gb)) { // bitstream_restriction_flag
+        /*
+         * tiles_fixed_structure_flag              u(1)
+         * motion_vectors_over_pic_boundaries_flag u(1)
+         * restricted_ref_pic_lists_flag           u(1)
+         */
+        skip_bits(gb, 3);
+
+        min_spatial_segmentation_idc = get_ue_golomb_long(gb);
+
+        /*
+         * unsigned int(12) min_spatial_segmentation_idc;
+         *
+         * The min_spatial_segmentation_idc indication must indicate a level of
+         * spatial segmentation equal to or less than the lowest level of
+         * spatial segmentation indicated in all the parameter sets.
+         */
+        hvcc->min_spatial_segmentation_idc = FFMIN(hvcc->min_spatial_segmentation_idc,
+                                                   min_spatial_segmentation_idc);
+
+        get_ue_golomb_long(gb); // max_bytes_per_pic_denom
+        get_ue_golomb_long(gb); // max_bits_per_min_cu_denom
+        get_ue_golomb_long(gb); // log2_max_mv_length_horizontal
+        get_ue_golomb_long(gb); // log2_max_mv_length_vertical
+    }
+}
+
+static void skip_sub_layer_ordering_info(GetBitContext *gb)
+{
+    get_ue_golomb_long(gb); // max_dec_pic_buffering_minus1
+    get_ue_golomb_long(gb); // max_num_reorder_pics
+    get_ue_golomb_long(gb); // max_latency_increase_plus1
+}
+
+static int hvcc_parse_vps(GetBitContext *gb,
+                          HEVCDecoderConfigurationRecord *hvcc)
+{
+    unsigned int vps_max_sub_layers_minus1;
+
+    /*
+     * vps_video_parameter_set_id u(4)
+     * vps_reserved_three_2bits   u(2)
+     * vps_max_layers_minus1      u(6)
+     */
+    skip_bits(gb, 12);
+
+    vps_max_sub_layers_minus1 = get_bits(gb, 3);
+
+    /*
+     * numTemporalLayers greater than 1 indicates that the stream to which this
+     * configuration record applies is temporally scalable and the contained
+     * number of temporal layers (also referred to as temporal sub-layer or
+     * sub-layer in ISO/IEC 23008-2) is equal to numTemporalLayers. Value 1
+     * indicates that the stream is not temporally scalable. Value 0 indicates
+     * that it is unknown whether the stream is temporally scalable.
+     */
+    hvcc->numTemporalLayers = FFMAX(hvcc->numTemporalLayers,
+                                    vps_max_sub_layers_minus1 + 1);
+
+    /*
+     * vps_temporal_id_nesting_flag u(1)
+     * vps_reserved_0xffff_16bits   u(16)
+     */
+    skip_bits(gb, 17);
+
+    hvcc_parse_ptl(gb, hvcc, vps_max_sub_layers_minus1);
+
+    /* nothing useful for hvcC past this point */
+    return 0;
+}
+
+static void skip_scaling_list_data(GetBitContext *gb)
+{
+    int i, j, k, num_coeffs;
+
+    for (i = 0; i < 4; i++)
+        for (j = 0; j < (i == 3 ? 2 : 6); j++)
+            if (!get_bits1(gb))         // scaling_list_pred_mode_flag[i][j]
+                get_ue_golomb_long(gb); // scaling_list_pred_matrix_id_delta[i][j]
+            else {
+                num_coeffs = FFMIN(64, 1 << (4 + (i << 1)));
+
+                if (i > 1)
+                    get_se_golomb_long(gb); // scaling_list_dc_coef_minus8[i-2][j]
+
+                for (k = 0; k < num_coeffs; k++)
+                    get_se_golomb_long(gb); // scaling_list_delta_coef
+            }
+}
+
+static int parse_rps(GetBitContext *gb, unsigned int rps_idx,
+                     unsigned int num_rps,
+                     unsigned int num_delta_pocs[MAX_SHORT_TERM_RPS_COUNT])
+{
+    unsigned int i;
+
+    if (rps_idx && get_bits1(gb)) { // inter_ref_pic_set_prediction_flag
+        /* this should only happen for slice headers, and this isn't one */
+        if (rps_idx >= num_rps)
+            return AVERROR_INVALIDDATA;
+
+        skip_bits1        (gb); // delta_rps_sign
+        get_ue_golomb_long(gb); // abs_delta_rps_minus1
+
+        num_delta_pocs[rps_idx] = 0;
+
+        /*
+         * From libavcodec/hevc_ps.c:
+         *
+         * if (is_slice_header) {
+         *    //foo
+         * } else
+         *     rps_ridx = &sps->st_rps[rps - sps->st_rps - 1];
+         *
+         * where:
+         * rps:             &sps->st_rps[rps_idx]
+         * sps->st_rps:     &sps->st_rps[0]
+         * is_slice_header: rps_idx == num_rps
+         *
+         * thus:
+         * if (num_rps != rps_idx)
+         *     rps_ridx = &sps->st_rps[rps_idx - 1];
+         *
+         * NumDeltaPocs[RefRpsIdx]: num_delta_pocs[rps_idx - 1]
+         */
+        for (i = 0; i < num_delta_pocs[rps_idx - 1]; i++) {
+            uint8_t use_delta_flag = 0;
+            uint8_t used_by_curr_pic_flag = get_bits1(gb);
+            if (!used_by_curr_pic_flag)
+                use_delta_flag = get_bits1(gb);
+
+            if (used_by_curr_pic_flag || use_delta_flag)
+                num_delta_pocs[rps_idx]++;
+        }
+    } else {
+        unsigned int num_negative_pics = get_ue_golomb_long(gb);
+        unsigned int num_positive_pics = get_ue_golomb_long(gb);
+
+        num_delta_pocs[rps_idx] = num_negative_pics + num_positive_pics;
+
+        for (i = 0; i < num_negative_pics; i++) {
+            get_ue_golomb_long(gb); // delta_poc_s0_minus1[rps_idx]
+            skip_bits1        (gb); // used_by_curr_pic_s0_flag[rps_idx]
+        }
+
+        for (i = 0; i < num_positive_pics; i++) {
+            get_ue_golomb_long(gb); // delta_poc_s1_minus1[rps_idx]
+            skip_bits1        (gb); // used_by_curr_pic_s1_flag[rps_idx]
+        }
+    }
+
+    return 0;
+}
+
+static int hvcc_parse_sps(GetBitContext *gb,
+                          HEVCDecoderConfigurationRecord *hvcc)
+{
+    unsigned int i, sps_max_sub_layers_minus1, log2_max_pic_order_cnt_lsb_minus4;
+    unsigned int num_short_term_ref_pic_sets, num_delta_pocs[MAX_SHORT_TERM_RPS_COUNT];
+
+    skip_bits(gb, 4); // sps_video_parameter_set_id
+
+    sps_max_sub_layers_minus1 = get_bits (gb, 3);
+
+    /*
+     * numTemporalLayers greater than 1 indicates that the stream to which this
+     * configuration record applies is temporally scalable and the contained
+     * number of temporal layers (also referred to as temporal sub-layer or
+     * sub-layer in ISO/IEC 23008-2) is equal to numTemporalLayers. Value 1
+     * indicates that the stream is not temporally scalable. Value 0 indicates
+     * that it is unknown whether the stream is temporally scalable.
+     */
+    hvcc->numTemporalLayers = FFMAX(hvcc->numTemporalLayers,
+                                    sps_max_sub_layers_minus1 + 1);
+
+    hvcc->temporalIdNested = get_bits1(gb);
+
+    hvcc_parse_ptl(gb, hvcc, sps_max_sub_layers_minus1);
+
+    get_ue_golomb_long(gb); // sps_seq_parameter_set_id
+
+    hvcc->chromaFormat = get_ue_golomb_long(gb);
+
+    if (hvcc->chromaFormat == 3)
+        skip_bits1(gb); // separate_colour_plane_flag
+
+    get_ue_golomb_long(gb); // pic_width_in_luma_samples
+    get_ue_golomb_long(gb); // pic_height_in_luma_samples
+
+    if (get_bits1(gb)) {        // conformance_window_flag
+        get_ue_golomb_long(gb); // conf_win_left_offset
+        get_ue_golomb_long(gb); // conf_win_right_offset
+        get_ue_golomb_long(gb); // conf_win_top_offset
+        get_ue_golomb_long(gb); // conf_win_bottom_offset
+    }
+
+    hvcc->bitDepthLumaMinus8          = get_ue_golomb_long(gb);
+    hvcc->bitDepthChromaMinus8        = get_ue_golomb_long(gb);
+    log2_max_pic_order_cnt_lsb_minus4 = get_ue_golomb_long(gb);
+
+    /* sps_sub_layer_ordering_info_present_flag */
+    i = get_bits1(gb) ? 0 : sps_max_sub_layers_minus1;
+    for (; i <= sps_max_sub_layers_minus1; i++)
+        skip_sub_layer_ordering_info(gb);
+
+    get_ue_golomb_long(gb); // log2_min_luma_coding_block_size_minus3
+    get_ue_golomb_long(gb); // log2_diff_max_min_luma_coding_block_size
+    get_ue_golomb_long(gb); // log2_min_transform_block_size_minus2
+    get_ue_golomb_long(gb); // log2_diff_max_min_transform_block_size
+    get_ue_golomb_long(gb); // max_transform_hierarchy_depth_inter
+    get_ue_golomb_long(gb); // max_transform_hierarchy_depth_intra
+
+    if (get_bits1(gb) && // scaling_list_enabled_flag
+        get_bits1(gb))   // sps_scaling_list_data_present_flag
+        skip_scaling_list_data(gb);
+
+    skip_bits1(gb); // amp_enabled_flag
+    skip_bits1(gb); // sample_adaptive_offset_enabled_flag
+
+    if (get_bits1(gb)) {           // pcm_enabled_flag
+        skip_bits         (gb, 4); // pcm_sample_bit_depth_luma_minus1
+        skip_bits         (gb, 4); // pcm_sample_bit_depth_chroma_minus1
+        get_ue_golomb_long(gb);    // log2_min_pcm_luma_coding_block_size_minus3
+        get_ue_golomb_long(gb);    // log2_diff_max_min_pcm_luma_coding_block_size
+        skip_bits1        (gb);    // pcm_loop_filter_disabled_flag
+    }
+
+    num_short_term_ref_pic_sets = get_ue_golomb_long(gb);
+    if (num_short_term_ref_pic_sets > MAX_SHORT_TERM_RPS_COUNT)
+        return AVERROR_INVALIDDATA;
+
+    for (i = 0; i < num_short_term_ref_pic_sets; i++) {
+        int ret = parse_rps(gb, i, num_short_term_ref_pic_sets, num_delta_pocs);
+        if (ret < 0)
+            return ret;
+    }
+
+    if (get_bits1(gb)) {                               // long_term_ref_pics_present_flag
+        for (i = 0; i < get_ue_golomb_long(gb); i++) { // num_long_term_ref_pics_sps
+            int len = FFMIN(log2_max_pic_order_cnt_lsb_minus4 + 4, 16);
+            skip_bits (gb, len); // lt_ref_pic_poc_lsb_sps[i]
+            skip_bits1(gb);      // used_by_curr_pic_lt_sps_flag[i]
+        }
+    }
+
+    skip_bits1(gb); // sps_temporal_mvp_enabled_flag
+    skip_bits1(gb); // strong_intra_smoothing_enabled_flag
+
+    if (get_bits1(gb)) // vui_parameters_present_flag
+        hvcc_parse_vui(gb, hvcc, sps_max_sub_layers_minus1);
+
+    /* nothing useful for hvcC past this point */
+    return 0;
+}
+
+static int hvcc_parse_pps(GetBitContext *gb,
+                          HEVCDecoderConfigurationRecord *hvcc)
+{
+    uint8_t tiles_enabled_flag, entropy_coding_sync_enabled_flag;
+
+    get_ue_golomb_long(gb); // pps_pic_parameter_set_id
+    get_ue_golomb_long(gb); // pps_seq_parameter_set_id
+
+    /*
+     * dependent_slice_segments_enabled_flag u(1)
+     * output_flag_present_flag              u(1)
+     * num_extra_slice_header_bits           u(3)
+     * sign_data_hiding_enabled_flag         u(1)
+     * cabac_init_present_flag               u(1)
+     */
+    skip_bits(gb, 7);
+
+    get_ue_golomb_long(gb); // num_ref_idx_l0_default_active_minus1
+    get_ue_golomb_long(gb); // num_ref_idx_l1_default_active_minus1
+    get_se_golomb_long(gb); // init_qp_minus26
+
+    /*
+     * constrained_intra_pred_flag u(1)
+     * transform_skip_enabled_flag u(1)
+     */
+    skip_bits(gb, 2);
+
+    if (get_bits1(gb))          // cu_qp_delta_enabled_flag
+        get_ue_golomb_long(gb); // diff_cu_qp_delta_depth
+
+    get_se_golomb_long(gb); // pps_cb_qp_offset
+    get_se_golomb_long(gb); // pps_cr_qp_offset
+
+    /*
+     * weighted_pred_flag               u(1)
+     * weighted_bipred_flag             u(1)
+     * transquant_bypass_enabled_flag   u(1)
+     */
+    skip_bits(gb, 3);
+
+    tiles_enabled_flag               = get_bits1(gb);
+    entropy_coding_sync_enabled_flag = get_bits1(gb);
+
+    if (entropy_coding_sync_enabled_flag && tiles_enabled_flag)
+        hvcc->parallelismType = 0; // mixed-type parallel decoding
+    else if (entropy_coding_sync_enabled_flag)
+        hvcc->parallelismType = 3; // wavefront-based parallel decoding
+    else if (tiles_enabled_flag)
+        hvcc->parallelismType = 2; // tile-based parallel decoding
+    else
+        hvcc->parallelismType = 1; // slice-based parallel decoding
+
+    /* nothing useful for hvcC past this point */
+    return 0;
+}
+
+static uint8_t *nal_unit_extract_rbsp(const uint8_t *src, uint32_t src_len,
+                                      uint32_t *dst_len)
+{
+    uint8_t *dst;
+    uint32_t i, len;
+
+    dst = av_malloc(src_len);
+    if (!dst)
+        return NULL;
+
+    /* NAL unit header (2 bytes) */
+    i = len = 0;
+    while (i < 2 && i < src_len)
+        dst[len++] = src[i++];
+
+    while (i + 2 < src_len)
+        if (!src[i] && !src[i + 1] && src[i + 2] == 3) {
+            dst[len++] = src[i++];
+            dst[len++] = src[i++];
+            i++; // remove emulation_prevention_three_byte
+        } else
+            dst[len++] = src[i++];
+
+    while (i < src_len)
+        dst[len++] = src[i++];
+
+    *dst_len = len;
+    return dst;
+}
+
+
+
+static void nal_unit_parse_header(GetBitContext *gb, uint8_t *nal_type)
+{
+    skip_bits1(gb); // forbidden_zero_bit
+
+    *nal_type = get_bits(gb, 6);
+
+    /*
+     * nuh_layer_id          u(6)
+     * nuh_temporal_id_plus1 u(3)
+     */
+    skip_bits(gb, 9);
+}
+
+static int hvcc_array_add_nal_unit(uint8_t *nal_buf, uint32_t nal_size,
+                                   uint8_t nal_type, int ps_array_completeness,
+                                   HEVCDecoderConfigurationRecord *hvcc)
+{
+    int ret;
+    uint8_t index;
+    uint16_t numNalus;
+    HVCCNALUnitArray *array;
+
+    for (index = 0; index < hvcc->numOfArrays; index++)
+        if (hvcc->array[index].NAL_unit_type == nal_type)
+            break;
+
+    if (index >= hvcc->numOfArrays) {
+        uint8_t i;
+
+        ret = av_reallocp_array(&hvcc->array, index + 1, sizeof(HVCCNALUnitArray));
+        if (ret < 0)
+            return ret;
+
+        for (i = hvcc->numOfArrays; i <= index; i++)
+            memset(&hvcc->array[i], 0, sizeof(HVCCNALUnitArray));
+        hvcc->numOfArrays = index + 1;
+    }
+
+    array    = &hvcc->array[index];
+    numNalus = array->numNalus;
+
+    ret = av_reallocp_array(&array->nalUnit, numNalus + 1, sizeof(uint8_t*));
+    if (ret < 0)
+        return ret;
+
+    ret = av_reallocp_array(&array->nalUnitLength, numNalus + 1, sizeof(uint16_t));
+    if (ret < 0)
+        return ret;
+
+    array->nalUnit      [numNalus] = nal_buf;
+    array->nalUnitLength[numNalus] = nal_size;
+    array->NAL_unit_type           = nal_type;
+    array->numNalus++;
+
+    /*
+     * When the sample entry name is ‘hvc1’, the default and mandatory value of
+     * array_completeness is 1 for arrays of all types of parameter sets, and 0
+     * for all other arrays. When the sample entry name is ‘hev1’, the default
+     * value of array_completeness is 0 for all arrays.
+     */
+    if (nal_type == NAL_VPS || nal_type == NAL_SPS || nal_type == NAL_PPS)
+        array->array_completeness = ps_array_completeness;
+
+    return 0;
+}
+
+static int hvcc_add_nal_unit(uint8_t *nal_buf, uint32_t nal_size,
+                             int ps_array_completeness,
+                             HEVCDecoderConfigurationRecord *hvcc)
+{
+    int ret = 0;
+    GetBitContext gbc;
+    uint8_t nal_type;
+    uint8_t *rbsp_buf;
+    uint32_t rbsp_size;
+
+    rbsp_buf = nal_unit_extract_rbsp(nal_buf, nal_size, &rbsp_size);
+    if (!rbsp_buf) {
+        ret = AVERROR(ENOMEM);
+        goto end;
+    }
+
+    ret = init_get_bits8(&gbc, rbsp_buf, rbsp_size);
+    if (ret < 0)
+        goto end;
+
+    nal_unit_parse_header(&gbc, &nal_type);
+
+    /*
+     * Note: only 'declarative' SEI messages are allowed in
+     * hvcC. Perhaps the SEI playload type should be checked
+     * and non-declarative SEI messages discarded?
+     */
+    switch (nal_type) {
+    case NAL_VPS:
+    case NAL_SPS:
+    case NAL_PPS:
+    case NAL_SEI_PREFIX:
+    case NAL_SEI_SUFFIX:
+        ret = hvcc_array_add_nal_unit(nal_buf, nal_size, nal_type,
+                                      ps_array_completeness, hvcc);
+        if (ret < 0)
+            goto end;
+        else if (nal_type == NAL_VPS)
+            ret = hvcc_parse_vps(&gbc, hvcc);
+        else if (nal_type == NAL_SPS)
+            ret = hvcc_parse_sps(&gbc, hvcc);
+        else if (nal_type == NAL_PPS)
+            ret = hvcc_parse_pps(&gbc, hvcc);
+        if (ret < 0)
+            goto end;
+        break;
+    default:
+        ret = AVERROR_INVALIDDATA;
+        goto end;
+    }
+
+end:
+    av_free(rbsp_buf);
+    return ret;
+}
+
+static void hvcc_init(HEVCDecoderConfigurationRecord *hvcc)
+{
+    memset(hvcc, 0, sizeof(HEVCDecoderConfigurationRecord));
+    hvcc->configurationVersion = 1;
+    hvcc->lengthSizeMinusOne   = 3; // 4 bytes
+
+    /*
+     * The following fields have all their valid bits set by default,
+     * the ProfileTierLevel parsing code will unset them when needed.
+     */
+    hvcc->general_profile_compatibility_flags = 0xffffffff;
+    hvcc->general_constraint_indicator_flags  = 0xffffffffffff;
+
+    /*
+     * Initialize this field with an invalid value which can be used to detect
+     * whether we didn't see any VUI (in wich case it should be reset to zero).
+     */
+    hvcc->min_spatial_segmentation_idc = MAX_SPATIAL_SEGMENTATION + 1;
+}
+
+static void hvcc_close(HEVCDecoderConfigurationRecord *hvcc)
+{
+    uint8_t i;
+
+    for (i = 0; i < hvcc->numOfArrays; i++) {
+        hvcc->array[i].numNalus = 0;
+        av_freep(&hvcc->array[i].nalUnit);
+        av_freep(&hvcc->array[i].nalUnitLength);
+    }
+
+    hvcc->numOfArrays = 0;
+    av_freep(&hvcc->array);
+}
+
+static int hvcc_write(AVIOContext *pb, HEVCDecoderConfigurationRecord *hvcc)
+{
+    uint8_t i;
+    uint16_t j, vps_count = 0, sps_count = 0, pps_count = 0;
+
+    /*
+     * We only support writing HEVCDecoderConfigurationRecord version 1.
+     */
+    hvcc->configurationVersion = 1;
+
+    /*
+     * If min_spatial_segmentation_idc is invalid, reset to 0 (unspecified).
+     */
+    if (hvcc->min_spatial_segmentation_idc > MAX_SPATIAL_SEGMENTATION)
+        hvcc->min_spatial_segmentation_idc = 0;
+
+    /*
+     * parallelismType indicates the type of parallelism that is used to meet
+     * the restrictions imposed by min_spatial_segmentation_idc when the value
+     * of min_spatial_segmentation_idc is greater than 0.
+     */
+    if (!hvcc->min_spatial_segmentation_idc)
+        hvcc->parallelismType = 0;
+
+    /*
+     * It's unclear how to properly compute these fields, so
+     * let's always set them to values meaning 'unspecified'.
+     */
+    hvcc->avgFrameRate      = 0;
+    hvcc->constantFrameRate = 0;
+
+    av_dlog(NULL,  "configurationVersion:                %"PRIu8"\n",
+            hvcc->configurationVersion);
+    av_dlog(NULL,  "general_profile_space:               %"PRIu8"\n",
+            hvcc->general_profile_space);
+    av_dlog(NULL,  "general_tier_flag:                   %"PRIu8"\n",
+            hvcc->general_tier_flag);
+    av_dlog(NULL,  "general_profile_idc:                 %"PRIu8"\n",
+            hvcc->general_profile_idc);
+    av_dlog(NULL, "general_profile_compatibility_flags: 0x%08"PRIx32"\n",
+            hvcc->general_profile_compatibility_flags);
+    av_dlog(NULL, "general_constraint_indicator_flags:  0x%012"PRIx64"\n",
+            hvcc->general_constraint_indicator_flags);
+    av_dlog(NULL,  "general_level_idc:                   %"PRIu8"\n",
+            hvcc->general_level_idc);
+    av_dlog(NULL,  "min_spatial_segmentation_idc:        %"PRIu16"\n",
+            hvcc->min_spatial_segmentation_idc);
+    av_dlog(NULL,  "parallelismType:                     %"PRIu8"\n",
+            hvcc->parallelismType);
+    av_dlog(NULL,  "chromaFormat:                        %"PRIu8"\n",
+            hvcc->chromaFormat);
+    av_dlog(NULL,  "bitDepthLumaMinus8:                  %"PRIu8"\n",
+            hvcc->bitDepthLumaMinus8);
+    av_dlog(NULL,  "bitDepthChromaMinus8:                %"PRIu8"\n",
+            hvcc->bitDepthChromaMinus8);
+    av_dlog(NULL,  "avgFrameRate:                        %"PRIu16"\n",
+            hvcc->avgFrameRate);
+    av_dlog(NULL,  "constantFrameRate:                   %"PRIu8"\n",
+            hvcc->constantFrameRate);
+    av_dlog(NULL,  "numTemporalLayers:                   %"PRIu8"\n",
+            hvcc->numTemporalLayers);
+    av_dlog(NULL,  "temporalIdNested:                    %"PRIu8"\n",
+            hvcc->temporalIdNested);
+    av_dlog(NULL,  "lengthSizeMinusOne:                  %"PRIu8"\n",
+            hvcc->lengthSizeMinusOne);
+    av_dlog(NULL,  "numOfArrays:                         %"PRIu8"\n",
+            hvcc->numOfArrays);
+    for (i = 0; i < hvcc->numOfArrays; i++) {
+        av_dlog(NULL, "array_completeness[%"PRIu8"]:               %"PRIu8"\n",
+                i, hvcc->array[i].array_completeness);
+        av_dlog(NULL, "NAL_unit_type[%"PRIu8"]:                    %"PRIu8"\n",
+                i, hvcc->array[i].NAL_unit_type);
+        av_dlog(NULL, "numNalus[%"PRIu8"]:                         %"PRIu16"\n",
+                i, hvcc->array[i].numNalus);
+        for (j = 0; j < hvcc->array[i].numNalus; j++)
+            av_dlog(NULL,
+                    "nalUnitLength[%"PRIu8"][%"PRIu16"]:                 %"PRIu16"\n",
+                    i, j, hvcc->array[i].nalUnitLength[j]);
+    }
+
+    /*
+     * We need at least one of each: VPS, SPS and PPS.
+     */
+    for (i = 0; i < hvcc->numOfArrays; i++)
+        switch (hvcc->array[i].NAL_unit_type) {
+        case NAL_VPS:
+            vps_count += hvcc->array[i].numNalus;
+            break;
+        case NAL_SPS:
+            sps_count += hvcc->array[i].numNalus;
+            break;
+        case NAL_PPS:
+            pps_count += hvcc->array[i].numNalus;
+            break;
+        default:
+            break;
+        }
+    if (!vps_count || vps_count > MAX_VPS_COUNT ||
+        !sps_count || sps_count > MAX_SPS_COUNT ||
+        !pps_count || pps_count > MAX_PPS_COUNT)
+        return AVERROR_INVALIDDATA;
+
+    /* unsigned int(8) configurationVersion = 1; */
+    avio_w8(pb, hvcc->configurationVersion);
+
+    /*
+     * unsigned int(2) general_profile_space;
+     * unsigned int(1) general_tier_flag;
+     * unsigned int(5) general_profile_idc;
+     */
+    avio_w8(pb, hvcc->general_profile_space << 6 |
+                hvcc->general_tier_flag     << 5 |
+                hvcc->general_profile_idc);
+
+    /* unsigned int(32) general_profile_compatibility_flags; */
+    avio_wb32(pb, hvcc->general_profile_compatibility_flags);
+
+    /* unsigned int(48) general_constraint_indicator_flags; */
+    avio_wb32(pb, hvcc->general_constraint_indicator_flags >> 16);
+    avio_wb16(pb, hvcc->general_constraint_indicator_flags);
+
+    /* unsigned int(8) general_level_idc; */
+    avio_w8(pb, hvcc->general_level_idc);
+
+    /*
+     * bit(4) reserved = ‘1111’b;
+     * unsigned int(12) min_spatial_segmentation_idc;
+     */
+    avio_wb16(pb, hvcc->min_spatial_segmentation_idc | 0xf000);
+
+    /*
+     * bit(6) reserved = ‘111111’b;
+     * unsigned int(2) parallelismType;
+     */
+    avio_w8(pb, hvcc->parallelismType | 0xfc);
+
+    /*
+     * bit(6) reserved = ‘111111’b;
+     * unsigned int(2) chromaFormat;
+     */
+    avio_w8(pb, hvcc->chromaFormat | 0xfc);
+
+    /*
+     * bit(5) reserved = ‘11111’b;
+     * unsigned int(3) bitDepthLumaMinus8;
+     */
+    avio_w8(pb, hvcc->bitDepthLumaMinus8 | 0xf8);
+
+    /*
+     * bit(5) reserved = ‘11111’b;
+     * unsigned int(3) bitDepthChromaMinus8;
+     */
+    avio_w8(pb, hvcc->bitDepthChromaMinus8 | 0xf8);
+
+    /* bit(16) avgFrameRate; */
+    avio_wb16(pb, hvcc->avgFrameRate);
+
+    /*
+     * bit(2) constantFrameRate;
+     * bit(3) numTemporalLayers;
+     * bit(1) temporalIdNested;
+     * unsigned int(2) lengthSizeMinusOne;
+     */
+    avio_w8(pb, hvcc->constantFrameRate << 6 |
+                hvcc->numTemporalLayers << 3 |
+                hvcc->temporalIdNested  << 2 |
+                hvcc->lengthSizeMinusOne);
+
+    /* unsigned int(8) numOfArrays; */
+    avio_w8(pb, hvcc->numOfArrays);
+
+    for (i = 0; i < hvcc->numOfArrays; i++) {
+        /*
+         * bit(1) array_completeness;
+         * unsigned int(1) reserved = 0;
+         * unsigned int(6) NAL_unit_type;
+         */
+        avio_w8(pb, hvcc->array[i].array_completeness << 7 |
+                    hvcc->array[i].NAL_unit_type & 0x3f);
+
+        /* unsigned int(16) numNalus; */
+        avio_wb16(pb, hvcc->array[i].numNalus);
+
+        for (j = 0; j < hvcc->array[i].numNalus; j++) {
+            /* unsigned int(16) nalUnitLength; */
+            avio_wb16(pb, hvcc->array[i].nalUnitLength[j]);
+
+            /* bit(8*nalUnitLength) nalUnit; */
+            avio_write(pb, hvcc->array[i].nalUnit[j],
+                       hvcc->array[i].nalUnitLength[j]);
+        }
+    }
+
+    return 0;
+}
+
+int ff_hevc_annexb2mp4(AVIOContext *pb, const uint8_t *buf_in,
+                       int size, int filter_ps, int *ps_count)
+{
+    int num_ps = 0, ret = 0;
+    uint8_t *buf, *end, *start = NULL;
+
+    if (!filter_ps) {
+        ret = ff_avc_parse_nal_units(pb, buf_in, size);
+        goto end;
+    }
+
+    ret = ff_avc_parse_nal_units_buf(buf_in, &start, &size);
+    if (ret < 0)
+        goto end;
+
+    ret = 0;
+    buf = start;
+    end = start + size;
+
+    while (end - buf > 4) {
+        uint32_t len = FFMIN(AV_RB32(buf), end - buf - 4);
+        uint8_t type = (buf[4] >> 1) & 0x3f;
+
+        buf += 4;
+
+        switch (type) {
+        case NAL_VPS:
+        case NAL_SPS:
+        case NAL_PPS:
+            num_ps++;
+            break;
+        default:
+            ret += 4 + len;
+            avio_wb32(pb, len);
+            avio_write(pb, buf, len);
+            break;
+        }
+
+        buf += len;
+    }
+
+end:
+    av_free(start);
+    if (ps_count)
+        *ps_count = num_ps;
+    return ret;
+}
+
+int ff_hevc_annexb2mp4_buf(const uint8_t *buf_in, uint8_t **buf_out,
+                           int *size, int filter_ps, int *ps_count)
+{
+    AVIOContext *pb;
+    int ret;
+
+    ret = avio_open_dyn_buf(&pb);
+    if (ret < 0)
+        return ret;
+
+    ret   = ff_hevc_annexb2mp4(pb, buf_in, *size, filter_ps, ps_count);
+    *size = avio_close_dyn_buf(pb, buf_out);
+
+    return ret;
+}
+
+int ff_isom_write_hvcc(AVIOContext *pb, const uint8_t *data,
+                       int size, int ps_array_completeness)
+{
+    int ret = 0;
+    uint8_t *buf, *end, *start = NULL;
+    HEVCDecoderConfigurationRecord hvcc;
+
+    hvcc_init(&hvcc);
+
+    if (size < 6) {
+        /* We can't write a valid hvcC from the provided data */
+        ret = AVERROR_INVALIDDATA;
+        goto end;
+    } else if (*data == 1) {
+        /* Data is already hvcC-formatted */
+        avio_write(pb, data, size);
+        goto end;
+    } else if (!(AV_RB24(data) == 1 || AV_RB32(data) == 1)) {
+        /* Not a valid Annex B start code prefix */
+        ret = AVERROR_INVALIDDATA;
+        goto end;
+    }
+
+    ret = ff_avc_parse_nal_units_buf(data, &start, &size);
+    if (ret < 0)
+        goto end;
+
+    buf = start;
+    end = start + size;
+
+    while (end - buf > 4) {
+        uint32_t len = FFMIN(AV_RB32(buf), end - buf - 4);
+        uint8_t type = (buf[4] >> 1) & 0x3f;
+
+        buf += 4;
+
+        switch (type) {
+        case NAL_VPS:
+        case NAL_SPS:
+        case NAL_PPS:
+        case NAL_SEI_PREFIX:
+        case NAL_SEI_SUFFIX:
+            ret = hvcc_add_nal_unit(buf, len, ps_array_completeness, &hvcc);
+            if (ret < 0)
+                goto end;
+            break;
+        default:
+            break;
+        }
+
+        buf += len;
+    }
+
+    ret = hvcc_write(pb, &hvcc);
+
+end:
+    hvcc_close(&hvcc);
+    av_free(start);
+    return ret;
+}

omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/hevc.h Added

@@ -0,0 +1,98 @@
+/*
+ * Copyright (c) 2014 Tim Walker <tdskywalker@gmail.com>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * internal header for HEVC (de)muxer utilities
+ */
+
+#ifndef AVFORMAT_HEVC_H
+#define AVFORMAT_HEVC_H
+
+#include <stdint.h>
+#include "avio.h"
+
+/**
+ * Writes Annex B formatted HEVC NAL units to the provided AVIOContext.
+ *
+ * The NAL units are converted to an MP4-compatible format (start code prefixes
+ * are replaced by 4-byte size fields, as per ISO/IEC 14496-15).
+ *
+ * If filter_ps is non-zero, any HEVC parameter sets found in the input will be
+ * discarded, and *ps_count will be set to the number of discarded PS NAL units.
+ *
+ * @param pb address of the AVIOContext where the data shall be written
+ * @param buf_in address of the buffer holding the input data
+ * @param size size (in bytes) of the input buffer
+ * @param filter_ps whether to write parameter set NAL units to the output (0)
+ *        or to discard them (non-zero)
+ * @param ps_count address of the variable where the number of discarded
+ *        parameter set NAL units shall be written, may be NULL
+ * @return the amount (in bytes) of data written in case of success, a negative
+ *         value corresponding to an AVERROR code in case of failure
+ */
+int ff_hevc_annexb2mp4(AVIOContext *pb, const uint8_t *buf_in,
+                       int size, int filter_ps, int *ps_count);
+
+/**
+ * Writes Annex B formatted HEVC NAL units to a data buffer.
+ *
+ * The NAL units are converted to an MP4-compatible format (start code prefixes
+ * are replaced by 4-byte size fields, as per ISO/IEC 14496-15).
+ *
+ * If filter_ps is non-zero, any HEVC parameter sets found in the input will be
+ * discarded, and *ps_count will be set to the number of discarded PS NAL units.
+ *
+ * On output, *size holds the size (in bytes) of the output data buffer.
+ *
+ * @param buf_in address of the buffer holding the input data
+ * @param size address of the variable holding the size (in bytes) of the input
+ *        buffer (on input) and of the output buffer (on output)
+ * @param buf_out address of the variable holding the address of the output
+ *        buffer
+ * @param filter_ps whether to write parameter set NAL units to the output (0)
+ *        or to discard them (non-zero)
+ * @param ps_count address of the variable where the number of discarded
+ *        parameter set NAL units shall be written, may be NULL
+ * @return the amount (in bytes) of data written in case of success, a negative
+ *         value corresponding to an AVERROR code in case of failure
+ */
+int ff_hevc_annexb2mp4_buf(const uint8_t *buf_in, uint8_t **buf_out,
+                           int *size, int filter_ps, int *ps_count);
+
+/**
+ * Writes HEVC extradata (parameter sets, declarative SEI NAL units) to the
+ * provided AVIOContext.
+ *
+ * If the extradata is Annex B format, it gets converted to hvcC format before
+ * writing.
+ *
+ * @param pb address of the AVIOContext where the hvcC shall be written
+ * @param data address of the buffer holding the data needed to write the hvcC
+ * @param size size (in bytes) of the data buffer
+ * @param ps_array_completeness whether all parameter sets are in the hvcC (1)
+ *        or there may be additional parameter sets in the bitstream (0)
+ * @return >=0 in case of success, a negative value corresponding to an AVERROR
+ *         code in case of failure
+ */
+int ff_isom_write_hvcc(AVIOContext *pb, const uint8_t *data,
+                       int size, int ps_array_completeness);
+
+#endif /* AVFORMAT_HEVC_H */

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/hevcdec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/hevcdec.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/hls.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/hls.c Changed

@@ -64,12 +64,11 @@
 };
 
 /*
- * Each variant has its own demuxer. If it currently is active,
+ * Each playlist has its own demuxer. If it currently is active,
  * it has an open AVIOContext too, and potentially an AVPacket
  * containing the next packet from this stream.
  */
-struct variant {
-    int bandwidth;
+struct playlist {
     char url[MAX_URL_SIZE];
     AVIOContext pb;
     uint8_t* read_buffer;
@@ -93,9 +92,18 @@
     uint8_t key[16];
 };
 
+struct variant {
+    int bandwidth;
+    int n_playlists;
+    struct playlist **playlists;
+};
+
 typedef struct HLSContext {
     int n_variants;
     struct variant **variants;
+    int n_playlists;
+    struct playlist **playlists;
+
     int cur_seq_no;
     int end_of_segment;
     int first_packet;
@@ -105,6 +113,7 @@
     AVIOInterruptCB *interrupt_callback;
     char *user_agent;                    ///< holds HTTP user agent set as an AVOption to the HTTP protocol context
     char *cookies;                       ///< holds HTTP cookie values set in either the initial response or as an AVOption to the HTTP protocol context
+    char *headers;                       ///< holds HTTP headers set as an AVOption to the HTTP protocol context
 } HLSContext;
 
 static int read_chomp_line(AVIOContext *s, char *buf, int maxlen)
@@ -115,13 +124,35 @@
     return len;
 }
 
-static void free_segment_list(struct variant *var)
+static void free_segment_list(struct playlist *pls)
+{
+    int i;
+    for (i = 0; i < pls->n_segments; i++)
+        av_free(pls->segments[i]);
+    av_freep(&pls->segments);
+    pls->n_segments = 0;
+}
+
+static void free_playlist_list(HLSContext *c)
 {
     int i;
-    for (i = 0; i < var->n_segments; i++)
-        av_free(var->segments[i]);
-    av_freep(&var->segments);
-    var->n_segments = 0;
+    for (i = 0; i < c->n_playlists; i++) {
+        struct playlist *pls = c->playlists[i];
+        free_segment_list(pls);
+        av_free_packet(&pls->pkt);
+        av_free(pls->pb.buffer);
+        if (pls->input)
+            ffurl_close(pls->input);
+        if (pls->ctx) {
+            pls->ctx->pb = NULL;
+            avformat_close_input(&pls->ctx);
+        }
+        av_free(pls);
+    }
+    av_freep(&c->playlists);
+    av_freep(&c->cookies);
+    av_freep(&c->user_agent);
+    c->n_playlists = 0;
 }
 
 static void free_variant_list(HLSContext *c)
@@ -129,20 +160,10 @@
     int i;
     for (i = 0; i < c->n_variants; i++) {
         struct variant *var = c->variants[i];
-        free_segment_list(var);
-        av_free_packet(&var->pkt);
-        av_free(var->pb.buffer);
-        if (var->input)
-            ffurl_close(var->input);
-        if (var->ctx) {
-            var->ctx->pb = NULL;
-            avformat_close_input(&var->ctx);
-        }
+        av_freep(&var->playlists);
         av_free(var);
     }
     av_freep(&c->variants);
-    av_freep(&c->cookies);
-    av_freep(&c->user_agent);
     c->n_variants = 0;
 }
 
@@ -156,16 +177,35 @@
     pkt->data = NULL;
 }
 
+static struct playlist *new_playlist(HLSContext *c, const char *url,
+                                     const char *base)
+{
+    struct playlist *pls = av_mallocz(sizeof(struct playlist));
+    if (!pls)
+        return NULL;
+    reset_packet(&pls->pkt);
+    ff_make_absolute_url(pls->url, sizeof(pls->url), base, url);
+    dynarray_add(&c->playlists, &c->n_playlists, pls);
+    return pls;
+}
+
 static struct variant *new_variant(HLSContext *c, int bandwidth,
                                    const char *url, const char *base)
 {
-    struct variant *var = av_mallocz(sizeof(struct variant));
+    struct variant *var;
+    struct playlist *pls;
+
+    pls = new_playlist(c, url, base);
+    if (!pls)
+        return NULL;
+
+    var = av_mallocz(sizeof(struct variant));
     if (!var)
         return NULL;
-    reset_packet(&var->pkt);
+
     var->bandwidth = bandwidth;
-    ff_make_absolute_url(var->url, sizeof(var->url), base, url);
     dynarray_add(&c->variants, &c->n_variants, var);
+    dynarray_add(&var->playlists, &var->n_playlists, pls);
     return var;
 }
 
@@ -204,7 +244,7 @@
 }
 
 static int parse_playlist(HLSContext *c, const char *url,
-                          struct variant *var, AVIOContext *in)
+                          struct playlist *pls, AVIOContext *in)
 {
     int ret = 0, is_segment = 0, is_variant = 0, bandwidth = 0;
     int64_t duration = 0;
@@ -215,6 +255,7 @@
     char line[MAX_URL_SIZE];
     const char *ptr;
     int close_in = 0;
+    uint8_t *new_url = NULL;
 
     if (!in) {
         AVDictionary *opts = NULL;
@@ -225,6 +266,7 @@
         // broker prior HTTP options that should be consistent across requests
         av_dict_set(&opts, "user-agent", c->user_agent, 0);
         av_dict_set(&opts, "cookies", c->cookies, 0);
+        av_dict_set(&opts, "headers", c->headers, 0);
 
         ret = avio_open2(&in, url, AVIO_FLAG_READ,
                          c->interrupt_callback, &opts);
@@ -233,15 +275,18 @@
             return ret;
     }
 
+    if (av_opt_get(in, "location", AV_OPT_SEARCH_CHILDREN, &new_url) >= 0)
+        url = new_url;
+
     read_chomp_line(in, line, sizeof(line));
     if (strcmp(line, "#EXTM3U")) {
         ret = AVERROR_INVALIDDATA;
         goto fail;
     }
 
-    if (var) {
-        free_segment_list(var);
-        var->finished = 0;
+    if (pls) {
+        free_segment_list(pls);
+        pls->finished = 0;
     }
     while (!url_feof(in)) {
         read_chomp_line(in, line, sizeof(line));
@@ -265,26 +310,26 @@
             }
             av_strlcpy(key, info.uri, sizeof(key));
         } else if (av_strstart(line, "#EXT-X-TARGETDURATION:", &ptr)) {
-            if (!var) {
-                var = new_variant(c, 0, url, NULL);
-                if (!var) {
+            if (!pls) {
+                if (!new_variant(c, 0, url, NULL)) {
                     ret = AVERROR(ENOMEM);
                     goto fail;
                 }
+                pls = c->playlists[c->n_playlists - 1];
             }
-            var->target_duration = atoi(ptr) * AV_TIME_BASE;
+            pls->target_duration = atoi(ptr) * AV_TIME_BASE;
         } else if (av_strstart(line, "#EXT-X-MEDIA-SEQUENCE:", &ptr)) {
-            if (!var) {
-                var = new_variant(c, 0, url, NULL);
-                if (!var) {
+            if (!pls) {
+                if (!new_variant(c, 0, url, NULL)) {
                     ret = AVERROR(ENOMEM);
                     goto fail;
                 }
+                pls = c->playlists[c->n_playlists - 1];
             }
-            var->start_seq_no = atoi(ptr);
+            pls->start_seq_no = atoi(ptr);
         } else if (av_strstart(line, "#EXT-X-ENDLIST", &ptr)) {
-            if (var)
-                var->finished = 1;
+            if (pls)
+                pls->finished = 1;
         } else if (av_strstart(line, "#EXTINF:", &ptr)) {
             is_segment = 1;
             duration   = atof(ptr) * AV_TIME_BASE;
@@ -301,12 +346,12 @@
             }
             if (is_segment) {
                 struct segment *seg;
-                if (!var) {
-                    var = new_variant(c, 0, url, NULL);
-                    if (!var) {
+                if (!pls) {
+                    if (!new_variant(c, 0, url, NULL)) {
                         ret = AVERROR(ENOMEM);
                         goto fail;
                     }
+                    pls = c->playlists[c->n_playlists - 1];
                 }
                 seg = av_malloc(sizeof(struct segment));
                 if (!seg) {
@@ -318,49 +363,55 @@
                 if (has_iv) {
                     memcpy(seg->iv, iv, sizeof(iv));
                 } else {
-                    int seq = var->start_seq_no + var->n_segments;
+                    int seq = pls->start_seq_no + pls->n_segments;
                     memset(seg->iv, 0, sizeof(seg->iv));
                     AV_WB32(seg->iv + 12, seq);
                 }
                 ff_make_absolute_url(seg->key, sizeof(seg->key), url, key);
                 ff_make_absolute_url(seg->url, sizeof(seg->url), url, line);
-                dynarray_add(&var->segments, &var->n_segments, seg);
+                dynarray_add(&pls->segments, &pls->n_segments, seg);
                 is_segment = 0;
             }
         }
     }
-    if (var)
-        var->last_load_time = av_gettime();
+    if (pls)
+        pls->last_load_time = av_gettime();
 
 fail:
+    av_free(new_url);
     if (close_in)
         avio_close(in);
     return ret;
 }
 
-static int open_input(HLSContext *c, struct variant *var)
+static int open_input(HLSContext *c, struct playlist *pls)
 {
     AVDictionary *opts = NULL;
+    AVDictionary *opts2 = NULL;
     int ret;
-    struct segment *seg = var->segments[var->cur_seq_no - var->start_seq_no];
+    struct segment *seg = pls->segments[pls->cur_seq_no - pls->start_seq_no];
 
     // broker prior HTTP options that should be consistent across requests
     av_dict_set(&opts, "user-agent", c->user_agent, 0);
     av_dict_set(&opts, "cookies", c->cookies, 0);
+    av_dict_set(&opts, "headers", c->headers, 0);
     av_dict_set(&opts, "seekable", "0", 0);
 
+    // Same opts for key request (ffurl_open mutilates the opts so it cannot be used twice)
+    av_dict_copy(&opts2, opts, 0);
+
     if (seg->key_type == KEY_NONE) {
-        ret = ffurl_open(&var->input, seg->url, AVIO_FLAG_READ,
-                          &var->parent->interrupt_callback, &opts);
+        ret = ffurl_open(&pls->input, seg->url, AVIO_FLAG_READ,
+                          &pls->parent->interrupt_callback, &opts);
         goto cleanup;
     } else if (seg->key_type == KEY_AES_128) {
         char iv[33], key[33], url[MAX_URL_SIZE];
-        if (strcmp(seg->key, var->key_url)) {
+        if (strcmp(seg->key, pls->key_url)) {
             URLContext *uc;
             if (ffurl_open(&uc, seg->key, AVIO_FLAG_READ,
-                           &var->parent->interrupt_callback, &opts) == 0) {
-                if (ffurl_read_complete(uc, var->key, sizeof(var->key))
-                    != sizeof(var->key)) {
+                           &pls->parent->interrupt_callback, &opts2) == 0) {
+                if (ffurl_read_complete(uc, pls->key, sizeof(pls->key))
+                    != sizeof(pls->key)) {
                     av_log(NULL, AV_LOG_ERROR, "Unable to read key file %s\n",
                            seg->key);
                 }
@@ -369,26 +420,24 @@
                 av_log(NULL, AV_LOG_ERROR, "Unable to open key file %s\n",
                        seg->key);
             }
-            av_strlcpy(var->key_url, seg->key, sizeof(var->key_url));
+            av_strlcpy(pls->key_url, seg->key, sizeof(pls->key_url));
         }
         ff_data_to_hex(iv, seg->iv, sizeof(seg->iv), 0);
-        ff_data_to_hex(key, var->key, sizeof(var->key), 0);
+        ff_data_to_hex(key, pls->key, sizeof(pls->key), 0);
         iv[32] = key[32] = '\0';
         if (strstr(seg->url, "://"))
             snprintf(url, sizeof(url), "crypto+%s", seg->url);
         else
             snprintf(url, sizeof(url), "crypto:%s", seg->url);
-        if ((ret = ffurl_alloc(&var->input, url, AVIO_FLAG_READ,
-                               &var->parent->interrupt_callback)) < 0)
+        if ((ret = ffurl_alloc(&pls->input, url, AVIO_FLAG_READ,
+                               &pls->parent->interrupt_callback)) < 0)
             goto cleanup;
-        av_opt_set(var->input->priv_data, "key", key, 0);
-        av_opt_set(var->input->priv_data, "iv", iv, 0);
-        /* Need to repopulate options */
-        av_dict_free(&opts);
-        av_dict_set(&opts, "seekable", "0", 0);
-        if ((ret = ffurl_connect(var->input, &opts)) < 0) {
-            ffurl_close(var->input);
-            var->input = NULL;
+        av_opt_set(pls->input->priv_data, "key", key, 0);
+        av_opt_set(pls->input->priv_data, "iv", iv, 0);
+
+        if ((ret = ffurl_connect(pls->input, &opts)) < 0) {
+            ffurl_close(pls->input);
+            pls->input = NULL;
             goto cleanup;
         }
         ret = 0;
@@ -398,19 +447,20 @@
 
 cleanup:
     av_dict_free(&opts);
+    av_dict_free(&opts2);
     return ret;
 }
 
 static int read_data(void *opaque, uint8_t *buf, int buf_size)
 {
-    struct variant *v = opaque;
+    struct playlist *v = opaque;
     HLSContext *c = v->parent->priv_data;
     int ret, i;
 
 restart:
     if (!v->input) {
         /* If this is a live stream and the reload interval has elapsed since
-         * the last playlist reload, reload the variant playlists now. */
+         * the last playlist reload, reload the playlists now. */
         int64_t reload_interval = v->n_segments > 0 ?
                                   v->segments[v->n_segments - 1]->duration :
                                   v->target_duration;
@@ -467,13 +517,32 @@
         }
     }
     if (!v->needed) {
-        av_log(v->parent, AV_LOG_INFO, "No longer receiving variant %d\n",
+        av_log(v->parent, AV_LOG_INFO, "No longer receiving playlist %d\n",
                v->index);
         return AVERROR_EOF;
     }
     goto restart;
 }
 
+static int playlist_in_multiple_variants(HLSContext *c, struct playlist *pls)
+{
+    int variant_count = 0;
+    int i, j;
+
+    for (i = 0; i < c->n_variants && variant_count < 2; i++) {
+        struct variant *v = c->variants[i];
+
+        for (j = 0; j < v->n_playlists; j++) {
+            if (v->playlists[j] == pls) {
+                variant_count++;
+                break;
+            }
+        }
+    }
+
+    return variant_count >= 2;
+}
+
 static int hls_read_header(AVFormatContext *s)
 {
     URLContext *u = (s->flags & AVFMT_FLAG_CUSTOM_IO) ? NULL : s->pb->opaque;
@@ -495,6 +564,12 @@
         av_opt_get(u->priv_data, "cookies", 0, (uint8_t**)&(c->cookies));
         if (c->cookies && !strlen(c->cookies))
             av_freep(&c->cookies);
+
+        // get the previous headers & set back to null if string size is zero
+        av_freep(&c->headers);
+        av_opt_get(u->priv_data, "headers", 0, (uint8_t**)&(c->headers));
+        if (c->headers && !strlen(c->headers))
+            av_freep(&c->headers);
     }
 
     if ((ret = parse_playlist(c, s->filename, NULL, s->pb)) < 0)
@@ -505,17 +580,17 @@
         ret = AVERROR_EOF;
         goto fail;
     }
-    /* If the playlist only contained variants, parse each individual
-     * variant playlist. */
-    if (c->n_variants > 1 || c->variants[0]->n_segments == 0) {
-        for (i = 0; i < c->n_variants; i++) {
-            struct variant *v = c->variants[i];
-            if ((ret = parse_playlist(c, v->url, v, NULL)) < 0)
+    /* If the playlist only contained playlists (Master Playlist),
+     * parse each individual playlist. */
+    if (c->n_playlists > 1 || c->playlists[0]->n_segments == 0) {
+        for (i = 0; i < c->n_playlists; i++) {
+            struct playlist *pls = c->playlists[i];
+            if ((ret = parse_playlist(c, pls->url, pls, NULL)) < 0)
                 goto fail;
         }
     }
 
-    if (c->variants[0]->n_segments == 0) {
+    if (c->variants[0]->playlists[0]->n_segments == 0) {
         av_log(NULL, AV_LOG_WARNING, "Empty playlist\n");
         ret = AVERROR_EOF;
         goto fail;
@@ -523,88 +598,107 @@
 
     /* If this isn't a live stream, calculate the total duration of the
      * stream. */
-    if (c->variants[0]->finished) {
+    if (c->variants[0]->playlists[0]->finished) {
         int64_t duration = 0;
-        for (i = 0; i < c->variants[0]->n_segments; i++)
-            duration += c->variants[0]->segments[i]->duration;
+        for (i = 0; i < c->variants[0]->playlists[0]->n_segments; i++)
+            duration += c->variants[0]->playlists[0]->segments[i]->duration;
         s->duration = duration;
     }
 
-    /* Open the demuxer for each variant */
-    for (i = 0; i < c->n_variants; i++) {
-        struct variant *v = c->variants[i];
+    /* Open the demuxer for each playlist */
+    for (i = 0; i < c->n_playlists; i++) {
+        struct playlist *pls = c->playlists[i];
         AVInputFormat *in_fmt = NULL;
-        char bitrate_str[20];
-        AVProgram *program;
 
-        if (v->n_segments == 0)
+        if (pls->n_segments == 0)
             continue;
 
-        if (!(v->ctx = avformat_alloc_context())) {
+        if (!(pls->ctx = avformat_alloc_context())) {
             ret = AVERROR(ENOMEM);
             goto fail;
         }
 
-        v->index  = i;
-        v->needed = 1;
-        v->parent = s;
+        pls->index  = i;
+        pls->needed = 1;
+        pls->parent = s;
 
         /* If this is a live stream with more than 3 segments, start at the
          * third last segment. */
-        v->cur_seq_no = v->start_seq_no;
-        if (!v->finished && v->n_segments > 3)
-            v->cur_seq_no = v->start_seq_no + v->n_segments - 3;
+        pls->cur_seq_no = pls->start_seq_no;
+        if (!pls->finished && pls->n_segments > 3)
+            pls->cur_seq_no = pls->start_seq_no + pls->n_segments - 3;
 
-        v->read_buffer = av_malloc(INITIAL_BUFFER_SIZE);
-        ffio_init_context(&v->pb, v->read_buffer, INITIAL_BUFFER_SIZE, 0, v,
+        pls->read_buffer = av_malloc(INITIAL_BUFFER_SIZE);
+        ffio_init_context(&pls->pb, pls->read_buffer, INITIAL_BUFFER_SIZE, 0, pls,
                           read_data, NULL, NULL);
-        v->pb.seekable = 0;
-        ret = av_probe_input_buffer(&v->pb, &in_fmt, v->segments[0]->url,
+        pls->pb.seekable = 0;
+        ret = av_probe_input_buffer(&pls->pb, &in_fmt, pls->segments[0]->url,
                                     NULL, 0, 0);
         if (ret < 0) {
             /* Free the ctx - it isn't initialized properly at this point,
              * so avformat_close_input shouldn't be called. If
              * avformat_open_input fails below, it frees and zeros the
              * context, so it doesn't need any special treatment like this. */
-            av_log(s, AV_LOG_ERROR, "Error when loading first segment '%s'\n", v->segments[0]->url);
-            avformat_free_context(v->ctx);
-            v->ctx = NULL;
+            av_log(s, AV_LOG_ERROR, "Error when loading first segment '%s'\n", pls->segments[0]->url);
+            avformat_free_context(pls->ctx);
+            pls->ctx = NULL;
             goto fail;
         }
-        v->ctx->pb       = &v->pb;
-        v->stream_offset = stream_offset;
-        ret = avformat_open_input(&v->ctx, v->segments[0]->url, in_fmt, NULL);
+        pls->ctx->pb       = &pls->pb;
+        pls->stream_offset = stream_offset;
+        ret = avformat_open_input(&pls->ctx, pls->segments[0]->url, in_fmt, NULL);
         if (ret < 0)
             goto fail;
 
-        v->ctx->ctx_flags &= ~AVFMTCTX_NOHEADER;
-        ret = avformat_find_stream_info(v->ctx, NULL);
+        pls->ctx->ctx_flags &= ~AVFMTCTX_NOHEADER;
+        ret = avformat_find_stream_info(pls->ctx, NULL);
         if (ret < 0)
             goto fail;
-        snprintf(bitrate_str, sizeof(bitrate_str), "%d", v->bandwidth);
-
-        program = av_new_program(s, i);
-        if (!program)
-            goto fail;
-        av_dict_set(&program->metadata, "variant_bitrate", bitrate_str, 0);
 
-        /* Create new AVStreams for each stream in this variant */
-        for (j = 0; j < v->ctx->nb_streams; j++) {
+        /* Create new AVStreams for each stream in this playlist */
+        for (j = 0; j < pls->ctx->nb_streams; j++) {
             AVStream *st = avformat_new_stream(s, NULL);
-            AVStream *ist = v->ctx->streams[j];
+            AVStream *ist = pls->ctx->streams[j];
             if (!st) {
                 ret = AVERROR(ENOMEM);
                 goto fail;
             }
-            ff_program_add_stream_index(s, i, stream_offset + j);
             st->id = i;
             avpriv_set_pts_info(st, ist->pts_wrap_bits, ist->time_base.num, ist->time_base.den);
-            avcodec_copy_context(st->codec, v->ctx->streams[j]->codec);
-            if (v->bandwidth)
-                av_dict_set(&st->metadata, "variant_bitrate", bitrate_str,
-                                 0);
+            avcodec_copy_context(st->codec, pls->ctx->streams[j]->codec);
+        }
+
+        stream_offset += pls->ctx->nb_streams;
+    }
+
+    /* Create a program for each variant */
+    for (i = 0; i < c->n_variants; i++) {
+        struct variant *v = c->variants[i];
+        char bitrate_str[20];
+        AVProgram *program;
+
+        snprintf(bitrate_str, sizeof(bitrate_str), "%d", v->bandwidth);
+
+        program = av_new_program(s, i);
+        if (!program)
+            goto fail;
+        av_dict_set(&program->metadata, "variant_bitrate", bitrate_str, 0);
+
+        for (j = 0; j < v->n_playlists; j++) {
+            struct playlist *pls = v->playlists[j];
+            int is_shared = playlist_in_multiple_variants(c, pls);
+            int k;
+
+            for (k = 0; k < pls->ctx->nb_streams; k++) {
+                struct AVStream *st = s->streams[pls->stream_offset + k];
+
+                ff_program_add_stream_index(s, i, pls->stream_offset + k);
+
+                /* Set variant_bitrate for streams unique to this variant */
+                if (!is_shared && v->bandwidth)
+                    av_dict_set(&st->metadata, "variant_bitrate", bitrate_str, 0);
+            }
         }
-        stream_offset += v->ctx->nb_streams;
     }
 
     c->first_packet = 1;
@@ -613,6 +707,7 @@
 
     return 0;
 fail:
+    free_playlist_list(c);
     free_variant_list(c);
     return ret;
 }
@@ -623,30 +718,30 @@
     int i, changed = 0;
 
     /* Check if any new streams are needed */
-    for (i = 0; i < c->n_variants; i++)
-        c->variants[i]->cur_needed = 0;
+    for (i = 0; i < c->n_playlists; i++)
+        c->playlists[i]->cur_needed = 0;
 
     for (i = 0; i < s->nb_streams; i++) {
         AVStream *st = s->streams[i];
-        struct variant *var = c->variants[s->streams[i]->id];
+        struct playlist *pls = c->playlists[s->streams[i]->id];
         if (st->discard < AVDISCARD_ALL)
-            var->cur_needed = 1;
+            pls->cur_needed = 1;
     }
-    for (i = 0; i < c->n_variants; i++) {
-        struct variant *v = c->variants[i];
-        if (v->cur_needed && !v->needed) {
-            v->needed = 1;
+    for (i = 0; i < c->n_playlists; i++) {
+        struct playlist *pls = c->playlists[i];
+        if (pls->cur_needed && !pls->needed) {
+            pls->needed = 1;
             changed = 1;
-            v->cur_seq_no = c->cur_seq_no;
-            v->pb.eof_reached = 0;
-            av_log(s, AV_LOG_INFO, "Now receiving variant %d\n", i);
-        } else if (first && !v->cur_needed && v->needed) {
-            if (v->input)
-                ffurl_close(v->input);
-            v->input = NULL;
-            v->needed = 0;
+            pls->cur_seq_no = c->cur_seq_no;
+            pls->pb.eof_reached = 0;
+            av_log(s, AV_LOG_INFO, "Now receiving playlist %d\n", i);
+        } else if (first && !pls->cur_needed && pls->needed) {
+            if (pls->input)
+                ffurl_close(pls->input);
+            pls->input = NULL;
+            pls->needed = 0;
             changed = 1;
-            av_log(s, AV_LOG_INFO, "No longer receiving variant %d\n", i);
+            av_log(s, AV_LOG_INFO, "No longer receiving playlist %d\n", i);
         }
     }
     return changed;
@@ -655,7 +750,7 @@
 static int hls_read_packet(AVFormatContext *s, AVPacket *pkt)
 {
     HLSContext *c = s->priv_data;
-    int ret, i, minvariant = -1;
+    int ret, i, minplaylist = -1;
 
     if (c->first_packet) {
         recheck_discard_flags(s, 1);
@@ -664,63 +759,64 @@
 
 start:
     c->end_of_segment = 0;
-    for (i = 0; i < c->n_variants; i++) {
-        struct variant *var = c->variants[i];
-        /* Make sure we've got one buffered packet from each open variant
+    for (i = 0; i < c->n_playlists; i++) {
+        struct playlist *pls = c->playlists[i];
+        /* Make sure we've got one buffered packet from each open playlist
          * stream */
-        if (var->needed && !var->pkt.data) {
+        if (pls->needed && !pls->pkt.data) {
             while (1) {
                 int64_t ts_diff;
                 AVStream *st;
-                ret = av_read_frame(var->ctx, &var->pkt);
+                ret = av_read_frame(pls->ctx, &pls->pkt);
                 if (ret < 0) {
-                    if (!url_feof(&var->pb) && ret != AVERROR_EOF)
+                    if (!url_feof(&pls->pb) && ret != AVERROR_EOF)
                         return ret;
-                    reset_packet(&var->pkt);
+                    reset_packet(&pls->pkt);
                     break;
                 } else {
                     if (c->first_timestamp == AV_NOPTS_VALUE &&
-                        var->pkt.dts       != AV_NOPTS_VALUE)
-                        c->first_timestamp = av_rescale_q(var->pkt.dts,
-                            var->ctx->streams[var->pkt.stream_index]->time_base,
+                        pls->pkt.dts       != AV_NOPTS_VALUE)
+                        c->first_timestamp = av_rescale_q(pls->pkt.dts,
+                            pls->ctx->streams[pls->pkt.stream_index]->time_base,
                             AV_TIME_BASE_Q);
                 }
 
                 if (c->seek_timestamp == AV_NOPTS_VALUE)
                     break;
 
-                if (var->pkt.dts == AV_NOPTS_VALUE) {
+                if (pls->pkt.dts == AV_NOPTS_VALUE) {
                     c->seek_timestamp = AV_NOPTS_VALUE;
                     break;
                 }
 
-                st = var->ctx->streams[var->pkt.stream_index];
-                ts_diff = av_rescale_rnd(var->pkt.dts, AV_TIME_BASE,
+                st = pls->ctx->streams[pls->pkt.stream_index];
+                ts_diff = av_rescale_rnd(pls->pkt.dts, AV_TIME_BASE,
                                          st->time_base.den, AV_ROUND_DOWN) -
                           c->seek_timestamp;
                 if (ts_diff >= 0 && (c->seek_flags  & AVSEEK_FLAG_ANY ||
-                                     var->pkt.flags & AV_PKT_FLAG_KEY)) {
+                                     pls->pkt.flags & AV_PKT_FLAG_KEY)) {
                     c->seek_timestamp = AV_NOPTS_VALUE;
                     break;
                 }
-                av_free_packet(&var->pkt);
-                reset_packet(&var->pkt);
+                av_free_packet(&pls->pkt);
+                reset_packet(&pls->pkt);
             }
         }
         /* Check if this stream still is on an earlier segment number, or
          * has the packet with the lowest dts */
-        if (var->pkt.data) {
-            struct variant *minvar = c->variants[minvariant];
-            if (minvariant < 0 || var->cur_seq_no < minvar->cur_seq_no) {
-                minvariant = i;
-            } else if (var->cur_seq_no == minvar->cur_seq_no) {
-                int64_t dts     =    var->pkt.dts;
-                int64_t mindts  = minvar->pkt.dts;
-                AVStream *st    =    var->ctx->streams[var->pkt.stream_index];
-                AVStream *minst = minvar->ctx->streams[minvar->pkt.stream_index];
+        if (pls->pkt.data) {
+            struct playlist *minpls = minplaylist < 0 ?
+                                     NULL : c->playlists[minplaylist];
+            if (minplaylist < 0 || pls->cur_seq_no < minpls->cur_seq_no) {
+                minplaylist = i;
+            } else if (pls->cur_seq_no == minpls->cur_seq_no) {
+                int64_t dts     =    pls->pkt.dts;
+                int64_t mindts  = minpls->pkt.dts;
+                AVStream *st    =    pls->ctx->streams[pls->pkt.stream_index];
+                AVStream *minst = minpls->ctx->streams[minpls->pkt.stream_index];
 
                 if (dts == AV_NOPTS_VALUE) {
-                    minvariant = i;
+                    minplaylist = i;
                 } else if (mindts != AV_NOPTS_VALUE) {
                     if (st->start_time    != AV_NOPTS_VALUE)
                         dts    -= st->start_time;
@@ -729,7 +825,7 @@
 
                     if (av_compare_ts(dts, st->time_base,
                                       mindts, minst->time_base) < 0)
-                        minvariant = i;
+                        minplaylist = i;
                 }
             }
         }
@@ -739,10 +835,10 @@
             goto start;
     }
     /* If we got a packet, return it */
-    if (minvariant >= 0) {
-        *pkt = c->variants[minvariant]->pkt;
-        pkt->stream_index += c->variants[minvariant]->stream_offset;
-        reset_packet(&c->variants[minvariant]->pkt);
+    if (minplaylist >= 0) {
+        *pkt = c->playlists[minplaylist]->pkt;
+        pkt->stream_index += c->playlists[minplaylist]->stream_offset;
+        reset_packet(&c->playlists[minplaylist]->pkt);
         return 0;
     }
     return AVERROR_EOF;
@@ -752,6 +848,7 @@
 {
     HLSContext *c = s->priv_data;
 
+    free_playlist_list(c);
     free_variant_list(c);
     return 0;
 }
@@ -762,7 +859,7 @@
     HLSContext *c = s->priv_data;
     int i, j, ret;
 
-    if ((flags & AVSEEK_FLAG_BYTE) || !c->variants[0]->finished)
+    if ((flags & AVSEEK_FLAG_BYTE) || !c->variants[0]->playlists[0]->finished)
         return AVERROR(ENOSYS);
 
     c->seek_flags     = flags;
@@ -781,32 +878,32 @@
     }
 
     ret = AVERROR(EIO);
-    for (i = 0; i < c->n_variants; i++) {
+    for (i = 0; i < c->n_playlists; i++) {
         /* Reset reading */
-        struct variant *var = c->variants[i];
+        struct playlist *pls = c->playlists[i];
         int64_t pos = c->first_timestamp == AV_NOPTS_VALUE ?
                       0 : c->first_timestamp;
-        if (var->input) {
-            ffurl_close(var->input);
-            var->input = NULL;
+        if (pls->input) {
+            ffurl_close(pls->input);
+            pls->input = NULL;
         }
-        av_free_packet(&var->pkt);
-        reset_packet(&var->pkt);
-        var->pb.eof_reached = 0;
+        av_free_packet(&pls->pkt);
+        reset_packet(&pls->pkt);
+        pls->pb.eof_reached = 0;
         /* Clear any buffered data */
-        var->pb.buf_end = var->pb.buf_ptr = var->pb.buffer;
+        pls->pb.buf_end = pls->pb.buf_ptr = pls->pb.buffer;
         /* Reset the pos, to let the mpegts demuxer know we've seeked. */
-        var->pb.pos = 0;
+        pls->pb.pos = 0;
 
         /* Locate the segment that contains the target timestamp */
-        for (j = 0; j < var->n_segments; j++) {
+        for (j = 0; j < pls->n_segments; j++) {
             if (timestamp >= pos &&
-                timestamp < pos + var->segments[j]->duration) {
-                var->cur_seq_no = var->start_seq_no + j;
+                timestamp < pos + pls->segments[j]->duration) {
+                pls->cur_seq_no = pls->start_seq_no + j;
                 ret = 0;
                 break;
             }
-            pos += var->segments[j]->duration;
+            pos += pls->segments[j]->duration;
         }
         if (ret)
             c->seek_timestamp = AV_NOPTS_VALUE;

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/hlsenc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/hlsenc.c Changed

omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/hnm.c Added

@@ -0,0 +1,204 @@
+/*
+ * Cryo Interactive Entertainment HNM4 demuxer
+ *
+ * Copyright (c) 2012 David Kment
+ *
+ * This file is part of FFmpeg .
+ *
+ * FFmpeg  is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg  is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg ; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "libavutil/intreadwrite.h"
+#include "avformat.h"
+#include "internal.h"
+
+#define HNM4_TAG MKTAG('H', 'N', 'M', '4')
+
+#define HNM4_SAMPLE_RATE 22050
+#define HNM4_FRAME_FPS 24
+
+#define HNM4_CHUNK_ID_PL 19536
+#define HNM4_CHUNK_ID_IZ 23113
+#define HNM4_CHUNK_ID_IU 21833
+#define HNM4_CHUNK_ID_SD 17491
+
+typedef struct Hnm4DemuxContext {
+    uint8_t version;
+    uint16_t width;
+    uint16_t height;
+    uint32_t filesize;
+    uint32_t frames;
+    uint32_t taboffset;
+    uint16_t bits;
+    uint16_t channels;
+    uint32_t framesize;
+    uint32_t currentframe;
+    int64_t pts;
+    uint32_t superchunk_remaining;
+    AVPacket vpkt;
+} Hnm4DemuxContext;
+
+static int hnm_probe(AVProbeData *p)
+{
+    if (p->buf_size < 4)
+        return 0;
+
+    // check for HNM4 header.
+    // currently only HNM v4/v4A is supported
+    if (AV_RL32(&p->buf[0]) == HNM4_TAG)
+        return AVPROBE_SCORE_MAX;
+
+    return 0;
+}
+
+static int hnm_read_header(AVFormatContext *s)
+{
+    Hnm4DemuxContext *hnm = s->priv_data;
+    AVIOContext *pb = s->pb;
+    AVStream *vst;
+
+    /* default context members */
+    hnm->pts = 0;
+    av_init_packet(&hnm->vpkt);
+    hnm->vpkt.data = NULL;
+    hnm->vpkt.size = 0;
+
+    hnm->superchunk_remaining = 0;
+
+    avio_skip(pb, 8);
+    hnm->width     = avio_rl16(pb);
+    hnm->height    = avio_rl16(pb);
+    hnm->filesize  = avio_rl32(pb);
+    hnm->frames    = avio_rl32(pb);
+    hnm->taboffset = avio_rl32(pb);
+    hnm->bits      = avio_rl16(pb);
+    hnm->channels  = avio_rl16(pb);
+    hnm->framesize = avio_rl32(pb);
+    avio_skip(pb, 32);
+
+    hnm->currentframe = 0;
+
+    if (hnm->width  < 320 || hnm->width  > 640 ||
+        hnm->height < 150 || hnm->height > 480) {
+        av_log(s, AV_LOG_ERROR,
+               "invalid resolution: %ux%u\n", hnm->width, hnm->height);
+        return AVERROR_INVALIDDATA;
+    }
+
+    // TODO: find a better way to detect HNM4A
+    if (hnm->width == 640)
+        hnm->version = 0x4a;
+    else
+        hnm->version = 0x40;
+
+    if (!(vst = avformat_new_stream(s, NULL)))
+        return AVERROR(ENOMEM);
+
+    vst->codec->codec_type = AVMEDIA_TYPE_VIDEO;
+    vst->codec->codec_id   = AV_CODEC_ID_HNM4_VIDEO;
+    vst->codec->codec_tag  = 0;
+    vst->codec->width      = hnm->width;
+    vst->codec->height     = hnm->height;
+    vst->codec->extradata  = av_mallocz(1);
+
+    vst->codec->extradata_size = 1;
+    memcpy(vst->codec->extradata, &hnm->version, 1);
+
+    vst->start_time = 0;
+
+    avpriv_set_pts_info(vst, 33, 1, HNM4_FRAME_FPS);
+
+    return 0;
+}
+
+static int hnm_read_packet(AVFormatContext *s, AVPacket *pkt)
+{
+    Hnm4DemuxContext *hnm = s->priv_data;
+    AVIOContext *pb = s->pb;
+    int ret = 0;
+
+    uint32_t superchunk_size, chunk_size;
+    uint16_t chunk_id;
+
+    if (hnm->currentframe == hnm->frames || pb->eof_reached)
+        return AVERROR_EOF;
+
+    if (hnm->superchunk_remaining == 0) {
+        /* parse next superchunk */
+        superchunk_size = avio_rl24(pb);
+        avio_skip(pb, 1);
+
+        hnm->superchunk_remaining = superchunk_size - 4;
+    }
+
+    chunk_size = avio_rl24(pb);
+    avio_skip(pb, 1);
+    chunk_id = avio_rl16(pb);
+    avio_skip(pb, 2);
+
+    if (chunk_size > hnm->superchunk_remaining || !chunk_size) {
+        av_log(s, AV_LOG_ERROR, "invalid chunk size: %u, offset: %u\n",
+               chunk_size, (int) avio_tell(pb));
+        avio_skip(pb, hnm->superchunk_remaining - 8);
+        hnm->superchunk_remaining = 0;
+    }
+
+    switch (chunk_id) {
+    case HNM4_CHUNK_ID_PL:
+    case HNM4_CHUNK_ID_IZ:
+    case HNM4_CHUNK_ID_IU:
+        avio_seek(pb, -8, SEEK_CUR);
+        ret += av_get_packet(pb, pkt, chunk_size);
+        hnm->superchunk_remaining -= chunk_size;
+        if (chunk_id == HNM4_CHUNK_ID_IZ || chunk_id == HNM4_CHUNK_ID_IU)
+            hnm->currentframe++;
+        break;
+
+    case HNM4_CHUNK_ID_SD:
+        avio_skip(pb, chunk_size - 8);
+        hnm->superchunk_remaining -= chunk_size;
+        break;
+
+    default:
+        av_log(s, AV_LOG_WARNING, "unknown chunk found: %d, offset: %d\n",
+               chunk_id, (int) avio_tell(pb));
+        avio_skip(pb, chunk_size - 8);
+        hnm->superchunk_remaining -= chunk_size;
+        break;
+    }
+
+    return ret;
+}
+
+static int hnm_read_close(AVFormatContext *s)
+{
+    Hnm4DemuxContext *hnm = s->priv_data;
+
+    if (hnm->vpkt.size > 0)
+        av_free_packet(&hnm->vpkt);
+
+    return 0;
+}
+
+AVInputFormat ff_hnm_demuxer = {
+    .name           = "hnm",
+    .long_name      = NULL_IF_CONFIG_SMALL("Cryo HNM v4"),
+    .priv_data_size = sizeof(Hnm4DemuxContext),
+    .read_probe     = hnm_probe,
+    .read_header    = hnm_read_header,
+    .read_packet    = hnm_read_packet,
+    .read_close     = hnm_read_close,
+    .flags          = AVFMT_NO_BYTE_SEEK | AVFMT_NOGENSEARCH | AVFMT_NOBINSEARCH
+};

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/http.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/http.c Changed

@@ -49,28 +49,37 @@
     unsigned char buffer[BUFFER_SIZE], *buf_ptr, *buf_end;
     int line_count;
     int http_code;
-    int64_t chunksize;      /**< Used if "Transfer-Encoding: chunked" otherwise -1. */
-    char *content_type;
-    char *user_agent;
-    int64_t off, filesize;
-    int icy_data_read;      ///< how much data was read since last ICY metadata packet
-    int icy_metaint;        ///< after how many bytes of read data a new metadata packet will be found
-    char location[MAX_URL_SIZE];
+    /* Used if "Transfer-Encoding: chunked" otherwise -1. */
+    int64_t chunksize;
+    int64_t off, end_off, filesize;
+    char *location;
     HTTPAuthState auth_state;
     HTTPAuthState proxy_auth_state;
     char *headers;
-    int willclose;          /**< Set if the server correctly handles Connection: close and will close the connection after feeding us the content. */
+    char *mime_type;
+    char *user_agent;
+    char *content_type;
+    /* Set if the server correctly handles Connection: close and will close
+     * the connection after feeding us the content. */
+    int willclose;
     int seekable;           /**< Control seekability, 0 = disable, 1 = enable, -1 = probe. */
     int chunked_post;
-    int end_chunked_post;   /**< A flag which indicates if the end of chunked encoding has been sent. */
-    int end_header;         /**< A flag which indicates we have finished to read POST reply. */
-    int multiple_requests;  /**< A flag which indicates if we use persistent connections. */
+    /* A flag which indicates if the end of chunked encoding has been sent. */
+    int end_chunked_post;
+    /* A flag which indicates we have finished to read POST reply. */
+    int end_header;
+    /* A flag which indicates if we use persistent connections. */
+    int multiple_requests;
     uint8_t *post_data;
     int post_datalen;
     int is_akamai;
-    char *mime_type;
+    int is_mediagateway;
     char *cookies;          ///< holds newline (\n) delimited Set-Cookie header field values (without the "Set-Cookie: " field name)
     int icy;
+    /* how much data was read since the last ICY metadata packet */
+    int icy_data_read;
+    /* after how many bytes of read data a new metadata packet will be found */
+    int icy_metaint;
     char *icy_metadata_headers;
     char *icy_metadata_packet;
 #if CONFIG_ZLIB
@@ -90,19 +99,23 @@
 {"seekable", "control seekability of connection", OFFSET(seekable), AV_OPT_TYPE_INT, {.i64 = -1}, -1, 1, D },
 {"chunked_post", "use chunked transfer-encoding for posts", OFFSET(chunked_post), AV_OPT_TYPE_INT, {.i64 = 1}, 0, 1, E },
 {"headers", "set custom HTTP headers, can override built in default headers", OFFSET(headers), AV_OPT_TYPE_STRING, { 0 }, 0, 0, D|E },
-{"content_type", "force a content type", OFFSET(content_type), AV_OPT_TYPE_STRING, { 0 }, 0, 0, D|E },
+{"content_type", "set a specific content type for the POST messages", OFFSET(content_type), AV_OPT_TYPE_STRING, { 0 }, 0, 0, D|E },
+{"user_agent", "override User-Agent header", OFFSET(user_agent), AV_OPT_TYPE_STRING, {.str = DEFAULT_USER_AGENT}, 0, 0, D },
 {"user-agent", "override User-Agent header", OFFSET(user_agent), AV_OPT_TYPE_STRING, {.str = DEFAULT_USER_AGENT}, 0, 0, D },
 {"multiple_requests", "use persistent connections", OFFSET(multiple_requests), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, D|E },
 {"post_data", "set custom HTTP post data", OFFSET(post_data), AV_OPT_TYPE_BINARY, .flags = D|E },
-{"mime_type", "set MIME type", OFFSET(mime_type), AV_OPT_TYPE_STRING, {0}, 0, 0, 0 },
-{"cookies", "set cookies to be sent in applicable future requests, use newline delimited Set-Cookie HTTP field value syntax", OFFSET(cookies), AV_OPT_TYPE_STRING, {0}, 0, 0, 0 },
+{"mime_type", "export the MIME type", OFFSET(mime_type), AV_OPT_TYPE_STRING, {0}, 0, 0, AV_OPT_FLAG_EXPORT | AV_OPT_FLAG_READONLY  },
+{"cookies", "set cookies to be sent in applicable future requests, use newline delimited Set-Cookie HTTP field value syntax", OFFSET(cookies), AV_OPT_TYPE_STRING, {0}, 0, 0, D },
 {"icy", "request ICY metadata", OFFSET(icy), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, D },
-{"icy_metadata_headers", "return ICY metadata headers", OFFSET(icy_metadata_headers), AV_OPT_TYPE_STRING, {0}, 0, 0, 0 },
-{"icy_metadata_packet", "return current ICY metadata packet", OFFSET(icy_metadata_packet), AV_OPT_TYPE_STRING, {0}, 0, 0, 0 },
+{"icy_metadata_headers", "return ICY metadata headers", OFFSET(icy_metadata_headers), AV_OPT_TYPE_STRING, {0}, 0, 0, AV_OPT_FLAG_EXPORT },
+{"icy_metadata_packet", "return current ICY metadata packet", OFFSET(icy_metadata_packet), AV_OPT_TYPE_STRING, {0}, 0, 0, AV_OPT_FLAG_EXPORT },
 {"auth_type", "HTTP authentication type", OFFSET(auth_state.auth_type), AV_OPT_TYPE_INT, {.i64 = HTTP_AUTH_NONE}, HTTP_AUTH_NONE, HTTP_AUTH_BASIC, D|E, "auth_type" },
 {"none", "No auth method set, autodetect", 0, AV_OPT_TYPE_CONST, {.i64 = HTTP_AUTH_NONE}, 0, 0, D|E, "auth_type" },
 {"basic", "HTTP basic authentication", 0, AV_OPT_TYPE_CONST, {.i64 = HTTP_AUTH_BASIC}, 0, 0, D|E, "auth_type" },
-{"send_expect_100", "Force sending an Expect: 100-continue header for POST", OFFSET(send_expect_100), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, E, "auth_type" },
+{"send_expect_100", "Force sending an Expect: 100-continue header for POST", OFFSET(send_expect_100), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, E },
+{"location", "The actual location of the data received", OFFSET(location), AV_OPT_TYPE_STRING, { 0 }, 0, 0, D|E },
+{"offset", "initial byte offset", OFFSET(off), AV_OPT_TYPE_INT64, {.i64 = 0}, 0, INT64_MAX, D },
+{"end_offset", "try to limit the request to bytes preceding this offset", OFFSET(end_off), AV_OPT_TYPE_INT64, {.i64 = 0}, 0, INT64_MAX, D },
 {NULL}
 };
 #define HTTP_CLASS(flavor)\
@@ -235,7 +248,10 @@
 
     s->off = 0;
     s->icy_data_read = 0;
-    av_strlcpy(s->location, uri, sizeof(s->location));
+    av_free(s->location);
+    s->location = av_strdup(uri);
+    if (!s->location)
+        return AVERROR(ENOMEM);
 
     av_dict_copy(&options, s->chained_options, 0);
     ret = http_open_cnx(h, &options);
@@ -255,7 +271,9 @@
         h->is_streamed = 1;
 
     s->filesize = -1;
-    av_strlcpy(s->location, uri, sizeof(s->location));
+    s->location = av_strdup(uri);
+    if (!s->location)
+        return AVERROR(ENOMEM);
     if (options)
         av_dict_copy(&s->chained_options, *options, 0);
 
@@ -278,7 +296,7 @@
         if (len < 0) {
             return len;
         } else if (len == 0) {
-            return -1;
+            return AVERROR_EOF;
         } else {
             s->buf_ptr = s->buffer;
             s->buf_end = s->buffer + len;
@@ -311,12 +329,110 @@
     }
 }
 
+static int check_http_code(URLContext *h, int http_code, const char *end)
+{
+    HTTPContext *s = h->priv_data;
+    /* error codes are 4xx and 5xx, but regard 401 as a success, so we
+     * don't abort until all headers have been parsed. */
+    if (http_code >= 400 && http_code < 600 &&
+        (http_code != 401 || s->auth_state.auth_type != HTTP_AUTH_NONE) &&
+        (http_code != 407 || s->proxy_auth_state.auth_type != HTTP_AUTH_NONE)) {
+        end += strspn(end, SPACE_CHARS);
+        av_log(h, AV_LOG_WARNING, "HTTP error %d %s\n", http_code, end);
+        return AVERROR(EIO);
+    }
+    return 0;
+}
+
+static int parse_location(HTTPContext *s, const char *p)
+{
+    char redirected_location[MAX_URL_SIZE], *new_loc;
+    ff_make_absolute_url(redirected_location, sizeof(redirected_location),
+                         s->location, p);
+    new_loc = av_strdup(redirected_location);
+    if (!new_loc)
+        return AVERROR(ENOMEM);
+    av_free(s->location);
+    s->location = new_loc;
+    return 0;
+}
+
+/* "bytes $from-$to/$document_size" */
+static void parse_content_range(URLContext *h, const char *p)
+{
+    HTTPContext *s = h->priv_data;
+    const char *slash;
+
+    if (!strncmp(p, "bytes ", 6)) {
+        p += 6;
+        s->off = strtoll(p, NULL, 10);
+        if ((slash = strchr(p, '/')) && strlen(slash) > 0)
+            s->filesize = strtoll(slash+1, NULL, 10);
+    }
+    if (s->seekable == -1 && (!s->is_akamai || s->filesize != 2147483647))
+        h->is_streamed = 0; /* we _can_ in fact seek */
+}
+
+static int parse_content_encoding(URLContext *h, const char *p)
+{
+    HTTPContext *s = h->priv_data;
+
+    if (!av_strncasecmp(p, "gzip", 4) ||
+        !av_strncasecmp(p, "deflate", 7)) {
+#if CONFIG_ZLIB
+        s->compressed = 1;
+        inflateEnd(&s->inflate_stream);
+        if (inflateInit2(&s->inflate_stream, 32 + 15) != Z_OK) {
+            av_log(h, AV_LOG_WARNING, "Error during zlib initialisation: %s\n",
+                   s->inflate_stream.msg);
+            return AVERROR(ENOSYS);
+        }
+        if (zlibCompileFlags() & (1 << 17)) {
+            av_log(h, AV_LOG_WARNING,
+                   "Your zlib was compiled without gzip support.\n");
+            return AVERROR(ENOSYS);
+        }
+#else
+        av_log(h, AV_LOG_WARNING,
+               "Compressed (%s) content, need zlib with gzip support\n", p);
+        return AVERROR(ENOSYS);
+#endif
+    } else if (!av_strncasecmp(p, "identity", 8)) {
+        // The normal, no-encoding case (although servers shouldn't include
+        // the header at all if this is the case).
+    } else {
+        av_log(h, AV_LOG_WARNING, "Unknown content coding: %s\n", p);
+    }
+    return 0;
+}
+
+// Concat all Icy- header lines
+static int parse_icy(HTTPContext *s, const char *tag, const char *p)
+{
+    int len = 4 + strlen(p) + strlen(tag);
+    int is_first = !s->icy_metadata_headers;
+    int ret;
+
+    if (s->icy_metadata_headers)
+        len += strlen(s->icy_metadata_headers);
+
+    if ((ret = av_reallocp(&s->icy_metadata_headers, len)) < 0)
+        return ret;
+
+    if (is_first)
+        *s->icy_metadata_headers = '\0';
+
+    av_strlcatf(s->icy_metadata_headers, len, "%s: %s\n", tag, p);
+
+    return 0;
+}
+
 static int process_line(URLContext *h, char *line, int line_count,
                         int *new_location)
 {
     HTTPContext *s = h->priv_data;
     char *tag, *p, *end;
-    char redirected_location[MAX_URL_SIZE];
+    int ret;
 
     /* end of header */
     if (line[0] == '\0') {
@@ -332,18 +448,10 @@
             p++;
         s->http_code = strtol(p, &end, 10);
 
-        av_dlog(NULL, "http_code=%d\n", s->http_code);
-
-        /* error codes are 4xx and 5xx, but regard 401 as a success, so we
-         * don't abort until all headers have been parsed. */
-        if (s->http_code >= 400 && s->http_code < 600 && (s->http_code != 401
-            || s->auth_state.auth_type != HTTP_AUTH_NONE) &&
-            (s->http_code != 407 || s->proxy_auth_state.auth_type != HTTP_AUTH_NONE)) {
-            end += strspn(end, SPACE_CHARS);
-            av_log(h, AV_LOG_WARNING, "HTTP error %d %s\n",
-                   s->http_code, end);
-            return -1;
-        }
+        av_log(h, AV_LOG_DEBUG, "http_code=%d\n", s->http_code);
+
+        if ((ret = check_http_code(h, s->http_code, end)) < 0)
+            return ret;
     } else {
         while (*p != '\0' && *p != ':')
             p++;
@@ -356,40 +464,39 @@
         while (av_isspace(*p))
             p++;
         if (!av_strcasecmp(tag, "Location")) {
-            ff_make_absolute_url(redirected_location, sizeof(redirected_location), s->location, p);
-            av_strlcpy(s->location, redirected_location, sizeof(s->location));
+            if ((ret = parse_location(s, p)) < 0)
+                return ret;
             *new_location = 1;
-        } else if (!av_strcasecmp (tag, "Content-Length") && s->filesize == -1) {
+        } else if (!av_strcasecmp(tag, "Content-Length") && s->filesize == -1) {
             s->filesize = strtoll(p, NULL, 10);
-        } else if (!av_strcasecmp (tag, "Content-Range")) {
-            /* "bytes $from-$to/$document_size" */
-            const char *slash;
-            if (!strncmp (p, "bytes ", 6)) {
-                p += 6;
-                s->off = strtoll(p, NULL, 10);
-                if ((slash = strchr(p, '/')) && strlen(slash) > 0)
-                    s->filesize = strtoll(slash+1, NULL, 10);
-            }
-            if (s->seekable == -1 && (!s->is_akamai || s->filesize != 2147483647))
-                h->is_streamed = 0; /* we _can_ in fact seek */
-        } else if (!av_strcasecmp(tag, "Accept-Ranges") && !strncmp(p, "bytes", 5) && s->seekable == -1) {
+        } else if (!av_strcasecmp(tag, "Content-Range")) {
+            parse_content_range(h, p);
+        } else if (!av_strcasecmp(tag, "Accept-Ranges") &&
+                   !strncmp(p, "bytes", 5) &&
+                   s->seekable == -1) {
             h->is_streamed = 0;
-        } else if (!av_strcasecmp (tag, "Transfer-Encoding") && !av_strncasecmp(p, "chunked", 7)) {
+        } else if (!av_strcasecmp(tag, "Transfer-Encoding") &&
+                   !av_strncasecmp(p, "chunked", 7)) {
             s->filesize = -1;
             s->chunksize = 0;
-        } else if (!av_strcasecmp (tag, "WWW-Authenticate")) {
+        } else if (!av_strcasecmp(tag, "WWW-Authenticate")) {
             ff_http_auth_handle_header(&s->auth_state, tag, p);
-        } else if (!av_strcasecmp (tag, "Authentication-Info")) {
+        } else if (!av_strcasecmp(tag, "Authentication-Info")) {
             ff_http_auth_handle_header(&s->auth_state, tag, p);
-        } else if (!av_strcasecmp (tag, "Proxy-Authenticate")) {
+        } else if (!av_strcasecmp(tag, "Proxy-Authenticate")) {
             ff_http_auth_handle_header(&s->proxy_auth_state, tag, p);
-        } else if (!av_strcasecmp (tag, "Connection")) {
+        } else if (!av_strcasecmp(tag, "Connection")) {
             if (!strcmp(p, "close"))
                 s->willclose = 1;
-        } else if (!av_strcasecmp (tag, "Server") && !av_strcasecmp (p, "AkamaiGHost")) {
-            s->is_akamai = 1;
+        } else if (!av_strcasecmp (tag, "Server")) {
+            if (!av_strcasecmp (p, "AkamaiGHost")) {
+                s->is_akamai = 1;
+            } else if (!av_strncasecmp (p, "MediaGateway", 12)) {
+                s->is_mediagateway = 1;
+            }
         } else if (!av_strcasecmp (tag, "Content-Type")) {
-            av_free(s->mime_type); s->mime_type = av_strdup(p);
+            av_free(s->mime_type);
+            s->mime_type = av_strdup(p);
         } else if (!av_strcasecmp (tag, "Set-Cookie")) {
             if (!s->cookies) {
                 if (!(s->cookies = av_strdup(p)))
@@ -407,37 +514,11 @@
         } else if (!av_strcasecmp (tag, "Icy-MetaInt")) {
             s->icy_metaint = strtoll(p, NULL, 10);
         } else if (!av_strncasecmp(tag, "Icy-", 4)) {
-            // Concat all Icy- header lines
-            char *buf = av_asprintf("%s%s: %s\n",
-                s->icy_metadata_headers ? s->icy_metadata_headers : "", tag, p);
-            if (!buf)
-                return AVERROR(ENOMEM);
-            av_freep(&s->icy_metadata_headers);
-            s->icy_metadata_headers = buf;
-        } else if (!av_strcasecmp (tag, "Content-Encoding")) {
-            if (!av_strncasecmp(p, "gzip", 4) || !av_strncasecmp(p, "deflate", 7)) {
-#if CONFIG_ZLIB
-                s->compressed = 1;
-                inflateEnd(&s->inflate_stream);
-                if (inflateInit2(&s->inflate_stream, 32 + 15) != Z_OK) {
-                    av_log(h, AV_LOG_WARNING, "Error during zlib initialisation: %s\n",
-                           s->inflate_stream.msg);
-                    return AVERROR(ENOSYS);
-                }
-                if (zlibCompileFlags() & (1 << 17)) {
-                    av_log(h, AV_LOG_WARNING, "Your zlib was compiled without gzip support.\n");
-                    return AVERROR(ENOSYS);
-                }
-#else
-                av_log(h, AV_LOG_WARNING, "Compressed (%s) content, need zlib with gzip support\n", p);
-                return AVERROR(ENOSYS);
-#endif
-            } else if (!av_strncasecmp(p, "identity", 8)) {
-                // The normal, no-encoding case (although servers shouldn't include
-                // the header at all if this is the case).
-            } else {
-                av_log(h, AV_LOG_WARNING, "Unknown content coding: %s\n", p);
-            }
+            if ((ret = parse_icy(s, tag, p)) < 0)
+                return ret;
+        } else if (!av_strcasecmp(tag, "Content-Encoding")) {
+            if ((ret = parse_content_encoding(h, p)) < 0)
+                return ret;
         }
     }
     return 1;
@@ -472,8 +553,11 @@
                 av_free(cpath);
                 cpath = av_strdup(&param[5]);
             } else if (!av_strncasecmp("domain=", param, 7)) {
+                // if the cookie specifies a sub-domain, skip the leading dot thereby
+                // supporting URLs that point to sub-domains and the master domain
+                int leading_dot = (param[7] == '.');
                 av_free(cdomain);
-                cdomain = av_strdup(&param[7]);
+                cdomain = av_strdup(&param[7+leading_dot]);
             } else if (!av_strncasecmp("secure",  param, 6) ||
                        !av_strncasecmp("comment", param, 7) ||
                        !av_strncasecmp("max-age", param, 7) ||
@@ -560,7 +644,7 @@
         if ((err = http_get_line(s, line, sizeof(line))) < 0)
             return err;
 
-        av_dlog(NULL, "header='%s'\n", line);
+        av_log(h, AV_LOG_DEBUG, "header='%s'\n", line);
 
         err = process_line(h, line, s->line_count, new_location);
         if (err < 0)
@@ -570,6 +654,9 @@
         s->line_count++;
     }
 
+    if (s->seekable == -1 && s->is_mediagateway && s->filesize == 2000000000)
+        h->is_streamed = 1; /* we can in fact _not_ seek */
+
     return err;
 }
 
@@ -624,9 +711,15 @@
     // Note: we send this on purpose even when s->off is 0 when we're probing,
     // since it allows us to detect more reliably if a (non-conforming)
     // server supports seeking by analysing the reply headers.
-    if (!has_header(s->headers, "\r\nRange: ") && !post && (s->off > 0 || s->seekable == -1))
+    if (!has_header(s->headers, "\r\nRange: ") && !post && (s->off > 0 || s->end_off || s->seekable == -1)) {
         len += av_strlcatf(headers + len, sizeof(headers) - len,
-                           "Range: bytes=%"PRId64"-\r\n", s->off);
+                           "Range: bytes=%"PRId64"-", s->off);
+        if (s->end_off)
+            len += av_strlcatf(headers + len, sizeof(headers) - len,
+                               "%"PRId64, s->end_off - 1);
+        len += av_strlcpy(headers + len, "\r\n",
+                          sizeof(headers) - len);
+    }
     if (send_expect_100 && !has_header(s->headers, "\r\nExpect: "))
         len += av_strlcatf(headers + len, sizeof(headers) - len,
                            "Expect: 100-continue\r\n");
@@ -647,6 +740,7 @@
     if (!has_header(s->headers, "\r\nContent-Length: ") && s->post_data)
         len += av_strlcatf(headers + len, sizeof(headers) - len,
                            "Content-Length: %d\r\n", s->post_datalen);
+
     if (!has_header(s->headers, "\r\nContent-Type: ") && s->content_type)
         len += av_strlcatf(headers + len, sizeof(headers) - len,
                            "Content-Type: %s\r\n", s->content_type);
@@ -683,6 +777,9 @@
 
     av_freep(&authstr);
     av_freep(&proxyauthstr);
+
+    av_log(h, AV_LOG_DEBUG, "request: %s\n", s->buffer);
+
     if ((err = ffurl_write(s->hd, s->buffer, strlen(s->buffer))) < 0)
         return err;
 
@@ -735,7 +832,6 @@
     }
     if (len > 0) {
         s->off += len;
-        s->icy_data_read += len;
         if (s->chunksize > 0)
             s->chunksize -= len;
     }
@@ -774,7 +870,7 @@
 }
 #endif
 
-static int http_read(URLContext *h, uint8_t *buf, int size)
+static int http_read_stream(URLContext *h, uint8_t *buf, int size)
 {
     HTTPContext *s = h->priv_data;
     int err, new_location;
@@ -809,32 +905,6 @@
         }
         size = FFMIN(size, s->chunksize);
     }
-    if (s->icy_metaint > 0) {
-        int remaining = s->icy_metaint - s->icy_data_read; /* until next metadata packet */
-        if (!remaining) {
-            // The metadata packet is variable sized. It has a 1 byte header
-            // which sets the length of the packet (divided by 16). If it's 0,
-            // the metadata doesn't change. After the packet, icy_metaint bytes
-            // of normal data follow.
-            int ch = http_getc(s);
-            if (ch < 0)
-                return ch;
-            if (ch > 0) {
-                char data[255 * 16 + 1];
-                int n;
-                int ret;
-                ch *= 16;
-                for (n = 0; n < ch; n++)
-                    data[n] = http_getc(s);
-                data[ch + 1] = 0;
-                if ((ret = av_opt_set(s, "icy_metadata_packet", data, 0)) < 0)
-                    return ret;
-            }
-            s->icy_data_read = 0;
-            remaining = s->icy_metaint;
-        }
-        size = FFMIN(size, remaining);
-    }
 #if CONFIG_ZLIB
     if (s->compressed)
         return http_buf_read_compressed(h, buf, size);
@@ -842,6 +912,72 @@
     return http_buf_read(h, buf, size);
 }
 
+// Like http_read_stream(), but no short reads.
+// Assumes partial reads are an error.
+static int http_read_stream_all(URLContext *h, uint8_t *buf, int size)
+{
+    int pos = 0;
+    while (pos < size) {
+        int len = http_read_stream(h, buf + pos, size - pos);
+        if (len < 0)
+            return len;
+        pos += len;
+    }
+    return pos;
+}
+
+static int store_icy(URLContext *h, int size)
+{
+    HTTPContext *s = h->priv_data;
+    /* until next metadata packet */
+    int remaining = s->icy_metaint - s->icy_data_read;
+
+    if (remaining < 0)
+        return AVERROR_INVALIDDATA;
+
+    if (!remaining) {
+        // The metadata packet is variable sized. It has a 1 byte header
+        // which sets the length of the packet (divided by 16). If it's 0,
+        // the metadata doesn't change. After the packet, icy_metaint bytes
+        // of normal data follow.
+        uint8_t ch;
+        int len = http_read_stream_all(h, &ch, 1);
+        if (len < 0)
+            return len;
+        if (ch > 0) {
+            char data[255 * 16 + 1];
+            int ret;
+            len = ch * 16;
+            ret = http_read_stream_all(h, data, len);
+            if (ret < 0)
+                return ret;
+            data[len + 1] = 0;
+            if ((ret = av_opt_set(s, "icy_metadata_packet", data, 0)) < 0)
+                return ret;
+        }
+        s->icy_data_read = 0;
+        remaining = s->icy_metaint;
+    }
+
+    return FFMIN(size, remaining);
+}
+
+static int http_read(URLContext *h, uint8_t *buf, int size)
+{
+    HTTPContext *s = h->priv_data;
+
+    if (s->icy_metaint > 0) {
+        size = store_icy(h, size);
+        if (size < 0)
+            return size;
+    }
+
+    size = http_read_stream(h, buf, size);
+    if (size > 0)
+        s->icy_data_read += size;
+    return size;
+}
+
 /* used only when posting data */
 static int http_write(URLContext *h, const uint8_t *buf, int size)
 {
@@ -912,13 +1048,16 @@
     URLContext *old_hd = s->hd;
     int64_t old_off = s->off;
     uint8_t old_buf[BUFFER_SIZE];
-    int old_buf_size;
+    int old_buf_size, ret;
     AVDictionary *options = NULL;
 
     if (whence == AVSEEK_SIZE)
         return s->filesize;
+    else if ((whence == SEEK_CUR && off == 0) ||
+             (whence == SEEK_SET && off == s->off))
+        return s->off;
     else if ((s->filesize == -1 && whence == SEEK_END) || h->is_streamed)
-        return -1;
+        return AVERROR(ENOSYS);
 
     /* we save the old context in case the seek fails */
     old_buf_size = s->buf_end - s->buf_ptr;
@@ -932,14 +1071,14 @@
 
     /* if it fails, continue on old connection */
     av_dict_copy(&options, s->chained_options, 0);
-    if (http_open_cnx(h, &options) < 0) {
+    if ((ret = http_open_cnx(h, &options)) < 0) {
         av_dict_free(&options);
         memcpy(s->buffer, old_buf, old_buf_size);
         s->buf_ptr = s->buffer;
         s->buf_end = s->buffer + old_buf_size;
         s->hd = old_hd;
         s->off = old_off;
-        return -1;
+        return ret;
     }
     av_dict_free(&options);
     ffurl_close(old_hd);

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/httpauth.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/httpauth.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/icodec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/icodec.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/id3v2.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/id3v2.c Changed

@@ -313,7 +313,7 @@
  * Parse GEOB tag into a ID3v2ExtraMetaGEOB struct.
  */
 static void read_geobtag(AVFormatContext *s, AVIOContext *pb, int taglen,
-                         char *tag, ID3v2ExtraMeta **extra_meta)
+                         char *tag, ID3v2ExtraMeta **extra_meta, int isv34)
 {
     ID3v2ExtraMetaGEOB *geob_data = NULL;
     ID3v2ExtraMeta *new_extra     = NULL;
@@ -445,7 +445,7 @@
 }
 
 static void read_apic(AVFormatContext *s, AVIOContext *pb, int taglen,
-                      char *tag, ID3v2ExtraMeta **extra_meta)
+                      char *tag, ID3v2ExtraMeta **extra_meta, int isv34)
 {
     int enc, pic_type;
     char mimetype[64];
@@ -467,7 +467,12 @@
     taglen--;
 
     /* mimetype */
+    if (isv34) {
     taglen -= avio_get_str(pb, taglen, mimetype, sizeof(mimetype));
+    } else {
+        avio_read(pb, mimetype, 3);
+        mimetype[3] = 0;
+    }
     while (mime->id != AV_CODEC_ID_NONE) {
         if (!av_strncasecmp(mime->str, mimetype, sizeof(mimetype))) {
             id = mime->id;
@@ -518,7 +523,7 @@
     avio_seek(pb, end, SEEK_SET);
 }
 
-static void read_chapter(AVFormatContext *s, AVIOContext *pb, int len, char *ttag, ID3v2ExtraMeta **extra_meta)
+static void read_chapter(AVFormatContext *s, AVIOContext *pb, int len, char *ttag, ID3v2ExtraMeta **extra_meta, int isv34)
 {
     AVRational time_base = {1, 1000};
     uint32_t start, end;
@@ -527,6 +532,14 @@
     int taglen;
     char tag[5];
 
+    if (!s) {
+        /* We should probably just put the chapter data to extra_meta here
+         * and do the AVFormatContext-needing part in a separate
+         * ff_id3v2_parse_apic()-like function. */
+        av_log(NULL, AV_LOG_DEBUG, "No AVFormatContext, skipped ID3 chapter data\n");
+        return;
+    }
+
     if (decode_str(s, pb, 0, &dst, &len) < 0)
         return;
     if (len < 16)
@@ -544,15 +557,14 @@
 
     len -= 16;
     while (len > 10) {
-        avio_read(pb, tag, 4);
+        if (avio_read(pb, tag, 4) < 4)
+            goto end;
         tag[4] = 0;
         taglen = avio_rb32(pb);
         avio_skip(pb, 2);
         len -= 10;
-        if (taglen < 0 || taglen > len) {
-            av_free(dst);
-            return;
-        }
+        if (taglen < 0 || taglen > len)
+            goto end;
         if (tag[0] == 'T')
             read_ttag(s, pb, taglen, &chapter->metadata, tag);
         else
@@ -562,14 +574,60 @@
 
     ff_metadata_conv(&chapter->metadata, NULL, ff_id3v2_34_metadata_conv);
     ff_metadata_conv(&chapter->metadata, NULL, ff_id3v2_4_metadata_conv);
+end:
     av_free(dst);
 }
 
+static void free_priv(void *obj)
+{
+    ID3v2ExtraMetaPRIV *priv = obj;
+    av_freep(&priv->owner);
+    av_freep(&priv->data);
+    av_freep(&priv);
+}
+
+static void read_priv(AVFormatContext *s, AVIOContext *pb, int taglen,
+                      char *tag, ID3v2ExtraMeta **extra_meta, int isv34)
+{
+    ID3v2ExtraMeta *meta;
+    ID3v2ExtraMetaPRIV *priv;
+
+    meta = av_mallocz(sizeof(*meta));
+    priv = av_mallocz(sizeof(*priv));
+
+    if (!meta || !priv)
+        goto fail;
+
+    if (decode_str(s, pb, ID3v2_ENCODING_ISO8859, &priv->owner, &taglen) < 0)
+        goto fail;
+
+    priv->data = av_malloc(taglen);
+    if (!priv->data)
+        goto fail;
+
+    priv->datasize = taglen;
+
+    if (avio_read(pb, priv->data, priv->datasize) != priv->datasize)
+        goto fail;
+
+    meta->tag   = "PRIV";
+    meta->data  = priv;
+    meta->next  = *extra_meta;
+    *extra_meta = meta;
+
+    return;
+
+fail:
+    if (priv)
+        free_priv(priv);
+    av_freep(&meta);
+}
+
 typedef struct ID3v2EMFunc {
     const char *tag3;
     const char *tag4;
     void (*read)(AVFormatContext *, AVIOContext *, int, char *,
-                 ID3v2ExtraMeta **);
+                 ID3v2ExtraMeta **, int isv34);
     void (*free)(void *obj);
 } ID3v2EMFunc;
 
@@ -577,6 +635,7 @@
     { "GEO", "GEOB", read_geobtag, free_geobtag },
     { "PIC", "APIC", read_apic,    free_apic    },
     { "CHAP","CHAP", read_chapter, NULL         },
+    { "PRIV","PRIV", read_priv,    free_priv    },
     { NULL }
 };
 
@@ -599,16 +658,17 @@
     return NULL;
 }
 
-static void id3v2_parse(AVFormatContext *s, int len, uint8_t version,
+static void id3v2_parse(AVIOContext *pb, AVDictionary **metadata,
+                        AVFormatContext *s, int len, uint8_t version,
                         uint8_t flags, ID3v2ExtraMeta **extra_meta)
 {
     int isv34, unsync;
     unsigned tlen;
     char tag[5];
-    int64_t next, end = avio_tell(s->pb) + len;
+    int64_t next, end = avio_tell(pb) + len;
     int taghdrlen;
     const char *reason = NULL;
-    AVIOContext pb;
+    AVIOContext pb_local;
     AVIOContext *pbx;
     unsigned char *buffer = NULL;
     int buffer_size       = 0;
@@ -642,7 +702,7 @@
     unsync = flags & 0x80;
 
     if (isv34 && flags & 0x40) { /* Extended header present, just skip over it */
-        int extlen = get_size(s->pb, 4);
+        int extlen = get_size(pb, 4);
         if (version == 4)
             /* In v2.4 the length includes the length field we just read. */
             extlen -= 4;
@@ -651,7 +711,7 @@
             reason = "invalid extended header length";
             goto error;
         }
-        avio_skip(s->pb, extlen);
+        avio_skip(pb, extlen);
         len -= extlen + 4;
         if (len < 0) {
             reason = "extended header too long.";
@@ -667,18 +727,20 @@
         unsigned long dlen;
 
         if (isv34) {
-            avio_read(s->pb, tag, 4);
+            if (avio_read(pb, tag, 4) < 4)
+                break;
             tag[4] = 0;
             if (version == 3) {
-                tlen = avio_rb32(s->pb);
+                tlen = avio_rb32(pb);
             } else
-                tlen = get_size(s->pb, 4);
-            tflags  = avio_rb16(s->pb);
+                tlen = get_size(pb, 4);
+            tflags  = avio_rb16(pb);
             tunsync = tflags & ID3v2_FLAG_UNSYNCH;
         } else {
-            avio_read(s->pb, tag, 3);
+            if (avio_read(pb, tag, 3) < 3)
+                break;
             tag[3] = 0;
-            tlen   = avio_rb24(s->pb);
+            tlen   = avio_rb24(pb);
         }
         if (tlen > (1<<28))
             break;
@@ -687,7 +749,7 @@
         if (len < 0)
             break;
 
-        next = avio_tell(s->pb) + tlen;
+        next = avio_tell(pb) + tlen;
 
         if (!tlen) {
             if (tag[0])
@@ -699,7 +761,7 @@
         if (tflags & ID3v2_FLAG_DATALEN) {
             if (tlen < 4)
                 break;
-            dlen = avio_rb32(s->pb);
+            dlen = avio_rb32(pb);
             tlen -= 4;
         } else
             dlen = tlen;
@@ -718,12 +780,12 @@
                 type = "encrypted and compressed";
 
             av_log(s, AV_LOG_WARNING, "Skipping %s ID3v2 frame %s.\n", type, tag);
-            avio_skip(s->pb, tlen);
+            avio_skip(pb, tlen);
         /* check for text tag or supported special meta tag */
         } else if (tag[0] == 'T' ||
                    (extra_meta &&
                     (extra_func = get_extra_meta_func(tag, isv34)))) {
-            pbx = s->pb;
+            pbx = pb;
 
             if (unsync || tunsync || tcomp) {
                 av_fast_malloc(&buffer, &buffer_size, tlen);
@@ -733,23 +795,23 @@
                 }
             }
             if (unsync || tunsync) {
-                int64_t end = avio_tell(s->pb) + tlen;
+                int64_t end = avio_tell(pb) + tlen;
                 uint8_t *b;
 
                 b = buffer;
-                while (avio_tell(s->pb) < end && b - buffer < tlen && !s->pb->eof_reached) {
-                    *b++ = avio_r8(s->pb);
-                    if (*(b - 1) == 0xff && avio_tell(s->pb) < end - 1 &&
+                while (avio_tell(pb) < end && b - buffer < tlen && !pb->eof_reached) {
+                    *b++ = avio_r8(pb);
+                    if (*(b - 1) == 0xff && avio_tell(pb) < end - 1 &&
                         b - buffer < tlen &&
-                        !s->pb->eof_reached ) {
-                        uint8_t val = avio_r8(s->pb);
-                        *b++ = val ? val : avio_r8(s->pb);
+                        !pb->eof_reached ) {
+                        uint8_t val = avio_r8(pb);
+                        *b++ = val ? val : avio_r8(pb);
                     }
                 }
-                ffio_init_context(&pb, buffer, b - buffer, 0, NULL, NULL, NULL,
+                ffio_init_context(&pb_local, buffer, b - buffer, 0, NULL, NULL, NULL,
                                   NULL);
                 tlen = b - buffer;
-                pbx  = &pb; // read from sync buffer
+                pbx  = &pb_local; // read from sync buffer
             }
 
 #if CONFIG_ZLIB
@@ -765,7 +827,7 @@
                     }
 
                     if (!(unsync || tunsync)) {
-                        err = avio_read(s->pb, buffer, tlen);
+                        err = avio_read(pb, buffer, tlen);
                         if (err < 0) {
                             av_log(s, AV_LOG_ERROR, "Failed to read compressed tag\n");
                             goto seek;
@@ -778,26 +840,26 @@
                         av_log(s, AV_LOG_ERROR, "Failed to uncompress tag: %d\n", err);
                         goto seek;
                     }
-                    ffio_init_context(&pb, uncompressed_buffer, dlen, 0, NULL, NULL, NULL, NULL);
+                    ffio_init_context(&pb_local, uncompressed_buffer, dlen, 0, NULL, NULL, NULL, NULL);
                     tlen = dlen;
-                    pbx = &pb; // read from sync buffer
+                    pbx = &pb_local; // read from sync buffer
                 }
 #endif
             if (tag[0] == 'T')
                 /* parse text tag */
-                read_ttag(s, pbx, tlen, &s->metadata, tag);
+                read_ttag(s, pbx, tlen, metadata, tag);
             else
                 /* parse special meta tag */
-                extra_func->read(s, pbx, tlen, tag, extra_meta);
+                extra_func->read(s, pbx, tlen, tag, extra_meta, isv34);
         } else if (!tag[0]) {
             if (tag[1])
                 av_log(s, AV_LOG_WARNING, "invalid frame id, assuming padding\n");
-            avio_skip(s->pb, tlen);
+            avio_skip(pb, tlen);
             break;
         }
         /* Skip to end of tag */
 seek:
-        avio_seek(s->pb, next, SEEK_SET);
+        avio_seek(pb, next, SEEK_SET);
     }
 
     /* Footer preset, always 10 bytes, skip over it */
@@ -808,14 +870,15 @@
     if (reason)
         av_log(s, AV_LOG_INFO, "ID3v2.%d tag skipped, cannot handle %s\n",
                version, reason);
-    avio_seek(s->pb, end, SEEK_SET);
+    avio_seek(pb, end, SEEK_SET);
     av_free(buffer);
     av_free(uncompressed_buffer);
     return;
 }
 
-void ff_id3v2_read(AVFormatContext *s, const char *magic,
-                   ID3v2ExtraMeta **extra_meta)
+static void id3v2_read_internal(AVIOContext *pb, AVDictionary **metadata,
+                                AVFormatContext *s, const char *magic,
+                                ID3v2ExtraMeta **extra_meta)
 {
     int len, ret;
     uint8_t buf[ID3v2_HEADER_SIZE];
@@ -824,10 +887,10 @@
 
     do {
         /* save the current offset in case there's nothing to read/skip */
-        off = avio_tell(s->pb);
-        ret = avio_read(s->pb, buf, ID3v2_HEADER_SIZE);
+        off = avio_tell(pb);
+        ret = avio_read(pb, buf, ID3v2_HEADER_SIZE);
         if (ret != ID3v2_HEADER_SIZE) {
-            avio_seek(s->pb, off, SEEK_SET);
+            avio_seek(pb, off, SEEK_SET);
             break;
         }
         found_header = ff_id3v2_match(buf, magic);
@@ -837,15 +900,27 @@
                   ((buf[7] & 0x7f) << 14) |
                   ((buf[8] & 0x7f) << 7) |
                    (buf[9] & 0x7f);
-            id3v2_parse(s, len, buf[3], buf[5], extra_meta);
+            id3v2_parse(pb, metadata, s, len, buf[3], buf[5], extra_meta);
         } else {
-            avio_seek(s->pb, off, SEEK_SET);
+            avio_seek(pb, off, SEEK_SET);
         }
     } while (found_header);
-    ff_metadata_conv(&s->metadata, NULL, ff_id3v2_34_metadata_conv);
-    ff_metadata_conv(&s->metadata, NULL, id3v2_2_metadata_conv);
-    ff_metadata_conv(&s->metadata, NULL, ff_id3v2_4_metadata_conv);
-    merge_date(&s->metadata);
+    ff_metadata_conv(metadata, NULL, ff_id3v2_34_metadata_conv);
+    ff_metadata_conv(metadata, NULL, id3v2_2_metadata_conv);
+    ff_metadata_conv(metadata, NULL, ff_id3v2_4_metadata_conv);
+    merge_date(metadata);
+}
+
+void ff_id3v2_read_dict(AVIOContext *pb, AVDictionary **metadata,
+                        const char *magic, ID3v2ExtraMeta **extra_meta)
+{
+    id3v2_read_internal(pb, metadata, NULL, magic, extra_meta);
+}
+
+void ff_id3v2_read(AVFormatContext *s, const char *magic,
+                   ID3v2ExtraMeta **extra_meta)
+{
+    id3v2_read_internal(s->pb, &s->metadata, s, magic, extra_meta);
 }
 
 void ff_id3v2_free_extra_meta(ID3v2ExtraMeta **extra_meta)

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/id3v2.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/id3v2.h Changed

@@ -73,6 +73,12 @@
     enum AVCodecID id;
 } ID3v2ExtraMetaAPIC;
 
+typedef struct ID3v2ExtraMetaPRIV {
+    uint8_t *owner;
+    uint8_t *data;
+    uint32_t datasize;
+} ID3v2ExtraMetaPRIV;
+
 /**
  * Detect ID3v2 Header.
  * @param buf   must be ID3v2_HEADER_SIZE byte long
@@ -89,7 +95,21 @@
 int ff_id3v2_tag_len(const uint8_t *buf);
 
 /**
- * Read an ID3v2 tag, including supported extra metadata
+ * Read an ID3v2 tag into specified dictionary and retrieve supported extra metadata.
+ *
+ * Chapters are not currently read by this variant.
+ *
+ * @param metadata Parsed metadata is stored here
+ * @param extra_meta If not NULL, extra metadata is parsed into a list of
+ * ID3v2ExtraMeta structs and *extra_meta points to the head of the list
+ */
+void ff_id3v2_read_dict(AVIOContext *pb, AVDictionary **metadata, const char *magic, ID3v2ExtraMeta **extra_meta);
+
+/**
+ * Read an ID3v2 tag, including supported extra metadata and chapters.
+ *
+ * Data is read from and stored to AVFormatContext.
+ *
  * @param extra_meta If not NULL, extra metadata is parsed into a list of
  * ID3v2ExtraMeta structs and *extra_meta points to the head of the list
  */
@@ -114,7 +134,7 @@
 /**
  * Finalize an opened ID3v2 tag.
  */
-void ff_id3v2_finish(ID3v2EncContext *id3, AVIOContext *pb);
+void ff_id3v2_finish(ID3v2EncContext *id3, AVIOContext *pb, int padding_bytes);
 
 /**
  * Write an ID3v2 tag containing all global metadata from s.

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/id3v2enc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/id3v2enc.c Changed

@@ -29,8 +29,6 @@
 #include "avio_internal.h"
 #include "id3v2.h"
 
-#define PADDING_BYTES 10
-
 static void id3v2_put_size(AVIOContext *pb, int size)
 {
     avio_w8(pb, size >> 21 & 0x7f);
@@ -324,15 +322,23 @@
     return 0;
 }
 
-void ff_id3v2_finish(ID3v2EncContext *id3, AVIOContext *pb)
+void ff_id3v2_finish(ID3v2EncContext *id3, AVIOContext *pb,
+                     int padding_bytes)
 {
     int64_t cur_pos;
 
-    /* adding an arbitrary amount of padding bytes at the end of the
-     * ID3 metadata fixes cover art display for some software (iTunes,
-     * Traktor, Serato, Torq) */
-    ffio_fill(pb, 0, PADDING_BYTES);
-    id3->len += PADDING_BYTES;
+    if (padding_bytes < 0)
+        padding_bytes = 10;
+
+    /* The ID3v2.3 specification states that 28 bits are used to represent the
+     * size of the whole tag.  Therefore the current size of the tag needs to be
+     * subtracted from the upper limit of 2^28-1 to clip the value correctly. */
+    /* The minimum of 10 is an arbitrary amount of padding at the end of the tag
+     * to fix cover art display with some software such as iTunes, Traktor,
+     * Serato, Torq. */
+    padding_bytes = av_clip(padding_bytes, 10, 268435455 - id3->len);
+    ffio_fill(pb, 0, padding_bytes);
+    id3->len += padding_bytes;
 
     cur_pos = avio_tell(pb);
     avio_seek(pb, id3->size_pos, SEEK_SET);
@@ -349,7 +355,7 @@
     ff_id3v2_start(&id3, s->pb, id3v2_version, magic);
     if ((ret = ff_id3v2_write_metadata(s, &id3)) < 0)
         return ret;
-    ff_id3v2_finish(&id3, s->pb);
+    ff_id3v2_finish(&id3, s->pb, s->metadata_header_padding);
 
     return 0;
 }

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/idcin.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/idcin.c Changed

@@ -94,6 +94,8 @@
 static int idcin_probe(AVProbeData *p)
 {
     unsigned int number, sample_rate;
+    unsigned int w, h;
+    int i;
 
     /*
      * This is what you could call a "probabilistic" file check: id CIN
@@ -108,17 +110,17 @@
 
     /* check we have enough data to do all checks, otherwise the
        0-padding may cause a wrong recognition */
-    if (p->buf_size < 20)
+    if (p->buf_size < 20 + HUFFMAN_TABLE_SIZE + 12)
         return 0;
 
     /* check the video width */
-    number = AV_RL32(&p->buf[0]);
-    if ((number == 0) || (number > 1024))
+    w = AV_RL32(&p->buf[0]);
+    if ((w == 0) || (w > 1024))
        return 0;
 
     /* check the video height */
-    number = AV_RL32(&p->buf[4]);
-    if ((number == 0) || (number > 1024))
+    h = AV_RL32(&p->buf[4]);
+    if ((h == 0) || (h > 1024))
        return 0;
 
     /* check the audio sample rate */
@@ -136,6 +138,13 @@
     if (number > 2 || sample_rate && !number)
         return 0;
 
+    i = 20 + HUFFMAN_TABLE_SIZE;
+    if (AV_RL32(&p->buf[i]) == 1)
+        i += 768;
+
+    if (i+12 > p->buf_size || AV_RL32(&p->buf[i+8]) != w*h)
+        return 1;
+
     /* return half certainty since this check is a bit sketchy */
     return AVPROBE_SCORE_EXTENSION;
 }
@@ -196,15 +205,8 @@
     st->codec->height = height;
 
     /* load up the Huffman tables into extradata */
-    if (ff_alloc_extradata(st->codec, HUFFMAN_TABLE_SIZE))
-        return AVERROR(ENOMEM);
-    ret = avio_read(pb, st->codec->extradata, HUFFMAN_TABLE_SIZE);
-    if (ret < 0) {
+    if ((ret = ff_get_extradata(st->codec, pb, HUFFMAN_TABLE_SIZE)) < 0)
         return ret;
-    } else if (ret != HUFFMAN_TABLE_SIZE) {
-        av_log(s, AV_LOG_ERROR, "incomplete header\n");
-        return AVERROR(EIO);
-    }
 
     if (idcin->audio_present) {
         idcin->audio_present = 1;

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/idroqenc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/idroqenc.c Changed

@@ -25,9 +25,35 @@
 
 static int roq_write_header(struct AVFormatContext *s)
 {
-    static const uint8_t header[] = {
-        0x84, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0x1E, 0x00
+    uint8_t header[] = {
+        0x84, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, /* fps: */ 0x1E, 0x00
     };
+    int n;
+    AVCodecContext *avctx;
+
+// set the actual fps
+    for(n=0;n<s->nb_streams;n++) {
+        if ((avctx=s->streams[n]->codec)->codec_type == AVMEDIA_TYPE_VIDEO) {
+            unsigned int fps;
+
+            if (avctx->time_base.num != 1) {
+                av_log(avctx, AV_LOG_ERROR, "Frame rate must be integer\n");
+                return AVERROR(EINVAL);
+            }
+
+            if ((fps=avctx->time_base.den) > 255) {
+                av_log(avctx, AV_LOG_ERROR, "Frame rate may not exceed 255fps\n");
+                return AVERROR(EINVAL);
+            }
+
+            if (fps != 30) {
+                av_log(avctx, AV_LOG_WARNING, "For vintage compatibility fps must be 30\n");
+            }
+
+            header[6] = fps;
+            break;
+        }
+    }
 
     avio_write(s->pb, header, 8);
     avio_flush(s->pb);

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/iff.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/iff.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/img2.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/img2.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/img2enc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/img2enc.c Changed

@@ -21,6 +21,7 @@
  */
 
 #include "libavutil/intreadwrite.h"
+#include "libavutil/avassert.h"
 #include "libavutil/avstring.h"
 #include "libavutil/log.h"
 #include "libavutil/opt.h"
@@ -37,6 +38,7 @@
     char path[1024];
     int update;
     int use_strftime;
+    const char *muxer;
 } VideoMuxData;
 
 static int write_header(AVFormatContext *s)
@@ -44,7 +46,6 @@
     VideoMuxData *img = s->priv_data;
     AVStream *st = s->streams[0];
     const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(st->codec->pix_fmt);
-    const char *str;
 
     av_strlcpy(img->path, s->filename, sizeof(img->path));
 
@@ -54,14 +55,17 @@
     else
         img->is_pipe = 1;
 
-    str = strrchr(img->path, '.');
-    img->split_planes =     str
-                         && !av_strcasecmp(str + 1, "y")
-                         && s->nb_streams == 1
-                         && st->codec->codec_id == AV_CODEC_ID_RAWVIDEO
-                         && desc
-                         &&(desc->flags & AV_PIX_FMT_FLAG_PLANAR)
-                         && desc->nb_components >= 3;
+    if (st->codec->codec_id == AV_CODEC_ID_GIF) {
+        img->muxer = "gif";
+    } else if (st->codec->codec_id == AV_CODEC_ID_RAWVIDEO) {
+        const char *str = strrchr(img->path, '.');
+        img->split_planes =     str
+                             && !av_strcasecmp(str + 1, "y")
+                             && s->nb_streams == 1
+                             && desc
+                             &&(desc->flags & AV_PIX_FMT_FLAG_PLANAR)
+                             && desc->nb_components >= 3;
+    }
     return 0;
 }
 
@@ -102,7 +106,7 @@
 
             if (!img->split_planes || i+1 >= desc->nb_components)
                 break;
-            filename[strlen(filename) - 1] = ((int[]){'U','V','A','x'})[i];
+            filename[strlen(filename) - 1] = "UVAx"[i];
         }
     } else {
         pb[0] = s->pb;
@@ -124,6 +128,37 @@
             avio_write(pb[3], pkt->data + ysize + 2*usize, ysize);
             avio_close(pb[3]);
         }
+    } else if (img->muxer) {
+        int ret;
+        AVStream *st;
+        AVPacket pkt2 = {0};
+        AVFormatContext *fmt = NULL;
+
+        av_assert0(!img->split_planes);
+
+        ret = avformat_alloc_output_context2(&fmt, NULL, img->muxer, s->filename);
+        if (ret < 0)
+            return ret;
+        st = avformat_new_stream(fmt, NULL);
+        if (!st) {
+            avformat_free_context(fmt);
+            return AVERROR(ENOMEM);
+        }
+        st->id = pkt->stream_index;
+
+        fmt->pb = pb[0];
+        if ((ret = av_copy_packet(&pkt2, pkt))                            < 0 ||
+            (ret = av_dup_packet(&pkt2))                                  < 0 ||
+            (ret = avcodec_copy_context(st->codec, s->streams[0]->codec)) < 0 ||
+            (ret = avformat_write_header(fmt, NULL))                      < 0 ||
+            (ret = av_interleaved_write_frame(fmt, &pkt2))                < 0 ||
+            (ret = av_write_trailer(fmt))                                 < 0) {
+            av_free_packet(&pkt2);
+            avformat_free_context(fmt);
+            return ret;
+        }
+        av_free_packet(&pkt2);
+        avformat_free_context(fmt);
     } else {
         avio_write(pb[0], pkt->data, pkt->size);
     }
@@ -159,7 +194,7 @@
     .long_name      = NULL_IF_CONFIG_SMALL("image2 sequence"),
     .extensions     = "bmp,dpx,jls,jpeg,jpg,ljpg,pam,pbm,pcx,pgm,pgmyuv,png,"
                       "ppm,sgi,tga,tif,tiff,jp2,j2c,j2k,xwd,sun,ras,rs,im1,im8,im24,"
-                      "sunras,xbm,xface",
+                      "sunras,webp,xbm,xface",
     .priv_data_size = sizeof(VideoMuxData),
     .video_codec    = AV_CODEC_ID_MJPEG,
     .write_header   = write_header,

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/internal.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/internal.h Changed

@@ -28,7 +28,7 @@
 
 /** size of probe buffer, for guessing file type from file contents */
 #define PROBE_BUF_MIN 2048
-#define PROBE_BUF_MAX (1<<20)
+#define PROBE_BUF_MAX (1 << 20)
 
 #ifdef DEBUG
 #    define hex_dump_debug(class, buf, size) av_hex_dump_log(class, AV_LOG_DEBUG, buf, size)
@@ -46,6 +46,14 @@
     enum AVCodecID id;
 } CodecMime;
 
+struct AVFormatInternal {
+    /**
+     * Number of streams relevant for interleaving.
+     * Muxing only.
+     */
+    int nb_interleaved_streams;
+};
+
 #ifdef __GNUC__
 #define dynarray_add(tab, nb_ptr, elem)\
 do {\
@@ -357,9 +365,10 @@
 AVRational ff_choose_timebase(AVFormatContext *s, AVStream *st, int min_precission);
 
 /**
- * Generate standard extradata for AVC-Intra based on width/height and field order.
+ * Generate standard extradata for AVC-Intra based on width/height and field
+ * order.
  */
-void ff_generate_avci_extradata(AVStream *st);
+int ff_generate_avci_extradata(AVStream *st);
 
 /**
  * Allocate extradata with additional FF_INPUT_BUFFER_PADDING_SIZE at end
@@ -370,4 +379,37 @@
  */
 int ff_alloc_extradata(AVCodecContext *avctx, int size);
 
+/**
+ * Allocate extradata with additional FF_INPUT_BUFFER_PADDING_SIZE at end
+ * which is always set to 0 and fill it from pb.
+ *
+ * @param size size of extradata
+ * @return >= 0 if OK, AVERROR_xxx on error
+ */
+int ff_get_extradata(AVCodecContext *avctx, AVIOContext *pb, int size);
+
+/**
+ * add frame for rfps calculation.
+ *
+ * @param dts timestamp of the i-th frame
+ * @return 0 if OK, AVERROR_xxx on error
+ */
+int ff_rfps_add_frame(AVFormatContext *ic, AVStream *st, int64_t dts);
+
+void ff_rfps_calculate(AVFormatContext *ic);
+
+/**
+ * Flags for AVFormatContext.write_uncoded_frame()
+ */
+enum AVWriteUncodedFrameFlags {
+
+    /**
+     * Query whether the feature is possible on this stream.
+     * The frame argument is ignored.
+     */
+    AV_WRITE_UNCODED_FRAME_QUERY           = 0x0001,
+
+};
+
+
 #endif /* AVFORMAT_INTERNAL_H */

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/ipmovie.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/ipmovie.c Changed

@@ -321,7 +321,7 @@
 
         case OPCODE_CREATE_TIMER:
             av_dlog(NULL, "create timer\n");
-            if ((opcode_version > 0) || (opcode_size > 6)) {
+            if ((opcode_version > 0) || (opcode_size != 6)) {
                 av_dlog(NULL, "bad create_timer opcode\n");
                 chunk_type = CHUNK_BAD;
                 break;
@@ -339,7 +339,7 @@
 
         case OPCODE_INIT_AUDIO_BUFFERS:
             av_dlog(NULL, "initialize audio buffers\n");
-            if ((opcode_version > 1) || (opcode_size > 10)) {
+            if (opcode_version > 1 || opcode_size > 10 || opcode_size < 6) {
                 av_dlog(NULL, "bad init_audio_buffers opcode\n");
                 chunk_type = CHUNK_BAD;
                 break;
@@ -376,7 +376,9 @@
 
         case OPCODE_INIT_VIDEO_BUFFERS:
             av_dlog(NULL, "initialize video buffers\n");
-            if ((opcode_version > 2) || (opcode_size > 8)) {
+            if ((opcode_version > 2) || (opcode_size > 8) || opcode_size < 4
+                || opcode_version == 2 && opcode_size < 8
+            ) {
                 av_dlog(NULL, "bad init_video_buffers opcode\n");
                 chunk_type = CHUNK_BAD;
                 break;
@@ -449,8 +451,8 @@
             av_dlog(NULL, "set palette\n");
             /* check for the logical maximum palette size
              * (3 * 256 + 4 bytes) */
-            if (opcode_size > 0x304) {
-                av_dlog(NULL, "demux_ipmovie: set_palette opcode too large\n");
+            if (opcode_size > 0x304 || opcode_size < 4) {
+                av_dlog(NULL, "demux_ipmovie: set_palette opcode with invalid size\n");
                 chunk_type = CHUNK_BAD;
                 break;
             }
@@ -463,7 +465,8 @@
             first_color = AV_RL16(&scratch[0]);
             last_color = first_color + AV_RL16(&scratch[2]) - 1;
             /* sanity check (since they are 16 bit values) */
-            if ((first_color > 0xFF) || (last_color > 0xFF)) {
+            if (   (first_color > 0xFF) || (last_color > 0xFF)
+                || (last_color - first_color + 1)*3 + 4 > opcode_size) {
                 av_dlog(NULL, "demux_ipmovie: set_palette indexes out of range (%d -> %d)\n",
                     first_color, last_color);
                 chunk_type = CHUNK_BAD;

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/isom.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/isom.c Changed

@@ -33,6 +33,7 @@
     { AV_CODEC_ID_MOV_TEXT    , 0x08 },
     { AV_CODEC_ID_MPEG4       , 0x20 },
     { AV_CODEC_ID_H264        , 0x21 },
+    { AV_CODEC_ID_HEVC        , 0x23 },
     { AV_CODEC_ID_AAC         , 0x40 },
     { AV_CODEC_ID_MP4ALS      , 0x40 }, /* 14496-3 ALS */
     { AV_CODEC_ID_MPEG2VIDEO  , 0x61 }, /* MPEG2 Main */
@@ -151,8 +152,8 @@
 
     { AV_CODEC_ID_RAWVIDEO, MKTAG('W', 'R', 'A', 'W') },
 
-    { AV_CODEC_ID_HEVC, MKTAG('h', 'v', 'c', '1') }, /* HEVC/H.265 which indicates parameter sets shall not be in ES */
     { AV_CODEC_ID_HEVC, MKTAG('h', 'e', 'v', '1') }, /* HEVC/H.265 which indicates parameter sets may be in ES */
+    { AV_CODEC_ID_HEVC, MKTAG('h', 'v', 'c', '1') }, /* HEVC/H.265 which indicates parameter sets shall not be in ES */
 
     { AV_CODEC_ID_H264, MKTAG('a', 'v', 'c', '1') }, /* AVC-1/H.264 */
     { AV_CODEC_ID_H264, MKTAG('a', 'i', '5', 'p') }, /* AVC-Intra  50M 720p24/30/60 */
@@ -218,6 +219,7 @@
     { AV_CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'h', 'd') }, /* XDCAM HD 540p */
     { AV_CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'h', '2') }, /* XDCAM HD422 540p */
     { AV_CODEC_ID_MPEG2VIDEO, MKTAG('A', 'V', 'm', 'p') }, /* AVID IMX PAL */
+    { AV_CODEC_ID_MPEG2VIDEO, MKTAG('m', 'p', '2', 'v') }, /* FCP5 */
 
     { AV_CODEC_ID_JPEG2000, MKTAG('m', 'j', 'p', '2') }, /* JPEG 2000 produced by FCP */
 
@@ -284,6 +286,7 @@
     { AV_CODEC_ID_PCM_MULAW,       MKTAG('u', 'l', 'a', 'w') },
     { AV_CODEC_ID_PCM_S16BE,       MKTAG('t', 'w', 'o', 's') },
     { AV_CODEC_ID_PCM_S16LE,       MKTAG('s', 'o', 'w', 't') },
+    { AV_CODEC_ID_PCM_S16BE,       MKTAG('l', 'p', 'c', 'm') },
     { AV_CODEC_ID_PCM_S16LE,       MKTAG('l', 'p', 'c', 'm') },
     { AV_CODEC_ID_PCM_S24BE,       MKTAG('i', 'n', '2', '4') },
     { AV_CODEC_ID_PCM_S24LE,       MKTAG('i', 'n', '2', '4') },
@@ -437,6 +440,7 @@
 int ff_mp4_read_dec_config_descr(AVFormatContext *fc, AVStream *st, AVIOContext *pb)
 {
     int len, tag;
+    int ret;
     int object_type_id = avio_r8(pb);
     avio_r8(pb); /* stream type */
     avio_rb24(pb); /* buffer size db */
@@ -456,11 +460,10 @@
         if (!len || (uint64_t)len > (1<<30))
             return -1;
         av_free(st->codec->extradata);
-        if (ff_alloc_extradata(st->codec, len))
-            return AVERROR(ENOMEM);
-        avio_read(pb, st->codec->extradata, len);
+        if ((ret = ff_get_extradata(st->codec, pb, len)) < 0)
+            return ret;
         if (st->codec->codec_id == AV_CODEC_ID_AAC) {
-            MPEG4AudioConfig cfg;
+            MPEG4AudioConfig cfg = {0};
             avpriv_mpeg4audio_get_config(&cfg, st->codec->extradata,
                                          st->codec->extradata_size * 8, 1);
             st->codec->channels = cfg.channels;
@@ -573,3 +576,12 @@
     avio_wb32(pb, 0);              // mNumberChannelDescriptions
 }
 
+const struct AVCodecTag *avformat_get_mov_video_tags(void)
+{
+    return ff_codec_movvideo_tags;
+}
+
+const struct AVCodecTag *avformat_get_mov_audio_tags(void)
+{
+    return ff_codec_movaudio_tags;
+}

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/isom.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/isom.h Changed

@@ -142,6 +142,9 @@
     int start_pad;        ///< amount of samples to skip due to enc-dec delay
     unsigned int rap_group_count;
     MOVSbgp *rap_group;
+
+    int nb_frames_for_fps;
+    int64_t duration_for_fps;
 } MOVStreamContext;
 
 typedef struct MOVContext {
@@ -207,6 +210,22 @@
 #define MOV_TKHD_FLAG_IN_PREVIEW    0x0004
 #define MOV_TKHD_FLAG_IN_POSTER     0x0008
 
+#define TAG_IS_AVCI(tag)                    \
+    ((tag) == MKTAG('a', 'i', '5', 'p') ||  \
+     (tag) == MKTAG('a', 'i', '5', 'q') ||  \
+     (tag) == MKTAG('a', 'i', '5', '2') ||  \
+     (tag) == MKTAG('a', 'i', '5', '3') ||  \
+     (tag) == MKTAG('a', 'i', '5', '5') ||  \
+     (tag) == MKTAG('a', 'i', '5', '6') ||  \
+     (tag) == MKTAG('a', 'i', '1', 'p') ||  \
+     (tag) == MKTAG('a', 'i', '1', 'q') ||  \
+     (tag) == MKTAG('a', 'i', '1', '2') ||  \
+     (tag) == MKTAG('a', 'i', '1', '3') ||  \
+     (tag) == MKTAG('a', 'i', '1', '5') ||  \
+     (tag) == MKTAG('a', 'i', '1', '6') ||  \
+     (tag) == MKTAG('A', 'V', 'i', 'n'))
+
+
 int ff_mov_read_esds(AVFormatContext *fc, AVIOContext *pb, MOVAtom atom);
 enum AVCodecID ff_mov_get_lpcm_codec_id(int bps, int flags);

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/iss.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/iss.c Changed

@@ -76,14 +76,23 @@
 
     get_token(pb, token, sizeof(token)); //"IMA_ADPCM_Sound"
     get_token(pb, token, sizeof(token)); //packet size
-    sscanf(token, "%d", &iss->packet_size);
+    if (sscanf(token, "%d", &iss->packet_size) != 1) {
+        av_log(s, AV_LOG_ERROR, "Failed parsing packet size\n");
+        return AVERROR_INVALIDDATA;
+    }
     get_token(pb, token, sizeof(token)); //File ID
     get_token(pb, token, sizeof(token)); //out size
     get_token(pb, token, sizeof(token)); //stereo
-    sscanf(token, "%d", &stereo);
+    if (sscanf(token, "%d", &stereo) != 1) {
+        av_log(s, AV_LOG_ERROR, "Failed parsing stereo flag\n");
+        return AVERROR_INVALIDDATA;
+    }
     get_token(pb, token, sizeof(token)); //Unknown1
     get_token(pb, token, sizeof(token)); //RateDivisor
-    sscanf(token, "%d", &rate_divisor);
+    if (sscanf(token, "%d", &rate_divisor) != 1) {
+        av_log(s, AV_LOG_ERROR, "Failed parsing rate_divisor\n");
+        return AVERROR_INVALIDDATA;
+    }
     get_token(pb, token, sizeof(token)); //Unknown2
     get_token(pb, token, sizeof(token)); //Version ID
     get_token(pb, token, sizeof(token)); //Size

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/jacosubdec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/jacosubdec.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/jvdec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/jvdec.c Changed

@@ -27,6 +27,7 @@
 
 #include "libavutil/channel_layout.h"
 #include "libavutil/intreadwrite.h"
+
 #include "avformat.h"
 #include "internal.h"
 
@@ -59,6 +60,15 @@
     return 0;
 }
 
+static int read_close(AVFormatContext *s)
+{
+    JVDemuxContext *jv = s->priv_data;
+
+    av_freep(&jv->frames);
+
+    return 0;
+}
+
 static int read_header(AVFormatContext *s)
 {
     JVDemuxContext *jv = s->priv_data;
@@ -87,17 +97,18 @@
 
     avio_skip(pb, 4);
 
-    ast->codec->codec_type  = AVMEDIA_TYPE_AUDIO;
-    ast->codec->codec_id    = AV_CODEC_ID_PCM_U8;
-    ast->codec->codec_tag   = 0; /* no fourcc */
-    ast->codec->sample_rate = avio_rl16(pb);
-    ast->codec->channels    = 1;
+    ast->codec->codec_type     = AVMEDIA_TYPE_AUDIO;
+    ast->codec->codec_id       = AV_CODEC_ID_PCM_U8;
+    ast->codec->codec_tag      = 0; /* no fourcc */
+    ast->codec->sample_rate    = avio_rl16(pb);
+    ast->codec->channels       = 1;
     ast->codec->channel_layout = AV_CH_LAYOUT_MONO;
     avpriv_set_pts_info(ast, 64, 1, ast->codec->sample_rate);
 
     avio_skip(pb, 10);
 
-    ast->index_entries = av_malloc(ast->nb_index_entries * sizeof(*ast->index_entries));
+    ast->index_entries = av_malloc(ast->nb_index_entries *
+                                   sizeof(*ast->index_entries));
     if (!ast->index_entries)
         return AVERROR(ENOMEM);
 
@@ -106,28 +117,41 @@
         return AVERROR(ENOMEM);
 
     offset = 0x68 + ast->nb_index_entries * 16;
-    for(i = 0; i < ast->nb_index_entries; i++) {
+    for (i = 0; i < ast->nb_index_entries; i++) {
         AVIndexEntry *e   = ast->index_entries + i;
         JVFrame      *jvf = jv->frames + i;
 
         /* total frame size including audio, video, palette data and padding */
-        e->size         = avio_rl32(pb);
-        e->timestamp    = i;
-        e->pos          = offset;
-        offset         += e->size;
+        e->size      = avio_rl32(pb);
+        e->timestamp = i;
+        e->pos       = offset;
+        offset      += e->size;
 
-        jvf->audio_size = avio_rl32(pb);
-        jvf->video_size = avio_rl32(pb);
+        jvf->audio_size   = avio_rl32(pb);
+        jvf->video_size   = avio_rl32(pb);
         jvf->palette_size = avio_r8(pb) ? 768 : 0;
-        jvf->video_size = FFMIN(FFMAX(jvf->video_size, 0),
-                                INT_MAX - JV_PREAMBLE_SIZE - jvf->palette_size);
+
+        if ((jvf->video_size | jvf->audio_size) & ~0xFFFFFF ||
+            e->size - jvf->audio_size
+                    - jvf->video_size
+                    - jvf->palette_size < 0) {
+            if (s->error_recognition & AV_EF_EXPLODE) {
+                read_close(s);
+                return AVERROR_INVALIDDATA;
+            }
+            jvf->audio_size   =
+            jvf->video_size   =
+            jvf->palette_size = 0;
+        }
+
         if (avio_r8(pb))
-             av_log(s, AV_LOG_WARNING, "unsupported audio codec\n");
+            av_log(s, AV_LOG_WARNING, "unsupported audio codec\n");
+
         jvf->video_type = avio_r8(pb);
         avio_skip(pb, 1);
 
         e->timestamp = jvf->audio_size ? audio_pts : AV_NOPTS_VALUE;
-        audio_pts += jvf->audio_size;
+        audio_pts   += jvf->audio_size;
 
         e->flags = jvf->video_type != 1 ? AVINDEX_KEYFRAME : 0;
     }
@@ -146,10 +170,10 @@
         const AVIndexEntry *e   = ast->index_entries + jv->pts;
         const JVFrame      *jvf = jv->frames + jv->pts;
 
-        switch(jv->state) {
+        switch (jv->state) {
         case JV_AUDIO:
             jv->state++;
-            if (jvf->audio_size ) {
+            if (jvf->audio_size) {
                 if (av_get_packet(s->pb, pkt, jvf->audio_size) < 0)
                     return AVERROR(ENOMEM);
                 pkt->stream_index = 0;
@@ -160,16 +184,22 @@
         case JV_VIDEO:
             jv->state++;
             if (jvf->video_size || jvf->palette_size) {
+                int ret;
                 int size = jvf->video_size + jvf->palette_size;
                 if (av_new_packet(pkt, size + JV_PREAMBLE_SIZE))
                     return AVERROR(ENOMEM);
 
                 AV_WL32(pkt->data, jvf->video_size);
-                pkt->data[4]      = jvf->video_type;
-                if ((size = avio_read(pb, pkt->data + JV_PREAMBLE_SIZE, size)) < 0)
-                    return AVERROR(EIO);
-
-                pkt->size         = size + JV_PREAMBLE_SIZE;
+                pkt->data[4] = jvf->video_type;
+                ret = avio_read(pb, pkt->data + JV_PREAMBLE_SIZE, size);
+                if (ret < 0)
+                    return ret;
+                if (ret < size) {
+                    memset(pkt->data + JV_PREAMBLE_SIZE + ret, 0,
+                           FF_INPUT_BUFFER_PADDING_SIZE);
+                    pkt->flags |= AV_PKT_FLAG_CORRUPT;
+                }
+                pkt->size         = ret + JV_PREAMBLE_SIZE;
                 pkt->stream_index = 1;
                 pkt->pts          = jv->pts;
                 if (jvf->video_type != 1)
@@ -184,6 +214,9 @@
         }
     }
 
+    if (s->pb->eof_reached)
+        return AVERROR_EOF;
+
     return AVERROR(EIO);
 }
 
@@ -194,10 +227,10 @@
     AVStream *ast = s->streams[0];
     int i;
 
-    if (flags & (AVSEEK_FLAG_BYTE|AVSEEK_FLAG_FRAME))
+    if (flags & (AVSEEK_FLAG_BYTE | AVSEEK_FLAG_FRAME))
         return AVERROR(ENOSYS);
 
-    switch(stream_index) {
+    switch (stream_index) {
     case 0:
         i = av_index_search_timestamp(ast, ts, flags);
         break;
@@ -218,15 +251,6 @@
     return 0;
 }
 
-static int read_close(AVFormatContext *s)
-{
-    JVDemuxContext *jv = s->priv_data;
-
-    av_freep(&jv->frames);
-
-    return 0;
-}
-
 AVInputFormat ff_jv_demuxer = {
     .name           = "jv",
     .long_name      = NULL_IF_CONFIG_SMALL("Bitmap Brothers JV"),

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/libgme.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/libgme.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/libmodplug.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/libmodplug.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/librtmp.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/librtmp.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/libssh.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/libssh.c Changed

@@ -19,9 +19,11 @@
  */
 
 #include <fcntl.h>
+#define LIBSSH_STATIC
 #include <libssh/sftp.h>
 #include "libavutil/avstring.h"
 #include "libavutil/opt.h"
+#include "libavutil/attributes.h"
 #include "avformat.h"
 #include "internal.h"
 #include "url.h"
@@ -34,106 +36,179 @@
     int64_t filesize;
     int rw_timeout;
     int trunc;
+    char *priv_key;
 } LIBSSHContext;
 
-static int libssh_close(URLContext *h)
+static av_cold int libssh_create_ssh_session(LIBSSHContext *libssh, const char* hostname, unsigned int port)
 {
-    LIBSSHContext *s = h->priv_data;
-    if (s->file)
-        sftp_close(s->file);
-    if (s->sftp)
-        sftp_free(s->sftp);
-    if (s->session) {
-        ssh_disconnect(s->session);
-        ssh_free(s->session);
+    static const int verbosity = SSH_LOG_NOLOG;
+
+    if (!(libssh->session = ssh_new())) {
+        av_log(libssh, AV_LOG_ERROR, "SSH session creation failed: %s\n", ssh_get_error(libssh->session));
+        return AVERROR(ENOMEM);
+    }
+    ssh_options_set(libssh->session, SSH_OPTIONS_HOST, hostname);
+    ssh_options_set(libssh->session, SSH_OPTIONS_PORT, &port);
+    ssh_options_set(libssh->session, SSH_OPTIONS_LOG_VERBOSITY, &verbosity);
+    if (libssh->rw_timeout > 0) {
+        long timeout = libssh->rw_timeout * 1000;
+        ssh_options_set(libssh->session, SSH_OPTIONS_TIMEOUT_USEC, &timeout);
+    }
+
+    if (ssh_connect(libssh->session) != SSH_OK) {
+        av_log(libssh, AV_LOG_ERROR, "Connection failed: %s\n", ssh_get_error(libssh->session));
+        return AVERROR(EIO);
     }
+
     return 0;
 }
 
-static int libssh_open(URLContext *h, const char *url, int flags)
+static av_cold int libssh_authentication(LIBSSHContext *libssh, const char *user, const char *password)
 {
-    static const int verbosity = SSH_LOG_NOLOG;
-    LIBSSHContext *s = h->priv_data;
-    char proto[10], path[MAX_URL_SIZE], hostname[1024], credencials[1024];
-    int port = 22, access, ret;
-    long timeout = s->rw_timeout * 1000;
-    const char *user = NULL, *pass = NULL;
-    char *end = NULL;
-    sftp_attributes stat;
+    int authorized = 0;
+    int auth_methods;
 
-    av_url_split(proto, sizeof(proto),
-                 credencials, sizeof(credencials),
-                 hostname, sizeof(hostname),
-                 &port,
-                 path, sizeof(path),
-                 url);
+    if (user)
+        ssh_options_set(libssh->session, SSH_OPTIONS_USER, user);
 
-    if (port <= 0 || port > 65535)
-        port = 22;
+    auth_methods = ssh_userauth_list(libssh->session, NULL);
 
-    if (!(s->session = ssh_new())) {
-        ret = AVERROR(ENOMEM);
-        goto fail;
+    if (auth_methods & SSH_AUTH_METHOD_PUBLICKEY) {
+        if (libssh->priv_key) {
+            ssh_string pub_key;
+            ssh_private_key priv_key;
+            int type;
+            if (!ssh_try_publickey_from_file(libssh->session, libssh->priv_key, &pub_key, &type)) {
+                priv_key = privatekey_from_file(libssh->session, libssh->priv_key, type, password);
+                if (ssh_userauth_pubkey(libssh->session, NULL, pub_key, priv_key) == SSH_AUTH_SUCCESS) {
+                    av_log(libssh, AV_LOG_DEBUG, "Authentication successful with selected private key.\n");
+                    authorized = 1;
+                }
+            } else {
+                av_log(libssh, AV_LOG_DEBUG, "Invalid key is provided.\n");
+                return AVERROR(EACCES);
+            }
+        } else if (ssh_userauth_autopubkey(libssh->session, password) == SSH_AUTH_SUCCESS) {
+            av_log(libssh, AV_LOG_DEBUG, "Authentication successful with auto selected key.\n");
+            authorized = 1;
+        }
     }
-    user = av_strtok(credencials, ":", &end);
-    pass = av_strtok(end, ":", &end);
-    ssh_options_set(s->session, SSH_OPTIONS_HOST, hostname);
-    ssh_options_set(s->session, SSH_OPTIONS_PORT, &port);
-    ssh_options_set(s->session, SSH_OPTIONS_LOG_VERBOSITY, &verbosity);
-    if (timeout > 0)
-        ssh_options_set(s->session, SSH_OPTIONS_TIMEOUT_USEC, &timeout);
-    if (user)
-        ssh_options_set(s->session, SSH_OPTIONS_USER, user);
 
-    if (ssh_connect(s->session) != SSH_OK) {
-        av_log(h, AV_LOG_ERROR, "Connection failed. %s\n", ssh_get_error(s->session));
-        ret = AVERROR(EIO);
-        goto fail;
+    if (!authorized && (auth_methods & SSH_AUTH_METHOD_PASSWORD)) {
+        if (ssh_userauth_password(libssh->session, NULL, password) == SSH_AUTH_SUCCESS) {
+            av_log(libssh, AV_LOG_DEBUG, "Authentication successful with password.\n");
+            authorized = 1;
+        }
     }
 
-    if (pass && ssh_userauth_password(s->session, NULL, pass) != SSH_AUTH_SUCCESS) {
-        av_log(h, AV_LOG_ERROR, "Error authenticating with password: %s\n", ssh_get_error(s->session));
-        ret = AVERROR(EACCES);
-        goto fail;
+    if (!authorized) {
+        av_log(libssh, AV_LOG_ERROR, "Authentication failed.\n");
+        return AVERROR(EACCES);
     }
 
-    if (!(s->sftp = sftp_new(s->session))) {
-        av_log(h, AV_LOG_ERROR, "SFTP session creation failed: %s\n", ssh_get_error(s->session));
-        ret = AVERROR(ENOMEM);
-        goto fail;
+    return 0;
+}
+
+static av_cold int libssh_create_sftp_session(LIBSSHContext *libssh)
+{
+    if (!(libssh->sftp = sftp_new(libssh->session))) {
+        av_log(libssh, AV_LOG_ERROR, "SFTP session creation failed: %s\n", ssh_get_error(libssh->session));
+        return AVERROR(ENOMEM);
     }
 
-    if (sftp_init(s->sftp) != SSH_OK) {
-        av_log(h, AV_LOG_ERROR, "Error initializing sftp session: %s\n", ssh_get_error(s->session));
-        ret = AVERROR(EIO);
-        goto fail;
+    if (sftp_init(libssh->sftp) != SSH_OK) {
+        av_log(libssh, AV_LOG_ERROR, "Error initializing sftp session: %s\n", ssh_get_error(libssh->session));
+        return AVERROR(EIO);
     }
 
+    return 0;
+}
+
+static av_cold int libssh_open_file(LIBSSHContext *libssh, int flags, const char *file)
+{
+    int access;
+
     if ((flags & AVIO_FLAG_WRITE) && (flags & AVIO_FLAG_READ)) {
         access = O_CREAT | O_RDWR;
-        if (s->trunc)
+        if (libssh->trunc)
             access |= O_TRUNC;
     } else if (flags & AVIO_FLAG_WRITE) {
         access = O_CREAT | O_WRONLY;
-        if (s->trunc)
+        if (libssh->trunc)
             access |= O_TRUNC;
-    } else {
+    } else
         access = O_RDONLY;
-    }
 
-    if (!(s->file = sftp_open(s->sftp, path, access, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH))) {
-        av_log(h, AV_LOG_ERROR, "Error opening sftp file: %s\n", ssh_get_error(s->session));
-        ret = AVERROR(EIO);
-        goto fail;
+    /* 0666 = -rw-rw-rw- = read+write for everyone, minus umask */
+    if (!(libssh->file = sftp_open(libssh->sftp, file, access, 0666))) {
+        av_log(libssh, AV_LOG_ERROR, "Error opening sftp file: %s\n", ssh_get_error(libssh->session));
+        return AVERROR(EIO);
     }
 
-    if (!(stat = sftp_fstat(s->file))) {
-        av_log(h, AV_LOG_WARNING, "Cannot stat remote file %s.\n", path);
-        s->filesize = -1;
+    return 0;
+}
+
+static av_cold void libssh_stat_file(LIBSSHContext *libssh)
+{
+    sftp_attributes stat;
+
+    if (!(stat = sftp_fstat(libssh->file))) {
+        av_log(libssh, AV_LOG_WARNING, "Cannot stat remote file.\n");
+        libssh->filesize = -1;
     } else {
-        s->filesize = stat->size;
+        libssh->filesize = stat->size;
         sftp_attributes_free(stat);
     }
+}
+
+static av_cold int libssh_close(URLContext *h)
+{
+    LIBSSHContext *libssh = h->priv_data;
+    if (libssh->file)
+        sftp_close(libssh->file);
+    if (libssh->sftp)
+        sftp_free(libssh->sftp);
+    if (libssh->session) {
+        ssh_disconnect(libssh->session);
+        ssh_free(libssh->session);
+    }
+    return 0;
+}
+
+static av_cold int libssh_open(URLContext *h, const char *url, int flags)
+{
+    LIBSSHContext *libssh = h->priv_data;
+    char proto[10], path[MAX_URL_SIZE], hostname[1024], credencials[1024];
+    int port = 22, ret;
+    const char *user = NULL, *pass = NULL;
+    char *end = NULL;
+
+    av_url_split(proto, sizeof(proto),
+                 credencials, sizeof(credencials),
+                 hostname, sizeof(hostname),
+                 &port,
+                 path, sizeof(path),
+                 url);
+
+    if (port <= 0 || port > 65535)
+        port = 22;
+
+    if ((ret = libssh_create_ssh_session(libssh, hostname, port)) < 0)
+        goto fail;
+
+    user = av_strtok(credencials, ":", &end);
+    pass = av_strtok(end, ":", &end);
+
+    if ((ret = libssh_authentication(libssh, user, pass)) < 0)
+        goto fail;
+
+    if ((ret = libssh_create_sftp_session(libssh)) < 0)
+        goto fail;
+
+    if ((ret = libssh_open_file(libssh, flags, path)) < 0)
+        goto fail;
+
+    libssh_stat_file(libssh);
 
     return 0;
 
@@ -144,31 +219,36 @@
 
 static int64_t libssh_seek(URLContext *h, int64_t pos, int whence)
 {
-    LIBSSHContext *s = h->priv_data;
+    LIBSSHContext *libssh = h->priv_data;
     int64_t newpos;
 
-    if (s->filesize == -1 && (whence == AVSEEK_SIZE || whence == SEEK_END)) {
+    if (libssh->filesize == -1 && (whence == AVSEEK_SIZE || whence == SEEK_END)) {
         av_log(h, AV_LOG_ERROR, "Error during seeking.\n");
         return AVERROR(EIO);
     }
 
     switch(whence) {
     case AVSEEK_SIZE:
-        return s->filesize;
+        return libssh->filesize;
     case SEEK_SET:
         newpos = pos;
         break;
     case SEEK_CUR:
-        newpos = sftp_tell64(s->file);
+        newpos = sftp_tell64(libssh->file) + pos;
         break;
     case SEEK_END:
-        newpos = s->filesize + pos;
+        newpos = libssh->filesize + pos;
         break;
     default:
         return AVERROR(EINVAL);
     }
 
-    if (sftp_seek64(s->file, newpos)) {
+    if (newpos < 0) {
+        av_log(h, AV_LOG_ERROR, "Seeking to nagative position.\n");
+        return AVERROR(EINVAL);
+    }
+
+    if (sftp_seek64(libssh->file, newpos)) {
         av_log(h, AV_LOG_ERROR, "Error during seeking.\n");
         return AVERROR(EIO);
     }
@@ -178,11 +258,11 @@
 
 static int libssh_read(URLContext *h, unsigned char *buf, int size)
 {
-    LIBSSHContext *s = h->priv_data;
+    LIBSSHContext *libssh = h->priv_data;
     int bytes_read;
 
-    if ((bytes_read = sftp_read(s->file, buf, size)) < 0) {
-        av_log(h, AV_LOG_ERROR, "Read error.\n");
+    if ((bytes_read = sftp_read(libssh->file, buf, size)) < 0) {
+        av_log(libssh, AV_LOG_ERROR, "Read error.\n");
         return AVERROR(EIO);
     }
     return bytes_read;
@@ -190,11 +270,11 @@
 
 static int libssh_write(URLContext *h, const unsigned char *buf, int size)
 {
-    LIBSSHContext *s = h->priv_data;
+    LIBSSHContext *libssh = h->priv_data;
     int bytes_written;
 
-    if ((bytes_written = sftp_write(s->file, buf, size)) < 0) {
-        av_log(h, AV_LOG_ERROR, "Write error.\n");
+    if ((bytes_written = sftp_write(libssh->file, buf, size)) < 0) {
+        av_log(libssh, AV_LOG_ERROR, "Write error.\n");
         return AVERROR(EIO);
     }
     return bytes_written;
@@ -206,6 +286,7 @@
 static const AVOption options[] = {
     {"timeout", "set timeout of socket I/O operations", OFFSET(rw_timeout), AV_OPT_TYPE_INT, {.i64 = -1}, -1, INT_MAX, D|E },
     {"truncate", "Truncate existing files on write", OFFSET(trunc), AV_OPT_TYPE_INT, { .i64 = 1 }, 0, 1, E },
+    {"private_key", "set path to private key", OFFSET(priv_key), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, D|E },
     {NULL}
 };

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/lvfdec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/lvfdec.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/matroskadec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/matroskadec.c Changed

@@ -62,6 +62,7 @@
     EBML_NEST,
     EBML_PASS,
     EBML_STOP,
+    EBML_SINT,
     EBML_TYPE_COUNT
 } EbmlType;
 
@@ -252,6 +253,7 @@
     uint64_t time_scale;
     double   duration;
     char    *title;
+    char    *muxingapp;
     EbmlBin date_utc;
     EbmlList tracks;
     EbmlList attachments;
@@ -292,7 +294,7 @@
     EbmlBin  bin;
     uint64_t additional_id;
     EbmlBin  additional;
-    uint64_t discard_padding;
+    int64_t discard_padding;
 } MatroskaBlock;
 
 static EbmlSyntax ebml_header[] = {
@@ -316,7 +318,7 @@
     { MATROSKA_ID_DURATION,           EBML_FLOAT, 0, offsetof(MatroskaDemuxContext,duration) },
     { MATROSKA_ID_TITLE,              EBML_UTF8,  0, offsetof(MatroskaDemuxContext,title) },
     { MATROSKA_ID_WRITINGAPP,         EBML_NONE },
-    { MATROSKA_ID_MUXINGAPP,          EBML_NONE },
+    { MATROSKA_ID_MUXINGAPP,          EBML_UTF8, 0, offsetof(MatroskaDemuxContext,muxingapp) },
     { MATROSKA_ID_DATEUTC,            EBML_BIN,  0, offsetof(MatroskaDemuxContext,date_utc) },
     { MATROSKA_ID_SEGMENTUID,         EBML_NONE },
     { 0 }
@@ -570,8 +572,8 @@
     { MATROSKA_ID_BLOCKADDITIONS, EBML_NEST, 0, 0, {.n=matroska_blockadditions} },
     { MATROSKA_ID_SIMPLEBLOCK,    EBML_BIN,  0, offsetof(MatroskaBlock,bin) },
     { MATROSKA_ID_BLOCKDURATION,  EBML_UINT, 0, offsetof(MatroskaBlock,duration) },
-    { MATROSKA_ID_DISCARDPADDING, EBML_UINT, 0, offsetof(MatroskaBlock,discard_padding) },
-    { MATROSKA_ID_BLOCKREFERENCE, EBML_UINT, 0, offsetof(MatroskaBlock,reference) },
+    { MATROSKA_ID_DISCARDPADDING, EBML_SINT, 0, offsetof(MatroskaBlock,discard_padding) },
+    { MATROSKA_ID_BLOCKREFERENCE, EBML_SINT, 0, offsetof(MatroskaBlock,reference) },
     { MATROSKA_ID_CODECSTATE,     EBML_NONE },
     { 1,                          EBML_UINT, 0, offsetof(MatroskaBlock,non_simple), {.u=1} },
     { 0 }
@@ -759,6 +761,30 @@
 }
 
 /*
+ * Read the next element as a signed int.
+ * 0 is success, < 0 is failure.
+ */
+static int ebml_read_sint(AVIOContext *pb, int size, int64_t *num)
+{
+    int n = 1;
+
+    if (size > 8)
+        return AVERROR_INVALIDDATA;
+
+    if (size == 0) {
+        *num = 0;
+    } else {
+        *num = sign_extend(avio_r8(pb), 8);
+
+        /* big-endian ordering; build up number */
+        while (n++ < size)
+            *num = (*num << 8) | avio_r8(pb);
+    }
+
+    return 0;
+}
+
+/*
  * Read the next element as a float.
  * 0 is success, < 0 is failure.
  */
@@ -985,6 +1011,7 @@
 
     switch (syntax->type) {
     case EBML_UINT:  res = ebml_read_uint  (pb, length, data);  break;
+    case EBML_SINT:  res = ebml_read_sint  (pb, length, data);  break;
     case EBML_FLOAT: res = ebml_read_float (pb, length, data);  break;
     case EBML_STR:
     case EBML_UTF8:  res = ebml_read_ascii (pb, length, data);  break;
@@ -1561,6 +1588,7 @@
         matroska->ctx->duration = matroska->duration * matroska->time_scale
                                   * 1000 / AV_TIME_BASE;
     av_dict_set(&s->metadata, "title", matroska->title, 0);
+    av_dict_set(&s->metadata, "encoder", matroska->muxingapp, 0);
 
     if (matroska->date_utc.size == 8)
         matroska_metadata_creation_time(&s->metadata, AV_RB64(matroska->date_utc.data));
@@ -1577,6 +1605,7 @@
         uint32_t fourcc = 0;
         AVIOContext b;
         char* key_id_base64 = NULL;
+        int bit_depth = -1;
 
         /* Apply some sanity checks. */
         if (track->type != MATROSKA_TRACK_TYPE_VIDEO &&
@@ -1680,6 +1709,7 @@
             && track->codec_priv.size >= 40
             && track->codec_priv.data != NULL) {
             track->ms_compat = 1;
+            bit_depth = AV_RL16(track->codec_priv.data + 14);
             fourcc = AV_RL32(track->codec_priv.data + 16);
             codec_id = ff_codec_get_id(ff_codec_bmp_tags, fourcc);
             extradata_offset = 40;
@@ -1694,11 +1724,26 @@
                 return ret;
             codec_id = st->codec->codec_id;
             extradata_offset = FFMIN(track->codec_priv.size, 18);
-        } else if (!strcmp(track->codec_id, "V_QUICKTIME")
+        } else if (!strcmp(track->codec_id, "A_QUICKTIME")
                    && (track->codec_priv.size >= 86)
                    && (track->codec_priv.data != NULL)) {
-            fourcc = AV_RL32(track->codec_priv.data);
+            fourcc = AV_RL32(track->codec_priv.data + 4);
+            codec_id = ff_codec_get_id(ff_codec_movaudio_tags, fourcc);
+            if (ff_codec_get_id(ff_codec_movaudio_tags, AV_RL32(track->codec_priv.data))) {
+                fourcc = AV_RL32(track->codec_priv.data);
+                codec_id = ff_codec_get_id(ff_codec_movaudio_tags, fourcc);
+            }
+        } else if (!strcmp(track->codec_id, "V_QUICKTIME")
+                   && (track->codec_priv.size >= 21)
+                   && (track->codec_priv.data != NULL)) {
+            fourcc = AV_RL32(track->codec_priv.data + 4);
             codec_id = ff_codec_get_id(ff_codec_movvideo_tags, fourcc);
+            if (ff_codec_get_id(ff_codec_movvideo_tags, AV_RL32(track->codec_priv.data))) {
+                fourcc = AV_RL32(track->codec_priv.data);
+                codec_id = ff_codec_get_id(ff_codec_movvideo_tags, fourcc);
+            }
+            if (codec_id == AV_CODEC_ID_NONE && AV_RL32(track->codec_priv.data+4) == AV_RL32("SMI "))
+                codec_id = AV_CODEC_ID_SVQ3;
         } else if (codec_id == AV_CODEC_ID_PCM_S16BE) {
             switch (track->audio.bitdepth) {
             case  8:  codec_id = AV_CODEC_ID_PCM_U8;     break;
@@ -1777,7 +1822,7 @@
             track->audio.sub_packet_h    = avio_rb16(&b);
             track->audio.frame_size      = avio_rb16(&b);
             track->audio.sub_packet_size = avio_rb16(&b);
-            if (flavor <= 0 || track->audio.coded_framesize <= 0 ||
+            if (flavor < 0 || track->audio.coded_framesize <= 0 ||
                 track->audio.sub_packet_h <= 0 || track->audio.frame_size <= 0 ||
                 track->audio.sub_packet_size <= 0)
                 return AVERROR_INVALIDDATA;
@@ -1808,7 +1853,7 @@
         avpriv_set_pts_info(st, 64, matroska->time_scale*track->time_scale, 1000*1000*1000); /* 64 bit pts in ns */
 
         st->codec->codec_id = codec_id;
-        st->start_time = 0;
+
         if (strcmp(track->language, "und"))
             av_dict_set(&st->metadata, "language", track->language, 0);
         av_dict_set(&st->metadata, "title", track->name, 0);
@@ -1836,6 +1881,8 @@
 
             st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
             st->codec->codec_tag  = fourcc;
+            if (bit_depth >= 0)
+                st->codec->bits_per_coded_sample = bit_depth;
             st->codec->width  = track->video.pixel_width;
             st->codec->height = track->video.pixel_height;
             av_reduce(&st->sample_aspect_ratio.num,
@@ -1845,6 +1892,7 @@
                       255);
             if (st->codec->codec_id != AV_CODEC_ID_HEVC)
                 st->need_parsing = AVSTREAM_PARSE_HEADERS;
+
             if (track->default_duration) {
                 av_reduce(&st->avg_frame_rate.num, &st->avg_frame_rate.den,
                           1000000000, track->default_duration, 30000);
@@ -1880,6 +1928,7 @@
             st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
             st->codec->sample_rate = track->audio.out_samplerate;
             st->codec->channels = track->audio.channels;
+            if (!st->codec->bits_per_coded_sample)
             st->codec->bits_per_coded_sample = track->audio.bitdepth;
             if (st->codec->codec_id != AV_CODEC_ID_AAC)
             st->need_parsing = AVSTREAM_PARSE_HEADERS;
@@ -2152,7 +2201,7 @@
             }
             memcpy(track->audio.buf + y*w, data, w);
         } else {
-            if (size < sps * w / sps || h<=0) {
+            if (size < sps * w / sps || h<=0 || w%sps) {
                 av_log(matroska->ctx, AV_LOG_ERROR,
                        "Corrupt generic RM-style audio packet size\n");
                 return AVERROR_INVALIDDATA;
@@ -2389,7 +2438,7 @@
                                 uint64_t timecode, uint64_t lace_duration,
                                 int64_t pos, int is_keyframe,
                                 uint8_t *additional, uint64_t additional_id, int additional_size,
-                                uint64_t discard_padding)
+                                int64_t discard_padding)
 {
     MatroskaTrackEncoding *encodings = track->encodings.elem;
     uint8_t *pkt_data = data;
@@ -2526,7 +2575,7 @@
                                 int size, int64_t pos, uint64_t cluster_time,
                                 uint64_t block_duration, int is_keyframe,
                                 uint8_t *additional, uint64_t additional_id, int additional_size,
-                                int64_t cluster_pos, uint64_t discard_padding)
+                                int64_t cluster_pos, int64_t discard_padding)
 {
     uint64_t timecode = AV_NOPTS_VALUE;
     MatroskaTrack *track;

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/matroskaenc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/matroskaenc.c Changed

@@ -19,7 +19,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <stdint.h>
+
 #include "avc.h"
+#include "hevc.h"
 #include "avformat.h"
 #include "avio_internal.h"
 #include "avlanguage.h"
@@ -202,6 +205,19 @@
         avio_w8(pb, (uint8_t)(val >> i*8));
 }
 
+static void put_ebml_sint(AVIOContext *pb, unsigned int elementid, int64_t val)
+{
+    int i, bytes = 1;
+    uint64_t tmp = 2*(val < 0 ? val^-1 : val);
+
+    while (tmp>>=8) bytes++;
+
+    put_ebml_id(pb, elementid);
+    put_ebml_num(pb, bytes, 0);
+    for (i = bytes - 1; i >= 0; i--)
+        avio_w8(pb, (uint8_t)(val >> i*8));
+}
+
 static void put_ebml_float(AVIOContext *pb, unsigned int elementid, double val)
 {
     put_ebml_id(pb, elementid);
@@ -517,6 +533,8 @@
             ret = put_wv_codecpriv(dyn_cp, codec);
         else if (codec->codec_id == AV_CODEC_ID_H264)
             ret = ff_isom_write_avcc(dyn_cp, codec->extradata, codec->extradata_size);
+        else if (codec->codec_id == AV_CODEC_ID_HEVC)
+            ret = ff_isom_write_hvcc(dyn_cp, codec->extradata, codec->extradata_size, 0);
         else if (codec->codec_id == AV_CODEC_ID_ALAC) {
             if (codec->extradata_size < 36) {
                 av_log(s, AV_LOG_ERROR,
@@ -533,9 +551,23 @@
         if (qt_id) {
             if (!codec->codec_tag)
                 codec->codec_tag = ff_codec_get_tag(ff_codec_movvideo_tags, codec->codec_id);
-            if (codec->extradata_size)
+            if (codec->extradata_size) {
+                if (   ff_codec_get_id(ff_codec_movvideo_tags, codec->codec_tag) == codec->codec_id
+                    && ff_codec_get_id(ff_codec_movvideo_tags, AV_RL32(codec->extradata+4)) != codec->codec_id
+                ) {
+                    int i;
+                    avio_wb32(dyn_cp, 0x5a + codec->extradata_size);
+                    avio_wl32(dyn_cp, codec->codec_tag);
+                    for(i=0; i<0x5a-8; i++)
+                        avio_w8(dyn_cp, 0);
+                }
                 avio_write(dyn_cp, codec->extradata, codec->extradata_size);
+            }
         } else {
+            if (!ff_codec_get_tag(ff_codec_bmp_tags, codec->codec_id))
+                av_log(s, AV_LOG_WARNING, "codec %s is not supported by this format\n",
+                       avcodec_get_name(codec->codec_id));
+
             if (!codec->codec_tag)
                 codec->codec_tag = ff_codec_get_tag(ff_codec_bmp_tags, codec->codec_id);
             if (!codec->codec_tag) {
@@ -544,7 +576,7 @@
                 ret = AVERROR(EINVAL);
             }
 
-            ff_put_bmp_header(dyn_cp, codec, ff_codec_bmp_tags, 0);
+            ff_put_bmp_header(dyn_cp, codec, ff_codec_bmp_tags, 0, 0);
         }
 
     } else if (codec->codec_type == AVMEDIA_TYPE_AUDIO) {
@@ -592,6 +624,8 @@
         int bit_depth = av_get_bits_per_sample(codec->codec_id);
         int sample_rate = codec->sample_rate;
         int output_sample_rate = 0;
+        int display_width_div = 1;
+        int display_height_div = 1;
         AVDictionaryEntry *tag;
 
         if (codec->codec_type == AVMEDIA_TYPE_ATTACHMENT) {
@@ -599,7 +633,7 @@
             continue;
         }
 
-        if (!bit_depth)
+        if (!bit_depth && codec->codec_id != AV_CODEC_ID_ADPCM_G726)
             bit_depth = av_get_bytes_per_sample(codec->sample_fmt) << 3;
         if (!bit_depth)
             bit_depth = codec->bits_per_coded_sample;
@@ -723,6 +757,21 @@
                         return AVERROR(EINVAL);
                     } else
                         put_ebml_uint(pb, MATROSKA_ID_VIDEOSTEREOMODE, st_mode);
+
+                    switch (st_mode) {
+                    case 1:
+                    case 8:
+                    case 9:
+                    case 11:
+                        display_width_div = 2;
+                        break;
+                    case 2:
+                    case 3:
+                    case 6:
+                    case 7:
+                        display_height_div = 2;
+                        break;
+                    }
                 }
 
                 if ((tag = av_dict_get(st->metadata, "alpha_mode", NULL, 0)) ||
@@ -737,8 +786,11 @@
                         av_log(s, AV_LOG_ERROR, "Overflow in display width\n");
                         return AVERROR(EINVAL);
                     }
-                    put_ebml_uint(pb, MATROSKA_ID_VIDEODISPLAYWIDTH , d_width);
-                    put_ebml_uint(pb, MATROSKA_ID_VIDEODISPLAYHEIGHT, codec->height);
+                    put_ebml_uint(pb, MATROSKA_ID_VIDEODISPLAYWIDTH , d_width / display_width_div);
+                    put_ebml_uint(pb, MATROSKA_ID_VIDEODISPLAYHEIGHT, codec->height / display_height_div);
+                } else if (display_width_div != 1 || display_height_div != 1) {
+                    put_ebml_uint(pb, MATROSKA_ID_VIDEODISPLAYWIDTH , codec->width / display_width_div);
+                    put_ebml_uint(pb, MATROSKA_ID_VIDEODISPLAYHEIGHT, codec->height / display_height_div);
                 }
 
                 if (codec->codec_id == AV_CODEC_ID_RAWVIDEO) {
@@ -893,7 +945,9 @@
     end_ebml_master(s->pb, targets);
 
     while ((t = av_dict_get(m, "", t, AV_DICT_IGNORE_SUFFIX)))
-        if (av_strcasecmp(t->key, "title") && av_strcasecmp(t->key, "stereo_mode"))
+        if (av_strcasecmp(t->key, "title") &&
+            av_strcasecmp(t->key, "stereo_mode") &&
+            av_strcasecmp(t->key, "encoding_tool"))
             mkv_write_simpletag(s->pb, t);
 
     end_ebml_master(s->pb, tag);
@@ -1098,7 +1152,10 @@
             segment_uid[i] = av_lfg_get(&lfg);
 
         put_ebml_string(pb, MATROSKA_ID_MUXINGAPP , LIBAVFORMAT_IDENT);
-        put_ebml_string(pb, MATROSKA_ID_WRITINGAPP, LIBAVFORMAT_IDENT);
+        if ((tag = av_dict_get(s->metadata, "encoding_tool", NULL, 0)))
+            put_ebml_string(pb, MATROSKA_ID_WRITINGAPP, tag->value);
+        else
+            put_ebml_string(pb, MATROSKA_ID_WRITINGAPP, LIBAVFORMAT_IDENT);
         put_ebml_binary(pb, MATROSKA_ID_SEGMENTUID, segment_uid, 16);
     } else {
         const char *ident = "Lavf";
@@ -1304,7 +1361,8 @@
     uint8_t *data = NULL, *side_data = NULL;
     int offset = 0, size = pkt->size, side_data_size = 0;
     int64_t ts = mkv->tracks[pkt->stream_index].write_dts ? pkt->dts : pkt->pts;
-    uint64_t additional_id = 0, discard_padding = 0;
+    uint64_t additional_id = 0;
+    int64_t discard_padding = 0;
     ebml_master block_group, block_additions, block_more;
 
     av_log(s, AV_LOG_DEBUG, "Writing block at offset %" PRIu64 ", size %d, "
@@ -1313,6 +1371,10 @@
     if (codec->codec_id == AV_CODEC_ID_H264 && codec->extradata_size > 0 &&
         (AV_RB24(codec->extradata) == 1 || AV_RB32(codec->extradata) == 1))
         ff_avc_parse_nal_units_buf(pkt->data, &data, &size);
+    else if (codec->codec_id == AV_CODEC_ID_HEVC && codec->extradata_size > 6 &&
+             (AV_RB24(codec->extradata) == 1 || AV_RB32(codec->extradata) == 1))
+        /* extradata is Annex B, assume the bitstream is too and convert it */
+        ff_hevc_annexb2mp4_buf(pkt->data, &data, &size, 0, NULL);
     else if (codec->codec_id == AV_CODEC_ID_WAVPACK) {
         int ret = mkv_strip_wavpack(pkt->data, &data, &size);
         if (ret < 0) {
@@ -1363,7 +1425,7 @@
         av_free(data);
 
     if (discard_padding) {
-        put_ebml_uint(pb, MATROSKA_ID_DISCARDPADDING, discard_padding);
+        put_ebml_sint(pb, MATROSKA_ID_DISCARDPADDING, discard_padding);
     }
 
     if (side_data_size && additional_id == 1) {

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/metadata.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/metadata.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/mms.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/mms.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/mmst.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/mmst.c Changed

@@ -1,7 +1,7 @@
 /*
  * MMS protocol over TCP
  * Copyright (c) 2006,2007 Ryan Martell
- * Copyright (c) 2007 Björn Axelsson
+ * Copyright (c) 2007 BjÃ¶rn Axelsson
  * Copyright (c) 2010 Zhentan Feng <spyfeng at gmail dot com>
  *
  * This file is part of FFmpeg.
@@ -152,7 +152,7 @@
     return 0;
 }
 
-static void mms_put_utf16(MMSContext *mms, const uint8_t *src)
+static int mms_put_utf16(MMSContext *mms, const uint8_t *src)
 {
     AVIOContext bic;
     int size = mms->write_out_ptr - mms->out_buffer;
@@ -161,7 +161,10 @@
             sizeof(mms->out_buffer) - size, 1, NULL, NULL, NULL, NULL);
 
     len = avio_put_str16le(&bic, src);
+    if (len < 0)
+        return len;
     mms->write_out_ptr += len;
+    return 0;
 }
 
 static int send_time_test_data(MMSTContext *mmst)
@@ -173,6 +176,7 @@
 
 static int send_protocol_select(MMSTContext *mmst)
 {
+    int ret;
     char data_string[256];
     MMSContext *mms = &mmst->mms;
 
@@ -189,18 +193,21 @@
             "TCP",                                        // or UDP
             LOCAL_PORT);
 
-    mms_put_utf16(mms, data_string);
+    if ((ret = mms_put_utf16(mms, data_string)) < 0)
+        return ret;
     return send_command_packet(mmst);
 }
 
 static int send_media_file_request(MMSTContext *mmst)
 {
+    int ret;
     MMSContext *mms = &mmst->mms;
     start_command_packet(mmst, CS_PKT_MEDIA_FILE_REQUEST);
     insert_command_prefixes(mms, 1, 0xffffffff);
     bytestream_put_le32(&mms->write_out_ptr, 0);
     bytestream_put_le32(&mms->write_out_ptr, 0);
-    mms_put_utf16(mms, mmst->path + 1); // +1 for skip "/"
+    if ((ret = mms_put_utf16(mms, mmst->path + 1)) < 0) // +1 for skip "/"
+        return ret;
 
     return send_command_packet(mmst);
 }
@@ -417,6 +424,7 @@
 static int send_startup_packet(MMSTContext *mmst)
 {
     char data_string[256];
+    int ret;
     MMSContext *mms = &mmst->mms;
     // SubscriberName is defined in MS specification linked below.
     // The guid value can be any valid value.
@@ -429,7 +437,8 @@
     start_command_packet(mmst, CS_PKT_INITIAL);
     insert_command_prefixes(mms, 0, 0x0004000b);
     bytestream_put_le32(&mms->write_out_ptr, 0x0003001c);
-    mms_put_utf16(mms, data_string);
+    if ((ret = mms_put_utf16(mms, data_string)) < 0)
+        return ret;
     return send_command_packet(mmst);
 }

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/mov.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/mov.c Changed

@@ -24,6 +24,7 @@
  */
 
 #include <limits.h>
+#include <stdint.h>
 
 //#define MOV_EXPORT_ALL_METADATA
 
@@ -393,7 +394,9 @@
         if (data_type == 3 || (data_type == 0 && (langcode < 0x400 || langcode == 0x7fff))) { // MAC Encoded
             mov_read_mac_string(c, pb, str_size, str, sizeof(str));
         } else {
-            avio_read(pb, str, str_size);
+            int ret = avio_read(pb, str, str_size);
+            if (ret != str_size)
+                return ret < 0 ? ret : AVERROR_INVALIDDATA;
             str[str_size] = 0;
         }
         av_dict_set(&c->fc->metadata, key, str, 0);
@@ -536,7 +539,8 @@
                     dref->dir = av_malloc(len+1);
                     if (!dref->dir)
                         return AVERROR(ENOMEM);
-                    avio_read(pb, dref->dir, len);
+                    if (avio_read(pb, dref->dir, len) != len)
+                        return AVERROR_INVALIDDATA;
                     dref->dir[len] = 0;
                     for (j = 0; j < len; j++)
                         if (dref->dir[j] == ':')
@@ -1001,7 +1005,14 @@
     st->codec->extradata_size= size - FF_INPUT_BUFFER_PADDING_SIZE;
     AV_WB32(       buf    , atom.size + 8);
     AV_WL32(       buf + 4, atom.type);
-    avio_read(pb, buf + 8, atom.size);
+    err = avio_read(pb, buf + 8, atom.size);
+    if (err < 0) {
+        return err;
+    } else if (err < atom.size) {
+        av_log(c->fc, AV_LOG_WARNING, "truncated extradata\n");
+        st->codec->extradata_size -= atom.size - err;
+    }
+    memset(buf + 8 + err, 0, FF_INPUT_BUFFER_PADDING_SIZE);
     return 0;
 }
 
@@ -1042,15 +1053,17 @@
 
 static int mov_read_ares(MOVContext *c, AVIOContext *pb, MOVAtom atom)
 {
-    AVCodecContext *codec = c->fc->streams[c->fc->nb_streams-1]->codec;
-    if (codec->codec_tag == MKTAG('A', 'V', 'i', 'n') &&
-        codec->codec_id == AV_CODEC_ID_H264 &&
-        atom.size > 11) {
-        avio_skip(pb, 10);
-        /* For AVID AVCI50, force width of 1440 to be able to select the correct SPS and PPS */
-        if (avio_rb16(pb) == 0xd4d)
-            codec->width = 1440;
-        return 0;
+    if (c->fc->nb_streams >= 1) {
+        AVCodecContext *codec = c->fc->streams[c->fc->nb_streams-1]->codec;
+        if (codec->codec_tag == MKTAG('A', 'V', 'i', 'n') &&
+            codec->codec_id == AV_CODEC_ID_H264 &&
+            atom.size > 11) {
+            avio_skip(pb, 10);
+            /* For AVID AVCI50, force width of 1440 to be able to select the correct SPS and PPS */
+            if (avio_rb16(pb) == 0xd4d)
+                codec->width = 1440;
+            return 0;
+        }
     }
 
     return mov_read_avid(c, pb, atom);
@@ -1077,9 +1090,8 @@
         st->codec->codec_id == AV_CODEC_ID_SPEEX) {
         // pass all frma atom to codec, needed at least for QDMC and QDM2
         av_free(st->codec->extradata);
-        if (ff_alloc_extradata(st->codec, atom.size))
+        if (ff_get_extradata(st->codec, pb, atom.size) < 0)
             return AVERROR(ENOMEM);
-        avio_read(pb, st->codec->extradata, atom.size);
     } else if (atom.size > 8) { /* to read frma, esds atoms */
         int ret;
         if ((ret = mov_read_default(c, pb, atom)) < 0)
@@ -1114,9 +1126,9 @@
             return mov_read_default(c, pb, atom);
     }
     av_free(st->codec->extradata);
-    if (ff_alloc_extradata(st->codec, atom.size))
+    if (ff_get_extradata(st->codec, pb, atom.size) < 0)
         return AVERROR(ENOMEM);
-    avio_read(pb, st->codec->extradata, atom.size);
+
     return 0;
 }
 
@@ -1124,6 +1136,7 @@
 {
     AVStream *st;
     uint8_t profile_level;
+    int ret;
 
     if (c->fc->nb_streams < 1)
         return 0;
@@ -1136,11 +1149,11 @@
     if ((profile_level & 0xf0) != 0xc0)
         return 0;
 
-    av_free(st->codec->extradata);
-    if (ff_alloc_extradata(st->codec, atom.size - 7))
-        return AVERROR(ENOMEM);
     avio_seek(pb, 6, SEEK_CUR);
-    avio_read(pb, st->codec->extradata, st->codec->extradata_size);
+    av_free(st->codec->extradata);
+    if ((ret = ff_get_extradata(st->codec, pb, atom.size - 7)) < 0)
+        return ret;
+
     return 0;
 }
 
@@ -1162,11 +1175,10 @@
     if ((uint64_t)atom.size > (1<<30))
         return AVERROR_INVALIDDATA;
 
+    avio_skip(pb, 40);
     av_free(st->codec->extradata);
-    if (ff_alloc_extradata(st->codec, atom.size - 40))
+    if (ff_get_extradata(st->codec, pb, atom.size - 40) < 0)
         return AVERROR(ENOMEM);
-    avio_skip(pb, 40);
-    avio_read(pb, st->codec->extradata, atom.size - 40);
     return 0;
 }
 
@@ -1305,6 +1317,9 @@
     /* figure out the palette situation */
     color_depth     = st->codec->bits_per_coded_sample & 0x1F;
     color_greyscale = st->codec->bits_per_coded_sample & 0x20;
+    /* Do not create a greyscale palette for cinepak */
+    if (color_greyscale && st->codec->codec_id == AV_CODEC_ID_CINEPAK)
+        return;
 
     /* if the depth is 2, 4, or 8 bpp, file is palettized */
     if ((color_depth == 2) || (color_depth == 4) || (color_depth == 8)) {
@@ -1320,9 +1335,6 @@
             color_index = 255;
             color_dec   = 256 / (color_count - 1);
             for (j = 0; j < color_count; j++) {
-                if (st->codec->codec_id == AV_CODEC_ID_CINEPAK){
-                    r = g = b = color_count - 1 - color_index;
-                } else
                 r = g = b = color_index;
                 sc->palette[j] = (0xFFU << 24) | (r << 16) | (g << 8) | (b);
                 color_index -= color_dec;
@@ -1479,9 +1491,8 @@
                                 int size)
 {
     if (st->codec->codec_tag == MKTAG('t','m','c','d')) {
-        if (ff_alloc_extradata(st->codec, size))
+        if (ff_get_extradata(st->codec, pb, size) < 0)
             return AVERROR(ENOMEM);
-        avio_read(pb, st->codec->extradata, size);
         if (size > 16) {
             MOVStreamContext *tmcd_ctx = st->priv_data;
             int val;
@@ -1526,6 +1537,10 @@
         // force sample rate for qcelp when not stored in mov
         if (st->codec->codec_tag != MKTAG('Q','c','l','p'))
             st->codec->sample_rate = 8000;
+        // FIXME: Why is the following needed for some files?
+        sc->samples_per_frame = 160;
+        if (!sc->bytes_per_frame)
+            sc->bytes_per_frame = 35;
         break;
     case AV_CODEC_ID_AMR_NB:
         st->codec->channels    = 1;
@@ -1558,11 +1573,7 @@
         }
         break;
     case AV_CODEC_ID_AC3:
-        st->need_parsing = AVSTREAM_PARSE_FULL;
-        break;
     case AV_CODEC_ID_MPEG1VIDEO:
-        st->need_parsing = AVSTREAM_PARSE_FULL;
-        break;
     case AV_CODEC_ID_VC1:
         st->need_parsing = AVSTREAM_PARSE_FULL;
         break;
@@ -1779,7 +1790,7 @@
     if (!entries)
     {
         sc->keyframe_absent = 1;
-        if (!st->need_parsing)
+        if (!st->need_parsing && st->codec->codec_type == AVMEDIA_TYPE_VIDEO)
             st->need_parsing = AVSTREAM_PARSE_HEADERS;
         return 0;
     }
@@ -1903,6 +1914,7 @@
     if (entries >= UINT_MAX / sizeof(*sc->stts_data))
         return -1;
 
+    av_free(sc->stts_data);
     sc->stts_data = av_malloc(entries * sizeof(*sc->stts_data));
     if (!sc->stts_data)
         return AVERROR(ENOMEM);
@@ -1916,7 +1928,8 @@
 
         /* sample_duration < 0 is invalid based on the spec */
         if (sample_duration < 0) {
-            av_log(c->fc, AV_LOG_ERROR, "Invalid SampleDelta in STTS %d\n", sample_duration);
+            av_log(c->fc, AV_LOG_ERROR, "Invalid SampleDelta %d in STTS, at %d st:%d\n",
+                   sample_duration, i, c->fc->nb_streams-1);
             sample_duration = 1;
         }
         if (sample_count < 0) {
@@ -1929,12 +1942,21 @@
         av_dlog(c->fc, "sample_count=%d, sample_duration=%d\n",
                 sample_count, sample_duration);
 
+        if (   i+1 == entries
+            && i
+            && sample_count == 1
+            && total_sample_count > 100
+            && sample_duration/10 > duration / total_sample_count)
+            sample_duration = duration / total_sample_count;
         duration+=(int64_t)sample_duration*sample_count;
         total_sample_count+=sample_count;
     }
 
     sc->stts_count = i;
 
+    sc->duration_for_fps  += duration;
+    sc->nb_frames_for_fps += total_sample_count;
+
     if (pb->eof_reached)
         return AVERROR_EOF;
 
@@ -2142,6 +2164,11 @@
                         rap_group_index++;
                     }
                 }
+                if (sc->keyframe_absent
+                    && !sc->stps_count
+                    && !rap_group_present
+                    && st->codec->codec_type == AVMEDIA_TYPE_AUDIO)
+                     keyframe = 1;
                 if (keyframe)
                     distance = 0;
                 sample_size = sc->stsz_sample_size > 0 ? sc->stsz_sample_size : sc->sample_sizes[current_sample];
@@ -2156,6 +2183,8 @@
                     av_dlog(mov->fc, "AVIndex stream %d, sample %d, offset %"PRIx64", dts %"PRId64", "
                             "size %d, distance %d, keyframe %d\n", st->index, current_sample,
                             current_offset, current_dts, sample_size, distance, keyframe);
+                    if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO && st->nb_index_entries < 100)
+                        ff_rfps_add_frame(mov->fc, st, current_dts);
                 }
 
                 current_offset += sample_size;
@@ -2374,10 +2403,6 @@
                                              ((double)st->codec->width * sc->height), INT_MAX);
         }
 
-        if (st->duration > 0)
-            av_reduce(&st->avg_frame_rate.num, &st->avg_frame_rate.den,
-                      sc->time_scale*st->nb_frames, st->duration, INT_MAX);
-
 #if FF_API_R_FRAME_RATE
         if (sc->stts_count == 1 || (sc->stts_count == 2 && sc->stts_data[1].count == 1))
             av_reduce(&st->r_frame_rate.num, &st->r_frame_rate.den,
@@ -2387,8 +2412,10 @@
 
     // done for ai5q, ai52, ai55, ai1q, ai12 and ai15.
     if (!st->codec->extradata_size && st->codec->codec_id == AV_CODEC_ID_H264 &&
-        st->codec->codec_tag != MKTAG('a', 'v', 'c', '1')) {
-        ff_generate_avci_extradata(st);
+        TAG_IS_AVCI(st->codec->codec_tag)) {
+        ret = ff_generate_avci_extradata(st);
+        if (ret < 0)
+            return ret;
     }
 
     switch (st->codec->codec_id) {
@@ -2694,6 +2721,8 @@
         dts += sample_duration;
         offset += sample_size;
         sc->data_size += sample_size;
+        sc->duration_for_fps += sample_duration;
+        sc->nb_frames_for_fps ++;
     }
 
     if (pb->eof_reached)
@@ -3267,13 +3296,15 @@
         av_freep(&sc->drefs);
         if (!sc->pb_is_copied)
             avio_close(sc->pb);
+
         sc->pb = NULL;
         av_freep(&sc->chunk_offsets);
-        av_freep(&sc->keyframes);
-        av_freep(&sc->sample_sizes);
-        av_freep(&sc->stps_data);
         av_freep(&sc->stsc_data);
+        av_freep(&sc->sample_sizes);
+        av_freep(&sc->keyframes);
         av_freep(&sc->stts_data);
+        av_freep(&sc->stps_data);
+        av_freep(&sc->rap_group);
     }
 
     if (mov->dv_demux) {
@@ -3388,6 +3419,9 @@
         if(st->codec->codec_type == AVMEDIA_TYPE_AUDIO && st->codec->codec_id == AV_CODEC_ID_AAC) {
             st->skip_samples = sc->start_pad;
         }
+        if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO && sc->nb_frames_for_fps > 0 && sc->duration_for_fps > 0)
+            av_reduce(&st->avg_frame_rate.num, &st->avg_frame_rate.den,
+                      sc->time_scale*(int64_t)sc->nb_frames_for_fps, sc->duration_for_fps, INT_MAX);
     }
 
     if (mov->trex_data) {
@@ -3405,6 +3439,8 @@
         }
     }
 
+    ff_rfps_calculate(s);
+
     return 0;
 }

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/movenc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/movenc.c Changed

@@ -21,6 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <stdint.h>
+
 #include "movenc.h"
 #include "avformat.h"
 #include "avio_internal.h"
@@ -37,6 +39,7 @@
 #include "libavutil/mathematics.h"
 #include "libavutil/opt.h"
 #include "libavutil/dict.h"
+#include "hevc.h"
 #include "rtpenc.h"
 #include "mov_chan.h"
 
@@ -64,6 +67,7 @@
     { "ism_lookahead", "Number of lookahead entries for ISM files", offsetof(MOVMuxContext, ism_lookahead), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM},
     { "use_editlist", "use edit list", offsetof(MOVMuxContext, use_editlist), AV_OPT_TYPE_INT, {.i64 = -1}, -1, 1, AV_OPT_FLAG_ENCODING_PARAM},
     { "video_track_timescale", "set timescale of all video tracks", offsetof(MOVMuxContext, video_track_timescale), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM},
+    { "brand",    "Override major brand", offsetof(MOVMuxContext, major_brand),   AV_OPT_TYPE_STRING, {.str = NULL}, .flags = AV_OPT_FLAG_ENCODING_PARAM },
     { NULL },
 };
 
@@ -612,7 +616,12 @@
     else
         next_dts = track->cluster[cluster_idx + 1].dts;
 
-    return next_dts - track->cluster[cluster_idx].dts;
+    next_dts -= track->cluster[cluster_idx].dts;
+
+    av_assert0(next_dts >= 0);
+    av_assert0(next_dts <= INT_MAX);
+
+    return next_dts;
 }
 
 static int get_samples_per_packet(MOVTrack *track)
@@ -765,6 +774,16 @@
     return update_size(pb, pos);
 }
 
+static int mov_write_hvcc_tag(AVIOContext *pb, MOVTrack *track)
+{
+    int64_t pos = avio_tell(pb);
+
+    avio_wb32(pb, 0);
+    ffio_wfourcc(pb, "hvcC");
+    ff_isom_write_hvcc(pb, track->vos_data, track->vos_len, 0);
+    return update_size(pb, pos);
+}
+
 /* also used by all avid codecs (dv, imx, meridien) and their variants */
 static int mov_write_avid_tag(AVIOContext *pb, MOVTrack *track)
 {
@@ -821,6 +840,7 @@
         return 0;
 
     if      (track->enc->codec_id == AV_CODEC_ID_H264)      tag = MKTAG('a','v','c','1');
+    else if (track->enc->codec_id == AV_CODEC_ID_HEVC)      tag = MKTAG('h','e','v','1');
     else if (track->enc->codec_id == AV_CODEC_ID_AC3)       tag = MKTAG('a','c','-','3');
     else if (track->enc->codec_id == AV_CODEC_ID_DIRAC)     tag = MKTAG('d','r','a','c');
     else if (track->enc->codec_id == AV_CODEC_ID_MOV_TEXT)  tag = MKTAG('t','x','3','g');
@@ -899,11 +919,14 @@
 
 static int mov_get_mpeg2_xdcam_codec_tag(AVFormatContext *s, MOVTrack *track)
 {
-    int tag = MKTAG('m', '2', 'v', '1'); //fallback tag
+    int tag = track->enc->codec_tag;
     int interlaced = track->enc->field_order > AV_FIELD_PROGRESSIVE;
     AVStream *st = track->st;
     int rate = av_q2d(find_fps(s, st));
 
+    if (!tag)
+        tag = MKTAG('m', '2', 'v', '1'); //fallback tag
+
     if (track->enc->pix_fmt == AV_PIX_FMT_YUV420P) {
         if (track->enc->width == 1280 && track->enc->height == 720) {
             if (!interlaced) {
@@ -1219,6 +1242,8 @@
         avio_wb32(pb, 0);
     } else if (track->enc->codec_id == AV_CODEC_ID_DNXHD)
         mov_write_avid_tag(pb, track);
+    else if (track->enc->codec_id == AV_CODEC_ID_HEVC)
+        mov_write_hvcc_tag(pb, track);
     else if (track->enc->codec_id == AV_CODEC_ID_H264) {
         mov_write_avcc_tag(pb, track);
         if (track->mode == MODE_IPOD)
@@ -2201,7 +2226,8 @@
     mov_write_string_metadata(s, pb, "\251wrt", "composer" , 1);
     mov_write_string_metadata(s, pb, "\251alb", "album"    , 1);
     mov_write_string_metadata(s, pb, "\251day", "date"     , 1);
-    mov_write_string_tag(pb, "\251too", LIBAVFORMAT_IDENT, 0, 1);
+    if (!mov_write_string_metadata(s, pb, "\251too", "encoding_tool", 1))
+        mov_write_string_tag(pb, "\251too", LIBAVFORMAT_IDENT, 0, 1);
     mov_write_string_metadata(s, pb, "\251cmt", "comment"  , 1);
     mov_write_string_metadata(s, pb, "\251gen", "genre"    , 1);
     mov_write_string_metadata(s, pb, "\251cpy", "copyright", 1);
@@ -2935,7 +2961,9 @@
     avio_wb32(pb, 0); /* size */
     ffio_wfourcc(pb, "ftyp");
 
-    if (mov->mode == MODE_3GP) {
+    if (mov->major_brand && strlen(mov->major_brand) >= 4)
+        ffio_wfourcc(pb, mov->major_brand);
+    else if (mov->mode == MODE_3GP) {
         ffio_wfourcc(pb, has_h264 ? "3gp6"  : "3gp4");
         minor =     has_h264 ?   0x100 :   0x200;
     } else if (mov->mode & MODE_3G2) {
@@ -3253,6 +3281,17 @@
     int size = pkt->size;
     uint8_t *reformatted_data = NULL;
 
+    if (trk->entry) {
+        int64_t duration = pkt->dts - trk->cluster[trk->entry - 1].dts;
+        if (duration < 0 || duration > INT_MAX) {
+            av_log(s, AV_LOG_ERROR, "Application provided duration: %"PRId64" / timestamp: %"PRId64" is out of range for mov/mp4 format\n",
+                duration, pkt->dts
+            );
+
+            pkt->dts = trk->cluster[trk->entry - 1].dts + 1;
+            pkt->pts = AV_NOPTS_VALUE;
+        }
+    }
     if (mov->flags & FF_MOV_FLAG_FRAGMENT) {
         int ret;
         if (mov->fragments > 0) {
@@ -3319,6 +3358,15 @@
         } else {
             size = ff_avc_parse_nal_units(pb, pkt->data, pkt->size);
         }
+    } else if (enc->codec_id == AV_CODEC_ID_HEVC && trk->vos_len > 6 &&
+               (AV_RB24(trk->vos_data) == 1 || AV_RB32(trk->vos_data) == 1)) {
+        /* extradata is Annex B, assume the bitstream is too and convert it */
+        if (trk->hint_track >= 0 && trk->hint_track < mov->nb_streams) {
+            ff_hevc_annexb2mp4_buf(pkt->data, &reformatted_data, &size, 0, NULL);
+            avio_write(pb, reformatted_data, size);
+        } else {
+            size = ff_hevc_annexb2mp4(pb, pkt->data, pkt->size, 0, NULL);
+        }
     } else {
         avio_write(pb, pkt->data, size);
     }
@@ -3703,7 +3751,7 @@
     AVIOContext *pb = s->pb;
     MOVMuxContext *mov = s->priv_data;
     AVDictionaryEntry *t, *global_tcr = av_dict_get(s->metadata, "timecode", NULL, 0);
-    int i, hint_track = 0, tmcd_track = 0;
+    int i, ret, hint_track = 0, tmcd_track = 0;
 
     /* Default mode == MP4 */
     mov->mode = MODE_MP4;
@@ -3743,7 +3791,7 @@
     }
 
     if (!supports_edts(mov) && s->avoid_negative_ts < 0) {
-        s->avoid_negative_ts = 1;
+        s->avoid_negative_ts = 2;
     }
 
     /* Non-seekable output is ok if using fragmentation. If ism_lookahead
@@ -3835,8 +3883,10 @@
         track->mode = mov->mode;
         track->tag  = mov_find_codec_tag(s, track);
         if (!track->tag) {
-            av_log(s, AV_LOG_ERROR, "track %d: could not find tag, "
-                   "codec not currently supported in container\n", i);
+            av_log(s, AV_LOG_ERROR, "Could not find tag for codec %s in stream #%d, "
+                   "codec not currently supported in container\n",
+                   avcodec_get_name(st->codec->codec_id), i);
+            ret = AVERROR(EINVAL);
             goto error;
         }
         /* If hinting of this track is enabled by a later hint track,
@@ -3849,6 +3899,7 @@
                 track->tag == MKTAG('m','x','5','p') || track->tag == MKTAG('m','x','5','n')) {
                 if (st->codec->width != 720 || (st->codec->height != 608 && st->codec->height != 512)) {
                     av_log(s, AV_LOG_ERROR, "D-10/IMX must use 720x608 or 720x512 video resolution\n");
+                    ret = AVERROR(EINVAL);
                     goto error;
                 }
                 track->height = track->tag >> 24 == 'n' ? 486 : 576;
@@ -3875,6 +3926,7 @@
                      st->codec->codec_id == AV_CODEC_ID_ILBC){
                 if (!st->codec->block_align) {
                     av_log(s, AV_LOG_ERROR, "track %d: codec block align is not set for adpcm\n", i);
+                    ret = AVERROR(EINVAL);
                     goto error;
                 }
                 track->sample_size = st->codec->block_align;
@@ -3883,13 +3935,15 @@
             }else{
                 track->sample_size = (av_get_bits_per_sample(st->codec->codec_id) >> 3) * st->codec->channels;
             }
-            if (st->codec->codec_id == AV_CODEC_ID_ILBC) {
+            if (st->codec->codec_id == AV_CODEC_ID_ILBC ||
+                st->codec->codec_id == AV_CODEC_ID_ADPCM_IMA_QT) {
                 track->audio_vbr = 1;
             }
             if (track->mode != MODE_MOV &&
                 track->enc->codec_id == AV_CODEC_ID_MP3 && track->timescale < 16000) {
                 av_log(s, AV_LOG_ERROR, "track %d: muxing mp3 at %dhz is not supported\n",
                        i, track->enc->sample_rate);
+                ret = AVERROR(EINVAL);
                 goto error;
             }
         } else if (st->codec->codec_type == AVMEDIA_TYPE_SUBTITLE) {
@@ -3918,13 +3972,6 @@
 
     enable_tracks(s);
 
-    if (mov->mode == MODE_ISM) {
-        /* If no fragmentation options have been set, set a default. */
-        if (!(mov->flags & (FF_MOV_FLAG_FRAG_KEYFRAME |
-                            FF_MOV_FLAG_FRAG_CUSTOM)) &&
-            !mov->max_fragment_duration && !mov->max_fragment_size)
-            mov->flags |= FF_MOV_FLAG_FRAG_KEYFRAME;
-    }
 
     if (mov->reserved_moov_size){
         mov->reserved_moov_pos= avio_tell(pb);
@@ -3932,7 +3979,13 @@
             avio_skip(pb, mov->reserved_moov_size);
     }
 
-    if (!(mov->flags & FF_MOV_FLAG_FRAGMENT)) {
+    if (mov->flags & FF_MOV_FLAG_FRAGMENT) {
+        /* If no fragmentation options have been set, set a default. */
+        if (!(mov->flags & (FF_MOV_FLAG_FRAG_KEYFRAME |
+                            FF_MOV_FLAG_FRAG_CUSTOM)) &&
+            !mov->max_fragment_duration && !mov->max_fragment_size)
+            mov->flags |= FF_MOV_FLAG_FRAG_KEYFRAME;
+    } else {
         if (mov->flags & FF_MOV_FLAG_FASTSTART)
             mov->reserved_moov_pos = avio_tell(pb);
         mov_write_mdat_tag(pb, mov);
@@ -3944,7 +3997,7 @@
         mov->time += 0x7C25B080; // 1970 based -> 1904 based
 
     if (mov->chapter_track)
-        if (mov_create_chapter_track(s, mov->chapter_track) < 0)
+        if ((ret = mov_create_chapter_track(s, mov->chapter_track)) < 0)
             goto error;
 
     if (mov->flags & FF_MOV_FLAG_RTP_HINT) {
@@ -3953,7 +4006,7 @@
             AVStream *st = s->streams[i];
             if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO ||
                 st->codec->codec_type == AVMEDIA_TYPE_AUDIO) {
-                if (ff_mov_init_hinting(s, hint_track, i) < 0)
+                if ((ret = ff_mov_init_hinting(s, hint_track, i)) < 0)
                     goto error;
                 hint_track++;
             }
@@ -3971,7 +4024,7 @@
                     t = av_dict_get(st->metadata, "timecode", NULL, 0);
                 if (!t)
                     continue;
-                if (mov_create_timecode_track(s, tmcd_track, i, t->value) < 0)
+                if ((ret = mov_create_timecode_track(s, tmcd_track, i, t->value)) < 0)
                     goto error;
                 tmcd_track++;
             }
@@ -3991,7 +4044,7 @@
     return 0;
  error:
     mov_free(s);
-    return -1;
+    return ret;
 }
 
 static int get_moov_size(AVFormatContext *s)

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/movenc.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/movenc.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/mp3dec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/mp3dec.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/mp3enc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/mp3enc.c Changed

@@ -85,6 +85,7 @@
     ID3v2EncContext id3;
     int id3v2_version;
     int write_id3v1;
+    int write_xing;
 
     /* xing header */
     int64_t xing_offset;
@@ -125,7 +126,7 @@
     int              needed;
     const char      *vendor = (codec->flags & CODEC_FLAG_BITEXACT) ? "Lavf" : LIBAVFORMAT_IDENT;
 
-    if (!s->pb->seekable)
+    if (!s->pb->seekable || !mp3->write_xing)
         return 0;
 
     for (i = 0; i < FF_ARRAY_ELEMS(avpriv_mpa_freq_tab); i++) {
@@ -303,7 +304,7 @@
     AVPacketList *pktl;
     int ret = 0, write = 1;
 
-    ff_id3v2_finish(&mp3->id3, s->pb);
+    ff_id3v2_finish(&mp3->id3, s->pb, s->metadata_header_padding);
     mp3_write_xing(s);
 
     while ((pktl = mp3->queue)) {
@@ -393,9 +394,11 @@
 
 static const AVOption options[] = {
     { "id3v2_version", "Select ID3v2 version to write. Currently 3 and 4 are supported.",
-      offsetof(MP3Context, id3v2_version), AV_OPT_TYPE_INT, {.i64 = 4}, 3, 4, AV_OPT_FLAG_ENCODING_PARAM},
+      offsetof(MP3Context, id3v2_version), AV_OPT_TYPE_INT, {.i64 = 4}, 0, 4, AV_OPT_FLAG_ENCODING_PARAM},
     { "write_id3v1", "Enable ID3v1 writing. ID3v1 tags are written in UTF-8 which may not be supported by most software.",
       offsetof(MP3Context, write_id3v1), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, AV_OPT_FLAG_ENCODING_PARAM},
+    { "write_xing",  "Write the Xing header containing file duration.",
+      offsetof(MP3Context, write_xing),  AV_OPT_TYPE_INT, {.i64 = 1}, 0, 1, AV_OPT_FLAG_ENCODING_PARAM},
     { NULL },
 };
 
@@ -414,14 +417,14 @@
         if (mp3->pics_to_write) {
             /* buffer audio packets until we get all the pictures */
             AVPacketList *pktl = av_mallocz(sizeof(*pktl));
+            int ret;
             if (!pktl)
                 return AVERROR(ENOMEM);
 
-            pktl->pkt     = *pkt;
-            pktl->pkt.buf = av_buffer_ref(pkt->buf);
-            if (!pktl->pkt.buf) {
+            ret = av_copy_packet(&pktl->pkt, pkt);
+            if (ret < 0) {
                 av_freep(&pktl);
-                return AVERROR(ENOMEM);
+                return ret;
             }
 
             if (mp3->queue_end)
@@ -464,6 +467,14 @@
     MP3Context  *mp3 = s->priv_data;
     int ret, i;
 
+    if (mp3->id3v2_version      &&
+        mp3->id3v2_version != 3 &&
+        mp3->id3v2_version != 4) {
+        av_log(s, AV_LOG_ERROR, "Invalid ID3v2 version requested: %d. Only "
+               "3, 4 or 0 (disabled) are allowed.\n", mp3->id3v2_version);
+        return AVERROR(EINVAL);
+    }
+
     /* check the streams -- we want exactly one audio and arbitrary number of
      * video (attached pictures) */
     mp3->audio_stream_idx = -1;
@@ -487,13 +498,22 @@
     }
     mp3->pics_to_write = s->nb_streams - 1;
 
-    ff_id3v2_start(&mp3->id3, s->pb, mp3->id3v2_version, ID3v2_DEFAULT_MAGIC);
-    ret = ff_id3v2_write_metadata(s, &mp3->id3);
-    if (ret < 0)
-        return ret;
+    if (mp3->pics_to_write && !mp3->id3v2_version) {
+        av_log(s, AV_LOG_ERROR, "Attached pictures were requested, but the "
+               "ID3v2 header is disabled.\n");
+        return AVERROR(EINVAL);
+    }
+
+    if (mp3->id3v2_version) {
+        ff_id3v2_start(&mp3->id3, s->pb, mp3->id3v2_version, ID3v2_DEFAULT_MAGIC);
+        ret = ff_id3v2_write_metadata(s, &mp3->id3);
+        if (ret < 0)
+            return ret;
+    }
 
     if (!mp3->pics_to_write) {
-        ff_id3v2_finish(&mp3->id3, s->pb);
+        if (mp3->id3v2_version)
+            ff_id3v2_finish(&mp3->id3, s->pb, s->metadata_header_padding);
         mp3_write_xing(s);
     }

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/mpc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/mpc.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/mpc8.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/mpc8.c Changed

@@ -136,7 +136,7 @@
     int tag;
     int64_t size, pos, ppos[2];
     uint8_t *buf;
-    int i, t, seekd;
+    int i, t, seekd, ret;
     GetBitContext gb;
 
     if (s->nb_streams == 0) {
@@ -156,7 +156,14 @@
     }
     if(!(buf = av_malloc(size + FF_INPUT_BUFFER_PADDING_SIZE)))
         return;
-    avio_read(s->pb, buf, size);
+    ret = avio_read(s->pb, buf, size);
+    if (ret != size) {
+        av_log(s, AV_LOG_ERROR, "seek table truncated\n");
+        av_free(buf);
+        return;
+    }
+    memset(buf+size, 0, FF_INPUT_BUFFER_PADDING_SIZE);
+
     init_get_bits(&gb, buf, size * 8);
     size = gb_get_v(&gb);
     if(size > UINT_MAX/4 || size > c->samples/1152){
@@ -241,9 +248,8 @@
     st->codec->codec_id = AV_CODEC_ID_MUSEPACK8;
     st->codec->bits_per_coded_sample = 16;
 
-    if (ff_alloc_extradata(st->codec, 2))
+    if (ff_get_extradata(st->codec, pb, 2) < 0)
         return AVERROR(ENOMEM);
-    avio_read(pb, st->codec->extradata, st->codec->extradata_size);
 
     st->codec->channels = (st->codec->extradata[1] >> 4) + 1;
     st->codec->sample_rate = mpc8_rate[st->codec->extradata[0] >> 5];

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/mpeg.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/mpeg.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/mpegenc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/mpegenc.c Changed

@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <stdint.h>
+
 #include "libavutil/attributes.h"
 #include "libavutil/fifo.h"
 #include "libavutil/log.h"
@@ -344,6 +346,15 @@
 
         switch(st->codec->codec_type) {
         case AVMEDIA_TYPE_AUDIO:
+            if (!s->is_mpeg2 &&
+                (st->codec->codec_id == AV_CODEC_ID_AC3 ||
+                 st->codec->codec_id == AV_CODEC_ID_DTS ||
+                 st->codec->codec_id == AV_CODEC_ID_PCM_S16BE))
+                 av_log(ctx, AV_LOG_WARNING,
+                        "%s in MPEG-1 system streams is not widely supported, "
+                        "consider using the vob or the dvd muxer "
+                        "to force a MPEG-2 program stream.\n",
+                        avcodec_get_name(st->codec->codec_id));
             if        (st->codec->codec_id == AV_CODEC_ID_AC3) {
                 stream->id = ac3_id++;
             } else if (st->codec->codec_id == AV_CODEC_ID_DTS) {

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/mpegts.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/mpegts.c Changed

@@ -90,6 +90,9 @@
     unsigned int id; //program id/service id
     unsigned int nb_pids;
     unsigned int pids[MAX_PIDS_PER_PROGRAM];
+
+    /** have we found pmt for this program */
+    int pmt_found;
 };
 
 struct MpegTSContext {
@@ -142,6 +145,8 @@
 static const AVOption mpegtsraw_options[] = {
     {"compute_pcr", "Compute exact PCR for each transport stream packet.", offsetof(MpegTSContext, mpeg2ts_compute_pcr), AV_OPT_TYPE_INT,
      {.i64 = 0}, 0, 1, AV_OPT_FLAG_DECODING_PARAM },
+    {"ts_packetsize", "Output option carrying the raw packet size.", offsetof(MpegTSContext, raw_packet_size), AV_OPT_TYPE_INT,
+     {.i64 = 0}, 0, 0, AV_OPT_FLAG_DECODING_PARAM | AV_OPT_FLAG_EXPORT | AV_OPT_FLAG_READONLY },
     { NULL },
 };
 
@@ -155,6 +160,8 @@
 static const AVOption mpegts_options[] = {
     {"fix_teletext_pts", "Try to fix pts values of dvb teletext streams.", offsetof(MpegTSContext, fix_teletext_pts), AV_OPT_TYPE_INT,
      {.i64 = 1}, 0, 1, AV_OPT_FLAG_DECODING_PARAM },
+    {"ts_packetsize", "Output option carrying the raw packet size.", offsetof(MpegTSContext, raw_packet_size), AV_OPT_TYPE_INT,
+     {.i64 = 0}, 0, 0, AV_OPT_FLAG_DECODING_PARAM | AV_OPT_FLAG_EXPORT | AV_OPT_FLAG_READONLY },
     { NULL },
 };
 
@@ -205,6 +212,17 @@
 
 extern AVInputFormat ff_mpegts_demuxer;
 
+static struct Program * get_program(MpegTSContext *ts, unsigned int programid)
+{
+    int i;
+    for(i=0; i<ts->nb_prg; i++) {
+        if(ts->prg[i].id == programid) {
+            return &ts->prg[i];
+        }
+    }
+    return NULL;
+}
+
 static void clear_avprogram(MpegTSContext *ts, unsigned int programid)
 {
     AVProgram *prg = NULL;
@@ -225,8 +243,10 @@
 
     clear_avprogram(ts, programid);
     for(i=0; i<ts->nb_prg; i++)
-        if(ts->prg[i].id == programid)
+        if(ts->prg[i].id == programid) {
             ts->prg[i].nb_pids = 0;
+            ts->prg[i].pmt_found = 0;
+        }
 }
 
 static void clear_programs(MpegTSContext *ts)
@@ -245,19 +265,13 @@
     p = &ts->prg[ts->nb_prg];
     p->id = programid;
     p->nb_pids = 0;
+    p->pmt_found = 0;
     ts->nb_prg++;
 }
 
 static void add_pid_to_pmt(MpegTSContext *ts, unsigned int programid, unsigned int pid)
 {
-    int i;
-    struct Program *p = NULL;
-    for(i=0; i<ts->nb_prg; i++) {
-        if(ts->prg[i].id == programid) {
-            p = &ts->prg[i];
-            break;
-        }
-    }
+    struct Program *p = get_program(ts, programid);
     if(!p)
         return;
 
@@ -266,6 +280,15 @@
     p->pids[p->nb_pids++] = pid;
 }
 
+static void set_pmt_found(MpegTSContext *ts, unsigned int programid)
+{
+    struct Program *p = get_program(ts, programid);
+    if(!p)
+        return;
+
+    p->pmt_found = 1;
+}
+
 static void set_pcr_pid(AVFormatContext *s, unsigned int programid, unsigned int pid)
 {
     int i;
@@ -452,22 +475,19 @@
 static int analyze(const uint8_t *buf, int size, int packet_size, int *index){
     int stat[TS_MAX_PACKET_SIZE];
     int i;
-    int x=0;
     int best_score=0;
 
-    memset(stat, 0, packet_size*sizeof(int));
+    memset(stat, 0, packet_size*sizeof(*stat));
 
-    for(x=i=0; i<size-3; i++){
+    for(i=0; i<size-3; i++){
         if(buf[i] == 0x47 && !(buf[i+1] & 0x80) && buf[i+3] != 0x47){
+            int x = i % packet_size;
             stat[x]++;
             if(stat[x] > best_score){
                 best_score= stat[x];
                 if(index) *index= x;
             }
         }
-
-        x++;
-        if(x == packet_size) x= 0;
     }
 
     return best_score;
@@ -640,6 +660,12 @@
     { 0 },
 };
 
+static const StreamType METADATA_types[] = {
+    { MKTAG('K','L','V','A'), AVMEDIA_TYPE_DATA, AV_CODEC_ID_SMPTE_KLV },
+    { MKTAG('I','D','3',' '), AVMEDIA_TYPE_DATA, AV_CODEC_ID_TIMED_ID3 },
+    { 0 },
+};
+
 /* descriptor present */
 static const StreamType DESC_types[] = {
     { 0x6a, AVMEDIA_TYPE_AUDIO,             AV_CODEC_ID_AC3 }, /* AC-3 descriptor */
@@ -1002,6 +1028,12 @@
                     p += sl_header_bytes;
                     buf_size -= sl_header_bytes;
                 }
+                if (pes->stream_type == 0x15 && buf_size >= 5) {
+                    /* skip metadata access unit header */
+                    pes->pes_header_size += 5;
+                    p += 5;
+                    buf_size -= 5;
+                }
                 if (pes->ts->fix_teletext_pts && pes->st->codec->codec_id == AV_CODEC_ID_DVB_TELETEXT) {
                     AVProgram *p = NULL;
                     while ((p = av_find_program_from_stream(pes->stream, p, pes->st->index))) {
@@ -1222,6 +1254,11 @@
         descr->sl.timestamp_res      = avio_rb32(&d->pb);
                                        avio_rb32(&d->pb);
         descr->sl.timestamp_len      = avio_r8(&d->pb);
+        if (descr->sl.timestamp_len > 64) {
+            avpriv_request_sample(NULL, "timestamp_len > 64");
+            descr->sl.timestamp_len = 64;
+            return AVERROR_PATCHWELCOME;
+        }
         descr->sl.ocr_len            = avio_r8(&d->pb);
         descr->sl.au_len             = avio_r8(&d->pb);
         descr->sl.inst_bitrate_len   = avio_r8(&d->pb);
@@ -1430,38 +1467,111 @@
         }
         break;
     case 0x56: /* DVB teletext descriptor */
-        language[0] = get8(pp, desc_end);
-        language[1] = get8(pp, desc_end);
-        language[2] = get8(pp, desc_end);
-        language[3] = 0;
-        av_dict_set(&st->metadata, "language", language, 0);
+        {
+            uint8_t *extradata = NULL;
+            int language_count = desc_len / 5;
+
+            if (desc_len > 0 && desc_len % 5 != 0)
+                return AVERROR_INVALIDDATA;
+
+            if (language_count > 0) {
+                /* 4 bytes per language code (3 bytes) with comma or NUL byte should fit language buffer */
+                if (language_count > sizeof(language) / 4) {
+                    language_count = sizeof(language) / 4;
+                }
+
+                if (st->codec->extradata == NULL) {
+                    if (ff_alloc_extradata(st->codec, language_count * 2)) {
+                        return AVERROR(ENOMEM);
+                    }
+                }
+
+               if (st->codec->extradata_size < language_count * 2)
+                   return AVERROR_INVALIDDATA;
+
+               extradata = st->codec->extradata;
+
+                for (i = 0; i < language_count; i++) {
+                    language[i * 4 + 0] = get8(pp, desc_end);
+                    language[i * 4 + 1] = get8(pp, desc_end);
+                    language[i * 4 + 2] = get8(pp, desc_end);
+                    language[i * 4 + 3] = ',';
+
+                    memcpy(extradata, *pp, 2);
+                    extradata += 2;
+
+                    *pp += 2;
+                }
+
+                language[i * 4 - 1] = 0;
+                av_dict_set(&st->metadata, "language", language, 0);
+            }
+        }
         break;
     case 0x59: /* subtitling descriptor */
-        language[0] = get8(pp, desc_end);
-        language[1] = get8(pp, desc_end);
-        language[2] = get8(pp, desc_end);
-        language[3] = 0;
-        /* hearing impaired subtitles detection */
-        switch(get8(pp, desc_end)) {
-        case 0x20: /* DVB subtitles (for the hard of hearing) with no monitor aspect ratio criticality */
-        case 0x21: /* DVB subtitles (for the hard of hearing) for display on 4:3 aspect ratio monitor */
-        case 0x22: /* DVB subtitles (for the hard of hearing) for display on 16:9 aspect ratio monitor */
-        case 0x23: /* DVB subtitles (for the hard of hearing) for display on 2.21:1 aspect ratio monitor */
-        case 0x24: /* DVB subtitles (for the hard of hearing) for display on a high definition monitor */
-        case 0x25: /* DVB subtitles (for the hard of hearing) with plano-stereoscopic disparity for display on a high definition monitor */
-            st->disposition |= AV_DISPOSITION_HEARING_IMPAIRED;
-            break;
-        }
-        if (st->codec->extradata) {
-            if (st->codec->extradata_size == 4 && memcmp(st->codec->extradata, *pp, 4))
-                avpriv_request_sample(fc, "DVB sub with multiple IDs");
-        } else {
-            if (!ff_alloc_extradata(st->codec, 4)) {
-                memcpy(st->codec->extradata, *pp, 4);
+        {
+            /* 8 bytes per DVB subtitle substream data:
+             * ISO_639_language_code (3 bytes),
+             * subtitling_type (1 byte),
+             * composition_page_id (2 bytes),
+             * ancillary_page_id (2 bytes) */
+            int language_count = desc_len / 8;
+
+            if (desc_len > 0 && desc_len % 8 != 0)
+                return AVERROR_INVALIDDATA;
+
+            if (language_count > 1) {
+                avpriv_request_sample(fc, "DVB subtitles with multiple languages");
+            }
+
+            if (language_count > 0) {
+                uint8_t *extradata;
+
+                /* 4 bytes per language code (3 bytes) with comma or NUL byte should fit language buffer */
+                if (language_count > sizeof(language) / 4) {
+                    language_count = sizeof(language) / 4;
+                }
+
+                if (st->codec->extradata == NULL) {
+                    if (ff_alloc_extradata(st->codec, language_count * 5)) {
+                        return AVERROR(ENOMEM);
+                    }
+                }
+
+                if (st->codec->extradata_size < language_count * 5)
+                    return AVERROR_INVALIDDATA;
+
+                extradata = st->codec->extradata;
+
+                for (i = 0; i < language_count; i++) {
+                    language[i * 4 + 0] = get8(pp, desc_end);
+                    language[i * 4 + 1] = get8(pp, desc_end);
+                    language[i * 4 + 2] = get8(pp, desc_end);
+                    language[i * 4 + 3] = ',';
+
+                    /* hearing impaired subtitles detection using subtitling_type */
+                    switch(*pp[0]) {
+                    case 0x20: /* DVB subtitles (for the hard of hearing) with no monitor aspect ratio criticality */
+                    case 0x21: /* DVB subtitles (for the hard of hearing) for display on 4:3 aspect ratio monitor */
+                    case 0x22: /* DVB subtitles (for the hard of hearing) for display on 16:9 aspect ratio monitor */
+                    case 0x23: /* DVB subtitles (for the hard of hearing) for display on 2.21:1 aspect ratio monitor */
+                    case 0x24: /* DVB subtitles (for the hard of hearing) for display on a high definition monitor */
+                    case 0x25: /* DVB subtitles (for the hard of hearing) with plano-stereoscopic disparity for display on a high definition monitor */
+                        st->disposition |= AV_DISPOSITION_HEARING_IMPAIRED;
+                        break;
+                    }
+
+                    extradata[4] = get8(pp, desc_end); /* subtitling_type */
+                    memcpy(extradata, *pp, 4); /* composition_page_id and ancillary_page_id */
+                    extradata += 5;
+
+                    *pp += 4;
+                }
+
+                language[i * 4 - 1] = 0;
+                av_dict_set(&st->metadata, "language", language, 0);
             }
         }
-        *pp += 4;
-        av_dict_set(&st->metadata, "language", language, 0);
         break;
     case 0x0a: /* ISO 639 language descriptor */
         for (i = 0; i + 4 <= desc_len; i += 4) {
@@ -1489,6 +1599,15 @@
     case 0x52: /* stream identifier descriptor */
         st->stream_identifier = 1 + get8(pp, desc_end);
         break;
+    case 0x26: /* metadata descriptor */
+        if (get16(pp, desc_end) == 0xFFFF)
+            *pp += 4;
+        if (get8(pp, desc_end) == 0xFF) {
+            st->codec->codec_tag = bytestream_get_le32(pp);
+            if (st->codec->codec_id == AV_CODEC_ID_NONE)
+                mpegts_find_stream_type(st, st->codec->codec_tag, METADATA_types);
+        }
+        break;
     default:
         break;
     }
@@ -1570,6 +1689,8 @@
     if (!ts->stream->nb_streams)
         ts->stop_parse = 2;
 
+    set_pmt_found(ts, h->id);
+
     for(;;) {
         st = 0;
         pes = NULL;
@@ -1892,6 +2013,23 @@
                                    p, p_end - p, 0);
             }
         }
+
+        // stop find_stream_info from waiting for more streams
+        // when all programs have received a PMT
+        if(ts->stream->ctx_flags & AVFMTCTX_NOHEADER) {
+            int i;
+            for(i=0; i<ts->nb_prg; i++) {
+                if (!ts->prg[i].pmt_found)
+                    break;
+            }
+            if (i == ts->nb_prg && ts->nb_prg > 0) {
+                if (ts->stream->nb_streams > 1 || pos > 100000) {
+                    av_log(ts->stream, AV_LOG_DEBUG, "All programs have pmt, headers found\n");
+                    ts->stream->ctx_flags &= ~AVFMTCTX_NOHEADER;
+                }
+            }
+        }
+
     } else {
         int ret;
         int64_t pcr = -1;
@@ -1976,7 +2114,9 @@
         /* check packet sync byte */
         if ((*data)[0] != 0x47) {
             /* find a new packet start */
-            avio_seek(pb, -raw_packet_size, SEEK_CUR);
+            uint64_t pos = avio_tell(pb);
+            avio_seek(pb, -FFMIN(raw_packet_size, pos), SEEK_CUR);
+
             if (mpegts_resync(s) < 0)
                 return AVERROR(EAGAIN);
             else

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/mpegtsenc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/mpegtsenc.c Changed

@@ -259,7 +259,7 @@
                           data, q - data);
 }
 
-static void mpegts_write_pmt(AVFormatContext *s, MpegTSService *service)
+static int mpegts_write_pmt(AVFormatContext *s, MpegTSService *service)
 {
     MpegTSWrite *ts = s->priv_data;
     uint8_t data[1012], *q, *desc_length_ptr, *program_info_length_ptr;
@@ -315,6 +315,10 @@
             stream_type = STREAM_TYPE_PRIVATE_DATA;
             break;
         }
+
+        if (q - data > sizeof(data) - 32)
+            return AVERROR(EINVAL);
+
         *q++ = stream_type;
         put16(&q, 0xe000 | ts_st->pid);
         desc_length_ptr = q;
@@ -346,7 +350,7 @@
                 len_ptr = q++;
                 *len_ptr = 0;
 
-                for (p = lang->value; next && *len_ptr < 255 / 4 * 4; p = next + 1) {
+                for (p = lang->value; next && *len_ptr < 255 / 4 * 4 && q - data < sizeof(data) - 4; p = next + 1) {
                     next = strchr(p, ',');
                     if (strlen(p) != 3 && (!next || next != p + 3))
                         continue; /* not a 3-letter code */
@@ -373,21 +377,79 @@
             break;
         case AVMEDIA_TYPE_SUBTITLE:
             {
-                const char *language;
-                language = lang && strlen(lang->value)==3 ? lang->value : "eng";
-                *q++ = 0x59;
-                *q++ = 8;
-                *q++ = language[0];
-                *q++ = language[1];
-                *q++ = language[2];
-                *q++ = 0x10; /* normal subtitles (0x20 = if hearing pb) */
-                if(st->codec->extradata_size == 4) {
-                    memcpy(q, st->codec->extradata, 4);
-                    q += 4;
-                } else {
-                    put16(&q, 1); /* page id */
-                    put16(&q, 1); /* ancillary page id */
-                }
+                const char default_language[] = "und";
+                const char *language = lang && strlen(lang->value) >= 3 ? lang->value : default_language;
+
+                if (st->codec->codec_id == AV_CODEC_ID_DVB_SUBTITLE) {
+                    uint8_t *len_ptr;
+                    int extradata_copied = 0;
+
+                    *q++ = 0x59; /* subtitling_descriptor */
+                    len_ptr = q++;
+
+                    while (strlen(language) >= 3 && (sizeof(data) - (q - data)) >= 8) { /* 8 bytes per DVB subtitle substream data */
+                        *q++ = *language++;
+                        *q++ = *language++;
+                        *q++ = *language++;
+                        /* Skip comma */
+                        if (*language != '\0')
+                            language++;
+
+                        if (st->codec->extradata_size - extradata_copied >= 5) {
+                            *q++ = st->codec->extradata[extradata_copied + 4]; /* subtitling_type */
+                            memcpy(q, st->codec->extradata + extradata_copied, 4); /* composition_page_id and ancillary_page_id */
+                            extradata_copied += 5;
+                            q += 4;
+                        } else {
+                            /* subtitling_type:
+                             * 0x10 - normal with no monitor aspect ratio criticality
+                             * 0x20 - for the hard of hearing with no monitor aspect ratio criticality */
+                            *q++ = (st->disposition & AV_DISPOSITION_HEARING_IMPAIRED) ? 0x20 : 0x10;
+                            if ((st->codec->extradata_size == 4) && (extradata_copied == 0)) {
+                                /* support of old 4-byte extradata format */
+                                memcpy(q, st->codec->extradata, 4); /* composition_page_id and ancillary_page_id */
+                                extradata_copied += 4;
+                                q += 4;
+                            } else {
+                                put16(&q, 1); /* composition_page_id */
+                                put16(&q, 1); /* ancillary_page_id */
+                            }
+                        }
+                    }
+
+                    *len_ptr = q - len_ptr - 1;
+                } else if (st->codec->codec_id == AV_CODEC_ID_DVB_TELETEXT) {
+                    uint8_t *len_ptr = NULL;
+                    int extradata_copied = 0;
+
+                    /* The descriptor tag. teletext_descriptor */
+                    *q++ = 0x56;
+                    len_ptr = q++;
+
+                    while (strlen(language) >= 3 && q - data < sizeof(data) - 6) {
+                        *q++ = *language++;
+                        *q++ = *language++;
+                        *q++ = *language++;
+                        /* Skip comma */
+                        if (*language != '\0')
+                            language++;
+
+                        if (st->codec->extradata_size - 1 > extradata_copied) {
+                            memcpy(q, st->codec->extradata + extradata_copied, 2);
+                            extradata_copied += 2;
+                            q += 2;
+                        } else {
+                            /* The Teletext descriptor:
+                             * teletext_type: This 5-bit field indicates the type of Teletext page indicated. (0x01 Initial Teletext page)
+                             * teletext_magazine_number: This is a 3-bit field which identifies the magazine number.
+                             * teletext_page_number: This is an 8-bit field giving two 4-bit hex digits identifying the page number. */
+                            *q++ = 0x08;
+                            *q++ = 0x00;
+                        }
+                    }
+
+                    *len_ptr = q - len_ptr - 1;
+                 }
             }
             break;
         case AVMEDIA_TYPE_VIDEO:
@@ -418,6 +480,7 @@
     }
     mpegts_write_section1(&service->pmt, PMT_TID, service->sid, ts->tables_version, 0, 0,
                           data, q - data);
+    return 0;
 }
 
 /* NOTE: str == NULL is accepted for an empty string */
@@ -859,7 +922,7 @@
     MpegTSWrite *ts = s->priv_data;
     uint8_t buf[TS_PACKET_SIZE];
     uint8_t *q;
-    int val, is_start, len, header_len, write_pcr, private_code, flags;
+    int val, is_start, len, header_len, write_pcr, is_dvb_subtitle, is_dvb_teletext, flags;
     int afc_len, stuffing_len;
     int64_t pcr = -1; /* avoid warning */
     int64_t delay = av_rescale(s->max_delay, 90000, AV_TIME_BASE);
@@ -923,11 +986,13 @@
         }
         if (is_start) {
             int pes_extension = 0;
+            int pes_header_stuffing_bytes = 0;
             /* write PES header */
             *q++ = 0x00;
             *q++ = 0x00;
             *q++ = 0x01;
-            private_code = 0;
+            is_dvb_subtitle = 0;
+            is_dvb_teletext = 0;
             if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO) {
                 if (st->codec->codec_id == AV_CODEC_ID_DIRAC) {
                     *q++ = 0xfd;
@@ -944,8 +1009,12 @@
                 *q++ = 0xfd;
             } else {
                 *q++ = 0xbd;
-                if (st->codec->codec_type == AVMEDIA_TYPE_SUBTITLE) {
-                    private_code = 0x20;
+                if(st->codec->codec_type == AVMEDIA_TYPE_SUBTITLE) {
+                    if (st->codec->codec_id == AV_CODEC_ID_DVB_SUBTITLE) {
+                        is_dvb_subtitle = 1;
+                    } else if (st->codec->codec_id == AV_CODEC_ID_DVB_TELETEXT) {
+                        is_dvb_teletext = 1;
+                    }
                 }
             }
             header_len = 0;
@@ -982,9 +1051,16 @@
                         flags |= 0x01;
                         header_len += 3;
             }
+            if (is_dvb_teletext) {
+                pes_header_stuffing_bytes = 0x24 - header_len;
+                header_len = 0x24;
+            }
             len = payload_size + header_len + 3;
-            if (private_code != 0)
-                len++;
+            /* 3 extra bytes should be added to DVB subtitle payload: 0x20 0x00 at the beginning and trailing 0xff */
+            if (is_dvb_subtitle) {
+                len += 3;
+                payload_size++;
+            }
             if (len > 0xffff)
                 len = 0;
             *q++ = len >> 8;
@@ -1025,8 +1101,17 @@
               }
 
 
-            if (private_code != 0)
-                *q++ = private_code;
+            if (is_dvb_subtitle) {
+                /* First two fields of DVB subtitles PES data:
+                 * data_identifier: for DVB subtitle streams shall be coded with the value 0x20
+                 * subtitle_stream_id: for DVB subtitle stream shall be identified by the value 0x00 */
+                *q++ = 0x20;
+                *q++ = 0x00;
+            }
+            if (is_dvb_teletext) {
+                memset(q, 0xff, pes_header_stuffing_bytes);
+                q += pes_header_stuffing_bytes;
+            }
             is_start = 0;
         }
         /* header size */
@@ -1057,7 +1142,14 @@
                 }
             }
         }
-        memcpy(buf + TS_PACKET_SIZE - len, payload, len);
+
+        if (is_dvb_subtitle && payload_size == len) {
+            memcpy(buf + TS_PACKET_SIZE - len, payload, len - 1);
+            buf[TS_PACKET_SIZE - 1] = 0xff; /* end_of_PES_data_field_marker: an 8-bit field with fixed contents 0xff for DVB subtitle */
+        } else {
+            memcpy(buf + TS_PACKET_SIZE - len, payload, len);
+        }
+
         payload += len;
         payload_size -= len;
         mpegts_prefix_m2ts_header(s);
@@ -1109,9 +1201,9 @@
 
         if (pkt->size < 5 || AV_RB32(pkt->data) != 0x0000001) {
             if (!st->nb_frames) {
-            av_log(s, AV_LOG_ERROR, "H.264 bitstream malformed, "
-                   "no startcode found, use the h264_mp4toannexb bitstream filter (-bsf h264_mp4toannexb)\n");
-            return AVERROR(EINVAL);
+                av_log(s, AV_LOG_ERROR, "H.264 bitstream malformed, "
+                       "no startcode found, use the h264_mp4toannexb bitstream filter (-bsf h264_mp4toannexb)\n");
+                return AVERROR(EINVAL);
             }
             av_log(s, AV_LOG_WARNING, "H.264 bitstream error, startcode missing\n");
         }

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/mpegvideodec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/mpegvideodec.c Changed

@@ -23,6 +23,8 @@
 #include "avformat.h"
 #include "rawdec.h"
 
+#include "libavutil/intreadwrite.h"
+
 #define SEQ_START_CODE          0x000001b3
 #define GOP_START_CODE          0x000001b8
 #define PICTURE_START_CODE      0x00000100
@@ -35,14 +37,29 @@
 {
     uint32_t code= -1;
     int pic=0, seq=0, slice=0, pspack=0, vpes=0, apes=0, res=0, sicle=0;
-    int i;
+    int i, j;
     uint32_t last = 0;
 
     for(i=0; i<p->buf_size; i++){
         code = (code<<8) + p->buf[i];
         if ((code & 0xffffff00) == 0x100) {
             switch(code){
-            case     SEQ_START_CODE:   seq++; break;
+            case     SEQ_START_CODE:
+                if (!(p->buf[i+1+3+1+2] & 0x20))
+                    break;
+                j = i;
+                if (p->buf[j+8] & 2)
+                    j+= 64;
+                if (j >= p->buf_size)
+                    break;
+                if (p->buf[j+8] & 1)
+                    j+= 64;
+                if (j >= p->buf_size)
+                    break;
+                if (AV_RB24(p->buf + j + 9) & 0xFFFFFE)
+                    break;
+                seq++;
+            break;
             case PICTURE_START_CODE:   pic++; break;
             case    PACK_START_CODE: pspack++; break;
             case              0x1b6:

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/mtv.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/mtv.c Changed

@@ -32,7 +32,8 @@
 #define MTV_ASUBCHUNK_DATA_SIZE 500
 #define MTV_HEADER_SIZE 512
 #define MTV_AUDIO_PADDING_SIZE 12
-#define AUDIO_SAMPLING_RATE 44100
+#define MTV_IMAGE_DEFAULT_BPP 16
+#define MTV_AUDIO_SAMPLING_RATE 44100
 
 typedef struct MTVDemuxContext {
 
@@ -52,12 +53,22 @@
 
 static int mtv_probe(AVProbeData *p)
 {
+    /* we need at least 57 bytes from the header
+     * to try parsing all required fields
+     */
+    if (p->buf_size < 57)
+        return 0;
+
     /* Magic is 'AMV' */
     if (*p->buf != 'A' || *(p->buf + 1) != 'M' || *(p->buf + 2) != 'V')
         return 0;
 
+    /* Audio magic is always MP3 */
+    if (p->buf[43] != 'M' || p->buf[44] != 'P' || p->buf[45] != '3')
+        return 0;
+
     /* Check for nonzero in bpp and (width|height) header fields */
-    if(p->buf_size < 57 || !(p->buf[51] && AV_RL16(&p->buf[52]) | AV_RL16(&p->buf[54])))
+    if(!(p->buf[51] && AV_RL16(&p->buf[52]) | AV_RL16(&p->buf[54])))
         return 0;
 
     /* If width or height are 0 then imagesize header field should not */
@@ -69,8 +80,20 @@
             return 0;
     }
 
-    if(p->buf[51] != 16)
-        return AVPROBE_SCORE_EXTENSION / 2; // But we are going to assume 16bpp anyway ..
+    /* Image bpp is not an absolutely required
+     * field as we latter claim it should be 16
+     * no matter what. All samples in the wild
+     * are RGB565/555.
+     */
+    if(p->buf[51] != MTV_IMAGE_DEFAULT_BPP)
+        return AVPROBE_SCORE_EXTENSION / 2;
+
+    /* We had enough data to parse header values
+     * but we expect to be able to get 512 bytes
+     * of header to be sure.
+     */
+    if (p->buf_size < MTV_HEADER_SIZE)
+        return AVPROBE_SCORE_EXTENSION;
 
     return AVPROBE_SCORE_MAX;
 }
@@ -89,22 +112,30 @@
     mtv->audio_identifier  = avio_rl24(pb);
     mtv->audio_br          = avio_rl16(pb);
     mtv->img_colorfmt      = avio_rl24(pb);
-    mtv->img_bpp           = avio_r8(pb);
+    mtv->img_bpp           = avio_r8(pb)>>3;
     mtv->img_width         = avio_rl16(pb);
     mtv->img_height        = avio_rl16(pb);
     mtv->img_segment_size  = avio_rl16(pb);
 
+    /* Assume 16bpp even if claimed otherwise.
+     * We know its going to be RGBG565/555 anyway
+     */
+    if (mtv->img_bpp != MTV_IMAGE_DEFAULT_BPP) {
+        av_log (s, AV_LOG_WARNING, "Header claims %dbpp (!= 16). Ignoring\n",
+                mtv->img_bpp);
+        mtv->img_bpp = MTV_IMAGE_DEFAULT_BPP;
+    }
+
     /* Calculate width and height if missing from header */
 
-    if(mtv->img_bpp>>3){
     if(!mtv->img_width && mtv->img_height)
-        mtv->img_width=mtv->img_segment_size / (mtv->img_bpp>>3)
+        mtv->img_width=mtv->img_segment_size / (mtv->img_bpp)
                         / mtv->img_height;
 
     if(!mtv->img_height && mtv->img_width)
-        mtv->img_height=mtv->img_segment_size / (mtv->img_bpp>>3)
+        mtv->img_height=mtv->img_segment_size / (mtv->img_bpp)
                         / mtv->img_width;
-    }
+
     if(!mtv->img_height || !mtv->img_width || !mtv->img_segment_size){
         av_log(s, AV_LOG_ERROR, "width or height or segment_size is invalid and I cannot calculate them from other information\n");
         return AVERROR(EINVAL);
@@ -149,7 +180,7 @@
     if(!st)
         return AVERROR(ENOMEM);
 
-    avpriv_set_pts_info(st, 64, 1, AUDIO_SAMPLING_RATE);
+    avpriv_set_pts_info(st, 64, 1, MTV_AUDIO_SAMPLING_RATE);
     st->codec->codec_type      = AVMEDIA_TYPE_AUDIO;
     st->codec->codec_id        = AV_CODEC_ID_MP3;
     st->codec->bit_rate        = mtv->audio_br;

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/mux.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/mux.c Changed

@@ -189,7 +189,7 @@
     const AVCodecTag *avctag;
     int n;
     enum AVCodecID id = AV_CODEC_ID_NONE;
-    unsigned int tag  = 0;
+    int64_t tag  = -1;
 
     /**
      * Check that tag + id is in the table
@@ -212,7 +212,7 @@
     }
     if (id != AV_CODEC_ID_NONE)
         return 0;
-    if (tag && (st->codec->strict_std_compliance >= FF_COMPLIANCE_NORMAL))
+    if (tag >= 0 && (st->codec->strict_std_compliance >= FF_COMPLIANCE_NORMAL))
         return 0;
     return 1;
 }
@@ -237,7 +237,7 @@
 
     // some sanity checks
     if (s->nb_streams == 0 && !(of->flags & AVFMT_NOSTREAMS)) {
-        av_log(s, AV_LOG_ERROR, "no streams\n");
+        av_log(s, AV_LOG_ERROR, "No streams to mux were specified\n");
         ret = AVERROR(EINVAL);
         goto fail;
     }
@@ -320,6 +320,9 @@
             av_log(s, AV_LOG_WARNING,
                    "Codec for stream %d does not use global headers "
                    "but container format requires global headers\n", i);
+
+        if (codec->codec_type != AVMEDIA_TYPE_ATTACHMENT)
+            s->internal->nb_interleaved_streams++;
     }
 
     if (!s->priv_data && of->priv_data_size > 0) {
@@ -339,6 +342,8 @@
     /* set muxer identification string */
     if (s->nb_streams && !(s->streams[0]->codec->flags & CODEC_FLAG_BITEXACT)) {
         av_dict_set(&s->metadata, "encoder", LIBAVFORMAT_IDENT, 0);
+    } else {
+        av_dict_set(&s->metadata, "encoder", NULL, 0);
     }
 
     if (options) {
@@ -412,6 +417,15 @@
     return 0;
 }
 
+#define AV_PKT_FLAG_UNCODED_FRAME 0x2000
+
+/* Note: using sizeof(AVFrame) from outside lavu is unsafe in general, but
+   it is only being used internally to this file as a consistency check.
+   The value is chosen to be very unlikely to appear on its own and to cause
+   immediate failure if used anywhere as a real size. */
+#define UNCODED_FRAME_PACKET_SIZE (INT_MIN / 3 * 2 + (int)sizeof(AVFrame))
+
+
 //FIXME merge with compute_pkt_fields
 static int compute_pkt_fields2(AVFormatContext *s, AVStream *st, AVPacket *pkt)
 {
@@ -477,7 +491,9 @@
     /* update pts */
     switch (st->codec->codec_type) {
     case AVMEDIA_TYPE_AUDIO:
-        frame_size = ff_get_audio_frame_size(st->codec, pkt->size, 1);
+        frame_size = (pkt->flags & AV_PKT_FLAG_UNCODED_FRAME) ?
+                     ((AVFrame *)pkt->data)->nb_samples :
+                     ff_get_audio_frame_size(st->codec, pkt->size, 1);
 
         /* HACK/FIXME, we skip the initial 0 size packets as they are most
          * likely equal to the encoder delay, but it would be better if we
@@ -508,11 +524,21 @@
 {
     int ret, did_split;
 
+    if (s->output_ts_offset) {
+        AVStream *st = s->streams[pkt->stream_index];
+        int64_t offset = av_rescale_q(s->output_ts_offset, AV_TIME_BASE_Q, st->time_base);
+
+        if (pkt->dts != AV_NOPTS_VALUE)
+            pkt->dts += offset;
+        if (pkt->pts != AV_NOPTS_VALUE)
+            pkt->pts += offset;
+    }
+
     if (s->avoid_negative_ts > 0) {
         AVStream *st = s->streams[pkt->stream_index];
         int64_t offset = st->mux_ts_offset;
 
-        if (pkt->dts < 0 && pkt->dts != AV_NOPTS_VALUE && !s->offset) {
+        if ((pkt->dts < 0 || s->avoid_negative_ts == 2) && pkt->dts != AV_NOPTS_VALUE && !s->offset) {
             s->offset = -pkt->dts;
             s->offset_timebase = st->time_base;
         }
@@ -534,7 +560,14 @@
     }
 
     did_split = av_packet_split_side_data(pkt);
-    ret = s->oformat->write_packet(s, pkt);
+    if ((pkt->flags & AV_PKT_FLAG_UNCODED_FRAME)) {
+        AVFrame *frame = (AVFrame *)pkt->data;
+        av_assert0(pkt->size == UNCODED_FRAME_PACKET_SIZE);
+        ret = s->oformat->write_uncoded_frame(s, pkt->stream_index, &frame, 0);
+        av_frame_free(&frame);
+    } else {
+        ret = s->oformat->write_packet(s, pkt);
+    }
 
     if (s->flush_packets && s->pb && ret >= 0 && s->flags & AVFMT_FLAG_FLUSH_PACKETS)
         avio_flush(s->pb);
@@ -545,10 +578,33 @@
     return ret;
 }
 
+static int check_packet(AVFormatContext *s, AVPacket *pkt)
+{
+    if (!pkt)
+        return 0;
+
+    if (pkt->stream_index < 0 || pkt->stream_index >= s->nb_streams) {
+        av_log(s, AV_LOG_ERROR, "Invalid packet stream index: %d\n",
+               pkt->stream_index);
+        return AVERROR(EINVAL);
+    }
+
+    if (s->streams[pkt->stream_index]->codec->codec_type == AVMEDIA_TYPE_ATTACHMENT) {
+        av_log(s, AV_LOG_ERROR, "Received a packet for an attachment stream.\n");
+        return AVERROR(EINVAL);
+    }
+
+    return 0;
+}
+
 int av_write_frame(AVFormatContext *s, AVPacket *pkt)
 {
     int ret;
 
+    ret = check_packet(s, pkt);
+    if (ret < 0)
+        return ret;
+
     if (!pkt) {
         if (s->oformat->flags & AVFMT_ALLOW_FLUSH) {
             ret = s->oformat->write_packet(s, NULL);
@@ -583,6 +639,7 @@
     AVPacketList **next_point, *this_pktl;
     AVStream *st   = s->streams[pkt->stream_index];
     int chunked    = s->max_chunk_size || s->max_chunk_duration;
+    int ret;
 
     this_pktl      = av_mallocz(sizeof(AVPacketList));
     if (!this_pktl)
@@ -594,8 +651,17 @@
 FF_ENABLE_DEPRECATION_WARNINGS
 #endif
     pkt->buf       = NULL;
-    av_dup_packet(&this_pktl->pkt);  // duplicate the packet if it uses non-allocated memory
-    av_copy_packet_side_data(&this_pktl->pkt, &this_pktl->pkt); // copy side data
+    if ((pkt->flags & AV_PKT_FLAG_UNCODED_FRAME)) {
+        av_assert0(pkt->size == UNCODED_FRAME_PACKET_SIZE);
+        av_assert0(((AVFrame *)pkt->data)->buf);
+    } else {
+        // duplicate the packet if it uses non-allocated memory
+        if ((ret = av_dup_packet(&this_pktl->pkt)) < 0) {
+            av_free(this_pktl);
+            return ret;
+        }
+        av_copy_packet_side_data(&this_pktl->pkt, &this_pktl->pkt); // copy side data
+    }
 
     if (s->streams[pkt->stream_index]->last_in_packet_buffer) {
         next_point = &(st->last_in_packet_buffer->next);
@@ -675,7 +741,6 @@
 {
     AVPacketList *pktl;
     int stream_count = 0, noninterleaved_count = 0;
-    int64_t delta_dts_max = 0;
     int i, ret;
 
     if (pkt) {
@@ -692,27 +757,38 @@
         }
     }
 
-    if (s->nb_streams == stream_count) {
+    if (s->internal->nb_interleaved_streams == stream_count)
         flush = 1;
-    } else if (!flush) {
-        for (i=0; i < s->nb_streams; i++) {
-            if (s->streams[i]->last_in_packet_buffer) {
-                int64_t delta_dts =
-                    av_rescale_q(s->streams[i]->last_in_packet_buffer->pkt.dts,
-                                s->streams[i]->time_base,
-                                AV_TIME_BASE_Q) -
-                    av_rescale_q(s->packet_buffer->pkt.dts,
-                                s->streams[s->packet_buffer->pkt.stream_index]->time_base,
-                                AV_TIME_BASE_Q);
-                delta_dts_max= FFMAX(delta_dts_max, delta_dts);
-            }
+
+    if (s->max_interleave_delta > 0 && s->packet_buffer && !flush) {
+        AVPacket *top_pkt = &s->packet_buffer->pkt;
+        int64_t delta_dts = INT64_MIN;
+        int64_t top_dts = av_rescale_q(top_pkt->dts,
+                                       s->streams[top_pkt->stream_index]->time_base,
+                                       AV_TIME_BASE_Q);
+
+        for (i = 0; i < s->nb_streams; i++) {
+            int64_t last_dts;
+            const AVPacketList *last = s->streams[i]->last_in_packet_buffer;
+
+            if (!last)
+                continue;
+
+            last_dts = av_rescale_q(last->pkt.dts,
+                                    s->streams[i]->time_base,
+                                    AV_TIME_BASE_Q);
+            delta_dts = FFMAX(delta_dts, last_dts - top_dts);
         }
-        if (s->nb_streams == stream_count+noninterleaved_count &&
-           delta_dts_max > 20*AV_TIME_BASE) {
-            av_log(s, AV_LOG_DEBUG, "flushing with %d noninterleaved\n", noninterleaved_count);
+
+        if (delta_dts > s->max_interleave_delta) {
+            av_log(s, AV_LOG_DEBUG,
+                   "Delay between the first packet and last packet in the "
+                   "muxing queue is %"PRId64" > %"PRId64": forcing output\n",
+                   delta_dts, s->max_interleave_delta);
             flush = 1;
         }
     }
+
     if (stream_count && flush) {
         AVStream *st;
         pktl = s->packet_buffer;
@@ -758,20 +834,28 @@
 {
     int ret, flush = 0;
 
+    ret = check_packet(s, pkt);
+    if (ret < 0)
+        goto fail;
+
     if (pkt) {
         AVStream *st = s->streams[pkt->stream_index];
 
         //FIXME/XXX/HACK drop zero sized packets
-        if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO && pkt->size == 0)
-            return 0;
+        if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO && pkt->size == 0) {
+            ret = 0;
+            goto fail;
+        }
 
         av_dlog(s, "av_interleaved_write_frame size:%d dts:%s pts:%s\n",
                 pkt->size, av_ts2str(pkt->dts), av_ts2str(pkt->pts));
         if ((ret = compute_pkt_fields2(s, st, pkt)) < 0 && !(s->oformat->flags & AVFMT_NOTIMESTAMPS))
-            return ret;
+            goto fail;
 
-        if (pkt->dts == AV_NOPTS_VALUE && !(s->oformat->flags & AVFMT_NOTIMESTAMPS))
-            return AVERROR(EINVAL);
+        if (pkt->dts == AV_NOPTS_VALUE && !(s->oformat->flags & AVFMT_NOTIMESTAMPS)) {
+            ret = AVERROR(EINVAL);
+            goto fail;
+        }
     } else {
         av_dlog(s, "av_interleaved_write_frame FLUSH\n");
         flush = 1;
@@ -780,6 +864,11 @@
     for (;; ) {
         AVPacket opkt;
         int ret = interleave_packet(s, &opkt, pkt, flush);
+        if (pkt) {
+            memset(pkt, 0, sizeof(*pkt));
+            av_init_packet(pkt);
+            pkt = NULL;
+        }
         if (ret <= 0) //FIXME cleanup needed for ret<0 ?
             return ret;
 
@@ -788,13 +877,15 @@
             s->streams[opkt.stream_index]->nb_frames++;
 
         av_free_packet(&opkt);
-        pkt = NULL;
 
         if (ret < 0)
             return ret;
         if(s->pb && s->pb->error)
             return s->pb->error;
     }
+fail:
+    av_packet_unref(pkt);
+    return ret;
 }
 
 int av_write_trailer(AVFormatContext *s)
@@ -869,3 +960,51 @@
                                           dst->streams[dst_stream]->time_base);
     return av_write_frame(dst, &local_pkt);
 }
+
+static int av_write_uncoded_frame_internal(AVFormatContext *s, int stream_index,
+                                           AVFrame *frame, int interleaved)
+{
+    AVPacket pkt, *pktp;
+
+    av_assert0(s->oformat);
+    if (!s->oformat->write_uncoded_frame)
+        return AVERROR(ENOSYS);
+
+    if (!frame) {
+        pktp = NULL;
+    } else {
+        pktp = &pkt;
+        av_init_packet(&pkt);
+        pkt.data = (void *)frame;
+        pkt.size         = UNCODED_FRAME_PACKET_SIZE;
+        pkt.pts          =
+        pkt.dts          = frame->pts;
+        pkt.duration     = av_frame_get_pkt_duration(frame);
+        pkt.stream_index = stream_index;
+        pkt.flags |= AV_PKT_FLAG_UNCODED_FRAME;
+    }
+
+    return interleaved ? av_interleaved_write_frame(s, pktp) :
+                         av_write_frame(s, pktp);
+}
+
+int av_write_uncoded_frame(AVFormatContext *s, int stream_index,
+                           AVFrame *frame)
+{
+    return av_write_uncoded_frame_internal(s, stream_index, frame, 0);
+}
+
+int av_interleaved_write_uncoded_frame(AVFormatContext *s, int stream_index,
+                                       AVFrame *frame)
+{
+    return av_write_uncoded_frame_internal(s, stream_index, frame, 1);
+}
+
+int av_write_uncoded_frame_query(AVFormatContext *s, int stream_index)
+{
+    av_assert0(s->oformat);
+    if (!s->oformat->write_uncoded_frame)
+        return AVERROR(ENOSYS);
+    return s->oformat->write_uncoded_frame(s, stream_index, NULL,
+                                           AV_WRITE_UNCODED_FRAME_QUERY);
+}

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/mxfdec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/mxfdec.c Changed

@@ -43,10 +43,13 @@
  * Only tracks with associated descriptors will be decoded. "Highly Desirable" SMPTE 377M D.1
  */
 
+#include <stdint.h>
+
 #include "libavutil/aes.h"
 #include "libavutil/avassert.h"
 #include "libavutil/mathematics.h"
 #include "libavcodec/bytestream.h"
+#include "libavutil/intreadwrite.h"
 #include "libavutil/timecode.h"
 #include "avformat.h"
 #include "internal.h"
@@ -145,9 +148,11 @@
     int width;
     int height; /* Field height, not frame height */
     int frame_layout; /* See MXFFrameLayout enum */
+#define MXF_TFF 1
+#define MXF_BFF 2
+    int field_dominance;
     int channels;
     int bits_per_sample;
-    int field_dominance;
     unsigned int component_depth;
     unsigned int horiz_subsampling;
     unsigned int vert_subsampling;
@@ -328,7 +333,7 @@
     data_ptr = pkt->data;
     end_ptr = pkt->data + length;
     buf_ptr = pkt->data + 4; /* skip SMPTE 331M header */
-    for (; buf_ptr + st->codec->channels*4 <= end_ptr; ) {
+    for (; end_ptr - buf_ptr >= st->codec->channels * 4; ) {
         for (i = 0; i < st->codec->channels; i++) {
             uint32_t sample = bytestream_get_le32(&buf_ptr);
             if (st->codec->bits_per_coded_sample == 24)
@@ -484,7 +489,10 @@
     partition->index_sid = avio_rb32(pb);
     avio_skip(pb, 8);
     partition->body_sid = avio_rb32(pb);
-    avio_read(pb, op, sizeof(UID));
+    if (avio_read(pb, op, sizeof(UID)) != sizeof(UID)) {
+        av_log(mxf->fc, AV_LOG_ERROR, "Failed reading UID\n");
+        return AVERROR_INVALIDDATA;
+    }
     nb_essence_containers = avio_rb32(pb);
 
     /* some files don'thave FooterPartition set in every partition */
@@ -1243,7 +1251,9 @@
         }
     }
 
-    if (!(mxf->index_tables = av_calloc(mxf->nb_index_tables, sizeof(MXFIndexTable)))) {
+    mxf->index_tables = av_mallocz_array(mxf->nb_index_tables,
+                                         sizeof(*mxf->index_tables));
+    if (!mxf->index_tables) {
         av_log(mxf->fc, AV_LOG_ERROR, "failed to allocate index tables\n");
         ret = AVERROR(ENOMEM);
         goto finish_decoding_index;
@@ -1262,8 +1272,12 @@
     for (i = j = 0; j < mxf->nb_index_tables; i += mxf->index_tables[j++].nb_segments) {
         MXFIndexTable *t = &mxf->index_tables[j];
 
-        if (!(t->segments = av_calloc(t->nb_segments, sizeof(MXFIndexTableSegment*)))) {
-            av_log(mxf->fc, AV_LOG_ERROR, "failed to allocate IndexTableSegment pointer array\n");
+        t->segments = av_mallocz_array(t->nb_segments,
+                                       sizeof(*t->segments));
+
+        if (!t->segments) {
+            av_log(mxf->fc, AV_LOG_ERROR, "failed to allocate IndexTableSegment"
+                   " pointer array\n");
             ret = AVERROR(ENOMEM);
             goto finish_decoding_index;
         }
@@ -1450,10 +1464,13 @@
         if (st->duration == -1)
             st->duration = AV_NOPTS_VALUE;
         st->start_time = component->start_position;
-        if (material_track->edit_rate.num <= 0 || material_track->edit_rate.den <= 0) {
+        if (material_track->edit_rate.num <= 0 ||
+            material_track->edit_rate.den <= 0) {
             av_log(mxf->fc, AV_LOG_WARNING,
-                   "invalid edit rate (%d/%d) found on stream #%d, defaulting to 25/1\n",
-                   material_track->edit_rate.num, material_track->edit_rate.den, st->index);
+                   "Invalid edit rate (%d/%d) found on stream #%d, "
+                   "defaulting to 25/1\n",
+                   material_track->edit_rate.num,
+                   material_track->edit_rate.den, st->index);
             material_track->edit_rate = (AVRational){25, 1};
         }
         avpriv_set_pts_info(st, 64, material_track->edit_rate.den, material_track->edit_rate.num);
@@ -1515,6 +1532,7 @@
                 av_log(mxf->fc, AV_LOG_VERBOSE, ".");
         }
         av_log(mxf->fc, AV_LOG_VERBOSE, "\n");
+
         if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO) {
             source_track->intra_only = mxf_is_intra_only(descriptor);
             container_ul = mxf_get_codec_ul(mxf_picture_essence_container_uls, essence_container_ul);
@@ -1539,7 +1557,21 @@
                 case MixedFields:
                     break;
                 case SeparateFields:
-                    st->codec->height *= 2; /* Turn field height into frame height. */
+                    switch (descriptor->field_dominance) {
+                    case MXF_TFF:
+                        st->codec->field_order = AV_FIELD_TT;
+                        break;
+                    case MXF_BFF:
+                        st->codec->field_order = AV_FIELD_BB;
+                        break;
+                    default:
+                        avpriv_request_sample(mxf->fc,
+                                              "Field dominance %d support",
+                                              descriptor->field_dominance);
+                        break;
+                    }
+                    /* Turn field height into frame height. */
+                    st->codec->height *= 2;
                     break;
                 default:
                     av_log(mxf->fc, AV_LOG_INFO, "Unknown frame layout type: %d\n", descriptor->frame_layout);
@@ -1604,8 +1636,10 @@
             if (!ff_alloc_extradata(st->codec, descriptor->extradata_size)) {
                 memcpy(st->codec->extradata, descriptor->extradata, descriptor->extradata_size);
             }
-        } else if(st->codec->codec_id == AV_CODEC_ID_H264) {
-            ff_generate_avci_extradata(st);
+        } else if (st->codec->codec_id == AV_CODEC_ID_H264) {
+            ret = ff_generate_avci_extradata(st);
+            if (ret < 0)
+                return ret;
         }
         if (st->codec->codec_type != AVMEDIA_TYPE_DATA && (*essence_container_ul)[15] > 0x01) {
             /* TODO: decode timestamps */
@@ -2005,6 +2039,8 @@
     MXFContext *mxf = s->priv_data;
     KLVPacket klv;
     int64_t essence_offset = 0;
+    int64_t last_pos = -1;
+    uint64_t last_pos_index = 1;
     int ret;
 
     mxf->last_forward_tell = INT64_MAX;
@@ -2022,7 +2058,12 @@
 
     while (!url_feof(s->pb)) {
         const MXFMetadataReadTableEntry *metadata;
-
+        if (avio_tell(s->pb) == last_pos) {
+            av_log(mxf->fc, AV_LOG_ERROR, "MXF structure loop detected\n");
+            return AVERROR_INVALIDDATA;
+        }
+        if ((1ULL<<61) % last_pos_index++ == 0)
+            last_pos = avio_tell(s->pb);
         if (klv_read_packet(&klv, s->pb) < 0) {
             /* EOF - seek to previous partition or stop */
             if(mxf_parse_handle_partition_or_eof(mxf) <= 0)
@@ -2456,10 +2497,19 @@
 
     /* Must skip Run-In Sequence and search for MXF header partition pack key SMPTE 377M 5.5 */
     end -= sizeof(mxf_header_partition_pack_key);
-    for (; bufp < end; bufp++) {
-        if (IS_KLV_KEY(bufp, mxf_header_partition_pack_key))
-            return AVPROBE_SCORE_MAX;
+
+    for (; bufp < end;) {
+        if (!((bufp[13] - 1) & 0xF2)){
+            if (AV_RN32(bufp   ) == AV_RN32(mxf_header_partition_pack_key   ) &&
+                AV_RN32(bufp+ 4) == AV_RN32(mxf_header_partition_pack_key+ 4) &&
+                AV_RN32(bufp+ 8) == AV_RN32(mxf_header_partition_pack_key+ 8) &&
+                AV_RN16(bufp+12) == AV_RN16(mxf_header_partition_pack_key+12))
+                return AVPROBE_SCORE_MAX;
+            bufp ++;
+        } else
+            bufp += 10;
     }
+
     return 0;
 }
 
@@ -2472,7 +2522,6 @@
     MXFContext* mxf = s->priv_data;
     int64_t seekpos;
     int i, ret;
-    int64_t ret64;
     MXFIndexTable *t;
     MXFTrack *source_track = st->priv_data;
 
@@ -2487,8 +2536,10 @@
         sample_time = 0;
     seconds = av_rescale(sample_time, st->time_base.num, st->time_base.den);
 
-    if ((ret64 = avio_seek(s->pb, (s->bit_rate * seconds) >> 3, SEEK_SET)) < 0)
-        return ret64;
+    seekpos = avio_seek(s->pb, (s->bit_rate * seconds) >> 3, SEEK_SET);
+    if (seekpos < 0)
+        return seekpos;
+
     ff_update_cur_dts(s, st, sample_time);
     mxf->current_edit_unit = sample_time;
     } else {
@@ -2508,7 +2559,7 @@
             sample_time = FFMIN(sample_time, source_track->original_duration - 1);
         }
 
-        if ((ret = mxf_edit_unit_absolute_offset(mxf, t, sample_time, &sample_time, &seekpos, 1)) << 0)
+        if ((ret = mxf_edit_unit_absolute_offset(mxf, t, sample_time, &sample_time, &seekpos, 1)) < 0)
             return ret;
 
         ff_update_cur_dts(s, st, sample_time);

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/network.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/network.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/network.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/network.h Changed

@@ -62,7 +62,7 @@
 #include <netdb.h>
 
 #define ff_neterrno() AVERROR(errno)
-#endif
+#endif /* HAVE_WINSOCK2_H */
 
 #if HAVE_ARPA_INET_H
 #include <arpa/inet.h>
@@ -104,12 +104,12 @@
     uint8_t ss_family;
 #else
     uint16_t ss_family;
-#endif
+#endif /* HAVE_STRUCT_SOCKADDR_SA_LEN */
     char ss_pad1[6];
     int64_t ss_align;
     char ss_pad2[112];
 };
-#endif
+#endif /* !HAVE_STRUCT_SOCKADDR_STORAGE */
 
 #if !HAVE_STRUCT_ADDRINFO
 struct addrinfo {
@@ -122,7 +122,7 @@
     char *ai_canonname;
     struct addrinfo *ai_next;
 };
-#endif
+#endif /* !HAVE_STRUCT_ADDRINFO */
 
 /* getaddrinfo constants */
 #ifndef EAI_AGAIN
@@ -195,12 +195,13 @@
 #define getaddrinfo ff_getaddrinfo
 #define freeaddrinfo ff_freeaddrinfo
 #define getnameinfo ff_getnameinfo
-#endif
+#endif /* !HAVE_GETADDRINFO */
+
 #if !HAVE_GETADDRINFO || HAVE_WINSOCK2_H
 const char *ff_gai_strerror(int ecode);
 #undef gai_strerror
 #define gai_strerror ff_gai_strerror
-#endif
+#endif /* !HAVE_GETADDRINFO || HAVE_WINSOCK2_H */
 
 #ifndef INADDR_LOOPBACK
 #define INADDR_LOOPBACK 0x7f000001

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/nistspheredec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/nistspheredec.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/nullenc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/nullenc.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/nut.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/nut.c Changed

@@ -157,6 +157,22 @@
     { AV_CODEC_ID_RAWVIDEO,         MKTAG('G', '3',   0,  16) },
     { AV_CODEC_ID_RAWVIDEO,         MKTAG(16,    0, '3', 'G') },
 
+    { AV_CODEC_ID_RAWVIDEO,         MKTAG('X', 'Y', 'Z' , 36 ) },
+    { AV_CODEC_ID_RAWVIDEO,         MKTAG(36 , 'Z' , 'Y', 'X') },
+
+    { AV_CODEC_ID_RAWVIDEO, MKTAG(0xBA, 'B', 'G', 8   ) },
+    { AV_CODEC_ID_RAWVIDEO, MKTAG(0xBA, 'B', 'G', 16  ) },
+    { AV_CODEC_ID_RAWVIDEO, MKTAG(16  , 'G', 'B', 0xBA) },
+    { AV_CODEC_ID_RAWVIDEO, MKTAG(0xBA, 'R', 'G', 8   ) },
+    { AV_CODEC_ID_RAWVIDEO, MKTAG(0xBA, 'R', 'G', 16  ) },
+    { AV_CODEC_ID_RAWVIDEO, MKTAG(16  , 'G', 'R', 0xBA) },
+    { AV_CODEC_ID_RAWVIDEO, MKTAG(0xBA, 'G', 'B', 8   ) },
+    { AV_CODEC_ID_RAWVIDEO, MKTAG(0xBA, 'G', 'B', 16  ) },
+    { AV_CODEC_ID_RAWVIDEO, MKTAG(16,   'B', 'G', 0xBA) },
+    { AV_CODEC_ID_RAWVIDEO, MKTAG(0xBA, 'G', 'R', 8   ) },
+    { AV_CODEC_ID_RAWVIDEO, MKTAG(0xBA, 'G', 'R', 16  ) },
+    { AV_CODEC_ID_RAWVIDEO, MKTAG(16,   'R', 'G', 0xBA) },
+
     { AV_CODEC_ID_NONE,             0 }
 };

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/nut.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/nut.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/nutdec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/nutdec.c Changed

@@ -24,8 +24,10 @@
 #include "libavutil/avassert.h"
 #include "libavutil/bswap.h"
 #include "libavutil/dict.h"
+#include "libavutil/intreadwrite.h"
 #include "libavutil/mathematics.h"
 #include "libavutil/tree.h"
+#include "libavcodec/bytestream.h"
 #include "avio_internal.h"
 #include "nut.h"
 #include "riff.h"
@@ -227,11 +229,14 @@
     end += avio_tell(bc);
 
     tmp = ffio_read_varlen(bc);
-    if (tmp < 2 && tmp > NUT_VERSION) {
+    if (tmp < 2 && tmp > 4) {
         av_log(s, AV_LOG_ERROR, "Version %"PRId64" not supported.\n",
                tmp);
         return AVERROR(ENOSYS);
     }
+    nut->version = tmp;
+    if (nut->version > 3)
+        nut->minor_version = ffio_read_varlen(bc);
 
     GET_V(stream_count, tmp > 0 && tmp <= NUT_MAX_STREAMS);
 
@@ -415,9 +420,8 @@
 
     GET_V(st->codec->extradata_size, tmp < (1 << 30));
     if (st->codec->extradata_size) {
-        if (ff_alloc_extradata(st->codec, st->codec->extradata_size))
+        if (ff_get_extradata(st->codec, bc, st->codec->extradata_size) < 0)
             return AVERROR(ENOMEM);
-        avio_read(bc, st->codec->extradata, st->codec->extradata_size);
     }
 
     if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO) {
@@ -774,6 +778,116 @@
     return 0;
 }
 
+static int read_sm_data(AVFormatContext *s, AVIOContext *bc, AVPacket *pkt, int is_meta, int64_t maxpos)
+{
+    int count = ffio_read_varlen(bc);
+    int skip_start = 0;
+    int skip_end = 0;
+    int channels = 0;
+    int64_t channel_layout = 0;
+    int sample_rate = 0;
+    int width = 0;
+    int height = 0;
+    int i;
+
+    for (i=0; i<count; i++) {
+        uint8_t name[256], str_value[256], type_str[256];
+        int value;
+        if (avio_tell(bc) >= maxpos)
+            return AVERROR_INVALIDDATA;
+        get_str(bc, name, sizeof(name));
+        value = get_s(bc);
+
+        if (value == -1) {
+            get_str(bc, str_value, sizeof(str_value));
+            av_log(s, AV_LOG_WARNING, "Unknown string %s / %s\n", name, str_value);
+        } else if (value == -2) {
+            uint8_t *dst = NULL;
+            int64_t v64, value_len;
+
+            get_str(bc, type_str, sizeof(type_str));
+            value_len = ffio_read_varlen(bc);
+            if (avio_tell(bc) + value_len >= maxpos)
+                return AVERROR_INVALIDDATA;
+            if (!strcmp(name, "Palette")) {
+                dst = av_packet_new_side_data(pkt, AV_PKT_DATA_PALETTE, value_len);
+            } else if (!strcmp(name, "Extradata")) {
+                dst = av_packet_new_side_data(pkt, AV_PKT_DATA_NEW_EXTRADATA, value_len);
+            } else if (sscanf(name, "CodecSpecificSide%"SCNd64"", &v64) == 1) {
+                dst = av_packet_new_side_data(pkt, AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL, value_len + 8);
+                if(!dst)
+                    return AVERROR(ENOMEM);
+                AV_WB64(dst, v64);
+                dst += 8;
+            } else if (!strcmp(name, "ChannelLayout") && value_len == 8) {
+                channel_layout = avio_rl64(bc);
+                continue;
+            } else {
+                av_log(s, AV_LOG_WARNING, "Unknown data %s / %s\n", name, type_str);
+                avio_skip(bc, value_len);
+                continue;
+            }
+            if(!dst)
+                return AVERROR(ENOMEM);
+            avio_read(bc, dst, value_len);
+        } else if (value == -3) {
+            value = get_s(bc);
+        } else if (value == -4) {
+            value = ffio_read_varlen(bc);
+        } else if (value < -4) {
+            get_s(bc);
+        } else {
+            if (!strcmp(name, "SkipStart")) {
+                skip_start = value;
+            } else if (!strcmp(name, "SkipEnd")) {
+                skip_end = value;
+            } else if (!strcmp(name, "Channels")) {
+                channels = value;
+            } else if (!strcmp(name, "SampleRate")) {
+                sample_rate = value;
+            } else if (!strcmp(name, "Width")) {
+                width = value;
+            } else if (!strcmp(name, "Height")) {
+                height = value;
+            } else {
+                av_log(s, AV_LOG_WARNING, "Unknown integer %s\n", name);
+            }
+        }
+    }
+
+    if (channels || channel_layout || sample_rate || width || height) {
+        uint8_t *dst = av_packet_new_side_data(pkt, AV_PKT_DATA_PARAM_CHANGE, 28);
+        if (!dst)
+            return AVERROR(ENOMEM);
+        bytestream_put_le32(&dst,
+                            AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_COUNT*(!!channels) +
+                            AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_LAYOUT*(!!channel_layout) +
+                            AV_SIDE_DATA_PARAM_CHANGE_SAMPLE_RATE*(!!sample_rate) +
+                            AV_SIDE_DATA_PARAM_CHANGE_DIMENSIONS*(!!(width|height))
+                           );
+        if (channels)
+            bytestream_put_le32(&dst, channels);
+        if (channel_layout)
+            bytestream_put_le64(&dst, channel_layout);
+        if (sample_rate)
+            bytestream_put_le32(&dst, sample_rate);
+        if (width || height){
+            bytestream_put_le32(&dst, width);
+            bytestream_put_le32(&dst, height);
+        }
+    }
+
+    if (skip_start || skip_end) {
+        uint8_t *dst = av_packet_new_side_data(pkt, AV_PKT_DATA_SKIP_SAMPLES, 10);
+        if (!dst)
+            return AVERROR(ENOMEM);
+        AV_WL32(dst, skip_start);
+        AV_WL32(dst+4, skip_end);
+    }
+
+    return 0;
+}
+
 static int decode_frame_header(NUTContext *nut, int64_t *pts, int *stream_id,
                                uint8_t *header_idx, int frame_code)
 {
@@ -856,6 +970,7 @@
     int64_t pts, last_IP_pts;
     StreamContext *stc;
     uint8_t header_idx;
+    int ret;
 
     size = decode_frame_header(nut, &pts, &stream_id, &header_idx, frame_code);
     if (size < 0)
@@ -881,7 +996,23 @@
         return AVERROR(ENOMEM);
     memcpy(pkt->data, nut->header[header_idx], nut->header_len[header_idx]);
     pkt->pos = avio_tell(bc); // FIXME
-    avio_read(bc, pkt->data + nut->header_len[header_idx], size);
+    if (stc->last_flags & FLAG_SM_DATA) {
+        int sm_size;
+        if (read_sm_data(s, bc, pkt, 0, pkt->pos + size) < 0)
+            return AVERROR_INVALIDDATA;
+        if (read_sm_data(s, bc, pkt, 1, pkt->pos + size) < 0)
+            return AVERROR_INVALIDDATA;
+        sm_size = avio_tell(bc) - pkt->pos;
+        size      -= sm_size;
+        pkt->size -= sm_size;
+    }
+
+    ret = avio_read(bc, pkt->data + nut->header_len[header_idx], size);
+    if (ret != size) {
+        if (ret < 0)
+            return ret;
+    }
+    av_shrink_packet(pkt, nut->header_len[header_idx] + ret);
 
     pkt->stream_index = stream_id;
     if (stc->last_flags & FLAG_KEY)

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/nutenc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/nutenc.c Changed

@@ -19,11 +19,14 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <stdint.h>
+
 #include "libavutil/intreadwrite.h"
 #include "libavutil/mathematics.h"
 #include "libavutil/tree.h"
 #include "libavutil/dict.h"
 #include "libavutil/avassert.h"
+#include "libavcodec/bytestream.h"
 #include "libavcodec/mpegaudiodata.h"
 #include "nut.h"
 #include "internal.h"
@@ -335,7 +338,9 @@
         tmp_head_idx;
     int64_t tmp_match;
 
-    ff_put_v(bc, NUT_VERSION);
+    ff_put_v(bc, nut->version = NUT_VERSION);
+    if (nut->version > 3)
+        ff_put_v(bc, nut->minor_version);
     ff_put_v(bc, nut->avf->nb_streams);
     ff_put_v(bc, nut->max_distance);
     ff_put_v(bc, nut->time_base_count);
@@ -584,8 +589,15 @@
         int64_t last_pts= -1;
         int j, k;
         for (j=0; j<nut->sp_count; j++) {
-            int flag = (nus->keyframe_pts[j] != AV_NOPTS_VALUE) ^ (j+1 == nut->sp_count);
+            int flag;
             int n = 0;
+
+            if (j && nus->keyframe_pts[j] == nus->keyframe_pts[j-1]) {
+                av_log(nut->avf, AV_LOG_WARNING, "Multiple keyframes with same PTS\n");
+                nus->keyframe_pts[j] = AV_NOPTS_VALUE;
+            }
+
+            flag = (nus->keyframe_pts[j] != AV_NOPTS_VALUE) ^ (j+1 == nut->sp_count);
             for (; j<nut->sp_count && (nus->keyframe_pts[j] != AV_NOPTS_VALUE) == flag; j++)
                 n++;
 
@@ -767,6 +779,8 @@
         flags |= FLAG_SIZE_MSB;
     if (pkt->pts - nus->last_pts != fc->pts_delta)
         flags |= FLAG_CODED_PTS;
+    if (pkt->side_data_elems && nut->version > 3)
+        flags |= FLAG_SM_DATA;
     if (pkt->size > 2 * nut->max_distance)
         flags |= FLAG_CHECKSUM;
     if (FFABS(pkt->pts - nus->last_pts) > nus->max_pts_distance)
@@ -799,11 +813,129 @@
     return best_i;
 }
 
+static int write_sm_data(AVFormatContext *s, AVIOContext *bc, AVPacket *pkt, int is_meta)
+{
+    AVStream *st = s->streams[pkt->stream_index];
+    int ret, i, dyn_size;
+    unsigned flags;
+    AVIOContext *dyn_bc;
+    int sm_data_count = 0;
+    uint8_t tmp[256];
+    uint8_t *dyn_buf;
+
+    ret = avio_open_dyn_buf(&dyn_bc);
+    if (ret < 0)
+        return ret;
+
+    for (i = 0; i<pkt->side_data_elems; i++) {
+        const uint8_t *data = pkt->side_data[i].data;
+        int size = pkt->side_data[i].size;
+        const uint8_t *data_end = data + size;
+
+        if (is_meta) {
+            if (   pkt->side_data[i].type == AV_PKT_DATA_METADATA_UPDATE
+                || pkt->side_data[i].type == AV_PKT_DATA_STRINGS_METADATA) {
+                if (!size || data[size-1])
+                    return AVERROR(EINVAL);
+                while (data < data_end) {
+                    const uint8_t *key = data;
+                    const uint8_t *val = data + strlen(key) + 1;
+
+                    if(val >= data_end)
+                        return AVERROR(EINVAL);
+                    put_str(dyn_bc, key);
+                    put_s(dyn_bc, -1);
+                    put_str(dyn_bc, val);
+                    data = val + strlen(val) + 1;
+                    sm_data_count++;
+                }
+            }
+        } else {
+            switch (pkt->side_data[i].type) {
+            case AV_PKT_DATA_PALETTE:
+            case AV_PKT_DATA_NEW_EXTRADATA:
+            case AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL:
+            default:
+                if (pkt->side_data[i].type == AV_PKT_DATA_PALETTE) {
+                    put_str(dyn_bc, "Palette");
+                } else if(pkt->side_data[i].type == AV_PKT_DATA_NEW_EXTRADATA) {
+                    put_str(dyn_bc, "Extradata");
+                } else if(pkt->side_data[i].type == AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL) {
+                    snprintf(tmp, sizeof(tmp), "CodecSpecificSide%"PRId64"", AV_RB64(data));
+                    put_str(dyn_bc, tmp);
+                } else {
+                    snprintf(tmp, sizeof(tmp), "UserData%s-SD-%d",
+                            (st->codec->flags & CODEC_FLAG_BITEXACT) ? "Lavf" : LIBAVFORMAT_IDENT,
+                            pkt->side_data[i].type);
+                    put_str(dyn_bc, tmp);
+                }
+                put_s(dyn_bc, -2);
+                put_str(dyn_bc, "bin");
+                ff_put_v(dyn_bc, pkt->side_data[i].size);
+                avio_write(dyn_bc, data, pkt->side_data[i].size);
+                sm_data_count++;
+                break;
+            case AV_PKT_DATA_PARAM_CHANGE:
+                flags = bytestream_get_le32(&data);
+                if (flags & AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_COUNT) {
+                    put_str(dyn_bc, "Channels");
+                    put_s(dyn_bc, bytestream_get_le32(&data));
+                    sm_data_count++;
+                }
+                if (flags & AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_LAYOUT) {
+                    put_str(dyn_bc, "ChannelLayout");
+                    put_s(dyn_bc, -2);
+                    put_str(dyn_bc, "u64");
+                    ff_put_v(bc, 8);
+                    avio_write(dyn_bc, data, 8); data+=8;
+                    sm_data_count++;
+                }
+                if (flags & AV_SIDE_DATA_PARAM_CHANGE_SAMPLE_RATE) {
+                    put_str(dyn_bc, "SampleRate");
+                    put_s(dyn_bc, bytestream_get_le32(&data));
+                    sm_data_count++;
+                }
+                if (flags & AV_SIDE_DATA_PARAM_CHANGE_DIMENSIONS) {
+                    put_str(dyn_bc, "Width");
+                    put_s(dyn_bc, bytestream_get_le32(&data));
+                    put_str(dyn_bc, "Height");
+                    put_s(dyn_bc, bytestream_get_le32(&data));
+                    sm_data_count+=2;
+                }
+                break;
+            case AV_PKT_DATA_SKIP_SAMPLES:
+                if (AV_RL32(data)) {
+                    put_str(dyn_bc, "SkipStart");
+                    put_s(dyn_bc, (unsigned)AV_RL32(data));
+                    sm_data_count++;
+                }
+                if (AV_RL32(data+4)) {
+                    put_str(dyn_bc, "SkipEnd");
+                    put_s(dyn_bc, (unsigned)AV_RL32(data+4));
+                    sm_data_count++;
+                }
+                break;
+            case AV_PKT_DATA_METADATA_UPDATE:
+            case AV_PKT_DATA_STRINGS_METADATA:
+                // belongs into meta, not side data
+                break;
+            }
+        }
+    }
+
+    ff_put_v(bc, sm_data_count);
+    dyn_size = avio_close_dyn_buf(dyn_bc, &dyn_buf);
+    avio_write(bc, dyn_buf, dyn_size);
+    av_freep(&dyn_buf);
+
+    return 0;
+}
+
 static int nut_write_packet(AVFormatContext *s, AVPacket *pkt)
 {
     NUTContext *nut    = s->priv_data;
     StreamContext *nus = &nut->stream[pkt->stream_index];
-    AVIOContext *bc    = s->pb, *dyn_bc;
+    AVIOContext *bc    = s->pb, *dyn_bc, *sm_bc = NULL;
     FrameCode *fc;
     int64_t coded_pts;
     int best_length, frame_code, flags, needed_flags, i, header_idx;
@@ -811,6 +943,9 @@
     int key_frame = !!(pkt->flags & AV_PKT_FLAG_KEY);
     int store_sp  = 0;
     int ret;
+    int sm_size = 0;
+    int data_size = pkt->size;
+    uint8_t *sm_buf;
 
     if (pkt->pts < 0) {
         av_log(s, AV_LOG_ERROR,
@@ -819,13 +954,23 @@
         return AVERROR(EINVAL);
     }
 
+    if (pkt->side_data_elems && nut->version > 3) {
+        ret = avio_open_dyn_buf(&sm_bc);
+        if (ret < 0)
+            return ret;
+        write_sm_data(s, sm_bc, pkt, 0);
+        write_sm_data(s, sm_bc, pkt, 1);
+        sm_size = avio_close_dyn_buf(sm_bc, &sm_buf);
+        data_size += sm_size;
+    }
+
     if (1LL << (20 + 3 * nut->header_count) <= avio_tell(bc))
         write_headers(s, bc);
 
     if (key_frame && !(nus->last_flags & FLAG_KEY))
         store_sp = 1;
 
-    if (pkt->size + 30 /*FIXME check*/ + avio_tell(bc) >= nut->last_syncpoint_pos + nut->max_distance)
+    if (data_size + 30 /*FIXME check*/ + avio_tell(bc) >= nut->last_syncpoint_pos + nut->max_distance)
         store_sp = 1;
 
 //FIXME: Ensure store_sp is 1 in the first place.
@@ -905,10 +1050,10 @@
         if (flags & FLAG_STREAM_ID)
             length += ff_get_v_length(pkt->stream_index);
 
-        if (pkt->size % fc->size_mul != fc->size_lsb)
+        if (data_size % fc->size_mul != fc->size_lsb)
             continue;
         if (flags & FLAG_SIZE_MSB)
-            length += ff_get_v_length(pkt->size / fc->size_mul);
+            length += ff_get_v_length(data_size / fc->size_mul);
 
         if (flags & FLAG_CHECKSUM)
             length += 4;
@@ -950,13 +1095,18 @@
     }
     if (flags & FLAG_STREAM_ID)  ff_put_v(bc, pkt->stream_index);
     if (flags & FLAG_CODED_PTS)  ff_put_v(bc, coded_pts);
-    if (flags & FLAG_SIZE_MSB )  ff_put_v(bc, pkt->size / fc->size_mul);
+    if (flags & FLAG_SIZE_MSB )  ff_put_v(bc, data_size / fc->size_mul);
     if (flags & FLAG_HEADER_IDX) ff_put_v(bc, header_idx = best_header_idx);
 
     if (flags & FLAG_CHECKSUM)   avio_wl32(bc, ffio_get_checksum(bc));
     else                         ffio_get_checksum(bc);
 
+    if (flags & FLAG_SM_DATA) {
+        avio_write(bc, sm_buf, sm_size);
+        av_freep(&sm_buf);
+    }
     avio_write(bc, pkt->data + nut->header_len[header_idx], pkt->size - nut->header_len[header_idx]);
+
     nus->last_flags = flags;
     nus->last_pts   = pkt->pts;

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/nuv.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/nuv.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/oggdec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/oggdec.c Changed

@@ -48,6 +48,7 @@
     &ff_flac_codec,
     &ff_celt_codec,
     &ff_opus_codec,
+    &ff_vp8_codec,
     &ff_old_dirac_codec,
     &ff_old_flac_codec,
     &ff_ogm_video_codec,
@@ -77,6 +78,8 @@
         struct ogg_stream *os = ogg->streams + i;
         os->buf = av_mallocz(os->bufsize + FF_INPUT_BUFFER_PADDING_SIZE);
         memcpy(os->buf, ost->streams[i].buf, os->bufpos);
+        os->new_metadata      = NULL;
+        os->new_metadata_size = 0;
     }
 
     ogg->state = ost;
@@ -142,6 +145,9 @@
         if (start_pos <= s->data_offset) {
             os->lastpts = 0;
         }
+        os->end_trimming = 0;
+        av_freep(&os->new_metadata);
+        os->new_metadata_size = 0;
     }
 
     ogg->page_pos = -1;
@@ -639,6 +645,7 @@
             ogg->streams[i].codec->cleanup(s, i);
         }
         av_freep(&ogg->streams[i].private);
+        av_freep(&ogg->streams[i].new_metadata);
     }
     av_freep(&ogg->streams);
     return 0;
@@ -720,8 +727,16 @@
 {
     struct ogg *ogg = s->priv_data;
     struct ogg_stream *os = ogg->streams + idx;
-    if (psize && s->streams[idx]->codec->codec_id == AV_CODEC_ID_THEORA) {
-        if (!!(os->pflags & AV_PKT_FLAG_KEY) != !(os->buf[pstart] & 0x40)) {
+    int invalid = 0;
+    if (psize) {
+        switch (s->streams[idx]->codec->codec_id) {
+        case AV_CODEC_ID_THEORA:
+            invalid = !!(os->pflags & AV_PKT_FLAG_KEY) != !(os->buf[pstart] & 0x40);
+        break;
+        case AV_CODEC_ID_VP8:
+            invalid = !!(os->pflags & AV_PKT_FLAG_KEY) != !(os->buf[pstart] & 1);
+        }
+        if (invalid) {
             os->pflags ^= AV_PKT_FLAG_KEY;
             av_log(s, AV_LOG_WARNING, "Broken file, %skeyframe not correctly marked.\n",
                    (os->pflags & AV_PKT_FLAG_KEY) ? "" : "non-");
@@ -784,6 +799,16 @@
             return AVERROR(ENOMEM);
         }
         AV_WL32(side_data + 4, os->end_trimming);
+        os->end_trimming = 0;
+    }
+
+    if (os->new_metadata) {
+        uint8_t *side_data = av_packet_new_side_data(pkt,
+                                                     AV_PKT_DATA_METADATA_UPDATE,
+                                                     os->new_metadata_size);
+        memcpy(side_data, os->new_metadata, os->new_metadata_size);
+        av_freep(&os->new_metadata);
+        os->new_metadata_size = 0;
     }
 
     return psize;
@@ -805,6 +830,11 @@
            && !ogg_packet(s, &i, &pstart, &psize, pos_arg)) {
         if (i == stream_index) {
             struct ogg_stream *os = ogg->streams + stream_index;
+            // Dont trust the last timestamps of a ogm video
+            if (    (os->flags & OGG_FLAG_EOS)
+                && !(os->flags & OGG_FLAG_BOS)
+                && os->codec == &ff_ogm_video_codec)
+                continue;
             pts = ogg_calc_pts(s, i, NULL);
             ogg_validate_keyframe(s, i, pstart, psize);
             if (os->pflags & AV_PKT_FLAG_KEY) {

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/oggdec.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/oggdec.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/oggenc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/oggenc.c Changed

@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <stdint.h>
+
 #include "libavutil/crc.h"
 #include "libavutil/mathematics.h"
 #include "libavutil/opt.h"
@@ -84,14 +86,6 @@
     { NULL },
 };
 
-static const AVClass ogg_muxer_class = {
-    .class_name = "Ogg muxer",
-    .item_name  = av_default_item_name,
-    .option     = options,
-    .version    = LIBAVUTIL_VERSION_INT,
-};
-
-
 static void ogg_update_checksum(AVFormatContext *s, AVIOContext *pb, int64_t crc_offset)
 {
     int64_t pos = avio_tell(pb);
@@ -622,13 +616,29 @@
     return 0;
 }
 
+#if CONFIG_OGG_MUXER
+static const AVClass ogg_muxer_class = {
+    .class_name = "Ogg muxer",
+    .item_name  = av_default_item_name,
+    .option     = options,
+    .version    = LIBAVUTIL_VERSION_INT,
+};
+
 AVOutputFormat ff_ogg_muxer = {
     .name              = "ogg",
     .long_name         = NULL_IF_CONFIG_SMALL("Ogg"),
     .mime_type         = "application/ogg",
-    .extensions        = "ogg,ogv,spx,opus",
+    .extensions        = "ogg,ogv"
+#if !CONFIG_SPEEX_MUXER
+                         ",spx"
+#endif
+#if !CONFIG_OPUS_MUXER
+                         ",opus"
+#endif
+                         ,
     .priv_data_size    = sizeof(OGGContext),
-    .audio_codec       = AV_CODEC_ID_FLAC,
+    .audio_codec       = CONFIG_LIBVORBIS_ENCODER ?
+                         AV_CODEC_ID_VORBIS : AV_CODEC_ID_FLAC,
     .video_codec       = AV_CODEC_ID_THEORA,
     .write_header      = ogg_write_header,
     .write_packet      = ogg_write_packet,
@@ -636,3 +646,52 @@
     .flags             = AVFMT_TS_NEGATIVE,
     .priv_class        = &ogg_muxer_class,
 };
+#endif
+
+#if CONFIG_SPEEX_MUXER
+static const AVClass speex_muxer_class = {
+    .class_name = "Speex muxer",
+    .item_name  = av_default_item_name,
+    .option     = options,
+    .version    = LIBAVUTIL_VERSION_INT,
+};
+
+AVOutputFormat ff_speex_muxer = {
+    .name              = "speex",
+    .long_name         = NULL_IF_CONFIG_SMALL("Speex"),
+    .mime_type         = "audio/ogg",
+    .extensions        = "spx",
+    .priv_data_size    = sizeof(OGGContext),
+    .audio_codec       = AV_CODEC_ID_SPEEX,
+     .video_codec      = AV_CODEC_ID_NONE,
+    .write_header      = ogg_write_header,
+    .write_packet      = ogg_write_packet,
+    .write_trailer     = ogg_write_trailer,
+    .flags             = AVFMT_TS_NEGATIVE,
+    .priv_class        = &speex_muxer_class,
+};
+#endif
+
+#if CONFIG_OPUS_MUXER
+static const AVClass opus_muxer_class = {
+    .class_name = "Opus muxer",
+    .item_name  = av_default_item_name,
+    .option     = options,
+    .version    = LIBAVUTIL_VERSION_INT,
+};
+
+AVOutputFormat ff_opus_muxer = {
+    .name              = "opus",
+    .long_name         = NULL_IF_CONFIG_SMALL("Opus"),
+    .mime_type         = "audio/ogg",
+    .extensions        = "opus",
+    .priv_data_size    = sizeof(OGGContext),
+    .audio_codec       = AV_CODEC_ID_OPUS,
+    .video_codec       = AV_CODEC_ID_NONE,
+    .write_header      = ogg_write_header,
+    .write_packet      = ogg_write_packet,
+    .write_trailer     = ogg_write_trailer,
+    .flags             = AVFMT_TS_NEGATIVE,
+    .priv_class        = &opus_muxer_class,
+};
+#endif

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/oggparseogm.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/oggparseogm.c Changed

@@ -79,6 +79,11 @@
         size        = FFMIN(size, os->psize);
         time_unit   = bytestream2_get_le64(&p);
         spu         = bytestream2_get_le64(&p);
+        if (!time_unit || !spu) {
+            av_log(s, AV_LOG_ERROR, "Invalid timing values.\n");
+            return AVERROR_INVALIDDATA;
+        }
+
         bytestream2_skip(&p, 4);    /* default_len */
         bytestream2_skip(&p, 8);    /* buffersize + bits_per_sample */
 
@@ -90,7 +95,7 @@
             st->codec->channels = bytestream2_get_le16(&p);
             bytestream2_skip(&p, 2); /* block_align */
             st->codec->bit_rate = bytestream2_get_le32(&p) * 8;
-            st->codec->sample_rate = time_unit ? spu * 10000000 / time_unit : 0;
+            st->codec->sample_rate = spu * 10000000 / time_unit;
             avpriv_set_pts_info(st, 64, 1, st->codec->sample_rate);
             if (size >= 56 && st->codec->codec_id == AV_CODEC_ID_AAC) {
                 bytestream2_skip(&p, 4);
@@ -126,15 +131,23 @@
     if(*p != 1)
         return 1;
 
+    if (os->psize < 100)
+        return AVERROR_INVALIDDATA;
     t = AV_RL32(p + 96);
 
     if(t == 0x05589f80){
+        if (os->psize < 184)
+            return AVERROR_INVALIDDATA;
+
         st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
         st->codec->codec_id = ff_codec_get_id(ff_codec_bmp_tags, AV_RL32(p + 68));
         avpriv_set_pts_info(st, 64, AV_RL64(p + 164), 10000000);
         st->codec->width = AV_RL32(p + 176);
         st->codec->height = AV_RL32(p + 180);
     } else if(t == 0x05589f81){
+        if (os->psize < 136)
+            return AVERROR_INVALIDDATA;
+
         st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
         st->codec->codec_id = ff_codec_get_id(ff_codec_wav_tags, AV_RL16(p + 124));
         st->codec->channels = AV_RL16(p + 126);

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/oggparseopus.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/oggparseopus.c Changed

@@ -32,6 +32,7 @@
     int64_t cur_dts;
 };
 
+#define OPUS_SEEK_PREROLL_MS 80
 #define OPUS_HEAD_SIZE 19
 
 static int opus_header(AVFormatContext *avf, int idx)
@@ -55,6 +56,7 @@
         st->codec->codec_id   = AV_CODEC_ID_OPUS;
         st->codec->channels   = AV_RL8 (packet + 9);
         priv->pre_skip        = AV_RL16(packet + 10);
+        st->codec->delay      = priv->pre_skip;
         /*orig_sample_rate    = AV_RL32(packet + 12);*/
         /*gain                = AV_RL16(packet + 16);*/
         /*channel_map         = AV_RL8 (packet + 18);*/
@@ -65,6 +67,9 @@
         memcpy(st->codec->extradata, packet, os->psize);
 
         st->codec->sample_rate = 48000;
+        av_codec_set_seek_preroll(st->codec,
+                                  av_rescale(OPUS_SEEK_PREROLL_MS,
+                                             st->codec->sample_rate, 1000));
         avpriv_set_pts_info(st, 64, 1, 48000);
         priv->need_comments = 1;
         return 1;
@@ -81,6 +86,26 @@
     return 0;
 }
 
+static int opus_duration(uint8_t *src, int size)
+{
+    unsigned nb_frames  = 1;
+    unsigned toc        = src[0];
+    unsigned toc_config = toc >> 3;
+    unsigned toc_count  = toc & 3;
+    unsigned frame_size = toc_config < 12 ? FFMAX(480, 960 * (toc_config & 3)) :
+                          toc_config < 16 ? 480 << (toc_config & 1) :
+                                            120 << (toc_config & 3);
+    if (toc_count == 3) {
+        if (size<2)
+            return AVERROR_INVALIDDATA;
+        nb_frames = src[1] & 0x3F;
+    } else if (toc_count) {
+        nb_frames = 2;
+    }
+
+    return frame_size * nb_frames;
+}
+
 static int opus_packet(AVFormatContext *avf, int idx)
 {
     struct ogg *ogg              = avf->priv_data;
@@ -88,26 +113,43 @@
     AVStream *st                 = avf->streams[idx];
     struct oggopus_private *priv = os->private;
     uint8_t *packet              = os->buf + os->pstart;
-    unsigned toc, toc_config, toc_count, frame_size, nb_frames = 1;
+    int ret;
 
     if (!os->psize)
         return AVERROR_INVALIDDATA;
 
-    toc        = *packet;
-    toc_config = toc >> 3;
-    toc_count  = toc & 3;
-    frame_size = toc_config < 12 ? FFMAX(480, 960 * (toc_config & 3)) :
-                 toc_config < 16 ? 480 << (toc_config & 1) :
-                                   120 << (toc_config & 3);
-    if (toc_count == 3) {
-        if (os->psize < 2)
-            return AVERROR_INVALIDDATA;
-        nb_frames = packet[1] & 0x3F;
-    } else if (toc_count) {
-        nb_frames = 2;
+    if ((!os->lastpts || os->lastpts == AV_NOPTS_VALUE) && !(os->flags & OGG_FLAG_EOS)) {
+        int seg, d;
+        int duration;
+        uint8_t *last_pkt  = os->buf + os->pstart;
+        uint8_t *next_pkt  = last_pkt;
+
+        duration = 0;
+        seg = os->segp;
+        d = opus_duration(last_pkt, os->psize);
+        if (d < 0) {
+            os->pflags |= AV_PKT_FLAG_CORRUPT;
+            return 0;
+        }
+        duration += d;
+        last_pkt = next_pkt =  next_pkt + os->psize;
+        for (; seg < os->nsegs; seg++) {
+            next_pkt += os->segments[seg];
+            if (os->segments[seg] < 255 && next_pkt != last_pkt) {
+                int d = opus_duration(last_pkt, next_pkt - last_pkt);
+                if (d > 0)
+                    duration += d;
+                last_pkt = next_pkt;
+            }
+        }
+        os->lastpts                 =
+        os->lastdts                 = os->granule - duration;
     }
 
-    os->pduration = frame_size * nb_frames;
+    if ((ret = opus_duration(packet, os->psize)) < 0)
+        return ret;
+
+    os->pduration = ret;
     if (os->lastpts != AV_NOPTS_VALUE) {
         if (st->start_time == AV_NOPTS_VALUE)
             st->start_time = os->lastpts;

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/oggparsetheora.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/oggparsetheora.c Changed

@@ -1,26 +1,26 @@
 /**
-      Copyright (C) 2005  Matthieu CASTET, Alex Beregszaszi
-
-      Permission is hereby granted, free of charge, to any person
-      obtaining a copy of this software and associated documentation
-      files (the "Software"), to deal in the Software without
-      restriction, including without limitation the rights to use, copy,
-      modify, merge, publish, distribute, sublicense, and/or sell copies
-      of the Software, and to permit persons to whom the Software is
-      furnished to do so, subject to the following conditions:
-
-      The above copyright notice and this permission notice shall be
-      included in all copies or substantial portions of the Software.
-
-      THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-      EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-      MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-      NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-      HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-      WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-      OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-      DEALINGS IN THE SOFTWARE.
-**/
+ *    Copyright (C) 2005  Matthieu CASTET, Alex Beregszaszi
+ *
+ *    Permission is hereby granted, free of charge, to any person
+ *    obtaining a copy of this software and associated documentation
+ *    files (the "Software"), to deal in the Software without
+ *    restriction, including without limitation the rights to use, copy,
+ *    modify, merge, publish, distribute, sublicense, and/or sell copies
+ *    of the Software, and to permit persons to whom the Software is
+ *    furnished to do so, subject to the following conditions:
+ *
+ *    The above copyright notice and this permission notice shall be
+ *    included in all copies or substantial portions of the Software.
+ *
+ *    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ *    HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ *    WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ *    DEALINGS IN THE SOFTWARE.
+ **/
 
 #include <stdlib.h>
 #include "libavutil/bswap.h"
@@ -29,64 +29,67 @@
 #include "internal.h"
 #include "oggdec.h"
 
-struct theora_params {
+typedef struct TheoraParams {
     int gpshift;
     int gpmask;
     unsigned version;
-};
+} TheoraParams;
 
-static int
-theora_header (AVFormatContext * s, int idx)
+static int theora_header(AVFormatContext *s, int idx)
 {
-    struct ogg *ogg = s->priv_data;
+    struct ogg *ogg       = s->priv_data;
     struct ogg_stream *os = ogg->streams + idx;
-    AVStream *st = s->streams[idx];
-    struct theora_params *thp = os->private;
-    int cds = st->codec->extradata_size + os->psize + 2, err;
+    AVStream *st          = s->streams[idx];
+    TheoraParams *thp     = os->private;
+    int cds               = st->codec->extradata_size + os->psize + 2;
+    int err;
     uint8_t *cdp;
 
-    if(!(os->buf[os->pstart] & 0x80))
+    if (!(os->buf[os->pstart] & 0x80))
         return 0;
 
-    if(!thp){
+    if (!thp) {
         thp = av_mallocz(sizeof(*thp));
+        if (!thp)
+            return AVERROR(ENOMEM);
         os->private = thp;
     }
 
     switch (os->buf[os->pstart]) {
     case 0x80: {
         GetBitContext gb;
-        int width, height;
         AVRational timebase;
 
-        init_get_bits(&gb, os->buf + os->pstart, os->psize*8);
+        init_get_bits(&gb, os->buf + os->pstart, os->psize * 8);
 
-        skip_bits_long(&gb, 7*8); /* 0x80"theora" */
+        /* 0x80"theora" */
+        skip_bits_long(&gb, 7 * 8);
 
         thp->version = get_bits_long(&gb, 24);
-        if (thp->version < 0x030100)
-        {
+        if (thp->version < 0x030100) {
             av_log(s, AV_LOG_ERROR,
-                "Too old or unsupported Theora (%x)\n", thp->version);
-            return -1;
+                   "Too old or unsupported Theora (%x)\n", thp->version);
+            return AVERROR(ENOSYS);
         }
 
-        width  = get_bits(&gb, 16) << 4;
-        height = get_bits(&gb, 16) << 4;
-        avcodec_set_dimensions(st->codec, width, height);
+        st->codec->width  = get_bits(&gb, 16) << 4;
+        st->codec->height = get_bits(&gb, 16) << 4;
 
         if (thp->version >= 0x030400)
             skip_bits(&gb, 100);
 
         if (thp->version >= 0x030200) {
-            width  = get_bits_long(&gb, 24);
-            height = get_bits_long(&gb, 24);
-            if (   width  <= st->codec->width  && width  > st->codec->width-16
-                && height <= st->codec->height && height > st->codec->height-16)
-                avcodec_set_dimensions(st->codec, width, height);
+            int width  = get_bits_long(&gb, 24);
+            int height = get_bits_long(&gb, 24);
+            if (width  <= st->codec->width  && width  > st->codec->width  - 16 &&
+                height <= st->codec->height && height > st->codec->height - 16) {
+                st->codec->width  = width;
+                st->codec->height = height;
+            }
 
             skip_bits(&gb, 16);
         }
+
         timebase.den = get_bits_long(&gb, 32);
         timebase.num = get_bits_long(&gb, 32);
         if (!(timebase.num > 0 && timebase.den > 0)) {
@@ -105,22 +108,22 @@
             skip_bits(&gb, 2);
 
         thp->gpshift = get_bits(&gb, 5);
-        thp->gpmask = (1 << thp->gpshift) - 1;
+        thp->gpmask  = (1 << thp->gpshift) - 1;
 
         st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
-        st->codec->codec_id = AV_CODEC_ID_THEORA;
-        st->need_parsing = AVSTREAM_PARSE_HEADERS;
+        st->codec->codec_id   = AV_CODEC_ID_THEORA;
+        st->need_parsing      = AVSTREAM_PARSE_HEADERS;
     }
     break;
     case 0x81:
         ff_vorbis_comment(s, &st->metadata, os->buf + os->pstart + 7, os->psize - 7);
     case 0x82:
         if (!thp->version)
-            return -1;
+            return AVERROR_INVALIDDATA;
         break;
     default:
         av_log(s, AV_LOG_ERROR, "Unknown header type %X\n", os->buf[os->pstart]);
-        return -1;
+        return AVERROR_INVALIDDATA;
     }
 
     if ((err = av_reallocp(&st->codec->extradata,
@@ -128,21 +131,23 @@
         st->codec->extradata_size = 0;
         return err;
     }
-    cdp = st->codec->extradata + st->codec->extradata_size;
+    memset(st->codec->extradata + cds, 0, FF_INPUT_BUFFER_PADDING_SIZE);
+
+    cdp    = st->codec->extradata + st->codec->extradata_size;
     *cdp++ = os->psize >> 8;
     *cdp++ = os->psize & 0xff;
-    memcpy (cdp, os->buf + os->pstart, os->psize);
+    memcpy(cdp, os->buf + os->pstart, os->psize);
     st->codec->extradata_size = cds;
 
     return 1;
 }
 
-static uint64_t
-theora_gptopts(AVFormatContext *ctx, int idx, uint64_t gp, int64_t *dts)
+static uint64_t theora_gptopts(AVFormatContext *ctx, int idx, uint64_t gp,
+                               int64_t *dts)
 {
-    struct ogg *ogg = ctx->priv_data;
+    struct ogg *ogg       = ctx->priv_data;
     struct ogg_stream *os = ogg->streams + idx;
-    struct theora_params *thp = os->private;
+    TheoraParams *thp     = os->private;
     uint64_t iframe, pframe;
 
     if (!thp)
@@ -154,7 +159,7 @@
     if (thp->version < 0x030201)
         iframe++;
 
-    if(!pframe)
+    if (!pframe)
         os->pflags |= AV_PKT_FLAG_KEY;
 
     if (dts)
@@ -200,10 +205,10 @@
 }
 
 const struct ogg_codec ff_theora_codec = {
-    .magic = "\200theora",
+    .magic     = "\200theora",
     .magicsize = 7,
-    .header = theora_header,
-    .packet = theora_packet,
-    .gptopts = theora_gptopts,
+    .header    = theora_header,
+    .packet    = theora_packet,
+    .gptopts   = theora_gptopts,
     .nb_header = 3,
 };

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/oggparsevorbis.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/oggparsevorbis.c Changed

@@ -155,10 +155,15 @@
                     av_log(as, AV_LOG_WARNING, "Failed to parse cover art block.\n");
                     continue;
                 }
-            } else if (!ogm_chapter(as, tt, ct))
+            } else if (!ogm_chapter(as, tt, ct)) {
+                if (m && av_dict_get(*m, tt, NULL, 0)) {
+                    av_dict_set(m, tt, ";", AV_DICT_APPEND);
+                }
                 av_dict_set(m, tt, ct,
                             AV_DICT_DONT_STRDUP_KEY |
-                            AV_DICT_DONT_STRDUP_VAL);
+                            AV_DICT_APPEND);
+                av_freep(&ct);
+            }
         }
     }
 
@@ -237,6 +242,36 @@
             av_freep(&priv->packet[i]);
 }
 
+static int vorbis_update_metadata(AVFormatContext *s, int idx)
+{
+    struct ogg *ogg = s->priv_data;
+    struct ogg_stream *os = ogg->streams + idx;
+    AVStream *st = s->streams[idx];
+    int ret;
+
+    if (os->psize <= 8)
+        return 0;
+
+    /* New metadata packet; release old data. */
+    av_dict_free(&st->metadata);
+    ret = ff_vorbis_comment(s, &st->metadata, os->buf + os->pstart + 7,
+                            os->psize - 8);
+    if (ret < 0)
+        return ret;
+
+    /* Update the metadata if possible. */
+    av_freep(&os->new_metadata);
+    if (st->metadata) {
+        os->new_metadata = av_packet_pack_dictionary(st->metadata, &os->new_metadata_size);
+    /* Send an empty dictionary to indicate that metadata has been cleared. */
+    } else {
+        os->new_metadata = av_malloc(1);
+        os->new_metadata_size = 0;
+    }
+
+    return ret;
+}
+
 static int vorbis_header(AVFormatContext *s, int idx)
 {
     struct ogg *ogg = s->priv_data;
@@ -312,9 +347,7 @@
             avpriv_set_pts_info(st, 64, 1, srate);
         }
     } else if (os->buf[os->pstart] == 3) {
-        if (os->psize > 8 &&
-            ff_vorbis_comment(s, &st->metadata, os->buf + os->pstart + 7,
-                              os->psize - 8) >= 0) {
+        if (vorbis_update_metadata(s, idx) >= 0) {
             // drop all metadata we parsed and which is not required by libvorbis
             unsigned new_len = 7 + 4 + AV_RL32(priv->packet[1] + 7) + 4 + 1;
             if (new_len >= 16 && new_len < os->psize) {
@@ -345,13 +378,13 @@
     struct ogg *ogg = s->priv_data;
     struct ogg_stream *os = ogg->streams + idx;
     struct oggvorbis_private *priv = os->private;
-    int duration;
+    int duration, flags = 0;
 
     /* first packet handling
      * here we parse the duration of each packet in the first page and compare
      * the total duration to the page granule to find the encoder delay and
      * set the first timestamp */
-    if ((!os->lastpts || os->lastpts == AV_NOPTS_VALUE) && !(os->flags & OGG_FLAG_EOS)) {
+    if ((!os->lastpts || os->lastpts == AV_NOPTS_VALUE) && !(os->flags & OGG_FLAG_EOS) && (int64_t)os->granule>=0) {
         int seg, d;
         uint8_t *last_pkt  = os->buf + os->pstart;
         uint8_t *next_pkt  = last_pkt;
@@ -359,19 +392,25 @@
         avpriv_vorbis_parse_reset(&priv->vp);
         duration = 0;
         seg = os->segp;
-        d = avpriv_vorbis_parse_frame(&priv->vp, last_pkt, 1);
+        d = avpriv_vorbis_parse_frame_flags(&priv->vp, last_pkt, 1, &flags);
         if (d < 0) {
             os->pflags |= AV_PKT_FLAG_CORRUPT;
             return 0;
+        } else if (flags & VORBIS_FLAG_COMMENT) {
+            vorbis_update_metadata(s, idx);
+            flags = 0;
         }
         duration += d;
         last_pkt = next_pkt =  next_pkt + os->psize;
         for (; seg < os->nsegs; seg++) {
             if (os->segments[seg] < 255) {
-                int d = avpriv_vorbis_parse_frame(&priv->vp, last_pkt, 1);
+                int d = avpriv_vorbis_parse_frame_flags(&priv->vp, last_pkt, 1, &flags);
                 if (d < 0) {
                     duration = os->granule;
                     break;
+                } else if (flags & VORBIS_FLAG_COMMENT) {
+                    vorbis_update_metadata(s, idx);
+                    flags = 0;
                 }
                 duration += d;
                 last_pkt  = next_pkt + os->segments[seg];
@@ -382,7 +421,7 @@
         os->lastdts                 = os->granule - duration;
         if (s->streams[idx]->start_time == AV_NOPTS_VALUE) {
             s->streams[idx]->start_time = FFMAX(os->lastpts, 0);
-            if (s->streams[idx]->duration)
+            if (s->streams[idx]->duration != AV_NOPTS_VALUE)
                 s->streams[idx]->duration -= s->streams[idx]->start_time;
         }
         priv->final_pts          = AV_NOPTS_VALUE;
@@ -391,10 +430,13 @@
 
     /* parse packet duration */
     if (os->psize > 0) {
-        duration = avpriv_vorbis_parse_frame(&priv->vp, os->buf + os->pstart, 1);
+        duration = avpriv_vorbis_parse_frame_flags(&priv->vp, os->buf + os->pstart, 1, &flags);
         if (duration < 0) {
             os->pflags |= AV_PKT_FLAG_CORRUPT;
             return 0;
+        } else if (flags & VORBIS_FLAG_COMMENT) {
+            vorbis_update_metadata(s, idx);
+            flags = 0;
         }
         os->pduration = duration;
     }

omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/oggparsevp8.c Added

@@ -0,0 +1,137 @@
+/*
+ * On2 VP8 parser for Ogg
+ * Copyright (C) 2013 James Almer
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "libavutil/intreadwrite.h"
+#include "avformat.h"
+#include "internal.h"
+#include "oggdec.h"
+
+#define VP8_HEADER_SIZE 26
+
+static int vp8_header(AVFormatContext *s, int idx)
+{
+    struct ogg *ogg = s->priv_data;
+    struct ogg_stream *os = ogg->streams + idx;
+    uint8_t *p = os->buf + os->pstart;
+    AVStream *st = s->streams[idx];
+    AVRational framerate;
+
+    if (os->psize < 7 || p[0] != 0x4f)
+        return 0;
+
+    switch (p[5]){
+    case 0x01:
+        if (os->psize < VP8_HEADER_SIZE) {
+            av_log(s, AV_LOG_ERROR, "Invalid OggVP8 header packet");
+            return AVERROR_INVALIDDATA;
+        }
+
+        if (p[6] != 1) {
+            av_log(s, AV_LOG_WARNING, "Unknown OggVP8 version %d.%d\n", p[6], p[7]);
+            return AVERROR_INVALIDDATA;
+        }
+
+        st->codec->width            = AV_RB16(p +  8);
+        st->codec->height           = AV_RB16(p + 10);
+        st->sample_aspect_ratio.num = AV_RB24(p + 12);
+        st->sample_aspect_ratio.den = AV_RB24(p + 15);
+        framerate.den               = AV_RB32(p + 18);
+        framerate.num               = AV_RB32(p + 22);
+
+        avpriv_set_pts_info(st, 64, framerate.num, framerate.den);
+        st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
+        st->codec->codec_id   = AV_CODEC_ID_VP8;
+        st->need_parsing      = AVSTREAM_PARSE_HEADERS;
+        break;
+    case 0x02:
+        if (p[6] != 0x20)
+            return AVERROR_INVALIDDATA;
+        ff_vorbis_comment(s, &st->metadata, p + 7, os->psize - 7);
+        break;
+    default:
+        av_log(s, AV_LOG_ERROR, "Unknown VP8 header type 0x%02X\n", p[5]);
+        return AVERROR_INVALIDDATA;
+    }
+
+    return 1;
+}
+
+static uint64_t vp8_gptopts(AVFormatContext *s, int idx, uint64_t granule, int64_t *dts)
+{
+    struct ogg *ogg = s->priv_data;
+    struct ogg_stream *os = ogg->streams + idx;
+
+    uint64_t pts  = (granule >> 32);
+    uint32_t dist = (granule >>  3) & 0x07ffffff;
+
+    if (!dist)
+        os->pflags |= AV_PKT_FLAG_KEY;
+
+    if (dts)
+        *dts = pts;
+
+    return pts;
+}
+
+static int vp8_packet(AVFormatContext *s, int idx)
+{
+    struct ogg *ogg = s->priv_data;
+    struct ogg_stream *os = ogg->streams + idx;
+    uint8_t *p = os->buf + os->pstart;
+
+    if ((!os->lastpts || os->lastpts == AV_NOPTS_VALUE) && !(os->flags & OGG_FLAG_EOS)) {
+        int seg;
+        int duration;
+        uint8_t *last_pkt = p;
+        uint8_t *next_pkt;
+
+        seg = os->segp;
+        duration = (last_pkt[0] >> 4) & 1;
+        next_pkt = last_pkt += os->psize;
+        for (; seg < os->nsegs; seg++) {
+            if (os->segments[seg] < 255) {
+                duration += (last_pkt[0] >> 4) & 1;
+                last_pkt  = next_pkt + os->segments[seg];
+            }
+            next_pkt += os->segments[seg];
+        }
+        os->lastpts = os->lastdts = vp8_gptopts(s, idx, os->granule, NULL) - duration;
+        if(s->streams[idx]->start_time == AV_NOPTS_VALUE) {
+            s->streams[idx]->start_time = os->lastpts;
+            if (s->streams[idx]->duration)
+                s->streams[idx]->duration -= s->streams[idx]->start_time;
+        }
+    }
+
+    if (os->psize > 0)
+        os->pduration = (p[0] >> 4) & 1;
+
+    return 0;
+}
+
+const struct ogg_codec ff_vp8_codec = {
+    .magic     = "OVP80",
+    .magicsize = 5,
+    .header    = vp8_header,
+    .packet    = vp8_packet,
+    .gptopts   = vp8_gptopts,
+    .nb_header = 1,
+};

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/omadec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/omadec.c Changed

@@ -37,6 +37,7 @@
  * - Sound data organized in packets follow the EA3 header
  *   (can be encrypted using the Sony DRM!).
  *
+ * Supported decoders: ATRAC3, ATRAC3+, MP3, LPCM
  */
 
 #include "libavutil/channel_layout.h"
@@ -232,9 +233,8 @@
         av_log(s, AV_LOG_ERROR, "Invalid encryption header\n");
         return AVERROR_INVALIDDATA;
     }
-    if (   OMA_ENC_HEADER_SIZE + oc->k_size + oc->e_size + oc->i_size + 8 > geob->datasize
-        || OMA_ENC_HEADER_SIZE + 48 > geob->datasize
-    ) {
+    if (OMA_ENC_HEADER_SIZE + oc->k_size + oc->e_size + oc->i_size + 8 > geob->datasize ||
+        OMA_ENC_HEADER_SIZE + 48 > geob->datasize) {
         av_log(s, AV_LOG_ERROR, "Too little GEOB data\n");
         return AVERROR_INVALIDDATA;
     }
@@ -380,7 +380,6 @@
         st->codec->sample_rate = samplerate;
         st->codec->bit_rate    = samplerate * framesize * 8 / 2048;
         avpriv_set_pts_info(st, 64, 1, samplerate);
-        av_log(s, AV_LOG_ERROR, "Unsupported codec ATRAC3+!\n");
         break;
     case OMA_CODECID_MP3:
         st->need_parsing = AVSTREAM_PARSE_FULL_RAW;
@@ -440,23 +439,16 @@
 
 static int oma_read_probe(AVProbeData *p)
 {
-    const uint8_t *buf;
+    const uint8_t *buf = p->buf;
     unsigned tag_len = 0;
 
-    buf = p->buf;
-
-    if (p->buf_size < ID3v2_HEADER_SIZE ||
-        !ff_id3v2_match(buf, ID3v2_EA3_MAGIC) ||
-        buf[3] != 3 || // version must be 3
-        buf[4]) // flags byte zero
-        return 0;
-
-    tag_len = ff_id3v2_tag_len(buf);
+    if (p->buf_size >= ID3v2_HEADER_SIZE && ff_id3v2_match(buf, ID3v2_EA3_MAGIC))
+        tag_len = ff_id3v2_tag_len(buf);
 
     /* This check cannot overflow as tag_len has at most 28 bits */
     if (p->buf_size < tag_len + 5)
         /* EA3 header comes late, might be outside of the probe buffer */
-        return AVPROBE_SCORE_EXTENSION;
+        return tag_len ? AVPROBE_SCORE_EXTENSION : 0;
 
     buf += tag_len;

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/options.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/options.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/options_table.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/options_table.h Changed

@@ -73,10 +73,17 @@
 {"compliant",  "consider all spec non compliancies as errors", 0, AV_OPT_TYPE_CONST, {.i64 = AV_EF_COMPLIANT }, INT_MIN, INT_MAX, D, "err_detect"},
 {"aggressive", "consider things that a sane encoder shouldn't do as an error", 0, AV_OPT_TYPE_CONST, {.i64 = AV_EF_AGGRESSIVE }, INT_MIN, INT_MAX, D, "err_detect"},
 {"use_wallclock_as_timestamps", "use wallclock as timestamps", OFFSET(use_wallclock_as_timestamps), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX-1, D},
-{"avoid_negative_ts", "shift timestamps to make them non-negative. 1 enables, 0 disables, default of -1 enables when required by target format.", OFFSET(avoid_negative_ts), AV_OPT_TYPE_INT, {.i64 = -1}, -1, 1, E},
+{"avoid_negative_ts", "shift timestamps so they start at 0", OFFSET(avoid_negative_ts), AV_OPT_TYPE_INT, {.i64 = -1}, -1, 2, E, "avoid_negative_ts"},
+{"auto",                "enabled when required by target format",    0, AV_OPT_TYPE_CONST, {.i64 = -1 }, INT_MIN, INT_MAX, E, "avoid_negative_ts"},
+{"disabled",            "do not change timestamps",                  0, AV_OPT_TYPE_CONST, {.i64 =  0 }, INT_MIN, INT_MAX, E, "avoid_negative_ts"},
+{"make_zero",           "shift timestamps so they start at 0",       0, AV_OPT_TYPE_CONST, {.i64 =  2 }, INT_MIN, INT_MAX, E, "avoid_negative_ts"},
+{"make_non_negative",   "shift timestamps so they are non negative", 0, AV_OPT_TYPE_CONST, {.i64 =  1 }, INT_MIN, INT_MAX, E, "avoid_negative_ts"},
 {"skip_initial_bytes", "set number of bytes to skip before reading header and frames", OFFSET(skip_initial_bytes), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX-1, D},
 {"correct_ts_overflow", "correct single timestamp overflows", OFFSET(correct_ts_overflow), AV_OPT_TYPE_INT, {.i64 = 1}, 0, 1, D},
 {"flush_packets", "enable flushing of the I/O context after each packet", OFFSET(flush_packets), AV_OPT_TYPE_INT, {.i64 = 1}, 0, 1, E},
+{"metadata_header_padding", "set number of bytes to be written as padding in a metadata header", OFFSET(metadata_header_padding), AV_OPT_TYPE_INT, {.i64 = -1}, -1, INT_MAX, E},
+{"output_ts_offset", "set output timestamp offset", OFFSET(output_ts_offset), AV_OPT_TYPE_DURATION, {.i64 = 0}, -INT64_MAX, INT64_MAX, E},
+{"max_interleave_delta", "maximum buffering duration for interleaving", OFFSET(max_interleave_delta), AV_OPT_TYPE_INT64, { .i64 = 10000000 }, 0, INT64_MAX, E },
 {NULL},
 };

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/os_support.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/os_support.c Changed

@@ -32,13 +32,13 @@
 #if !HAVE_POLL_H
 #if HAVE_SYS_TIME_H
 #include <sys/time.h>
-#endif
+#endif /* HAVE_SYS_TIME_H */
 #if HAVE_WINSOCK2_H
 #include <winsock2.h>
 #elif HAVE_SYS_SELECT_H
 #include <sys/select.h>
-#endif
-#endif
+#endif /* HAVE_WINSOCK2_H */
+#endif /* !HAVE_POLL_H */
 
 #include "network.h"
 
@@ -82,7 +82,7 @@
     win_getaddrinfo = GetProcAddress(ws2mod, "getaddrinfo");
     if (win_getaddrinfo)
         return win_getaddrinfo(node, service, hints, res);
-#endif
+#endif /* HAVE_WINSOCK2_H */
 
     *res = NULL;
     sin  = av_mallocz(sizeof(struct sockaddr_in));
@@ -156,7 +156,7 @@
         win_freeaddrinfo(res);
         return;
     }
-#endif
+#endif /* HAVE_WINSOCK2_H */
 
     av_free(res->ai_canonname);
     av_free(res->ai_addr);
@@ -177,7 +177,7 @@
     win_getnameinfo = GetProcAddress(ws2mod, "getnameinfo");
     if (win_getnameinfo)
         return win_getnameinfo(sa, salen, host, hostlen, serv, servlen, flags);
-#endif
+#endif /* HAVE_WINSOCK2_H */
 
     if (sa->sa_family != AF_INET)
         return EAI_FAMILY;
@@ -208,7 +208,7 @@
 #if HAVE_GETSERVBYPORT
         if (!(flags & NI_NUMERICSERV))
             ent = getservbyport(sin->sin_port, flags & NI_DGRAM ? "udp" : "tcp");
-#endif
+#endif /* HAVE_GETSERVBYPORT */
 
         if (ent)
             snprintf(serv, servlen, "%s", ent->s_name);
@@ -238,7 +238,7 @@
 #if EAI_NODATA != EAI_NONAME
     case EAI_NODATA:
         return "No address associated with hostname";
-#endif
+#endif /* EAI_NODATA != EAI_NONAME */
     case EAI_NONAME:
         return "The name does not resolve for the supplied parameters";
     case EAI_SERVICE:
@@ -261,7 +261,7 @@
         return fcntl(socket, F_SETFL, fcntl(socket, F_GETFL) | O_NONBLOCK);
     else
         return fcntl(socket, F_SETFL, fcntl(socket, F_GETFL) & ~O_NONBLOCK);
-#endif
+#endif /* HAVE_WINSOCK2_H */
 }
 
 #if !HAVE_POLL_H
@@ -279,7 +279,7 @@
         errno = EINVAL;
         return -1;
     }
-#endif
+#endif /* HAVE_WINSOCK2_H */
 
     FD_ZERO(&read_set);
     FD_ZERO(&write_set);
@@ -294,7 +294,7 @@
             errno = EINVAL;
             return -1;
         }
-#endif
+#endif /* !HAVE_WINSOCK2_H */
 
         if (fds[i].events & POLLIN)
             FD_SET(fds[i].fd, &read_set);
@@ -336,5 +336,6 @@
 
     return rc;
 }
-#endif /* HAVE_POLL_H */
+#endif /* !HAVE_POLL_H */
+
 #endif /* CONFIG_NETWORK */

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/pjsdec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/pjsdec.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/pmpdec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/pmpdec.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/psxstr.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/psxstr.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/pva.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/pva.c Changed

@@ -85,6 +85,7 @@
     PVAContext *pvactx = s->priv_data;
     int syncword, streamid, reserved, flags, length, pts_flag;
     int64_t pva_pts = AV_NOPTS_VALUE, startpos;
+    int ret;
 
 recover:
     startpos = avio_tell(pb);
@@ -133,8 +134,8 @@
             pes_flags              = avio_rb16(pb);
             pes_header_data_length = avio_r8(pb);
 
-            if (pes_signal != 1) {
-                pva_log(s, AV_LOG_WARNING, "expected signaled PES packet, "
+            if (pes_signal != 1 || pes_header_data_length == 0) {
+                pva_log(s, AV_LOG_WARNING, "expected non empty signaled PES packet, "
                                           "trying to recover\n");
                 avio_skip(pb, length - 9);
                 if (!read_packet)
@@ -142,15 +143,23 @@
                 goto recover;
             }
 
-            avio_read(pb, pes_header_data, pes_header_data_length);
+            ret = avio_read(pb, pes_header_data, pes_header_data_length);
+            if (ret != pes_header_data_length)
+                return ret < 0 ? ret : AVERROR_INVALIDDATA;
             length -= 9 + pes_header_data_length;
 
             pes_packet_length -= 3 + pes_header_data_length;
 
             pvactx->continue_pes = pes_packet_length;
 
-            if (pes_flags & 0x80 && (pes_header_data[0] & 0xf0) == 0x20)
+            if (pes_flags & 0x80 && (pes_header_data[0] & 0xf0) == 0x20) {
+                if (pes_header_data_length < 5) {
+                    pva_log(s, AV_LOG_ERROR, "header too short\n");
+                    avio_skip(pb, length);
+                    return AVERROR_INVALIDDATA;
+                }
                 pva_pts = ff_parse_pes_pts(pes_header_data);
+            }
         }
 
         pvactx->continue_pes -= length;

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/rawenc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/rawenc.c Changed

@@ -29,6 +29,16 @@
     return 0;
 }
 
+static int force_one_stream(AVFormatContext *s)
+{
+    if (s->nb_streams != 1) {
+        av_log(s, AV_LOG_ERROR, "%s files have exactly one stream\n",
+               s->oformat->name);
+        return AVERROR(EINVAL);
+    }
+    return 0;
+}
+
 /* Note: Do not forget to add new entries to the Makefile as well. */
 
 #if CONFIG_AC3_MUXER
@@ -39,6 +49,7 @@
     .extensions        = "ac3",
     .audio_codec       = AV_CODEC_ID_AC3,
     .video_codec       = AV_CODEC_ID_NONE,
+    .write_header      = force_one_stream,
     .write_packet      = ff_raw_write_packet,
     .flags             = AVFMT_NOTIMESTAMPS,
 };
@@ -51,6 +62,7 @@
     .extensions        = "adx",
     .audio_codec       = AV_CODEC_ID_ADPCM_ADX,
     .video_codec       = AV_CODEC_ID_NONE,
+    .write_header      = force_one_stream,
     .write_packet      = ff_raw_write_packet,
     .flags             = AVFMT_NOTIMESTAMPS,
 };
@@ -63,6 +75,7 @@
     .extensions        = "cavs",
     .audio_codec       = AV_CODEC_ID_NONE,
     .video_codec       = AV_CODEC_ID_CAVS,
+    .write_header      = force_one_stream,
     .write_packet      = ff_raw_write_packet,
     .flags             = AVFMT_NOTIMESTAMPS,
 };
@@ -72,6 +85,7 @@
 AVOutputFormat ff_data_muxer = {
     .name              = "data",
     .long_name         = NULL_IF_CONFIG_SMALL("raw data"),
+    .write_header      = force_one_stream,
     .write_packet      = ff_raw_write_packet,
     .flags             = AVFMT_NOTIMESTAMPS,
 };
@@ -84,6 +98,7 @@
     .extensions        = "drc",
     .audio_codec       = AV_CODEC_ID_NONE,
     .video_codec       = AV_CODEC_ID_DIRAC,
+    .write_header      = force_one_stream,
     .write_packet      = ff_raw_write_packet,
     .flags             = AVFMT_NOTIMESTAMPS,
 };
@@ -96,6 +111,7 @@
     .extensions        = "dnxhd",
     .audio_codec       = AV_CODEC_ID_NONE,
     .video_codec       = AV_CODEC_ID_DNXHD,
+    .write_header      = force_one_stream,
     .write_packet      = ff_raw_write_packet,
     .flags             = AVFMT_NOTIMESTAMPS,
 };
@@ -109,6 +125,7 @@
     .extensions        = "dts",
     .audio_codec       = AV_CODEC_ID_DTS,
     .video_codec       = AV_CODEC_ID_NONE,
+    .write_header      = force_one_stream,
     .write_packet      = ff_raw_write_packet,
     .flags             = AVFMT_NOTIMESTAMPS,
 };
@@ -122,6 +139,7 @@
     .extensions        = "eac3",
     .audio_codec       = AV_CODEC_ID_EAC3,
     .video_codec       = AV_CODEC_ID_NONE,
+    .write_header      = force_one_stream,
     .write_packet      = ff_raw_write_packet,
     .flags             = AVFMT_NOTIMESTAMPS,
 };
@@ -135,6 +153,7 @@
     .extensions        = "g722",
     .audio_codec       = AV_CODEC_ID_ADPCM_G722,
     .video_codec       = AV_CODEC_ID_NONE,
+    .write_header      = force_one_stream,
     .write_packet      = ff_raw_write_packet,
     .flags             = AVFMT_NOTIMESTAMPS,
 };
@@ -148,6 +167,7 @@
     .extensions        = "tco,rco",
     .audio_codec       = AV_CODEC_ID_G723_1,
     .video_codec       = AV_CODEC_ID_NONE,
+    .write_header      = force_one_stream,
     .write_packet      = ff_raw_write_packet,
     .flags             = AVFMT_NOTIMESTAMPS,
 };
@@ -161,6 +181,7 @@
     .extensions        = "h261",
     .audio_codec       = AV_CODEC_ID_NONE,
     .video_codec       = AV_CODEC_ID_H261,
+    .write_header      = force_one_stream,
     .write_packet      = ff_raw_write_packet,
     .flags             = AVFMT_NOTIMESTAMPS,
 };
@@ -174,6 +195,7 @@
     .extensions        = "h263",
     .audio_codec       = AV_CODEC_ID_NONE,
     .video_codec       = AV_CODEC_ID_H263,
+    .write_header      = force_one_stream,
     .write_packet      = ff_raw_write_packet,
     .flags             = AVFMT_NOTIMESTAMPS,
 };
@@ -186,6 +208,19 @@
     .extensions        = "h264",
     .audio_codec       = AV_CODEC_ID_NONE,
     .video_codec       = AV_CODEC_ID_H264,
+    .write_header      = force_one_stream,
+    .write_packet      = ff_raw_write_packet,
+    .flags             = AVFMT_NOTIMESTAMPS,
+};
+#endif
+
+#if CONFIG_HEVC_MUXER
+AVOutputFormat ff_hevc_muxer = {
+    .name              = "hevc",
+    .long_name         = NULL_IF_CONFIG_SMALL("raw HEVC video"),
+    .extensions        = "hevc",
+    .audio_codec       = AV_CODEC_ID_NONE,
+    .video_codec       = AV_CODEC_ID_HEVC,
     .write_packet      = ff_raw_write_packet,
     .flags             = AVFMT_NOTIMESTAMPS,
 };
@@ -211,6 +246,7 @@
     .extensions        = "mjpg,mjpeg",
     .audio_codec       = AV_CODEC_ID_NONE,
     .video_codec       = AV_CODEC_ID_MJPEG,
+    .write_header      = force_one_stream,
     .write_packet      = ff_raw_write_packet,
     .flags             = AVFMT_NOTIMESTAMPS,
 };
@@ -223,6 +259,7 @@
     .extensions        = "mlp",
     .audio_codec       = AV_CODEC_ID_MLP,
     .video_codec       = AV_CODEC_ID_NONE,
+    .write_header      = force_one_stream,
     .write_packet      = ff_raw_write_packet,
     .flags             = AVFMT_NOTIMESTAMPS,
 };
@@ -236,6 +273,7 @@
     .extensions        = "mpg,mpeg,m1v",
     .audio_codec       = AV_CODEC_ID_NONE,
     .video_codec       = AV_CODEC_ID_MPEG1VIDEO,
+    .write_header      = force_one_stream,
     .write_packet      = ff_raw_write_packet,
     .flags             = AVFMT_NOTIMESTAMPS,
 };
@@ -248,6 +286,7 @@
     .extensions        = "m2v",
     .audio_codec       = AV_CODEC_ID_NONE,
     .video_codec       = AV_CODEC_ID_MPEG2VIDEO,
+    .write_header      = force_one_stream,
     .write_packet      = ff_raw_write_packet,
     .flags             = AVFMT_NOTIMESTAMPS,
 };
@@ -272,6 +311,7 @@
     .extensions        = "thd",
     .audio_codec       = AV_CODEC_ID_TRUEHD,
     .video_codec       = AV_CODEC_ID_NONE,
+    .write_header      = force_one_stream,
     .write_packet      = ff_raw_write_packet,
     .flags             = AVFMT_NOTIMESTAMPS,
 };
@@ -284,6 +324,7 @@
     .extensions        = "vc1",
     .audio_codec       = AV_CODEC_ID_NONE,
     .video_codec       = AV_CODEC_ID_VC1,
+    .write_header      = force_one_stream,
     .write_packet      = ff_raw_write_packet,
     .flags             = AVFMT_NOTIMESTAMPS,
 };

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/rdt.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/rdt.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/rdt.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/rdt.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/riff.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/riff.c Changed

@@ -42,6 +42,7 @@
     { AV_CODEC_ID_H264,         MKTAG('V', '2', '6', '4') },
     { AV_CODEC_ID_H264,         MKTAG('G', 'A', 'V', 'C') }, /* GeoVision camera */
     { AV_CODEC_ID_H264,         MKTAG('U', 'M', 'S', 'V') },
+    { AV_CODEC_ID_H264,         MKTAG('I', 'N', 'M', 'C') },
     { AV_CODEC_ID_H263,         MKTAG('H', '2', '6', '3') },
     { AV_CODEC_ID_H263,         MKTAG('X', '2', '6', '3') },
     { AV_CODEC_ID_H263,         MKTAG('T', '2', '6', '3') },
@@ -85,11 +86,13 @@
     { AV_CODEC_ID_MPEG4,        MKTAG('M', '4', 'T', '3') },
     { AV_CODEC_ID_MPEG4,        MKTAG('G', 'E', 'O', 'X') },
     /* flipped video */
+    { AV_CODEC_ID_MPEG4,        MKTAG('G', '2', '6', '4') },
+    /* flipped video */
     { AV_CODEC_ID_MPEG4,        MKTAG('H', 'D', 'X', '4') },
     { AV_CODEC_ID_MPEG4,        MKTAG('D', 'M', '4', 'V') },
     { AV_CODEC_ID_MPEG4,        MKTAG('D', 'M', 'K', '2') },
+    { AV_CODEC_ID_MPEG4,        MKTAG('D', 'Y', 'M', '4') },
     { AV_CODEC_ID_MPEG4,        MKTAG('D', 'I', 'G', 'I') },
-    { AV_CODEC_ID_MPEG4,        MKTAG('I', 'N', 'M', 'C') },
     /* Ephv MPEG-4 */
     { AV_CODEC_ID_MPEG4,        MKTAG('E', 'P', 'H', 'V') },
     { AV_CODEC_ID_MPEG4,        MKTAG('E', 'M', '4', 'A') },
@@ -256,6 +259,7 @@
     { AV_CODEC_ID_VP6F,         MKTAG('V', 'P', '6', 'F') },
     { AV_CODEC_ID_VP6F,         MKTAG('F', 'L', 'V', '4') },
     { AV_CODEC_ID_VP8,          MKTAG('V', 'P', '8', '0') },
+    { AV_CODEC_ID_VP9,          MKTAG('V', 'P', '9', '0') },
     { AV_CODEC_ID_ASV1,         MKTAG('A', 'S', 'V', '1') },
     { AV_CODEC_ID_ASV2,         MKTAG('A', 'S', 'V', '2') },
     { AV_CODEC_ID_VCR1,         MKTAG('V', 'C', 'R', '1') },
@@ -352,6 +356,7 @@
     { AV_CODEC_ID_G2M,          MKTAG('G', '2', 'M', '2') },
     { AV_CODEC_ID_G2M,          MKTAG('G', '2', 'M', '3') },
     { AV_CODEC_ID_G2M,          MKTAG('G', '2', 'M', '4') },
+    { AV_CODEC_ID_FIC,          MKTAG('F', 'I', 'C', 'V') },
     { AV_CODEC_ID_NONE,         0 }
 };
 
@@ -409,6 +414,8 @@
     { AV_CODEC_ID_AAC,             0x1600 },
     { AV_CODEC_ID_AAC_LATM,        0x1602 },
     { AV_CODEC_ID_AC3,             0x2000 },
+    /* There is no Microsoft Format Tag for E-AC3, the GUID has to be used */
+    { AV_CODEC_ID_EAC3,            0x2000 },
     { AV_CODEC_ID_DTS,             0x2001 },
     { AV_CODEC_ID_SONIC,           0x2048 },
     { AV_CODEC_ID_SONIC_LS,        0x2048 },
@@ -452,3 +459,11 @@
 {
     return ff_codec_wav_tags;
 }
+
+const AVCodecGuid ff_codec_wav_guids[] = {
+    { AV_CODEC_ID_AC3,      { 0x2C, 0x80, 0x6D, 0xE0, 0x46, 0xDB, 0xCF, 0x11, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA } },
+    { AV_CODEC_ID_ATRAC3P,  { 0xBF, 0xAA, 0x23, 0xE9, 0x58, 0xCB, 0x71, 0x44, 0xA1, 0x19, 0xFF, 0xFA, 0x01, 0xE4, 0xCE, 0x62 } },
+    { AV_CODEC_ID_EAC3,     { 0xAF, 0x87, 0xFB, 0xA7, 0x02, 0x2D, 0xFB, 0x42, 0xA4, 0xD4, 0x05, 0xCD, 0x93, 0x84, 0x3B, 0xDD } },
+    { AV_CODEC_ID_MP2,      { 0x2B, 0x80, 0x6D, 0xE0, 0x46, 0xDB, 0xCF, 0x11, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA } },
+    { AV_CODEC_ID_NONE }
+};

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/riff.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/riff.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/riffdec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/riffdec.c Changed

@@ -29,19 +29,14 @@
 #include "avio_internal.h"
 #include "riff.h"
 
-const AVCodecGuid ff_codec_wav_guids[] = {
-    { AV_CODEC_ID_AC3,      { 0x2C, 0x80, 0x6D, 0xE0, 0x46, 0xDB, 0xCF, 0x11, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA } },
-    { AV_CODEC_ID_ATRAC3P,  { 0xBF, 0xAA, 0x23, 0xE9, 0x58, 0xCB, 0x71, 0x44, 0xA1, 0x19, 0xFF, 0xFA, 0x01, 0xE4, 0xCE, 0x62 } },
-    { AV_CODEC_ID_EAC3,     { 0xAF, 0x87, 0xFB, 0xA7, 0x02, 0x2D, 0xFB, 0x42, 0xA4, 0xD4, 0x05, 0xCD, 0x93, 0x84, 0x3B, 0xDD } },
-    { AV_CODEC_ID_MP2,      { 0x2B, 0x80, 0x6D, 0xE0, 0x46, 0xDB, 0xCF, 0x11, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA } },
-    { AV_CODEC_ID_NONE }
-};
-
-void ff_get_guid(AVIOContext *s, ff_asf_guid *g)
+int ff_get_guid(AVIOContext *s, ff_asf_guid *g)
 {
     av_assert0(sizeof(*g) == 16); //compiler will optimize this out
-    if (avio_read(s, *g, sizeof(*g)) < (int)sizeof(*g))
+    if (avio_read(s, *g, sizeof(*g)) < (int)sizeof(*g)) {
         memset(*g, 0, sizeof(*g));
+        return AVERROR_INVALIDDATA;
+    }
+    return 0;
 }
 
 enum AVCodecID ff_codec_guid_get_id(const AVCodecGuid *guids, ff_asf_guid guid)
@@ -117,9 +112,8 @@
         }
         if (cbSize > 0) {
             av_free(codec->extradata);
-            if (ff_alloc_extradata(codec, cbSize))
+            if (ff_get_extradata(codec, pb, cbSize) < 0)
                 return AVERROR(ENOMEM);
-            avio_read(pb, codec->extradata, codec->extradata_size);
             size -= cbSize;
         }

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/riffenc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/riffenc.c Changed

@@ -72,6 +72,7 @@
 
     waveformatextensible = (enc->channels > 2 && enc->channel_layout) ||
                            enc->sample_rate > 48000 ||
+                           enc->codec_id == AV_CODEC_ID_EAC3 ||
                            av_get_bits_per_sample(enc->codec_id) > 16;
 
     if (waveformatextensible)
@@ -183,10 +184,14 @@
         /* dwChannelMask */
         avio_wl32(pb, enc->channel_layout);
         /* GUID + next 3 */
+        if (enc->codec_id == AV_CODEC_ID_EAC3) {
+            ff_put_guid(pb, get_codec_guid(enc->codec_id, ff_codec_wav_guids));
+        } else {
         avio_wl32(pb, enc->codec_tag);
         avio_wl32(pb, 0x00100000);
         avio_wl32(pb, 0xAA000080);
         avio_wl32(pb, 0x719B3800);
+        }
     } else {
         avio_wl16(pb, riff_extradata - riff_extradata_start); /* cbSize */
     }
@@ -201,10 +206,10 @@
 
 /* BITMAPINFOHEADER header */
 void ff_put_bmp_header(AVIOContext *pb, AVCodecContext *enc,
-                       const AVCodecTag *tags, int for_asf)
+                       const AVCodecTag *tags, int for_asf, int ignore_extradata)
 {
     /* size */
-    avio_wl32(pb, 40 + enc->extradata_size);
+    avio_wl32(pb, 40 + (ignore_extradata ? 0 : enc->extradata_size));
     avio_wl32(pb, enc->width);
     //We always store RGB TopDown
     avio_wl32(pb, enc->codec_tag ? enc->height : -enc->height);
@@ -220,10 +225,12 @@
     avio_wl32(pb, 0);
     avio_wl32(pb, 0);
 
-    avio_write(pb, enc->extradata, enc->extradata_size);
+    if (!ignore_extradata) {
+        avio_write(pb, enc->extradata, enc->extradata_size);
 
-    if (!for_asf && enc->extradata_size & 1)
-        avio_w8(pb, 0);
+        if (!for_asf && enc->extradata_size & 1)
+            avio_w8(pb, 0);
+    }
 }
 
 void ff_parse_specific_params(AVCodecContext *stream, int *au_rate,
@@ -310,3 +317,19 @@
             ff_riff_write_info_tag(s->pb, t->key, t->value);
     ff_end_tag(pb, list_pos);
 }
+
+void ff_put_guid(AVIOContext *s, const ff_asf_guid *g)
+{
+    av_assert0(sizeof(*g) == 16);
+    avio_write(s, *g, sizeof(*g));
+}
+
+const ff_asf_guid *get_codec_guid(enum AVCodecID id, const AVCodecGuid *av_guid)
+{
+    int i;
+    for (i = 0; av_guid[i].id != AV_CODEC_ID_NONE; i++) {
+        if (id == av_guid[i].id)
+            return &(av_guid[i].guid);
+    }
+    return NULL;
+}

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/rl2.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/rl2.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/rmdec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/rmdec.c Changed

@@ -86,11 +86,8 @@
 {
     if (size >= 1<<24)
         return -1;
-    if (ff_alloc_extradata(avctx, size))
+    if (ff_get_extradata(avctx, pb, size) < 0)
         return AVERROR(ENOMEM);
-    avctx->extradata_size = avio_read(pb, avctx->extradata, size);
-    if (avctx->extradata_size != size)
-        return AVERROR(EIO);
     return 0;
 }
 
@@ -185,6 +182,7 @@
             avio_read(pb, buf, 4);
             buf[4] = 0;
         } else {
+            AV_WL32(buf, 0);
             get_str8(pb, buf, sizeof(buf)); /* desc */
             ast->deint_id = AV_RL32(buf);
             get_str8(pb, buf, sizeof(buf)); /* desc */
@@ -257,27 +255,23 @@
         default:
             av_strlcpy(st->codec->codec_name, buf, sizeof(st->codec->codec_name));
         }
-        if (ast->deint_id == DEINT_ID_INT4 ||
-            ast->deint_id == DEINT_ID_GENR ||
-            ast->deint_id == DEINT_ID_SIPR) {
-            if (st->codec->block_align <= 0 ||
-                ast->audio_framesize * sub_packet_h > (unsigned)INT_MAX ||
-                ast->audio_framesize * sub_packet_h < st->codec->block_align)
-                return AVERROR_INVALIDDATA;
-            if (av_new_packet(&ast->pkt, ast->audio_framesize * sub_packet_h) < 0)
-                return AVERROR(ENOMEM);
-        }
         switch (ast->deint_id) {
         case DEINT_ID_INT4:
             if (ast->coded_framesize > ast->audio_framesize ||
                 sub_packet_h <= 1 ||
                 ast->coded_framesize * sub_packet_h > (2 + (sub_packet_h & 1)) * ast->audio_framesize)
                 return AVERROR_INVALIDDATA;
+            if (ast->coded_framesize * sub_packet_h != 2*ast->audio_framesize) {
+                avpriv_request_sample(s, "mismatching interleaver parameters");
+                return AVERROR_INVALIDDATA;
+            }
             break;
         case DEINT_ID_GENR:
             if (ast->sub_packet_size <= 0 ||
                 ast->sub_packet_size > ast->audio_framesize)
                 return AVERROR_INVALIDDATA;
+            if (ast->audio_framesize % ast->sub_packet_size)
+                return AVERROR_INVALIDDATA;
             break;
         case DEINT_ID_SIPR:
         case DEINT_ID_INT0:
@@ -288,6 +282,16 @@
             av_log(s, AV_LOG_ERROR, "Unknown interleaver %X\n", ast->deint_id);
             return AVERROR_INVALIDDATA;
         }
+        if (ast->deint_id == DEINT_ID_INT4 ||
+            ast->deint_id == DEINT_ID_GENR ||
+            ast->deint_id == DEINT_ID_SIPR) {
+            if (st->codec->block_align <= 0 ||
+                ast->audio_framesize * sub_packet_h > (unsigned)INT_MAX ||
+                ast->audio_framesize * sub_packet_h < st->codec->block_align)
+                return AVERROR_INVALIDDATA;
+            if (av_new_packet(&ast->pkt, ast->audio_framesize * sub_packet_h) < 0)
+                return AVERROR(ENOMEM);
+        }
 
         if (read_all) {
             avio_r8(pb);
@@ -785,6 +789,16 @@
     }
 }
 
+static int readfull(AVFormatContext *s, AVIOContext *pb, uint8_t *dst, int n) {
+    int ret = avio_read(pb, dst, n);
+    if (ret != n) {
+        if (ret >= 0) memset(dst + ret, 0, n - ret);
+        else          memset(dst      , 0, n);
+        av_log(s, AV_LOG_ERROR, "Failed to fully read block\n");
+    }
+    return ret;
+}
+
 int
 ff_rm_parse_packet (AVFormatContext *s, AVIOContext *pb,
                     AVStream *st, RMStream *ast, int len, AVPacket *pkt,
@@ -817,14 +831,14 @@
             switch (ast->deint_id) {
                 case DEINT_ID_INT4:
                     for (x = 0; x < h/2; x++)
-                        avio_read(pb, ast->pkt.data+x*2*w+y*cfs, cfs);
+                        readfull(s, pb, ast->pkt.data+x*2*w+y*cfs, cfs);
                     break;
                 case DEINT_ID_GENR:
                     for (x = 0; x < w/sps; x++)
-                        avio_read(pb, ast->pkt.data+sps*(h*x+((h+1)/2)*(y&1)+(y>>1)), sps);
+                        readfull(s, pb, ast->pkt.data+sps*(h*x+((h+1)/2)*(y&1)+(y>>1)), sps);
                     break;
                 case DEINT_ID_SIPR:
-                    avio_read(pb, ast->pkt.data + y * w, w);
+                    readfull(s, pb, ast->pkt.data + y * w, w);
                     break;
             }

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/rpl.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/rpl.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/rsd.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/rsd.c Changed

@@ -43,10 +43,13 @@
 
 static int rsd_probe(AVProbeData *p)
 {
-    if (!memcmp(p->buf, "RSD", 3) &&
-        p->buf[3] - '0' >= 2 && p->buf[3] - '0' <= 6)
-        return AVPROBE_SCORE_EXTENSION;
-    return 0;
+    if (memcmp(p->buf, "RSD", 3) || p->buf[3] - '0' < 2 || p->buf[3] - '0' > 6)
+        return 0;
+    if (AV_RL32(p->buf +  8) > 256 || !AV_RL32(p->buf +  8))
+        return AVPROBE_SCORE_MAX / 8;
+    if (AV_RL32(p->buf + 16) > 8*48000 || !AV_RL32(p->buf + 16))
+        return AVPROBE_SCORE_MAX / 8;
+    return AVPROBE_SCORE_MAX;
 }
 
 static int rsd_read_header(AVFormatContext *s)
@@ -101,13 +104,10 @@
         /* RSD3GADP is mono, so only alloc enough memory
            to store the coeff table for a single channel. */
 
-        if (ff_alloc_extradata(codec, 32))
-            return AVERROR(ENOMEM);
-
         start = avio_rl32(pb);
 
-        if (avio_read(s->pb, codec->extradata, 32) != 32)
-            return AVERROR_INVALIDDATA;
+        if (ff_get_extradata(codec, s->pb, 32) < 0)
+            return AVERROR(ENOMEM);
 
         for (i = 0; i < 16; i++)
             AV_WB16(codec->extradata + i * 2, AV_RL16(codec->extradata + i * 2));

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/rtmphttp.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/rtmphttp.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/rtmppkt.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/rtmppkt.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/rtmpproto.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/rtmpproto.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/rtpdec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/rtpdec.c Changed

@@ -32,6 +32,12 @@
 
 #define MIN_FEEDBACK_INTERVAL 200000 /* 200 ms in us */
 
+static RTPDynamicProtocolHandler gsm_dynamic_handler = {
+    .enc_name   = "GSM",
+    .codec_type = AVMEDIA_TYPE_AUDIO,
+    .codec_id   = AV_CODEC_ID_GSM,
+};
+
 static RTPDynamicProtocolHandler realmedia_mp3_dynamic_handler = {
     .enc_name   = "X-MP3-draft-00",
     .codec_type = AVMEDIA_TYPE_AUDIO,
@@ -58,7 +64,7 @@
     rtp_first_dynamic_payload_handler = handler;
 }
 
-void av_register_rtp_dynamic_payload_handlers(void)
+void ff_register_rtp_dynamic_payload_handlers(void)
 {
     ff_register_dynamic_payload_handler(&ff_amr_nb_dynamic_handler);
     ff_register_dynamic_payload_handler(&ff_amr_wb_dynamic_handler);
@@ -90,6 +96,7 @@
     ff_register_dynamic_payload_handler(&ff_theora_dynamic_handler);
     ff_register_dynamic_payload_handler(&ff_vorbis_dynamic_handler);
     ff_register_dynamic_payload_handler(&ff_vp8_dynamic_handler);
+    ff_register_dynamic_payload_handler(&gsm_dynamic_handler);
     ff_register_dynamic_payload_handler(&opus_dynamic_handler);
     ff_register_dynamic_payload_handler(&realmedia_mp3_dynamic_handler);
     ff_register_dynamic_payload_handler(&speex_dynamic_handler);

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/rtpdec.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/rtpdec.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/rtpdec_asf.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/rtpdec_asf.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/rtpdec_h264.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/rtpdec_h264.c Changed

@@ -190,7 +190,8 @@
     switch (type) {
     case 0:                    // undefined, but pass them through
     case 1:
-        av_new_packet(pkt, len + sizeof(start_sequence));
+        if ((result = av_new_packet(pkt, len + sizeof(start_sequence))) < 0)
+            return result;
         memcpy(pkt->data, start_sequence, sizeof(start_sequence));
         memcpy(pkt->data + sizeof(start_sequence), buf, len);
         COUNT_NAL_TYPE(data, nal);
@@ -247,7 +248,8 @@
                 if (pass == 0) {
                     /* now we know the total size of the packet (with the
                      * start sequences added) */
-                    av_new_packet(pkt, total_length);
+                    if ((result = av_new_packet(pkt, total_length)) < 0)
+                        return result;
                     dst = pkt->data;
                 } else {
                     assert(dst - pkt->data == total_length);
@@ -292,12 +294,14 @@
                 COUNT_NAL_TYPE(data, nal_type);
             if (start_bit) {
                 /* copy in the start sequence, and the reconstructed nal */
-                av_new_packet(pkt, sizeof(start_sequence) + sizeof(nal) + len);
+                if ((result = av_new_packet(pkt, sizeof(start_sequence) + sizeof(nal) + len)) < 0)
+                    return result;
                 memcpy(pkt->data, start_sequence, sizeof(start_sequence));
                 pkt->data[sizeof(start_sequence)] = reconstructed_nal;
                 memcpy(pkt->data + sizeof(start_sequence) + sizeof(nal), buf, len);
             } else {
-                av_new_packet(pkt, len);
+                if ((result = av_new_packet(pkt, len)) < 0)
+                    return result;
                 memcpy(pkt->data, buf, len);
             }
         } else {

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/rtpenc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/rtpenc.c Changed

@@ -262,7 +262,7 @@
 }
 
 /* send an rtcp sender report packet */
-static void rtcp_send_sr(AVFormatContext *s1, int64_t ntp_time)
+static void rtcp_send_sr(AVFormatContext *s1, int64_t ntp_time, int bye)
 {
     RTPMuxContext *s = s1->priv_data;
     uint32_t rtp_ts;
@@ -272,7 +272,7 @@
     s->last_rtcp_ntp_time = ntp_time;
     rtp_ts = av_rescale_q(ntp_time - s->first_rtcp_ntp_time, (AVRational){1, 1000000},
                           s1->streams[0]->time_base) + s->base_timestamp;
-    avio_w8(s1->pb, (RTP_VERSION << 6));
+    avio_w8(s1->pb, RTP_VERSION << 6);
     avio_w8(s1->pb, RTCP_SR);
     avio_wb16(s1->pb, 6); /* length in words - 1 */
     avio_wb32(s1->pb, s->ssrc);
@@ -296,6 +296,13 @@
             avio_w8(s1->pb, 0);
     }
 
+    if (bye) {
+        avio_w8(s1->pb, (RTP_VERSION << 6) | 1);
+        avio_w8(s1->pb, RTCP_BYE);
+        avio_wb16(s1->pb, 1); /* length in words - 1 */
+        avio_wb32(s1->pb, s->ssrc);
+    }
+
     avio_flush(s1->pb);
 }
 
@@ -308,7 +315,7 @@
     av_dlog(s1, "rtp_send_data size=%d\n", len);
 
     /* build the RTP header */
-    avio_w8(s1->pb, (RTP_VERSION << 6));
+    avio_w8(s1->pb, RTP_VERSION << 6);
     avio_w8(s1->pb, (s->payload_type & 0x7f) | ((m & 0x01) << 7));
     avio_wb16(s1->pb, s->seq);
     avio_wb32(s1->pb, s->timestamp);
@@ -494,7 +501,7 @@
     if ((s->first_packet || ((rtcp_bytes >= RTCP_SR_SIZE) &&
                             (ff_ntp_time() - s->last_rtcp_ntp_time > 5000000))) &&
         !(s->flags & FF_RTP_FLAG_SKIP_RTCP)) {
-        rtcp_send_sr(s1, ff_ntp_time());
+        rtcp_send_sr(s1, ff_ntp_time(), 0);
         s->last_octet_count = s->octet_count;
         s->first_packet = 0;
     }
@@ -550,6 +557,10 @@
             const uint8_t *mb_info =
                 av_packet_get_side_data(pkt, AV_PKT_DATA_H263_MB_INFO,
                                         &mb_info_size);
+            if (!mb_info) {
+                av_log(s1, AV_LOG_ERROR, "failed to allocate side data\n");
+                return AVERROR(ENOMEM);
+            }
             ff_rtp_send_h263_rfc2190(s1, pkt->data, size, mb_info, mb_info_size);
             break;
         }
@@ -590,6 +601,10 @@
 {
     RTPMuxContext *s = s1->priv_data;
 
+    /* If the caller closes and recreates ->pb, this might actually
+     * be NULL here even if it was successfully allocated at the start. */
+    if (s1->pb && (s->flags & FF_RTP_FLAG_SEND_BYE))
+        rtcp_send_sr(s1, ff_ntp_time(), 1);
     av_freep(&s->buf);
 
     return 0;

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/rtpenc.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/rtpenc.h Changed

@@ -68,13 +68,15 @@
 #define FF_RTP_FLAG_RFC2190   2
 #define FF_RTP_FLAG_SKIP_RTCP 4
 #define FF_RTP_FLAG_H264_MODE0 8
+#define FF_RTP_FLAG_SEND_BYE  16
 
 #define FF_RTP_FLAG_OPTS(ctx, fieldname) \
     { "rtpflags", "RTP muxer flags", offsetof(ctx, fieldname), AV_OPT_TYPE_FLAGS, {.i64 = 0}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "rtpflags" }, \
     { "latm", "Use MP4A-LATM packetization instead of MPEG4-GENERIC for AAC", 0, AV_OPT_TYPE_CONST, {.i64 = FF_RTP_FLAG_MP4A_LATM}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "rtpflags" }, \
     { "rfc2190", "Use RFC 2190 packetization instead of RFC 4629 for H.263", 0, AV_OPT_TYPE_CONST, {.i64 = FF_RTP_FLAG_RFC2190}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "rtpflags" }, \
     { "skip_rtcp", "Don't send RTCP sender reports", 0, AV_OPT_TYPE_CONST, {.i64 = FF_RTP_FLAG_SKIP_RTCP}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "rtpflags" }, \
-    { "h264_mode0", "Use mode 0 for H264 in RTP", 0, AV_OPT_TYPE_CONST, {.i64 = FF_RTP_FLAG_H264_MODE0}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "rtpflags" } \
+    { "h264_mode0", "Use mode 0 for H264 in RTP", 0, AV_OPT_TYPE_CONST, {.i64 = FF_RTP_FLAG_H264_MODE0}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "rtpflags" }, \
+    { "send_bye", "Send RTCP BYE packets when finishing", 0, AV_OPT_TYPE_CONST, {.i64 = FF_RTP_FLAG_SEND_BYE}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "rtpflags" } \
 
 void ff_rtp_send_data(AVFormatContext *s1, const uint8_t *buf1, int len, int m);

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/rtsp.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/rtsp.c Changed

@@ -65,7 +65,7 @@
 
 #define RTSP_FLAG_OPTS(name, longname) \
     { name, longname, OFFSET(rtsp_flags), AV_OPT_TYPE_FLAGS, {.i64 = 0}, INT_MIN, INT_MAX, DEC, "rtsp_flags" }, \
-    { "filter_src", "Only receive packets from the negotiated peer IP", 0, AV_OPT_TYPE_CONST, {.i64 = RTSP_FLAG_FILTER_SRC}, 0, 0, DEC, "rtsp_flags" }
+    { "filter_src", "only receive packets from the negotiated peer IP", 0, AV_OPT_TYPE_CONST, {.i64 = RTSP_FLAG_FILTER_SRC}, 0, 0, DEC, "rtsp_flags" }
 
 #define RTSP_MEDIATYPE_OPTS(name, longname) \
     { name, longname, OFFSET(media_type_mask), AV_OPT_TYPE_FLAGS, { .i64 = (1 << (AVMEDIA_TYPE_DATA+1)) - 1 }, INT_MIN, INT_MAX, DEC, "allowed_media_types" }, \
@@ -74,23 +74,23 @@
     { "data", "Data", 0, AV_OPT_TYPE_CONST, {.i64 = 1 << AVMEDIA_TYPE_DATA}, 0, 0, DEC, "allowed_media_types" }
 
 #define RTSP_REORDERING_OPTS() \
-    { "reorder_queue_size", "Number of packets to buffer for handling of reordered packets", OFFSET(reordering_queue_size), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, DEC }
+    { "reorder_queue_size", "set number of packets to buffer for handling of reordered packets", OFFSET(reordering_queue_size), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, DEC }
 
 const AVOption ff_rtsp_options[] = {
-    { "initial_pause",  "Don't start playing the stream immediately", OFFSET(initial_pause), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, DEC },
+    { "initial_pause",  "do not start playing the stream immediately", OFFSET(initial_pause), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, DEC },
     FF_RTP_FLAG_OPTS(RTSPState, rtp_muxer_flags),
-    { "rtsp_transport", "RTSP transport protocols", OFFSET(lower_transport_mask), AV_OPT_TYPE_FLAGS, {.i64 = 0}, INT_MIN, INT_MAX, DEC|ENC, "rtsp_transport" }, \
+    { "rtsp_transport", "set RTSP transport protocols", OFFSET(lower_transport_mask), AV_OPT_TYPE_FLAGS, {.i64 = 0}, INT_MIN, INT_MAX, DEC|ENC, "rtsp_transport" }, \
     { "udp", "UDP", 0, AV_OPT_TYPE_CONST, {.i64 = 1 << RTSP_LOWER_TRANSPORT_UDP}, 0, 0, DEC|ENC, "rtsp_transport" }, \
     { "tcp", "TCP", 0, AV_OPT_TYPE_CONST, {.i64 = 1 << RTSP_LOWER_TRANSPORT_TCP}, 0, 0, DEC|ENC, "rtsp_transport" }, \
     { "udp_multicast", "UDP multicast", 0, AV_OPT_TYPE_CONST, {.i64 = 1 << RTSP_LOWER_TRANSPORT_UDP_MULTICAST}, 0, 0, DEC, "rtsp_transport" },
     { "http", "HTTP tunneling", 0, AV_OPT_TYPE_CONST, {.i64 = (1 << RTSP_LOWER_TRANSPORT_HTTP)}, 0, 0, DEC, "rtsp_transport" },
-    RTSP_FLAG_OPTS("rtsp_flags", "RTSP flags"),
-    { "listen", "Wait for incoming connections", 0, AV_OPT_TYPE_CONST, {.i64 = RTSP_FLAG_LISTEN}, 0, 0, DEC, "rtsp_flags" },
-    RTSP_MEDIATYPE_OPTS("allowed_media_types", "Media types to accept from the server"),
-    { "min_port", "Minimum local UDP port", OFFSET(rtp_port_min), AV_OPT_TYPE_INT, {.i64 = RTSP_RTP_PORT_MIN}, 0, 65535, DEC|ENC },
-    { "max_port", "Maximum local UDP port", OFFSET(rtp_port_max), AV_OPT_TYPE_INT, {.i64 = RTSP_RTP_PORT_MAX}, 0, 65535, DEC|ENC },
-    { "timeout", "Maximum timeout (in seconds) to wait for incoming connections. -1 is infinite. Implies flag listen", OFFSET(initial_timeout), AV_OPT_TYPE_INT, {.i64 = -1}, INT_MIN, INT_MAX, DEC },
-    { "stimeout", "timeout (in micro seconds) of socket i/o operations.", OFFSET(stimeout), AV_OPT_TYPE_INT, {.i64 = 0}, INT_MIN, INT_MAX, DEC },
+    RTSP_FLAG_OPTS("rtsp_flags", "set RTSP flags"),
+    { "listen", "wait for incoming connections", 0, AV_OPT_TYPE_CONST, {.i64 = RTSP_FLAG_LISTEN}, 0, 0, DEC, "rtsp_flags" },
+    RTSP_MEDIATYPE_OPTS("allowed_media_types", "set media types to accept from the server"),
+    { "min_port", "set minimum local UDP port", OFFSET(rtp_port_min), AV_OPT_TYPE_INT, {.i64 = RTSP_RTP_PORT_MIN}, 0, 65535, DEC|ENC },
+    { "max_port", "set maximum local UDP port", OFFSET(rtp_port_max), AV_OPT_TYPE_INT, {.i64 = RTSP_RTP_PORT_MAX}, 0, 65535, DEC|ENC },
+    { "timeout", "set maximum timeout (in seconds) to wait for incoming connections (-1 is infinite, imply flag listen)", OFFSET(initial_timeout), AV_OPT_TYPE_INT, {.i64 = -1}, INT_MIN, INT_MAX, DEC },
+    { "stimeout", "set timeout (in micro seconds) of socket TCP I/O operations", OFFSET(stimeout), AV_OPT_TYPE_INT, {.i64 = 0}, INT_MIN, INT_MAX, DEC },
     RTSP_REORDERING_OPTS(),
     { "user-agent", "override User-Agent header", OFFSET(user_agent), AV_OPT_TYPE_STRING, {.str = LIBAVFORMAT_IDENT}, 0, 0, DEC },
     { NULL },
@@ -98,15 +98,15 @@
 
 static const AVOption sdp_options[] = {
     RTSP_FLAG_OPTS("sdp_flags", "SDP flags"),
-    { "custom_io", "Use custom IO", 0, AV_OPT_TYPE_CONST, {.i64 = RTSP_FLAG_CUSTOM_IO}, 0, 0, DEC, "rtsp_flags" },
-    { "rtcp_to_source", "Send RTCP packets to the source address of received packets", 0, AV_OPT_TYPE_CONST, {.i64 = RTSP_FLAG_RTCP_TO_SOURCE}, 0, 0, DEC, "rtsp_flags" },
-    RTSP_MEDIATYPE_OPTS("allowed_media_types", "Media types to accept from the server"),
+    { "custom_io", "use custom I/O", 0, AV_OPT_TYPE_CONST, {.i64 = RTSP_FLAG_CUSTOM_IO}, 0, 0, DEC, "rtsp_flags" },
+    { "rtcp_to_source", "send RTCP packets to the source address of received packets", 0, AV_OPT_TYPE_CONST, {.i64 = RTSP_FLAG_RTCP_TO_SOURCE}, 0, 0, DEC, "rtsp_flags" },
+    RTSP_MEDIATYPE_OPTS("allowed_media_types", "set media types to accept from the server"),
     RTSP_REORDERING_OPTS(),
     { NULL },
 };
 
 static const AVOption rtp_options[] = {
-    RTSP_FLAG_OPTS("rtp_flags", "RTP flags"),
+    RTSP_FLAG_OPTS("rtp_flags", "set RTP flags"),
     RTSP_REORDERING_OPTS(),
     { NULL },
 };
@@ -641,7 +641,7 @@
 }
 #endif /* CONFIG_RTPDEC */
 
-void ff_rtsp_undo_setup(AVFormatContext *s)
+void ff_rtsp_undo_setup(AVFormatContext *s, int send_packets)
 {
     RTSPState *rt = s->priv_data;
     int i;
@@ -656,6 +656,8 @@
                 av_write_trailer(rtpctx);
                 if (rt->lower_transport == RTSP_LOWER_TRANSPORT_TCP) {
                     uint8_t *ptr;
+                    if (CONFIG_RTSP_MUXER && rtpctx->pb && send_packets)
+                        ff_rtsp_tcp_write_packet(s, rtsp_st);
                     avio_close_dyn_buf(rtpctx->pb, &ptr);
                     av_free(ptr);
                 } else {
@@ -681,7 +683,7 @@
     int i, j;
     RTSPStream *rtsp_st;
 
-    ff_rtsp_undo_setup(s);
+    ff_rtsp_undo_setup(s, 0);
     for (i = 0; i < rt->nb_rtsp_streams; i++) {
         rtsp_st = rt->rtsp_streams[i];
         if (rtsp_st) {
@@ -727,8 +729,8 @@
         s->ctx_flags |= AVFMTCTX_NOHEADER;
 
     if (s->oformat && CONFIG_RTSP_MUXER) {
-        int ret = ff_rtp_chain_mux_open((AVFormatContext **)&rtsp_st->transport_priv, s, st,
-                                        rtsp_st->rtp_handle,
+        int ret = ff_rtp_chain_mux_open((AVFormatContext **)&rtsp_st->transport_priv,
+                                        s, st, rtsp_st->rtp_handle,
                                         RTSP_TCP_MAX_PACKET_SIZE,
                                         rtsp_st->stream_index);
         /* Ownership of rtp_handle is passed to the rtp mux context */
@@ -1547,7 +1549,7 @@
     return 0;
 
 fail:
-    ff_rtsp_undo_setup(s);
+    ff_rtsp_undo_setup(s, 0);
     return err;
 }

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/rtsp.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/rtsp.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/rtspdec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/rtspdec.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/rtspenc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/rtspenc.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/sdp.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/sdp.c Changed

@@ -402,7 +402,7 @@
     switch (c->codec_id) {
         case AV_CODEC_ID_H264: {
             int mode = 1;
-            if (fmt && fmt->oformat->priv_class &&
+            if (fmt && fmt->oformat && fmt->oformat->priv_class &&
                 av_opt_flag_is_set(fmt->priv_data, "rtpflags", "h264_mode0"))
                 mode = 0;
             if (c->extradata_size) {
@@ -513,13 +513,6 @@
             break;
         case AV_CODEC_ID_THEORA: {
             const char *pix_fmt;
-            if (c->extradata_size)
-                config = xiph_extradata2config(c);
-            else
-                av_log(c, AV_LOG_ERROR, "Theora configuation info missing\n");
-            if (!config)
-                return NULL;
-
             switch (c->pix_fmt) {
             case AV_PIX_FMT_YUV420P:
                 pix_fmt = "YCbCr-4:2:0";
@@ -535,6 +528,13 @@
                 return NULL;
             }
 
+            if (c->extradata_size)
+                config = xiph_extradata2config(c);
+            else
+                av_log(c, AV_LOG_ERROR, "Theora configuation info missing\n");
+            if (!config)
+                return NULL;
+
             av_strlcatf(buff, size, "a=rtpmap:%d theora/90000\r\n"
                                     "a=fmtp:%d delivery-method=inline; "
                                     "width=%d; height=%d; sampling=%s; "

omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/sdr2.c Added

@@ -0,0 +1,121 @@
+/*
+ * SDR2 demuxer
+ * Copyright (c) 2014 Paul B Mahol
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "libavutil/intreadwrite.h"
+#include "avformat.h"
+#include "internal.h"
+
+static int sdr2_probe(AVProbeData *p)
+{
+    if (AV_RL32(p->buf) != MKTAG('S', 'R', 'A', 1))
+        return 0;
+
+    return AVPROBE_SCORE_EXTENSION;
+}
+
+#define FIRST 0xA8
+
+static int sdr2_read_header(AVFormatContext *s)
+{
+    AVStream *st, *ast;
+
+    ast = avformat_new_stream(s, 0);
+    if (!ast)
+        return AVERROR(ENOMEM);
+
+    st = avformat_new_stream(s, 0);
+    if (!st)
+        return AVERROR(ENOMEM);
+
+    avio_skip(s->pb, 20);
+    avpriv_set_pts_info(st, 64, 1, avio_rl32(s->pb));
+    st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
+    st->codec->width      = avio_rl32(s->pb);
+    st->codec->height     = avio_rl32(s->pb);
+    st->codec->codec_id   = AV_CODEC_ID_H264;
+    st->need_parsing      = AVSTREAM_PARSE_FULL;
+
+    ast->codec->codec_type  = AVMEDIA_TYPE_AUDIO;
+    ast->codec->channels    = 1;
+    ast->codec->sample_rate = 8000;
+    ast->codec->codec_id    = AV_CODEC_ID_PCM_S16LE;
+    avpriv_set_pts_info(ast, 64, 1, 8000);
+
+    avio_seek(s->pb, FIRST, SEEK_SET);
+
+    return 0;
+}
+
+static const uint8_t header[24] = {
+    0x00, 0x00, 0x00, 0x01, 0x67, 0x42, 0x00, 0x1e,
+    0xa6, 0x80, 0xb0, 0x7e, 0x40, 0x00, 0x00, 0x00,
+    0x01, 0x68, 0xce, 0x38, 0x80, 0x00, 0x00, 0x00
+};
+
+static int sdr2_read_packet(AVFormatContext *s, AVPacket *pkt)
+{
+    int64_t pos;
+    unsigned next;
+    int flags, ret = 0, is_video;
+
+    pos = avio_tell(s->pb);
+
+    flags = avio_rl32(s->pb);
+    avio_skip(s->pb, 4);
+
+    next = avio_rl32(s->pb);
+    if (next <= 52)
+        return AVERROR_INVALIDDATA;
+
+    avio_skip(s->pb, 6);
+    is_video = avio_rl32(s->pb);
+    avio_skip(s->pb, 30);
+
+    if (pos == FIRST) {
+        if (av_new_packet(pkt, next - 52 + 24) < 0)
+            return AVERROR(ENOMEM);
+        memcpy(pkt->data, header, 24);
+        ret = avio_read(s->pb, pkt->data + 24, next - 52);
+        if (ret < 0) {
+            av_free_packet(pkt);
+            return ret;
+        }
+        av_shrink_packet(pkt, ret + 24);
+    } else {
+        ret = av_get_packet(s->pb, pkt, next - 52);
+    }
+    pkt->stream_index = !!is_video;
+    pkt->pos = pos;
+    if (flags & (1 << 12))
+        pkt->flags |= AV_PKT_FLAG_KEY;
+
+    return ret;
+}
+
+AVInputFormat ff_sdr2_demuxer = {
+    .name        = "sdr2",
+    .long_name   = NULL_IF_CONFIG_SMALL("SDR2"),
+    .read_probe  = sdr2_probe,
+    .read_header = sdr2_read_header,
+    .read_packet = sdr2_read_packet,
+    .extensions  = "sdr2",
+    .flags       = AVFMT_GENERIC_INDEX,
+};

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/seek.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/seek.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/seek.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/seek.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/segafilm.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/segafilm.c Changed

@@ -69,16 +69,28 @@
     if (AV_RB32(&p->buf[0]) != FILM_TAG)
         return 0;
 
+    if (AV_RB32(&p->buf[16]) != FDSC_TAG)
+        return 0;
+
     return AVPROBE_SCORE_MAX;
 }
 
+static int film_read_close(AVFormatContext *s)
+{
+    FilmDemuxContext *film = s->priv_data;
+
+    av_freep(&film->sample_table);
+
+    return 0;
+}
+
 static int film_read_header(AVFormatContext *s)
 {
     FilmDemuxContext *film = s->priv_data;
     AVIOContext *pb = s->pb;
     AVStream *st;
     unsigned char scratch[256];
-    int i;
+    int i, ret;
     unsigned int data_offset;
     unsigned int audio_frame_counter;
 
@@ -203,14 +215,16 @@
     for (i = 0; i < film->sample_count; i++) {
         /* load the next sample record and transfer it to an internal struct */
         if (avio_read(pb, scratch, 16) != 16) {
-            av_freep(&film->sample_table);
-            return AVERROR(EIO);
+            ret = AVERROR(EIO);
+            goto fail;
         }
         film->sample_table[i].sample_offset =
             data_offset + AV_RB32(&scratch[0]);
         film->sample_table[i].sample_size = AV_RB32(&scratch[4]);
-        if (film->sample_table[i].sample_size > INT_MAX / 4)
-            return AVERROR_INVALIDDATA;
+        if (film->sample_table[i].sample_size > INT_MAX / 4) {
+            ret = AVERROR_INVALIDDATA;
+            goto fail;
+        }
         if (AV_RB32(&scratch[8]) == 0xFFFFFFFF) {
             film->sample_table[i].stream = film->audio_stream_index;
             film->sample_table[i].pts = audio_frame_counter;
@@ -231,6 +245,9 @@
     film->current_sample = 0;
 
     return 0;
+fail:
+    film_read_close(s);
+    return ret;
 }
 
 static int film_read_packet(AVFormatContext *s,
@@ -249,18 +266,10 @@
     /* position the stream (will probably be there anyway) */
     avio_seek(pb, sample->sample_offset, SEEK_SET);
 
-    /* do a special song and dance when loading FILM Cinepak chunks */
-    if ((sample->stream == film->video_stream_index) &&
-        (film->video_type == AV_CODEC_ID_CINEPAK)) {
-        pkt->pos= avio_tell(pb);
-        if (av_new_packet(pkt, sample->sample_size))
-            return AVERROR(ENOMEM);
-        avio_read(pb, pkt->data, sample->sample_size);
-    } else {
-        ret= av_get_packet(pb, pkt, sample->sample_size);
-        if (ret != sample->sample_size)
-            ret = AVERROR(EIO);
-    }
+
+    ret= av_get_packet(pb, pkt, sample->sample_size);
+    if (ret != sample->sample_size)
+        ret = AVERROR(EIO);
 
     pkt->stream_index = sample->stream;
     pkt->pts = sample->pts;
@@ -270,15 +279,6 @@
     return ret;
 }
 
-static int film_read_close(AVFormatContext *s)
-{
-    FilmDemuxContext *film = s->priv_data;
-
-    av_freep(&film->sample_table);
-
-    return 0;
-}
-
 AVInputFormat ff_segafilm_demuxer = {
     .name           = "film_cpk",
     .long_name      = NULL_IF_CONFIG_SMALL("Sega FILM / CPK"),

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/segment.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/segment.c Changed

@@ -44,7 +44,7 @@
     double start_time, end_time;
     int64_t start_pts;
     int64_t offset_pts;
-    char filename[1024];
+    char *filename;
     struct SegmentListEntry *next;
 } SegmentListEntry;
 
@@ -72,6 +72,7 @@
     char *list;            ///< filename for the segment list file
     int   list_flags;      ///< flags affecting list generation
     int   list_size;       ///< number of entries for the segment list file
+    char *list_entry_prefix; ///< prefix to add to list entry filenames
     ListType list_type;    ///< set the list type
     AVIOContext *list_pb;  ///< list file put-byte context
     char *time_str;        ///< segment duration specification string
@@ -158,6 +159,7 @@
 {
     SegmentContext *seg = s->priv_data;
     AVFormatContext *oc = seg->avf;
+    size_t size;
 
     if (seg->segment_idx_wrap)
         seg->segment_idx %= seg->segment_idx_wrap;
@@ -166,7 +168,19 @@
         av_log(oc, AV_LOG_ERROR, "Invalid segment filename template '%s'\n", s->filename);
         return AVERROR(EINVAL);
     }
-    av_strlcpy(seg->cur_entry.filename, oc->filename, sizeof(seg->cur_entry.filename));
+
+    /* copy modified name in list entry */
+    size = strlen(av_basename(oc->filename)) + 1;
+    if (seg->list_entry_prefix)
+        size += strlen(seg->list_entry_prefix);
+
+    seg->cur_entry.filename = av_mallocz(size);
+    if (!seg->cur_entry.filename)
+        return AVERROR(ENOMEM);
+    snprintf(seg->cur_entry.filename, size, "%s%s",
+             seg->list_entry_prefix ? seg->list_entry_prefix : "",
+             av_basename(oc->filename));
+
     return 0;
 }
 
@@ -189,8 +203,10 @@
         return err;
 
     if ((err = avio_open2(&oc->pb, oc->filename, AVIO_FLAG_WRITE,
-                          &s->interrupt_callback, NULL)) < 0)
+                          &s->interrupt_callback, NULL)) < 0) {
+        av_log(s, AV_LOG_ERROR, "Failed to open segment '%s'\n", oc->filename);
         return err;
+    }
 
     if (oc->oformat->priv_class && oc->priv_data)
         av_opt_set(oc->priv_data, "resend_headers", "1", 0); /* mpegts specific */
@@ -211,8 +227,10 @@
 
     ret = avio_open2(&seg->list_pb, seg->list, AVIO_FLAG_WRITE,
                      &s->interrupt_callback, NULL);
-    if (ret < 0)
+    if (ret < 0) {
+        av_log(s, AV_LOG_ERROR, "Failed to open segment list '%s'\n", seg->list);
         return ret;
+    }
 
     if (seg->list_type == LIST_TYPE_M3U8 && seg->segment_list_entries) {
         SegmentListEntry *entry;
@@ -303,6 +321,7 @@
             if (seg->list_size && seg->segment_count > seg->list_size) {
                 entry = seg->segment_list_entries;
                 seg->segment_list_entries = seg->segment_list_entries->next;
+                av_free(entry->filename);
                 av_freep(&entry);
             }
 
@@ -600,8 +619,10 @@
 
     if (seg->write_header_trailer) {
         if ((ret = avio_open2(&oc->pb, oc->filename, AVIO_FLAG_WRITE,
-                              &s->interrupt_callback, NULL)) < 0)
+                              &s->interrupt_callback, NULL)) < 0) {
+            av_log(s, AV_LOG_ERROR, "Failed to open segment '%s'\n", oc->filename);
             goto fail;
+        }
     } else {
         if ((ret = open_null_ctx(&oc->pb)) < 0)
             goto fail;
@@ -636,7 +657,6 @@
 static int seg_write_packet(AVFormatContext *s, AVPacket *pkt)
 {
     SegmentContext *seg = s->priv_data;
-    AVFormatContext *oc = seg->avf;
     AVStream *st = s->streams[pkt->stream_index];
     int64_t end_pts = INT64_MAX, offset;
     int start_frame = INT_MAX;
@@ -669,8 +689,6 @@
         if ((ret = segment_start(s, seg->individual_header_trailer)) < 0)
             goto fail;
 
-        oc = seg->avf;
-
         seg->cur_entry.index = seg->segment_idx;
         seg->cur_entry.start_time = (double)pkt->pts * av_q2d(st->time_base);
         seg->cur_entry.start_pts = av_rescale_q(pkt->pts, st->time_base, AV_TIME_BASE_Q);
@@ -680,7 +698,7 @@
     }
 
     if (seg->is_first_pkt) {
-        av_log(s, AV_LOG_DEBUG, "segment:'%s' starts with packet stream:%d pts:%s pts_time:%s frame:%d\n",
+        av_log(s, AV_LOG_VERBOSE, "segment:'%s' starts with packet stream:%d pts:%s pts_time:%s frame:%d\n",
                seg->avf->filename, pkt->stream_index,
                av_ts2str(pkt->pts), av_ts2timestr(pkt->pts, &st->time_base), seg->frame_count);
         seg->is_first_pkt = 0;
@@ -704,18 +722,12 @@
            av_ts2str(pkt->pts), av_ts2timestr(pkt->pts, &st->time_base),
            av_ts2str(pkt->dts), av_ts2timestr(pkt->dts, &st->time_base));
 
-    ret = ff_write_chained(oc, pkt->stream_index, pkt, s);
+    ret = ff_write_chained(seg->avf, pkt->stream_index, pkt, s);
 
 fail:
     if (pkt->stream_index == seg->reference_stream_index)
         seg->frame_count++;
 
-    if (ret < 0) {
-        if (seg->list)
-            avio_close(seg->list_pb);
-        avformat_free_context(oc);
-    }
-
     return ret;
 }
 
@@ -746,6 +758,7 @@
     cur = seg->segment_list_entries;
     while (cur) {
         next = cur->next;
+        av_free(cur->filename);
         av_free(cur);
         cur = next;
     }
@@ -766,6 +779,7 @@
     { "live",              "enable live-friendly list generation (useful for HLS)", 0, AV_OPT_TYPE_CONST, {.i64 = SEGMENT_LIST_FLAG_LIVE }, INT_MIN, INT_MAX,    E, "list_flags"},
 
     { "segment_list_size", "set the maximum number of playlist entries", OFFSET(list_size), AV_OPT_TYPE_INT,  {.i64 = 0},     0, INT_MAX, E },
+    { "segment_list_entry_prefix", "set prefix to prepend to each list entry filename", OFFSET(list_entry_prefix), AV_OPT_TYPE_STRING,  {.str = NULL}, 0, 0, E },
 
     { "segment_list_type", "set the segment list type",                  OFFSET(list_type), AV_OPT_TYPE_INT,  {.i64 = LIST_TYPE_UNDEFINED}, -1, LIST_TYPE_NB-1, E, "list_type" },
     { "flat", "flat format",     0, AV_OPT_TYPE_CONST, {.i64=LIST_TYPE_FLAT }, INT_MIN, INT_MAX, E, "list_type" },

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/sierravmd.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/sierravmd.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/siff.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/siff.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/smacker.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/smacker.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/spdifdec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/spdifdec.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/swfdec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/swfdec.c Changed

@@ -55,12 +55,18 @@
 
 static int swf_probe(AVProbeData *p)
 {
+    if(p->buf_size < 15)
+        return 0;
+
     /* check file header */
-    if ((p->buf[0] == 'F' || p->buf[0] == 'C') && p->buf[1] == 'W' &&
-        p->buf[2] == 'S')
-        return AVPROBE_SCORE_MAX;
-    else
+    if (   AV_RB24(p->buf) != AV_RB24("CWS")
+        && AV_RB24(p->buf) != AV_RB24("FWS"))
         return 0;
+
+    if (p->buf[3] >= 20)
+        return AVPROBE_SCORE_MAX / 4;
+
+    return AVPROBE_SCORE_MAX;
 }
 
 #if CONFIG_ZLIB
@@ -440,16 +446,30 @@
                 goto skip;
             if ((res = av_new_packet(pkt, len)) < 0)
                 return res;
-            avio_read(pb, pkt->data, 4);
+            if (avio_read(pb, pkt->data, 4) != 4) {
+                av_free_packet(pkt);
+                return AVERROR_INVALIDDATA;
+            }
             if (AV_RB32(pkt->data) == 0xffd8ffd9 ||
                 AV_RB32(pkt->data) == 0xffd9ffd8) {
                 /* old SWF files containing SOI/EOI as data start */
                 /* files created by swink have reversed tag */
                 pkt->size -= 4;
-                avio_read(pb, pkt->data, pkt->size);
+                memset(pkt->data+pkt->size, 0, 4);
+                res = avio_read(pb, pkt->data, pkt->size);
             } else {
-                avio_read(pb, pkt->data + 4, pkt->size - 4);
+                res = avio_read(pb, pkt->data + 4, pkt->size - 4);
+                if (res >= 0)
+                    res += 4;
+            }
+            if (res != pkt->size) {
+                if (res < 0) {
+                    av_free_packet(pkt);
+                    return res;
+                }
+                av_shrink_packet(pkt, res);
             }
+
             pkt->pos = pos;
             pkt->stream_index = st->index;
             return pkt->size;

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/takdec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/takdec.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/tcp.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/tcp.c Changed

@@ -44,8 +44,8 @@
 #define E AV_OPT_FLAG_ENCODING_PARAM
 static const AVOption options[] = {
 {"listen", "listen on port instead of connecting", OFFSET(listen), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, D|E },
-{"timeout", "timeout of socket i/o operations", OFFSET(rw_timeout), AV_OPT_TYPE_INT, {.i64 = -1}, -1, INT_MAX, D|E },
-{"listen_timeout", "connection awaiting timeout", OFFSET(listen_timeout), AV_OPT_TYPE_INT, {.i64 = -1}, -1, INT_MAX, D|E },
+{"timeout", "set timeout of socket I/O operations", OFFSET(rw_timeout), AV_OPT_TYPE_INT, {.i64 = -1}, -1, INT_MAX, D|E },
+{"listen_timeout", "set connection awaiting timeout", OFFSET(listen_timeout), AV_OPT_TYPE_INT, {.i64 = -1}, -1, INT_MAX, D|E },
 {NULL}
 };
 
@@ -79,8 +79,13 @@
     }
     p = strchr(uri, '?');
     if (p) {
-        if (av_find_info_tag(buf, sizeof(buf), "listen", p))
-            s->listen = 1;
+        if (av_find_info_tag(buf, sizeof(buf), "listen", p)) {
+            char *endptr = NULL;
+            s->listen = strtol(buf, &endptr, 10);
+            /* assume if no digits were found it is a request to enable it */
+            if (buf == endptr)
+                s->listen = 1;
+        }
         if (av_find_info_tag(buf, sizeof(buf), "timeout", p)) {
             s->rw_timeout = strtol(buf, NULL, 10);
         }

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/thp.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/thp.c Changed

@@ -26,15 +26,15 @@
 
 typedef struct ThpDemuxContext {
     int              version;
-    int              first_frame;
-    int              first_framesz;
-    int              last_frame;
+    unsigned         first_frame;
+    unsigned         first_framesz;
+    unsigned         last_frame;
     int              compoff;
-    int              framecnt;
+    unsigned         framecnt;
     AVRational       fps;
-    int              frame;
-    int              next_frame;
-    int              next_framesz;
+    unsigned         frame;
+    int64_t          next_frame;
+    unsigned         next_framesz;
     int              video_stream_index;
     int              audio_stream_index;
     int              compcount;
@@ -47,11 +47,16 @@
 
 static int thp_probe(AVProbeData *p)
 {
+    double d;
     /* check file header */
-    if (AV_RL32(p->buf) == MKTAG('T', 'H', 'P', '\0'))
-        return AVPROBE_SCORE_MAX;
-    else
+    if (AV_RL32(p->buf) != MKTAG('T', 'H', 'P', '\0'))
         return 0;
+
+    d = av_int2float(AV_RB32(p->buf + 16));
+    if (d < 0.1 || d > 1000 || isnan(d))
+        return AVPROBE_SCORE_MAX/4;
+
+    return AVPROBE_SCORE_MAX;
 }
 
 static int thp_read_header(AVFormatContext *s)
@@ -109,7 +114,6 @@
             st->codec->codec_tag = 0;  /* no fourcc */
             st->codec->width = avio_rb32(pb);
             st->codec->height = avio_rb32(pb);
-            st->codec->sample_rate = av_q2d(thp->fps);
             st->nb_frames =
             st->duration = thp->framecnt;
             thp->vst = st;
@@ -158,7 +162,7 @@
         avio_seek(pb, thp->next_frame, SEEK_SET);
 
         /* Locate the next frame and read out its size.  */
-        thp->next_frame += thp->next_framesz;
+        thp->next_frame += FFMAX(thp->next_framesz, 1);
         thp->next_framesz = avio_rb32(pb);
 
                         avio_rb32(pb); /* Previous total size.  */

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/tls.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/tls.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/udp.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/udp.c Changed

@@ -84,23 +84,24 @@
     char *local_addr;
     int packet_size;
     int timeout;
+    struct sockaddr_storage local_addr_storage;
 } UDPContext;
 
 #define OFFSET(x) offsetof(UDPContext, x)
 #define D AV_OPT_FLAG_DECODING_PARAM
 #define E AV_OPT_FLAG_ENCODING_PARAM
 static const AVOption options[] = {
-{"buffer_size", "Socket buffer size in bytes", OFFSET(buffer_size), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX, D|E },
-{"localport", "Set local port to bind to", OFFSET(local_port), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX, D|E },
-{"localaddr", "Choose local IP address", OFFSET(local_addr), AV_OPT_TYPE_STRING, {.str = ""}, 0, 0, D|E },
-{"pkt_size", "Set size of UDP packets", OFFSET(packet_size), AV_OPT_TYPE_INT, {.i64 = 1472}, 0, INT_MAX, D|E },
-{"reuse", "Explicitly allow or disallow reusing UDP sockets", OFFSET(reuse_socket), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, D|E },
-{"ttl", "Set the time to live value (for multicast only)", OFFSET(ttl), AV_OPT_TYPE_INT, {.i64 = 16}, 0, INT_MAX, E },
-{"connect", "Should connect() be called on socket", OFFSET(is_connected), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, D|E },
+{"buffer_size", "set packet buffer size in bytes", OFFSET(buffer_size), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX, D|E },
+{"localport", "set local port to bind to", OFFSET(local_port), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX, D|E },
+{"localaddr", "choose local IP address", OFFSET(local_addr), AV_OPT_TYPE_STRING, {.str = ""}, 0, 0, D|E },
+{"pkt_size", "set size of UDP packets", OFFSET(packet_size), AV_OPT_TYPE_INT, {.i64 = 1472}, 0, INT_MAX, D|E },
+{"reuse", "explicitly allow or disallow reusing UDP sockets", OFFSET(reuse_socket), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, D|E },
+{"ttl", "set the time to live value (for multicast only)", OFFSET(ttl), AV_OPT_TYPE_INT, {.i64 = 16}, 0, INT_MAX, E },
+{"connect", "set if connect() should be called on socket", OFFSET(is_connected), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, D|E },
 /* TODO 'sources', 'block' option */
-{"fifo_size", "Set the UDP receiving circular buffer size, expressed as a number of packets with size of 188 bytes", OFFSET(circular_buffer_size), AV_OPT_TYPE_INT, {.i64 = 7*4096}, 0, INT_MAX, D },
-{"overrun_nonfatal", "Survive in case of UDP receiving circular buffer overrun", OFFSET(overrun_nonfatal), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, D },
-{"timeout", "In read mode: if no data arrived in more than this time interval, raise error", OFFSET(timeout), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX, D },
+{"fifo_size", "set the UDP receiving circular buffer size, expressed as a number of packets with size of 188 bytes", OFFSET(circular_buffer_size), AV_OPT_TYPE_INT, {.i64 = 7*4096}, 0, INT_MAX, D },
+{"overrun_nonfatal", "survive in case of UDP receiving circular buffer overrun", OFFSET(overrun_nonfatal), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, D },
+{"timeout", "set raise error timeout (only in read mode)", OFFSET(timeout), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX, D },
 {NULL}
 };
 
@@ -140,14 +141,17 @@
     return 0;
 }
 
-static int udp_join_multicast_group(int sockfd, struct sockaddr *addr)
+static int udp_join_multicast_group(int sockfd, struct sockaddr *addr,struct sockaddr *local_addr)
 {
 #ifdef IP_ADD_MEMBERSHIP
     if (addr->sa_family == AF_INET) {
         struct ip_mreq mreq;
 
         mreq.imr_multiaddr.s_addr = ((struct sockaddr_in *)addr)->sin_addr.s_addr;
-        mreq.imr_interface.s_addr= INADDR_ANY;
+        if (local_addr)
+            mreq.imr_interface= ((struct sockaddr_in *)local_addr)->sin_addr;
+        else
+            mreq.imr_interface.s_addr= INADDR_ANY;
         if (setsockopt(sockfd, IPPROTO_IP, IP_ADD_MEMBERSHIP, (const void *)&mreq, sizeof(mreq)) < 0) {
             log_net_error(NULL, AV_LOG_ERROR, "setsockopt(IP_ADD_MEMBERSHIP)");
             return -1;
@@ -169,14 +173,17 @@
     return 0;
 }
 
-static int udp_leave_multicast_group(int sockfd, struct sockaddr *addr)
+static int udp_leave_multicast_group(int sockfd, struct sockaddr *addr,struct sockaddr *local_addr)
 {
 #ifdef IP_DROP_MEMBERSHIP
     if (addr->sa_family == AF_INET) {
         struct ip_mreq mreq;
 
         mreq.imr_multiaddr.s_addr = ((struct sockaddr_in *)addr)->sin_addr.s_addr;
-        mreq.imr_interface.s_addr= INADDR_ANY;
+        if (local_addr)
+            mreq.imr_interface= ((struct sockaddr_in *)local_addr)->sin_addr;
+        else
+            mreq.imr_interface.s_addr= INADDR_ANY;
         if (setsockopt(sockfd, IPPROTO_IP, IP_DROP_MEMBERSHIP, (const void *)&mreq, sizeof(mreq)) < 0) {
             log_net_error(NULL, AV_LOG_ERROR, "setsockopt(IP_DROP_MEMBERSHIP)");
             return -1;
@@ -624,6 +631,8 @@
     if (udp_fd < 0)
         goto fail;
 
+    s->local_addr_storage=my_addr; //store for future multicast join
+
     /* Follow the requested reuse option, unless it's multicast in which
      * case enable reuse unless explicitly disabled.
      */
@@ -668,7 +677,7 @@
                 if (udp_set_multicast_sources(udp_fd, (struct sockaddr *)&s->dest_addr, s->dest_addr_len, include_sources, num_include_sources, 1) < 0)
                     goto fail;
             } else {
-                if (udp_join_multicast_group(udp_fd, (struct sockaddr *)&s->dest_addr) < 0)
+                if (udp_join_multicast_group(udp_fd, (struct sockaddr *)&s->dest_addr,(struct sockaddr *)&s->local_addr_storage) < 0)
                     goto fail;
             }
             if (num_exclude_sources) {
@@ -692,6 +701,12 @@
         if (setsockopt(udp_fd, SOL_SOCKET, SO_RCVBUF, &tmp, sizeof(tmp)) < 0) {
             log_net_error(h, AV_LOG_WARNING, "setsockopt(SO_RECVBUF)");
         }
+        len = sizeof(tmp);
+        if (getsockopt(udp_fd, SOL_SOCKET, SO_RCVBUF, &tmp, &len) < 0) {
+            log_net_error(h, AV_LOG_WARNING, "getsockopt(SO_RCVBUF)");
+        } else
+            av_log(h, AV_LOG_DEBUG, "end receive buffer size reported is %d\n", tmp);
+
         /* make the socket non-blocking */
         ff_socket_nonblock(udp_fd, 1);
     }
@@ -838,7 +853,7 @@
     int ret;
 
     if (s->is_multicast && (h->flags & AVIO_FLAG_READ))
-        udp_leave_multicast_group(s->udp_fd, (struct sockaddr *)&s->dest_addr);
+        udp_leave_multicast_group(s->udp_fd, (struct sockaddr *)&s->dest_addr,(struct sockaddr *)&s->local_addr_storage);
     closesocket(s->udp_fd);
 #if HAVE_PTHREAD_CANCEL
     if (s->thread_started) {

omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/uncodedframecrcenc.c Added

@@ -0,0 +1,172 @@
+/*
+* Copyright (c) 2013 Nicolas George
+*
+* This file is part of FFmpeg.
+*
+* FFmpeg is free software; you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public License
+* as published by the Free Software Foundation; either
+* version 2.1 of the License, or (at your option) any later version.
+*
+* FFmpeg is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public License
+* along with FFmpeg; if not, write to the Free Software Foundation, Inc.,
+* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+*/
+
+#include "libavutil/adler32.h"
+#include "libavutil/avassert.h"
+#include "libavutil/bprint.h"
+#include "libavutil/imgutils.h"
+#include "libavutil/pixdesc.h"
+#include "avformat.h"
+#include "internal.h"
+
+/* Identical to Adler32 when the type is uint8_t. */
+#define DEFINE_CKSUM_LINE(name, type, conv) \
+static void cksum_line_ ## name(unsigned *cksum, void *data, unsigned size) \
+{ \
+    type *p = data; \
+    unsigned a = *cksum & 0xFFFF, b = *cksum >> 16; \
+    for (; size > 0; size--, p++) { \
+        a = (a + (unsigned)(conv)) % 65521; \
+        b = (b + a) % 65521; \
+    } \
+    *cksum = a | (b << 16); \
+}
+
+DEFINE_CKSUM_LINE(u8,  uint8_t, *p)
+DEFINE_CKSUM_LINE(s16, int16_t, *p + 0x8000)
+DEFINE_CKSUM_LINE(s32, int32_t, *p + 0x80000000)
+DEFINE_CKSUM_LINE(flt, float,   *p * 0x80000000 + 0x80000000)
+DEFINE_CKSUM_LINE(dbl, double,  *p * 0x80000000 + 0x80000000)
+
+static void video_frame_cksum(AVBPrint *bp, AVFrame *frame)
+{
+    const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(frame->format);
+    int i, y;
+    uint8_t *data;
+    int linesize[5] = { 0 };
+
+    av_bprintf(bp, ", %d x %d", frame->width, frame->height);
+    if (!desc) {
+        av_bprintf(bp, ", unknown");
+        return;
+    }
+    if (av_image_fill_linesizes(linesize, frame->format, frame->width) < 0)
+        return;
+    av_bprintf(bp, ", %s", desc->name);
+    for (i = 0; linesize[i]; i++) {
+        unsigned cksum = 0;
+        int h = frame->height;
+        if ((i == 1 || i == 2) && desc->nb_components >= 3)
+            h = -((-h) >> desc->log2_chroma_h);
+        data = frame->data[i];
+        for (y = 0; y < h; y++) {
+            cksum = av_adler32_update(cksum, data, linesize[i]);
+            data += frame->linesize[i];
+        }
+        av_bprintf(bp, ", 0x%08x", cksum);
+    }
+}
+
+static void audio_frame_cksum(AVBPrint *bp, AVFrame *frame)
+{
+    int nb_planes, nb_samples, p;
+    const char *name;
+
+    nb_planes  = av_frame_get_channels(frame);
+    nb_samples = frame->nb_samples;
+    if (!av_sample_fmt_is_planar(frame->format)) {
+        nb_samples *= nb_planes;
+        nb_planes = 1;
+    }
+    name = av_get_sample_fmt_name(frame->format);
+    av_bprintf(bp, ", %d samples", frame->nb_samples);
+    av_bprintf(bp, ", %s", name ? name : "unknown");
+    for (p = 0; p < nb_planes; p++) {
+        uint32_t cksum = 0;
+        void *d = frame->extended_data[p];
+        switch (frame->format) {
+        case AV_SAMPLE_FMT_U8:
+        case AV_SAMPLE_FMT_U8P:
+            cksum_line_u8(&cksum, d, nb_samples);
+            break;
+        case AV_SAMPLE_FMT_S16:
+        case AV_SAMPLE_FMT_S16P:
+            cksum_line_s16(&cksum, d, nb_samples);
+            break;
+        case AV_SAMPLE_FMT_S32:
+        case AV_SAMPLE_FMT_S32P:
+            cksum_line_s32(&cksum, d, nb_samples);
+            break;
+        case AV_SAMPLE_FMT_FLT:
+        case AV_SAMPLE_FMT_FLTP:
+            cksum_line_flt(&cksum, d, nb_samples);
+            break;
+        case AV_SAMPLE_FMT_DBL:
+        case AV_SAMPLE_FMT_DBLP:
+            cksum_line_dbl(&cksum, d, nb_samples);
+            break;
+        default:
+            av_assert0(!"reached");
+        }
+        av_bprintf(bp, ", 0x%08x", cksum);
+    }
+}
+
+static int write_frame(struct AVFormatContext *s, int stream_index,
+                       AVFrame **frame, unsigned flags)
+{
+    AVBPrint bp;
+    int ret = 0;
+    enum AVMediaType type;
+    const char *type_name;
+
+    if ((flags & AV_WRITE_UNCODED_FRAME_QUERY))
+        return 0;
+
+    av_bprint_init(&bp, 0, AV_BPRINT_SIZE_UNLIMITED);
+    av_bprintf(&bp, "%d, %10"PRId64"",
+               stream_index, (*frame)->pts);
+    type = s->streams[stream_index]->codec->codec_type;
+    type_name = av_get_media_type_string(type);
+    av_bprintf(&bp, ", %s", type_name ? type_name : "unknown");
+    switch (type) {
+        case AVMEDIA_TYPE_VIDEO:
+            video_frame_cksum(&bp, *frame);
+            break;
+        case AVMEDIA_TYPE_AUDIO:
+            audio_frame_cksum(&bp, *frame);
+            break;
+    }
+
+    av_bprint_chars(&bp, '\n', 1);
+    if (av_bprint_is_complete(&bp))
+        avio_write(s->pb, bp.str, bp.len);
+    else
+        ret = AVERROR(ENOMEM);
+    av_bprint_finalize(&bp, NULL);
+    return ret;
+}
+
+static int write_packet(struct AVFormatContext *s, AVPacket *pkt)
+{
+    return AVERROR(ENOSYS);
+}
+
+AVOutputFormat ff_uncodedframecrc_muxer = {
+    .name              = "uncodedframecrc",
+    .long_name         = NULL_IF_CONFIG_SMALL("uncoded framecrc testing"),
+    .audio_codec       = AV_CODEC_ID_PCM_S16LE,
+    .video_codec       = AV_CODEC_ID_RAWVIDEO,
+    .write_header      = ff_framehash_write_header,
+    .write_packet      = write_packet,
+    .write_uncoded_frame = write_frame,
+    .flags             = AVFMT_VARIABLE_FPS | AVFMT_TS_NONSTRICT |
+                         AVFMT_TS_NEGATIVE,
+};

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/url.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/url.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/utils.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/utils.c Changed

@@ -19,34 +19,39 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "avformat.h"
-#include "avio_internal.h"
-#include "internal.h"
-#include "libavcodec/internal.h"
-#include "libavcodec/raw.h"
-#include "libavcodec/bytestream.h"
-#include "libavutil/opt.h"
-#include "libavutil/dict.h"
-#include "libavutil/internal.h"
-#include "libavutil/pixdesc.h"
-#include "metadata.h"
-#include "id3v2.h"
+#undef NDEBUG
+#include <assert.h>
+#include <stdarg.h>
+#include <stdint.h>
+
+#include "config.h"
+
 #include "libavutil/avassert.h"
 #include "libavutil/avstring.h"
+#include "libavutil/dict.h"
+#include "libavutil/internal.h"
 #include "libavutil/mathematics.h"
+#include "libavutil/opt.h"
 #include "libavutil/parseutils.h"
+#include "libavutil/pixdesc.h"
 #include "libavutil/time.h"
 #include "libavutil/timestamp.h"
-#include "riff.h"
+
+#include "libavcodec/bytestream.h"
+#include "libavcodec/internal.h"
+#include "libavcodec/raw.h"
+
 #include "audiointerleave.h"
-#include "url.h"
-#include <stdarg.h>
+#include "avformat.h"
+#include "avio_internal.h"
+#include "id3v2.h"
+#include "internal.h"
+#include "metadata.h"
 #if CONFIG_NETWORK
 #include "network.h"
 #endif
-
-#undef NDEBUG
-#include <assert.h>
+#include "riff.h"
+#include "url.h"
 
 /**
  * @file
@@ -89,10 +94,10 @@
         st->pts_wrap_reference != AV_NOPTS_VALUE && timestamp != AV_NOPTS_VALUE) {
         if (st->pts_wrap_behavior == AV_PTS_WRAP_ADD_OFFSET &&
             timestamp < st->pts_wrap_reference)
-            return timestamp + (1ULL<<st->pts_wrap_bits);
+            return timestamp + (1ULL << st->pts_wrap_bits);
         else if (st->pts_wrap_behavior == AV_PTS_WRAP_SUB_OFFSET &&
             timestamp >= st->pts_wrap_reference)
-            return timestamp - (1ULL<<st->pts_wrap_bits);
+            return timestamp - (1ULL << st->pts_wrap_bits);
     }
     return timestamp;
 }
@@ -101,21 +106,24 @@
 MAKE_ACCESSORS(AVFormatContext, format, AVCodec *, video_codec)
 MAKE_ACCESSORS(AVFormatContext, format, AVCodec *, audio_codec)
 MAKE_ACCESSORS(AVFormatContext, format, AVCodec *, subtitle_codec)
+MAKE_ACCESSORS(AVFormatContext, format, int, metadata_header_padding)
+MAKE_ACCESSORS(AVFormatContext, format, void *, opaque)
+MAKE_ACCESSORS(AVFormatContext, format, av_format_control_message, control_message_cb)
 
 static AVCodec *find_decoder(AVFormatContext *s, AVStream *st, enum AVCodecID codec_id)
 {
     if (st->codec->codec)
         return st->codec->codec;
 
-    switch(st->codec->codec_type){
+    switch (st->codec->codec_type) {
     case AVMEDIA_TYPE_VIDEO:
-        if(s->video_codec)    return s->video_codec;
+        if (s->video_codec)    return s->video_codec;
         break;
     case AVMEDIA_TYPE_AUDIO:
-        if(s->audio_codec)    return s->audio_codec;
+        if (s->audio_codec)    return s->audio_codec;
         break;
     case AVMEDIA_TYPE_SUBTITLE:
-        if(s->subtitle_codec) return s->subtitle_codec;
+        if (s->subtitle_codec) return s->subtitle_codec;
         break;
     }
 
@@ -132,28 +140,26 @@
 
 int ffio_limit(AVIOContext *s, int size)
 {
-    if(s->maxsize>=0){
+    if (s->maxsize>= 0) {
         int64_t remaining= s->maxsize - avio_tell(s);
-        if(remaining < size){
-            int64_t newsize= avio_size(s);
-            if(!s->maxsize || s->maxsize<newsize)
-                s->maxsize= newsize - !newsize;
+        if (remaining < size) {
+            int64_t newsize = avio_size(s);
+            if (!s->maxsize || s->maxsize<newsize)
+                s->maxsize = newsize - !newsize;
             remaining= s->maxsize - avio_tell(s);
             remaining= FFMAX(remaining, 0);
         }
 
-        if(s->maxsize>=0 && remaining+1 < size){
+        if (s->maxsize>= 0 && remaining+1 < size) {
             av_log(NULL, remaining ? AV_LOG_ERROR : AV_LOG_DEBUG, "Truncating packet of size %d to %"PRId64"\n", size, remaining+1);
-            size= remaining+1;
+            size = remaining+1;
         }
     }
     return size;
 }
 
-/*
- * Read the data in sane-sized chunks and append to pkt.
- * Return the number of bytes read or an error.
- */
+/* Read the data in sane-sized chunks and append to pkt.
+ * Return the number of bytes read or an error. */
 static int append_packet_chunked(AVIOContext *s, AVPacket *pkt, int size)
 {
     int64_t orig_pos   = pkt->pos; // av_grow_packet might reset pos
@@ -164,10 +170,8 @@
         int prev_size = pkt->size;
         int read_size;
 
-        /*
-         * When the caller requests a lot of data, limit it to the amount left
-         * in file or SANE_CHUNK_SIZE when it is not known
-         */
+        /* When the caller requests a lot of data, limit it to the amount
+         * left in file or SANE_CHUNK_SIZE when it is not known. */
         read_size = size;
         if (read_size > SANE_CHUNK_SIZE/10) {
             read_size = ffio_limit(s, read_size);
@@ -214,18 +218,19 @@
     return append_packet_chunked(s, pkt, size);
 }
 
-
 int av_filename_number_test(const char *filename)
 {
     char buf[1024];
-    return filename && (av_get_frame_filename(buf, sizeof(buf), filename, 1)>=0);
+    return filename &&
+           (av_get_frame_filename(buf, sizeof(buf), filename, 1) >= 0);
 }
 
-AVInputFormat *av_probe_input_format3(AVProbeData *pd, int is_opened, int *score_ret)
+AVInputFormat *av_probe_input_format3(AVProbeData *pd, int is_opened,
+                                      int *score_ret)
 {
     AVProbeData lpd = *pd;
     AVInputFormat *fmt1 = NULL, *fmt;
-    int score, nodat = 0, score_max=0;
+    int score, nodat = 0, score_max = 0;
     const static uint8_t zerobuffer[AVPROBE_PADDING_SIZE];
 
     if (!lpd.buf)
@@ -234,9 +239,9 @@
     if (lpd.buf_size > 10 && ff_id3v2_match(lpd.buf, ID3v2_DEFAULT_MAGIC)) {
         int id3len = ff_id3v2_tag_len(lpd.buf);
         if (lpd.buf_size > id3len + 16) {
-            lpd.buf += id3len;
+            lpd.buf      += id3len;
             lpd.buf_size -= id3len;
-        }else
+        } else
             nodat = 1;
     }
 
@@ -247,22 +252,21 @@
         score = 0;
         if (fmt1->read_probe) {
             score = fmt1->read_probe(&lpd);
-            if(fmt1->extensions && av_match_ext(lpd.filename, fmt1->extensions))
+            if (fmt1->extensions && av_match_ext(lpd.filename, fmt1->extensions))
                 score = FFMAX(score, nodat ? AVPROBE_SCORE_EXTENSION / 2 - 1 : 1);
         } else if (fmt1->extensions) {
-            if (av_match_ext(lpd.filename, fmt1->extensions)) {
+            if (av_match_ext(lpd.filename, fmt1->extensions))
                 score = AVPROBE_SCORE_EXTENSION;
-            }
         }
         if (score > score_max) {
             score_max = score;
-            fmt = fmt1;
-        }else if (score == score_max)
+            fmt       = fmt1;
+        } else if (score == score_max)
             fmt = NULL;
     }
-    if(nodat)
+    if (nodat)
         score_max = FFMIN(AVPROBE_SCORE_EXTENSION / 2 - 1, score_max);
-    *score_ret= score_max;
+    *score_ret = score_max;
 
     return fmt;
 }
@@ -270,32 +274,37 @@
 AVInputFormat *av_probe_input_format2(AVProbeData *pd, int is_opened, int *score_max)
 {
     int score_ret;
-    AVInputFormat *fmt= av_probe_input_format3(pd, is_opened, &score_ret);
-    if(score_ret > *score_max){
-        *score_max= score_ret;
+    AVInputFormat *fmt = av_probe_input_format3(pd, is_opened, &score_ret);
+    if (score_ret > *score_max) {
+        *score_max = score_ret;
         return fmt;
-    }else
+    } else
         return NULL;
 }
 
-AVInputFormat *av_probe_input_format(AVProbeData *pd, int is_opened){
-    int score=0;
+AVInputFormat *av_probe_input_format(AVProbeData *pd, int is_opened)
+{
+    int score = 0;
     return av_probe_input_format2(pd, is_opened, &score);
 }
 
-static int set_codec_from_probe_data(AVFormatContext *s, AVStream *st, AVProbeData *pd)
+static int set_codec_from_probe_data(AVFormatContext *s, AVStream *st,
+                                     AVProbeData *pd)
 {
     static const struct {
-        const char *name; enum AVCodecID id; enum AVMediaType type;
+        const char *name;
+        enum AVCodecID id;
+        enum AVMediaType type;
     } fmt_id_type[] = {
-        { "aac"      , AV_CODEC_ID_AAC       , AVMEDIA_TYPE_AUDIO },
-        { "ac3"      , AV_CODEC_ID_AC3       , AVMEDIA_TYPE_AUDIO },
-        { "dts"      , AV_CODEC_ID_DTS       , AVMEDIA_TYPE_AUDIO },
-        { "eac3"     , AV_CODEC_ID_EAC3      , AVMEDIA_TYPE_AUDIO },
-        { "h264"     , AV_CODEC_ID_H264      , AVMEDIA_TYPE_VIDEO },
-        { "loas"     , AV_CODEC_ID_AAC_LATM  , AVMEDIA_TYPE_AUDIO },
-        { "m4v"      , AV_CODEC_ID_MPEG4     , AVMEDIA_TYPE_VIDEO },
-        { "mp3"      , AV_CODEC_ID_MP3       , AVMEDIA_TYPE_AUDIO },
+        { "aac",       AV_CODEC_ID_AAC,        AVMEDIA_TYPE_AUDIO },
+        { "ac3",       AV_CODEC_ID_AC3,        AVMEDIA_TYPE_AUDIO },
+        { "dts",       AV_CODEC_ID_DTS,        AVMEDIA_TYPE_AUDIO },
+        { "eac3",      AV_CODEC_ID_EAC3,       AVMEDIA_TYPE_AUDIO },
+        { "h264",      AV_CODEC_ID_H264,       AVMEDIA_TYPE_VIDEO },
+        { "hevc",      AV_CODEC_ID_HEVC,       AVMEDIA_TYPE_VIDEO },
+        { "loas",      AV_CODEC_ID_AAC_LATM,   AVMEDIA_TYPE_AUDIO },
+        { "m4v",       AV_CODEC_ID_MPEG4,      AVMEDIA_TYPE_VIDEO },
+        { "mp3",       AV_CODEC_ID_MP3,        AVMEDIA_TYPE_AUDIO },
         { "mpegvideo", AV_CODEC_ID_MPEG2VIDEO, AVMEDIA_TYPE_VIDEO },
         { 0 }
     };
@@ -304,8 +313,10 @@
 
     if (fmt && st->request_probe <= score) {
         int i;
-        av_log(s, AV_LOG_DEBUG, "Probe with size=%d, packets=%d detected %s with score=%d\n",
-               pd->buf_size, MAX_PROBE_PACKETS - st->probe_packets, fmt->name, score);
+        av_log(s, AV_LOG_DEBUG,
+               "Probe with size=%d, packets=%d detected %s with score=%d\n",
+               pd->buf_size, MAX_PROBE_PACKETS - st->probe_packets,
+               fmt->name, score);
         for (i = 0; fmt_id_type[i].name; i++) {
             if (!strcmp(fmt->name, fmt_id_type[i].name)) {
                 st->codec->codec_id   = fmt_id_type[i].id;
@@ -320,7 +331,7 @@
 /************************************************************/
 /* input media file */
 
-int av_demuxer_open(AVFormatContext *ic){
+int av_demuxer_open(AVFormatContext *ic) {
     int err;
 
     if (ic->iformat->read_header) {
@@ -340,25 +351,24 @@
                           const char *filename, void *logctx,
                           unsigned int offset, unsigned int max_probe_size)
 {
-    AVProbeData pd = { filename ? filename : "", NULL, -offset };
-    unsigned char *buf = NULL;
+    AVProbeData pd = { filename ? filename : "" };
+    uint8_t *buf = NULL;
     uint8_t *mime_type;
     int ret = 0, probe_size, buf_offset = 0;
     int score = 0;
 
-    if (!max_probe_size) {
+    if (!max_probe_size)
         max_probe_size = PROBE_BUF_MAX;
-    } else if (max_probe_size > PROBE_BUF_MAX) {
+    else if (max_probe_size > PROBE_BUF_MAX)
         max_probe_size = PROBE_BUF_MAX;
-    } else if (max_probe_size < PROBE_BUF_MIN) {
+    else if (max_probe_size < PROBE_BUF_MIN) {
         av_log(logctx, AV_LOG_ERROR,
                "Specified probe size value %u cannot be < %u\n", max_probe_size, PROBE_BUF_MIN);
         return AVERROR(EINVAL);
     }
 
-    if (offset >= max_probe_size) {
+    if (offset >= max_probe_size)
         return AVERROR(EINVAL);
-    }
 
     if (!*fmt && pb->av_class && av_opt_get(pb, "mime_type", AV_OPT_SEARCH_CHILDREN, &mime_type) >= 0 && mime_type) {
         if (!av_strcasecmp(mime_type, "audio/aacp")) {
@@ -367,38 +377,49 @@
         av_freep(&mime_type);
     }
 
-    for(probe_size= PROBE_BUF_MIN; probe_size<=max_probe_size && !*fmt;
-        probe_size = FFMIN(probe_size<<1, FFMAX(max_probe_size, probe_size+1))) {
-
-        if (probe_size < offset) {
-            continue;
-        }
+    for (probe_size = PROBE_BUF_MIN; probe_size <= max_probe_size && !*fmt;
+         probe_size = FFMIN(probe_size << 1,
+                            FFMAX(max_probe_size, probe_size + 1))) {
         score = probe_size < max_probe_size ? AVPROBE_SCORE_RETRY : 0;
 
-        /* read probe data */
+        /* Read probe data. */
         if ((ret = av_reallocp(&buf, probe_size + AVPROBE_PADDING_SIZE)) < 0)
             return ret;
-        if ((ret = avio_read(pb, buf + buf_offset, probe_size - buf_offset)) < 0) {
-            /* fail if error was not end of file, otherwise, lower score */
+        if ((ret = avio_read(pb, buf + buf_offset,
+                             probe_size - buf_offset)) < 0) {
+            /* Fail if error was not end of file, otherwise, lower score. */
             if (ret != AVERROR_EOF) {
                 av_free(buf);
                 return ret;
             }
             score = 0;
-            ret = 0;            /* error was end of file, nothing read */
+            ret   = 0;          /* error was end of file, nothing read */
         }
-        pd.buf_size = buf_offset += ret;
+        buf_offset += ret;
+        if (buf_offset < offset)
+            continue;
+        pd.buf_size = buf_offset - offset;
         pd.buf = &buf[offset];
 
         memset(pd.buf + pd.buf_size, 0, AVPROBE_PADDING_SIZE);
 
-        /* guess file format */
+        /* Guess file format. */
         *fmt = av_probe_input_format2(&pd, 1, &score);
-        if(*fmt){
-            if(score <= AVPROBE_SCORE_RETRY){ //this can only be true in the last iteration
-                av_log(logctx, AV_LOG_WARNING, "Format %s detected only with low score of %d, misdetection possible!\n", (*fmt)->name, score);
-            }else
-                av_log(logctx, AV_LOG_DEBUG, "Format %s probed with size=%d and score=%d\n", (*fmt)->name, probe_size, score);
+        if (*fmt) {
+            /* This can only be true in the last iteration. */
+            if (score <= AVPROBE_SCORE_RETRY) {
+                av_log(logctx, AV_LOG_WARNING,
+                       "Format %s detected only with low score of %d, "
+                       "misdetection possible!\n", (*fmt)->name, score);
+            } else
+                av_log(logctx, AV_LOG_DEBUG,
+                       "Format %s probed with size=%d and score=%d\n",
+                       (*fmt)->name, probe_size, score);
+#if 0
+            FILE *f = fopen("probestat.tmp", "ab");
+            fprintf(f, "probe_size:%d format:%s score:%d filename:%s\n", probe_size, (*fmt)->name, score, filename);
+            fclose(f);
+#endif
         }
     }
 
@@ -407,8 +428,8 @@
         return AVERROR_INVALIDDATA;
     }
 
-    /* rewind. reuse probe buffer to avoid seeking */
-    ret = ffio_rewind_with_probe_data(pb, &buf, pd.buf_size);
+    /* Rewind. Reuse probe buffer to avoid seeking. */
+    ret = ffio_rewind_with_probe_data(pb, &buf, buf_offset);
 
     return ret < 0 ? ret : score;
 }
@@ -421,25 +442,26 @@
     return ret < 0 ? ret : 0;
 }
 
-
-/* open input file and probe the format if necessary */
-static int init_input(AVFormatContext *s, const char *filename, AVDictionary **options)
+/* Open input file and probe the format if necessary. */
+static int init_input(AVFormatContext *s, const char *filename,
+                      AVDictionary **options)
 {
     int ret;
-    AVProbeData pd = {filename, NULL, 0};
+    AVProbeData pd = { filename, NULL, 0 };
     int score = AVPROBE_SCORE_RETRY;
 
     if (s->pb) {
         s->flags |= AVFMT_FLAG_CUSTOM_IO;
         if (!s->iformat)
-            return av_probe_input_buffer2(s->pb, &s->iformat, filename, s, 0, s->probesize);
+            return av_probe_input_buffer2(s->pb, &s->iformat, filename,
+                                         s, 0, s->probesize);
         else if (s->iformat->flags & AVFMT_NOFILE)
             av_log(s, AV_LOG_WARNING, "Custom AVIOContext makes no sense and "
                                       "will be ignored with AVFMT_NOFILE format.\n");
         return 0;
     }
 
-    if ( (s->iformat && s->iformat->flags & AVFMT_NOFILE) ||
+    if ((s->iformat && s->iformat->flags & AVFMT_NOFILE) ||
         (!s->iformat && (s->iformat = av_probe_input_format2(&pd, 0, &score))))
         return score;
 
@@ -448,11 +470,13 @@
         return ret;
     if (s->iformat)
         return 0;
-    return av_probe_input_buffer2(s->pb, &s->iformat, filename, s, 0, s->probesize);
+    return av_probe_input_buffer2(s->pb, &s->iformat, filename,
+                                 s, 0, s->probesize);
 }
 
 static AVPacket *add_to_pktbuf(AVPacketList **packet_buffer, AVPacket *pkt,
-                               AVPacketList **plast_pktl){
+                               AVPacketList **plast_pktl)
+{
     AVPacketList *pktl = av_mallocz(sizeof(AVPacketList));
     if (!pktl)
         return NULL;
@@ -462,9 +486,9 @@
     else
         *packet_buffer = pktl;
 
-    /* add the packet in the buffered packet list */
+    /* Add the packet in the buffered packet list. */
     *plast_pktl = pktl;
-    pktl->pkt= *pkt;
+    pktl->pkt   = *pkt;
     return &pktl->pkt;
 }
 
@@ -475,16 +499,18 @@
         if (s->streams[i]->disposition & AV_DISPOSITION_ATTACHED_PIC &&
             s->streams[i]->discard < AVDISCARD_ALL) {
             AVPacket copy = s->streams[i]->attached_pic;
-            copy.buf      = av_buffer_ref(copy.buf);
+            copy.buf = av_buffer_ref(copy.buf);
             if (!copy.buf)
                 return AVERROR(ENOMEM);
 
-            add_to_pktbuf(&s->raw_packet_buffer, &copy, &s->raw_packet_buffer_end);
+            add_to_pktbuf(&s->raw_packet_buffer, &copy,
+                          &s->raw_packet_buffer_end);
         }
     return 0;
 }
 
-int avformat_open_input(AVFormatContext **ps, const char *filename, AVInputFormat *fmt, AVDictionary **options)
+int avformat_open_input(AVFormatContext **ps, const char *filename,
+                        AVInputFormat *fmt, AVDictionary **options)
 {
     AVFormatContext *s = *ps;
     int ret = 0;
@@ -493,7 +519,7 @@
 
     if (!s && !(s = avformat_alloc_context()))
         return AVERROR(ENOMEM);
-    if (!s->av_class){
+    if (!s->av_class) {
         av_log(NULL, AV_LOG_ERROR, "Input context has not been properly allocated by avformat_alloc_context() and is not NULL either\n");
         return AVERROR(EINVAL);
     }
@@ -511,7 +537,7 @@
     s->probe_score = ret;
     avio_skip(s->pb, s->skip_initial_bytes);
 
-    /* check filename in case an image number is expected */
+    /* Check filename in case an image number is expected. */
     if (s->iformat->flags & AVFMT_NEEDNUMBER) {
         if (!av_filename_number_test(filename)) {
             ret = AVERROR(EINVAL);
@@ -522,14 +548,14 @@
     s->duration = s->start_time = AV_NOPTS_VALUE;
     av_strlcpy(s->filename, filename ? filename : "", sizeof(s->filename));
 
-    /* allocate private data */
+    /* Allocate private data. */
     if (s->iformat->priv_data_size > 0) {
         if (!(s->priv_data = av_mallocz(s->iformat->priv_data_size))) {
             ret = AVERROR(ENOMEM);
             goto fail;
         }
         if (s->iformat->priv_class) {
-            *(const AVClass**)s->priv_data = s->iformat->priv_class;
+            *(const AVClass **) s->priv_data = s->iformat->priv_class;
             av_opt_set_defaults(s->priv_data);
             if ((ret = av_opt_set_dict(s->priv_data, &tmp)) < 0)
                 goto fail;
@@ -547,7 +573,7 @@
     if (id3v2_extra_meta) {
         if (!strcmp(s->iformat->name, "mp3") || !strcmp(s->iformat->name, "aac") ||
             !strcmp(s->iformat->name, "tta")) {
-            if((ret = ff_id3v2_parse_apic(s, &id3v2_extra_meta)) < 0)
+            if ((ret = ff_id3v2_parse_apic(s, &id3v2_extra_meta)) < 0)
                 goto fail;
         } else
             av_log(s, AV_LOG_DEBUG, "demuxer does not support additional id3 data, skipping\n");
@@ -583,22 +609,25 @@
 
 static void force_codec_ids(AVFormatContext *s, AVStream *st)
 {
-    switch(st->codec->codec_type){
+    switch (st->codec->codec_type) {
     case AVMEDIA_TYPE_VIDEO:
-        if(s->video_codec_id)   st->codec->codec_id= s->video_codec_id;
+        if (s->video_codec_id)
+            st->codec->codec_id = s->video_codec_id;
         break;
     case AVMEDIA_TYPE_AUDIO:
-        if(s->audio_codec_id)   st->codec->codec_id= s->audio_codec_id;
+        if (s->audio_codec_id)
+            st->codec->codec_id = s->audio_codec_id;
         break;
     case AVMEDIA_TYPE_SUBTITLE:
-        if(s->subtitle_codec_id)st->codec->codec_id= s->subtitle_codec_id;
+        if (s->subtitle_codec_id)
+            st->codec->codec_id = s->subtitle_codec_id;
         break;
     }
 }
 
 static int probe_codec(AVFormatContext *s, AVStream *st, const AVPacket *pkt)
 {
-    if(st->request_probe>0){
+    if (st->request_probe>0) {
         AVProbeData *pd = &st->probe_data;
         int end;
         av_log(s, AV_LOG_DEBUG, "probing stream %d pp:%d\n", st->index, st->probe_packets);
@@ -606,38 +635,38 @@
 
         if (pkt) {
             uint8_t *new_buf = av_realloc(pd->buf, pd->buf_size+pkt->size+AVPROBE_PADDING_SIZE);
-            if(!new_buf) {
+            if (!new_buf) {
                 av_log(s, AV_LOG_WARNING,
                        "Failed to reallocate probe buffer for stream %d\n",
                        st->index);
                 goto no_packet;
             }
             pd->buf = new_buf;
-            memcpy(pd->buf+pd->buf_size, pkt->data, pkt->size);
+            memcpy(pd->buf + pd->buf_size, pkt->data, pkt->size);
             pd->buf_size += pkt->size;
-            memset(pd->buf+pd->buf_size, 0, AVPROBE_PADDING_SIZE);
+            memset(pd->buf + pd->buf_size, 0, AVPROBE_PADDING_SIZE);
         } else {
 no_packet:
             st->probe_packets = 0;
             if (!pd->buf_size) {
-                av_log(s, AV_LOG_WARNING, "nothing to probe for stream %d\n",
-                       st->index);
+                av_log(s, AV_LOG_WARNING,
+                       "nothing to probe for stream %d\n", st->index);
             }
         }
 
         end=    s->raw_packet_buffer_remaining_size <= 0
-                || st->probe_packets<=0;
+                || st->probe_packets<= 0;
 
-        if(end || av_log2(pd->buf_size) != av_log2(pd->buf_size - pkt->size)){
-            int score= set_codec_from_probe_data(s, st, pd);
-            if(    (st->codec->codec_id != AV_CODEC_ID_NONE && score > AVPROBE_SCORE_RETRY)
-                || end){
-                pd->buf_size=0;
+        if (end || av_log2(pd->buf_size) != av_log2(pd->buf_size - pkt->size)) {
+            int score = set_codec_from_probe_data(s, st, pd);
+            if (    (st->codec->codec_id != AV_CODEC_ID_NONE && score > AVPROBE_SCORE_STREAM_RETRY)
+                || end) {
+                pd->buf_size = 0;
                 av_freep(&pd->buf);
-                st->request_probe= -1;
-                if(st->codec->codec_id != AV_CODEC_ID_NONE){
+                st->request_probe = -1;
+                if (st->codec->codec_id != AV_CODEC_ID_NONE) {
                     av_log(s, AV_LOG_DEBUG, "probed stream %d\n", st->index);
-                }else
+                } else
                     av_log(s, AV_LOG_WARNING, "probed stream %d failed\n", st->index);
             }
             force_codec_ids(s, st);
@@ -646,23 +675,86 @@
     return 0;
 }
 
+static int update_wrap_reference(AVFormatContext *s, AVStream *st, int stream_index, AVPacket *pkt)
+{
+    int64_t ref = pkt->dts;
+    int i, pts_wrap_behavior;
+    int64_t pts_wrap_reference;
+    AVProgram *first_program;
+
+    if (ref == AV_NOPTS_VALUE)
+        ref = pkt->pts;
+    if (st->pts_wrap_reference != AV_NOPTS_VALUE || st->pts_wrap_bits >= 63 || ref == AV_NOPTS_VALUE || !s->correct_ts_overflow)
+        return 0;
+    ref &= (1LL << st->pts_wrap_bits)-1;
+
+    // reference time stamp should be 60 s before first time stamp
+    pts_wrap_reference = ref - av_rescale(60, st->time_base.den, st->time_base.num);
+    // if first time stamp is not more than 1/8 and 60s before the wrap point, subtract rather than add wrap offset
+    pts_wrap_behavior = (ref < (1LL << st->pts_wrap_bits) - (1LL << st->pts_wrap_bits-3)) ||
+        (ref < (1LL << st->pts_wrap_bits) - av_rescale(60, st->time_base.den, st->time_base.num)) ?
+        AV_PTS_WRAP_ADD_OFFSET : AV_PTS_WRAP_SUB_OFFSET;
+
+    first_program = av_find_program_from_stream(s, NULL, stream_index);
+
+    if (!first_program) {
+        int default_stream_index = av_find_default_stream_index(s);
+        if (s->streams[default_stream_index]->pts_wrap_reference == AV_NOPTS_VALUE) {
+            for (i = 0; i < s->nb_streams; i++) {
+                s->streams[i]->pts_wrap_reference = pts_wrap_reference;
+                s->streams[i]->pts_wrap_behavior = pts_wrap_behavior;
+            }
+        }
+        else {
+            st->pts_wrap_reference = s->streams[default_stream_index]->pts_wrap_reference;
+            st->pts_wrap_behavior = s->streams[default_stream_index]->pts_wrap_behavior;
+        }
+    }
+    else {
+        AVProgram *program = first_program;
+        while (program) {
+            if (program->pts_wrap_reference != AV_NOPTS_VALUE) {
+                pts_wrap_reference = program->pts_wrap_reference;
+                pts_wrap_behavior = program->pts_wrap_behavior;
+                break;
+            }
+            program = av_find_program_from_stream(s, program, stream_index);
+        }
+
+        // update every program with differing pts_wrap_reference
+        program = first_program;
+        while (program) {
+            if (program->pts_wrap_reference != pts_wrap_reference) {
+                for (i = 0; i<program->nb_stream_indexes; i++) {
+                    s->streams[program->stream_index[i]]->pts_wrap_reference = pts_wrap_reference;
+                    s->streams[program->stream_index[i]]->pts_wrap_behavior = pts_wrap_behavior;
+                }
+
+                program->pts_wrap_reference = pts_wrap_reference;
+                program->pts_wrap_behavior = pts_wrap_behavior;
+            }
+            program = av_find_program_from_stream(s, program, stream_index);
+        }
+    }
+    return 1;
+}
+
 int ff_read_packet(AVFormatContext *s, AVPacket *pkt)
 {
     int ret, i, err;
     AVStream *st;
 
-    for(;;){
+    for (;;) {
         AVPacketList *pktl = s->raw_packet_buffer;
 
         if (pktl) {
             *pkt = pktl->pkt;
-            st = s->streams[pkt->stream_index];
-            if (s->raw_packet_buffer_remaining_size <= 0) {
+            st   = s->streams[pkt->stream_index];
+            if (s->raw_packet_buffer_remaining_size <= 0)
                 if ((err = probe_codec(s, st, NULL)) < 0)
                     return err;
-            }
-            if(st->request_probe <= 0){
-                s->raw_packet_buffer = pktl->next;
+            if (st->request_probe <= 0) {
+                s->raw_packet_buffer                 = pktl->next;
                 s->raw_packet_buffer_remaining_size += pkt->size;
                 av_free(pktl);
                 return 0;
@@ -672,16 +764,15 @@
         pkt->data = NULL;
         pkt->size = 0;
         av_init_packet(pkt);
-        ret= s->iformat->read_packet(s, pkt);
+        ret = s->iformat->read_packet(s, pkt);
         if (ret < 0) {
             if (!pktl || ret == AVERROR(EAGAIN))
                 return ret;
             for (i = 0; i < s->nb_streams; i++) {
                 st = s->streams[i];
-                if (st->probe_packets) {
+                if (st->probe_packets)
                     if ((err = probe_codec(s, st, NULL)) < 0)
                         return err;
-                }
                 av_assert0(st->request_probe <= 0);
             }
             continue;
@@ -696,15 +787,23 @@
             continue;
         }
 
-        if(!(s->flags & AVFMT_FLAG_KEEP_SIDE_DATA))
-            av_packet_merge_side_data(pkt);
-
-        if(pkt->stream_index >= (unsigned)s->nb_streams){
+        if (pkt->stream_index >= (unsigned)s->nb_streams) {
             av_log(s, AV_LOG_ERROR, "Invalid stream index %d\n", pkt->stream_index);
             continue;
         }
 
-        st= s->streams[pkt->stream_index];
+        st = s->streams[pkt->stream_index];
+
+        if (update_wrap_reference(s, st, pkt->stream_index, pkt) && st->pts_wrap_behavior == AV_PTS_WRAP_SUB_OFFSET) {
+            // correct first time stamps to negative values
+            if (!is_relative(st->first_dts))
+                st->first_dts = wrap_timestamp(st, st->first_dts);
+            if (!is_relative(st->start_time))
+                st->start_time = wrap_timestamp(st, st->start_time);
+            if (!is_relative(st->cur_dts))
+                st->cur_dts = wrap_timestamp(st, st->cur_dts);
+        }
+
         pkt->dts = wrap_timestamp(st, pkt->dts);
         pkt->pts = wrap_timestamp(st, pkt->pts);
 
@@ -714,7 +813,7 @@
         if (s->use_wallclock_as_timestamps)
             pkt->dts = pkt->pts = av_rescale_q(av_gettime(), AV_TIME_BASE_Q, st->time_base);
 
-        if(!pktl && st->request_probe <= 0)
+        if (!pktl && st->request_probe <= 0)
             return ret;
 
         add_to_pktbuf(&s->raw_packet_buffer, pkt, &s->raw_packet_buffer_end);
@@ -766,7 +865,7 @@
 
     //For WMA we currently have no other means to calculate duration thus we
     //do it here by assuming CBR, which is true for all known cases.
-    if(!mux && enc->bit_rate>0 && size>0 && enc->sample_rate>0 && enc->block_align>1) {
+    if (!mux && enc->bit_rate>0 && size>0 && enc->sample_rate>0 && enc->block_align>1) {
         if (enc->codec_id == AV_CODEC_ID_WMAV1 || enc->codec_id == AV_CODEC_ID_WMAV2)
             return  ((int64_t)size * 8 * enc->sample_rate) / enc->bit_rate;
     }
@@ -774,7 +873,6 @@
     return -1;
 }
 
-
 /**
  * Return the frame duration in seconds. Return 0 if not available.
  */
@@ -785,15 +883,15 @@
 
     *pnum = 0;
     *pden = 0;
-    switch(st->codec->codec_type) {
+    switch (st->codec->codec_type) {
     case AVMEDIA_TYPE_VIDEO:
         if (st->r_frame_rate.num && !pc) {
             *pnum = st->r_frame_rate.den;
             *pden = st->r_frame_rate.num;
-        } else if(st->time_base.num*1000LL > st->time_base.den) {
+        } else if (st->time_base.num * 1000LL > st->time_base.den) {
             *pnum = st->time_base.num;
             *pden = st->time_base.den;
-        }else if(st->codec->time_base.num*1000LL > st->codec->time_base.den){
+        } else if (st->codec->time_base.num * 1000LL > st->codec->time_base.den) {
             *pnum = st->codec->time_base.num;
             *pden = st->codec->time_base.den;
             if (pc && pc->repeat_pict) {
@@ -802,11 +900,11 @@
                 else
                     *pnum *= 1 + pc->repeat_pict;
             }
-            //If this codec can be interlaced or progressive then we need a parser to compute duration of a packet
-            //Thus if we have no parser in such case leave duration undefined.
-            if(st->codec->ticks_per_frame>1 && !pc){
+            /* If this codec can be interlaced or progressive then we need
+             * a parser to compute duration of a packet. Thus if we have
+             * no parser in such case leave duration undefined. */
+            if (st->codec->ticks_per_frame > 1 && !pc)
                 *pnum = *pden = 0;
-            }
         }
         break;
     case AVMEDIA_TYPE_AUDIO:
@@ -821,10 +919,10 @@
     }
 }
 
-static int is_intra_only(AVCodecContext *enc){
+static int is_intra_only(AVCodecContext *enc) {
     const AVCodecDescriptor *desc;
 
-    if(enc->codec_type != AVMEDIA_TYPE_VIDEO)
+    if (enc->codec_type != AVMEDIA_TYPE_VIDEO)
         return 1;
 
     desc = av_codec_get_codec_descriptor(enc);
@@ -839,17 +937,17 @@
 
 static int has_decode_delay_been_guessed(AVStream *st)
 {
-    if(st->codec->codec_id != AV_CODEC_ID_H264) return 1;
-    if(!st->info) // if we have left find_stream_info then nb_decoded_frames won't increase anymore for stream copy
+    if (st->codec->codec_id != AV_CODEC_ID_H264) return 1;
+    if (!st->info) // if we have left find_stream_info then nb_decoded_frames won't increase anymore for stream copy
         return 1;
 #if CONFIG_H264_DECODER
-    if(st->codec->has_b_frames &&
+    if (st->codec->has_b_frames &&
        avpriv_h264_has_num_reorder_frames(st->codec) == st->codec->has_b_frames)
         return 1;
 #endif
-    if(st->codec->has_b_frames<3)
+    if (st->codec->has_b_frames<3)
         return st->nb_decoded_frames >= 7;
-    else if(st->codec->has_b_frames<4)
+    else if (st->codec->has_b_frames<4)
         return st->nb_decoded_frames >= 18;
     else
         return st->nb_decoded_frames >= 20;
@@ -859,121 +957,98 @@
 {
     if (pktl->next)
         return pktl->next;
-    if (pktl == s->parse_queue_end)
-        return s->packet_buffer;
+    if (pktl == s->packet_buffer_end)
+        return s->parse_queue;
     return NULL;
 }
 
-static int update_wrap_reference(AVFormatContext *s, AVStream *st, int stream_index)
-{
-    if (s->correct_ts_overflow && st->pts_wrap_bits < 63 &&
-        st->pts_wrap_reference == AV_NOPTS_VALUE && st->first_dts != AV_NOPTS_VALUE) {
+static int64_t select_from_pts_buffer(AVStream *st, int64_t *pts_buffer, int64_t dts) {
+    int onein_oneout = st->codec->codec_id != AV_CODEC_ID_H264 &&
+                       st->codec->codec_id != AV_CODEC_ID_HEVC;
+
+    if(!onein_oneout) {
+        int delay = st->codec->has_b_frames;
         int i;
 
-        // reference time stamp should be 60 s before first time stamp
-        int64_t pts_wrap_reference = st->first_dts - av_rescale(60, st->time_base.den, st->time_base.num);
-        // if first time stamp is not more than 1/8 and 60s before the wrap point, subtract rather than add wrap offset
-        int pts_wrap_behavior = (st->first_dts < (1LL<<st->pts_wrap_bits) - (1LL<<st->pts_wrap_bits-3)) ||
-            (st->first_dts < (1LL<<st->pts_wrap_bits) - av_rescale(60, st->time_base.den, st->time_base.num)) ?
-            AV_PTS_WRAP_ADD_OFFSET : AV_PTS_WRAP_SUB_OFFSET;
-
-        AVProgram *first_program = av_find_program_from_stream(s, NULL, stream_index);
-
-        if (!first_program) {
-            int default_stream_index = av_find_default_stream_index(s);
-            if (s->streams[default_stream_index]->pts_wrap_reference == AV_NOPTS_VALUE) {
-                for (i=0; i<s->nb_streams; i++) {
-                    s->streams[i]->pts_wrap_reference = pts_wrap_reference;
-                    s->streams[i]->pts_wrap_behavior = pts_wrap_behavior;
-                }
-            }
-            else {
-                st->pts_wrap_reference = s->streams[default_stream_index]->pts_wrap_reference;
-                st->pts_wrap_behavior = s->streams[default_stream_index]->pts_wrap_behavior;
-            }
-        }
-        else {
-            AVProgram *program = first_program;
-            while (program) {
-                if (program->pts_wrap_reference != AV_NOPTS_VALUE) {
-                    pts_wrap_reference = program->pts_wrap_reference;
-                    pts_wrap_behavior = program->pts_wrap_behavior;
-                    break;
+        if (dts == AV_NOPTS_VALUE) {
+            int64_t best_score = INT64_MAX;
+            for (i = 0; i<delay; i++) {
+                if (st->pts_reorder_error_count[i]) {
+                    int64_t score = st->pts_reorder_error[i] / st->pts_reorder_error_count[i];
+                    if (score < best_score) {
+                        best_score = score;
+                        dts = pts_buffer[i];
+                    }
                 }
-                program = av_find_program_from_stream(s, program, stream_index);
             }
-
-            // update every program with differing pts_wrap_reference
-            program = first_program;
-            while(program) {
-                if (program->pts_wrap_reference != pts_wrap_reference) {
-                    for (i=0; i<program->nb_stream_indexes; i++) {
-                        s->streams[program->stream_index[i]]->pts_wrap_reference = pts_wrap_reference;
-                        s->streams[program->stream_index[i]]->pts_wrap_behavior = pts_wrap_behavior;
+        } else {
+            for (i = 0; i<delay; i++) {
+                if (pts_buffer[i] != AV_NOPTS_VALUE) {
+                    int64_t diff =  FFABS(pts_buffer[i] - dts)
+                                    + (uint64_t)st->pts_reorder_error[i];
+                    diff = FFMAX(diff, st->pts_reorder_error[i]);
+                    st->pts_reorder_error[i] = diff;
+                    st->pts_reorder_error_count[i]++;
+                    if (st->pts_reorder_error_count[i] > 250) {
+                        st->pts_reorder_error[i] >>= 1;
+                        st->pts_reorder_error_count[i] >>= 1;
                     }
-
-                    program->pts_wrap_reference = pts_wrap_reference;
-                    program->pts_wrap_behavior = pts_wrap_behavior;
                 }
-                program = av_find_program_from_stream(s, program, stream_index);
             }
         }
-        return 1;
     }
-    return 0;
+
+    if (dts == AV_NOPTS_VALUE)
+        dts = pts_buffer[0];
+
+    return dts;
 }
 
 static void update_initial_timestamps(AVFormatContext *s, int stream_index,
                                       int64_t dts, int64_t pts, AVPacket *pkt)
 {
-    AVStream *st= s->streams[stream_index];
-    AVPacketList *pktl= s->parse_queue ? s->parse_queue : s->packet_buffer;
+    AVStream *st       = s->streams[stream_index];
+    AVPacketList *pktl = s->packet_buffer ? s->packet_buffer : s->parse_queue;
     int64_t pts_buffer[MAX_REORDER_DELAY+1];
     int64_t shift;
     int i, delay;
 
-    if(st->first_dts != AV_NOPTS_VALUE || dts == AV_NOPTS_VALUE || st->cur_dts == AV_NOPTS_VALUE || is_relative(dts))
+    if (st->first_dts != AV_NOPTS_VALUE ||
+        dts           == AV_NOPTS_VALUE ||
+        st->cur_dts   == AV_NOPTS_VALUE ||
+        is_relative(dts))
         return;
 
-    delay = st->codec->has_b_frames;
-    st->first_dts= dts - (st->cur_dts - RELATIVE_TS_BASE);
-    st->cur_dts= dts;
-    shift = st->first_dts - RELATIVE_TS_BASE;
+    delay         = st->codec->has_b_frames;
+    st->first_dts = dts - (st->cur_dts - RELATIVE_TS_BASE);
+    st->cur_dts   = dts;
+    shift         = st->first_dts - RELATIVE_TS_BASE;
 
-    for (i=0; i<MAX_REORDER_DELAY+1; i++)
+    for (i = 0; i<MAX_REORDER_DELAY+1; i++)
         pts_buffer[i] = AV_NOPTS_VALUE;
 
     if (is_relative(pts))
         pts += shift;
 
-    for(; pktl; pktl= get_next_pkt(s, st, pktl)){
-        if(pktl->pkt.stream_index != stream_index)
+    for (; pktl; pktl = get_next_pkt(s, st, pktl)) {
+        if (pktl->pkt.stream_index != stream_index)
             continue;
-        if(is_relative(pktl->pkt.pts))
+        if (is_relative(pktl->pkt.pts))
             pktl->pkt.pts += shift;
 
-        if(is_relative(pktl->pkt.dts))
+        if (is_relative(pktl->pkt.dts))
             pktl->pkt.dts += shift;
 
-        if(st->start_time == AV_NOPTS_VALUE && pktl->pkt.pts != AV_NOPTS_VALUE)
-            st->start_time= pktl->pkt.pts;
+        if (st->start_time == AV_NOPTS_VALUE && pktl->pkt.pts != AV_NOPTS_VALUE)
+            st->start_time = pktl->pkt.pts;
 
-        if(pktl->pkt.pts != AV_NOPTS_VALUE && delay <= MAX_REORDER_DELAY && has_decode_delay_been_guessed(st)){
-            pts_buffer[0]= pktl->pkt.pts;
-            for(i=0; i<delay && pts_buffer[i] > pts_buffer[i+1]; i++)
-                FFSWAP(int64_t, pts_buffer[i], pts_buffer[i+1]);
-            if(pktl->pkt.dts == AV_NOPTS_VALUE)
-                pktl->pkt.dts= pts_buffer[0];
-        }
-    }
+        if (pktl->pkt.pts != AV_NOPTS_VALUE && delay <= MAX_REORDER_DELAY && has_decode_delay_been_guessed(st)) {
+            pts_buffer[0] = pktl->pkt.pts;
+            for (i = 0; i<delay && pts_buffer[i] > pts_buffer[i + 1]; i++)
+                FFSWAP(int64_t, pts_buffer[i], pts_buffer[i + 1]);
 
-    if (update_wrap_reference(s, st, stream_index) && st->pts_wrap_behavior == AV_PTS_WRAP_SUB_OFFSET) {
-        // correct first time stamps to negative values
-        st->first_dts = wrap_timestamp(st, st->first_dts);
-        st->cur_dts = wrap_timestamp(st, st->cur_dts);
-        pkt->dts = wrap_timestamp(st, pkt->dts);
-        pkt->pts = wrap_timestamp(st, pkt->pts);
-        pts = wrap_timestamp(st, pts);
+            pktl->pkt.dts = select_from_pts_buffer(st, pts_buffer, pktl->pkt.dts);
+        }
     }
 
     if (st->start_time == AV_NOPTS_VALUE)
@@ -983,48 +1058,54 @@
 static void update_initial_durations(AVFormatContext *s, AVStream *st,
                                      int stream_index, int duration)
 {
-    AVPacketList *pktl= s->parse_queue ? s->parse_queue : s->packet_buffer;
-    int64_t cur_dts= RELATIVE_TS_BASE;
+    AVPacketList *pktl = s->packet_buffer ? s->packet_buffer : s->parse_queue;
+    int64_t cur_dts    = RELATIVE_TS_BASE;
 
-    if(st->first_dts != AV_NOPTS_VALUE){
-        cur_dts= st->first_dts;
-        for(; pktl; pktl= get_next_pkt(s, st, pktl)){
-            if(pktl->pkt.stream_index == stream_index){
-                if(pktl->pkt.pts != pktl->pkt.dts || pktl->pkt.dts != AV_NOPTS_VALUE || pktl->pkt.duration)
+    if (st->first_dts != AV_NOPTS_VALUE) {
+        if (st->update_initial_durations_done)
+            return;
+        st->update_initial_durations_done = 1;
+        cur_dts = st->first_dts;
+        for (; pktl; pktl = get_next_pkt(s, st, pktl)) {
+            if (pktl->pkt.stream_index == stream_index) {
+                if (pktl->pkt.pts != pktl->pkt.dts  ||
+                    pktl->pkt.dts != AV_NOPTS_VALUE ||
+                    pktl->pkt.duration)
                     break;
                 cur_dts -= duration;
             }
         }
-        if(pktl && pktl->pkt.dts != st->first_dts) {
+        if (pktl && pktl->pkt.dts != st->first_dts) {
             av_log(s, AV_LOG_DEBUG, "first_dts %s not matching first dts %s (pts %s, duration %d) in the queue\n",
                    av_ts2str(st->first_dts), av_ts2str(pktl->pkt.dts), av_ts2str(pktl->pkt.pts), pktl->pkt.duration);
             return;
         }
-        if(!pktl) {
+        if (!pktl) {
             av_log(s, AV_LOG_DEBUG, "first_dts %s but no packet with dts in the queue\n", av_ts2str(st->first_dts));
             return;
         }
-        pktl= s->parse_queue ? s->parse_queue : s->packet_buffer;
+        pktl          = s->packet_buffer ? s->packet_buffer : s->parse_queue;
         st->first_dts = cur_dts;
-    }else if(st->cur_dts != RELATIVE_TS_BASE)
+    } else if (st->cur_dts != RELATIVE_TS_BASE)
         return;
 
-    for(; pktl; pktl= get_next_pkt(s, st, pktl)){
-        if(pktl->pkt.stream_index != stream_index)
+    for (; pktl; pktl = get_next_pkt(s, st, pktl)) {
+        if (pktl->pkt.stream_index != stream_index)
             continue;
-        if(pktl->pkt.pts == pktl->pkt.dts && (pktl->pkt.dts == AV_NOPTS_VALUE || pktl->pkt.dts == st->first_dts)
-           && !pktl->pkt.duration){
-            pktl->pkt.dts= cur_dts;
-            if(!st->codec->has_b_frames)
-                pktl->pkt.pts= cur_dts;
+        if (pktl->pkt.pts == pktl->pkt.dts  &&
+            (pktl->pkt.dts == AV_NOPTS_VALUE || pktl->pkt.dts == st->first_dts) &&
+            !pktl->pkt.duration) {
+            pktl->pkt.dts = cur_dts;
+            if (!st->codec->has_b_frames)
+                pktl->pkt.pts = cur_dts;
 //            if (st->codec->codec_type != AVMEDIA_TYPE_AUDIO)
                 pktl->pkt.duration = duration;
-        }else
+        } else
             break;
         cur_dts = pktl->pkt.dts + pktl->pkt.duration;
     }
-    if(!pktl)
-        st->cur_dts= cur_dts;
+    if (!pktl)
+        st->cur_dts = cur_dts;
 }
 
 static void compute_pkt_fields(AVFormatContext *s, AVStream *st,
@@ -1032,23 +1113,49 @@
 {
     int num, den, presentation_delayed, delay, i;
     int64_t offset;
+    AVRational duration;
+    int onein_oneout = st->codec->codec_id != AV_CODEC_ID_H264 &&
+                       st->codec->codec_id != AV_CODEC_ID_HEVC;
 
     if (s->flags & AVFMT_FLAG_NOFILLIN)
         return;
 
-    if((s->flags & AVFMT_FLAG_IGNDTS) && pkt->pts != AV_NOPTS_VALUE)
-        pkt->dts= AV_NOPTS_VALUE;
+    if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO && pkt->dts != AV_NOPTS_VALUE) {
+        if (pkt->dts == pkt->pts && st->last_dts_for_order_check != AV_NOPTS_VALUE) {
+            if (st->last_dts_for_order_check <= pkt->dts) {
+                st->dts_ordered++;
+            } else {
+                av_log(s, st->dts_misordered ? AV_LOG_DEBUG : AV_LOG_WARNING,
+                       "DTS %"PRIi64" < %"PRIi64" out of order\n",
+                       pkt->dts,
+                       st->last_dts_for_order_check);
+                st->dts_misordered++;
+            }
+            if (st->dts_ordered + st->dts_misordered > 250) {
+                st->dts_ordered    >>= 1;
+                st->dts_misordered >>= 1;
+            }
+        }
+
+        st->last_dts_for_order_check = pkt->dts;
+        if (st->dts_ordered < 8*st->dts_misordered && pkt->dts == pkt->pts)
+            pkt->dts = AV_NOPTS_VALUE;
+    }
 
-    if (st->codec->codec_id != AV_CODEC_ID_H264 && pc && pc->pict_type == AV_PICTURE_TYPE_B)
+    if ((s->flags & AVFMT_FLAG_IGNDTS) && pkt->pts != AV_NOPTS_VALUE)
+        pkt->dts = AV_NOPTS_VALUE;
+
+    if (pc && pc->pict_type == AV_PICTURE_TYPE_B
+        && !st->codec->has_b_frames)
         //FIXME Set low_delay = 0 when has_b_frames = 1
         st->codec->has_b_frames = 1;
 
     /* do we have a video B-frame ? */
-    delay= st->codec->has_b_frames;
+    delay = st->codec->has_b_frames;
     presentation_delayed = 0;
 
     /* XXX: need has_b_frame, but cannot get it if the codec is
-        not initialized */
+     *  not initialized */
     if (delay &&
         pc && pc->pict_type != AV_PICTURE_TYPE_B)
         presentation_delayed = 1;
@@ -1056,71 +1163,64 @@
     if (pkt->pts != AV_NOPTS_VALUE && pkt->dts != AV_NOPTS_VALUE &&
         st->pts_wrap_bits < 63 &&
         pkt->dts - (1LL << (st->pts_wrap_bits - 1)) > pkt->pts) {
-        if(is_relative(st->cur_dts) || pkt->dts - (1LL<<(st->pts_wrap_bits-1)) > st->cur_dts) {
-            pkt->dts -= 1LL<<st->pts_wrap_bits;
+        if (is_relative(st->cur_dts) || pkt->dts - (1LL<<(st->pts_wrap_bits - 1)) > st->cur_dts) {
+            pkt->dts -= 1LL << st->pts_wrap_bits;
         } else
-            pkt->pts += 1LL<<st->pts_wrap_bits;
+            pkt->pts += 1LL << st->pts_wrap_bits;
     }
 
-    // some mpeg2 in mpeg-ps lack dts (issue171 / input_file.mpg)
-    // we take the conservative approach and discard both
-    // Note, if this is misbehaving for a H.264 file then possibly presentation_delayed is not set correctly.
-    if(delay==1 && pkt->dts == pkt->pts && pkt->dts != AV_NOPTS_VALUE && presentation_delayed){
+    /* Some MPEG-2 in MPEG-PS lack dts (issue #171 / input_file.mpg).
+     * We take the conservative approach and discard both.
+     * Note: If this is misbehaving for an H.264 file, then possibly
+     * presentation_delayed is not set correctly. */
+    if (delay == 1 && pkt->dts == pkt->pts &&
+        pkt->dts != AV_NOPTS_VALUE && presentation_delayed) {
         av_log(s, AV_LOG_DEBUG, "invalid dts/pts combination %"PRIi64"\n", pkt->dts);
-        if(strcmp(s->iformat->name, "mov,mp4,m4a,3gp,3g2,mj2")) // otherwise we discard correct timestamps for vc1-wmapro.ism
-            pkt->dts= AV_NOPTS_VALUE;
+        if (    strcmp(s->iformat->name, "mov,mp4,m4a,3gp,3g2,mj2")
+             && strcmp(s->iformat->name, "flv")) // otherwise we discard correct timestamps for vc1-wmapro.ism
+            pkt->dts = AV_NOPTS_VALUE;
     }
 
+    duration = av_mul_q((AVRational) {pkt->duration, 1}, st->time_base);
     if (pkt->duration == 0) {
         ff_compute_frame_duration(&num, &den, st, pc, pkt);
         if (den && num) {
-            pkt->duration = av_rescale_rnd(1, num * (int64_t)st->time_base.den, den * (int64_t)st->time_base.num, AV_ROUND_DOWN);
+            duration = (AVRational) {num, den};
+            pkt->duration = av_rescale_rnd(1,
+                                           num * (int64_t) st->time_base.den,
+                                           den * (int64_t) st->time_base.num,
+                                           AV_ROUND_DOWN);
         }
     }
-    if(pkt->duration != 0 && (s->packet_buffer || s->parse_queue))
+
+    if (pkt->duration != 0 && (s->packet_buffer || s->parse_queue))
         update_initial_durations(s, st, pkt->stream_index, pkt->duration);
 
-    /* correct timestamps with byte offset if demuxers only have timestamps
-       on packet boundaries */
-    if(pc && st->need_parsing == AVSTREAM_PARSE_TIMESTAMPS && pkt->size){
+    /* Correct timestamps with byte offset if demuxers only have timestamps
+     * on packet boundaries */
+    if (pc && st->need_parsing == AVSTREAM_PARSE_TIMESTAMPS && pkt->size) {
         /* this will estimate bitrate based on this frame's duration and size */
         offset = av_rescale(pc->offset, pkt->duration, pkt->size);
-        if(pkt->pts != AV_NOPTS_VALUE)
+        if (pkt->pts != AV_NOPTS_VALUE)
             pkt->pts += offset;
-        if(pkt->dts != AV_NOPTS_VALUE)
+        if (pkt->dts != AV_NOPTS_VALUE)
             pkt->dts += offset;
     }
 
-    if (pc && pc->dts_sync_point >= 0) {
-        // we have synchronization info from the parser
-        int64_t den = st->codec->time_base.den * (int64_t) st->time_base.num;
-        if (den > 0) {
-            int64_t num = st->codec->time_base.num * (int64_t) st->time_base.den;
-            if (pkt->dts != AV_NOPTS_VALUE) {
-                // got DTS from the stream, update reference timestamp
-                st->reference_dts = pkt->dts - pc->dts_ref_dts_delta * num / den;
-            } else if (st->reference_dts != AV_NOPTS_VALUE) {
-                // compute DTS based on reference timestamp
-                pkt->dts = st->reference_dts + pc->dts_ref_dts_delta * num / den;
-            }
-
-            if (st->reference_dts != AV_NOPTS_VALUE && pkt->pts == AV_NOPTS_VALUE)
-                pkt->pts = pkt->dts + pc->pts_dts_delta * num / den;
-
-            if (pc->dts_sync_point > 0)
-                st->reference_dts = pkt->dts; // new reference
-        }
-    }
-
     /* This may be redundant, but it should not hurt. */
-    if(pkt->dts != AV_NOPTS_VALUE && pkt->pts != AV_NOPTS_VALUE && pkt->pts > pkt->dts)
+    if (pkt->dts != AV_NOPTS_VALUE &&
+        pkt->pts != AV_NOPTS_VALUE &&
+        pkt->pts > pkt->dts)
         presentation_delayed = 1;
 
-    av_dlog(NULL, "IN delayed:%d pts:%s, dts:%s cur_dts:%s st:%d pc:%p duration:%d\n",
-           presentation_delayed, av_ts2str(pkt->pts), av_ts2str(pkt->dts), av_ts2str(st->cur_dts), pkt->stream_index, pc, pkt->duration);
-    /* interpolate PTS and DTS if they are not present */
-    //We skip H264 currently because delay and has_b_frames are not reliably set
-    if((delay==0 || (delay==1 && pc)) && st->codec->codec_id != AV_CODEC_ID_H264){
+    av_dlog(NULL,
+            "IN delayed:%d pts:%s, dts:%s cur_dts:%s st:%d pc:%p duration:%d\n",
+            presentation_delayed, av_ts2str(pkt->pts), av_ts2str(pkt->dts), av_ts2str(st->cur_dts),
+            pkt->stream_index, pc, pkt->duration);
+    /* Interpolate PTS and DTS if they are not present. We skip H264
+     * currently because delay and has_b_frames are not reliably set. */
+    if ((delay == 0 || (delay == 1 && pc)) &&
+        onein_oneout) {
         if (presentation_delayed) {
             /* DTS = decompression timestamp */
             /* PTS = presentation timestamp */
@@ -1130,20 +1230,19 @@
             if (pkt->dts == AV_NOPTS_VALUE)
                 pkt->dts = st->cur_dts;
 
-            /* this is tricky: the dts must be incremented by the duration
-            of the frame we are displaying, i.e. the last I- or P-frame */
+            /* This is tricky: the dts must be incremented by the duration
+             * of the frame we are displaying, i.e. the last I- or P-frame. */
             if (st->last_IP_duration == 0)
                 st->last_IP_duration = pkt->duration;
-            if(pkt->dts != AV_NOPTS_VALUE)
+            if (pkt->dts != AV_NOPTS_VALUE)
                 st->cur_dts = pkt->dts + st->last_IP_duration;
-            st->last_IP_duration  = pkt->duration;
-            st->last_IP_pts= pkt->pts;
-            /* cannot compute PTS if not present (we can compute it only
-            by knowing the future */
+            st->last_IP_duration = pkt->duration;
+            st->last_IP_pts      = pkt->pts;
+            /* Cannot compute PTS if not present (we can compute it only
+             * by knowing the future. */
         } else if (pkt->pts != AV_NOPTS_VALUE ||
                    pkt->dts != AV_NOPTS_VALUE ||
                    pkt->duration                ) {
-            int duration = pkt->duration;
 
             /* presentation is not delayed : PTS and DTS are the same */
             if (pkt->pts == AV_NOPTS_VALUE)
@@ -1154,21 +1253,22 @@
                 pkt->pts = st->cur_dts;
             pkt->dts = pkt->pts;
             if (pkt->pts != AV_NOPTS_VALUE)
-                st->cur_dts = pkt->pts + duration;
+                st->cur_dts = av_add_stable(st->time_base, pkt->pts, duration, 1);
         }
     }
 
-    if(pkt->pts != AV_NOPTS_VALUE && delay <= MAX_REORDER_DELAY && has_decode_delay_been_guessed(st)){
-        st->pts_buffer[0]= pkt->pts;
-        for(i=0; i<delay && st->pts_buffer[i] > st->pts_buffer[i+1]; i++)
-            FFSWAP(int64_t, st->pts_buffer[i], st->pts_buffer[i+1]);
-        if(pkt->dts == AV_NOPTS_VALUE)
-            pkt->dts= st->pts_buffer[0];
-    }
-    if(st->codec->codec_id == AV_CODEC_ID_H264){ // we skipped it above so we try here
-        update_initial_timestamps(s, pkt->stream_index, pkt->dts, pkt->pts, pkt); // this should happen on the first packet
+    if (pkt->pts != AV_NOPTS_VALUE && delay <= MAX_REORDER_DELAY && has_decode_delay_been_guessed(st)) {
+        st->pts_buffer[0] = pkt->pts;
+        for (i = 0; i<delay && st->pts_buffer[i] > st->pts_buffer[i + 1]; i++)
+            FFSWAP(int64_t, st->pts_buffer[i], st->pts_buffer[i + 1]);
+
+        pkt->dts = select_from_pts_buffer(st, st->pts_buffer, pkt->dts);
     }
-    if(pkt->dts > st->cur_dts)
+    // We skipped it above so we try here.
+    if (!onein_oneout)
+        // This should happen on the first packet
+        update_initial_timestamps(s, pkt->stream_index, pkt->dts, pkt->pts, pkt);
+    if (pkt->dts > st->cur_dts)
         st->cur_dts = pkt->dts;
 
     av_dlog(NULL, "OUTdelayed:%d/%d pts:%s, dts:%s cur_dts:%s\n",
@@ -1193,21 +1293,21 @@
 }
 
 /**
- * Parse a packet, add all split parts to parse_queue
+ * Parse a packet, add all split parts to parse_queue.
  *
- * @param pkt packet to parse, NULL when flushing the parser at end of stream
+ * @param pkt Packet to parse, NULL when flushing the parser at end of stream.
  */
 static int parse_packet(AVFormatContext *s, AVPacket *pkt, int stream_index)
 {
     AVPacket out_pkt = { 0 }, flush_pkt = { 0 };
-    AVStream     *st = s->streams[stream_index];
-    uint8_t    *data = pkt ? pkt->data : NULL;
-    int         size = pkt ? pkt->size : 0;
+    AVStream *st = s->streams[stream_index];
+    uint8_t *data = pkt ? pkt->data : NULL;
+    int size      = pkt ? pkt->size : 0;
     int ret = 0, got_output = 0;
 
     if (!pkt) {
         av_init_packet(&flush_pkt);
-        pkt = &flush_pkt;
+        pkt        = &flush_pkt;
         got_output = 1;
     } else if (!size && st->parser->flags & PARSER_FLAG_COMPLETE_FRAMES) {
         // preserve 0-size sync packets
@@ -1218,7 +1318,7 @@
         int len;
 
         av_init_packet(&out_pkt);
-        len = av_parser_parse2(st->parser,  st->codec,
+        len = av_parser_parse2(st->parser, st->codec,
                                &out_pkt.data, &out_pkt.size, data, size,
                                pkt->pts, pkt->dts, pkt->pos);
 
@@ -1236,18 +1336,19 @@
         if (pkt->side_data) {
             out_pkt.side_data       = pkt->side_data;
             out_pkt.side_data_elems = pkt->side_data_elems;
-            pkt->side_data       = NULL;
-            pkt->side_data_elems = 0;
+            pkt->side_data          = NULL;
+            pkt->side_data_elems    = 0;
         }
 
         /* set the duration */
         out_pkt.duration = 0;
         if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO) {
             if (st->codec->sample_rate > 0) {
-                out_pkt.duration = av_rescale_q_rnd(st->parser->duration,
-                                                    (AVRational){ 1, st->codec->sample_rate },
-                                                    st->time_base,
-                                                    AV_ROUND_DOWN);
+                out_pkt.duration =
+                    av_rescale_q_rnd(st->parser->duration,
+                                     (AVRational) { 1, st->codec->sample_rate },
+                                     st->time_base,
+                                     AV_ROUND_DOWN);
             }
         } else if (st->codec->time_base.num != 0 &&
                    st->codec->time_base.den != 0) {
@@ -1258,11 +1359,11 @@
         }
 
         out_pkt.stream_index = st->index;
-        out_pkt.pts = st->parser->pts;
-        out_pkt.dts = st->parser->dts;
-        out_pkt.pos = st->parser->pos;
+        out_pkt.pts          = st->parser->pts;
+        out_pkt.dts          = st->parser->dts;
+        out_pkt.pos          = st->parser->pos;
 
-        if(st->need_parsing == AVSTREAM_PARSE_FULL_RAW)
+        if (st->need_parsing == AVSTREAM_PARSE_FULL_RAW)
             out_pkt.pos = st->parser->frame_offset;
 
         if (st->parser->key_frame == 1 ||
@@ -1270,14 +1371,14 @@
              st->parser->pict_type == AV_PICTURE_TYPE_I))
             out_pkt.flags |= AV_PKT_FLAG_KEY;
 
-        if(st->parser->key_frame == -1 && st->parser->pict_type==AV_PICTURE_TYPE_NONE && (pkt->flags&AV_PKT_FLAG_KEY))
+        if (st->parser->key_frame == -1 && st->parser->pict_type ==AV_PICTURE_TYPE_NONE && (pkt->flags&AV_PKT_FLAG_KEY))
             out_pkt.flags |= AV_PKT_FLAG_KEY;
 
         compute_pkt_fields(s, st, st->parser, &out_pkt);
 
         if (out_pkt.data == pkt->data && out_pkt.size == pkt->size) {
-            out_pkt.buf   = pkt->buf;
-            pkt->buf      = NULL;
+            out_pkt.buf = pkt->buf;
+            pkt->buf    = NULL;
 #if FF_API_DESTRUCT_PACKET
 FF_DISABLE_DEPRECATION_WARNINGS
             out_pkt.destruct = pkt->destruct;
@@ -1295,7 +1396,6 @@
         }
     }
 
-
     /* end of the stream => close and free the parser */
     if (pkt == &flush_pkt) {
         av_parser_close(st->parser);
@@ -1313,8 +1413,8 @@
 {
     AVPacketList *pktl;
     av_assert0(*pkt_buffer);
-    pktl = *pkt_buffer;
-    *pkt = pktl->pkt;
+    pktl        = *pkt_buffer;
+    *pkt        = pktl->pkt;
     *pkt_buffer = pktl->next;
     if (!pktl->next)
         *pkt_buffer_end = NULL;
@@ -1338,7 +1438,7 @@
             if (ret == AVERROR(EAGAIN))
                 return ret;
             /* flush the parsers */
-            for(i = 0; i < s->nb_streams; i++) {
+            for (i = 0; i < s->nb_streams; i++) {
                 st = s->streams[i];
                 if (st->parser && st->need_parsing)
                     parse_packet(s, NULL, st->index);
@@ -1353,20 +1453,20 @@
         if (cur_pkt.pts != AV_NOPTS_VALUE &&
             cur_pkt.dts != AV_NOPTS_VALUE &&
             cur_pkt.pts < cur_pkt.dts) {
-            av_log(s, AV_LOG_WARNING, "Invalid timestamps stream=%d, pts=%s, dts=%s, size=%d\n",
+            av_log(s, AV_LOG_WARNING,
+                   "Invalid timestamps stream=%d, pts=%s, dts=%s, size=%d\n",
                    cur_pkt.stream_index,
                    av_ts2str(cur_pkt.pts),
                    av_ts2str(cur_pkt.dts),
                    cur_pkt.size);
         }
         if (s->debug & FF_FDEBUG_TS)
-            av_log(s, AV_LOG_DEBUG, "ff_read_packet stream=%d, pts=%s, dts=%s, size=%d, duration=%d, flags=%d\n",
+            av_log(s, AV_LOG_DEBUG,
+                   "ff_read_packet stream=%d, pts=%s, dts=%s, size=%d, duration=%d, flags=%d\n",
                    cur_pkt.stream_index,
                    av_ts2str(cur_pkt.pts),
                    av_ts2str(cur_pkt.dts),
-                   cur_pkt.size,
-                   cur_pkt.duration,
-                   cur_pkt.flags);
+                   cur_pkt.size, cur_pkt.duration, cur_pkt.flags);
 
         if (st->need_parsing && !st->parser && !(s->flags & AVFMT_FLAG_NOPARSE)) {
             st->parser = av_parser_init(st->codec->codec_id);
@@ -1376,13 +1476,12 @@
                        avcodec_get_name(st->codec->codec_id));
                 /* no parser available: just output the raw packets */
                 st->need_parsing = AVSTREAM_PARSE_NONE;
-            } else if(st->need_parsing == AVSTREAM_PARSE_HEADERS) {
+            } else if (st->need_parsing == AVSTREAM_PARSE_HEADERS)
                 st->parser->flags |= PARSER_FLAG_COMPLETE_FRAMES;
-            } else if(st->need_parsing == AVSTREAM_PARSE_FULL_ONCE) {
+            else if (st->need_parsing == AVSTREAM_PARSE_FULL_ONCE)
                 st->parser->flags |= PARSER_FLAG_ONCE;
-            } else if(st->need_parsing == AVSTREAM_PARSE_FULL_RAW) {
+            else if (st->need_parsing == AVSTREAM_PARSE_FULL_RAW)
                 st->parser->flags |= PARSER_FLAG_USE_CODEC_TS;
-            }
         }
 
         if (!st->need_parsing || !st->parser) {
@@ -1392,7 +1491,8 @@
             if ((s->iformat->flags & AVFMT_GENERIC_INDEX) &&
                 (pkt->flags & AV_PKT_FLAG_KEY) && pkt->dts != AV_NOPTS_VALUE) {
                 ff_reduce_index(s, st->index);
-                av_add_index_entry(st, pkt->pos, pkt->dts, 0, 0, AVINDEX_KEYFRAME);
+                av_add_index_entry(st, pkt->pos, pkt->dts,
+                                   0, 0, AVINDEX_KEYFRAME);
             }
             got_packet = 1;
         } else if (st->discard < AVDISCARD_ALL) {
@@ -1416,14 +1516,29 @@
     if (!got_packet && s->parse_queue)
         ret = read_from_packet_buffer(&s->parse_queue, &s->parse_queue_end, pkt);
 
-    if(s->debug & FF_FDEBUG_TS)
-        av_log(s, AV_LOG_DEBUG, "read_frame_internal stream=%d, pts=%s, dts=%s, size=%d, duration=%d, flags=%d\n",
-            pkt->stream_index,
-            av_ts2str(pkt->pts),
-            av_ts2str(pkt->dts),
-            pkt->size,
-            pkt->duration,
-            pkt->flags);
+    if (ret >= 0) {
+        AVStream *st = s->streams[pkt->stream_index];
+        if (st->skip_samples) {
+            uint8_t *p = av_packet_new_side_data(pkt, AV_PKT_DATA_SKIP_SAMPLES, 10);
+            if (p) {
+                AV_WL32(p, st->skip_samples);
+                av_log(s, AV_LOG_DEBUG, "demuxer injecting skip %d\n", st->skip_samples);
+            }
+            st->skip_samples = 0;
+        }
+    }
+
+    if (ret >= 0 && !(s->flags & AVFMT_FLAG_KEEP_SIDE_DATA))
+        av_packet_merge_side_data(pkt);
+
+    if (s->debug & FF_FDEBUG_TS)
+        av_log(s, AV_LOG_DEBUG,
+               "read_frame_internal stream=%d, pts=%s, dts=%s, "
+               "size=%d, duration=%d, flags=%d\n",
+               pkt->stream_index,
+               av_ts2str(pkt->pts),
+               av_ts2str(pkt->dts),
+               pkt->size, pkt->duration, pkt->flags);
 
     return ret;
 }
@@ -1431,14 +1546,15 @@
 int av_read_frame(AVFormatContext *s, AVPacket *pkt)
 {
     const int genpts = s->flags & AVFMT_FLAG_GENPTS;
-    int          eof = 0;
+    int eof = 0;
     int ret;
     AVStream *st;
 
     if (!genpts) {
-        ret = s->packet_buffer ?
-            read_from_packet_buffer(&s->packet_buffer, &s->packet_buffer_end, pkt) :
-            read_frame_internal(s, pkt);
+        ret = s->packet_buffer
+              ? read_from_packet_buffer(&s->packet_buffer,
+                                        &s->packet_buffer_end, pkt)
+              : read_frame_internal(s, pkt);
         if (ret < 0)
             return ret;
         goto return_packet;
@@ -1458,7 +1574,8 @@
                 while (pktl && next_pkt->pts == AV_NOPTS_VALUE) {
                     if (pktl->pkt.stream_index == next_pkt->stream_index &&
                         (av_compare_mod(next_pkt->dts, pktl->pkt.dts, 2LL << (wrap_bits - 1)) < 0)) {
-                        if (av_compare_mod(pktl->pkt.pts, pktl->pkt.dts, 2LL << (wrap_bits - 1))) { //not b frame
+                        if (av_compare_mod(pktl->pkt.pts, pktl->pkt.dts, 2LL << (wrap_bits - 1))) {
+                            // not B-frame
                             next_pkt->pts = pktl->pkt.dts;
                         }
                         if (last_dts != AV_NOPTS_VALUE) {
@@ -1498,22 +1615,13 @@
         }
 
         if (av_dup_packet(add_to_pktbuf(&s->packet_buffer, pkt,
-                          &s->packet_buffer_end)) < 0)
+                                        &s->packet_buffer_end)) < 0)
             return AVERROR(ENOMEM);
     }
 
 return_packet:
 
     st = s->streams[pkt->stream_index];
-    if (st->skip_samples) {
-        uint8_t *p = av_packet_new_side_data(pkt, AV_PKT_DATA_SKIP_SAMPLES, 10);
-        if (p) {
-            AV_WL32(p, st->skip_samples);
-            av_log(s, AV_LOG_DEBUG, "demuxer injecting skip %d\n", st->skip_samples);
-        }
-        st->skip_samples = 0;
-    }
-
     if ((s->iformat->flags & AVFMT_GENERIC_INDEX) && pkt->flags & AV_PKT_FLAG_KEY) {
         ff_reduce_index(s, st->index);
         av_add_index_entry(st, pkt->pos, pkt->dts, 0, 0, AVINDEX_KEYFRAME);
@@ -1548,21 +1656,20 @@
 
     if (s->nb_streams <= 0)
         return -1;
-    for(i = 0; i < s->nb_streams; i++) {
+    for (i = 0; i < s->nb_streams; i++) {
         st = s->streams[i];
         if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO &&
             !(st->disposition & AV_DISPOSITION_ATTACHED_PIC)) {
             return i;
         }
-        if (first_audio_index < 0 && st->codec->codec_type == AVMEDIA_TYPE_AUDIO)
+        if (first_audio_index < 0 &&
+            st->codec->codec_type == AVMEDIA_TYPE_AUDIO)
             first_audio_index = i;
     }
     return first_audio_index >= 0 ? first_audio_index : 0;
 }
 
-/**
- * Flush the frame reader.
- */
+/** Flush the frame reader. */
 void ff_read_frame_flush(AVFormatContext *s)
 {
     AVStream *st;
@@ -1570,8 +1677,8 @@
 
     flush_packet_queue(s);
 
-    /* for each stream, reset read state */
-    for(i = 0; i < s->nb_streams; i++) {
+    /* Reset read state for each stream. */
+    for (i = 0; i < s->nb_streams; i++) {
         st = s->streams[i];
 
         if (st->parser) {
@@ -1579,14 +1686,17 @@
             st->parser = NULL;
         }
         st->last_IP_pts = AV_NOPTS_VALUE;
-        if(st->first_dts == AV_NOPTS_VALUE) st->cur_dts = RELATIVE_TS_BASE;
-        else                                st->cur_dts = AV_NOPTS_VALUE; /* we set the current DTS to an unspecified origin */
-        st->reference_dts = AV_NOPTS_VALUE;
+        st->last_dts_for_order_check = AV_NOPTS_VALUE;
+        if (st->first_dts == AV_NOPTS_VALUE)
+            st->cur_dts = RELATIVE_TS_BASE;
+        else
+            /* We set the current DTS to an unspecified origin. */
+            st->cur_dts = AV_NOPTS_VALUE;
 
         st->probe_packets = MAX_PROBE_PACKETS;
 
-        for(j=0; j<MAX_REORDER_DELAY+1; j++)
-            st->pts_buffer[j]= AV_NOPTS_VALUE;
+        for (j = 0; j < MAX_REORDER_DELAY + 1; j++)
+            st->pts_buffer[j] = AV_NOPTS_VALUE;
     }
 }
 
@@ -1594,40 +1704,42 @@
 {
     int i;
 
-    for(i = 0; i < s->nb_streams; i++) {
+    for (i = 0; i < s->nb_streams; i++) {
         AVStream *st = s->streams[i];
 
-        st->cur_dts = av_rescale(timestamp,
-                                 st->time_base.den * (int64_t)ref_st->time_base.num,
-                                 st->time_base.num * (int64_t)ref_st->time_base.den);
+        st->cur_dts =
+            av_rescale(timestamp,
+                       st->time_base.den * (int64_t) ref_st->time_base.num,
+                       st->time_base.num * (int64_t) ref_st->time_base.den);
     }
 }
 
 void ff_reduce_index(AVFormatContext *s, int stream_index)
 {
-    AVStream *st= s->streams[stream_index];
-    unsigned int max_entries= s->max_index_size / sizeof(AVIndexEntry);
+    AVStream *st             = s->streams[stream_index];
+    unsigned int max_entries = s->max_index_size / sizeof(AVIndexEntry);
 
-    if((unsigned)st->nb_index_entries >= max_entries){
+    if ((unsigned) st->nb_index_entries >= max_entries) {
         int i;
-        for(i=0; 2*i<st->nb_index_entries; i++)
-            st->index_entries[i]= st->index_entries[2*i];
-        st->nb_index_entries= i;
+        for (i = 0; 2 * i < st->nb_index_entries; i++)
+            st->index_entries[i] = st->index_entries[2 * i];
+        st->nb_index_entries = i;
     }
 }
 
 int ff_add_index_entry(AVIndexEntry **index_entries,
                        int *nb_index_entries,
                        unsigned int *index_entries_allocated_size,
-                       int64_t pos, int64_t timestamp, int size, int distance, int flags)
+                       int64_t pos, int64_t timestamp,
+                       int size, int distance, int flags)
 {
     AVIndexEntry *entries, *ie;
     int index;
 
-    if((unsigned)*nb_index_entries + 1 >= UINT_MAX / sizeof(AVIndexEntry))
+    if ((unsigned) *nb_index_entries + 1 >= UINT_MAX / sizeof(AVIndexEntry))
         return -1;
 
-    if(timestamp == AV_NOPTS_VALUE)
+    if (timestamp == AV_NOPTS_VALUE)
         return AVERROR(EINVAL);
 
     if (size < 0 || size > 0x3FFFFFFF)
@@ -1640,39 +1752,42 @@
                               index_entries_allocated_size,
                               (*nb_index_entries + 1) *
                               sizeof(AVIndexEntry));
-    if(!entries)
+    if (!entries)
         return -1;
 
-    *index_entries= entries;
+    *index_entries = entries;
 
-    index= ff_index_search_timestamp(*index_entries, *nb_index_entries, timestamp, AVSEEK_FLAG_ANY);
+    index = ff_index_search_timestamp(*index_entries, *nb_index_entries,
+                                      timestamp, AVSEEK_FLAG_ANY);
 
-    if(index<0){
-        index= (*nb_index_entries)++;
-        ie= &entries[index];
-        av_assert0(index==0 || ie[-1].timestamp < timestamp);
-    }else{
-        ie= &entries[index];
-        if(ie->timestamp != timestamp){
-            if(ie->timestamp <= timestamp)
+    if (index < 0) {
+        index = (*nb_index_entries)++;
+        ie    = &entries[index];
+        av_assert0(index == 0 || ie[-1].timestamp < timestamp);
+    } else {
+        ie = &entries[index];
+        if (ie->timestamp != timestamp) {
+            if (ie->timestamp <= timestamp)
                 return -1;
-            memmove(entries + index + 1, entries + index, sizeof(AVIndexEntry)*(*nb_index_entries - index));
+            memmove(entries + index + 1, entries + index,
+                    sizeof(AVIndexEntry) * (*nb_index_entries - index));
             (*nb_index_entries)++;
-        }else if(ie->pos == pos && distance < ie->min_distance) //do not reduce the distance
-            distance= ie->min_distance;
+        } else if (ie->pos == pos && distance < ie->min_distance)
+            // do not reduce the distance
+            distance = ie->min_distance;
     }
 
-    ie->pos = pos;
-    ie->timestamp = timestamp;
-    ie->min_distance= distance;
-    ie->size= size;
-    ie->flags = flags;
+    ie->pos          = pos;
+    ie->timestamp    = timestamp;
+    ie->min_distance = distance;
+    ie->size         = size;
+    ie->flags        = flags;
 
     return index;
 }
 
-int av_add_index_entry(AVStream *st,
-                       int64_t pos, int64_t timestamp, int size, int distance, int flags)
+int av_add_index_entry(AVStream *st, int64_t pos, int64_t timestamp,
+                       int size, int distance, int flags)
 {
     timestamp = wrap_timestamp(st, timestamp);
     return ff_add_index_entry(&st->index_entries, &st->nb_index_entries,
@@ -1686,36 +1801,34 @@
     int a, b, m;
     int64_t timestamp;
 
-    a = - 1;
+    a = -1;
     b = nb_entries;
 
-    //optimize appending index entries at the end
-    if(b && entries[b-1].timestamp < wanted_timestamp)
-        a= b-1;
+    // Optimize appending index entries at the end.
+    if (b && entries[b - 1].timestamp < wanted_timestamp)
+        a = b - 1;
 
     while (b - a > 1) {
-        m = (a + b) >> 1;
+        m         = (a + b) >> 1;
         timestamp = entries[m].timestamp;
-        if(timestamp >= wanted_timestamp)
+        if (timestamp >= wanted_timestamp)
             b = m;
-        if(timestamp <= wanted_timestamp)
+        if (timestamp <= wanted_timestamp)
             a = m;
     }
-    m= (flags & AVSEEK_FLAG_BACKWARD) ? a : b;
+    m = (flags & AVSEEK_FLAG_BACKWARD) ? a : b;
 
-    if(!(flags & AVSEEK_FLAG_ANY)){
-        while(m>=0 && m<nb_entries && !(entries[m].flags & AVINDEX_KEYFRAME)){
+    if (!(flags & AVSEEK_FLAG_ANY))
+        while (m >= 0 && m < nb_entries &&
+               !(entries[m].flags & AVINDEX_KEYFRAME))
             m += (flags & AVSEEK_FLAG_BACKWARD) ? -1 : 1;
-        }
-    }
 
-    if(m == nb_entries)
+    if (m == nb_entries)
         return -1;
-    return  m;
+    return m;
 }
 
-int av_index_search_timestamp(AVStream *st, int64_t wanted_timestamp,
-                              int flags)
+int av_index_search_timestamp(AVStream *st, int64_t wanted_timestamp, int flags)
 {
     return ff_index_search_timestamp(st->index_entries, st->nb_index_entries,
                                      wanted_timestamp, flags);
@@ -1730,9 +1843,10 @@
     return ts;
 }
 
-int ff_seek_frame_binary(AVFormatContext *s, int stream_index, int64_t target_ts, int flags)
+int ff_seek_frame_binary(AVFormatContext *s, int stream_index,
+                         int64_t target_ts, int flags)
 {
-    AVInputFormat *avif= s->iformat;
+    AVInputFormat *avif = s->iformat;
     int64_t av_uninit(pos_min), av_uninit(pos_max), pos, pos_limit;
     int64_t ts_min, ts_max, ts;
     int index;
@@ -1744,42 +1858,47 @@
 
     av_dlog(s, "read_seek: %d %s\n", stream_index, av_ts2str(target_ts));
 
-    ts_max=
-    ts_min= AV_NOPTS_VALUE;
-    pos_limit= -1; //gcc falsely says it may be uninitialized
+    ts_max =
+    ts_min = AV_NOPTS_VALUE;
+    pos_limit = -1; // GCC falsely says it may be uninitialized.
 
-    st= s->streams[stream_index];
-    if(st->index_entries){
+    st = s->streams[stream_index];
+    if (st->index_entries) {
         AVIndexEntry *e;
 
-        index= av_index_search_timestamp(st, target_ts, flags | AVSEEK_FLAG_BACKWARD); //FIXME whole func must be checked for non-keyframe entries in index case, especially read_timestamp()
-        index= FFMAX(index, 0);
-        e= &st->index_entries[index];
-
-        if(e->timestamp <= target_ts || e->pos == e->min_distance){
-            pos_min= e->pos;
-            ts_min= e->timestamp;
+        /* FIXME: Whole function must be checked for non-keyframe entries in
+         * index case, especially read_timestamp(). */
+        index = av_index_search_timestamp(st, target_ts,
+                                          flags | AVSEEK_FLAG_BACKWARD);
+        index = FFMAX(index, 0);
+        e     = &st->index_entries[index];
+
+        if (e->timestamp <= target_ts || e->pos == e->min_distance) {
+            pos_min = e->pos;
+            ts_min  = e->timestamp;
             av_dlog(s, "using cached pos_min=0x%"PRIx64" dts_min=%s\n",
                     pos_min, av_ts2str(ts_min));
-        }else{
-            av_assert1(index==0);
+        } else {
+            av_assert1(index == 0);
         }
 
-        index= av_index_search_timestamp(st, target_ts, flags & ~AVSEEK_FLAG_BACKWARD);
+        index = av_index_search_timestamp(st, target_ts,
+                                          flags & ~AVSEEK_FLAG_BACKWARD);
         av_assert0(index < st->nb_index_entries);
-        if(index >= 0){
-            e= &st->index_entries[index];
+        if (index >= 0) {
+            e = &st->index_entries[index];
             av_assert1(e->timestamp >= target_ts);
-            pos_max= e->pos;
-            ts_max= e->timestamp;
-            pos_limit= pos_max - e->min_distance;
-            av_dlog(s, "using cached pos_max=0x%"PRIx64" pos_limit=0x%"PRIx64" dts_max=%s\n",
-                    pos_max, pos_limit, av_ts2str(ts_max));
+            pos_max   = e->pos;
+            ts_max    = e->timestamp;
+            pos_limit = pos_max - e->min_distance;
+            av_dlog(s, "using cached pos_max=0x%"PRIx64" pos_limit=0x%"PRIx64
+                    " dts_max=%s\n", pos_max, pos_limit, av_ts2str(ts_max));
         }
     }
 
-    pos= ff_gen_search(s, stream_index, target_ts, pos_min, pos_max, pos_limit, ts_min, ts_max, flags, &ts, avif->read_timestamp);
-    if(pos<0)
+    pos = ff_gen_search(s, stream_index, target_ts, pos_min, pos_max, pos_limit,
+                        ts_min, ts_max, flags, &ts, avif->read_timestamp);
+    if (pos < 0)
         return -1;
 
     /* do the seek */
@@ -1795,28 +1914,30 @@
 int ff_find_last_ts(AVFormatContext *s, int stream_index, int64_t *ts, int64_t *pos,
                     int64_t (*read_timestamp)(struct AVFormatContext *, int , int64_t *, int64_t ))
 {
-    int64_t step= 1024;
+    int64_t step = 1024;
     int64_t limit, ts_max;
     int64_t filesize = avio_size(s->pb);
-    int64_t pos_max = filesize - 1;
-    do{
+    int64_t pos_max  = filesize - 1;
+    do {
         limit = pos_max;
         pos_max = FFMAX(0, (pos_max) - step);
-        ts_max = ff_read_timestamp(s, stream_index, &pos_max, limit, read_timestamp);
-        step += step;
-    }while(ts_max == AV_NOPTS_VALUE && 2*limit > step);
+        ts_max  = ff_read_timestamp(s, stream_index,
+                                    &pos_max, limit, read_timestamp);
+        step   += step;
+    } while (ts_max == AV_NOPTS_VALUE && 2*limit > step);
     if (ts_max == AV_NOPTS_VALUE)
         return -1;
 
-    for(;;){
+    for (;;) {
         int64_t tmp_pos = pos_max + 1;
-        int64_t tmp_ts = ff_read_timestamp(s, stream_index, &tmp_pos, INT64_MAX, read_timestamp);
-        if(tmp_ts == AV_NOPTS_VALUE)
+        int64_t tmp_ts  = ff_read_timestamp(s, stream_index,
+                                            &tmp_pos, INT64_MAX, read_timestamp);
+        if (tmp_ts == AV_NOPTS_VALUE)
             break;
         av_assert0(tmp_pos > pos_max);
         ts_max  = tmp_ts;
         pos_max = tmp_pos;
-        if(tmp_pos >= filesize)
+        if (tmp_pos >= filesize)
             break;
     }
 
@@ -1830,8 +1951,10 @@
 
 int64_t ff_gen_search(AVFormatContext *s, int stream_index, int64_t target_ts,
                       int64_t pos_min, int64_t pos_max, int64_t pos_limit,
-                      int64_t ts_min, int64_t ts_max, int flags, int64_t *ts_ret,
-                      int64_t (*read_timestamp)(struct AVFormatContext *, int , int64_t *, int64_t ))
+                      int64_t ts_min, int64_t ts_max,
+                      int flags, int64_t *ts_ret,
+                      int64_t (*read_timestamp)(struct AVFormatContext *, int,
+                                                int64_t *, int64_t))
 {
     int64_t pos, ts;
     int64_t start_pos;
@@ -1840,107 +1963,114 @@
 
     av_dlog(s, "gen_seek: %d %s\n", stream_index, av_ts2str(target_ts));
 
-    if(ts_min == AV_NOPTS_VALUE){
+    if (ts_min == AV_NOPTS_VALUE) {
         pos_min = s->data_offset;
-        ts_min = ff_read_timestamp(s, stream_index, &pos_min, INT64_MAX, read_timestamp);
+        ts_min  = ff_read_timestamp(s, stream_index, &pos_min, INT64_MAX, read_timestamp);
         if (ts_min == AV_NOPTS_VALUE)
             return -1;
     }
 
-    if(ts_min >= target_ts){
-        *ts_ret= ts_min;
+    if (ts_min >= target_ts) {
+        *ts_ret = ts_min;
         return pos_min;
     }
 
-    if(ts_max == AV_NOPTS_VALUE){
+    if (ts_max == AV_NOPTS_VALUE) {
         if ((ret = ff_find_last_ts(s, stream_index, &ts_max, &pos_max, read_timestamp)) < 0)
             return ret;
-        pos_limit= pos_max;
+        pos_limit = pos_max;
     }
 
-    if(ts_max <= target_ts){
-        *ts_ret= ts_max;
+    if (ts_max <= target_ts) {
+        *ts_ret = ts_max;
         return pos_max;
     }
 
-    if(ts_min > ts_max){
+    if (ts_min > ts_max)
         return -1;
-    }else if(ts_min == ts_max){
-        pos_limit= pos_min;
-    }
+    else if (ts_min == ts_max)
+        pos_limit = pos_min;
 
-    no_change=0;
+    no_change = 0;
     while (pos_min < pos_limit) {
-        av_dlog(s, "pos_min=0x%"PRIx64" pos_max=0x%"PRIx64" dts_min=%s dts_max=%s\n",
+        av_dlog(s,
+                "pos_min=0x%"PRIx64" pos_max=0x%"PRIx64" dts_min=%s dts_max=%s\n",
                 pos_min, pos_max, av_ts2str(ts_min), av_ts2str(ts_max));
         assert(pos_limit <= pos_max);
 
-        if(no_change==0){
-            int64_t approximate_keyframe_distance= pos_max - pos_limit;
+        if (no_change == 0) {
+            int64_t approximate_keyframe_distance = pos_max - pos_limit;
             // interpolate position (better than dichotomy)
-            pos = av_rescale(target_ts - ts_min, pos_max - pos_min, ts_max - ts_min)
-                + pos_min - approximate_keyframe_distance;
-        }else if(no_change==1){
-            // bisection, if interpolation failed to change min or max pos last time
-            pos = (pos_min + pos_limit)>>1;
-        }else{
+            pos = av_rescale(target_ts - ts_min, pos_max - pos_min,
+                             ts_max - ts_min) +
+                  pos_min - approximate_keyframe_distance;
+        } else if (no_change == 1) {
+            // bisection if interpolation did not change min / max pos last time
+            pos = (pos_min + pos_limit) >> 1;
+        } else {
             /* linear search if bisection failed, can only happen if there
-               are very few or no keyframes between min/max */
-            pos=pos_min;
+             * are very few or no keyframes between min/max */
+            pos = pos_min;
         }
-        if(pos <= pos_min)
-            pos= pos_min + 1;
-        else if(pos > pos_limit)
-            pos= pos_limit;
-        start_pos= pos;
-
-        ts = ff_read_timestamp(s, stream_index, &pos, INT64_MAX, read_timestamp); //may pass pos_limit instead of -1
-        if(pos == pos_max)
+        if (pos <= pos_min)
+            pos = pos_min + 1;
+        else if (pos > pos_limit)
+            pos = pos_limit;
+        start_pos = pos;
+
+        // May pass pos_limit instead of -1.
+        ts = ff_read_timestamp(s, stream_index, &pos, INT64_MAX, read_timestamp);
+        if (pos == pos_max)
             no_change++;
         else
-            no_change=0;
-        av_dlog(s, "%"PRId64" %"PRId64" %"PRId64" / %s %s %s target:%s limit:%"PRId64" start:%"PRId64" noc:%d\n",
+            no_change = 0;
+        av_dlog(s, "%"PRId64" %"PRId64" %"PRId64" / %s %s %s"
+                " target:%s limit:%"PRId64" start:%"PRId64" noc:%d\n",
                 pos_min, pos, pos_max,
                 av_ts2str(ts_min), av_ts2str(ts), av_ts2str(ts_max), av_ts2str(target_ts),
                 pos_limit, start_pos, no_change);
-        if(ts == AV_NOPTS_VALUE){
+        if (ts == AV_NOPTS_VALUE) {
             av_log(s, AV_LOG_ERROR, "read_timestamp() failed in the middle\n");
             return -1;
         }
         assert(ts != AV_NOPTS_VALUE);
         if (target_ts <= ts) {
             pos_limit = start_pos - 1;
-            pos_max = pos;
-            ts_max = ts;
+            pos_max   = pos;
+            ts_max    = ts;
         }
         if (target_ts >= ts) {
             pos_min = pos;
-            ts_min = ts;
+            ts_min  = ts;
         }
     }
 
-    pos = (flags & AVSEEK_FLAG_BACKWARD) ? pos_min : pos_max;
-    ts  = (flags & AVSEEK_FLAG_BACKWARD) ?  ts_min :  ts_max;
+    pos     = (flags & AVSEEK_FLAG_BACKWARD) ? pos_min : pos_max;
+    ts      = (flags & AVSEEK_FLAG_BACKWARD) ? ts_min  : ts_max;
 #if 0
     pos_min = pos;
-    ts_min = ff_read_timestamp(s, stream_index, &pos_min, INT64_MAX, read_timestamp);
+    ts_min  = ff_read_timestamp(s, stream_index, &pos_min, INT64_MAX, read_timestamp);
     pos_min++;
     ts_max = ff_read_timestamp(s, stream_index, &pos_min, INT64_MAX, read_timestamp);
     av_dlog(s, "pos=0x%"PRIx64" %s<=%s<=%s\n",
             pos, av_ts2str(ts_min), av_ts2str(target_ts), av_ts2str(ts_max));
 #endif
-    *ts_ret= ts;
+    *ts_ret = ts;
     return pos;
 }
 
-static int seek_frame_byte(AVFormatContext *s, int stream_index, int64_t pos, int flags){
+static int seek_frame_byte(AVFormatContext *s, int stream_index,
+                           int64_t pos, int flags)
+{
     int64_t pos_min, pos_max;
 
     pos_min = s->data_offset;
     pos_max = avio_size(s->pb) - 1;
 
-    if     (pos < pos_min) pos= pos_min;
-    else if(pos > pos_max) pos= pos_max;
+    if (pos < pos_min)
+        pos = pos_min;
+    else if (pos > pos_max)
+        pos = pos_max;
 
     avio_seek(s->pb, pos, SEEK_SET);
 
@@ -1949,8 +2079,8 @@
     return 0;
 }
 
-static int seek_frame_generic(AVFormatContext *s,
-                                 int stream_index, int64_t timestamp, int flags)
+static int seek_frame_generic(AVFormatContext *s, int stream_index,
+                              int64_t timestamp, int flags)
 {
     int index;
     int64_t ret;
@@ -1961,35 +2091,36 @@
 
     index = av_index_search_timestamp(st, timestamp, flags);
 
-    if(index < 0 && st->nb_index_entries && timestamp < st->index_entries[0].timestamp)
+    if (index < 0 && st->nb_index_entries &&
+        timestamp < st->index_entries[0].timestamp)
         return -1;
 
-    if(index < 0 || index==st->nb_index_entries-1){
+    if (index < 0 || index == st->nb_index_entries - 1) {
         AVPacket pkt;
-        int nonkey=0;
+        int nonkey = 0;
 
-        if(st->nb_index_entries){
+        if (st->nb_index_entries) {
             av_assert0(st->index_entries);
-            ie= &st->index_entries[st->nb_index_entries-1];
+            ie = &st->index_entries[st->nb_index_entries - 1];
             if ((ret = avio_seek(s->pb, ie->pos, SEEK_SET)) < 0)
                 return ret;
             ff_update_cur_dts(s, st, ie->timestamp);
-        }else{
+        } else {
             if ((ret = avio_seek(s->pb, s->data_offset, SEEK_SET)) < 0)
                 return ret;
         }
         for (;;) {
             int read_status;
-            do{
+            do {
                 read_status = av_read_frame(s, &pkt);
             } while (read_status == AVERROR(EAGAIN));
             if (read_status < 0)
                 break;
             av_free_packet(&pkt);
-            if(stream_index == pkt.stream_index && pkt.dts > timestamp){
-                if(pkt.flags & AV_PKT_FLAG_KEY)
+            if (stream_index == pkt.stream_index && pkt.dts > timestamp) {
+                if (pkt.flags & AV_PKT_FLAG_KEY)
                     break;
-                if(nonkey++ > 1000 && st->codec->codec_id != AV_CODEC_ID_CDGRAPHICS){
+                if (nonkey++ > 1000 && st->codec->codec_id != AV_CODEC_ID_CDGRAPHICS) {
                     av_log(s, AV_LOG_ERROR,"seek_frame_generic failed as this stream seems to contain no keyframes after the target timestamp, %d non keyframes found\n", nonkey);
                     break;
                 }
@@ -2001,10 +2132,9 @@
         return -1;
 
     ff_read_frame_flush(s);
-    if (s->iformat->read_seek){
-        if(s->iformat->read_seek(s, stream_index, timestamp, flags) >= 0)
+    if (s->iformat->read_seek)
+        if (s->iformat->read_seek(s, stream_index, timestamp, flags) >= 0)
             return 0;
-    }
     ie = &st->index_entries[index];
     if ((ret = avio_seek(s->pb, ie->pos, SEEK_SET)) < 0)
         return ret;
@@ -2026,14 +2156,15 @@
         return seek_frame_byte(s, stream_index, timestamp, flags);
     }
 
-    if(stream_index < 0){
-        stream_index= av_find_default_stream_index(s);
-        if(stream_index < 0)
+    if (stream_index < 0) {
+        stream_index = av_find_default_stream_index(s);
+        if (stream_index < 0)
             return -1;
 
-        st= s->streams[stream_index];
+        st = s->streams[stream_index];
         /* timestamp for default must be expressed in AV_TIME_BASE units */
-        timestamp = av_rescale(timestamp, st->time_base.den, AV_TIME_BASE * (int64_t)st->time_base.num);
+        timestamp = av_rescale(timestamp, st->time_base.den,
+                               AV_TIME_BASE * (int64_t) st->time_base.num);
     }
 
     /* first, we try the format specific seek */
@@ -2042,22 +2173,22 @@
         ret = s->iformat->read_seek(s, stream_index, timestamp, flags);
     } else
         ret = -1;
-    if (ret >= 0) {
+    if (ret >= 0)
         return 0;
-    }
 
-    if (s->iformat->read_timestamp && !(s->iformat->flags & AVFMT_NOBINSEARCH)) {
+    if (s->iformat->read_timestamp &&
+        !(s->iformat->flags & AVFMT_NOBINSEARCH)) {
         ff_read_frame_flush(s);
         return ff_seek_frame_binary(s, stream_index, timestamp, flags);
     } else if (!(s->iformat->flags & AVFMT_NOGENSEARCH)) {
         ff_read_frame_flush(s);
         return seek_frame_generic(s, stream_index, timestamp, flags);
-    }
-    else
+    } else
         return -1;
 }
 
-int av_seek_frame(AVFormatContext *s, int stream_index, int64_t timestamp, int flags)
+int av_seek_frame(AVFormatContext *s, int stream_index,
+                  int64_t timestamp, int flags)
 {
     int ret;
 
@@ -2079,14 +2210,15 @@
     return ret;
 }
 
-int avformat_seek_file(AVFormatContext *s, int stream_index, int64_t min_ts, int64_t ts, int64_t max_ts, int flags)
+int avformat_seek_file(AVFormatContext *s, int stream_index, int64_t min_ts,
+                       int64_t ts, int64_t max_ts, int flags)
 {
-    if(min_ts > ts || max_ts < ts)
+    if (min_ts > ts || max_ts < ts)
         return -1;
     if (stream_index < -1 || stream_index >= (int)s->nb_streams)
         return AVERROR(EINVAL);
 
-    if(s->seek2any>0)
+    if (s->seek2any>0)
         flags |= AVSEEK_FLAG_ANY;
     flags &= ~AVSEEK_FLAG_BACKWARD;
 
@@ -2105,15 +2237,16 @@
                                     AV_ROUND_DOWN | AV_ROUND_PASS_MINMAX);
         }
 
-        ret = s->iformat->read_seek2(s, stream_index, min_ts, ts, max_ts, flags);
+        ret = s->iformat->read_seek2(s, stream_index, min_ts,
+                                     ts, max_ts, flags);
 
         if (ret >= 0)
             ret = avformat_queue_attached_pictures(s);
         return ret;
     }
 
-    if(s->iformat->read_timestamp){
-        //try to seek via read_timestamp()
+    if (s->iformat->read_timestamp) {
+        // try to seek via read_timestamp()
     }
 
     // Fall back on old API if new is not implemented but old is.
@@ -2145,7 +2278,7 @@
     int i;
     AVStream *st;
 
-    for(i = 0;i < ic->nb_streams; i++) {
+    for (i = 0; i < ic->nb_streams; i++) {
         st = ic->streams[i];
         if (st->duration != AV_NOPTS_VALUE)
             return 1;
@@ -2170,47 +2303,50 @@
 
     start_time = INT64_MAX;
     start_time_text = INT64_MAX;
-    end_time = INT64_MIN;
-    duration = INT64_MIN;
-    for(i = 0;i < ic->nb_streams; i++) {
+    end_time   = INT64_MIN;
+    duration   = INT64_MIN;
+    for (i = 0; i < ic->nb_streams; i++) {
         st = ic->streams[i];
         if (st->start_time != AV_NOPTS_VALUE && st->time_base.den) {
-            start_time1= av_rescale_q(st->start_time, st->time_base, AV_TIME_BASE_Q);
+            start_time1 = av_rescale_q(st->start_time, st->time_base,
+                                       AV_TIME_BASE_Q);
             if (st->codec->codec_type == AVMEDIA_TYPE_SUBTITLE || st->codec->codec_type == AVMEDIA_TYPE_DATA) {
                 if (start_time1 < start_time_text)
                     start_time_text = start_time1;
             } else
                 start_time = FFMIN(start_time, start_time1);
-            end_time1 = AV_NOPTS_VALUE;
+            end_time1   = AV_NOPTS_VALUE;
             if (st->duration != AV_NOPTS_VALUE) {
-                end_time1 = start_time1
-                          + av_rescale_q(st->duration, st->time_base, AV_TIME_BASE_Q);
+                end_time1 = start_time1 +
+                            av_rescale_q(st->duration, st->time_base,
+                                         AV_TIME_BASE_Q);
                 end_time = FFMAX(end_time, end_time1);
             }
-            for(p = NULL; (p = av_find_program_from_stream(ic, p, i)); ){
-                if(p->start_time == AV_NOPTS_VALUE || p->start_time > start_time1)
+            for (p = NULL; (p = av_find_program_from_stream(ic, p, i)); ) {
+                if (p->start_time == AV_NOPTS_VALUE || p->start_time > start_time1)
                     p->start_time = start_time1;
-                if(p->end_time < end_time1)
+                if (p->end_time < end_time1)
                     p->end_time = end_time1;
             }
         }
         if (st->duration != AV_NOPTS_VALUE) {
-            duration1 = av_rescale_q(st->duration, st->time_base, AV_TIME_BASE_Q);
-            duration = FFMAX(duration, duration1);
+            duration1 = av_rescale_q(st->duration, st->time_base,
+                                     AV_TIME_BASE_Q);
+            duration  = FFMAX(duration, duration1);
         }
     }
     if (start_time == INT64_MAX || (start_time > start_time_text && start_time - start_time_text < AV_TIME_BASE))
         start_time = start_time_text;
-    else if(start_time > start_time_text)
+    else if (start_time > start_time_text)
         av_log(ic, AV_LOG_VERBOSE, "Ignoring outlier non primary stream starttime %f\n", start_time_text / (float)AV_TIME_BASE);
 
     if (start_time != INT64_MAX) {
         ic->start_time = start_time;
         if (end_time != INT64_MIN) {
             if (ic->nb_programs) {
-                for (i=0; i<ic->nb_programs; i++) {
+                for (i = 0; i < ic->nb_programs; i++) {
                     p = ic->programs[i];
-                    if(p->start_time != AV_NOPTS_VALUE && p->end_time > p->start_time)
+                    if (p->start_time != AV_NOPTS_VALUE && p->end_time > p->start_time)
                         duration = FFMAX(duration, p->end_time - p->start_time);
                 }
             } else
@@ -2220,13 +2356,13 @@
     if (duration != INT64_MIN && duration > 0 && ic->duration == AV_NOPTS_VALUE) {
         ic->duration = duration;
     }
-        if (ic->pb && (filesize = avio_size(ic->pb)) > 0 && ic->duration != AV_NOPTS_VALUE) {
-            /* compute the bitrate */
-            double bitrate = (double)filesize * 8.0 * AV_TIME_BASE /
-                (double)ic->duration;
-            if (bitrate >= 0 && bitrate <= INT_MAX)
-                ic->bit_rate = bitrate;
-        }
+    if (ic->pb && (filesize = avio_size(ic->pb)) > 0 && ic->duration != AV_NOPTS_VALUE) {
+        /* compute the bitrate */
+        double bitrate = (double) filesize * 8.0 * AV_TIME_BASE /
+                         (double) ic->duration;
+        if (bitrate >= 0 && bitrate <= INT_MAX)
+            ic->bit_rate = bitrate;
+    }
 }
 
 static void fill_all_stream_timings(AVFormatContext *ic)
@@ -2235,13 +2371,15 @@
     AVStream *st;
 
     update_stream_timings(ic);
-    for(i = 0;i < ic->nb_streams; i++) {
+    for (i = 0; i < ic->nb_streams; i++) {
         st = ic->streams[i];
         if (st->start_time == AV_NOPTS_VALUE) {
-            if(ic->start_time != AV_NOPTS_VALUE)
-                st->start_time = av_rescale_q(ic->start_time, AV_TIME_BASE_Q, st->time_base);
-            if(ic->duration != AV_NOPTS_VALUE)
-                st->duration = av_rescale_q(ic->duration, AV_TIME_BASE_Q, st->time_base);
+            if (ic->start_time != AV_NOPTS_VALUE)
+                st->start_time = av_rescale_q(ic->start_time, AV_TIME_BASE_Q,
+                                              st->time_base);
+            if (ic->duration != AV_NOPTS_VALUE)
+                st->duration = av_rescale_q(ic->duration, AV_TIME_BASE_Q,
+                                            st->time_base);
         }
     }
 }
@@ -2255,7 +2393,7 @@
     /* if bit_rate is already set, we believe it */
     if (ic->bit_rate <= 0) {
         int bit_rate = 0;
-        for(i=0;i<ic->nb_streams;i++) {
+        for (i = 0; i < ic->nb_streams; i++) {
             st = ic->streams[i];
             if (st->codec->bit_rate > 0) {
                 if (INT_MAX - st->codec->bit_rate < bit_rate) {
@@ -2273,11 +2411,13 @@
         ic->bit_rate != 0) {
         filesize = ic->pb ? avio_size(ic->pb) : 0;
         if (filesize > 0) {
-            for(i = 0; i < ic->nb_streams; i++) {
-                st = ic->streams[i];
+            for (i = 0; i < ic->nb_streams; i++) {
+                st      = ic->streams[i];
                 if (   st->time_base.num <= INT64_MAX / ic->bit_rate
                     && st->duration == AV_NOPTS_VALUE) {
-                    duration= av_rescale(8*filesize, st->time_base.den, ic->bit_rate*(int64_t)st->time_base.num);
+                    duration = av_rescale(8 * filesize, st->time_base.den,
+                                          ic->bit_rate *
+                                          (int64_t) st->time_base.num);
                     st->duration = duration;
                     show_warning = 1;
                 }
@@ -2285,7 +2425,8 @@
         }
     }
     if (show_warning)
-        av_log(ic, AV_LOG_WARNING, "Estimating duration from bitrate, this may be inaccurate\n");
+        av_log(ic, AV_LOG_WARNING,
+               "Estimating duration from bitrate, this may be inaccurate\n");
 }
 
 #define DURATION_MAX_READ_SIZE 250000LL
@@ -2299,19 +2440,22 @@
     int read_size, i, ret;
     int64_t end_time;
     int64_t filesize, offset, duration;
-    int retry=0;
+    int retry = 0;
 
     /* flush packet queue */
     flush_packet_queue(ic);
 
-    for (i=0; i<ic->nb_streams; i++) {
+    for (i = 0; i < ic->nb_streams; i++) {
         st = ic->streams[i];
-        if (st->start_time == AV_NOPTS_VALUE && st->first_dts == AV_NOPTS_VALUE)
-            av_log(st->codec, AV_LOG_WARNING, "start time is not set in estimate_timings_from_pts\n");
+        if (st->start_time == AV_NOPTS_VALUE &&
+            st->first_dts == AV_NOPTS_VALUE &&
+            st->codec->codec_type != AVMEDIA_TYPE_UNKNOWN)
+            av_log(st->codec, AV_LOG_WARNING,
+                   "start time is not set in estimate_timings_from_pts\n");
 
         if (st->parser) {
             av_parser_close(st->parser);
-            st->parser= NULL;
+            st->parser = NULL;
         }
     }
 
@@ -2319,24 +2463,24 @@
     /* XXX: may need to support wrapping */
     filesize = ic->pb ? avio_size(ic->pb) : 0;
     end_time = AV_NOPTS_VALUE;
-    do{
-        offset = filesize - (DURATION_MAX_READ_SIZE<<retry);
+    do {
+        offset = filesize - (DURATION_MAX_READ_SIZE << retry);
         if (offset < 0)
             offset = 0;
 
         avio_seek(ic->pb, offset, SEEK_SET);
         read_size = 0;
-        for(;;) {
-            if (read_size >= DURATION_MAX_READ_SIZE<<(FFMAX(retry-1,0)))
+        for (;;) {
+            if (read_size >= DURATION_MAX_READ_SIZE << (FFMAX(retry - 1, 0)))
                 break;
 
             do {
                 ret = ff_read_packet(ic, pkt);
-            } while(ret == AVERROR(EAGAIN));
+            } while (ret == AVERROR(EAGAIN));
             if (ret != 0)
                 break;
             read_size += pkt->size;
-            st = ic->streams[pkt->stream_index];
+            st         = ic->streams[pkt->stream_index];
             if (pkt->pts != AV_NOPTS_VALUE &&
                 (st->start_time != AV_NOPTS_VALUE ||
                  st->first_dts  != AV_NOPTS_VALUE)) {
@@ -2346,7 +2490,7 @@
                 else
                     duration -= st->first_dts;
                 if (duration > 0) {
-                    if (st->duration == AV_NOPTS_VALUE || st->info->last_duration<=0 ||
+                    if (st->duration == AV_NOPTS_VALUE || st->info->last_duration<= 0 ||
                         (st->duration < duration && FFABS(duration - st->info->last_duration) < 60LL*st->time_base.den / st->time_base.num))
                         st->duration = duration;
                     st->info->last_duration = duration;
@@ -2354,18 +2498,22 @@
             }
             av_free_packet(pkt);
         }
-    }while(   end_time==AV_NOPTS_VALUE
-           && filesize > (DURATION_MAX_READ_SIZE<<retry)
-           && ++retry <= DURATION_MAX_RETRY);
+    } while (end_time == AV_NOPTS_VALUE &&
+             filesize > (DURATION_MAX_READ_SIZE << retry) &&
+             ++retry <= DURATION_MAX_RETRY);
 
     fill_all_stream_timings(ic);
 
     avio_seek(ic->pb, old_offset, SEEK_SET);
-    for (i=0; i<ic->nb_streams; i++) {
-        st= ic->streams[i];
-        st->cur_dts= st->first_dts;
+    for (i = 0; i < ic->nb_streams; i++) {
+        int j;
+
+        st              = ic->streams[i];
+        st->cur_dts     = st->first_dts;
         st->last_IP_pts = AV_NOPTS_VALUE;
-        st->reference_dts = AV_NOPTS_VALUE;
+        st->last_dts_for_order_check = AV_NOPTS_VALUE;
+        for (j = 0; j < MAX_REORDER_DELAY + 1; j++)
+            st->pts_buffer[j] = AV_NOPTS_VALUE;
     }
 }
 
@@ -2389,7 +2537,7 @@
         ic->duration_estimation_method = AVFMT_DURATION_FROM_PTS;
     } else if (has_duration(ic)) {
         /* at least one component has timings - we use them for all
-           the components */
+         * the components */
         fill_all_stream_timings(ic);
         ic->duration_estimation_method = AVFMT_DURATION_FROM_STREAM;
     } else {
@@ -2402,13 +2550,14 @@
     {
         int i;
         AVStream av_unused *st;
-        for(i = 0;i < ic->nb_streams; i++) {
+        for (i = 0; i < ic->nb_streams; i++) {
             st = ic->streams[i];
             av_dlog(ic, "%d: start_time: %0.3f duration: %0.3f\n", i,
                     (double) st->start_time / AV_TIME_BASE,
                     (double) st->duration   / AV_TIME_BASE);
         }
-        av_dlog(ic, "stream: start_time: %0.3f duration: %0.3f bitrate=%d kb/s\n",
+        av_dlog(ic,
+                "stream: start_time: %0.3f duration: %0.3f bitrate=%d kb/s\n",
                 (double) ic->start_time / AV_TIME_BASE,
                 (double) ic->duration   / AV_TIME_BASE,
                 ic->bit_rate / 1000);
@@ -2429,7 +2578,8 @@
     case AVMEDIA_TYPE_AUDIO:
         if (!avctx->frame_size && determinable_frame_size(avctx))
             FAIL("unspecified frame size");
-        if (st->info->found_decoder >= 0 && avctx->sample_fmt == AV_SAMPLE_FMT_NONE)
+        if (st->info->found_decoder >= 0 &&
+            avctx->sample_fmt == AV_SAMPLE_FMT_NONE)
             FAIL("unspecified sample format");
         if (!avctx->sample_rate)
             FAIL("unspecified sample rate");
@@ -2452,7 +2602,7 @@
             FAIL("unspecified size");
         break;
     case AVMEDIA_TYPE_DATA:
-        if(avctx->codec_id == AV_CODEC_ID_NONE) return 1;
+        if (avctx->codec_id == AV_CODEC_ID_NONE) return 1;
     }
 
     if (avctx->codec_id == AV_CODEC_ID_NONE)
@@ -2461,11 +2611,12 @@
 }
 
 /* returns 1 or 0 if or if not decoded data was returned, or a negative error */
-static int try_decode_frame(AVFormatContext *s, AVStream *st, AVPacket *avpkt, AVDictionary **options)
+static int try_decode_frame(AVFormatContext *s, AVStream *st, AVPacket *avpkt,
+                            AVDictionary **options)
 {
     const AVCodec *codec;
     int got_picture = 1, ret = 0;
-    AVFrame *frame = avcodec_alloc_frame();
+    AVFrame *frame = av_frame_alloc();
     AVSubtitle subtitle;
     AVPacket pkt = *avpkt;
 
@@ -2479,12 +2630,12 @@
 
         if (!codec) {
             st->info->found_decoder = -1;
-            ret = -1;
+            ret                     = -1;
             goto fail;
         }
 
-        /* force thread count to 1 since the h264 decoder will not extract SPS
-         *  and PPS to extradata during multi-threaded decoding */
+        /* Force thread count to 1 since the H.264 decoder will not extract
+         * SPS and PPS to extradata during multi-threaded decoding. */
         av_dict_set(options ? options : &thread_opt, "threads", "1", 0);
         ret = avcodec_open2(st->codec, codec, options ? options : &thread_opt);
         if (!options)
@@ -2504,12 +2655,11 @@
 
     while ((pkt.size > 0 || (!pkt.data && got_picture)) &&
            ret >= 0 &&
-           (!has_codec_parameters(st, NULL)   ||
-           !has_decode_delay_been_guessed(st) ||
-           (!st->codec_info_nb_frames && st->codec->codec->capabilities & CODEC_CAP_CHANNEL_CONF))) {
+           (!has_codec_parameters(st, NULL) || !has_decode_delay_been_guessed(st) ||
+            (!st->codec_info_nb_frames &&
+             st->codec->codec->capabilities & CODEC_CAP_CHANNEL_CONF))) {
         got_picture = 0;
-        avcodec_get_frame_defaults(frame);
-        switch(st->codec->codec_type) {
+        switch (st->codec->codec_type) {
         case AVMEDIA_TYPE_VIDEO:
             ret = avcodec_decode_video2(st->codec, frame,
                                         &got_picture, &pkt);
@@ -2534,11 +2684,11 @@
         }
     }
 
-    if(!pkt.data && !got_picture)
+    if (!pkt.data && !got_picture)
         ret = -1;
 
 fail:
-    avcodec_free_frame(&frame);
+    av_frame_free(&frame);
     return ret;
 }
 
@@ -2555,14 +2705,12 @@
 enum AVCodecID ff_codec_get_id(const AVCodecTag *tags, unsigned int tag)
 {
     int i;
-    for(i=0; tags[i].id != AV_CODEC_ID_NONE;i++) {
-        if(tag == tags[i].tag)
+    for (i = 0; tags[i].id != AV_CODEC_ID_NONE; i++)
+        if (tag == tags[i].tag)
             return tags[i].id;
-    }
-    for(i=0; tags[i].id != AV_CODEC_ID_NONE; i++) {
+    for (i = 0; tags[i].id != AV_CODEC_ID_NONE; i++)
         if (avpriv_toupper4(tag) == avpriv_toupper4(tags[i].tag))
             return tags[i].id;
-    }
     return AV_CODEC_ID_NONE;
 }
 
@@ -2570,34 +2718,47 @@
 {
     if (flt) {
         switch (bps) {
-        case 32: return be ? AV_CODEC_ID_PCM_F32BE : AV_CODEC_ID_PCM_F32LE;
-        case 64: return be ? AV_CODEC_ID_PCM_F64BE : AV_CODEC_ID_PCM_F64LE;
-        default: return AV_CODEC_ID_NONE;
+        case 32:
+            return be ? AV_CODEC_ID_PCM_F32BE : AV_CODEC_ID_PCM_F32LE;
+        case 64:
+            return be ? AV_CODEC_ID_PCM_F64BE : AV_CODEC_ID_PCM_F64LE;
+        default:
+            return AV_CODEC_ID_NONE;
         }
     } else {
         bps  += 7;
         bps >>= 3;
         if (sflags & (1 << (bps - 1))) {
             switch (bps) {
-            case 1:  return AV_CODEC_ID_PCM_S8;
-            case 2:  return be ? AV_CODEC_ID_PCM_S16BE : AV_CODEC_ID_PCM_S16LE;
-            case 3:  return be ? AV_CODEC_ID_PCM_S24BE : AV_CODEC_ID_PCM_S24LE;
-            case 4:  return be ? AV_CODEC_ID_PCM_S32BE : AV_CODEC_ID_PCM_S32LE;
-            default: return AV_CODEC_ID_NONE;
+            case 1:
+                return AV_CODEC_ID_PCM_S8;
+            case 2:
+                return be ? AV_CODEC_ID_PCM_S16BE : AV_CODEC_ID_PCM_S16LE;
+            case 3:
+                return be ? AV_CODEC_ID_PCM_S24BE : AV_CODEC_ID_PCM_S24LE;
+            case 4:
+                return be ? AV_CODEC_ID_PCM_S32BE : AV_CODEC_ID_PCM_S32LE;
+            default:
+                return AV_CODEC_ID_NONE;
             }
         } else {
             switch (bps) {
-            case 1:  return AV_CODEC_ID_PCM_U8;
-            case 2:  return be ? AV_CODEC_ID_PCM_U16BE : AV_CODEC_ID_PCM_U16LE;
-            case 3:  return be ? AV_CODEC_ID_PCM_U24BE : AV_CODEC_ID_PCM_U24LE;
-            case 4:  return be ? AV_CODEC_ID_PCM_U32BE : AV_CODEC_ID_PCM_U32LE;
-            default: return AV_CODEC_ID_NONE;
+            case 1:
+                return AV_CODEC_ID_PCM_U8;
+            case 2:
+                return be ? AV_CODEC_ID_PCM_U16BE : AV_CODEC_ID_PCM_U16LE;
+            case 3:
+                return be ? AV_CODEC_ID_PCM_U24BE : AV_CODEC_ID_PCM_U24LE;
+            case 4:
+                return be ? AV_CODEC_ID_PCM_U32BE : AV_CODEC_ID_PCM_U32LE;
+            default:
+                return AV_CODEC_ID_NONE;
             }
         }
     }
 }
 
-unsigned int av_codec_get_tag(const AVCodecTag * const *tags, enum AVCodecID id)
+unsigned int av_codec_get_tag(const AVCodecTag *const *tags, enum AVCodecID id)
 {
     unsigned int tag;
     if (!av_codec_get_tag2(tags, id, &tag))
@@ -2609,7 +2770,7 @@
                       unsigned int *tag)
 {
     int i;
-    for(i=0; tags && tags[i]; i++){
+    for (i = 0; tags && tags[i]; i++) {
         const AVCodecTag *codec_tags = tags[i];
         while (codec_tags->id != AV_CODEC_ID_NONE) {
             if (codec_tags->id == id) {
@@ -2622,12 +2783,13 @@
     return 0;
 }
 
-enum AVCodecID av_codec_get_id(const AVCodecTag * const *tags, unsigned int tag)
+enum AVCodecID av_codec_get_id(const AVCodecTag *const *tags, unsigned int tag)
 {
     int i;
-    for(i=0; tags && tags[i]; i++){
-        enum AVCodecID id= ff_codec_get_id(tags[i], tag);
-        if(id!=AV_CODEC_ID_NONE) return id;
+    for (i = 0; tags && tags[i]; i++) {
+        enum AVCodecID id = ff_codec_get_id(tags[i], tag);
+        if (id != AV_CODEC_ID_NONE)
+            return id;
     }
     return AV_CODEC_ID_NONE;
 }
@@ -2635,17 +2797,20 @@
 static void compute_chapters_end(AVFormatContext *s)
 {
     unsigned int i, j;
-    int64_t max_time = s->duration + ((s->start_time == AV_NOPTS_VALUE) ? 0 : s->start_time);
+    int64_t max_time = s->duration +
+                       ((s->start_time == AV_NOPTS_VALUE) ? 0 : s->start_time);
 
     for (i = 0; i < s->nb_chapters; i++)
         if (s->chapters[i]->end == AV_NOPTS_VALUE) {
             AVChapter *ch = s->chapters[i];
-            int64_t   end = max_time ? av_rescale_q(max_time, AV_TIME_BASE_Q, ch->time_base)
-                                     : INT64_MAX;
+            int64_t end = max_time ? av_rescale_q(max_time, AV_TIME_BASE_Q,
+                                                  ch->time_base)
+                                   : INT64_MAX;
 
             for (j = 0; j < s->nb_chapters; j++) {
-                AVChapter *ch1 = s->chapters[j];
-                int64_t next_start = av_rescale_q(ch1->start, ch1->time_base, ch->time_base);
+                AVChapter *ch1     = s->chapters[j];
+                int64_t next_start = av_rescale_q(ch1->start, ch1->time_base,
+                                                  ch->time_base);
                 if (j != i && next_start > ch->start && next_start < end)
                     end = next_start;
             }
@@ -2653,28 +2818,29 @@
         }
 }
 
-static int get_std_framerate(int i){
-    if(i<60*12) return (i+1)*1001;
-    else        return ((const int[]){24,30,60,12,15,48})[i-60*12]*1000*12;
+static int get_std_framerate(int i)
+{
+    if (i < 60 * 12)
+        return (i + 1) * 1001;
+    else
+        return ((const int[]) { 24, 30, 60, 12, 15, 48 })[i - 60 * 12] * 1000 * 12;
 }
 
-/*
- * Is the time base unreliable.
+/* Is the time base unreliable?
  * This is a heuristic to balance between quick acceptance of the values in
  * the headers vs. some extra checks.
  * Old DivX and Xvid often have nonsense timebases like 1fps or 2fps.
  * MPEG-2 commonly misuses field repeat flags to store different framerates.
- * And there are "variable" fps files this needs to detect as well.
- */
-static int tb_unreliable(AVCodecContext *c){
-    if(   c->time_base.den >= 101L*c->time_base.num
-       || c->time_base.den <    5L*c->time_base.num
-/*       || c->codec_tag == AV_RL32("DIVX")
-       || c->codec_tag == AV_RL32("XVID")*/
-       || c->codec_tag == AV_RL32("mp4v")
-       || c->codec_id == AV_CODEC_ID_MPEG2VIDEO
-       || c->codec_id == AV_CODEC_ID_H264
-       )
+ * And there are "variable" fps files this needs to detect as well. */
+static int tb_unreliable(AVCodecContext *c)
+{
+    if (c->time_base.den >= 101L * c->time_base.num ||
+        c->time_base.den <    5L * c->time_base.num ||
+        // c->codec_tag == AV_RL32("DIVX") ||
+        // c->codec_tag == AV_RL32("XVID") ||
+        c->codec_tag == AV_RL32("mp4v") ||
+        c->codec_id == AV_CODEC_ID_MPEG2VIDEO ||
+        c->codec_id == AV_CODEC_ID_H264)
         return 1;
     return 0;
 }
@@ -2706,38 +2872,169 @@
     return ret;
 }
 
+int ff_get_extradata(AVCodecContext *avctx, AVIOContext *pb, int size)
+{
+    int ret = ff_alloc_extradata(avctx, size);
+    if (ret < 0)
+        return ret;
+    ret = avio_read(pb, avctx->extradata, size);
+    if (ret != size) {
+        av_freep(&avctx->extradata);
+        avctx->extradata_size = 0;
+        av_log(avctx, AV_LOG_ERROR, "Failed to read extradata of size %d\n", size);
+        return ret < 0 ? ret : AVERROR_INVALIDDATA;
+    }
+
+    return ret;
+}
+
+int ff_rfps_add_frame(AVFormatContext *ic, AVStream *st, int64_t ts)
+{
+    int i, j;
+    int64_t last = st->info->last_dts;
+
+    if (   ts != AV_NOPTS_VALUE && last != AV_NOPTS_VALUE && ts > last
+       && ts - (uint64_t)last < INT64_MAX) {
+        double dts = (is_relative(ts) ?  ts - RELATIVE_TS_BASE : ts) * av_q2d(st->time_base);
+        int64_t duration = ts - last;
+
+        if (!st->info->duration_error)
+            st->info->duration_error = av_mallocz(sizeof(st->info->duration_error[0])*2);
+        if (!st->info->duration_error)
+            return AVERROR(ENOMEM);
+
+//         if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO)
+//             av_log(NULL, AV_LOG_ERROR, "%f\n", dts);
+        for (i = 0; i<MAX_STD_TIMEBASES; i++) {
+            if (st->info->duration_error[0][1][i] < 1e10) {
+                int framerate = get_std_framerate(i);
+                double sdts = dts*framerate/(1001*12);
+                for (j= 0; j<2; j++) {
+                    int64_t ticks = llrint(sdts+j*0.5);
+                    double error= sdts - ticks + j*0.5;
+                    st->info->duration_error[j][0][i] += error;
+                    st->info->duration_error[j][1][i] += error*error;
+                }
+            }
+        }
+        st->info->duration_count++;
+        st->info->rfps_duration_sum += duration;
+
+        if (st->info->duration_count % 10 == 0) {
+            int n = st->info->duration_count;
+            for (i = 0; i<MAX_STD_TIMEBASES; i++) {
+                if (st->info->duration_error[0][1][i] < 1e10) {
+                    double a0     = st->info->duration_error[0][0][i] / n;
+                    double error0 = st->info->duration_error[0][1][i] / n - a0*a0;
+                    double a1     = st->info->duration_error[1][0][i] / n;
+                    double error1 = st->info->duration_error[1][1][i] / n - a1*a1;
+                    if (error0 > 0.04 && error1 > 0.04) {
+                        st->info->duration_error[0][1][i] = 2e10;
+                        st->info->duration_error[1][1][i] = 2e10;
+                    }
+                }
+            }
+        }
+
+        // ignore the first 4 values, they might have some random jitter
+        if (st->info->duration_count > 3 && is_relative(ts) == is_relative(last))
+            st->info->duration_gcd = av_gcd(st->info->duration_gcd, duration);
+    }
+    if (ts != AV_NOPTS_VALUE)
+        st->info->last_dts = ts;
+
+    return 0;
+}
+
+void ff_rfps_calculate(AVFormatContext *ic)
+{
+    int i, j;
+
+    for (i = 0; i < ic->nb_streams; i++) {
+        AVStream *st = ic->streams[i];
+
+        if (st->codec->codec_type != AVMEDIA_TYPE_VIDEO)
+            continue;
+        // the check for tb_unreliable() is not completely correct, since this is not about handling
+        // a unreliable/inexact time base, but a time base that is finer than necessary, as e.g.
+        // ipmovie.c produces.
+        if (tb_unreliable(st->codec) && st->info->duration_count > 15 && st->info->duration_gcd > FFMAX(1, st->time_base.den/(500LL*st->time_base.num)) && !st->r_frame_rate.num)
+            av_reduce(&st->r_frame_rate.num, &st->r_frame_rate.den, st->time_base.den, st->time_base.num * st->info->duration_gcd, INT_MAX);
+        if (st->info->duration_count>1 && !st->r_frame_rate.num
+            && tb_unreliable(st->codec)) {
+            int num = 0;
+            double best_error= 0.01;
+
+            for (j= 0; j<MAX_STD_TIMEBASES; j++) {
+                int k;
+
+                if (st->info->codec_info_duration && st->info->codec_info_duration*av_q2d(st->time_base) < (1001*12.0)/get_std_framerate(j))
+                    continue;
+                if (!st->info->codec_info_duration && 1.0 < (1001*12.0)/get_std_framerate(j))
+                    continue;
+
+                if (av_q2d(st->time_base) * st->info->rfps_duration_sum / st->info->duration_count < (1001*12.0 * 0.8)/get_std_framerate(j))
+                    continue;
+
+                for (k= 0; k<2; k++) {
+                    int n = st->info->duration_count;
+                    double a= st->info->duration_error[k][0][j] / n;
+                    double error= st->info->duration_error[k][1][j]/n - a*a;
+
+                    if (error < best_error && best_error> 0.000000001) {
+                        best_error= error;
+                        num = get_std_framerate(j);
+                    }
+                    if (error < 0.02)
+                        av_log(NULL, AV_LOG_DEBUG, "rfps: %f %f\n", get_std_framerate(j) / 12.0/1001, error);
+                }
+            }
+            // do not increase frame rate by more than 1 % in order to match a standard rate.
+            if (num && (!st->r_frame_rate.num || (double)num/(12*1001) < 1.01 * av_q2d(st->r_frame_rate)))
+                av_reduce(&st->r_frame_rate.num, &st->r_frame_rate.den, num, 12*1001, INT_MAX);
+        }
+
+        av_freep(&st->info->duration_error);
+        st->info->last_dts = AV_NOPTS_VALUE;
+        st->info->duration_count = 0;
+        st->info->rfps_duration_sum = 0;
+    }
+}
+
 int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options)
 {
     int i, count, ret = 0, j;
     int64_t read_size;
     AVStream *st;
     AVPacket pkt1, *pkt;
-    int64_t old_offset = avio_tell(ic->pb);
-    int orig_nb_streams = ic->nb_streams;        // new streams might appear, no options for those
-    int flush_codecs = ic->probesize > 0;
-
-    if(ic->pb)
-        av_log(ic, AV_LOG_DEBUG, "File position before avformat_find_stream_info() is %"PRId64"\n", avio_tell(ic->pb));
+    int64_t old_offset  = avio_tell(ic->pb);
+    // new streams might appear, no options for those
+    int orig_nb_streams = ic->nb_streams;
+    int flush_codecs    = ic->probesize > 0;
+
+    if (ic->pb)
+        av_log(ic, AV_LOG_DEBUG, "Before avformat_find_stream_info() pos: %"PRId64" bytes read:%"PRId64" seeks:%d\n",
+               avio_tell(ic->pb), ic->pb->bytes_read, ic->pb->seek_count);
 
-    for(i=0;i<ic->nb_streams;i++) {
+    for (i = 0; i < ic->nb_streams; i++) {
         const AVCodec *codec;
         AVDictionary *thread_opt = NULL;
         st = ic->streams[i];
 
         if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO ||
             st->codec->codec_type == AVMEDIA_TYPE_SUBTITLE) {
-/*            if(!st->time_base.num)
-                st->time_base= */
-            if(!st->codec->time_base.num)
-                st->codec->time_base= st->time_base;
+/*            if (!st->time_base.num)
+                st->time_base = */
+            if (!st->codec->time_base.num)
+                st->codec->time_base = st->time_base;
         }
-        //only for the split stuff
+        // only for the split stuff
         if (!st->parser && !(ic->flags & AVFMT_FLAG_NOPARSE)) {
             st->parser = av_parser_init(st->codec->codec_id);
-            if(st->parser){
-                if(st->need_parsing == AVSTREAM_PARSE_HEADERS){
+            if (st->parser) {
+                if (st->need_parsing == AVSTREAM_PARSE_HEADERS) {
                     st->parser->flags |= PARSER_FLAG_COMPLETE_FRAMES;
-                } else if(st->need_parsing == AVSTREAM_PARSE_FULL_RAW) {
+                } else if (st->need_parsing == AVSTREAM_PARSE_FULL_RAW) {
                     st->parser->flags |= PARSER_FLAG_USE_CODEC_TS;
                 }
             } else if (st->need_parsing) {
@@ -2748,27 +3045,30 @@
         }
         codec = find_decoder(ic, st, st->codec->codec_id);
 
-        /* force thread count to 1 since the h264 decoder will not extract SPS
-         *  and PPS to extradata during multi-threaded decoding */
+        /* Force thread count to 1 since the H.264 decoder will not extract
+         * SPS and PPS to extradata during multi-threaded decoding. */
         av_dict_set(options ? &options[i] : &thread_opt, "threads", "1", 0);
 
         /* Ensure that subtitle_header is properly set. */
         if (st->codec->codec_type == AVMEDIA_TYPE_SUBTITLE
-            && codec && !st->codec->codec)
-            avcodec_open2(st->codec, codec, options ? &options[i]
-                              : &thread_opt);
+            && codec && !st->codec->codec) {
+            if (avcodec_open2(st->codec, codec, options ? &options[i] : &thread_opt) < 0)
+                av_log(ic, AV_LOG_WARNING,
+                       "Failed to open codec in av_find_stream_info\n");
+        }
 
-        //try to just open decoders, in case this is enough to get parameters
+        // Try to just open decoders, in case this is enough to get parameters.
         if (!has_codec_parameters(st, NULL) && st->request_probe <= 0) {
             if (codec && !st->codec->codec)
-                avcodec_open2(st->codec, codec, options ? &options[i]
-                              : &thread_opt);
+                if (avcodec_open2(st->codec, codec, options ? &options[i] : &thread_opt) < 0)
+                    av_log(ic, AV_LOG_WARNING,
+                           "Failed to open codec in av_find_stream_info\n");
         }
         if (!options)
             av_dict_free(&thread_opt);
     }
 
-    for (i=0; i<ic->nb_streams; i++) {
+    for (i = 0; i < ic->nb_streams; i++) {
 #if FF_API_R_FRAME_RATE
         ic->streams[i]->info->last_dts = AV_NOPTS_VALUE;
 #endif
@@ -2776,25 +3076,25 @@
         ic->streams[i]->info->fps_last_dts  = AV_NOPTS_VALUE;
     }
 
-    count = 0;
+    count     = 0;
     read_size = 0;
-    for(;;) {
-        if (ff_check_interrupt(&ic->interrupt_callback)){
-            ret= AVERROR_EXIT;
+    for (;;) {
+        if (ff_check_interrupt(&ic->interrupt_callback)) {
+            ret = AVERROR_EXIT;
             av_log(ic, AV_LOG_DEBUG, "interrupted\n");
             break;
         }
 
         /* check if one codec still needs to be handled */
-        for(i=0;i<ic->nb_streams;i++) {
+        for (i = 0; i < ic->nb_streams; i++) {
             int fps_analyze_framecount = 20;
 
             st = ic->streams[i];
             if (!has_codec_parameters(st, NULL))
                 break;
-            /* if the timebase is coarse (like the usual millisecond precision
-               of mkv), we need to analyze more frames to reliably arrive at
-               the correct fps */
+            /* If the timebase is coarse (like the usual millisecond precision
+             * of mkv), we need to analyze more frames to reliably arrive at
+             * the correct fps. */
             if (av_q2d(st->time_base) > 0.0005)
                 fps_analyze_framecount *= 2;
             if (ic->fps_probe_size >= 0)
@@ -2802,11 +3102,13 @@
             if (st->disposition & AV_DISPOSITION_ATTACHED_PIC)
                 fps_analyze_framecount = 0;
             /* variable fps and no guess at the real fps */
-            if(   tb_unreliable(st->codec) && !(st->r_frame_rate.num && st->avg_frame_rate.num)
-               && st->info->duration_count < fps_analyze_framecount
-               && st->codec->codec_type == AVMEDIA_TYPE_VIDEO)
+            if (tb_unreliable(st->codec) &&
+                !(st->r_frame_rate.num && st->avg_frame_rate.num) &&
+                st->info->duration_count < fps_analyze_framecount &&
+                st->codec->codec_type == AVMEDIA_TYPE_VIDEO)
                 break;
-            if(st->parser && st->parser->parser->split && !st->codec->extradata)
+            if (st->parser && st->parser->parser->split &&
+                !st->codec->extradata)
                 break;
             if (st->first_dts == AV_NOPTS_VALUE &&
                 (st->codec->codec_type == AVMEDIA_TYPE_VIDEO ||
@@ -2814,24 +3116,25 @@
                 break;
         }
         if (i == ic->nb_streams) {
-            /* NOTE: if the format has no header, then we need to read
-               some packets to get most of the streams, so we cannot
-               stop here */
+            /* NOTE: If the format has no header, then we need to read some
+             * packets to get most of the streams, so we cannot stop here. */
             if (!(ic->ctx_flags & AVFMTCTX_NOHEADER)) {
-                /* if we found the info for all the codecs, we can stop */
+                /* If we found the info for all the codecs, we can stop. */
                 ret = count;
                 av_log(ic, AV_LOG_DEBUG, "All info found\n");
                 flush_codecs = 0;
                 break;
             }
         }
-        /* we did not get all the codec info, but we read too much data */
+        /* We did not get all the codec info, but we read too much data. */
         if (read_size >= ic->probesize) {
             ret = count;
-            av_log(ic, AV_LOG_DEBUG, "Probe buffer size limit of %d bytes reached\n", ic->probesize);
+            av_log(ic, AV_LOG_DEBUG,
+                   "Probe buffer size limit of %d bytes reached\n", ic->probesize);
             for (i = 0; i < ic->nb_streams; i++)
                 if (!ic->streams[i]->r_frame_rate.num &&
                     ic->streams[i]->info->duration_count <= 1 &&
+                    ic->streams[i]->codec->codec_type == AVMEDIA_TYPE_VIDEO &&
                     strcmp(ic->iformat->name, "image2"))
                     av_log(ic, AV_LOG_WARNING,
                            "Stream #%d: not enough frames to estimate rate; "
@@ -2839,8 +3142,8 @@
             break;
         }
 
-        /* NOTE: a new stream can be added there if no header in file
-           (AVFMTCTX_NOHEADER) */
+        /* NOTE: A new stream can be added there if no header in file
+         * (AVFMTCTX_NOHEADER). */
         ret = read_frame_internal(ic, &pkt1);
         if (ret == AVERROR(EAGAIN))
             continue;
@@ -2863,31 +3166,39 @@
                 goto find_stream_info_err;
         }
 
-        read_size += pkt->size;
-
         st = ic->streams[pkt->stream_index];
+        if (!(st->disposition & AV_DISPOSITION_ATTACHED_PIC))
+            read_size += pkt->size;
+
         if (pkt->dts != AV_NOPTS_VALUE && st->codec_info_nb_frames > 1) {
             /* check for non-increasing dts */
             if (st->info->fps_last_dts != AV_NOPTS_VALUE &&
                 st->info->fps_last_dts >= pkt->dts) {
-                av_log(ic, AV_LOG_DEBUG, "Non-increasing DTS in stream %d: "
-                       "packet %d with DTS %"PRId64", packet %d with DTS "
-                       "%"PRId64"\n", st->index, st->info->fps_last_dts_idx,
-                       st->info->fps_last_dts, st->codec_info_nb_frames, pkt->dts);
-                st->info->fps_first_dts = st->info->fps_last_dts = AV_NOPTS_VALUE;
-            }
-            /* check for a discontinuity in dts - if the difference in dts
-             * is more than 1000 times the average packet duration in the sequence,
-             * we treat it as a discontinuity */
+                av_log(ic, AV_LOG_DEBUG,
+                       "Non-increasing DTS in stream %d: packet %d with DTS "
+                       "%"PRId64", packet %d with DTS %"PRId64"\n",
+                       st->index, st->info->fps_last_dts_idx,
+                       st->info->fps_last_dts, st->codec_info_nb_frames,
+                       pkt->dts);
+                st->info->fps_first_dts =
+                st->info->fps_last_dts  = AV_NOPTS_VALUE;
+            }
+            /* Check for a discontinuity in dts. If the difference in dts
+             * is more than 1000 times the average packet duration in the
+             * sequence, we treat it as a discontinuity. */
             if (st->info->fps_last_dts != AV_NOPTS_VALUE &&
                 st->info->fps_last_dts_idx > st->info->fps_first_dts_idx &&
                 (pkt->dts - st->info->fps_last_dts) / 1000 >
-                (st->info->fps_last_dts - st->info->fps_first_dts) / (st->info->fps_last_dts_idx - st->info->fps_first_dts_idx)) {
-                av_log(ic, AV_LOG_WARNING, "DTS discontinuity in stream %d: "
-                       "packet %d with DTS %"PRId64", packet %d with DTS "
-                       "%"PRId64"\n", st->index, st->info->fps_last_dts_idx,
-                       st->info->fps_last_dts, st->codec_info_nb_frames, pkt->dts);
-                st->info->fps_first_dts = st->info->fps_last_dts = AV_NOPTS_VALUE;
+                (st->info->fps_last_dts     - st->info->fps_first_dts) /
+                (st->info->fps_last_dts_idx - st->info->fps_first_dts_idx)) {
+                av_log(ic, AV_LOG_WARNING,
+                       "DTS discontinuity in stream %d: packet %d with DTS "
+                       "%"PRId64", packet %d with DTS %"PRId64"\n",
+                       st->index, st->info->fps_last_dts_idx,
+                       st->info->fps_last_dts, st->codec_info_nb_frames,
+                       pkt->dts);
+                st->info->fps_first_dts =
+                st->info->fps_last_dts  = AV_NOPTS_VALUE;
             }
 
             /* update stored dts values */
@@ -2895,17 +3206,17 @@
                 st->info->fps_first_dts     = pkt->dts;
                 st->info->fps_first_dts_idx = st->codec_info_nb_frames;
             }
-            st->info->fps_last_dts = pkt->dts;
+            st->info->fps_last_dts     = pkt->dts;
             st->info->fps_last_dts_idx = st->codec_info_nb_frames;
         }
         if (st->codec_info_nb_frames>1) {
-            int64_t t=0;
+            int64_t t = 0;
             if (st->time_base.den > 0)
                 t = av_rescale_q(st->info->codec_info_duration, st->time_base, AV_TIME_BASE_Q);
             if (st->avg_frame_rate.num > 0)
                 t = FFMAX(t, av_rescale_q(st->codec_info_nb_frames, av_inv_q(st->avg_frame_rate), AV_TIME_BASE_Q));
 
-            if (   t==0
+            if (   t == 0
                 && st->codec_info_nb_frames>30
                 && st->info->fps_first_dts != AV_NOPTS_VALUE
                 && st->info->fps_last_dts  != AV_NOPTS_VALUE)
@@ -2917,63 +3228,33 @@
             }
             if (pkt->duration) {
                 st->info->codec_info_duration        += pkt->duration;
-                st->info->codec_info_duration_fields += st->parser && st->need_parsing && st->codec->ticks_per_frame==2 ? st->parser->repeat_pict + 1 : 2;
+                st->info->codec_info_duration_fields += st->parser && st->need_parsing && st->codec->ticks_per_frame ==2 ? st->parser->repeat_pict + 1 : 2;
             }
         }
 #if FF_API_R_FRAME_RATE
-        {
-            int64_t last = st->info->last_dts;
-
-            if(   pkt->dts != AV_NOPTS_VALUE && last != AV_NOPTS_VALUE && pkt->dts > last
-               && pkt->dts - (uint64_t)last < INT64_MAX){
-                double dts= (is_relative(pkt->dts) ?  pkt->dts - RELATIVE_TS_BASE : pkt->dts) * av_q2d(st->time_base);
-                int64_t duration= pkt->dts - last;
-
-                if (!st->info->duration_error)
-                    st->info->duration_error = av_mallocz(sizeof(st->info->duration_error[0])*2);
-                if (!st->info->duration_error)
-                    return AVERROR(ENOMEM);
-
-//                 if(st->codec->codec_type == AVMEDIA_TYPE_VIDEO)
-//                     av_log(NULL, AV_LOG_ERROR, "%f\n", dts);
-                for (i=0; i<MAX_STD_TIMEBASES; i++) {
-                    int framerate= get_std_framerate(i);
-                    double sdts= dts*framerate/(1001*12);
-                    for(j=0; j<2; j++){
-                        int64_t ticks= llrint(sdts+j*0.5);
-                        double error= sdts - ticks + j*0.5;
-                        st->info->duration_error[j][0][i] += error;
-                        st->info->duration_error[j][1][i] += error*error;
-                    }
-                }
-                st->info->duration_count++;
-                // ignore the first 4 values, they might have some random jitter
-                if (st->info->duration_count > 3 && is_relative(pkt->dts) == is_relative(last))
-                    st->info->duration_gcd = av_gcd(st->info->duration_gcd, duration);
-            }
-            if (pkt->dts != AV_NOPTS_VALUE)
-                st->info->last_dts = pkt->dts;
-        }
+        ff_rfps_add_frame(ic, st, pkt->dts);
 #endif
-        if(st->parser && st->parser->parser->split && !st->codec->extradata){
-            int i= st->parser->parser->split(st->codec, pkt->data, pkt->size);
+        if (st->parser && st->parser->parser->split && !st->codec->extradata) {
+            int i = st->parser->parser->split(st->codec, pkt->data, pkt->size);
             if (i > 0 && i < FF_MAX_EXTRADATA_SIZE) {
                 if (ff_alloc_extradata(st->codec, i))
                     return AVERROR(ENOMEM);
-                memcpy(st->codec->extradata, pkt->data, st->codec->extradata_size);
+                memcpy(st->codec->extradata, pkt->data,
+                       st->codec->extradata_size);
             }
         }
 
-        /* if still no information, we try to open the codec and to
-           decompress the frame. We try to avoid that in most cases as
-           it takes longer and uses more memory. For MPEG-4, we need to
-           decompress for QuickTime.
-
-           If CODEC_CAP_CHANNEL_CONF is set this will force decoding of at
-           least one frame of codec data, this makes sure the codec initializes
-           the channel configuration and does not only trust the values from the container.
-        */
-        try_decode_frame(ic, st, pkt, (options && i < orig_nb_streams ) ? &options[i] : NULL);
+        /* If still no information, we try to open the codec and to
+         * decompress the frame. We try to avoid that in most cases as
+         * it takes longer and uses more memory. For MPEG-4, we need to
+         * decompress for QuickTime.
+         *
+         * If CODEC_CAP_CHANNEL_CONF is set this will force decoding of at
+         * least one frame of codec data, this makes sure the codec initializes
+         * the channel configuration and does not only trust the values from
+         * the container. */
+        try_decode_frame(ic, st, pkt,
+                         (options && i < orig_nb_streams) ? &options[i] : NULL);
 
         st->codec_info_nb_frames++;
         count++;
@@ -2984,7 +3265,7 @@
         int err = 0;
         av_init_packet(&empty_pkt);
 
-        for(i=0;i<ic->nb_streams;i++) {
+        for (i = 0; i < ic->nb_streams; i++) {
 
             st = ic->streams[i];
 
@@ -2992,8 +3273,8 @@
             if (st->info->found_decoder == 1) {
                 do {
                     err = try_decode_frame(ic, st, &empty_pkt,
-                                            (options && i < orig_nb_streams) ?
-                                            &options[i] : NULL);
+                                            (options && i < orig_nb_streams)
+                                            ? &options[i] : NULL);
                 } while (err > 0 && !has_codec_parameters(st, NULL));
 
                 if (err < 0) {
@@ -3005,22 +3286,27 @@
     }
 
     // close codecs which were opened in try_decode_frame()
-    for(i=0;i<ic->nb_streams;i++) {
+    for (i = 0; i < ic->nb_streams; i++) {
         st = ic->streams[i];
         avcodec_close(st->codec);
     }
-    for(i=0;i<ic->nb_streams;i++) {
+
+    ff_rfps_calculate(ic);
+
+    for (i = 0; i < ic->nb_streams; i++) {
         st = ic->streams[i];
         if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO) {
-            if(st->codec->codec_id == AV_CODEC_ID_RAWVIDEO && !st->codec->codec_tag && !st->codec->bits_per_coded_sample){
+            if (st->codec->codec_id == AV_CODEC_ID_RAWVIDEO && !st->codec->codec_tag && !st->codec->bits_per_coded_sample) {
                 uint32_t tag= avcodec_pix_fmt_to_codec_tag(st->codec->pix_fmt);
                 if (avpriv_find_pix_fmt(ff_raw_pix_fmt_tags, tag) == st->codec->pix_fmt)
                     st->codec->codec_tag= tag;
             }
 
             /* estimate average framerate if not set by demuxer */
-            if (st->info->codec_info_duration_fields && !st->avg_frame_rate.num && st->info->codec_info_duration) {
-                int      best_fps = 0;
+            if (st->info->codec_info_duration_fields &&
+                !st->avg_frame_rate.num &&
+                st->info->codec_info_duration) {
+                int best_fps      = 0;
                 double best_error = 0.01;
 
                 if (st->info->codec_info_duration        >= INT64_MAX / st->time_base.num / 2||
@@ -3028,95 +3314,68 @@
                     st->info->codec_info_duration        < 0)
                     continue;
                 av_reduce(&st->avg_frame_rate.num, &st->avg_frame_rate.den,
-                          st->info->codec_info_duration_fields*(int64_t)st->time_base.den,
-                          st->info->codec_info_duration*2*(int64_t)st->time_base.num, 60000);
+                          st->info->codec_info_duration_fields * (int64_t) st->time_base.den,
+                          st->info->codec_info_duration * 2 * (int64_t) st->time_base.num, 60000);
 
-                /* round guessed framerate to a "standard" framerate if it's
-                 * within 1% of the original estimate*/
-                for (j = 1; j < MAX_STD_TIMEBASES; j++) {
-                    AVRational std_fps = { get_std_framerate(j), 12*1001 };
-                    double error = fabs(av_q2d(st->avg_frame_rate) / av_q2d(std_fps) - 1);
+                /* Round guessed framerate to a "standard" framerate if it's
+                 * within 1% of the original estimate. */
+                for (j = 0; j < MAX_STD_TIMEBASES; j++) {
+                    AVRational std_fps = { get_std_framerate(j), 12 * 1001 };
+                    double error       = fabs(av_q2d(st->avg_frame_rate) /
+                                              av_q2d(std_fps) - 1);
 
                     if (error < best_error) {
                         best_error = error;
                         best_fps   = std_fps.num;
                     }
                 }
-                if (best_fps) {
+                if (best_fps)
                     av_reduce(&st->avg_frame_rate.num, &st->avg_frame_rate.den,
-                              best_fps, 12*1001, INT_MAX);
-                }
-            }
-            // the check for tb_unreliable() is not completely correct, since this is not about handling
-            // a unreliable/inexact time base, but a time base that is finer than necessary, as e.g.
-            // ipmovie.c produces.
-            if (tb_unreliable(st->codec) && st->info->duration_count > 15 && st->info->duration_gcd > FFMAX(1, st->time_base.den/(500LL*st->time_base.num)) && !st->r_frame_rate.num)
-                av_reduce(&st->r_frame_rate.num, &st->r_frame_rate.den, st->time_base.den, st->time_base.num * st->info->duration_gcd, INT_MAX);
-            if (st->info->duration_count>1 && !st->r_frame_rate.num
-                && tb_unreliable(st->codec)) {
-                int num = 0;
-                double best_error= 0.01;
-
-                for (j=0; j<MAX_STD_TIMEBASES; j++) {
-                    int k;
-
-                    if(st->info->codec_info_duration && st->info->codec_info_duration*av_q2d(st->time_base) < (1001*12.0)/get_std_framerate(j))
-                        continue;
-                    if(!st->info->codec_info_duration && 1.0 < (1001*12.0)/get_std_framerate(j))
-                        continue;
-                    for(k=0; k<2; k++){
-                        int n= st->info->duration_count;
-                        double a= st->info->duration_error[k][0][j] / n;
-                        double error= st->info->duration_error[k][1][j]/n - a*a;
-
-                        if(error < best_error && best_error> 0.000000001){
-                            best_error= error;
-                            num = get_std_framerate(j);
-                        }
-                        if(error < 0.02)
-                            av_log(NULL, AV_LOG_DEBUG, "rfps: %f %f\n", get_std_framerate(j) / 12.0/1001, error);
-                    }
-                }
-                // do not increase frame rate by more than 1 % in order to match a standard rate.
-                if (num && (!st->r_frame_rate.num || (double)num/(12*1001) < 1.01 * av_q2d(st->r_frame_rate)))
-                    av_reduce(&st->r_frame_rate.num, &st->r_frame_rate.den, num, 12*1001, INT_MAX);
+                              best_fps, 12 * 1001, INT_MAX);
             }
 
-            if (!st->r_frame_rate.num){
-                if(    st->codec->time_base.den * (int64_t)st->time_base.num
-                    <= st->codec->time_base.num * st->codec->ticks_per_frame * (int64_t)st->time_base.den){
+            if (!st->r_frame_rate.num) {
+                if (    st->codec->time_base.den * (int64_t) st->time_base.num
+                    <= st->codec->time_base.num * st->codec->ticks_per_frame * (int64_t) st->time_base.den) {
                     st->r_frame_rate.num = st->codec->time_base.den;
                     st->r_frame_rate.den = st->codec->time_base.num * st->codec->ticks_per_frame;
-                }else{
+                } else {
                     st->r_frame_rate.num = st->time_base.den;
                     st->r_frame_rate.den = st->time_base.num;
                 }
             }
-        }else if(st->codec->codec_type == AVMEDIA_TYPE_AUDIO) {
-            if(!st->codec->bits_per_coded_sample)
-                st->codec->bits_per_coded_sample= av_get_bits_per_sample(st->codec->codec_id);
+        } else if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO) {
+            if (!st->codec->bits_per_coded_sample)
+                st->codec->bits_per_coded_sample =
+                    av_get_bits_per_sample(st->codec->codec_id);
             // set stream disposition based on audio service type
             switch (st->codec->audio_service_type) {
             case AV_AUDIO_SERVICE_TYPE_EFFECTS:
-                st->disposition = AV_DISPOSITION_CLEAN_EFFECTS;    break;
+                st->disposition = AV_DISPOSITION_CLEAN_EFFECTS;
+                break;
             case AV_AUDIO_SERVICE_TYPE_VISUALLY_IMPAIRED:
-                st->disposition = AV_DISPOSITION_VISUAL_IMPAIRED;  break;
+                st->disposition = AV_DISPOSITION_VISUAL_IMPAIRED;
+                break;
             case AV_AUDIO_SERVICE_TYPE_HEARING_IMPAIRED:
-                st->disposition = AV_DISPOSITION_HEARING_IMPAIRED; break;
+                st->disposition = AV_DISPOSITION_HEARING_IMPAIRED;
+                break;
             case AV_AUDIO_SERVICE_TYPE_COMMENTARY:
-                st->disposition = AV_DISPOSITION_COMMENT;          break;
+                st->disposition = AV_DISPOSITION_COMMENT;
+                break;
             case AV_AUDIO_SERVICE_TYPE_KARAOKE:
-                st->disposition = AV_DISPOSITION_KARAOKE;          break;
+                st->disposition = AV_DISPOSITION_KARAOKE;
+                break;
             }
         }
     }
 
-    if(ic->probesize)
+    if (ic->probesize)
     estimate_timings(ic, old_offset);
 
     if (ret >= 0 && ic->nb_streams)
-        ret = -1; /* we could not have all the codec parameters before EOF */
-    for(i=0;i<ic->nb_streams;i++) {
+        /* We could not have all the codec parameters before EOF. */
+        ret = -1;
+    for (i = 0; i < ic->nb_streams; i++) {
         const char *errmsg;
         st = ic->streams[i];
         if (!has_codec_parameters(st, &errmsg)) {
@@ -3133,17 +3392,18 @@
 
     compute_chapters_end(ic);
 
- find_stream_info_err:
-    for (i=0; i < ic->nb_streams; i++) {
+find_stream_info_err:
+    for (i = 0; i < ic->nb_streams; i++) {
         st = ic->streams[i];
-        if (ic->streams[i]->codec && ic->streams[i]->codec->codec_type != AVMEDIA_TYPE_AUDIO)
+        if (ic->streams[i]->codec->codec_type != AVMEDIA_TYPE_AUDIO)
             ic->streams[i]->codec->thread_count = 0;
         if (st->info)
             av_freep(&st->info->duration_error);
         av_freep(&ic->streams[i]->info);
     }
-    if(ic->pb)
-        av_log(ic, AV_LOG_DEBUG, "File position after avformat_find_stream_info() is %"PRId64"\n", avio_tell(ic->pb));
+    if (ic->pb)
+        av_log(ic, AV_LOG_DEBUG, "After avformat_find_stream_info() pos: %"PRId64" bytes read:%"PRId64" seeks:%d frames:%d\n",
+               avio_tell(ic->pb), ic->pb->bytes_read, ic->pb->seek_count, count);
     return ret;
 }
 
@@ -3164,12 +3424,9 @@
     return NULL;
 }
 
-int av_find_best_stream(AVFormatContext *ic,
-                        enum AVMediaType type,
-                        int wanted_stream_nb,
-                        int related_stream,
-                        AVCodec **decoder_ret,
-                        int flags)
+int av_find_best_stream(AVFormatContext *ic, enum AVMediaType type,
+                        int wanted_stream_nb, int related_stream,
+                        AVCodec **decoder_ret, int flags)
 {
     int i, nb_streams = ic->nb_streams;
     int ret = AVERROR_STREAM_NOT_FOUND, best_count = -1, best_bitrate = -1, best_multiframe = -1, count, bitrate, multiframe;
@@ -3179,19 +3436,23 @@
     if (related_stream >= 0 && wanted_stream_nb < 0) {
         AVProgram *p = av_find_program_from_stream(ic, NULL, related_stream);
         if (p) {
-            program = p->stream_index;
+            program    = p->stream_index;
             nb_streams = p->nb_stream_indexes;
         }
     }
     for (i = 0; i < nb_streams; i++) {
         int real_stream_index = program ? program[i] : i;
-        AVStream *st = ic->streams[real_stream_index];
+        AVStream *st          = ic->streams[real_stream_index];
         AVCodecContext *avctx = st->codec;
         if (avctx->codec_type != type)
             continue;
         if (wanted_stream_nb >= 0 && real_stream_index != wanted_stream_nb)
             continue;
-        if (st->disposition & (AV_DISPOSITION_HEARING_IMPAIRED|AV_DISPOSITION_VISUAL_IMPAIRED))
+        if (wanted_stream_nb != real_stream_index &&
+            st->disposition & (AV_DISPOSITION_HEARING_IMPAIRED |
+                               AV_DISPOSITION_VISUAL_IMPAIRED))
+            continue;
+        if (type == AVMEDIA_TYPE_AUDIO && !avctx->channels)
             continue;
         if (decoder_ret) {
             decoder = find_decoder(ic, st, st->codec->codec_id);
@@ -3208,15 +3469,16 @@
             (best_multiframe == multiframe && best_bitrate >  bitrate) ||
             (best_multiframe == multiframe && best_bitrate == bitrate && best_count >= count))
             continue;
-        best_count = count;
+        best_count   = count;
         best_bitrate = bitrate;
         best_multiframe = multiframe;
-        ret = real_stream_index;
+        ret          = real_stream_index;
         best_decoder = decoder;
         if (program && i == nb_streams - 1 && ret < 0) {
-            program = NULL;
+            program    = NULL;
             nb_streams = ic->nb_streams;
-            i = 0; /* no related stream found, try again with everything */
+            /* no related stream found, try again with everything */
+            i = 0;
         }
     }
     if (decoder_ret)
@@ -3244,9 +3506,9 @@
     return AVERROR(ENOSYS);
 }
 
-void ff_free_stream(AVFormatContext *s, AVStream *st){
+void ff_free_stream(AVFormatContext *s, AVStream *st) {
     av_assert0(s->nb_streams>0);
-    av_assert0(s->streams[ s->nb_streams-1 ] == st);
+    av_assert0(s->streams[ s->nb_streams - 1 ] == st);
 
     if (st->parser) {
         av_parser_close(st->parser);
@@ -3277,23 +3539,24 @@
     if (s->iformat && s->iformat->priv_class && s->priv_data)
         av_opt_free(s->priv_data);
 
-    for(i=s->nb_streams-1; i>=0; i--) {
+    for (i = s->nb_streams - 1; i >= 0; i--) {
         ff_free_stream(s, s->streams[i]);
     }
-    for(i=s->nb_programs-1; i>=0; i--) {
+    for (i = s->nb_programs - 1; i >= 0; i--) {
         av_dict_free(&s->programs[i]->metadata);
         av_freep(&s->programs[i]->stream_index);
         av_freep(&s->programs[i]);
     }
     av_freep(&s->programs);
     av_freep(&s->priv_data);
-    while(s->nb_chapters--) {
+    while (s->nb_chapters--) {
         av_dict_free(&s->chapters[s->nb_chapters]->metadata);
         av_freep(&s->chapters[s->nb_chapters]);
     }
     av_freep(&s->chapters);
     av_dict_free(&s->metadata);
     av_freep(&s->streams);
+    av_freep(&s->internal);
     av_free(s);
 }
 
@@ -3312,7 +3575,7 @@
     if (!ps || !*ps)
         return;
 
-    s = *ps;
+    s  = *ps;
     pb = s->pb;
 
     if ((s->iformat && s->iformat->flags & AVFMT_NOFILE) ||
@@ -3321,10 +3584,9 @@
 
     flush_packet_queue(s);
 
-    if (s->iformat) {
+    if (s->iformat)
         if (s->iformat->read_close)
             s->iformat->read_close(s);
-    }
 
     avformat_free_context(s);
 
@@ -3366,19 +3628,18 @@
     st->info->last_dts = AV_NOPTS_VALUE;
 
     st->codec = avcodec_alloc_context3(c);
-    if (s->iformat) {
+    if (s->iformat)
         /* no default bitrate if decoding */
         st->codec->bit_rate = 0;
-    }
-    st->index = s->nb_streams;
+    st->index      = s->nb_streams;
     st->start_time = AV_NOPTS_VALUE;
-    st->duration = AV_NOPTS_VALUE;
-        /* we set the current DTS to 0 so that formats without any timestamps
-           but durations get some timestamps, formats with some unknown
-           timestamps have their first few packets buffered and the
-           timestamps corrected before they are returned to the user */
-    st->cur_dts = s->iformat ? RELATIVE_TS_BASE : 0;
-    st->first_dts = AV_NOPTS_VALUE;
+    st->duration   = AV_NOPTS_VALUE;
+    /* we set the current DTS to 0 so that formats without any timestamps
+     * but durations get some timestamps, formats with some unknown
+     * timestamps have their first few packets buffered and the
+     * timestamps corrected before they are returned to the user */
+    st->cur_dts       = s->iformat ? RELATIVE_TS_BASE : 0;
+    st->first_dts     = AV_NOPTS_VALUE;
     st->probe_packets = MAX_PROBE_PACKETS;
     st->pts_wrap_reference = AV_NOPTS_VALUE;
     st->pts_wrap_behavior = AV_PTS_WRAP_IGNORE;
@@ -3386,11 +3647,11 @@
     /* default pts setting is MPEG-like */
     avpriv_set_pts_info(st, 33, 1, 90000);
     st->last_IP_pts = AV_NOPTS_VALUE;
-    for(i=0; i<MAX_REORDER_DELAY+1; i++)
-        st->pts_buffer[i]= AV_NOPTS_VALUE;
-    st->reference_dts = AV_NOPTS_VALUE;
+    st->last_dts_for_order_check = AV_NOPTS_VALUE;
+    for (i = 0; i < MAX_REORDER_DELAY + 1; i++)
+        st->pts_buffer[i] = AV_NOPTS_VALUE;
 
-    st->sample_aspect_ratio = (AVRational){0,1};
+    st->sample_aspect_ratio = (AVRational) { 0, 1 };
 
 #if FF_API_R_FRAME_RATE
     st->info->last_dts      = AV_NOPTS_VALUE;
@@ -3404,16 +3665,16 @@
 
 AVProgram *av_new_program(AVFormatContext *ac, int id)
 {
-    AVProgram *program=NULL;
+    AVProgram *program = NULL;
     int i;
 
     av_dlog(ac, "new_program: id=0x%04x\n", id);
 
-    for(i=0; i<ac->nb_programs; i++)
-        if(ac->programs[i]->id == id)
+    for (i = 0; i < ac->nb_programs; i++)
+        if (ac->programs[i]->id == id)
             program = ac->programs[i];
 
-    if(!program){
+    if (!program) {
         program = av_mallocz(sizeof(AVProgram));
         if (!program)
             return NULL;
@@ -3430,34 +3691,35 @@
     return program;
 }
 
-AVChapter *avpriv_new_chapter(AVFormatContext *s, int id, AVRational time_base, int64_t start, int64_t end, const char *title)
+AVChapter *avpriv_new_chapter(AVFormatContext *s, int id, AVRational time_base,
+                              int64_t start, int64_t end, const char *title)
 {
     AVChapter *chapter = NULL;
     int i;
 
-    for(i=0; i<s->nb_chapters; i++)
-        if(s->chapters[i]->id == id)
+    for (i = 0; i < s->nb_chapters; i++)
+        if (s->chapters[i]->id == id)
             chapter = s->chapters[i];
 
-    if(!chapter){
-        chapter= av_mallocz(sizeof(AVChapter));
-        if(!chapter)
+    if (!chapter) {
+        chapter = av_mallocz(sizeof(AVChapter));
+        if (!chapter)
             return NULL;
         dynarray_add(&s->chapters, &s->nb_chapters, chapter);
     }
     av_dict_set(&chapter->metadata, "title", title, 0);
-    chapter->id    = id;
-    chapter->time_base= time_base;
-    chapter->start = start;
-    chapter->end   = end;
+    chapter->id        = id;
+    chapter->time_base = time_base;
+    chapter->start     = start;
+    chapter->end       = end;
 
     return chapter;
 }
 
-void ff_program_add_stream_index(AVFormatContext *ac, int progid, unsigned int idx)
+void ff_program_add_stream_index(AVFormatContext *ac, int progid, unsigned idx)
 {
     int i, j;
-    AVProgram *program=NULL;
+    AVProgram *program = NULL;
     void *tmp;
 
     if (idx >= ac->nb_streams) {
@@ -3465,16 +3727,16 @@
         return;
     }
 
-    for(i=0; i<ac->nb_programs; i++){
-        if(ac->programs[i]->id != progid)
+    for (i = 0; i < ac->nb_programs; i++) {
+        if (ac->programs[i]->id != progid)
             continue;
         program = ac->programs[i];
-        for(j=0; j<program->nb_stream_indexes; j++)
-            if(program->stream_index[j] == idx)
+        for (j = 0; j < program->nb_stream_indexes; j++)
+            if (program->stream_index[j] == idx)
                 return;
 
         tmp = av_realloc_array(program->stream_index, program->nb_stream_indexes+1, sizeof(unsigned int));
-        if(!tmp)
+        if (!tmp)
             return;
         program->stream_index = tmp;
         program->stream_index[program->nb_stream_indexes++] = idx;
@@ -3482,24 +3744,29 @@
     }
 }
 
-static void print_fps(double d, const char *postfix){
-    uint64_t v= lrintf(d*100);
-    if     (v% 100      ) av_log(NULL, AV_LOG_INFO, ", %3.2f %s", d, postfix);
-    else if(v%(100*1000)) av_log(NULL, AV_LOG_INFO, ", %1.0f %s", d, postfix);
-    else                  av_log(NULL, AV_LOG_INFO, ", %1.0fk %s", d/1000, postfix);
+static void print_fps(double d, const char *postfix)
+{
+    uint64_t v = lrintf(d * 100);
+    if (v % 100)
+        av_log(NULL, AV_LOG_INFO, ", %3.2f %s", d, postfix);
+    else if (v % (100 * 1000))
+        av_log(NULL, AV_LOG_INFO, ", %1.0f %s", d, postfix);
+    else
+        av_log(NULL, AV_LOG_INFO, ", %1.0fk %s", d / 1000, postfix);
 }
 
 static void dump_metadata(void *ctx, AVDictionary *m, const char *indent)
 {
-    if(m && !(av_dict_count(m) == 1 && av_dict_get(m, "language", NULL, 0))){
-        AVDictionaryEntry *tag=NULL;
+    if (m && !(av_dict_count(m) == 1 && av_dict_get(m, "language", NULL, 0))) {
+        AVDictionaryEntry *tag = NULL;
 
         av_log(ctx, AV_LOG_INFO, "%sMetadata:\n", indent);
-        while((tag=av_dict_get(m, "", tag, AV_DICT_IGNORE_SUFFIX))) {
-            if(strcmp("language", tag->key)){
+        while ((tag = av_dict_get(m, "", tag, AV_DICT_IGNORE_SUFFIX)))
+            if (strcmp("language", tag->key)) {
                 const char *p = tag->value;
-                av_log(ctx, AV_LOG_INFO, "%s  %-16s: ", indent, tag->key);
-                while(*p) {
+                av_log(ctx, AV_LOG_INFO,
+                       "%s  %-16s: ", indent, tag->key);
+                while (*p) {
                     char tmp[256];
                     size_t len = strcspn(p, "\x8\xa\xb\xc\xd");
                     av_strlcpy(tmp, p, FFMIN(sizeof(tmp), len+1));
@@ -3511,12 +3778,12 @@
                 }
                 av_log(ctx, AV_LOG_INFO, "\n");
             }
-        }
     }
 }
 
 /* "user interface" functions */
-static void dump_stream_format(AVFormatContext *ic, int i, int index, int is_output)
+static void dump_stream_format(AVFormatContext *ic, int i,
+                               int index, int is_output)
 {
     char buf[256];
     int flags = (is_output ? ic->oformat->flags : ic->iformat->flags);
@@ -3531,30 +3798,31 @@
         av_log(NULL, AV_LOG_INFO, "[0x%x]", st->id);
     if (lang)
         av_log(NULL, AV_LOG_INFO, "(%s)", lang->value);
-    av_log(NULL, AV_LOG_DEBUG, ", %d, %d/%d", st->codec_info_nb_frames, st->time_base.num/g, st->time_base.den/g);
+    av_log(NULL, AV_LOG_DEBUG, ", %d, %d/%d", st->codec_info_nb_frames,
+           st->time_base.num / g, st->time_base.den / g);
     av_log(NULL, AV_LOG_INFO, ": %s", buf);
     if (st->sample_aspect_ratio.num && // default
         av_cmp_q(st->sample_aspect_ratio, st->codec->sample_aspect_ratio)) {
         AVRational display_aspect_ratio;
         av_reduce(&display_aspect_ratio.num, &display_aspect_ratio.den,
-                  st->codec->width*st->sample_aspect_ratio.num,
-                  st->codec->height*st->sample_aspect_ratio.den,
-                  1024*1024);
+                  st->codec->width  * st->sample_aspect_ratio.num,
+                  st->codec->height * st->sample_aspect_ratio.den,
+                  1024 * 1024);
         av_log(NULL, AV_LOG_INFO, ", SAR %d:%d DAR %d:%d",
-                 st->sample_aspect_ratio.num, st->sample_aspect_ratio.den,
-                 display_aspect_ratio.num, display_aspect_ratio.den);
+               st->sample_aspect_ratio.num, st->sample_aspect_ratio.den,
+               display_aspect_ratio.num, display_aspect_ratio.den);
     }
-    if(st->codec->codec_type == AVMEDIA_TYPE_VIDEO){
-        if(st->avg_frame_rate.den && st->avg_frame_rate.num)
+    if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO) {
+        if (st->avg_frame_rate.den && st->avg_frame_rate.num)
             print_fps(av_q2d(st->avg_frame_rate), "fps");
 #if FF_API_R_FRAME_RATE
-        if(st->r_frame_rate.den && st->r_frame_rate.num)
+        if (st->r_frame_rate.den && st->r_frame_rate.num)
             print_fps(av_q2d(st->r_frame_rate), "tbr");
 #endif
-        if(st->time_base.den && st->time_base.num)
-            print_fps(1/av_q2d(st->time_base), "tbn");
-        if(st->codec->time_base.den && st->codec->time_base.num)
-            print_fps(1/av_q2d(st->codec->time_base), "tbc");
+        if (st->time_base.den && st->time_base.num)
+            print_fps(1 / av_q2d(st->time_base), "tbn");
+        if (st->codec->time_base.den && st->codec->time_base.num)
+            print_fps(1 / av_q2d(st->codec->time_base), "tbc");
     }
     if (st->disposition & AV_DISPOSITION_DEFAULT)
         av_log(NULL, AV_LOG_INFO, " (default)");
@@ -3580,10 +3848,8 @@
     dump_metadata(NULL, st->metadata, "    ");
 }
 
-void av_dump_format(AVFormatContext *ic,
-                    int index,
-                    const char *url,
-                    int is_output)
+void av_dump_format(AVFormatContext *ic, int index,
+                    const char *url, int is_output)
 {
     int i;
     uint8_t *printed = ic->nb_streams ? av_mallocz(ic->nb_streams) : NULL;
@@ -3591,19 +3857,19 @@
         return;
 
     av_log(NULL, AV_LOG_INFO, "%s #%d, %s, %s '%s':\n",
-            is_output ? "Output" : "Input",
-            index,
-            is_output ? ic->oformat->name : ic->iformat->name,
-            is_output ? "to" : "from", url);
+           is_output ? "Output" : "Input",
+           index,
+           is_output ? ic->oformat->name : ic->iformat->name,
+           is_output ? "to" : "from", url);
     dump_metadata(NULL, ic->metadata, "  ");
     if (!is_output) {
         av_log(NULL, AV_LOG_INFO, "  Duration: ");
         if (ic->duration != AV_NOPTS_VALUE) {
             int hours, mins, secs, us;
             int64_t duration = ic->duration + 5000;
-            secs = duration / AV_TIME_BASE;
-            us = duration % AV_TIME_BASE;
-            mins = secs / 60;
+            secs  = duration / AV_TIME_BASE;
+            us    = duration % AV_TIME_BASE;
+            mins  = secs / 60;
             secs %= 60;
             hours = mins / 60;
             mins %= 60;
@@ -3616,36 +3882,38 @@
             int secs, us;
             av_log(NULL, AV_LOG_INFO, ", start: ");
             secs = ic->start_time / AV_TIME_BASE;
-            us = abs(ic->start_time % AV_TIME_BASE);
+            us   = abs(ic->start_time % AV_TIME_BASE);
             av_log(NULL, AV_LOG_INFO, "%d.%06d",
-                   secs, (int)av_rescale(us, 1000000, AV_TIME_BASE));
+                   secs, (int) av_rescale(us, 1000000, AV_TIME_BASE));
         }
         av_log(NULL, AV_LOG_INFO, ", bitrate: ");
-        if (ic->bit_rate) {
-            av_log(NULL, AV_LOG_INFO,"%d kb/s", ic->bit_rate / 1000);
-        } else {
+        if (ic->bit_rate)
+            av_log(NULL, AV_LOG_INFO, "%d kb/s", ic->bit_rate / 1000);
+        else
             av_log(NULL, AV_LOG_INFO, "N/A");
-        }
         av_log(NULL, AV_LOG_INFO, "\n");
     }
     for (i = 0; i < ic->nb_chapters; i++) {
         AVChapter *ch = ic->chapters[i];
         av_log(NULL, AV_LOG_INFO, "    Chapter #%d.%d: ", index, i);
-        av_log(NULL, AV_LOG_INFO, "start %f, ", ch->start * av_q2d(ch->time_base));
-        av_log(NULL, AV_LOG_INFO, "end %f\n",   ch->end   * av_q2d(ch->time_base));
+        av_log(NULL, AV_LOG_INFO,
+               "start %f, ", ch->start * av_q2d(ch->time_base));
+        av_log(NULL, AV_LOG_INFO,
+               "end %f\n", ch->end * av_q2d(ch->time_base));
 
         dump_metadata(NULL, ch->metadata, "    ");
     }
-    if(ic->nb_programs) {
+    if (ic->nb_programs) {
         int j, k, total = 0;
-        for(j=0; j<ic->nb_programs; j++) {
+        for (j = 0; j < ic->nb_programs; j++) {
             AVDictionaryEntry *name = av_dict_get(ic->programs[j]->metadata,
                                                   "name", NULL, 0);
             av_log(NULL, AV_LOG_INFO, "  Program %d %s\n", ic->programs[j]->id,
                    name ? name->value : "");
             dump_metadata(NULL, ic->programs[j]->metadata, "    ");
-            for(k=0; k<ic->programs[j]->nb_stream_indexes; k++) {
-                dump_stream_format(ic, ic->programs[j]->stream_index[k], index, is_output);
+            for (k = 0; k < ic->programs[j]->nb_stream_indexes; k++) {
+                dump_stream_format(ic, ic->programs[j]->stream_index[k],
+                                   index, is_output);
                 printed[ic->programs[j]->stream_index[k]] = 1;
             }
             total += ic->programs[j]->nb_stream_indexes;
@@ -3653,7 +3921,7 @@
         if (total < ic->nb_streams)
             av_log(NULL, AV_LOG_INFO, "  No Program\n");
     }
-    for(i=0;i<ic->nb_streams;i++)
+    for (i = 0; i < ic->nb_streams; i++)
         if (!printed[i])
             dump_stream_format(ic, i, index, is_output);
 
@@ -3662,11 +3930,10 @@
 
 uint64_t ff_ntp_time(void)
 {
-  return (av_gettime() / 1000) * 1000 + NTP_OFFSET_US;
+    return (av_gettime() / 1000) * 1000 + NTP_OFFSET_US;
 }
 
-int av_get_frame_filename(char *buf, int buf_size,
-                          const char *path, int number)
+int av_get_frame_filename(char *buf, int buf_size, const char *path, int number)
 {
     const char *p;
     char *q, buf1[20], c;
@@ -3675,20 +3942,19 @@
     q = buf;
     p = path;
     percentd_found = 0;
-    for(;;) {
+    for (;;) {
         c = *p++;
         if (c == '\0')
             break;
         if (c == '%') {
             do {
                 nd = 0;
-                while (av_isdigit(*p)) {
+                while (av_isdigit(*p))
                     nd = nd * 10 + *p++ - '0';
-                }
                 c = *p++;
             } while (av_isdigit(c));
 
-            switch(c) {
+            switch (c) {
             case '%':
                 goto addchar;
             case 'd':
@@ -3706,7 +3972,7 @@
                 goto fail;
             }
         } else {
-        addchar:
+addchar:
             if ((q - buf) < buf_size - 1)
                 *q++ = c;
         }
@@ -3715,38 +3981,44 @@
         goto fail;
     *q = '\0';
     return 0;
- fail:
+fail:
     *q = '\0';
     return -1;
 }
 
+#define HEXDUMP_PRINT(...)                      \
+    do {                                        \
+        if (!f)                                 \
+            av_log(avcl, level, __VA_ARGS__);   \
+        else                                    \
+            fprintf(f, __VA_ARGS__);            \
+    } while (0)
+
 static void hex_dump_internal(void *avcl, FILE *f, int level,
                               const uint8_t *buf, int size)
 {
     int len, i, j, c;
-#define PRINT(...) do { if (!f) av_log(avcl, level, __VA_ARGS__); else fprintf(f, __VA_ARGS__); } while(0)
 
-    for(i=0;i<size;i+=16) {
+    for (i = 0; i < size; i += 16) {
         len = size - i;
         if (len > 16)
             len = 16;
-        PRINT("%08x ", i);
-        for(j=0;j<16;j++) {
+        HEXDUMP_PRINT("%08x ", i);
+        for (j = 0; j < 16; j++) {
             if (j < len)
-                PRINT(" %02x", buf[i+j]);
+                HEXDUMP_PRINT(" %02x", buf[i + j]);
             else
-                PRINT("   ");
+                HEXDUMP_PRINT("   ");
         }
-        PRINT(" ");
-        for(j=0;j<len;j++) {
-            c = buf[i+j];
+        HEXDUMP_PRINT(" ");
+        for (j = 0; j < len; j++) {
+            c = buf[i + j];
             if (c < ' ' || c > '~')
                 c = '.';
-            PRINT("%c", c);
+            HEXDUMP_PRINT("%c", c);
         }
-        PRINT("\n");
+        HEXDUMP_PRINT("\n");
     }
-#undef PRINT
 }
 
 void av_hex_dump(FILE *f, const uint8_t *buf, int size)
@@ -3759,27 +4031,26 @@
     hex_dump_internal(avcl, NULL, level, buf, size);
 }
 
-static void pkt_dump_internal(void *avcl, FILE *f, int level, AVPacket *pkt, int dump_payload, AVRational time_base)
+static void pkt_dump_internal(void *avcl, FILE *f, int level, AVPacket *pkt,
+                              int dump_payload, AVRational time_base)
 {
-#define PRINT(...) do { if (!f) av_log(avcl, level, __VA_ARGS__); else fprintf(f, __VA_ARGS__); } while(0)
-    PRINT("stream #%d:\n", pkt->stream_index);
-    PRINT("  keyframe=%d\n", ((pkt->flags & AV_PKT_FLAG_KEY) != 0));
-    PRINT("  duration=%0.3f\n", pkt->duration * av_q2d(time_base));
+    HEXDUMP_PRINT("stream #%d:\n", pkt->stream_index);
+    HEXDUMP_PRINT("  keyframe=%d\n", (pkt->flags & AV_PKT_FLAG_KEY) != 0);
+    HEXDUMP_PRINT("  duration=%0.3f\n", pkt->duration * av_q2d(time_base));
     /* DTS is _always_ valid after av_read_frame() */
-    PRINT("  dts=");
+    HEXDUMP_PRINT("  dts=");
     if (pkt->dts == AV_NOPTS_VALUE)
-        PRINT("N/A");
+        HEXDUMP_PRINT("N/A");
     else
-        PRINT("%0.3f", pkt->dts * av_q2d(time_base));
+        HEXDUMP_PRINT("%0.3f", pkt->dts * av_q2d(time_base));
     /* PTS may not be known if B-frames are present. */
-    PRINT("  pts=");
+    HEXDUMP_PRINT("  pts=");
     if (pkt->pts == AV_NOPTS_VALUE)
-        PRINT("N/A");
+        HEXDUMP_PRINT("N/A");
     else
-        PRINT("%0.3f", pkt->pts * av_q2d(time_base));
-    PRINT("\n");
-    PRINT("  size=%d\n", pkt->size);
-#undef PRINT
+        HEXDUMP_PRINT("%0.3f", pkt->pts * av_q2d(time_base));
+    HEXDUMP_PRINT("\n");
+    HEXDUMP_PRINT("  size=%d\n", pkt->size);
     if (dump_payload)
         av_hex_dump(f, pkt->data, pkt->size);
 }
@@ -3798,24 +4069,29 @@
 void av_url_split(char *proto, int proto_size,
                   char *authorization, int authorization_size,
                   char *hostname, int hostname_size,
-                  int *port_ptr,
-                  char *path, int path_size,
-                  const char *url)
+                  int *port_ptr, char *path, int path_size, const char *url)
 {
     const char *p, *ls, *ls2, *at, *at2, *col, *brk;
 
-    if (port_ptr)               *port_ptr = -1;
-    if (proto_size > 0)         proto[0] = 0;
-    if (authorization_size > 0) authorization[0] = 0;
-    if (hostname_size > 0)      hostname[0] = 0;
-    if (path_size > 0)          path[0] = 0;
+    if (port_ptr)
+        *port_ptr = -1;
+    if (proto_size > 0)
+        proto[0] = 0;
+    if (authorization_size > 0)
+        authorization[0] = 0;
+    if (hostname_size > 0)
+        hostname[0] = 0;
+    if (path_size > 0)
+        path[0] = 0;
 
     /* parse protocol */
     if ((p = strchr(url, ':'))) {
         av_strlcpy(proto, url, FFMIN(proto_size, p + 1 - url));
         p++; /* skip ':' */
-        if (*p == '/') p++;
-        if (*p == '/') p++;
+        if (*p == '/')
+            p++;
+        if (*p == '/')
+            p++;
     } else {
         /* no protocol means plain filename */
         av_strlcpy(path, url, path_size);
@@ -3825,14 +4101,14 @@
     /* separate path from hostname */
     ls = strchr(p, '/');
     ls2 = strchr(p, '?');
-    if(!ls)
+    if (!ls)
         ls = ls2;
     else if (ls && ls2)
         ls = FFMIN(ls, ls2);
-    if(ls)
+    if (ls)
         av_strlcpy(path, ls, path_size);
     else
-        ls = &p[strlen(p)]; // XXX
+        ls = &p[strlen(p)];  // XXX
 
     /* the rest is hostname, use that to parse auth/port */
     if (ls != p) {
@@ -3853,7 +4129,8 @@
         } else if ((col = strchr(p, ':')) && col < ls) {
             av_strlcpy(hostname, p,
                        FFMIN(col + 1 - p, hostname_size));
-            if (port_ptr) *port_ptr = atoi(col + 1);
+            if (port_ptr)
+                *port_ptr = atoi(col + 1);
         } else
             av_strlcpy(hostname, p,
                        FFMIN(ls + 1 - p, hostname_size));
@@ -3873,7 +4150,7 @@
                                            'c', 'd', 'e', 'f' };
     const char *hex_table = lowercase ? hex_table_lc : hex_table_uc;
 
-    for(i = 0; i < s; i++) {
+    for (i = 0; i < s; i++) {
         buff[i * 2]     = hex_table[src[i] >> 4];
         buff[i * 2 + 1] = hex_table[src[i] & 0xF];
     }
@@ -3886,7 +4163,7 @@
     int c, len, v;
 
     len = 0;
-    v = 1;
+    v   = 1;
     for (;;) {
         p += strspn(p, SPACE_CHARS);
         if (*p == '\0')
@@ -3921,17 +4198,23 @@
                          unsigned int pts_num, unsigned int pts_den)
 {
     AVRational new_tb;
-    if(av_reduce(&new_tb.num, &new_tb.den, pts_num, pts_den, INT_MAX)){
-        if(new_tb.num != pts_num)
-            av_log(NULL, AV_LOG_DEBUG, "st:%d removing common factor %d from timebase\n", s->index, pts_num/new_tb.num);
-    }else
-        av_log(NULL, AV_LOG_WARNING, "st:%d has too large timebase, reducing\n", s->index);
+    if (av_reduce(&new_tb.num, &new_tb.den, pts_num, pts_den, INT_MAX)) {
+        if (new_tb.num != pts_num)
+            av_log(NULL, AV_LOG_DEBUG,
+                   "st:%d removing common factor %d from timebase\n",
+                   s->index, pts_num / new_tb.num);
+    } else
+        av_log(NULL, AV_LOG_WARNING,
+               "st:%d has too large timebase, reducing\n", s->index);
 
-    if(new_tb.num <= 0 || new_tb.den <= 0) {
-        av_log(NULL, AV_LOG_ERROR, "Ignoring attempt to set invalid timebase %d/%d for st:%d\n", new_tb.num, new_tb.den, s->index);
+    if (new_tb.num <= 0 || new_tb.den <= 0) {
+        av_log(NULL, AV_LOG_ERROR,
+               "Ignoring attempt to set invalid timebase %d/%d for st:%d\n",
+               new_tb.num, new_tb.den,
+               s->index);
         return;
     }
-    s->time_base = new_tb;
+    s->time_base     = new_tb;
     av_codec_set_pkt_timebase(s->codec, new_tb);
     s->pts_wrap_bits = pts_wrap_bits;
 }
@@ -3993,16 +4276,15 @@
 int ff_find_stream_index(AVFormatContext *s, int id)
 {
     int i;
-    for (i = 0; i < s->nb_streams; i++) {
+    for (i = 0; i < s->nb_streams; i++)
         if (s->streams[i]->id == id)
             return i;
-    }
     return -1;
 }
 
 int64_t ff_iso8601_to_unix_time(const char *datestr)
 {
-    struct tm time1 = {0}, time2 = {0};
+    struct tm time1 = { 0 }, time2 = { 0 };
     char *ret1, *ret2;
     ret1 = av_small_strptime(datestr, "%Y - %m - %d %H:%M:%S", &time1);
     ret2 = av_small_strptime(datestr, "%Y - %m - %dT%H:%M:%S", &time2);
@@ -4012,14 +4294,16 @@
         return av_timegm(&time1);
 }
 
-int avformat_query_codec(AVOutputFormat *ofmt, enum AVCodecID codec_id, int std_compliance)
+int avformat_query_codec(AVOutputFormat *ofmt, enum AVCodecID codec_id,
+                         int std_compliance)
 {
     if (ofmt) {
         if (ofmt->query_codec)
             return ofmt->query_codec(codec_id, std_compliance);
         else if (ofmt->codec_tag)
             return !!av_codec_get_tag(ofmt->codec_tag, codec_id);
-        else if (codec_id == ofmt->video_codec || codec_id == ofmt->audio_codec ||
+        else if (codec_id == ofmt->video_codec ||
+                 codec_id == ofmt->audio_codec ||
                  codec_id == ofmt->subtitle_codec)
             return 1;
     }
@@ -4057,19 +4341,19 @@
     if (!pkt)
         return AVERROR(EINVAL);
     if (channels) {
-        size += 4;
+        size  += 4;
         flags |= AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_COUNT;
     }
     if (channel_layout) {
-        size += 8;
+        size  += 8;
         flags |= AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_LAYOUT;
     }
     if (sample_rate) {
-        size += 4;
+        size  += 4;
         flags |= AV_SIDE_DATA_PARAM_CHANGE_SAMPLE_RATE;
     }
     if (width || height) {
-        size += 8;
+        size  += 8;
         flags |= AV_SIDE_DATA_PARAM_CHANGE_DIMENSIONS;
     }
     data = av_packet_new_side_data(pkt, AV_PKT_DATA_PARAM_CHANGE, size);
@@ -4115,10 +4399,16 @@
 AVRational av_guess_frame_rate(AVFormatContext *format, AVStream *st, AVFrame *frame)
 {
     AVRational fr = st->r_frame_rate;
+    AVRational codec_fr = av_inv_q(st->codec->time_base);
+    AVRational   avg_fr = st->avg_frame_rate;
+
+    if (avg_fr.num > 0 && avg_fr.den > 0 && fr.num > 0 && fr.den > 0 &&
+        av_q2d(avg_fr) < 70 && av_q2d(fr) > 210) {
+        fr = avg_fr;
+    }
+
 
     if (st->codec->ticks_per_frame > 1) {
-        AVRational codec_fr = av_inv_q(st->codec->time_base);
-        AVRational   avg_fr = st->avg_frame_rate;
         codec_fr.den *= st->codec->ticks_per_frame;
         if (   codec_fr.num > 0 && codec_fr.den > 0 && av_q2d(codec_fr) < av_q2d(fr)*0.7
             && fabs(1.0 - av_q2d(av_div_q(avg_fr, fr))) > 0.1)
@@ -4189,7 +4479,7 @@
     return AVERROR(EINVAL);
 }
 
-void ff_generate_avci_extradata(AVStream *st)
+int ff_generate_avci_extradata(AVStream *st)
 {
     static const uint8_t avci100_1080p_extradata[] = {
         // SPS
@@ -4256,8 +4546,10 @@
         0x00, 0x00, 0x00, 0x01, 0x68, 0xce, 0x31, 0x12,
         0x11
     };
-    int size = 0;
-    const uint8_t *data = 0;
+
+    const uint8_t *data = NULL;
+    int size            = 0;
+
     if (st->codec->width == 1920) {
         if (st->codec->field_order == AV_FIELD_PROGRESSIVE) {
             data = avci100_1080p_extradata;
@@ -4273,10 +4565,14 @@
         data = avci100_720p_extradata;
         size = sizeof(avci100_720p_extradata);
     }
+
     if (!size)
-        return;
+        return 0;
+
     av_freep(&st->codec->extradata);
     if (ff_alloc_extradata(st->codec, size))
-        return;
+        return AVERROR(ENOMEM);
     memcpy(st->codec->extradata, data, size);
+
+    return 0;
 }

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/vc1test.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/vc1test.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/version.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/version.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/vqf.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/vqf.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/wavdec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/wavdec.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/wavenc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/wavenc.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/wc3movie.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/wc3movie.c Changed

@@ -27,6 +27,7 @@
  *   http://www.pcisys.net/~melanson/codecs/
  */
 
+#include "libavutil/avstring.h"
 #include "libavutil/channel_layout.h"
 #include "libavutil/intreadwrite.h"
 #include "libavutil/dict.h"
@@ -249,10 +250,16 @@
             else {
                 int i = 0;
                 av_log (s, AV_LOG_DEBUG, "Subtitle time!\n");
+                if (i >= size || av_strnlen(&text[i + 1], size - i - 1) >= size - i - 1)
+                    return AVERROR_INVALIDDATA;
                 av_log (s, AV_LOG_DEBUG, "  inglish: %s\n", &text[i + 1]);
                 i += text[i] + 1;
+                if (i >= size || av_strnlen(&text[i + 1], size - i - 1) >= size - i - 1)
+                    return AVERROR_INVALIDDATA;
                 av_log (s, AV_LOG_DEBUG, "  doytsch: %s\n", &text[i + 1]);
                 i += text[i] + 1;
+                if (i >= size || av_strnlen(&text[i + 1], size - i - 1) >= size - i - 1)
+                    return AVERROR_INVALIDDATA;
                 av_log (s, AV_LOG_DEBUG, "  fronsay: %s\n", &text[i + 1]);
             }
 #endif

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/webvttdec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/webvttdec.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/westwood_vqa.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/westwood_vqa.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/wtv.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/wtv.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/wtv_common.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/wtv_common.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/wtvdec.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/wtvdec.c Changed

@@ -153,6 +153,7 @@
     AVIOContext *pb;
     WtvFile *wf;
     uint8_t *buffer;
+    int64_t size;
 
     if (seek_by_sector(s->pb, first_sector, 0) < 0)
         return NULL;
@@ -205,7 +206,8 @@
         return NULL;
     }
 
-    if ((int64_t)wf->sectors[wf->nb_sectors - 1] << WTV_SECTOR_BITS > avio_tell(s->pb))
+    size = avio_size(s->pb);
+    if (size >= 0 && (int64_t)wf->sectors[wf->nb_sectors - 1] << WTV_SECTOR_BITS > size)
         av_log(s, AV_LOG_WARNING, "truncated file\n");
 
     /* check length */
@@ -370,10 +372,6 @@
 static const ff_asf_guid mediasubtype_mpeg2_sections =
     {0x79,0x85,0x9F,0x4A,0xF8,0x6B,0x92,0x43,0x8A,0x6D,0xD2,0xDD,0x09,0xFA,0x78,0x61};
 
-/* Formats */
-static const ff_asf_guid format_videoinfo2 =
-    {0xA0,0x76,0x2A,0xF7,0x0A,0xEB,0xD0,0x11,0xAC,0xE4,0x00,0x00,0xC0,0xCC,0x16,0xBA};
-
 static int read_probe(AVProbeData *p)
 {
     return ff_guidcmp(p->buf, ff_wtv_guid) ? 0 : AVPROBE_SCORE_MAX;
@@ -506,7 +504,7 @@
         else
             snprintf(buf, buf_size, "%"PRIi64, num);
     } else if (type == 5 && length == 2) {
-        snprintf(buf, buf_size, "%"PRIi16, avio_rl16(pb));
+        snprintf(buf, buf_size, "%u", avio_rl16(pb));
     } else if (type == 6 && length == 16) {
         ff_asf_guid guid;
         avio_read(pb, guid, 16);
@@ -689,7 +687,7 @@
         st = new_stream(s, st, sid, AVMEDIA_TYPE_VIDEO);
         if (!st)
             return NULL;
-        if (!ff_guidcmp(formattype, format_videoinfo2)) {
+        if (!ff_guidcmp(formattype, ff_format_videoinfo2)) {
             int consumed = parse_videoinfoheader2(s, st);
             avio_skip(pb, FFMAX(size - consumed, 0));
         } else if (!ff_guidcmp(formattype, ff_format_mpeg2_video)) {

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/wtvenc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/wtvenc.c Changed

@@ -31,7 +31,6 @@
 #include "avio_internal.h"
 #include "internal.h"
 #include "wtv.h"
-#include "asf.h"
 
 #define WTV_BIGSECTOR_SIZE (1 << WTV_BIGSECTOR_BITS)
 #define INDEX_BASE 0x2
@@ -130,16 +129,6 @@
 
 #define write_pad(pb, size) ffio_fill(pb, 0, size)
 
-static const ff_asf_guid *get_codec_guid(enum AVCodecID id, const AVCodecGuid *av_guid)
-{
-    int i;
-    for (i = 0; av_guid[i].id != AV_CODEC_ID_NONE; i++) {
-        if (id == av_guid[i].id)
-            return &(av_guid[i].guid);
-    }
-    return NULL;
-}
-
 /**
  * Write chunk header. If header chunk (0x80000000 set) then add to list of header chunks
  */
@@ -223,10 +212,52 @@
         write_index(s);
 }
 
+static void put_videoinfoheader2(AVIOContext *pb, AVStream *st)
+{
+    AVRational dar = av_mul_q(st->sample_aspect_ratio, (AVRational){st->codec->width, st->codec->height});
+    unsigned int num, den;
+    av_reduce(&num, &den, dar.num, dar.den, 0xFFFFFFFF);
+
+    /* VIDEOINFOHEADER2 */
+    avio_wl32(pb, 0);
+    avio_wl32(pb, 0);
+    avio_wl32(pb, st->codec->width);
+    avio_wl32(pb, st->codec->height);
+
+    avio_wl32(pb, 0);
+    avio_wl32(pb, 0);
+    avio_wl32(pb, 0);
+    avio_wl32(pb, 0);
+
+    avio_wl32(pb, st->codec->bit_rate);
+    avio_wl32(pb, 0);
+    avio_wl64(pb, st->avg_frame_rate.num && st->avg_frame_rate.den ? INT64_C(10000000) / av_q2d(st->avg_frame_rate) : 0);
+    avio_wl32(pb, 0);
+    avio_wl32(pb, 0);
+
+    avio_wl32(pb, num);
+    avio_wl32(pb, den);
+    avio_wl32(pb, 0);
+    avio_wl32(pb, 0);
+
+    ff_put_bmp_header(pb, st->codec, ff_codec_bmp_tags, 0, 1);
+
+    if (st->codec->codec_id == AV_CODEC_ID_MPEG2VIDEO) {
+        /* MPEG2VIDEOINFO */
+        avio_wl32(pb, 0);
+        avio_wl32(pb, st->codec->extradata_size);
+        avio_wl32(pb, -1);
+        avio_wl32(pb, -1);
+        avio_wl32(pb, 0);
+        avio_write(pb, st->codec->extradata, st->codec->extradata_size);
+        avio_wl64(pb, 0);
+    }
+}
+
 static int write_stream_codec_info(AVFormatContext *s, AVStream *st)
 {
-    WtvContext *wctx = s->priv_data;
     const ff_asf_guid *g, *media_type, *format_type;
+    const AVCodecTag *tags;
     AVIOContext *pb = s->pb;
     int64_t  hdr_pos_start;
     int hdr_size = 0;
@@ -234,21 +265,18 @@
     if (st->codec->codec_type  == AVMEDIA_TYPE_VIDEO) {
         g = get_codec_guid(st->codec->codec_id, ff_video_guids);
         media_type = &ff_mediatype_video;
-        format_type = &ff_format_mpeg2_video;
+        format_type = st->codec->codec_id == AV_CODEC_ID_MPEG2VIDEO ? &ff_format_mpeg2_video : &ff_format_videoinfo2;
+        tags = ff_codec_bmp_tags;
     } else if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO) {
         g = get_codec_guid(st->codec->codec_id, ff_codec_wav_guids);
         media_type = &ff_mediatype_audio;
         format_type = &ff_format_waveformatex;
+        tags = ff_codec_wav_tags;
     } else {
         av_log(s, AV_LOG_ERROR, "unknown codec_type (0x%x)\n", st->codec->codec_type);
         return -1;
     }
 
-    if (g == NULL) {
-        av_log(s, AV_LOG_ERROR, "can't get video codec_id (0x%x) guid.\n", st->codec->codec_id);
-        return -1;
-    }
-
     ff_put_guid(pb, media_type); // mediatype
     ff_put_guid(pb, &ff_mediasubtype_cpfilters_processed); // subtype
     write_pad(pb, 12);
@@ -257,15 +285,10 @@
 
     hdr_pos_start = avio_tell(pb);
     if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO) {
-        if (wctx->first_video_flag) {
-            write_pad(pb, 216); //The size is sensitive.
-            wctx->first_video_flag = 0;
-        } else {
-            write_pad(pb, 72); // aspect ratio
-            ff_put_bmp_header(pb, st->codec, ff_codec_bmp_tags, 0);
-        }
+        put_videoinfoheader2(pb, st);
     } else {
-        ff_put_wav_header(pb, st->codec);
+        if (ff_put_wav_header(pb, st->codec) < 0)
+            format_type = &ff_format_none;
     }
     hdr_size = avio_tell(pb) - hdr_pos_start;
 
@@ -273,7 +296,17 @@
     avio_seek(pb, -(hdr_size + 4), SEEK_CUR);
     avio_wl32(pb, hdr_size + 32);
     avio_seek(pb, hdr_size, SEEK_CUR);
-    ff_put_guid(pb, g);           // actual_subtype
+    if (g) {
+        ff_put_guid(pb, g);           // actual_subtype
+    } else {
+        int tag = ff_codec_get_tag(tags, st->codec->codec_id);
+        if (!tag) {
+            av_log(s, AV_LOG_ERROR, "unsupported codec_id (0x%x)\n", st->codec->codec_id);
+            return -1;
+        }
+        avio_wl32(pb, tag);
+        avio_write(pb, (const uint8_t[]){FF_MEDIASUBTYPE_BASE_GUID}, 12);
+    }
     ff_put_guid(pb, format_type); // actual_formattype
 
     return 0;

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/xwma.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/xwma.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavformat/yuv4mpeg.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavformat/yuv4mpeg.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavresample/Makefile -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavresample/Makefile Changed

omxplayer-2014.03.28.tar.gz/ffmpeg/libavresample/aarch64 Added

omxplayer-2014.03.28.tar.gz/ffmpeg/libavresample/aarch64/Makefile Added

omxplayer-2014.03.28.tar.gz/ffmpeg/libavresample/aarch64/neontest.c Added

@@ -0,0 +1,31 @@
+/*
+ * check NEON registers for clobbers
+ * Copyright (c) 2013 Martin Storsjo
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "libavresample/avresample.h"
+#include "libavutil/aarch64/neontest.h"
+
+wrap(avresample_convert(AVAudioResampleContext *avr, uint8_t **output,
+                        int out_plane_size, int out_samples, uint8_t **input,
+                        int in_plane_size, int in_samples))
+{
+    testneonclobbers(avresample_convert, avr, output, out_plane_size,
+                     out_samples, input, in_plane_size, in_samples);
+}

omxplayer-2014.02.11.tar.gz/ffmpeg/libavresample/arm/Makefile -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavresample/arm/Makefile Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavresample/arm/audio_convert_neon.S -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavresample/arm/audio_convert_neon.S Changed

omxplayer-2014.03.28.tar.gz/ffmpeg/libavresample/arm/neontest.c Added

@@ -0,0 +1,31 @@
+/*
+ * check NEON registers for clobbers
+ * Copyright (c) 2013 Martin Storsjo
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "libavresample/avresample.h"
+#include "libavutil/arm/neontest.h"
+
+wrap(avresample_convert(AVAudioResampleContext *avr, uint8_t **output,
+                        int out_plane_size, int out_samples, uint8_t **input,
+                        int in_plane_size, int in_samples))
+{
+    testneonclobbers(avresample_convert, avr, output, out_plane_size,
+                     out_samples, input, in_plane_size, in_samples);
+}

omxplayer-2014.02.11.tar.gz/ffmpeg/libavresample/audio_mix.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavresample/audio_mix.c Changed

@@ -447,7 +447,7 @@
 
     if (am->in_matrix_channels && am->out_matrix_channels) {
         uint8_t **data;
-        uint8_t *data0[AVRESAMPLE_MAX_CHANNELS];
+        uint8_t *data0[AVRESAMPLE_MAX_CHANNELS] = { NULL };
 
         if (am->out_matrix_channels < am->out_channels ||
              am->in_matrix_channels <  am->in_channels) {
@@ -559,9 +559,12 @@
         if (zero) {
             am->output_zero[o] = 1;
             am->out_matrix_channels--;
+            if (o < am->in_channels)
+                am->in_matrix_channels--;
         }
     }
-    if (am->out_matrix_channels == 0) {
+    if (am->out_matrix_channels == 0 || am->in_matrix_channels == 0) {
+        am->out_matrix_channels = 0;
         am->in_matrix_channels = 0;
         return;
     }
@@ -683,7 +686,7 @@
                                      am->in_matrix_channels;                \
         for (i = 0, i0 = 0; i < am->in_channels; i++) {                     \
             double v;                                                       \
-            if (am->input_skip[i])                                          \
+            if (am->input_skip[i] || am->output_zero[i])                    \
                 continue;                                                   \
             v = matrix[o * stride + i];                                     \
             am->matrix_## type[o0][i0] = expr;                              \
@@ -726,7 +729,7 @@
         for (i = 0; i < am->in_channels; i++) {
             if (am->output_zero[o])
                 av_log(am->avr, AV_LOG_DEBUG, "  (ZERO)");
-            else if (am->input_skip[i] || am->output_skip[o])
+            else if (am->input_skip[i] || am->output_zero[i] || am->output_skip[o])
                 av_log(am->avr, AV_LOG_DEBUG, "  (SKIP)");
             else
                 av_log(am->avr, AV_LOG_DEBUG, "  %0.3f ",

omxplayer-2014.02.11.tar.gz/ffmpeg/libavresample/audio_mix_matrix.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavresample/audio_mix_matrix.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavresample/avresample.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavresample/avresample.h Changed

omxplayer-2014.03.28.tar.gz/ffmpeg/libavresample/avresampleres.rc Added

@@ -0,0 +1,55 @@
+/*
+ * Windows resource file for libavresample
+ *
+ * Copyright (C) 2012 James Almer
+ * Copyright (C) 2013 Tiancheng "Timothy" Gu
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <windows.h>
+#include "libavresample/version.h"
+#include "libavutil/ffversion.h"
+#include "config.h"
+
+1 VERSIONINFO
+FILEVERSION     LIBAVRESAMPLE_VERSION_MAJOR, LIBAVRESAMPLE_VERSION_MINOR, LIBAVRESAMPLE_VERSION_MICRO, 0
+PRODUCTVERSION  LIBAVRESAMPLE_VERSION_MAJOR, LIBAVRESAMPLE_VERSION_MINOR, LIBAVRESAMPLE_VERSION_MICRO, 0
+FILEFLAGSMASK   VS_FFI_FILEFLAGSMASK
+FILEOS          VOS_NT_WINDOWS32
+FILETYPE        VFT_DLL
+{
+    BLOCK "StringFileInfo"
+    {
+        BLOCK "040904B0"
+        {
+            VALUE "CompanyName",      "FFmpeg Project"
+            VALUE "FileDescription",  "Libav audio resampling library"
+            VALUE "FileVersion",      AV_STRINGIFY(LIBAVRESAMPLE_VERSION)
+            VALUE "InternalName",     "libavresample"
+            VALUE "LegalCopyright",   "Copyright (C) 2000-" AV_STRINGIFY(CONFIG_THIS_YEAR) " FFmpeg Project"
+            VALUE "OriginalFilename", "avresample" BUILDSUF "-" AV_STRINGIFY(LIBAVRESAMPLE_VERSION_MAJOR) SLIBSUF
+            VALUE "ProductName",      "FFmpeg"
+            VALUE "ProductVersion",   FFMPEG_VERSION
+        }
+    }
+
+    BLOCK "VarFileInfo"
+    {
+        VALUE "Translation", 0x0409, 0x04B0
+    }
+}

omxplayer-2014.02.11.tar.gz/ffmpeg/libavresample/options.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavresample/options.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavresample/utils.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavresample/utils.c Changed

@@ -36,6 +36,11 @@
 {
     int ret;
 
+    if (avresample_is_open(avr)) {
+        av_log(avr, AV_LOG_ERROR, "The resampling context is already open.\n");
+        return AVERROR(EINVAL);
+    }
+
     /* set channel mixing parameters */
     avr->in_channels = av_get_channel_layout_nb_channels(avr->in_channel_layout);
     if (avr->in_channels <= 0 || avr->in_channels > AVRESAMPLE_MAX_CHANNELS) {
@@ -254,6 +259,11 @@
     return ret;
 }
 
+int avresample_is_open(AVAudioResampleContext *avr)
+{
+    return !!avr->out_fifo;
+}
+
 void avresample_close(AVAudioResampleContext *avr)
 {
     ff_audio_data_free(&avr->in_buffer);
@@ -438,7 +448,8 @@
             resample_out = &output_buffer;
         else
             resample_out = avr->resample_out_buffer;
-        av_dlog(avr, "[resample] %s to %s\n", current_buffer->name,
+        av_dlog(avr, "[resample] %s to %s\n",
+                current_buffer ? current_buffer->name : "null",
                 resample_out->name);
         ret = ff_audio_resample(avr->resample, resample_out,
                                 current_buffer);

omxplayer-2014.02.11.tar.gz/ffmpeg/libavresample/version.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavresample/version.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavresample/x86/Makefile -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavresample/x86/Makefile Changed

omxplayer-2014.03.28.tar.gz/ffmpeg/libavresample/x86/w64xmmtest.c Added

@@ -0,0 +1,31 @@
+/*
+ * check XMM registers for clobbers on Win64
+ * Copyright (c) 2013 Martin Storsjo
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "libavresample/avresample.h"
+#include "libavutil/x86/w64xmmtest.h"
+
+wrap(avresample_convert(AVAudioResampleContext *avr, uint8_t **output,
+                        int out_plane_size, int out_samples, uint8_t **input,
+                        int in_plane_size, int in_samples))
+{
+    testxmmclobbers(avresample_convert, avr, output, out_plane_size,
+                    out_samples, input, in_plane_size, in_samples);
+}

omxplayer-2014.02.11.tar.gz/ffmpeg/libavutil/Makefile -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavutil/Makefile Changed

@@ -19,6 +19,7 @@
           common.h                                                      \
           cpu.h                                                         \
           crc.h                                                         \
+          downmix_info.h                                                \
           error.h                                                       \
           eval.h                                                        \
           fifo.h                                                        \
@@ -31,6 +32,7 @@
           intreadwrite.h                                                \
           lfg.h                                                         \
           log.h                                                         \
+          macros.h                                                      \
           mathematics.h                                                 \
           md5.h                                                         \
           mem.h                                                         \
@@ -47,6 +49,7 @@
           samplefmt.h                                                   \
           sha.h                                                         \
           sha512.h                                                      \
+          stereo3d.h                                                    \
           time.h                                                        \
           timecode.h                                                    \
           timestamp.h                                                   \
@@ -62,7 +65,8 @@
                intreadwrite.h                                           \
                timer.h                                                  \
 
-BUILT_HEADERS = avconfig.h
+BUILT_HEADERS = avconfig.h                                              \
+                ffversion.h
 
 OBJS = adler32.o                                                        \
        aes.o                                                            \
@@ -77,6 +81,7 @@
        cpu.o                                                            \
        crc.o                                                            \
        des.o                                                            \
+       downmix_info.o                                                   \
        error.o                                                          \
        eval.o                                                           \
        fifo.o                                                           \
@@ -90,7 +95,8 @@
        intfloat_readwrite.o                                             \
        intmath.o                                                        \
        lfg.o                                                            \
-       lls.o                                                            \
+       lls1.o                                                           \
+       lls2.o                                                           \
        log.o                                                            \
        log2_tab.o                                                       \
        mathematics.o                                                    \
@@ -108,6 +114,7 @@
        samplefmt.o                                                      \
        sha.o                                                            \
        sha512.o                                                         \
+       stereo3d.o                                                       \
        time.o                                                           \
        timecode.o                                                       \
        tree.o                                                           \
@@ -120,6 +127,9 @@
 
 OBJS += $(COMPAT_OBJS:%=../compat/%)
 
+# Windows resource file
+SLIBOBJS-$(HAVE_GNU_WINDRES)            += avutilres.o
+
 SKIPHEADERS          = old_pix_fmts.h
 
 SKIPHEADERS-$(HAVE_ATOMICS_GCC)        += atomic_gcc.h
@@ -143,7 +153,8 @@
             fifo                                                        \
             hmac                                                        \
             lfg                                                         \
-            lls                                                         \
+            lls1                                                        \
+            lls2                                                        \
             md5                                                         \
             murmur3                                                     \
             opt                                                         \
@@ -155,6 +166,7 @@
             sha                                                         \
             sha512                                                      \
             tree                                                        \
+            utf8                                                        \
             xtea                                                        \
 
 TESTPROGS-$(HAVE_LZO1X_999_COMPRESS) += lzo

omxplayer-2014.03.28.tar.gz/ffmpeg/libavutil/aarch64 Added

omxplayer-2014.03.28.tar.gz/ffmpeg/libavutil/aarch64/Makefile Added

omxplayer-2014.03.28.tar.gz/ffmpeg/libavutil/aarch64/asm.S Added

@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2008 Mans Rullgard <mans@mansr.com>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "config.h"
+
+#ifdef __ELF__
+#   define ELF
+#else
+#   define ELF //
+#endif
+
+.macro  function name, export=0, align=2
+    .macro endfunc
+ELF     .size   \name, . - \name
+        .endfunc
+        .purgem endfunc
+    .endm
+        .text
+        .align          \align
+    .if \export
+        .global EXTERN_ASM\name
+ELF     .type   EXTERN_ASM\name, %function
+        .func   EXTERN_ASM\name
+EXTERN_ASM\name:
+    .else
+ELF     .type   \name, %function
+        .func   \name
+\name:
+    .endif
+.endm
+
+.macro  const   name, align=2
+    .macro endconst
+ELF     .size   \name, . - \name
+        .purgem endconst
+    .endm
+        .section        .rodata
+        .align          \align
+\name:
+.endm
+
+.macro  movrel rd, val
+#if CONFIG_PIC
+        adrp            \rd, #:pg_hi21:\val
+        add             \rd, \rd, #:lo12:\val
+#else
+        ldr             \rd, =\val
+#endif
+.endm
+
+#define GLUE(a, b) a ## b
+#define JOIN(a, b) GLUE(a, b)
+#define X(s) JOIN(EXTERN_ASM, s)

omxplayer-2014.03.28.tar.gz/ffmpeg/libavutil/aarch64/bswap.h Added

@@ -0,0 +1,50 @@
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_AARCH64_BSWAP_H
+#define AVUTIL_AARCH64_BSWAP_H
+
+#include <stdint.h>
+#include "config.h"
+#include "libavutil/attributes.h"
+
+#if HAVE_INLINE_ASM
+
+#define av_bswap16 av_bswap16
+static av_always_inline av_const unsigned av_bswap16(unsigned x)
+{
+    __asm__("rev16 %w0, %w0" : "+r"(x));
+    return x;
+}
+
+#define av_bswap32 av_bswap32
+static av_always_inline av_const uint32_t av_bswap32(uint32_t x)
+{
+    __asm__("rev %w0, %w0" : "+r"(x));
+    return x;
+}
+
+#define av_bswap64 av_bswap64
+static av_always_inline av_const uint64_t av_bswap64(uint64_t x)
+{
+    __asm__("rev %0, %0" : "+r"(x));
+    return x;
+}
+
+#endif /* HAVE_INLINE_ASM */
+#endif /* AVUTIL_AARCH64_BSWAP_H */

omxplayer-2014.03.28.tar.gz/ffmpeg/libavutil/aarch64/cpu.c Added

@@ -0,0 +1,27 @@
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "libavutil/cpu.h"
+#include "libavutil/cpu_internal.h"
+#include "config.h"
+
+int ff_get_cpu_flags_aarch64(void)
+{
+    return AV_CPU_FLAG_NEON * HAVE_NEON |
+           AV_CPU_FLAG_VFP  * HAVE_VFP;
+}

omxplayer-2014.03.28.tar.gz/ffmpeg/libavutil/aarch64/cpu.h Added

@@ -0,0 +1,29 @@
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_AARCH64_CPU_H
+#define AVUTIL_AARCH64_CPU_H
+
+#include "config.h"
+#include "libavutil/cpu.h"
+#include "libavutil/cpu_internal.h"
+
+#define have_neon(flags) CPUEXT(flags, NEON)
+#define have_vfp(flags)  CPUEXT(flags, VFP)
+
+#endif /* AVUTIL_AARCH64_CPU_H */

omxplayer-2014.03.28.tar.gz/ffmpeg/libavutil/aarch64/neontest.h Added

@@ -0,0 +1,65 @@
+/*
+ * check NEON registers for clobbering
+ * Copyright (c) 2008 Ramiro Polla <ramiro.polla@gmail.com>
+ * Copyright (c) 2013 Martin Storsjo
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <inttypes.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+
+#include "libavutil/bswap.h"
+
+#define storeneonregs(mem)                \
+    __asm__ volatile(                     \
+        "stp d8,  d9,  [%0]\n\t"          \
+        "stp d10, d11, [%0, #16]\n\t"     \
+        "stp d12, d13, [%0, #32]\n\t"     \
+        "stp d14, d15, [%0, #48]\n\t"     \
+        :: "r"(mem) : "memory")
+
+#define testneonclobbers(func, ctx, ...)                        \
+    uint64_t neon[2][8];                                        \
+    int ret;                                                    \
+    storeneonregs(neon[0]);                                     \
+    ret = __real_ ## func(ctx, __VA_ARGS__);                    \
+    storeneonregs(neon[1]);                                     \
+    if (memcmp(neon[0], neon[1], sizeof(neon[0]))) {            \
+        int i;                                                  \
+        av_log(ctx, AV_LOG_ERROR,                               \
+               "NEON REGS CLOBBERED IN %s!\n", #func);          \
+        for (i = 0; i < 8; i ++)                                \
+            if (neon[0][i] != neon[1][i]) {                     \
+                av_log(ctx, AV_LOG_ERROR,                       \
+                       "d%-2d = %016"PRIx64"\n",                \
+                       8 + i, av_bswap64(neon[0][i]));          \
+                av_log(ctx, AV_LOG_ERROR,                       \
+                       "   -> %016"PRIx64"\n",                  \
+                       av_bswap64(neon[1][i]));                 \
+            }                                                   \
+        abort();                                                \
+    }                                                           \
+    return ret
+
+#define wrap(func)      \
+int __real_ ## func;    \
+int __wrap_ ## func;    \
+int __wrap_ ## func

omxplayer-2014.02.11.tar.gz/ffmpeg/libavutil/adler32.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavutil/adler32.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavutil/adler32.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavutil/adler32.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavutil/aes.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavutil/aes.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavutil/arm/asm.S -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavutil/arm/asm.S Changed

@@ -53,8 +53,9 @@
         .syntax unified
 T       .thumb
 ELF     .eabi_attribute 25, 1           @ Tag_ABI_align_preserved
+ELF     .section .note.GNU-stack,"",%progbits @ Mark stack as non-executable
 
-.macro  function name, export=0
+.macro  function name, export=0, align=2
         .set            .Lpic_idx, 0
         .set            .Lpic_gp, 0
     .macro endfunc
@@ -69,14 +70,17 @@
         .purgem endfunc
     .endm
         .text
-        .align          2
+        .align          \align
     .if \export
         .global EXTERN_ASM\name
+ELF     .type   EXTERN_ASM\name, %function
+        .func   EXTERN_ASM\name
 EXTERN_ASM\name:
-    .endif
+    .else
 ELF     .type   \name, %function
         .func   \name
 \name:
+    .endif
 .endm
 
 .macro  const   name, align=2
@@ -212,6 +216,13 @@
 T       add             \rn, \rn, \rm
 .endm
 
+.macro  ldrc_pre        cc,  rt,  rn,  rm:vararg
+A       ldr\cc          \rt, [\rn, \rm]!
+T       itt             \cc
+T       add\cc          \rn, \rn, \rm
+T       ldr\cc          \rt, [\rn]
+.endm
+
 .macro  ldrd_reg        rt,  rt2, rn,  rm
 A       ldrd            \rt, \rt2, [\rn, \rm]
 T       add             \rt, \rn, \rm

omxplayer-2014.03.28.tar.gz/ffmpeg/libavutil/arm/neontest.h Added

@@ -0,0 +1,62 @@
+/*
+ * check NEON registers for clobbering
+ * Copyright (c) 2008 Ramiro Polla <ramiro.polla@gmail.com>
+ * Copyright (c) 2013 Martin Storsjo
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <inttypes.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+
+#include "libavutil/bswap.h"
+
+#define storeneonregs(mem)                \
+    __asm__ volatile(                     \
+        "vstm %0, {d8-d15}\n\t"           \
+        :: "r"(mem) : "memory")
+
+#define testneonclobbers(func, ctx, ...)                        \
+    uint64_t neon[2][8];                                        \
+    int ret;                                                    \
+    storeneonregs(neon[0]);                                     \
+    ret = __real_ ## func(ctx, __VA_ARGS__);                    \
+    storeneonregs(neon[1]);                                     \
+    if (memcmp(neon[0], neon[1], sizeof(neon[0]))) {            \
+        int i;                                                  \
+        av_log(ctx, AV_LOG_ERROR,                               \
+               "NEON REGS CLOBBERED IN %s!\n", #func);          \
+        for (i = 0; i < 8; i ++)                                \
+            if (neon[0][i] != neon[1][i]) {                     \
+                av_log(ctx, AV_LOG_ERROR,                       \
+                       "d%-2d = %016"PRIx64"\n",                \
+                       8 + i, av_bswap64(neon[0][i]));          \
+                av_log(ctx, AV_LOG_ERROR,                       \
+                       "   -> %016"PRIx64"\n",                  \
+                       av_bswap64(neon[1][i]));                 \
+            }                                                   \
+        abort();                                                \
+    }                                                           \
+    return ret
+
+#define wrap(func)      \
+int __real_ ## func;    \
+int __wrap_ ## func;    \
+int __wrap_ ## func

omxplayer-2014.02.11.tar.gz/ffmpeg/libavutil/atomic.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavutil/atomic.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavutil/atomic.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavutil/atomic.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavutil/attributes.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavutil/attributes.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavutil/avstring.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavutil/avstring.c Changed

@@ -307,6 +307,70 @@
     return av_isdigit(c) || (c >= 'a' && c <= 'f');
 }
 
+int av_utf8_decode(int32_t *codep, const uint8_t **bufp, const uint8_t *buf_end,
+                   unsigned int flags)
+{
+    const uint8_t *p = *bufp;
+    uint32_t top;
+    uint64_t code;
+    int ret = 0;
+
+    if (p >= buf_end)
+        return 0;
+
+    code = *p++;
+
+    /* first sequence byte starts with 10, or is 1111-1110 or 1111-1111,
+       which is not admitted */
+    if ((code & 0xc0) == 0x80 || code >= 0xFE) {
+        ret = AVERROR(EILSEQ);
+        goto end;
+    }
+    top = (code & 128) >> 1;
+
+    while (code & top) {
+        int tmp;
+        if (p >= buf_end) {
+            ret = AVERROR(EILSEQ); /* incomplete sequence */
+            goto end;
+        }
+
+        /* we assume the byte to be in the form 10xx-xxxx */
+        tmp = *p++ - 128;   /* strip leading 1 */
+        if (tmp>>6) {
+            ret = AVERROR(EILSEQ);
+            goto end;
+        }
+        code = (code<<6) + tmp;
+        top <<= 5;
+    }
+    code &= (top << 1) - 1;
+
+    if (code >= 1<<31) {
+        ret = AVERROR(EILSEQ);  /* out-of-range value */
+        goto end;
+    }
+
+    *codep = code;
+
+    if (code > 0x10FFFF &&
+        !(flags & AV_UTF8_FLAG_ACCEPT_INVALID_BIG_CODES))
+        ret = AVERROR(EILSEQ);
+    if (code < 0x20 && code != 0x9 && code != 0xA && code != 0xD &&
+        flags & AV_UTF8_FLAG_EXCLUDE_XML_INVALID_CONTROL_CODES)
+        ret = AVERROR(EILSEQ);
+    if (code >= 0xD800 && code <= 0xDFFF &&
+        !(flags & AV_UTF8_FLAG_ACCEPT_SURROGATES))
+        ret = AVERROR(EILSEQ);
+    if ((code == 0xFFFE || code == 0xFFFF) &&
+        !(flags & AV_UTF8_FLAG_ACCEPT_NON_CHARACTERS))
+        ret = AVERROR(EILSEQ);
+
+end:
+    *bufp = p;
+    return ret;
+}
+
 #ifdef TEST
 
 int main(void)

omxplayer-2014.02.11.tar.gz/ffmpeg/libavutil/avstring.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavutil/avstring.h Changed

@@ -22,6 +22,7 @@
 #define AVUTIL_AVSTRING_H
 
 #include <stddef.h>
+#include <stdint.h>
 #include "attributes.h"
 
 /**
@@ -131,6 +132,20 @@
 size_t av_strlcatf(char *dst, size_t size, const char *fmt, ...) av_printf_format(3, 4);
 
 /**
+ * Get the count of continuous non zero chars starting from the beginning.
+ *
+ * @param len maximum number of characters to check in the string, that
+ *            is the maximum value which is returned by the function
+ */
+static inline size_t av_strnlen(const char *s, size_t len)
+{
+    size_t i;
+    for (i = 0; i < len && s[i]; i++)
+        ;
+    return i;
+}
+
+/**
  * Print arguments following specified format into a large enough auto
  * allocated buffer. It is similar to GNU asprintf().
  * @param fmt printf-compatible format string, specifying how the
@@ -295,6 +310,45 @@
 int av_escape(char **dst, const char *src, const char *special_chars,
               enum AVEscapeMode mode, int flags);
 
+#define AV_UTF8_FLAG_ACCEPT_INVALID_BIG_CODES          1 ///< accept codepoints over 0x10FFFF
+#define AV_UTF8_FLAG_ACCEPT_NON_CHARACTERS             2 ///< accept non-characters - 0xFFFE and 0xFFFF
+#define AV_UTF8_FLAG_ACCEPT_SURROGATES                 4 ///< accept UTF-16 surrogates codes
+#define AV_UTF8_FLAG_EXCLUDE_XML_INVALID_CONTROL_CODES 8 ///< exclude control codes not accepted by XML
+
+#define AV_UTF8_FLAG_ACCEPT_ALL \
+    AV_UTF8_FLAG_ACCEPT_INVALID_BIG_CODES|AV_UTF8_FLAG_ACCEPT_NON_CHARACTERS|AV_UTF8_FLAG_ACCEPT_SURROGATES
+
+/**
+ * Read and decode a single UTF-8 code point (character) from the
+ * buffer in *buf, and update *buf to point to the next byte to
+ * decode.
+ *
+ * In case of an invalid byte sequence, the pointer will be updated to
+ * the next byte after the invalid sequence and the function will
+ * return an error code.
+ *
+ * Depending on the specified flags, the function will also fail in
+ * case the decoded code point does not belong to a valid range.
+ *
+ * @note For speed-relevant code a carefully implemented use of
+ * GET_UTF8() may be preferred.
+ *
+ * @param codep   pointer used to return the parsed code in case of success.
+ *                The value in *codep is set even in case the range check fails.
+ * @param bufp    pointer to the address the first byte of the sequence
+ *                to decode, updated by the function to point to the
+ *                byte next after the decoded sequence
+ * @param buf_end pointer to the end of the buffer, points to the next
+ *                byte past the last in the buffer. This is used to
+ *                avoid buffer overreads (in case of an unfinished
+ *                UTF-8 sequence towards the end of the buffer).
+ * @param flags   a collection of AV_UTF8_FLAG_* flags
+ * @return >= 0 in case a sequence was successfully read, a negative
+ * value in case of invalid sequence
+ */
+int av_utf8_decode(int32_t *codep, const uint8_t **bufp, const uint8_t *buf_end,
+                   unsigned int flags);
+
 /**
  * @}
  */

omxplayer-2014.02.11.tar.gz/ffmpeg/libavutil/avutil.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavutil/avutil.h Changed

@@ -41,7 +41,7 @@
  * @li @ref lavu "libavutil" common utility library
  * @li @ref lswr "libswresample" audio resampling, format conversion and mixing
  * @li @ref lpp  "libpostproc" post processing library
- * @li @ref lsws "libswscale" color conversion and scaling library
+ * @li @ref libsws "libswscale" color conversion and scaling library
  *
  * @section ffmpeg_versioning Versioning and compatibility
  *
@@ -145,6 +145,12 @@
  * @{
  *
  * @}
+ *
+ * @defgroup preproc_misc Preprocessor String Macros
+ *
+ * @{
+ *
+ * @}
  */
 
 
@@ -277,9 +283,9 @@
 #include "common.h"
 #include "error.h"
 #include "version.h"
+#include "macros.h"
 #include "mathematics.h"
 #include "rational.h"
-#include "intfloat_readwrite.h"
 #include "log.h"
 #include "pixfmt.h"
 
@@ -313,6 +319,13 @@
     av_int_list_length_for_size(sizeof(*(list)), list, term)
 
 /**
+ * Open a file using a UTF-8 filename.
+ * The API of this function matches POSIX fopen(), errors are returned through
+ * errno.
+ */
+FILE *av_fopen_utf8(const char *path, const char *mode);
+
+/**
  * @}
  * @}
  */

omxplayer-2014.03.28.tar.gz/ffmpeg/libavutil/avutilres.rc Added

@@ -0,0 +1,55 @@
+/*
+ * Windows resource file for libavutil
+ *
+ * Copyright (C) 2012 James Almer
+ * Copyright (C) 2013 Tiancheng "Timothy" Gu
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <windows.h>
+#include "libavutil/version.h"
+#include "libavutil/ffversion.h"
+#include "config.h"
+
+1 VERSIONINFO
+FILEVERSION     LIBAVUTIL_VERSION_MAJOR, LIBAVUTIL_VERSION_MINOR, LIBAVUTIL_VERSION_MICRO, 0
+PRODUCTVERSION  LIBAVUTIL_VERSION_MAJOR, LIBAVUTIL_VERSION_MINOR, LIBAVUTIL_VERSION_MICRO, 0
+FILEFLAGSMASK   VS_FFI_FILEFLAGSMASK
+FILEOS          VOS_NT_WINDOWS32
+FILETYPE        VFT_DLL
+{
+    BLOCK "StringFileInfo"
+    {
+        BLOCK "040904B0"
+        {
+            VALUE "CompanyName",      "FFmpeg Project"
+            VALUE "FileDescription",  "FFmpeg utility library"
+            VALUE "FileVersion",      AV_STRINGIFY(LIBAVUTIL_VERSION)
+            VALUE "InternalName",     "libavutil"
+            VALUE "LegalCopyright",   "Copyright (C) 2000-" AV_STRINGIFY(CONFIG_THIS_YEAR) " FFmpeg Project"
+            VALUE "OriginalFilename", "avutil" BUILDSUF "-" AV_STRINGIFY(LIBAVUTIL_VERSION_MAJOR) SLIBSUF
+            VALUE "ProductName",      "FFmpeg"
+            VALUE "ProductVersion",   FFMPEG_VERSION
+        }
+    }
+
+    BLOCK "VarFileInfo"
+    {
+        VALUE "Translation", 0x0409, 0x04B0
+    }
+}

omxplayer-2014.02.11.tar.gz/ffmpeg/libavutil/base64.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavutil/base64.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavutil/bswap.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavutil/bswap.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavutil/channel_layout.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavutil/channel_layout.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavutil/channel_layout.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavutil/channel_layout.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavutil/common.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavutil/common.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavutil/cpu.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavutil/cpu.c Changed

@@ -16,6 +16,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <stdint.h>
+
 #include "cpu.h"
 #include "cpu_internal.h"
 #include "config.h"
@@ -54,9 +56,14 @@
     if (checked)
         return flags;
 
-    if (ARCH_ARM) flags = ff_get_cpu_flags_arm();
-    if (ARCH_PPC) flags = ff_get_cpu_flags_ppc();
-    if (ARCH_X86) flags = ff_get_cpu_flags_x86();
+    if (ARCH_AARCH64)
+        flags = ff_get_cpu_flags_aarch64();
+    if (ARCH_ARM)
+        flags = ff_get_cpu_flags_arm();
+    if (ARCH_PPC)
+        flags = ff_get_cpu_flags_ppc();
+    if (ARCH_X86)
+        flags = ff_get_cpu_flags_x86();
 
     checked = 1;
     return flags;
@@ -84,8 +91,11 @@
 #define CPUFLAG_SSE42    (AV_CPU_FLAG_SSE42    | CPUFLAG_SSE4)
 #define CPUFLAG_AVX      (AV_CPU_FLAG_AVX      | CPUFLAG_SSE42)
 #define CPUFLAG_XOP      (AV_CPU_FLAG_XOP      | CPUFLAG_AVX)
+#define CPUFLAG_FMA3     (AV_CPU_FLAG_FMA3     | CPUFLAG_AVX)
 #define CPUFLAG_FMA4     (AV_CPU_FLAG_FMA4     | CPUFLAG_AVX)
 #define CPUFLAG_AVX2     (AV_CPU_FLAG_AVX2     | CPUFLAG_AVX)
+#define CPUFLAG_BMI1     (AV_CPU_FLAG_BMI1)
+#define CPUFLAG_BMI2     (AV_CPU_FLAG_BMI2     | CPUFLAG_BMI1)
     static const AVOption cpuflags_opts[] = {
         { "flags"   , NULL, 0, AV_OPT_TYPE_FLAGS, { .i64 = 0 }, INT64_MIN, INT64_MAX, .unit = "flags" },
 #if   ARCH_PPC
@@ -104,8 +114,11 @@
         { "sse4.2"  , NULL, 0, AV_OPT_TYPE_CONST, { .i64 = CPUFLAG_SSE42        },    .unit = "flags" },
         { "avx"     , NULL, 0, AV_OPT_TYPE_CONST, { .i64 = CPUFLAG_AVX          },    .unit = "flags" },
         { "xop"     , NULL, 0, AV_OPT_TYPE_CONST, { .i64 = CPUFLAG_XOP          },    .unit = "flags" },
+        { "fma3"    , NULL, 0, AV_OPT_TYPE_CONST, { .i64 = CPUFLAG_FMA3         },    .unit = "flags" },
         { "fma4"    , NULL, 0, AV_OPT_TYPE_CONST, { .i64 = CPUFLAG_FMA4         },    .unit = "flags" },
         { "avx2"    , NULL, 0, AV_OPT_TYPE_CONST, { .i64 = CPUFLAG_AVX2         },    .unit = "flags" },
+        { "bmi1"    , NULL, 0, AV_OPT_TYPE_CONST, { .i64 = CPUFLAG_BMI1         },    .unit = "flags" },
+        { "bmi2"    , NULL, 0, AV_OPT_TYPE_CONST, { .i64 = CPUFLAG_BMI2         },    .unit = "flags" },
         { "3dnow"   , NULL, 0, AV_OPT_TYPE_CONST, { .i64 = CPUFLAG_3DNOW        },    .unit = "flags" },
         { "3dnowext", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = CPUFLAG_3DNOWEXT     },    .unit = "flags" },
         { "cmov",     NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AV_CPU_FLAG_CMOV     },    .unit = "flags" },
@@ -116,6 +129,9 @@
         { "vfp",      NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AV_CPU_FLAG_VFP      },    .unit = "flags" },
         { "vfpv3",    NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AV_CPU_FLAG_VFPV3    },    .unit = "flags" },
         { "neon",     NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AV_CPU_FLAG_NEON     },    .unit = "flags" },
+#elif ARCH_AARCH64
+        { "neon",     NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AV_CPU_FLAG_NEON     },    .unit = "flags" },
+        { "vfp",      NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AV_CPU_FLAG_VFP      },    .unit = "flags" },
 #endif
         { NULL },
     };
@@ -156,7 +172,11 @@
         { "sse4.2"  , NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AV_CPU_FLAG_SSE42    },    .unit = "flags" },
         { "avx"     , NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AV_CPU_FLAG_AVX      },    .unit = "flags" },
         { "xop"     , NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AV_CPU_FLAG_XOP      },    .unit = "flags" },
+        { "fma3"    , NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AV_CPU_FLAG_FMA3     },    .unit = "flags" },
         { "fma4"    , NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AV_CPU_FLAG_FMA4     },    .unit = "flags" },
+        { "avx2"    , NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AV_CPU_FLAG_AVX2     },    .unit = "flags" },
+        { "bmi1"    , NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AV_CPU_FLAG_BMI1     },    .unit = "flags" },
+        { "bmi2"    , NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AV_CPU_FLAG_BMI2     },    .unit = "flags" },
         { "3dnow"   , NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AV_CPU_FLAG_3DNOW    },    .unit = "flags" },
         { "3dnowext", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AV_CPU_FLAG_3DNOWEXT },    .unit = "flags" },
         { "cmov",     NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AV_CPU_FLAG_CMOV     },    .unit = "flags" },
@@ -242,7 +262,10 @@
     int flag;
     const char *name;
 } cpu_flag_tab[] = {
-#if   ARCH_ARM
+#if   ARCH_AARCH64
+    { AV_CPU_FLAG_NEON,      "neon"       },
+    { AV_CPU_FLAG_VFP,       "vfp"        },
+#elif ARCH_ARM
     { AV_CPU_FLAG_ARMV5TE,   "armv5te"    },
     { AV_CPU_FLAG_ARMV6,     "armv6"      },
     { AV_CPU_FLAG_ARMV6T2,   "armv6t2"    },
@@ -265,11 +288,14 @@
     { AV_CPU_FLAG_SSE42,     "sse4.2"     },
     { AV_CPU_FLAG_AVX,       "avx"        },
     { AV_CPU_FLAG_XOP,       "xop"        },
+    { AV_CPU_FLAG_FMA3,      "fma3"       },
     { AV_CPU_FLAG_FMA4,      "fma4"       },
     { AV_CPU_FLAG_3DNOW,     "3dnow"      },
     { AV_CPU_FLAG_3DNOWEXT,  "3dnowext"   },
     { AV_CPU_FLAG_CMOV,      "cmov"       },
     { AV_CPU_FLAG_AVX2,      "avx2"       },
+    { AV_CPU_FLAG_BMI1,      "bmi1"       },
+    { AV_CPU_FLAG_BMI2,      "bmi2"       },
 #endif
     { 0 }
 };

omxplayer-2014.02.11.tar.gz/ffmpeg/libavutil/cpu.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavutil/cpu.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavutil/cpu_internal.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavutil/cpu_internal.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavutil/dict.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavutil/dict.h Changed

@@ -46,30 +46,31 @@
  * entries and finally av_dict_free() to free the dictionary
  * and all its contents.
  *
- * @code
- * AVDictionary *d = NULL;                // "create" an empty dictionary
- * av_dict_set(&d, "foo", "bar", 0);      // add an entry
- *
- * char *k = av_strdup("key");            // if your strings are already allocated,
- * char *v = av_strdup("value");          // you can avoid copying them like this
- * av_dict_set(&d, k, v, AV_DICT_DONT_STRDUP_KEY | AV_DICT_DONT_STRDUP_VAL);
- *
- * AVDictionaryEntry *t = NULL;
- * while (t = av_dict_get(d, "", t, AV_DICT_IGNORE_SUFFIX)) {
- *     <....>                             // iterate over all entries in d
- * }
- *
- * av_dict_free(&d);
- * @endcode
+ @code
+   AVDictionary *d = NULL;           // "create" an empty dictionary
+   AVDictionaryEntry *t = NULL;
+
+   av_dict_set(&d, "foo", "bar", 0); // add an entry
+
+   char *k = av_strdup("key");       // if your strings are already allocated,
+   char *v = av_strdup("value");     // you can avoid copying them like this
+   av_dict_set(&d, k, v, AV_DICT_DONT_STRDUP_KEY | AV_DICT_DONT_STRDUP_VAL);
+
+   while (t = av_dict_get(d, "", t, AV_DICT_IGNORE_SUFFIX)) {
+       <....>                             // iterate over all entries in d
+   }
+   av_dict_free(&d);
+ @endcode
  *
  */
 
-#define AV_DICT_MATCH_CASE      1
-#define AV_DICT_IGNORE_SUFFIX   2
+#define AV_DICT_MATCH_CASE      1   /**< Only get an entry with exact-case key match. Only relevant in av_dict_get(). */
+#define AV_DICT_IGNORE_SUFFIX   2   /**< Return first entry in a dictionary whose first part corresponds to the search key,
+                                         ignoring the suffix of the found key string. Only relevant in av_dict_get(). */
 #define AV_DICT_DONT_STRDUP_KEY 4   /**< Take ownership of a key that's been
-                                         allocated with av_malloc() and children. */
+                                         allocated with av_malloc() or another memory allocation function. */
 #define AV_DICT_DONT_STRDUP_VAL 8   /**< Take ownership of a value that's been
-                                         allocated with av_malloc() and chilren. */
+                                         allocated with av_malloc() or another memory allocation function. */
 #define AV_DICT_DONT_OVERWRITE 16   ///< Don't overwrite existing entries.
 #define AV_DICT_APPEND         32   /**< If the entry already exists, append to it.  Note that no
                                       delimiter is added, the strings are simply concatenated. */
@@ -84,10 +85,17 @@
 /**
  * Get a dictionary entry with matching key.
  *
+ * The returned entry key or value must not be changed, or it will
+ * cause undefined behavior.
+ *
+ * To iterate through all the dictionary entries, you can set the matching key
+ * to the null string "" and set the AV_DICT_IGNORE_SUFFIX flag.
+ *
  * @param prev Set to the previous matching element to find the next.
  *             If set to NULL the first matching element is returned.
- * @param flags Allows case as well as suffix-insensitive comparisons.
- * @return Found entry or NULL, changing key or value leads to undefined behavior.
+ * @param key matching key
+ * @param flags a collection of AV_DICT_* flags controlling how the entry is retrieved
+ * @return found entry or NULL in case no matching entry was found in the dictionary
  */
 AVDictionaryEntry *
 av_dict_get(AVDictionary *m, const char *key, const AVDictionaryEntry *prev, int flags);
@@ -113,7 +121,10 @@
 int av_dict_set(AVDictionary **pm, const char *key, const char *value, int flags);
 
 /**
- * Parse the key/value pairs list and add to a dictionary.
+ * Parse the key/value pairs list and add the parsed entries to a dictionary.
+ *
+ * In case of failure, all the successfully set entries are stored in
+ * *pm. You may need to manually free the created dictionary.
  *
  * @param key_val_sep  a 0-terminated list of characters used to separate
  *                     key from value

omxplayer-2014.03.28.tar.gz/ffmpeg/libavutil/downmix_info.c Added

@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2014 Tim Walker <tdskywalker@gmail.com>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "downmix_info.h"
+#include "frame.h"
+
+AVDownmixInfo *av_downmix_info_update_side_data(AVFrame *frame)
+{
+    AVFrameSideData *side_data;
+
+    side_data = av_frame_get_side_data(frame, AV_FRAME_DATA_DOWNMIX_INFO);
+
+    if (!side_data)
+        side_data = av_frame_new_side_data(frame, AV_FRAME_DATA_DOWNMIX_INFO,
+                                           sizeof(AVDownmixInfo));
+
+    if (!side_data)
+        return NULL;
+
+    return (AVDownmixInfo*)side_data->data;
+}

omxplayer-2014.03.28.tar.gz/ffmpeg/libavutil/downmix_info.h Added

@@ -0,0 +1,114 @@
+/*
+ * Copyright (c) 2014 Tim Walker <tdskywalker@gmail.com>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_DOWNMIX_INFO_H
+#define AVUTIL_DOWNMIX_INFO_H
+
+#include "frame.h"
+
+/**
+ * @file
+ * audio downmix medatata
+ */
+
+/**
+ * @addtogroup lavu_audio
+ * @{
+ */
+
+/**
+ * @defgroup downmix_info Audio downmix metadata
+ * @{
+ */
+
+/**
+ * Possible downmix types.
+ */
+enum AVDownmixType {
+    AV_DOWNMIX_TYPE_UNKNOWN, /**< Not indicated. */
+    AV_DOWNMIX_TYPE_LORO,    /**< Lo/Ro 2-channel downmix (Stereo). */
+    AV_DOWNMIX_TYPE_LTRT,    /**< Lt/Rt 2-channel downmix, Dolby Surround compatible. */
+    AV_DOWNMIX_TYPE_DPLII,   /**< Lt/Rt 2-channel downmix, Dolby Pro Logic II compatible. */
+    AV_DOWNMIX_TYPE_NB       /**< Number of downmix types. Not part of ABI. */
+};
+
+/**
+ * This structure describes optional metadata relevant to a downmix procedure.
+ *
+ * All fields are set by the decoder to the value indicated in the audio
+ * bitstream (if present), or to a "sane" default otherwise.
+ */
+typedef struct AVDownmixInfo {
+    /**
+     * Type of downmix preferred by the mastering engineer.
+     */
+    enum AVDownmixType preferred_downmix_type;
+
+    /**
+     * Absolute scale factor representing the nominal level of the center
+     * channel during a regular downmix.
+     */
+    double center_mix_level;
+
+    /**
+     * Absolute scale factor representing the nominal level of the center
+     * channel during an Lt/Rt compatible downmix.
+     */
+    double center_mix_level_ltrt;
+
+    /**
+     * Absolute scale factor representing the nominal level of the surround
+     * channels during a regular downmix.
+     */
+    double surround_mix_level;
+
+    /**
+     * Absolute scale factor representing the nominal level of the surround
+     * channels during an Lt/Rt compatible downmix.
+     */
+    double surround_mix_level_ltrt;
+
+    /**
+     * Absolute scale factor representing the level at which the LFE data is
+     * mixed into L/R channels during downmixing.
+     */
+    double lfe_mix_level;
+} AVDownmixInfo;
+
+/**
+ * Get a frame's AV_FRAME_DATA_DOWNMIX_INFO side data for editing.
+ *
+ * The side data is created and added to the frame if it's absent.
+ *
+ * @param frame the frame for which the side data is to be obtained.
+ *
+ * @return the AVDownmixInfo structure to be edited by the caller.
+ */
+AVDownmixInfo *av_downmix_info_update_side_data(AVFrame *frame);
+
+/**
+ * @}
+ */
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_DOWNMIX_INFO_H */

omxplayer-2014.02.11.tar.gz/ffmpeg/libavutil/eval.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavutil/eval.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavutil/file_open.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavutil/file_open.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavutil/float_dsp.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavutil/float_dsp.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavutil/frame.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavutil/frame.c Changed

@@ -159,7 +159,7 @@
         if (i == 1 || i == 2)
             h = FF_CEIL_RSHIFT(h, desc->log2_chroma_h);
 
-        frame->buf[i] = av_buffer_alloc(frame->linesize[i] * h + 16);
+        frame->buf[i] = av_buffer_alloc(frame->linesize[i] * h + 16 + 16/*STRIDE_ALIGN*/ - 1);
         if (!frame->buf[i])
             goto fail;
 
@@ -183,11 +183,17 @@
 
 static int get_audio_buffer(AVFrame *frame, int align)
 {
-    int channels = frame->channels;
+    int channels;
     int planar   = av_sample_fmt_is_planar(frame->format);
-    int planes   = planar ? channels : 1;
+    int planes;
     int ret, i;
 
+    if (!frame->channels)
+        frame->channels = av_get_channel_layout_nb_channels(frame->channel_layout);
+
+    channels = frame->channels;
+    planes = planar ? channels : 1;
+
     CHECK_CHANNELS_CONSISTENCY(frame);
     if (!frame->linesize[0]) {
         ret = av_samples_get_buffer_size(&frame->linesize[0], channels,
@@ -244,7 +250,7 @@
     return AVERROR(EINVAL);
 }
 
-int av_frame_ref(AVFrame *dst, AVFrame *src)
+int av_frame_ref(AVFrame *dst, const AVFrame *src)
 {
     int i, ret = 0;
 
@@ -265,16 +271,11 @@
         if (ret < 0)
             return ret;
 
-        if (src->nb_samples) {
-            int ch = src->channels;
-            CHECK_CHANNELS_CONSISTENCY(src);
-            av_samples_copy(dst->extended_data, src->extended_data, 0, 0,
-                            dst->nb_samples, ch, dst->format);
-        } else {
-            av_image_copy(dst->data, dst->linesize, src->data, src->linesize,
-                          dst->format, dst->width, dst->height);
-        }
-        return 0;
+        ret = av_frame_copy(dst, src);
+        if (ret < 0)
+            av_frame_unref(dst);
+
+        return ret;
     }
 
     /* ref the buffers */
@@ -335,7 +336,7 @@
     return ret;
 }
 
-AVFrame *av_frame_clone(AVFrame *src)
+AVFrame *av_frame_clone(const AVFrame *src)
 {
     AVFrame *ret = av_frame_alloc();
 
@@ -418,14 +419,10 @@
     if (ret < 0)
         return ret;
 
-    if (tmp.nb_samples) {
-        int ch = tmp.channels;
-        CHECK_CHANNELS_CONSISTENCY(&tmp);
-        av_samples_copy(tmp.extended_data, frame->extended_data, 0, 0,
-                        frame->nb_samples, ch, frame->format);
-    } else {
-        av_image_copy(tmp.data, tmp.linesize, frame->data, frame->linesize,
-                      frame->format, frame->width, frame->height);
+    ret = av_frame_copy(&tmp, frame);
+    if (ret < 0) {
+        av_frame_unref(&tmp);
+        return ret;
     }
 
     ret = av_frame_copy_props(&tmp, frame);
@@ -447,32 +444,33 @@
 {
     int i;
 
-    dst->key_frame           = src->key_frame;
-    dst->pict_type           = src->pict_type;
-    dst->sample_aspect_ratio = src->sample_aspect_ratio;
-    dst->pts                 = src->pts;
-    dst->repeat_pict         = src->repeat_pict;
-    dst->interlaced_frame    = src->interlaced_frame;
-    dst->top_field_first     = src->top_field_first;
-    dst->palette_has_changed = src->palette_has_changed;
-    dst->sample_rate         = src->sample_rate;
-    dst->opaque              = src->opaque;
+    dst->key_frame              = src->key_frame;
+    dst->pict_type              = src->pict_type;
+    dst->sample_aspect_ratio    = src->sample_aspect_ratio;
+    dst->pts                    = src->pts;
+    dst->repeat_pict            = src->repeat_pict;
+    dst->interlaced_frame       = src->interlaced_frame;
+    dst->top_field_first        = src->top_field_first;
+    dst->palette_has_changed    = src->palette_has_changed;
+    dst->sample_rate            = src->sample_rate;
+    dst->opaque                 = src->opaque;
 #if FF_API_AVFRAME_LAVC
-    dst->type                = src->type;
+    dst->type                   = src->type;
 #endif
-    dst->pkt_pts             = src->pkt_pts;
-    dst->pkt_dts             = src->pkt_dts;
-    dst->pkt_pos             = src->pkt_pos;
-    dst->pkt_size            = src->pkt_size;
-    dst->pkt_duration        = src->pkt_duration;
-    dst->reordered_opaque    = src->reordered_opaque;
-    dst->quality             = src->quality;
-    dst->best_effort_timestamp = src->best_effort_timestamp;
-    dst->coded_picture_number = src->coded_picture_number;
+    dst->pkt_pts                = src->pkt_pts;
+    dst->pkt_dts                = src->pkt_dts;
+    dst->pkt_pos                = src->pkt_pos;
+    dst->pkt_size               = src->pkt_size;
+    dst->pkt_duration           = src->pkt_duration;
+    dst->reordered_opaque       = src->reordered_opaque;
+    dst->quality                = src->quality;
+    dst->best_effort_timestamp  = src->best_effort_timestamp;
+    dst->coded_picture_number   = src->coded_picture_number;
     dst->display_picture_number = src->display_picture_number;
-    dst->decode_error_flags  = src->decode_error_flags;
-    dst->colorspace          = src->colorspace;
-    dst->color_range         = src->color_range;
+    dst->flags                  = src->flags;
+    dst->decode_error_flags     = src->decode_error_flags;
+    dst->colorspace             = src->colorspace;
+    dst->color_range            = src->color_range;
 
     av_dict_copy(&dst->metadata, src->metadata, 0);
 
@@ -585,3 +583,62 @@
     }
     return NULL;
 }
+
+static int frame_copy_video(AVFrame *dst, const AVFrame *src)
+{
+    const uint8_t *src_data[4];
+    int i, planes;
+
+    if (dst->width  != src->width ||
+        dst->height != src->height)
+        return AVERROR(EINVAL);
+
+    planes = av_pix_fmt_count_planes(dst->format);
+    for (i = 0; i < planes; i++)
+        if (!dst->data[i] || !src->data[i])
+            return AVERROR(EINVAL);
+
+    memcpy(src_data, src->data, sizeof(src_data));
+    av_image_copy(dst->data, dst->linesize,
+                  src_data, src->linesize,
+                  dst->format, dst->width, dst->height);
+
+    return 0;
+}
+
+static int frame_copy_audio(AVFrame *dst, const AVFrame *src)
+{
+    int planar   = av_sample_fmt_is_planar(dst->format);
+    int channels = dst->channels;
+    int planes   = planar ? channels : 1;
+    int i;
+
+    if (dst->nb_samples     != src->nb_samples ||
+        dst->channels       != src->channels ||
+        dst->channel_layout != src->channel_layout)
+        return AVERROR(EINVAL);
+
+    CHECK_CHANNELS_CONSISTENCY(src);
+
+    for (i = 0; i < planes; i++)
+        if (!dst->extended_data[i] || !src->extended_data[i])
+            return AVERROR(EINVAL);
+
+    av_samples_copy(dst->extended_data, src->extended_data, 0, 0,
+                    dst->nb_samples, channels, dst->format);
+
+    return 0;
+}
+
+int av_frame_copy(AVFrame *dst, const AVFrame *src)
+{
+    if (dst->format != src->format || dst->format < 0)
+        return AVERROR(EINVAL);
+
+    if (dst->width > 0 && dst->height > 0)
+        return frame_copy_video(dst, src);
+    else if (dst->nb_samples > 0 && dst->channel_layout)
+        return frame_copy_audio(dst, src);
+
+    return AVERROR(EINVAL);
+}

omxplayer-2014.02.11.tar.gz/ffmpeg/libavutil/frame.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavutil/frame.h Changed

@@ -17,29 +17,37 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+/**
+ * @file
+ * @ingroup lavu_frame
+ * reference-counted frame API
+ */
+
 #ifndef AVUTIL_FRAME_H
 #define AVUTIL_FRAME_H
 
 #include <stdint.h>
 
-#include "libavcodec/version.h"
-
 #include "avutil.h"
 #include "buffer.h"
 #include "dict.h"
 #include "rational.h"
 #include "samplefmt.h"
+#include "version.h"
+
 
 enum AVColorSpace{
-    AVCOL_SPC_RGB         = 0,
-    AVCOL_SPC_BT709       = 1, ///< also ITU-R BT1361 / IEC 61966-2-4 xvYCC709 / SMPTE RP177 Annex B
-    AVCOL_SPC_UNSPECIFIED = 2,
-    AVCOL_SPC_FCC         = 4,
-    AVCOL_SPC_BT470BG     = 5, ///< also ITU-R BT601-6 625 / ITU-R BT1358 625 / ITU-R BT1700 625 PAL & SECAM / IEC 61966-2-4 xvYCC601
-    AVCOL_SPC_SMPTE170M   = 6, ///< also ITU-R BT601-6 525 / ITU-R BT1358 525 / ITU-R BT1700 NTSC / functionally identical to above
-    AVCOL_SPC_SMPTE240M   = 7,
-    AVCOL_SPC_YCOCG       = 8, ///< Used by Dirac / VC-2 and H.264 FRext, see ITU-T SG16
-    AVCOL_SPC_NB             , ///< Not part of ABI
+    AVCOL_SPC_RGB         =  0,
+    AVCOL_SPC_BT709       =  1, ///< also ITU-R BT1361 / IEC 61966-2-4 xvYCC709 / SMPTE RP177 Annex B
+    AVCOL_SPC_UNSPECIFIED =  2,
+    AVCOL_SPC_FCC         =  4,
+    AVCOL_SPC_BT470BG     =  5, ///< also ITU-R BT601-6 625 / ITU-R BT1358 625 / ITU-R BT1700 625 PAL & SECAM / IEC 61966-2-4 xvYCC601
+    AVCOL_SPC_SMPTE170M   =  6, ///< also ITU-R BT601-6 525 / ITU-R BT1358 525 / ITU-R BT1700 NTSC / functionally identical to above
+    AVCOL_SPC_SMPTE240M   =  7,
+    AVCOL_SPC_YCOCG       =  8, ///< Used by Dirac / VC-2 and H.264 FRext, see ITU-T SG16
+    AVCOL_SPC_BT2020_NCL  =  9, ///< ITU-R BT2020 non-constant luminance system
+    AVCOL_SPC_BT2020_CL   = 10, ///< ITU-R BT2020 constant luminance system
+    AVCOL_SPC_NB              , ///< Not part of ABI
 };
 #define AVCOL_SPC_YCGCO AVCOL_SPC_YCOCG
 
@@ -50,11 +58,40 @@
     AVCOL_RANGE_NB             , ///< Not part of ABI
 };
 
+
+/**
+ * @defgroup lavu_frame AVFrame
+ * @ingroup lavu_data
+ *
+ * @{
+ * AVFrame is an abstraction for reference-counted raw multimedia data.
+ */
+
 enum AVFrameSideDataType {
     /**
      * The data is the AVPanScan struct defined in libavcodec.
      */
     AV_FRAME_DATA_PANSCAN,
+    /**
+     * ATSC A53 Part 4 Closed Captions.
+     * A53 CC bitstream is stored as uint8_t in AVFrameSideData.data.
+     * The number of bytes of CC data is AVFrameSideData.size.
+     */
+    AV_FRAME_DATA_A53_CC,
+    /**
+     * Stereoscopic 3d metadata.
+     * The data is the AVStereo3D struct defined in libavutil/stereo3d.h.
+     */
+    AV_FRAME_DATA_STEREO3D,
+    /**
+     * The data is the AVMatrixEncoding enum defined in libavutil/channel_layout.h.
+     */
+    AV_FRAME_DATA_MATRIXENCODING,
+    /**
+     * Metadata relevant to a downmix procedure.
+     * The data is the AVDownmixInfo struct defined in libavutil/downmix_info.h.
+     */
+    AV_FRAME_DATA_DOWNMIX_INFO,
 };
 
 typedef struct AVFrameSideData {
@@ -386,6 +423,26 @@
     AVFrameSideData **side_data;
     int            nb_side_data;
 
+/**
+ * @defgroup lavu_frame_flags AV_FRAME_FLAGS
+ * Flags describing additional frame properties.
+ *
+ * @{
+ */
+
+/**
+ * The frame data may be corrupted, e.g. due to decoding errors.
+ */
+#define AV_FRAME_FLAG_CORRUPT       (1 << 0)
+/**
+ * @}
+ */
+
+    /**
+     * Frame flags, a combination of @ref lavu_frame_flags
+     */
+    int flags;
+
     /**
      * frame timestamp estimated using various heuristics, in stream time base
      * Code outside libavcodec should access this field using:
@@ -539,7 +596,7 @@
 void av_frame_free(AVFrame **frame);
 
 /**
- * Setup a new reference to the data described by a given frame.
+ * Set up a new reference to the data described by the source frame.
  *
  * Copy frame properties from src to dst and create a new reference for each
  * AVBufferRef from src.
@@ -549,7 +606,7 @@
  *
  * @return 0 on success, a negative AVERROR on error
  */
-int av_frame_ref(AVFrame *dst, AVFrame *src);
+int av_frame_ref(AVFrame *dst, const AVFrame *src);
 
 /**
  * Create a new frame that references the same data as src.
@@ -558,7 +615,7 @@
  *
  * @return newly created AVFrame on success, NULL on error.
  */
-AVFrame *av_frame_clone(AVFrame *src);
+AVFrame *av_frame_clone(const AVFrame *src);
 
 /**
  * Unreference all the buffers referenced by frame and reset the frame fields.
@@ -617,6 +674,19 @@
 int av_frame_make_writable(AVFrame *frame);
 
 /**
+ * Copy the frame data from src to dst.
+ *
+ * This function does not allocate anything, dst must be already initialized and
+ * allocated with the same parameters as src.
+ *
+ * This function only copies the frame data (i.e. the contents of the data /
+ * extended data arrays), not any other properties.
+ *
+ * @return >= 0 on success, a negative AVERROR on error.
+ */
+int av_frame_copy(AVFrame *dst, const AVFrame *src);
+
+/**
  * Copy only "metadata" fields from src to dst.
  *
  * Metadata for the purpose of this function are those fields that do not affect
@@ -656,4 +726,8 @@
 AVFrameSideData *av_frame_get_side_data(const AVFrame *frame,
                                         enum AVFrameSideDataType type);
 
+/**
+ * @}
+ */
+
 #endif /* AVUTIL_FRAME_H */

omxplayer-2014.02.11.tar.gz/ffmpeg/libavutil/internal.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavutil/internal.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavutil/intfloat_readwrite.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavutil/intfloat_readwrite.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavutil/intfloat_readwrite.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavutil/intfloat_readwrite.h Changed

omxplayer-2014.03.28.tar.gz/ffmpeg/libavutil/lls1.c Added

@@ -0,0 +1,180 @@
+/*
+ * linear least squares model
+ *
+ * Copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * linear least squares model
+ */
+
+#include <math.h>
+#include <string.h>
+
+#include "attributes.h"
+#include "version.h"
+#include "lls1.h"
+
+#if FF_API_LLS1
+
+av_cold void avpriv_init_lls(LLSModel *m, int indep_count)
+{
+    memset(m, 0, sizeof(LLSModel));
+    m->indep_count = indep_count;
+}
+
+void avpriv_update_lls(LLSModel *m, double *var, double decay)
+{
+    int i, j;
+
+    for (i = 0; i <= m->indep_count; i++) {
+        for (j = i; j <= m->indep_count; j++) {
+            m->covariance[i][j] *= decay;
+            m->covariance[i][j] += var[i] * var[j];
+        }
+    }
+}
+
+void avpriv_solve_lls(LLSModel *m, double threshold, unsigned short min_order)
+{
+    int i, j, k;
+    double (*factor)[MAX_VARS + 1] = (void *) &m->covariance[1][0];
+    double (*covar) [MAX_VARS + 1] = (void *) &m->covariance[1][1];
+    double *covar_y                = m->covariance[0];
+    int count                      = m->indep_count;
+
+    for (i = 0; i < count; i++) {
+        for (j = i; j < count; j++) {
+            double sum = covar[i][j];
+
+            for (k = i - 1; k >= 0; k--)
+                sum -= factor[i][k] * factor[j][k];
+
+            if (i == j) {
+                if (sum < threshold)
+                    sum = 1.0;
+                factor[i][i] = sqrt(sum);
+            } else {
+                factor[j][i] = sum / factor[i][i];
+            }
+        }
+    }
+
+    for (i = 0; i < count; i++) {
+        double sum = covar_y[i + 1];
+
+        for (k = i - 1; k >= 0; k--)
+            sum -= factor[i][k] * m->coeff[0][k];
+
+        m->coeff[0][i] = sum / factor[i][i];
+    }
+
+    for (j = count - 1; j >= min_order; j--) {
+        for (i = j; i >= 0; i--) {
+            double sum = m->coeff[0][i];
+
+            for (k = i + 1; k <= j; k++)
+                sum -= factor[k][i] * m->coeff[j][k];
+
+            m->coeff[j][i] = sum / factor[i][i];
+        }
+
+        m->variance[j] = covar_y[0];
+
+        for (i = 0; i <= j; i++) {
+            double sum = m->coeff[j][i] * covar[i][i] - 2 * covar_y[i + 1];
+
+            for (k = 0; k < i; k++)
+                sum += 2 * m->coeff[j][k] * covar[k][i];
+
+            m->variance[j] += m->coeff[j][i] * sum;
+        }
+    }
+}
+
+double avpriv_evaluate_lls(LLSModel *m, double *param, int order)
+{
+    int i;
+    double out = 0;
+
+    for (i = 0; i <= order; i++)
+        out += param[i] * m->coeff[order][i];
+
+    return out;
+}
+
+#if FF_API_LLS_PRIVATE
+av_cold void av_init_lls(LLSModel *m, int indep_count)
+{
+    avpriv_init_lls(m, indep_count);
+}
+void av_update_lls(LLSModel *m, double *param, double decay)
+{
+    avpriv_update_lls(m, param, decay);
+}
+void av_solve_lls(LLSModel *m, double threshold, int min_order)
+{
+    avpriv_solve_lls(m, threshold, min_order);
+}
+double av_evaluate_lls(LLSModel *m, double *param, int order)
+{
+    return avpriv_evaluate_lls(m, param, order);
+}
+#endif /* FF_API_LLS_PRIVATE */
+
+#endif /* FF_API_LLS1 */
+
+#ifdef TEST
+
+#include <stdio.h>
+#include <limits.h>
+#include "lfg.h"
+
+int main(void)
+{
+    LLSModel m;
+    int i, order;
+    AVLFG lfg;
+
+    av_lfg_init(&lfg, 1);
+    avpriv_init_lls(&m, 3);
+
+    for (i = 0; i < 100; i++) {
+        double var[4];
+        double eval;
+
+        var[0] = (av_lfg_get(&lfg) / (double) UINT_MAX - 0.5) * 2;
+        var[1] = var[0] + av_lfg_get(&lfg) / (double) UINT_MAX - 0.5;
+        var[2] = var[1] + av_lfg_get(&lfg) / (double) UINT_MAX - 0.5;
+        var[3] = var[2] + av_lfg_get(&lfg) / (double) UINT_MAX - 0.5;
+        avpriv_update_lls(&m, var, 0.99);
+        avpriv_solve_lls(&m, 0.001, 0);
+        for (order = 0; order < 3; order++) {
+            eval = avpriv_evaluate_lls(&m, var + 1, order);
+            printf("real:%9f order:%d pred:%9f var:%f coeffs:%f %9f %9f\n",
+                   var[0], order, eval, sqrt(m.variance[order] / (i + 1)),
+                   m.coeff[order][0], m.coeff[order][1],
+                   m.coeff[order][2]);
+        }
+    }
+    return 0;
+}
+
+#endif

omxplayer-2014.03.28.tar.gz/ffmpeg/libavutil/lls1.h Added

@@ -0,0 +1,54 @@
+/*
+ * linear least squares model
+ *
+ * Copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_LLS_H
+#define AVUTIL_LLS_H
+
+#include "version.h"
+
+#define MAX_VARS 32
+
+//FIXME avoid direct access to LLSModel from outside
+
+/**
+ * Linear least squares model.
+ */
+typedef struct LLSModel {
+    double covariance[MAX_VARS + 1][MAX_VARS + 1];
+    double coeff[MAX_VARS][MAX_VARS];
+    double variance[MAX_VARS];
+    int indep_count;
+} LLSModel;
+
+void avpriv_init_lls(LLSModel *m, int indep_count);
+void avpriv_update_lls(LLSModel *m, double *param, double decay);
+void avpriv_solve_lls(LLSModel *m, double threshold, unsigned short min_order);
+double avpriv_evaluate_lls(LLSModel *m, double *param, int order);
+
+#if FF_API_LLS_PRIVATE
+void av_init_lls(LLSModel *m, int indep_count);
+void av_update_lls(LLSModel *m, double *param, double decay);
+void av_solve_lls(LLSModel *m, double threshold, int min_order);
+double av_evaluate_lls(LLSModel *m, double *param, int order);
+#endif /* FF_API_LLS_PRIVATE */
+
+#endif /* AVUTIL_LLS_H */

omxplayer-2014.03.28.tar.gz/ffmpeg/libavutil/lls2.c Added

@@ -0,0 +1,160 @@
+/*
+ * linear least squares model
+ *
+ * Copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * linear least squares model
+ */
+
+#include <math.h>
+#include <string.h>
+
+#include "attributes.h"
+#include "version.h"
+#include "lls2.h"
+
+static void update_lls(LLSModel2 *m, double *var)
+{
+    int i, j;
+
+    for (i = 0; i <= m->indep_count; i++) {
+        for (j = i; j <= m->indep_count; j++) {
+            m->covariance[i][j] += var[i] * var[j];
+        }
+    }
+}
+
+void avpriv_solve_lls2(LLSModel2 *m, double threshold, unsigned short min_order)
+{
+    int i, j, k;
+    double (*factor)[MAX_VARS_ALIGN] = (void *) &m->covariance[1][0];
+    double (*covar) [MAX_VARS_ALIGN] = (void *) &m->covariance[1][1];
+    double *covar_y                = m->covariance[0];
+    int count                      = m->indep_count;
+
+    for (i = 0; i < count; i++) {
+        for (j = i; j < count; j++) {
+            double sum = covar[i][j];
+
+            for (k = i - 1; k >= 0; k--)
+                sum -= factor[i][k] * factor[j][k];
+
+            if (i == j) {
+                if (sum < threshold)
+                    sum = 1.0;
+                factor[i][i] = sqrt(sum);
+            } else {
+                factor[j][i] = sum / factor[i][i];
+            }
+        }
+    }
+
+    for (i = 0; i < count; i++) {
+        double sum = covar_y[i + 1];
+
+        for (k = i - 1; k >= 0; k--)
+            sum -= factor[i][k] * m->coeff[0][k];
+
+        m->coeff[0][i] = sum / factor[i][i];
+    }
+
+    for (j = count - 1; j >= min_order; j--) {
+        for (i = j; i >= 0; i--) {
+            double sum = m->coeff[0][i];
+
+            for (k = i + 1; k <= j; k++)
+                sum -= factor[k][i] * m->coeff[j][k];
+
+            m->coeff[j][i] = sum / factor[i][i];
+        }
+
+        m->variance[j] = covar_y[0];
+
+        for (i = 0; i <= j; i++) {
+            double sum = m->coeff[j][i] * covar[i][i] - 2 * covar_y[i + 1];
+
+            for (k = 0; k < i; k++)
+                sum += 2 * m->coeff[j][k] * covar[k][i];
+
+            m->variance[j] += m->coeff[j][i] * sum;
+        }
+    }
+}
+
+static double evaluate_lls(LLSModel2 *m, double *param, int order)
+{
+    int i;
+    double out = 0;
+
+    for (i = 0; i <= order; i++)
+        out += param[i] * m->coeff[order][i];
+
+    return out;
+}
+
+av_cold void avpriv_init_lls2(LLSModel2 *m, int indep_count)
+{
+    memset(m, 0, sizeof(LLSModel2));
+    m->indep_count = indep_count;
+    m->update_lls = update_lls;
+    m->evaluate_lls = evaluate_lls;
+    if (ARCH_X86)
+        ff_init_lls_x86(m);
+}
+
+#ifdef TEST
+
+#include <stdio.h>
+#include <limits.h>
+#include "lfg.h"
+
+int main(void)
+{
+    LLSModel2 m;
+    int i, order;
+    AVLFG lfg;
+
+    av_lfg_init(&lfg, 1);
+    avpriv_init_lls2(&m, 3);
+
+    for (i = 0; i < 100; i++) {
+        LOCAL_ALIGNED(32, double, var, [4]);
+        double eval;
+
+        var[0] = (av_lfg_get(&lfg) / (double) UINT_MAX - 0.5) * 2;
+        var[1] = var[0] + av_lfg_get(&lfg) / (double) UINT_MAX - 0.5;
+        var[2] = var[1] + av_lfg_get(&lfg) / (double) UINT_MAX - 0.5;
+        var[3] = var[2] + av_lfg_get(&lfg) / (double) UINT_MAX - 0.5;
+        m.update_lls(&m, var);
+        avpriv_solve_lls2(&m, 0.001, 0);
+        for (order = 0; order < 3; order++) {
+            eval = m.evaluate_lls(&m, var + 1, order);
+            printf("real:%9f order:%d pred:%9f var:%f coeffs:%f %9f %9f\n",
+                   var[0], order, eval, sqrt(m.variance[order] / (i + 1)),
+                   m.coeff[order][0], m.coeff[order][1],
+                   m.coeff[order][2]);
+        }
+    }
+    return 0;
+}
+
+#endif

omxplayer-2014.03.28.tar.gz/ffmpeg/libavutil/lls2.h Added

@@ -0,0 +1,64 @@
+/*
+ * linear least squares model
+ *
+ * Copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_LLS_H
+#define AVUTIL_LLS_H
+
+#include "common.h"
+#include "mem.h"
+#include "version.h"
+
+#define MAX_VARS 32
+#define MAX_VARS_ALIGN FFALIGN(MAX_VARS+1,4)
+
+//FIXME avoid direct access to LLSModel2 from outside
+
+/**
+ * Linear least squares model.
+ */
+typedef struct LLSModel2 {
+    DECLARE_ALIGNED(32, double, covariance[MAX_VARS_ALIGN][MAX_VARS_ALIGN]);
+    DECLARE_ALIGNED(32, double, coeff[MAX_VARS][MAX_VARS]);
+    double variance[MAX_VARS];
+    int indep_count;
+    /**
+     * Take the outer-product of var[] with itself, and add to the covariance matrix.
+     * @param m this context
+     * @param var training samples, starting with the value to be predicted
+     *            32-byte aligned, and any padding elements must be initialized
+     *            (i.e not denormal/nan).
+     */
+    void (*update_lls)(struct LLSModel2 *m, double *var);
+    /**
+     * Inner product of var[] and the LPC coefs.
+     * @param m this context
+     * @param var training samples, excluding the value to be predicted. unaligned.
+     * @param order lpc order
+     */
+    double (*evaluate_lls)(struct LLSModel2 *m, double *var, int order);
+} LLSModel2;
+
+void avpriv_init_lls2(LLSModel2 *m, int indep_count);
+void ff_init_lls_x86(LLSModel2 *m);
+void avpriv_solve_lls2(LLSModel2 *m, double threshold, unsigned short min_order);
+
+#endif /* AVUTIL_LLS_H */

omxplayer-2014.02.11.tar.gz/ffmpeg/libavutil/log.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavutil/log.c Changed

@@ -75,9 +75,6 @@
 
 static int16_t background, attr_orig;
 static HANDLE con;
-#define set_color(x)  SetConsoleTextAttribute(con, background | color[x])
-#define set_256color set_color
-#define reset_color() SetConsoleTextAttribute(con, attr_orig)
 #else
 
 static const uint32_t color[16 + AV_CLASS_CATEGORY_NB] = {
@@ -101,14 +98,14 @@
     [16+AV_CLASS_CATEGORY_SWRESAMPLER     ] = 147 << 8 | 0x14,
 };
 
-#define set_color(x)  fprintf(stderr, "\033[%d;3%dm", (color[x] >> 4) & 15, color[x] & 15)
-#define set_256color(x) fprintf(stderr, "\033[48;5;%dm\033[38;5;%dm", (color[x] >> 16) & 0xff, (color[x] >> 8) & 0xff)
-#define reset_color() fprintf(stderr, "\033[0m")
 #endif
 static int use_color = -1;
 
 static void colored_fputs(int level, const char *str)
 {
+    if (!*str)
+        return;
+
     if (use_color < 0) {
 #if HAVE_SETCONSOLETEXTATTRIBUTE
         CONSOLE_SCREEN_BUFFER_INFO con_info;
@@ -132,14 +129,29 @@
 #endif
     }
 
-    if (use_color == 1) {
-        set_color(level);
-    } else if (use_color == 256)
-        set_256color(level);
+#if HAVE_SETCONSOLETEXTATTRIBUTE
+    if (use_color && level != AV_LOG_INFO/8)
+        SetConsoleTextAttribute(con, background | color[level]);
     fputs(str, stderr);
-    if (use_color) {
-        reset_color();
-    }
+    if (use_color && level != AV_LOG_INFO/8)
+        SetConsoleTextAttribute(con, attr_orig);
+#else
+    if (use_color == 1 && level != AV_LOG_INFO/8) {
+        fprintf(stderr,
+                "\033[%d;3%dm%s\033[0m",
+                (color[level] >> 4) & 15,
+                color[level] & 15,
+                str);
+    } else if (use_color == 256 && level != AV_LOG_INFO/8) {
+        fprintf(stderr,
+                "\033[48;5;%dm\033[38;5;%dm%s\033[0m",
+                (color[level] >> 16) & 0xff,
+                (color[level] >> 8) & 0xff,
+                str);
+    } else
+        fputs(str, stderr);
+#endif
+
 }
 
 const char *av_default_item_name(void *ptr)
@@ -173,10 +185,10 @@
     return avc->category + 16;
 }
 
-static void format_line(void *ptr, int level, const char *fmt, va_list vl,
+static void format_line(void *avcl, int level, const char *fmt, va_list vl,
                         AVBPrint part[3], int *print_prefix, int type[2])
 {
-    AVClass* avc = ptr ? *(AVClass **) ptr : NULL;
+    AVClass* avc = avcl ? *(AVClass **) avcl : NULL;
     av_bprint_init(part+0, 0, 1);
     av_bprint_init(part+1, 0, 1);
     av_bprint_init(part+2, 0, 65536);
@@ -184,7 +196,7 @@
     if(type) type[0] = type[1] = AV_CLASS_CATEGORY_NA + 16;
     if (*print_prefix && avc) {
         if (avc->parent_log_context_offset) {
-            AVClass** parent = *(AVClass ***) (((uint8_t *) ptr) +
+            AVClass** parent = *(AVClass ***) (((uint8_t *) avcl) +
                                    avc->parent_log_context_offset);
             if (parent && *parent) {
                 av_bprintf(part+0, "[%s @ %p] ",
@@ -193,14 +205,14 @@
             }
         }
         av_bprintf(part+1, "[%s @ %p] ",
-                 avc->item_name(ptr), ptr);
-        if(type) type[1] = get_category(ptr);
+                 avc->item_name(avcl), avcl);
+        if(type) type[1] = get_category(avcl);
     }
 
     av_vbprintf(part+2, fmt, vl);
 
     if(*part[0].str || *part[1].str || *part[2].str) {
-        char lastc = part[2].len ? part[2].str[part[2].len - 1] : 0;
+        char lastc = part[2].len && part[2].len <= part[2].size ? part[2].str[part[2].len - 1] : 0;
         *print_prefix = lastc == '\n' || lastc == '\r';
     }
 }

omxplayer-2014.02.11.tar.gz/ffmpeg/libavutil/log.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavutil/log.h Changed

omxplayer-2014.03.28.tar.gz/ffmpeg/libavutil/macros.h Added

omxplayer-2014.02.11.tar.gz/ffmpeg/libavutil/mathematics.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavutil/mathematics.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavutil/mathematics.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavutil/mathematics.h Changed

@@ -45,6 +45,9 @@
 #ifndef M_PI
 #define M_PI           3.14159265358979323846  /* pi */
 #endif
+#ifndef M_PI_2
+#define M_PI_2         1.57079632679489661923  /* pi/2 */
+#endif
 #ifndef M_SQRT1_2
 #define M_SQRT1_2      0.70710678118654752440  /* 1/sqrt(2) */
 #endif
@@ -133,14 +136,28 @@
  * Rescale a timestamp while preserving known durations.
  *
  * @param in_ts Input timestamp
- * @param in_tb Input timesbase
+ * @param in_tb Input timebase
  * @param fs_tb Duration and *last timebase
  * @param duration duration till the next call
- * @param out_tb Output timesbase
+ * @param out_tb Output timebase
  */
 int64_t av_rescale_delta(AVRational in_tb, int64_t in_ts,  AVRational fs_tb, int duration, int64_t *last, AVRational out_tb);
 
 /**
+ * Add a value to a timestamp.
+ *
+ * This function gurantees that when the same value is repeatly added that
+ * no accumulation of rounding errors occurs.
+ *
+ * @param ts Input timestamp
+ * @param ts_tb Input timestamp timebase
+ * @param inc value to add to ts
+ * @param inc_tb inc timebase
+ */
+int64_t av_add_stable(AVRational ts_tb, int64_t ts, AVRational inc_tb, int64_t inc);
+
+
+    /**
  * @}
  */

omxplayer-2014.02.11.tar.gz/ffmpeg/libavutil/mem.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavutil/mem.c Changed

@@ -38,6 +38,7 @@
 
 #include "avassert.h"
 #include "avutil.h"
+#include "common.h"
 #include "intreadwrite.h"
 #include "mem.h"
 
@@ -463,3 +464,41 @@
     }
 }
 
+void *av_fast_realloc(void *ptr, unsigned int *size, size_t min_size)
+{
+    if (min_size < *size)
+        return ptr;
+
+    min_size = FFMAX(17 * min_size / 16 + 32, min_size);
+
+    ptr = av_realloc(ptr, min_size);
+    /* we could set this to the unmodified min_size but this is safer
+     * if the user lost the ptr and uses NULL now
+     */
+    if (!ptr)
+        min_size = 0;
+
+    *size = min_size;
+
+    return ptr;
+}
+
+static inline int ff_fast_malloc(void *ptr, unsigned int *size, size_t min_size, int zero_realloc)
+{
+    void **p = ptr;
+    if (min_size < *size)
+        return 0;
+    min_size = FFMAX(17 * min_size / 16 + 32, min_size);
+    av_free(*p);
+    *p = zero_realloc ? av_mallocz(min_size) : av_malloc(min_size);
+    if (!*p)
+        min_size = 0;
+    *size = min_size;
+    return 1;
+}
+
+void av_fast_malloc(void *ptr, unsigned int *size, size_t min_size)
+{
+    ff_fast_malloc(ptr, size, min_size, 0);
+}
+

omxplayer-2014.02.11.tar.gz/ffmpeg/libavutil/mem.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavutil/mem.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavutil/old_pix_fmts.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavutil/old_pix_fmts.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavutil/opencl.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavutil/opencl.c Changed

@@ -1,7 +1,8 @@
 /*
- * Copyright (C) 2012 Peng Gao <peng@multicorewareinc.com>
- * Copyright (C) 2012 Li   Cao <li@multicorewareinc.com>
- * Copyright (C) 2012 Wei  Gao <weigao@multicorewareinc.com>
+ * Copyright (C) 2012 Peng  Gao     <peng@multicorewareinc.com>
+ * Copyright (C) 2012 Li    Cao     <li@multicorewareinc.com>
+ * Copyright (C) 2012 Wei   Gao     <weigao@multicorewareinc.com>
+ * Copyright (C) 2013 Lenny Wang    <lwanghpc@gmail.com>
  *
  * This file is part of FFmpeg.
  *
@@ -39,8 +40,6 @@
 #define UNLOCK_OPENCL
 #endif
 
-
-#define MAX_KERNEL_NUM 500
 #define MAX_KERNEL_CODE_NUM 200
 
 typedef struct {
@@ -61,17 +60,19 @@
     int is_user_created;
     int platform_idx;
     int device_idx;
-    char *build_options;
     cl_platform_id platform_id;
     cl_device_type device_type;
     cl_context context;
     cl_device_id device_id;
     cl_command_queue command_queue;
+#if FF_API_OLD_OPENCL
+    char *build_options;
     int program_count;
     cl_program programs[MAX_KERNEL_CODE_NUM];
+    int kernel_count;
+#endif
     int kernel_code_count;
     KernelCode kernel_code[MAX_KERNEL_CODE_NUM];
-    int kernel_count;
     AVOpenCLDeviceList device_list;
 } OpenclContext;
 
@@ -80,7 +81,9 @@
 static const AVOption opencl_options[] = {
      { "platform_idx",        "set platform index value",  OFFSET(platform_idx),  AV_OPT_TYPE_INT,    {.i64=-1}, -1, INT_MAX},
      { "device_idx",          "set device index value",    OFFSET(device_idx),    AV_OPT_TYPE_INT,    {.i64=-1}, -1, INT_MAX},
+#if FF_API_OLD_OPENCL
      { "build_options",       "build options of opencl",   OFFSET(build_options), AV_OPT_TYPE_STRING, {.str="-I."},  CHAR_MIN, CHAR_MAX},
+#endif
      { NULL }
 };
 
@@ -95,7 +98,7 @@
 
 static OpenclContext opencl_ctx = {&openclutils_class};
 
-static const cl_device_type device_type[] = {CL_DEVICE_TYPE_GPU, CL_DEVICE_TYPE_CPU, CL_DEVICE_TYPE_DEFAULT};
+static const cl_device_type device_type[] = {CL_DEVICE_TYPE_GPU, CL_DEVICE_TYPE_CPU};
 
 typedef struct {
     int err_code;
@@ -194,7 +197,7 @@
 static int get_device_list(AVOpenCLDeviceList *device_list)
 {
     cl_int status;
-    int i, j, k, device_num, total_devices_num,ret = 0;
+    int i, j, k, device_num, total_devices_num, ret = 0;
     int *devices_num;
     cl_platform_id *platform_ids = NULL;
     cl_device_id *device_ids = NULL;
@@ -388,66 +391,72 @@
     return ret;
 }
 
-int av_opencl_create_kernel(AVOpenCLKernelEnv *env, const char *kernel_name)
+cl_program av_opencl_compile(const char *program_name, const char *build_opts)
 {
+    int i;
     cl_int status;
-    int i, ret = 0;
+    int kernel_code_idx = 0;
+    const char *kernel_source;
+    size_t kernel_code_len;
+    char* ptr = NULL;
+    cl_program program = NULL;
+
     LOCK_OPENCL;
-    if (strlen(kernel_name) + 1 > AV_OPENCL_MAX_KERNEL_NAME_SIZE) {
-        av_log(&opencl_ctx, AV_LOG_ERROR, "Created kernel name %s is too long\n", kernel_name);
-        ret = AVERROR(EINVAL);
+    for (i = 0; i < opencl_ctx.kernel_code_count; i++) {
+        // identify a program using a unique name within the kernel source
+        ptr = av_stristr(opencl_ctx.kernel_code[i].kernel_string, program_name);
+        if (ptr && !opencl_ctx.kernel_code[i].is_compiled) {
+            kernel_source = opencl_ctx.kernel_code[i].kernel_string;
+            kernel_code_len = strlen(opencl_ctx.kernel_code[i].kernel_string);
+            kernel_code_idx = i;
+            break;
+        }
+    }
+    if (!kernel_source) {
+        av_log(&opencl_ctx, AV_LOG_ERROR,
+               "Unable to find OpenCL kernel source '%s'\n", program_name);
         goto end;
     }
-    if (!env->kernel) {
-        if (opencl_ctx.kernel_count >= MAX_KERNEL_NUM) {
-            av_log(&opencl_ctx, AV_LOG_ERROR,
-                   "Could not create kernel with name '%s', maximum number of kernels %d already reached\n",
-                   kernel_name, MAX_KERNEL_NUM);
-            ret = AVERROR(EINVAL);
-            goto end;
-        }
-        if (opencl_ctx.program_count == 0) {
-            av_log(&opencl_ctx, AV_LOG_ERROR, "Program count of OpenCL is 0, can not create kernel\n");
-            ret = AVERROR(EINVAL);
-            goto end;
-        }
-        for (i = 0; i < opencl_ctx.program_count; i++) {
-            env->kernel = clCreateKernel(opencl_ctx.programs[i], kernel_name, &status);
-            if (status == CL_SUCCESS)
-                break;
-        }
-        if (status != CL_SUCCESS) {
-            av_log(&opencl_ctx, AV_LOG_ERROR, "Could not create OpenCL kernel: %s\n", av_opencl_errstr(status));
-            ret = AVERROR_EXTERNAL;
-            goto end;
-        }
-        opencl_ctx.kernel_count++;
-        env->command_queue = opencl_ctx.command_queue;
-        av_strlcpy(env->kernel_name, kernel_name, sizeof(env->kernel_name));
+
+    /* create a CL program from kernel source */
+    program = clCreateProgramWithSource(opencl_ctx.context, 1, &kernel_source, &kernel_code_len, &status);
+    if(status != CL_SUCCESS) {
+        av_log(&opencl_ctx, AV_LOG_ERROR,
+               "Unable to create OpenCL program '%s': %s\n", program_name, av_opencl_errstr(status));
+        program = NULL;
+        goto end;
     }
+    status = clBuildProgram(program, 1, &(opencl_ctx.device_id), build_opts, NULL, NULL);
+    if (status != CL_SUCCESS) {
+        av_log(&opencl_ctx, AV_LOG_ERROR,
+               "Compilation failed with OpenCL program: %s\n", program_name);
+        program = NULL;
+        goto end;
+    }
+
+    opencl_ctx.kernel_code[kernel_code_idx].is_compiled = 1;
 end:
     UNLOCK_OPENCL;
-    return ret;
+    return program;
+}
+
+cl_command_queue av_opencl_get_command_queue(void)
+{
+    return opencl_ctx.command_queue;
+}
+
+#if FF_API_OLD_OPENCL
+int av_opencl_create_kernel(AVOpenCLKernelEnv *env, const char *kernel_name)
+{
+    av_log(&opencl_ctx, AV_LOG_ERROR, "Could not create OpenCL kernel %s, please update libavfilter.\n", kernel_name);
+    return AVERROR(EINVAL);
 }
 
 void av_opencl_release_kernel(AVOpenCLKernelEnv *env)
 {
-    cl_int status;
-    LOCK_OPENCL;
-    if (!env->kernel)
-        goto end;
-    status = clReleaseKernel(env->kernel);
-    if (status != CL_SUCCESS) {
-        av_log(&opencl_ctx, AV_LOG_ERROR, "Could not release kernel: %s\n",
-              av_opencl_errstr(status));
-    }
-    env->kernel = NULL;
-    env->command_queue = NULL;
-    env->kernel_name[0] = 0;
-    opencl_ctx.kernel_count--;
-end:
-    UNLOCK_OPENCL;
+    av_log(&opencl_ctx, AV_LOG_ERROR, "Could not release OpenCL kernel, please update libavfilter.\n");
 }
+#endif
 
 static int init_opencl_env(OpenclContext *opencl_ctx, AVOpenCLExternalEnv *ext_opencl_env)
 {
@@ -542,49 +551,6 @@
     return ret;
 }
 
-static int compile_kernel_file(OpenclContext *opencl_ctx)
-{
-    cl_int status;
-    int i, kernel_code_count = 0;
-    const char *kernel_code[MAX_KERNEL_CODE_NUM] = {NULL};
-    size_t kernel_code_len[MAX_KERNEL_CODE_NUM] = {0};
-
-    for (i = 0; i < opencl_ctx->kernel_code_count; i++) {
-        if (!opencl_ctx->kernel_code[i].is_compiled) {
-            kernel_code[kernel_code_count] = opencl_ctx->kernel_code[i].kernel_string;
-            kernel_code_len[kernel_code_count] = strlen(opencl_ctx->kernel_code[i].kernel_string);
-            opencl_ctx->kernel_code[i].is_compiled = 1;
-            kernel_code_count++;
-        }
-    }
-    if (!kernel_code_count)
-        return 0;
-    /* create a CL program using the kernel source */
-    opencl_ctx->programs[opencl_ctx->program_count] = clCreateProgramWithSource(opencl_ctx->context,
-                                                                                kernel_code_count,
-                                                                                kernel_code,
-                                                                                kernel_code_len,
-                                                                                &status);
-    if(status != CL_SUCCESS) {
-        av_log(opencl_ctx, AV_LOG_ERROR,
-               "Could not create OpenCL program with source code: %s\n", av_opencl_errstr(status));
-        return AVERROR_EXTERNAL;
-    }
-    if (!opencl_ctx->programs[opencl_ctx->program_count]) {
-        av_log(opencl_ctx, AV_LOG_ERROR, "Created program is NULL\n");
-        return AVERROR_EXTERNAL;
-    }
-    status = clBuildProgram(opencl_ctx->programs[opencl_ctx->program_count], 1, &(opencl_ctx->device_id),
-                            opencl_ctx->build_options, NULL, NULL);
-    if (status != CL_SUCCESS) {
-        av_log(opencl_ctx, AV_LOG_ERROR,
-               "Could not compile OpenCL kernel: %s\n", av_opencl_errstr(status));
-        return AVERROR_EXTERNAL;
-    }
-    opencl_ctx->program_count++;
-    return 0;
-}
-
 int av_opencl_init(AVOpenCLExternalEnv *ext_opencl_env)
 {
     int ret = 0;
@@ -597,18 +563,14 @@
         ret = init_opencl_env(&opencl_ctx, ext_opencl_env);
         if (ret < 0)
             goto end;
-    }
-    ret = compile_kernel_file(&opencl_ctx);
-    if (ret < 0)
-        goto end;
-    if (opencl_ctx.kernel_code_count <= 0) {
-        av_log(&opencl_ctx, AV_LOG_ERROR,
-               "No kernel code is registered, compile kernel file failed\n");
-        ret = AVERROR(EINVAL);
-        goto end;
+        if (opencl_ctx.kernel_code_count <= 0) {
+            av_log(&opencl_ctx, AV_LOG_ERROR,
+                   "No kernel code is registered, compile kernel file failed\n");
+            ret = AVERROR(EINVAL);
+            goto end;
+        }
     }
     opencl_ctx.init_count++;
-
 end:
     UNLOCK_OPENCL;
     return ret;
@@ -617,23 +579,12 @@
 void av_opencl_uninit(void)
 {
     cl_int status;
-    int i;
     LOCK_OPENCL;
     opencl_ctx.init_count--;
     if (opencl_ctx.is_user_created)
         goto end;
-    if (opencl_ctx.init_count > 0 || opencl_ctx.kernel_count > 0)
+    if (opencl_ctx.init_count > 0)
         goto end;
-    for (i = 0; i < opencl_ctx.program_count; i++) {
-        if (opencl_ctx.programs[i]) {
-            status = clReleaseProgram(opencl_ctx.programs[i]);
-            if (status != CL_SUCCESS) {
-                av_log(&opencl_ctx, AV_LOG_ERROR,
-                       "Could not release OpenCL program: %s\n", av_opencl_errstr(status));
-            }
-            opencl_ctx.programs[i] = NULL;
-        }
-    }
     if (opencl_ctx.command_queue) {
         status = clReleaseCommandQueue(opencl_ctx.command_queue);
         if (status != CL_SUCCESS) {
@@ -652,7 +603,7 @@
     }
     free_device_list(&opencl_ctx.device_list);
 end:
-    if ((opencl_ctx.init_count <= 0) && (opencl_ctx.kernel_count <= 0))
+    if (opencl_ctx.init_count <= 0)
         av_opt_free(&opencl_ctx); //FIXME: free openclutils context
     UNLOCK_OPENCL;
 }
@@ -810,3 +761,45 @@
     }
     return 0;
 }
+
+int64_t av_opencl_benchmark(AVOpenCLDeviceNode *device_node, cl_platform_id platform,
+                            int64_t (*benchmark)(AVOpenCLExternalEnv *ext_opencl_env))
+{
+    int64_t ret = 0;
+    cl_int status;
+    cl_context_properties cps[3];
+    AVOpenCLExternalEnv *ext_opencl_env = NULL;
+
+    ext_opencl_env = av_opencl_alloc_external_env();
+    ext_opencl_env->device_id = device_node->device_id;
+    ext_opencl_env->device_type = device_node->device_type;
+    av_log(&opencl_ctx, AV_LOG_VERBOSE, "Performing test on OpenCL device %s\n",
+           device_node->device_name);
+
+    cps[0] = CL_CONTEXT_PLATFORM;
+    cps[1] = (cl_context_properties)platform;
+    cps[2] = 0;
+    ext_opencl_env->context = clCreateContextFromType(cps, ext_opencl_env->device_type,
+                                                      NULL, NULL, &status);
+    if (status != CL_SUCCESS || !ext_opencl_env->context) {
+        ret = AVERROR_EXTERNAL;
+        goto end;
+    }
+    ext_opencl_env->command_queue = clCreateCommandQueue(ext_opencl_env->context,
+                                                         ext_opencl_env->device_id, 0, &status);
+    if (status != CL_SUCCESS || !ext_opencl_env->command_queue) {
+        ret = AVERROR_EXTERNAL;
+        goto end;
+    }
+    ret = benchmark(ext_opencl_env);
+    if (ret < 0)
+        av_log(&opencl_ctx, AV_LOG_ERROR, "Benchmark failed with OpenCL device %s\n",
+               device_node->device_name);
+end:
+    if (ext_opencl_env->command_queue)
+        clReleaseCommandQueue(ext_opencl_env->command_queue);
+    if (ext_opencl_env->context)
+        clReleaseContext(ext_opencl_env->context);
+    av_opencl_free_external_env(&ext_opencl_env);
+    return ret;
+}

omxplayer-2014.02.11.tar.gz/ffmpeg/libavutil/opencl.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavutil/opencl.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavutil/opt.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavutil/opt.c Changed

@@ -93,11 +93,21 @@
 
 static int write_number(void *obj, const AVOption *o, void *dst, double num, int den, int64_t intnum)
 {
-    if (o->max*den < num*intnum || o->min*den > num*intnum) {
+    if (o->type != AV_OPT_TYPE_FLAGS &&
+        (o->max * den < num * intnum || o->min * den > num * intnum)) {
         av_log(obj, AV_LOG_ERROR, "Value %f for parameter '%s' out of range [%g - %g]\n",
                num*intnum/den, o->name, o->min, o->max);
         return AVERROR(ERANGE);
     }
+    if (o->type == AV_OPT_TYPE_FLAGS) {
+        double d = num*intnum/den;
+        if (d < -1.5 || d > 0xFFFFFFFF+0.5 || (llrint(d*256) & 255)) {
+            av_log(obj, AV_LOG_ERROR,
+                   "Value %f for parameter '%s' is not a valid set of 32bit integer flags\n",
+                   num*intnum/den, o->name);
+            return AVERROR(ERANGE);
+        }
+    }
 
     switch (o->type) {
     case AV_OPT_TYPE_FLAGS:
@@ -185,6 +195,15 @@
 static int set_string_number(void *obj, void *target_obj, const AVOption *o, const char *val, void *dst)
 {
     int ret = 0, notfirst = 0;
+    int num, den;
+    char c;
+
+    if (sscanf(val, "%d%*1[:/]%d%c", &num, &den, &c) == 2) {
+        if ((ret = write_number(obj, o, dst, 1, den, num)) >= 0)
+            return ret;
+        ret = 0;
+    }
+
     for (;;) {
         int i, den = 1;
         char buf[256];
@@ -242,6 +261,101 @@
     return 0;
 }
 
+static int set_string_image_size(void *obj, const AVOption *o, const char *val, int *dst)
+{
+    int ret;
+
+    if (!val || !strcmp(val, "none")) {
+        dst[0] =
+        dst[1] = 0;
+        return 0;
+    }
+    ret = av_parse_video_size(dst, dst + 1, val);
+    if (ret < 0)
+        av_log(obj, AV_LOG_ERROR, "Unable to parse option value \"%s\" as image size\n", val);
+    return ret;
+}
+
+static int set_string_video_rate(void *obj, const AVOption *o, const char *val, AVRational *dst)
+{
+    int ret;
+    if (!val) {
+        ret = AVERROR(EINVAL);
+    } else {
+        ret = av_parse_video_rate(dst, val);
+    }
+    if (ret < 0)
+        av_log(obj, AV_LOG_ERROR, "Unable to parse option value \"%s\" as video rate\n", val);
+    return ret;
+}
+
+static int set_string_color(void *obj, const AVOption *o, const char *val, uint8_t *dst)
+{
+    int ret;
+
+    if (!val) {
+        return 0;
+    } else {
+        ret = av_parse_color(dst, val, -1, obj);
+        if (ret < 0)
+            av_log(obj, AV_LOG_ERROR, "Unable to parse option value \"%s\" as color\n", val);
+        return ret;
+    }
+    return 0;
+}
+
+static int set_string_fmt(void *obj, const AVOption *o, const char *val, uint8_t *dst,
+                          int fmt_nb, int ((*get_fmt)(const char *)), const char *desc)
+{
+    int fmt, min, max;
+
+    if (!val || !strcmp(val, "none")) {
+        fmt = -1;
+    } else {
+        fmt = get_fmt(val);
+        if (fmt == -1) {
+            char *tail;
+            fmt = strtol(val, &tail, 0);
+            if (*tail || (unsigned)fmt >= fmt_nb) {
+                av_log(obj, AV_LOG_ERROR,
+                       "Unable to parse option value \"%s\" as %s\n", val, desc);
+                return AVERROR(EINVAL);
+            }
+        }
+    }
+
+    min = FFMAX(o->min, -1);
+    max = FFMIN(o->max, fmt_nb-1);
+
+    // hack for compatibility with old ffmpeg
+    if(min == 0 && max == 0) {
+        min = -1;
+        max = fmt_nb-1;
+    }
+
+    if (fmt < min || fmt > max) {
+        av_log(obj, AV_LOG_ERROR,
+               "Value %d for parameter '%s' out of %s format range [%d - %d]\n",
+               fmt, o->name, desc, min, max);
+        return AVERROR(ERANGE);
+    }
+
+    *(int *)dst = fmt;
+    return 0;
+}
+
+static int set_string_pixel_fmt(void *obj, const AVOption *o, const char *val, uint8_t *dst)
+{
+    return set_string_fmt(obj, o, val, dst,
+                          AV_PIX_FMT_NB, av_get_pix_fmt, "pixel format");
+}
+
+static int set_string_sample_fmt(void *obj, const AVOption *o, const char *val, uint8_t *dst)
+{
+    return set_string_fmt(obj, o, val, dst,
+                          AV_SAMPLE_FMT_NB, av_get_sample_fmt, "sample format");
+}
+
 #if FF_API_OLD_AVOPTIONS
 int av_set_string3(void *obj, const char *name, const char *val, int alloc, const AVOption **o_out)
 {
@@ -266,6 +380,9 @@
                  o->type != AV_OPT_TYPE_CHANNEL_LAYOUT))
         return AVERROR(EINVAL);
 
+    if (o->flags & AV_OPT_FLAG_READONLY)
+        return AVERROR(EINVAL);
+
     dst = ((uint8_t*)target_obj) + o->offset;
     switch (o->type) {
     case AV_OPT_TYPE_STRING:   return set_string(obj, o, val, dst);
@@ -276,56 +393,10 @@
     case AV_OPT_TYPE_FLOAT:
     case AV_OPT_TYPE_DOUBLE:
     case AV_OPT_TYPE_RATIONAL: return set_string_number(obj, target_obj, o, val, dst);
-    case AV_OPT_TYPE_IMAGE_SIZE:
-        if (!val || !strcmp(val, "none")) {
-            *(int *)dst = *((int *)dst + 1) = 0;
-            return 0;
-        }
-        ret = av_parse_video_size(dst, ((int *)dst) + 1, val);
-        if (ret < 0)
-            av_log(obj, AV_LOG_ERROR, "Unable to parse option value \"%s\" as image size\n", val);
-        return ret;
-    case AV_OPT_TYPE_VIDEO_RATE:
-        if (!val) {
-            ret = AVERROR(EINVAL);
-        } else {
-            ret = av_parse_video_rate(dst, val);
-        }
-        if (ret < 0)
-            av_log(obj, AV_LOG_ERROR, "Unable to parse option value \"%s\" as video rate\n", val);
-        return ret;
-    case AV_OPT_TYPE_PIXEL_FMT:
-        if (!val || !strcmp(val, "none")) {
-            ret = AV_PIX_FMT_NONE;
-        } else {
-            ret = av_get_pix_fmt(val);
-            if (ret == AV_PIX_FMT_NONE) {
-                char *tail;
-                ret = strtol(val, &tail, 0);
-                if (*tail || (unsigned)ret >= AV_PIX_FMT_NB) {
-                    av_log(obj, AV_LOG_ERROR, "Unable to parse option value \"%s\" as pixel format\n", val);
-                    return AVERROR(EINVAL);
-                }
-            }
-        }
-        *(enum AVPixelFormat *)dst = ret;
-        return 0;
-    case AV_OPT_TYPE_SAMPLE_FMT:
-        if (!val || !strcmp(val, "none")) {
-            ret = AV_SAMPLE_FMT_NONE;
-        } else {
-            ret = av_get_sample_fmt(val);
-            if (ret == AV_SAMPLE_FMT_NONE) {
-                char *tail;
-                ret = strtol(val, &tail, 0);
-                if (*tail || (unsigned)ret >= AV_SAMPLE_FMT_NB) {
-                    av_log(obj, AV_LOG_ERROR, "Unable to parse option value \"%s\" as sample format\n", val);
-                    return AVERROR(EINVAL);
-                }
-            }
-        }
-        *(enum AVSampleFormat *)dst = ret;
-        return 0;
+    case AV_OPT_TYPE_IMAGE_SIZE: return set_string_image_size(obj, o, val, dst);
+    case AV_OPT_TYPE_VIDEO_RATE: return set_string_video_rate(obj, o, val, dst);
+    case AV_OPT_TYPE_PIXEL_FMT:  return set_string_pixel_fmt(obj, o, val, dst);
+    case AV_OPT_TYPE_SAMPLE_FMT: return set_string_sample_fmt(obj, o, val, dst);
     case AV_OPT_TYPE_DURATION:
         if (!val) {
             *(int64_t *)dst = 0;
@@ -336,16 +407,7 @@
             return ret;
         }
         break;
-    case AV_OPT_TYPE_COLOR:
-        if (!val) {
-            return 0;
-        } else {
-            ret = av_parse_color(dst, val, -1, obj);
-            if (ret < 0)
-                av_log(obj, AV_LOG_ERROR, "Unable to parse option value \"%s\" as color\n", val);
-            return ret;
-        }
-        break;
+    case AV_OPT_TYPE_COLOR:      return set_string_color(obj, o, val, dst);
     case AV_OPT_TYPE_CHANNEL_LAYOUT:
         if (!val || !strcmp(val, "none")) {
             *(int64_t *)dst = 0;
@@ -372,7 +434,7 @@
 #define OPT_EVAL_NUMBER(name, opttype, vartype)\
     int av_opt_eval_ ## name(void *obj, const AVOption *o, const char *val, vartype *name ## _out)\
     {\
-        if (!o || o->type != opttype)\
+        if (!o || o->type != opttype || o->flags & AV_OPT_FLAG_READONLY)\
             return AVERROR(EINVAL);\
         return set_string_number(obj, obj, o, val, name ## _out);\
     }
@@ -393,6 +455,9 @@
     if (!o || !target_obj)
         return AVERROR_OPTION_NOT_FOUND;
 
+    if (o->flags & AV_OPT_FLAG_READONLY)
+        return AVERROR(EINVAL);
+
     dst = ((uint8_t*)target_obj) + o->offset;
     return write_number(obj, o, dst, num, den, intnum);
 }
@@ -449,7 +514,7 @@
     if (!o || !target_obj)
         return AVERROR_OPTION_NOT_FOUND;
 
-    if (o->type != AV_OPT_TYPE_BINARY)
+    if (o->type != AV_OPT_TYPE_BINARY || o->flags & AV_OPT_FLAG_READONLY)
         return AVERROR(EINVAL);
 
     ptr = len ? av_malloc(len) : NULL;
@@ -524,15 +589,15 @@
         return AVERROR(EINVAL);
     }
 
-#if LIBAVUTIL_VERSION_MAJOR < 53
+#if LIBAVUTIL_VERSION_MAJOR < 54
     if (class->version && class->version < AV_VERSION_INT(52, 11, 100)) {
         min = -1;
         max = nb_fmts-1;
     } else
 #endif
     {
-        min = FFMIN(o->min, -1);
-        max = FFMAX(o->max, nb_fmts-1);
+        min = FFMAX(o->min, -1);
+        max = FFMIN(o->max, nb_fmts-1);
     }
     if (fmt < min || fmt > max) {
         av_log(obj, AV_LOG_ERROR,
@@ -877,6 +942,8 @@
         av_log(av_log_obj, level, "INT_MAX");
     } else if (d == INT_MIN) {
         av_log(av_log_obj, level, "INT_MIN");
+    } else if (d == UINT32_MAX) {
+        av_log(av_log_obj, level, "UINT32_MAX");
     } else if (d == (double)INT64_MAX) {
         av_log(av_log_obj, level, "I64_MAX");
     } else if (d == INT64_MIN) {
@@ -885,6 +952,18 @@
         av_log(av_log_obj, level, "FLT_MAX");
     } else if (d == FLT_MIN) {
         av_log(av_log_obj, level, "FLT_MIN");
+    } else if (d == -FLT_MAX) {
+        av_log(av_log_obj, level, "-FLT_MAX");
+    } else if (d == -FLT_MIN) {
+        av_log(av_log_obj, level, "-FLT_MIN");
+    } else if (d == DBL_MAX) {
+        av_log(av_log_obj, level, "DBL_MAX");
+    } else if (d == DBL_MIN) {
+        av_log(av_log_obj, level, "DBL_MIN");
+    } else if (d == -DBL_MAX) {
+        av_log(av_log_obj, level, "-DBL_MAX");
+    } else if (d == -DBL_MIN) {
+        av_log(av_log_obj, level, "-DBL_MIN");
     } else {
         av_log(av_log_obj, level, "%g", d);
     }
@@ -975,6 +1054,8 @@
         av_log(av_log_obj, AV_LOG_INFO, "%c", (opt->flags & AV_OPT_FLAG_VIDEO_PARAM   ) ? 'V' : '.');
         av_log(av_log_obj, AV_LOG_INFO, "%c", (opt->flags & AV_OPT_FLAG_AUDIO_PARAM   ) ? 'A' : '.');
         av_log(av_log_obj, AV_LOG_INFO, "%c", (opt->flags & AV_OPT_FLAG_SUBTITLE_PARAM) ? 'S' : '.');
+        av_log(av_log_obj, AV_LOG_INFO, "%c", (opt->flags & AV_OPT_FLAG_EXPORT)         ? 'X' : '.');
+        av_log(av_log_obj, AV_LOG_INFO, "%c", (opt->flags & AV_OPT_FLAG_READONLY)       ? 'R' : '.');
 
         if (opt->help)
             av_log(av_log_obj, AV_LOG_INFO, " %s", opt->help);
@@ -1073,10 +1154,15 @@
     const AVClass *class = *(AVClass **)s;
     const AVOption *opt = NULL;
     while ((opt = av_opt_next(s, opt)) != NULL) {
+        void *dst = ((uint8_t*)s) + opt->offset;
 #if FF_API_OLD_AVOPTIONS
         if ((opt->flags & mask) != flags)
             continue;
 #endif
+
+        if (opt->flags & AV_OPT_FLAG_READONLY)
+            continue;
+
         switch (opt->type) {
             case AV_OPT_TYPE_CONST:
                 /* Nothing to be done here */
@@ -1086,42 +1172,48 @@
             case AV_OPT_TYPE_INT64:
             case AV_OPT_TYPE_DURATION:
             case AV_OPT_TYPE_CHANNEL_LAYOUT:
-                av_opt_set_int(s, opt->name, opt->default_val.i64, 0);
+                write_number(s, opt, dst, 1, 1, opt->default_val.i64);
             break;
             case AV_OPT_TYPE_DOUBLE:
             case AV_OPT_TYPE_FLOAT: {
                 double val;
                 val = opt->default_val.dbl;
-                av_opt_set_double(s, opt->name, val, 0);
+                write_number(s, opt, dst, val, 1, 1);
             }
             break;
             case AV_OPT_TYPE_RATIONAL: {
                 AVRational val;
                 val = av_d2q(opt->default_val.dbl, INT_MAX);
-                av_opt_set_q(s, opt->name, val, 0);
+                write_number(s, opt, dst, 1, val.den, val.num);
             }
             break;
             case AV_OPT_TYPE_COLOR:
+                set_string_color(s, opt, opt->default_val.str, dst);
+                break;
             case AV_OPT_TYPE_STRING:
+                set_string(s, opt, opt->default_val.str, dst);
+                break;
             case AV_OPT_TYPE_IMAGE_SIZE:
+                set_string_image_size(s, opt, opt->default_val.str, dst);
+                break;
             case AV_OPT_TYPE_VIDEO_RATE:
-                av_opt_set(s, opt->name, opt->default_val.str, 0);
+                set_string_video_rate(s, opt, opt->default_val.str, dst);
                 break;
             case AV_OPT_TYPE_PIXEL_FMT:
-#if LIBAVUTIL_VERSION_MAJOR < 53
+#if LIBAVUTIL_VERSION_MAJOR < 54
                 if (class->version && class->version < AV_VERSION_INT(52, 10, 100))
                     av_opt_set(s, opt->name, opt->default_val.str, 0);
                 else
 #endif
-                    av_opt_set_pixel_fmt(s, opt->name, opt->default_val.i64, 0);
+                    write_number(s, opt, dst, 1, 1, opt->default_val.i64);
                 break;
             case AV_OPT_TYPE_SAMPLE_FMT:
-#if LIBAVUTIL_VERSION_MAJOR < 53
+#if LIBAVUTIL_VERSION_MAJOR < 54
                 if (class->version && class->version < AV_VERSION_INT(52, 10, 100))
                     av_opt_set(s, opt->name, opt->default_val.str, 0);
                 else
 #endif
-                    av_opt_set_sample_fmt(s, opt->name, opt->default_val.i64, 0);
+                    write_number(s, opt, dst, 1, 1, opt->default_val.i64);
                 break;
             case AV_OPT_TYPE_BINARY:
                 /* Cannot set default for binary */
@@ -1549,8 +1641,8 @@
 {"lame",     "set lame flag ", 0,                AV_OPT_TYPE_CONST,    {.i64 = TEST_FLAG_LAME}, INT_MIN,  INT_MAX, 0, "flags" },
 {"mu",       "set mu flag ",   0,                AV_OPT_TYPE_CONST,    {.i64 = TEST_FLAG_MU},   INT_MIN,  INT_MAX, 0, "flags" },
 {"size",     "set size",       OFFSET(w),        AV_OPT_TYPE_IMAGE_SIZE,{0},             0,        0                   },
-{"pix_fmt",  "set pixfmt",     OFFSET(pix_fmt),  AV_OPT_TYPE_PIXEL_FMT, {.i64 = AV_PIX_FMT_NONE}, -1, AV_PIX_FMT_NB-1},
-{"sample_fmt", "set samplefmt", OFFSET(sample_fmt), AV_OPT_TYPE_SAMPLE_FMT, {.i64 = AV_SAMPLE_FMT_NONE}, -1, AV_SAMPLE_FMT_NB-1},
+{"pix_fmt",  "set pixfmt",     OFFSET(pix_fmt),  AV_OPT_TYPE_PIXEL_FMT, {.i64 = AV_PIX_FMT_NONE}, -1, INT_MAX},
+{"sample_fmt", "set samplefmt", OFFSET(sample_fmt), AV_OPT_TYPE_SAMPLE_FMT, {.i64 = AV_SAMPLE_FMT_NONE}, -1, INT_MAX},
 {"video_rate", "set videorate", OFFSET(video_rate), AV_OPT_TYPE_VIDEO_RATE,  {.str = "25"}, 0,     0                   },
 {"duration", "set duration",   OFFSET(duration), AV_OPT_TYPE_DURATION, {.i64 = 0}, 0, INT64_MAX},
 {"color", "set color",   OFFSET(color), AV_OPT_TYPE_COLOR, {.str = "pink"}, 0, 0},

omxplayer-2014.02.11.tar.gz/ffmpeg/libavutil/opt.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavutil/opt.h Changed

@@ -282,10 +282,21 @@
     int flags;
 #define AV_OPT_FLAG_ENCODING_PARAM  1   ///< a generic parameter which can be set by the user for muxing or encoding
 #define AV_OPT_FLAG_DECODING_PARAM  2   ///< a generic parameter which can be set by the user for demuxing or decoding
+#if FF_API_OPT_TYPE_METADATA
 #define AV_OPT_FLAG_METADATA        4   ///< some data extracted or inserted into the file like title, comment, ...
+#endif
 #define AV_OPT_FLAG_AUDIO_PARAM     8
 #define AV_OPT_FLAG_VIDEO_PARAM     16
 #define AV_OPT_FLAG_SUBTITLE_PARAM  32
+/**
+ * The option is inteded for exporting values to the caller.
+ */
+#define AV_OPT_FLAG_EXPORT          64
+/**
+ * The option may not be set through the AVOptions API, only read.
+ * This flag only makes sense when AV_OPT_FLAG_EXPORT is also set.
+ */
+#define AV_OPT_FLAG_READONLY        128
 #define AV_OPT_FLAG_FILTERING_PARAM (1<<16) ///< a generic parameter which can be set by the user for filtering
 //FIXME think about enc-audio, ... style flags

omxplayer-2014.02.11.tar.gz/ffmpeg/libavutil/parseutils.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavutil/parseutils.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavutil/pixdesc.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavutil/pixdesc.c Changed

@@ -29,6 +29,7 @@
 #include "internal.h"
 #include "intreadwrite.h"
 #include "avstring.h"
+#include "version.h"
 
 void av_read_image_line(uint16_t *dst,
                         const uint8_t *data[4], const int linesize[4],
@@ -313,6 +314,7 @@
         },
         .flags = AV_PIX_FMT_FLAG_PLANAR,
     },
+#if FF_API_XVMC
     [AV_PIX_FMT_XVMC_MPEG2_MC] = {
         .name = "xvmcmc",
         .flags = AV_PIX_FMT_FLAG_HWACCEL,
@@ -321,6 +323,13 @@
         .name = "xvmcidct",
         .flags = AV_PIX_FMT_FLAG_HWACCEL,
     },
+#endif /* FF_API_XVMC */
+#if !FF_API_XVMC
+    [AV_PIX_FMT_XVMC] = {
+        .name = "xvmc",
+        .flags = AV_PIX_FMT_FLAG_HWACCEL,
+    },
+#endif /* !FF_API_XVMC */
     [AV_PIX_FMT_UYVY422] = {
         .name = "uyvy422",
         .nb_components = 3,
@@ -1761,50 +1770,62 @@
     [AV_PIX_FMT_BAYER_BGGR8] = {
         .name = "bayer_bggr8",
         BAYER8_DESC_COMMON
+        .flags = AV_PIX_FMT_FLAG_RGB,
     },
     [AV_PIX_FMT_BAYER_BGGR16LE] = {
         .name = "bayer_bggr16le",
         BAYER16_DESC_COMMON
+        .flags = AV_PIX_FMT_FLAG_RGB,
     },
     [AV_PIX_FMT_BAYER_BGGR16BE] = {
         .name = "bayer_bggr16be",
         BAYER16_DESC_COMMON
+        .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_RGB,
     },
     [AV_PIX_FMT_BAYER_RGGB8] = {
         .name = "bayer_rggb8",
         BAYER8_DESC_COMMON
+        .flags = AV_PIX_FMT_FLAG_RGB,
     },
     [AV_PIX_FMT_BAYER_RGGB16LE] = {
         .name = "bayer_rggb16le",
         BAYER16_DESC_COMMON
+        .flags = AV_PIX_FMT_FLAG_RGB,
     },
     [AV_PIX_FMT_BAYER_RGGB16BE] = {
         .name = "bayer_rggb16be",
         BAYER16_DESC_COMMON
+        .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_RGB,
     },
     [AV_PIX_FMT_BAYER_GBRG8] = {
         .name = "bayer_gbrg8",
         BAYER8_DESC_COMMON
+        .flags = AV_PIX_FMT_FLAG_RGB,
     },
     [AV_PIX_FMT_BAYER_GBRG16LE] = {
         .name = "bayer_gbrg16le",
         BAYER16_DESC_COMMON
+        .flags = AV_PIX_FMT_FLAG_RGB,
     },
     [AV_PIX_FMT_BAYER_GBRG16BE] = {
         .name = "bayer_gbrg16be",
         BAYER16_DESC_COMMON
+        .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_RGB,
     },
     [AV_PIX_FMT_BAYER_GRBG8] = {
         .name = "bayer_grbg8",
         BAYER8_DESC_COMMON
+        .flags = AV_PIX_FMT_FLAG_RGB,
     },
     [AV_PIX_FMT_BAYER_GRBG16LE] = {
         .name = "bayer_grbg16le",
         BAYER16_DESC_COMMON
+        .flags = AV_PIX_FMT_FLAG_RGB,
     },
     [AV_PIX_FMT_BAYER_GRBG16BE] = {
         .name = "bayer_grbg16be",
         BAYER16_DESC_COMMON
+        .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_RGB,
     },
     [AV_PIX_FMT_NV16] = {
         .name = "nv16",

omxplayer-2014.02.11.tar.gz/ffmpeg/libavutil/pixfmt.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavutil/pixfmt.h Changed

@@ -80,8 +80,11 @@
     AV_PIX_FMT_YUVJ420P,  ///< planar YUV 4:2:0, 12bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV420P and setting color_range
     AV_PIX_FMT_YUVJ422P,  ///< planar YUV 4:2:2, 16bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV422P and setting color_range
     AV_PIX_FMT_YUVJ444P,  ///< planar YUV 4:4:4, 24bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV444P and setting color_range
+#if FF_API_XVMC
     AV_PIX_FMT_XVMC_MPEG2_MC,///< XVideo Motion Acceleration via common packet passing
     AV_PIX_FMT_XVMC_MPEG2_IDCT,
+#define AV_PIX_FMT_XVMC AV_PIX_FMT_XVMC_MPEG2_IDCT
+#endif /* FF_API_XVMC */
     AV_PIX_FMT_UYVY422,   ///< packed YUV 4:2:2, 16bpp, Cb Y0 Cr Y1
     AV_PIX_FMT_UYYVYY411, ///< packed YUV 4:1:1, 12bpp, Cb Y0 Y1 Cr Y2 Y3
     AV_PIX_FMT_BGR8,      ///< packed RGB 3:3:2,  8bpp, (msb)2B 3G 3R(lsb)
@@ -260,6 +263,9 @@
     AV_PIX_FMT_BAYER_GBRG16BE, ///< bayer, GBGB..(odd line), RGRG..(even line), 16-bit samples, big-endian */
     AV_PIX_FMT_BAYER_GRBG16LE, ///< bayer, GRGR..(odd line), BGBG..(even line), 16-bit samples, little-endian */
     AV_PIX_FMT_BAYER_GRBG16BE, ///< bayer, GRGR..(odd line), BGBG..(even line), 16-bit samples, big-endian */
+#if !FF_API_XVMC
+    AV_PIX_FMT_XVMC,///< XVideo Motion Acceleration via common packet passing
+#endif /* !FF_API_XVMC */
 
     AV_PIX_FMT_NB,        ///< number of pixel formats, DO NOT USE THIS if you want to link with shared libav* because the number of formats might differ between versions

omxplayer-2014.02.11.tar.gz/ffmpeg/libavutil/random_seed.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavutil/random_seed.c Changed

@@ -33,10 +33,10 @@
 #include <string.h>
 #include "avassert.h"
 #include "internal.h"
+#include "intreadwrite.h"
 #include "timer.h"
 #include "random_seed.h"
 #include "sha.h"
-#include "intreadwrite.h"
 
 #ifndef TEST
 #define TEST 0
@@ -65,7 +65,7 @@
     struct AVSHA *sha = (void*)tmp;
     clock_t last_t  = 0;
     static uint64_t i = 0;
-    static uint32_t buffer[512] = {0};
+    static uint32_t buffer[512] = { 0 };
     unsigned char digest[20];
     uint64_t last_i = i;
 
@@ -84,11 +84,11 @@
     for (;;) {
         clock_t t = clock();
 
-        if(last_t == t){
-            buffer[i&511]++;
-        }else{
-            buffer[++i&511]+= (t-last_t) % 3294638521U;
-            if(last_i && i-last_i > 4 || i-last_i > 64 || TEST && i-last_i > 8)
+        if (last_t == t) {
+            buffer[i & 511]++;
+        } else {
+            buffer[++i & 511] += (t - last_t) % 3294638521U;
+            if (last_i && i - last_i > 4 || i - last_i > 64 || TEST && i - last_i > 8)
                 break;
         }
         last_t = t;
@@ -98,9 +98,9 @@
         buffer[0] = buffer[1] = 0;
 
     av_sha_init(sha, 160);
-    av_sha_update(sha, (uint8_t*)buffer, sizeof(buffer));
+    av_sha_update(sha, (const uint8_t *)buffer, sizeof(buffer));
     av_sha_final(sha, digest);
-    return AV_RB32(digest) + AV_RB32(digest+16);
+    return AV_RB32(digest) + AV_RB32(digest + 16);
 }
 
 uint32_t av_get_random_seed(void)

omxplayer-2014.02.11.tar.gz/ffmpeg/libavutil/rational.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavutil/rational.c Changed

@@ -171,6 +171,36 @@
             }
         }
     }
+
+    for (a.num = 1; a.num <= 10; a.num++) {
+        for (a.den = 1; a.den <= 10; a.den++) {
+            if (av_gcd(a.num, a.den) > 1)
+                continue;
+            for (b.num = 1; b.num <= 10; b.num++) {
+                for (b.den = 1; b.den <= 10; b.den++) {
+                    int start;
+                    if (av_gcd(b.num, b.den) > 1)
+                        continue;
+                    if (av_cmp_q(b, a) < 0)
+                        continue;
+                    for (start = 0; start < 10 ; start++) {
+                        int acc= start;
+                        int i;
+
+                        for (i = 0; i<100; i++) {
+                            int exact = start + av_rescale_q(i+1, b, a);
+                            acc = av_add_stable(a, acc, b, 1);
+                            if (FFABS(acc - exact) > 2) {
+                                av_log(NULL, AV_LOG_ERROR, "%d/%d %d/%d, %d %d\n", a.num,
+                                       a.den, b.num, b.den, acc, exact);
+                                return 1;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
     return 0;
 }
 #endif

omxplayer-2014.02.11.tar.gz/ffmpeg/libavutil/rational.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavutil/rational.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavutil/samplefmt.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavutil/samplefmt.c Changed

omxplayer-2014.03.28.tar.gz/ffmpeg/libavutil/stereo3d.c Added

@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2013 Vittorio Giovara <vittorio.giovara@gmail.com>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <stdint.h>
+
+#include "mem.h"
+#include "stereo3d.h"
+
+AVStereo3D *av_stereo3d_alloc(void)
+{
+    return av_mallocz(sizeof(AVStereo3D));
+}
+
+AVStereo3D *av_stereo3d_create_side_data(AVFrame *frame)
+{
+    AVFrameSideData *side_data = av_frame_new_side_data(frame,
+                                                        AV_FRAME_DATA_STEREO3D,
+                                                        sizeof(AVStereo3D));
+    if (!side_data)
+        return NULL;
+
+    return (AVStereo3D *)side_data->data;
+}

omxplayer-2014.03.28.tar.gz/ffmpeg/libavutil/stereo3d.h Added

@@ -0,0 +1,147 @@
+/*
+ * Copyright (c) 2013 Vittorio Giovara <vittorio.giovara@gmail.com>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <stdint.h>
+
+#include "frame.h"
+
+/**
+ * List of possible 3D Types
+ */
+enum AVStereo3DType {
+    /**
+     * Video is not stereoscopic (and metadata has to be there).
+     */
+    AV_STEREO3D_2D,
+
+    /**
+     * Views are next to each other.
+     *
+     *    LLLLRRRR
+     *    LLLLRRRR
+     *    LLLLRRRR
+     *    ...
+     */
+    AV_STEREO3D_SIDEBYSIDE,
+
+    /**
+     * Views are on top of each other.
+     *
+     *    LLLLLLLL
+     *    LLLLLLLL
+     *    RRRRRRRR
+     *    RRRRRRRR
+     */
+    AV_STEREO3D_TOPBOTTOM,
+
+    /**
+     * Views are alternated temporally.
+     *
+     *     frame0   frame1   frame2   ...
+     *    LLLLLLLL RRRRRRRR LLLLLLLL
+     *    LLLLLLLL RRRRRRRR LLLLLLLL
+     *    LLLLLLLL RRRRRRRR LLLLLLLL
+     *    ...      ...      ...
+     */
+    AV_STEREO3D_FRAMESEQUENCE,
+
+    /**
+     * Views are packed in a checkerboard-like structure per pixel.
+     *
+     *    LRLRLRLR
+     *    RLRLRLRL
+     *    LRLRLRLR
+     *    ...
+     */
+    AV_STEREO3D_CHECKERBOARD,
+
+    /**
+     * Views are next to each other, but when upscaling
+     * apply a checkerboard pattern.
+     *
+     *     LLLLRRRR          L L L L    R R R R
+     *     LLLLRRRR    =>     L L L L  R R R R
+     *     LLLLRRRR          L L L L    R R R R
+     *     LLLLRRRR           L L L L  R R R R
+     */
+    AV_STEREO3D_SIDEBYSIDE_QUINCUNX,
+
+    /**
+     * Views are packed per line, as if interlaced.
+     *
+     *    LLLLLLLL
+     *    RRRRRRRR
+     *    LLLLLLLL
+     *    ...
+     */
+    AV_STEREO3D_LINES,
+
+    /**
+     * Views are packed per column.
+     *
+     *    LRLRLRLR
+     *    LRLRLRLR
+     *    LRLRLRLR
+     *    ...
+     */
+    AV_STEREO3D_COLUMNS,
+};
+
+
+/**
+ * Inverted views, Right/Bottom represents the left view.
+ */
+#define AV_STEREO3D_FLAG_INVERT     (1 << 0)
+
+/**
+ * Stereo 3D type: this structure describes how two videos are packed
+ * within a single video surface, with additional information as needed.
+ *
+ * @note The struct must be allocated with av_stereo3d_alloc() and
+ *       its size is not a part of the public ABI.
+ */
+typedef struct AVStereo3D {
+    /**
+     * How views are packed within the video.
+     */
+    enum AVStereo3DType type;
+
+    /**
+     * Additional information about the frame packing.
+     */
+    int flags;
+} AVStereo3D;
+
+/**
+ * Allocate an AVStereo3D structure and set its fields to default values.
+ * The resulting struct can be freed using av_freep().
+ *
+ * @return An AVStereo3D filled with default values or NULL on failure.
+ */
+AVStereo3D *av_stereo3d_alloc(void);
+
+/**
+ * Allocate a complete AVFrameSideData and add it to the frame.
+ *
+ * @param frame The frame which side data is added to.
+ *
+ * @return The AVStereo3D structure to be filled by caller.
+ */
+AVStereo3D *av_stereo3d_create_side_data(AVFrame *frame);

omxplayer-2014.02.11.tar.gz/ffmpeg/libavutil/timer.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavutil/timer.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavutil/timestamp.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavutil/timestamp.h Changed

omxplayer-2014.03.28.tar.gz/ffmpeg/libavutil/utf8.c Added

@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2013 Stefano Sabatini
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifdef TEST
+#include <stdio.h>
+
+#include "libavutil/avstring.h"
+#include "libavutil/file.h"
+
+static void print_sequence(const char *p, int l, int indent)
+{
+    int i;
+    for (i = 0; i < l; i++)
+        printf("%02X", (uint8_t)p[i]);
+    printf("%*s", indent-l*2, "");
+}
+
+int main(int argc, char **argv)
+{
+    int ret;
+    char *filename = argv[1];
+    uint8_t *file_buf;
+    size_t file_buf_size;
+    uint32_t code;
+    const uint8_t *p, *endp;
+
+    ret = av_file_map(filename, &file_buf, &file_buf_size, 0, NULL);
+    if (ret < 0)
+        return 1;
+
+    p = file_buf;
+    endp = file_buf + file_buf_size;
+    while (p < endp) {
+        int l, r;
+        const uint8_t *p0 = p;
+        code = UINT32_MAX;
+        r = av_utf8_decode(&code, &p, endp, 0);
+        l = (int)(p-p0);
+        print_sequence(p0, l, 20);
+        if (code != UINT32_MAX) {
+            printf("%-10d 0x%-10X %-5d ", code, code, l);
+            if (r >= 0) {
+                if (*p0 == '\n') printf("\\n\n");
+                else             printf ("%.*s\n", l, p0);
+            } else {
+                printf("invalid code range\n");
+            }
+        } else {
+            printf("invalid sequence\n");
+        }
+    }
+
+    av_file_unmap(file_buf, file_buf_size);
+    return 0;
+}
+#endif

omxplayer-2014.02.11.tar.gz/ffmpeg/libavutil/utils.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavutil/utils.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavutil/version.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavutil/version.h Changed

@@ -21,25 +21,7 @@
 #ifndef AVUTIL_VERSION_H
 #define AVUTIL_VERSION_H
 
-/**
- * @defgroup preproc_misc Preprocessor String Macros
- *
- * String manipulation macros
- *
- * @{
- */
-
-#define AV_STRINGIFY(s)         AV_TOSTRING(s)
-#define AV_TOSTRING(s) #s
-
-#define AV_GLUE(a, b) a ## b
-#define AV_JOIN(a, b) AV_GLUE(a, b)
-
-#define AV_PRAGMA(s) _Pragma(#s)
-
-/**
- * @}
- */
+#include "macros.h"
 
 /**
  * @defgroup version_utils Library Version Macros
@@ -58,7 +40,6 @@
  * @}
  */
 
-
 /**
  * @file
  * @ingroup lavu
@@ -75,7 +56,7 @@
  */
 
 #define LIBAVUTIL_VERSION_MAJOR  52
-#define LIBAVUTIL_VERSION_MINOR  48
+#define LIBAVUTIL_VERSION_MINOR  66
 #define LIBAVUTIL_VERSION_MICRO 100
 
 #define LIBAVUTIL_VERSION_INT   AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
@@ -100,46 +81,61 @@
  */
 
 #ifndef FF_API_GET_BITS_PER_SAMPLE_FMT
-#define FF_API_GET_BITS_PER_SAMPLE_FMT (LIBAVUTIL_VERSION_MAJOR < 53)
+#define FF_API_GET_BITS_PER_SAMPLE_FMT (LIBAVUTIL_VERSION_MAJOR < 54)
 #endif
 #ifndef FF_API_FIND_OPT
-#define FF_API_FIND_OPT                 (LIBAVUTIL_VERSION_MAJOR < 53)
+#define FF_API_FIND_OPT                 (LIBAVUTIL_VERSION_MAJOR < 54)
 #endif
 #ifndef FF_API_OLD_AVOPTIONS
-#define FF_API_OLD_AVOPTIONS            (LIBAVUTIL_VERSION_MAJOR < 53)
+#define FF_API_OLD_AVOPTIONS            (LIBAVUTIL_VERSION_MAJOR < 54)
 #endif
 #ifndef FF_API_PIX_FMT
-#define FF_API_PIX_FMT                  (LIBAVUTIL_VERSION_MAJOR < 53)
+#define FF_API_PIX_FMT                  (LIBAVUTIL_VERSION_MAJOR < 54)
 #endif
 #ifndef FF_API_CONTEXT_SIZE
-#define FF_API_CONTEXT_SIZE             (LIBAVUTIL_VERSION_MAJOR < 53)
+#define FF_API_CONTEXT_SIZE             (LIBAVUTIL_VERSION_MAJOR < 54)
 #endif
 #ifndef FF_API_PIX_FMT_DESC
-#define FF_API_PIX_FMT_DESC             (LIBAVUTIL_VERSION_MAJOR < 53)
+#define FF_API_PIX_FMT_DESC             (LIBAVUTIL_VERSION_MAJOR < 54)
 #endif
 #ifndef FF_API_AV_REVERSE
-#define FF_API_AV_REVERSE               (LIBAVUTIL_VERSION_MAJOR < 53)
+#define FF_API_AV_REVERSE               (LIBAVUTIL_VERSION_MAJOR < 54)
 #endif
 #ifndef FF_API_AUDIOCONVERT
-#define FF_API_AUDIOCONVERT             (LIBAVUTIL_VERSION_MAJOR < 53)
+#define FF_API_AUDIOCONVERT             (LIBAVUTIL_VERSION_MAJOR < 54)
 #endif
 #ifndef FF_API_CPU_FLAG_MMX2
-#define FF_API_CPU_FLAG_MMX2            (LIBAVUTIL_VERSION_MAJOR < 53)
+#define FF_API_CPU_FLAG_MMX2            (LIBAVUTIL_VERSION_MAJOR < 54)
 #endif
 #ifndef FF_API_SAMPLES_UTILS_RETURN_ZERO
-#define FF_API_SAMPLES_UTILS_RETURN_ZERO (LIBAVUTIL_VERSION_MAJOR < 53)
+#define FF_API_SAMPLES_UTILS_RETURN_ZERO (LIBAVUTIL_VERSION_MAJOR < 54)
 #endif
 #ifndef FF_API_LLS_PRIVATE
-#define FF_API_LLS_PRIVATE              (LIBAVUTIL_VERSION_MAJOR < 53)
+#define FF_API_LLS_PRIVATE              (LIBAVUTIL_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_LLS1
+#define FF_API_LLS1                     (LIBAVUTIL_VERSION_MAJOR < 54)
 #endif
 #ifndef FF_API_AVFRAME_LAVC
-#define FF_API_AVFRAME_LAVC             (LIBAVUTIL_VERSION_MAJOR < 53)
+#define FF_API_AVFRAME_LAVC             (LIBAVUTIL_VERSION_MAJOR < 54)
 #endif
 #ifndef FF_API_VDPAU
-#define FF_API_VDPAU                    (LIBAVUTIL_VERSION_MAJOR < 53)
+#define FF_API_VDPAU                    (LIBAVUTIL_VERSION_MAJOR < 54)
 #endif
 #ifndef FF_API_GET_CHANNEL_LAYOUT_COMPAT
-#define FF_API_GET_CHANNEL_LAYOUT_COMPAT (LIBAVUTIL_VERSION_MAJOR < 53)
+#define FF_API_GET_CHANNEL_LAYOUT_COMPAT (LIBAVUTIL_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_OLD_OPENCL
+#define FF_API_OLD_OPENCL               (LIBAVUTIL_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_XVMC
+#define FF_API_XVMC                     (LIBAVUTIL_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_INTFLOAT
+#define FF_API_INTFLOAT                 (LIBAVUTIL_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_OPT_TYPE_METADATA
+#define FF_API_OPT_TYPE_METADATA        (LIBAVUTIL_VERSION_MAJOR < 54)
 #endif
 
 /**

omxplayer-2014.02.11.tar.gz/ffmpeg/libavutil/x86/cpu.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavutil/x86/cpu.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavutil/x86/cpu.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavutil/x86/cpu.h Changed

@@ -37,6 +37,8 @@
 #define X86_SSE4(flags)             CPUEXT(flags, SSE4)
 #define X86_SSE42(flags)            CPUEXT(flags, SSE42)
 #define X86_AVX(flags)              CPUEXT(flags, AVX)
+#define X86_XOP(flags)              CPUEXT(flags, XOP)
+#define X86_FMA3(flags)             CPUEXT(flags, FMA3)
 #define X86_FMA4(flags)             CPUEXT(flags, FMA4)
 #define X86_AVX2(flags)             CPUEXT(flags, AVX2)
 
@@ -51,6 +53,8 @@
 #define EXTERNAL_SSE4(flags)        CPUEXT_SUFFIX(flags, _EXTERNAL, SSE4)
 #define EXTERNAL_SSE42(flags)       CPUEXT_SUFFIX(flags, _EXTERNAL, SSE42)
 #define EXTERNAL_AVX(flags)         CPUEXT_SUFFIX(flags, _EXTERNAL, AVX)
+#define EXTERNAL_XOP(flags)         CPUEXT_SUFFIX(flags, _EXTERNAL, XOP)
+#define EXTERNAL_FMA3(flags)        CPUEXT_SUFFIX(flags, _EXTERNAL, FMA3)
 #define EXTERNAL_FMA4(flags)        CPUEXT_SUFFIX(flags, _EXTERNAL, FMA4)
 #define EXTERNAL_AVX2(flags)        CPUEXT_SUFFIX(flags, _EXTERNAL, AVX2)
 
@@ -65,6 +69,8 @@
 #define INLINE_SSE4(flags)          CPUEXT_SUFFIX(flags, _INLINE, SSE4)
 #define INLINE_SSE42(flags)         CPUEXT_SUFFIX(flags, _INLINE, SSE42)
 #define INLINE_AVX(flags)           CPUEXT_SUFFIX(flags, _INLINE, AVX)
+#define INLINE_XOP(flags)           CPUEXT_SUFFIX(flags, _INLINE, XOP)
+#define INLINE_FMA3(flags)          CPUEXT_SUFFIX(flags, _INLINE, FMA3)
 #define INLINE_FMA4(flags)          CPUEXT_SUFFIX(flags, _INLINE, FMA4)
 #define INLINE_AVX2(flags)          CPUEXT_SUFFIX(flags, _INLINE, AVX2)

omxplayer-2014.02.11.tar.gz/ffmpeg/libavutil/x86/float_dsp.asm -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavutil/x86/float_dsp.asm Changed

@@ -29,17 +29,21 @@
 ;-----------------------------------------------------------------------------
 %macro VECTOR_FMUL 0
 cglobal vector_fmul, 4,4,2, dst, src0, src1, len
-    lea       lenq, [lend*4 - 2*mmsize]
+    lea       lenq, [lend*4 - 64]
 ALIGN 16
 .loop:
-    mova      m0,   [src0q + lenq]
-    mova      m1,   [src0q + lenq + mmsize]
-    mulps     m0, m0, [src1q + lenq]
-    mulps     m1, m1, [src1q + lenq + mmsize]
-    mova      [dstq + lenq], m0
-    mova      [dstq + lenq + mmsize], m1
+%assign a 0
+%rep 32/mmsize
+    mova      m0,   [src0q + lenq + (a+0)*mmsize]
+    mova      m1,   [src0q + lenq + (a+1)*mmsize]
+    mulps     m0, m0, [src1q + lenq + (a+0)*mmsize]
+    mulps     m1, m1, [src1q + lenq + (a+1)*mmsize]
+    mova      [dstq + lenq + (a+0)*mmsize], m0
+    mova      [dstq + lenq + (a+1)*mmsize], m1
+%assign a a+2
+%endrep
 
-    sub       lenq, 2*mmsize
+    sub       lenq, 64
     jge       .loop
     REP_RET
 %endmacro
@@ -72,15 +76,19 @@
     vinsertf128  m0, m0, xmm0, 1
 %endif
 %endif
-    lea    lenq, [lend*4-2*mmsize]
+    lea    lenq, [lend*4-64]
 .loop:
-    mulps    m1, m0, [srcq+lenq       ]
-    mulps    m2, m0, [srcq+lenq+mmsize]
-    addps    m1, m1, [dstq+lenq       ]
-    addps    m2, m2, [dstq+lenq+mmsize]
-    mova  [dstq+lenq       ], m1
-    mova  [dstq+lenq+mmsize], m2
-    sub    lenq, 2*mmsize
+%assign a 0
+%rep 32/mmsize
+    mulps    m1, m0, [srcq+lenq+(a+0)*mmsize]
+    mulps    m2, m0, [srcq+lenq+(a+1)*mmsize]
+    addps    m1, m1, [dstq+lenq+(a+0)*mmsize]
+    addps    m2, m2, [dstq+lenq+(a+1)*mmsize]
+    mova  [dstq+lenq+(a+0)*mmsize], m1
+    mova  [dstq+lenq+(a+1)*mmsize], m2
+%assign a a+2
+%endrep
+    sub    lenq, 64
     jge .loop
     REP_RET
 %endmacro

omxplayer-2014.02.11.tar.gz/ffmpeg/libavutil/x86/lls.asm -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavutil/x86/lls.asm Changed

@@ -29,7 +29,7 @@
 %define COVAR_STRIDE MAX_VARS_ALIGN*8
 %define COVAR(x,y) [covarq + (x)*8 + (y)*COVAR_STRIDE]
 
-struc LLSModel
+struc LLSModel2
     .covariance:  resq MAX_VARS_ALIGN*MAX_VARS_ALIGN
     .coeff:       resq MAX_VARS*MAX_VARS
     .variance:    resq MAX_VARS
@@ -49,7 +49,7 @@
 %define movdqa movaps
 cglobal update_lls, 2,5,8, ctx, var, i, j, covar2
     %define covarq ctxq
-    mov     id, [ctxq + LLSModel.indep_count]
+    mov     id, [ctxq + LLSModel2.indep_count]
     lea   varq, [varq + iq*8]
     neg     iq
     mov covar2q, covarq
@@ -129,7 +129,7 @@
 INIT_YMM avx
 cglobal update_lls, 3,6,8, ctx, var, count, i, j, count2
     %define covarq ctxq
-    mov  countd, [ctxq + LLSModel.indep_count]
+    mov  countd, [ctxq + LLSModel2.indep_count]
     lea count2d, [countq-2]
     xor     id, id
 .loopi:
@@ -206,7 +206,7 @@
     %define coefsq ctxq
     mov     id, orderd
     imul    orderd, MAX_VARS
-    lea     coefsq, [ctxq + LLSModel.coeff + orderq*8]
+    lea     coefsq, [ctxq + LLSModel2.coeff + orderq*8]
     movsd   m0, [varq]
     movhpd  m0, [varq + 8]
     mulpd   m0, [coefsq]

omxplayer-2014.02.11.tar.gz/ffmpeg/libavutil/x86/lls_init.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavutil/x86/lls_init.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavutil/x86/x86inc.asm -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavutil/x86/x86inc.asm Changed

@@ -1058,25 +1058,25 @@
 ;%5+: operands
 %macro RUN_AVX_INSTR 5-8+
     %ifnum sizeof%6
-        %assign %%sizeofreg sizeof%6
+        %assign __sizeofreg sizeof%6
     %elifnum sizeof%5
-        %assign %%sizeofreg sizeof%5
+        %assign __sizeofreg sizeof%5
     %else
-        %assign %%sizeofreg mmsize
+        %assign __sizeofreg mmsize
     %endif
-    %assign %%emulate_avx 0
-    %if avx_enabled && %%sizeofreg >= 16
-        %xdefine %%instr v%1
+    %assign __emulate_avx 0
+    %if avx_enabled && __sizeofreg >= 16
+        %xdefine __instr v%1
     %else
-        %xdefine %%instr %1
+        %xdefine __instr %1
         %if %0 >= 7+%3
-            %assign %%emulate_avx 1
+            %assign __emulate_avx 1
         %endif
     %endif
 
-    %if %%emulate_avx
-        %xdefine %%src1 %6
-        %xdefine %%src2 %7
+    %if __emulate_avx
+        %xdefine __src1 %6
+        %xdefine __src2 %7
         %ifnidn %5, %6
             %if %0 >= 8
                 CHECK_AVX_INSTR_EMU {%1 %5, %6, %7, %8}, %5, %7, %8
@@ -1088,31 +1088,31 @@
                     ; 3-operand AVX instructions with a memory arg can only have it in src2,
                     ; whereas SSE emulation prefers to have it in src1 (i.e. the mov).
                     ; So, if the instruction is commutative with a memory arg, swap them.
-                    %xdefine %%src1 %7
-                    %xdefine %%src2 %6
+                    %xdefine __src1 %7
+                    %xdefine __src2 %6
                 %endif
             %endif
-            %if %%sizeofreg == 8
-                MOVQ %5, %%src1
+            %if __sizeofreg == 8
+                MOVQ %5, __src1
             %elif %2
-                MOVAPS %5, %%src1
+                MOVAPS %5, __src1
             %else
-                MOVDQA %5, %%src1
+                MOVDQA %5, __src1
             %endif
         %endif
         %if %0 >= 8
-            %1 %5, %%src2, %8
+            %1 %5, __src2, %8
         %else
-            %1 %5, %%src2
+            %1 %5, __src2
         %endif
     %elif %0 >= 8
-        %%instr %5, %6, %7, %8
+        __instr %5, %6, %7, %8
     %elif %0 == 7
-        %%instr %5, %6, %7
+        __instr %5, %6, %7
     %elif %0 == 6
-        %%instr %5, %6
+        __instr %5, %6
     %else
-        %%instr %5
+        __instr %5
     %endif
 %endmacro
 
@@ -1407,21 +1407,6 @@
 %undef i
 %undef j
 
-%macro FMA_INSTR 3
-    %macro %1 4-7 %1, %2, %3
-        %if cpuflag(xop)
-            v%5 %1, %2, %3, %4
-        %else
-            %6 %1, %2, %3
-            %7 %1, %4
-        %endif
-    %endmacro
-%endmacro
-
-FMA_INSTR  pmacsdd,  pmulld, paddd
-FMA_INSTR  pmacsww,  pmullw, paddw
-FMA_INSTR pmadcswd, pmaddwd, paddd
-
 ; tzcnt is equivalent to "rep bsf" and is backwards-compatible with bsf.
 ; This lets us use tzcnt without bumping the yasm version requirement yet.
 %define tzcnt rep bsf

omxplayer-2014.02.11.tar.gz/ffmpeg/libavutil/x86/x86util.asm -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavutil/x86/x86util.asm Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavutil/xtea.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavutil/xtea.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libavutil/xtea.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libavutil/xtea.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libpostproc/Makefile -> omxplayer-2014.03.28.tar.gz/ffmpeg/libpostproc/Makefile Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libpostproc/postprocess.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libpostproc/postprocess.c Changed

omxplayer-2014.03.28.tar.gz/ffmpeg/libpostproc/postprocres.rc Added

@@ -0,0 +1,55 @@
+/*
+ * Windows resource file for libpostproc
+ *
+ * Copyright (C) 2012 James Almer
+ * Copyright (C) 2013 Tiancheng "Timothy" Gu
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <windows.h>
+#include "libpostproc/version.h"
+#include "libavutil/ffversion.h"
+#include "config.h"
+
+1 VERSIONINFO
+FILEVERSION     LIBPOSTPROC_VERSION_MAJOR, LIBPOSTPROC_VERSION_MINOR, LIBPOSTPROC_VERSION_MICRO, 0
+PRODUCTVERSION  LIBPOSTPROC_VERSION_MAJOR, LIBPOSTPROC_VERSION_MINOR, LIBPOSTPROC_VERSION_MICRO, 0
+FILEFLAGSMASK   VS_FFI_FILEFLAGSMASK
+FILEOS          VOS_NT_WINDOWS32
+FILETYPE        VFT_DLL
+{
+    BLOCK "StringFileInfo"
+    {
+        BLOCK "040904B0"
+        {
+            VALUE "CompanyName",      "FFmpeg Project"
+            VALUE "FileDescription",  "FFmpeg postprocessing library"
+            VALUE "FileVersion",      AV_STRINGIFY(LIBPOSTPROC_VERSION)
+            VALUE "InternalName",     "libpostproc"
+            VALUE "LegalCopyright",   "Copyright (C) 2000-" AV_STRINGIFY(CONFIG_THIS_YEAR) " FFmpeg Project"
+            VALUE "OriginalFilename", "postproc" BUILDSUF "-" AV_STRINGIFY(LIBPOSTPROC_VERSION_MAJOR) SLIBSUF
+            VALUE "ProductName",      "FFmpeg"
+            VALUE "ProductVersion",   FFMPEG_VERSION
+        }
+    }
+
+    BLOCK "VarFileInfo"
+    {
+        VALUE "Translation", 0x0409, 0x04B0
+    }
+}

omxplayer-2014.02.11.tar.gz/ffmpeg/library.mak -> omxplayer-2014.03.28.tar.gz/ffmpeg/library.mak Changed

@@ -25,7 +25,7 @@
 $(SUBDIR)x86/%.o: $(SUBDIR)x86/%.asm
 	$(DEPYASM) $(YASMFLAGS) -I $(<D)/ -M -o $@ $< > $(@:.o=.d)
 	$(YASM) $(YASMFLAGS) -I $(<D)/ -o $@ $<
-	-$(STRIP) -wN '..@*' $@
+	-$(if $(ASMSTRIPFLAGS), $(STRIP) $(ASMSTRIPFLAGS) $@)
 
 LIBOBJS := $(OBJS) $(SUBDIR)%.h.o $(TESTOBJS)
 $(LIBOBJS) $(LIBOBJS:.o=.s) $(LIBOBJS:.o=.i):   CPPFLAGS += -DHAVE_AV_CONFIG_H
@@ -42,16 +42,16 @@
 install-libs-$(CONFIG_SHARED): install-lib$(NAME)-shared
 
 define RULES
-$(EXAMPLES) $(TOOLS): THISLIB = $(FULLNAME:%=$(LD_LIB))
-$(TESTPROGS):         THISLIB = $(SUBDIR)$(LIBNAME)
+$(TOOLS):     THISLIB = $(FULLNAME:%=$(LD_LIB))
+$(TESTPROGS): THISLIB = $(SUBDIR)$(LIBNAME)
 
-$(EXAMPLES) $(TESTPROGS) $(TOOLS): %$(EXESUF): %.o $(EXEOBJS)
+$(TESTPROGS) $(TOOLS): %$(EXESUF): %.o $(EXEOBJS)
 	$$(LD) $(LDFLAGS) $$(LD_O) $$(filter %.o,$$^) $$(THISLIB) $(FFEXTRALIBS) $$(ELIBS)
 
 $(SUBDIR)$(SLIBNAME): $(SUBDIR)$(SLIBNAME_WITH_MAJOR)
 	$(Q)cd ./$(SUBDIR) && $(LN_S) $(SLIBNAME_WITH_MAJOR) $(SLIBNAME)
 
-$(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(OBJS) $(SUBDIR)lib$(NAME).ver
+$(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(OBJS) $(SLIBOBJS) $(SUBDIR)lib$(NAME).ver
 	$(SLIB_CREATE_DEF_CMD)
 	$$(LD) $(SHFLAGS) $(LDFLAGS) $$(LD_O) $$(filter %.o,$$^) $(FFEXTRALIBS)
 	$(SLIB_EXTRA_CMD)
@@ -61,7 +61,7 @@
 endif
 
 clean::
-	$(RM) $(addprefix $(SUBDIR),*-example$(EXESUF) *-test$(EXESUF) $(CLEANFILES) $(CLEANSUFFIXES) $(LIBSUFFIXES)) \
+	$(RM) $(addprefix $(SUBDIR),*-test$(EXESUF) $(CLEANFILES) $(CLEANSUFFIXES) $(LIBSUFFIXES)) \
 	    $(CLEANSUFFIXES:%=$(SUBDIR)$(ARCH)/%)
 
 distclean:: clean
@@ -105,8 +105,7 @@
 
 $(eval $(RULES))
 
-$(EXAMPLES) $(TOOLS): $(DEP_LIBS) $(SUBDIR)$($(CONFIG_SHARED:yes=S)LIBNAME)
-$(TESTPROGS):         $(DEP_LIBS) $(SUBDIR)$(LIBNAME)
+$(TOOLS):     $(DEP_LIBS) $(SUBDIR)$($(CONFIG_SHARED:yes=S)LIBNAME)
+$(TESTPROGS): $(DEP_LIBS) $(SUBDIR)$(LIBNAME)
 
-examples: $(EXAMPLES)
 testprogs: $(TESTPROGS)

omxplayer-2014.02.11.tar.gz/ffmpeg/libswresample/Makefile -> omxplayer-2014.03.28.tar.gz/ffmpeg/libswresample/Makefile Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libswresample/arm/Makefile -> omxplayer-2014.03.28.tar.gz/ffmpeg/libswresample/arm/Makefile Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libswresample/arm/audio_convert_neon.S -> omxplayer-2014.03.28.tar.gz/ffmpeg/libswresample/arm/audio_convert_neon.S Changed

omxplayer-2014.03.28.tar.gz/ffmpeg/libswresample/arm/neontest.c Added

@@ -0,0 +1,29 @@
+/*
+ * check NEON registers for clobbers
+ * Copyright (c) 2013 Martin Storsjo
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "libswresample/swresample.h"
+#include "libavutil/arm/neontest.h"
+
+wrap(swr_convert(struct SwrContext *s, uint8_t **out, int out_count,
+                 const uint8_t **in , int in_count))
+{
+    testneonclobbers(swr_convert, s, out, out_count, in, in_count);
+}

omxplayer-2014.02.11.tar.gz/ffmpeg/libswresample/rematrix.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libswresample/rematrix.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libswresample/swresample.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libswresample/swresample.c Changed

@@ -51,12 +51,12 @@
 {"in_sample_rate"       , "set input sample rate"       , OFFSET( in_sample_rate), AV_OPT_TYPE_INT  , {.i64=0                     }, 0      , INT_MAX   , PARAM},
 {"osr"                  , "set output sample rate"      , OFFSET(out_sample_rate), AV_OPT_TYPE_INT  , {.i64=0                     }, 0      , INT_MAX   , PARAM},
 {"out_sample_rate"      , "set output sample rate"      , OFFSET(out_sample_rate), AV_OPT_TYPE_INT  , {.i64=0                     }, 0      , INT_MAX   , PARAM},
-{"isf"                  , "set input sample format"     , OFFSET( in_sample_fmt ), AV_OPT_TYPE_SAMPLE_FMT , {.i64=AV_SAMPLE_FMT_NONE}, -1   , AV_SAMPLE_FMT_NB-1, PARAM},
-{"in_sample_fmt"        , "set input sample format"     , OFFSET( in_sample_fmt ), AV_OPT_TYPE_SAMPLE_FMT , {.i64=AV_SAMPLE_FMT_NONE}, -1   , AV_SAMPLE_FMT_NB-1, PARAM},
-{"osf"                  , "set output sample format"    , OFFSET(out_sample_fmt ), AV_OPT_TYPE_SAMPLE_FMT , {.i64=AV_SAMPLE_FMT_NONE}, -1   , AV_SAMPLE_FMT_NB-1, PARAM},
-{"out_sample_fmt"       , "set output sample format"    , OFFSET(out_sample_fmt ), AV_OPT_TYPE_SAMPLE_FMT , {.i64=AV_SAMPLE_FMT_NONE}, -1   , AV_SAMPLE_FMT_NB-1, PARAM},
-{"tsf"                  , "set internal sample format"  , OFFSET(int_sample_fmt ), AV_OPT_TYPE_SAMPLE_FMT , {.i64=AV_SAMPLE_FMT_NONE}, -1   , AV_SAMPLE_FMT_NB-1, PARAM},
-{"internal_sample_fmt"  , "set internal sample format"  , OFFSET(int_sample_fmt ), AV_OPT_TYPE_SAMPLE_FMT , {.i64=AV_SAMPLE_FMT_NONE}, -1   , AV_SAMPLE_FMT_NB-1, PARAM},
+{"isf"                  , "set input sample format"     , OFFSET( in_sample_fmt ), AV_OPT_TYPE_SAMPLE_FMT , {.i64=AV_SAMPLE_FMT_NONE}, -1   , INT_MAX, PARAM},
+{"in_sample_fmt"        , "set input sample format"     , OFFSET( in_sample_fmt ), AV_OPT_TYPE_SAMPLE_FMT , {.i64=AV_SAMPLE_FMT_NONE}, -1   , INT_MAX, PARAM},
+{"osf"                  , "set output sample format"    , OFFSET(out_sample_fmt ), AV_OPT_TYPE_SAMPLE_FMT , {.i64=AV_SAMPLE_FMT_NONE}, -1   , INT_MAX, PARAM},
+{"out_sample_fmt"       , "set output sample format"    , OFFSET(out_sample_fmt ), AV_OPT_TYPE_SAMPLE_FMT , {.i64=AV_SAMPLE_FMT_NONE}, -1   , INT_MAX, PARAM},
+{"tsf"                  , "set internal sample format"  , OFFSET(int_sample_fmt ), AV_OPT_TYPE_SAMPLE_FMT , {.i64=AV_SAMPLE_FMT_NONE}, -1   , INT_MAX, PARAM},
+{"internal_sample_fmt"  , "set internal sample format"  , OFFSET(int_sample_fmt ), AV_OPT_TYPE_SAMPLE_FMT , {.i64=AV_SAMPLE_FMT_NONE}, -1   , INT_MAX, PARAM},
 {"icl"                  , "set input channel layout"    , OFFSET( in_ch_layout  ), AV_OPT_TYPE_CHANNEL_LAYOUT, {.i64=0                     }, 0      , INT64_MAX , PARAM, "channel_layout"},
 {"in_channel_layout"    , "set input channel layout"    , OFFSET( in_ch_layout  ), AV_OPT_TYPE_CHANNEL_LAYOUT, {.i64=0                     }, 0      , INT64_MAX , PARAM, "channel_layout"},
 {"ocl"                  , "set output channel layout"   , OFFSET(out_ch_layout  ), AV_OPT_TYPE_CHANNEL_LAYOUT, {.i64=0                     }, 0      , INT64_MAX , PARAM, "channel_layout"},
@@ -218,33 +218,12 @@
     memset(a, 0, sizeof(*a));
 }
 
-av_cold void swr_free(SwrContext **ss){
-    SwrContext *s= *ss;
-    if(s){
-        free_temp(&s->postin);
-        free_temp(&s->midbuf);
-        free_temp(&s->preout);
-        free_temp(&s->in_buffer);
-        free_temp(&s->silence);
-        free_temp(&s->drop_temp);
-        free_temp(&s->dither.noise);
-        free_temp(&s->dither.temp);
-        swri_audio_convert_free(&s-> in_convert);
-        swri_audio_convert_free(&s->out_convert);
-        swri_audio_convert_free(&s->full_convert);
-        if (s->resampler)
-            s->resampler->free(&s->resample);
-        swri_rematrix_free(s);
-    }
-
-    av_freep(ss);
-}
-
-av_cold int swr_init(struct SwrContext *s){
-    int ret;
+static void clear_context(SwrContext *s){
     s->in_buffer_index= 0;
     s->in_buffer_count= 0;
     s->resample_in_constraint= 0;
+    memset(s->in.ch, 0, sizeof(s->in.ch));
+    memset(s->out.ch, 0, sizeof(s->out.ch));
     free_temp(&s->postin);
     free_temp(&s->midbuf);
     free_temp(&s->preout);
@@ -253,14 +232,29 @@
     free_temp(&s->drop_temp);
     free_temp(&s->dither.noise);
     free_temp(&s->dither.temp);
-    memset(s->in.ch, 0, sizeof(s->in.ch));
-    memset(s->out.ch, 0, sizeof(s->out.ch));
     swri_audio_convert_free(&s-> in_convert);
     swri_audio_convert_free(&s->out_convert);
     swri_audio_convert_free(&s->full_convert);
     swri_rematrix_free(s);
 
     s->flushed = 0;
+}
+
+av_cold void swr_free(SwrContext **ss){
+    SwrContext *s= *ss;
+    if(s){
+        clear_context(s);
+        if (s->resampler)
+            s->resampler->free(&s->resample);
+    }
+
+    av_freep(ss);
+}
+
+av_cold int swr_init(struct SwrContext *s){
+    int ret;
+
+    clear_context(s);
 
     if(s-> in_sample_fmt >= AV_SAMPLE_FMT_NB){
         av_log(s, AV_LOG_ERROR, "Requested input sample format %d is invalid\n", s->in_sample_fmt);
@@ -534,6 +528,7 @@
     AudioData in, out, tmp;
     int ret_sum=0;
     int border=0;
+    int padless = ARCH_X86 && s->engine == SWR_ENGINE_SWR ? 7 : 0;
 
     av_assert1(s->in_buffer.ch_count == in_param->ch_count);
     av_assert1(s->in_buffer.planar   == in_param->planar);
@@ -564,9 +559,9 @@
             }
         }
 
-        if((s->flushed || in_count) && !s->in_buffer_count){
+        if((s->flushed || in_count > padless) && !s->in_buffer_count){
             s->in_buffer_index=0;
-            ret= s->resampler->multiple_resample(s->resample, &out, out_count, &in, in_count, &consumed);
+            ret= s->resampler->multiple_resample(s->resample, &out, out_count, &in, FFMAX(in_count-padless, 0), &consumed);
             out_count -= ret;
             ret_sum += ret;
             buf_set(&out, &out, ret);
@@ -598,6 +593,10 @@
             s->resample_in_constraint= 0;
             if(s->in_buffer_count != count || in_count)
                 continue;
+            if (padless) {
+                padless = 0;
+                continue;
+            }
         }
         break;
     }while(1);
@@ -734,11 +733,20 @@
     return out_count;
 }
 
+int swr_is_initialized(struct SwrContext *s) {
+    return !!s->in_buffer.ch_count;
+}
+
 int swr_convert(struct SwrContext *s, uint8_t *out_arg[SWR_CH_MAX], int out_count,
                                 const uint8_t *in_arg [SWR_CH_MAX], int  in_count){
     AudioData * in= &s->in;
     AudioData *out= &s->out;
 
+    if (!swr_is_initialized(s)) {
+        av_log(s, AV_LOG_ERROR, "Context has not been initialized\n");
+        return AVERROR(EINVAL);
+    }
+
     while(s->drop_output > 0){
         int ret;
         uint8_t *tmp_arg[SWR_CH_MAX];

omxplayer-2014.02.11.tar.gz/ffmpeg/libswresample/swresample.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libswresample/swresample.h Changed

omxplayer-2014.03.28.tar.gz/ffmpeg/libswresample/swresampleres.rc Added

@@ -0,0 +1,55 @@
+/*
+ * Windows resource file for libswresample
+ *
+ * Copyright (C) 2012 James Almer
+ * Copyright (C) 2013 Tiancheng "Timothy" Gu
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <windows.h>
+#include "libswresample/version.h"
+#include "libavutil/ffversion.h"
+#include "config.h"
+
+1 VERSIONINFO
+FILEVERSION     LIBSWRESAMPLE_VERSION_MAJOR, LIBSWRESAMPLE_VERSION_MINOR, LIBSWRESAMPLE_VERSION_MICRO, 0
+PRODUCTVERSION  LIBSWRESAMPLE_VERSION_MAJOR, LIBSWRESAMPLE_VERSION_MINOR, LIBSWRESAMPLE_VERSION_MICRO, 0
+FILEFLAGSMASK   VS_FFI_FILEFLAGSMASK
+FILEOS          VOS_NT_WINDOWS32
+FILETYPE        VFT_DLL
+{
+    BLOCK "StringFileInfo"
+    {
+        BLOCK "040904B0"
+        {
+            VALUE "CompanyName",      "FFmpeg Project"
+            VALUE "FileDescription",  "FFmpeg audio resampling library"
+            VALUE "FileVersion",      AV_STRINGIFY(LIBSWRESAMPLE_VERSION)
+            VALUE "InternalName",     "libswresample"
+            VALUE "LegalCopyright",   "Copyright (C) 2000-" AV_STRINGIFY(CONFIG_THIS_YEAR) " FFmpeg Project"
+            VALUE "OriginalFilename", "swresample" BUILDSUF "-" AV_STRINGIFY(LIBSWRESAMPLE_VERSION_MAJOR) SLIBSUF
+            VALUE "ProductName",      "FFmpeg"
+            VALUE "ProductVersion",   FFMPEG_VERSION
+        }
+    }
+
+    BLOCK "VarFileInfo"
+    {
+        VALUE "Translation", 0x0409, 0x04B0
+    }
+}

omxplayer-2014.02.11.tar.gz/ffmpeg/libswresample/version.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libswresample/version.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libswresample/x86/Makefile -> omxplayer-2014.03.28.tar.gz/ffmpeg/libswresample/x86/Makefile Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libswresample/x86/swresample_x86.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libswresample/x86/swresample_x86.c Changed

omxplayer-2014.03.28.tar.gz/ffmpeg/libswresample/x86/w64xmmtest.c Added

@@ -0,0 +1,29 @@
+/*
+ * check XMM registers for clobbers on Win64
+ * Copyright (c) 2013 Martin Storsjo
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "libswresample/swresample.h"
+#include "libavutil/x86/w64xmmtest.h"
+
+wrap(swr_convert(struct SwrContext *s, uint8_t **out, int out_count,
+                 const uint8_t **in , int in_count))
+{
+    testxmmclobbers(swr_convert, s, out, out_count, in, in_count);
+}

omxplayer-2014.02.11.tar.gz/ffmpeg/libswscale/Makefile -> omxplayer-2014.03.28.tar.gz/ffmpeg/libswscale/Makefile Changed

omxplayer-2014.03.28.tar.gz/ffmpeg/libswscale/arm Added

omxplayer-2014.03.28.tar.gz/ffmpeg/libswscale/arm/Makefile Added

omxplayer-2014.03.28.tar.gz/ffmpeg/libswscale/arm/rgb2yuv_neon_16.S Added

@@ -0,0 +1,80 @@
+/*
+ * Copyright (C) 2013 Xiaolei Yu <dreifachstein@gmail.com>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "rgb2yuv_neon_common.S"
+
+/* downsampled R16G16B16 x8 */
+alias_qw    r16x8,  q7
+alias_qw    g16x8,  q8
+alias_qw    b16x8,  q9
+
+alias   n16x16_l,   q11
+alias   n16x16_h,   q12
+
+alias   y16x16_l,   q13
+alias   y16x16_h,   q14
+
+alias_qw    y8x16,  q15
+
+.macro init     src
+    vld3.i32    {q13_l, q14_l, q15_l},          [\src]!
+    vld3.i32    {q13_h[0], q14_h[0], q15_h[0]}, [\src]
+    vrshrn.i32  CO_R,   q13, #7
+    vrshrn.i32  CO_G,   q14, #7
+    vrshrn.i32  CO_B,   q15, #7
+
+    vmov.u8     BIAS_Y, #16
+    vmov.u8     BIAS_U, #128
+.endm
+
+
+.macro compute_y_16x1_step  action, s8x16, coeff
+    vmovl.u8    n16x16_l,   \s8x16\()_l
+    vmovl.u8    n16x16_h,   \s8x16\()_h
+
+    \action     y16x16_l,   n16x16_l,   \coeff
+    \action     y16x16_h,   n16x16_h,   \coeff
+.endm
+
+.macro compute_y_16x1
+    compute_y_16x1_step vmul, r8x16, CO_RY
+    compute_y_16x1_step vmla, g8x16, CO_GY
+    compute_y_16x1_step vmla, b8x16, CO_BY
+
+    vrshrn.i16  y8x16_l,    y16x16_l,   #8
+    vrshrn.i16  y8x16_h,    y16x16_h,   #8
+
+    vadd.u8     y8x16,      y8x16,      BIAS_Y
+.endm
+
+alias   c16x8,      q15
+alias_qw    c8x8x2, q10
+
+
+.macro compute_chroma_8x1   c, C
+    vmul    c16x8,  r16x8,  CO_R\C
+    vmla    c16x8,  g16x8,  CO_G\C
+    vmla    c16x8,  b16x8,  CO_B\C
+
+    vrshrn.i16  \c\()8x8,   c16x8,      #8
+    vadd.u8     \c\()8x8,   \c\()8x8,   BIAS_\C
+.endm
+
+    loop_420sp  rgbx, nv12, init, kernel_420_16x2, 16

omxplayer-2014.03.28.tar.gz/ffmpeg/libswscale/arm/rgb2yuv_neon_32.S Added

@@ -0,0 +1,119 @@
+/*
+ * Copyright (C) 2013 Xiaolei Yu <dreifachstein@gmail.com>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "rgb2yuv_neon_common.S"
+
+/* downsampled R16G16B16 x8 */
+alias_qw    r16x8,  q7
+alias_qw    g16x8,  q8
+alias_qw    b16x8,  q9
+
+alias   n16x16_o,   q11
+alias   n16x16_ol,  q11_l
+alias   n16x16_oh,  q11_h
+
+alias   y32x16_el,  q12
+alias   y32x16_eh,  q13
+alias   y32x16_ol,  q14
+alias   y32x16_oh,  q15
+
+alias   y16x16_e,   q12
+alias   y16x16_el,  q12_l
+alias   y16x16_eh,  q12_h
+alias   y16x16_o,   q13
+alias   y16x16_ol,  q13_l
+alias   y16x16_oh,  q13_h
+
+
+alias   y8x16,  y16x16_e
+
+
+.macro init     src
+    // load s32x3x3, narrow to s16x3x3
+    vld3.i32    {q13_l, q14_l, q15_l},          [\src]!
+    vld3.i32    {q13_h[0], q14_h[0], q15_h[0]}, [\src]
+
+    vmovn.i32   CO_R, q13
+    vmovn.i32   CO_G, q14
+    vmovn.i32   CO_B, q15
+
+    vmov.u8     BIAS_Y, #16
+    vmov.u8     BIAS_U, #128
+.endm
+
+
+.macro compute_y_16x1_step  action, s8x16, coeff
+    vmov.u8     n16x16_o,   #0
+    vtrn.u8     \s8x16,     n16x16_o
+
+    \action     y32x16_el,  \s8x16\()_l,    \coeff
+    \action     y32x16_eh,  \s8x16\()_h,    \coeff
+    \action     y32x16_ol,  n16x16_ol,      \coeff
+    \action     y32x16_oh,  n16x16_oh,      \coeff
+.endm
+
+/*
+ * in:      r8x16, g8x16, b8x16
+ * out:     y8x16
+ * clobber: q11-q15, r8x16, g8x16, b8x16
+ */
+.macro compute_y_16x1
+    compute_y_16x1_step vmull, r8x16, CO_RY
+    compute_y_16x1_step vmlal, g8x16, CO_GY
+    compute_y_16x1_step vmlal, b8x16, CO_BY
+
+    vrshrn.i32  y16x16_el,  y32x16_el,  #15
+    vrshrn.i32  y16x16_eh,  y32x16_eh,  #15
+    vrshrn.i32  y16x16_ol,  y32x16_ol,  #15
+    vrshrn.i32  y16x16_oh,  y32x16_oh,  #15
+
+    vtrn.8      y16x16_e,   y16x16_o
+    vadd.u8     y8x16,      y8x16,      BIAS_Y
+.endm
+
+alias   c32x8_l,    q14
+alias   c32x8_h,    q15
+
+alias_qw    c16x8,  q13
+alias_qw    c8x8x2, q10
+
+.macro compute_chroma_8x1_step  action, s16x8, coeff
+    \action     c32x8_l,    \s16x8\()_l,    \coeff
+    \action     c32x8_h,    \s16x8\()_h,    \coeff
+.endm
+
+/*
+ * in:      r16x8, g16x8, b16x8
+ * out:     c8x8
+ * clobber: q14-q15
+ */
+.macro compute_chroma_8x1   c, C
+    compute_chroma_8x1_step vmull, r16x8, CO_R\C
+    compute_chroma_8x1_step vmlal, g16x8, CO_G\C
+    compute_chroma_8x1_step vmlal, b16x8, CO_B\C
+
+    vrshrn.i32  c16x8_l,    c32x8_l,    #15
+    vrshrn.i32  c16x8_h,    c32x8_h,    #15
+    vmovn.i16   \c\()8x8,   c16x8
+    vadd.u8     \c\()8x8,   \c\()8x8,   BIAS_\C
+.endm
+
+
+    loop_420sp  rgbx, nv12, init, kernel_420_16x2, 32

omxplayer-2014.03.28.tar.gz/ffmpeg/libswscale/arm/rgb2yuv_neon_common.S Added

@@ -0,0 +1,291 @@
+/*
+ * Copyright (C) 2013 Xiaolei Yu <dreifachstein@gmail.com>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "libavutil/arm/asm.S"
+
+.macro alias name, tgt, set=1
+.if \set != 0
+    \name   .req    \tgt
+.else
+    .unreq  \name
+.endif
+.endm
+
+.altmacro
+
+.macro alias_dw_all qw, dw_l, dw_h
+    alias   q\qw\()_l, d\dw_l
+    alias   q\qw\()_h, d\dw_h
+    .if \qw < 15
+        alias_dw_all  %(\qw + 1), %(\dw_l + 2), %(\dw_h + 2)
+    .endif
+.endm
+
+alias_dw_all    0, 0, 1
+
+.noaltmacro
+
+.macro alias_qw     name, qw, set=1
+    alias   \name\(), \qw, \set
+    alias   \name\()_l, \qw\()_l, \set
+    alias   \name\()_h, \qw\()_h, \set
+.endm
+
+.macro prologue
+    push            {r4-r12, lr}
+    vpush           {q4-q7}
+.endm
+
+.macro epilogue
+    vpop            {q4-q7}
+    pop             {r4-r12, pc}
+.endm
+
+.macro  load_arg    reg, ix
+    ldr     \reg,   [sp, #((10 * 4 + 4 * 16) + (\ix - 4) * 4)]
+.endm
+
+
+/* ()_to_()_neon(const uint8_t *src, uint8_t *y, uint8_t *chroma
+ *                  int width, int height,
+ *                  int y_stride, int c_stride, int src_stride,
+ *                  int32_t coeff_table[9]);
+ */
+.macro  alias_loop_420sp set=1
+    alias   src,        r0, \set
+    alias   src0,       src, \set
+    alias   y,          r1, \set
+    alias   y0,         y, \set
+    alias   chroma,     r2, \set
+    alias   width,      r3, \set
+    alias   header,     width, \set
+
+    alias   height,     r4, \set
+    alias   y_stride,   r5, \set
+    alias   c_stride,   r6, \set
+    alias   c_padding,  c_stride, \set
+    alias   src_stride, r7, \set
+
+    alias   y0_end,     r8, \set
+
+    alias   src_padding,r9, \set
+    alias   y_padding,  r10, \set
+
+    alias   src1,       r11, \set
+    alias   y1,         r12, \set
+
+    alias   coeff_table,r12, \set
+.endm
+
+
+.macro  loop_420sp s_fmt, d_fmt, init, kernel, precision
+
+function \s_fmt\()_to_\d_fmt\()_neon_\precision, export=1
+    prologue
+
+    alias_loop_420sp
+
+    load_arg    height,         4
+    load_arg    y_stride,       5
+    load_arg    c_stride,       6
+    load_arg    src_stride,     7
+    load_arg    coeff_table,    8
+
+    \init       coeff_table
+
+    sub         y_padding,      y_stride,       width
+    sub         c_padding,      c_stride,       width
+    sub         src_padding,    src_stride,     width, LSL #2
+
+    add         y0_end,         y0,             width
+    and         header,         width,          #15
+
+    add         y1,             y0,             y_stride
+    add         src1,           src0,           src_stride
+
+0:
+    cmp         header,     #0
+    beq         1f
+
+    \kernel     \s_fmt, \d_fmt, src0, src1, y0, y1, chroma, header
+
+1:
+    \kernel     \s_fmt, \d_fmt, src0, src1, y0, y1, chroma
+
+    cmp         y0,         y0_end
+    blt         1b
+2:
+    add         y0,         y1,         y_padding
+    add         y0_end,     y1,         y_stride
+    add         chroma,     chroma,     c_padding
+    add         src0,       src1,       src_padding
+
+    add         y1,         y0,         y_stride
+    add         src1,       src0,       src_stride
+
+    subs        height,     height,     #2
+
+    bgt         0b
+
+    epilogue
+
+    alias_loop_420sp 0
+
+endfunc
+.endm
+
+.macro downsample
+    vpaddl.u8   r16x8,  r8x16
+    vpaddl.u8   g16x8,  g8x16
+    vpaddl.u8   b16x8,  b8x16
+.endm
+
+
+/* acculumate and right shift by 2 */
+.macro downsample_ars2
+    vpadal.u8   r16x8,  r8x16
+    vpadal.u8   g16x8,  g8x16
+    vpadal.u8   b16x8,  b8x16
+
+    vrshr.u16   r16x8,  r16x8,  #2
+    vrshr.u16   g16x8,  g16x8,  #2
+    vrshr.u16   b16x8,  b16x8,  #2
+.endm
+
+.macro store_y8_16x1            dst, count
+.ifc "\count",""
+    vstmia      \dst!,  {y8x16}
+.else
+    vstmia      \dst,   {y8x16}
+    add         \dst,   \dst,           \count
+.endif
+.endm
+
+.macro store_chroma_nv12_8x1    dst, count
+.ifc "\count",""
+    vst2.i8     {u8x8, v8x8},   [\dst]!
+.else
+    vst2.i8     {u8x8, v8x8},   [\dst], \count
+.endif
+.endm
+
+.macro store_chroma_nv21_8x1    dst, count
+.ifc "\count",""
+    vst2.i8     {v8x8, u8x8},   [\dst]!
+.else
+    vst2.i8     {v8x8, u8x8},   [\dst], \count
+.endif
+.endm
+
+.macro load_8888_16x1   a, b, c, d, src, count
+.ifc "\count",""
+    vld4.8      {\a\()8x16_l, \b\()8x16_l, \c\()8x16_l, \d\()8x16_l},  [\src]!
+    vld4.8      {\a\()8x16_h, \b\()8x16_h, \c\()8x16_h, \d\()8x16_h},  [\src]!
+.else
+    vld4.8      {\a\()8x16_l, \b\()8x16_l, \c\()8x16_l, \d\()8x16_l},  [\src]!
+    vld4.8      {\a\()8x16_h, \b\()8x16_h, \c\()8x16_h, \d\()8x16_h},  [\src]
+    sub         \src,   \src,   #32
+    add         \src,   \src,   \count, LSL #2
+.endif
+.endm
+
+.macro load_rgbx_16x1   src, count
+    load_8888_16x1  r, g, b, x, \src, \count
+.endm
+
+.macro load_bgrx_16x1   src, count
+    load_8888_16x1  b, g, r, x, \src, \count
+.endm
+
+.macro alias_src_rgbx   set=1
+    alias_src_8888  r, g, b, x, \set
+.endm
+
+.macro alias_src_bgrx   set=1
+    alias_src_8888  b, g, r, x, \set
+.endm
+
+.macro alias_dst_nv12   set=1
+    alias   u8x8, c8x8x2_l, \set
+    alias   v8x8, c8x8x2_h, \set
+.endm
+
+.macro alias_dst_nv21   set=1
+    alias   v8x8, c8x8x2_l, \set
+    alias   u8x8, c8x8x2_h, \set
+.endm
+
+
+// common aliases
+
+alias   CO_R    d0
+CO_RY   .dn     d0.s16[0]
+CO_RU   .dn     d0.s16[1]
+CO_RV   .dn     d0.s16[2]
+
+alias   CO_G    d1
+CO_GY   .dn     d1.s16[0]
+CO_GU   .dn     d1.s16[1]
+CO_GV   .dn     d1.s16[2]
+
+alias   CO_B    d2
+CO_BY   .dn     d2.s16[0]
+CO_BU   .dn     d2.s16[1]
+CO_BV   .dn     d2.s16[2]
+
+alias   BIAS_U, d3
+alias   BIAS_V, BIAS_U
+
+alias   BIAS_Y, q2
+
+
+/* q3-q6 R8G8B8X8 x16 */
+
+.macro alias_src_8888   a, b, c, d, set
+    alias_qw  \a\()8x16, q3, \set
+    alias_qw  \b\()8x16, q4, \set
+    alias_qw  \c\()8x16, q5, \set
+    alias_qw  \d\()8x16, q6, \set
+.endm
+
+.macro kernel_420_16x2  rgb_fmt, yuv_fmt, rgb0, rgb1, y0, y1, chroma, count
+    alias_src_\rgb_fmt
+    alias_dst_\yuv_fmt
+
+    load_\rgb_fmt\()_16x1   \rgb0, \count
+
+    downsample
+    compute_y_16x1
+    store_y8_16x1   \y0, \count
+
+
+    load_\rgb_fmt\()_16x1   \rgb1, \count
+    downsample_ars2
+    compute_y_16x1
+    store_y8_16x1   \y1, \count
+
+    compute_chroma_8x1  u, U
+    compute_chroma_8x1  v, V
+
+    store_chroma_\yuv_fmt\()_8x1 \chroma, \count
+
+    alias_dst_\yuv_fmt 0
+    alias_src_\rgb_fmt 0
+.endm

omxplayer-2014.03.28.tar.gz/ffmpeg/libswscale/arm/swscale_unscaled.c Added

@@ -0,0 +1,79 @@
+/*
+ * Copyright (C) 2013 Xiaolei Yu <dreifachstein@gmail.com>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "config.h"
+#include "libswscale/swscale.h"
+#include "libswscale/swscale_internal.h"
+#include "libavutil/arm/cpu.h"
+
+extern void rgbx_to_nv12_neon_32(const uint8_t *src, uint8_t *y, uint8_t *chroma,
+                int width, int height,
+                int y_stride, int c_stride, int src_stride,
+                int32_t coeff_tbl[9]);
+
+extern void rgbx_to_nv12_neon_16(const uint8_t *src, uint8_t *y, uint8_t *chroma,
+                int width, int height,
+                int y_stride, int c_stride, int src_stride,
+                int32_t coeff_tbl[9]);
+
+static int rgbx_to_nv12_neon_32_wrapper(SwsContext *context, const uint8_t *src[],
+                        int srcStride[], int srcSliceY, int srcSliceH,
+                        uint8_t *dst[], int dstStride[]) {
+
+    rgbx_to_nv12_neon_32(src[0] + srcSliceY * srcStride[0],
+            dst[0] + srcSliceY * dstStride[0],
+            dst[1] + (srcSliceY / 2) * dstStride[1],
+            context->srcW, srcSliceH,
+            dstStride[0], dstStride[1], srcStride[0],
+            context->input_rgb2yuv_table);
+
+    return 0;
+}
+
+static int rgbx_to_nv12_neon_16_wrapper(SwsContext *context, const uint8_t *src[],
+                        int srcStride[], int srcSliceY, int srcSliceH,
+                        uint8_t *dst[], int dstStride[]) {
+
+    rgbx_to_nv12_neon_16(src[0] + srcSliceY * srcStride[0],
+            dst[0] + srcSliceY * dstStride[0],
+            dst[1] + (srcSliceY / 2) * dstStride[1],
+            context->srcW, srcSliceH,
+            dstStride[0], dstStride[1], srcStride[0],
+            context->input_rgb2yuv_table);
+
+    return 0;
+}
+
+static void get_unscaled_swscale_neon(SwsContext *c) {
+    int accurate_rnd = c->flags & SWS_ACCURATE_RND;
+    if (c->srcFormat == AV_PIX_FMT_RGBA
+            && c->dstFormat == AV_PIX_FMT_NV12
+            && (c->srcW >= 16)) {
+        c->swscale = accurate_rnd ? rgbx_to_nv12_neon_32_wrapper
+                        : rgbx_to_nv12_neon_16_wrapper;
+    }
+}
+
+void ff_get_unscaled_swscale_arm(SwsContext *c)
+{
+    int cpu_flags = av_get_cpu_flags();
+    if (have_neon(cpu_flags))
+        get_unscaled_swscale_neon(c);
+}

omxplayer-2014.03.28.tar.gz/ffmpeg/libswscale/bayer_template.c Added

@@ -0,0 +1,236 @@
+/*
+ * Bayer-to-RGB/YV12 template
+ * Copyright (c) 2011-2014 Peter Ross <pross@xvid.org>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#if defined(BAYER_BGGR) || defined(BAYER_GBRG)
+#define BAYER_R       0
+#define BAYER_G       1
+#define BAYER_B       2
+#endif
+#if defined(BAYER_RGGB) || defined(BAYER_GRBG)
+#define BAYER_R       2
+#define BAYER_G       1
+#define BAYER_B       0
+#endif
+
+#if defined(BAYER_8)
+#define BAYER_READ(x) (x)
+#define BAYER_SIZEOF  1
+#define BAYER_SHIFT   0
+#endif
+#if defined(BAYER_16LE)
+#define BAYER_READ(x) AV_RL16(&x)
+#define BAYER_SIZEOF  2
+#define BAYER_SHIFT   8
+#endif
+#if defined(BAYER_16BE)
+#define BAYER_READ(x) AV_RB16(&x)
+#define BAYER_SIZEOF  2
+#define BAYER_SHIFT   8
+#endif
+
+#define S(y, x) BAYER_READ(src[(y)*src_stride + BAYER_SIZEOF*(x)])
+#define T(y, x) (unsigned int)S(y, x)
+#define R(y, x) dst[(y)*dst_stride + (x)*3 + BAYER_R]
+#define G(y, x) dst[(y)*dst_stride + (x)*3 + BAYER_G]
+#define B(y, x) dst[(y)*dst_stride + (x)*3 + BAYER_B]
+
+#if defined(BAYER_BGGR) || defined(BAYER_RGGB)
+#define BAYER_TO_RGB24_COPY \
+    R(0, 0) = \
+    R(0, 1) = \
+    R(1, 1) = \
+    R(1, 0) = S(1, 1) >> BAYER_SHIFT; \
+    \
+    G(0, 1) = S(0, 1) >> BAYER_SHIFT; \
+    G(0, 0) = \
+    G(1, 1) = (T(0, 1) + T(1, 0)) >> (1 + BAYER_SHIFT); \
+    G(1, 0) = S(1, 0) >> BAYER_SHIFT; \
+    \
+    B(1, 1) = \
+    B(0, 0) = \
+    B(0, 1) = \
+    B(1, 0) = S(0, 0) >> BAYER_SHIFT;
+#define BAYER_TO_RGB24_INTERPOLATE \
+    R(0, 0) = (T(-1, -1) + T(-1,  1) + T(1, -1) + T(1, 1)) >> (2 + BAYER_SHIFT); \
+    G(0, 0) = (T(-1,  0) + T( 0, -1) + T(0,  1) + T(1, 0)) >> (2 + BAYER_SHIFT); \
+    B(0, 0) =  S(0, 0) >> BAYER_SHIFT; \
+    \
+    R(0, 1) = (T(-1, 1) + T(1, 1)) >> (1 + BAYER_SHIFT); \
+    G(0, 1) =  S(0,  1) >> BAYER_SHIFT; \
+    B(0, 1) = (T(0,  0) + T(0, 2)) >> (1 + BAYER_SHIFT); \
+    \
+    R(1, 0) = (T(1, -1) + T(1, 1)) >> (1 + BAYER_SHIFT); \
+    G(1, 0) =  S(1,  0) >> BAYER_SHIFT; \
+    B(1, 0) = (T(0,  0) + T(2, 0)) >> (1 + BAYER_SHIFT); \
+    \
+    R(1, 1) =  S(1, 1) >> BAYER_SHIFT; \
+    G(1, 1) = (T(0, 1) + T(1, 0) + T(1, 2) + T(2, 1)) >> (2 + BAYER_SHIFT); \
+    B(1, 1) = (T(0, 0) + T(0, 2) + T(2, 0) + T(2, 2)) >> (2 + BAYER_SHIFT);
+#else
+#define BAYER_TO_RGB24_COPY \
+    R(0, 0) = \
+    R(0, 1) = \
+    R(1, 1) = \
+    R(1, 0) = S(1, 0) >> BAYER_SHIFT; \
+    \
+    G(0, 0) = S(0, 0) >> BAYER_SHIFT; \
+    G(1, 1) = S(1, 1) >> BAYER_SHIFT; \
+    G(0, 1) = \
+    G(1, 0) = (T(0, 0) + T(1, 1)) >> (1 + BAYER_SHIFT); \
+    \
+    B(1, 1) = \
+    B(0, 0) = \
+    B(0, 1) = \
+    B(1, 0) = S(0, 1) >> BAYER_SHIFT;
+#define BAYER_TO_RGB24_INTERPOLATE \
+    R(0, 0) = (T(-1, 0) + T(1, 0)) >> (1 + BAYER_SHIFT); \
+    G(0, 0) =  S(0, 0) >> BAYER_SHIFT; \
+    B(0, 0) = (T(0, -1) + T(0, 1)) >> (1 + BAYER_SHIFT); \
+    \
+    R(0, 1) = (T(-1, 0) + T(-1, 2) + T(1, 0) + T(1, 2)) >> (2 + BAYER_SHIFT); \
+    G(0, 1) = (T(-1, 1) + T(0,  0) + T(0, 2) + T(1, 1)) >> (2 + BAYER_SHIFT); \
+    B(0, 1) =  S(0, 1) >> BAYER_SHIFT; \
+    \
+    R(1, 0) =  S(1, 0) >> BAYER_SHIFT; \
+    G(1, 0) = (T(0, 0)  + T(1, -1) + T(1,  1) + T(2, 0)) >> (2 + BAYER_SHIFT); \
+    B(1, 0) = (T(0, -1) + T(0,  1) + T(2, -1) + T(2, 1)) >> (2 + BAYER_SHIFT); \
+    \
+    R(1, 1) = (T(1, 0) + T(1, 2)) >> (1 + BAYER_SHIFT); \
+    G(1, 1) =  S(1, 1) >> BAYER_SHIFT; \
+    B(1, 1) = (T(0, 1) + T(2, 1)) >> (1 + BAYER_SHIFT);
+#endif
+
+/**
+ * invoke ff_rgb24toyv12 for 2x2 pixels
+ */
+#define rgb24toyv12_2x2(src, dstY, dstU, dstV, luma_stride, src_stride, rgb2yuv) \
+    ff_rgb24toyv12(src, dstY, dstV, dstU, 2, 2, luma_stride, 0, src_stride, rgb2yuv)
+
+static void BAYER_RENAME(rgb24_copy)(const uint8_t *src, int src_stride, uint8_t *dst, int dst_stride, int width)
+{
+    int i;
+    for (i = 0 ; i < width; i+= 2) {
+        BAYER_TO_RGB24_COPY
+        src += 2 * BAYER_SIZEOF;
+        dst += 6;
+    }
+}
+
+static void BAYER_RENAME(rgb24_interpolate)(const uint8_t *src, int src_stride, uint8_t *dst, int dst_stride, int width)
+{
+    int i;
+
+    BAYER_TO_RGB24_COPY
+    src += 2 * BAYER_SIZEOF;
+    dst += 6;
+
+    for (i = 2 ; i < width - 2; i+= 2) {
+        BAYER_TO_RGB24_INTERPOLATE
+        src += 2 * BAYER_SIZEOF;
+        dst += 6;
+    }
+
+    if (width > 2) {
+        BAYER_TO_RGB24_COPY
+    }
+}
+
+static void BAYER_RENAME(yv12_copy)(const uint8_t *src, int src_stride, uint8_t *dstY, uint8_t *dstU, uint8_t *dstV, int luma_stride, int width, int32_t *rgb2yuv)
+{
+    uint8_t dst[12];
+    const int dst_stride = 6;
+    int i;
+    for (i = 0 ; i < width; i+= 2) {
+        BAYER_TO_RGB24_COPY
+        rgb24toyv12_2x2(dst, dstY, dstU, dstV, luma_stride, dst_stride, rgb2yuv);
+        src  += 2 * BAYER_SIZEOF;
+        dstY += 2;
+        dstU++;
+        dstV++;
+    }
+}
+
+static void BAYER_RENAME(yv12_interpolate)(const uint8_t *src, int src_stride, uint8_t *dstY, uint8_t *dstU, uint8_t *dstV, int luma_stride, int width, int32_t *rgb2yuv)
+{
+    uint8_t dst[12];
+    const int dst_stride = 6;
+    int i;
+
+    BAYER_TO_RGB24_COPY
+    rgb24toyv12_2x2(dst, dstY, dstU, dstV, luma_stride, dst_stride, rgb2yuv);
+    src  += 2 * BAYER_SIZEOF;
+    dstY += 2;
+    dstU++;
+    dstV++;
+
+    for (i = 2 ; i < width - 2; i+= 2) {
+        BAYER_TO_RGB24_INTERPOLATE
+        rgb24toyv12_2x2(dst, dstY, dstU, dstV, luma_stride, dst_stride, rgb2yuv);
+        src  += 2 * BAYER_SIZEOF;
+        dstY += 2;
+        dstU++;
+        dstV++;
+    }
+
+    if (width > 2) {
+        BAYER_TO_RGB24_COPY
+        rgb24toyv12_2x2(dst, dstY, dstU, dstV, luma_stride, dst_stride, rgb2yuv);
+    }
+}
+
+#undef S
+#undef T
+#undef R
+#undef G
+#undef B
+#undef BAYER_TO_RGB24_COPY
+#undef BAYER_TO_RGB24_INTERPOLATE
+
+#undef BAYER_RENAME
+
+#undef BAYER_R
+#undef BAYER_G
+#undef BAYER_B
+#undef BAYER_READ
+#undef BAYER_SIZEOF
+#undef BAYER_SHIFT
+
+#if defined(BAYER_BGGR)
+#undef BAYER_BGGR
+#endif
+#if defined(BAYER_RGGB)
+#undef BAYER_RGGB
+#endif
+#if defined(BAYER_GBRG)
+#undef BAYER_GBRG
+#endif
+#if defined(BAYER_GRBG)
+#undef BAYER_GRBG
+#endif
+#if defined(BAYER_8)
+#undef BAYER_8
+#endif
+#if defined(BAYER_16LE)
+#undef BAYER_16LE
+#endif
+#if defined(BAYER_16BE)
+#undef BAYER_16BE
+#endif

omxplayer-2014.02.11.tar.gz/ffmpeg/libswscale/rgb2rgb.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libswscale/rgb2rgb.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libswscale/rgb2rgb.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libswscale/rgb2rgb.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libswscale/rgb2rgb_template.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libswscale/rgb2rgb_template.c Changed

@@ -693,6 +693,24 @@
     }
 }
 
+static void deinterleaveBytes_c(const uint8_t *src, uint8_t *dst1, uint8_t *dst2,
+                                int width, int height, int srcStride,
+                                int dst1Stride, int dst2Stride)
+{
+    int h;
+
+    for (h = 0; h < height; h++) {
+        int w;
+        for (w = 0; w < width; w++) {
+            dst1[w] = src[2 * w + 0];
+            dst2[w] = src[2 * w + 1];
+        }
+        src  += srcStride;
+        dst1 += dst1Stride;
+        dst2 += dst2Stride;
+    }
+}
+
 static inline void vu9_to_vu12_c(const uint8_t *src1, const uint8_t *src2,
                                  uint8_t *dst1, uint8_t *dst2,
                                  int width, int height,
@@ -922,6 +940,7 @@
     planar2x           = planar2x_c;
     ff_rgb24toyv12     = ff_rgb24toyv12_c;
     interleaveBytes    = interleaveBytes_c;
+    deinterleaveBytes  = deinterleaveBytes_c;
     vu9_to_vu12        = vu9_to_vu12_c;
     yvu9_to_yuy2       = yvu9_to_yuy2_c;

omxplayer-2014.02.11.tar.gz/ffmpeg/libswscale/swscale.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libswscale/swscale.c Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libswscale/swscale.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libswscale/swscale.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libswscale/swscale_internal.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libswscale/swscale_internal.h Changed

@@ -362,9 +362,11 @@
     int dstY;                     ///< Last destination vertical line output from last slice.
     int flags;                    ///< Flags passed by the user to select scaler algorithm, optimizations, subsampling, etc...
     void *yuvTable;             // pointer to the yuv->rgb table start so it can be freed()
+    // alignment ensures the offset can be added in a single
+    // instruction on e.g. ARM
+    DECLARE_ALIGNED(16, int, table_gV)[256 + 2*YUVRGB_TABLE_HEADROOM];
     uint8_t *table_rV[256 + 2*YUVRGB_TABLE_HEADROOM];
     uint8_t *table_gU[256 + 2*YUVRGB_TABLE_HEADROOM];
-    int table_gV[256 + 2*YUVRGB_TABLE_HEADROOM];
     uint8_t *table_bU[256 + 2*YUVRGB_TABLE_HEADROOM];
     DECLARE_ALIGNED(16, int32_t, input_rgb2yuv_table)[16+40*4]; // This table can contain both C and SIMD formatted values, teh C vales are always at the XY_IDX points
 #define RY_IDX 0
@@ -747,8 +749,24 @@
         || (x) == AV_PIX_FMT_BGR24       \
     )
 
+#define isBayer(x) ( \
+           (x)==AV_PIX_FMT_BAYER_BGGR8    \
+        || (x)==AV_PIX_FMT_BAYER_BGGR16LE \
+        || (x)==AV_PIX_FMT_BAYER_BGGR16BE \
+        || (x)==AV_PIX_FMT_BAYER_RGGB8    \
+        || (x)==AV_PIX_FMT_BAYER_RGGB16LE \
+        || (x)==AV_PIX_FMT_BAYER_RGGB16BE \
+        || (x)==AV_PIX_FMT_BAYER_GBRG8    \
+        || (x)==AV_PIX_FMT_BAYER_GBRG16LE \
+        || (x)==AV_PIX_FMT_BAYER_GBRG16BE \
+        || (x)==AV_PIX_FMT_BAYER_GRBG8    \
+        || (x)==AV_PIX_FMT_BAYER_GRBG16LE \
+        || (x)==AV_PIX_FMT_BAYER_GRBG16BE \
+    )
+
 #define isAnyRGB(x) \
     (           \
+          isBayer(x)          ||    \
           isRGBinInt(x)       ||    \
           isBGRinInt(x)       ||    \
           isRGB(x)      \
@@ -833,6 +851,7 @@
 void ff_get_unscaled_swscale(SwsContext *c);
 void ff_get_unscaled_swscale_bfin(SwsContext *c);
 void ff_get_unscaled_swscale_ppc(SwsContext *c);
+void ff_get_unscaled_swscale_arm(SwsContext *c);
 
 /**
  * Return function pointer to fastest main scaler path function depending

omxplayer-2014.02.11.tar.gz/ffmpeg/libswscale/swscale_unscaled.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libswscale/swscale_unscaled.c Changed

@@ -168,10 +168,31 @@
 
     if (c->dstFormat == AV_PIX_FMT_NV12)
         interleaveBytes(src[1], src[2], dst, c->srcW / 2, srcSliceH / 2,
-                        srcStride[1], srcStride[2], dstStride[0]);
+                        srcStride[1], srcStride[2], dstStride[1]);
     else
         interleaveBytes(src[2], src[1], dst, c->srcW / 2, srcSliceH / 2,
-                        srcStride[2], srcStride[1], dstStride[0]);
+                        srcStride[2], srcStride[1], dstStride[1]);
+
+    return srcSliceH;
+}
+
+static int nv12ToPlanarWrapper(SwsContext *c, const uint8_t *src[],
+                               int srcStride[], int srcSliceY,
+                               int srcSliceH, uint8_t *dstParam[],
+                               int dstStride[])
+{
+    uint8_t *dst1 = dstParam[1] + dstStride[1] * srcSliceY / 2;
+    uint8_t *dst2 = dstParam[2] + dstStride[2] * srcSliceY / 2;
+
+    copyPlane(src[0], srcStride[0], srcSliceY, srcSliceH, c->srcW,
+              dstParam[0], dstStride[0]);
+
+    if (c->srcFormat == AV_PIX_FMT_NV12)
+        deinterleaveBytes(src[1], dst1, dst2,c->srcW / 2, srcSliceH / 2,
+                          srcStride[1], dstStride[1], dstStride[2]);
+    else
+        deinterleaveBytes(src[1], dst2, dst1, c->srcW / 2, srcSliceH / 2,
+                          srcStride[1], dstStride[2], dstStride[1]);
 
     return srcSliceH;
 }
@@ -389,6 +410,192 @@
     return srcSliceH;
 }
 
+static void packed16togbra16(const uint8_t *src, int srcStride,
+                             uint16_t *dst[], int dstStride[], int srcSliceH,
+                             int src_alpha, int swap, int shift, int width)
+{
+    int x, h, i;
+    int dst_alpha = dst[3] != NULL;
+    for (h = 0; h < srcSliceH; h++) {
+        uint16_t *src_line = (uint16_t *)(src + srcStride * h);
+        switch (swap) {
+        case 3:
+            if (src_alpha && dst_alpha) {
+                for (x = 0; x < width; x++) {
+                    dst[0][x] = av_bswap16(av_bswap16(*src_line++) >> shift);
+                    dst[1][x] = av_bswap16(av_bswap16(*src_line++) >> shift);
+                    dst[2][x] = av_bswap16(av_bswap16(*src_line++) >> shift);
+                    dst[3][x] = av_bswap16(av_bswap16(*src_line++) >> shift);
+                }
+            } else if (dst_alpha) {
+                for (x = 0; x < width; x++) {
+                    dst[0][x] = av_bswap16(av_bswap16(*src_line++) >> shift);
+                    dst[1][x] = av_bswap16(av_bswap16(*src_line++) >> shift);
+                    dst[2][x] = av_bswap16(av_bswap16(*src_line++) >> shift);
+                    dst[3][x] = 0xFFFF;
+                }
+            } else if (src_alpha) {
+                for (x = 0; x < width; x++) {
+                    dst[0][x] = av_bswap16(av_bswap16(*src_line++) >> shift);
+                    dst[1][x] = av_bswap16(av_bswap16(*src_line++) >> shift);
+                    dst[2][x] = av_bswap16(av_bswap16(*src_line++) >> shift);
+                    src_line++;
+                }
+            } else {
+                for (x = 0; x < width; x++) {
+                    dst[0][x] = av_bswap16(av_bswap16(*src_line++) >> shift);
+                    dst[1][x] = av_bswap16(av_bswap16(*src_line++) >> shift);
+                    dst[2][x] = av_bswap16(av_bswap16(*src_line++) >> shift);
+                }
+            }
+            break;
+        case 2:
+            if (src_alpha && dst_alpha) {
+                for (x = 0; x < width; x++) {
+                    dst[0][x] = av_bswap16(*src_line++ >> shift);
+                    dst[1][x] = av_bswap16(*src_line++ >> shift);
+                    dst[2][x] = av_bswap16(*src_line++ >> shift);
+                    dst[3][x] = av_bswap16(*src_line++ >> shift);
+                }
+            } else if (dst_alpha) {
+                for (x = 0; x < width; x++) {
+                    dst[0][x] = av_bswap16(*src_line++ >> shift);
+                    dst[1][x] = av_bswap16(*src_line++ >> shift);
+                    dst[2][x] = av_bswap16(*src_line++ >> shift);
+                    dst[3][x] = 0xFFFF;
+                }
+            } else if (src_alpha) {
+                for (x = 0; x < width; x++) {
+                    dst[0][x] = av_bswap16(*src_line++ >> shift);
+                    dst[1][x] = av_bswap16(*src_line++ >> shift);
+                    dst[2][x] = av_bswap16(*src_line++ >> shift);
+                    src_line++;
+                }
+            } else {
+                for (x = 0; x < width; x++) {
+                    dst[0][x] = av_bswap16(*src_line++ >> shift);
+                    dst[1][x] = av_bswap16(*src_line++ >> shift);
+                    dst[2][x] = av_bswap16(*src_line++ >> shift);
+                }
+            }
+            break;
+        case 1:
+            if (src_alpha && dst_alpha) {
+                for (x = 0; x < width; x++) {
+                    dst[0][x] = av_bswap16(*src_line++) >> shift;
+                    dst[1][x] = av_bswap16(*src_line++) >> shift;
+                    dst[2][x] = av_bswap16(*src_line++) >> shift;
+                    dst[3][x] = av_bswap16(*src_line++) >> shift;
+                }
+            } else if (dst_alpha) {
+                for (x = 0; x < width; x++) {
+                    dst[0][x] = av_bswap16(*src_line++) >> shift;
+                    dst[1][x] = av_bswap16(*src_line++) >> shift;
+                    dst[2][x] = av_bswap16(*src_line++) >> shift;
+                    dst[3][x] = 0xFFFF;
+                }
+            } else if (src_alpha) {
+                for (x = 0; x < width; x++) {
+                    dst[0][x] = av_bswap16(*src_line++) >> shift;
+                    dst[1][x] = av_bswap16(*src_line++) >> shift;
+                    dst[2][x] = av_bswap16(*src_line++) >> shift;
+                    src_line++;
+                }
+            } else {
+                for (x = 0; x < width; x++) {
+                    dst[0][x] = av_bswap16(*src_line++) >> shift;
+                    dst[1][x] = av_bswap16(*src_line++) >> shift;
+                    dst[2][x] = av_bswap16(*src_line++) >> shift;
+                }
+            }
+            break;
+        default:
+            if (src_alpha && dst_alpha) {
+                for (x = 0; x < width; x++) {
+                    dst[0][x] = *src_line++ >> shift;
+                    dst[1][x] = *src_line++ >> shift;
+                    dst[2][x] = *src_line++ >> shift;
+                    dst[3][x] = *src_line++ >> shift;
+                }
+            } else if (dst_alpha) {
+                for (x = 0; x < width; x++) {
+                    dst[0][x] = *src_line++ >> shift;
+                    dst[1][x] = *src_line++ >> shift;
+                    dst[2][x] = *src_line++ >> shift;
+                    dst[3][x] = 0xFFFF;
+                }
+            } else if (src_alpha) {
+                for (x = 0; x < width; x++) {
+                    dst[0][x] = *src_line++ >> shift;
+                    dst[1][x] = *src_line++ >> shift;
+                    dst[2][x] = *src_line++ >> shift;
+                    src_line++;
+                }
+            } else {
+                for (x = 0; x < width; x++) {
+                    dst[0][x] = *src_line++ >> shift;
+                    dst[1][x] = *src_line++ >> shift;
+                    dst[2][x] = *src_line++ >> shift;
+                }
+            }
+        }
+        for (i = 0; i < 4; i++)
+            dst[i] += dstStride[i] >> 1;
+    }
+}
+
+static int Rgb16ToPlanarRgb16Wrapper(SwsContext *c, const uint8_t *src[],
+                                     int srcStride[], int srcSliceY, int srcSliceH,
+                                     uint8_t *dst[], int dstStride[])
+{
+    uint16_t *dst2013[] = { (uint16_t *)dst[2], (uint16_t *)dst[0], (uint16_t *)dst[1], (uint16_t *)dst[3] };
+    uint16_t *dst1023[] = { (uint16_t *)dst[1], (uint16_t *)dst[0], (uint16_t *)dst[2], (uint16_t *)dst[3] };
+    int stride2013[] = { dstStride[2], dstStride[0], dstStride[1], dstStride[3] };
+    int stride1023[] = { dstStride[1], dstStride[0], dstStride[2], dstStride[3] };
+    const AVPixFmtDescriptor *src_format = av_pix_fmt_desc_get(c->srcFormat);
+    const AVPixFmtDescriptor *dst_format = av_pix_fmt_desc_get(c->dstFormat);
+    int bpc = dst_format->comp[0].depth_minus1 + 1;
+    int alpha = src_format->flags & AV_PIX_FMT_FLAG_ALPHA;
+    int swap = 0;
+    if ( HAVE_BIGENDIAN && !(src_format->flags & AV_PIX_FMT_FLAG_BE) ||
+        !HAVE_BIGENDIAN &&   src_format->flags & AV_PIX_FMT_FLAG_BE)
+        swap++;
+    if ( HAVE_BIGENDIAN && !(dst_format->flags & AV_PIX_FMT_FLAG_BE) ||
+        !HAVE_BIGENDIAN &&   dst_format->flags & AV_PIX_FMT_FLAG_BE)
+        swap += 2;
+
+    if ((dst_format->flags & (AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB)) !=
+        (AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB) || bpc < 9) {
+        av_log(c, AV_LOG_ERROR, "unsupported conversion to planar RGB %s -> %s\n",
+               src_format->name, dst_format->name);
+        return srcSliceH;
+    }
+    switch (c->srcFormat) {
+    case AV_PIX_FMT_RGB48LE:
+    case AV_PIX_FMT_RGB48BE:
+    case AV_PIX_FMT_RGBA64LE:
+    case AV_PIX_FMT_RGBA64BE:
+        packed16togbra16(src[0] + srcSliceY * srcStride[0], srcStride[0],
+                         dst2013, stride2013, srcSliceH, alpha, swap,
+                         16 - bpc, c->srcW);
+        break;
+    case AV_PIX_FMT_BGR48LE:
+    case AV_PIX_FMT_BGR48BE:
+    case AV_PIX_FMT_BGRA64LE:
+    case AV_PIX_FMT_BGRA64BE:
+        packed16togbra16(src[0] + srcSliceY * srcStride[0], srcStride[0],
+                         dst1023, stride1023, srcSliceH, alpha, swap,
+                         16 - bpc, c->srcW);
+        break;
+    default:
+        av_log(c, AV_LOG_ERROR,
+               "unsupported conversion to planar RGB %s -> %s\n",
+               src_format->name, dst_format->name);
+    }
+
+    return srcSliceH;
+}
+
 static void gbr16ptopacked16(const uint16_t *src[], int srcStride[],
                              uint8_t *dst, int dstStride, int srcSliceH,
                              int alpha, int swap, int bpp, int width)
@@ -761,6 +968,160 @@
     return srcSliceH;
 }
 
+#define BAYER_GBRG
+#define BAYER_8
+#define BAYER_RENAME(x) bayer_gbrg8_to_##x
+#include "bayer_template.c"
+
+#define BAYER_GBRG
+#define BAYER_16LE
+#define BAYER_RENAME(x) bayer_gbrg16le_to_##x
+#include "bayer_template.c"
+
+#define BAYER_GBRG
+#define BAYER_16BE
+#define BAYER_RENAME(x) bayer_gbrg16be_to_##x
+#include "bayer_template.c"
+
+#define BAYER_GRBG
+#define BAYER_8
+#define BAYER_RENAME(x) bayer_grbg8_to_##x
+#include "bayer_template.c"
+
+#define BAYER_GRBG
+#define BAYER_16LE
+#define BAYER_RENAME(x) bayer_grbg16le_to_##x
+#include "bayer_template.c"
+
+#define BAYER_GRBG
+#define BAYER_16BE
+#define BAYER_RENAME(x) bayer_grbg16be_to_##x
+#include "bayer_template.c"
+
+#define BAYER_BGGR
+#define BAYER_8
+#define BAYER_RENAME(x) bayer_bggr8_to_##x
+#include "bayer_template.c"
+
+#define BAYER_BGGR
+#define BAYER_16LE
+#define BAYER_RENAME(x) bayer_bggr16le_to_##x
+#include "bayer_template.c"
+
+#define BAYER_BGGR
+#define BAYER_16BE
+#define BAYER_RENAME(x) bayer_bggr16be_to_##x
+#include "bayer_template.c"
+
+#define BAYER_RGGB
+#define BAYER_8
+#define BAYER_RENAME(x) bayer_rggb8_to_##x
+#include "bayer_template.c"
+
+#define BAYER_RGGB
+#define BAYER_16LE
+#define BAYER_RENAME(x) bayer_rggb16le_to_##x
+#include "bayer_template.c"
+
+#define BAYER_RGGB
+#define BAYER_16BE
+#define BAYER_RENAME(x) bayer_rggb16be_to_##x
+#include "bayer_template.c"
+
+static int bayer_to_rgb24_wrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY,
+                                  int srcSliceH, uint8_t* dst[], int dstStride[])
+{
+    uint8_t *dstPtr= dst[0];
+    const uint8_t *srcPtr= src[0];
+    int i;
+    void (*copy)       (const uint8_t *src, int src_stride, uint8_t *dst, int dst_stride, int width);
+    void (*interpolate)(const uint8_t *src, int src_stride, uint8_t *dst, int dst_stride, int width);
+
+    switch(c->srcFormat) {
+#define CASE(pixfmt, prefix) \
+    case pixfmt: copy        = bayer_##prefix##_to_rgb24_copy; \
+                 interpolate = bayer_##prefix##_to_rgb24_interpolate; \
+                 break;
+    CASE(AV_PIX_FMT_BAYER_BGGR8,    bggr8)
+    CASE(AV_PIX_FMT_BAYER_BGGR16LE, bggr16le)
+    CASE(AV_PIX_FMT_BAYER_BGGR16BE, bggr16be)
+    CASE(AV_PIX_FMT_BAYER_RGGB8,    rggb8)
+    CASE(AV_PIX_FMT_BAYER_RGGB16LE, rggb16le)
+    CASE(AV_PIX_FMT_BAYER_RGGB16BE, rggb16be)
+    CASE(AV_PIX_FMT_BAYER_GBRG8,    gbrg8)
+    CASE(AV_PIX_FMT_BAYER_GBRG16LE, gbrg16le)
+    CASE(AV_PIX_FMT_BAYER_GBRG16BE, gbrg16be)
+    CASE(AV_PIX_FMT_BAYER_GRBG8,    grbg8)
+    CASE(AV_PIX_FMT_BAYER_GRBG16LE, grbg16le)
+    CASE(AV_PIX_FMT_BAYER_GRBG16BE, grbg16be)
+#undef CASE
+    default: return 0;
+    }
+
+    copy(srcPtr, srcStride[0], dstPtr, dstStride[0], c->srcW);
+    srcPtr += 2 * srcStride[0];
+    dstPtr += 2 * dstStride[0];
+
+    for (i = 2; i < srcSliceH - 2; i += 2) {
+        interpolate(srcPtr, srcStride[0], dstPtr, dstStride[0], c->srcW);
+        srcPtr += 2 * srcStride[0];
+        dstPtr += 2 * dstStride[0];
+    }
+
+    copy(srcPtr, srcStride[0], dstPtr, dstStride[0], c->srcW);
+    return srcSliceH;
+}
+
+static int bayer_to_yv12_wrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY,
+                                 int srcSliceH, uint8_t* dst[], int dstStride[])
+{
+    const uint8_t *srcPtr= src[0];
+    uint8_t *dstY= dst[0];
+    uint8_t *dstU= dst[1];
+    uint8_t *dstV= dst[2];
+    int i;
+    void (*copy)       (const uint8_t *src, int src_stride, uint8_t *dstY, uint8_t *dstU, uint8_t *dstV, int luma_stride, int width, int32_t *rgb2yuv);
+    void (*interpolate)(const uint8_t *src, int src_stride, uint8_t *dstY, uint8_t *dstU, uint8_t *dstV, int luma_stride, int width, int32_t *rgb2yuv);
+
+    switch(c->srcFormat) {
+#define CASE(pixfmt, prefix) \
+    case pixfmt: copy        = bayer_##prefix##_to_yv12_copy; \
+                 interpolate = bayer_##prefix##_to_yv12_interpolate; \
+                 break;
+    CASE(AV_PIX_FMT_BAYER_BGGR8,    bggr8)
+    CASE(AV_PIX_FMT_BAYER_BGGR16LE, bggr16le)
+    CASE(AV_PIX_FMT_BAYER_BGGR16BE, bggr16be)
+    CASE(AV_PIX_FMT_BAYER_RGGB8,    rggb8)
+    CASE(AV_PIX_FMT_BAYER_RGGB16LE, rggb16le)
+    CASE(AV_PIX_FMT_BAYER_RGGB16BE, rggb16be)
+    CASE(AV_PIX_FMT_BAYER_GBRG8,    gbrg8)
+    CASE(AV_PIX_FMT_BAYER_GBRG16LE, gbrg16le)
+    CASE(AV_PIX_FMT_BAYER_GBRG16BE, gbrg16be)
+    CASE(AV_PIX_FMT_BAYER_GRBG8,    grbg8)
+    CASE(AV_PIX_FMT_BAYER_GRBG16LE, grbg16le)
+    CASE(AV_PIX_FMT_BAYER_GRBG16BE, grbg16be)
+#undef CASE
+    default: return 0;
+    }
+
+    copy(srcPtr, srcStride[0], dstY, dstU, dstV, dstStride[0], c->srcW, c->input_rgb2yuv_table);
+    srcPtr += 2 * srcStride[0];
+    dstY   += 2 * dstStride[0];
+    dstU   +=     dstStride[1];
+    dstV   +=     dstStride[1];
+
+    for (i = 2; i < srcSliceH - 2; i += 2) {
+        interpolate(srcPtr, srcStride[0], dstY, dstU, dstV, dstStride[0], c->srcW, c->input_rgb2yuv_table);
+        srcPtr += 2 * srcStride[0];
+        dstY   += 2 * dstStride[0];
+        dstU   +=     dstStride[1];
+        dstV   +=     dstStride[1];
+    }
+
+    copy(srcPtr, srcStride[0], dstY, dstU, dstV, dstStride[0], c->srcW, c->input_rgb2yuv_table);
+    return srcSliceH;
+}
+
 #define isRGBA32(x) (            \
            (x) == AV_PIX_FMT_ARGB   \
         || (x) == AV_PIX_FMT_RGBA   \
@@ -1091,27 +1452,24 @@
                         srcPtr  += srcStride[plane];
                     }
                 } else if (src_depth <= dst_depth) {
-                    int orig_length = length;
                     for (i = 0; i < height; i++) {
+                        j = 0;
                         if(isBE(c->srcFormat) == HAVE_BIGENDIAN &&
                            isBE(c->dstFormat) == HAVE_BIGENDIAN &&
                            shiftonly) {
                              unsigned shift = dst_depth - src_depth;
-                             length = orig_length;
 #if HAVE_FAST_64BIT
 #define FAST_COPY_UP(shift) \
-    for (j = 0; j < length - 3; j += 4) { \
+    for (; j < length - 3; j += 4) { \
         uint64_t v = AV_RN64A(srcPtr2 + j); \
         AV_WN64A(dstPtr2 + j, v << shift); \
-    } \
-    length &= 3;
+    }
 #else
 #define FAST_COPY_UP(shift) \
-    for (j = 0; j < length - 1; j += 2) { \
+    for (; j < length - 1; j += 2) { \
         uint32_t v = AV_RN32A(srcPtr2 + j); \
         AV_WN32A(dstPtr2 + j, v << shift); \
-    } \
-    length &= 1;
+    }
 #endif
                              switch (shift)
                              {
@@ -1121,12 +1479,12 @@
                         }
 #define COPY_UP(r,w) \
     if(shiftonly){\
-        for (j = 0; j < length; j++){ \
+        for (; j < length; j++){ \
             unsigned int v= r(&srcPtr2[j]);\
             w(&dstPtr2[j], v<<(dst_depth-src_depth));\
         }\
     }else{\
-        for (j = 0; j < length; j++){ \
+        for (; j < length; j++){ \
             unsigned int v= r(&srcPtr2[j]);\
             w(&dstPtr2[j], (v<<(dst_depth-src_depth)) | \
                         (v>>(2*src_depth-dst_depth)));\
@@ -1215,6 +1573,11 @@
         (dstFormat == AV_PIX_FMT_NV12 || dstFormat == AV_PIX_FMT_NV21)) {
         c->swscale = planarToNv12Wrapper;
     }
+    /* nv12_to_yv12 */
+    if (dstFormat == AV_PIX_FMT_YUV420P &&
+        (srcFormat == AV_PIX_FMT_NV12 || srcFormat == AV_PIX_FMT_NV21)) {
+        c->swscale = nv12ToPlanarWrapper;
+    }
     /* yuv2bgr */
     if ((srcFormat == AV_PIX_FMT_YUV420P || srcFormat == AV_PIX_FMT_YUV422P ||
          srcFormat == AV_PIX_FMT_YUVA420P) && isAnyRGB(dstFormat) &&
@@ -1254,6 +1617,18 @@
     if (srcFormat == AV_PIX_FMT_GBRP && isPlanar(srcFormat) && isByteRGB(dstFormat))
         c->swscale = planarRgbToRgbWrapper;
 
+    if ((srcFormat == AV_PIX_FMT_RGB48LE  || srcFormat == AV_PIX_FMT_RGB48BE  ||
+         srcFormat == AV_PIX_FMT_BGR48LE  || srcFormat == AV_PIX_FMT_BGR48BE  ||
+         srcFormat == AV_PIX_FMT_RGBA64LE || srcFormat == AV_PIX_FMT_RGBA64BE ||
+         srcFormat == AV_PIX_FMT_BGRA64LE || srcFormat == AV_PIX_FMT_BGRA64BE) &&
+        (dstFormat == AV_PIX_FMT_GBRP9LE  || dstFormat == AV_PIX_FMT_GBRP9BE  ||
+         dstFormat == AV_PIX_FMT_GBRP10LE || dstFormat == AV_PIX_FMT_GBRP10BE ||
+         dstFormat == AV_PIX_FMT_GBRP12LE || dstFormat == AV_PIX_FMT_GBRP12BE ||
+         dstFormat == AV_PIX_FMT_GBRP14LE || dstFormat == AV_PIX_FMT_GBRP14BE ||
+         dstFormat == AV_PIX_FMT_GBRP16LE || dstFormat == AV_PIX_FMT_GBRP16BE ||
+         dstFormat == AV_PIX_FMT_GBRAP16LE || dstFormat == AV_PIX_FMT_GBRAP16BE ))
+        c->swscale = Rgb16ToPlanarRgb16Wrapper;
+
     if ((srcFormat == AV_PIX_FMT_GBRP9LE  || srcFormat == AV_PIX_FMT_GBRP9BE  ||
          srcFormat == AV_PIX_FMT_GBRP16LE || srcFormat == AV_PIX_FMT_GBRP16BE ||
          srcFormat == AV_PIX_FMT_GBRP10LE || srcFormat == AV_PIX_FMT_GBRP10BE ||
@@ -1270,8 +1645,23 @@
         isPackedRGB(srcFormat) && dstFormat == AV_PIX_FMT_GBRP)
         c->swscale = rgbToPlanarRgbWrapper;
 
+    if (isBayer(srcFormat)) {
+        if (dstFormat == AV_PIX_FMT_RGB24)
+            c->swscale = bayer_to_rgb24_wrapper;
+        else if (dstFormat == AV_PIX_FMT_YUV420P)
+            c->swscale = bayer_to_yv12_wrapper;
+        else if (!isBayer(dstFormat)) {
+            av_log(c, AV_LOG_ERROR, "unsupported bayer conversion\n");
+            av_assert0(0);
+        }
+    }
+
     /* bswap 16 bits per pixel/component packed formats */
-    if (IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_BGR444) ||
+    if (IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_BAYER_BGGR16) ||
+        IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_BAYER_RGGB16) ||
+        IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_BAYER_GBRG16) ||
+        IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_BAYER_GRBG16) ||
+        IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_BGR444) ||
         IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_BGR48)  ||
         IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_BGRA64) ||
         IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_BGR555) ||
@@ -1361,6 +1751,9 @@
         ff_get_unscaled_swscale_bfin(c);
     if (ARCH_PPC)
         ff_get_unscaled_swscale_ppc(c);
+//     if (ARCH_ARM)
+//         ff_get_unscaled_swscale_arm(c);
+
 }
 
 /* Convert the palette to the same packed 32-bit format as the palette */

omxplayer-2014.03.28.tar.gz/ffmpeg/libswscale/swscaleres.rc Added

@@ -0,0 +1,55 @@
+/*
+ * Windows resource file for libswscale
+ *
+ * Copyright (C) 2012 James Almer
+ * Copyright (C) 2013 Tiancheng "Timothy" Gu
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <windows.h>
+#include "libswscale/version.h"
+#include "libavutil/ffversion.h"
+#include "config.h"
+
+1 VERSIONINFO
+FILEVERSION     LIBSWSCALE_VERSION_MAJOR, LIBSWSCALE_VERSION_MINOR, LIBSWSCALE_VERSION_MICRO, 0
+PRODUCTVERSION  LIBSWSCALE_VERSION_MAJOR, LIBSWSCALE_VERSION_MINOR, LIBSWSCALE_VERSION_MICRO, 0
+FILEFLAGSMASK   VS_FFI_FILEFLAGSMASK
+FILEOS          VOS_NT_WINDOWS32
+FILETYPE        VFT_DLL
+{
+    BLOCK "StringFileInfo"
+    {
+        BLOCK "040904B0"
+        {
+            VALUE "CompanyName",      "FFmpeg Project"
+            VALUE "FileDescription",  "FFmpeg image rescaling library"
+            VALUE "FileVersion",      AV_STRINGIFY(LIBSWSCALE_VERSION)
+            VALUE "InternalName",     "libswscale"
+            VALUE "LegalCopyright",   "Copyright (C) 2000-" AV_STRINGIFY(CONFIG_THIS_YEAR) " FFmpeg Project"
+            VALUE "OriginalFilename", "swscale" BUILDSUF "-" AV_STRINGIFY(LIBSWSCALE_VERSION_MAJOR) SLIBSUF
+            VALUE "ProductName",      "FFmpeg"
+            VALUE "ProductVersion",   FFMPEG_VERSION
+        }
+    }
+
+    BLOCK "VarFileInfo"
+    {
+        VALUE "Translation", 0x0409, 0x04B0
+    }
+}

omxplayer-2014.02.11.tar.gz/ffmpeg/libswscale/utils.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libswscale/utils.c Changed

@@ -207,6 +207,18 @@
     [AV_PIX_FMT_GBRAP]       = { 1, 1 },
     [AV_PIX_FMT_GBRAP16LE]   = { 1, 0 },
     [AV_PIX_FMT_GBRAP16BE]   = { 1, 0 },
+    [AV_PIX_FMT_BAYER_BGGR8] = { 1, 0 },
+    [AV_PIX_FMT_BAYER_RGGB8] = { 1, 0 },
+    [AV_PIX_FMT_BAYER_GBRG8] = { 1, 0 },
+    [AV_PIX_FMT_BAYER_GRBG8] = { 1, 0 },
+    [AV_PIX_FMT_BAYER_BGGR16LE] = { 1, 0 },
+    [AV_PIX_FMT_BAYER_BGGR16BE] = { 1, 0 },
+    [AV_PIX_FMT_BAYER_RGGB16LE] = { 1, 0 },
+    [AV_PIX_FMT_BAYER_RGGB16BE] = { 1, 0 },
+    [AV_PIX_FMT_BAYER_GBRG16LE] = { 1, 0 },
+    [AV_PIX_FMT_BAYER_GBRG16BE] = { 1, 0 },
+    [AV_PIX_FMT_BAYER_GRBG16LE] = { 1, 0 },
+    [AV_PIX_FMT_BAYER_GRBG16BE] = { 1, 0 },
 };
 
 int sws_isSupportedInput(enum AVPixelFormat pix_fmt)
@@ -260,6 +272,26 @@
     return pos >> chr_subsample;
 }
 
+typedef struct {
+    int flag;                   ///< flag associated to the algorithm
+    const char *description;    ///< human-readable description
+    int size_factor;            ///< size factor used when initing the filters
+} ScaleAlgorithm;
+
+static const ScaleAlgorithm scale_algorithms[] = {
+    { SWS_AREA,          "area averaging",                  1 /* downscale only, for upscale it is bilinear */ },
+    { SWS_BICUBIC,       "bicubic",                         4 },
+    { SWS_BICUBLIN,      "luma bicubic / chroma bilinear", -1 },
+    { SWS_BILINEAR,      "bilinear",                        2 },
+    { SWS_FAST_BILINEAR, "fast bilinear",                  -1 },
+    { SWS_GAUSS,         "Gaussian",                        8 /* infinite ;) */ },
+    { SWS_LANCZOS,       "Lanczos",                        -1 /* custom */ },
+    { SWS_POINT,         "nearest neighbor / point",       -1 },
+    { SWS_SINC,          "sinc",                           20 /* infinite ;) */ },
+    { SWS_SPLINE,        "bicubic spline",                 20 /* infinite :)*/ },
+    { SWS_X,             "experimental",                    8 },
+};
+
 static av_cold int initFilter(int16_t **outFilter, int32_t **filterPos,
                               int *outFilterSize, int xInc, int srcW,
                               int dstW, int filterAlign, int one,
@@ -332,27 +364,17 @@
         }
     } else {
         int64_t xDstInSrc;
-        int sizeFactor;
-
-        if (flags & SWS_BICUBIC)
-            sizeFactor = 4;
-        else if (flags & SWS_X)
-            sizeFactor = 8;
-        else if (flags & SWS_AREA)
-            sizeFactor = 1;     // downscale only, for upscale it is bilinear
-        else if (flags & SWS_GAUSS)
-            sizeFactor = 8;     // infinite ;)
-        else if (flags & SWS_LANCZOS)
-            sizeFactor = param[0] != SWS_PARAM_DEFAULT ? ceil(2 * param[0]) : 6;
-        else if (flags & SWS_SINC)
-            sizeFactor = 20;    // infinite ;)
-        else if (flags & SWS_SPLINE)
-            sizeFactor = 20;    // infinite ;)
-        else if (flags & SWS_BILINEAR)
-            sizeFactor = 2;
-        else {
-            av_assert0(0);
+        int sizeFactor = -1;
+
+        for (i = 0; i < FF_ARRAY_ELEMS(scale_algorithms); i++) {
+            if (flags & scale_algorithms[i].flag) {
+                sizeFactor = scale_algorithms[i].size_factor;
+                break;
+            }
         }
+        if (flags & SWS_LANCZOS)
+            sizeFactor = param[0] != SWS_PARAM_DEFAULT ? ceil(2 * param[0]) : 6;
+        av_assert0(sizeFactor > 0);
 
         if (xInc <= 1 << 16)
             filterSize = 1 + sizeFactor;    // upscale
@@ -557,7 +579,7 @@
     filter = av_malloc(filterSize * dstW * sizeof(*filter));
     if (filterSize >= MAX_FILTER_SIZE * 16 /
                       ((flags & SWS_ACCURATE_RND) ? APCK_SIZE : 16) || !filter) {
-        av_log(NULL, AV_LOG_ERROR, "sws: filterSize %d is too large, try less extreem scaling or increase MAX_FILTER_SIZE and recompile\n", filterSize);
+        av_log(NULL, AV_LOG_ERROR, "sws: filterSize %d is too large, try less extreme scaling or increase MAX_FILTER_SIZE and recompile\n", filterSize);
         goto fail;
     }
     *outFilterSize = filterSize;
@@ -771,10 +793,10 @@
             int c                  = ((xpos + xInc * 2) >> 16) - xx;
             int d                  = ((xpos + xInc * 3) >> 16) - xx;
             int inc                = (d + 1 < 4);
-            uint8_t *fragment      = (d + 1 < 4) ? fragmentB : fragmentA;
-            x86_reg imm8OfPShufW1  = (d + 1 < 4) ? imm8OfPShufW1B : imm8OfPShufW1A;
-            x86_reg imm8OfPShufW2  = (d + 1 < 4) ? imm8OfPShufW2B : imm8OfPShufW2A;
-            x86_reg fragmentLength = (d + 1 < 4) ? fragmentLengthB : fragmentLengthA;
+            uint8_t *fragment      = inc ? fragmentB : fragmentA;
+            x86_reg imm8OfPShufW1  = inc ? imm8OfPShufW1B : imm8OfPShufW1A;
+            x86_reg imm8OfPShufW2  = inc ? imm8OfPShufW2B : imm8OfPShufW2A;
+            x86_reg fragmentLength = inc ? fragmentLengthB : fragmentLengthA;
             int maxShift           = 3 - (d + inc);
             int shift              = 0;
 
@@ -975,8 +997,6 @@
     c->srcRange   = srcRange;
     c->dstRange   = dstRange;
 
-    fill_xyztables(c);
-
     if ((isYUV(c->dstFormat) || isGray(c->dstFormat)) && (isYUV(c->srcFormat) || isGray(c->srcFormat)))
         return -1;
 
@@ -1035,6 +1055,8 @@
         *format = AV_PIX_FMT_YUV440P;
         return 1;
     case AV_PIX_FMT_GRAY8:
+    case AV_PIX_FMT_GRAY16LE:
+    case AV_PIX_FMT_GRAY16BE:
         return 1;
     default:
         return 0;
@@ -1067,6 +1089,8 @@
     c->dst0Alpha |= handle_0alpha(&c->dstFormat);
     c->srcXYZ    |= handle_xyz(&c->srcFormat);
     c->dstXYZ    |= handle_xyz(&c->dstFormat);
+    if (c->srcXYZ || c->dstXYZ)
+        fill_xyztables(c);
 }
 
 SwsContext *sws_alloc_context(void)
@@ -1110,13 +1134,14 @@
     c->srcRange |= handle_jpeg(&c->srcFormat);
     c->dstRange |= handle_jpeg(&c->dstFormat);
 
+    if(srcFormat!=c->srcFormat || dstFormat!=c->dstFormat)
+        av_log(c, AV_LOG_WARNING, "deprecated pixel format used, make sure you did set range correctly\n");
+
     if (!c->contrast && !c->saturation && !c->dstFormatBpp)
         sws_setColorspaceDetails(c, ff_yuv2rgb_coeffs[SWS_CS_DEFAULT], c->srcRange,
                                  ff_yuv2rgb_coeffs[SWS_CS_DEFAULT],
                                  c->dstRange, 0, 1 << 16, 1 << 16);
 
-    if(srcFormat!=c->srcFormat || dstFormat!=c->dstFormat)
-        av_log(c, AV_LOG_WARNING, "deprecated pixel format used, make sure you did set range correctly\n");
     handle_formats(c);
     srcFormat = c->srcFormat;
     dstFormat = c->dstFormat;
@@ -1331,9 +1356,10 @@
         dst_stride <<= 1;
 
     if (INLINE_MMXEXT(cpu_flags) && c->srcBpc == 8 && c->dstBpc <= 14) {
-        c->canMMXEXTBeUsed = (dstW >= srcW && (dstW & 31) == 0 &&
-                              (srcW & 15) == 0) ? 1 : 0;
-        if (!c->canMMXEXTBeUsed && dstW >= srcW && (srcW & 15) == 0
+        c->canMMXEXTBeUsed = dstW >= srcW && (dstW & 31) == 0 &&
+                             c->chrDstW >= c->chrSrcW &&
+                             (srcW & 15) == 0;
+        if (!c->canMMXEXTBeUsed && dstW >= srcW && c->chrDstW >= c->chrSrcW && (srcW & 15) == 0
 
             && (flags & SWS_FAST_BILINEAR)) {
             if (flags & SWS_PRINT_INFO)
@@ -1567,33 +1593,17 @@
     av_assert0(c->chrDstH <= dstH);
 
     if (flags & SWS_PRINT_INFO) {
-        const char *scaler, *cpucaps;
-        if (flags & SWS_FAST_BILINEAR)
-            scaler = "FAST_BILINEAR scaler";
-        else if (flags & SWS_BILINEAR)
-            scaler = "BILINEAR scaler";
-        else if (flags & SWS_BICUBIC)
-            scaler = "BICUBIC scaler";
-        else if (flags & SWS_X)
-            scaler = "Experimental scaler";
-        else if (flags & SWS_POINT)
-            scaler = "Nearest Neighbor / POINT scaler";
-        else if (flags & SWS_AREA)
-            scaler = "Area Averaging scaler";
-        else if (flags & SWS_BICUBLIN)
-            scaler = "luma BICUBIC / chroma BILINEAR scaler";
-        else if (flags & SWS_GAUSS)
-            scaler = "Gaussian scaler";
-        else if (flags & SWS_SINC)
-            scaler = "Sinc scaler";
-        else if (flags & SWS_LANCZOS)
-            scaler = "Lanczos scaler";
-        else if (flags & SWS_SPLINE)
-            scaler = "Bicubic spline scaler";
-        else
-            scaler = "ehh flags invalid?!";
+        const char *scaler = NULL, *cpucaps;
 
-        av_log(c, AV_LOG_INFO, "%s, from %s to %s%s ",
+        for (i = 0; i < FF_ARRAY_ELEMS(scale_algorithms); i++) {
+            if (flags & scale_algorithms[i].flag) {
+                scaler = scale_algorithms[i].description;
+                break;
+            }
+        }
+        if (!scaler)
+            scaler =  "ehh flags invalid?!";
+        av_log(c, AV_LOG_INFO, "%s scaler, from %s to %s%s ",
                scaler,
                av_get_pix_fmt_name(srcFormat),
 #ifdef DITHER1XBPP

omxplayer-2014.02.11.tar.gz/ffmpeg/libswscale/version.h -> omxplayer-2014.03.28.tar.gz/ffmpeg/libswscale/version.h Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/libswscale/x86/rgb2rgb.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libswscale/x86/rgb2rgb.c Changed

@@ -91,35 +91,45 @@
 #define COMPILE_TEMPLATE_MMXEXT 0
 #define COMPILE_TEMPLATE_AMD3DNOW 0
 #define COMPILE_TEMPLATE_SSE2 0
+#define COMPILE_TEMPLATE_AVX 0
 
 //MMX versions
 #undef RENAME
-#define RENAME(a) a ## _MMX
+#define RENAME(a) a ## _mmx
 #include "rgb2rgb_template.c"
 
 // MMXEXT versions
 #undef RENAME
 #undef COMPILE_TEMPLATE_MMXEXT
 #define COMPILE_TEMPLATE_MMXEXT 1
-#define RENAME(a) a ## _MMXEXT
+#define RENAME(a) a ## _mmxext
 #include "rgb2rgb_template.c"
 
 //SSE2 versions
 #undef RENAME
 #undef COMPILE_TEMPLATE_SSE2
 #define COMPILE_TEMPLATE_SSE2 1
-#define RENAME(a) a ## _SSE2
+#define RENAME(a) a ## _sse2
+#include "rgb2rgb_template.c"
+
+//AVX versions
+#undef RENAME
+#undef COMPILE_TEMPLATE_AVX
+#define COMPILE_TEMPLATE_AVX 1
+#define RENAME(a) a ## _avx
 #include "rgb2rgb_template.c"
 
 //3DNOW versions
 #undef RENAME
 #undef COMPILE_TEMPLATE_MMXEXT
 #undef COMPILE_TEMPLATE_SSE2
+#undef COMPILE_TEMPLATE_AVX
 #undef COMPILE_TEMPLATE_AMD3DNOW
 #define COMPILE_TEMPLATE_MMXEXT 0
 #define COMPILE_TEMPLATE_SSE2 0
+#define COMPILE_TEMPLATE_AVX 0
 #define COMPILE_TEMPLATE_AMD3DNOW 1
-#define RENAME(a) a ## _3DNOW
+#define RENAME(a) a ## _3dnow
 #include "rgb2rgb_template.c"
 
 /*
@@ -137,12 +147,14 @@
     int cpu_flags = av_get_cpu_flags();
 
     if (INLINE_MMX(cpu_flags))
-        rgb2rgb_init_MMX();
+        rgb2rgb_init_mmx();
     if (INLINE_AMD3DNOW(cpu_flags))
-        rgb2rgb_init_3DNOW();
+        rgb2rgb_init_3dnow();
     if (INLINE_MMXEXT(cpu_flags))
-        rgb2rgb_init_MMXEXT();
+        rgb2rgb_init_mmxext();
     if (INLINE_SSE2(cpu_flags))
-        rgb2rgb_init_SSE2();
+        rgb2rgb_init_sse2();
+    if (INLINE_AVX(cpu_flags))
+        rgb2rgb_init_avx();
 #endif /* HAVE_INLINE_ASM */
 }

omxplayer-2014.02.11.tar.gz/ffmpeg/libswscale/x86/rgb2rgb_template.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libswscale/x86/rgb2rgb_template.c Changed

@@ -1854,7 +1854,7 @@
 #endif /* HAVE_7REGS */
 #endif /* !COMPILE_TEMPLATE_SSE2 */
 
-#if !COMPILE_TEMPLATE_AMD3DNOW
+#if !COMPILE_TEMPLATE_AMD3DNOW && !COMPILE_TEMPLATE_AVX
 static void RENAME(interleaveBytes)(const uint8_t *src1, const uint8_t *src2, uint8_t *dest,
                                     int width, int height, int src1Stride,
                                     int src2Stride, int dstStride)
@@ -1924,7 +1924,36 @@
             ::: "memory"
             );
 }
+#endif /* !COMPILE_TEMPLATE_AMD3DNOW && !COMPILE_TEMPLATE_AVX */
+
+#if !COMPILE_TEMPLATE_AVX || HAVE_AVX_EXTERNAL
+#if !COMPILE_TEMPLATE_AMD3DNOW && (ARCH_X86_32 || COMPILE_TEMPLATE_SSE2) && COMPILE_TEMPLATE_MMXEXT == COMPILE_TEMPLATE_SSE2 && HAVE_YASM
+void RENAME(ff_nv12ToUV)(uint8_t *dstU, uint8_t *dstV,
+                         const uint8_t *unused,
+                         const uint8_t *src1,
+                         const uint8_t *src2,
+                         int w,
+                         uint32_t *unused2);
+static void RENAME(deinterleaveBytes)(const uint8_t *src, uint8_t *dst1, uint8_t *dst2,
+                                      int width, int height, int srcStride,
+                                      int dst1Stride, int dst2Stride)
+{
+    int h;
+
+    for (h = 0; h < height; h++) {
+        RENAME(ff_nv12ToUV)(dst1, dst2, NULL, src, NULL, width, NULL);
+        src  += srcStride;
+        dst1 += dst1Stride;
+        dst2 += dst2Stride;
+    }
+    __asm__(
+            EMMS"       \n\t"
+            SFENCE"     \n\t"
+            ::: "memory"
+            );
+}
 #endif /* !COMPILE_TEMPLATE_AMD3DNOW */
+#endif /* !COMPILE_TEMPLATE_AVX || HAVE_AVX_EXTERNAL */
 
 #if !COMPILE_TEMPLATE_SSE2
 #if !COMPILE_TEMPLATE_AMD3DNOW
@@ -2494,7 +2523,12 @@
     uyvytoyuv420       = RENAME(uyvytoyuv420);
 #endif /* !COMPILE_TEMPLATE_SSE2 */
 
-#if !COMPILE_TEMPLATE_AMD3DNOW
+#if !COMPILE_TEMPLATE_AMD3DNOW && !COMPILE_TEMPLATE_AVX
     interleaveBytes    = RENAME(interleaveBytes);
-#endif /* !COMPILE_TEMPLATE_AMD3DNOW */
+#endif /* !COMPILE_TEMPLATE_AMD3DNOW && !COMPILE_TEMPLATE_AVX */
+#if !COMPILE_TEMPLATE_AVX || HAVE_AVX_EXTERNAL
+#if !COMPILE_TEMPLATE_AMD3DNOW && (ARCH_X86_32 || COMPILE_TEMPLATE_SSE2) && COMPILE_TEMPLATE_MMXEXT == COMPILE_TEMPLATE_SSE2 && HAVE_YASM
+    deinterleaveBytes  = RENAME(deinterleaveBytes);
+#endif
+#endif
 }

omxplayer-2014.02.11.tar.gz/ffmpeg/libswscale/x86/swscale.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libswscale/x86/swscale.c Changed

@@ -71,7 +71,7 @@
 #if HAVE_MMX_INLINE
 #undef RENAME
 #define COMPILE_TEMPLATE_MMXEXT 0
-#define RENAME(a) a ## _MMX
+#define RENAME(a) a ## _mmx
 #include "swscale_template.c"
 #endif
 
@@ -80,7 +80,7 @@
 #undef RENAME
 #undef COMPILE_TEMPLATE_MMXEXT
 #define COMPILE_TEMPLATE_MMXEXT 1
-#define RENAME(a) a ## _MMXEXT
+#define RENAME(a) a ## _mmxext
 #include "swscale_template.c"
 #endif
 
@@ -206,7 +206,7 @@
                            const uint8_t *dither, int offset)
 {
     if(((int)dest) & 15){
-        return yuv2yuvX_MMXEXT(filter, filterSize, src, dest, dstW, dither, offset);
+        return yuv2yuvX_mmxext(filter, filterSize, src, dest, dstW, dither, offset);
     }
     if (offset) {
         __asm__ volatile("movq       (%0), %%xmm3\n\t"
@@ -266,7 +266,8 @@
         "jb                                  1b             \n\t"\
         :: "g" (filter),
            "r" (dest-offset), "g" ((x86_reg)(dstW+offset)), "m" (offset)
-        : "%"REG_d, "%"REG_S, "%"REG_c
+        : XMM_CLOBBERS("%xmm0" , "%xmm1" , "%xmm2" , "%xmm3" , "%xmm4" , "%xmm5" , "%xmm7" ,)
+         "%"REG_d, "%"REG_S, "%"REG_c
     );
 }
 #endif
@@ -382,12 +383,12 @@
     int cpu_flags = av_get_cpu_flags();
 
 #if HAVE_MMX_INLINE
-    if (cpu_flags & AV_CPU_FLAG_MMX)
-        sws_init_swscale_MMX(c);
+    if (INLINE_MMX(cpu_flags))
+        sws_init_swscale_mmx(c);
 #endif
 #if HAVE_MMXEXT_INLINE
-    if (cpu_flags & AV_CPU_FLAG_MMXEXT)
-        sws_init_swscale_MMXEXT(c);
+    if (INLINE_MMXEXT(cpu_flags))
+        sws_init_swscale_mmxext(c);
     if (cpu_flags & AV_CPU_FLAG_SSE3){
         if(c->use_mmx_vfilter && !(c->flags & SWS_ACCURATE_RND))
             c->yuv2planeX = yuv2yuvX_sse3;

omxplayer-2014.02.11.tar.gz/ffmpeg/libswscale/x86/yuv2rgb.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/libswscale/x86/yuv2rgb.c Changed

@@ -34,6 +34,7 @@
 #include "libswscale/swscale_internal.h"
 #include "libavutil/attributes.h"
 #include "libavutil/x86/asm.h"
+#include "libavutil/x86/cpu.h"
 #include "libavutil/cpu.h"
 
 #if HAVE_INLINE_ASM
@@ -53,7 +54,7 @@
 #undef RENAME
 #undef COMPILE_TEMPLATE_MMXEXT
 #define COMPILE_TEMPLATE_MMXEXT 0
-#define RENAME(a) a ## _MMX
+#define RENAME(a) a ## _mmx
 #include "yuv2rgb_template.c"
 #endif /* HAVE_MMX_INLINE */
 
@@ -62,7 +63,7 @@
 #undef RENAME
 #undef COMPILE_TEMPLATE_MMXEXT
 #define COMPILE_TEMPLATE_MMXEXT 1
-#define RENAME(a) a ## _MMXEXT
+#define RENAME(a) a ## _mmxext
 #include "yuv2rgb_template.c"
 #endif /* HAVE_MMXEXT_INLINE */
 
@@ -74,36 +75,42 @@
     int cpu_flags = av_get_cpu_flags();
 
 #if HAVE_MMXEXT_INLINE
-    if (cpu_flags & AV_CPU_FLAG_MMXEXT) {
+    if (INLINE_MMXEXT(cpu_flags)) {
         switch (c->dstFormat) {
         case AV_PIX_FMT_RGB24:
-            return yuv420_rgb24_MMXEXT;
+            return yuv420_rgb24_mmxext;
         case AV_PIX_FMT_BGR24:
-            return yuv420_bgr24_MMXEXT;
+            return yuv420_bgr24_mmxext;
         }
     }
 #endif
 
-    if (cpu_flags & AV_CPU_FLAG_MMX) {
+    if (INLINE_MMX(cpu_flags)) {
         switch (c->dstFormat) {
             case AV_PIX_FMT_RGB32:
                 if (c->srcFormat == AV_PIX_FMT_YUVA420P) {
 #if HAVE_7REGS && CONFIG_SWSCALE_ALPHA
-                    return yuva420_rgb32_MMX;
+                    return yuva420_rgb32_mmx;
 #endif
                     break;
-                } else return yuv420_rgb32_MMX;
+                } else
+                    return yuv420_rgb32_mmx;
             case AV_PIX_FMT_BGR32:
                 if (c->srcFormat == AV_PIX_FMT_YUVA420P) {
 #if HAVE_7REGS && CONFIG_SWSCALE_ALPHA
-                    return yuva420_bgr32_MMX;
+                    return yuva420_bgr32_mmx;
 #endif
                     break;
-                } else return yuv420_bgr32_MMX;
-            case AV_PIX_FMT_RGB24:  return yuv420_rgb24_MMX;
-            case AV_PIX_FMT_BGR24:  return yuv420_bgr24_MMX;
-            case AV_PIX_FMT_RGB565: return yuv420_rgb16_MMX;
-            case AV_PIX_FMT_RGB555: return yuv420_rgb15_MMX;
+                } else
+                    return yuv420_bgr32_mmx;
+            case AV_PIX_FMT_RGB24:
+                return yuv420_rgb24_mmx;
+            case AV_PIX_FMT_BGR24:
+                return yuv420_bgr24_mmx;
+            case AV_PIX_FMT_RGB565:
+                return yuv420_rgb16_mmx;
+            case AV_PIX_FMT_RGB555:
+                return yuv420_rgb15_mmx;
         }
     }
 #endif /* HAVE_MMX_INLINE */

omxplayer-2014.02.11.tar.gz/ffmpeg/tests/Makefile -> omxplayer-2014.03.28.tar.gz/ffmpeg/tests/Makefile Changed

@@ -68,9 +68,11 @@
 
 DEMMUX  = $(call ALLYES, $(1)_DEMUXER $(2)_MUXER)
 
-FILTERDEMDEC       = $(call ALLYES, $(1)_FILTER $(2)_DEMUXER $(3)_DECODER)
-FILTERDEMDECMUX    = $(call ALLYES, $(1)_FILTER $(2)_DEMUXER $(3)_DECODER $(4)_MUXER)
-FILTERDEMDECENCMUX = $(call ALLYES, $(1)_FILTER $(2)_DEMUXER $(3)_DECODER $(4)_ENCODER $(5)_MUXER)
+FILTERDEMDEC       = $(call ALLYES, $(1:%=%_FILTER) $(2)_DEMUXER $(3)_DECODER)
+FILTERDEMDECMUX    = $(call ALLYES, $(1:%=%_FILTER) $(2)_DEMUXER $(3)_DECODER $(4)_MUXER)
+FILTERDEMDECENCMUX = $(call ALLYES, $(1:%=%_FILTER) $(2)_DEMUXER $(3)_DECODER $(4)_ENCODER $(5)_MUXER)
+
+PARSERDEMDEC       = $(call ALLYES, $(1)_PARSER $(2)_DEMUXER $(3)_DECODER)
 
 include $(SRC_PATH)/tests/fate/acodec.mak
 include $(SRC_PATH)/tests/fate/vcodec.mak
@@ -133,6 +135,7 @@
 include $(SRC_PATH)/tests/fate/vqf.mak
 include $(SRC_PATH)/tests/fate/wavpack.mak
 include $(SRC_PATH)/tests/fate/wma.mak
+include $(SRC_PATH)/tests/fate/xvid.mak
 
 FATE_FFMPEG += $(FATE_FFMPEG-yes) $(FATE_AVCONV) $(FATE_AVCONV-yes)
 FATE-$(CONFIG_FFMPEG) += $(FATE_FFMPEG)

omxplayer-2014.02.11.tar.gz/ffmpeg/tests/fate.sh -> omxplayer-2014.03.28.tar.gz/ffmpeg/tests/fate.sh Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/tests/fate/aac.mak -> omxplayer-2014.03.28.tar.gz/ffmpeg/tests/fate/aac.mak Changed

@@ -42,6 +42,10 @@
 fate-aac-al_sbr_hq_cm_48_5.1: CMD = pcm -i $(TARGET_SAMPLES)/aac/al_sbr_cm_48_5.1.mp4
 fate-aac-al_sbr_hq_cm_48_5.1: REF = $(SAMPLES)/aac/al_sbr_hq_cm_48_5.1_reorder.s16
 
+FATE_AAC += fate-aac-al_sbr_hq_sr_48_2_fsaac48
+fate-aac-al_sbr_hq_sr_48_2_fsaac48: CMD = pcm -i $(TARGET_SAMPLES)/aac/al_sbr_sr_48_2_fsaac48.mp4
+fate-aac-al_sbr_hq_sr_48_2_fsaac48: REF = $(SAMPLES)/aac/al_sbr_hq_sr_48_2_fsaac48.s16
+
 FATE_AAC += fate-aac-al_sbr_ps_06_ur
 fate-aac-al_sbr_ps_06_ur: CMD = pcm -i $(TARGET_SAMPLES)/aac/al_sbr_ps_06_new.mp4
 fate-aac-al_sbr_ps_06_ur: REF = $(SAMPLES)/aac/al_sbr_ps_06_ur.s16
@@ -52,7 +56,11 @@
 
 FATE_AAC += fate-aac-er_ad6000np_44_ep0
 fate-aac-er_ad6000np_44_ep0: CMD = pcm -i $(TARGET_SAMPLES)/aac/er_ad6000np_44_ep0.mp4
-fate-aac-er_ad6000np_44_ep0: REF = $(SAMPLES)/aac/er_ad6000np_44_ep0.s16
+fate-aac-er_ad6000np_44_ep0: REF = $(SAMPLES)/aac/er_ad6000np_44.s16
+
+FATE_AAC += fate-aac-er_eld1001np_44_ep0
+fate-aac-er_eld1001np_44_ep0: CMD = pcm -i $(TARGET_SAMPLES)/aac/er_eld1001np_44_ep0.mp4
+fate-aac-er_eld1001np_44_ep0: REF = $(SAMPLES)/aac/er_eld1001np_44.s16
 
 FATE_AAC += fate-aac-er_eld2000np_48_ep0
 fate-aac-er_eld2000np_48_ep0: CMD = pcm -i $(TARGET_SAMPLES)/aac/er_eld2000np_48_ep0.mp4

omxplayer-2014.02.11.tar.gz/ffmpeg/tests/fate/acodec.mak -> omxplayer-2014.03.28.tar.gz/ffmpeg/tests/fate/acodec.mak Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/tests/fate/demux.mak -> omxplayer-2014.03.28.tar.gz/ffmpeg/tests/fate/demux.mak Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/tests/fate/exif.mak -> omxplayer-2014.03.28.tar.gz/ffmpeg/tests/fate/exif.mak Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/tests/fate/filter-video.mak -> omxplayer-2014.03.28.tar.gz/ffmpeg/tests/fate/filter-video.mak Changed

@@ -44,6 +44,14 @@
 FATE_FILTER_VSYNTH-$(call ALLYES, INTERLACE_FILTER FIELDORDER_FILTER) += fate-filter-fieldorder
 fate-filter-fieldorder: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf interlace=tff,fieldorder=bff -sws_flags +accurate_rnd+bitexact
 
+define FATE_FPFILTER_SUITE
+FATE_FILTER_VSYNTH-$(CONFIG_FRAMEPACK_FILTER) += fate-filter-framepack-$(1)
+fate-filter-framepack-$(1): CMD = framecrc -c:v pgmyuv -i $(TARGET_PATH)/tests/vsynth1/%02d.pgm -c:v pgmyuv -i $(TARGET_PATH)/tests/vsynth1/%02d.pgm -filter_complex framepack=$(1) -frames 15
+endef
+
+FPMODES = columns frameseq lines sbs tab
+$(foreach MODE,$(FPMODES),$(eval $(call FATE_FPFILTER_SUITE,$(MODE))))
+
 FATE_FILTER_VSYNTH-$(CONFIG_GRADFUN_FILTER) += fate-filter-gradfun
 fate-filter-gradfun: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf gradfun
 
@@ -72,6 +80,9 @@
 FATE_FILTER_VSYNTH-$(call ALLYES, SPLIT_FILTER SCALE_FILTER PAD_FILTER OVERLAY_FILTER) += fate-filter-overlay_yuv420
 fate-filter-overlay_yuv420: CMD = framecrc -c:v pgmyuv -i $(SRC) -filter_complex_script $(SRC_PATH)/tests/filtergraphs/overlay_yuv420
 
+FATE_FILTER_VSYNTH-$(call ALLYES, SPLIT_FILTER SCALE_FILTER PAD_FILTER OVERLAY_FILTER) += fate-filter-overlay_yuv422
+fate-filter-overlay_yuv422: CMD = framecrc -c:v pgmyuv -i $(SRC) -filter_complex_script $(SRC_PATH)/tests/filtergraphs/overlay_yuv422
+
 FATE_FILTER_VSYNTH-$(call ALLYES, SPLIT_FILTER SCALE_FILTER PAD_FILTER OVERLAY_FILTER) += fate-filter-overlay_yuv444
 fate-filter-overlay_yuv444: CMD = framecrc -c:v pgmyuv -i $(SRC) -filter_complex_script $(SRC_PATH)/tests/filtergraphs/overlay_yuv444
 
@@ -81,6 +92,10 @@
 FATE_FILTER_VSYNTH-$(CONFIG_SEPARATEFIELDS_FILTER) += fate-filter-separatefields
 fate-filter-separatefields: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf separatefields
 
+FATE_FILTER_VSYNTH-$(CONFIG_SELECT_FILTER) += fate-filter-select-alternate
+fate-filter-select-alternate: tests/data/filtergraphs/select-alternate
+fate-filter-select-alternate: CMD = framecrc -c:v pgmyuv -i $(SRC) -filter_script $(TARGET_PATH)/tests/data/filtergraphs/select-alternate
+
 FATE_FILTER_VSYNTH-$(call ALLYES, SETPTS_FILTER  SETTB_FILTER) += fate-filter-setpts
 fate-filter-setpts: tests/data/filtergraphs/setpts
 fate-filter-setpts: CMD = framecrc -c:v pgmyuv -i $(SRC) -filter_script $(TARGET_PATH)/tests/data/filtergraphs/setpts

omxplayer-2014.02.11.tar.gz/ffmpeg/tests/fate/hevc.mak -> omxplayer-2014.03.28.tar.gz/ffmpeg/tests/fate/hevc.mak Changed

@@ -16,7 +16,7 @@
     CAINIT_G_SHARP_3            \
     CAINIT_H_SHARP_3            \
     CIP_A_Panasonic_3           \
-    cip_B_NEC_2                 \
+    cip_B_NEC_3                 \
     CIP_C_Panasonic_2           \
     DBLK_A_SONY_3               \
     DBLK_B_SONY_3               \
@@ -37,16 +37,18 @@
     ENTP_A_LG_2                 \
     ENTP_B_LG_2                 \
     ENTP_C_LG_3                 \
-    EXT_A_ericsson_3            \
-    ipcm_A_NEC_2                \
-    ipcm_B_NEC_2                \
-    ipcm_C_NEC_2                \
-    ipcm_D_NEC_2                \
+    EXT_A_ericsson_4            \
+    ipcm_A_NEC_3                \
+    ipcm_B_NEC_3                \
+    ipcm_C_NEC_3                \
+    ipcm_D_NEC_3                \
+    ipcm_E_NEC_2                \
     IPRED_A_docomo_2            \
     IPRED_B_Nokia_3             \
     IPRED_C_Mitsubishi_2        \
     LS_A_Orange_2               \
-    LS_B_ORANGE_3               \
+    LS_B_ORANGE_4               \
+    LTRPSPS_A_Qualcomm_1        \
     MAXBINS_A_TI_4              \
     MAXBINS_B_TI_4              \
     MAXBINS_C_TI_4              \
@@ -60,7 +62,7 @@
     MVCLIP_A_qualcomm_3         \
     MVDL1ZERO_A_docomo_3        \
     MVEDGE_A_qualcomm_3         \
-    NUT_A_ericsson_4            \
+    NUT_A_ericsson_5            \
     PICSIZE_A_Bossen_1          \
     PICSIZE_B_Bossen_1          \
     PICSIZE_C_Bossen_1          \
@@ -80,9 +82,10 @@
     RPLM_B_qualcomm_4           \
     RPS_A_docomo_4              \
     RPS_B_qualcomm_5            \
-    RPS_C_ericsson_4            \
-    RPS_D_ericsson_5            \
+    RPS_C_ericsson_5            \
+    RPS_D_ericsson_6            \
     RPS_E_qualcomm_5            \
+    RPS_F_docomo_1              \
     RQT_A_HHI_4                 \
     RQT_B_HHI_4                 \
     RQT_C_HHI_4                 \
@@ -103,14 +106,17 @@
     SLIST_B_Sony_8              \
     SLIST_C_Sony_3              \
     SLIST_D_Sony_9              \
+    SLPPLP_A_VIDYO_1            \
     STRUCT_A_Samsung_5          \
     STRUCT_B_Samsung_4          \
     TILES_A_Cisco_2             \
     TILES_B_Cisco_1             \
-    TMVP_A_MS_2                 \
+    TMVP_A_MS_3                 \
     TSCL_A_VIDYO_5              \
     TSCL_B_VIDYO_4              \
-    TSKIP_A_MS_2                \
+    TSKIP_A_MS_3                \
+    TUSIZE_A_Samsung_1          \
+    VPSID_A_VIDYO_1             \
     WP_A_Toshiba_3              \
     WP_B_Toshiba_3              \
     WPP_A_ericsson_MAIN_2       \

omxplayer-2014.02.11.tar.gz/ffmpeg/tests/fate/image.mak -> omxplayer-2014.03.28.tar.gz/ffmpeg/tests/fate/image.mak Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/tests/fate/libavresample.mak -> omxplayer-2014.03.28.tar.gz/ffmpeg/tests/fate/libavresample.mak Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/tests/fate/microsoft.mak -> omxplayer-2014.03.28.tar.gz/ffmpeg/tests/fate/microsoft.mak Changed

@@ -1,6 +1,24 @@
 FATE_MICROSOFT-$(call DEMDEC, AVI, MSMPEG4V1) += fate-msmpeg4v1
 fate-msmpeg4v1: CMD = framecrc -flags +bitexact -idct simple -i $(TARGET_SAMPLES)/msmpeg4v1/mpg4.avi -an
 
+FATE_MSS2 += fate-mss2-pal
+fate-mss2-pal: CMD = framecrc -i $(TARGET_SAMPLES)/mss2/rlepal.wmv
+
+FATE_MSS2 += fate-mss2-pals
+fate-mss2-pals: CMD = framecrc -i $(TARGET_SAMPLES)/mss2/rlepals.wmv
+
+FATE_MSS2 += fate-mss2-rgb555
+fate-mss2-rgb555: CMD = framecrc -i $(TARGET_SAMPLES)/mss2/rle555.wmv -pix_fmt rgb555le
+
+FATE_MSS2 += fate-mss2-rgb555s
+fate-mss2-rgb555s: CMD = framecrc -i $(TARGET_SAMPLES)/mss2/rle555s.wmv -pix_fmt rgb555le
+
+FATE_MSS2 += fate-mss2-wmv
+fate-mss2-wmv: CMD = framecrc -i $(TARGET_SAMPLES)/mss2/msscreencodec.wmv -an -frames 100
+
+FATE_SAMPLES_AVCONV-$(call DEMDEC, ASF, MSS2) += $(FATE_MSS2)
+fate-mss2: $(FATE_MSS2)
+
 FATE_MSVIDEO1 += fate-msvideo1-8bit
 fate-msvideo1-8bit: CMD = framecrc -i $(TARGET_SAMPLES)/cram/skating.avi -t 1 -pix_fmt rgb24
 
@@ -12,7 +30,7 @@
 
 FATE_WMV8_DRM += fate-wmv8-drm
 # discard last packet to avoid fails due to overread of VC-1 decoder
-fate-wmv8-drm: CMD = framecrc -cryptokey 137381538c84c068111902a59c5cf6c340247c39 -i $(TARGET_SAMPLES)/wmv8/wmv_drm.wmv -an -vframes 162
+fate-wmv8-drm: CMD = framecrc -cryptokey 137381538c84c068111902a59c5cf6c340247c39 -i $(TARGET_SAMPLES)/wmv8/wmv_drm.wmv -an -frames:v 129
 
 FATE_WMV8_DRM += fate-wmv8-drm-nodec
 fate-wmv8-drm-nodec: CMD = framecrc -cryptokey 137381538c84c068111902a59c5cf6c340247c39 -i $(TARGET_SAMPLES)/wmv8/wmv_drm.wmv -acodec copy -vcodec copy

omxplayer-2014.02.11.tar.gz/ffmpeg/tests/fate/real.mak -> omxplayer-2014.03.28.tar.gz/ffmpeg/tests/fate/real.mak Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/tests/fate/utvideo.mak -> omxplayer-2014.03.28.tar.gz/ffmpeg/tests/fate/utvideo.mak Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/tests/fate/vcodec.mak -> omxplayer-2014.03.28.tar.gz/ffmpeg/tests/fate/vcodec.mak Changed

@@ -58,7 +58,11 @@
 fate-vsynth%-ffv1:               ENCOPTS = -slices 4
 fate-vsynth%-ffv1.0:             CODEC   = ffv1
 
-FATE_VCODEC-$(call ENCDEC, FFVHUFF, AVI) += ffvhuff
+FATE_VCODEC-$(call ENCDEC, FFVHUFF, AVI) += ffvhuff ffvhuff444 ffvhuff420p12 ffvhuff422p10left ffvhuff444p16
+fate-vsynth%-ffvhuff444:         ENCOPTS = -strict -2 -vcodec ffvhuff -pix_fmt yuv444p
+fate-vsynth%-ffvhuff420p12:      ENCOPTS = -strict -2 -vcodec ffvhuff -pix_fmt yuv420p12le
+fate-vsynth%-ffvhuff422p10left:  ENCOPTS = -strict -2 -vcodec ffvhuff -pix_fmt yuv422p10le -pred left
+fate-vsynth%-ffvhuff444p16:      ENCOPTS = -strict -2 -vcodec ffvhuff -pix_fmt yuv444p16le -pred plane
 
 FATE_VCODEC-$(call ENCDEC, FLASHSV, FLV) += flashsv
 fate-vsynth%-flashsv:            ENCOPTS = -sws_flags neighbor+full_chroma_int
@@ -74,8 +78,9 @@
 fate-vsynth%-flv:                ENCOPTS = -qscale 10
 fate-vsynth%-flv:                FMT     = flv
 
-FATE_VCODEC-$(call ENCDEC, H261, AVI)   += h261
+FATE_VCODEC-$(call ENCDEC, H261, AVI)   += h261 h261-trellis
 fate-vsynth%-h261:               ENCOPTS = -qscale 11
+fate-vsynth%-h261-trellis:       ENCOPTS = -qscale 12 -trellis 1 -mbd rd
 
 FATE_VCODEC-$(call ENCDEC, H263, AVI)   += h263 h263-obmc h263p
 fate-vsynth%-h263:               ENCOPTS = -qscale 10

omxplayer-2014.02.11.tar.gz/ffmpeg/tests/fate/video.mak -> omxplayer-2014.03.28.tar.gz/ffmpeg/tests/fate/video.mak Changed

@@ -139,7 +139,7 @@
 fate-id-cin-video: CMD = framecrc -i $(TARGET_SAMPLES)/idcin/idlog-2MB.cin -pix_fmt rgb24
 
 FATE_VIDEO-$(call ENCDEC, ROQ PGMYUV, ROQ IMAGE2) += fate-idroq-video-encode
-fate-idroq-video-encode: CMD = md5 -f image2 -vcodec pgmyuv -i $(TARGET_SAMPLES)/ffmpeg-synthetic/vsynth1/%02d.pgm -sws_flags +bitexact -vf pad=512:512:80:112 -f roq -t 0.2
+fate-idroq-video-encode: CMD = md5 -f image2 -vcodec pgmyuv -i $(TARGET_SAMPLES)/ffmpeg-synthetic/vsynth1/%02d.pgm -r 30 -sws_flags +bitexact -vf pad=512:512:80:112 -f roq -t 0.2
 
 FATE_IFF-$(CONFIG_IFF_BYTERUN1_DECODER) += fate-iff-byterun1
 fate-iff-byterun1: CMD = framecrc -i $(TARGET_SAMPLES)/iff/ASH.LBM -pix_fmt rgb24
@@ -163,7 +163,7 @@
 fate-jpeg2000-dcinema: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/jpeg2000/chiens_dcinema2K.mxf -pix_fmt xyz12le
 
 FATE_VIDEO-$(call DEMDEC, JV, JV) += fate-jv
-fate-jv: CMD = framecrc -i $(TARGET_SAMPLES)/jv/intro.jv -pix_fmt rgb24 -an
+fate-jv: CMD = framecrc -i $(TARGET_SAMPLES)/jv/intro.jv -an -pix_fmt rgb24
 
 FATE_VIDEO-$(call DEMDEC, AVI, KGV1) += fate-kgv1
 fate-kgv1: CMD = framecrc -i $(TARGET_SAMPLES)/kega/kgv1.avi -pix_fmt rgb555le -an
@@ -269,6 +269,9 @@
 FATE_VIDEO-$(call DEMDEC, AVI, VCR1) += fate-vcr1
 fate-vcr1: CMD = framecrc -i $(TARGET_SAMPLES)/vcr1/VCR1test.avi -an
 
+FATE_VIDEO-$(call DEMDEC, AVI, MPEG2VIDEO) += fate-vcr2
+fate-vcr2: CMD = framecrc -flags +bitexact -idct simple -i $(TARGET_SAMPLES)/vcr2/VCR2test.avi -an
+
 FATE_VIDEO-$(call DEMDEC, AVI, XL) += fate-videoxl
 fate-videoxl: CMD = framecrc -i $(TARGET_SAMPLES)/vixl/pig-vixl.avi

omxplayer-2014.02.11.tar.gz/ffmpeg/tests/fate/vpx.mak -> omxplayer-2014.03.28.tar.gz/ffmpeg/tests/fate/vpx.mak Changed

omxplayer-2014.03.28.tar.gz/ffmpeg/tests/fate/xvid.mak Added

omxplayer-2014.03.28.tar.gz/ffmpeg/tests/filtergraphs/lavr_mix_output_zero Added

omxplayer-2014.03.28.tar.gz/ffmpeg/tests/filtergraphs/overlay_yuv422 Added

omxplayer-2014.03.28.tar.gz/ffmpeg/tests/filtergraphs/select-alternate Added

omxplayer-2014.02.11.tar.gz/ffmpeg/tests/lavf-regression.sh -> omxplayer-2014.03.28.tar.gz/ffmpeg/tests/lavf-regression.sh Changed

omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/acodec/mp2fixed Added

omxplayer-2014.02.11.tar.gz/ffmpeg/tests/ref/fate/exif-image-embedded -> omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/fate/exif-image-embedded Changed

@@ -5,6 +5,8 @@
 pkt_pts_time=N/A
 pkt_dts=N/A
 pkt_dts_time=N/A
+best_effort_timestamp=N/A
+best_effort_timestamp_time=N/A
 pkt_duration=N/A
 pkt_duration_time=N/A
 pkt_pos=N/A
@@ -29,6 +31,8 @@
 pkt_pts_time=0.025057
 pkt_dts=353600
 pkt_dts_time=0.025057
+best_effort_timestamp=0
+best_effort_timestamp_time=0.000000
 pkt_duration=15040
 pkt_duration_time=0.001066
 pkt_pos=16292
@@ -45,6 +49,8 @@
 pkt_pts_time=0.026122
 pkt_dts=368640
 pkt_dts_time=0.026122
+best_effort_timestamp=368640
+best_effort_timestamp_time=0.026122
 pkt_duration=368640
 pkt_duration_time=0.026122
 pkt_pos=16709
@@ -61,6 +67,8 @@
 pkt_pts_time=0.052245
 pkt_dts=737280
 pkt_dts_time=0.052245
+best_effort_timestamp=737280
+best_effort_timestamp_time=0.052245
 pkt_duration=368640
 pkt_duration_time=0.026122
 pkt_pos=17127
@@ -77,6 +85,8 @@
 pkt_pts_time=0.078367
 pkt_dts=1105920
 pkt_dts_time=0.078367
+best_effort_timestamp=1105920
+best_effort_timestamp_time=0.078367
 pkt_duration=368640
 pkt_duration_time=0.026122
 pkt_pos=17545
@@ -93,6 +103,8 @@
 pkt_pts_time=0.104490
 pkt_dts=1474560
 pkt_dts_time=0.104490
+best_effort_timestamp=1474560
+best_effort_timestamp_time=0.104490
 pkt_duration=368640
 pkt_duration_time=0.026122
 pkt_pos=17963
@@ -109,6 +121,8 @@
 pkt_pts_time=0.130612
 pkt_dts=1843200
 pkt_dts_time=0.130612
+best_effort_timestamp=1843200
+best_effort_timestamp_time=0.130612
 pkt_duration=368640
 pkt_duration_time=0.026122
 pkt_pos=18381
@@ -125,6 +139,8 @@
 pkt_pts_time=0.156735
 pkt_dts=2211840
 pkt_dts_time=0.156735
+best_effort_timestamp=2211840
+best_effort_timestamp_time=0.156735
 pkt_duration=368640
 pkt_duration_time=0.026122
 pkt_pos=18799
@@ -141,6 +157,8 @@
 pkt_pts_time=0.182857
 pkt_dts=2580480
 pkt_dts_time=0.182857
+best_effort_timestamp=2580480
+best_effort_timestamp_time=0.182857
 pkt_duration=368640
 pkt_duration_time=0.026122
 pkt_pos=19217
@@ -157,6 +175,8 @@
 pkt_pts_time=0.208980
 pkt_dts=2949120
 pkt_dts_time=0.208980
+best_effort_timestamp=2949120
+best_effort_timestamp_time=0.208980
 pkt_duration=368640
 pkt_duration_time=0.026122
 pkt_pos=19635
@@ -173,6 +193,8 @@
 pkt_pts_time=0.235102
 pkt_dts=3317760
 pkt_dts_time=0.235102
+best_effort_timestamp=3317760
+best_effort_timestamp_time=0.235102
 pkt_duration=368640
 pkt_duration_time=0.026122
 pkt_pos=20053
@@ -189,6 +211,8 @@
 pkt_pts_time=0.261224
 pkt_dts=3686400
 pkt_dts_time=0.261224
+best_effort_timestamp=3686400
+best_effort_timestamp_time=0.261224
 pkt_duration=368640
 pkt_duration_time=0.026122
 pkt_pos=20471
@@ -205,6 +229,8 @@
 pkt_pts_time=0.287347
 pkt_dts=4055040
 pkt_dts_time=0.287347
+best_effort_timestamp=4055040
+best_effort_timestamp_time=0.287347
 pkt_duration=368640
 pkt_duration_time=0.026122
 pkt_pos=20889
@@ -221,6 +247,8 @@
 pkt_pts_time=0.313469
 pkt_dts=4423680
 pkt_dts_time=0.313469
+best_effort_timestamp=4423680
+best_effort_timestamp_time=0.313469
 pkt_duration=368640
 pkt_duration_time=0.026122
 pkt_pos=21307
@@ -237,6 +265,8 @@
 pkt_pts_time=0.339592
 pkt_dts=4792320
 pkt_dts_time=0.339592
+best_effort_timestamp=4792320
+best_effort_timestamp_time=0.339592
 pkt_duration=368640
 pkt_duration_time=0.026122
 pkt_pos=21725
@@ -253,6 +283,8 @@
 pkt_pts_time=0.365714
 pkt_dts=5160960
 pkt_dts_time=0.365714
+best_effort_timestamp=5160960
+best_effort_timestamp_time=0.365714
 pkt_duration=368640
 pkt_duration_time=0.026122
 pkt_pos=22143
@@ -269,6 +301,8 @@
 pkt_pts_time=0.391837
 pkt_dts=5529600
 pkt_dts_time=0.391837
+best_effort_timestamp=5529600
+best_effort_timestamp_time=0.391837
 pkt_duration=368640
 pkt_duration_time=0.026122
 pkt_pos=22561
@@ -285,6 +319,8 @@
 pkt_pts_time=0.417959
 pkt_dts=5898240
 pkt_dts_time=0.417959
+best_effort_timestamp=5898240
+best_effort_timestamp_time=0.417959
 pkt_duration=368640
 pkt_duration_time=0.026122
 pkt_pos=22979
@@ -301,6 +337,8 @@
 pkt_pts_time=0.444082
 pkt_dts=6266880
 pkt_dts_time=0.444082
+best_effort_timestamp=6266880
+best_effort_timestamp_time=0.444082
 pkt_duration=368640
 pkt_duration_time=0.026122
 pkt_pos=23397
@@ -317,6 +355,8 @@
 pkt_pts_time=0.470204
 pkt_dts=6635520
 pkt_dts_time=0.470204
+best_effort_timestamp=6635520
+best_effort_timestamp_time=0.470204
 pkt_duration=368640
 pkt_duration_time=0.026122
 pkt_pos=23815
@@ -333,6 +373,8 @@
 pkt_pts_time=0.496327
 pkt_dts=7004160
 pkt_dts_time=0.496327
+best_effort_timestamp=7004160
+best_effort_timestamp_time=0.496327
 pkt_duration=368640
 pkt_duration_time=0.026122
 pkt_pos=24233
@@ -349,6 +391,8 @@
 pkt_pts_time=0.522449
 pkt_dts=7372800
 pkt_dts_time=0.522449
+best_effort_timestamp=7372800
+best_effort_timestamp_time=0.522449
 pkt_duration=368640
 pkt_duration_time=0.026122
 pkt_pos=24651

omxplayer-2014.02.11.tar.gz/ffmpeg/tests/ref/fate/exif-image-jpg -> omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/fate/exif-image-jpg Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/tests/ref/fate/exif-image-tiff -> omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/fate/exif-image-tiff Changed

omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/fate/exif-image-webp Added

@@ -0,0 +1,226 @@
+[FRAME]
+media_type=video
+key_frame=1
+pkt_pts=0
+pkt_pts_time=0.000000
+pkt_dts=0
+pkt_dts_time=0.000000
+best_effort_timestamp=0
+best_effort_timestamp_time=0.000000
+pkt_duration=1
+pkt_duration_time=0.040000
+pkt_pos=N/A
+pkt_size=39276
+width=400
+height=225
+pix_fmt=yuv420p
+sample_aspect_ratio=N/A
+pict_type=I
+coded_picture_number=0
+display_picture_number=0
+interlaced_frame=0
+top_field_first=0
+repeat_pict=0
+TAG:ImageDescription=
+TAG:Make=Canon
+TAG:Model=Canon PowerShot SX200 IS
+TAG:Orientation=    1
+TAG:XResolution=    180:1
+TAG:YResolution=    180:1
+TAG:ResolutionUnit=    2
+TAG:DateTime=2013:07:18 13:12:03
+TAG:YCbCrPositioning=    2
+TAG:ExposureTime=      1:1250
+TAG:FNumber=     40:10
+TAG:ISOSpeedRatings=  160
+TAG:ExifVersion= 48,  50,  50,  49
+TAG:DateTimeOriginal=2013:07:18 13:12:03
+TAG:DateTimeDigitized=2013:07:18 13:12:03
+TAG:ComponentsConfiguration=  1,   2,   3,   0
+TAG:CompressedBitsPerPixel=      3:1
+TAG:ShutterSpeedValue=    329:32
+TAG:ApertureValue=    128:32
+TAG:ExposureBiasValue=      0:3
+TAG:MaxApertureValue=    113:32
+TAG:MeteringMode=    5
+TAG:Flash=   16
+TAG:FocalLength=   5000:1000
+TAG:MakerNote=
+ 25,   0,   1,   0,   3,   0,  48,   0,   0,   0,  28,   4,   0,   0,   2,   0
+  3,   0,   4,   0,   0,   0, 124,   4,   0,   0,   3,   0,   3,   0,   4,   0
+  0,   0, 132,   4,   0,   0,   4,   0,   3,   0,  34,   0,   0,   0, 140,   4
+  0,   0,   0,   0,   3,   0,   6,   0,   0,   0, 208,   4,   0,   0,   6,   0
+  2,   0,  28,   0,   0,   0, 220,   4,   0,   0,   7,   0,   2,   0,  22,   0
+  0,   0, 252,   4,   0,   0,   8,   0,   4,   0,   1,   0,   0,   0,  17, 166
+ 15,   0,   9,   0,   2,   0,  32,   0,   0,   0,  20,   5,   0,   0,  13,   0
+  4,   0, 167,   0,   0,   0,  52,   5,   0,   0,  16,   0,   4,   0,   1,   0
+  0,   0,   0,   0,  96,   2,  38,   0,   3,   0,  48,   0,   0,   0, 208,   7
+  0,   0,  19,   0,   3,   0,   4,   0,   0,   0,  48,   8,   0,   0,  24,   0
+  1,   0,   0,   1,   0,   0,  56,   8,   0,   0,  25,   0,   3,   0,   1,   0
+  0,   0,   1,   0,   0,   0,  28,   0,   3,   0,   1,   0,   0,   0,   0,   0
+  0,   0,  29,   0,   3,   0,  16,   0,   0,   0,  56,   9,   0,   0,  30,   0
+  4,   0,   1,   0,   0,   0,   0,   4,   0,   1,  31,   0,   3,   0,  69,   0
+  0,   0,  88,   9,   0,   0,  34,   0,   3,   0, 208,   0,   0,   0, 226,   9
+  0,   0,  35,   0,   4,   0,   2,   0,   0,   0, 130,  11,   0,   0,  39,   0
+  3,   0,   5,   0,   0,   0, 138,  11,   0,   0,  40,   0,   1,   0,  16,   0
+  0,   0, 148,  11,   0,   0, 208,   0,   4,   0,   1,   0,   0,   0,   0,   0
+  0,   0,  45,   0,   4,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  96,   0
+  2,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   4,   0, 255, 255
+  1,   0,   9,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  15,   0
+  3,   0,   1,   0,   6,  64,   0,   0, 255, 127, 255, 255,  96, 234, 136,  19
+232,   3, 113,   0, 221,   0, 255, 255,   0,   0,   0,   0,   0,   0,   1,   0
+  0,   0,   1,   0,   0,   0, 160,  15, 160,  15,   0,   0,   0,   0, 255, 255
+  0,   0, 255, 127, 255, 127,   0,   0,   0,   0, 255, 255,  90,   0,   2,   0
+136,  19, 250,   0, 187,   0,   0,   0,   0,   0,   0,   0,   0,   0,  68,   0
+ 18,   0, 160,   0,  68,   1, 128,   0,  73,   1,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   1,   0, 119,   0,   0,   0, 128,   0,  73,   1,   0,   0,   0,   0
+ 23,   0, 250,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  73,  77
+ 71,  58,  80, 111, 119, 101, 114,  83, 104, 111, 116,  32,  83,  88,  50,  48
+ 48,  32,  73,  83,  32,  74,  80,  69,  71,   0,   0,   0,   0,   0,  70, 105
+114, 109, 119,  97, 114, 101,  32,  86, 101, 114, 115, 105, 111, 110,  32,  49
+ 46,  48,  48,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   5,   0,   0,   0, 211,   1,   0,   0, 155,   1
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 128,   1
+  0,   0, 221,   3,   0,   0,  56,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  64,   2,   0,   0, 123,   3
+  0,   0, 165, 255, 255, 255,   0,   0,   0,   0,   0,   0,   0,   0,   7,   0
+  0,   0,  66,   0,   0,   0,  10,   0,   0,   0,  17,   0,   0,   0,  70,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  81,   0,   0,   0,   0,   0
+  0,   0, 204,   3,   0,   0, 138,   3,   0,   0, 138,   3,   0,   0, 128,   1
+  0,   0,  66,   4,   0,   0, 165, 255, 255, 255,   0,   0,   0,   0,   0,   0
+  0,   0, 138,   3,   0,   0, 138,   3,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   5,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,  35,   0,   0,   0, 120,   0,   0,   0, 120,   0,   0,   0, 102, 255
+255, 255, 208,   0,   0,   0, 114, 255, 255, 255, 208,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0, 114, 255, 255, 255, 208,   0,   0,   0,  12,   0
+  0,   0, 204,   0,   0,   0, 239, 255, 255, 255, 201,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   4,   0,   0,   0,   4,   0,   0,   0,   4
+  0,   0,   0,   5,   0,   0,   8,   0,   0,   0, 239, 255, 255, 255, 201,   0
+  0,   0,  24,   0,   0,   0, 143,   3,   0,   0, 125,   6,   0,   0,  97,   6
+  0,   0, 143,   3,   0,   0, 100,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   1,   0,   0,   0,  91,   1,   0,   0, 113,   4,   0,   0, 204,   3
+  0,   0, 147,   2,   0,   0, 165, 255, 255, 255,  10,   0,   0,   0, 128,   0
+  0,   0, 251,   1,   0,   0,   4,   0,   0,   0,   0,   0,   0,   0,  74,   2
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  97,   2,   0,   0, 150,   2
+  0,   0, 204,   2,   0,   0, 241,   2,   0,   0,   0,   0,   0,   0, 128,   0
+  0,   0,   0,   0,   0,   0,   8, 162, 255, 255,  70,   2,   0,   0,  69,   2
+  0,   0,  69,   2,   0,   0,  65,   2,   0,   0,  66,   2,   0,   0,  68,   2
+  0,   0,  66,   2,   0,   0,  67,   2,   0,   0,  67,   2,   0,   0,  68,   2
+  0,   0,  18,   6,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,  56,   5,   0,   0, 250,   0,   0,   0,  53,   1,   0,   0,  58,   0
+  0,   0,   5,   4,   0,   0, 193,   0,   0,   0, 240,   0,   0,   0,  45,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   3,   0
+  0,   0,   8,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 107,   0
+  0,   0,   6, 255, 255, 255,   0,   0,   0,   0, 255, 255,   0,   0,   0,   0
+  0,   0,   0, 244, 255, 255, 133,   0,   0,   0, 102,   2,   0,   0, 243,   1
+  0,   0,   0,   0,   0,   0,  99,   2,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0, 192,   0,   0,   0,   4,   1,   0,   0,   0,   1,   0,   0,   4,   1
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  96,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,  33,   0,   0,   0,  13,   0,   0,   0, 237, 157
+ 54,  41,  96,   0,   4,   0,   9,   0,   9,   0, 160,  15, 200,   8, 100,   0
+100,   0,  18,   0,  18,   0,  18,   0,  18,   0,  18,   0,  18,   0,  18,   0
+ 18,   0,  18,   0,  18,   0,  18,   0,  18,   0,  18,   0,  18,   0,  18,   0
+ 18,   0,  18,   0,  18,   0, 238, 255,   0,   0,  18,   0, 238, 255,   0,   0
+ 18,   0, 238, 255,   0,   0,  18,   0, 238, 255, 238, 255, 238, 255,   0,   0
+  0,   0,   0,   0,  18,   0,  18,   0,  18,   0,   1,   0,   0,   0,   0,   0
+  0,   0,   0,   0, 159,   0,  15,   0, 104,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  32,   0,   1,   0,   0,   0
+  2,   0,   2,   0,   2,   0,   2,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 138,   0,   1,   0,   0,   0
+  4,   0,   8,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0, 160,   1,   0,   0,   0,   0,  16,   0,   8,   0,   1,   0
+  1,   0, 128,   2, 224,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  8,   0, 128,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   8,   0,   0,   0,   0,   0,   0,   0,  10,   0,   0,   0
+255, 255,   0,   0,   0,   0, 239, 154, 237, 228, 191, 235,  20, 171,  30,   6
+  2, 129,  88, 251,  56,  49,  73,  73,  42,   0, 222,   2,   0,   0
+TAG:UserComment=
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0
+TAG:FlashpixVersion= 48,  49,  48,  48
+TAG:ColorSpace=    1
+TAG:PixelXDimension= 4000
+TAG:PixelYDimension= 2248
+TAG:GPSLatitudeRef=R98
+TAG:GPSLatitude= 48,  49,  48,  48
+TAG:0x1001= 4000
+TAG:0x1002= 2248
+TAG:FocalPlaneXResolution=4000000:244
+TAG:FocalPlaneYResolution=2248000:183
+TAG:FocalPlaneResolutionUnit=    2
+TAG:SensingMethod=    2
+TAG:FileSource=  3
+TAG:CustomRendered=    0
+TAG:ExposureMode=    0
+TAG:WhiteBalance=    0
+TAG:DigitalZoomRatio=   4000:4000
+TAG:SceneCaptureType=    0
+[/FRAME]

omxplayer-2014.02.11.tar.gz/ffmpeg/tests/ref/fate/ffprobe_compact -> omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/fate/ffprobe_compact Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/tests/ref/fate/ffprobe_csv -> omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/fate/ffprobe_csv Changed

@@ -1,31 +1,31 @@
 packet,audio,0,0,0.000000,0,0.000000,1024,0.023220,N/A,N/A,2048,572,K
-frame,audio,1,0,0.000000,0,0.000000,1024,0.023220,572,2048,s16,1024,1,unknown
+frame,audio,1,0,0.000000,0,0.000000,0,0.000000,1024,0.023220,572,2048,s16,1024,1,unknown
 packet,video,1,0,0.000000,0,0.000000,2048,0.040000,N/A,N/A,230400,2647,K
-frame,video,1,0,0.000000,0,0.000000,2048,0.040000,2647,N/A,320,240,rgb24,1:1,I,0,0,0,0,0
+frame,video,1,0,0.000000,0,0.000000,0,0.000000,2048,0.040000,2647,N/A,320,240,rgb24,1:1,I,0,0,0,0,0
 packet,video,2,0,0.000000,0,0.000000,2048,0.040000,N/A,N/A,30000,233068,K
-frame,video,1,0,0.000000,0,0.000000,2048,0.040000,233068,N/A,100,100,rgb24,1:1,I,0,0,0,0,0
+frame,video,1,0,0.000000,0,0.000000,0,0.000000,2048,0.040000,233068,N/A,100,100,rgb24,1:1,I,0,0,0,0,0
 packet,audio,0,1024,0.023220,1024,0.023220,1024,0.023220,N/A,N/A,2048,263073,K
-frame,audio,1,1024,0.023220,1024,0.023220,1024,0.023220,263073,2048,s16,1024,1,unknown
+frame,audio,1,1024,0.023220,1024,0.023220,1024,0.023220,1024,0.023220,263073,2048,s16,1024,1,unknown
 packet,video,1,2048,0.040000,2048,0.040000,2048,0.040000,N/A,N/A,230400,265151,K
-frame,video,1,2048,0.040000,2048,0.040000,2048,0.040000,265151,N/A,320,240,rgb24,1:1,I,0,0,0,0,0
+frame,video,1,2048,0.040000,2048,0.040000,2048,0.040000,2048,0.040000,265151,N/A,320,240,rgb24,1:1,I,0,0,0,0,0
 packet,video,2,2048,0.040000,2048,0.040000,2048,0.040000,N/A,N/A,30000,495575,K
-frame,video,1,2048,0.040000,2048,0.040000,2048,0.040000,495575,N/A,100,100,rgb24,1:1,I,0,0,0,0,0
+frame,video,1,2048,0.040000,2048,0.040000,2048,0.040000,2048,0.040000,495575,N/A,100,100,rgb24,1:1,I,0,0,0,0,0
 packet,audio,0,2048,0.046440,2048,0.046440,1024,0.023220,N/A,N/A,2048,525580,K
-frame,audio,1,2048,0.046440,2048,0.046440,1024,0.023220,525580,2048,s16,1024,1,unknown
+frame,audio,1,2048,0.046440,2048,0.046440,2048,0.046440,1024,0.023220,525580,2048,s16,1024,1,unknown
 packet,audio,0,3072,0.069660,3072,0.069660,1024,0.023220,N/A,N/A,2048,527651,K
-frame,audio,1,3072,0.069660,3072,0.069660,1024,0.023220,527651,2048,s16,1024,1,unknown
+frame,audio,1,3072,0.069660,3072,0.069660,3072,0.069660,1024,0.023220,527651,2048,s16,1024,1,unknown
 packet,video,1,4096,0.080000,4096,0.080000,2048,0.040000,N/A,N/A,230400,529729,K
-frame,video,1,4096,0.080000,4096,0.080000,2048,0.040000,529729,N/A,320,240,rgb24,1:1,I,0,0,0,0,0
+frame,video,1,4096,0.080000,4096,0.080000,4096,0.080000,2048,0.040000,529729,N/A,320,240,rgb24,1:1,I,0,0,0,0,0
 packet,video,2,4096,0.080000,4096,0.080000,2048,0.040000,N/A,N/A,30000,760153,K
-frame,video,1,4096,0.080000,4096,0.080000,2048,0.040000,760153,N/A,100,100,rgb24,1:1,I,0,0,0,0,0
+frame,video,1,4096,0.080000,4096,0.080000,4096,0.080000,2048,0.040000,760153,N/A,100,100,rgb24,1:1,I,0,0,0,0,0
 packet,audio,0,4096,0.092880,4096,0.092880,1024,0.023220,N/A,N/A,2048,790158,K
-frame,audio,1,4096,0.092880,4096,0.092880,1024,0.023220,790158,2048,s16,1024,1,unknown
+frame,audio,1,4096,0.092880,4096,0.092880,4096,0.092880,1024,0.023220,790158,2048,s16,1024,1,unknown
 packet,audio,0,5120,0.116100,5120,0.116100,1024,0.023220,N/A,N/A,2048,792229,K
-frame,audio,1,5120,0.116100,5120,0.116100,1024,0.023220,792229,2048,s16,1024,1,unknown
+frame,audio,1,5120,0.116100,5120,0.116100,5120,0.116100,1024,0.023220,792229,2048,s16,1024,1,unknown
 packet,video,1,6144,0.120000,6144,0.120000,2048,0.040000,N/A,N/A,230400,794307,K
-frame,video,1,6144,0.120000,6144,0.120000,2048,0.040000,794307,N/A,320,240,rgb24,1:1,I,0,0,0,0,0
+frame,video,1,6144,0.120000,6144,0.120000,6144,0.120000,2048,0.040000,794307,N/A,320,240,rgb24,1:1,I,0,0,0,0,0
 packet,video,2,6144,0.120000,6144,0.120000,2048,0.040000,N/A,N/A,30000,1024731,K
-frame,video,1,6144,0.120000,6144,0.120000,2048,0.040000,1024731,N/A,100,100,rgb24,1:1,I,0,0,0,0,0
+frame,video,1,6144,0.120000,6144,0.120000,6144,0.120000,2048,0.040000,1024731,N/A,100,100,rgb24,1:1,I,0,0,0,0,0
 stream,0,pcm_s16le,unknown,audio,1/44100,PSD[16],0x10445350,s16,44100,1,unknown,16,N/A,0/0,0/0,1/44100,0,0.000000,N/A,N/A,705600,N/A,6,6,0,0,0,0,0,0,0,0,0,0,0,mc²
 stream,1,rawvideo,unknown,video,1/51200,RGB[24],0x18424752,320,240,0,1:1,4:3,rgb24,-99,N/A,N/A,25/1,25/1,1/51200,0,0.000000,N/A,N/A,N/A,N/A,4,4,0,0,0,0,0,0,0,0,0,0,0,foobar,field-and-tags-conflict-attempt
 stream,2,rawvideo,unknown,video,1/51200,RGB[24],0x18424752,100,100,0,1:1,1:1,rgb24,-99,N/A,N/A,25/1,25/1,1/51200,0,0.000000,N/A,N/A,N/A,N/A,4,4,0,0,0,0,0,0,0,0,0,0,0

omxplayer-2014.02.11.tar.gz/ffmpeg/tests/ref/fate/ffprobe_default -> omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/fate/ffprobe_default Changed

@@ -20,6 +20,8 @@
 pkt_pts_time=0.000000
 pkt_dts=0
 pkt_dts_time=0.000000
+best_effort_timestamp=0
+best_effort_timestamp_time=0.000000
 pkt_duration=1024
 pkt_duration_time=0.023220
 pkt_pos=572
@@ -51,6 +53,8 @@
 pkt_pts_time=0.000000
 pkt_dts=0
 pkt_dts_time=0.000000
+best_effort_timestamp=0
+best_effort_timestamp_time=0.000000
 pkt_duration=2048
 pkt_duration_time=0.040000
 pkt_pos=2647
@@ -88,6 +92,8 @@
 pkt_pts_time=0.000000
 pkt_dts=0
 pkt_dts_time=0.000000
+best_effort_timestamp=0
+best_effort_timestamp_time=0.000000
 pkt_duration=2048
 pkt_duration_time=0.040000
 pkt_pos=233068
@@ -125,6 +131,8 @@
 pkt_pts_time=0.023220
 pkt_dts=1024
 pkt_dts_time=0.023220
+best_effort_timestamp=1024
+best_effort_timestamp_time=0.023220
 pkt_duration=1024
 pkt_duration_time=0.023220
 pkt_pos=263073
@@ -156,6 +164,8 @@
 pkt_pts_time=0.040000
 pkt_dts=2048
 pkt_dts_time=0.040000
+best_effort_timestamp=2048
+best_effort_timestamp_time=0.040000
 pkt_duration=2048
 pkt_duration_time=0.040000
 pkt_pos=265151
@@ -193,6 +203,8 @@
 pkt_pts_time=0.040000
 pkt_dts=2048
 pkt_dts_time=0.040000
+best_effort_timestamp=2048
+best_effort_timestamp_time=0.040000
 pkt_duration=2048
 pkt_duration_time=0.040000
 pkt_pos=495575
@@ -230,6 +242,8 @@
 pkt_pts_time=0.046440
 pkt_dts=2048
 pkt_dts_time=0.046440
+best_effort_timestamp=2048
+best_effort_timestamp_time=0.046440
 pkt_duration=1024
 pkt_duration_time=0.023220
 pkt_pos=525580
@@ -261,6 +275,8 @@
 pkt_pts_time=0.069660
 pkt_dts=3072
 pkt_dts_time=0.069660
+best_effort_timestamp=3072
+best_effort_timestamp_time=0.069660
 pkt_duration=1024
 pkt_duration_time=0.023220
 pkt_pos=527651
@@ -292,6 +308,8 @@
 pkt_pts_time=0.080000
 pkt_dts=4096
 pkt_dts_time=0.080000
+best_effort_timestamp=4096
+best_effort_timestamp_time=0.080000
 pkt_duration=2048
 pkt_duration_time=0.040000
 pkt_pos=529729
@@ -329,6 +347,8 @@
 pkt_pts_time=0.080000
 pkt_dts=4096
 pkt_dts_time=0.080000
+best_effort_timestamp=4096
+best_effort_timestamp_time=0.080000
 pkt_duration=2048
 pkt_duration_time=0.040000
 pkt_pos=760153
@@ -366,6 +386,8 @@
 pkt_pts_time=0.092880
 pkt_dts=4096
 pkt_dts_time=0.092880
+best_effort_timestamp=4096
+best_effort_timestamp_time=0.092880
 pkt_duration=1024
 pkt_duration_time=0.023220
 pkt_pos=790158
@@ -397,6 +419,8 @@
 pkt_pts_time=0.116100
 pkt_dts=5120
 pkt_dts_time=0.116100
+best_effort_timestamp=5120
+best_effort_timestamp_time=0.116100
 pkt_duration=1024
 pkt_duration_time=0.023220
 pkt_pos=792229
@@ -428,6 +452,8 @@
 pkt_pts_time=0.120000
 pkt_dts=6144
 pkt_dts_time=0.120000
+best_effort_timestamp=6144
+best_effort_timestamp_time=0.120000
 pkt_duration=2048
 pkt_duration_time=0.040000
 pkt_pos=794307
@@ -465,6 +491,8 @@
 pkt_pts_time=0.120000
 pkt_dts=6144
 pkt_dts_time=0.120000
+best_effort_timestamp=6144
+best_effort_timestamp_time=0.120000
 pkt_duration=2048
 pkt_duration_time=0.040000
 pkt_pos=1024731

omxplayer-2014.02.11.tar.gz/ffmpeg/tests/ref/fate/ffprobe_flat -> omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/fate/ffprobe_flat Changed

@@ -17,6 +17,8 @@
 packets_and_frames.frame.0.pkt_pts_time="0.000000"
 packets_and_frames.frame.0.pkt_dts=0
 packets_and_frames.frame.0.pkt_dts_time="0.000000"
+packets_and_frames.frame.0.best_effort_timestamp=0
+packets_and_frames.frame.0.best_effort_timestamp_time="0.000000"
 packets_and_frames.frame.0.pkt_duration=1024
 packets_and_frames.frame.0.pkt_duration_time="0.023220"
 packets_and_frames.frame.0.pkt_pos="572"
@@ -44,6 +46,8 @@
 packets_and_frames.frame.1.pkt_pts_time="0.000000"
 packets_and_frames.frame.1.pkt_dts=0
 packets_and_frames.frame.1.pkt_dts_time="0.000000"
+packets_and_frames.frame.1.best_effort_timestamp=0
+packets_and_frames.frame.1.best_effort_timestamp_time="0.000000"
 packets_and_frames.frame.1.pkt_duration=2048
 packets_and_frames.frame.1.pkt_duration_time="0.040000"
 packets_and_frames.frame.1.pkt_pos="2647"
@@ -77,6 +81,8 @@
 packets_and_frames.frame.2.pkt_pts_time="0.000000"
 packets_and_frames.frame.2.pkt_dts=0
 packets_and_frames.frame.2.pkt_dts_time="0.000000"
+packets_and_frames.frame.2.best_effort_timestamp=0
+packets_and_frames.frame.2.best_effort_timestamp_time="0.000000"
 packets_and_frames.frame.2.pkt_duration=2048
 packets_and_frames.frame.2.pkt_duration_time="0.040000"
 packets_and_frames.frame.2.pkt_pos="233068"
@@ -110,6 +116,8 @@
 packets_and_frames.frame.3.pkt_pts_time="0.023220"
 packets_and_frames.frame.3.pkt_dts=1024
 packets_and_frames.frame.3.pkt_dts_time="0.023220"
+packets_and_frames.frame.3.best_effort_timestamp=1024
+packets_and_frames.frame.3.best_effort_timestamp_time="0.023220"
 packets_and_frames.frame.3.pkt_duration=1024
 packets_and_frames.frame.3.pkt_duration_time="0.023220"
 packets_and_frames.frame.3.pkt_pos="263073"
@@ -137,6 +145,8 @@
 packets_and_frames.frame.4.pkt_pts_time="0.040000"
 packets_and_frames.frame.4.pkt_dts=2048
 packets_and_frames.frame.4.pkt_dts_time="0.040000"
+packets_and_frames.frame.4.best_effort_timestamp=2048
+packets_and_frames.frame.4.best_effort_timestamp_time="0.040000"
 packets_and_frames.frame.4.pkt_duration=2048
 packets_and_frames.frame.4.pkt_duration_time="0.040000"
 packets_and_frames.frame.4.pkt_pos="265151"
@@ -170,6 +180,8 @@
 packets_and_frames.frame.5.pkt_pts_time="0.040000"
 packets_and_frames.frame.5.pkt_dts=2048
 packets_and_frames.frame.5.pkt_dts_time="0.040000"
+packets_and_frames.frame.5.best_effort_timestamp=2048
+packets_and_frames.frame.5.best_effort_timestamp_time="0.040000"
 packets_and_frames.frame.5.pkt_duration=2048
 packets_and_frames.frame.5.pkt_duration_time="0.040000"
 packets_and_frames.frame.5.pkt_pos="495575"
@@ -203,6 +215,8 @@
 packets_and_frames.frame.6.pkt_pts_time="0.046440"
 packets_and_frames.frame.6.pkt_dts=2048
 packets_and_frames.frame.6.pkt_dts_time="0.046440"
+packets_and_frames.frame.6.best_effort_timestamp=2048
+packets_and_frames.frame.6.best_effort_timestamp_time="0.046440"
 packets_and_frames.frame.6.pkt_duration=1024
 packets_and_frames.frame.6.pkt_duration_time="0.023220"
 packets_and_frames.frame.6.pkt_pos="525580"
@@ -230,6 +244,8 @@
 packets_and_frames.frame.7.pkt_pts_time="0.069660"
 packets_and_frames.frame.7.pkt_dts=3072
 packets_and_frames.frame.7.pkt_dts_time="0.069660"
+packets_and_frames.frame.7.best_effort_timestamp=3072
+packets_and_frames.frame.7.best_effort_timestamp_time="0.069660"
 packets_and_frames.frame.7.pkt_duration=1024
 packets_and_frames.frame.7.pkt_duration_time="0.023220"
 packets_and_frames.frame.7.pkt_pos="527651"
@@ -257,6 +273,8 @@
 packets_and_frames.frame.8.pkt_pts_time="0.080000"
 packets_and_frames.frame.8.pkt_dts=4096
 packets_and_frames.frame.8.pkt_dts_time="0.080000"
+packets_and_frames.frame.8.best_effort_timestamp=4096
+packets_and_frames.frame.8.best_effort_timestamp_time="0.080000"
 packets_and_frames.frame.8.pkt_duration=2048
 packets_and_frames.frame.8.pkt_duration_time="0.040000"
 packets_and_frames.frame.8.pkt_pos="529729"
@@ -290,6 +308,8 @@
 packets_and_frames.frame.9.pkt_pts_time="0.080000"
 packets_and_frames.frame.9.pkt_dts=4096
 packets_and_frames.frame.9.pkt_dts_time="0.080000"
+packets_and_frames.frame.9.best_effort_timestamp=4096
+packets_and_frames.frame.9.best_effort_timestamp_time="0.080000"
 packets_and_frames.frame.9.pkt_duration=2048
 packets_and_frames.frame.9.pkt_duration_time="0.040000"
 packets_and_frames.frame.9.pkt_pos="760153"
@@ -323,6 +343,8 @@
 packets_and_frames.frame.10.pkt_pts_time="0.092880"
 packets_and_frames.frame.10.pkt_dts=4096
 packets_and_frames.frame.10.pkt_dts_time="0.092880"
+packets_and_frames.frame.10.best_effort_timestamp=4096
+packets_and_frames.frame.10.best_effort_timestamp_time="0.092880"
 packets_and_frames.frame.10.pkt_duration=1024
 packets_and_frames.frame.10.pkt_duration_time="0.023220"
 packets_and_frames.frame.10.pkt_pos="790158"
@@ -350,6 +372,8 @@
 packets_and_frames.frame.11.pkt_pts_time="0.116100"
 packets_and_frames.frame.11.pkt_dts=5120
 packets_and_frames.frame.11.pkt_dts_time="0.116100"
+packets_and_frames.frame.11.best_effort_timestamp=5120
+packets_and_frames.frame.11.best_effort_timestamp_time="0.116100"
 packets_and_frames.frame.11.pkt_duration=1024
 packets_and_frames.frame.11.pkt_duration_time="0.023220"
 packets_and_frames.frame.11.pkt_pos="792229"
@@ -377,6 +401,8 @@
 packets_and_frames.frame.12.pkt_pts_time="0.120000"
 packets_and_frames.frame.12.pkt_dts=6144
 packets_and_frames.frame.12.pkt_dts_time="0.120000"
+packets_and_frames.frame.12.best_effort_timestamp=6144
+packets_and_frames.frame.12.best_effort_timestamp_time="0.120000"
 packets_and_frames.frame.12.pkt_duration=2048
 packets_and_frames.frame.12.pkt_duration_time="0.040000"
 packets_and_frames.frame.12.pkt_pos="794307"
@@ -410,6 +436,8 @@
 packets_and_frames.frame.13.pkt_pts_time="0.120000"
 packets_and_frames.frame.13.pkt_dts=6144
 packets_and_frames.frame.13.pkt_dts_time="0.120000"
+packets_and_frames.frame.13.best_effort_timestamp=6144
+packets_and_frames.frame.13.best_effort_timestamp_time="0.120000"
 packets_and_frames.frame.13.pkt_duration=2048
 packets_and_frames.frame.13.pkt_duration_time="0.040000"
 packets_and_frames.frame.13.pkt_pos="1024731"

omxplayer-2014.02.11.tar.gz/ffmpeg/tests/ref/fate/ffprobe_ini -> omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/fate/ffprobe_ini Changed

@@ -22,6 +22,8 @@
 pkt_pts_time=0.000000
 pkt_dts=0
 pkt_dts_time=0.000000
+best_effort_timestamp=0
+best_effort_timestamp_time=0.000000
 pkt_duration=1024
 pkt_duration_time=0.023220
 pkt_pos=572
@@ -53,6 +55,8 @@
 pkt_pts_time=0.000000
 pkt_dts=0
 pkt_dts_time=0.000000
+best_effort_timestamp=0
+best_effort_timestamp_time=0.000000
 pkt_duration=2048
 pkt_duration_time=0.040000
 pkt_pos=2647
@@ -90,6 +94,8 @@
 pkt_pts_time=0.000000
 pkt_dts=0
 pkt_dts_time=0.000000
+best_effort_timestamp=0
+best_effort_timestamp_time=0.000000
 pkt_duration=2048
 pkt_duration_time=0.040000
 pkt_pos=233068
@@ -127,6 +133,8 @@
 pkt_pts_time=0.023220
 pkt_dts=1024
 pkt_dts_time=0.023220
+best_effort_timestamp=1024
+best_effort_timestamp_time=0.023220
 pkt_duration=1024
 pkt_duration_time=0.023220
 pkt_pos=263073
@@ -158,6 +166,8 @@
 pkt_pts_time=0.040000
 pkt_dts=2048
 pkt_dts_time=0.040000
+best_effort_timestamp=2048
+best_effort_timestamp_time=0.040000
 pkt_duration=2048
 pkt_duration_time=0.040000
 pkt_pos=265151
@@ -195,6 +205,8 @@
 pkt_pts_time=0.040000
 pkt_dts=2048
 pkt_dts_time=0.040000
+best_effort_timestamp=2048
+best_effort_timestamp_time=0.040000
 pkt_duration=2048
 pkt_duration_time=0.040000
 pkt_pos=495575
@@ -232,6 +244,8 @@
 pkt_pts_time=0.046440
 pkt_dts=2048
 pkt_dts_time=0.046440
+best_effort_timestamp=2048
+best_effort_timestamp_time=0.046440
 pkt_duration=1024
 pkt_duration_time=0.023220
 pkt_pos=525580
@@ -263,6 +277,8 @@
 pkt_pts_time=0.069660
 pkt_dts=3072
 pkt_dts_time=0.069660
+best_effort_timestamp=3072
+best_effort_timestamp_time=0.069660
 pkt_duration=1024
 pkt_duration_time=0.023220
 pkt_pos=527651
@@ -294,6 +310,8 @@
 pkt_pts_time=0.080000
 pkt_dts=4096
 pkt_dts_time=0.080000
+best_effort_timestamp=4096
+best_effort_timestamp_time=0.080000
 pkt_duration=2048
 pkt_duration_time=0.040000
 pkt_pos=529729
@@ -331,6 +349,8 @@
 pkt_pts_time=0.080000
 pkt_dts=4096
 pkt_dts_time=0.080000
+best_effort_timestamp=4096
+best_effort_timestamp_time=0.080000
 pkt_duration=2048
 pkt_duration_time=0.040000
 pkt_pos=760153
@@ -368,6 +388,8 @@
 pkt_pts_time=0.092880
 pkt_dts=4096
 pkt_dts_time=0.092880
+best_effort_timestamp=4096
+best_effort_timestamp_time=0.092880
 pkt_duration=1024
 pkt_duration_time=0.023220
 pkt_pos=790158
@@ -399,6 +421,8 @@
 pkt_pts_time=0.116100
 pkt_dts=5120
 pkt_dts_time=0.116100
+best_effort_timestamp=5120
+best_effort_timestamp_time=0.116100
 pkt_duration=1024
 pkt_duration_time=0.023220
 pkt_pos=792229
@@ -430,6 +454,8 @@
 pkt_pts_time=0.120000
 pkt_dts=6144
 pkt_dts_time=0.120000
+best_effort_timestamp=6144
+best_effort_timestamp_time=0.120000
 pkt_duration=2048
 pkt_duration_time=0.040000
 pkt_pos=794307
@@ -467,6 +493,8 @@
 pkt_pts_time=0.120000
 pkt_dts=6144
 pkt_dts_time=0.120000
+best_effort_timestamp=6144
+best_effort_timestamp_time=0.120000
 pkt_duration=2048
 pkt_duration_time=0.040000
 pkt_pos=1024731

omxplayer-2014.02.11.tar.gz/ffmpeg/tests/ref/fate/ffprobe_json -> omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/fate/ffprobe_json Changed

@@ -22,6 +22,8 @@
             "pkt_pts_time": "0.000000",
             "pkt_dts": 0,
             "pkt_dts_time": "0.000000",
+            "best_effort_timestamp": 0,
+            "best_effort_timestamp_time": "0.000000",
             "pkt_duration": 1024,
             "pkt_duration_time": "0.023220",
             "pkt_pos": "572",
@@ -52,6 +54,8 @@
             "pkt_pts_time": "0.000000",
             "pkt_dts": 0,
             "pkt_dts_time": "0.000000",
+            "best_effort_timestamp": 0,
+            "best_effort_timestamp_time": "0.000000",
             "pkt_duration": 2048,
             "pkt_duration_time": "0.040000",
             "pkt_pos": "2647",
@@ -88,6 +92,8 @@
             "pkt_pts_time": "0.000000",
             "pkt_dts": 0,
             "pkt_dts_time": "0.000000",
+            "best_effort_timestamp": 0,
+            "best_effort_timestamp_time": "0.000000",
             "pkt_duration": 2048,
             "pkt_duration_time": "0.040000",
             "pkt_pos": "233068",
@@ -124,6 +130,8 @@
             "pkt_pts_time": "0.023220",
             "pkt_dts": 1024,
             "pkt_dts_time": "0.023220",
+            "best_effort_timestamp": 1024,
+            "best_effort_timestamp_time": "0.023220",
             "pkt_duration": 1024,
             "pkt_duration_time": "0.023220",
             "pkt_pos": "263073",
@@ -154,6 +162,8 @@
             "pkt_pts_time": "0.040000",
             "pkt_dts": 2048,
             "pkt_dts_time": "0.040000",
+            "best_effort_timestamp": 2048,
+            "best_effort_timestamp_time": "0.040000",
             "pkt_duration": 2048,
             "pkt_duration_time": "0.040000",
             "pkt_pos": "265151",
@@ -190,6 +200,8 @@
             "pkt_pts_time": "0.040000",
             "pkt_dts": 2048,
             "pkt_dts_time": "0.040000",
+            "best_effort_timestamp": 2048,
+            "best_effort_timestamp_time": "0.040000",
             "pkt_duration": 2048,
             "pkt_duration_time": "0.040000",
             "pkt_pos": "495575",
@@ -226,6 +238,8 @@
             "pkt_pts_time": "0.046440",
             "pkt_dts": 2048,
             "pkt_dts_time": "0.046440",
+            "best_effort_timestamp": 2048,
+            "best_effort_timestamp_time": "0.046440",
             "pkt_duration": 1024,
             "pkt_duration_time": "0.023220",
             "pkt_pos": "525580",
@@ -256,6 +270,8 @@
             "pkt_pts_time": "0.069660",
             "pkt_dts": 3072,
             "pkt_dts_time": "0.069660",
+            "best_effort_timestamp": 3072,
+            "best_effort_timestamp_time": "0.069660",
             "pkt_duration": 1024,
             "pkt_duration_time": "0.023220",
             "pkt_pos": "527651",
@@ -286,6 +302,8 @@
             "pkt_pts_time": "0.080000",
             "pkt_dts": 4096,
             "pkt_dts_time": "0.080000",
+            "best_effort_timestamp": 4096,
+            "best_effort_timestamp_time": "0.080000",
             "pkt_duration": 2048,
             "pkt_duration_time": "0.040000",
             "pkt_pos": "529729",
@@ -322,6 +340,8 @@
             "pkt_pts_time": "0.080000",
             "pkt_dts": 4096,
             "pkt_dts_time": "0.080000",
+            "best_effort_timestamp": 4096,
+            "best_effort_timestamp_time": "0.080000",
             "pkt_duration": 2048,
             "pkt_duration_time": "0.040000",
             "pkt_pos": "760153",
@@ -358,6 +378,8 @@
             "pkt_pts_time": "0.092880",
             "pkt_dts": 4096,
             "pkt_dts_time": "0.092880",
+            "best_effort_timestamp": 4096,
+            "best_effort_timestamp_time": "0.092880",
             "pkt_duration": 1024,
             "pkt_duration_time": "0.023220",
             "pkt_pos": "790158",
@@ -388,6 +410,8 @@
             "pkt_pts_time": "0.116100",
             "pkt_dts": 5120,
             "pkt_dts_time": "0.116100",
+            "best_effort_timestamp": 5120,
+            "best_effort_timestamp_time": "0.116100",
             "pkt_duration": 1024,
             "pkt_duration_time": "0.023220",
             "pkt_pos": "792229",
@@ -418,6 +442,8 @@
             "pkt_pts_time": "0.120000",
             "pkt_dts": 6144,
             "pkt_dts_time": "0.120000",
+            "best_effort_timestamp": 6144,
+            "best_effort_timestamp_time": "0.120000",
             "pkt_duration": 2048,
             "pkt_duration_time": "0.040000",
             "pkt_pos": "794307",
@@ -454,6 +480,8 @@
             "pkt_pts_time": "0.120000",
             "pkt_dts": 6144,
             "pkt_dts_time": "0.120000",
+            "best_effort_timestamp": 6144,
+            "best_effort_timestamp_time": "0.120000",
             "pkt_duration": 2048,
             "pkt_duration_time": "0.040000",
             "pkt_pos": "1024731",

omxplayer-2014.02.11.tar.gz/ffmpeg/tests/ref/fate/ffprobe_xml -> omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/fate/ffprobe_xml Changed

@@ -2,33 +2,33 @@
 <ffprobe>
     <packets_and_frames>
         <packet codec_type="audio" stream_index="0" pts="0" pts_time="0.000000" dts="0" dts_time="0.000000" duration="1024" duration_time="0.023220" size="2048" pos="572" flags="K"/>
-        <frame media_type="audio" key_frame="1" pkt_pts="0" pkt_pts_time="0.000000" pkt_dts="0" pkt_dts_time="0.000000" pkt_duration="1024" pkt_duration_time="0.023220" pkt_pos="572" pkt_size="2048" sample_fmt="s16" nb_samples="1024" channels="1"/>
+        <frame media_type="audio" key_frame="1" pkt_pts="0" pkt_pts_time="0.000000" pkt_dts="0" pkt_dts_time="0.000000" best_effort_timestamp="0" best_effort_timestamp_time="0.000000" pkt_duration="1024" pkt_duration_time="0.023220" pkt_pos="572" pkt_size="2048" sample_fmt="s16" nb_samples="1024" channels="1"/>
         <packet codec_type="video" stream_index="1" pts="0" pts_time="0.000000" dts="0" dts_time="0.000000" duration="2048" duration_time="0.040000" size="230400" pos="2647" flags="K"/>
-        <frame media_type="video" key_frame="1" pkt_pts="0" pkt_pts_time="0.000000" pkt_dts="0" pkt_dts_time="0.000000" pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="2647" width="320" height="240" pix_fmt="rgb24" sample_aspect_ratio="1:1" pict_type="I" coded_picture_number="0" display_picture_number="0" interlaced_frame="0" top_field_first="0" repeat_pict="0"/>
+        <frame media_type="video" key_frame="1" pkt_pts="0" pkt_pts_time="0.000000" pkt_dts="0" pkt_dts_time="0.000000" best_effort_timestamp="0" best_effort_timestamp_time="0.000000" pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="2647" width="320" height="240" pix_fmt="rgb24" sample_aspect_ratio="1:1" pict_type="I" coded_picture_number="0" display_picture_number="0" interlaced_frame="0" top_field_first="0" repeat_pict="0"/>
         <packet codec_type="video" stream_index="2" pts="0" pts_time="0.000000" dts="0" dts_time="0.000000" duration="2048" duration_time="0.040000" size="30000" pos="233068" flags="K"/>
-        <frame media_type="video" key_frame="1" pkt_pts="0" pkt_pts_time="0.000000" pkt_dts="0" pkt_dts_time="0.000000" pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="233068" width="100" height="100" pix_fmt="rgb24" sample_aspect_ratio="1:1" pict_type="I" coded_picture_number="0" display_picture_number="0" interlaced_frame="0" top_field_first="0" repeat_pict="0"/>
+        <frame media_type="video" key_frame="1" pkt_pts="0" pkt_pts_time="0.000000" pkt_dts="0" pkt_dts_time="0.000000" best_effort_timestamp="0" best_effort_timestamp_time="0.000000" pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="233068" width="100" height="100" pix_fmt="rgb24" sample_aspect_ratio="1:1" pict_type="I" coded_picture_number="0" display_picture_number="0" interlaced_frame="0" top_field_first="0" repeat_pict="0"/>
         <packet codec_type="audio" stream_index="0" pts="1024" pts_time="0.023220" dts="1024" dts_time="0.023220" duration="1024" duration_time="0.023220" size="2048" pos="263073" flags="K"/>
-        <frame media_type="audio" key_frame="1" pkt_pts="1024" pkt_pts_time="0.023220" pkt_dts="1024" pkt_dts_time="0.023220" pkt_duration="1024" pkt_duration_time="0.023220" pkt_pos="263073" pkt_size="2048" sample_fmt="s16" nb_samples="1024" channels="1"/>
+        <frame media_type="audio" key_frame="1" pkt_pts="1024" pkt_pts_time="0.023220" pkt_dts="1024" pkt_dts_time="0.023220" best_effort_timestamp="1024" best_effort_timestamp_time="0.023220" pkt_duration="1024" pkt_duration_time="0.023220" pkt_pos="263073" pkt_size="2048" sample_fmt="s16" nb_samples="1024" channels="1"/>
         <packet codec_type="video" stream_index="1" pts="2048" pts_time="0.040000" dts="2048" dts_time="0.040000" duration="2048" duration_time="0.040000" size="230400" pos="265151" flags="K"/>
-        <frame media_type="video" key_frame="1" pkt_pts="2048" pkt_pts_time="0.040000" pkt_dts="2048" pkt_dts_time="0.040000" pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="265151" width="320" height="240" pix_fmt="rgb24" sample_aspect_ratio="1:1" pict_type="I" coded_picture_number="0" display_picture_number="0" interlaced_frame="0" top_field_first="0" repeat_pict="0"/>
+        <frame media_type="video" key_frame="1" pkt_pts="2048" pkt_pts_time="0.040000" pkt_dts="2048" pkt_dts_time="0.040000" best_effort_timestamp="2048" best_effort_timestamp_time="0.040000" pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="265151" width="320" height="240" pix_fmt="rgb24" sample_aspect_ratio="1:1" pict_type="I" coded_picture_number="0" display_picture_number="0" interlaced_frame="0" top_field_first="0" repeat_pict="0"/>
         <packet codec_type="video" stream_index="2" pts="2048" pts_time="0.040000" dts="2048" dts_time="0.040000" duration="2048" duration_time="0.040000" size="30000" pos="495575" flags="K"/>
-        <frame media_type="video" key_frame="1" pkt_pts="2048" pkt_pts_time="0.040000" pkt_dts="2048" pkt_dts_time="0.040000" pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="495575" width="100" height="100" pix_fmt="rgb24" sample_aspect_ratio="1:1" pict_type="I" coded_picture_number="0" display_picture_number="0" interlaced_frame="0" top_field_first="0" repeat_pict="0"/>
+        <frame media_type="video" key_frame="1" pkt_pts="2048" pkt_pts_time="0.040000" pkt_dts="2048" pkt_dts_time="0.040000" best_effort_timestamp="2048" best_effort_timestamp_time="0.040000" pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="495575" width="100" height="100" pix_fmt="rgb24" sample_aspect_ratio="1:1" pict_type="I" coded_picture_number="0" display_picture_number="0" interlaced_frame="0" top_field_first="0" repeat_pict="0"/>
         <packet codec_type="audio" stream_index="0" pts="2048" pts_time="0.046440" dts="2048" dts_time="0.046440" duration="1024" duration_time="0.023220" size="2048" pos="525580" flags="K"/>
-        <frame media_type="audio" key_frame="1" pkt_pts="2048" pkt_pts_time="0.046440" pkt_dts="2048" pkt_dts_time="0.046440" pkt_duration="1024" pkt_duration_time="0.023220" pkt_pos="525580" pkt_size="2048" sample_fmt="s16" nb_samples="1024" channels="1"/>
+        <frame media_type="audio" key_frame="1" pkt_pts="2048" pkt_pts_time="0.046440" pkt_dts="2048" pkt_dts_time="0.046440" best_effort_timestamp="2048" best_effort_timestamp_time="0.046440" pkt_duration="1024" pkt_duration_time="0.023220" pkt_pos="525580" pkt_size="2048" sample_fmt="s16" nb_samples="1024" channels="1"/>
         <packet codec_type="audio" stream_index="0" pts="3072" pts_time="0.069660" dts="3072" dts_time="0.069660" duration="1024" duration_time="0.023220" size="2048" pos="527651" flags="K"/>
-        <frame media_type="audio" key_frame="1" pkt_pts="3072" pkt_pts_time="0.069660" pkt_dts="3072" pkt_dts_time="0.069660" pkt_duration="1024" pkt_duration_time="0.023220" pkt_pos="527651" pkt_size="2048" sample_fmt="s16" nb_samples="1024" channels="1"/>
+        <frame media_type="audio" key_frame="1" pkt_pts="3072" pkt_pts_time="0.069660" pkt_dts="3072" pkt_dts_time="0.069660" best_effort_timestamp="3072" best_effort_timestamp_time="0.069660" pkt_duration="1024" pkt_duration_time="0.023220" pkt_pos="527651" pkt_size="2048" sample_fmt="s16" nb_samples="1024" channels="1"/>
         <packet codec_type="video" stream_index="1" pts="4096" pts_time="0.080000" dts="4096" dts_time="0.080000" duration="2048" duration_time="0.040000" size="230400" pos="529729" flags="K"/>
-        <frame media_type="video" key_frame="1" pkt_pts="4096" pkt_pts_time="0.080000" pkt_dts="4096" pkt_dts_time="0.080000" pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="529729" width="320" height="240" pix_fmt="rgb24" sample_aspect_ratio="1:1" pict_type="I" coded_picture_number="0" display_picture_number="0" interlaced_frame="0" top_field_first="0" repeat_pict="0"/>
+        <frame media_type="video" key_frame="1" pkt_pts="4096" pkt_pts_time="0.080000" pkt_dts="4096" pkt_dts_time="0.080000" best_effort_timestamp="4096" best_effort_timestamp_time="0.080000" pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="529729" width="320" height="240" pix_fmt="rgb24" sample_aspect_ratio="1:1" pict_type="I" coded_picture_number="0" display_picture_number="0" interlaced_frame="0" top_field_first="0" repeat_pict="0"/>
         <packet codec_type="video" stream_index="2" pts="4096" pts_time="0.080000" dts="4096" dts_time="0.080000" duration="2048" duration_time="0.040000" size="30000" pos="760153" flags="K"/>
-        <frame media_type="video" key_frame="1" pkt_pts="4096" pkt_pts_time="0.080000" pkt_dts="4096" pkt_dts_time="0.080000" pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="760153" width="100" height="100" pix_fmt="rgb24" sample_aspect_ratio="1:1" pict_type="I" coded_picture_number="0" display_picture_number="0" interlaced_frame="0" top_field_first="0" repeat_pict="0"/>
+        <frame media_type="video" key_frame="1" pkt_pts="4096" pkt_pts_time="0.080000" pkt_dts="4096" pkt_dts_time="0.080000" best_effort_timestamp="4096" best_effort_timestamp_time="0.080000" pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="760153" width="100" height="100" pix_fmt="rgb24" sample_aspect_ratio="1:1" pict_type="I" coded_picture_number="0" display_picture_number="0" interlaced_frame="0" top_field_first="0" repeat_pict="0"/>
         <packet codec_type="audio" stream_index="0" pts="4096" pts_time="0.092880" dts="4096" dts_time="0.092880" duration="1024" duration_time="0.023220" size="2048" pos="790158" flags="K"/>
-        <frame media_type="audio" key_frame="1" pkt_pts="4096" pkt_pts_time="0.092880" pkt_dts="4096" pkt_dts_time="0.092880" pkt_duration="1024" pkt_duration_time="0.023220" pkt_pos="790158" pkt_size="2048" sample_fmt="s16" nb_samples="1024" channels="1"/>
+        <frame media_type="audio" key_frame="1" pkt_pts="4096" pkt_pts_time="0.092880" pkt_dts="4096" pkt_dts_time="0.092880" best_effort_timestamp="4096" best_effort_timestamp_time="0.092880" pkt_duration="1024" pkt_duration_time="0.023220" pkt_pos="790158" pkt_size="2048" sample_fmt="s16" nb_samples="1024" channels="1"/>
         <packet codec_type="audio" stream_index="0" pts="5120" pts_time="0.116100" dts="5120" dts_time="0.116100" duration="1024" duration_time="0.023220" size="2048" pos="792229" flags="K"/>
-        <frame media_type="audio" key_frame="1" pkt_pts="5120" pkt_pts_time="0.116100" pkt_dts="5120" pkt_dts_time="0.116100" pkt_duration="1024" pkt_duration_time="0.023220" pkt_pos="792229" pkt_size="2048" sample_fmt="s16" nb_samples="1024" channels="1"/>
+        <frame media_type="audio" key_frame="1" pkt_pts="5120" pkt_pts_time="0.116100" pkt_dts="5120" pkt_dts_time="0.116100" best_effort_timestamp="5120" best_effort_timestamp_time="0.116100" pkt_duration="1024" pkt_duration_time="0.023220" pkt_pos="792229" pkt_size="2048" sample_fmt="s16" nb_samples="1024" channels="1"/>
         <packet codec_type="video" stream_index="1" pts="6144" pts_time="0.120000" dts="6144" dts_time="0.120000" duration="2048" duration_time="0.040000" size="230400" pos="794307" flags="K"/>
-        <frame media_type="video" key_frame="1" pkt_pts="6144" pkt_pts_time="0.120000" pkt_dts="6144" pkt_dts_time="0.120000" pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="794307" width="320" height="240" pix_fmt="rgb24" sample_aspect_ratio="1:1" pict_type="I" coded_picture_number="0" display_picture_number="0" interlaced_frame="0" top_field_first="0" repeat_pict="0"/>
+        <frame media_type="video" key_frame="1" pkt_pts="6144" pkt_pts_time="0.120000" pkt_dts="6144" pkt_dts_time="0.120000" best_effort_timestamp="6144" best_effort_timestamp_time="0.120000" pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="794307" width="320" height="240" pix_fmt="rgb24" sample_aspect_ratio="1:1" pict_type="I" coded_picture_number="0" display_picture_number="0" interlaced_frame="0" top_field_first="0" repeat_pict="0"/>
         <packet codec_type="video" stream_index="2" pts="6144" pts_time="0.120000" dts="6144" dts_time="0.120000" duration="2048" duration_time="0.040000" size="30000" pos="1024731" flags="K"/>
-        <frame media_type="video" key_frame="1" pkt_pts="6144" pkt_pts_time="0.120000" pkt_dts="6144" pkt_dts_time="0.120000" pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="1024731" width="100" height="100" pix_fmt="rgb24" sample_aspect_ratio="1:1" pict_type="I" coded_picture_number="0" display_picture_number="0" interlaced_frame="0" top_field_first="0" repeat_pict="0"/>
+        <frame media_type="video" key_frame="1" pkt_pts="6144" pkt_pts_time="0.120000" pkt_dts="6144" pkt_dts_time="0.120000" best_effort_timestamp="6144" best_effort_timestamp_time="0.120000" pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="1024731" width="100" height="100" pix_fmt="rgb24" sample_aspect_ratio="1:1" pict_type="I" coded_picture_number="0" display_picture_number="0" interlaced_frame="0" top_field_first="0" repeat_pict="0"/>
     </packets_and_frames>
 
     <streams>

omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/fate/filter-framepack-columns Added

omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/fate/filter-framepack-frameseq Added

omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/fate/filter-framepack-lines Added

omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/fate/filter-framepack-sbs Added

omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/fate/filter-framepack-tab Added

omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/fate/filter-overlay_yuv422 Added

@@ -0,0 +1,51 @@
+#tb 0: 1/25
+0,          0,          0,        1,   304128, 0x9b9e09b2
+0,          1,          1,        1,   304128, 0x33addb48
+0,          2,          2,        1,   304128, 0xd5b973e9
+0,          3,          3,        1,   304128, 0xcb847cb6
+0,          4,          4,        1,   304128, 0xf64536f0
+0,          5,          5,        1,   304128, 0xda17564a
+0,          6,          6,        1,   304128, 0x85e33692
+0,          7,          7,        1,   304128, 0x081a657f
+0,          8,          8,        1,   304128, 0xf15f69ee
+0,          9,          9,        1,   304128, 0x0a2dd737
+0,         10,         10,        1,   304128, 0x14ae5b1b
+0,         11,         11,        1,   304128, 0x0b654f1e
+0,         12,         12,        1,   304128, 0x35a11962
+0,         13,         13,        1,   304128, 0x010b7514
+0,         14,         14,        1,   304128, 0x5db20c43
+0,         15,         15,        1,   304128, 0xafb6c615
+0,         16,         16,        1,   304128, 0xa671a3ac
+0,         17,         17,        1,   304128, 0x1a0fc75d
+0,         18,         18,        1,   304128, 0xe3a05ff1
+0,         19,         19,        1,   304128, 0x58437c36
+0,         20,         20,        1,   304128, 0x1303f940
+0,         21,         21,        1,   304128, 0xec2f3248
+0,         22,         22,        1,   304128, 0xe9ff7d49
+0,         23,         23,        1,   304128, 0x3972a1ed
+0,         24,         24,        1,   304128, 0xee2311df
+0,         25,         25,        1,   304128, 0x5b62c4d9
+0,         26,         26,        1,   304128, 0x9e1e52e2
+0,         27,         27,        1,   304128, 0x60c56d07
+0,         28,         28,        1,   304128, 0x313a8534
+0,         29,         29,        1,   304128, 0x9f548f56
+0,         30,         30,        1,   304128, 0x8d894ed3
+0,         31,         31,        1,   304128, 0x3ce0500a
+0,         32,         32,        1,   304128, 0xb8dd487a
+0,         33,         33,        1,   304128, 0xdde97863
+0,         34,         34,        1,   304128, 0x8d9d1689
+0,         35,         35,        1,   304128, 0x703634dd
+0,         36,         36,        1,   304128, 0x3e321210
+0,         37,         37,        1,   304128, 0x6b5a1a8c
+0,         38,         38,        1,   304128, 0xffc1015d
+0,         39,         39,        1,   304128, 0x4abc4495
+0,         40,         40,        1,   304128, 0x3c03ada9
+0,         41,         41,        1,   304128, 0x6fa0344a
+0,         42,         42,        1,   304128, 0x36572833
+0,         43,         43,        1,   304128, 0x31646c4d
+0,         44,         44,        1,   304128, 0xa22d18c7
+0,         45,         45,        1,   304128, 0xf3b058f2
+0,         46,         46,        1,   304128, 0x4c6be349
+0,         47,         47,        1,   304128, 0xda98914a
+0,         48,         48,        1,   304128, 0x1a6d2f58
+0,         49,         49,        1,   304128, 0x12684280

omxplayer-2014.02.11.tar.gz/ffmpeg/tests/ref/fate/filter-pixdesc -> omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/fate/filter-pixdesc Changed

@@ -26,8 +26,8 @@
 gbrp9be             c76ab5850c9bc72bbbf36caa6d1c5ac7
 gbrp9le             5ad363dc9570187ad3e3f2344fbb30cf
 gray                2ee2ea2340d0ecf2dfa6f90f87384799
-gray16be            389f4e5a8ab413b3af32767b59ed7f9e
-gray16le            a1f912941247e45b394b9cf4f0e81130
+gray16be            a61507aec1088f5692036e1aabdb4f41
+gray16le            171fbdd46e3737bc865d0185a0006e1c
 monob               309b5785a36bd988d17e15d88f4ffad1
 monow               8809a02bc69b58d1114b09ca79ebffad
 nv12                75e90c54d858b993e99f4ee6d2a2a38f
@@ -48,8 +48,8 @@
 rgba64be            c05fbb1ada1b48fb1eb192fc200af2b6
 rgba64le            1b826cc613666f545274e8a7799d69f1
 uyvy422             3f411f947e3ac8f842c88e717d68bd9a
-xyz12be             71f608adceed8e8997aa463203b1a648
-xyz12le             dc524e3726ba1df0d2f406db3a2c08aa
+xyz12be             7fb449368615139d47192c4543b5d125
+xyz12le             bfa1cde86dece70348e48f6293a7c2ef
 yuv410p             7dcf3f4770c8b494290ceacd2c2ce6db
 yuv411p             9461b188dab6f8b90d9a27e353a89f58
 yuv420p             61fffd2d8425759a33ae07e718d0242d

omxplayer-2014.02.11.tar.gz/ffmpeg/tests/ref/fate/filter-pixfmts-copy -> omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/fate/filter-pixfmts-copy Changed

@@ -26,8 +26,8 @@
 gbrp9be             c76ab5850c9bc72bbbf36caa6d1c5ac7
 gbrp9le             5ad363dc9570187ad3e3f2344fbb30cf
 gray                2ee2ea2340d0ecf2dfa6f90f87384799
-gray16be            389f4e5a8ab413b3af32767b59ed7f9e
-gray16le            a1f912941247e45b394b9cf4f0e81130
+gray16be            a61507aec1088f5692036e1aabdb4f41
+gray16le            171fbdd46e3737bc865d0185a0006e1c
 monob               309b5785a36bd988d17e15d88f4ffad1
 monow               8809a02bc69b58d1114b09ca79ebffad
 nv12                75e90c54d858b993e99f4ee6d2a2a38f
@@ -49,8 +49,8 @@
 rgba64be            c05fbb1ada1b48fb1eb192fc200af2b6
 rgba64le            1b826cc613666f545274e8a7799d69f1
 uyvy422             3f411f947e3ac8f842c88e717d68bd9a
-xyz12be             b91ff224254afceb4a8f803d56eb52a1
-xyz12le             dc524e3726ba1df0d2f406db3a2c08aa
+xyz12be             7fb449368615139d47192c4543b5d125
+xyz12le             bfa1cde86dece70348e48f6293a7c2ef
 yuv410p             7dcf3f4770c8b494290ceacd2c2ce6db
 yuv411p             9461b188dab6f8b90d9a27e353a89f58
 yuv420p             61fffd2d8425759a33ae07e718d0242d

omxplayer-2014.02.11.tar.gz/ffmpeg/tests/ref/fate/filter-pixfmts-crop -> omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/fate/filter-pixfmts-crop Changed

@@ -26,8 +26,8 @@
 gbrp9be             f17b7ba66ba35ed0fcbbb5c32c7e0f56
 gbrp9le             fc11219debfbe8dd8c3d6f0ef92c4d50
 gray                6d34024704f862c75db3ba6989a4a039
-gray16be            02ac848ad4e28c06938599563ba81ff7
-gray16le            672aebfeb8a0f4067b3c6064340056e4
+gray16be            27cfdb4b211cad34f66a664cabd754b4
+gray16le            91cb081d457100a60c2d0f54110f064f
 nv12                923a313a7013fb0e87608155ef6aa9a4
 nv21                21e6b9273bb74203beabeb9edb9cf95c
 pal8                e1fd50b8a8a67fb5abd8b44abc778bbb
@@ -46,8 +46,8 @@
 rgba                7abe1af7b97f5b9a7aa5ad3e4bf32f76
 rgba64be            2eed28b61af25790c02cc658e5f86b9b
 rgba64le            de8bc34c6d573488d87e87ce8c7ad07f
-xyz12be             7ea4ce13143195dfe1ed340bc9e86b2f
-xyz12le             e4e86ef100e07cda561a22811f242e5d
+xyz12be             c3783bcad9f962049f9992d5c907bbf2
+xyz12le             20a9ebf2256ceda449ba5603f1dab7e3
 yuv410p             126e0da1da4fd89be28087b8367bbb36
 yuv411p             b94f0af107fc4796aca70c0a36d374c5
 yuv420p             74c6b331bd30f005e6c75a192423ad90

omxplayer-2014.02.11.tar.gz/ffmpeg/tests/ref/fate/filter-pixfmts-field -> omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/fate/filter-pixfmts-field Changed

@@ -26,8 +26,8 @@
 gbrp9be             c293422f1395bfddc788282eef139ed6
 gbrp9le             0d2bb77c25d84611ec6222f3dffe11c0
 gray                42a0ad7625a0481183e375e38679d8d3
-gray16be            a447af6482b922c9997ac02e5d3535f1
-gray16le            c1dd0db327295898ff282d07f48c105d
+gray16be            e10bc0a8b015fdb0776eca402ffe5eff
+gray16le            2eb159fb4af25c3b4f033e6414fef63e
 monob               1b7fb7e69a913a0a1c0dffc54e5899ea
 monow               b5d3778a054fc73d515d36f8a6bc693b
 nv12                b3829e9ae2a15349432b7efac4236068
@@ -49,8 +49,8 @@
 rgba64be            53363baf266592e0ac02b3f8242ec4fb
 rgba64le            a630eaa38545b2be741f000ab58451e5
 uyvy422             a6a52504a16f09b8f2ec2405bc8190b5
-xyz12be             33d0b7ef124a9e94d2d13a2cad1dfc00
-xyz12le             bab6403abf58e69575900802ffef8f38
+xyz12be             98775fdf313afa1c20da37b74b57c926
+xyz12le             39edc4f30363a00401a62acd7a65e173
 yuv410p             3feb55b1e2a385b488c82e808a12587b
 yuv411p             ab3dd8e6cf1452afe2d2e976e4726370
 yuv420p             52e26ad198368e2326bef97cdfa6a2bb

omxplayer-2014.02.11.tar.gz/ffmpeg/tests/ref/fate/filter-pixfmts-fieldorder -> omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/fate/filter-pixfmts-fieldorder Changed

@@ -26,8 +26,8 @@
 gbrp9be             a6eb7cde03f19a25bf13627d731a2c9a
 gbrp9le             1b6d228b97a370ec76707ed2dcc15a66
 gray                3258910ef8c6f0c4a331368e7af87507
-gray16be            50cc8a29e8e81e174676542347804a4f
-gray16le            fb93e8aa2deed734dfd1ca6a5c48cf18
+gray16be            9a4c7e731ce572ad86985b56a653b5c3
+gray16le            d10df57cf0de14206c8e354e8f6b732b
 rgb0                5f8f8076e2b9a2422cac25a4f0459d79
 rgb24               66ca89ced3ade4c239ad6c5a79a6b8cd
 rgb444be            7197a09137ab5630a26226396bb7e313
@@ -44,8 +44,8 @@
 rgba64be            9ae73ceaa9d95e7981b4df559b0d3b6d
 rgba64le            86997e62f62d2a5351b5ca9c9c93c2d1
 uyvy422             a07829fe630b59855c80d87d0e8f0dbb
-xyz12be             5785613045b051cee508625dde3357df
-xyz12le             3645601dc8bfbdff68cc823a0fc85b27
+xyz12be             dcb691784f80fd6b438844e8e30299fd
+xyz12le             c63cdd81442c37d710da95d9be70a24d
 yuv411p             3d3d427999863945aa5ec03edf98c19a
 yuv422p             961d8a22bfe8868eb3c743b4241a3c99
 yuv422p10be         845e80406c880f33a384b5ebdd21796d

omxplayer-2014.02.11.tar.gz/ffmpeg/tests/ref/fate/filter-pixfmts-hflip -> omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/fate/filter-pixfmts-hflip Changed

@@ -26,8 +26,8 @@
 gbrp9be             8268b9a1e9f4d6a42e57db9c81d82fa5
 gbrp9le             b3a09bba825e16e6d160328706a9f62f
 gray                aaa9c2fe3c2a2a43a4b35226ea689b3c
-gray16be            d206a080739d89cb7dc0009ad4082ed4
-gray16le            7ebcfd9401ba85e584230de8fc02986d
+gray16be            5be35a44f0ba85eb8c55b4f062fdb80f
+gray16le            d9e73f7c4f53d795192ab87649270241
 nv12                719adbc47fa74e92f83150921917483f
 nv21                9c833b3ce53539d270e1f21e4319797b
 pal8                19c8735b23feeed18ec2d37913a5f3f8
@@ -46,8 +46,8 @@
 rgba                a37789c4df73c3bd8648ad1fe9d3f991
 rgba64be            286067334e4bca33fba7ebb1706890a2
 rgba64le            2a8b3dd5045df299259636d8e6b62589
-xyz12be             079dac329f0d93df7a7e71b260f13dd9
-xyz12le             31c4f953548326b27920c5939bcf2cce
+xyz12be             92f8189963a977ee758b77a85d6e99ac
+xyz12le             d5591761e71436d71e35788b46e873c3
 yuv410p             a1280c2b9b562dba3c2d35a1e5fc4b23
 yuv411p             6bf10756ac5c7841db63a97106ff911b
 yuv420p             45f4a06481f2cd8e28fb29c7c151e110

omxplayer-2014.02.11.tar.gz/ffmpeg/tests/ref/fate/filter-pixfmts-il -> omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/fate/filter-pixfmts-il Changed

@@ -26,8 +26,8 @@
 gbrp9be             b9fc10ab1ddad0e7945d6b047725d078
 gbrp9le             ef3d6bc8069b95cae31100908a7fa967
 gray                2cadbaed81ee12181bda9f4aa87ddbc0
-gray16be            cd9c1367dabd2f1858ae4f31693e622f
-gray16le            4ef774c282280d7ed4780690df6e5cb4
+gray16be            34cd1af8bbdd4266d5f7985ef22cfc9f
+gray16le            0eec98b32e4a2a57d9f51aac9ac3cf8d
 monob               07cffe7f5f25f39c3aa38866303791c6
 monow               f2d1bdb939813a49abd6348ecfbb2703
 nv12                6847b3f7141ca1e3c40d3a494f0e13cb
@@ -48,8 +48,8 @@
 rgba64be            576dfc2fd1937f9e594c4004fafd83f2
 rgba64le            7938eccc1f05f13710ec351767b47a36
 uyvy422             8be40aded4b407ff66305911ba5ce2ce
-xyz12be             ba8a8152ca6e8b338e1dc5ace0a729b6
-xyz12le             1f20849dcf44539ce351346c73bdff1a
+xyz12be             fe74cfbcd18ada951bfa943e990e0e32
+xyz12le             6a0c4d381f06a6d43a6c1d2e3e87672d
 yuv410p             92112d85ba4f74cbd3044945c0f33402
 yuv411p             b6b22000e5275c92baf5afc417c32a70
 yuv420p             fca7fbbff753612a718ee13e1dfe2af2

omxplayer-2014.02.11.tar.gz/ffmpeg/tests/ref/fate/filter-pixfmts-null -> omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/fate/filter-pixfmts-null Changed

@@ -26,8 +26,8 @@
 gbrp9be             c76ab5850c9bc72bbbf36caa6d1c5ac7
 gbrp9le             5ad363dc9570187ad3e3f2344fbb30cf
 gray                2ee2ea2340d0ecf2dfa6f90f87384799
-gray16be            389f4e5a8ab413b3af32767b59ed7f9e
-gray16le            a1f912941247e45b394b9cf4f0e81130
+gray16be            a61507aec1088f5692036e1aabdb4f41
+gray16le            171fbdd46e3737bc865d0185a0006e1c
 monob               309b5785a36bd988d17e15d88f4ffad1
 monow               8809a02bc69b58d1114b09ca79ebffad
 nv12                75e90c54d858b993e99f4ee6d2a2a38f
@@ -49,8 +49,8 @@
 rgba64be            c05fbb1ada1b48fb1eb192fc200af2b6
 rgba64le            1b826cc613666f545274e8a7799d69f1
 uyvy422             3f411f947e3ac8f842c88e717d68bd9a
-xyz12be             b91ff224254afceb4a8f803d56eb52a1
-xyz12le             dc524e3726ba1df0d2f406db3a2c08aa
+xyz12be             7fb449368615139d47192c4543b5d125
+xyz12le             bfa1cde86dece70348e48f6293a7c2ef
 yuv410p             7dcf3f4770c8b494290ceacd2c2ce6db
 yuv411p             9461b188dab6f8b90d9a27e353a89f58
 yuv420p             61fffd2d8425759a33ae07e718d0242d

omxplayer-2014.02.11.tar.gz/ffmpeg/tests/ref/fate/filter-pixfmts-scale -> omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/fate/filter-pixfmts-scale Changed

@@ -26,8 +26,8 @@
 gbrp9be             2c9adb80abc16546cac69b4872aaf557
 gbrp9le             fcfa1684553e3e185179462bca347649
 gray                c45dcee08887f43dc463f79d7ecd7d68
-gray16be            70064f9acdc5e3935ccda67e765bf2fb
-gray16le            578241fb43029e5ae841a3c94d940dce
+gray16be            52a6ff8ba7fe11032f370c0888d87fc4
+gray16le            e78f07e83698651639743f2f8501c51c
 monob               91ec2a25b13f6ca34d42da778b217de0
 monow               a991455fda8f60f373aeb744456996b9
 nv12                0617f1e13ae4a43d4cb49282b9c02f71
@@ -49,8 +49,8 @@
 rgba64be            5ce6f591ac8be4edcf5c3350d2d2d3f5
 rgba64le            12baab5162019de2053db39a3bfca868
 uyvy422             479105bc4c7fbb4a33ca8745aa8c2de8
-xyz12be             6769a0b3b3b6d7a674542c8cd3e3644e
-xyz12le             b4f967df71db5c38c222f9236c341031
+xyz12be             8b9767926ff233a5820f99923e8331df
+xyz12le             a76c6cd0b058ade67104a8bb3217aaef
 yuv410p             d0daa93f5cee83360e219e39563ab6da
 yuv411p             e5c8f3ca024a88dd07e0a92db3e2133d
 yuv420p             485d9af8608f926ffffbf42230b4150d

omxplayer-2014.02.11.tar.gz/ffmpeg/tests/ref/fate/filter-pixfmts-vflip -> omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/fate/filter-pixfmts-vflip Changed

@@ -26,8 +26,8 @@
 gbrp9be             b4361a1ad66cdff0d32d4af769a8a960
 gbrp9le             5bc148ca18ff1bf7095e78a4e65ed8ab
 gray                800813149a825964025e75cf14ec528b
-gray16be            9b23f3e79c54a6ccb62e0135a32e3045
-gray16le            93cfa8fbb2a86ead275ce1817444e6d5
+gray16be            03fdfc40a4fd25252f1b03d9358f00ef
+gray16le            ebcd797559fef441e5baeff4e7a02472
 monob               c395a8efb9477b4ec53a77326e41ccd7
 monow               efaee1c763ccd5ce1a8519d2ed5aa5a9
 nv12                77373304a9c732b65dab0a33afba9295
@@ -49,8 +49,8 @@
 rgba64be            52ee01b66ee3d52e4726a12fbb819950
 rgba64le            60541d81afcea71a27629c4e5d137dcb
 uyvy422             21c48162379321bb83ec2399535f9253
-xyz12be             7070af64e30fa689e3627b1dde7506f4
-xyz12le             4c4b31100b836638e7e61181997c49e1
+xyz12be             3c00294e1e56ac7673226c75faafc247
+xyz12le             edfc0b6dd18510d9dd605a83d74ba5b9
 yuv410p             8699f50c04f8ac931aa5a8306827364b
 yuv411p             47af34559b92b68851df4c2b170f7736
 yuv420p             c59b35b82b5a195128736021913b35a4

omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/fate/filter-select-alternate Added

@@ -0,0 +1,26 @@
+#tb 0: 1/25
+0,          0,          0,        1,   152064, 0x05b789ef
+0,          2,          2,        1,   152064, 0x9dddf64a
+0,          4,          4,        1,   152064, 0x4de3b652
+0,          6,          6,        1,   152064, 0xe20f7c23
+0,          8,          8,        1,   152064, 0x1f1b8026
+0,         10,         10,        1,   152064, 0x02344760
+0,         12,         12,        1,   152064, 0xc711ad61
+0,         14,         14,        1,   152064, 0x52a48ddd
+0,         16,         16,        1,   152064, 0x8e364e18
+0,         18,         18,        1,   152064, 0xf25f6acc
+0,         20,         20,        1,   152064, 0xfc7bf570
+0,         22,         22,        1,   152064, 0x445d1d59
+0,         24,         24,        1,   152064, 0xce09f9d6
+0,         26,         26,        1,   152064, 0x43d796b5
+0,         28,         28,        1,   152064, 0x76d2a455
+0,         30,         30,        1,   152064, 0x0f9d6aca
+0,         32,         32,        1,   152064, 0xd766fc8d
+0,         34,         34,        1,   152064, 0x7fea4378
+0,         36,         36,        1,   152064, 0x4c9737ab
+0,         38,         38,        1,   152064, 0x0b07594c
+0,         40,         40,        1,   152064, 0xd2735925
+0,         42,         42,        1,   152064, 0x20cebfa9
+0,         44,         44,        1,   152064, 0xfd500471
+0,         46,         46,        1,   152064, 0x09ef53ff
+0,         48,         48,        1,   152064, 0xbb87b483

omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/fate/hevc-conformance-EXT_A_ericsson_4 Changed

omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/fate/hevc-conformance-LS_B_ORANGE_4 Changed

omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/fate/hevc-conformance-LTRPSPS_A_Qualcomm_1 Added

@@ -0,0 +1,501 @@
+#tb 0: 1/25
+0,          0,          0,        1,   149760, 0xcfffa013
+0,          1,          1,        1,   149760, 0x8ae80654
+0,          2,          2,        1,   149760, 0xa79915b8
+0,          3,          3,        1,   149760, 0xcc5d4a1e
+0,          4,          4,        1,   149760, 0x80636df7
+0,          5,          5,        1,   149760, 0xbd9ab94a
+0,          6,          6,        1,   149760, 0xb7c9ecc5
+0,          7,          7,        1,   149760, 0xbb8607fc
+0,          8,          8,        1,   149760, 0x82c62409
+0,          9,          9,        1,   149760, 0xdc1a9149
+0,         10,         10,        1,   149760, 0x3d55ac92
+0,         11,         11,        1,   149760, 0x398ad055
+0,         12,         12,        1,   149760, 0xd7c2c80b
+0,         13,         13,        1,   149760, 0x17b0e967
+0,         14,         14,        1,   149760, 0x0463f30b
+0,         15,         15,        1,   149760, 0x73d31d58
+0,         16,         16,        1,   149760, 0xaeee2c07
+0,         17,         17,        1,   149760, 0xcd98831c
+0,         18,         18,        1,   149760, 0x38798b8c
+0,         19,         19,        1,   149760, 0x11a6a0d5
+0,         20,         20,        1,   149760, 0x5e509f19
+0,         21,         21,        1,   149760, 0x399ec835
+0,         22,         22,        1,   149760, 0x0250e3c1
+0,         23,         23,        1,   149760, 0xd62510a1
+0,         24,         24,        1,   149760, 0x715016ac
+0,         25,         25,        1,   149760, 0x1f4e9aae
+0,         26,         26,        1,   149760, 0xd27fa636
+0,         27,         27,        1,   149760, 0x55369ec0
+0,         28,         28,        1,   149760, 0x77ffa34e
+0,         29,         29,        1,   149760, 0x5589f2c0
+0,         30,         30,        1,   149760, 0x99c2e78a
+0,         31,         31,        1,   149760, 0xd7e9ff76
+0,         32,         32,        1,   149760, 0xd4437e12
+0,         33,         33,        1,   149760, 0x3af7b718
+0,         34,         34,        1,   149760, 0x6de8bb92
+0,         35,         35,        1,   149760, 0xd523ca09
+0,         36,         36,        1,   149760, 0x44ccbf86
+0,         37,         37,        1,   149760, 0x8eddf1a0
+0,         38,         38,        1,   149760, 0xf554f120
+0,         39,         39,        1,   149760, 0x75bd170c
+0,         40,         40,        1,   149760, 0x4cf40a64
+0,         41,         41,        1,   149760, 0xefe64d68
+0,         42,         42,        1,   149760, 0xa48e7572
+0,         43,         43,        1,   149760, 0x0773b154
+0,         44,         44,        1,   149760, 0x304a8bb9
+0,         45,         45,        1,   149760, 0x6b219051
+0,         46,         46,        1,   149760, 0xbb9b68a3
+0,         47,         47,        1,   149760, 0x060d7cc8
+0,         48,         48,        1,   149760, 0x49317bcb
+0,         49,         49,        1,   149760, 0xac3c9a38
+0,         50,         50,        1,   149760, 0x2f1ea025
+0,         51,         51,        1,   149760, 0x2b87b9b8
+0,         52,         52,        1,   149760, 0x9024bdc9
+0,         53,         53,        1,   149760, 0xa7d1f5c5
+0,         54,         54,        1,   149760, 0x4d590628
+0,         55,         55,        1,   149760, 0x0a65166a
+0,         56,         56,        1,   149760, 0x9f4f350b
+0,         57,         57,        1,   149760, 0x8a40990d
+0,         58,         58,        1,   149760, 0x75f4ad20
+0,         59,         59,        1,   149760, 0xb3aadfd2
+0,         60,         60,        1,   149760, 0xb23df15d
+0,         61,         61,        1,   149760, 0xff99a695
+0,         62,         62,        1,   149760, 0x710963d7
+0,         63,         63,        1,   149760, 0x7c497146
+0,         64,         64,        1,   149760, 0xd3378be9
+0,         65,         65,        1,   149760, 0x0c449d3b
+0,         66,         66,        1,   149760, 0xcb16554e
+0,         67,         67,        1,   149760, 0xeb5e62d5
+0,         68,         68,        1,   149760, 0xc9b8125a
+0,         69,         69,        1,   149760, 0x8c6b2b56
+0,         70,         70,        1,   149760, 0xaba92f83
+0,         71,         71,        1,   149760, 0xc0a45d8a
+0,         72,         72,        1,   149760, 0x72a17719
+0,         73,         73,        1,   149760, 0x98037887
+0,         74,         74,        1,   149760, 0xb752b50b
+0,         75,         75,        1,   149760, 0x91520f28
+0,         76,         76,        1,   149760, 0x58d7f7cb
+0,         77,         77,        1,   149760, 0x8c639e33
+0,         78,         78,        1,   149760, 0xda16eeed
+0,         79,         79,        1,   149760, 0xfcb7fd52
+0,         80,         80,        1,   149760, 0x193fd521
+0,         81,         81,        1,   149760, 0x51cca11e
+0,         82,         82,        1,   149760, 0x8606cc0f
+0,         83,         83,        1,   149760, 0xa588bdfc
+0,         84,         84,        1,   149760, 0x3f828b28
+0,         85,         85,        1,   149760, 0x7a9d6a9f
+0,         86,         86,        1,   149760, 0xf963ded3
+0,         87,         87,        1,   149760, 0x9d4452bb
+0,         88,         88,        1,   149760, 0x474399bf
+0,         89,         89,        1,   149760, 0x934cdcea
+0,         90,         90,        1,   149760, 0x32efebce
+0,         91,         91,        1,   149760, 0xb9ba01ba
+0,         92,         92,        1,   149760, 0xcdb63f42
+0,         93,         93,        1,   149760, 0x4ca2b3fc
+0,         94,         94,        1,   149760, 0xf5b3fae3
+0,         95,         95,        1,   149760, 0xac216fee
+0,         96,         96,        1,   149760, 0x8753dbea
+0,         97,         97,        1,   149760, 0x605c5d19
+0,         98,         98,        1,   149760, 0x441f3093
+0,         99,         99,        1,   149760, 0x586d3630
+0,        100,        100,        1,   149760, 0xb3678490
+0,        101,        101,        1,   149760, 0xc6c90b12
+0,        102,        102,        1,   149760, 0xb103185e
+0,        103,        103,        1,   149760, 0x92a10168
+0,        104,        104,        1,   149760, 0xa77ae265
+0,        105,        105,        1,   149760, 0x14def17a
+0,        106,        106,        1,   149760, 0x0468ea5a
+0,        107,        107,        1,   149760, 0x078832be
+0,        108,        108,        1,   149760, 0xf353fe88
+0,        109,        109,        1,   149760, 0xa42d3435
+0,        110,        110,        1,   149760, 0xd13a85ea
+0,        111,        111,        1,   149760, 0xd3c2f119
+0,        112,        112,        1,   149760, 0x7ee6c196
+0,        113,        113,        1,   149760, 0xa75aadbc
+0,        114,        114,        1,   149760, 0xbe661a3e
+0,        115,        115,        1,   149760, 0x662cb304
+0,        116,        116,        1,   149760, 0x32a7a688
+0,        117,        117,        1,   149760, 0xedf4ff9f
+0,        118,        118,        1,   149760, 0x3d036dbc
+0,        119,        119,        1,   149760, 0x525025d2
+0,        120,        120,        1,   149760, 0x9ab72bd2
+0,        121,        121,        1,   149760, 0xbf401309
+0,        122,        122,        1,   149760, 0xaab6d421
+0,        123,        123,        1,   149760, 0x3713ce39
+0,        124,        124,        1,   149760, 0x5054b38d
+0,        125,        125,        1,   149760, 0x40211b8d
+0,        126,        126,        1,   149760, 0x769d8bcc
+0,        127,        127,        1,   149760, 0xa3b428d7
+0,        128,        128,        1,   149760, 0x3d4df3de
+0,        129,        129,        1,   149760, 0xa1338ae9
+0,        130,        130,        1,   149760, 0xb12f8c9a
+0,        131,        131,        1,   149760, 0x43cc9612
+0,        132,        132,        1,   149760, 0xcbc4b7ce
+0,        133,        133,        1,   149760, 0xae2e2b7c
+0,        134,        134,        1,   149760, 0x685403bd
+0,        135,        135,        1,   149760, 0x1362c52f
+0,        136,        136,        1,   149760, 0x2a7cf8e7
+0,        137,        137,        1,   149760, 0x2863f3a4
+0,        138,        138,        1,   149760, 0xa94bc07d
+0,        139,        139,        1,   149760, 0xe025b2f7
+0,        140,        140,        1,   149760, 0x0c56ce13
+0,        141,        141,        1,   149760, 0x97ce3184
+0,        142,        142,        1,   149760, 0x3761313f
+0,        143,        143,        1,   149760, 0x7bf850ba
+0,        144,        144,        1,   149760, 0xa7d02257
+0,        145,        145,        1,   149760, 0xb64c79ae
+0,        146,        146,        1,   149760, 0x36a610b8
+0,        147,        147,        1,   149760, 0xc4946568
+0,        148,        148,        1,   149760, 0x89a29ed8
+0,        149,        149,        1,   149760, 0x5040a1e2
+0,        150,        150,        1,   149760, 0x3daa53ba
+0,        151,        151,        1,   149760, 0xbca6b7c2
+0,        152,        152,        1,   149760, 0x540af705
+0,        153,        153,        1,   149760, 0x524e8012
+0,        154,        154,        1,   149760, 0x2cfd69dd
+0,        155,        155,        1,   149760, 0x6d222afd
+0,        156,        156,        1,   149760, 0xf522489b
+0,        157,        157,        1,   149760, 0x18357f2f
+0,        158,        158,        1,   149760, 0x38c58007
+0,        159,        159,        1,   149760, 0xb367598b
+0,        160,        160,        1,   149760, 0xeaee7801
+0,        161,        161,        1,   149760, 0x6ec20703
+0,        162,        162,        1,   149760, 0x19b61bbe
+0,        163,        163,        1,   149760, 0x81d328ab
+0,        164,        164,        1,   149760, 0x6f5555eb
+0,        165,        165,        1,   149760, 0x7706277a
+0,        166,        166,        1,   149760, 0x45a7e27a
+0,        167,        167,        1,   149760, 0xd30a2c09
+0,        168,        168,        1,   149760, 0x13fdcefc
+0,        169,        169,        1,   149760, 0x952bf8f5
+0,        170,        170,        1,   149760, 0x18a627d7
+0,        171,        171,        1,   149760, 0x33838dc4
+0,        172,        172,        1,   149760, 0x0b81d369
+0,        173,        173,        1,   149760, 0x9a85acb5
+0,        174,        174,        1,   149760, 0x6bee543e
+0,        175,        175,        1,   149760, 0xff9563dc
+0,        176,        176,        1,   149760, 0x15177760
+0,        177,        177,        1,   149760, 0xc2ca9fcd
+0,        178,        178,        1,   149760, 0xe14290cf
+0,        179,        179,        1,   149760, 0x113a84ed
+0,        180,        180,        1,   149760, 0x423b83ac
+0,        181,        181,        1,   149760, 0x64c37fa9
+0,        182,        182,        1,   149760, 0x07a324fc
+0,        183,        183,        1,   149760, 0xb7a5dd83
+0,        184,        184,        1,   149760, 0xc9c65cfe
+0,        185,        185,        1,   149760, 0xecab5ab0
+0,        186,        186,        1,   149760, 0x04240342
+0,        187,        187,        1,   149760, 0x6d6ec6ea
+0,        188,        188,        1,   149760, 0x18e1413a
+0,        189,        189,        1,   149760, 0x4602403a
+0,        190,        190,        1,   149760, 0x9a4c03b4
+0,        191,        191,        1,   149760, 0x7b93bd44
+0,        192,        192,        1,   149760, 0xa72ecc38
+0,        193,        193,        1,   149760, 0xb4bc1591
+0,        194,        194,        1,   149760, 0x6c8e40b4
+0,        195,        195,        1,   149760, 0x5adb674b
+0,        196,        196,        1,   149760, 0x223f68e5
+0,        197,        197,        1,   149760, 0x6257d660
+0,        198,        198,        1,   149760, 0xade0f8af
+0,        199,        199,        1,   149760, 0xe5834d9a
+0,        200,        200,        1,   149760, 0x593b7957
+0,        201,        201,        1,   149760, 0x278109dc
+0,        202,        202,        1,   149760, 0x9e46908e
+0,        203,        203,        1,   149760, 0x221b16c6
+0,        204,        204,        1,   149760, 0x26f1387b
+0,        205,        205,        1,   149760, 0xfe87a439
+0,        206,        206,        1,   149760, 0x79a2aa13
+0,        207,        207,        1,   149760, 0xd9d6ed45
+0,        208,        208,        1,   149760, 0xc4bde65b
+0,        209,        209,        1,   149760, 0x3f4c2558
+0,        210,        210,        1,   149760, 0x2bce7b58
+0,        211,        211,        1,   149760, 0x76468d74
+0,        212,        212,        1,   149760, 0x3c8ceb15
+0,        213,        213,        1,   149760, 0x6d55430f
+0,        214,        214,        1,   149760, 0x2500386a
+0,        215,        215,        1,   149760, 0x5c220604
+0,        216,        216,        1,   149760, 0xc8c5e3c7
+0,        217,        217,        1,   149760, 0xb35b12d3
+0,        218,        218,        1,   149760, 0x47bbea46
+0,        219,        219,        1,   149760, 0xd15acaff
+0,        220,        220,        1,   149760, 0xf1a35a2f
+0,        221,        221,        1,   149760, 0xf9d845e0
+0,        222,        222,        1,   149760, 0x87cfe711
+0,        223,        223,        1,   149760, 0xf6f2d8a5
+0,        224,        224,        1,   149760, 0x167b5401
+0,        225,        225,        1,   149760, 0x33f355c2
+0,        226,        226,        1,   149760, 0xd0d66b7c
+0,        227,        227,        1,   149760, 0xb676a0ad
+0,        228,        228,        1,   149760, 0x987cbc29
+0,        229,        229,        1,   149760, 0x5fb71596
+0,        230,        230,        1,   149760, 0xf993350a
+0,        231,        231,        1,   149760, 0x586a6ae0
+0,        232,        232,        1,   149760, 0x3b678b28
+0,        233,        233,        1,   149760, 0x45a1c869
+0,        234,        234,        1,   149760, 0xa4ccfdeb
+0,        235,        235,        1,   149760, 0x5ff52df9
+0,        236,        236,        1,   149760, 0x84c01dee
+0,        237,        237,        1,   149760, 0x8d4ed483
+0,        238,        238,        1,   149760, 0x9b4f466f
+0,        239,        239,        1,   149760, 0x954dfaed
+0,        240,        240,        1,   149760, 0xae07d9cd
+0,        241,        241,        1,   149760, 0xf81ecbe8
+0,        242,        242,        1,   149760, 0xdb6f97f7
+0,        243,        243,        1,   149760, 0x1b1b50f4
+0,        244,        244,        1,   149760, 0xbd450e28
+0,        245,        245,        1,   149760, 0x1307a938
+0,        246,        246,        1,   149760, 0xb2af5ddd
+0,        247,        247,        1,   149760, 0xbf80377d
+0,        248,        248,        1,   149760, 0x230b0fbb
+0,        249,        249,        1,   149760, 0x365afaa8
+0,        250,        250,        1,   149760, 0xe517dcb0
+0,        251,        251,        1,   149760, 0xfa1dcda3
+0,        252,        252,        1,   149760, 0x4908b5a1
+0,        253,        253,        1,   149760, 0x423a9ebd
+0,        254,        254,        1,   149760, 0x1145a6d1
+0,        255,        255,        1,   149760, 0x4f40a141
+0,        256,        256,        1,   149760, 0x851e84de
+0,        257,        257,        1,   149760, 0x1709a3cd
+0,        258,        258,        1,   149760, 0x3dace2eb
+0,        259,        259,        1,   149760, 0x3e9d4890
+0,        260,        260,        1,   149760, 0xea53610c
+0,        261,        261,        1,   149760, 0xe50f2ee9
+0,        262,        262,        1,   149760, 0x59a16fc6
+0,        263,        263,        1,   149760, 0x9bee92d8
+0,        264,        264,        1,   149760, 0xf3047aed
+0,        265,        265,        1,   149760, 0x30f922ed
+0,        266,        266,        1,   149760, 0x4eb5c685
+0,        267,        267,        1,   149760, 0xf688d9e5
+0,        268,        268,        1,   149760, 0xf5f5ec81
+0,        269,        269,        1,   149760, 0xa5667bdc
+0,        270,        270,        1,   149760, 0x9a64c3f1
+0,        271,        271,        1,   149760, 0x0fbe3441
+0,        272,        272,        1,   149760, 0xf67f517c
+0,        273,        273,        1,   149760, 0x97155c90
+0,        274,        274,        1,   149760, 0xe41fde38
+0,        275,        275,        1,   149760, 0xdf140d56
+0,        276,        276,        1,   149760, 0x5ae5f31b
+0,        277,        277,        1,   149760, 0x13238d0a
+0,        278,        278,        1,   149760, 0x53a867a4
+0,        279,        279,        1,   149760, 0xbc6327fa
+0,        280,        280,        1,   149760, 0x34ce9cda
+0,        281,        281,        1,   149760, 0x07b6d6f4
+0,        282,        282,        1,   149760, 0x271e7299
+0,        283,        283,        1,   149760, 0x2e53d61b
+0,        284,        284,        1,   149760, 0x5ec6c37a
+0,        285,        285,        1,   149760, 0x2284efdc
+0,        286,        286,        1,   149760, 0x5c59625b
+0,        287,        287,        1,   149760, 0x93965c3b
+0,        288,        288,        1,   149760, 0x4eaa64c0
+0,        289,        289,        1,   149760, 0xde7fd5b7
+0,        290,        290,        1,   149760, 0x00f2fdf1
+0,        291,        291,        1,   149760, 0xb7daf9f2
+0,        292,        292,        1,   149760, 0x988d751e
+0,        293,        293,        1,   149760, 0x5c8baa8e
+0,        294,        294,        1,   149760, 0xcdea5c41
+0,        295,        295,        1,   149760, 0x22d0cddc
+0,        296,        296,        1,   149760, 0xd913bba8
+0,        297,        297,        1,   149760, 0xba74650e
+0,        298,        298,        1,   149760, 0x01af4f86
+0,        299,        299,        1,   149760, 0xc4e60d8a
+0,        300,        300,        1,   149760, 0x1a193c1c
+0,        301,        301,        1,   149760, 0x7f66ab93
+0,        302,        302,        1,   149760, 0xa47c8c5a
+0,        303,        303,        1,   149760, 0x221d4c1c
+0,        304,        304,        1,   149760, 0xadd8f1e7
+0,        305,        305,        1,   149760, 0xa8224d8e
+0,        306,        306,        1,   149760, 0xca2dc482
+0,        307,        307,        1,   149760, 0x74110b2d
+0,        308,        308,        1,   149760, 0x1c2271df
+0,        309,        309,        1,   149760, 0xb1dbae7e
+0,        310,        310,        1,   149760, 0x0932826d
+0,        311,        311,        1,   149760, 0x386f191d
+0,        312,        312,        1,   149760, 0x11863aa3
+0,        313,        313,        1,   149760, 0x0a07f11f
+0,        314,        314,        1,   149760, 0x164d047a
+0,        315,        315,        1,   149760, 0xb79fa393
+0,        316,        316,        1,   149760, 0x83d4eba8
+0,        317,        317,        1,   149760, 0x4d8dad20
+0,        318,        318,        1,   149760, 0x5bd2ae35
+0,        319,        319,        1,   149760, 0xedbfcbf6
+0,        320,        320,        1,   149760, 0x4e3c1463
+0,        321,        321,        1,   149760, 0x79564bd9
+0,        322,        322,        1,   149760, 0x3d84e6f5
+0,        323,        323,        1,   149760, 0x2117e35d
+0,        324,        324,        1,   149760, 0xa7e71f6e
+0,        325,        325,        1,   149760, 0xc4db38cf
+0,        326,        326,        1,   149760, 0x1fb89dc7
+0,        327,        327,        1,   149760, 0x2606f7fc
+0,        328,        328,        1,   149760, 0x232478d4
+0,        329,        329,        1,   149760, 0x5ee6d57a
+0,        330,        330,        1,   149760, 0xc9dcad6a
+0,        331,        331,        1,   149760, 0x9190e77f
+0,        332,        332,        1,   149760, 0x9c4770a6
+0,        333,        333,        1,   149760, 0x58e4f194
+0,        334,        334,        1,   149760, 0x2fdcc67c
+0,        335,        335,        1,   149760, 0xaaede6fd
+0,        336,        336,        1,   149760, 0x676c3f9b
+0,        337,        337,        1,   149760, 0xd420e536
+0,        338,        338,        1,   149760, 0x6dc24987
+0,        339,        339,        1,   149760, 0xc6368607
+0,        340,        340,        1,   149760, 0x34620402
+0,        341,        341,        1,   149760, 0xd98da63e
+0,        342,        342,        1,   149760, 0xeb724c79
+0,        343,        343,        1,   149760, 0x4ba2c1f5
+0,        344,        344,        1,   149760, 0x2795fc4c
+0,        345,        345,        1,   149760, 0x0e7ece9a
+0,        346,        346,        1,   149760, 0x6ac54741
+0,        347,        347,        1,   149760, 0xb96fd2cc
+0,        348,        348,        1,   149760, 0x117291e5
+0,        349,        349,        1,   149760, 0x87415084
+0,        350,        350,        1,   149760, 0x8f73b005
+0,        351,        351,        1,   149760, 0xda24dd2d
+0,        352,        352,        1,   149760, 0xbb7a0383
+0,        353,        353,        1,   149760, 0x31b6d2ad
+0,        354,        354,        1,   149760, 0x87f8b103
+0,        355,        355,        1,   149760, 0xc2c41bca
+0,        356,        356,        1,   149760, 0xf021cb64
+0,        357,        357,        1,   149760, 0x19809718
+0,        358,        358,        1,   149760, 0x81247b86
+0,        359,        359,        1,   149760, 0x2326d770
+0,        360,        360,        1,   149760, 0x2b27c7ee
+0,        361,        361,        1,   149760, 0xa9ce4ef4
+0,        362,        362,        1,   149760, 0x0de330b8
+0,        363,        363,        1,   149760, 0xf8c14fc9
+0,        364,        364,        1,   149760, 0x3264e471
+0,        365,        365,        1,   149760, 0x410e8591
+0,        366,        366,        1,   149760, 0xb38f2ea9
+0,        367,        367,        1,   149760, 0xf4fbcbea
+0,        368,        368,        1,   149760, 0x60935dc0
+0,        369,        369,        1,   149760, 0x98f4cfb4
+0,        370,        370,        1,   149760, 0xab0156db
+0,        371,        371,        1,   149760, 0x0bd8e392
+0,        372,        372,        1,   149760, 0x6b4701c1
+0,        373,        373,        1,   149760, 0xe94b1bea
+0,        374,        374,        1,   149760, 0x86d932fb
+0,        375,        375,        1,   149760, 0xebb7cf5b
+0,        376,        376,        1,   149760, 0xb4022144
+0,        377,        377,        1,   149760, 0xb61506a3
+0,        378,        378,        1,   149760, 0xd48b1fa0
+0,        379,        379,        1,   149760, 0xd4b7ecaf
+0,        380,        380,        1,   149760, 0x9296f641
+0,        381,        381,        1,   149760, 0x976e816a
+0,        382,        382,        1,   149760, 0xd4d1e34e
+0,        383,        383,        1,   149760, 0xe34fd75b
+0,        384,        384,        1,   149760, 0x9a926a62
+0,        385,        385,        1,   149760, 0x3fb24f62
+0,        386,        386,        1,   149760, 0x0e7840af
+0,        387,        387,        1,   149760, 0x1cb583c4
+0,        388,        388,        1,   149760, 0x24c4fd96
+0,        389,        389,        1,   149760, 0x923493e0
+0,        390,        390,        1,   149760, 0xd4755d80
+0,        391,        391,        1,   149760, 0x9cd4b85c
+0,        392,        392,        1,   149760, 0xd01aa4ad
+0,        393,        393,        1,   149760, 0x55e09c4f
+0,        394,        394,        1,   149760, 0x09a873b6
+0,        395,        395,        1,   149760, 0x915a4408
+0,        396,        396,        1,   149760, 0x714aeafb
+0,        397,        397,        1,   149760, 0x8941f5b8
+0,        398,        398,        1,   149760, 0x1fe23244
+0,        399,        399,        1,   149760, 0x1663a392
+0,        400,        400,        1,   149760, 0x91b4d995
+0,        401,        401,        1,   149760, 0xb4fc80b0
+0,        402,        402,        1,   149760, 0x02523fbb
+0,        403,        403,        1,   149760, 0xc6d16d89
+0,        404,        404,        1,   149760, 0xd1d899be
+0,        405,        405,        1,   149760, 0x03c55283
+0,        406,        406,        1,   149760, 0x581b2f1a
+0,        407,        407,        1,   149760, 0xac93eb35
+0,        408,        408,        1,   149760, 0x21d0573b
+0,        409,        409,        1,   149760, 0xda4f9ea4
+0,        410,        410,        1,   149760, 0x2a04ad09
+0,        411,        411,        1,   149760, 0x46d9c0fc
+0,        412,        412,        1,   149760, 0x90b79b33
+0,        413,        413,        1,   149760, 0x6cadf70b
+0,        414,        414,        1,   149760, 0xb4f294a4
+0,        415,        415,        1,   149760, 0xc6d599d2
+0,        416,        416,        1,   149760, 0xec332a7f
+0,        417,        417,        1,   149760, 0x1e4c9fea
+0,        418,        418,        1,   149760, 0xadacff11
+0,        419,        419,        1,   149760, 0x63ffacab
+0,        420,        420,        1,   149760, 0xcc504bbf
+0,        421,        421,        1,   149760, 0xfd9002d4
+0,        422,        422,        1,   149760, 0xe338cabf
+0,        423,        423,        1,   149760, 0x89ab95bd
+0,        424,        424,        1,   149760, 0x932602d1
+0,        425,        425,        1,   149760, 0x063a9a8a
+0,        426,        426,        1,   149760, 0xd07c1d2c
+0,        427,        427,        1,   149760, 0x1016fee6
+0,        428,        428,        1,   149760, 0xe778f595
+0,        429,        429,        1,   149760, 0x5c46d12a
+0,        430,        430,        1,   149760, 0xe50e7d26
+0,        431,        431,        1,   149760, 0x6ef2149d
+0,        432,        432,        1,   149760, 0x5c1c475c
+0,        433,        433,        1,   149760, 0xd1af09dd
+0,        434,        434,        1,   149760, 0x91e38b8e
+0,        435,        435,        1,   149760, 0xe8f0fb1e
+0,        436,        436,        1,   149760, 0xabef97c8
+0,        437,        437,        1,   149760, 0x7a2a5abd
+0,        438,        438,        1,   149760, 0xc74774f0
+0,        439,        439,        1,   149760, 0x47d17c54
+0,        440,        440,        1,   149760, 0x849f8860
+0,        441,        441,        1,   149760, 0xe81e0022
+0,        442,        442,        1,   149760, 0xa572c832
+0,        443,        443,        1,   149760, 0x7670f316
+0,        444,        444,        1,   149760, 0x67556784
+0,        445,        445,        1,   149760, 0x42b2af9d
+0,        446,        446,        1,   149760, 0x731e17c8
+0,        447,        447,        1,   149760, 0x491f3ed7
+0,        448,        448,        1,   149760, 0xdb9d163d
+0,        449,        449,        1,   149760, 0x7282e4d6
+0,        450,        450,        1,   149760, 0x8d6dc686
+0,        451,        451,        1,   149760, 0x2d413343
+0,        452,        452,        1,   149760, 0x27a05c87
+0,        453,        453,        1,   149760, 0x0edfe7c8
+0,        454,        454,        1,   149760, 0xf2fb72cd
+0,        455,        455,        1,   149760, 0x0c046074
+0,        456,        456,        1,   149760, 0xbd2ffeec
+0,        457,        457,        1,   149760, 0xdb849b70
+0,        458,        458,        1,   149760, 0xc8193666
+0,        459,        459,        1,   149760, 0x7dab4b05
+0,        460,        460,        1,   149760, 0x83a94327
+0,        461,        461,        1,   149760, 0x56a2ca36
+0,        462,        462,        1,   149760, 0x7d20c938
+0,        463,        463,        1,   149760, 0xcba79c1b
+0,        464,        464,        1,   149760, 0xea020d13
+0,        465,        465,        1,   149760, 0xf188d8ca
+0,        466,        466,        1,   149760, 0xecec2c0f
+0,        467,        467,        1,   149760, 0xec7e6c6e
+0,        468,        468,        1,   149760, 0x10f4bd53
+0,        469,        469,        1,   149760, 0xe91a78f9
+0,        470,        470,        1,   149760, 0x996b5fe0
+0,        471,        471,        1,   149760, 0xafff2efb
+0,        472,        472,        1,   149760, 0x5270e8d7
+0,        473,        473,        1,   149760, 0x24f548b6
+0,        474,        474,        1,   149760, 0xe4b5ffe6
+0,        475,        475,        1,   149760, 0x59c7f7da
+0,        476,        476,        1,   149760, 0x4a7b30a2
+0,        477,        477,        1,   149760, 0xbe5829b3
+0,        478,        478,        1,   149760, 0x70226e30
+0,        479,        479,        1,   149760, 0xfbba9558
+0,        480,        480,        1,   149760, 0x2cb89025
+0,        481,        481,        1,   149760, 0x18e2a4ad
+0,        482,        482,        1,   149760, 0xf50dce5e
+0,        483,        483,        1,   149760, 0x9f87c44f
+0,        484,        484,        1,   149760, 0xbfdc521d
+0,        485,        485,        1,   149760, 0xa06f5b06
+0,        486,        486,        1,   149760, 0xa169a6fe
+0,        487,        487,        1,   149760, 0xce6280d4
+0,        488,        488,        1,   149760, 0x056c21d6
+0,        489,        489,        1,   149760, 0xdf7177ef
+0,        490,        490,        1,   149760, 0x1097459b
+0,        491,        491,        1,   149760, 0xf00518a4
+0,        492,        492,        1,   149760, 0x6969b893
+0,        493,        493,        1,   149760, 0xfc3ce0af
+0,        494,        494,        1,   149760, 0x53cf36b5
+0,        495,        495,        1,   149760, 0xdef7e027
+0,        496,        496,        1,   149760, 0xff11e733
+0,        497,        497,        1,   149760, 0x4ffd5d92
+0,        498,        498,        1,   149760, 0x96f0bb4a
+0,        499,        499,        1,   149760, 0x7b04dd15

omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/fate/hevc-conformance-NUT_A_ericsson_5 Changed

omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/fate/hevc-conformance-RPS_C_ericsson_5 Changed

omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/fate/hevc-conformance-RPS_D_ericsson_6 Changed

omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/fate/hevc-conformance-RPS_F_docomo_1 Added

@@ -0,0 +1,51 @@
+#tb 0: 1/25
+0,          0,          0,        1,   149760, 0x8edb27d7
+0,          1,          1,        1,   149760, 0x0bdf13f8
+0,          2,          2,        1,   149760, 0x45e702c7
+0,          3,          3,        1,   149760, 0xcc6428c0
+0,          4,          4,        1,   149760, 0xab0ed81d
+0,          5,          5,        1,   149760, 0xb518a0ce
+0,          6,          6,        1,   149760, 0x038340c0
+0,          7,          7,        1,   149760, 0x18ac1285
+0,          8,          8,        1,   149760, 0xfe2eb624
+0,          9,          9,        1,   149760, 0x3f67dcf5
+0,         10,         10,        1,   149760, 0x9a9adbf1
+0,         11,         11,        1,   149760, 0x41c67437
+0,         12,         12,        1,   149760, 0x8450a1d0
+0,         13,         13,        1,   149760, 0xae606230
+0,         14,         14,        1,   149760, 0x0525d4ba
+0,         15,         15,        1,   149760, 0x860755bc
+0,         16,         16,        1,   149760, 0xbf646d22
+0,         17,         17,        1,   149760, 0x64c79745
+0,         18,         18,        1,   149760, 0xa3cf35a4
+0,         19,         19,        1,   149760, 0x23d6f5a2
+0,         20,         20,        1,   149760, 0xf2b8ff71
+0,         21,         21,        1,   149760, 0xb98ba444
+0,         22,         22,        1,   149760, 0xa6c0ffd3
+0,         23,         23,        1,   149760, 0x4501ae0d
+0,         24,         24,        1,   149760, 0xd8ba65d1
+0,         25,         25,        1,   149760, 0x684d982b
+0,         26,         26,        1,   149760, 0x1bf223e0
+0,         27,         27,        1,   149760, 0xf1fb5950
+0,         28,         28,        1,   149760, 0x699f0526
+0,         29,         29,        1,   149760, 0x77d4d641
+0,         30,         30,        1,   149760, 0x0f2cd844
+0,         31,         31,        1,   149760, 0xd99cbe3f
+0,         32,         32,        1,   149760, 0xbd342d08
+0,         33,         33,        1,   149760, 0x0b993f3c
+0,         34,         34,        1,   149760, 0xd89190e2
+0,         35,         35,        1,   149760, 0xfae538e6
+0,         36,         36,        1,   149760, 0x6994c08f
+0,         37,         37,        1,   149760, 0xba181c41
+0,         38,         38,        1,   149760, 0x484f4e19
+0,         39,         39,        1,   149760, 0xd2d8f91d
+0,         40,         40,        1,   149760, 0x1294b154
+0,         41,         41,        1,   149760, 0xd98ad86b
+0,         42,         42,        1,   149760, 0x3867767d
+0,         43,         43,        1,   149760, 0x950d76e0
+0,         44,         44,        1,   149760, 0x752cf844
+0,         45,         45,        1,   149760, 0xd4a11c1c
+0,         46,         46,        1,   149760, 0xf5e6dce6
+0,         47,         47,        1,   149760, 0x2c7ff2a6
+0,         48,         48,        1,   149760, 0x7a48af63
+0,         49,         49,        1,   149760, 0xcb72f57a

omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/fate/hevc-conformance-SLPPLP_A_VIDYO_1 Added

@@ -0,0 +1,34 @@
+#tb 0: 1/25
+0,          0,          0,        1,   149760, 0x88619f80
+0,          1,          1,        1,   149760, 0x550bdaf0
+0,          2,          2,        1,   149760, 0x99440a14
+0,          3,          3,        1,   149760, 0xcc2c2049
+0,          4,          4,        1,   149760, 0x46927368
+0,          5,          5,        1,   149760, 0x53cdb3fe
+0,          6,          6,        1,   149760, 0x654df025
+0,          7,          7,        1,   149760, 0x024d24bc
+0,          8,          8,        1,   149760, 0x409138c2
+0,          9,          9,        1,   149760, 0xfbb47c48
+0,         10,         10,        1,   149760, 0x18caa19d
+0,         11,         11,        1,   149760, 0x0f88c2e5
+0,         12,         12,        1,   149760, 0x1c16aa2d
+0,         13,         13,        1,   149760, 0x60bfcce8
+0,         14,         14,        1,   149760, 0x1c38e3d3
+0,         15,         15,        1,   149760, 0x0d5b044a
+0,         16,         16,        1,   149760, 0x93d21593
+0,         17,         17,        1,   149760, 0xdf283910
+0,         18,         18,        1,   149760, 0x03324c23
+0,         19,         19,        1,   149760, 0x3b175b7b
+0,         20,         20,        1,   149760, 0xb91b9a7e
+0,         21,         21,        1,   149760, 0x734fbbe7
+0,         22,         22,        1,   149760, 0xfc3fea48
+0,         23,         23,        1,   149760, 0x6609103e
+0,         24,         24,        1,   149760, 0x3f5916fa
+0,         25,         25,        1,   149760, 0x08e43f4d
+0,         26,         26,        1,   149760, 0xc84e5471
+0,         27,         27,        1,   149760, 0xbd4e5c8d
+0,         28,         28,        1,   149760, 0x4a4d3995
+0,         29,         29,        1,   149760, 0x662163c0
+0,         30,         30,        1,   149760, 0xda28671f
+0,         31,         31,        1,   149760, 0x19e1878e
+0,         32,         32,        1,   149760, 0x19807e67

omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/fate/hevc-conformance-TMVP_A_MS_3 Added

@@ -0,0 +1,18 @@
+#tb 0: 1/25
+0,          0,          0,        1,   149760, 0xdb5e3b56
+0,          1,          1,        1,   149760, 0x6d4418eb
+0,          2,          2,        1,   149760, 0x0473e366
+0,          3,          3,        1,   149760, 0x988ff70c
+0,          4,          4,        1,   149760, 0x87cfb972
+0,          5,          5,        1,   149760, 0x9f006c8d
+0,          6,          6,        1,   149760, 0xa83fefd9
+0,          7,          7,        1,   149760, 0xee501a46
+0,          8,          8,        1,   149760, 0x04d29f74
+0,          9,          9,        1,   149760, 0xc1ee00dc
+0,         10,         10,        1,   149760, 0x274ef97b
+0,         11,         11,        1,   149760, 0xebec6365
+0,         12,         12,        1,   149760, 0x4555eb87
+0,         13,         13,        1,   149760, 0x50c5ae52
+0,         14,         14,        1,   149760, 0xf2861b67
+0,         15,         15,        1,   149760, 0xd6de4556
+0,         16,         16,        1,   149760, 0xc35d6134

omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/fate/hevc-conformance-TSKIP_A_MS_3 Added

@@ -0,0 +1,18 @@
+#tb 0: 1/25
+0,          0,          0,        1,  1382400, 0xaea37937
+0,          1,          1,        1,  1382400, 0xea5c7b5d
+0,          2,          2,        1,  1382400, 0x4e41e421
+0,          3,          3,        1,  1382400, 0x9214d0ee
+0,          4,          4,        1,  1382400, 0xc9aef661
+0,          5,          5,        1,  1382400, 0xddb8a3d2
+0,          6,          6,        1,  1382400, 0xf00f3c55
+0,          7,          7,        1,  1382400, 0x586d98bd
+0,          8,          8,        1,  1382400, 0x60650aa6
+0,          9,          9,        1,  1382400, 0x13108a54
+0,         10,         10,        1,  1382400, 0x90d25797
+0,         11,         11,        1,  1382400, 0x472fbac3
+0,         12,         12,        1,  1382400, 0xb9f2ac5a
+0,         13,         13,        1,  1382400, 0xb6fc0c35
+0,         14,         14,        1,  1382400, 0xfe3fd694
+0,         15,         15,        1,  1382400, 0xb1a0f737
+0,         16,         16,        1,  1382400, 0xf7e62b7e

omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/fate/hevc-conformance-TUSIZE_A_Samsung_1 Added

omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/fate/hevc-conformance-VPSID_A_VIDYO_1 Added

omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/fate/hevc-conformance-cip_B_NEC_3 Changed

omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/fate/hevc-conformance-ipcm_A_NEC_3 Changed

omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/fate/hevc-conformance-ipcm_B_NEC_3 Changed

omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/fate/hevc-conformance-ipcm_C_NEC_3 Changed

omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/fate/hevc-conformance-ipcm_D_NEC_3 Changed

omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/fate/hevc-conformance-ipcm_E_NEC_2 Added

omxplayer-2014.02.11.tar.gz/ffmpeg/tests/ref/fate/jv-demux -> omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/fate/jv-demux Changed

omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/fate/mss2-pal Added

omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/fate/mss2-pals Added

omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/fate/mss2-rgb555 Added

omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/fate/mss2-rgb555s Added

omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/fate/mss2-wmv Added

@@ -0,0 +1,101 @@
+#tb 0: 1/15
+0,          0,          0,        1,   230400, 0x00000000
+0,          3,          3,        1,   230400, 0xaf950008
+0,          4,          4,        1,   230400, 0x8d2a0010
+0,          5,          5,        1,   230400, 0xd75e0018
+0,          6,          6,        1,   230400, 0x00000000
+0,          7,          7,        1,   230400, 0x517f0008
+0,          8,          8,        1,   230400, 0xcf5a0010
+0,          9,          9,        1,   230400, 0x00000000
+0,         10,         10,        1,   230400, 0x40ef0018
+0,         11,         11,        1,   230400, 0xdc850008
+0,         12,         12,        1,   230400, 0x00000000
+0,         13,         13,        1,   230400, 0x09a40008
+0,         14,         14,        1,   230400, 0x00000000
+0,         15,         15,        1,   230400, 0x8b950008
+0,         16,         16,        1,   230400, 0xae260038
+0,         17,         17,        1,   230400, 0x6d850008
+0,         18,         18,        1,   230400, 0x00000000
+0,         23,         23,        1,   230400, 0x8b950008
+0,         24,         24,        1,   230400, 0x75450018
+0,         25,         25,        1,   230400, 0xb0dd0010
+0,         26,         26,        1,   230400, 0xecdd0018
+0,         27,         27,        1,   230400, 0x68e3f7f7
+0,         28,         28,        1,   230400, 0x9cfdcea6
+0,         29,         29,        1,   230400, 0x735ababf
+0,         30,         30,        1,   230400, 0xa1c604ea
+0,         31,         31,        1,   230400, 0x18a2f97a
+0,         32,         32,        1,   230400, 0xf9e82961
+0,         33,         33,        1,   230400, 0x57a8e9e8
+0,         34,         34,        1,   230400, 0xdef6fd66
+0,         35,         35,        1,   230400, 0xc7d923a9
+0,         36,         36,        1,   230400, 0x08bb41ee
+0,         37,         37,        1,   230400, 0x43ccbd29
+0,         38,         38,        1,   230400, 0x46666ee3
+0,         39,         39,        1,   230400, 0xbfd2ef29
+0,         40,         40,        1,   230400, 0x6504545f
+0,         41,         41,        1,   230400, 0x8fb86901
+0,         42,         42,        1,   230400, 0xc95f0917
+0,         43,         43,        1,   230400, 0x21f6a54b
+0,         44,         44,        1,   230400, 0xf808106b
+0,         45,         45,        1,   230400, 0x34150020
+0,         46,         46,        1,   230400, 0x50fdfe89
+0,         47,         47,        1,   230400, 0x920b7708
+0,         48,         48,        1,   230400, 0xed64fcc4
+0,         49,         49,        1,   230400, 0x6291a170
+0,         50,         50,        1,   230400, 0x20524643
+0,         51,         51,        1,   230400, 0x92aafecd
+0,         52,         52,        1,   230400, 0xf00ee14d
+0,         53,         53,        1,   230400, 0xfa3113ea
+0,         54,         54,        1,   230400, 0x99c06df1
+0,         55,         55,        1,   230400, 0x625c6918
+0,         56,         56,        1,   230400, 0xb277b25e
+0,         57,         57,        1,   230400, 0x2e913006
+0,         58,         58,        1,   230400, 0x3f6f1d99
+0,         59,         59,        1,   230400, 0x100ab60f
+0,         60,         60,        1,   230400, 0x9b73d0bf
+0,         61,         61,        1,   230400, 0xda0df2ce
+0,         62,         62,        1,   230400, 0x67f7ca24
+0,         63,         63,        1,   230400, 0xbde9b3d0
+0,         64,         64,        1,   230400, 0x92e14d07
+0,         65,         65,        1,   230400, 0x9426c3d9
+0,         66,         66,        1,   230400, 0x6104be70
+0,         67,         67,        1,   230400, 0xc4d1078a
+0,         68,         68,        1,   230400, 0x89426a42
+0,         69,         69,        1,   230400, 0x5271324a
+0,         70,         70,        1,   230400, 0x1cb1c735
+0,         71,         71,        1,   230400, 0x4249b8c6
+0,         72,         72,        1,   230400, 0x4b88cad3
+0,         73,         73,        1,   230400, 0x76af545d
+0,         74,         74,        1,   230400, 0xfe47e3c4
+0,         75,         75,        1,   230400, 0xa2e0e721
+0,         76,         76,        1,   230400, 0xde974a42
+0,         77,         77,        1,   230400, 0x87bf38ba
+0,         78,         78,        1,   230400, 0xd52318fd
+0,         79,         79,        1,   230400, 0x0bbb1526
+0,         80,         80,        1,   230400, 0xa22c5e5e
+0,         81,         81,        1,   230400, 0x4532c5d2
+0,         82,         82,        1,   230400, 0x88b560ec
+0,         83,         83,        1,   230400, 0xcee9d9c9
+0,         84,         84,        1,   230400, 0x0429358f
+0,         85,         85,        1,   230400, 0xf18a9b98
+0,         86,         86,        1,   230400, 0x63f7a12c
+0,         87,         87,        1,   230400, 0x98635515
+0,         88,         88,        1,   230400, 0x36affebc
+0,         89,         89,        1,   230400, 0xd8c19629
+0,         90,         90,        1,   230400, 0x9ef5344d
+0,         91,         91,        1,   230400, 0x545668dc
+0,         92,         92,        1,   230400, 0x50e65e74
+0,         93,         93,        1,   230400, 0xe3258be3
+0,         94,         94,        1,   230400, 0xeb479e1b
+0,         95,         95,        1,   230400, 0x91894243
+0,         96,         96,        1,   230400, 0x3c5660fc
+0,         97,         97,        1,   230400, 0xf0c35673
+0,         98,         98,        1,   230400, 0x552832e8
+0,         99,         99,        1,   230400, 0x1970f2b1
+0,        100,        100,        1,   230400, 0x812d4c91
+0,        101,        101,        1,   230400, 0xa3fbd4ef
+0,        102,        102,        1,   230400, 0x486f9649
+0,        103,        103,        1,   230400, 0x850f315a
+0,        104,        104,        1,   230400, 0xc18ec66b
+0,        105,        105,        1,   230400, 0xc9ef266e

omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/fate/oggvp8-demux Added

@@ -0,0 +1,71 @@
+#tb 0: 1/30
+0,          0,          0,        1,     5014, 0x4798fa33
+0,          1,          1,        1,      822, 0x596486c5, F=0x0
+0,          2,          2,        1,      840, 0xf06490ba, F=0x0
+0,          3,          3,        1,      853, 0x1db19d31, F=0x0
+0,          4,          4,        1,      885, 0x5a1aa91f, F=0x0
+0,          5,          5,        1,      902, 0xaabdb1ce, F=0x0
+0,          6,          6,        1,      854, 0x6eb1954e, F=0x0
+0,          7,          7,        1,     3086, 0xe4c12b4a, F=0x0
+0,          8,          8,        1,      732, 0x3c0868bc, F=0x0
+0,          9,          9,        1,      719, 0xa0995781, F=0x0
+0,         10,         10,        1,      749, 0xce2c6ce9, F=0x0
+0,         11,         11,        1,      869, 0x9080b554, F=0x0
+0,         12,         12,        1,      967, 0x8cd5e57a, F=0x0
+0,         13,         13,        1,     1581, 0xd0cc21d8, F=0x0
+0,         14,         14,        1,      934, 0x94facbdc, F=0x0
+0,         15,         15,        1,      841, 0xb00aa233, F=0x0
+0,         16,         16,        1,      820, 0xe93da769, F=0x0
+0,         17,         17,        1,      818, 0xa2ff91cb, F=0x0
+0,         18,         18,        1,     3113, 0x8e74377b, F=0x0
+0,         19,         19,        1,      733, 0xc88e7918, F=0x0
+0,         20,         20,        1,      745, 0x41116e83, F=0x0
+0,         21,         21,        1,      764, 0xc89a7652, F=0x0
+0,         22,         22,        1,      730, 0xe9586ef3, F=0x0
+0,         23,         23,        1,      736, 0x89437b6a, F=0x0
+0,         24,         24,        1,     1268, 0x0e985dc0, F=0x0
+0,         25,         25,        1,      805, 0x8f78897f, F=0x0
+0,         26,         26,        1,      769, 0xe5417a9b, F=0x0
+0,         27,         27,        1,      739, 0x5c0f72ea, F=0x0
+0,         28,         28,        1,      730, 0x0f556cb5, F=0x0
+0,         29,         29,        1,     3057, 0x8fb3e57c, F=0x0
+0,         30,         30,        1,      763, 0xc69479da, F=0x0
+0,         31,         31,        1,      745, 0x757b7265, F=0x0
+0,         32,         32,        1,      712, 0x20a75fc2, F=0x0
+0,         33,         33,        1,      723, 0x44016897, F=0x0
+0,         34,         34,        1,      716, 0x18f96229, F=0x0
+0,         35,         35,        1,     1132, 0xe1542e3e, F=0x0
+0,         36,         36,        1,      774, 0x0027865b, F=0x0
+0,         37,         37,        1,      770, 0x1bd67c7e, F=0x0
+0,         38,         38,        1,      755, 0xdb54746a, F=0x0
+0,         39,         39,        1,      726, 0x010973bd, F=0x0
+0,         40,         40,        1,     3078, 0x9971fe7a, F=0x0
+0,         41,         41,        1,      749, 0xcd7873de, F=0x0
+0,         42,         42,        1,      722, 0x05c86a36, F=0x0
+0,         43,         43,        1,      726, 0x4a356dd8, F=0x0
+0,         44,         44,        1,      710, 0x62176453, F=0x0
+0,         45,         45,        1,      707, 0xfb8b5c7c, F=0x0
+0,         46,         46,        1,     1143, 0x771832ff, F=0x0
+0,         47,         47,        1,      780, 0x3fb488a0, F=0x0
+0,         48,         48,        1,      720, 0xbbf27127, F=0x0
+0,         49,         49,        1,      740, 0xc6276dcb, F=0x0
+0,         50,         50,        1,      781, 0xa45586f4, F=0x0
+0,         51,         51,        1,     3122, 0x9e87222e, F=0x0
+0,         52,         52,        1,      748, 0xe5827d61, F=0x0
+0,         53,         53,        1,      740, 0x7b436f4c, F=0x0
+0,         54,         54,        1,      748, 0xa7b972fe, F=0x0
+0,         55,         55,        1,      731, 0x2a0a67d1, F=0x0
+0,         56,         56,        1,      733, 0x8c956ae1, F=0x0
+0,         57,         57,        1,     1132, 0x60f41eaa, F=0x0
+0,         58,         58,        1,      755, 0x72a276b8, F=0x0
+0,         59,         59,        1,      765, 0x4da18195, F=0x0
+0,         60,         60,        1,      715, 0x33b35877, F=0x0
+0,         61,         61,        1,      769, 0x16b6867e, F=0x0
+0,         62,         62,        1,     3219, 0x465f474f, F=0x0
+0,         63,         63,        1,      732, 0xb2f56da4, F=0x0
+0,         64,         64,        1,      808, 0xeca18ba7, F=0x0
+0,         65,         65,        1,      772, 0x7c978926, F=0x0
+0,         66,         66,        1,      791, 0x0c238441, F=0x0
+0,         67,         67,        1,      778, 0x55e0844e, F=0x0
+0,         68,         68,        1,     1443, 0x9cbed37b, F=0x0
+0,         69,         69,        1,      862, 0xbdcaa8b9, F=0x0

omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/fate/pngparser Added

omxplayer-2014.02.11.tar.gz/ffmpeg/tests/ref/fate/prores-422 -> omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/fate/prores-422 Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/tests/ref/fate/prores-422_hq -> omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/fate/prores-422_hq Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/tests/ref/fate/prores-422_lt -> omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/fate/prores-422_lt Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/tests/ref/fate/prores-422_proxy -> omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/fate/prores-422_proxy Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/tests/ref/fate/prores-alpha -> omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/fate/prores-alpha Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/tests/ref/fate/prores-alpha_skip -> omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/fate/prores-alpha_skip Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/tests/ref/fate/prores-transparency -> omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/fate/prores-transparency Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/tests/ref/fate/prores-transparency_skip -> omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/fate/prores-transparency_skip Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/tests/ref/fate/sub-movtextenc -> omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/fate/sub-movtextenc Changed

omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/fate/vcr2 Added

@@ -0,0 +1,158 @@
+#tb 0: 12/539
+0,          0,          0,        1,    38016, 0x50e93e0d
+0,          3,          3,        1,    38016, 0x6ac8627d
+0,          6,          6,        1,    38016, 0x6f38661e
+0,          9,          9,        1,    38016, 0x18bb3e23
+0,         12,         12,        1,    38016, 0x2029f4da
+0,         15,         15,        1,    38016, 0xa981eeb9
+0,         18,         18,        1,    38016, 0x65c636ef
+0,         21,         21,        1,    38016, 0x8218f178
+0,         24,         24,        1,    38016, 0xc3986e18
+0,         27,         27,        1,    38016, 0xac871f50
+0,         30,         30,        1,    38016, 0xe83ed617
+0,         33,         33,        1,    38016, 0xe87c4132
+0,         36,         36,        1,    38016, 0x9e03c321
+0,         39,         39,        1,    38016, 0x81f06a6e
+0,         42,         42,        1,    38016, 0x4ce15039
+0,         45,         45,        1,    38016, 0x398dfbdd
+0,         48,         48,        1,    38016, 0x3049218c
+0,         51,         51,        1,    38016, 0x6d90bb3f
+0,         54,         54,        1,    38016, 0x5b61ae57
+0,         57,         57,        1,    38016, 0xaf17011d
+0,         60,         60,        1,    38016, 0xb6c13da6
+0,         63,         63,        1,    38016, 0xb58135cf
+0,         66,         66,        1,    38016, 0x051c33ce
+0,         69,         69,        1,    38016, 0xda950393
+0,         72,         72,        1,    38016, 0x76f7ea61
+0,         75,         75,        1,    38016, 0xcba6f5c8
+0,         78,         78,        1,    38016, 0x2ac20405
+0,         81,         81,        1,    38016, 0x6c790a1b
+0,         84,         84,        1,    38016, 0x8525413b
+0,         87,         87,        1,    38016, 0xef2e46a5
+0,         90,         90,        1,    38016, 0x32c16c28
+0,         93,         93,        1,    38016, 0x9fb0755f
+0,         96,         96,        1,    38016, 0xdfd7a1e2
+0,         99,         99,        1,    38016, 0xa91eb2d0
+0,        102,        102,        1,    38016, 0xb7bed869
+0,        105,        105,        1,    38016, 0x0263da70
+0,        108,        108,        1,    38016, 0x1403cf83
+0,        111,        111,        1,    38016, 0xb766f81a
+0,        114,        114,        1,    38016, 0x85abd4e0
+0,        117,        117,        1,    38016, 0xfc30c171
+0,        120,        120,        1,    38016, 0xb53bb9e5
+0,        123,        123,        1,    38016, 0xe93ca93c
+0,        126,        126,        1,    38016, 0xfa9db507
+0,        129,        129,        1,    38016, 0xd4da8492
+0,        132,        132,        1,    38016, 0x951cb041
+0,        135,        135,        1,    38016, 0x64fb9a09
+0,        138,        138,        1,    38016, 0x8f89b841
+0,        141,        141,        1,    38016, 0x9ee4b6df
+0,        144,        144,        1,    38016, 0xd733ae27
+0,        147,        147,        1,    38016, 0x2a1ab87d
+0,        150,        150,        1,    38016, 0x4853bf88
+0,        153,        153,        1,    38016, 0x701da865
+0,        156,        156,        1,    38016, 0x074d8248
+0,        159,        159,        1,    38016, 0xa1b4b019
+0,        162,        162,        1,    38016, 0x33f798c7
+0,        165,        165,        1,    38016, 0x5091bd66
+0,        168,        168,        1,    38016, 0x9dc0bf08
+0,        171,        171,        1,    38016, 0x83cff4c3
+0,        174,        174,        1,    38016, 0xce551295
+0,        177,        177,        1,    38016, 0x3c334a45
+0,        180,        180,        1,    38016, 0xd6e669ae
+0,        183,        183,        1,    38016, 0x08817cb0
+0,        186,        186,        1,    38016, 0x3d399508
+0,        189,        189,        1,    38016, 0xaf49a306
+0,        192,        192,        1,    38016, 0x6b77e02c
+0,        195,        195,        1,    38016, 0x34a6cc72
+0,        198,        198,        1,    38016, 0x0303e6bb
+0,        201,        201,        1,    38016, 0x3995eee2
+0,        204,        204,        1,    38016, 0x8eefd136
+0,        207,        207,        1,    38016, 0xd69ad171
+0,        210,        210,        1,    38016, 0xed98bff6
+0,        213,        213,        1,    38016, 0x606ba5ef
+0,        216,        216,        1,    38016, 0xbce4afaa
+0,        219,        219,        1,    38016, 0xa5baac40
+0,        222,        222,        1,    38016, 0x7a15929f
+0,        225,        225,        1,    38016, 0x0374cdec
+0,        228,        228,        1,    38016, 0xf482e941
+0,        231,        231,        1,    38016, 0xced1c9e3
+0,        234,        234,        1,    38016, 0x638fd91f
+0,        237,        237,        1,    38016, 0xced5d802
+0,        240,        240,        1,    38016, 0x330adeeb
+0,        243,        243,        1,    38016, 0x7a70f93e
+0,        246,        246,        1,    38016, 0x25c0dac1
+0,        249,        249,        1,    38016, 0x6f9401cf
+0,        252,        252,        1,    38016, 0x01632a5b
+0,        255,        255,        1,    38016, 0x6eedd857
+0,        258,        258,        1,    38016, 0xcfad1017
+0,        261,        261,        1,    38016, 0x38071e53
+0,        264,        264,        1,    38016, 0xc7c3013f
+0,        267,        267,        1,    38016, 0x1f41fe19
+0,        270,        270,        1,    38016, 0x9662e170
+0,        273,        273,        1,    38016, 0xec19ecfc
+0,        276,        276,        1,    38016, 0xab419765
+0,        279,        279,        1,    38016, 0xe784d98b
+0,        282,        282,        1,    38016, 0x93c1a4bf
+0,        285,        285,        1,    38016, 0xf2e4c9b4
+0,        288,        288,        1,    38016, 0x7cb6c1ff
+0,        291,        291,        1,    38016, 0x6fb36837
+0,        294,        294,        1,    38016, 0x6fb64665
+0,        297,        297,        1,    38016, 0xf24eaba9
+0,        300,        300,        1,    38016, 0x3866d28b
+0,        303,        303,        1,    38016, 0x807e829c
+0,        306,        306,        1,    38016, 0xf25fcbbb
+0,        309,        309,        1,    38016, 0xc28ba68f
+0,        312,        312,        1,    38016, 0x65ef8def
+0,        315,        315,        1,    38016, 0xc4646ee4
+0,        318,        318,        1,    38016, 0x3cb76962
+0,        321,        321,        1,    38016, 0xe5500136
+0,        324,        324,        1,    38016, 0xb086aa05
+0,        327,        327,        1,    38016, 0xde9fd4c3
+0,        330,        330,        1,    38016, 0xcae0d11b
+0,        333,        333,        1,    38016, 0x6cd3ee1a
+0,        336,        336,        1,    38016, 0x38981b85
+0,        339,        339,        1,    38016, 0xbe742f68
+0,        342,        342,        1,    38016, 0x29c41fc7
+0,        345,        345,        1,    38016, 0x43612eaf
+0,        348,        348,        1,    38016, 0x199dba2f
+0,        351,        351,        1,    38016, 0xb434f64d
+0,        354,        354,        1,    38016, 0x36f2fd8c
+0,        357,        357,        1,    38016, 0xc1075321
+0,        360,        360,        1,    38016, 0x7eabeab8
+0,        363,        363,        1,    38016, 0x7fcd5127
+0,        366,        366,        1,    38016, 0x37ddb544
+0,        369,        369,        1,    38016, 0x5dee2700
+0,        372,        372,        1,    38016, 0x46deb355
+0,        375,        375,        1,    38016, 0xb2496a7c
+0,        378,        378,        1,    38016, 0xfaf3b134
+0,        381,        381,        1,    38016, 0x42e9dbe1
+0,        384,        384,        1,    38016, 0x699fc6e0
+0,        387,        387,        1,    38016, 0x43ba68ae
+0,        390,        390,        1,    38016, 0xffd21579
+0,        393,        393,        1,    38016, 0xdd979741
+0,        396,        396,        1,    38016, 0x789c89aa
+0,        399,        399,        1,    38016, 0x40be024e
+0,        402,        402,        1,    38016, 0xa60c291d
+0,        405,        405,        1,    38016, 0xa8d253e9
+0,        408,        408,        1,    38016, 0x16d7f60e
+0,        411,        411,        1,    38016, 0xf1d21a57
+0,        414,        414,        1,    38016, 0x5e80e3bd
+0,        417,        417,        1,    38016, 0xceec0529
+0,        420,        420,        1,    38016, 0x1ff9c462
+0,        423,        423,        1,    38016, 0x51c168d2
+0,        426,        426,        1,    38016, 0xf61f2059
+0,        429,        429,        1,    38016, 0xb22fa794
+0,        432,        432,        1,    38016, 0xb81ec7d5
+0,        435,        435,        1,    38016, 0x7555d1df
+0,        438,        438,        1,    38016, 0x860d9de3
+0,        441,        441,        1,    38016, 0x9b19a66f
+0,        444,        444,        1,    38016, 0xec52d405
+0,        447,        447,        1,    38016, 0x2da4d05b
+0,        450,        450,        1,    38016, 0xf15bf060
+0,        453,        453,        1,    38016, 0xfabcc24a
+0,        456,        456,        1,    38016, 0xc159f63a
+0,        459,        459,        1,    38016, 0x0b97fcc1
+0,        462,        462,        1,    38016, 0xe0c063a2
+0,        465,        465,        1,    38016, 0x7bda9bec
+0,        468,        468,        1,    38016, 0xbe99a923

omxplayer-2014.02.11.tar.gz/ffmpeg/tests/ref/fate/vp8-alpha -> omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/fate/vp8-alpha Changed

@@ -1,121 +1,121 @@
 #tb 0: 1/1000
-0,          1,          1,        0,     2108, 0x59b92a34, S=1,     1900, 0x8fb3adc5
-0,         33,         33,        0,      142, 0x2f2a3fed, F=0x0, S=1,      160, 0xa13346af
-0,         66,         66,        0,      157, 0x17804767, F=0x0, S=1,      209, 0x64115f15
-0,        100,        100,        0,      206, 0x537262ca, F=0x0, S=1,      317, 0x44a09dd0
-0,        133,        133,        0,      259, 0x73ff74b6, F=0x0, S=1,      384, 0x2ee2c588
-0,        166,        166,        0,      320, 0x0fcf8ce4, F=0x0, S=1,      415, 0xff68c953
-0,        200,        200,        0,      377, 0x8fffb5f5, F=0x0, S=1,      475, 0x4166f3eb
-0,        233,        233,        0,      407, 0xe476c19e, F=0x0, S=1,      193, 0x3ff75489
-0,        266,        266,        0,      539, 0x90202334, F=0x0, S=1,      681, 0x776656b0
-0,        300,        300,        0,      560, 0xc6e2168d, F=0x0, S=1,      585, 0xddc81b8a
-0,        333,        333,        0,      597, 0x201a32a7, F=0x0, S=1,      574, 0x8baa1d65
-0,        366,        366,        0,      770, 0xab2b8891, F=0x0, S=1,      666, 0xcd8e51eb
-0,        400,        400,        0,      708, 0xc2386711, F=0x0, S=1,      706, 0x046b6444
-0,        433,        433,        0,      905, 0x7211c52d, F=0x0, S=1,      814, 0x5e288def
-0,        466,        466,        0,      770, 0xda4f8574, F=0x0, S=1,      829, 0xa0e8a949
-0,        500,        500,        0,      955, 0xf9a1d77a, F=0x0, S=1,      857, 0x9b63b955
-0,        533,        533,        0,      970, 0xff4de39a, F=0x0, S=1,      153, 0x3b00416c
-0,        566,        566,        0,      978, 0x12bcf81f, F=0x0, S=1,     1181, 0xce175555
-0,        600,        600,        0,     1233, 0x2903744a, F=0x0, S=1,      860, 0x737eb566
-0,        633,        633,        0,     1118, 0x7f274f50, F=0x0, S=1,      933, 0xb669c6b6
-0,        666,        666,        0,      941, 0x6bffd4b1, F=0x0, S=1,     1058, 0x07581cee
-0,        700,        700,        0,     1598, 0xc007219f, F=0x0, S=1,      939, 0x2c0bdc45
-0,        733,        733,        0,     1218, 0x25d962b6, F=0x0, S=1,     1090, 0x96482341
-0,        766,        766,        0,     1200, 0x86b85be3, F=0x0, S=1,      189, 0x3f085309
-0,        800,        800,        0,     1329, 0x298a848a, F=0x0, S=1,     1426, 0x6ea3df12
-0,        833,        833,        0,     1500, 0xe437edec, F=0x0, S=1,     1244, 0x32836b8d
-0,        866,        866,        0,     1288, 0xc4447dd5, F=0x0, S=1,     1289, 0x06a57b0f
-0,        900,        900,        0,     1281, 0xb5bf7e9f, F=0x0, S=1,     1227, 0xd96d5697
-0,        933,        933,        0,     1372, 0x09be9014, F=0x0, S=1,     1556, 0x2630fbff
-0,        966,        966,        0,     1238, 0x42ce6316, F=0x0, S=1,     1287, 0x1d3084f6
-0,       1000,       1000,        0,     1655, 0xb94b45c2, F=0x0, S=1,     1494, 0x34dbd1a4
-0,       1033,       1033,        0,     1164, 0xf6b93ad0, F=0x0, S=1,     1337, 0xba6d9673
-0,       1066,       1066,        0,     1084, 0x58c50fb5, F=0x0, S=1,     1384, 0x3fabb82b
-0,       1100,       1100,        0,     1151, 0x0b3f3359, F=0x0, S=1,     1353, 0x08e2a1d7
-0,       1133,       1133,        0,     1277, 0xa3ae77e1, F=0x0, S=1,     1409, 0xf65cb9f7
-0,       1166,       1166,        0,      782, 0xdcf671ff, F=0x0, S=1,     1408, 0x01e2ac53
-0,       1200,       1200,        0,      926, 0xe913c286, F=0x0, S=1,     1320, 0x32e38e42
-0,       1233,       1233,        0,      970, 0x3d86e5ae, F=0x0, S=1,     1608, 0x40b52618
-0,       1266,       1266,        0,     1353, 0xe4f197b2, F=0x0, S=1,     1272, 0xf1d272a5
-0,       1300,       1300,        0,      685, 0x629b4ce4, F=0x0, S=1,     1257, 0x14845de9
-0,       1333,       1333,        0,      743, 0x6f1172a3, F=0x0, S=1,     1260, 0xa6c66fda
-0,       1366,       1366,        0,      789, 0x94fc84cd, F=0x0, S=1,     1009, 0x7daaf2b0
-0,       1400,       1400,        0,     1460, 0x668adb82, F=0x0, S=1,      944, 0x44b6ccf5
-0,       1433,       1433,        0,      766, 0x49c884ef, F=0x0, S=1,      996, 0x8646e6dd
-0,       1466,       1466,        0,     1037, 0x24831498, F=0x0, S=1,      983, 0x14a9e7a6
-0,       1500,       1500,        0,      943, 0x1f53d180, F=0x0, S=1,     1107, 0x02f72acb
-0,       1533,       1533,        0,     1152, 0xbf6a35ae, F=0x0, S=1,     1026, 0xd57afda0
-0,       1566,       1566,        0,      730, 0x42806abf, F=0x0, S=1,     1029, 0xfb0402d5
-0,       1600,       1600,        0,      975, 0xa5ffec57, F=0x0, S=1,     1081, 0xe2890cea
-0,       1633,       1633,        0,      970, 0xbe8ee224, F=0x0, S=1,     1151, 0x7b0d3b20
-0,       1666,       1666,        0,     1012, 0x20c6f0d8, F=0x0, S=1,      979, 0xc25cd69c
-0,       1700,       1700,        0,      874, 0x1a2fb4da, F=0x0, S=1,      943, 0xdb2dc9f8
-0,       1733,       1733,        0,      869, 0xab0caf3d, F=0x0, S=1,      934, 0x48b9bfcc
-0,       1766,       1766,        0,      863, 0xd8caa2e5, F=0x0, S=1,      874, 0x0b34b026
-0,       1800,       1800,        0,     1246, 0x47866cdc, F=0x0, S=1,      818, 0x0c908eeb
-0,       1833,       1833,        0,      742, 0xa6296ac1, F=0x0, S=1,      921, 0x97b6b053
-0,       1866,       1866,        0,      828, 0x0b568d7a, F=0x0, S=1,      969, 0x3314dbfa
-0,       1900,       1900,        0,      825, 0x6d329394, F=0x0, S=1,      982, 0x5f66e68c
-0,       1933,       1933,        0,      836, 0x8ace8dfb, F=0x0, S=1,      929, 0x9ffdc2fd
-0,       1966,       1966,        0,     1774, 0xd4686726, F=0x0, S=1,      909, 0x11a9c07a
-0,       2000,       2000,        0,     1803, 0x08c879ce, F=0x0, S=1,     1525, 0x1e11f02f
-0,       2033,       2033,        0,      518, 0x7c32fc72, F=0x0, S=1,      785, 0xfc1f792a
-0,       2066,       2066,        0,      790, 0x3dac8aa0, F=0x0, S=1,      876, 0x0918c88d
-0,       2100,       2100,        0,      927, 0x4feccb24, F=0x0, S=1,     1059, 0xbcaa05c7
-0,       2133,       2133,        0,      835, 0x29d39266, F=0x0, S=1,      980, 0x4913e409
-0,       2166,       2166,        0,      951, 0xc1dddd12, F=0x0, S=1,     1041, 0x0541047e
-0,       2200,       2200,        0,      876, 0x2f6eb89d, F=0x0, S=1,      949, 0x2d56c53b
-0,       2233,       2233,        0,      959, 0xf0dedabd, F=0x0, S=1,     1022, 0x8d33f5fa
-0,       2266,       2266,        0,      860, 0x9274ab39, F=0x0, S=1,     1061, 0x289c0132
-0,       2300,       2300,        0,      863, 0x7058ba30, F=0x0, S=1,      940, 0x1f32d4a3
-0,       2333,       2333,        0,     1021, 0xcabdf84f, F=0x0, S=1,      887, 0xda8ab95e
-0,       2366,       2366,        0,      897, 0x9867c8e8, F=0x0, S=1,      840, 0xd93eaaf5
-0,       2400,       2400,        0,      897, 0x6a16b5db, F=0x0, S=1,      977, 0x7b77dc9b
-0,       2433,       2433,        0,      953, 0xe9b4cf1f, F=0x0, S=1,      921, 0x75a8ca45
-0,       2466,       2466,        0,      847, 0x0335ad37, F=0x0, S=1,     1000, 0x2691f3bd
-0,       2500,       2500,        0,      902, 0x3360b315, F=0x0, S=1,     1008, 0xd5e1deb6
-0,       2533,       2533,        0,      881, 0xf5309d59, F=0x0, S=1,     1113, 0xdbef3065
-0,       2566,       2566,        0,      974, 0x7c2de3ce, F=0x0, S=1,     1086, 0x365626bb
-0,       2600,       2600,        0,      974, 0xf42bd9f5, F=0x0, S=1,     1039, 0xa7e9060d
-0,       2633,       2633,        0,     1029, 0x7c33f4d0, F=0x0, S=1,     1041, 0xf4affa59
-0,       2666,       2666,        0,      881, 0x9021a565, F=0x0, S=1,     1039, 0xc1e00521
-0,       2700,       2700,        0,     1157, 0xe1c136f7, F=0x0, S=1,      917, 0x357ac7d3
-0,       2733,       2733,        0,      649, 0xdffb3cb7, F=0x0, S=1,      976, 0xa386e05e
-0,       2766,       2766,        0,      758, 0xb67875f3, F=0x0, S=1,     1041, 0xae4e0a63
-0,       2800,       2800,        0,     1105, 0x8ffb1a26, F=0x0, S=1,      962, 0x211ddc5e
-0,       2833,       2833,        0,      866, 0xa60eb2d9, F=0x0, S=1,      929, 0xe9e4c84b
-0,       2866,       2866,        0,      912, 0xcd34bf9b, F=0x0, S=1,      946, 0xfce9d359
-0,       2900,       2900,        0,      868, 0x5651a343, F=0x0, S=1,      809, 0x624a8ef9
-0,       2933,       2933,        0,      997, 0xfa66eaeb, F=0x0, S=1,      992, 0xc913e5e2
-0,       2966,       2966,        0,     1111, 0x3f272497, F=0x0, S=1,     1007, 0xf78ee6a7
-0,       3000,       3000,        0,      842, 0xe442999f, F=0x0, S=1,      972, 0x25a0d25c
-0,       3033,       3033,        0,     1030, 0x6f97ffad, F=0x0, S=1,      993, 0x4059fd6b
-0,       3066,       3066,        0,     1176, 0x66e64926, F=0x0, S=1,      951, 0x2762cdf1
-0,       3100,       3100,        0,      803, 0xfd1699cb, F=0x0, S=1,      959, 0x5cf9d56c
-0,       3133,       3133,        0,      972, 0x1cdff00e, F=0x0, S=1,     1023, 0xeaf20900
-0,       3166,       3166,        0,      907, 0x17f8acca, F=0x0, S=1,     1054, 0xeb010c4d
-0,       3200,       3200,        0,      915, 0x3569b545, F=0x0, S=1,      987, 0x73b2e159
-0,       3233,       3233,        0,     1021, 0x14c5076a, F=0x0, S=1,     1007, 0x6c4bf7f0
-0,       3266,       3266,        0,      837, 0xbf86b0ef, F=0x0, S=1,      963, 0xf472d31a
-0,       3300,       3300,        0,      885, 0x1caac123, F=0x0, S=1,     1052, 0x2b7bfd20
-0,       3333,       3333,        0,     1355, 0x299e8d3c, F=0x0, S=1,      858, 0x2bbca3f0
-0,       3366,       3366,        0,      784, 0xb0bd7e9d, F=0x0, S=1,      969, 0xc865dc00
-0,       3400,       3400,        0,      991, 0xbc7ddda9, F=0x0, S=1,     1028, 0x801b00a6
-0,       3433,       3433,        0,      986, 0xb356f6b1, F=0x0, S=1,     1056, 0x8b840add
-0,       3466,       3466,        0,      978, 0x94a3e87e, F=0x0, S=1,     1018, 0xe766fa52
-0,       3500,       3500,        0,      976, 0x55ddd14a, F=0x0, S=1,      992, 0x58a9ddfe
-0,       3533,       3533,        0,     1241, 0x1ec867f7, F=0x0, S=1,      966, 0xa329e84f
-0,       3566,       3566,        0,      975, 0xecf5dbb3, F=0x0, S=1,      899, 0xa7539f4d
-0,       3600,       3600,        0,     1129, 0xb7243037, F=0x0, S=1,     1057, 0xbd0d10bd
-0,       3633,       3633,        0,      913, 0xe5f1d03d, F=0x0, S=1,     1092, 0xeb9621f8
-0,       3666,       3666,        0,      943, 0x87d0ed78, F=0x0, S=1,     1057, 0x079c1054
-0,       3700,       3700,        0,      917, 0x536cc3fd, F=0x0, S=1,      946, 0xd2b9d0e2
-0,       3733,       3733,        0,      892, 0x4dffb1e2, F=0x0, S=1,      930, 0x70c9cc40
-0,       3766,       3766,        0,      957, 0x1a98e71c, F=0x0, S=1,      719, 0x6fec614a
-0,       3800,       3800,        0,      893, 0xf405b2c3, F=0x0, S=1,      821, 0x63529cab
-0,       3833,       3833,        0,      978, 0xa0a8d5f6, F=0x0, S=1,      745, 0x3c616219
-0,       3866,       3866,        0,      887, 0xfa7cb65d, F=0x0, S=1,      768, 0xb8f07885
-0,       3900,       3900,        0,      867, 0xd808ade7, F=0x0, S=1,      783, 0xf82b6b9a
-0,       3933,       3933,        0,     1068, 0x6f8b135a, F=0x0, S=1,      807, 0x52028d50
-0,       3966,       3966,        0,     2010, 0x536fe0b6, F=0x0, S=1,     1512, 0x690aeb55
+0,          0,          0,        0,     2108, 0x59b92a34, S=1,     1900, 0x8fb3adc5
+0,         32,         32,        0,      142, 0x2f2a3fed, F=0x0, S=1,      160, 0xa13346af
+0,         65,         65,        0,      157, 0x17804767, F=0x0, S=1,      209, 0x64115f15
+0,         99,         99,        0,      206, 0x537262ca, F=0x0, S=1,      317, 0x44a09dd0
+0,        132,        132,        0,      259, 0x73ff74b6, F=0x0, S=1,      384, 0x2ee2c588
+0,        165,        165,        0,      320, 0x0fcf8ce4, F=0x0, S=1,      415, 0xff68c953
+0,        199,        199,        0,      377, 0x8fffb5f5, F=0x0, S=1,      475, 0x4166f3eb
+0,        232,        232,        0,      407, 0xe476c19e, F=0x0, S=1,      193, 0x3ff75489
+0,        265,        265,        0,      539, 0x90202334, F=0x0, S=1,      681, 0x776656b0
+0,        299,        299,        0,      560, 0xc6e2168d, F=0x0, S=1,      585, 0xddc81b8a
+0,        332,        332,        0,      597, 0x201a32a7, F=0x0, S=1,      574, 0x8baa1d65
+0,        365,        365,        0,      770, 0xab2b8891, F=0x0, S=1,      666, 0xcd8e51eb
+0,        399,        399,        0,      708, 0xc2386711, F=0x0, S=1,      706, 0x046b6444
+0,        432,        432,        0,      905, 0x7211c52d, F=0x0, S=1,      814, 0x5e288def
+0,        465,        465,        0,      770, 0xda4f8574, F=0x0, S=1,      829, 0xa0e8a949
+0,        499,        499,        0,      955, 0xf9a1d77a, F=0x0, S=1,      857, 0x9b63b955
+0,        532,        532,        0,      970, 0xff4de39a, F=0x0, S=1,      153, 0x3b00416c
+0,        565,        565,        0,      978, 0x12bcf81f, F=0x0, S=1,     1181, 0xce175555
+0,        599,        599,        0,     1233, 0x2903744a, F=0x0, S=1,      860, 0x737eb566
+0,        632,        632,        0,     1118, 0x7f274f50, F=0x0, S=1,      933, 0xb669c6b6
+0,        665,        665,        0,      941, 0x6bffd4b1, F=0x0, S=1,     1058, 0x07581cee
+0,        699,        699,        0,     1598, 0xc007219f, F=0x0, S=1,      939, 0x2c0bdc45
+0,        732,        732,        0,     1218, 0x25d962b6, F=0x0, S=1,     1090, 0x96482341
+0,        765,        765,        0,     1200, 0x86b85be3, F=0x0, S=1,      189, 0x3f085309
+0,        799,        799,        0,     1329, 0x298a848a, F=0x0, S=1,     1426, 0x6ea3df12
+0,        832,        832,        0,     1500, 0xe437edec, F=0x0, S=1,     1244, 0x32836b8d
+0,        865,        865,        0,     1288, 0xc4447dd5, F=0x0, S=1,     1289, 0x06a57b0f
+0,        899,        899,        0,     1281, 0xb5bf7e9f, F=0x0, S=1,     1227, 0xd96d5697
+0,        932,        932,        0,     1372, 0x09be9014, F=0x0, S=1,     1556, 0x2630fbff
+0,        965,        965,        0,     1238, 0x42ce6316, F=0x0, S=1,     1287, 0x1d3084f6
+0,        999,        999,        0,     1655, 0xb94b45c2, F=0x0, S=1,     1494, 0x34dbd1a4
+0,       1032,       1032,        0,     1164, 0xf6b93ad0, F=0x0, S=1,     1337, 0xba6d9673
+0,       1065,       1065,        0,     1084, 0x58c50fb5, F=0x0, S=1,     1384, 0x3fabb82b
+0,       1099,       1099,        0,     1151, 0x0b3f3359, F=0x0, S=1,     1353, 0x08e2a1d7
+0,       1132,       1132,        0,     1277, 0xa3ae77e1, F=0x0, S=1,     1409, 0xf65cb9f7
+0,       1165,       1165,        0,      782, 0xdcf671ff, F=0x0, S=1,     1408, 0x01e2ac53
+0,       1199,       1199,        0,      926, 0xe913c286, F=0x0, S=1,     1320, 0x32e38e42
+0,       1232,       1232,        0,      970, 0x3d86e5ae, F=0x0, S=1,     1608, 0x40b52618
+0,       1265,       1265,        0,     1353, 0xe4f197b2, F=0x0, S=1,     1272, 0xf1d272a5
+0,       1299,       1299,        0,      685, 0x629b4ce4, F=0x0, S=1,     1257, 0x14845de9
+0,       1332,       1332,        0,      743, 0x6f1172a3, F=0x0, S=1,     1260, 0xa6c66fda
+0,       1365,       1365,        0,      789, 0x94fc84cd, F=0x0, S=1,     1009, 0x7daaf2b0
+0,       1399,       1399,        0,     1460, 0x668adb82, F=0x0, S=1,      944, 0x44b6ccf5
+0,       1432,       1432,        0,      766, 0x49c884ef, F=0x0, S=1,      996, 0x8646e6dd
+0,       1465,       1465,        0,     1037, 0x24831498, F=0x0, S=1,      983, 0x14a9e7a6
+0,       1499,       1499,        0,      943, 0x1f53d180, F=0x0, S=1,     1107, 0x02f72acb
+0,       1532,       1532,        0,     1152, 0xbf6a35ae, F=0x0, S=1,     1026, 0xd57afda0
+0,       1565,       1565,        0,      730, 0x42806abf, F=0x0, S=1,     1029, 0xfb0402d5
+0,       1599,       1599,        0,      975, 0xa5ffec57, F=0x0, S=1,     1081, 0xe2890cea
+0,       1632,       1632,        0,      970, 0xbe8ee224, F=0x0, S=1,     1151, 0x7b0d3b20
+0,       1665,       1665,        0,     1012, 0x20c6f0d8, F=0x0, S=1,      979, 0xc25cd69c
+0,       1699,       1699,        0,      874, 0x1a2fb4da, F=0x0, S=1,      943, 0xdb2dc9f8
+0,       1732,       1732,        0,      869, 0xab0caf3d, F=0x0, S=1,      934, 0x48b9bfcc
+0,       1765,       1765,        0,      863, 0xd8caa2e5, F=0x0, S=1,      874, 0x0b34b026
+0,       1799,       1799,        0,     1246, 0x47866cdc, F=0x0, S=1,      818, 0x0c908eeb
+0,       1832,       1832,        0,      742, 0xa6296ac1, F=0x0, S=1,      921, 0x97b6b053
+0,       1865,       1865,        0,      828, 0x0b568d7a, F=0x0, S=1,      969, 0x3314dbfa
+0,       1899,       1899,        0,      825, 0x6d329394, F=0x0, S=1,      982, 0x5f66e68c
+0,       1932,       1932,        0,      836, 0x8ace8dfb, F=0x0, S=1,      929, 0x9ffdc2fd
+0,       1965,       1965,        0,     1774, 0xd4686726, F=0x0, S=1,      909, 0x11a9c07a
+0,       1999,       1999,        0,     1803, 0x08c879ce, F=0x0, S=1,     1525, 0x1e11f02f
+0,       2032,       2032,        0,      518, 0x7c32fc72, F=0x0, S=1,      785, 0xfc1f792a
+0,       2065,       2065,        0,      790, 0x3dac8aa0, F=0x0, S=1,      876, 0x0918c88d
+0,       2099,       2099,        0,      927, 0x4feccb24, F=0x0, S=1,     1059, 0xbcaa05c7
+0,       2132,       2132,        0,      835, 0x29d39266, F=0x0, S=1,      980, 0x4913e409
+0,       2165,       2165,        0,      951, 0xc1dddd12, F=0x0, S=1,     1041, 0x0541047e
+0,       2199,       2199,        0,      876, 0x2f6eb89d, F=0x0, S=1,      949, 0x2d56c53b
+0,       2232,       2232,        0,      959, 0xf0dedabd, F=0x0, S=1,     1022, 0x8d33f5fa
+0,       2265,       2265,        0,      860, 0x9274ab39, F=0x0, S=1,     1061, 0x289c0132
+0,       2299,       2299,        0,      863, 0x7058ba30, F=0x0, S=1,      940, 0x1f32d4a3
+0,       2332,       2332,        0,     1021, 0xcabdf84f, F=0x0, S=1,      887, 0xda8ab95e
+0,       2365,       2365,        0,      897, 0x9867c8e8, F=0x0, S=1,      840, 0xd93eaaf5
+0,       2399,       2399,        0,      897, 0x6a16b5db, F=0x0, S=1,      977, 0x7b77dc9b
+0,       2432,       2432,        0,      953, 0xe9b4cf1f, F=0x0, S=1,      921, 0x75a8ca45
+0,       2465,       2465,        0,      847, 0x0335ad37, F=0x0, S=1,     1000, 0x2691f3bd
+0,       2499,       2499,        0,      902, 0x3360b315, F=0x0, S=1,     1008, 0xd5e1deb6
+0,       2532,       2532,        0,      881, 0xf5309d59, F=0x0, S=1,     1113, 0xdbef3065
+0,       2565,       2565,        0,      974, 0x7c2de3ce, F=0x0, S=1,     1086, 0x365626bb
+0,       2599,       2599,        0,      974, 0xf42bd9f5, F=0x0, S=1,     1039, 0xa7e9060d
+0,       2632,       2632,        0,     1029, 0x7c33f4d0, F=0x0, S=1,     1041, 0xf4affa59
+0,       2665,       2665,        0,      881, 0x9021a565, F=0x0, S=1,     1039, 0xc1e00521
+0,       2699,       2699,        0,     1157, 0xe1c136f7, F=0x0, S=1,      917, 0x357ac7d3
+0,       2732,       2732,        0,      649, 0xdffb3cb7, F=0x0, S=1,      976, 0xa386e05e
+0,       2765,       2765,        0,      758, 0xb67875f3, F=0x0, S=1,     1041, 0xae4e0a63
+0,       2799,       2799,        0,     1105, 0x8ffb1a26, F=0x0, S=1,      962, 0x211ddc5e
+0,       2832,       2832,        0,      866, 0xa60eb2d9, F=0x0, S=1,      929, 0xe9e4c84b
+0,       2865,       2865,        0,      912, 0xcd34bf9b, F=0x0, S=1,      946, 0xfce9d359
+0,       2899,       2899,        0,      868, 0x5651a343, F=0x0, S=1,      809, 0x624a8ef9
+0,       2932,       2932,        0,      997, 0xfa66eaeb, F=0x0, S=1,      992, 0xc913e5e2
+0,       2965,       2965,        0,     1111, 0x3f272497, F=0x0, S=1,     1007, 0xf78ee6a7
+0,       2999,       2999,        0,      842, 0xe442999f, F=0x0, S=1,      972, 0x25a0d25c
+0,       3032,       3032,        0,     1030, 0x6f97ffad, F=0x0, S=1,      993, 0x4059fd6b
+0,       3065,       3065,        0,     1176, 0x66e64926, F=0x0, S=1,      951, 0x2762cdf1
+0,       3099,       3099,        0,      803, 0xfd1699cb, F=0x0, S=1,      959, 0x5cf9d56c
+0,       3132,       3132,        0,      972, 0x1cdff00e, F=0x0, S=1,     1023, 0xeaf20900
+0,       3165,       3165,        0,      907, 0x17f8acca, F=0x0, S=1,     1054, 0xeb010c4d
+0,       3199,       3199,        0,      915, 0x3569b545, F=0x0, S=1,      987, 0x73b2e159
+0,       3232,       3232,        0,     1021, 0x14c5076a, F=0x0, S=1,     1007, 0x6c4bf7f0
+0,       3265,       3265,        0,      837, 0xbf86b0ef, F=0x0, S=1,      963, 0xf472d31a
+0,       3299,       3299,        0,      885, 0x1caac123, F=0x0, S=1,     1052, 0x2b7bfd20
+0,       3332,       3332,        0,     1355, 0x299e8d3c, F=0x0, S=1,      858, 0x2bbca3f0
+0,       3365,       3365,        0,      784, 0xb0bd7e9d, F=0x0, S=1,      969, 0xc865dc00
+0,       3399,       3399,        0,      991, 0xbc7ddda9, F=0x0, S=1,     1028, 0x801b00a6
+0,       3432,       3432,        0,      986, 0xb356f6b1, F=0x0, S=1,     1056, 0x8b840add
+0,       3465,       3465,        0,      978, 0x94a3e87e, F=0x0, S=1,     1018, 0xe766fa52
+0,       3499,       3499,        0,      976, 0x55ddd14a, F=0x0, S=1,      992, 0x58a9ddfe
+0,       3532,       3532,        0,     1241, 0x1ec867f7, F=0x0, S=1,      966, 0xa329e84f
+0,       3565,       3565,        0,      975, 0xecf5dbb3, F=0x0, S=1,      899, 0xa7539f4d
+0,       3599,       3599,        0,     1129, 0xb7243037, F=0x0, S=1,     1057, 0xbd0d10bd
+0,       3632,       3632,        0,      913, 0xe5f1d03d, F=0x0, S=1,     1092, 0xeb9621f8
+0,       3665,       3665,        0,      943, 0x87d0ed78, F=0x0, S=1,     1057, 0x079c1054
+0,       3699,       3699,        0,      917, 0x536cc3fd, F=0x0, S=1,      946, 0xd2b9d0e2
+0,       3732,       3732,        0,      892, 0x4dffb1e2, F=0x0, S=1,      930, 0x70c9cc40
+0,       3765,       3765,        0,      957, 0x1a98e71c, F=0x0, S=1,      719, 0x6fec614a
+0,       3799,       3799,        0,      893, 0xf405b2c3, F=0x0, S=1,      821, 0x63529cab
+0,       3832,       3832,        0,      978, 0xa0a8d5f6, F=0x0, S=1,      745, 0x3c616219
+0,       3865,       3865,        0,      887, 0xfa7cb65d, F=0x0, S=1,      768, 0xb8f07885
+0,       3899,       3899,        0,      867, 0xd808ade7, F=0x0, S=1,      783, 0xf82b6b9a
+0,       3932,       3932,        0,     1068, 0x6f8b135a, F=0x0, S=1,      807, 0x52028d50
+0,       3965,       3965,        0,     2010, 0x536fe0b6, F=0x0, S=1,     1512, 0x690aeb55

omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/fate/vp9-parallelmode-akiyo Added

@@ -0,0 +1,30 @@
+#format: frame checksums
+#version: 1
+#hash: MD5
+#tb 0: 1001/30000
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   152064, f5bc602db15c69545307e56990f9f9f7
+0,          1,          1,        1,   152064, b56428b6f97669938c8b9b05458fca70
+0,          2,          2,        1,   152064, b56428b6f97669938c8b9b05458fca70
+0,          3,          3,        1,   152064, 3098d2eb9129beddb6975e3ae332a4ab
+0,          4,          4,        1,   152064, 6719f3a6c22f05dc53dd3906e4154bd7
+0,          5,          5,        1,   152064, 8cd9a12761e35f67c278949cd3aee88f
+0,          6,          6,        1,   152064, 8cd9a12761e35f67c278949cd3aee88f
+0,          7,          7,        1,   152064, 0160dec415234d39f148e91f72d264ab
+0,          8,          8,        1,   152064, 9f90d96d67d9e9b3716abe2a3faa854e
+0,          9,          9,        1,   152064, 1edb312f9d0be7835b964a3ffa014759
+0,         10,         10,        1,   152064, 7614fd674609afccacd355aa2f714c75
+0,         11,         11,        1,   152064, cb46868706dd246878bebf354aff66f4
+0,         12,         12,        1,   152064, da36fe96cb4956036f890bb2f6d05b98
+0,         13,         13,        1,   152064, af0a178c68b719b369c8fa8537d38e65
+0,         14,         14,        1,   152064, ff03dbc436376fc60ac240cd6c4fc518
+0,         15,         15,        1,   152064, b0bf25e139556bd9067616db7e4f47b5
+0,         16,         16,        1,   152064, e70d5480c1f82fc877bbe1a8093f807a
+0,         17,         17,        1,   152064, 622fb43e6ff63834f0f680a68b49f6e6
+0,         18,         18,        1,   152064, c331ebba15f2290f174533dbffb3c27b
+0,         19,         19,        1,   152064, 15cb153425c55f7065fb36606c48972e
+0,         20,         20,        1,   152064, b95c7699639c51b08b3615ef7fa7046c
+0,         21,         21,        1,   152064, b4774148c71c9c184bda5a18294e459c
+0,         22,         22,        1,   152064, 795b7ce4c5e0dc343bd8f80ad6c1a454
+0,         23,         23,        1,   152064, 19163601b7b6138e2940cf28f6df6c7f
+0,         24,         24,        1,   152064, b9b388e0892c52df0680a30bfa954506

omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/fate/vp9-segmentation-aq-akiyo Added

@@ -0,0 +1,30 @@
+#format: frame checksums
+#version: 1
+#hash: MD5
+#tb 0: 1001/30000
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   152064, b208eac12f0ae74a812bc9e314bdfac7
+0,          1,          1,        1,   152064, ebb2259451c3acf3ad6379d1f4092efb
+0,          2,          2,        1,   152064, 33de46060afd14aa359b7bd0d9ff1be8
+0,          3,          3,        1,   152064, 33de46060afd14aa359b7bd0d9ff1be8
+0,          4,          4,        1,   152064, 5d087d8df10fd406d59172710ea0341a
+0,          5,          5,        1,   152064, 3570ed7fb90ac9b5335b97adf0539e94
+0,          6,          6,        1,   152064, 68a8c56b889a3befc75c9ec4293c7fda
+0,          7,          7,        1,   152064, f871f7c0456f644cfb0ec896132a097f
+0,          8,          8,        1,   152064, 14e939bfeb2b878e0782a7ce68ecd214
+0,          9,          9,        1,   152064, bd3e97881ebece0f876d46d067c6a7ff
+0,         10,         10,        1,   152064, a20529c091ef3e68a901c574371224b3
+0,         11,         11,        1,   152064, 5253f16c8b0329d33d38d275124487fb
+0,         12,         12,        1,   152064, c9c2f7d8835e620709a53ff8adfe72bf
+0,         13,         13,        1,   152064, dc8f1df0d7ab8e4f9daf2ccfd96de855
+0,         14,         14,        1,   152064, d09d43208d4de7f81d54f48cff310b6f
+0,         15,         15,        1,   152064, 0dcf7212075c1f15219690ad6ffe2940
+0,         16,         16,        1,   152064, 3b52e3eb4f972318c6912dd29a95dcf3
+0,         17,         17,        1,   152064, aa1414343067749fbd743ace93553492
+0,         18,         18,        1,   152064, 6951cb7a78e0a03f9a3f6264084de6dc
+0,         19,         19,        1,   152064, 5324f2f03c4d5fe35446561af654e9ec
+0,         20,         20,        1,   152064, dff11b046a02ca34c6b1aecc857632ec
+0,         21,         21,        1,   152064, 971182c013c1524d4864fd946b8c1550
+0,         22,         22,        1,   152064, 3306f1dcd5760ba92dd9cec8bfc21b08
+0,         23,         23,        1,   152064, f1f7b13c33332fece576b4d175f91832
+0,         24,         24,        1,   152064, 9e66573fbfe847149eb32e8a9c242c18

omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/fate/vp9-segmentation-sf-akiyo Added

@@ -0,0 +1,30 @@
+#format: frame checksums
+#version: 1
+#hash: MD5
+#tb 0: 1001/30000
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   152064, f4e04a0f92fab3a52d858bb222807ac0
+0,          1,          1,        1,   152064, 493cb96b8202a1518c6c9bdb848540e4
+0,          2,          2,        1,   152064, 60b5b63f832cff119a43de82102758f4
+0,          3,          3,        1,   152064, 0d9bd42e279d480603f9c670f0a8ffe3
+0,          4,          4,        1,   152064, 25ca563f233688f32f40fec985a116a2
+0,          5,          5,        1,   152064, dd14b43d538708a91de41606703dbe1c
+0,          6,          6,        1,   152064, 01bb23cb43960ff185a97ea79936d3b4
+0,          7,          7,        1,   152064, 85045c4310ee80cd12979bdea4f3f86e
+0,          8,          8,        1,   152064, c8e015ea13359a05483de349313a6686
+0,          9,          9,        1,   152064, 8dbb0406bf6fe19c30a9c9253fcdfe7f
+0,         10,         10,        1,   152064, 84881463643069036d03e8120a5f15e9
+0,         11,         11,        1,   152064, 9abcd3f2f86ff31f8d357389b330df59
+0,         12,         12,        1,   152064, 19ada6395c4e656578d2ceeaba291bb2
+0,         13,         13,        1,   152064, fc29773a6f32eed2bfa44143f8f505b1
+0,         14,         14,        1,   152064, 5e56bd91f5e3d1457c124b5702bdc3b6
+0,         15,         15,        1,   152064, 5b920d73e301adb6c45699a209f09a33
+0,         16,         16,        1,   152064, 4d06ec294270638c6abdd1c2303b34fc
+0,         17,         17,        1,   152064, dc99797067851f74708d7e6ff54367d8
+0,         18,         18,        1,   152064, 5df68b49124219592b043916affb1311
+0,         19,         19,        1,   152064, cfb52d101fad76acb1bb0d48c513bffd
+0,         20,         20,        1,   152064, 206dbd55680b8a83d8bafe33c54c3e36
+0,         21,         21,        1,   152064, 171f2e26771db631788065eecf6c44d9
+0,         22,         22,        1,   152064, b10809dcf9ecfdb4f86a6f3236ac273e
+0,         23,         23,        1,   152064, b354107bdea9bd011b09d9f4a32d4e89
+0,         24,         24,        1,   152064, 0c18be13dc6fbf79a613f2b24bb301c1

omxplayer-2014.02.11.tar.gz/ffmpeg/tests/ref/fate/wmv8-drm -> omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/fate/wmv8-drm Changed

omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/fate/xvid-custom-matrix Added

@@ -0,0 +1,25 @@
+#format: frame checksums
+#version: 1
+#hash: MD5
+#tb 0: 1/25
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   622080, 870e846b6b001d3e34fa87df96297e28
+0,          1,          1,        1,   622080, de1a3dd9fcc32086ecdffd4591a8defa
+0,          2,          2,        1,   622080, 59f5f16d4224e98e09f22818cc9227e0
+0,          3,          3,        1,   622080, 9744609bcf95107bdbe6a9e21dc22b9d
+0,          4,          4,        1,   622080, 6dc50ad4b5821cc20f418f2eb273a45c
+0,          5,          5,        1,   622080, 57012fc77d853c17591319cc528ebd93
+0,          6,          6,        1,   622080, fd0068955ce1583f21bb888ad3b6952a
+0,          7,          7,        1,   622080, 58b7bcb056fac5d34ec4197fe10723a7
+0,          8,          8,        1,   622080, 064311346d0ea2753f01f18f13188c27
+0,          9,          9,        1,   622080, 21995e49367aee152a11992f48317bbe
+0,         10,         10,        1,   622080, 288c2cd0ac0a3b74d23da6ba30111d55
+0,         11,         11,        1,   622080, 88db7bf240fd6ee5ef89c34522de76e8
+0,         12,         12,        1,   622080, 8e2d38686bbf768e812005decc37cb90
+0,         13,         13,        1,   622080, 3a7d3c036ecaa669d26660937a8b723e
+0,         14,         14,        1,   622080, 6c8b8e847c544125213c9f49d9607d98
+0,         15,         15,        1,   622080, 16b56117f1b327862f78421116dfe52e
+0,         16,         16,        1,   622080, a7ce423456a59bdb4d5921aff1a27691
+0,         17,         17,        1,   622080, 881c9561c9ab66a7659145173f8e8cda
+0,         18,         18,        1,   622080, 7413961f9accd1d32e116592a6448e9b
+0,         21,         21,        1,   622080, c66409494fd1714e6236596f476cece6

omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/fate/xvid-idctmmx Added

@@ -0,0 +1,25 @@
+#format: frame checksums
+#version: 1
+#hash: MD5
+#tb 0: 1/25
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   622080, 8fe318df973b5d7669e6d28ebf03b229
+0,          1,          1,        1,   622080, 3568d92074e0298a2027f990004fe1a6
+0,          2,          2,        1,   622080, 4781afb6ba38318738e26a98ace4061b
+0,          3,          3,        1,   622080, bd29a005b8392005ef30211f185ca049
+0,          4,          4,        1,   622080, fc50b441ee9256883edba5a584000d66
+0,          5,          5,        1,   622080, 5fce9fb7e66c9d0773ff9c7482cb8307
+0,          6,          6,        1,   622080, 2e0ad7b1ba39e60cdd7a65ed1ed57c30
+0,          7,          7,        1,   622080, b91cfdb91751dabd6691d3c34221b636
+0,          8,          8,        1,   622080, f65507bc00043e8fe345c542f0861a64
+0,          9,          9,        1,   622080, 2e4ee4ea4ec761c2298acced17f63f35
+0,         10,         10,        1,   622080, e7945bd07296205d1549c8edf843af48
+0,         11,         11,        1,   622080, 52fed0ec02c57a138de7dc0e0c804de8
+0,         12,         12,        1,   622080, 3ee2848d0d70795e14765127111a677c
+0,         13,         13,        1,   622080, 42cb0929406b10b95817ffaa2da47335
+0,         14,         14,        1,   622080, 523986866b6cf729e130ea43feacb0a2
+0,         15,         15,        1,   622080, 5d1e4becddf728e93bbcb428de1f02ae
+0,         16,         16,        1,   622080, 0a1453df21e4547447ec8f27a0d4d5ec
+0,         17,         17,        1,   622080, d3495686e769df299b1732326fa3f17e
+0,         18,         18,        1,   622080, 602e9020397b1e82b58b1ff6b9733d21
+0,         21,         21,        1,   622080, 759bd3f739a3b99309efa5c1a697e34d

omxplayer-2014.02.11.tar.gz/ffmpeg/tests/ref/fate/zmbv-8bit -> omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/fate/zmbv-8bit Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/tests/ref/lavf-fate/ogg_vp3 -> omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/lavf-fate/ogg_vp3 Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/tests/ref/lavf/ismv -> omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/lavf/ismv Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/tests/ref/lavf/pam -> omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/lavf/pam Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/tests/ref/lavf/png -> omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/lavf/png Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/tests/ref/lavf/wtv -> omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/lavf/wtv Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/tests/ref/seek/acodec-mp2 -> omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/seek/acodec-mp2 Changed

@@ -1,6 +1,6 @@
 ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:   417
 ret: 0         st:-1 flags:0  ts:-1.000000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:   417
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:   440
 ret: 0         st:-1 flags:1  ts: 1.894167
 ret: 0         st: 0 flags:1 dts: 1.880816 pts: 1.880816 pos:  30093 size:   418
 ret: 0         st: 0 flags:0  ts: 0.788334
@@ -18,7 +18,7 @@
 ret: 0         st:-1 flags:1  ts: 1.047503
 ret: 0         st: 0 flags:1 dts: 1.044898 pts: 1.044898 pos:  16718 size:   418
 ret: 0         st: 0 flags:0  ts:-0.058330
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:   417
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:   440
 ret: 0         st: 0 flags:1  ts: 2.835837
 ret: 0         st: 0 flags:1 dts: 2.821224 pts: 2.821224 pos:  45139 size:   418
 ret: 0         st:-1 flags:0  ts: 1.730004
@@ -26,7 +26,7 @@
 ret: 0         st:-1 flags:1  ts: 0.624171
 ret: 0         st: 0 flags:1 dts: 0.600816 pts: 0.600816 pos:   9613 size:   418
 ret: 0         st: 0 flags:0  ts:-0.481662
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:   417
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:   440
 ret: 0         st: 0 flags:1  ts: 2.412505
 ret: 0         st: 0 flags:1 dts: 2.403265 pts: 2.403265 pos:  38452 size:   418
 ret: 0         st:-1 flags:0  ts: 1.306672
@@ -34,7 +34,7 @@
 ret: 0         st:-1 flags:1  ts: 0.200839
 ret: 0         st: 0 flags:1 dts: 0.182857 pts: 0.182857 pos:   2925 size:   418
 ret: 0         st: 0 flags:0  ts:-0.904994
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:   417
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:   440
 ret: 0         st: 0 flags:1  ts: 1.989173
 ret: 0         st: 0 flags:1 dts: 1.985306 pts: 1.985306 pos:  31764 size:   418
 ret: 0         st:-1 flags:0  ts: 0.883340

omxplayer-2014.02.11.tar.gz/ffmpeg/tests/ref/seek/lavf-wtv -> omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/seek/lavf-wtv Changed

@@ -1,48 +1,48 @@
-ret: 0         st: 1 flags:1 dts: 0.029093 pts: 0.029093 pos:  26344 size:   208
+ret: 0         st: 1 flags:1 dts: 0.029093 pts: 0.029093 pos:  26288 size:   208
 ret: 0         st:-1 flags:0  ts:-1.000000
-ret: 0         st: 1 flags:1 dts: 0.029093 pts: 0.029093 pos:  26344 size:   208
+ret: 0         st: 1 flags:1 dts: 0.029093 pts: 0.029093 pos:  26288 size:   208
 ret: 0         st:-1 flags:1  ts: 1.894167
-ret: 0         st: 1 flags:1 dts: 0.734399 pts: 0.734399 pos: 294744 size:   209
+ret: 0         st: 1 flags:1 dts: 0.734399 pts: 0.734399 pos: 294688 size:   209
 ret: 0         st: 0 flags:0  ts: 0.788334
-ret: 0         st: 1 flags:1 dts: 0.734399 pts: 0.734399 pos: 294744 size:   209
+ret: 0         st: 1 flags:1 dts: 0.734399 pts: 0.734399 pos: 294688 size:   209
 ret: 0         st: 0 flags:1  ts:-0.317499
-ret: 0         st: 1 flags:1 dts: 0.029093 pts: 0.029093 pos:  26344 size:   208
+ret: 0         st: 1 flags:1 dts: 0.029093 pts: 0.029093 pos:  26288 size:   208
 ret:-1         st: 1 flags:0  ts: 2.576668
 ret: 0         st: 1 flags:1  ts: 1.470835
-ret: 0         st: 1 flags:1 dts: 0.734399 pts: 0.734399 pos: 294744 size:   209
+ret: 0         st: 1 flags:1 dts: 0.734399 pts: 0.734399 pos: 294688 size:   209
 ret: 0         st:-1 flags:0  ts: 0.365002
-ret: 0         st: 1 flags:1 dts: 0.029093 pts: 0.029093 pos:  26344 size:   208
+ret: 0         st: 1 flags:1 dts: 0.029093 pts: 0.029093 pos:  26288 size:   208
 ret: 0         st:-1 flags:1  ts:-0.740831
-ret: 0         st: 1 flags:1 dts: 0.029093 pts: 0.029093 pos:  26344 size:   208
+ret: 0         st: 1 flags:1 dts: 0.029093 pts: 0.029093 pos:  26288 size:   208
 ret:-1         st: 0 flags:0  ts: 2.153336
 ret: 0         st: 0 flags:1  ts: 1.047503
-ret: 0         st: 1 flags:1 dts: 0.029093 pts: 0.029093 pos:  26344 size:   208
+ret: 0         st: 1 flags:1 dts: 0.029093 pts: 0.029093 pos:  26288 size:   208
 ret: 0         st: 1 flags:0  ts:-0.058330
-ret: 0         st: 1 flags:1 dts: 0.029093 pts: 0.029093 pos:  26344 size:   208
+ret: 0         st: 1 flags:1 dts: 0.029093 pts: 0.029093 pos:  26288 size:   208
 ret: 0         st: 1 flags:1  ts: 2.835837
-ret: 0         st: 1 flags:1 dts: 0.734399 pts: 0.734399 pos: 294744 size:   209
+ret: 0         st: 1 flags:1 dts: 0.734399 pts: 0.734399 pos: 294688 size:   209
 ret:-1         st:-1 flags:0  ts: 1.730004
 ret: 0         st:-1 flags:1  ts: 0.624171
-ret: 0         st: 1 flags:1 dts: 0.029093 pts: 0.029093 pos:  26344 size:   208
+ret: 0         st: 1 flags:1 dts: 0.029093 pts: 0.029093 pos:  26288 size:   208
 ret: 0         st: 0 flags:0  ts:-0.481662
-ret: 0         st: 1 flags:1 dts: 0.029093 pts: 0.029093 pos:  26344 size:   208
+ret: 0         st: 1 flags:1 dts: 0.029093 pts: 0.029093 pos:  26288 size:   208
 ret: 0         st: 0 flags:1  ts: 2.412505
-ret: 0         st: 1 flags:1 dts: 0.734399 pts: 0.734399 pos: 294744 size:   209
+ret: 0         st: 1 flags:1 dts: 0.734399 pts: 0.734399 pos: 294688 size:   209
 ret:-1         st: 1 flags:0  ts: 1.306672
 ret: 0         st: 1 flags:1  ts: 0.200839
-ret: 0         st: 1 flags:1 dts: 0.211950 pts: 0.211950 pos:  99352 size:   209
+ret: 0         st: 1 flags:1 dts: 0.211950 pts: 0.211950 pos:  99296 size:   209
 ret: 0         st:-1 flags:0  ts:-0.904994
-ret: 0         st: 1 flags:1 dts: 0.029093 pts: 0.029093 pos:  26344 size:   208
+ret: 0         st: 1 flags:1 dts: 0.029093 pts: 0.029093 pos:  26288 size:   208
 ret: 0         st:-1 flags:1  ts: 1.989173
-ret: 0         st: 1 flags:1 dts: 0.734399 pts: 0.734399 pos: 294744 size:   209
+ret: 0         st: 1 flags:1 dts: 0.734399 pts: 0.734399 pos: 294688 size:   209
 ret: 0         st: 0 flags:0  ts: 0.883340
-ret: 0         st: 1 flags:1 dts: 0.734399 pts: 0.734399 pos: 294744 size:   209
+ret: 0         st: 1 flags:1 dts: 0.734399 pts: 0.734399 pos: 294688 size:   209
 ret: 0         st: 0 flags:1  ts:-0.222493
-ret: 0         st: 1 flags:1 dts: 0.029093 pts: 0.029093 pos:  26344 size:   208
+ret: 0         st: 1 flags:1 dts: 0.029093 pts: 0.029093 pos:  26288 size:   208
 ret:-1         st: 1 flags:0  ts: 2.671674
 ret: 0         st: 1 flags:1  ts: 1.565841
-ret: 0         st: 1 flags:1 dts: 0.734399 pts: 0.734399 pos: 294744 size:   209
+ret: 0         st: 1 flags:1 dts: 0.734399 pts: 0.734399 pos: 294688 size:   209
 ret: 0         st:-1 flags:0  ts: 0.460008
-ret: 0         st: 1 flags:1 dts: 0.029093 pts: 0.029093 pos:  26344 size:   208
+ret: 0         st: 1 flags:1 dts: 0.029093 pts: 0.029093 pos:  26288 size:   208
 ret: 0         st:-1 flags:1  ts:-0.645825
-ret: 0         st: 1 flags:1 dts: 0.029093 pts: 0.029093 pos:  26344 size:   208
+ret: 0         st: 1 flags:1 dts: 0.029093 pts: 0.029093 pos:  26288 size:   208

omxplayer-2014.02.11.tar.gz/ffmpeg/tests/ref/vsynth/vsynth1-dnxhd-720p-10bit -> omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/vsynth/vsynth1-dnxhd-720p-10bit Changed

omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/vsynth/vsynth1-ffvhuff420p12 Added

omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/vsynth/vsynth1-ffvhuff422p10left Added

omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/vsynth/vsynth1-ffvhuff444 Added

omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/vsynth/vsynth1-ffvhuff444p16 Added

omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/vsynth/vsynth1-h261-trellis Added

omxplayer-2014.02.11.tar.gz/ffmpeg/tests/ref/vsynth/vsynth1-prores -> omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/vsynth/vsynth1-prores Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/tests/ref/vsynth/vsynth1-prores_ks -> omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/vsynth/vsynth1-prores_ks Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/tests/ref/vsynth/vsynth2-dnxhd-720p-10bit -> omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/vsynth/vsynth2-dnxhd-720p-10bit Changed

omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/vsynth/vsynth2-ffvhuff420p12 Added

omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/vsynth/vsynth2-ffvhuff422p10left Added

omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/vsynth/vsynth2-ffvhuff444 Added

omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/vsynth/vsynth2-ffvhuff444p16 Added

omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/vsynth/vsynth2-h261-trellis Added

omxplayer-2014.02.11.tar.gz/ffmpeg/tests/ref/vsynth/vsynth2-prores -> omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/vsynth/vsynth2-prores Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/tests/ref/vsynth/vsynth2-prores_ks -> omxplayer-2014.03.28.tar.gz/ffmpeg/tests/ref/vsynth/vsynth2-prores_ks Changed

omxplayer-2014.02.11.tar.gz/ffmpeg/tests/tiny_ssim.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/tests/tiny_ssim.c Changed

@@ -27,6 +27,7 @@
  * overlapped 8x8 block sums, rather than the original gaussian weights.
  */
 
+#include "config.h"
 #include <inttypes.h>
 #include <math.h>
 #include <stdio.h>
@@ -149,11 +150,31 @@
     return ssd;
 }
 
-double ssd_to_psnr( uint64_t ssd, uint64_t denom )
+static double ssd_to_psnr( uint64_t ssd, uint64_t denom )
 {
     return -10*log((double)ssd/(denom*255*255))/log(10);
 }
 
+static double ssim_db( double ssim, double weight )
+{
+    return 10*(log(weight)/log(10)-log(weight-ssim)/log(10));
+}
+
+static void print_results(uint64_t ssd[3], double ssim[3], int frames, int w, int h)
+{
+    printf( "PSNR Y:%.3f  U:%.3f  V:%.3f  All:%.3f | ",
+            ssd_to_psnr( ssd[0], (uint64_t)frames*w*h ),
+            ssd_to_psnr( ssd[1], (uint64_t)frames*w*h/4 ),
+            ssd_to_psnr( ssd[2], (uint64_t)frames*w*h/4 ),
+            ssd_to_psnr( ssd[0] + ssd[1] + ssd[2], (uint64_t)frames*w*h*3/2 ) );
+    printf( "SSIM Y:%.5f U:%.5f V:%.5f All:%.5f (%.5f)",
+            ssim[0] / frames,
+            ssim[1] / frames,
+            ssim[2] / frames,
+            (ssim[0]*4 + ssim[1] + ssim[2]) / (frames*6),
+            ssim_db(ssim[0] * 4 + ssim[1] + ssim[2], frames*6));
+}
+
 int main(int argc, char* argv[])
 {
     FILE *f[2];
@@ -188,29 +209,31 @@
 
     for( frames=0;; frames++ )
     {
+        uint64_t ssd_one[3];
+        double ssim_one[3];
         if( fread(buf[0], frame_size, 1, f[0]) != 1) break;
         if( fread(buf[1], frame_size, 1, f[1]) != 1) break;
         for( i=0; i<3; i++ )
         {
-            ssd[i]  += ssd_plane ( plane[0][i], plane[1][i], w*h>>2*!!i );
-            ssim[i] += ssim_plane( plane[0][i], w>>!!i,
-                                   plane[1][i], w>>!!i,
-                                   w>>!!i, h>>!!i, temp, NULL );
+            ssd_one[i]  = ssd_plane ( plane[0][i], plane[1][i], w*h>>2*!!i );
+            ssim_one[i] = ssim_plane( plane[0][i], w>>!!i,
+                                     plane[1][i], w>>!!i,
+                                     w>>!!i, h>>!!i, temp, NULL );
+            ssd[i] += ssd_one[i];
+            ssim[i] += ssim_one[i];
         }
+
+        printf("Frame %d | ", frames);
+        print_results(ssd_one, ssim_one, 1, w, h);
+        printf("                \r");
+        fflush(stdout);
     }
 
     if( !frames ) return 0;
 
-    printf( "PSNR Y:%.3f  U:%.3f  V:%.3f  All:%.3f\n",
-            ssd_to_psnr( ssd[0], (uint64_t)frames*w*h ),
-            ssd_to_psnr( ssd[1], (uint64_t)frames*w*h/4 ),
-            ssd_to_psnr( ssd[2], (uint64_t)frames*w*h/4 ),
-            ssd_to_psnr( ssd[0] + ssd[1] + ssd[2], (uint64_t)frames*w*h*3/2 ) );
-    printf( "SSIM Y:%.5f U:%.5f V:%.5f All:%.5f\n",
-            ssim[0] / frames,
-            ssim[1] / frames,
-            ssim[2] / frames,
-            (ssim[0]*4 + ssim[1] + ssim[2]) / (frames*6) );
+    printf("Total %d frames | ", frames);
+    print_results(ssd, ssim, frames, w, h);
+    printf("\n");
 
     return 0;
 }

omxplayer-2014.02.11.tar.gz/ffmpeg/tools/aviocat.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/tools/aviocat.c Changed

@@ -26,13 +26,13 @@
 
 static int usage(const char *argv0, int ret)
 {
-    fprintf(stderr, "%s [-b bytespersec] input_url output_url\n", argv0);
+    fprintf(stderr, "%s [-b bytespersec] [-d duration] input_url output_url\n", argv0);
     return ret;
 }
 
 int main(int argc, char **argv)
 {
-    int bps = 0, ret, i;
+    int bps = 0, duration = 0, ret, i;
     const char *input_url = NULL, *output_url = NULL;
     int64_t stream_pos = 0;
     int64_t start_time;
@@ -43,9 +43,12 @@
     avformat_network_init();
 
     for (i = 1; i < argc; i++) {
-        if (!strcmp(argv[i], "-b")) {
+        if (!strcmp(argv[i], "-b") && i + 1 < argc) {
             bps = atoi(argv[i + 1]);
             i++;
+        } else if (!strcmp(argv[i], "-d") && i + 1 < argc) {
+            duration = atoi(argv[i + 1]);
+            i++;
         } else if (!input_url) {
             input_url = argv[i];
         } else if (!output_url) {
@@ -63,6 +66,15 @@
         fprintf(stderr, "Unable to open %s: %s\n", input_url, errbuf);
         return 1;
     }
+    if (duration && !bps) {
+        int64_t size = avio_size(input);
+        if (size < 0) {
+            av_strerror(ret, errbuf, sizeof(errbuf));
+            fprintf(stderr, "Unable to get size of %s: %s\n", input_url, errbuf);
+            goto fail;
+        }
+        bps = size / duration;
+    }
     ret = avio_open2(&output, output_url, AVIO_FLAG_WRITE, NULL, NULL);
     if (ret) {
         av_strerror(ret, errbuf, sizeof(errbuf));

omxplayer-2014.03.28.tar.gz/ffmpeg/tools/gen-rc Added

@@ -0,0 +1,121 @@
+#!/bin/sh
+#
+# Copyright (c) 2012 James Almer
+# Copyright (c) 2013 Tiancheng "Timothy" Gu
+#
+# This file is part of FFmpeg.
+#
+# FFmpeg is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# FFmpeg is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with FFmpeg; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+## Help
+die() {
+    cat <<EOF >&2
+This script is used to generate Windows resources file for the FFmpeg libraries.
+The output .rc file is to be compiled by windres(1). It is mainly useful for
+FFmpeg developers to tweak and regenerate all resources files at once.
+
+Usage: $0 <libname> <comment>
+
+The script will output the file to '<libname>/<libname-without-lib>res.rc'.
+
+Example: $0 libavcodec 'FFmpeg codecs library'
+EOF
+    exit 1
+}
+
+# Script to generate all:
+# (to remove prefix '# ' and add 'tools/' as prefix: sed -r 's/^.{2}/tools\//')
+# gen-rc libavutil     "FFmpeg utility library"
+# gen-rc libavcodec    "FFmpeg codec library"
+# gen-rc libavformat   "FFmpeg container format library"
+# gen-rc libavdevice   "FFmpeg device handling library"
+# gen-rc libavfilter   "FFmpeg audio/video filtering library"
+# gen-rc libpostproc   "FFmpeg postprocessing library"
+# gen-rc libavresample "Libav audio resampling library"
+# gen-rc libswscale    "FFmpeg image rescaling library"
+# gen-rc libswresample "FFmpeg audio resampling library"
+
+## Sanity checks and argument parsing
+if test $# -lt 2 || test $# -gt 3; then
+    die
+fi
+
+name=$1
+shortname=${name#lib}
+comment=$2
+capname=`echo $name | awk '{print toupper($0)}'`
+version=${capname}_VERSION
+
+mkdir -p "$name"
+output="$name/${shortname}res.rc"
+
+## REAL magic
+cat <<EOF > $output
+/*
+ * Windows resource file for $name
+ *
+ * Copyright (C) 2012 James Almer
+ * Copyright (C) 2013 Tiancheng "Timothy" Gu
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <windows.h>
+#include "$name/version.h"
+#include "libavutil/ffversion.h"
+#include "config.h"
+
+1 VERSIONINFO
+FILEVERSION     ${version}_MAJOR, ${version}_MINOR, ${version}_MICRO, 0
+PRODUCTVERSION  ${version}_MAJOR, ${version}_MINOR, ${version}_MICRO, 0
+FILEFLAGSMASK   VS_FFI_FILEFLAGSMASK
+FILEOS          VOS_NT_WINDOWS32
+FILETYPE        VFT_DLL
+{
+    BLOCK "StringFileInfo"
+    {
+        BLOCK "040904B0"
+        {
+            VALUE "CompanyName",      "FFmpeg Project"
+            VALUE "FileDescription",  "$comment"
+            VALUE "FileVersion",      AV_STRINGIFY($version)
+            VALUE "InternalName",     "$name"
+            VALUE "LegalCopyright",   "Copyright (C) 2000-" AV_STRINGIFY(CONFIG_THIS_YEAR) " FFmpeg Project"
+            VALUE "OriginalFilename", "$shortname" BUILDSUF "-" AV_STRINGIFY(${version}_MAJOR) SLIBSUF
+            VALUE "ProductName",      "FFmpeg"
+            VALUE "ProductVersion",   FFMPEG_VERSION
+        }
+    }
+
+    BLOCK "VarFileInfo"
+    {
+        VALUE "Translation", 0x0409, 0x04B0
+    }
+}
+EOF

omxplayer-2014.02.11.tar.gz/ffmpeg/tools/probetest.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/tools/probetest.c Changed

@@ -23,10 +23,17 @@
 #include "libavformat/avformat.h"
 #include "libavcodec/put_bits.h"
 #include "libavutil/lfg.h"
+#include "libavutil/timer.h"
 
-static int score_array[1000]; //this must be larger than the number of formats
+#define MAX_FORMATS 1000 //this must be larger than the number of formats
+static int score_array[MAX_FORMATS];
+static int64_t time_array[MAX_FORMATS];
 static int failures = 0;
 
+#ifndef AV_READ_TIME
+#define AV_READ_TIME(x) 0
+#endif
+
 static void probe(AVProbeData *pd, int type, int p, int size)
 {
     int i = 0;
@@ -36,7 +43,10 @@
         if (fmt->flags & AVFMT_NOFILE)
             continue;
         if (fmt->read_probe) {
-            int score = fmt->read_probe(pd);
+            int score;
+            int64_t start = AV_READ_TIME();
+            score = fmt->read_probe(pd);
+            time_array[i] += AV_READ_TIME() - start;
             if (score > score_array[i] && score > AVPROBE_SCORE_MAX / 4) {
                 score_array[i] = score;
                 fprintf(stderr,
@@ -49,6 +59,22 @@
     }
 }
 
+static void print_times(void)
+{
+    int i = 0;
+    AVInputFormat *fmt = NULL;
+
+    while ((fmt = av_iformat_next(fmt))) {
+        if (fmt->flags & AVFMT_NOFILE)
+            continue;
+        if (time_array[i] > 1000000) {
+            fprintf(stderr, "%12"PRIu64" cycles, %12s\n",
+                    time_array[i], fmt->name);
+        }
+        i++;
+    }
+}
+
 int main(int argc, char **argv)
 {
     unsigned int p, i, type, size, retry;
@@ -84,6 +110,11 @@
         pd.buf      = av_realloc(pd.buf, size + AVPROBE_PADDING_SIZE);
         pd.filename = "";
 
+        if (!pd.buf) {
+            fprintf(stderr, "out of memory\n");
+            return 1;
+        }
+
         memset(pd.buf, 0, size + AVPROBE_PADDING_SIZE);
 
         fprintf(stderr, "testing size=%d\n", size);
@@ -141,5 +172,7 @@
             }
         }
     }
+    if(AV_READ_TIME())
+        print_times();
     return failures;
 }

omxplayer-2014.02.11.tar.gz/ffmpeg/tools/qt-faststart.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/tools/qt-faststart.c Changed

@@ -37,14 +37,14 @@
 #define ftello(x)       _ftelli64(x)
 #endif
 
-#define FFMIN(a,b) ((a) > (b) ? (b) : (a))
+#define MIN(a,b) ((a) > (b) ? (b) : (a))
 
 #define BE_16(x) ((((uint8_t*)(x))[0] <<  8) | ((uint8_t*)(x))[1])
 
-#define BE_32(x) ((((uint8_t*)(x))[0] << 24) |  \
-                  (((uint8_t*)(x))[1] << 16) |  \
-                  (((uint8_t*)(x))[2] <<  8) |  \
-                   ((uint8_t*)(x))[3])
+#define BE_32(x) (((uint32_t)(((uint8_t*)(x))[0]) << 24) |  \
+                             (((uint8_t*)(x))[1]  << 16) |  \
+                             (((uint8_t*)(x))[2]  <<  8) |  \
+                              ((uint8_t*)(x))[3])
 
 #define BE_64(x) (((uint64_t)(((uint8_t*)(x))[0]) << 56) |  \
                   ((uint64_t)(((uint8_t*)(x))[1]) << 48) |  \
@@ -89,7 +89,7 @@
     uint32_t atom_type   = 0;
     uint64_t atom_size   = 0;
     uint64_t atom_offset = 0;
-    uint64_t last_offset;
+    int64_t last_offset;
     unsigned char *moov_atom = NULL;
     unsigned char *ftyp_atom = NULL;
     uint64_t moov_atom_size;
@@ -102,7 +102,8 @@
     int bytes_to_copy;
 
     if (argc != 3) {
-        printf("Usage: qt-faststart <infile.mov> <outfile.mov>\n");
+        printf("Usage: qt-faststart <infile.mov> <outfile.mov>\n"
+               "Note: alternatively you can use -movflags +faststart in ffmpeg\n");
         return 0;
     }
 
@@ -123,7 +124,7 @@
         if (fread(atom_bytes, ATOM_PREAMBLE_SIZE, 1, infile) != 1) {
             break;
         }
-        atom_size = (uint32_t) BE_32(&atom_bytes[0]);
+        atom_size = BE_32(&atom_bytes[0]);
         atom_type = BE_32(&atom_bytes[4]);
 
         /* keep ftyp atom */
@@ -136,9 +137,9 @@
                        atom_size);
                 goto error_out;
             }
-            if (   fseeko(infile, -ATOM_PREAMBLE_SIZE, SEEK_CUR)
-                || fread(ftyp_atom, atom_size, 1, infile) != 1
-                || (start_offset = ftello(infile))<0) {
+            if (fseeko(infile, -ATOM_PREAMBLE_SIZE, SEEK_CUR) ||
+                fread(ftyp_atom, atom_size, 1, infile) != 1 ||
+                (start_offset = ftello(infile)) < 0) {
                 perror(argv[1]);
                 goto error_out;
             }
@@ -154,7 +155,7 @@
             } else {
                 ret = fseeko(infile, atom_size - ATOM_PREAMBLE_SIZE, SEEK_CUR);
             }
-            if(ret) {
+            if (ret) {
                 perror(argv[1]);
                 goto error_out;
             }
@@ -202,6 +203,10 @@
         goto error_out;
     }
     last_offset    = ftello(infile);
+    if (last_offset < 0) {
+        perror(argv[1]);
+        goto error_out;
+    }
     moov_atom_size = atom_size;
     moov_atom      = malloc(moov_atom_size);
     if (!moov_atom) {
@@ -229,18 +234,18 @@
         atom_type = BE_32(&moov_atom[i]);
         if (atom_type == STCO_ATOM) {
             printf(" patching stco atom...\n");
-            atom_size = (uint32_t)BE_32(&moov_atom[i - 4]);
+            atom_size = BE_32(&moov_atom[i - 4]);
             if (i + atom_size - 4 > moov_atom_size) {
                 printf(" bad atom size\n");
                 goto error_out;
             }
             offset_count = BE_32(&moov_atom[i + 8]);
-            if (i + 12LL + offset_count * 4LL > moov_atom_size) {
-                printf(" bad atom size\n");
+            if (i + 12 + offset_count * UINT64_C(4) > moov_atom_size) {
+                printf(" bad atom size/element count\n");
                 goto error_out;
             }
             for (j = 0; j < offset_count; j++) {
-                current_offset  = (uint32_t)BE_32(&moov_atom[i + 12 + j * 4]);
+                current_offset  = BE_32(&moov_atom[i + 12 + j * 4]);
                 current_offset += moov_atom_size;
                 moov_atom[i + 12 + j * 4 + 0] = (current_offset >> 24) & 0xFF;
                 moov_atom[i + 12 + j * 4 + 1] = (current_offset >> 16) & 0xFF;
@@ -250,14 +255,14 @@
             i += atom_size - 4;
         } else if (atom_type == CO64_ATOM) {
             printf(" patching co64 atom...\n");
-            atom_size = (uint32_t)BE_32(&moov_atom[i - 4]);
+            atom_size = BE_32(&moov_atom[i - 4]);
             if (i + atom_size - 4 > moov_atom_size) {
                 printf(" bad atom size\n");
                 goto error_out;
             }
             offset_count = BE_32(&moov_atom[i + 8]);
-            if (i + 12LL + offset_count * 8LL > moov_atom_size) {
-                printf(" bad atom size\n");
+            if (i + 12 + offset_count * UINT64_C(8) > moov_atom_size) {
+                printf(" bad atom size/element count\n");
                 goto error_out;
             }
             for (j = 0; j < offset_count; j++) {
@@ -315,7 +320,7 @@
     }
 
     /* copy the remainder of the infile, from offset 0 -> last_offset - 1 */
-    bytes_to_copy = FFMIN(COPY_BUFFER_SIZE, last_offset);
+    bytes_to_copy = MIN(COPY_BUFFER_SIZE, last_offset);
     copy_buffer = malloc(bytes_to_copy);
     if (!copy_buffer) {
         printf("could not allocate %d bytes for copy_buffer\n", bytes_to_copy);
@@ -323,7 +328,7 @@
     }
     printf(" copying rest of file...\n");
     while (last_offset) {
-        bytes_to_copy = FFMIN(bytes_to_copy, last_offset);
+        bytes_to_copy = MIN(bytes_to_copy, last_offset);
 
         if (fread(copy_buffer, bytes_to_copy, 1, infile) != 1) {
             perror(argv[1]);

omxplayer-2014.03.28.tar.gz/ffmpeg/tools/uncoded_frame.c Added

@@ -0,0 +1,279 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "libavutil/avassert.h"
+#include "libavdevice/avdevice.h"
+#include "libavfilter/avfilter.h"
+#include "libavfilter/buffersink.h"
+#include "libavformat/avformat.h"
+
+typedef struct {
+    AVFormatContext *mux;
+    AVStream *stream;
+    AVFilterContext *sink;
+    AVFilterLink *link;
+} Stream;
+
+static int create_sink(Stream *st, AVFilterGraph *graph,
+                       AVFilterContext *f, int idx)
+{
+    enum AVMediaType type = avfilter_pad_get_type(f->output_pads, idx);
+    const char *sink_name;
+    int ret;
+
+    switch (type) {
+    case AVMEDIA_TYPE_VIDEO: sink_name =  "buffersink"; break;
+    case AVMEDIA_TYPE_AUDIO: sink_name = "abuffersink"; break;
+    default:
+        av_log(NULL, AV_LOG_ERROR, "Stream type not supported\n");
+        return AVERROR(EINVAL);
+    }
+    ret = avfilter_graph_create_filter(&st->sink,
+                                       avfilter_get_by_name(sink_name),
+                                       NULL, NULL, NULL, graph);
+    if (ret < 0)
+        return ret;
+    ret = avfilter_link(f, idx, st->sink, 0);
+    if (ret < 0)
+        return ret;
+    st->link = st->sink->inputs[0];
+    return 0;
+}
+
+int main(int argc, char **argv)
+{
+    char *in_graph_desc, **out_dev_name;
+    int nb_out_dev = 0, nb_streams = 0;
+    AVFilterGraph *in_graph = NULL;
+    Stream *streams = NULL, *st;
+    AVFrame *frame = NULL;
+    int i, j, run = 1, ret;
+
+    //av_log_set_level(AV_LOG_DEBUG);
+
+    if (argc < 3) {
+        av_log(NULL, AV_LOG_ERROR,
+               "Usage: %s filter_graph dev:out [dev2:out2...]\n\n"
+               "Examples:\n"
+               "%s movie=file.nut:s=v+a xv:- alsa:default\n"
+               "%s movie=file.nut:s=v+a uncodedframecrc:pipe:0\n",
+               argv[0], argv[0], argv[0]);
+        exit(1);
+    }
+    in_graph_desc = argv[1];
+    out_dev_name = argv + 2;
+    nb_out_dev = argc - 2;
+
+    av_register_all();
+    avdevice_register_all();
+    avfilter_register_all();
+
+    /* Create input graph */
+    if (!(in_graph = avfilter_graph_alloc())) {
+        ret = AVERROR(ENOMEM);
+        av_log(NULL, AV_LOG_ERROR, "Unable to alloc graph graph: %s\n",
+               av_err2str(ret));
+        goto fail;
+    }
+    ret = avfilter_graph_parse_ptr(in_graph, in_graph_desc, NULL, NULL, NULL);
+    if (ret < 0) {
+        av_log(NULL, AV_LOG_ERROR, "Unable to parse graph: %s\n",
+               av_err2str(ret));
+        goto fail;
+    }
+    nb_streams = 0;
+    for (i = 0; i < in_graph->nb_filters; i++) {
+        AVFilterContext *f = in_graph->filters[i];
+        for (j = 0; j < f->nb_inputs; j++) {
+            if (!f->inputs[j]) {
+                av_log(NULL, AV_LOG_ERROR, "Graph has unconnected inputs\n");
+                ret = AVERROR(EINVAL);
+                goto fail;
+            }
+        }
+        for (j = 0; j < f->nb_outputs; j++)
+            if (!f->outputs[j])
+                nb_streams++;
+    }
+    if (!nb_streams) {
+        av_log(NULL, AV_LOG_ERROR, "Graph has no output stream\n");
+        ret = AVERROR(EINVAL);
+        goto fail;
+    }
+    if (nb_out_dev != 1 && nb_out_dev != nb_streams) {
+        av_log(NULL, AV_LOG_ERROR,
+               "Graph has %d output streams, %d devices given\n",
+               nb_streams, nb_out_dev);
+        ret = AVERROR(EINVAL);
+        goto fail;
+    }
+
+    if (!(streams = av_calloc(nb_streams, sizeof(*streams)))) {
+        ret = AVERROR(ENOMEM);
+        av_log(NULL, AV_LOG_ERROR, "Could not allocate streams\n");
+    }
+    st = streams;
+    for (i = 0; i < in_graph->nb_filters; i++) {
+        AVFilterContext *f = in_graph->filters[i];
+        for (j = 0; j < f->nb_outputs; j++) {
+            if (!f->outputs[j]) {
+                if ((ret = create_sink(st++, in_graph, f, j)) < 0)
+                    goto fail;
+            }
+        }
+    }
+    av_assert0(st - streams == nb_streams);
+    if ((ret = avfilter_graph_config(in_graph, NULL)) < 0) {
+        av_log(NULL, AV_LOG_ERROR, "Failed to configure graph\n");
+        goto fail;
+    }
+
+    /* Create output devices */
+    for (i = 0; i < nb_out_dev; i++) {
+        char *fmt = NULL, *dev = out_dev_name[i];
+        st = &streams[i];
+        if ((dev = strchr(dev, ':'))) {
+            *(dev++) = 0;
+            fmt = out_dev_name[i];
+        }
+        ret = avformat_alloc_output_context2(&st->mux, NULL, fmt, dev);
+        if (ret < 0) {
+            av_log(NULL, AV_LOG_ERROR, "Failed to allocate output: %s\n",
+                   av_err2str(ret));
+            goto fail;
+        }
+        if (!(st->mux->oformat->flags & AVFMT_NOFILE)) {
+            ret = avio_open2(&st->mux->pb, st->mux->filename, AVIO_FLAG_WRITE,
+                             NULL, NULL);
+            if (ret < 0) {
+                av_log(st->mux, AV_LOG_ERROR, "Failed to init output: %s\n",
+                       av_err2str(ret));
+                goto fail;
+            }
+        }
+    }
+    for (; i < nb_streams; i++)
+        streams[i].mux = streams[0].mux;
+
+    /* Create output device streams */
+    for (i = 0; i < nb_streams; i++) {
+        st = &streams[i];
+        if (!(st->stream = avformat_new_stream(st->mux, NULL))) {
+            ret = AVERROR(ENOMEM);
+            av_log(NULL, AV_LOG_ERROR, "Failed to create output stream\n");
+            goto fail;
+        }
+        st->stream->codec->codec_type = st->link->type;
+        st->stream->time_base = st->stream->codec->time_base =
+            st->link->time_base;
+        switch (st->link->type) {
+        case AVMEDIA_TYPE_VIDEO:
+            st->stream->codec->codec_id = AV_CODEC_ID_RAWVIDEO;
+            st->stream->avg_frame_rate =
+            st->stream->  r_frame_rate = av_buffersink_get_frame_rate(st->sink);
+            st->stream->codec->width               = st->link->w;
+            st->stream->codec->height              = st->link->h;
+            st->stream->codec->sample_aspect_ratio = st->link->sample_aspect_ratio;
+            st->stream->codec->pix_fmt             = st->link->format;
+            break;
+        case AVMEDIA_TYPE_AUDIO:
+            st->stream->codec->codec_id =
+                av_get_pcm_codec(st->stream->codec->sample_fmt, -1);
+            st->stream->codec->channel_layout = st->link->channel_layout;
+            st->stream->codec->channels = avfilter_link_get_channels(st->link);
+            st->stream->codec->sample_rate = st->link->sample_rate;
+            st->stream->codec->sample_fmt = st->link->format;
+            break;
+        default:
+            av_assert0(!"reached");
+        }
+    }
+
+    /* Init output devices */
+    for (i = 0; i < nb_out_dev; i++) {
+        st = &streams[i];
+        if ((ret = avformat_write_header(st->mux, NULL)) < 0) {
+            av_log(st->mux, AV_LOG_ERROR, "Failed to init output: %s\n",
+                   av_err2str(ret));
+            goto fail;
+        }
+    }
+
+    /* Check output devices */
+    for (i = 0; i < nb_streams; i++) {
+        st = &streams[i];
+        ret = av_write_uncoded_frame_query(st->mux, st->stream->index);
+        if (ret < 0) {
+            av_log(st->mux, AV_LOG_ERROR,
+                   "Uncoded frames not supported on stream #%d: %s\n",
+                   i, av_err2str(ret));
+            goto fail;
+        }
+    }
+
+    while (run) {
+        ret = avfilter_graph_request_oldest(in_graph);
+        if (ret < 0) {
+            if (ret == AVERROR_EOF) {
+                run = 0;
+            } else {
+                av_log(NULL, AV_LOG_ERROR, "Error filtering: %s\n",
+                       av_err2str(ret));
+                break;
+            }
+        }
+        for (i = 0; i < nb_streams; i++) {
+            st = &streams[i];
+            while (1) {
+                if (!frame && !(frame = av_frame_alloc())) {
+                    ret = AVERROR(ENOMEM);
+                    av_log(NULL, AV_LOG_ERROR, "Could not allocate frame\n");
+                    goto fail;
+                }
+                ret = av_buffersink_get_frame_flags(st->sink, frame,
+                                                    AV_BUFFERSINK_FLAG_NO_REQUEST);
+                if (ret < 0) {
+                    if (ret != AVERROR(EAGAIN) && ret != AVERROR_EOF)
+                        av_log(NULL, AV_LOG_WARNING, "Error in sink: %s\n",
+                               av_err2str(ret));
+                    break;
+                }
+                if (frame->pts != AV_NOPTS_VALUE)
+                    frame->pts = av_rescale_q(frame->pts,
+                                              st->link  ->time_base,
+                                              st->stream->time_base);
+                ret = av_interleaved_write_uncoded_frame(st->mux,
+                                                         st->stream->index,
+                                                         frame);
+                frame = NULL;
+                if (ret < 0) {
+                    av_log(st->stream->codec, AV_LOG_ERROR,
+                           "Error writing frame: %s\n", av_err2str(ret));
+                    goto fail;
+                }
+            }
+        }
+    }
+    ret = 0;
+
+    for (i = 0; i < nb_out_dev; i++) {
+        st = &streams[i];
+        av_write_trailer(st->mux);
+    }
+
+fail:
+    av_frame_free(&frame);
+    avfilter_graph_free(&in_graph);
+    if (streams) {
+        for (i = 0; i < nb_out_dev; i++) {
+            st = &streams[i];
+            if (st->mux) {
+                if (st->mux->pb)
+                    avio_close(st->mux->pb);
+                avformat_free_context(st->mux);
+            }
+        }
+    }
+    av_freep(&streams);
+    return ret < 0;
+}

omxplayer-2014.02.11.tar.gz/ffmpeg/tools/zmqsend.c -> omxplayer-2014.03.28.tar.gz/ffmpeg/tools/zmqsend.c Changed

@@ -54,7 +54,7 @@
     AVBPrint src;
     char c, *src_buf, *recv_buf;
     int recv_buf_size, ret;
-    void *ctx, *socket;
+    void *zmq_ctx, *socket;
     const char *bind_address = "tcp://localhost:5555";
     const char *infilename = NULL;
     FILE *infile = NULL;
@@ -88,23 +88,23 @@
         return 1;
     }
 
-    ctx = zmq_ctx_new();
-    if (!ctx) {
+    zmq_ctx = zmq_ctx_new();
+    if (!zmq_ctx) {
         av_log(NULL, AV_LOG_ERROR,
                "Could not create ZMQ context: %s\n", zmq_strerror(errno));
         return 1;
     }
 
-    socket = zmq_socket(ctx, ZMQ_REQ);
+    socket = zmq_socket(zmq_ctx, ZMQ_REQ);
     if (!socket) {
-        av_log(ctx, AV_LOG_ERROR,
+        av_log(NULL, AV_LOG_ERROR,
                "Could not create ZMQ socket: %s\n", zmq_strerror(errno));
         ret = 1;
         goto end;
     }
 
     if (zmq_connect(socket, bind_address) == -1) {
-        av_log(ctx, AV_LOG_ERROR, "Could not bind ZMQ responder to address '%s': %s\n",
+        av_log(NULL, AV_LOG_ERROR, "Could not bind ZMQ responder to address '%s': %s\n",
                bind_address, zmq_strerror(errno));
         ret = 1;
         goto end;
@@ -131,14 +131,14 @@
     }
 
     if (zmq_msg_init(&msg) == -1) {
-        av_log(ctx, AV_LOG_ERROR,
+        av_log(NULL, AV_LOG_ERROR,
                "Could not initialize receiving message: %s\n", zmq_strerror(errno));
         ret = 1;
         goto end;
     }
 
     if (zmq_msg_recv(&msg, socket, 0) == -1) {
-        av_log(ctx, AV_LOG_ERROR,
+        av_log(NULL, AV_LOG_ERROR,
                "Could not receive message: %s\n", zmq_strerror(errno));
         zmq_msg_close(&msg);
         ret = 1;
@@ -148,7 +148,7 @@
     recv_buf_size = zmq_msg_size(&msg) + 1;
     recv_buf = av_malloc(recv_buf_size);
     if (!recv_buf) {
-        av_log(ctx, AV_LOG_ERROR,
+        av_log(NULL, AV_LOG_ERROR,
                "Could not allocate receiving message buffer\n");
         zmq_msg_close(&msg);
         ret = 1;
@@ -162,6 +162,6 @@
 
 end:
     zmq_close(socket);
-    zmq_ctx_destroy(ctx);
+    zmq_ctx_destroy(zmq_ctx);
     return ret;
 }

omxplayer-2014.02.11.tar.gz/ffmpeg/version.sh -> omxplayer-2014.03.28.tar.gz/ffmpeg/version.sh Changed

omxplayer-2014.02.11.tar.gz/omxplayer -> omxplayer-2014.03.28.tar.gz/omxplayer Changed

@@ -43,13 +43,20 @@
     fi
 fi
 
-OMXPLAYER_DBUS_ADDR=`mktemp -t omxplayer-XXXXX`
-OMXPLAYER_DBUS_PID=`mktemp -t omxplayer-XXXXX`
-
-exec 5> $OMXPLAYER_DBUS_ADDR
-exec 6> $OMXPLAYER_DBUS_PID
-
-dbus-daemon --fork --print-address 5 --print-pid 6 --session
+DBUS_CMD="dbus-daemon --fork --print-address 5 --print-pid 6 --session"
+OMXPLAYER_DBUS_ADDR="/tmp/omxplayerdbus"
+OMXPLAYER_DBUS_PID="/tmp/omxplayerdbus.pid"
+
+if [ ! -s "$OMXPLAYER_DBUS_PID" ] || ! pgrep -f "$DBUS_CMD" -F "$OMXPLAYER_DBUS_PID" >/dev/null; then
+	#echo "starting dbus for the first time" >&2
+	exec 5> "$OMXPLAYER_DBUS_ADDR"
+	exec 6> "$OMXPLAYER_DBUS_PID"
+	$DBUS_CMD
+	until [ -s "$OMXPLAYER_DBUS_ADDR" ]; do
+		echo "waiting for dbus address to appear" >&2
+		sleep .2
+	done
+fi
 
 DBUS_SESSION_BUS_ADDRESS=`cat $OMXPLAYER_DBUS_ADDR`
 DBUS_SESSION_BUS_PID=`cat $OMXPLAYER_DBUS_PID`
@@ -59,13 +66,6 @@
 
 LD_LIBRARY_PATH="$OMXPLAYER_LIBS${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" $OMXPLAYER_BIN "$@"; true
 
-if [ -n "$DBUS_SESSION_BUS_PID" ]; then
-    kill -2 "$DBUS_SESSION_BUS_PID"
-fi
-
-rm -f $OMXPLAYER_DBUS_ADDR
-rm -f $OMXPLAYER_DBUS_PID
-
 if [ ! -z $NOREFRESH ] && [ "$NOREFRESH" == "1" ]; then
     exit 0
 fi

omxplayer-2014.02.11.tar.gz/omxplayer.cpp -> omxplayer-2014.03.28.tar.gz/omxplayer.cpp Changed

@@ -90,6 +90,7 @@
 bool              m_has_external_subtitles = false;
 std::string       m_font_path           = "/usr/share/fonts/truetype/freefont/FreeSans.ttf";
 std::string       m_italic_font_path    = "/usr/share/fonts/truetype/freefont/FreeSansOblique.ttf";
+std::string       m_dbus_name           = "org.mpris.MediaPlayer2.omxplayer";
 bool              m_asked_for_font      = false;
 bool              m_asked_for_italic_font = false;
 float             m_font_size           = 0.055f;
@@ -121,6 +122,8 @@
 float             m_display_aspect      = 0.0f;
 bool              m_boost_on_downmix    = true;
 bool              m_gen_log             = false;
+bool              m_loop                = false;
+int               m_layer               = 0;
 
 enum{ERROR=-1,SUCCESS,ONEBYTE};
 
@@ -163,6 +166,7 @@
   printf("         -g / --genlog                  generate log file\n");
   printf("         -l / --pos n                   start position (hh:mm:ss)\n");
   printf("         -b / --blank                   set background to black\n");
+  printf("              --loop                    loop file. Ignored if file is not seekable, start position applied if given\n");
   printf("              --no-boost-on-downmix     don't boost volume when downmixing\n");
   printf("              --vol n                   Set initial volume in millibels (default 0)\n");
   printf("              --amp n                   Set initial amplification in millibels (default 0)\n");
@@ -183,11 +187,15 @@
   printf("              --audio_queue n           Size of audio input queue in MB\n");
   printf("              --video_queue n           Size of video input queue in MB\n");
   printf("              --threshold   n           Amount of buffered data required to come out of buffering in seconds\n");
+  printf("              --timeout     n           Amount of time a file/network operation can stall for before timing out (default 10s)\n");
   printf("              --orientation n           Set orientation of video (0, 90, 180 or 270)\n");
   printf("              --fps n                   Set fps of video where timestamps are not present\n");
   printf("              --live                    Set for live tv or vod type stream\n");
   printf("              --layout                  Set output speaker layout (e.g. 5.1)\n");
+  printf("              --dbus_name name          Set D-Bus bus name\n");
+  printf("                                        (default: org.mpris.MediaPlayer2.omxplayer)\n");
   printf("              --key-config <file>       Uses key bindings specified in <file> instead of the default\n");
+  printf("              --layer n                 Set the video render layer number (higher numbers are on top)\n");
 }
 
 void print_keybindings()
@@ -519,6 +527,7 @@
   uint32_t vc_image_ptr;
   VC_IMAGE_TYPE_T type = VC_IMAGE_RGB565;
   uint16_t image = 0x0000; // black
+  int             layer = m_layer - 1;
 
   VC_RECT_T dst_rect, src_rect;
 
@@ -539,7 +548,7 @@
   update = vc_dispmanx_update_start(0);
   assert(update);
 
-  element = vc_dispmanx_element_add(update, display, -1 /*layer*/, &dst_rect, resource, &src_rect,
+  element = vc_dispmanx_element_add(update, display, layer, &dst_rect, resource, &src_rect,
                                     DISPMANX_PROTECTION_NONE, NULL, NULL, (DISPMANX_TRANSFORM_T)0 );
   assert(element);
 
@@ -557,8 +566,10 @@
   bool                  m_send_eos            = false;
   bool                  m_packet_after_seek   = false;
   bool                  m_seek_flush          = false;
+  bool                  m_new_win_pos         = false;
   std::string           m_filename;
   double                m_incr                = 0;
+  double                m_loop_from           = 0;
   CRBP                  g_RBP;
   COMXCore              g_OMX;
   bool                  m_stats               = false;
@@ -574,12 +585,14 @@
   float audio_queue_size = 0.0;
   float video_queue_size = 0.0;
   float m_threshold      = -1.0f; // amount of audio/video required to come out of buffering
+  float m_timeout        = 10.0f; // amount of time file/network operation can stall for before timing out
   int m_orientation      = -1; // unset
   float m_fps            = 0.0f; // unset
   bool m_live            = false; // set to true for live tv or vod for low buffering
   enum PCMLayout m_layout = PCM_LAYOUT_2_0;
   TV_DISPLAY_STATE_T   tv_state;
   double last_seek_pos = 0;
+  bool idle = false;
 
   const int font_opt        = 0x100;
   const int italic_font_opt = 0x201;
@@ -596,6 +609,7 @@
   const int video_queue_opt = 0x10a;
   const int no_deinterlace_opt = 0x10b;
   const int threshold_opt   = 0x10c;
+  const int timeout_opt     = 0x10f;
   const int boost_on_downmix_opt = 0x200;
   const int no_boost_on_downmix_opt = 0x207;
   const int key_config_opt  = 0x10d;
@@ -605,6 +619,9 @@
   const int fps_opt = 0x208;
   const int live_opt = 0x205;
   const int layout_opt = 0x206;
+  const int dbus_name_opt = 0x209;
+  const int loop_opt = 0x20a;
+  const int layer_opt = 0x20b;
 
   struct option longopts[] = {
     { "info",         no_argument,        NULL,          'i' },
@@ -641,6 +658,7 @@
     { "audio_queue",  required_argument,  NULL,          audio_queue_opt },
     { "video_queue",  required_argument,  NULL,          video_queue_opt },
     { "threshold",    required_argument,  NULL,          threshold_opt },
+    { "timeout",      required_argument,  NULL,          timeout_opt },
     { "boost-on-downmix", no_argument,    NULL,          boost_on_downmix_opt },
     { "no-boost-on-downmix", no_argument, NULL,          no_boost_on_downmix_opt },
     { "key-config",   required_argument,  NULL,          key_config_opt },
@@ -649,6 +667,9 @@
     { "fps",          required_argument,  NULL,          fps_opt },
     { "live",         no_argument,        NULL,          live_opt },
     { "layout",       required_argument,  NULL,          layout_opt },
+    { "dbus_name",    required_argument,  NULL,          dbus_name_opt },
+    { "loop",         no_argument,        NULL,          loop_opt },
+    { "layer",        required_argument,  NULL,          layer_opt },
     { 0, 0, 0, 0 }
   };
 
@@ -741,6 +762,8 @@
           {
             m_incr = atof(optarg);
           }
+          if(m_loop)
+            m_loop_from = m_incr;
         }
         break;
       case no_osd_opt:
@@ -804,6 +827,9 @@
       case threshold_opt:
   m_threshold = atof(optarg);
         break;
+      case timeout_opt:
+        m_timeout = atof(optarg);
+        break;
       case orientation_opt:
         m_orientation = atoi(optarg);
         break;
@@ -830,12 +856,23 @@
         }
         break;
       }
+      case dbus_name_opt:
+        m_dbus_name = optarg;
+        break;
+      case loop_opt:
+        if(m_incr != 0)
+            m_loop_from = m_incr;
+        m_loop = true;
+        break;
       case 'b':
         m_blank_background = true;
         break;
       case key_config_opt:
         keymap = KeyConfig::parseConfigFile(optarg);
         break;
+      case layer_opt:
+        m_layer = atoi(optarg);
+        break;
       case 0:
         break;
       case 'h':
@@ -938,12 +975,13 @@
     printf("Only %dM of gpu_mem is configured. Try running \"sudo raspi-config\" and ensure that \"memory_split\" has a value of %d or greater\n", gpu_mem, min_gpu_mem);
 
   m_av_clock = new OMXClock();
-  m_omxcontrol.init(m_av_clock, &m_player_audio);
+  m_omxcontrol.init(m_av_clock, &m_player_audio, &m_player_subtitles, &m_omx_reader, m_dbus_name);
   m_keyboard.setKeymap(keymap);
+  m_keyboard.setDbusName(m_dbus_name);
 
   m_thread_player = true;
 
-  if(!m_omx_reader.Open(m_filename.c_str(), m_dump_format, m_live))
+  if(!m_omx_reader.Open(m_filename.c_str(), m_dump_format, m_live, m_timeout))
     goto do_exit;
 
   if(m_dump_format)
@@ -953,6 +991,7 @@
   m_has_audio     = m_omx_reader.AudioStreamCount();
   m_has_subtitle  = m_has_external_subtitles ||
                     m_omx_reader.SubtitleStreamCount();
+  m_loop          = m_loop && m_omx_reader.CanSeek();
 
   if (m_audio_extension)
   {
@@ -1015,7 +1054,7 @@
   if (m_orientation >= 0)
     m_hints_video.orientation = m_orientation;
   if(m_has_video && !m_player_video.Open(m_hints_video, m_av_clock, DestRect, m_Deinterlace ? VS_DEINTERLACEMODE_FORCE:m_NoDeinterlace ? VS_DEINTERLACEMODE_OFF:VS_DEINTERLACEMODE_AUTO,
-                                         m_hdmi_clock_sync, m_thread_player, m_display_aspect, video_queue_size, video_fifo_size))
+                                         m_hdmi_clock_sync, m_thread_player, m_display_aspect, m_layer, video_queue_size, video_fifo_size))
     goto do_exit;
 
   if(m_has_subtitle || m_osd)
@@ -1036,6 +1075,7 @@
                                 m_centered,
                                 m_ghost_box,
                                 m_subtitle_lines,
+                                m_layer + 1,
                                 m_av_clock))
       goto do_exit;
   }
@@ -1108,7 +1148,10 @@
     }
 
      if (update) {
-    switch(m_omxcontrol.getEvent())
+       OMXControlResult result = m_omxcontrol.getEvent();
+       double oldPos, newPos;
+
+    switch(result.getKey())
     {
       case KeyConfig::ACTION_SHOW_INFO:
         m_tv_show_info = !m_tv_show_info;
@@ -1314,6 +1357,14 @@
       case KeyConfig::ACTION_SEEK_BACK_LARGE:
         if(m_omx_reader.CanSeek()) m_incr = -600.0;
         break;
+      case KeyConfig::ACTION_SEEK_RELATIVE:
+          m_incr = result.getArg() * 1e-6;
+          break;
+      case KeyConfig::ACTION_SEEK_ABSOLUTE:
+          newPos = result.getArg() * 1e-6;
+          oldPos = m_av_clock->OMXMediaTime()*1e-6;
+          m_incr = newPos - oldPos;
+          break;
       case KeyConfig::ACTION_PAUSE:
         m_Pause = !m_Pause;
         if (m_av_clock->OMXPlaySpeed() != DVD_PLAYSPEED_NORMAL && m_av_clock->OMXPlaySpeed() != DVD_PLAYSPEED_PAUSE)
@@ -1344,6 +1395,29 @@
             (t/3600), (t/60)%60, t%60, (dur/3600), (dur/60)%60, dur%60));
         }
         break;
+      case KeyConfig::ACTION_MOVE_VIDEO:
+        sscanf(result.getWinArg(), "%f %f %f %f", &DestRect.x1, &DestRect.y1, &DestRect.x2, &DestRect.y2);
+        m_new_win_pos = true;
+        m_seek_flush = true;
+        break;
+      case KeyConfig::ACTION_HIDE_VIDEO:
+        m_player_video.Close();
+        if (m_live)
+        {
+          m_omx_reader.Close();
+          idle = true;
+        }
+        break;
+      case KeyConfig::ACTION_UNHIDE_VIDEO:
+        if (m_live)
+        {
+          idle = false;
+          if(!m_omx_reader.Open(m_filename.c_str(), m_dump_format, true))
+            goto do_exit;
+        }
+        m_new_win_pos = true;
+        m_seek_flush = true;
+        break;
       case KeyConfig::ACTION_DECREASE_VOLUME:
         m_Volume -= 300;
         m_player_audio.SetVolume(pow(10, m_Volume / 2000.0));
@@ -1363,6 +1437,12 @@
     }
     }
 
+    if (idle)
+    {
+      usleep(10000);
+      continue;
+    }
+
     if(m_seek_flush || m_incr != 0)
     {
       double seek_pos     = 0;
@@ -1385,9 +1465,16 @@
         unsigned t = (unsigned)(startpts*1e-6);
         auto dur = m_omx_reader.GetStreamLength() / 1000;
 
-        DISPLAY_TEXT_LONG(strprintf("Seek\n%02d:%02d:%02d / %02d:%02d:%02d",
-            (t/3600), (t/60)%60, t%60, (dur/3600), (dur/60)%60, dur%60));
-        printf("Seek to: %02d:%02d:%02d\n", (t/3600), (t/60)%60, t%60);
+        if (!m_new_win_pos)
+        {
+          DISPLAY_TEXT_LONG(strprintf("Seek\n%02d:%02d:%02d / %02d:%02d:%02d",
+              (t/3600), (t/60)%60, t%60, (dur/3600), (dur/60)%60, dur%60));
+          printf("Seek to: %02d:%02d:%02d\n", (t/3600), (t/60)%60, t%60);
+        }
+        else
+        {
+          m_new_win_pos = false;
+        }
 
         FlushStreams(startpts);
       }
@@ -1397,7 +1484,7 @@
       sentStarted = false;
 
       if(m_has_video && !m_player_video.Open(m_hints_video, m_av_clock, DestRect, m_Deinterlace ? VS_DEINTERLACEMODE_FORCE:m_NoDeinterlace ? VS_DEINTERLACEMODE_OFF:VS_DEINTERLACEMODE_AUTO,
-                                         m_hdmi_clock_sync, m_thread_player, m_display_aspect, video_queue_size, video_fifo_size))
+                                         m_hdmi_clock_sync, m_thread_player, m_display_aspect, m_layer, video_queue_size, video_fifo_size))
         goto do_exit;
 
       CLog::Log(LOGDEBUG, "Seeked %.0f %.0f %.0f\n", DVD_MSEC_TO_TIME(seek_pos), startpts, m_av_clock->OMXMediaTime());
@@ -1589,6 +1676,11 @@
         OMXClock::OMXSleep(10);
         continue;
       }
+      if (m_loop)
+      {
+        m_incr = m_loop_from - (m_av_clock->OMXMediaTime() ? m_av_clock->OMXMediaTime() / DVD_TIME_BASE : last_seek_pos);
+        continue;
+      }
       if (!m_send_eos && m_has_video)
         m_player_video.SubmitEOS();
       if (!m_send_eos && m_has_audio)

omxplayer-2014.02.11.tar.gz/prepare-native-raspbian.sh -> omxplayer-2014.03.28.tar.gz/prepare-native-raspbian.sh Changed

@@ -3,13 +3,13 @@
 echo "Patching makefiles..."
 echo "FLOAT=hard
 
-CFLAGS +=  -mfloat-abi=hard -mcpu=arm1176jzf-s -fomit-frame-pointer -mabi=aapcs-linux -mtune=arm1176jzf-s -mfpu=vfp -Wno-psabi -mno-apcs-stack-check -O3 -mstructure-size-boundary=32 -mno-sched-prolog -march=armv6zk
+CFLAGS +=  -mfloat-abi=hard -mcpu=arm1176jzf-s -fomit-frame-pointer -mabi=aapcs-linux -mtune=arm1176jzf-s -mfpu=vfp -Wno-psabi -mno-apcs-stack-check -O3 -mstructure-size-boundary=32 -mno-sched-prolog -march=armv6zk `pkg-config dbus-1 --cflags`
 
 BUILDROOT	:=/usr/local/src/omxplayer
 TOOLCHAIN	:=/usr/
 LD			:= \$(TOOLCHAIN)/bin/ld
-CC			:= \$(TOOLCHAIN)/bin/gcc 
-CXX       	:= \$(TOOLCHAIN)/bin/g++
+CC			:= \$(TOOLCHAIN)/bin/gcc-4.7
+CXX       	:= \$(TOOLCHAIN)/bin/g++-4.7
 OBJDUMP		:= \$(TOOLCHAIN)/bin/objdump
 RANLIB		:= \$(TOOLCHAIN)/bin/ranlib
 STRIP		:= \$(TOOLCHAIN)/bin/strip
@@ -38,9 +38,8 @@
 
 echo "Installing packages..."
 sudo apt-get update
-sudo apt-get -y install ca-certificates git-core subversion binutils libva1 libpcre3-dev libidn11-dev libboost1.50-dev libfreetype6-dev libusb-1.0-0-dev
+sudo apt-get -y install ca-certificates git-core subversion binutils libva1 libpcre3-dev libidn11-dev libboost1.50-dev libfreetype6-dev libusb-1.0-0-dev libdbus-1-dev libssl-dev
 sudo apt-get -y install gcc-4.7 g++-4.7
-pushd /usr/bin && sudo rm gcc && sudo ln -s gcc-4.7 gcc && sudo rm g++ && sudo ln -s g++-4.7 g++ && popd
 
 
 echo "Installing the rpi-update script..."